From a738b0cac9b51e07940a45024d4c749104896e59 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 15 Apr 2024 13:22:36 +0200
Subject: [PATCH 001/283] Initialize ChillTicketBundle

---
 composer.json                                   |  1 +
 .../DependencyInjection/config/routes.yaml      |  0
 .../DependencyInjection/config/services.yaml    |  1 +
 .../ChillTicketBundle/src/ChillTicketBundle.php | 10 ++++++++++
 .../ChillTicketExtension.php                    | 17 +++++++++++++++++
 5 files changed, 29 insertions(+)
 create mode 100644 src/Bundle/ChillThirdPartyBundle/DependencyInjection/config/routes.yaml
 create mode 100644 src/Bundle/ChillThirdPartyBundle/DependencyInjection/config/services.yaml
 create mode 100644 src/Bundle/ChillTicketBundle/src/ChillTicketBundle.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/DependencyInjection/ChillTicketExtension.php

diff --git a/composer.json b/composer.json
index a000d5b3c..928a65292 100644
--- a/composer.json
+++ b/composer.json
@@ -118,6 +118,7 @@
             "Chill\\PersonBundle\\": "src/Bundle/ChillPersonBundle",
             "Chill\\ReportBundle\\": "src/Bundle/ChillReportBundle",
             "Chill\\TaskBundle\\": "src/Bundle/ChillTaskBundle",
+            "Chill\\TicketBundle\\": "src/Bundle/ChillTicketBundle/src",
             "Chill\\ThirdPartyBundle\\": "src/Bundle/ChillThirdPartyBundle",
             "Chill\\WopiBundle\\": "src/Bundle/ChillWopiBundle/src",
             "Chill\\Utils\\Rector\\": "utils/rector/src"
diff --git a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/config/routes.yaml b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/config/routes.yaml
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/config/services.yaml b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/config/services.yaml
new file mode 100644
index 000000000..0baad4766
--- /dev/null
+++ b/src/Bundle/ChillThirdPartyBundle/DependencyInjection/config/services.yaml
@@ -0,0 +1 @@
+services:
diff --git a/src/Bundle/ChillTicketBundle/src/ChillTicketBundle.php b/src/Bundle/ChillTicketBundle/src/ChillTicketBundle.php
new file mode 100644
index 000000000..9bb39e1f9
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/ChillTicketBundle.php
@@ -0,0 +1,10 @@
+<?php
+
+namespace Chill\TicketBundle;
+
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+class ChillTicketBundle extends Bundle
+{
+
+}
diff --git a/src/Bundle/ChillTicketBundle/src/DependencyInjection/ChillTicketExtension.php b/src/Bundle/ChillTicketBundle/src/DependencyInjection/ChillTicketExtension.php
new file mode 100644
index 000000000..c3c3add41
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/DependencyInjection/ChillTicketExtension.php
@@ -0,0 +1,17 @@
+<?php
+
+namespace Chill\TicketBundle\DependencyInjection;
+
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Loader;
+use Symfony\Component\DependencyInjection\Extension\Extension;
+
+class ChillTicketExtension extends Extension
+{
+    public function load(array $configs, ContainerBuilder $container)
+    {
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
+        $loader->load('services.yml');
+    }
+}

From a59ea7db31adc876956d16c2d5eec626c7eed5db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 15 Apr 2024 13:48:49 +0200
Subject: [PATCH 002/283] Compiles with ticket bundle

---
 .../config/routes.yaml                                        | 0
 .../config/services.yaml                                      | 0
 .../src/DependencyInjection/ChillTicketExtension.php          | 4 ++--
 3 files changed, 2 insertions(+), 2 deletions(-)
 rename src/Bundle/{ChillThirdPartyBundle/DependencyInjection => ChillTicketBundle}/config/routes.yaml (100%)
 rename src/Bundle/{ChillThirdPartyBundle/DependencyInjection => ChillTicketBundle}/config/services.yaml (100%)

diff --git a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/config/routes.yaml b/src/Bundle/ChillTicketBundle/config/routes.yaml
similarity index 100%
rename from src/Bundle/ChillThirdPartyBundle/DependencyInjection/config/routes.yaml
rename to src/Bundle/ChillTicketBundle/config/routes.yaml
diff --git a/src/Bundle/ChillThirdPartyBundle/DependencyInjection/config/services.yaml b/src/Bundle/ChillTicketBundle/config/services.yaml
similarity index 100%
rename from src/Bundle/ChillThirdPartyBundle/DependencyInjection/config/services.yaml
rename to src/Bundle/ChillTicketBundle/config/services.yaml
diff --git a/src/Bundle/ChillTicketBundle/src/DependencyInjection/ChillTicketExtension.php b/src/Bundle/ChillTicketBundle/src/DependencyInjection/ChillTicketExtension.php
index c3c3add41..7c9227cfb 100644
--- a/src/Bundle/ChillTicketBundle/src/DependencyInjection/ChillTicketExtension.php
+++ b/src/Bundle/ChillTicketBundle/src/DependencyInjection/ChillTicketExtension.php
@@ -11,7 +11,7 @@ class ChillTicketExtension extends Extension
 {
     public function load(array $configs, ContainerBuilder $container)
     {
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
-        $loader->load('services.yml');
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../../config'));
+        $loader->load('services.yaml');
     }
 }

From deb3d9218975142f7a299b6e75f074e2b0ccb39a Mon Sep 17 00:00:00 2001
From: Boris Waaub <boris.waaub@gmail.com>
Date: Mon, 15 Apr 2024 14:34:09 +0200
Subject: [PATCH 003/283] Add ChillTicketBundle webpack configuration

---
 src/Bundle/ChillTicketBundle/chill.webpack.config.js          | 4 ++++
 src/Bundle/ChillTicketBundle/src/Resources/public/types.ts    | 0
 .../src/Resources/public/vuejs/TicketApp/index.ts             | 0
 3 files changed, 4 insertions(+)
 create mode 100644 src/Bundle/ChillTicketBundle/chill.webpack.config.js
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts

diff --git a/src/Bundle/ChillTicketBundle/chill.webpack.config.js b/src/Bundle/ChillTicketBundle/chill.webpack.config.js
new file mode 100644
index 000000000..5f40de9f2
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/chill.webpack.config.js
@@ -0,0 +1,4 @@
+// this file loads all assets from the Chill person bundle
+module.exports = function(encore, entries) {
+    encore.addEntry('ticket_app', __dirname + '/src/Resources/public/vuejs/TicketApp/index.ts');
+};
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts
new file mode 100644
index 000000000..e69de29bb

From 4d67702a7693ebccaeddec9caac984d41fe9d904 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 15 Apr 2024 15:48:25 +0200
Subject: [PATCH 004/283] Bootstrap loading of controllers and routes for
 ticket bundle

---
 src/Bundle/ChillTicketBundle/config/routes.yaml   |  0
 src/Bundle/ChillTicketBundle/config/services.yaml |  1 -
 .../src/Controller/ViewTicketController.php       | 15 +++++++++++++++
 .../DependencyInjection/ChillTicketExtension.php  |  2 +-
 .../ChillTicketBundle/src/config/services.yaml    | 12 ++++++++++++
 5 files changed, 28 insertions(+), 2 deletions(-)
 delete mode 100644 src/Bundle/ChillTicketBundle/config/routes.yaml
 delete mode 100644 src/Bundle/ChillTicketBundle/config/services.yaml
 create mode 100644 src/Bundle/ChillTicketBundle/src/Controller/ViewTicketController.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/config/services.yaml

diff --git a/src/Bundle/ChillTicketBundle/config/routes.yaml b/src/Bundle/ChillTicketBundle/config/routes.yaml
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/Bundle/ChillTicketBundle/config/services.yaml b/src/Bundle/ChillTicketBundle/config/services.yaml
deleted file mode 100644
index 0baad4766..000000000
--- a/src/Bundle/ChillTicketBundle/config/services.yaml
+++ /dev/null
@@ -1 +0,0 @@
-services:
diff --git a/src/Bundle/ChillTicketBundle/src/Controller/ViewTicketController.php b/src/Bundle/ChillTicketBundle/src/Controller/ViewTicketController.php
new file mode 100644
index 000000000..ddc1f8f2f
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Controller/ViewTicketController.php
@@ -0,0 +1,15 @@
+<?php
+
+namespace Chill\TicketBundle\Controller;
+
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Annotation\Route;
+
+class ViewTicketController
+{
+    #[Route('/{_locale}/ticket/ticket/{ticketId}', name: 'chill_ticket_ticket_view')]
+    public function __invoke(int $ticketId): Response
+    {
+        return new Response('ok');
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/DependencyInjection/ChillTicketExtension.php b/src/Bundle/ChillTicketBundle/src/DependencyInjection/ChillTicketExtension.php
index 7c9227cfb..59488fd7d 100644
--- a/src/Bundle/ChillTicketBundle/src/DependencyInjection/ChillTicketExtension.php
+++ b/src/Bundle/ChillTicketBundle/src/DependencyInjection/ChillTicketExtension.php
@@ -11,7 +11,7 @@ class ChillTicketExtension extends Extension
 {
     public function load(array $configs, ContainerBuilder $container)
     {
-        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../../config'));
+        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
         $loader->load('services.yaml');
     }
 }
diff --git a/src/Bundle/ChillTicketBundle/src/config/services.yaml b/src/Bundle/ChillTicketBundle/src/config/services.yaml
new file mode 100644
index 000000000..6d2f9e1bf
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/config/services.yaml
@@ -0,0 +1,12 @@
+services:
+    _defaults:
+        autoconfigure: true
+        autowire: true
+
+    Chill\TicketBundle\Controller\:
+        resource: '../Controller/'
+        tags:
+            - controller.service_arguments
+
+
+

From a2f1e20ddff78bf42e157b7645c06e0e1a7c9de4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 15 Apr 2024 15:49:47 +0200
Subject: [PATCH 005/283] Fix cs

---
 .../ChillTicketBundle/src/ChillTicketBundle.php    | 14 ++++++++++----
 .../src/Controller/ViewTicketController.php        |  9 +++++++++
 .../DependencyInjection/ChillTicketExtension.php   |  9 +++++++++
 3 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/src/ChillTicketBundle.php b/src/Bundle/ChillTicketBundle/src/ChillTicketBundle.php
index 9bb39e1f9..de1b1535e 100644
--- a/src/Bundle/ChillTicketBundle/src/ChillTicketBundle.php
+++ b/src/Bundle/ChillTicketBundle/src/ChillTicketBundle.php
@@ -1,10 +1,16 @@
 <?php
 
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\TicketBundle;
 
 use Symfony\Component\HttpKernel\Bundle\Bundle;
 
-class ChillTicketBundle extends Bundle
-{
-
-}
+class ChillTicketBundle extends Bundle {}
diff --git a/src/Bundle/ChillTicketBundle/src/Controller/ViewTicketController.php b/src/Bundle/ChillTicketBundle/src/Controller/ViewTicketController.php
index ddc1f8f2f..9b35c0d48 100644
--- a/src/Bundle/ChillTicketBundle/src/Controller/ViewTicketController.php
+++ b/src/Bundle/ChillTicketBundle/src/Controller/ViewTicketController.php
@@ -1,5 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\TicketBundle\Controller;
 
 use Symfony\Component\HttpFoundation\Response;
diff --git a/src/Bundle/ChillTicketBundle/src/DependencyInjection/ChillTicketExtension.php b/src/Bundle/ChillTicketBundle/src/DependencyInjection/ChillTicketExtension.php
index 59488fd7d..8ee95d06c 100644
--- a/src/Bundle/ChillTicketBundle/src/DependencyInjection/ChillTicketExtension.php
+++ b/src/Bundle/ChillTicketBundle/src/DependencyInjection/ChillTicketExtension.php
@@ -1,5 +1,14 @@
 <?php
 
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Chill\TicketBundle\DependencyInjection;
 
 use Symfony\Component\Config\FileLocator;

From 5c3585a1ed22d87949f7a59b23b8342a13d9a1e6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 16 Apr 2024 14:41:29 +0200
Subject: [PATCH 006/283] Fix loading of environment variable in bootstrap
 process

---
 tests/app/config/bootstrap.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/app/config/bootstrap.php b/tests/app/config/bootstrap.php
index 4a7385190..6f243bb04 100644
--- a/tests/app/config/bootstrap.php
+++ b/tests/app/config/bootstrap.php
@@ -23,7 +23,7 @@ if (is_array($env = @include dirname(__DIR__).'/.env.local.php') && (!isset($env
     (new Dotenv(false))->populate($env);
 } else {
     // load all the .env files
-    (new Dotenv(false))->loadEnv(dirname(__DIR__).'/../../.env.test');
+    (new Dotenv(false))->loadEnv(dirname(__DIR__).'/../../.env');
 }
 
 $_SERVER += $_ENV;

From 58325429783421f4e1b4a59a41867b18496d6086 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 16 Apr 2024 14:41:39 +0200
Subject: [PATCH 007/283] load also tests for ticket bundle

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 928a65292..482dcc72f 100644
--- a/composer.json
+++ b/composer.json
@@ -126,8 +126,8 @@
     },
     "autoload-dev": {
         "psr-4": {
-            "App\\": "tests/",
             "Chill\\DocGeneratorBundle\\Tests\\": "src/Bundle/ChillDocGeneratorBundle/tests",
+            "Chill\\TicketBundle\\Tests": "src/Bundle/ChillTicketBundle/tests",
             "Chill\\WopiBundle\\Tests\\": "src/Bundle/ChillDocGeneratorBundle/tests",
             "Chill\\Utils\\Rector\\Tests\\": "utils/rector/tests"
         }

From 912fdd63499826f2365317f716f74b693bb29511 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 16 Apr 2024 14:41:55 +0200
Subject: [PATCH 008/283] Add phone number search function to
 PersonACLAwareRepository

A new function, findByPhone, has been added to the PersonACLAwareRepository. This function allows searching for people based on their phone numbers. Changes also reflect in the PersonACLAwareRepositoryInterface, and new test cases have been added to the PersonACLAwareRepositoryTest.
---
 .../Repository/PersonACLAwareRepository.php   | 25 +++++++
 .../PersonACLAwareRepositoryInterface.php     | 10 +++
 .../PersonACLAwareRepositoryTest.php          | 66 +++++++++++++++++++
 3 files changed, 101 insertions(+)

diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
index 303773c3e..3eaa1d989 100644
--- a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
@@ -21,6 +21,8 @@ use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\NonUniqueResultException;
 use Doctrine\ORM\Query;
+use libphonenumber\PhoneNumber;
+use libphonenumber\PhoneNumberFormat;
 use Symfony\Component\Security\Core\Security;
 
 final readonly class PersonACLAwareRepository implements PersonACLAwareRepositoryInterface
@@ -298,4 +300,27 @@ final readonly class PersonACLAwareRepository implements PersonACLAwareRepositor
                 \array_map(static fn (Center $c) => $c->getId(), $authorizedCenters)
             );
     }
+
+    public function findByPhone(PhoneNumber $phoneNumber, int $start = 0, int $limit = 20): array
+    {
+        $authorizedCenters = $this->authorizationHelper
+            ->getReachableCenters($this->security->getUser(), PersonVoter::SEE);
+
+        if ([] === $authorizedCenters) {
+            return [];
+        }
+
+        $util = \libphonenumber\PhoneNumberUtil::getInstance();
+
+        return $this->em->createQuery(
+            'SELECT p FROM '.Person::class.' p LEFT JOIN p.otherPhoneNumbers opn JOIN p.centerCurrent pcc '.
+            'WHERE (p.phonenumber LIKE :phone OR p.mobilenumber LIKE :phone OR opn.phonenumber LIKE :phone) '.
+            'AND pcc.center IN (:centers)'
+        )
+            ->setMaxResults($limit)
+            ->setFirstResult($start)
+            ->setParameter('phone', $util->format($phoneNumber, PhoneNumberFormat::E164))
+            ->setParameter('centers', $authorizedCenters)
+            ->getResult();
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepositoryInterface.php b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepositoryInterface.php
index c327ecd40..42e61bf21 100644
--- a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepositoryInterface.php
@@ -13,6 +13,7 @@ namespace Chill\PersonBundle\Repository;
 
 use Chill\MainBundle\Search\SearchApiQuery;
 use Chill\PersonBundle\Entity\Person;
+use libphonenumber\PhoneNumber;
 
 interface PersonACLAwareRepositoryInterface
 {
@@ -60,4 +61,13 @@ interface PersonACLAwareRepositoryInterface
         ?string $phonenumber = null,
         ?string $city = null
     ): array;
+
+    /**
+     * @return list<Person>
+     */
+    public function findByPhone(
+        PhoneNumber $phoneNumber,
+        int $start = 0,
+        int $limit = 20
+    ): array;
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Repository/PersonACLAwareRepositoryTest.php b/src/Bundle/ChillPersonBundle/Tests/Repository/PersonACLAwareRepositoryTest.php
index 94df35d88..667242111 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Repository/PersonACLAwareRepositoryTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Repository/PersonACLAwareRepositoryTest.php
@@ -11,14 +11,17 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Tests\Repository;
 
+use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Repository\CenterRepositoryInterface;
 use Chill\MainBundle\Repository\CountryRepository;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
 use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Entity\PersonPhone;
 use Chill\PersonBundle\Repository\PersonACLAwareRepository;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Doctrine\ORM\EntityManagerInterface;
+use PHPUnit\Framework\Attributes\DataProvider;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
@@ -98,4 +101,67 @@ final class PersonACLAwareRepositoryTest extends KernelTestCase
             $this->assertStringContainsString('diallo', strtolower($person->getFirstName().' '.$person->getLastName()));
         }
     }
+
+    /**
+     * @dataProvider providePersonsWithPhoneNumbers
+     */
+    public function testFindByPhonenumber(\libphonenumber\PhoneNumber $phoneNumber, ?int $expectedId): void
+    {
+        $user = new User();
+
+        $authorizationHelper = $this->prophesize(AuthorizationHelperInterface::class);
+        $authorizationHelper->getReachableCenters(Argument::exact($user), Argument::exact(PersonVoter::SEE))
+            ->willReturn($this->centerRepository->findAll());
+
+        $security = $this->prophesize(Security::class);
+        $security->getUser()->willReturn($user);
+
+        $repository = new PersonACLAwareRepository(
+            $security->reveal(),
+            $this->entityManager,
+            $this->countryRepository,
+            $authorizationHelper->reveal()
+        );
+
+        $actual = $repository->findByPhone($phoneNumber, 0, 10);
+
+        if (null === $expectedId) {
+            self::assertCount(0, $actual);
+        } else {
+            $actualIds = array_map(fn (Person $person) => $person->getId(), $actual);
+
+            self::assertContains($expectedId, $actualIds);
+        }
+    }
+
+    public static function providePersonsWithPhoneNumbers(): iterable
+    {
+        self::bootKernel();
+        $em = self::getContainer()->get(EntityManagerInterface::class);
+        $center = $em->createQuery('SELECT c FROM '.Center::class.' c ')->setMaxResults(1)
+            ->getSingleResult();
+        $util = \libphonenumber\PhoneNumberUtil::getInstance();
+
+        $mobile = $util->parse('+32486123456');
+        $fixed = $util->parse('+3281136917');
+        $anotherMobile = $util->parse('+32486123478');
+        $person = (new Person())->setFirstName('diallo')->setLastName('diallo')->setCenter($center);
+        $person->setMobilenumber($mobile)->setPhonenumber($fixed);
+        $otherPhone = new PersonPhone();
+        $otherPhone->setPerson($person);
+        $otherPhone->setPhonenumber($anotherMobile);
+        $otherPhone->setType('mobile');
+
+        $em->persist($person);
+        $em->persist($otherPhone);
+
+        $em->flush();
+
+        self::ensureKernelShutdown();
+
+        yield [$mobile, $person->getId()];
+        yield [$anotherMobile, $person->getId()];
+        yield [$fixed, $person->getId()];
+        yield [$util->parse('+331234567890'), null];
+    }
 }

From 75fbec5489cb7b97e7975f5b399f1a1307be23e1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 17 Apr 2024 09:56:18 +0200
Subject: [PATCH 009/283] Create entities and doctrine mapping for ticket

---
 composer.json                                 |   2 +-
 .../ChillMainBundle/Entity/UserGroup.php      |  74 ++++++++
 .../migrations/Version20240416145021.php      |  41 +++++
 .../src/Entity/AddresseeHistory.php           |  97 ++++++++++
 .../ChillTicketBundle/src/Entity/Comment.php  |  55 ++++++
 .../src/Entity/InputHistory.php               |  91 ++++++++++
 .../ChillTicketBundle/src/Entity/Motive.php   |  55 ++++++
 .../src/Entity/MotiveHistory.php              |  72 ++++++++
 .../src/Entity/PersonHistory.php              |  80 +++++++++
 .../ChillTicketBundle/src/Entity/Ticket.php   | 166 ++++++++++++++++++
 .../src/migrations/Version20240416145919.php  | 139 +++++++++++++++
 11 files changed, 871 insertions(+), 1 deletion(-)
 create mode 100644 src/Bundle/ChillMainBundle/Entity/UserGroup.php
 create mode 100644 src/Bundle/ChillMainBundle/migrations/Version20240416145021.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Entity/AddresseeHistory.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Entity/Comment.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Entity/InputHistory.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Entity/Motive.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Entity/MotiveHistory.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Entity/PersonHistory.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Entity/Ticket.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/migrations/Version20240416145919.php

diff --git a/composer.json b/composer.json
index 482dcc72f..1dbb8fc27 100644
--- a/composer.json
+++ b/composer.json
@@ -127,7 +127,7 @@
     "autoload-dev": {
         "psr-4": {
             "Chill\\DocGeneratorBundle\\Tests\\": "src/Bundle/ChillDocGeneratorBundle/tests",
-            "Chill\\TicketBundle\\Tests": "src/Bundle/ChillTicketBundle/tests",
+            "Chill\\TicketBundle\\Tests\\": "src/Bundle/ChillTicketBundle/tests",
             "Chill\\WopiBundle\\Tests\\": "src/Bundle/ChillDocGeneratorBundle/tests",
             "Chill\\Utils\\Rector\\Tests\\": "utils/rector/tests"
         }
diff --git a/src/Bundle/ChillMainBundle/Entity/UserGroup.php b/src/Bundle/ChillMainBundle/Entity/UserGroup.php
new file mode 100644
index 000000000..3bd9870a6
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Entity/UserGroup.php
@@ -0,0 +1,74 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Entity;
+
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\ORM\Mapping as ORM;
+
+#[ORM\Entity]
+#[ORM\Table(name: 'chill_main_user_group')]
+class UserGroup
+{
+    #[ORM\Id]
+    #[ORM\GeneratedValue]
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::INTEGER, nullable: false)]
+    private ?int $id = null;
+
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::JSON, nullable: false, options: ['default' => '[]'])]
+    private array $label = [];
+
+    /**
+     * @var \Doctrine\Common\Collections\Collection<int, \Chill\MainBundle\Entity\User>
+     */
+    #[ORM\ManyToMany(targetEntity: User::class)]
+    #[ORM\JoinTable(name: 'chill_main_user_group_user')]
+    private Collection $users;
+
+    public function __construct()
+    {
+        $this->users = new ArrayCollection();
+    }
+
+    public function addUser(User $user): self
+    {
+        if (!$this->users->contains($user)) {
+            $this->users[] = $user;
+        }
+
+        return $this;
+    }
+
+    public function removeUser(User $user): self
+    {
+        if ($this->users->contains($user)) {
+            $this->users->removeElement($user);
+        }
+
+        return $this;
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getLabel(): array
+    {
+        return $this->label;
+    }
+
+    public function getUsers(): Collection
+    {
+        return $this->users;
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20240416145021.php b/src/Bundle/ChillMainBundle/migrations/Version20240416145021.php
new file mode 100644
index 000000000..f2f8d37dd
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/migrations/Version20240416145021.php
@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\Migrations\Main;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20240416145021 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Create tables for user_group';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('CREATE SEQUENCE chill_main_user_group_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+        $this->addSql('CREATE TABLE chill_main_user_group (id INT NOT NULL, label JSON DEFAULT \'[]\' NOT NULL, PRIMARY KEY(id))');
+        $this->addSql('CREATE TABLE chill_main_user_group_user (usergroup_id INT NOT NULL, user_id INT NOT NULL, PRIMARY KEY(usergroup_id, user_id))');
+        $this->addSql('CREATE INDEX IDX_1E07F044D2112630 ON chill_main_user_group_user (usergroup_id)');
+        $this->addSql('CREATE INDEX IDX_1E07F044A76ED395 ON chill_main_user_group_user (user_id)');
+        $this->addSql('ALTER TABLE chill_main_user_group_user ADD CONSTRAINT FK_1E07F044D2112630 FOREIGN KEY (usergroup_id) REFERENCES chill_main_user_group (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_main_user_group_user ADD CONSTRAINT FK_1E07F044A76ED395 FOREIGN KEY (user_id) REFERENCES users (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP SEQUENCE chill_main_user_group_id_seq');
+        $this->addSql('DROP TABLE chill_main_user_group_user');
+        $this->addSql('DROP TABLE chill_main_user_group');
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Entity/AddresseeHistory.php b/src/Bundle/ChillTicketBundle/src/Entity/AddresseeHistory.php
new file mode 100644
index 000000000..3939a24c3
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Entity/AddresseeHistory.php
@@ -0,0 +1,97 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Entity;
+
+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\Entity\UserGroup;
+use Doctrine\ORM\Mapping as ORM;
+
+#[ORM\Entity()]
+#[ORM\Table(name: 'addressee_history', schema: 'chill_ticket')]
+class AddresseeHistory implements TrackUpdateInterface, TrackCreationInterface
+{
+    use TrackCreationTrait;
+    use TrackUpdateTrait;
+
+    #[ORM\Id]
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::INTEGER, nullable: false)]
+    #[ORM\GeneratedValue(strategy: 'AUTO')]
+    private ?int $id = null;
+
+    #[ORM\ManyToOne(targetEntity: User::class)]
+    #[ORM\JoinColumn(nullable: true)]
+    private ?User $addresseeUser = null;
+
+    #[ORM\ManyToOne(targetEntity: UserGroup::class)]
+    #[ORM\JoinColumn(nullable: true)]
+    private ?UserGroup $addresseeGroup = null;
+
+    private ?\DateTimeImmutable $endDate = null;
+
+    public function __construct(
+        User|UserGroup $addressee,
+        #[ORM\Column(type: \Doctrine\DBAL\Types\Types::DATETIME_IMMUTABLE, nullable: false)]
+        private \DateTimeImmutable $startDate,
+        #[ORM\ManyToOne(targetEntity: Ticket::class)]
+        #[ORM\JoinColumn(nullable: false)]
+        private Ticket $ticket,
+    ) {
+        if ($addressee instanceof User) {
+            $this->addresseeUser = $addressee;
+        } else {
+            $this->addresseeGroup = $addressee;
+        }
+    }
+
+    public function getAddressee(): UserGroup|User
+    {
+        if (null !== $this->addresseeGroup) {
+            return $this->addresseeGroup;
+        }
+
+        return $this->addresseeUser;
+    }
+
+    public function getAddresseeGroup(): ?UserGroup
+    {
+        return $this->addresseeGroup;
+    }
+
+    public function getAddresseeUser(): ?User
+    {
+        return $this->addresseeUser;
+    }
+
+    public function getEndDate(): ?\DateTimeImmutable
+    {
+        return $this->endDate;
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getStartDate(): \DateTimeImmutable
+    {
+        return $this->startDate;
+    }
+
+    public function getTicket(): Ticket
+    {
+        return $this->ticket;
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Entity/Comment.php b/src/Bundle/ChillTicketBundle/src/Entity/Comment.php
new file mode 100644
index 000000000..d62e6d8b4
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Entity/Comment.php
@@ -0,0 +1,55 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Entity;
+
+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;
+use Doctrine\ORM\Mapping\JoinColumn;
+
+#[ORM\Entity()]
+#[ORM\Table(name: 'comment', schema: 'chill_ticket')]
+class Comment implements TrackCreationInterface, TrackUpdateInterface
+{
+    use TrackCreationTrait;
+    use TrackUpdateTrait;
+
+    #[ORM\Id]
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::INTEGER, nullable: false)]
+    #[ORM\GeneratedValue(strategy: 'AUTO')]
+    private ?int $id = null;
+
+    public function __construct(
+        #[ORM\ManyToOne(targetEntity: Ticket::class, inversedBy: 'comments')]
+        #[JoinColumn(nullable: false)]
+        private Ticket $ticket,
+        #[ORM\Column(type: \Doctrine\DBAL\Types\Types::TEXT, nullable: false, options: ['default' => ''])]
+        private string $content = ''
+    ) {}
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getContent(): string
+    {
+        return $this->content;
+    }
+
+    public function getTicket(): Ticket
+    {
+        return $this->ticket;
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Entity/InputHistory.php b/src/Bundle/ChillTicketBundle/src/Entity/InputHistory.php
new file mode 100644
index 000000000..2b25ae6ac
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Entity/InputHistory.php
@@ -0,0 +1,91 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Entity;
+
+use Chill\MainBundle\Entity\User;
+use Chill\PersonBundle\Entity\Person;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Doctrine\ORM\Mapping as ORM;
+
+#[ORM\Entity()]
+#[ORM\Table(name: 'input_history', schema: 'chill_ticket')]
+class InputHistory
+{
+    #[ORM\Id]
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::INTEGER, nullable: false)]
+    #[ORM\GeneratedValue(strategy: 'AUTO')]
+    private ?int $id = null;
+
+    #[ORM\ManyToOne(targetEntity: Person::class)]
+    #[ORM\JoinColumn(nullable: true)]
+    private ?Person $person = null;
+
+    #[ORM\ManyToOne(targetEntity: ThirdParty::class)]
+    #[ORM\JoinColumn(nullable: true)]
+    private ?ThirdParty $thirdParty = null;
+
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::DATETIME_IMMUTABLE, nullable: true, options: ['default' => null])]
+    private ?\DateTimeImmutable $endDate = null;
+
+    #[ORM\ManyToOne(targetEntity: User::class)]
+    #[ORM\JoinColumn(nullable: true)]
+    private ?User $removedBy = null;
+
+    public function __construct(
+        Person|ThirdParty $input,
+        #[ORM\ManyToOne(targetEntity: Ticket::class)]
+        #[ORM\JoinColumn(nullable: false)]
+        private Ticket $ticket,
+        #[ORM\Column(type: \Doctrine\DBAL\Types\Types::DATETIME_IMMUTABLE, nullable: false)]
+        private \DateTimeImmutable $startDate,
+    ) {
+        if ($input instanceof Person) {
+            $this->person = $input;
+        } else {
+            $this->thirdParty = $input;
+        }
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getEndDate(): ?\DateTimeImmutable
+    {
+        return $this->endDate;
+    }
+
+    public function getRemovedBy(): ?User
+    {
+        return $this->removedBy;
+    }
+
+    public function getStartDate(): \DateTimeImmutable
+    {
+        return $this->startDate;
+    }
+
+    public function getTicket(): Ticket
+    {
+        return $this->ticket;
+    }
+
+    public function getInput(): Person|ThirdParty
+    {
+        if (null !== $this->person) {
+            return $this->person;
+        }
+
+        return $this->thirdParty;
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Entity/Motive.php b/src/Bundle/ChillTicketBundle/src/Entity/Motive.php
new file mode 100644
index 000000000..fd744392c
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Entity/Motive.php
@@ -0,0 +1,55 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Entity;
+
+use Doctrine\ORM\Mapping as ORM;
+
+#[ORM\Entity()]
+#[ORM\Table(name: 'motive', schema: 'chill_ticket')]
+class Motive
+{
+    #[ORM\Id]
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::INTEGER, nullable: false)]
+    #[ORM\GeneratedValue(strategy: 'AUTO')]
+    private ?int $id = null;
+
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::JSON, nullable: false, options: ['default' => '[]'])]
+    private array $label = [];
+
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::BOOLEAN, nullable: false, options: ['default' => true])]
+    private bool $active = true;
+
+    public function isActive(): bool
+    {
+        return $this->active;
+    }
+
+    public function setActive(bool $active): void
+    {
+        $this->active = $active;
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getLabel(): array
+    {
+        return $this->label;
+    }
+
+    public function setLabel(array $label): void
+    {
+        $this->label = $label;
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Entity/MotiveHistory.php b/src/Bundle/ChillTicketBundle/src/Entity/MotiveHistory.php
new file mode 100644
index 000000000..c96c2d6f4
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Entity/MotiveHistory.php
@@ -0,0 +1,72 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Entity;
+
+use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
+use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
+use Doctrine\ORM\Mapping as ORM;
+
+#[ORM\Entity]
+#[ORM\Table(name: 'motives_history', schema: 'chill_ticket')]
+class MotiveHistory implements TrackCreationInterface
+{
+    use TrackCreationTrait;
+
+    #[ORM\Id]
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::INTEGER, nullable: false)]
+    #[ORM\GeneratedValue(strategy: 'AUTO')]
+    private ?int $id = null;
+
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::DATETIME_IMMUTABLE, nullable: true, options: ['default' => null])]
+    private ?\DateTimeImmutable $endDate = null;
+
+    public function __construct(
+        #[ORM\ManyToOne(targetEntity: Motive::class)]
+        #[ORM\JoinColumn(nullable: false)]
+        private Motive $motive,
+        #[ORM\ManyToOne(targetEntity: Ticket::class)]
+        #[ORM\JoinColumn(nullable: false)]
+        private Ticket $ticket,
+        #[ORM\Column(type: \Doctrine\DBAL\Types\Types::DATETIME_IMMUTABLE, nullable: false)]
+        private \DateTimeImmutable $startDate = new \DateTimeImmutable('now')
+    ) {}
+
+    public function getEndDate(): ?\DateTimeImmutable
+    {
+        return $this->endDate;
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getMotive(): Motive
+    {
+        return $this->motive;
+    }
+
+    public function getStartDate(): \DateTimeImmutable
+    {
+        return $this->startDate;
+    }
+
+    public function getTicket(): Ticket
+    {
+        return $this->ticket;
+    }
+
+    public function setEndDate(?\DateTimeImmutable $endDate): void
+    {
+        $this->endDate = $endDate;
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Entity/PersonHistory.php b/src/Bundle/ChillTicketBundle/src/Entity/PersonHistory.php
new file mode 100644
index 000000000..9914f96a1
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Entity/PersonHistory.php
@@ -0,0 +1,80 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Entity;
+
+use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
+use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
+use Chill\MainBundle\Entity\User;
+use Chill\PersonBundle\Entity\Person;
+use Doctrine\ORM\Mapping as ORM;
+
+#[ORM\Entity]
+#[ORM\Table(name: 'person_history', schema: 'chill_ticket')]
+class PersonHistory implements TrackCreationInterface
+{
+    use TrackCreationTrait;
+
+    #[ORM\Id]
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::INTEGER, nullable: false)]
+    #[ORM\GeneratedValue(strategy: 'AUTO')]
+    private ?int $id = null;
+
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::DATETIME_IMMUTABLE, nullable: true, options: ['default' => null])]
+    private ?\DateTimeImmutable $endDate = null;
+
+    #[ORM\ManyToOne(targetEntity: User::class)]
+    #[ORM\JoinColumn(nullable: true)]
+    private ?User $removedBy = null;
+
+    public function __construct(
+        #[ORM\ManyToOne(targetEntity: Person::class, fetch: 'EAGER')]
+        private Person $person,
+        #[ORM\ManyToOne(targetEntity: Ticket::class)]
+        #[ORM\JoinColumn(nullable: false)]
+        private Ticket $ticket,
+        #[ORM\Column(type: \Doctrine\DBAL\Types\Types::DATETIME_IMMUTABLE, nullable: false)]
+        private \DateTimeImmutable $startDate,
+    ) {
+        // keep ticket instance in sync with this
+        $this->ticket->addPersonHistory($this);
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getPerson(): Person
+    {
+        return $this->person;
+    }
+
+    public function getEndDate(): ?\DateTimeImmutable
+    {
+        return $this->endDate;
+    }
+
+    public function getTicket(): Ticket
+    {
+        return $this->ticket;
+    }
+
+    public function getStartDate(): \DateTimeImmutable
+    {
+        return $this->startDate;
+    }
+
+    public function getRemovedBy(): ?User
+    {
+        return $this->removedBy;
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php b/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php
new file mode 100644
index 000000000..f74a55a3f
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php
@@ -0,0 +1,166 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Entity;
+
+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\Entity\UserGroup;
+use Chill\PersonBundle\Entity\Person;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\Common\Collections\ReadableCollection;
+use Doctrine\ORM\Mapping as ORM;
+
+#[ORM\Entity]
+#[ORM\Table(name: 'ticket', schema: 'chill_ticket')]
+class Ticket implements TrackCreationInterface, TrackUpdateInterface
+{
+    use TrackCreationTrait;
+    use TrackUpdateTrait;
+
+    #[ORM\Id]
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::INTEGER, nullable: false)]
+    #[ORM\GeneratedValue(strategy: 'AUTO')]
+    private ?int $id = null;
+
+    /**
+     * @var Collection<int, AddresseeHistory>
+     */
+    #[ORM\OneToMany(targetEntity: AddresseeHistory::class, mappedBy: 'ticket')]
+    private Collection $addresseeHistory;
+
+    /**
+     * @var Collection<int, Comment>
+     */
+    #[ORM\OneToMany(targetEntity: Comment::class, mappedBy: 'ticket')]
+    private Collection $comments;
+
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::TEXT, nullable: false, options: ['default' => ''])]
+    private string $externalRef = '';
+
+    /**
+     * @var Collection<int, InputHistory>
+     */
+    #[ORM\OneToMany(targetEntity: InputHistory::class, mappedBy: 'ticket')]
+    private Collection $inputHistories;
+
+    /**
+     * @var Collection<int, MotiveHistory>
+     */
+    #[ORM\OneToMany(targetEntity: MotiveHistory::class, mappedBy: 'ticket')]
+    private Collection $motiveHistories;
+
+    /**
+     * @var Collection<int, PersonHistory>
+     */
+    #[ORM\OneToMany(targetEntity: PersonHistory::class, mappedBy: 'ticket')]
+    private Collection $personHistories;
+
+    public function __construct()
+    {
+        $this->addresseeHistory = new ArrayCollection();
+        $this->comments = new ArrayCollection();
+        $this->motiveHistories = new ArrayCollection();
+        $this->personHistories = new ArrayCollection();
+        $this->inputHistories = new ArrayCollection();
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getExternalRef(): string
+    {
+        return $this->externalRef;
+    }
+
+    public function setExternalRef(string $externalRef): void
+    {
+        $this->externalRef = $externalRef;
+    }
+
+    /**
+     * @return list<Person>
+     */
+    public function getPersons(): array
+    {
+        return $this->personHistories
+            ->filter(fn (PersonHistory $personHistory) => null === $personHistory->getEndDate())
+            ->map(fn (PersonHistory $personHistory) => $personHistory->getPerson())
+            ->getValues();
+    }
+
+    /**
+     * Add a PersonHistory.
+     *
+     * This method should not be used, use @see{PersonHistory::__construct()} insted.
+     */
+    public function addPersonHistory(PersonHistory $personHistory): void
+    {
+        $this->personHistories->add($personHistory);
+    }
+
+    /**
+     * @return list<UserGroup|User>
+     */
+    public function getCurrentAddressee(): array
+    {
+        $addresses = [];
+
+        foreach ($this->addresseeHistory
+            ->filter(fn (AddresseeHistory $addresseeHistory) => null === $addresseeHistory->getEndDate()) as $addressHistory) {
+            $addresses[] = $addressHistory->getAddressee();
+        }
+
+        return $addresses;
+    }
+
+    /**
+     * @return ReadableCollection<int, Comment>
+     */
+    public function getComments(): ReadableCollection
+    {
+        return $this->comments;
+    }
+
+    /**
+     * @return list<ThirdParty|Person>
+     */
+    public function getCurrentInputs(): array
+    {
+        $inputs = [];
+
+        foreach ($this->inputHistories
+            ->filter(fn (InputHistory $inputHistory) => null === $inputHistory->getEndDate()) as $inputHistory
+        ) {
+            $inputs[] = $inputHistory->getInput();
+        }
+
+        return $inputs;
+    }
+
+    public function getMotive(): ?Motive
+    {
+        foreach ($this->motiveHistories as $motiveHistory) {
+            if (null === $motiveHistory->getEndDate()) {
+                return $motiveHistory->getMotive();
+            }
+        }
+
+        return null;
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/migrations/Version20240416145919.php b/src/Bundle/ChillTicketBundle/src/migrations/Version20240416145919.php
new file mode 100644
index 000000000..f627a4143
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/migrations/Version20240416145919.php
@@ -0,0 +1,139 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\Migrations\Ticket;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20240416145919 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Create schema and tables for chill ticket';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('CREATE SCHEMA chill_ticket');
+        $this->addSql('CREATE SEQUENCE chill_ticket.addressee_history_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+        $this->addSql('CREATE SEQUENCE chill_ticket.comment_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+        $this->addSql('CREATE SEQUENCE chill_ticket.input_history_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+        $this->addSql('CREATE SEQUENCE chill_ticket.motive_id_seq INCREMENT BY 1 MINVALUE 1 START 1000');
+        $this->addSql('CREATE SEQUENCE chill_ticket.motives_history_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+        $this->addSql('CREATE SEQUENCE chill_ticket.person_history_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+        $this->addSql('CREATE SEQUENCE chill_ticket.ticket_id_seq INCREMENT BY 1 MINVALUE 1 START 1');
+        $this->addSql('CREATE TABLE chill_ticket.addressee_history (id INT NOT NULL, ticket_id INT NOT NULL, startDate TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, createdAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, updatedAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, addresseeUser_id INT DEFAULT NULL, addresseeGroup_id INT DEFAULT NULL, createdBy_id INT DEFAULT NULL, updatedBy_id INT DEFAULT NULL, PRIMARY KEY(id))');
+        $this->addSql('CREATE INDEX IDX_434EBDBD4D06F00C ON chill_ticket.addressee_history (addresseeUser_id)');
+        $this->addSql('CREATE INDEX IDX_434EBDBD776D9A84 ON chill_ticket.addressee_history (addresseeGroup_id)');
+        $this->addSql('CREATE INDEX IDX_434EBDBD700047D2 ON chill_ticket.addressee_history (ticket_id)');
+        $this->addSql('CREATE INDEX IDX_434EBDBD3174800F ON chill_ticket.addressee_history (createdBy_id)');
+        $this->addSql('CREATE INDEX IDX_434EBDBD65FF1AEC ON chill_ticket.addressee_history (updatedBy_id)');
+        $this->addSql('COMMENT ON COLUMN chill_ticket.addressee_history.startDate IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN chill_ticket.addressee_history.createdAt IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN chill_ticket.addressee_history.updatedAt IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('CREATE TABLE chill_ticket.comment (id INT NOT NULL, ticket_id INT NOT NULL, content TEXT DEFAULT \'\' NOT NULL, createdAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, updatedAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, createdBy_id INT DEFAULT NULL, updatedBy_id INT DEFAULT NULL, PRIMARY KEY(id))');
+        $this->addSql('CREATE INDEX IDX_79EBD416700047D2 ON chill_ticket.comment (ticket_id)');
+        $this->addSql('CREATE INDEX IDX_79EBD4163174800F ON chill_ticket.comment (createdBy_id)');
+        $this->addSql('CREATE INDEX IDX_79EBD41665FF1AEC ON chill_ticket.comment (updatedBy_id)');
+        $this->addSql('COMMENT ON COLUMN chill_ticket.comment.createdAt IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN chill_ticket.comment.updatedAt IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('CREATE TABLE chill_ticket.input_history (id INT NOT NULL, person_id INT DEFAULT NULL, ticket_id INT NOT NULL, endDate TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, startDate TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, thirdParty_id INT DEFAULT NULL, removedBy_id INT DEFAULT NULL, PRIMARY KEY(id))');
+        $this->addSql('CREATE INDEX IDX_E2AA301F217BBB47 ON chill_ticket.input_history (person_id)');
+        $this->addSql('CREATE INDEX IDX_E2AA301F3EA5CAB0 ON chill_ticket.input_history (thirdParty_id)');
+        $this->addSql('CREATE INDEX IDX_E2AA301FB8346CCF ON chill_ticket.input_history (removedBy_id)');
+        $this->addSql('CREATE INDEX IDX_E2AA301F700047D2 ON chill_ticket.input_history (ticket_id)');
+        $this->addSql('COMMENT ON COLUMN chill_ticket.input_history.endDate IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN chill_ticket.input_history.startDate IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('CREATE TABLE chill_ticket.motive (id INT NOT NULL, label JSON DEFAULT \'[]\' NOT NULL, active BOOLEAN DEFAULT true NOT NULL, PRIMARY KEY(id))');
+        $this->addSql('CREATE TABLE chill_ticket.motives_history (id INT NOT NULL, motive_id INT NOT NULL, ticket_id INT NOT NULL, endDate TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, startDate TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, createdAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, createdBy_id INT DEFAULT NULL, PRIMARY KEY(id))');
+        $this->addSql('CREATE INDEX IDX_48995CFF9658649C ON chill_ticket.motives_history (motive_id)');
+        $this->addSql('CREATE INDEX IDX_48995CFF700047D2 ON chill_ticket.motives_history (ticket_id)');
+        $this->addSql('CREATE INDEX IDX_48995CFF3174800F ON chill_ticket.motives_history (createdBy_id)');
+        $this->addSql('COMMENT ON COLUMN chill_ticket.motives_history.endDate IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN chill_ticket.motives_history.startDate IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN chill_ticket.motives_history.createdAt IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('CREATE TABLE chill_ticket.person_history (id INT NOT NULL, person_id INT DEFAULT NULL, ticket_id INT NOT NULL, endDate TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, startDate TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, createdAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, removedBy_id INT DEFAULT NULL, createdBy_id INT DEFAULT NULL, PRIMARY KEY(id))');
+        $this->addSql('CREATE INDEX IDX_F2969246B8346CCF ON chill_ticket.person_history (removedBy_id)');
+        $this->addSql('CREATE INDEX IDX_F2969246217BBB47 ON chill_ticket.person_history (person_id)');
+        $this->addSql('CREATE INDEX IDX_F2969246700047D2 ON chill_ticket.person_history (ticket_id)');
+        $this->addSql('CREATE INDEX IDX_F29692463174800F ON chill_ticket.person_history (createdBy_id)');
+        $this->addSql('COMMENT ON COLUMN chill_ticket.person_history.endDate IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN chill_ticket.person_history.startDate IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN chill_ticket.person_history.createdAt IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('CREATE TABLE chill_ticket.ticket (id INT NOT NULL, externalRef TEXT DEFAULT \'\' NOT NULL, createdAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, updatedAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, createdBy_id INT DEFAULT NULL, updatedBy_id INT DEFAULT NULL, PRIMARY KEY(id))');
+        $this->addSql('CREATE INDEX IDX_B0A5F7233174800F ON chill_ticket.ticket (createdBy_id)');
+        $this->addSql('CREATE INDEX IDX_B0A5F72365FF1AEC ON chill_ticket.ticket (updatedBy_id)');
+        $this->addSql('COMMENT ON COLUMN chill_ticket.ticket.createdAt IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('COMMENT ON COLUMN chill_ticket.ticket.updatedAt IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('ALTER TABLE chill_ticket.addressee_history ADD CONSTRAINT FK_434EBDBD4D06F00C FOREIGN KEY (addresseeUser_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_ticket.addressee_history ADD CONSTRAINT FK_434EBDBD776D9A84 FOREIGN KEY (addresseeGroup_id) REFERENCES chill_main_user_group (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_ticket.addressee_history ADD CONSTRAINT FK_434EBDBD700047D2 FOREIGN KEY (ticket_id) REFERENCES chill_ticket.ticket (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_ticket.addressee_history ADD CONSTRAINT FK_434EBDBD3174800F FOREIGN KEY (createdBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_ticket.addressee_history ADD CONSTRAINT FK_434EBDBD65FF1AEC FOREIGN KEY (updatedBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_ticket.comment ADD CONSTRAINT FK_79EBD416700047D2 FOREIGN KEY (ticket_id) REFERENCES chill_ticket.ticket (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_ticket.comment ADD CONSTRAINT FK_79EBD4163174800F FOREIGN KEY (createdBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_ticket.comment ADD CONSTRAINT FK_79EBD41665FF1AEC FOREIGN KEY (updatedBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_ticket.input_history ADD CONSTRAINT FK_E2AA301F217BBB47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_ticket.input_history ADD CONSTRAINT FK_E2AA301F3EA5CAB0 FOREIGN KEY (thirdParty_id) REFERENCES chill_3party.third_party (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_ticket.input_history ADD CONSTRAINT FK_E2AA301FB8346CCF FOREIGN KEY (removedBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_ticket.input_history ADD CONSTRAINT FK_E2AA301F700047D2 FOREIGN KEY (ticket_id) REFERENCES chill_ticket.ticket (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_ticket.motives_history ADD CONSTRAINT FK_48995CFF9658649C FOREIGN KEY (motive_id) REFERENCES chill_ticket.motive (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_ticket.motives_history ADD CONSTRAINT FK_48995CFF700047D2 FOREIGN KEY (ticket_id) REFERENCES chill_ticket.ticket (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_ticket.motives_history ADD CONSTRAINT FK_48995CFF3174800F FOREIGN KEY (createdBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_ticket.person_history ADD CONSTRAINT FK_F2969246B8346CCF FOREIGN KEY (removedBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_ticket.person_history ADD CONSTRAINT FK_F2969246217BBB47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_ticket.person_history ADD CONSTRAINT FK_F2969246700047D2 FOREIGN KEY (ticket_id) REFERENCES chill_ticket.ticket (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_ticket.person_history ADD CONSTRAINT FK_F29692463174800F FOREIGN KEY (createdBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_ticket.ticket ADD CONSTRAINT FK_B0A5F7233174800F FOREIGN KEY (createdBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('ALTER TABLE chill_ticket.ticket ADD CONSTRAINT FK_B0A5F72365FF1AEC FOREIGN KEY (updatedBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP SEQUENCE chill_ticket.addressee_history_id_seq CASCADE');
+        $this->addSql('DROP SEQUENCE chill_ticket.comment_id_seq CASCADE');
+        $this->addSql('DROP SEQUENCE chill_ticket.input_history_id_seq CASCADE');
+        $this->addSql('DROP SEQUENCE chill_ticket.motive_id_seq CASCADE');
+        $this->addSql('DROP SEQUENCE chill_ticket.motives_history_id_seq CASCADE');
+        $this->addSql('DROP SEQUENCE chill_ticket.person_history_id_seq CASCADE');
+        $this->addSql('DROP SEQUENCE chill_ticket.ticket_id_seq CASCADE');
+        $this->addSql('ALTER TABLE chill_ticket.addressee_history DROP CONSTRAINT FK_434EBDBD4D06F00C');
+        $this->addSql('ALTER TABLE chill_ticket.addressee_history DROP CONSTRAINT FK_434EBDBD776D9A84');
+        $this->addSql('ALTER TABLE chill_ticket.addressee_history DROP CONSTRAINT FK_434EBDBD700047D2');
+        $this->addSql('ALTER TABLE chill_ticket.addressee_history DROP CONSTRAINT FK_434EBDBD3174800F');
+        $this->addSql('ALTER TABLE chill_ticket.addressee_history DROP CONSTRAINT FK_434EBDBD65FF1AEC');
+        $this->addSql('ALTER TABLE chill_ticket.comment DROP CONSTRAINT FK_79EBD416700047D2');
+        $this->addSql('ALTER TABLE chill_ticket.comment DROP CONSTRAINT FK_79EBD4163174800F');
+        $this->addSql('ALTER TABLE chill_ticket.comment DROP CONSTRAINT FK_79EBD41665FF1AEC');
+        $this->addSql('ALTER TABLE chill_ticket.input_history DROP CONSTRAINT FK_E2AA301F217BBB47');
+        $this->addSql('ALTER TABLE chill_ticket.input_history DROP CONSTRAINT FK_E2AA301F3EA5CAB0');
+        $this->addSql('ALTER TABLE chill_ticket.input_history DROP CONSTRAINT FK_E2AA301FB8346CCF');
+        $this->addSql('ALTER TABLE chill_ticket.input_history DROP CONSTRAINT FK_E2AA301F700047D2');
+        $this->addSql('ALTER TABLE chill_ticket.motives_history DROP CONSTRAINT FK_48995CFF9658649C');
+        $this->addSql('ALTER TABLE chill_ticket.motives_history DROP CONSTRAINT FK_48995CFF700047D2');
+        $this->addSql('ALTER TABLE chill_ticket.motives_history DROP CONSTRAINT FK_48995CFF3174800F');
+        $this->addSql('ALTER TABLE chill_ticket.person_history DROP CONSTRAINT FK_F2969246B8346CCF');
+        $this->addSql('ALTER TABLE chill_ticket.person_history DROP CONSTRAINT FK_F2969246217BBB47');
+        $this->addSql('ALTER TABLE chill_ticket.person_history DROP CONSTRAINT FK_F2969246700047D2');
+        $this->addSql('ALTER TABLE chill_ticket.person_history DROP CONSTRAINT FK_F29692463174800F');
+        $this->addSql('ALTER TABLE chill_ticket.ticket DROP CONSTRAINT FK_B0A5F7233174800F');
+        $this->addSql('ALTER TABLE chill_ticket.ticket DROP CONSTRAINT FK_B0A5F72365FF1AEC');
+        $this->addSql('DROP TABLE chill_ticket.addressee_history');
+        $this->addSql('DROP TABLE chill_ticket.comment');
+        $this->addSql('DROP TABLE chill_ticket.input_history');
+        $this->addSql('DROP TABLE chill_ticket.motive');
+        $this->addSql('DROP TABLE chill_ticket.motives_history');
+        $this->addSql('DROP TABLE chill_ticket.person_history');
+        $this->addSql('DROP TABLE chill_ticket.ticket');
+        $this->addSql('DROP SCHEMA chill_ticket CASCADE');
+    }
+}

From 4b30d922820bd47739c461f9514478440d948e75 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 17 Apr 2024 09:56:41 +0200
Subject: [PATCH 010/283] Add ticket creation and associating by phone number
 functionality

This update introduces new features allowing the creation of tickets and associating them with a phone number. Specifically, relevant commands and their handlers have been created along with corresponding tests. An endpoint for ticket creation has also been set up, and the ViewTicketController has been renamed and refactored to EditTicketController to better reflect its function.
---
 .../Ticket/AssociateByPhonenumberCommand.php  | 19 ++++++
 .../Command/Ticket/CreateTicketCommand.php    | 19 ++++++
 .../AssociateByPhonenumberCommandHandler.php  | 41 ++++++++++++
 .../Handler/CreateTicketCommandHandler.php    | 26 ++++++++
 .../src/Controller/CreateTicketController.php | 60 ++++++++++++++++++
 ...ontroller.php => EditTicketController.php} | 10 +--
 .../src/config/services.yaml                  |  3 +-
 ...sociateByPhonenumberCommandHandlerTest.php | 62 +++++++++++++++++++
 .../CreateTicketCommandHandlerTest.php        | 48 ++++++++++++++
 9 files changed, 283 insertions(+), 5 deletions(-)
 create mode 100644 src/Bundle/ChillTicketBundle/src/Command/Ticket/AssociateByPhonenumberCommand.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Command/Ticket/CreateTicketCommand.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Command/Ticket/Handler/AssociateByPhonenumberCommandHandler.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Command/Ticket/Handler/CreateTicketCommandHandler.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Controller/CreateTicketController.php
 rename src/Bundle/ChillTicketBundle/src/Controller/{ViewTicketController.php => EditTicketController.php} (64%)
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Command/Ticket/Handler/AssociateByPhonenumberCommandHandlerTest.php
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Command/Ticket/Handler/CreateTicketCommandHandlerTest.php

diff --git a/src/Bundle/ChillTicketBundle/src/Command/Ticket/AssociateByPhonenumberCommand.php b/src/Bundle/ChillTicketBundle/src/Command/Ticket/AssociateByPhonenumberCommand.php
new file mode 100644
index 000000000..61e652190
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Command/Ticket/AssociateByPhonenumberCommand.php
@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Command\Ticket;
+
+class AssociateByPhonenumberCommand
+{
+    public function __construct(
+        public string $phonenumber,
+    ) {}
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Command/Ticket/CreateTicketCommand.php b/src/Bundle/ChillTicketBundle/src/Command/Ticket/CreateTicketCommand.php
new file mode 100644
index 000000000..2f9b929ed
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Command/Ticket/CreateTicketCommand.php
@@ -0,0 +1,19 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Command\Ticket;
+
+final readonly class CreateTicketCommand
+{
+    public function __construct(
+        public string $externalReference = '',
+    ) {}
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Command/Ticket/Handler/AssociateByPhonenumberCommandHandler.php b/src/Bundle/ChillTicketBundle/src/Command/Ticket/Handler/AssociateByPhonenumberCommandHandler.php
new file mode 100644
index 000000000..d4a36d22b
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Command/Ticket/Handler/AssociateByPhonenumberCommandHandler.php
@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Command\Ticket\Handler;
+
+use Chill\PersonBundle\Repository\PersonACLAwareRepositoryInterface;
+use Chill\TicketBundle\Command\Ticket\AssociateByPhonenumberCommand;
+use Chill\TicketBundle\Entity\PersonHistory;
+use Chill\TicketBundle\Entity\Ticket;
+use Doctrine\ORM\EntityManagerInterface;
+use libphonenumber\PhoneNumberUtil;
+use Symfony\Component\Clock\ClockInterface;
+
+class AssociateByPhonenumberCommandHandler
+{
+    public function __construct(
+        private PersonACLAwareRepositoryInterface $personRepository,
+        private PhoneNumberUtil $phoneNumberUtil,
+        private ClockInterface $clock,
+        private EntityManagerInterface $entityManager,
+    ) {}
+
+    public function __invoke(Ticket $ticket, AssociateByPhonenumberCommand $command): void
+    {
+        $phone = $this->phoneNumberUtil->parse($command->phonenumber);
+        $persons = $this->personRepository->findByPhone($phone);
+
+        foreach ($persons as $person) {
+            $history = new PersonHistory($person, $ticket, $this->clock->now());
+            $this->entityManager->persist($history);
+        }
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Command/Ticket/Handler/CreateTicketCommandHandler.php b/src/Bundle/ChillTicketBundle/src/Command/Ticket/Handler/CreateTicketCommandHandler.php
new file mode 100644
index 000000000..a62c0418e
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Command/Ticket/Handler/CreateTicketCommandHandler.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Command\Ticket\Handler;
+
+use Chill\TicketBundle\Command\Ticket\CreateTicketCommand;
+use Chill\TicketBundle\Entity\Ticket;
+
+class CreateTicketCommandHandler
+{
+    public function __invoke(CreateTicketCommand $command): Ticket
+    {
+        $ticket = new Ticket();
+        $ticket->setExternalRef($command->externalReference);
+
+        return $ticket;
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Controller/CreateTicketController.php b/src/Bundle/ChillTicketBundle/src/Controller/CreateTicketController.php
new file mode 100644
index 000000000..ec2ea7b90
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Controller/CreateTicketController.php
@@ -0,0 +1,60 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Controller;
+
+use Chill\TicketBundle\Command\Ticket\AssociateByPhonenumberCommand;
+use Chill\TicketBundle\Command\Ticket\Handler\AssociateByPhonenumberCommandHandler;
+use Chill\TicketBundle\Command\Ticket\CreateTicketCommand;
+use Chill\TicketBundle\Command\Ticket\Handler\CreateTicketCommandHandler;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use Symfony\Component\Security\Core\Security;
+
+final readonly class CreateTicketController
+{
+    public function __construct(
+        private CreateTicketCommandHandler $createTicketCommandHandler,
+        private AssociateByPhonenumberCommandHandler $associateByPhonenumberCommandHandler,
+        private Security $security,
+        private UrlGeneratorInterface $urlGenerator,
+        private EntityManagerInterface $entityManager
+    ) {}
+
+    #[Route('{_locale}/ticket/ticket/create')]
+    public function __invoke(Request $request): Response
+    {
+        if (!$this->security->isGranted('ROLE_USER')) {
+            throw new AccessDeniedHttpException('Only users are allowed to create tickets.');
+        }
+
+        $createCommand = new CreateTicketCommand($request->query->get('extId', ''));
+        $ticket = $this->createTicketCommandHandler->__invoke($createCommand);
+
+        $this->entityManager->persist($ticket);
+
+        if ($request->query->has('caller')) {
+            $associateByPhonenumberCommand = new AssociateByPhonenumberCommand($request->query->get('caller'));
+            $this->associateByPhonenumberCommandHandler->__invoke($ticket, $associateByPhonenumberCommand);
+        }
+
+        $this->entityManager->flush();
+
+        return new RedirectResponse(
+            $this->urlGenerator->generate('chill_ticket_ticket_edit', ['id' => $ticket->getId()])
+        );
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Controller/ViewTicketController.php b/src/Bundle/ChillTicketBundle/src/Controller/EditTicketController.php
similarity index 64%
rename from src/Bundle/ChillTicketBundle/src/Controller/ViewTicketController.php
rename to src/Bundle/ChillTicketBundle/src/Controller/EditTicketController.php
index 9b35c0d48..a51c3a4a8 100644
--- a/src/Bundle/ChillTicketBundle/src/Controller/ViewTicketController.php
+++ b/src/Bundle/ChillTicketBundle/src/Controller/EditTicketController.php
@@ -11,14 +11,16 @@ declare(strict_types=1);
 
 namespace Chill\TicketBundle\Controller;
 
+use Chill\TicketBundle\Entity\Ticket;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 
-class ViewTicketController
+class EditTicketController
 {
-    #[Route('/{_locale}/ticket/ticket/{ticketId}', name: 'chill_ticket_ticket_view')]
-    public function __invoke(int $ticketId): Response
-    {
+    #[Route('/{_locale}/ticket/ticket/{id}/edit', name: 'chill_ticket_ticket_edit')]
+    public function __invoke(
+        Ticket $ticket
+    ): Response {
         return new Response('ok');
     }
 }
diff --git a/src/Bundle/ChillTicketBundle/src/config/services.yaml b/src/Bundle/ChillTicketBundle/src/config/services.yaml
index 6d2f9e1bf..372baa81f 100644
--- a/src/Bundle/ChillTicketBundle/src/config/services.yaml
+++ b/src/Bundle/ChillTicketBundle/src/config/services.yaml
@@ -8,5 +8,6 @@ services:
         tags:
             - controller.service_arguments
 
-
+    Chill\TicketBundle\Command\Ticket\Handler\:
+        resource: '../Command/Ticket/Handler/'
 
diff --git a/src/Bundle/ChillTicketBundle/tests/Command/Ticket/Handler/AssociateByPhonenumberCommandHandlerTest.php b/src/Bundle/ChillTicketBundle/tests/Command/Ticket/Handler/AssociateByPhonenumberCommandHandlerTest.php
new file mode 100644
index 000000000..ab0744015
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Command/Ticket/Handler/AssociateByPhonenumberCommandHandlerTest.php
@@ -0,0 +1,62 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Tests\Command\Ticket\Handler;
+
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Repository\PersonACLAwareRepositoryInterface;
+use Chill\TicketBundle\Command\Ticket\AssociateByPhonenumberCommand;
+use Chill\TicketBundle\Command\Ticket\Handler\AssociateByPhonenumberCommandHandler;
+use Chill\TicketBundle\Entity\Ticket;
+use Doctrine\Persistence\ObjectManager;
+use libphonenumber\PhoneNumberUtil;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Component\Clock\MockClock;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class AssociateByPhonenumberCommandHandlerTest extends TestCase
+{
+    use ProphecyTrait;
+
+    private function getHandler(
+        PersonACLAwareRepositoryInterface $personACLAwareRepository,
+    ): AssociateByPhonenumberCommandHandler {
+        $objectManager = $this->prophesize(ObjectManager::class);
+
+        return new AssociateByPhonenumberCommandHandler(
+            $personACLAwareRepository,
+            PhoneNumberUtil::getInstance(),
+            new MockClock(),
+            $objectManager->reveal()
+        );
+    }
+
+    public function testHandleWithPersonFoundByPhonenumber(): void
+    {
+        $person = new Person();
+
+        $personAclAwareRepository = $this->prophesize(PersonACLAwareRepositoryInterface::class);
+        $personAclAwareRepository->findByPhone(Argument::any())->willReturn([$person]);
+
+        $handler = $this->getHandler($personAclAwareRepository->reveal());
+
+        $ticket = new Ticket();
+        $handler($ticket, new AssociateByPhonenumberCommand('+3281136917'));
+
+        self::assertSame($person, $ticket->getPersons()[0]);
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Command/Ticket/Handler/CreateTicketCommandHandlerTest.php b/src/Bundle/ChillTicketBundle/tests/Command/Ticket/Handler/CreateTicketCommandHandlerTest.php
new file mode 100644
index 000000000..3b94dd706
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Command/Ticket/Handler/CreateTicketCommandHandlerTest.php
@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Tests\Command\Ticket\Handler;
+
+use Chill\TicketBundle\Command\Ticket\CreateTicketCommand;
+use Chill\TicketBundle\Command\Ticket\Handler\CreateTicketCommandHandler;
+use Chill\TicketBundle\Entity\Ticket;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class CreateTicketCommandHandlerTest extends TestCase
+{
+    private function getHandler(): CreateTicketCommandHandler
+    {
+        return new CreateTicketCommandHandler();
+    }
+
+    public function testHandleWithoutReference(): void
+    {
+        $command = new CreateTicketCommand();
+        $actual = ($this->getHandler())($command);
+
+        self::assertInstanceOf(Ticket::class, $actual);
+        self::assertEquals('', $actual->getExternalRef());
+    }
+
+    public function testHandleWithReference(): void
+    {
+        $command = new CreateTicketCommand($ref = 'external-ref');
+        $actual = ($this->getHandler())($command);
+
+        self::assertInstanceOf(Ticket::class, $actual);
+        self::assertEquals($ref, $actual->getExternalRef());
+    }
+}

From 36bc4dab24ae952c5994e32ebe9696df7a2bf7cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 17 Apr 2024 10:26:33 +0200
Subject: [PATCH 011/283] Configure a testsuite for TicketBundle

---
 phpunit.xml.dist | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/phpunit.xml.dist b/phpunit.xml.dist
index 336877a0c..fa8f479c5 100644
--- a/phpunit.xml.dist
+++ b/phpunit.xml.dist
@@ -49,6 +49,10 @@
       <!-- temporarily removed, the time to find a fix -->
       <exclude>src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php</exclude>
     </testsuite>
+
+    <testsuite name="TicketBundle">
+      <directory suffix="Test.php">src/Bundle/ChillTicketBundle/tests/</directory>
+    </testsuite>
     <!--
         <testsuite name="ReportBundle">
             <directory suffix="Test.php">src/Bundle/ChillReportBundle/Tests/</directory>

From 7c1f3b114d533dcc0584a1024f29c414635b9f3d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 17 Apr 2024 10:29:08 +0200
Subject: [PATCH 012/283] Rename Command directory to Action to avoid confusion
 with symfony commands

---
 .../Ticket/AssociateByPhonenumberCommand.php              | 2 +-
 .../{Command => Action}/Ticket/CreateTicketCommand.php    | 2 +-
 .../Handler/AssociateByPhonenumberCommandHandler.php      | 4 ++--
 .../Ticket/Handler/CreateTicketCommandHandler.php         | 4 ++--
 .../src/Controller/CreateTicketController.php             | 8 ++++----
 .../Handler/AssociateByPhonenumberCommandHandlerTest.php  | 6 +++---
 .../Ticket/Handler/CreateTicketCommandHandlerTest.php     | 6 +++---
 7 files changed, 16 insertions(+), 16 deletions(-)
 rename src/Bundle/ChillTicketBundle/src/{Command => Action}/Ticket/AssociateByPhonenumberCommand.php (88%)
 rename src/Bundle/ChillTicketBundle/src/{Command => Action}/Ticket/CreateTicketCommand.php (88%)
 rename src/Bundle/ChillTicketBundle/src/{Command => Action}/Ticket/Handler/AssociateByPhonenumberCommandHandler.php (90%)
 rename src/Bundle/ChillTicketBundle/src/{Command => Action}/Ticket/Handler/CreateTicketCommandHandler.php (81%)
 rename src/Bundle/ChillTicketBundle/tests/{Command => Action}/Ticket/Handler/AssociateByPhonenumberCommandHandlerTest.php (88%)
 rename src/Bundle/ChillTicketBundle/tests/{Command => Action}/Ticket/Handler/CreateTicketCommandHandlerTest.php (85%)

diff --git a/src/Bundle/ChillTicketBundle/src/Command/Ticket/AssociateByPhonenumberCommand.php b/src/Bundle/ChillTicketBundle/src/Action/Ticket/AssociateByPhonenumberCommand.php
similarity index 88%
rename from src/Bundle/ChillTicketBundle/src/Command/Ticket/AssociateByPhonenumberCommand.php
rename to src/Bundle/ChillTicketBundle/src/Action/Ticket/AssociateByPhonenumberCommand.php
index 61e652190..47b19c381 100644
--- a/src/Bundle/ChillTicketBundle/src/Command/Ticket/AssociateByPhonenumberCommand.php
+++ b/src/Bundle/ChillTicketBundle/src/Action/Ticket/AssociateByPhonenumberCommand.php
@@ -9,7 +9,7 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\TicketBundle\Command\Ticket;
+namespace Chill\TicketBundle\Action\Ticket;
 
 class AssociateByPhonenumberCommand
 {
diff --git a/src/Bundle/ChillTicketBundle/src/Command/Ticket/CreateTicketCommand.php b/src/Bundle/ChillTicketBundle/src/Action/Ticket/CreateTicketCommand.php
similarity index 88%
rename from src/Bundle/ChillTicketBundle/src/Command/Ticket/CreateTicketCommand.php
rename to src/Bundle/ChillTicketBundle/src/Action/Ticket/CreateTicketCommand.php
index 2f9b929ed..94e4310f9 100644
--- a/src/Bundle/ChillTicketBundle/src/Command/Ticket/CreateTicketCommand.php
+++ b/src/Bundle/ChillTicketBundle/src/Action/Ticket/CreateTicketCommand.php
@@ -9,7 +9,7 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\TicketBundle\Command\Ticket;
+namespace Chill\TicketBundle\Action\Ticket;
 
 final readonly class CreateTicketCommand
 {
diff --git a/src/Bundle/ChillTicketBundle/src/Command/Ticket/Handler/AssociateByPhonenumberCommandHandler.php b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/AssociateByPhonenumberCommandHandler.php
similarity index 90%
rename from src/Bundle/ChillTicketBundle/src/Command/Ticket/Handler/AssociateByPhonenumberCommandHandler.php
rename to src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/AssociateByPhonenumberCommandHandler.php
index d4a36d22b..40276622e 100644
--- a/src/Bundle/ChillTicketBundle/src/Command/Ticket/Handler/AssociateByPhonenumberCommandHandler.php
+++ b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/AssociateByPhonenumberCommandHandler.php
@@ -9,10 +9,10 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\TicketBundle\Command\Ticket\Handler;
+namespace Chill\TicketBundle\Action\Ticket\Handler;
 
 use Chill\PersonBundle\Repository\PersonACLAwareRepositoryInterface;
-use Chill\TicketBundle\Command\Ticket\AssociateByPhonenumberCommand;
+use Chill\TicketBundle\Action\Ticket\AssociateByPhonenumberCommand;
 use Chill\TicketBundle\Entity\PersonHistory;
 use Chill\TicketBundle\Entity\Ticket;
 use Doctrine\ORM\EntityManagerInterface;
diff --git a/src/Bundle/ChillTicketBundle/src/Command/Ticket/Handler/CreateTicketCommandHandler.php b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/CreateTicketCommandHandler.php
similarity index 81%
rename from src/Bundle/ChillTicketBundle/src/Command/Ticket/Handler/CreateTicketCommandHandler.php
rename to src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/CreateTicketCommandHandler.php
index a62c0418e..4fdbfa8f3 100644
--- a/src/Bundle/ChillTicketBundle/src/Command/Ticket/Handler/CreateTicketCommandHandler.php
+++ b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/CreateTicketCommandHandler.php
@@ -9,9 +9,9 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\TicketBundle\Command\Ticket\Handler;
+namespace Chill\TicketBundle\Action\Ticket\Handler;
 
-use Chill\TicketBundle\Command\Ticket\CreateTicketCommand;
+use Chill\TicketBundle\Action\Ticket\CreateTicketCommand;
 use Chill\TicketBundle\Entity\Ticket;
 
 class CreateTicketCommandHandler
diff --git a/src/Bundle/ChillTicketBundle/src/Controller/CreateTicketController.php b/src/Bundle/ChillTicketBundle/src/Controller/CreateTicketController.php
index ec2ea7b90..8a6d8dd32 100644
--- a/src/Bundle/ChillTicketBundle/src/Controller/CreateTicketController.php
+++ b/src/Bundle/ChillTicketBundle/src/Controller/CreateTicketController.php
@@ -11,10 +11,10 @@ declare(strict_types=1);
 
 namespace Chill\TicketBundle\Controller;
 
-use Chill\TicketBundle\Command\Ticket\AssociateByPhonenumberCommand;
-use Chill\TicketBundle\Command\Ticket\Handler\AssociateByPhonenumberCommandHandler;
-use Chill\TicketBundle\Command\Ticket\CreateTicketCommand;
-use Chill\TicketBundle\Command\Ticket\Handler\CreateTicketCommandHandler;
+use Chill\TicketBundle\Action\Ticket\AssociateByPhonenumberCommand;
+use Chill\TicketBundle\Action\Ticket\Handler\AssociateByPhonenumberCommandHandler;
+use Chill\TicketBundle\Action\Ticket\CreateTicketCommand;
+use Chill\TicketBundle\Action\Ticket\Handler\CreateTicketCommandHandler;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
diff --git a/src/Bundle/ChillTicketBundle/tests/Command/Ticket/Handler/AssociateByPhonenumberCommandHandlerTest.php b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/AssociateByPhonenumberCommandHandlerTest.php
similarity index 88%
rename from src/Bundle/ChillTicketBundle/tests/Command/Ticket/Handler/AssociateByPhonenumberCommandHandlerTest.php
rename to src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/AssociateByPhonenumberCommandHandlerTest.php
index ab0744015..71e6efc21 100644
--- a/src/Bundle/ChillTicketBundle/tests/Command/Ticket/Handler/AssociateByPhonenumberCommandHandlerTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/AssociateByPhonenumberCommandHandlerTest.php
@@ -9,12 +9,12 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\TicketBundle\Tests\Command\Ticket\Handler;
+namespace Chill\TicketBundle\Tests\Action\Ticket\Handler;
 
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Repository\PersonACLAwareRepositoryInterface;
-use Chill\TicketBundle\Command\Ticket\AssociateByPhonenumberCommand;
-use Chill\TicketBundle\Command\Ticket\Handler\AssociateByPhonenumberCommandHandler;
+use Chill\TicketBundle\Action\Ticket\AssociateByPhonenumberCommand;
+use Chill\TicketBundle\Action\Ticket\Handler\AssociateByPhonenumberCommandHandler;
 use Chill\TicketBundle\Entity\Ticket;
 use Doctrine\Persistence\ObjectManager;
 use libphonenumber\PhoneNumberUtil;
diff --git a/src/Bundle/ChillTicketBundle/tests/Command/Ticket/Handler/CreateTicketCommandHandlerTest.php b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/CreateTicketCommandHandlerTest.php
similarity index 85%
rename from src/Bundle/ChillTicketBundle/tests/Command/Ticket/Handler/CreateTicketCommandHandlerTest.php
rename to src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/CreateTicketCommandHandlerTest.php
index 3b94dd706..73f84b171 100644
--- a/src/Bundle/ChillTicketBundle/tests/Command/Ticket/Handler/CreateTicketCommandHandlerTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/CreateTicketCommandHandlerTest.php
@@ -9,10 +9,10 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\TicketBundle\Tests\Command\Ticket\Handler;
+namespace Chill\TicketBundle\Tests\Action\Ticket\Handler;
 
-use Chill\TicketBundle\Command\Ticket\CreateTicketCommand;
-use Chill\TicketBundle\Command\Ticket\Handler\CreateTicketCommandHandler;
+use Chill\TicketBundle\Action\Ticket\CreateTicketCommand;
+use Chill\TicketBundle\Action\Ticket\Handler\CreateTicketCommandHandler;
 use Chill\TicketBundle\Entity\Ticket;
 use PHPUnit\Framework\TestCase;
 

From 4c89a954faf72e6e35e0a125476dd8e5867ecb0d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 17 Apr 2024 10:36:13 +0200
Subject: [PATCH 013/283] Refactor test, fixing the constructor

---
 .../Handler/AssociateByPhonenumberCommandHandlerTest.php    | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/AssociateByPhonenumberCommandHandlerTest.php b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/AssociateByPhonenumberCommandHandlerTest.php
index 71e6efc21..7907712ab 100644
--- a/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/AssociateByPhonenumberCommandHandlerTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/AssociateByPhonenumberCommandHandlerTest.php
@@ -16,7 +16,7 @@ use Chill\PersonBundle\Repository\PersonACLAwareRepositoryInterface;
 use Chill\TicketBundle\Action\Ticket\AssociateByPhonenumberCommand;
 use Chill\TicketBundle\Action\Ticket\Handler\AssociateByPhonenumberCommandHandler;
 use Chill\TicketBundle\Entity\Ticket;
-use Doctrine\Persistence\ObjectManager;
+use Doctrine\ORM\EntityManagerInterface;
 use libphonenumber\PhoneNumberUtil;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
@@ -35,13 +35,13 @@ class AssociateByPhonenumberCommandHandlerTest extends TestCase
     private function getHandler(
         PersonACLAwareRepositoryInterface $personACLAwareRepository,
     ): AssociateByPhonenumberCommandHandler {
-        $objectManager = $this->prophesize(ObjectManager::class);
+        $entityManager = $this->prophesize(EntityManagerInterface::class);
 
         return new AssociateByPhonenumberCommandHandler(
             $personACLAwareRepository,
             PhoneNumberUtil::getInstance(),
             new MockClock(),
-            $objectManager->reveal()
+            $entityManager->reveal()
         );
     }
 

From c8467df1b16e9e204c74d3b2568b8aac0d31d5cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 17 Apr 2024 10:46:45 +0200
Subject: [PATCH 014/283] fixup! Rename Command directory to Action to avoid
 confusion with symfony commands

---
 src/Bundle/ChillTicketBundle/src/config/services.yaml | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/src/config/services.yaml b/src/Bundle/ChillTicketBundle/src/config/services.yaml
index 372baa81f..db5a5cf27 100644
--- a/src/Bundle/ChillTicketBundle/src/config/services.yaml
+++ b/src/Bundle/ChillTicketBundle/src/config/services.yaml
@@ -8,6 +8,6 @@ services:
         tags:
             - controller.service_arguments
 
-    Chill\TicketBundle\Command\Ticket\Handler\:
-        resource: '../Command/Ticket/Handler/'
+    Chill\TicketBundle\Action\Ticket\Handler\:
+        resource: '../Action/Ticket/Handler/'
 

From dd37427be1d052bf8022b6732f87b68ec326b406 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 17 Apr 2024 11:34:42 +0200
Subject: [PATCH 015/283] Bootstrap ticket layout and vue app to edit ticket

---
 CONVENTIONS.md                                |  2 +-
 .../Resources/views/layout.html.twig          | 52 ++++++++++---------
 .../ChillTicketBundle/chill.webpack.config.js |  4 +-
 .../src/Controller/EditTicketController.php   | 11 +++-
 .../public/module/ticket/banner.scss          |  0
 .../Resources/public/module/ticket/index.ts   |  1 +
 .../src/Resources/public/types.ts             |  3 ++
 .../Resources/public/vuejs/TicketApp/App.vue  | 11 ++++
 .../public/vuejs/TicketApp/i18n/messages.ts   |  5 ++
 .../Resources/public/vuejs/TicketApp/index.ts | 17 ++++++
 .../Resources/views/Banner/banner.html.twig   | 24 +++++++++
 .../src/Resources/views/Ticket/edit.html.twig | 15 ++++++
 .../src/Resources/views/layout.html.twig      | 14 +++++
 13 files changed, 130 insertions(+), 29 deletions(-)
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/module/ticket/banner.scss
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/module/ticket/index.ts
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/views/Banner/banner.html.twig
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/edit.html.twig
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/views/layout.html.twig

diff --git a/CONVENTIONS.md b/CONVENTIONS.md
index f1892e244..0fe76a135 100644
--- a/CONVENTIONS.md
+++ b/CONVENTIONS.md
@@ -55,7 +55,7 @@ Arborescence:
     - person
     - personvendee
     - household_edit_metadata
-        - index.js
+        - index.ts
 ```
 
 ## Organisation des feuilles de styles
diff --git a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
index 8a64c9543..9587fbecf 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
@@ -68,35 +68,37 @@
                     </div>
                 {% endif %}
 
-                {% block content %}
-                    <div class="col-8 main_search">
-                        {% if app.user.isAbsent %}
-                            <div class="d-flex flex-row mb-5 alert alert-warning" role="alert">
-                                <p class="m-2">{{'absence.You are marked as being absent'|trans }}</p>
-                                <span class="ms-auto">
-                                    <a class="btn btn-remove" title="Modifier" href="{{ path('chill_main_user_absence_index') }}">{{ 'absence.Unset absence'|trans }}</a>
-                                </span>
-                            </div>
-                        {% endif %}
-                        <h2>{{ 'Search'|trans }}</h2>
+                {% block wrapping_content %}
+                    {% block content %}
+                        <div class="col-8 main_search">
+                            {% if app.user.isAbsent %}
+                                <div class="d-flex flex-row mb-5 alert alert-warning" role="alert">
+                                    <p class="m-2">{{'absence.You are marked as being absent'|trans }}</p>
+                                    <span class="ms-auto">
+                                        <a class="btn btn-remove" title="Modifier" href="{{ path('chill_main_user_absence_index') }}">{{ 'absence.Unset absence'|trans }}</a>
+                                    </span>
+                                </div>
+                            {% endif %}
+                            <h2>{{ 'Search'|trans }}</h2>
 
-                        <form action="{{ path('chill_main_search') }}" method="get">
-                            <input class="form-control form-control-lg" name="q" type="search" placeholder="{{ 'Search persons, ...'|trans }}" />
-                            <div class="text-center">
-                                <button type="submit" class="btn btn-lg btn-warning mt-3">
-                                    <i class="fa fa-fw fa-search"></i> {{ 'Search'|trans }}
-                                </button>
-                                <a class="btn btn-lg btn-misc mt-3" href="{{ path('chill_main_advanced_search_list') }}">
-                                    <i class="fa fa-fw fa-search"></i> {{ 'Advanced search'|trans }}
-                                </a>
-                            </div>
-                        </form>
-                    </div>
+                            <form action="{{ path('chill_main_search') }}" method="get">
+                                <input class="form-control form-control-lg" name="q" type="search" placeholder="{{ 'Search persons, ...'|trans }}" />
+                                <div class="text-center">
+                                    <button type="submit" class="btn btn-lg btn-warning mt-3">
+                                        <i class="fa fa-fw fa-search"></i> {{ 'Search'|trans }}
+                                    </button>
+                                    <a class="btn btn-lg btn-misc mt-3" href="{{ path('chill_main_advanced_search_list') }}">
+                                        <i class="fa fa-fw fa-search"></i> {{ 'Advanced search'|trans }}
+                                    </a>
+                                </div>
+                            </form>
+                        </div>
 
-                    {#  DISABLED {{  chill_widget('homepage', {} ) }} #}
+                        {#  DISABLED {{  chill_widget('homepage', {} ) }} #}
 
-                    {% include '@ChillMain/Homepage/index.html.twig' %}
+                        {% include '@ChillMain/Homepage/index.html.twig' %}
 
+                    {% endblock %}
                 {% endblock %}
 
             </div>
diff --git a/src/Bundle/ChillTicketBundle/chill.webpack.config.js b/src/Bundle/ChillTicketBundle/chill.webpack.config.js
index 5f40de9f2..213b81c97 100644
--- a/src/Bundle/ChillTicketBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillTicketBundle/chill.webpack.config.js
@@ -1,4 +1,4 @@
-// this file loads all assets from the Chill person bundle
 module.exports = function(encore, entries) {
-    encore.addEntry('ticket_app', __dirname + '/src/Resources/public/vuejs/TicketApp/index.ts');
+    encore.addEntry('mod_ticket', __dirname + '/src/Resources/public/module/ticket/index.ts');
+    encore.addEntry('vue_ticket_app', __dirname + '/src/Resources/public/vuejs/TicketApp/index.ts');
 };
diff --git a/src/Bundle/ChillTicketBundle/src/Controller/EditTicketController.php b/src/Bundle/ChillTicketBundle/src/Controller/EditTicketController.php
index a51c3a4a8..6f8ab2a2b 100644
--- a/src/Bundle/ChillTicketBundle/src/Controller/EditTicketController.php
+++ b/src/Bundle/ChillTicketBundle/src/Controller/EditTicketController.php
@@ -14,13 +14,22 @@ namespace Chill\TicketBundle\Controller;
 use Chill\TicketBundle\Entity\Ticket;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
+use Twig\Environment;
 
 class EditTicketController
 {
+    public function __construct(
+        private Environment $templating,
+    ) {}
+
     #[Route('/{_locale}/ticket/ticket/{id}/edit', name: 'chill_ticket_ticket_edit')]
     public function __invoke(
         Ticket $ticket
     ): Response {
-        return new Response('ok');
+        return new Response(
+            $this->templating->render(
+                '@ChillTicket/Ticket/edit.html.twig',
+            )
+        );
     }
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/module/ticket/banner.scss b/src/Bundle/ChillTicketBundle/src/Resources/public/module/ticket/banner.scss
new file mode 100644
index 000000000..e69de29bb
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/module/ticket/index.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/module/ticket/index.ts
new file mode 100644
index 000000000..2361e49da
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/module/ticket/index.ts
@@ -0,0 +1 @@
+import './banner.scss';
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
index e69de29bb..7302f2485 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
@@ -0,0 +1,3 @@
+export interface Ticket {
+    id: number
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
new file mode 100644
index 000000000..89210e057
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
@@ -0,0 +1,11 @@
+<script setup lang="ts">
+
+</script>
+
+<template>
+<p>{{ $t('hello', {'name': 'Boris'})}}</p>
+</template>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
new file mode 100644
index 000000000..4065765f3
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
@@ -0,0 +1,5 @@
+export const messages = {
+    fr: {
+        hello: "Bonjour {name}"
+    }
+};
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts
index e69de29bb..bad5fb9ac 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts
@@ -0,0 +1,17 @@
+import {createApp} from "vue";
+import { _createI18n } from "../../../../../../ChillMainBundle/Resources/public/vuejs/_js/i18n";
+import VueToast from 'vue-toast-notification';
+import 'vue-toast-notification/dist/theme-sugar.css';
+import {messages} from "./i18n/messages";
+import App from './App.vue';
+
+const i18n = _createI18n(messages)
+
+const _app = createApp({
+        template: '<app></app>',
+    })
+    .use(i18n)
+    .use(VueToast)
+    .component('app', App)
+    .mount('#ticketRoot');
+
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/views/Banner/banner.html.twig b/src/Bundle/ChillTicketBundle/src/Resources/views/Banner/banner.html.twig
new file mode 100644
index 000000000..f7263b387
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/views/Banner/banner.html.twig
@@ -0,0 +1,24 @@
+<div class="banner banner-ticket">
+    <div id="header-ticket-main" class="header-name">
+        <div class="container-xxl">
+            <div class="row">
+                <div class="col-md-6 ps-md-5 ps-xxl-0">
+                    TODO
+                </div>
+
+                <div class="col-md-6">
+                    TODO
+                </div>
+            </div>
+        </div>
+    </div>
+    <div id="header-ticket-details" class="header-details">
+        <div class="container-xxl">
+            <div class="row justify-content-between">
+                <div class="col-md-12 ps-md-5 ps-xxl-0 container">
+                    <p>TODO</p>
+                </div>
+            </div>
+        </div>
+    </div>
+</div>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/edit.html.twig b/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/edit.html.twig
new file mode 100644
index 000000000..a8e38d86a
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/edit.html.twig
@@ -0,0 +1,15 @@
+{% extends '@ChillTicket/layout.html.twig' %}
+
+{% block css %}
+    {{ parent() }}
+    {{ encore_entry_link_tags('vue_ticket_app') }}
+{% endblock %}
+
+{% block js %}
+    {{ parent() }}
+    {{ encore_entry_script_tags('vue_ticket_app') }}
+{% endblock %}
+
+{% block content %}
+    <div id="ticketRoot"></div>
+{% endblock %}
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/views/layout.html.twig b/src/Bundle/ChillTicketBundle/src/Resources/views/layout.html.twig
new file mode 100644
index 000000000..12fb443d4
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/views/layout.html.twig
@@ -0,0 +1,14 @@
+{% extends '@ChillMain/layout.html.twig' %}
+
+
+{% block top_banner %}
+    {{ include('@ChillTicket/Banner/banner.html.twig') }}
+{% endblock %}
+
+{% block wrapping_content %}
+    <div class="row">
+        <div class="col-md-8 col-sm-12">
+            {% block content %}{% endblock %}
+        </div>
+    </div>
+{% endblock %}

From ecdc1e25bfa4cfcbe72c3b0e6433579403a4dfe4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 17 Apr 2024 12:02:27 +0200
Subject: [PATCH 016/283] Layout of banner for ticket

---
 .../ChillTicketBundle/chill.webpack.config.js |  2 +-
 .../public/module/ticket/banner.scss          |  0
 .../Resources/public/page/ticket/banner.scss  | 24 +++++++++++++++++++
 .../public/{module => page}/ticket/index.ts   |  0
 .../src/Resources/views/layout.html.twig      |  7 ++++++
 5 files changed, 32 insertions(+), 1 deletion(-)
 delete mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/module/ticket/banner.scss
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/page/ticket/banner.scss
 rename src/Bundle/ChillTicketBundle/src/Resources/public/{module => page}/ticket/index.ts (100%)

diff --git a/src/Bundle/ChillTicketBundle/chill.webpack.config.js b/src/Bundle/ChillTicketBundle/chill.webpack.config.js
index 213b81c97..fdb1d57e5 100644
--- a/src/Bundle/ChillTicketBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillTicketBundle/chill.webpack.config.js
@@ -1,4 +1,4 @@
 module.exports = function(encore, entries) {
-    encore.addEntry('mod_ticket', __dirname + '/src/Resources/public/module/ticket/index.ts');
+    encore.addEntry('page_ticket', __dirname + '/src/Resources/public/page/ticket/index.ts');
     encore.addEntry('vue_ticket_app', __dirname + '/src/Resources/public/vuejs/TicketApp/index.ts');
 };
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/module/ticket/banner.scss b/src/Bundle/ChillTicketBundle/src/Resources/public/module/ticket/banner.scss
deleted file mode 100644
index e69de29bb..000000000
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/page/ticket/banner.scss b/src/Bundle/ChillTicketBundle/src/Resources/public/page/ticket/banner.scss
new file mode 100644
index 000000000..76893b424
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/page/ticket/banner.scss
@@ -0,0 +1,24 @@
+@import '~ChillMainAssets/module/bootstrap/shared';
+
+div.banner {
+    div#header-ticket-main {
+        background: none repeat scroll 0 0 #ae986fFF;
+        color: $white;
+        padding-top: 1em;
+        padding-bottom: 1em;
+    }
+    div#header-ticket-details {
+        background: none repeat scroll 0 0 #d3c7b1FF;
+        color: $white;
+        padding-top: 1em;
+        padding-bottom: 1em;
+        div.contact {
+            display: flex;
+            align-content: center;
+            & > * {
+                margin-right: 1em;
+            }
+        }
+    }
+}
+
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/module/ticket/index.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/page/ticket/index.ts
similarity index 100%
rename from src/Bundle/ChillTicketBundle/src/Resources/public/module/ticket/index.ts
rename to src/Bundle/ChillTicketBundle/src/Resources/public/page/ticket/index.ts
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/views/layout.html.twig b/src/Bundle/ChillTicketBundle/src/Resources/views/layout.html.twig
index 12fb443d4..7b397a0e5 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/views/layout.html.twig
+++ b/src/Bundle/ChillTicketBundle/src/Resources/views/layout.html.twig
@@ -1,5 +1,12 @@
 {% extends '@ChillMain/layout.html.twig' %}
 
+{% block css %}
+    {{ encore_entry_link_tags('page_ticket') }}
+{% endblock %}
+
+{% block js %}
+    {{ encore_entry_script_tags('page_ticket') }}
+{% endblock %}
 
 {% block top_banner %}
     {{ include('@ChillTicket/Banner/banner.html.twig') }}

From 71a3a1924a306ffa6d33b797ba3ba0531ee7ccf0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 17 Apr 2024 12:51:31 +0200
Subject: [PATCH 017/283] Add Motive API and related fixtures to
 ChillTicketBundle

This update introduces the Motive API Controller to the ChillTicket bundle with its corresponding service configuration. Also included are related data fixtures for loading motive information. The motive entity has been updated to improve its serialization properties and new types were added to the TypeScript definitions of the bundle.
---
 .../ChillTicketBundle/chill.api.specs.yaml    | 25 ++++++
 .../src/Controller/MotiveApiController.php    | 25 ++++++
 .../src/DataFixtures/ORM/LoadMotives.php      | 82 +++++++++++++++++++
 .../ChillTicketExtension.php                  | 40 ++++++++-
 .../ChillTicketBundle/src/Entity/Motive.php   |  5 ++
 .../src/Resources/public/types.ts             |  8 ++
 .../src/config/services.yaml                  |  3 +
 7 files changed, 187 insertions(+), 1 deletion(-)
 create mode 100644 src/Bundle/ChillTicketBundle/chill.api.specs.yaml
 create mode 100644 src/Bundle/ChillTicketBundle/src/Controller/MotiveApiController.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/DataFixtures/ORM/LoadMotives.php

diff --git a/src/Bundle/ChillTicketBundle/chill.api.specs.yaml b/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
new file mode 100644
index 000000000..e15b57ba5
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
@@ -0,0 +1,25 @@
+components:
+    schemas:
+        Motive:
+            type: object
+            properties:
+                id:
+                    type: integer
+                label:
+                    type: object
+                    additionalProperties:
+                        type: string
+                    example:
+                        fr: Retard de livraison
+                active:
+                    type: boolean
+
+paths:
+    /1.0/ticket/motive.json:
+        get:
+            tags:
+                - ticket
+            summary: A list of available ticket's motive
+            responses:
+                200:
+                    description: "OK"
diff --git a/src/Bundle/ChillTicketBundle/src/Controller/MotiveApiController.php b/src/Bundle/ChillTicketBundle/src/Controller/MotiveApiController.php
new file mode 100644
index 000000000..d3f682615
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Controller/MotiveApiController.php
@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Controller;
+
+use Chill\MainBundle\CRUD\Controller\ApiController;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\HttpFoundation\Request;
+
+final class MotiveApiController extends ApiController
+{
+    protected function customizeQuery(string $action, Request $request, $query): void
+    {
+        /* @var $query QueryBuilder */
+        $query->andWhere('e.active = TRUE');
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/DataFixtures/ORM/LoadMotives.php b/src/Bundle/ChillTicketBundle/src/DataFixtures/ORM/LoadMotives.php
new file mode 100644
index 000000000..e29470a3f
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/DataFixtures/ORM/LoadMotives.php
@@ -0,0 +1,82 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\DataFixtures\ORM;
+
+use Chill\TicketBundle\Entity\Motive;
+use Doctrine\Bundle\FixturesBundle\Fixture;
+use Doctrine\Bundle\FixturesBundle\FixtureGroupInterface;
+use Doctrine\Persistence\ObjectManager;
+
+final class LoadMotives extends Fixture implements FixtureGroupInterface
+{
+    public static function getGroups(): array
+    {
+        return ['ticket'];
+    }
+
+    public function load(ObjectManager $manager)
+    {
+        foreach (explode("\n", self::MOTIVES) as $label) {
+            if ('' === trim($label)) {
+                continue;
+            }
+
+            $motive = new Motive();
+            $motive->setLabel(['fr' => trim($label)]);
+
+            $manager->persist($motive);
+        }
+
+        $manager->flush();
+    }
+
+    private const MOTIVES = <<<'TXT'
+        Coordonnées
+        Horaire de passage
+        Retard de livraison
+        Erreur de livraison
+        Colis incomplet
+        MATLOC
+        Retard DASRI
+        Planning d'astreintes
+        Planning des tournées
+        Contrôle pompe
+        Changement de rendez-vous
+        Renseignement facturation/prestation
+        Décès patient
+        Demande de prise en charge
+        Information absence
+        Demande bulletin de situation
+        Difficultés accès logement
+        Déplacement inutile
+        Problème de prélèvement/de commande
+        Parc auto
+        Demande d'admission
+        Retrait de matériel au domicile
+        Comptes-rendus
+        Démarchage commercial
+        Demande de transport
+        Demande laboratoire
+        Demande admission
+        Suivi de prise en charge
+        Mauvaise adresse
+        Patient absent
+        Annulation
+        Colis perdu
+        Changement de rendez-vous
+        Coordination interservices
+        Problème de substitution produits
+        Problème ordonnance
+        Réclamations facture
+        Préparation urgente
+        TXT;
+}
diff --git a/src/Bundle/ChillTicketBundle/src/DependencyInjection/ChillTicketExtension.php b/src/Bundle/ChillTicketBundle/src/DependencyInjection/ChillTicketExtension.php
index 8ee95d06c..f2222aa7a 100644
--- a/src/Bundle/ChillTicketBundle/src/DependencyInjection/ChillTicketExtension.php
+++ b/src/Bundle/ChillTicketBundle/src/DependencyInjection/ChillTicketExtension.php
@@ -11,16 +11,54 @@ declare(strict_types=1);
 
 namespace Chill\TicketBundle\DependencyInjection;
 
+use Chill\TicketBundle\Controller\MotiveApiController;
+use Chill\TicketBundle\Entity\Motive;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 use Symfony\Component\DependencyInjection\Loader;
 use Symfony\Component\DependencyInjection\Extension\Extension;
+use Symfony\Component\HttpFoundation\Request;
 
-class ChillTicketExtension extends Extension
+class ChillTicketExtension extends Extension implements PrependExtensionInterface
 {
     public function load(array $configs, ContainerBuilder $container)
     {
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
         $loader->load('services.yaml');
     }
+
+    public function prepend(ContainerBuilder $container)
+    {
+        $this->prependApi($container);
+    }
+
+    private function prependApi(ContainerBuilder $container): void
+    {
+        $container->prependExtensionConfig('chill_main', [
+            'apis' => [
+                [
+                    'class' => Motive::class,
+                    'name' => 'motive',
+                    'base_path' => '/api/1.0/ticket/motive',
+                    'controller' => MotiveApiController::class,
+                    '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,
+                            ],
+                        ],
+                    ],
+                ],
+            ],
+        ]);
+    }
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Entity/Motive.php b/src/Bundle/ChillTicketBundle/src/Entity/Motive.php
index fd744392c..eceefdf46 100644
--- a/src/Bundle/ChillTicketBundle/src/Entity/Motive.php
+++ b/src/Bundle/ChillTicketBundle/src/Entity/Motive.php
@@ -12,20 +12,25 @@ declare(strict_types=1);
 namespace Chill\TicketBundle\Entity;
 
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation as Serializer;
 
 #[ORM\Entity()]
 #[ORM\Table(name: 'motive', schema: 'chill_ticket')]
+#[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['ticket_motive' => Motive::class])]
 class Motive
 {
     #[ORM\Id]
     #[ORM\Column(type: \Doctrine\DBAL\Types\Types::INTEGER, nullable: false)]
     #[ORM\GeneratedValue(strategy: 'AUTO')]
+    #[Serializer\Groups(['read'])]
     private ?int $id = null;
 
     #[ORM\Column(type: \Doctrine\DBAL\Types\Types::JSON, nullable: false, options: ['default' => '[]'])]
+    #[Serializer\Groups(['read'])]
     private array $label = [];
 
     #[ORM\Column(type: \Doctrine\DBAL\Types\Types::BOOLEAN, nullable: false, options: ['default' => true])]
+    #[Serializer\Groups(['read'])]
     private bool $active = true;
 
     public function isActive(): bool
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
index 7302f2485..e7eed8575 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
@@ -1,3 +1,11 @@
+import {TranslatableString} from "../../../../ChillMainBundle/Resources/public/types";
+
 export interface Ticket {
     id: number
 }
+
+export interface Motive {
+    id: number,
+    active: boolean,
+    label: TranslatableString
+}
diff --git a/src/Bundle/ChillTicketBundle/src/config/services.yaml b/src/Bundle/ChillTicketBundle/src/config/services.yaml
index db5a5cf27..0ccd26525 100644
--- a/src/Bundle/ChillTicketBundle/src/config/services.yaml
+++ b/src/Bundle/ChillTicketBundle/src/config/services.yaml
@@ -11,3 +11,6 @@ services:
     Chill\TicketBundle\Action\Ticket\Handler\:
         resource: '../Action/Ticket/Handler/'
 
+
+    Chill\TicketBundle\DataFixtures\:
+        resource: '../DataFixtures/'

From a9760b323fc5020655f10f9d9faae036d68e39bf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 17 Apr 2024 21:40:29 +0200
Subject: [PATCH 018/283] Add ChillTicketBundle to configuration and
 autoload-dev

The commit includes the ChillTicketBundle in the bundles configuration file for testing. Additionally, the autoload-dev directive in the composer.json file was updated to include the "App" namespace for testing purposes. This ensures that the tests related to the "App" namespace are correctly autoloaded.
---
 composer.json                                      | 1 +
 tests/app/config/bundles.php                       | 2 +-
 tests/app/config/packages/doctrine_migrations.yaml | 1 +
 3 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 1dbb8fc27..07e65dbba 100644
--- a/composer.json
+++ b/composer.json
@@ -126,6 +126,7 @@
     },
     "autoload-dev": {
         "psr-4": {
+            "App\\": "tests",
             "Chill\\DocGeneratorBundle\\Tests\\": "src/Bundle/ChillDocGeneratorBundle/tests",
             "Chill\\TicketBundle\\Tests\\": "src/Bundle/ChillTicketBundle/tests",
             "Chill\\WopiBundle\\Tests\\": "src/Bundle/ChillDocGeneratorBundle/tests",
diff --git a/tests/app/config/bundles.php b/tests/app/config/bundles.php
index e4520fa51..b20185210 100644
--- a/tests/app/config/bundles.php
+++ b/tests/app/config/bundles.php
@@ -44,5 +44,5 @@ return [
     Chill\WopiBundle\ChillWopiBundle::class => ['all' => true],
     \Lexik\Bundle\JWTAuthenticationBundle\LexikJWTAuthenticationBundle::class => ['all' => true],
     Chill\EventBundle\ChillEventBundle::class => ['all' => true],
-
+    Chill\TicketBundle\ChillTicketBundle::class => ['all' => true],
 ];
diff --git a/tests/app/config/packages/doctrine_migrations.yaml b/tests/app/config/packages/doctrine_migrations.yaml
index a559780d3..a2afd0f01 100644
--- a/tests/app/config/packages/doctrine_migrations.yaml
+++ b/tests/app/config/packages/doctrine_migrations.yaml
@@ -14,6 +14,7 @@ doctrine_migrations:
         'Chill\Migrations\DocGenerator': '@ChillDocGeneratorBundle/migrations'
         'Chill\Migrations\Calendar': '@ChillCalendarBundle/migrations'
         'Chill\Migrations\Budget': '@ChillBudgetBundle/migrations'
+        'Chill\Migrations\Ticket': '@ChillTicketBundle/migrations'
 
     all_or_nothing:
         true

From 670b8eb82b3e591b166a94102a727c9b429edf9d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 17 Apr 2024 21:41:30 +0200
Subject: [PATCH 019/283] Implement functionality to replace ticket's motive

The commit introduces several features related to ticket motive management in the Chill-TicketBundle:
- Adds capability to replace a ticket's motive with a new one.
- Provides ticket motive history management features.
- Implements relevant changes in Controller, Action Handler, and Entity levels.
- Incorporates new API endpoints and updates the API specification file for the new feature.
- Includes tests to ensure the new functionality works as expected.
---
 .../ChillTicketBundle/chill.api.specs.yaml    |  41 +++++++
 .../Handler/ReplaceMotiveCommandHandler.php   |  56 +++++++++
 .../Action/Ticket/ReplaceMotiveCommand.php    |  25 ++++
 .../Controller/ReplaceMotiveController.php    |  64 ++++++++++
 .../ChillTicketBundle/src/Entity/Ticket.php   |  13 ++
 .../ReplaceMotiveCommandHandlerTest.php       | 108 +++++++++++++++++
 .../ReplaceMotiveControllerTest.php           | 113 ++++++++++++++++++
 .../tests/Entity/TicketTest.php               |  47 ++++++++
 8 files changed, 467 insertions(+)
 create mode 100644 src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/ReplaceMotiveCommandHandler.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Action/Ticket/ReplaceMotiveCommand.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Controller/ReplaceMotiveController.php
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/ReplaceMotiveCommandHandlerTest.php
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Controller/ReplaceMotiveControllerTest.php
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Entity/TicketTest.php

diff --git a/src/Bundle/ChillTicketBundle/chill.api.specs.yaml b/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
index e15b57ba5..ce53732ff 100644
--- a/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
@@ -13,6 +13,18 @@ components:
                         fr: Retard de livraison
                 active:
                     type: boolean
+        MotiveById:
+            type: object
+            properties:
+                id:
+                    type: integer
+                type:
+                    type: string
+                    enum:
+                        - ticket_motive
+            required:
+                - id
+                - type
 
 paths:
     /1.0/ticket/motive.json:
@@ -23,3 +35,32 @@ paths:
             responses:
                 200:
                     description: "OK"
+
+    /1.0/ticket/{id}/motive/set:
+        post:
+            tags:
+                - ticket
+            summary: Replace the existing ticket's motive by a new one
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The ticket id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            requestBody:
+                required: true
+                content:
+                    application/json:
+                        schema:
+                            type: object
+                            properties:
+                                motive:
+                                    $ref: "#/components/schemas/MotiveById"
+            responses:
+                201:
+                    description: "ACCEPTED"
+                422:
+                    description: "UNPROCESSABLE ENTITY"
diff --git a/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/ReplaceMotiveCommandHandler.php b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/ReplaceMotiveCommandHandler.php
new file mode 100644
index 000000000..7363d5e73
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/ReplaceMotiveCommandHandler.php
@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Action\Ticket\Handler;
+
+use Chill\TicketBundle\Action\Ticket\ReplaceMotiveCommand;
+use Chill\TicketBundle\Entity\MotiveHistory;
+use Chill\TicketBundle\Entity\Ticket;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\Clock\ClockInterface;
+
+final readonly class ReplaceMotiveCommandHandler
+{
+    public function __construct(
+        private ClockInterface $clock,
+        private EntityManagerInterface $entityManager,
+    ) {}
+
+    public function handle(Ticket $ticket, ReplaceMotiveCommand $command): void
+    {
+        if (null === $command->motive) {
+            throw new \InvalidArgumentException('The new motive cannot be null');
+        }
+
+        // will add if there are no existing motive
+        $readyToAdd = 0 === count($ticket->getMotiveHistories());
+
+        foreach ($ticket->getMotiveHistories() as $history) {
+            if (null !== $history->getEndDate()) {
+                continue;
+            }
+
+            if ($history->getMotive() === $command->motive) {
+                // we apply the same motive, we do nothing
+                continue;
+            }
+
+            $history->setEndDate($this->clock->now());
+            $readyToAdd = true;
+        }
+
+        if ($readyToAdd) {
+            $history = new MotiveHistory($command->motive, $ticket, $this->clock->now());
+            $ticket->addMotiveHistory($history);
+            $this->entityManager->persist($history);
+        }
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Action/Ticket/ReplaceMotiveCommand.php b/src/Bundle/ChillTicketBundle/src/Action/Ticket/ReplaceMotiveCommand.php
new file mode 100644
index 000000000..75e2a3f1b
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Action/Ticket/ReplaceMotiveCommand.php
@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Action\Ticket;
+
+use Chill\TicketBundle\Entity\Motive;
+use Symfony\Component\Serializer\Annotation\Groups;
+use Symfony\Component\Validator\Constraints as Assert;
+
+final readonly class ReplaceMotiveCommand
+{
+    public function __construct(
+        #[Assert\NotNull]
+        #[Groups(['write'])]
+        public ?Motive $motive,
+    ) {}
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Controller/ReplaceMotiveController.php b/src/Bundle/ChillTicketBundle/src/Controller/ReplaceMotiveController.php
new file mode 100644
index 000000000..d6f1acf94
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Controller/ReplaceMotiveController.php
@@ -0,0 +1,64 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Controller;
+
+use Chill\TicketBundle\Action\Ticket\Handler\ReplaceMotiveCommandHandler;
+use Chill\TicketBundle\Action\Ticket\ReplaceMotiveCommand;
+use Chill\TicketBundle\Entity\Ticket;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
+use Symfony\Component\Serializer\SerializerInterface;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
+
+final readonly class ReplaceMotiveController
+{
+    public function __construct(
+        private Security $security,
+        private ReplaceMotiveCommandHandler $replaceMotiveCommandHandler,
+        private SerializerInterface $serializer,
+        private ValidatorInterface $validator,
+        private EntityManagerInterface $entityManager,
+    ) {}
+
+    #[Route('/api/1.0/ticket/{id}/motive/set', name: 'chill_ticket_motive_set', methods: ['POST'])]
+    public function __invoke(Ticket $ticket, Request $request): Response
+    {
+        if (!$this->security->isGranted('ROLE_USER')) {
+            throw new AccessDeniedHttpException('');
+        }
+
+        $command = $this->serializer->deserialize($request->getContent(), ReplaceMotiveCommand::class, 'json', [
+            AbstractNormalizer::GROUPS => ['write'],
+        ]);
+
+        $errors = $this->validator->validate($command);
+
+        if (0 < $errors->count()) {
+            return new JsonResponse(
+                $this->serializer->serialize($errors, 'json'),
+                Response::HTTP_UNPROCESSABLE_ENTITY,
+            );
+        }
+
+        $this->replaceMotiveCommandHandler->handle($ticket, $command);
+
+        $this->entityManager->flush();
+
+        return new JsonResponse(null, Response::HTTP_CREATED);
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php b/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php
index f74a55a3f..3551aa93d 100644
--- a/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php
+++ b/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php
@@ -114,6 +114,11 @@ class Ticket implements TrackCreationInterface, TrackUpdateInterface
         $this->personHistories->add($personHistory);
     }
 
+    public function addMotiveHistory(MotiveHistory $motiveHistory): void
+    {
+        $this->motiveHistories->add($motiveHistory);
+    }
+
     /**
      * @return list<UserGroup|User>
      */
@@ -163,4 +168,12 @@ class Ticket implements TrackCreationInterface, TrackUpdateInterface
 
         return null;
     }
+
+    /**
+     * @return ReadableCollection<int, MotiveHistory>
+     */
+    public function getMotiveHistories(): ReadableCollection
+    {
+        return $this->motiveHistories;
+    }
 }
diff --git a/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/ReplaceMotiveCommandHandlerTest.php b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/ReplaceMotiveCommandHandlerTest.php
new file mode 100644
index 000000000..ef86dad17
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/ReplaceMotiveCommandHandlerTest.php
@@ -0,0 +1,108 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Tests\Action\Ticket\Handler;
+
+use Chill\TicketBundle\Action\Ticket\Handler\ReplaceMotiveCommandHandler;
+use Chill\TicketBundle\Action\Ticket\ReplaceMotiveCommand;
+use Chill\TicketBundle\Entity\Motive;
+use Chill\TicketBundle\Entity\MotiveHistory;
+use Chill\TicketBundle\Entity\Ticket;
+use Doctrine\ORM\EntityManagerInterface;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Clock\MockClock;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+final class ReplaceMotiveCommandHandlerTest extends KernelTestCase
+{
+    use ProphecyTrait;
+
+    private function buildHandler(
+        EntityManagerInterface $entityManager,
+    ): ReplaceMotiveCommandHandler {
+        $clock = new MockClock();
+
+        return new ReplaceMotiveCommandHandler($clock, $entityManager);
+    }
+
+    public function testHandleOnTicketWithoutMotive(): void
+    {
+        $motive = new Motive();
+        $ticket = new Ticket();
+
+        $entityManager = $this->prophesize(EntityManagerInterface::class);
+        $entityManager->persist(Argument::that(static function ($arg) use ($motive): bool {
+            if (!$arg instanceof MotiveHistory) {
+                return false;
+            }
+
+            return $arg->getMotive() === $motive;
+        }))->shouldBeCalled();
+
+        $handler = $this->buildHandler($entityManager->reveal());
+
+        $handler->handle($ticket, new ReplaceMotiveCommand($motive));
+
+        self::assertSame($motive, $ticket->getMotive());
+    }
+
+    public function testHandleReplaceMotiveOnTicketWithExistingMotive(): void
+    {
+        $motive = new Motive();
+        $ticket = new Ticket();
+        $ticket->addMotiveHistory(new MotiveHistory(new Motive(), $ticket));
+
+        $entityManager = $this->prophesize(EntityManagerInterface::class);
+        $entityManager->persist(Argument::that(static function ($arg) use ($motive): bool {
+            if (!$arg instanceof MotiveHistory) {
+                return false;
+            }
+
+            return $arg->getMotive() === $motive;
+        }))->shouldBeCalled();
+
+        $handler = $this->buildHandler($entityManager->reveal());
+
+        $handler->handle($ticket, new ReplaceMotiveCommand($motive));
+
+        self::assertSame($motive, $ticket->getMotive());
+        self::assertCount(2, $ticket->getMotiveHistories());
+    }
+
+    public function testHandleReplaceMotiveOnTicketWithSameMotive(): void
+    {
+        $motive = new Motive();
+        $ticket = new Ticket();
+        $ticket->addMotiveHistory(new MotiveHistory($motive, $ticket));
+
+        $entityManager = $this->prophesize(EntityManagerInterface::class);
+        $entityManager->persist(Argument::that(static function ($arg) use ($motive): bool {
+            if (!$arg instanceof MotiveHistory) {
+                return false;
+            }
+
+            return $arg->getMotive() === $motive;
+        }))->shouldNotBeCalled();
+
+        $handler = $this->buildHandler($entityManager->reveal());
+
+        $handler->handle($ticket, new ReplaceMotiveCommand($motive));
+
+        self::assertSame($motive, $ticket->getMotive());
+        self::assertCount(1, $ticket->getMotiveHistories());
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/ReplaceMotiveControllerTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/ReplaceMotiveControllerTest.php
new file mode 100644
index 000000000..dcf6a2318
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/ReplaceMotiveControllerTest.php
@@ -0,0 +1,113 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Tests\Controller;
+
+use Chill\TicketBundle\Action\Ticket\Handler\ReplaceMotiveCommandHandler;
+use Chill\TicketBundle\Controller\ReplaceMotiveController;
+use Chill\TicketBundle\Entity\Motive;
+use Chill\TicketBundle\Entity\MotiveHistory;
+use Chill\TicketBundle\Entity\Ticket;
+use Doctrine\ORM\EntityManagerInterface;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Clock\MockClock;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\SerializerInterface;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class ReplaceMotiveControllerTest extends KernelTestCase
+{
+    use ProphecyTrait;
+
+    private SerializerInterface $serializer;
+
+    private ValidatorInterface $validator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+        $this->serializer = self::getContainer()->get(SerializerInterface::class);
+        $this->validator = self::getContainer()->get(ValidatorInterface::class);
+    }
+
+    protected function tearDown(): void
+    {
+        self::ensureKernelShutdown();
+    }
+
+    /**
+     * @dataProvider generateMotiveId
+     */
+    public function testAddValidMotive(int $motiveId): void
+    {
+        $ticket = new Ticket();
+        $payload = <<<JSON
+            {"motive": {"type":  "ticket_motive", "id":  {$motiveId}}}
+            JSON;
+
+        $request = new Request(content: $payload);
+
+        $controller = $this->buildController();
+
+        $response = $controller($ticket, $request);
+
+        self::assertEquals(201, $response->getStatusCode());
+    }
+
+    private function buildController(): ReplaceMotiveController
+    {
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $entityManager = $this->prophesize(EntityManagerInterface::class);
+        $entityManager->persist(Argument::type(MotiveHistory::class))->shouldBeCalled();
+        $entityManager->flush()->shouldBeCalled();
+
+        $handler = new ReplaceMotiveCommandHandler(
+            new MockClock(),
+            $entityManager->reveal()
+        );
+
+        return new ReplaceMotiveController(
+            $security->reveal(),
+            $handler,
+            $this->serializer,
+            $this->validator,
+            $entityManager->reveal(),
+        );
+    }
+
+    public static function generateMotiveId(): iterable
+    {
+        self::bootKernel();
+        $em = self::getContainer()->get(EntityManagerInterface::class);
+
+        $motive = $em->createQuery('SELECT m FROM '.Motive::class.' m ')
+            ->setMaxResults(1)
+            ->getOneOrNullResult();
+
+        if (null === $motive) {
+            throw new \RuntimeException('the motive table seems to be empty');
+        }
+
+        self::ensureKernelShutdown();
+
+        yield [$motive->getId()];
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Entity/TicketTest.php b/src/Bundle/ChillTicketBundle/tests/Entity/TicketTest.php
new file mode 100644
index 000000000..f8d7ad270
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Entity/TicketTest.php
@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Tests\Entity;
+
+use Chill\TicketBundle\Entity\Motive;
+use Chill\TicketBundle\Entity\MotiveHistory;
+use Chill\TicketBundle\Entity\Ticket;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class TicketTest extends KernelTestCase
+{
+    public function testGetMotive(): void
+    {
+        $ticket = new Ticket();
+        $motive = new Motive();
+
+        self::assertNull($ticket->getMotive());
+
+        $history = new MotiveHistory($motive, $ticket);
+        $ticket->addMotiveHistory($history);
+
+        self::assertSame($motive, $ticket->getMotive());
+        self::assertCount(1, $ticket->getMotiveHistories());
+
+        // replace motive
+        $motive2 = new Motive();
+        $history->setEndDate(new \DateTimeImmutable());
+        $ticket->addMotiveHistory(new MotiveHistory($motive2, $ticket));
+
+        self::assertCount(2, $ticket->getMotiveHistories());
+        self::assertSame($motive2, $ticket->getMotive());
+    }
+}

From 467bea7cde37e01aa2d8c259f2e96bc744f6436f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 18 Apr 2024 11:35:07 +0200
Subject: [PATCH 020/283] Serialization of tickets with history

---
 .../Handler/ReplaceMotiveCommandHandler.php   |   1 -
 .../src/Controller/EditTicketController.php   |   5 +-
 .../src/Entity/MotiveHistory.php              |  10 +-
 .../src/Entity/PersonHistory.php              |   7 +
 .../ChillTicketBundle/src/Entity/Ticket.php   |   8 +
 .../src/Resources/public/types.ts             |  51 ++++++-
 .../Resources/public/vuejs/TicketApp/index.ts |  21 +++
 .../src/Resources/views/Ticket/edit.html.twig |   3 +
 .../Normalizer/TicketNormalizer.php           |  91 +++++++++++
 .../src/config/services.yaml                  |   2 +
 .../ReplaceMotiveCommandHandlerTest.php       |   4 +-
 .../tests/Entity/TicketTest.php               |  18 ++-
 .../Normalizer/TicketNormalizerTest.php       | 144 ++++++++++++++++++
 13 files changed, 353 insertions(+), 12 deletions(-)
 create mode 100644 src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/TicketNormalizerTest.php

diff --git a/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/ReplaceMotiveCommandHandler.php b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/ReplaceMotiveCommandHandler.php
index 7363d5e73..026ab377b 100644
--- a/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/ReplaceMotiveCommandHandler.php
+++ b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/ReplaceMotiveCommandHandler.php
@@ -49,7 +49,6 @@ final readonly class ReplaceMotiveCommandHandler
 
         if ($readyToAdd) {
             $history = new MotiveHistory($command->motive, $ticket, $this->clock->now());
-            $ticket->addMotiveHistory($history);
             $this->entityManager->persist($history);
         }
     }
diff --git a/src/Bundle/ChillTicketBundle/src/Controller/EditTicketController.php b/src/Bundle/ChillTicketBundle/src/Controller/EditTicketController.php
index 6f8ab2a2b..0e8fcd7e5 100644
--- a/src/Bundle/ChillTicketBundle/src/Controller/EditTicketController.php
+++ b/src/Bundle/ChillTicketBundle/src/Controller/EditTicketController.php
@@ -19,7 +19,7 @@ use Twig\Environment;
 class EditTicketController
 {
     public function __construct(
-        private Environment $templating,
+        private Environment $templating
     ) {}
 
     #[Route('/{_locale}/ticket/ticket/{id}/edit', name: 'chill_ticket_ticket_edit')]
@@ -29,6 +29,9 @@ class EditTicketController
         return new Response(
             $this->templating->render(
                 '@ChillTicket/Ticket/edit.html.twig',
+                [
+                    'ticket' => $ticket,
+                ]
             )
         );
     }
diff --git a/src/Bundle/ChillTicketBundle/src/Entity/MotiveHistory.php b/src/Bundle/ChillTicketBundle/src/Entity/MotiveHistory.php
index c96c2d6f4..1922459e8 100644
--- a/src/Bundle/ChillTicketBundle/src/Entity/MotiveHistory.php
+++ b/src/Bundle/ChillTicketBundle/src/Entity/MotiveHistory.php
@@ -14,9 +14,11 @@ namespace Chill\TicketBundle\Entity;
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
 use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation as Serializer;
 
 #[ORM\Entity]
 #[ORM\Table(name: 'motives_history', schema: 'chill_ticket')]
+#[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['ticket_motive_history' => MotiveHistory::class])]
 class MotiveHistory implements TrackCreationInterface
 {
     use TrackCreationTrait;
@@ -24,21 +26,27 @@ class MotiveHistory implements TrackCreationInterface
     #[ORM\Id]
     #[ORM\Column(type: \Doctrine\DBAL\Types\Types::INTEGER, nullable: false)]
     #[ORM\GeneratedValue(strategy: 'AUTO')]
+    #[Serializer\Groups(['read'])]
     private ?int $id = null;
 
     #[ORM\Column(type: \Doctrine\DBAL\Types\Types::DATETIME_IMMUTABLE, nullable: true, options: ['default' => null])]
+    #[Serializer\Groups(['read'])]
     private ?\DateTimeImmutable $endDate = null;
 
     public function __construct(
         #[ORM\ManyToOne(targetEntity: Motive::class)]
         #[ORM\JoinColumn(nullable: false)]
+        #[Serializer\Groups(['read'])]
         private Motive $motive,
         #[ORM\ManyToOne(targetEntity: Ticket::class)]
         #[ORM\JoinColumn(nullable: false)]
         private Ticket $ticket,
         #[ORM\Column(type: \Doctrine\DBAL\Types\Types::DATETIME_IMMUTABLE, nullable: false)]
+        #[Serializer\Groups(['read'])]
         private \DateTimeImmutable $startDate = new \DateTimeImmutable('now')
-    ) {}
+    ) {
+        $ticket->addMotiveHistory($this);
+    }
 
     public function getEndDate(): ?\DateTimeImmutable
     {
diff --git a/src/Bundle/ChillTicketBundle/src/Entity/PersonHistory.php b/src/Bundle/ChillTicketBundle/src/Entity/PersonHistory.php
index 9914f96a1..57a9809e2 100644
--- a/src/Bundle/ChillTicketBundle/src/Entity/PersonHistory.php
+++ b/src/Bundle/ChillTicketBundle/src/Entity/PersonHistory.php
@@ -16,9 +16,11 @@ use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
 use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\Person;
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation as Serializer;
 
 #[ORM\Entity]
 #[ORM\Table(name: 'person_history', schema: 'chill_ticket')]
+#[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['ticket_person_history' => PersonHistory::class])]
 class PersonHistory implements TrackCreationInterface
 {
     use TrackCreationTrait;
@@ -26,22 +28,27 @@ class PersonHistory implements TrackCreationInterface
     #[ORM\Id]
     #[ORM\Column(type: \Doctrine\DBAL\Types\Types::INTEGER, nullable: false)]
     #[ORM\GeneratedValue(strategy: 'AUTO')]
+    #[Serializer\Groups(['read'])]
     private ?int $id = null;
 
     #[ORM\Column(type: \Doctrine\DBAL\Types\Types::DATETIME_IMMUTABLE, nullable: true, options: ['default' => null])]
+    #[Serializer\Groups(['read'])]
     private ?\DateTimeImmutable $endDate = null;
 
     #[ORM\ManyToOne(targetEntity: User::class)]
     #[ORM\JoinColumn(nullable: true)]
+    #[Serializer\Groups(['read'])]
     private ?User $removedBy = null;
 
     public function __construct(
         #[ORM\ManyToOne(targetEntity: Person::class, fetch: 'EAGER')]
+        #[Serializer\Groups(['read'])]
         private Person $person,
         #[ORM\ManyToOne(targetEntity: Ticket::class)]
         #[ORM\JoinColumn(nullable: false)]
         private Ticket $ticket,
         #[ORM\Column(type: \Doctrine\DBAL\Types\Types::DATETIME_IMMUTABLE, nullable: false)]
+        #[Serializer\Groups(['read'])]
         private \DateTimeImmutable $startDate,
     ) {
         // keep ticket instance in sync with this
diff --git a/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php b/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php
index 3551aa93d..de369379b 100644
--- a/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php
+++ b/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php
@@ -176,4 +176,12 @@ class Ticket implements TrackCreationInterface, TrackUpdateInterface
     {
         return $this->motiveHistories;
     }
+
+    /**
+     * @return ReadableCollection<int, PersonHistory>
+     */
+    public function getPersonHistories(): ReadableCollection
+    {
+        return $this->personHistories;
+    }
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
index e7eed8575..b0c6a37df 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
@@ -1,11 +1,52 @@
-import {TranslatableString} from "../../../../ChillMainBundle/Resources/public/types";
-
-export interface Ticket {
-    id: number
-}
+import {DateTime, TranslatableString, User} from "../../../../ChillMainBundle/Resources/public/types";
+import {Person} from "../../../../ChillPersonBundle/Resources/public/types";
 
 export interface Motive {
+    type: "ticket_motive"
     id: number,
     active: boolean,
     label: TranslatableString
 }
+
+interface TicketHistory<T extends string, D extends object> {
+    event_type: T,
+    at: DateTime,
+    by: User,
+    data: D
+}
+
+interface PersonHistory {
+    type: "ticket_person_history",
+    id: number,
+    startDate: DateTime,
+    endDate: null|DateTime,
+    person: Person,
+    removedBy: null,
+    createdBy: User|null,
+    createdAt: DateTime|null
+}
+
+interface MotiveHistory {
+    type: "ticket_motive_history",
+    id: number,
+    startDate: null,
+    endDate: null|DateTime,
+    motive: Motive,
+    createdBy: User|null,
+    createdAt: DateTime|null,
+}
+
+interface AddPersonEvent extends TicketHistory<"add_person", PersonHistory> {};
+interface SetMotiveEvent extends TicketHistory<"set_motive", MotiveHistory> {};
+
+type TicketHistoryLine = AddPersonEvent | SetMotiveEvent;
+
+export interface Ticket {
+    type: "ticket_ticket"
+    id: number
+    externalRef: string
+    currentPersons: Person[]
+    currentMotive: null|Motive
+    history: TicketHistoryLine[],
+}
+
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts
index bad5fb9ac..c72576af5 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts
@@ -4,9 +4,30 @@ import VueToast from 'vue-toast-notification';
 import 'vue-toast-notification/dist/theme-sugar.css';
 import {messages} from "./i18n/messages";
 import App from './App.vue';
+import {Ticket} from "../../types";
+
+declare global {
+    interface Window {
+        initialTicket: string
+    }
+}
 
 const i18n = _createI18n(messages)
 
+// the initial ticket is serialized there:
+console.log(window.initialTicket);
+// to have js object
+const ticket = JSON.parse(window.initialTicket) as Ticket;
+console.log("the ticket for this app (at page loading)", ticket);
+
+for (const eh of ticket.history) {
+    if (eh.event_type === 'add_person') {
+        console.log("add_person", eh.data.person);
+    } else if (eh.event_type === 'set_motive') {
+        console.log("set_motive", eh.data.motive);
+    }
+}
+
 const _app = createApp({
         template: '<app></app>',
     })
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/edit.html.twig b/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/edit.html.twig
index a8e38d86a..2b067304e 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/edit.html.twig
+++ b/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/edit.html.twig
@@ -7,6 +7,9 @@
 
 {% block js %}
     {{ parent() }}
+    <script type="text/javascript">
+        window.initialTicket = "{{ ticket|serialize('json', {'groups': 'read'})|escape('js') }}";
+    </script>
     {{ encore_entry_script_tags('vue_ticket_app') }}
 {% endblock %}
 
diff --git a/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php b/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
new file mode 100644
index 000000000..c69ac5a7f
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
@@ -0,0 +1,91 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Serializer\Normalizer;
+
+use Chill\TicketBundle\Entity\MotiveHistory;
+use Chill\TicketBundle\Entity\PersonHistory;
+use Chill\TicketBundle\Entity\Ticket;
+use Symfony\Component\Serializer\Exception\UnexpectedValueException;
+use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+
+final class TicketNormalizer implements NormalizerInterface, NormalizerAwareInterface
+{
+    use NormalizerAwareTrait;
+
+    public function normalize($object, ?string $format = null, array $context = [])
+    {
+        if (!$object instanceof Ticket) {
+            throw new UnexpectedValueException();
+        }
+
+        return [
+            'type' => 'ticket_ticket',
+            'id' => $object->getId(),
+            'externalRef' => $object->getExternalRef(),
+            'currentPersons' => $this->normalizer->normalize($object->getPersons(), $format, [
+                'groups' => 'read',
+            ]),
+            'currentAddressees' => $this->normalizer->normalize($object->getCurrentAddressee(), $format, ['groups' => 'read']),
+            'currentInputs' => $this->normalizer->normalize($object->getCurrentInputs(), $format, ['groups' => 'read']),
+            'currentMotive' => $this->normalizer->normalize($object->getMotive(), $format, ['groups' => 'read']),
+            'history' => array_values($this->serializeHistory($object, $format, ['groups' => 'read'])),
+        ];
+    }
+
+    public function supportsNormalization($data, ?string $format = null)
+    {
+        return 'json' === $format && $data instanceof Ticket;
+    }
+
+    private function serializeHistory(Ticket $ticket, string $format, array $context): array
+    {
+        $events = [
+            ...array_map(
+                fn (MotiveHistory $motiveHistory) => [
+                    'event_type' => 'set_motive',
+                    'at' => $motiveHistory->getStartDate(),
+                    'by' => $motiveHistory->getCreatedBy(),
+                    'data' => $motiveHistory,
+                ],
+                $ticket->getMotiveHistories()->toArray()
+            ),
+            ...array_map(
+                fn (PersonHistory $personHistory) =>  [
+                    'event_type' => 'add_person',
+                    'at' => $personHistory->getStartDate(),
+                    'by' => $personHistory->getCreatedBy(),
+                    'data' => $personHistory,
+                ],
+                $ticket->getPersonHistories()->toArray(),
+            ),
+        ];
+
+        usort(
+            $events,
+            static function (array $a, array $b): int {
+                return $a['at'] <=> $b['at'];
+            }
+        );
+
+        return array_map(
+            fn ($data) => [
+                'event_type' => $data['event_type'],
+                'at' => $this->normalizer->normalize($data['at'], $format, $context),
+                'by' => $this->normalizer->normalize($data['by'], $format, $context),
+                'data' => $this->normalizer->normalize($data['data'], $format, $context),
+            ],
+            $events
+        );
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/config/services.yaml b/src/Bundle/ChillTicketBundle/src/config/services.yaml
index 0ccd26525..490e215c4 100644
--- a/src/Bundle/ChillTicketBundle/src/config/services.yaml
+++ b/src/Bundle/ChillTicketBundle/src/config/services.yaml
@@ -11,6 +11,8 @@ services:
     Chill\TicketBundle\Action\Ticket\Handler\:
         resource: '../Action/Ticket/Handler/'
 
+    Chill\TicketBundle\Serializer\:
+        resource: '../Serializer/'
 
     Chill\TicketBundle\DataFixtures\:
         resource: '../DataFixtures/'
diff --git a/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/ReplaceMotiveCommandHandlerTest.php b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/ReplaceMotiveCommandHandlerTest.php
index ef86dad17..b0f49dd61 100644
--- a/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/ReplaceMotiveCommandHandlerTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/ReplaceMotiveCommandHandlerTest.php
@@ -64,7 +64,7 @@ final class ReplaceMotiveCommandHandlerTest extends KernelTestCase
     {
         $motive = new Motive();
         $ticket = new Ticket();
-        $ticket->addMotiveHistory(new MotiveHistory(new Motive(), $ticket));
+        $history = new MotiveHistory(new Motive(), $ticket);
 
         $entityManager = $this->prophesize(EntityManagerInterface::class);
         $entityManager->persist(Argument::that(static function ($arg) use ($motive): bool {
@@ -87,7 +87,7 @@ final class ReplaceMotiveCommandHandlerTest extends KernelTestCase
     {
         $motive = new Motive();
         $ticket = new Ticket();
-        $ticket->addMotiveHistory(new MotiveHistory($motive, $ticket));
+        $history = new MotiveHistory($motive, $ticket);
 
         $entityManager = $this->prophesize(EntityManagerInterface::class);
         $entityManager->persist(Argument::that(static function ($arg) use ($motive): bool {
diff --git a/src/Bundle/ChillTicketBundle/tests/Entity/TicketTest.php b/src/Bundle/ChillTicketBundle/tests/Entity/TicketTest.php
index f8d7ad270..6f710f1aa 100644
--- a/src/Bundle/ChillTicketBundle/tests/Entity/TicketTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Entity/TicketTest.php
@@ -11,8 +11,10 @@ declare(strict_types=1);
 
 namespace Chill\TicketBundle\Tests\Entity;
 
+use Chill\PersonBundle\Entity\Person;
 use Chill\TicketBundle\Entity\Motive;
 use Chill\TicketBundle\Entity\MotiveHistory;
+use Chill\TicketBundle\Entity\PersonHistory;
 use Chill\TicketBundle\Entity\Ticket;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
@@ -31,7 +33,6 @@ class TicketTest extends KernelTestCase
         self::assertNull($ticket->getMotive());
 
         $history = new MotiveHistory($motive, $ticket);
-        $ticket->addMotiveHistory($history);
 
         self::assertSame($motive, $ticket->getMotive());
         self::assertCount(1, $ticket->getMotiveHistories());
@@ -39,9 +40,22 @@ class TicketTest extends KernelTestCase
         // replace motive
         $motive2 = new Motive();
         $history->setEndDate(new \DateTimeImmutable());
-        $ticket->addMotiveHistory(new MotiveHistory($motive2, $ticket));
+        $history2 = new MotiveHistory($motive2, $ticket);
 
         self::assertCount(2, $ticket->getMotiveHistories());
         self::assertSame($motive2, $ticket->getMotive());
     }
+
+    public function testGetPerson(): void
+    {
+        $ticket = new Ticket();
+        $person = new Person();
+
+        self::assertEquals([], $ticket->getPersons());
+
+        $history = new PersonHistory($person, $ticket, new \DateTimeImmutable('now'));
+
+        self::assertCount(1, $ticket->getPersons());
+        self::assertSame($person, $ticket->getPersons()[0]);
+    }
 }
diff --git a/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/TicketNormalizerTest.php b/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/TicketNormalizerTest.php
new file mode 100644
index 000000000..e876341cd
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/TicketNormalizerTest.php
@@ -0,0 +1,144 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Tests\Serializer\Normalizer;
+
+use Chill\PersonBundle\Entity\Person;
+use Chill\TicketBundle\Entity\Motive;
+use Chill\TicketBundle\Entity\MotiveHistory;
+use Chill\TicketBundle\Entity\PersonHistory;
+use Chill\TicketBundle\Entity\Ticket;
+use Chill\TicketBundle\Serializer\Normalizer\TicketNormalizer;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class TicketNormalizerTest extends KernelTestCase
+{
+    use ProphecyTrait;
+
+    /**
+     * @dataProvider provideTickets
+     */
+    public function testNormalize(Ticket $ticket, array $expected): void
+    {
+        $actual = $this->buildNormalizer()->normalize($ticket, 'json', ['groups' => 'read']);
+
+        self::assertEqualsCanonicalizing(array_keys($expected), array_keys($actual));
+
+        foreach (array_keys($expected) as $k) {
+            if ('history' === $k) {
+                continue;
+            }
+            self::assertEqualsCanonicalizing($expected[$k], $actual[$k], sprintf("assert the content of the '%s' key", $k));
+        }
+
+        self::assertArrayHasKey('history', $actual);
+        self::assertIsArray($actual['history']);
+
+        foreach ($actual['history'] as $k => $eventType) {
+            self::assertEquals($expected['history'][$k]['event_type'], $eventType['event_type']);
+        }
+    }
+
+    private function buildNormalizer(): TicketNormalizer
+    {
+        $normalizer = $this->prophesize(NormalizerInterface::class);
+
+        // empty array
+        $normalizer->normalize(
+            Argument::that(fn ($arg) => is_array($arg) && 0 === count($arg)),
+            'json',
+            Argument::type('array')
+        )->willReturn([]);
+
+        // array of mixed objects
+        $normalizer->normalize(
+            Argument::that(fn ($arg) => is_array($arg) && 0 < count($arg) && is_object($arg[0])),
+            'json',
+            Argument::type('array')
+        )->will(function ($args) {
+            return array_fill(0, count($args[0]), 'embedded');
+        });
+
+        // array of event type
+        $normalizer->normalize(
+            Argument::that(fn ($arg) => is_array($arg) && 0 < count($arg) && is_array($arg[0]) && array_key_exists('event_type', $arg[0])),
+            'json',
+            Argument::type('array')
+        )->will(function ($args): array {
+            $events = [];
+
+            foreach ($args[0] as $event) {
+                $events[] = $event['event_type'];
+            }
+
+            return $events;
+        });
+
+        // datetime
+        $normalizer->normalize(Argument::type(\DateTimeImmutable::class), 'json', Argument::type('array'))
+            ->will(function ($args) { return $args[0]->getTimestamp(); });
+        $normalizer->normalize(Argument::type(Motive::class), 'json', Argument::type('array'))->willReturn(['type' => 'motive', 'id' => 0]);
+        $normalizer->normalize(Argument::type(PersonHistory::class), 'json', Argument::type('array'))
+            ->willReturn(['personHistory']);
+        $normalizer->normalize(Argument::type(MotiveHistory::class), 'json', Argument::type('array'))
+            ->willReturn(['motiveHistory']);
+        $normalizer->normalize(null, 'json', Argument::type('array'))->willReturn(null);
+
+        $ticketNormalizer = new TicketNormalizer();
+        $ticketNormalizer->setNormalizer($normalizer->reveal());
+
+        return $ticketNormalizer;
+    }
+
+    public static function provideTickets(): iterable
+    {
+        yield [
+            new Ticket(),
+            [
+                'type' => 'ticket_ticket',
+                'id' => null,
+                'externalRef' => '',
+                'currentPersons' => [],
+                'currentAddressees' => [],
+                'currentInputs' => [],
+                'currentMotive' => null,
+                'history' => [],
+            ],
+        ];
+
+        $ticket = new Ticket();
+        $ticket->setExternalRef('2134');
+        $personHistory = new PersonHistory(new Person(), $ticket, new \DateTimeImmutable('2024-04-01T12:00:00'));
+        $ticketHistory = new MotiveHistory(new Motive(), $ticket, new \DateTimeImmutable('2024-04-01T12:02:00'));
+
+        yield [
+            $ticket,
+            [
+                'type' => 'ticket_ticket',
+                'id' => null,
+                'externalRef' => '2134',
+                'currentPersons' => ['embedded'],
+                'currentAddressees' => [],
+                'currentInputs' => [],
+                'currentMotive' => ['type' => 'motive', 'id' => 0],
+                'history' => [['event_type' => 'add_person'], ['event_type' => 'set_motive']],
+            ],
+        ];
+    }
+}

From 56a1a488dea20143fde32a610e1c3627495df2e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 18 Apr 2024 15:44:05 +0200
Subject: [PATCH 021/283] Return the content of the ticket on replace motive
 POST request

---
 .../src/Controller/ReplaceMotiveController.php             | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Controller/ReplaceMotiveController.php b/src/Bundle/ChillTicketBundle/src/Controller/ReplaceMotiveController.php
index d6f1acf94..8af2773e8 100644
--- a/src/Bundle/ChillTicketBundle/src/Controller/ReplaceMotiveController.php
+++ b/src/Bundle/ChillTicketBundle/src/Controller/ReplaceMotiveController.php
@@ -59,6 +59,11 @@ final readonly class ReplaceMotiveController
 
         $this->entityManager->flush();
 
-        return new JsonResponse(null, Response::HTTP_CREATED);
+        return new JsonResponse(
+            $this->serializer->serialize($ticket, 'json', ['groups' => 'read']),
+            Response::HTTP_CREATED,
+            [],
+            true
+        );
     }
 }

From 613ee8b186c871b9268ed1489b260f1f614eb1f8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 18 Apr 2024 21:57:55 +0200
Subject: [PATCH 022/283] Add functionality to add comments to tickets

A new controller, 'AddCommentController', has been added. This controller implements the 'AddCommentCommandHandler', allowing users to add comments to tickets. Additionally, corresponding test cases were implemented. The Ticket entity was also updated to accept and manage comments. API endpoint specs were updated to reflect these changes.
---
 .../ChillTicketBundle/chill.api.specs.yaml    |  29 +++++
 .../src/Action/Ticket/AddCommentCommand.php   |  25 +++++
 .../Handler/AddCommentCommandHandler.php      |  31 ++++++
 .../src/Controller/AddCommentController.php   |  68 ++++++++++++
 .../ChillTicketBundle/src/Entity/Comment.php  |   8 +-
 .../ChillTicketBundle/src/Entity/Ticket.php   |  13 ++-
 .../Handler/AddCommentCommandHandlerTest.php  |  52 +++++++++
 .../Controller/AddCommentControllerTest.php   | 104 ++++++++++++++++++
 8 files changed, 326 insertions(+), 4 deletions(-)
 create mode 100644 src/Bundle/ChillTicketBundle/src/Action/Ticket/AddCommentCommand.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/AddCommentCommandHandler.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Controller/AddCommentController.php
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/AddCommentCommandHandlerTest.php
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Controller/AddCommentControllerTest.php

diff --git a/src/Bundle/ChillTicketBundle/chill.api.specs.yaml b/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
index ce53732ff..86049cc24 100644
--- a/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
@@ -64,3 +64,32 @@ paths:
                     description: "ACCEPTED"
                 422:
                     description: "UNPROCESSABLE ENTITY"
+
+    /1.0/ticket/{id}/comment/add:
+        post:
+            tags:
+                - ticket
+            summary: Add a comment to an existing ticket
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The ticket id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            requestBody:
+                required: true
+                content:
+                    application/json:
+                        schema:
+                            type: object
+                            properties:
+                                content:
+                                    type: string
+            responses:
+                201:
+                    description: "ACCEPTED"
+                422:
+                    description: "UNPROCESSABLE ENTITY"
diff --git a/src/Bundle/ChillTicketBundle/src/Action/Ticket/AddCommentCommand.php b/src/Bundle/ChillTicketBundle/src/Action/Ticket/AddCommentCommand.php
new file mode 100644
index 000000000..1c009cfc8
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Action/Ticket/AddCommentCommand.php
@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Action\Ticket;
+
+use Symfony\Component\Validator\Constraints as Assert;
+use Symfony\Component\Serializer\Annotation as Serializer;
+
+final readonly class AddCommentCommand
+{
+    public function __construct(
+        #[Assert\NotBlank()]
+        #[Assert\NotNull]
+        #[Serializer\Groups(['write'])]
+        public ?string $content = null,
+    ) {}
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/AddCommentCommandHandler.php b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/AddCommentCommandHandler.php
new file mode 100644
index 000000000..66c972c3d
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/AddCommentCommandHandler.php
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Action\Ticket\Handler;
+
+use Chill\TicketBundle\Action\Ticket\AddCommentCommand;
+use Chill\TicketBundle\Entity\Comment;
+use Chill\TicketBundle\Entity\Ticket;
+use Doctrine\ORM\EntityManagerInterface;
+
+final readonly class AddCommentCommandHandler
+{
+    public function __construct(
+        private EntityManagerInterface $entityManager,
+    ) {}
+
+    public function handle(Ticket $ticket, AddCommentCommand $command): void
+    {
+        $comment = new Comment($command->content, $ticket);
+
+        $this->entityManager->persist($comment);
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Controller/AddCommentController.php b/src/Bundle/ChillTicketBundle/src/Controller/AddCommentController.php
new file mode 100644
index 000000000..157e69698
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Controller/AddCommentController.php
@@ -0,0 +1,68 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Controller;
+
+use Chill\TicketBundle\Action\Ticket\AddCommentCommand;
+use Chill\TicketBundle\Action\Ticket\Handler\AddCommentCommandHandler;
+use Chill\TicketBundle\Entity\Ticket;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\SerializerInterface;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
+
+final readonly class AddCommentController
+{
+    public function __construct(
+        private Security $security,
+        private SerializerInterface $serializer,
+        private ValidatorInterface $validator,
+        private AddCommentCommandHandler $addCommentCommandHandler,
+        private EntityManagerInterface $entityManager,
+    ) {}
+
+    #[Route('/api/1.0/ticket/{id}/comment/add', name: 'chill_ticket_comment_add', methods: ['POST'])]
+    public function __invoke(Ticket $ticket, Request $request): Response
+    {
+        if (!$this->security->isGranted('ROLE_USER')) {
+            throw new AccessDeniedHttpException('Only user can add ticket comments.');
+        }
+
+        $command = $this->serializer->deserialize($request->getContent(), AddCommentCommand::class, 'json', ['groups' => 'write']);
+
+        $errors = $this->validator->validate($command);
+
+        if (count($errors) > 0) {
+            return new JsonResponse(
+                $this->serializer->serialize($errors, 'json'),
+                Response::HTTP_UNPROCESSABLE_ENTITY,
+                [],
+                true
+            );
+        }
+
+        $this->addCommentCommandHandler->handle($ticket, $command);
+
+        $this->entityManager->flush();
+
+        return new JsonResponse(
+            $this->serializer->serialize($ticket, 'json', ['groups' => 'read']),
+            Response::HTTP_CREATED,
+            [],
+            true
+        );
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Entity/Comment.php b/src/Bundle/ChillTicketBundle/src/Entity/Comment.php
index d62e6d8b4..de12d5d47 100644
--- a/src/Bundle/ChillTicketBundle/src/Entity/Comment.php
+++ b/src/Bundle/ChillTicketBundle/src/Entity/Comment.php
@@ -31,12 +31,14 @@ class Comment implements TrackCreationInterface, TrackUpdateInterface
     private ?int $id = null;
 
     public function __construct(
+        #[ORM\Column(type: \Doctrine\DBAL\Types\Types::TEXT, nullable: false, options: ['default' => ''])]
+        private string $content,
         #[ORM\ManyToOne(targetEntity: Ticket::class, inversedBy: 'comments')]
         #[JoinColumn(nullable: false)]
         private Ticket $ticket,
-        #[ORM\Column(type: \Doctrine\DBAL\Types\Types::TEXT, nullable: false, options: ['default' => ''])]
-        private string $content = ''
-    ) {}
+    ) {
+        $ticket->addComment($this);
+    }
 
     public function getId(): ?int
     {
diff --git a/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php b/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php
index de369379b..cd49d7377 100644
--- a/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php
+++ b/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php
@@ -104,16 +104,27 @@ class Ticket implements TrackCreationInterface, TrackUpdateInterface
             ->getValues();
     }
 
+    /**
+     * @internal use @see{Comment::__construct} instead
+     */
+    public function addComment(Comment $comment): void
+    {
+        $this->comments->add($comment);
+    }
+
     /**
      * Add a PersonHistory.
      *
-     * This method should not be used, use @see{PersonHistory::__construct()} insted.
+     * @internal use @see{PersonHistory::__construct} instead
      */
     public function addPersonHistory(PersonHistory $personHistory): void
     {
         $this->personHistories->add($personHistory);
     }
 
+    /**
+     * @internal use @see{MotiveHistory::__construct} instead
+     */
     public function addMotiveHistory(MotiveHistory $motiveHistory): void
     {
         $this->motiveHistories->add($motiveHistory);
diff --git a/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/AddCommentCommandHandlerTest.php b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/AddCommentCommandHandlerTest.php
new file mode 100644
index 000000000..5ff18b436
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/AddCommentCommandHandlerTest.php
@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Tests\Action\Ticket\Handler;
+
+use Chill\TicketBundle\Action\Ticket\AddCommentCommand;
+use Chill\TicketBundle\Action\Ticket\Handler\AddCommentCommandHandler;
+use Chill\TicketBundle\Entity\Comment;
+use Chill\TicketBundle\Entity\Ticket;
+use Doctrine\ORM\EntityManagerInterface;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class AddCommentCommandHandlerTest extends TestCase
+{
+    use ProphecyTrait;
+
+    public function testAddComment(): void
+    {
+        $handler = $this->buildCommand();
+
+        $ticket = new Ticket();
+        $command = new AddCommentCommand(content: 'test');
+
+        $handler->handle($ticket, $command);
+
+        self::assertCount(1, $ticket->getComments());
+        self::assertEquals('test', $ticket->getComments()[0]->getContent());
+    }
+
+    private function buildCommand(): AddCommentCommandHandler
+    {
+        $entityManager = $this->prophesize(EntityManagerInterface::class);
+        $entityManager->persist(Argument::type(Comment::class))->shouldBeCalled();
+
+        return new AddCommentCommandHandler($entityManager->reveal());
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/AddCommentControllerTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/AddCommentControllerTest.php
new file mode 100644
index 000000000..2826c360d
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/AddCommentControllerTest.php
@@ -0,0 +1,104 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Tests\Controller;
+
+use Chill\TicketBundle\Action\Ticket\Handler\AddCommentCommandHandler;
+use Chill\TicketBundle\Controller\AddCommentController;
+use Chill\TicketBundle\Entity\Comment;
+use Chill\TicketBundle\Entity\Ticket;
+use Doctrine\ORM\EntityManagerInterface;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\SerializerInterface;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class AddCommentControllerTest extends KernelTestCase
+{
+    use ProphecyTrait;
+
+    private SerializerInterface $serializer;
+    private ValidatorInterface $validator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+        $this->validator = self::getContainer()->get(ValidatorInterface::class);
+        $this->serializer = self::getContainer()->get(SerializerInterface::class);
+    }
+
+    public function testAddComment(): void
+    {
+        $controller = $this->buildController(willFlush: true);
+
+        $ticket = new Ticket();
+        $request = new Request(content: <<<'JSON'
+            {"content":  "test"}
+            JSON);
+
+        $response = $controller->__invoke($ticket, $request);
+
+        self::assertEquals(201, $response->getStatusCode());
+    }
+
+    public function testAddCommentWithBlankContent(): void
+    {
+        $controller = $this->buildController(willFlush: false);
+
+        $ticket = new Ticket();
+        $request = new Request(content: <<<'JSON'
+            {"content":  ""}
+            JSON);
+
+        $response = $controller->__invoke($ticket, $request);
+
+        self::assertEquals(422, $response->getStatusCode());
+
+        $request = new Request(content: <<<'JSON'
+            {"content":  null}
+            JSON);
+
+        $response = $controller->__invoke($ticket, $request);
+
+        self::assertEquals(422, $response->getStatusCode());
+    }
+
+    private function buildController(bool $willFlush): AddCommentController
+    {
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $entityManager = $this->prophesize(EntityManagerInterface::class);
+
+        if ($willFlush) {
+            $entityManager->persist(Argument::type(Comment::class))->shouldBeCalled();
+            $entityManager->flush()->shouldBeCalled();
+        }
+
+        $commandHandler = new AddCommentCommandHandler($entityManager->reveal());
+
+        return new AddCommentController(
+            $security->reveal(),
+            $this->serializer,
+            $this->validator,
+            $commandHandler,
+            $entityManager->reveal(),
+        );
+    }
+}

From 39d701feb2a60c212431c06042403b89da6adecc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 18 Apr 2024 22:10:56 +0200
Subject: [PATCH 023/283] Serialize ticket's Comment

---
 .../ChillTicketBundle/src/Entity/Comment.php   |  4 ++++
 .../src/Resources/public/types.ts              | 13 ++++++++++++-
 .../Serializer/Normalizer/TicketNormalizer.php | 10 ++++++++++
 .../Normalizer/TicketNormalizerTest.php        | 18 +++++++++++++++++-
 4 files changed, 43 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Entity/Comment.php b/src/Bundle/ChillTicketBundle/src/Entity/Comment.php
index de12d5d47..8e11ff489 100644
--- a/src/Bundle/ChillTicketBundle/src/Entity/Comment.php
+++ b/src/Bundle/ChillTicketBundle/src/Entity/Comment.php
@@ -17,9 +17,11 @@ use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
 use Doctrine\ORM\Mapping as ORM;
 use Doctrine\ORM\Mapping\JoinColumn;
+use Symfony\Component\Serializer\Annotation as Serializer;
 
 #[ORM\Entity()]
 #[ORM\Table(name: 'comment', schema: 'chill_ticket')]
+#[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['ticket_comment' => Comment::class])]
 class Comment implements TrackCreationInterface, TrackUpdateInterface
 {
     use TrackCreationTrait;
@@ -28,10 +30,12 @@ class Comment implements TrackCreationInterface, TrackUpdateInterface
     #[ORM\Id]
     #[ORM\Column(type: \Doctrine\DBAL\Types\Types::INTEGER, nullable: false)]
     #[ORM\GeneratedValue(strategy: 'AUTO')]
+    #[Serializer\Groups(['read'])]
     private ?int $id = null;
 
     public function __construct(
         #[ORM\Column(type: \Doctrine\DBAL\Types\Types::TEXT, nullable: false, options: ['default' => ''])]
+        #[Serializer\Groups(['read'])]
         private string $content,
         #[ORM\ManyToOne(targetEntity: Ticket::class, inversedBy: 'comments')]
         #[JoinColumn(nullable: false)]
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
index b0c6a37df..2df53da99 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
@@ -36,10 +36,21 @@ interface MotiveHistory {
     createdAt: DateTime|null,
 }
 
+interface Comment {
+    type: "ticket_comment",
+    id: number,
+    content: string,
+    createdBy: User|null,
+    createdAt: DateTime|null,
+    updatedBy: User|null,
+    updatedAt: DateTime|null,
+}
+
 interface AddPersonEvent extends TicketHistory<"add_person", PersonHistory> {};
+interface AddCommentEvent extends TicketHistory<"add_comment", Comment> {};
 interface SetMotiveEvent extends TicketHistory<"set_motive", MotiveHistory> {};
 
-type TicketHistoryLine = AddPersonEvent | SetMotiveEvent;
+type TicketHistoryLine = AddPersonEvent | AddCommentEvent | SetMotiveEvent;
 
 export interface Ticket {
     type: "ticket_ticket"
diff --git a/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php b/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
index c69ac5a7f..c68ab34ef 100644
--- a/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
+++ b/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\TicketBundle\Serializer\Normalizer;
 
+use Chill\TicketBundle\Entity\Comment;
 use Chill\TicketBundle\Entity\MotiveHistory;
 use Chill\TicketBundle\Entity\PersonHistory;
 use Chill\TicketBundle\Entity\Ticket;
@@ -69,6 +70,15 @@ final class TicketNormalizer implements NormalizerInterface, NormalizerAwareInte
                 ],
                 $ticket->getPersonHistories()->toArray(),
             ),
+            ...array_map(
+                fn (Comment $comment) => [
+                    'event_type' => 'add_comment',
+                    'at' => $comment->getCreatedAt(),
+                    'by' => $comment->getCreatedBy(),
+                    'data' => $comment,
+                ],
+                $ticket->getComments()->toArray(),
+            ),
         ];
 
         usort(
diff --git a/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/TicketNormalizerTest.php b/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/TicketNormalizerTest.php
index e876341cd..447bebfbf 100644
--- a/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/TicketNormalizerTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/TicketNormalizerTest.php
@@ -11,7 +11,9 @@ declare(strict_types=1);
 
 namespace Chill\TicketBundle\Tests\Serializer\Normalizer;
 
+use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\Person;
+use Chill\TicketBundle\Entity\Comment;
 use Chill\TicketBundle\Entity\Motive;
 use Chill\TicketBundle\Entity\MotiveHistory;
 use Chill\TicketBundle\Entity\PersonHistory;
@@ -93,11 +95,20 @@ class TicketNormalizerTest extends KernelTestCase
         // datetime
         $normalizer->normalize(Argument::type(\DateTimeImmutable::class), 'json', Argument::type('array'))
             ->will(function ($args) { return $args[0]->getTimestamp(); });
+        // user
+        $normalizer->normalize(Argument::type(User::class), 'json', Argument::type('array'))
+            ->willReturn(['user']);
+        // motive
         $normalizer->normalize(Argument::type(Motive::class), 'json', Argument::type('array'))->willReturn(['type' => 'motive', 'id' => 0]);
+        // person history
         $normalizer->normalize(Argument::type(PersonHistory::class), 'json', Argument::type('array'))
             ->willReturn(['personHistory']);
+        // motive history
         $normalizer->normalize(Argument::type(MotiveHistory::class), 'json', Argument::type('array'))
             ->willReturn(['motiveHistory']);
+        $normalizer->normalize(Argument::type(Comment::class), 'json', Argument::type('array'))
+            ->willReturn(['comment']);
+        // null values
         $normalizer->normalize(null, 'json', Argument::type('array'))->willReturn(null);
 
         $ticketNormalizer = new TicketNormalizer();
@@ -109,6 +120,7 @@ class TicketNormalizerTest extends KernelTestCase
     public static function provideTickets(): iterable
     {
         yield [
+            // this a nearly empty ticket
             new Ticket(),
             [
                 'type' => 'ticket_ticket',
@@ -122,10 +134,14 @@ class TicketNormalizerTest extends KernelTestCase
             ],
         ];
 
+        // ticket with more features
         $ticket = new Ticket();
         $ticket->setExternalRef('2134');
         $personHistory = new PersonHistory(new Person(), $ticket, new \DateTimeImmutable('2024-04-01T12:00:00'));
         $ticketHistory = new MotiveHistory(new Motive(), $ticket, new \DateTimeImmutable('2024-04-01T12:02:00'));
+        $comment = new Comment('blabla test', $ticket);
+        $comment->setCreatedAt(new \DateTimeImmutable('2024-04-01T12:04:00'));
+        $comment->setCreatedBy(new User());
 
         yield [
             $ticket,
@@ -137,7 +153,7 @@ class TicketNormalizerTest extends KernelTestCase
                 'currentAddressees' => [],
                 'currentInputs' => [],
                 'currentMotive' => ['type' => 'motive', 'id' => 0],
-                'history' => [['event_type' => 'add_person'], ['event_type' => 'set_motive']],
+                'history' => [['event_type' => 'add_person'], ['event_type' => 'set_motive'], ['event_type' => 'add_comment']],
             ],
         ];
     }

From 2cdfb5005813e915effe1a673cc9628a05b8f565 Mon Sep 17 00:00:00 2001
From: Boris Waaub <boris.waaub@gmail.com>
Date: Fri, 19 Apr 2024 14:12:09 +0200
Subject: [PATCH 024/283] =?UTF-8?q?Mise=20en=20=C5=93uvre=20de=20la=20fonc?=
 =?UTF-8?q?tionnalit=C3=A9=20de=20remplacement=20du=20motif=20du=20ticket?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

La validation introduit plusieurs fonctionnalités liées à la gestion du motif du ticket dans le bundle Chill-TicketBundle :
- Ajoute la possibilité de remplacer le motif d'un ticket par un nouveau.
- Fournit des fonctionnalités de gestion de l'historique des motifs du ticket.
- Implémente les modifications pertinentes au niveau du contrôleur, du gestionnaire d'actions et de l'entité.
- Intègre de nouvelles points d'API et met à jour le fichier de spécification de l'API pour la nouvelle fonctionnalité.
- Inclut des tests pour garantir le bon fonctionnement de la nouvelle fonctionnalité.
---
 .../Resources/public/vuejs/TicketApp/App.vue  | 49 +++++++++++++++++--
 .../Resources/public/vuejs/TicketApp/index.ts | 26 +++-------
 .../public/vuejs/TicketApp/store/index.ts     | 12 +++++
 .../vuejs/TicketApp/store/modules/motive.ts   | 47 ++++++++++++++++++
 4 files changed, 111 insertions(+), 23 deletions(-)
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/motive.ts

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
index 89210e057..19989d16f 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
@@ -1,11 +1,50 @@
-<script setup lang="ts">
-
-</script>
 
 <template>
-<p>{{ $t('hello', {'name': 'Boris'})}}</p>
+    <div>
+        <p>{{ ticket.externalRef }}</p>
+        <p>{{ ticket.currentMotive }}</p>
+    </div>
+
+    <div v-for="person in ticket.currentPersons as Person[]" :key="person.id">
+        <p>{{ person.firstName }}</p>
+        <p>{{ person.lastName }}</p>
+    </div>
+    <div v-for="ticket_history_line in ticket.history">
+        <p>{{ ticket_history_line.event_type}}</p>
+        <p>{{ ticket_history_line.data}}</p>
+    </div>
+
 </template>
 
-<style scoped lang="scss">
+<script lang="ts">
 
+    import { computed, defineComponent, onMounted } from 'vue';
+    import { useStore } from 'vuex';
+
+    // Types
+    import { Person } from '../../../../../../ChillPersonBundle/Resources/public/types';
+    import { Motive, Ticket } from '../../types';
+
+
+    export default defineComponent({
+        name: 'App',
+
+        setup() {
+            const store = useStore();
+            const ticket = JSON.parse(window.initialTicket) as Ticket;
+            const motives = computed(() => store.getters.getMotives as Motive[])
+
+            onMounted(() => {
+                store.dispatch('fetchMotives');
+            });
+
+            return {
+                motives,
+                ticket,
+            };
+        },
+    });
+</script>
+
+<style lang="scss" scoped>
 </style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts
index c72576af5..182925b92 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts
@@ -1,10 +1,13 @@
+import App from './App.vue';
 import {createApp} from "vue";
+
 import { _createI18n } from "../../../../../../ChillMainBundle/Resources/public/vuejs/_js/i18n";
+import {messages} from "./i18n/messages";
+
 import VueToast from 'vue-toast-notification';
 import 'vue-toast-notification/dist/theme-sugar.css';
-import {messages} from "./i18n/messages";
-import App from './App.vue';
-import {Ticket} from "../../types";
+
+import { store } from "./store";
 
 declare global {
     interface Window {
@@ -12,25 +15,12 @@ declare global {
     }
 }
 
-const i18n = _createI18n(messages)
-
-// the initial ticket is serialized there:
-console.log(window.initialTicket);
-// to have js object
-const ticket = JSON.parse(window.initialTicket) as Ticket;
-console.log("the ticket for this app (at page loading)", ticket);
-
-for (const eh of ticket.history) {
-    if (eh.event_type === 'add_person') {
-        console.log("add_person", eh.data.person);
-    } else if (eh.event_type === 'set_motive') {
-        console.log("set_motive", eh.data.motive);
-    }
-}
+const i18n = _createI18n(messages);
 
 const _app = createApp({
         template: '<app></app>',
     })
+    .use(store)
     .use(i18n)
     .use(VueToast)
     .component('app', App)
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts
new file mode 100644
index 000000000..013a6d68a
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts
@@ -0,0 +1,12 @@
+import { createStore } from "vuex";
+import { State as MotiveStates, moduleMotive } from "./modules/motive";
+
+export type RootState = {
+    motive: MotiveStates;
+  };
+
+export const store = createStore({
+    modules: {
+        motive:moduleMotive,
+      }
+});
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/motive.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/motive.ts
new file mode 100644
index 000000000..85aa0e36c
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/motive.ts
@@ -0,0 +1,47 @@
+import { fetchResults, makeFetch } from "../../../../../../../../ChillMainBundle/Resources/public/lib/api/apiMethods";
+
+import { Module } from "vuex";
+import { RootState } from "..";
+
+import { Motive } from "../../../../types";
+
+export interface State {
+    motives: Array<Motive>;
+}
+
+export const moduleMotive: Module<State, RootState> ={
+    state: () => ({
+        motives: [],
+    }),
+    getters: {
+        getMotives(state) {
+            return state.motives;
+          }
+    },
+    mutations: {
+        setMotives(state, motives) {
+            state.motives = motives;
+        }
+    },
+    actions: {
+        async fetchMotives({ commit }) {
+            try{
+                const results = await fetchResults("/api/1.0/ticket/motive.json") as Motive[];
+                commit("setMotives", results);
+            }
+            catch (e) {
+                console.error("Error while fetching motives", e);
+            }
+        },
+        async createMotive({ commit }, datas: {currentMotiveId: number, motive: Motive}) {
+            const { currentMotiveId, motive } = datas;
+            try {
+                const result = await makeFetch("POST", `/api/1.0/ticket/${currentMotiveId}/motive/set`, motive);
+                commit("setMotives", result);;
+            }
+            catch (e) {
+                console.error("Error while creating motive", e);
+            }
+        }
+    },
+};

From e2deb55fdbee985636d5862c7d98cab4d39afc9b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 19 Apr 2024 15:34:16 +0200
Subject: [PATCH 025/283] Create api endpoint for listing user-group

---
 .../Controller/UserGroupApiController.php       | 16 ++++++++++++++++
 .../DependencyInjection/ChillMainExtension.php  | 17 +++++++++++++++++
 src/Bundle/ChillMainBundle/Entity/UserGroup.php |  4 ++++
 src/Bundle/ChillMainBundle/chill.api.specs.yaml | 16 ++++++++++++++++
 4 files changed, 53 insertions(+)
 create mode 100644 src/Bundle/ChillMainBundle/Controller/UserGroupApiController.php

diff --git a/src/Bundle/ChillMainBundle/Controller/UserGroupApiController.php b/src/Bundle/ChillMainBundle/Controller/UserGroupApiController.php
new file mode 100644
index 000000000..602b84ec5
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Controller/UserGroupApiController.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Controller;
+
+use Chill\MainBundle\CRUD\Controller\ApiController;
+
+class UserGroupApiController extends ApiController {}
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
index 4dde2076c..3170cadee 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
@@ -24,6 +24,7 @@ use Chill\MainBundle\Controller\LocationTypeController;
 use Chill\MainBundle\Controller\NewsItemController;
 use Chill\MainBundle\Controller\RegroupmentController;
 use Chill\MainBundle\Controller\UserController;
+use Chill\MainBundle\Controller\UserGroupApiController;
 use Chill\MainBundle\Controller\UserJobApiController;
 use Chill\MainBundle\Controller\UserJobController;
 use Chill\MainBundle\DependencyInjection\Widget\Factory\WidgetFactoryInterface;
@@ -59,6 +60,7 @@ use Chill\MainBundle\Entity\LocationType;
 use Chill\MainBundle\Entity\NewsItem;
 use Chill\MainBundle\Entity\Regroupment;
 use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Entity\UserGroup;
 use Chill\MainBundle\Entity\UserJob;
 use Chill\MainBundle\Form\CenterType;
 use Chill\MainBundle\Form\CivilityType;
@@ -803,6 +805,21 @@ class ChillMainExtension extends Extension implements
                         ],
                     ],
                 ],
+                [
+                    'class' => UserGroup::class,
+                    'controller' => UserGroupApiController::class,
+                    'name' => 'user-group',
+                    'base_path' => '/api/1.0/main/user-group',
+                    'base_role' => 'ROLE_USER',
+                    'actions' => [
+                        '_index' => [
+                            'methods' => [
+                                Request::METHOD_GET => true,
+                                Request::METHOD_HEAD => true,
+                            ],
+                        ],
+                    ],
+                ],
             ],
         ]);
     }
diff --git a/src/Bundle/ChillMainBundle/Entity/UserGroup.php b/src/Bundle/ChillMainBundle/Entity/UserGroup.php
index 3bd9870a6..d6e343d00 100644
--- a/src/Bundle/ChillMainBundle/Entity/UserGroup.php
+++ b/src/Bundle/ChillMainBundle/Entity/UserGroup.php
@@ -14,17 +14,21 @@ namespace Chill\MainBundle\Entity;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation as Serializer;
 
 #[ORM\Entity]
 #[ORM\Table(name: 'chill_main_user_group')]
+#[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['user_group' => UserGroup::class])]
 class UserGroup
 {
     #[ORM\Id]
     #[ORM\GeneratedValue]
     #[ORM\Column(type: \Doctrine\DBAL\Types\Types::INTEGER, nullable: false)]
+    #[Serializer\Groups(['read'])]
     private ?int $id = null;
 
     #[ORM\Column(type: \Doctrine\DBAL\Types\Types::JSON, nullable: false, options: ['default' => '[]'])]
+    #[Serializer\Groups(['read'])]
     private array $label = [];
 
     /**
diff --git a/src/Bundle/ChillMainBundle/chill.api.specs.yaml b/src/Bundle/ChillMainBundle/chill.api.specs.yaml
index f37ee723d..fec36312d 100644
--- a/src/Bundle/ChillMainBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillMainBundle/chill.api.specs.yaml
@@ -908,3 +908,19 @@ paths:
                                     $ref: '#/components/schemas/NewsItem'
                 403:
                     description: "Unauthorized"
+    /1.0/main/user-group.json:
+        get:
+            tags:
+                - user-group
+            summary: Return a list of users-groups
+            responses:
+                200:
+                    description: "ok"
+                    content:
+                        application/json:
+                            schema:
+                                type: array
+                                items:
+                                    $ref: '#/components/schemas/NewsItem'
+                403:
+                    description: "Unauthorized"

From baab8e94ce13fa86eaec4fbb2fd05ee806bec132 Mon Sep 17 00:00:00 2001
From: Boris Waaub <boris.waaub@gmail.com>
Date: Fri, 19 Apr 2024 17:46:12 +0200
Subject: [PATCH 026/283] Add ticket to storeand  catch error with toast in
 component

---
 .../Resources/public/vuejs/TicketApp/App.vue  | 15 ++++++++--
 .../Resources/public/vuejs/TicketApp/index.ts |  8 ++++--
 .../public/vuejs/TicketApp/store/index.ts     |  3 ++
 .../vuejs/TicketApp/store/modules/motive.ts   | 22 +++++----------
 .../vuejs/TicketApp/store/modules/ticket.ts   | 28 +++++++++++++++++++
 5 files changed, 56 insertions(+), 20 deletions(-)
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
index 19989d16f..b6e28952e 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
@@ -18,9 +18,10 @@
 
 <script lang="ts">
 
-    import { computed, defineComponent, onMounted } from 'vue';
+    import { computed, defineComponent, inject, onMounted } from 'vue';
     import { useStore } from 'vuex';
 
+
     // Types
     import { Person } from '../../../../../../ChillPersonBundle/Resources/public/types';
     import { Motive, Ticket } from '../../types';
@@ -31,11 +32,19 @@
 
         setup() {
             const store = useStore();
-            const ticket = JSON.parse(window.initialTicket) as Ticket;
+            const toast = inject('toast') as any;
+
+            store.commit('setTicket', JSON.parse(window.initialTicket) as Ticket);
+
             const motives = computed(() => store.getters.getMotives as Motive[])
+            const ticket = computed(() => store.getters.getTicket as Ticket)
 
             onMounted(() => {
-                store.dispatch('fetchMotives');
+                try {
+                    store.dispatch('fetchMotives')
+                } catch (error) {
+                    toast.error(error)
+                };
             });
 
             return {
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts
index 182925b92..c63968469 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts
@@ -19,10 +19,14 @@ const i18n = _createI18n(messages);
 
 const _app = createApp({
         template: '<app></app>',
-    })
+    });
+
+    _app
     .use(store)
     .use(i18n)
-    .use(VueToast)
+    // Cant use this.$toast in components in composition API so we need to provide it
+    // Fix: with vue-toast-notification@^3
+    .use(VueToast).provide('toast', _app.config.globalProperties.$toast)
     .component('app', App)
     .mount('#ticketRoot');
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts
index 013a6d68a..b26eaa611 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts
@@ -1,12 +1,15 @@
 import { createStore } from "vuex";
 import { State as MotiveStates, moduleMotive } from "./modules/motive";
+import { State as TicketStates, moduleTicket } from "./modules/ticket";
 
 export type RootState = {
     motive: MotiveStates;
+    ticket: TicketStates;
   };
 
 export const store = createStore({
     modules: {
         motive:moduleMotive,
+        ticket:moduleTicket,
       }
 });
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/motive.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/motive.ts
index 85aa0e36c..88d6091ba 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/motive.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/motive.ts
@@ -11,7 +11,7 @@ export interface State {
 
 export const moduleMotive: Module<State, RootState> ={
     state: () => ({
-        motives: [],
+        motives: [] as Array<Motive>,
     }),
     getters: {
         getMotives(state) {
@@ -25,23 +25,15 @@ export const moduleMotive: Module<State, RootState> ={
     },
     actions: {
         async fetchMotives({ commit }) {
-            try{
-                const results = await fetchResults("/api/1.0/ticket/motive.json") as Motive[];
-                commit("setMotives", results);
-            }
-            catch (e) {
-                console.error("Error while fetching motives", e);
-            }
+            const results = await fetchResults("/api/1.0/ticket/motive.json") as Motive[];
+            commit("setMotives", results);
+            return results;
         },
         async createMotive({ commit }, datas: {currentMotiveId: number, motive: Motive}) {
             const { currentMotiveId, motive } = datas;
-            try {
-                const result = await makeFetch("POST", `/api/1.0/ticket/${currentMotiveId}/motive/set`, motive);
-                commit("setMotives", result);;
-            }
-            catch (e) {
-                console.error("Error while creating motive", e);
-            }
+            const result = await makeFetch("POST", `/api/1.0/ticket/${currentMotiveId}/motive/set`, motive);
+            commit("setMotives", result);
+            return result;
         }
     },
 };
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
new file mode 100644
index 000000000..4e3a55762
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
@@ -0,0 +1,28 @@
+import { fetchResults, makeFetch } from "../../../../../../../../ChillMainBundle/Resources/public/lib/api/apiMethods";
+
+import { Module } from "vuex";
+import { RootState } from "..";
+
+import { Ticket } from "../../../../types";
+
+export interface State {
+    ticket: Ticket;
+}
+
+export const moduleTicket: Module<State, RootState> ={
+    state: () => ({
+        ticket: {} as Ticket,
+    }),
+    getters: {
+        getTicket(state) {
+            return state.ticket;
+          }
+    },
+    mutations: {
+        setTicket(state, ticket) {
+            state.ticket = ticket;
+        }
+    },
+    actions: {
+    },
+};

From 46fb1c04b57cd6fd4224e389e8d6720e67027ee3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 22 Apr 2024 12:01:28 +0200
Subject: [PATCH 027/283] Add color and exclusion fields to UserGroup

This commit introduces new fields to the UserGroup entity, specifically background color, foreground color, and an exclusion key. These have been implemented both in the PHP entity and TypeScript interface definitions. Additionally, a Doctrine migration has been created to reflect these changes on the database side.
---
 .../ChillMainBundle/Entity/UserGroup.php      | 61 +++++++++++++++++++
 .../ChillMainBundle/Resources/public/types.ts |  9 +++
 .../migrations/Version20240422091752.php      | 41 +++++++++++++
 3 files changed, 111 insertions(+)
 create mode 100644 src/Bundle/ChillMainBundle/migrations/Version20240422091752.php

diff --git a/src/Bundle/ChillMainBundle/Entity/UserGroup.php b/src/Bundle/ChillMainBundle/Entity/UserGroup.php
index d6e343d00..470a21a70 100644
--- a/src/Bundle/ChillMainBundle/Entity/UserGroup.php
+++ b/src/Bundle/ChillMainBundle/Entity/UserGroup.php
@@ -38,6 +38,24 @@ class UserGroup
     #[ORM\JoinTable(name: 'chill_main_user_group_user')]
     private Collection $users;
 
+    #[ORM\Column(type: 'text', nullable: false, options: ['default' => '#ffffffff'])]
+    #[Serializer\Groups(['read'])]
+    private string $backgroundColor = '#ffffffff';
+
+    #[ORM\Column(type: 'text', nullable: false, options: ['default' => '#000000ff'])]
+    #[Serializer\Groups(['read'])]
+    private string $foregroundColor = '#000000ff';
+
+    /**
+     * Groups with same exclude key are mutually exclusive: adding one in a many-to-one relationship
+     * will exclude others.
+     *
+     * An empty string means "no exclusion"
+     */
+    #[ORM\Column(type: 'text', nullable: false, options: ['default' => ''])]
+    #[Serializer\Groups(['read'])]
+    private string $excludeKey = '';
+
     public function __construct()
     {
         $this->users = new ArrayCollection();
@@ -75,4 +93,47 @@ class UserGroup
     {
         return $this->users;
     }
+
+    public function getForegroundColor(): string
+    {
+        return $this->foregroundColor;
+    }
+
+    public function getExcludeKey(): string
+    {
+        return $this->excludeKey;
+    }
+
+    public function getBackgroundColor(): string
+    {
+        return $this->backgroundColor;
+    }
+
+    public function setForegroundColor(string $foregroundColor): self
+    {
+        $this->foregroundColor = $foregroundColor;
+
+        return $this;
+    }
+
+    public function setBackgroundColor(string $backgroundColor): self
+    {
+        $this->backgroundColor = $backgroundColor;
+
+        return $this;
+    }
+
+    public function setExcludeKey(string $excludeKey): self
+    {
+        $this->excludeKey = $excludeKey;
+
+        return $this;
+    }
+
+    public function setLabel(array $label): self
+    {
+        $this->label = $label;
+
+        return $this;
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/types.ts b/src/Bundle/ChillMainBundle/Resources/public/types.ts
index 2e33b8248..840a0e939 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/types.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/types.ts
@@ -42,6 +42,15 @@ export interface User {
   // todo: mainCenter; mainJob; etc..
 }
 
+export interface UserGroup {
+    type: "chill_main_user_group",
+    id: number,
+    label: TranslatableString,
+    backgroundColor: string,
+    foregroundColor: string,
+    excludeKey: string,
+}
+
 export interface UserAssociatedInterface {
   type: "user";
   id: number;
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20240422091752.php b/src/Bundle/ChillMainBundle/migrations/Version20240422091752.php
new file mode 100644
index 000000000..960b3cc79
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/migrations/Version20240422091752.php
@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\Migrations\Main;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20240422091752 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add colors and exclude string to user groups';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_main_user_group ADD backgroundColor TEXT DEFAULT \'#ffffffff\' NOT NULL');
+        $this->addSql('ALTER TABLE chill_main_user_group ADD foregroundColor TEXT DEFAULT \'#000000ff\' NOT NULL');
+        $this->addSql('ALTER TABLE chill_main_user_group ADD excludeKey TEXT DEFAULT \'\' NOT NULL');
+        $this->addSql('ALTER INDEX idx_1e07f044d2112630 RENAME TO IDX_738BC82BD2112630');
+        $this->addSql('ALTER INDEX idx_1e07f044a76ed395 RENAME TO IDX_738BC82BA76ED395');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_main_user_group DROP backgroundColor');
+        $this->addSql('ALTER TABLE chill_main_user_group DROP foregroundColor');
+        $this->addSql('ALTER TABLE chill_main_user_group DROP excludeKey');
+        $this->addSql('ALTER INDEX idx_738bc82bd2112630 RENAME TO idx_1e07f044d2112630');
+        $this->addSql('ALTER INDEX idx_738bc82ba76ed395 RENAME TO idx_1e07f044a76ed395');
+    }
+}

From 0bc6e62d4d6d29be4c593990cc956edfb4be226e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 22 Apr 2024 12:01:49 +0200
Subject: [PATCH 028/283] Add fixtures for UserGroup

---
 .../DataFixtures/ORM/LoadUserGroup.php        | 68 +++++++++++++++++++
 1 file changed, 68 insertions(+)
 create mode 100644 src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUserGroup.php

diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUserGroup.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUserGroup.php
new file mode 100644
index 000000000..614a83515
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUserGroup.php
@@ -0,0 +1,68 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\DataFixtures\ORM;
+
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Entity\UserGroup;
+use Doctrine\Bundle\FixturesBundle\Fixture;
+use Doctrine\Bundle\FixturesBundle\FixtureGroupInterface;
+use Doctrine\Persistence\ObjectManager;
+
+class LoadUserGroup extends Fixture implements FixtureGroupInterface
+{
+    public static function getGroups(): array
+    {
+        return ['user-group'];
+    }
+
+    public function load(ObjectManager $manager)
+    {
+        $centerASocial = $manager->getRepository(User::class)->findOneBy(['username' => 'center a_social']);
+        $centerBSocial = $manager->getRepository(User::class)->findOneBy(['username' => 'center b_social']);
+        $multiCenter = $manager->getRepository(User::class)->findOneBy(['username' => 'multi_center']);
+        $administrativeA = $manager->getRepository(User::class)->findOneBy(['username' => 'center a_administrative']);
+        $administrativeB = $manager->getRepository(User::class)->findOneBy(['username' => 'center b_administrative']);
+
+        $level1 = $this->generateLevelGroup('Niveau 1', '#eec84aff', '#000000ff', 'level');
+        $level1->addUser($centerASocial)->addUser($centerBSocial);
+        $manager->persist($level1);
+
+        $level2 = $this->generateLevelGroup('Niveau 2', ' #e2793dff', '#000000ff', 'level');
+        $level2->addUser($multiCenter);
+        $manager->persist($level2);
+
+        $level3 = $this->generateLevelGroup('Niveau 3', ' #df4949ff', '#000000ff', 'level');
+        $level3->addUser($multiCenter);
+        $manager->persist($level3);
+
+        $tss = $this->generateLevelGroup('Travailleur sociaux', '#43b29dff', '#000000ff', '');
+        $tss->addUser($multiCenter)->addUser($centerASocial)->addUser($centerBSocial);
+        $manager->persist($tss);
+        $admins = $this->generateLevelGroup('Administratif', '#334d5cff', '#000000ff', '');
+        $admins->addUser($administrativeA)->addUser($administrativeB);
+        $manager->persist($admins);
+
+        $manager->flush();
+    }
+
+    private function generateLevelGroup(string $title, string $backgroundColor, string $foregroundColor, string $excludeKey): UserGroup
+    {
+        $userGroup = new UserGroup();
+
+        return $userGroup
+            ->setLabel(['fr' => $title])
+            ->setBackgroundColor($backgroundColor)
+            ->setForegroundColor($foregroundColor)
+            ->setExcludeKey($excludeKey)
+        ;
+    }
+}

From 9f355032a818dfc2659451fa0652801f393fb90e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 22 Apr 2024 12:41:43 +0200
Subject: [PATCH 029/283] Create a "do not exclude" validation constraint for
 user groups

---
 .../Validator/UserGroupDoNotExcludeTest.php   | 91 +++++++++++++++++++
 .../Constraint/UserGroupDoNotExclude.php      | 31 +++++++
 .../Validator/UserGroupDoNotExclude.php       | 69 ++++++++++++++
 3 files changed, 191 insertions(+)
 create mode 100644 src/Bundle/ChillMainBundle/Tests/Validation/Validator/UserGroupDoNotExcludeTest.php
 create mode 100644 src/Bundle/ChillMainBundle/Validation/Constraint/UserGroupDoNotExclude.php
 create mode 100644 src/Bundle/ChillMainBundle/Validation/Validator/UserGroupDoNotExclude.php

diff --git a/src/Bundle/ChillMainBundle/Tests/Validation/Validator/UserGroupDoNotExcludeTest.php b/src/Bundle/ChillMainBundle/Tests/Validation/Validator/UserGroupDoNotExcludeTest.php
new file mode 100644
index 000000000..d6d1c9887
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Tests/Validation/Validator/UserGroupDoNotExcludeTest.php
@@ -0,0 +1,91 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Tests\Validation\Validator;
+
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Entity\UserGroup;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\MainBundle\Validation\Validator\UserGroupDoNotExclude;
+use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class UserGroupDoNotExcludeTest extends ConstraintValidatorTestCase
+{
+    protected function createValidator()
+    {
+        return new UserGroupDoNotExclude(
+            new class () implements TranslatableStringHelperInterface {
+                public function localize(array $translatableStrings): ?string
+                {
+                    return $translatableStrings['fr'];
+                }
+            }
+        );
+    }
+
+    public function testEmptyArrayIsValid(): void
+    {
+        $this->validator->validate([], new \Chill\MainBundle\Validation\Constraint\UserGroupDoNotExclude());
+
+        $this->assertNoViolation();
+    }
+
+    public function testMixedUserGroupAndUsersIsValid(): void
+    {
+        $this->validator->validate(
+            [new User(), new UserGroup()],
+            new \Chill\MainBundle\Validation\Constraint\UserGroupDoNotExclude()
+        );
+
+        $this->assertNoViolation();
+    }
+
+    public function testDifferentExcludeKeysIsValid(): void
+    {
+        $this->validator->validate(
+            [(new UserGroup())->setExcludeKey('A'), (new UserGroup())->setExcludeKey('B')],
+            new \Chill\MainBundle\Validation\Constraint\UserGroupDoNotExclude()
+        );
+
+        $this->assertNoViolation();
+    }
+
+    public function testMultipleGroupsWithEmptyExcludeKeyIsValid(): void
+    {
+        $this->validator->validate(
+            [(new UserGroup())->setExcludeKey(''), (new UserGroup())->setExcludeKey('')],
+            new \Chill\MainBundle\Validation\Constraint\UserGroupDoNotExclude()
+        );
+
+        $this->assertNoViolation();
+    }
+
+    public function testSameExclusionKeyWillRaiseError(): void
+    {
+        $this->validator->validate(
+            [
+                (new UserGroup())->setExcludeKey('A')->setLabel(['fr' => 'Group 1']),
+                (new UserGroup())->setExcludeKey('A')->setLabel(['fr' => 'Group 2']),
+            ],
+            new \Chill\MainBundle\Validation\Constraint\UserGroupDoNotExclude()
+        );
+
+        $this->buildViolation('The groups {{ excluded_groups }} do exclude themselves. Please choose one between them')
+            ->setParameter('excluded_groups', 'Group 1, Group 2')
+            ->setCode('e16c8226-0090-11ef-8560-f7239594db09')
+            ->assertRaised();
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Validation/Constraint/UserGroupDoNotExclude.php b/src/Bundle/ChillMainBundle/Validation/Constraint/UserGroupDoNotExclude.php
new file mode 100644
index 000000000..5ec688e5b
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Validation/Constraint/UserGroupDoNotExclude.php
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Validation\Constraint;
+
+use Symfony\Component\Validator\Constraint;
+
+#[\Attribute(\Attribute::TARGET_PROPERTY)]
+class UserGroupDoNotExclude extends Constraint
+{
+    public string $message = 'The groups {{ excluded_groups }} do exclude themselves. Please choose one between them';
+    public string $code = 'e16c8226-0090-11ef-8560-f7239594db09';
+
+    public function getTargets()
+    {
+        return [self::PROPERTY_CONSTRAINT];
+    }
+
+    public function validatedBy()
+    {
+        return \Chill\MainBundle\Validation\Validator\UserGroupDoNotExclude::class;
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Validation/Validator/UserGroupDoNotExclude.php b/src/Bundle/ChillMainBundle/Validation/Validator/UserGroupDoNotExclude.php
new file mode 100644
index 000000000..9bd7167c7
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Validation/Validator/UserGroupDoNotExclude.php
@@ -0,0 +1,69 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Validation\Validator;
+
+use Chill\MainBundle\Entity\UserGroup;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\ConstraintValidator;
+use Symfony\Component\Validator\Exception\UnexpectedTypeException;
+use Symfony\Component\Validator\Exception\UnexpectedValueException;
+
+final class UserGroupDoNotExclude extends ConstraintValidator
+{
+    public function __construct(private readonly TranslatableStringHelperInterface $translatableStringHelper) {}
+
+    public function validate($value, Constraint $constraint)
+    {
+        if (!$constraint instanceof \Chill\MainBundle\Validation\Constraint\UserGroupDoNotExclude) {
+            throw new UnexpectedTypeException($constraint, UserGroupDoNotExclude::class);
+        }
+
+        if (null === $value) {
+            return;
+        }
+
+        if (!is_iterable($value)) {
+            throw new UnexpectedValueException($value, 'iterable');
+        }
+
+        $groups = [];
+
+        foreach ($value as $gr) {
+            if ($gr instanceof UserGroup) {
+                $groups[$gr->getExcludeKey()][] = $gr;
+            }
+        }
+
+        foreach ($groups as $excludeKey => $groupByKey) {
+            if ('' === $excludeKey) {
+                continue;
+            }
+
+            if (1 < count($groupByKey)) {
+                $excludedGroups = implode(
+                    ', ',
+                    array_map(
+                        fn (UserGroup $group) => $this->translatableStringHelper->localize($group->getLabel()),
+                        $groupByKey
+                    )
+                );
+
+                $this->context
+                    ->buildViolation($constraint->message)
+                    ->setCode($constraint->code)
+                    ->setParameters(['excluded_groups' => $excludedGroups])
+                    ->addViolation();
+            }
+        }
+    }
+}

From 800a952532b3c87a9246a1f6f900c879f90be77a Mon Sep 17 00:00:00 2001
From: Boris Waaub <boris.waaub@gmail.com>
Date: Tue, 23 Apr 2024 20:41:32 +0200
Subject: [PATCH 030/283] Add base template

---
 .../Resources/public/vuejs/TicketApp/App.vue  | 90 ++++++++++---------
 .../components/ActionToolbarComponent.vue     | 59 ++++++++++++
 .../TicketApp/components/BannerComponent.vue  | 65 ++++++++++++++
 .../components/MotiveListComponent.vue        | 43 +++++++++
 .../components/TicketHistoryListComponent.vue | 61 +++++++++++++
 .../components/TicketSelectorComponent.vue    | 42 +++++++++
 .../public/vuejs/TicketApp/i18n/messages.ts   | 11 ++-
 .../Resources/public/vuejs/TicketApp/index.ts |  3 +-
 .../src/Resources/views/layout.html.twig      |  6 +-
 9 files changed, 330 insertions(+), 50 deletions(-)
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/MotiveListComponent.vue
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketSelectorComponent.vue

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
index b6e28952e..cfe0b31bc 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
@@ -1,59 +1,65 @@
-
 <template>
-    <div>
-        <p>{{ ticket.externalRef }}</p>
-        <p>{{ ticket.currentMotive }}</p>
+    <banner-component :ticket="ticket" />
+    <div class="container-xxl p-2">
+        <ticket-selector-component :tickets="[]" />
+        <ticket-history-list-component :history="ticket.history" />
+        <motive-list-component :motives="motives" />
     </div>
-
-    <div v-for="person in ticket.currentPersons as Person[]" :key="person.id">
-        <p>{{ person.firstName }}</p>
-        <p>{{ person.lastName }}</p>
-    </div>
-    <div v-for="ticket_history_line in ticket.history">
-        <p>{{ ticket_history_line.event_type}}</p>
-        <p>{{ ticket_history_line.data}}</p>
-    </div>
-
+    <action-toolbar-component />
 </template>
 
 <script lang="ts">
 
-    import { computed, defineComponent, inject, onMounted } from 'vue';
-    import { useStore } from 'vuex';
+import { computed, defineComponent, inject, onMounted, ref } from 'vue';
+import { useStore } from 'vuex';
 
 
-    // Types
-    import { Person } from '../../../../../../ChillPersonBundle/Resources/public/types';
-    import { Motive, Ticket } from '../../types';
+// Types
+import { Motive, Ticket } from '../../types';
 
+// Components
+import TicketSelectorComponent from './components/TicketSelectorComponent.vue';
+import TicketHistoryListComponent from './components/TicketHistoryListComponent.vue';
+import ActionToolbarComponent from './components/ActionToolbarComponent.vue';
+import BannerComponent from './components/BannerComponent.vue';
+import MotiveListComponent from './components/MotiveListComponent.vue';
 
-    export default defineComponent({
-        name: 'App',
+export default defineComponent({
+    name: 'App',
+    components: {
+        BannerComponent,
+        TicketSelectorComponent,
+        TicketHistoryListComponent,
+        MotiveListComponent,
+        ActionToolbarComponent
+    },
+    setup() {
+        const store = useStore();
+        const toast = inject('toast') as any;
+        const headline = ref({} as HTMLHeadingElement);
 
-        setup() {
-            const store = useStore();
-            const toast = inject('toast') as any;
+        store.commit('setTicket', JSON.parse(window.initialTicket) as Ticket);
 
-            store.commit('setTicket', JSON.parse(window.initialTicket) as Ticket);
+        const motives = computed(() => store.getters.getMotives as Motive[])
+        const ticket = computed(() => store.getters.getTicket as Ticket)
 
-            const motives = computed(() => store.getters.getMotives as Motive[])
-            const ticket = computed(() => store.getters.getTicket as Ticket)
+        onMounted(() => {
+            console.log(headline.value.textContent);
 
-            onMounted(() => {
-                try {
-                    store.dispatch('fetchMotives')
-                } catch (error) {
-                    toast.error(error)
-                };
-            });
-
-            return {
-                motives,
-                ticket,
+            try {
+                store.dispatch('fetchMotives')
+            } catch (error) {
+                toast.error(error)
             };
-        },
-    });
+        });
+
+        return {
+            headline,
+            motives,
+            ticket,
+        };
+    },
+});
 </script>
 
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
new file mode 100644
index 000000000..96741bb34
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
@@ -0,0 +1,59 @@
+<template>
+    <div class="sticky-bottom">
+        <div class="footer-ticket-details"><button class="btn btn-chill-green text-white">Enregistrer</button></div>
+        <div class="footer-ticket-main">
+            <ul class="nav nav-tabs justify-content-end">
+
+                <li class="nav-item">
+                    <button type="button" class="m-2 btn btn-light">
+                        <i class="fa fa-plus"></i>
+                        Commentaire
+                    </button>
+                </li>
+                <li class="nav-item">
+                    <button type="button" class="m-2 btn btn-light">
+                        <i class="fa fa-paper-plane"></i>
+                        Transfert
+                    </button>
+                </li>
+                <li class="nav-item">
+                    <button type="button" class="m-2 btn btn-light">
+                        <i class="fa fa-paint-brush"></i>
+                        Motif
+                    </button>
+                </li>
+                <li class="nav-item">
+                    <button type="button" class="m-2 btn btn-light">
+                        <i class="fa fa-bolt"></i>
+                        Fermer
+                    </button>
+                </li>
+            </ul>
+        </div>
+
+    </div>
+</template>
+
+<script lang="ts">
+import { defineComponent } from 'vue';
+import { useStore } from 'vuex';
+
+
+export default defineComponent({
+    name: 'ActionToolbarComponent',
+    setup(props, ctx) {
+        const store = useStore();
+    },
+});
+</script>
+<style lang="scss" scoped>
+div.sticky-bottom {
+    div.footer-ticket-main {
+        background: none repeat scroll 0 0 #CABB9F;
+    }
+
+    div.footer-ticket-details {
+        background: none repeat scroll 0 0 #EFE2CA;
+    }
+}
+</style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
new file mode 100644
index 000000000..31c2f9f63
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
@@ -0,0 +1,65 @@
+<template>
+    <div class="banner banner-ticket ">
+        <div id="header-ticket-main" class="header-name">
+            <div class="container-xxl text-primary">
+                <div class="row">
+                    <div class="col-md-6 ps-md-5 ps-xxl-0 ">
+                        <h2>
+                            # {{ ticket.externalRef }}
+                        </h2>
+                        <h1>
+                            {{ ticket.currentMotive ? ticket.currentMotive.label.fr : 'Aucun motif' }}
+                        </h1>
+                    </div>
+
+                    <div class="col-md-6">
+                        <div class="float-end">
+                            <h1><span class="badge text-bg-chill-green text-white">Ouvert</span></h1>
+                            <h3 class="fst-italic">Depuis</h3>
+                        </div>
+                    </div>
+                </div>
+            </div>
+        </div>
+        <div id="header-ticket-details" class="header-details">
+            <div class="container-xxl">
+                <div class="row justify-content-between">
+                    <div class="col-md-4 col-sm-12">
+                        <h3 class="text-primary">Patient concerné</h3>
+                        <h2><span class="badge text-bg-light" v-for="person in ticket.currentPersons"> {{ person.text
+                                }}</span></h2>
+                    </div>
+                    <div class="col-md-4 col-sm-12">
+                        <h3 class="text-primary">Appelant</h3>
+                        <h2><span class="badge text-bg-light" v-for="person in ticket.currentPersons"> {{ person.text
+                                }}</span></h2>
+
+                    </div>
+                    <div class="col-md-4 col-sm-12">
+                        <h3 class="text-primary">Intervenant</h3>
+                        <h2><span class="badge text-bg-light" v-for="person in ticket.currentPersons"> {{ person.text
+                                }}</span></h2>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script lang="ts">
+import { PropType, defineComponent } from 'vue';
+import { Ticket } from '../../../types';
+
+export default defineComponent({
+    name: 'BannerComponent',
+    props: {
+        ticket: {
+            type: Object as PropType<Ticket>,
+            required: true,
+        },
+    },
+    setup() {
+        return {}
+    }
+});
+</script>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/MotiveListComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/MotiveListComponent.vue
new file mode 100644
index 000000000..12ae6705b
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/MotiveListComponent.vue
@@ -0,0 +1,43 @@
+<template>
+    <div class="card my-2 bg-light" v-for="motive in motives" :key="motive.id">
+        <div class="card-header">
+            <span class="fw-bold fst-italic">
+
+            </span>
+            <span class="badge bg-white text-black mx-1">{{motive.active}}</span>
+        </div>
+        <div class="card-body row fst-italic">
+            <div class="col-12">
+                <i class="fa fa-comment" style="min-width: 16px;"></i>
+                <span class="mx-1">
+                  {{ motive.label.fr }}
+                </span>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script lang="ts">
+
+import {  PropType, defineComponent } from 'vue';
+
+
+
+// Types
+import { Motive } from '../../../types';
+
+export default defineComponent({
+    name: 'MotiveListComponent',
+    props: {
+        motives: {
+            type: Object as PropType<Motive[]>,
+            required: true,
+        },
+    },
+    setup() {
+        return {}
+    }
+});
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
new file mode 100644
index 000000000..42f5b071b
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
@@ -0,0 +1,61 @@
+<template>
+    <div class="card my-2 bg-light" v-for="history_line in history" :key="history_line.data.id">
+        <div class="card-header">
+            <span class="fw-bold fst-italic">
+                {{ formatDate(history_line.at) }}
+            </span>
+            <span class="badge bg-white text-black mx-1">{{ history_line.by.username }}</span>
+        </div>
+        <div class="card-body row fst-italic" v-if="history_line.event_type == 'add_person'">
+            <div class="col-12">
+                <i class="fa fa-bolt" style="min-width: 16px;"></i>
+                <span class="mx-1">
+                    {{ $t('history.person',{ text: history_line.data.person.text }) }}
+                </span>
+            </div>
+            <div class="col-12">
+                <i class="fa fa-eyedropper"></i>
+                <span class="mx-1">
+                    {{ $t('history.user',{ username: history_line.by.username }) }}
+                </span>
+            </div>
+
+            <div class="col-12">
+                <i class="fa fa-paint-brush"></i>
+                <span class="mx-1">
+                    {{ $t('history.motive',{ text: history_line.data.person.text }) }}
+                </span>
+            </div>
+        </div>
+    </div>
+</template>
+
+<script lang="ts">
+
+import { PropType, defineComponent } from 'vue';
+import { DateTime } from '../../../../../../../ChillMainBundle/Resources/public/types';
+import { Ticket } from '../../../types';
+
+export default defineComponent({
+    name: 'TicketHistoryListComponent',
+    props: {
+        history: {
+            type: Array as PropType<Ticket["history"]>,
+            required: true,
+        },
+    },
+
+    setup() {
+
+        function formatDate(d: DateTime) {
+            const date = new Date(d.datetime);
+            const month = date.toLocaleString('default', { month: 'long' });
+            return `${date.getDate()} ${month} ${date.getFullYear()}, ${date.getHours()}:${date.getMinutes()}`
+        }
+
+        return { formatDate }
+    }
+});
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketSelectorComponent.vue
new file mode 100644
index 000000000..7d1326513
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketSelectorComponent.vue
@@ -0,0 +1,42 @@
+<template>
+    <div class="btn-group">
+        <button type="button" class="btn btn-light dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
+            {{ $t('ticket.previous_tickets') }}
+            <span class="position-absolute top-0 start-100 translate-middle badge rounded-pill bg-danger">
+                {{ tickets.length }}
+                <span class="visually-hidden">unread messages</span>
+            </span>
+
+        </button>
+        <ul class="dropdown-menu">
+            <li><button class="dropdown-item" type="button">Action</button></li>
+            <li><button class="dropdown-item" type="button">Another action</button></li>
+            <li><button class="dropdown-item" type="button">Something else here</button></li>
+        </ul>
+    </div>
+</template>
+
+<script lang="ts">
+
+import { PropType, defineComponent } from 'vue';
+
+
+
+// Types
+import { Ticket } from '../../../types';
+
+export default defineComponent({
+    name: 'TicketSelectorComponent',
+    props: {
+        tickets: {
+            type: Object as PropType<Ticket[]>,
+            required: true,
+        },
+    },
+    setup() {
+        return {}
+    }
+});
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
index 4065765f3..9bc5d751c 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
@@ -1,5 +1,12 @@
 export const messages = {
     fr: {
-        hello: "Bonjour {name}"
-    }
+        ticket: {
+            previous_tickets: "Précédents tickets",
+        },
+        history: {
+            person: "Ouverture par appel téléphonique de {text}",
+            user: "Prise en charge par {username}",
+            motive: "Motif indiqué: {motive}",
+        },
+    },
 };
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts
index c63968469..e6f9011b0 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts
@@ -2,12 +2,13 @@ import App from './App.vue';
 import {createApp} from "vue";
 
 import { _createI18n } from "../../../../../../ChillMainBundle/Resources/public/vuejs/_js/i18n";
-import {messages} from "./i18n/messages";
+
 
 import VueToast from 'vue-toast-notification';
 import 'vue-toast-notification/dist/theme-sugar.css';
 
 import { store } from "./store";
+import { messages } from './i18n/messages';
 
 declare global {
     interface Window {
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/views/layout.html.twig b/src/Bundle/ChillTicketBundle/src/Resources/views/layout.html.twig
index 7b397a0e5..8936d1c31 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/views/layout.html.twig
+++ b/src/Bundle/ChillTicketBundle/src/Resources/views/layout.html.twig
@@ -13,9 +13,5 @@
 {% endblock %}
 
 {% block wrapping_content %}
-    <div class="row">
-        <div class="col-md-8 col-sm-12">
-            {% block content %}{% endblock %}
-        </div>
-    </div>
+    {% block content %}{% endblock %}
 {% endblock %}

From b434d38091508a6fda2ae1e7abb365975322746f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 23 Apr 2024 17:47:07 +0200
Subject: [PATCH 031/283] Add functionality to set addressees for a ticket

This update includes the implementation of methods to add and retrieve addressee history in the Ticket entity, a handler for addressee setting command, denormalizer for transforming request data to SetAddresseesCommand, and corresponding tests. Additionally, it adds a SetAddresseesController for handling addressee related requests and updates the API specifications.
---
 .../ChillMainBundle/chill.api.specs.yaml      |  38 ++++-
 .../config/services/validator.yaml            |   3 +
 .../ChillTicketBundle/chill.api.specs.yaml    |  36 +++++
 .../Handler/SetAddresseesCommandHandler.php   |  50 ++++++
 .../Action/Ticket/SetAddresseesCommand.php    |  31 ++++
 .../Controller/SetAddresseesController.php    |  67 ++++++++
 .../src/Entity/AddresseeHistory.php           |   9 ++
 .../src/Entity/PersonHistory.php              |   7 +
 .../ChillTicketBundle/src/Entity/Ticket.php   |  16 ++
 .../SetAddresseesCommandDenormalizer.php      |  56 +++++++
 .../src/config/services.yaml                  |   6 +-
 .../SetAddressesCommandHandlerTest.php        | 118 ++++++++++++++
 .../SetAddresseesControllerTest.php           | 146 ++++++++++++++++++
 .../tests/Entity/TicketTest.php               |  31 ++++
 .../SetAddresseesCommandDenormalizerTest.php  |  66 ++++++++
 15 files changed, 677 insertions(+), 3 deletions(-)
 create mode 100644 src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/SetAddresseesCommandHandler.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Action/Ticket/SetAddresseesCommand.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Controller/SetAddresseesController.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/SetAddresseesCommandDenormalizer.php
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/SetAddressesCommandHandlerTest.php
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Controller/SetAddresseesControllerTest.php
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/SetAddresseesCommandDenormalizerTest.php

diff --git a/src/Bundle/ChillMainBundle/chill.api.specs.yaml b/src/Bundle/ChillMainBundle/chill.api.specs.yaml
index fec36312d..958afab07 100644
--- a/src/Bundle/ChillMainBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillMainBundle/chill.api.specs.yaml
@@ -29,6 +29,42 @@ components:
                     type: string
                 text:
                     type: string
+        UserById:
+            type: object
+            properties:
+                id:
+                    type: integer
+                type:
+                    type: string
+                    enum:
+                        - user
+        UserGroup:
+            type: object
+            properties:
+                id:
+                    type: integer
+                type:
+                    type: string
+                    enum:
+                        - user_group
+                label:
+                    type: object
+                    additionalProperties: true
+                backgroundColor:
+                    type: string
+                foregroundColor:
+                    type: string
+                exclusionKey:
+                    type: string
+        UserGroupById:
+            type: object
+            properties:
+                id:
+                    type: integer
+                type:
+                    type: string
+                    enum:
+                        - user_group
         Center:
             type: object
             properties:
@@ -921,6 +957,6 @@ paths:
                             schema:
                                 type: array
                                 items:
-                                    $ref: '#/components/schemas/NewsItem'
+                                    $ref: '#/components/schemas/UserGroup'
                 403:
                     description: "Unauthorized"
diff --git a/src/Bundle/ChillMainBundle/config/services/validator.yaml b/src/Bundle/ChillMainBundle/config/services/validator.yaml
index b3b60b9d6..32b8903cc 100644
--- a/src/Bundle/ChillMainBundle/config/services/validator.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/validator.yaml
@@ -3,6 +3,9 @@ services:
         autowire: true
         autoconfigure: true
 
+    Chill\MainBundle\Validation\:
+        resource: '../../Validation'
+
     chill_main.validator_user_circle_consistency:
         class: Chill\MainBundle\Validator\Constraints\Entity\UserCircleConsistencyValidator
         arguments:
diff --git a/src/Bundle/ChillTicketBundle/chill.api.specs.yaml b/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
index 86049cc24..232982f01 100644
--- a/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
@@ -93,3 +93,39 @@ paths:
                     description: "ACCEPTED"
                 422:
                     description: "UNPROCESSABLE ENTITY"
+
+    /1.0/ticket/{id}/addressees/set:
+        post:
+            tags:
+                - ticket
+            summary: Set the addresses for an existing ticket (will replace all the existing addresses)
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The ticket id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            requestBody:
+                required: true
+                content:
+                    application/json:
+                        schema:
+                            type: object
+                            properties:
+                                addresses:
+                                    type: array
+                                    items:
+                                        oneOf:
+                                            - $ref: '#/components/schemas/UserGroupById'
+                                            - $ref: '#/components/schemas/UserById'
+
+
+            responses:
+                201:
+                    description: "ACCEPTED"
+                422:
+                    description: "UNPROCESSABLE ENTITY"
+
diff --git a/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/SetAddresseesCommandHandler.php b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/SetAddresseesCommandHandler.php
new file mode 100644
index 000000000..25ac97e5d
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/SetAddresseesCommandHandler.php
@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Action\Ticket\Handler;
+
+use Chill\TicketBundle\Action\Ticket\SetAddresseesCommand;
+use Chill\TicketBundle\Entity\AddresseeHistory;
+use Chill\TicketBundle\Entity\Ticket;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\Clock\ClockInterface;
+
+final readonly class SetAddresseesCommandHandler
+{
+    public function __construct(
+        private ClockInterface $clock,
+        private EntityManagerInterface $entityManager,
+    ) {}
+
+    public function handle(Ticket $ticket, SetAddresseesCommand $command): void
+    {
+        // remove existing addresses which are not in the new addresses
+        foreach ($ticket->getAddresseeHistories() as $addressHistory) {
+            if (null !== $addressHistory->getEndDate()) {
+                continue;
+            }
+
+            if (!in_array($addressHistory->getAddressee(), $command->addressees, true)) {
+                $addressHistory->setEndDate($this->clock->now());
+            }
+        }
+
+        // add new addresses
+        foreach ($command->addressees as $address) {
+            if (in_array($address, $ticket->getCurrentAddressee(), true)) {
+                continue;
+            }
+
+            $history = new AddresseeHistory($address, $this->clock->now(), $ticket);
+            $this->entityManager->persist($history);
+        }
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Action/Ticket/SetAddresseesCommand.php b/src/Bundle/ChillTicketBundle/src/Action/Ticket/SetAddresseesCommand.php
new file mode 100644
index 000000000..824e2506f
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Action/Ticket/SetAddresseesCommand.php
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Action\Ticket;
+
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Entity\UserGroup;
+use Chill\MainBundle\Validation\Constraint\UserGroupDoNotExclude;
+use Symfony\Component\Serializer\Annotation\Groups;
+use Symfony\Component\Validator\Constraints\GreaterThan;
+
+final readonly class SetAddresseesCommand
+{
+    public function __construct(
+        /**
+         * @var list<UserGroup|User>
+         */
+        #[UserGroupDoNotExclude]
+        #[GreaterThan(0)]
+        #[Groups(['read'])]
+        public array $addressees
+    ) {}
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Controller/SetAddresseesController.php b/src/Bundle/ChillTicketBundle/src/Controller/SetAddresseesController.php
new file mode 100644
index 000000000..add8d480a
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Controller/SetAddresseesController.php
@@ -0,0 +1,67 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Controller;
+
+use Chill\TicketBundle\Action\Ticket\Handler\SetAddresseesCommandHandler;
+use Chill\TicketBundle\Action\Ticket\SetAddresseesCommand;
+use Chill\TicketBundle\Entity\Ticket;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
+use Symfony\Component\Serializer\SerializerInterface;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
+
+final readonly class SetAddresseesController
+{
+    public function __construct(
+        private Security                    $security,
+        private EntityManagerInterface      $entityManager,
+        private SerializerInterface         $serializer,
+        private SetAddresseesCommandHandler $addressesCommandHandler,
+        private ValidatorInterface          $validator,
+    ) {}
+
+    #[Route('/api/1.0/ticket/{id}/addressees/set', methods: ['POST'])]
+    public function setAddressees(Ticket $ticket, Request $request): Response
+    {
+        if (!$this->security->isGranted('ROLE_USER')) {
+            throw new AccessDeniedHttpException('Only users can set addressees.');
+        }
+
+        $command = $this->serializer->deserialize($request->getContent(), SetAddresseesCommand::class, 'json', [AbstractNormalizer::GROUPS => ['read']]);
+
+        if (0 < count($errors = $this->validator->validate($command))) {
+            return new JsonResponse(
+                $this->serializer->serialize($errors, 'json'),
+                Response::HTTP_UNPROCESSABLE_ENTITY,
+                [],
+                true
+            );
+        }
+
+        $this->addressesCommandHandler->handle($ticket, $command);
+
+        $this->entityManager->flush();
+
+        return new JsonResponse(
+            $this->serializer->serialize($ticket, 'json', ['groups' => 'read']),
+            Response::HTTP_OK,
+            [],
+            true,
+        );
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Entity/AddresseeHistory.php b/src/Bundle/ChillTicketBundle/src/Entity/AddresseeHistory.php
index 3939a24c3..b3718a9ca 100644
--- a/src/Bundle/ChillTicketBundle/src/Entity/AddresseeHistory.php
+++ b/src/Bundle/ChillTicketBundle/src/Entity/AddresseeHistory.php
@@ -54,6 +54,8 @@ class AddresseeHistory implements TrackUpdateInterface, TrackCreationInterface
         } else {
             $this->addresseeGroup = $addressee;
         }
+
+        $this->ticket->addAddresseeHistory($this);
     }
 
     public function getAddressee(): UserGroup|User
@@ -94,4 +96,11 @@ class AddresseeHistory implements TrackUpdateInterface, TrackCreationInterface
     {
         return $this->ticket;
     }
+
+    public function setEndDate(?\DateTimeImmutable $endDate): self
+    {
+        $this->endDate = $endDate;
+
+        return $this;
+    }
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Entity/PersonHistory.php b/src/Bundle/ChillTicketBundle/src/Entity/PersonHistory.php
index 57a9809e2..927ea978f 100644
--- a/src/Bundle/ChillTicketBundle/src/Entity/PersonHistory.php
+++ b/src/Bundle/ChillTicketBundle/src/Entity/PersonHistory.php
@@ -84,4 +84,11 @@ class PersonHistory implements TrackCreationInterface
     {
         return $this->removedBy;
     }
+
+    public function setEndDate(?\DateTimeImmutable $endDate): self
+    {
+        $this->endDate = $endDate;
+
+        return $this;
+    }
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php b/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php
index cd49d7377..04cfe828b 100644
--- a/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php
+++ b/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php
@@ -130,6 +130,14 @@ class Ticket implements TrackCreationInterface, TrackUpdateInterface
         $this->motiveHistories->add($motiveHistory);
     }
 
+    /**
+     * @internal use @see{AddresseHistory::__construct} instead
+     */
+    public function addAddresseeHistory(AddresseeHistory $addresseeHistory): void
+    {
+        $this->addresseeHistory->add($addresseeHistory);
+    }
+
     /**
      * @return list<UserGroup|User>
      */
@@ -195,4 +203,12 @@ class Ticket implements TrackCreationInterface, TrackUpdateInterface
     {
         return $this->personHistories;
     }
+
+    /**
+     * @return ReadableCollection<int, AddresseeHistory>
+     */
+    public function getAddresseeHistories(): ReadableCollection
+    {
+        return $this->addresseeHistory;
+    }
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/SetAddresseesCommandDenormalizer.php b/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/SetAddresseesCommandDenormalizer.php
new file mode 100644
index 000000000..d97ca5d92
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/SetAddresseesCommandDenormalizer.php
@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Serializer\Normalizer;
+
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Entity\UserGroup;
+use Chill\TicketBundle\Action\Ticket\SetAddresseesCommand;
+use Symfony\Component\Serializer\Exception\UnexpectedValueException;
+use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
+use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+
+final class SetAddresseesCommandDenormalizer implements DenormalizerInterface, DenormalizerAwareInterface
+{
+    use DenormalizerAwareTrait;
+
+    public function denormalize($data, string $type, ?string $format = null, array $context = [])
+    {
+        if (null === $data) {
+            return null;
+        }
+
+        if (!array_key_exists('addressees', $data)) {
+            throw new UnexpectedValueException("key 'addressees' does exists");
+        }
+
+        if (!is_array($data['addressees'])) {
+            throw new UnexpectedValueException("key 'addressees' must be an array");
+        }
+
+        $addresses = [];
+        foreach ($data['addressees'] as $address) {
+            $addresses[] = match ($address['type'] ?? '') {
+                'user_group' => $this->denormalizer->denormalize($address, UserGroup::class, $format, $context),
+                'user' => $this->denormalizer->denormalize($address, User::class, $format, $context),
+                default => throw new UnexpectedValueException('the type is not set or not supported')
+            };
+        }
+
+        return new SetAddresseesCommand($addresses);
+    }
+
+    public function supportsDenormalization($data, string $type, ?string $format = null)
+    {
+        return SetAddresseesCommand::class === $type && 'json' === $format;
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/config/services.yaml b/src/Bundle/ChillTicketBundle/src/config/services.yaml
index 490e215c4..006fa5cb6 100644
--- a/src/Bundle/ChillTicketBundle/src/config/services.yaml
+++ b/src/Bundle/ChillTicketBundle/src/config/services.yaml
@@ -14,5 +14,7 @@ services:
     Chill\TicketBundle\Serializer\:
         resource: '../Serializer/'
 
-    Chill\TicketBundle\DataFixtures\:
-        resource: '../DataFixtures/'
+when@dev:
+    services:
+        Chill\TicketBundle\DataFixtures\:
+            resource: '../DataFixtures/'
diff --git a/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/SetAddressesCommandHandlerTest.php b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/SetAddressesCommandHandlerTest.php
new file mode 100644
index 000000000..efb545bac
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/SetAddressesCommandHandlerTest.php
@@ -0,0 +1,118 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Tests\Action\Ticket\Handler;
+
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Entity\UserGroup;
+use Chill\TicketBundle\Action\Ticket\Handler\SetAddresseesCommandHandler;
+use Chill\TicketBundle\Action\Ticket\SetAddresseesCommand;
+use Chill\TicketBundle\Entity\AddresseeHistory;
+use Chill\TicketBundle\Entity\Ticket;
+use Doctrine\ORM\EntityManagerInterface;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Component\Clock\MockClock;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+final class SetAddressesCommandHandlerTest extends TestCase
+{
+    use ProphecyTrait;
+
+    public function testHandleOnEmptyAddresses(): void
+    {
+        $ticket = new Ticket();
+        $command = new SetAddresseesCommand([$user1 = new User(), $group1 = new UserGroup()]);
+
+        $entityManager = $this->prophesize(EntityManagerInterface::class);
+        $entityManager->persist(Argument::that(function ($arg) use ($user1) {
+            return $arg instanceof AddresseeHistory && $arg->getAddressee() === $user1;
+        }))->shouldBeCalledOnce();
+        $entityManager->persist(Argument::that(function ($arg) use ($group1) {
+            return $arg instanceof AddresseeHistory && $arg->getAddressee() === $group1;
+        }))->shouldBeCalledOnce();
+
+        $handler = $this->buildHandler($entityManager->reveal());
+
+        $handler->handle($ticket, $command);
+
+        self::assertCount(2, $ticket->getCurrentAddressee());
+    }
+
+    public function testHandleExistingUserIsNotRemovedNorCreatingDouble(): void
+    {
+        $ticket = new Ticket();
+        $user = new User();
+        $history = new AddresseeHistory($user, new \DateTimeImmutable('1 month ago'), $ticket);
+        $command = new SetAddresseesCommand([$user]);
+
+        $entityManager = $this->prophesize(EntityManagerInterface::class);
+        $entityManager->persist(Argument::that(function ($arg) use ($user) {
+            return $arg instanceof AddresseeHistory && $arg->getAddressee() === $user;
+        }))->shouldNotBeCalled();
+
+        $handler = $this->buildHandler($entityManager->reveal());
+
+        $handler->handle($ticket, $command);
+
+        self::assertNull($history->getEndDate());
+        self::assertCount(1, $ticket->getCurrentAddressee());
+    }
+
+    public function testHandleRemoveExistingAddressee(): void
+    {
+        $ticket = new Ticket();
+        $user = new User();
+        $group = new UserGroup();
+        $history = new AddresseeHistory($user, new \DateTimeImmutable('1 month ago'), $ticket);
+        $command = new SetAddresseesCommand([$group]);
+
+        $entityManager = $this->prophesize(EntityManagerInterface::class);
+        $entityManager->persist(Argument::that(function ($arg) use ($group) {
+            return $arg instanceof AddresseeHistory && $arg->getAddressee() === $group;
+        }))->shouldBeCalled();
+
+        $handler = $this->buildHandler($entityManager->reveal());
+
+        $handler->handle($ticket, $command);
+
+        self::assertNotNull($history->getEndDate());
+        self::assertContains($group, $ticket->getCurrentAddressee());
+    }
+
+    public function testAddingDoublingAddresseeDoesNotCreateDoubleHistories(): void
+    {
+        $ticket = new Ticket();
+        $group = new UserGroup();
+        $command = new SetAddresseesCommand([$group, $group]);
+
+        $entityManager = $this->prophesize(EntityManagerInterface::class);
+        $entityManager->persist(Argument::that(function ($arg) use ($group) {
+            return $arg instanceof AddresseeHistory && $arg->getAddressee() === $group;
+        }))->shouldBeCalledOnce();
+
+        $handler = $this->buildHandler($entityManager->reveal());
+
+        $handler->handle($ticket, $command);
+
+        self::assertCount(1, $ticket->getCurrentAddressee());
+    }
+
+    private function buildHandler(EntityManagerInterface $entityManager): SetAddresseesCommandHandler
+    {
+        return new SetAddresseesCommandHandler(new MockClock(), $entityManager);
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/SetAddresseesControllerTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/SetAddresseesControllerTest.php
new file mode 100644
index 000000000..ed842f742
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/SetAddresseesControllerTest.php
@@ -0,0 +1,146 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Tests\Controller;
+
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Entity\UserGroup;
+use Chill\TicketBundle\Action\Ticket\Handler\SetAddresseesCommandHandler;
+use Chill\TicketBundle\Action\Ticket\SetAddresseesCommand;
+use Chill\TicketBundle\Controller\SetAddresseesController;
+use Chill\TicketBundle\Entity\AddresseeHistory;
+use Chill\TicketBundle\Entity\Ticket;
+use Doctrine\ORM\EntityManagerInterface;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Clock\MockClock;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\SerializerInterface;
+use Symfony\Component\Validator\ConstraintViolation;
+use Symfony\Component\Validator\ConstraintViolationList;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class SetAddresseesControllerTest extends KernelTestCase
+{
+    use ProphecyTrait;
+
+    private SerializerInterface $serializer;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+        $this->serializer = self::getContainer()->get(SerializerInterface::class);
+    }
+
+    /**
+     * @dataProvider getContentData
+     */
+    public function testSetAddresseesWithValidData(array $bodyAsArray): void
+    {
+        $controller = $this->buildController(true, true);
+        $request = new Request(content: json_encode(['addressees' => $bodyAsArray], JSON_THROW_ON_ERROR, 512));
+        $ticket = new Ticket();
+
+        $response = $controller->setAddressees($ticket, $request);
+
+        self::assertEquals(200, $response->getStatusCode());
+
+        $asArray = json_decode($response->getContent(), true, 512, JSON_THROW_ON_ERROR);
+        self::assertIsArray($asArray);
+        self::assertArrayHasKey('type', $asArray);
+        self::assertEquals('ticket_ticket', $asArray['type']);
+    }
+
+    /**
+     * @dataProvider getContentData
+     */
+    public function testSetAddresseesWithInvalidData(array $bodyAsArray): void
+    {
+        $controller = $this->buildController(false, false);
+        $request = new Request(content: json_encode(['addressees' => $bodyAsArray], JSON_THROW_ON_ERROR, 512));
+        $ticket = new Ticket();
+
+        $response = $controller->setAddressees($ticket, $request);
+
+        self::assertEquals(422, $response->getStatusCode());
+
+        $asArray = json_decode($response->getContent(), true, 512, JSON_THROW_ON_ERROR);
+        self::assertIsArray($asArray);
+        self::arrayHasKey('violations', $asArray);
+        self::assertGreaterThan(0, count($asArray['violations']));
+    }
+
+    public static function getContentData(): iterable
+    {
+        self::bootKernel();
+        $entityManager = self::getContainer()->get(EntityManagerInterface::class);
+
+        $userGroup = $entityManager->createQuery('SELECT ug FROM '.UserGroup::class.' ug ')
+            ->setMaxResults(1)->getOneOrNullResult();
+
+        if (null === $userGroup) {
+            throw new \RuntimeException('User group not existing in database');
+        }
+
+        $user = $entityManager->createQuery('SELECT u FROM '.User::class.' u')
+            ->setMaxResults(1)->getOneOrNullResult();
+
+        if (null === $user) {
+            throw new \RuntimeException('User not existing in database');
+        }
+
+        self::ensureKernelShutdown();
+
+        yield [[['type' => 'user', 'id' => $user->getId()]]];
+        yield [[['type' => 'user', 'id' => $user->getId()], ['type' => 'user_group', 'id' => $userGroup->getId()]]];
+        yield [[['type' => 'user_group', 'id' => $userGroup->getId()]]];
+    }
+
+    private function buildController(bool $willSave, bool $isValid): SetAddresseesController
+    {
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $entityManager = $this->prophesize(EntityManagerInterface::class);
+
+        if ($willSave) {
+            $entityManager->flush()->shouldBeCalled();
+            $entityManager->persist(Argument::type(AddresseeHistory::class))->shouldBeCalled();
+        }
+
+        $validator = $this->prophesize(ValidatorInterface::class);
+
+        if ($isValid) {
+            $validator->validate(Argument::type(SetAddresseesCommand::class))->willReturn(new ConstraintViolationList([]));
+        } else {
+            $validator->validate(Argument::type(SetAddresseesCommand::class))->willReturn(
+                new ConstraintViolationList([
+                    new ConstraintViolation('Fake constraint', 'fake message template', [], [], 'addresses', []),
+                ])
+            );
+        }
+
+        return new SetAddresseesController(
+            $security->reveal(),
+            $entityManager->reveal(),
+            $this->serializer,
+            new SetAddresseesCommandHandler(new MockClock(), $entityManager->reveal()),
+            $validator->reveal()
+        );
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Entity/TicketTest.php b/src/Bundle/ChillTicketBundle/tests/Entity/TicketTest.php
index 6f710f1aa..f0efe5493 100644
--- a/src/Bundle/ChillTicketBundle/tests/Entity/TicketTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Entity/TicketTest.php
@@ -11,7 +11,10 @@ declare(strict_types=1);
 
 namespace Chill\TicketBundle\Tests\Entity;
 
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Entity\UserGroup;
 use Chill\PersonBundle\Entity\Person;
+use Chill\TicketBundle\Entity\AddresseeHistory;
 use Chill\TicketBundle\Entity\Motive;
 use Chill\TicketBundle\Entity\MotiveHistory;
 use Chill\TicketBundle\Entity\PersonHistory;
@@ -57,5 +60,33 @@ class TicketTest extends KernelTestCase
 
         self::assertCount(1, $ticket->getPersons());
         self::assertSame($person, $ticket->getPersons()[0]);
+
+        $history->setEndDate(new \DateTimeImmutable('now'));
+
+        self::assertCount(0, $ticket->getPersons());
+    }
+
+    public function testGetAddresse(): void
+    {
+        $ticket = new Ticket();
+        $user = new User();
+        $group = new UserGroup();
+
+        self::assertEquals([], $ticket->getCurrentAddressee());
+
+        $history = new AddresseeHistory($user, new \DateTimeImmutable('now'), $ticket);
+
+        self::assertCount(1, $ticket->getCurrentAddressee());
+        self::assertSame($user, $ticket->getCurrentAddressee()[0]);
+
+        $history2 = new AddresseeHistory($group, new \DateTimeImmutable('now'), $ticket);
+
+        self::assertCount(2, $ticket->getCurrentAddressee());
+        self::assertContains($group, $ticket->getCurrentAddressee());
+
+        $history->setEndDate(new \DateTimeImmutable('now'));
+
+        self::assertCount(1, $ticket->getCurrentAddressee());
+        self::assertSame($group, $ticket->getCurrentAddressee()[0]);
     }
 }
diff --git a/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/SetAddresseesCommandDenormalizerTest.php b/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/SetAddresseesCommandDenormalizerTest.php
new file mode 100644
index 000000000..a4b9bbf49
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/SetAddresseesCommandDenormalizerTest.php
@@ -0,0 +1,66 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Tests\Serializer\Normalizer;
+
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Entity\UserGroup;
+use Chill\TicketBundle\Action\Ticket\SetAddresseesCommand;
+use Chill\TicketBundle\Serializer\Normalizer\SetAddresseesCommandDenormalizer;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class SetAddresseesCommandDenormalizerTest extends TestCase
+{
+    use ProphecyTrait;
+
+    public function testSupportsDenormalization()
+    {
+        $denormalizer = new SetAddresseesCommandDenormalizer();
+
+        self::assertTrue($denormalizer->supportsDenormalization('', SetAddresseesCommand::class, 'json'));
+        self::assertFalse($denormalizer->supportsDenormalization('', stdClass::class, 'json'));
+    }
+
+    public function testDenormalize()
+    {
+        $denormalizer = $this->buildDenormalizer();
+
+        $actual = $denormalizer->denormalize(['addressees' => [['type' => 'user'], ['type' => 'user_group']]], SetAddresseesCommand::class, 'json');
+
+        self::assertInstanceOf(SetAddresseesCommand::class, $actual);
+        self::assertIsArray($actual->addressees);
+        self::assertCount(2, $actual->addressees);
+        self::assertInstanceOf(User::class, $actual->addressees[0]);
+        self::assertInstanceOf(UserGroup::class, $actual->addressees[1]);
+    }
+
+    private function buildDenormalizer(): SetAddresseesCommandDenormalizer
+    {
+        $normalizer = $this->prophesize(DenormalizerInterface::class);
+        $normalizer->denormalize(Argument::any(), User::class, 'json', Argument::any())
+            ->willReturn(new User());
+        $normalizer->denormalize(Argument::any(), UserGroup::class, 'json', Argument::any())
+            ->willReturn(new UserGroup());
+
+        $denormalizer = new SetAddresseesCommandDenormalizer();
+        $denormalizer->setDenormalizer($normalizer->reveal());
+
+        return $denormalizer;
+    }
+}

From fa6783569045615b3a0487972adf08c1d4caf095 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 23 Apr 2024 23:00:12 +0200
Subject: [PATCH 032/283] Add functionality to add single addressee to tickets

This update introduces a new feature allowing end-users to add a single addressee to a ticket without removing the existing ones. This was achieved by adding a new API endpoint and updating the SetAddresseesController to handle the addition of a single addressee. Accompanying tests have also been provided to ensure the new feature works as expected.
---
 .../ChillTicketBundle/chill.api.specs.yaml    | 34 +++++++++-
 .../src/Action/Ticket/AddAddresseeCommand.php | 29 +++++++++
 .../Action/Ticket/SetAddresseesCommand.php    |  9 +++
 .../Controller/SetAddresseesController.php    | 26 ++++++--
 .../SetAddresseesControllerTest.php           | 64 +++++++++++++++++++
 5 files changed, 157 insertions(+), 5 deletions(-)
 create mode 100644 src/Bundle/ChillTicketBundle/src/Action/Ticket/AddAddresseeCommand.php

diff --git a/src/Bundle/ChillTicketBundle/chill.api.specs.yaml b/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
index 232982f01..5be9ac0c0 100644
--- a/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
@@ -115,7 +115,7 @@ paths:
                         schema:
                             type: object
                             properties:
-                                addresses:
+                                addressees:
                                     type: array
                                     items:
                                         oneOf:
@@ -129,3 +129,35 @@ paths:
                 422:
                     description: "UNPROCESSABLE ENTITY"
 
+    /1.0/ticket/{id}/addressee/add:
+        post:
+            tags:
+                - ticket
+            summary: Add an addressee to a ticket, without removing existing ones.
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The ticket id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            requestBody:
+                required: true
+                content:
+                    application/json:
+                        schema:
+                            type: object
+                            properties:
+                                addressee:
+                                    oneOf:
+                                        - $ref: '#/components/schemas/UserGroupById'
+                                        - $ref: '#/components/schemas/UserById'
+
+
+            responses:
+                201:
+                    description: "ACCEPTED"
+                422:
+                    description: "UNPROCESSABLE ENTITY"
diff --git a/src/Bundle/ChillTicketBundle/src/Action/Ticket/AddAddresseeCommand.php b/src/Bundle/ChillTicketBundle/src/Action/Ticket/AddAddresseeCommand.php
new file mode 100644
index 000000000..d7f9c545f
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Action/Ticket/AddAddresseeCommand.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Action\Ticket;
+
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Entity\UserGroup;
+use Symfony\Component\Serializer\Annotation\Groups;
+
+/**
+ * Add a single addressee to the ticket.
+ *
+ * This command is converted into an "SetAddresseesCommand" for handling
+ */
+final readonly class AddAddresseeCommand
+{
+    public function __construct(
+        #[Groups(['read'])]
+        public User|UserGroup $addressee
+    ) {}
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Action/Ticket/SetAddresseesCommand.php b/src/Bundle/ChillTicketBundle/src/Action/Ticket/SetAddresseesCommand.php
index 824e2506f..e0d474d11 100644
--- a/src/Bundle/ChillTicketBundle/src/Action/Ticket/SetAddresseesCommand.php
+++ b/src/Bundle/ChillTicketBundle/src/Action/Ticket/SetAddresseesCommand.php
@@ -14,6 +14,7 @@ namespace Chill\TicketBundle\Action\Ticket;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\UserGroup;
 use Chill\MainBundle\Validation\Constraint\UserGroupDoNotExclude;
+use Chill\TicketBundle\Entity\Ticket;
 use Symfony\Component\Serializer\Annotation\Groups;
 use Symfony\Component\Validator\Constraints\GreaterThan;
 
@@ -28,4 +29,12 @@ final readonly class SetAddresseesCommand
         #[Groups(['read'])]
         public array $addressees
     ) {}
+
+    public static function fromAddAddresseeCommand(AddAddresseeCommand $command, Ticket $ticket): self
+    {
+        return new self([
+            $command->addressee,
+            ...$ticket->getCurrentAddressee(),
+        ]);
+    }
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Controller/SetAddresseesController.php b/src/Bundle/ChillTicketBundle/src/Controller/SetAddresseesController.php
index add8d480a..9fa6dc366 100644
--- a/src/Bundle/ChillTicketBundle/src/Controller/SetAddresseesController.php
+++ b/src/Bundle/ChillTicketBundle/src/Controller/SetAddresseesController.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\TicketBundle\Controller;
 
+use Chill\TicketBundle\Action\Ticket\AddAddresseeCommand;
 use Chill\TicketBundle\Action\Ticket\Handler\SetAddresseesCommandHandler;
 use Chill\TicketBundle\Action\Ticket\SetAddresseesCommand;
 use Chill\TicketBundle\Entity\Ticket;
@@ -28,11 +29,11 @@ use Symfony\Component\Validator\Validator\ValidatorInterface;
 final readonly class SetAddresseesController
 {
     public function __construct(
-        private Security                    $security,
-        private EntityManagerInterface      $entityManager,
-        private SerializerInterface         $serializer,
+        private Security $security,
+        private EntityManagerInterface $entityManager,
+        private SerializerInterface $serializer,
         private SetAddresseesCommandHandler $addressesCommandHandler,
-        private ValidatorInterface          $validator,
+        private ValidatorInterface $validator,
     ) {}
 
     #[Route('/api/1.0/ticket/{id}/addressees/set', methods: ['POST'])]
@@ -44,6 +45,23 @@ final readonly class SetAddresseesController
 
         $command = $this->serializer->deserialize($request->getContent(), SetAddresseesCommand::class, 'json', [AbstractNormalizer::GROUPS => ['read']]);
 
+        return $this->registerSetAddressees($command, $ticket);
+    }
+
+    #[Route('/api/1.0/ticket/{id}/addressee/add', methods: ['POST'])]
+    public function addAddressee(Ticket $ticket, Request $request): Response
+    {
+        if (!$this->security->isGranted('ROLE_USER')) {
+            throw new AccessDeniedHttpException('Only users can add addressees.');
+        }
+
+        $command = $this->serializer->deserialize($request->getContent(), AddAddresseeCommand::class, 'json', [AbstractNormalizer::GROUPS => ['read']]);
+
+        return $this->registerSetAddressees(SetAddresseesCommand::fromAddAddresseeCommand($command, $ticket), $ticket);
+    }
+
+    private function registerSetAddressees(SetAddresseesCommand $command, Ticket $ticket): Response
+    {
         if (0 < count($errors = $this->validator->validate($command))) {
             return new JsonResponse(
                 $this->serializer->serialize($errors, 'json'),
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/SetAddresseesControllerTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/SetAddresseesControllerTest.php
index ed842f742..a7ca214c1 100644
--- a/src/Bundle/ChillTicketBundle/tests/Controller/SetAddresseesControllerTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/SetAddresseesControllerTest.php
@@ -85,6 +85,70 @@ class SetAddresseesControllerTest extends KernelTestCase
         self::assertGreaterThan(0, count($asArray['violations']));
     }
 
+    /**
+     * @dataProvider getContentDataUnique
+     */
+    public function testAddAddresseeWithValidData(array $bodyAsArray): void
+    {
+        $controller = $this->buildController(true, true);
+        $request = new Request(content: json_encode(['addressee' => $bodyAsArray], JSON_THROW_ON_ERROR, 512));
+        $ticket = new Ticket();
+
+        $response = $controller->addAddressee($ticket, $request);
+
+        self::assertEquals(200, $response->getStatusCode());
+
+        $asArray = json_decode($response->getContent(), true, 512, JSON_THROW_ON_ERROR);
+        self::assertIsArray($asArray);
+        self::assertArrayHasKey('type', $asArray);
+        self::assertEquals('ticket_ticket', $asArray['type']);
+    }
+
+    /**
+     * @throws \JsonException
+     *
+     * @dataProvider getContentDataUnique
+     */
+    public function testAddAddresseeWithInvalidData(array $bodyAsArray): void
+    {
+        $controller = $this->buildController(false, false);
+        $request = new Request(content: json_encode(['addressee' => $bodyAsArray], JSON_THROW_ON_ERROR, 512));
+        $ticket = new Ticket();
+
+        $response = $controller->addAddressee($ticket, $request);
+
+        self::assertEquals(422, $response->getStatusCode());
+
+        $asArray = json_decode($response->getContent(), true, 512, JSON_THROW_ON_ERROR);
+        self::assertIsArray($asArray);
+        self::arrayHasKey('violations', $asArray);
+        self::assertGreaterThan(0, count($asArray['violations']));
+    }
+
+    public static function getContentDataUnique(): iterable
+    {
+        $entityManager = self::getContainer()->get(EntityManagerInterface::class);
+
+        $userGroup = $entityManager->createQuery('SELECT ug FROM '.UserGroup::class.' ug ')
+            ->setMaxResults(1)->getOneOrNullResult();
+
+        if (null === $userGroup) {
+            throw new \RuntimeException('User group not existing in database');
+        }
+
+        $user = $entityManager->createQuery('SELECT u FROM '.User::class.' u')
+            ->setMaxResults(1)->getOneOrNullResult();
+
+        if (null === $user) {
+            throw new \RuntimeException('User not existing in database');
+        }
+
+        self::ensureKernelShutdown();
+
+        yield [['type' => 'user', 'id' => $user->getId()]];
+        yield [['type' => 'user_group', 'id' => $userGroup->getId()]];
+    }
+
     public static function getContentData(): iterable
     {
         self::bootKernel();

From ed45f14a45538bba59deeabc810efd5b4ce73309 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 23 Apr 2024 23:38:34 +0200
Subject: [PATCH 033/283] Add tracking of addressee history in ticket system

The updates introduce tracking for the history of addressees in the ticket system, both when added and when removed. The user who removed an addressee is now recorded. The changes also ensure these updated aspects are correctly normalized and users can see them in the ticket history. A new database migration file was created for the changes.
---
 .../Handler/SetAddresseesCommandHandler.php   |  6 +++
 .../src/migrations/Version20240423212824.php  | 40 +++++++++++++++++++
 .../SetAddressesCommandHandlerTest.php        |  6 ++-
 .../SetAddresseesControllerTest.php           |  4 +-
 4 files changed, 54 insertions(+), 2 deletions(-)
 create mode 100644 src/Bundle/ChillTicketBundle/src/migrations/Version20240423212824.php

diff --git a/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/SetAddresseesCommandHandler.php b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/SetAddresseesCommandHandler.php
index 25ac97e5d..b2805ed2f 100644
--- a/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/SetAddresseesCommandHandler.php
+++ b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/SetAddresseesCommandHandler.php
@@ -11,17 +11,20 @@ declare(strict_types=1);
 
 namespace Chill\TicketBundle\Action\Ticket\Handler;
 
+use Chill\MainBundle\Entity\User;
 use Chill\TicketBundle\Action\Ticket\SetAddresseesCommand;
 use Chill\TicketBundle\Entity\AddresseeHistory;
 use Chill\TicketBundle\Entity\Ticket;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Clock\ClockInterface;
+use Symfony\Component\Security\Core\Security;
 
 final readonly class SetAddresseesCommandHandler
 {
     public function __construct(
         private ClockInterface $clock,
         private EntityManagerInterface $entityManager,
+        private Security $security,
     ) {}
 
     public function handle(Ticket $ticket, SetAddresseesCommand $command): void
@@ -34,6 +37,9 @@ final readonly class SetAddresseesCommandHandler
 
             if (!in_array($addressHistory->getAddressee(), $command->addressees, true)) {
                 $addressHistory->setEndDate($this->clock->now());
+                if (($user = $this->security->getUser()) instanceof User) {
+                    $addressHistory->setRemovedBy($user);
+                }
             }
         }
 
diff --git a/src/Bundle/ChillTicketBundle/src/migrations/Version20240423212824.php b/src/Bundle/ChillTicketBundle/src/migrations/Version20240423212824.php
new file mode 100644
index 000000000..3c025d763
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/migrations/Version20240423212824.php
@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\Migrations\Ticket;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20240423212824 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add endDate and removedBy columns on addressee history (ticket)';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_ticket.addressee_history ADD endDate TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT null');
+        $this->addSql('ALTER TABLE chill_ticket.addressee_history ADD removedBy_id INT DEFAULT NULL');
+        $this->addSql('COMMENT ON COLUMN chill_ticket.addressee_history.endDate IS \'(DC2Type:datetime_immutable)\'');
+        $this->addSql('ALTER TABLE chill_ticket.addressee_history ADD CONSTRAINT FK_434EBDBDB8346CCF FOREIGN KEY (removedBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('CREATE INDEX IDX_434EBDBDB8346CCF ON chill_ticket.addressee_history (removedBy_id)');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_ticket.addressee_history DROP CONSTRAINT FK_434EBDBDB8346CCF');
+        $this->addSql('DROP INDEX chill_ticket.IDX_434EBDBDB8346CCF');
+        $this->addSql('ALTER TABLE chill_ticket.addressee_history DROP endDate');
+        $this->addSql('ALTER TABLE chill_ticket.addressee_history DROP removedBy_id');
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/SetAddressesCommandHandlerTest.php b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/SetAddressesCommandHandlerTest.php
index efb545bac..cef1ae153 100644
--- a/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/SetAddressesCommandHandlerTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/SetAddressesCommandHandlerTest.php
@@ -22,6 +22,7 @@ use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Component\Clock\MockClock;
+use Symfony\Component\Security\Core\Security;
 
 /**
  * @internal
@@ -113,6 +114,9 @@ final class SetAddressesCommandHandlerTest extends TestCase
 
     private function buildHandler(EntityManagerInterface $entityManager): SetAddresseesCommandHandler
     {
-        return new SetAddresseesCommandHandler(new MockClock(), $entityManager);
+        $security = $this->prophesize(Security::class);
+        $security->getUser()->willReturn(new User());
+
+        return new SetAddresseesCommandHandler(new MockClock(), $entityManager, $security->reveal());
     }
 }
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/SetAddresseesControllerTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/SetAddresseesControllerTest.php
index a7ca214c1..af0d48e87 100644
--- a/src/Bundle/ChillTicketBundle/tests/Controller/SetAddresseesControllerTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/SetAddresseesControllerTest.php
@@ -177,8 +177,10 @@ class SetAddresseesControllerTest extends KernelTestCase
 
     private function buildController(bool $willSave, bool $isValid): SetAddresseesController
     {
+        $user = new User();
         $security = $this->prophesize(Security::class);
         $security->isGranted('ROLE_USER')->willReturn(true);
+        $security->getUser()->willReturn($user);
 
         $entityManager = $this->prophesize(EntityManagerInterface::class);
 
@@ -203,7 +205,7 @@ class SetAddresseesControllerTest extends KernelTestCase
             $security->reveal(),
             $entityManager->reveal(),
             $this->serializer,
-            new SetAddresseesCommandHandler(new MockClock(), $entityManager->reveal()),
+            new SetAddresseesCommandHandler(new MockClock(), $entityManager->reveal(), $security->reveal()),
             $validator->reveal()
         );
     }

From 45828174d1156c45a86cd16fcdb4f2d5639cce16 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 23 Apr 2024 23:39:01 +0200
Subject: [PATCH 034/283] Add addressee history to ticket serialization

This update extends the tickets serialization and normalisation process to include addressee history. With the changes, AddresseeHistory class now also keeps track of who removed an addressee. Additional types, tests and interfaces have been introduced to support this change.
---
 .../ChillMainBundle/Resources/public/types.ts |  2 ++
 .../src/Entity/AddresseeHistory.php           | 24 +++++++++++++
 .../src/Resources/public/types.ts             | 35 +++++++++++++++----
 .../Normalizer/TicketNormalizer.php           | 19 ++++++++++
 .../Normalizer/TicketNormalizerTest.php       | 18 ++++++++--
 5 files changed, 89 insertions(+), 9 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/types.ts b/src/Bundle/ChillMainBundle/Resources/public/types.ts
index 840a0e939..ada3089a0 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/types.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/types.ts
@@ -51,6 +51,8 @@ export interface UserGroup {
     excludeKey: string,
 }
 
+export type UserGroupOrUser = User | UserGroup;
+
 export interface UserAssociatedInterface {
   type: "user";
   id: number;
diff --git a/src/Bundle/ChillTicketBundle/src/Entity/AddresseeHistory.php b/src/Bundle/ChillTicketBundle/src/Entity/AddresseeHistory.php
index b3718a9ca..2717df2a5 100644
--- a/src/Bundle/ChillTicketBundle/src/Entity/AddresseeHistory.php
+++ b/src/Bundle/ChillTicketBundle/src/Entity/AddresseeHistory.php
@@ -18,9 +18,11 @@ use Chill\MainBundle\Doctrine\Model\TrackUpdateTrait;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\UserGroup;
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation as Serializer;
 
 #[ORM\Entity()]
 #[ORM\Table(name: 'addressee_history', schema: 'chill_ticket')]
+#[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['ticket_addressee_history' => AddresseeHistory::class])]
 class AddresseeHistory implements TrackUpdateInterface, TrackCreationInterface
 {
     use TrackCreationTrait;
@@ -29,6 +31,7 @@ class AddresseeHistory implements TrackUpdateInterface, TrackCreationInterface
     #[ORM\Id]
     #[ORM\Column(type: \Doctrine\DBAL\Types\Types::INTEGER, nullable: false)]
     #[ORM\GeneratedValue(strategy: 'AUTO')]
+    #[Serializer\Groups(['read'])]
     private ?int $id = null;
 
     #[ORM\ManyToOne(targetEntity: User::class)]
@@ -39,11 +42,19 @@ class AddresseeHistory implements TrackUpdateInterface, TrackCreationInterface
     #[ORM\JoinColumn(nullable: true)]
     private ?UserGroup $addresseeGroup = null;
 
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::DATETIME_IMMUTABLE, nullable: true, options: ['default' => 'null'])]
+    #[Serializer\Groups(['read'])]
     private ?\DateTimeImmutable $endDate = null;
 
+    #[ORM\ManyToOne(targetEntity: User::class)]
+    #[ORM\JoinColumn(nullable: true)]
+    #[Serializer\Groups(['read'])]
+    private ?User $removedBy = null;
+
     public function __construct(
         User|UserGroup $addressee,
         #[ORM\Column(type: \Doctrine\DBAL\Types\Types::DATETIME_IMMUTABLE, nullable: false)]
+        #[Serializer\Groups(['read'])]
         private \DateTimeImmutable $startDate,
         #[ORM\ManyToOne(targetEntity: Ticket::class)]
         #[ORM\JoinColumn(nullable: false)]
@@ -58,6 +69,7 @@ class AddresseeHistory implements TrackUpdateInterface, TrackCreationInterface
         $this->ticket->addAddresseeHistory($this);
     }
 
+    #[Serializer\Groups(['read'])]
     public function getAddressee(): UserGroup|User
     {
         if (null !== $this->addresseeGroup) {
@@ -97,6 +109,18 @@ class AddresseeHistory implements TrackUpdateInterface, TrackCreationInterface
         return $this->ticket;
     }
 
+    public function getRemovedBy(): ?User
+    {
+        return $this->removedBy;
+    }
+
+    public function setRemovedBy(?User $removedBy): self
+    {
+        $this->removedBy = $removedBy;
+
+        return $this;
+    }
+
     public function setEndDate(?\DateTimeImmutable $endDate): self
     {
         $this->endDate = $endDate;
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
index 2df53da99..0bcd1ecbb 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
@@ -1,4 +1,10 @@
-import {DateTime, TranslatableString, User} from "../../../../ChillMainBundle/Resources/public/types";
+import {
+    DateTime,
+    TranslatableString,
+    User,
+    UserGroup,
+    UserGroupOrUser
+} from "../../../../ChillMainBundle/Resources/public/types";
 import {Person} from "../../../../ChillPersonBundle/Resources/public/types";
 
 export interface Motive {
@@ -46,18 +52,33 @@ interface Comment {
     updatedAt: DateTime|null,
 }
 
+interface AddresseeHistory {
+    type: "ticket_addressee_history",
+    id: number,
+    startDate: DateTime|null,
+    addressee: UserGroupOrUser,
+    endDate: DateTime|null,
+    removedBy: User|null,
+    createdBy: User|null,
+    createdAt: DateTime|null,
+    updatedBy: User|null,
+    updatedAt: DateTime|null,
+}
+
 interface AddPersonEvent extends TicketHistory<"add_person", PersonHistory> {};
 interface AddCommentEvent extends TicketHistory<"add_comment", Comment> {};
 interface SetMotiveEvent extends TicketHistory<"set_motive", MotiveHistory> {};
+interface AddAddressee extends TicketHistory<"add_addressee", AddresseeHistory> {};
 
-type TicketHistoryLine = AddPersonEvent | AddCommentEvent | SetMotiveEvent;
+type TicketHistoryLine = AddPersonEvent | AddCommentEvent | SetMotiveEvent | AddAddressee;
 
 export interface Ticket {
-    type: "ticket_ticket"
-    id: number
-    externalRef: string
-    currentPersons: Person[]
-    currentMotive: null|Motive
+    type: "ticket_ticket",
+    id: number,
+    externalRef: string,
+    currentAddressees: UserGroupOrUser[],
+    currentPersons: Person[],
+    currentMotive: null|Motive,
     history: TicketHistoryLine[],
 }
 
diff --git a/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php b/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
index c68ab34ef..f7aff602b 100644
--- a/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
+++ b/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\TicketBundle\Serializer\Normalizer;
 
+use Chill\TicketBundle\Entity\AddresseeHistory;
 use Chill\TicketBundle\Entity\Comment;
 use Chill\TicketBundle\Entity\MotiveHistory;
 use Chill\TicketBundle\Entity\PersonHistory;
@@ -79,6 +80,24 @@ final class TicketNormalizer implements NormalizerInterface, NormalizerAwareInte
                 ],
                 $ticket->getComments()->toArray(),
             ),
+            ...array_map(
+                fn (AddresseeHistory $history) => [
+                    'event_type' => 'add_addressee',
+                    'at' => $history->getStartDate(),
+                    'by' => $history->getCreatedBy(),
+                    'data' => $history,
+                ],
+                $ticket->getAddresseeHistories()->toArray(),
+            ),
+            ...array_map(
+                fn (AddresseeHistory $history) => [
+                    'event_type' => 'remove_addressee',
+                    'at' => $history->getStartDate(),
+                    'by' => $history->getRemovedBy(),
+                    'data' => $history,
+                ],
+                $ticket->getAddresseeHistories()->filter(fn (AddresseeHistory $history) => null !== $history->getEndDate())->toArray()
+            ),
         ];
 
         usort(
diff --git a/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/TicketNormalizerTest.php b/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/TicketNormalizerTest.php
index 447bebfbf..415fc15fb 100644
--- a/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/TicketNormalizerTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/TicketNormalizerTest.php
@@ -12,7 +12,9 @@ declare(strict_types=1);
 namespace Chill\TicketBundle\Tests\Serializer\Normalizer;
 
 use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Entity\UserGroup;
 use Chill\PersonBundle\Entity\Person;
+use Chill\TicketBundle\Entity\AddresseeHistory;
 use Chill\TicketBundle\Entity\Comment;
 use Chill\TicketBundle\Entity\Motive;
 use Chill\TicketBundle\Entity\MotiveHistory;
@@ -108,6 +110,8 @@ class TicketNormalizerTest extends KernelTestCase
             ->willReturn(['motiveHistory']);
         $normalizer->normalize(Argument::type(Comment::class), 'json', Argument::type('array'))
             ->willReturn(['comment']);
+        $normalizer->normalize(Argument::type(AddresseeHistory::class), 'json', Argument::type('array'))
+            ->willReturn(['addresseeHistory']);
         // null values
         $normalizer->normalize(null, 'json', Argument::type('array'))->willReturn(null);
 
@@ -142,6 +146,9 @@ class TicketNormalizerTest extends KernelTestCase
         $comment = new Comment('blabla test', $ticket);
         $comment->setCreatedAt(new \DateTimeImmutable('2024-04-01T12:04:00'));
         $comment->setCreatedBy(new User());
+        $addresseeHistory = new AddresseeHistory(new User(), new \DateTimeImmutable('2024-04-01T12:05:00'), $ticket);
+        $addresseeHistory->setEndDate(new \DateTimeImmutable('2024-04-01T12:06:00'));
+        new AddresseeHistory(new UserGroup(), new \DateTimeImmutable('2024-04-01T12:07:00'), $ticket);
 
         yield [
             $ticket,
@@ -150,10 +157,17 @@ class TicketNormalizerTest extends KernelTestCase
                 'id' => null,
                 'externalRef' => '2134',
                 'currentPersons' => ['embedded'],
-                'currentAddressees' => [],
+                'currentAddressees' => ['embedded'],
                 'currentInputs' => [],
                 'currentMotive' => ['type' => 'motive', 'id' => 0],
-                'history' => [['event_type' => 'add_person'], ['event_type' => 'set_motive'], ['event_type' => 'add_comment']],
+                'history' => [
+                    ['event_type' => 'add_person'],
+                    ['event_type' => 'set_motive'],
+                    ['event_type' => 'add_comment'],
+                    ['event_type' => 'add_addressee'],
+                    ['event_type' => 'remove_addressee'],
+                    ['event_type' => 'add_addressee'],
+                ],
             ],
         ];
     }

From 2d8b960d9e59730f3874787231b8a7731726018c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 24 Apr 2024 18:48:00 +0200
Subject: [PATCH 035/283] Re-open the same ticket if a ticket already exists
 with the same externalRef, instead of creating a new one

---
 .../src/Controller/CreateTicketController.php | 12 +++-
 .../src/Repository/TicketRepository.php       | 56 +++++++++++++++++++
 .../Repository/TicketRepositoryInterface.php  | 23 ++++++++
 .../src/config/services.yaml                  |  7 ++-
 4 files changed, 95 insertions(+), 3 deletions(-)
 create mode 100644 src/Bundle/ChillTicketBundle/src/Repository/TicketRepository.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Repository/TicketRepositoryInterface.php

diff --git a/src/Bundle/ChillTicketBundle/src/Controller/CreateTicketController.php b/src/Bundle/ChillTicketBundle/src/Controller/CreateTicketController.php
index 8a6d8dd32..a3bdf31c8 100644
--- a/src/Bundle/ChillTicketBundle/src/Controller/CreateTicketController.php
+++ b/src/Bundle/ChillTicketBundle/src/Controller/CreateTicketController.php
@@ -15,6 +15,7 @@ use Chill\TicketBundle\Action\Ticket\AssociateByPhonenumberCommand;
 use Chill\TicketBundle\Action\Ticket\Handler\AssociateByPhonenumberCommandHandler;
 use Chill\TicketBundle\Action\Ticket\CreateTicketCommand;
 use Chill\TicketBundle\Action\Ticket\Handler\CreateTicketCommandHandler;
+use Chill\TicketBundle\Repository\TicketRepositoryInterface;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\HttpFoundation\RedirectResponse;
 use Symfony\Component\HttpFoundation\Request;
@@ -31,7 +32,8 @@ final readonly class CreateTicketController
         private AssociateByPhonenumberCommandHandler $associateByPhonenumberCommandHandler,
         private Security $security,
         private UrlGeneratorInterface $urlGenerator,
-        private EntityManagerInterface $entityManager
+        private EntityManagerInterface $entityManager,
+        private TicketRepositoryInterface $ticketRepository,
     ) {}
 
     #[Route('{_locale}/ticket/ticket/create')]
@@ -41,6 +43,14 @@ final readonly class CreateTicketController
             throw new AccessDeniedHttpException('Only users are allowed to create tickets.');
         }
 
+        if ('' !== $extId = $request->query->get('extId', '')) {
+            if (null !== $ticket = $this->ticketRepository->findOneByExternalRef($extId)) {
+                return new RedirectResponse(
+                    $this->urlGenerator->generate('chill_ticket_ticket_edit', ['id' => $ticket->getId()])
+                );
+            }
+        }
+
         $createCommand = new CreateTicketCommand($request->query->get('extId', ''));
         $ticket = $this->createTicketCommandHandler->__invoke($createCommand);
 
diff --git a/src/Bundle/ChillTicketBundle/src/Repository/TicketRepository.php b/src/Bundle/ChillTicketBundle/src/Repository/TicketRepository.php
new file mode 100644
index 000000000..d4301585a
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Repository/TicketRepository.php
@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Repository;
+
+use Chill\TicketBundle\Entity\Ticket;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\Persistence\ObjectRepository;
+
+final readonly class TicketRepository implements TicketRepositoryInterface
+{
+    private ObjectRepository $repository;
+
+    public function __construct(EntityManagerInterface $objectManager)
+    {
+        $this->repository = $objectManager->getRepository($this->getClassName());
+    }
+
+    public function find($id): ?Ticket
+    {
+        return $this->repository->find($id);
+    }
+
+    public function findAll(): array
+    {
+        return $this->repository->findAll();
+    }
+
+    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
+    {
+        return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
+    }
+
+    public function findOneBy(array $criteria): ?Ticket
+    {
+        return $this->repository->findOneBy($criteria);
+    }
+
+    public function getClassName()
+    {
+        return Ticket::class;
+    }
+
+    public function findOneByExternalRef(string $extId): ?Ticket
+    {
+        return $this->repository->findOneBy(['externalRef' => $extId]);
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Repository/TicketRepositoryInterface.php b/src/Bundle/ChillTicketBundle/src/Repository/TicketRepositoryInterface.php
new file mode 100644
index 000000000..0b2cb4d66
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Repository/TicketRepositoryInterface.php
@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Repository;
+
+use Chill\TicketBundle\Entity\Ticket;
+use Doctrine\Persistence\ObjectRepository;
+
+/**
+ * @extends ObjectRepository<Ticket>
+ */
+interface TicketRepositoryInterface extends ObjectRepository
+{
+    public function findOneByExternalRef(string $extId): ?Ticket;
+}
diff --git a/src/Bundle/ChillTicketBundle/src/config/services.yaml b/src/Bundle/ChillTicketBundle/src/config/services.yaml
index 006fa5cb6..4b662ecdc 100644
--- a/src/Bundle/ChillTicketBundle/src/config/services.yaml
+++ b/src/Bundle/ChillTicketBundle/src/config/services.yaml
@@ -3,13 +3,16 @@ services:
         autoconfigure: true
         autowire: true
 
+    Chill\TicketBundle\Action\Ticket\Handler\:
+        resource: '../Action/Ticket/Handler/'
+
     Chill\TicketBundle\Controller\:
         resource: '../Controller/'
         tags:
             - controller.service_arguments
 
-    Chill\TicketBundle\Action\Ticket\Handler\:
-        resource: '../Action/Ticket/Handler/'
+    Chill\TicketBundle\Repository\:
+        resource: '../Repository/'
 
     Chill\TicketBundle\Serializer\:
         resource: '../Serializer/'

From 2a1963e993c3a53080e954ce839ba58d5df52dfb Mon Sep 17 00:00:00 2001
From: Boris Waaub <boris.waaub@gmail.com>
Date: Thu, 25 Apr 2024 10:36:45 +0200
Subject: [PATCH 036/283] =?UTF-8?q?Mise=20=C3=A0=20jour=20de=20l'interface?=
 =?UTF-8?q?=20utilisateur=20pour=20le=20composant=20ActionToolbarComponent?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Resources/public/vuejs/TicketApp/App.vue  |  2 +-
 .../components/ActionToolbarComponent.vue     | 54 +++++++++++++++----
 .../components/MotiveSelectorComponent.vue    | 42 +++++++++++++++
 .../components/TicketSelectorComponent.vue    |  6 +--
 .../Resources/public/vuejs/TicketApp/index.ts |  1 -
 5 files changed, 89 insertions(+), 16 deletions(-)
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/MotiveSelectorComponent.vue

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
index cfe0b31bc..b44e84dc8 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
@@ -1,6 +1,6 @@
 <template>
     <banner-component :ticket="ticket" />
-    <div class="container-xxl p-2">
+    <div class="container-xxl p-3">
         <ticket-selector-component :tickets="[]" />
         <ticket-history-list-component :history="ticket.history" />
         <motive-list-component :motives="motives" />
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
index 96741bb34..f53447c8a 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
@@ -1,48 +1,82 @@
 <template>
     <div class="sticky-bottom">
-        <div class="footer-ticket-details"><button class="btn btn-chill-green text-white">Enregistrer</button></div>
+        <div class="footer-ticket-details">
+            <div class="tab-content">
+                <div v-if="activeTab === 'commentaire'" class="p-2">
+
+
+                    <label class="col-form-label" for="content">{{ $t('comment.label') }}</label>
+
+                    <textarea v-model="comment" class="form-control" id="content" rows="3"
+                        placeholder="{{ $t('comment.placeholder') }}">
+                    </textarea>
+
+                </div>
+                <div v-if="activeTab === 'transfert'">
+                    <!-- Content for the 'Transfert' tab pane -->
+                    <p>This is the Transfert tab pane content.</p>
+                </div>
+                <div v-if="activeTab === 'motif'">
+                    <!-- Content for the 'Motif' tab pane -->
+                    <p>This is the Motif tab pane content.</p>
+                </div>
+                <div v-if="activeTab === 'fermer'">
+                    <!-- Content for the 'Fermer' tab pane -->
+                    <p>This is the Fermer tab pane content.</p>
+                </div>
+            </div>
+
+            <button class="btn btn-chill-green text-white">Enregistrer</button>
+        </div>
         <div class="footer-ticket-main">
             <ul class="nav nav-tabs justify-content-end">
-
                 <li class="nav-item">
-                    <button type="button" class="m-2 btn btn-light">
+                    <button type="button" class="m-2 btn btn-light" @click="activeTab = 'commentaire'">
                         <i class="fa fa-plus"></i>
                         Commentaire
                     </button>
                 </li>
                 <li class="nav-item">
-                    <button type="button" class="m-2 btn btn-light">
+                    <button type="button" class="m-2 btn btn-light" @click="activeTab = 'transfert'">
                         <i class="fa fa-paper-plane"></i>
                         Transfert
                     </button>
                 </li>
                 <li class="nav-item">
-                    <button type="button" class="m-2 btn btn-light">
+                    <button type="button" class="m-2 btn btn-light" @click="activeTab = 'motif'">
                         <i class="fa fa-paint-brush"></i>
                         Motif
                     </button>
                 </li>
                 <li class="nav-item">
-                    <button type="button" class="m-2 btn btn-light">
+                    <button type="button" class="m-2 btn btn-light" @click="activeTab = 'fermer'">
                         <i class="fa fa-bolt"></i>
                         Fermer
                     </button>
                 </li>
             </ul>
         </div>
-
     </div>
 </template>
 
-<script lang="ts">
-import { defineComponent } from 'vue';
-import { useStore } from 'vuex';
 
+<script lang="ts">
+import { defineComponent, ref } from 'vue';
+import { useStore } from 'vuex';
 
 export default defineComponent({
     name: 'ActionToolbarComponent',
     setup(props, ctx) {
         const store = useStore();
+        const editor = ref();
+        const activeTab = ref("");
+        const comment = ref("");
+        return {
+            activeTab,
+            comment,
+            editor,
+        };
+
     },
 });
 </script>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/MotiveSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/MotiveSelectorComponent.vue
new file mode 100644
index 000000000..70f851396
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/MotiveSelectorComponent.vue
@@ -0,0 +1,42 @@
+<template>
+    <div class="btn-group">
+        <button type="button" class="btn btn-light dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
+            {{ $t('ticket.previous_tickets') }}
+            <span class="badge rounded-pill bg-chill-green">
+                {{ tickets.length }}
+                <span class="visually-hidden">Tickets</span>
+            </span>
+
+        </button>
+        <ul class="dropdown-menu">
+            <li><button class="dropdown-item" type="button">Action</button></li>
+            <li><button class="dropdown-item" type="button">Another action</button></li>
+            <li><button class="dropdown-item" type="button">Something else here</button></li>
+        </ul>
+    </div>
+</template>
+
+<script lang="ts">
+
+import { PropType, defineComponent } from 'vue';
+
+
+
+// Types
+import { Ticket } from '../../../types';
+
+export default defineComponent({
+    name: 'MotiveSelectorComponent',
+    props: {
+        tickets: {
+            type: Object as PropType<Ticket[]>,
+            required: true,
+        },
+    },
+    setup() {
+        return {}
+    }
+});
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketSelectorComponent.vue
index 7d1326513..bfab4dfb8 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketSelectorComponent.vue
@@ -2,9 +2,9 @@
     <div class="btn-group">
         <button type="button" class="btn btn-light dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
             {{ $t('ticket.previous_tickets') }}
-            <span class="position-absolute top-0 start-100 translate-middle badge rounded-pill bg-danger">
+            <span class="position-absolute top-0 start-100 translate-middle badge rounded-pill bg-chill-green">
                 {{ tickets.length }}
-                <span class="visually-hidden">unread messages</span>
+                <span class="visually-hidden">Tickets</span>
             </span>
 
         </button>
@@ -20,8 +20,6 @@
 
 import { PropType, defineComponent } from 'vue';
 
-
-
 // Types
 import { Ticket } from '../../../types';
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts
index e6f9011b0..f27823031 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts
@@ -3,7 +3,6 @@ import {createApp} from "vue";
 
 import { _createI18n } from "../../../../../../ChillMainBundle/Resources/public/vuejs/_js/i18n";
 
-
 import VueToast from 'vue-toast-notification';
 import 'vue-toast-notification/dist/theme-sugar.css';
 

From b40ad9e44569e71fce1762272d74dc7fc75adee5 Mon Sep 17 00:00:00 2001
From: Boris Waaub <boris.waaub@gmail.com>
Date: Thu, 25 Apr 2024 11:16:08 +0200
Subject: [PATCH 037/283] =?UTF-8?q?Mise=20=C3=A0=20jour=20des=20messages?=
 =?UTF-8?q?=20de=20l'interface=20utilisateur=20pour=20inclure=20les=20fonc?=
 =?UTF-8?q?tionnalit=C3=A9s=20de=20commentaire,=20de=20motif=20et=20de=20t?=
 =?UTF-8?q?ransfert?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Resources/public/vuejs/TicketApp/App.vue  |  5 --
 .../components/ActionToolbarComponent.vue     | 53 +++++++++++++------
 .../components/MotiveListComponent.vue        | 43 ---------------
 .../components/MotiveSelectorComponent.vue    | 21 ++++----
 .../public/vuejs/TicketApp/i18n/messages.ts   | 15 ++++++
 5 files changed, 61 insertions(+), 76 deletions(-)
 delete mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/MotiveListComponent.vue

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
index b44e84dc8..9568dd95e 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
@@ -3,7 +3,6 @@
     <div class="container-xxl p-3">
         <ticket-selector-component :tickets="[]" />
         <ticket-history-list-component :history="ticket.history" />
-        <motive-list-component :motives="motives" />
     </div>
     <action-toolbar-component />
 </template>
@@ -22,7 +21,6 @@ import TicketSelectorComponent from './components/TicketSelectorComponent.vue';
 import TicketHistoryListComponent from './components/TicketHistoryListComponent.vue';
 import ActionToolbarComponent from './components/ActionToolbarComponent.vue';
 import BannerComponent from './components/BannerComponent.vue';
-import MotiveListComponent from './components/MotiveListComponent.vue';
 
 export default defineComponent({
     name: 'App',
@@ -30,7 +28,6 @@ export default defineComponent({
         BannerComponent,
         TicketSelectorComponent,
         TicketHistoryListComponent,
-        MotiveListComponent,
         ActionToolbarComponent
     },
     setup() {
@@ -44,8 +41,6 @@ export default defineComponent({
         const ticket = computed(() => store.getters.getTicket as Ticket)
 
         onMounted(() => {
-            console.log(headline.value.textContent);
-
             try {
                 store.dispatch('fetchMotives')
             } catch (error) {
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
index f53447c8a..2c5fc284d 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
@@ -4,29 +4,43 @@
             <div class="tab-content">
                 <div v-if="activeTab === 'commentaire'" class="p-2">
 
-
-                    <label class="col-form-label" for="content">{{ $t('comment.label') }}</label>
+                    <label class="col-form-label" for="content">{{ $t('comment.title') }}</label>
 
                     <textarea v-model="comment" class="form-control" id="content" rows="3"
-                        placeholder="{{ $t('comment.placeholder') }}">
+                        :placeholder="$t('comment.label')">
                     </textarea>
+                    <div class="d-flex justify-content-end p-2">
+                        <button class="btn btn-chill-green text-white float-right" type="submit">
+                            <i class="fa fa-pencil"></i>
+                            {{ $t('comment.save') }}
+                        </button>
+                    </div>
 
                 </div>
-                <div v-if="activeTab === 'transfert'">
-                    <!-- Content for the 'Transfert' tab pane -->
-                    <p>This is the Transfert tab pane content.</p>
+                <div v-if="activeTab === 'transfert'" class="p-2">
+                    <label class="col-form-label" for="content">{{ $t('transfert.title') }}</label>
+
+                    <div class="d-flex justify-content-end p-2">
+                        <button class="btn btn-chill-green text-white float-right" type="submit">
+                            <i class="fa fa-pencil"></i>
+                            {{ $t('transfert.save') }}
+                        </button>
+                    </div>
                 </div>
-                <div v-if="activeTab === 'motif'">
-                    <!-- Content for the 'Motif' tab pane -->
-                    <p>This is the Motif tab pane content.</p>
-                </div>
-                <div v-if="activeTab === 'fermer'">
-                    <!-- Content for the 'Fermer' tab pane -->
-                    <p>This is the Fermer tab pane content.</p>
+                <div v-if="activeTab === 'motif'" class="p-2">
+                    <label class="col-form-label" for="content">{{ $t('motive.title') }}</label>
+                    <div>
+                        <MotiveSelectorComponent :motives="motives" />
+                    </div>
+                    <div class="d-flex justify-content-end p-2">
+                        <button class="btn btn-chill-green text-white float-right" type="submit">
+                            <i class="fa fa-pencil"></i>
+                            {{ $t('motive.save') }}
+                        </button>
+                    </div>
                 </div>
             </div>
 
-            <button class="btn btn-chill-green text-white">Enregistrer</button>
         </div>
         <div class="footer-ticket-main">
             <ul class="nav nav-tabs justify-content-end">
@@ -49,7 +63,7 @@
                     </button>
                 </li>
                 <li class="nav-item">
-                    <button type="button" class="m-2 btn btn-light" @click="activeTab = 'fermer'">
+                    <button type="button" class="m-2 btn btn-light" @click="activeTab = ''">
                         <i class="fa fa-bolt"></i>
                         Fermer
                     </button>
@@ -61,17 +75,24 @@
 
 
 <script lang="ts">
-import { defineComponent, ref } from 'vue';
+import { computed, defineComponent, ref } from 'vue';
 import { useStore } from 'vuex';
+import MotiveSelectorComponent from './MotiveSelectorComponent.vue';
+import { Motive } from '../../../types';
 
 export default defineComponent({
     name: 'ActionToolbarComponent',
+    components: {
+        MotiveSelectorComponent
+    },
     setup(props, ctx) {
         const store = useStore();
         const editor = ref();
         const activeTab = ref("");
         const comment = ref("");
+        const motives = computed(() => store.getters.getMotives as Motive[])
         return {
+            motives,
             activeTab,
             comment,
             editor,
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/MotiveListComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/MotiveListComponent.vue
deleted file mode 100644
index 12ae6705b..000000000
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/MotiveListComponent.vue
+++ /dev/null
@@ -1,43 +0,0 @@
-<template>
-    <div class="card my-2 bg-light" v-for="motive in motives" :key="motive.id">
-        <div class="card-header">
-            <span class="fw-bold fst-italic">
-
-            </span>
-            <span class="badge bg-white text-black mx-1">{{motive.active}}</span>
-        </div>
-        <div class="card-body row fst-italic">
-            <div class="col-12">
-                <i class="fa fa-comment" style="min-width: 16px;"></i>
-                <span class="mx-1">
-                  {{ motive.label.fr }}
-                </span>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script lang="ts">
-
-import {  PropType, defineComponent } from 'vue';
-
-
-
-// Types
-import { Motive } from '../../../types';
-
-export default defineComponent({
-    name: 'MotiveListComponent',
-    props: {
-        motives: {
-            type: Object as PropType<Motive[]>,
-            required: true,
-        },
-    },
-    setup() {
-        return {}
-    }
-});
-</script>
-
-<style lang="scss" scoped></style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/MotiveSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/MotiveSelectorComponent.vue
index 70f851396..b528b2ebb 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/MotiveSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/MotiveSelectorComponent.vue
@@ -1,17 +1,14 @@
 <template>
     <div class="btn-group">
         <button type="button" class="btn btn-light dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
-            {{ $t('ticket.previous_tickets') }}
-            <span class="badge rounded-pill bg-chill-green">
-                {{ tickets.length }}
-                <span class="visually-hidden">Tickets</span>
-            </span>
-
+            {{ $t('motive.label') }}
+            <span class="visually-hidden">{{ $t('motive.label') }}</span>
         </button>
         <ul class="dropdown-menu">
-            <li><button class="dropdown-item" type="button">Action</button></li>
-            <li><button class="dropdown-item" type="button">Another action</button></li>
-            <li><button class="dropdown-item" type="button">Something else here</button></li>
+            <li v-for="motive in motives" :key="motive.label.fr"><button class="dropdown-item" type="button">
+                    {{ motive.label.fr }}
+                </button>
+            </li>
         </ul>
     </div>
 </template>
@@ -23,13 +20,13 @@ import { PropType, defineComponent } from 'vue';
 
 
 // Types
-import { Ticket } from '../../../types';
+import { Motive } from '../../../types';
 
 export default defineComponent({
     name: 'MotiveSelectorComponent',
     props: {
-        tickets: {
-            type: Object as PropType<Ticket[]>,
+        motives: {
+            type: Object as PropType<Motive[]>,
             required: true,
         },
     },
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
index 9bc5d751c..3b678559b 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
@@ -8,5 +8,20 @@ export const messages = {
             user: "Prise en charge par {username}",
             motive: "Motif indiqué: {motive}",
         },
+        comment: {
+            title: "Commentaire",
+            label: "Ajouter un commentaire",
+            save: "Enregistrer",
+         },
+         motive: {
+            title: "Motif",
+            label: "Ajouter un motif",
+            save: "Enregistrer",
+         },
+         transfert: {
+            title: "Transfert",
+            label: "Transferer vers",
+            save: "Enregistrer",
+         },
     },
 };

From c9f0e9843b2ae27118388582a6c8fac7cd835414 Mon Sep 17 00:00:00 2001
From: Boris Waaub <boris.waaub@gmail.com>
Date: Wed, 1 May 2024 15:49:32 +0200
Subject: [PATCH 038/283] =?UTF-8?q?D=C3=A9placer=20le=20composant=20=20ban?=
 =?UTF-8?q?ner=20dans=20twig?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/Resources/public/types.ts             |  2 +-
 .../Resources/public/vuejs/TicketApp/App.vue  |  2 -
 .../components/ActionToolbarComponent.vue     |  4 +-
 .../TicketApp/components/BannerComponent.vue  | 65 ---------------
 .../Resources/views/Banner/banner.html.twig   | 82 +++++++++++++------
 .../translations/messages.fr.yaml             |  5 ++
 6 files changed, 67 insertions(+), 93 deletions(-)
 delete mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
 create mode 100644 src/Bundle/ChillTicketBundle/translations/messages.fr.yaml

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
index 0bcd1ecbb..5fdabec3a 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
@@ -5,7 +5,7 @@ import {
     UserGroup,
     UserGroupOrUser
 } from "../../../../ChillMainBundle/Resources/public/types";
-import {Person} from "../../../../ChillPersonBundle/Resources/public/types";
+import { Person } from "../../../../ChillPersonBundle/Resources/public/types";
 
 export interface Motive {
     type: "ticket_motive"
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
index 9568dd95e..77acc57d1 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
@@ -20,12 +20,10 @@ import { Motive, Ticket } from '../../types';
 import TicketSelectorComponent from './components/TicketSelectorComponent.vue';
 import TicketHistoryListComponent from './components/TicketHistoryListComponent.vue';
 import ActionToolbarComponent from './components/ActionToolbarComponent.vue';
-import BannerComponent from './components/BannerComponent.vue';
 
 export default defineComponent({
     name: 'App',
     components: {
-        BannerComponent,
         TicketSelectorComponent,
         TicketHistoryListComponent,
         ActionToolbarComponent
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
index 2c5fc284d..70dad6480 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="sticky-bottom">
+    <div class="fixed-bottom">
         <div class="footer-ticket-details">
             <div class="tab-content">
                 <div v-if="activeTab === 'commentaire'" class="p-2">
@@ -102,7 +102,7 @@ export default defineComponent({
 });
 </script>
 <style lang="scss" scoped>
-div.sticky-bottom {
+div.fixed-bottom {
     div.footer-ticket-main {
         background: none repeat scroll 0 0 #CABB9F;
     }
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
deleted file mode 100644
index 31c2f9f63..000000000
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
+++ /dev/null
@@ -1,65 +0,0 @@
-<template>
-    <div class="banner banner-ticket ">
-        <div id="header-ticket-main" class="header-name">
-            <div class="container-xxl text-primary">
-                <div class="row">
-                    <div class="col-md-6 ps-md-5 ps-xxl-0 ">
-                        <h2>
-                            # {{ ticket.externalRef }}
-                        </h2>
-                        <h1>
-                            {{ ticket.currentMotive ? ticket.currentMotive.label.fr : 'Aucun motif' }}
-                        </h1>
-                    </div>
-
-                    <div class="col-md-6">
-                        <div class="float-end">
-                            <h1><span class="badge text-bg-chill-green text-white">Ouvert</span></h1>
-                            <h3 class="fst-italic">Depuis</h3>
-                        </div>
-                    </div>
-                </div>
-            </div>
-        </div>
-        <div id="header-ticket-details" class="header-details">
-            <div class="container-xxl">
-                <div class="row justify-content-between">
-                    <div class="col-md-4 col-sm-12">
-                        <h3 class="text-primary">Patient concerné</h3>
-                        <h2><span class="badge text-bg-light" v-for="person in ticket.currentPersons"> {{ person.text
-                                }}</span></h2>
-                    </div>
-                    <div class="col-md-4 col-sm-12">
-                        <h3 class="text-primary">Appelant</h3>
-                        <h2><span class="badge text-bg-light" v-for="person in ticket.currentPersons"> {{ person.text
-                                }}</span></h2>
-
-                    </div>
-                    <div class="col-md-4 col-sm-12">
-                        <h3 class="text-primary">Intervenant</h3>
-                        <h2><span class="badge text-bg-light" v-for="person in ticket.currentPersons"> {{ person.text
-                                }}</span></h2>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </div>
-</template>
-
-<script lang="ts">
-import { PropType, defineComponent } from 'vue';
-import { Ticket } from '../../../types';
-
-export default defineComponent({
-    name: 'BannerComponent',
-    props: {
-        ticket: {
-            type: Object as PropType<Ticket>,
-            required: true,
-        },
-    },
-    setup() {
-        return {}
-    }
-});
-</script>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/views/Banner/banner.html.twig b/src/Bundle/ChillTicketBundle/src/Resources/views/Banner/banner.html.twig
index f7263b387..73e56209a 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/views/Banner/banner.html.twig
+++ b/src/Bundle/ChillTicketBundle/src/Resources/views/Banner/banner.html.twig
@@ -1,24 +1,60 @@
-<div class="banner banner-ticket">
-    <div id="header-ticket-main" class="header-name">
-        <div class="container-xxl">
-            <div class="row">
-                <div class="col-md-6 ps-md-5 ps-xxl-0">
-                    TODO
-                </div>
+<div class="banner banner-ticket ">
+	<div id="header-ticket-main" class="header-name">
+		<div class="container-xxl text-primary">
+			<div class="row">
+				<div class="col-md-6 ps-md-5 ps-xxl-0 ">
+					<h2>
+						#{{ ticket.getExternalRef() }}
+					</h2>
+					<h1>
+						{{ticket.getMotive()}}
+					</h1>
+				</div>
 
-                <div class="col-md-6">
-                    TODO
-                </div>
-            </div>
-        </div>
-    </div>
-    <div id="header-ticket-details" class="header-details">
-        <div class="container-xxl">
-            <div class="row justify-content-between">
-                <div class="col-md-12 ps-md-5 ps-xxl-0 container">
-                    <p>TODO</p>
-                </div>
-            </div>
-        </div>
-    </div>
-</div>
+				<div class="col-md-6">
+					<div class="float-end">
+						<h1>
+							<span class="badge text-bg-chill-green text-white">{{'open' | trans}}</span>
+						</h1>
+						<h3 class="fst-italic">{{'since' | trans}}</h3>
+					</div>
+				</div>
+			</div>
+		</div>
+	</div>
+	<div id="header-ticket-details" class="header-details">
+		<div class="container-xxl">
+			<div class="row justify-content-between">
+				<div class="col-md-4 col-sm-12">
+					<h3 class="text-primary">{{'concerned_patient' | trans}}</h3>
+					<h2>
+						{% for person in ticket.getPersons()  %}
+							<span class="badge text-bg-light" v-for="person in ticket.currentPersons">
+								{{ person.firstName }}
+								{{ person.lastName }}
+							</span>
+						{% endfor %}
+					</h2>
+				</div>
+				<div class="col-md-4 col-sm-12">
+					<h3 class="text-primary">{{'caller' | trans}}</h3>
+					<h2></h2>
+				</div>
+				<div class="col-md-4 col-sm-12">
+					<h3 class="text-primary">{{'speaker' | trans}}</h3>
+					<h2>
+						{% for addressee in ticket.getCurrentAddressee() %}
+							<span class="badge text-bg-light" v-for="person in ticket.currentPersons">
+								{% if addressee.type=='chill_main_user_group'  %}
+									{{ addressee.label.fr }}
+								{% else %}
+									{{ addressee.username }}
+								{% endif %
+							</span>
+						{% endfor %}
+							</h2>
+						</div>
+					</div>
+				</div>
+			</div>
+		</div>
diff --git a/src/Bundle/ChillTicketBundle/translations/messages.fr.yaml b/src/Bundle/ChillTicketBundle/translations/messages.fr.yaml
new file mode 100644
index 000000000..6f2c57afa
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/translations/messages.fr.yaml
@@ -0,0 +1,5 @@
+concerned_patient: Patient concerné
+caller: Appelant
+speaker: Intervenant
+open: Ouvert
+since: Depuis

From b2587a688f7d36fd4023d59fd0748d11c4a193c9 Mon Sep 17 00:00:00 2001
From: Boris Waaub <boris.waaub@gmail.com>
Date: Wed, 1 May 2024 15:51:12 +0200
Subject: [PATCH 039/283] =?UTF-8?q?D=C3=A9placer=20le=20composant=20banner?=
 =?UTF-8?q?=20dans=20twig?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/Resources/views/Banner/banner.html.twig           | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/views/Banner/banner.html.twig b/src/Bundle/ChillTicketBundle/src/Resources/views/Banner/banner.html.twig
index 73e56209a..ab53626b2 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/views/Banner/banner.html.twig
+++ b/src/Bundle/ChillTicketBundle/src/Resources/views/Banner/banner.html.twig
@@ -49,12 +49,12 @@
 									{{ addressee.label.fr }}
 								{% else %}
 									{{ addressee.username }}
-								{% endif %
+								{% endif %}
 							</span>
 						{% endfor %}
-							</h2>
-						</div>
-					</div>
+					</h2>
 				</div>
 			</div>
 		</div>
+	</div>
+</div>

From 4cffcf4de18d461781fb2f7be6c73d4b5e8da780 Mon Sep 17 00:00:00 2001
From: Boris Waaub <boris.waaub@gmail.com>
Date: Wed, 1 May 2024 22:03:36 +0200
Subject: [PATCH 040/283] Use translate in setup

---
 .../src/Resources/public/vuejs/TicketApp/index.ts             | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts
index f27823031..753bd6ced 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts
@@ -7,7 +7,7 @@ import VueToast from 'vue-toast-notification';
 import 'vue-toast-notification/dist/theme-sugar.css';
 
 import { store } from "./store";
-import { messages } from './i18n/messages';
+import messages from './i18n/messages';
 
 declare global {
     interface Window {
@@ -15,7 +15,7 @@ declare global {
     }
 }
 
-const i18n = _createI18n(messages);
+const i18n = _createI18n(messages, false);
 
 const _app = createApp({
         template: '<app></app>',

From 85bdfb9e21e52358860b44ba643f27ed7364b720 Mon Sep 17 00:00:00 2001
From: Boris Waaub <boris.waaub@gmail.com>
Date: Wed, 1 May 2024 22:04:07 +0200
Subject: [PATCH 041/283] Remove banner component

---
 .../src/Resources/public/vuejs/TicketApp/App.vue                 | 1 -
 1 file changed, 1 deletion(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
index 77acc57d1..da1c60d2e 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
@@ -1,5 +1,4 @@
 <template>
-    <banner-component :ticket="ticket" />
     <div class="container-xxl p-3">
         <ticket-selector-component :tickets="[]" />
         <ticket-history-list-component :history="ticket.history" />

From a27d92aba02b0c40c4bc13bca17194be9a047356 Mon Sep 17 00:00:00 2001
From: Boris Waaub <boris.waaub@gmail.com>
Date: Thu, 2 May 2024 00:50:33 +0200
Subject: [PATCH 042/283] Add comment and motive

---
 .../src/Resources/public/types.ts             |   6 +-
 .../Resources/public/vuejs/TicketApp/App.vue  |   2 +-
 .../components/ActionToolbarComponent.vue     | 151 ++++++++++++------
 .../components/MotiveSelectorComponent.vue    |  57 ++++---
 .../TicketHistoryCommentComponent.vue         |  29 ++++
 .../components/TicketHistoryListComponent.vue |  39 +++--
 .../TicketHistoryMotiveComponent.vue          |  30 ++++
 .../TicketHistoryPersonComponent.vue          |  29 ++++
 .../components/TicketSelectorComponent.vue    |  12 +-
 .../public/vuejs/TicketApp/i18n/messages.ts   |  15 +-
 .../public/vuejs/TicketApp/store/index.ts     |   4 +
 .../vuejs/TicketApp/store/modules/comment.ts  |  40 +++++
 .../vuejs/TicketApp/store/modules/motive.ts   |  53 ++++--
 .../Resources/views/Banner/banner.html.twig   |   9 +-
 .../translations/messages.fr.yaml             |   1 +
 15 files changed, 359 insertions(+), 118 deletions(-)
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCommentComponent.vue
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryMotiveComponent.vue
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryPersonComponent.vue
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/comment.ts

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
index 5fdabec3a..2c347977c 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
@@ -21,7 +21,7 @@ interface TicketHistory<T extends string, D extends object> {
     data: D
 }
 
-interface PersonHistory {
+export interface PersonHistory {
     type: "ticket_person_history",
     id: number,
     startDate: DateTime,
@@ -32,7 +32,7 @@ interface PersonHistory {
     createdAt: DateTime|null
 }
 
-interface MotiveHistory {
+export interface MotiveHistory {
     type: "ticket_motive_history",
     id: number,
     startDate: null,
@@ -42,7 +42,7 @@ interface MotiveHistory {
     createdAt: DateTime|null,
 }
 
-interface Comment {
+export interface Comment {
     type: "ticket_comment",
     id: number,
     content: string,
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
index da1c60d2e..b993caa2f 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="container-xxl p-3">
+    <div class="container-xxl p-3" style="padding-bottom: 55px;">
         <ticket-selector-component :tickets="[]" />
         <ticket-history-list-component :history="ticket.history" />
     </div>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
index 70dad6480..986e466eb 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
@@ -1,65 +1,70 @@
 <template>
     <div class="fixed-bottom">
         <div class="footer-ticket-details">
-            <div class="tab-content">
-                <div v-if="activeTab === 'commentaire'" class="p-2">
-
-                    <label class="col-form-label" for="content">{{ $t('comment.title') }}</label>
-
-                    <textarea v-model="comment" class="form-control" id="content" rows="3"
-                        :placeholder="$t('comment.label')">
-                    </textarea>
-                    <div class="d-flex justify-content-end p-2">
-                        <button class="btn btn-chill-green text-white float-right" type="submit">
-                            <i class="fa fa-pencil"></i>
-                            {{ $t('comment.save') }}
-                        </button>
-                    </div>
+            <div class="tab-content p-2">
 
+                <div v-if="activeTab">
+                    <label class="col-form-label">
+                        {{ $t(`${activeTab}.title`) }}
+                    </label>
                 </div>
-                <div v-if="activeTab === 'transfert'" class="p-2">
-                    <label class="col-form-label" for="content">{{ $t('transfert.title') }}</label>
 
+                <div v-if="activeTab === 'comment'">
+                    <form @submit.prevent="createComment">
+                        <textarea v-model="content" class="form-control" id="content" rows="3"
+                            :placeholder="$t('comment.label')"></textarea>
+
+                        <div class="d-flex justify-content-end p-2">
+                            <button class="btn btn-chill-green text-white float-right" type="submit">
+                                <i class="fa fa-pencil"></i>
+                                {{ $t("comment.save") }}
+                            </button>
+                        </div>
+                    </form>
+                </div>
+
+                <div v-if="activeTab === 'transfert'">
                     <div class="d-flex justify-content-end p-2">
                         <button class="btn btn-chill-green text-white float-right" type="submit">
                             <i class="fa fa-pencil"></i>
-                            {{ $t('transfert.save') }}
+                            {{ $t("transfert.save") }}
                         </button>
                     </div>
                 </div>
-                <div v-if="activeTab === 'motif'" class="p-2">
-                    <label class="col-form-label" for="content">{{ $t('motive.title') }}</label>
-                    <div>
-                        <MotiveSelectorComponent :motives="motives" />
-                    </div>
-                    <div class="d-flex justify-content-end p-2">
-                        <button class="btn btn-chill-green text-white float-right" type="submit">
-                            <i class="fa fa-pencil"></i>
-                            {{ $t('motive.save') }}
-                        </button>
-                    </div>
+
+                <div v-if="activeTab === 'motive'">
+                    <form @submit.prevent="createMotive">
+
+                        <motive-selector-component v-model="motive" :motives="motives"
+                            :current-motive="ticket.currentMotive" />
+                        <div class="d-flex justify-content-end p-2">
+                            <button class="btn btn-chill-green text-white float-right" type="submit">
+                                <i class="fa fa-pencil"></i>
+                                {{ $t("motive.save") }}
+                            </button>
+                        </div>
+                    </form>
                 </div>
             </div>
-
         </div>
         <div class="footer-ticket-main">
             <ul class="nav nav-tabs justify-content-end">
                 <li class="nav-item">
-                    <button type="button" class="m-2 btn btn-light" @click="activeTab = 'commentaire'">
+                    <button type="button" class="m-2 btn btn-light" @click="activeTab = 'comment'">
                         <i class="fa fa-plus"></i>
-                        Commentaire
+                        {{ $t('comment.title') }}
                     </button>
                 </li>
                 <li class="nav-item">
                     <button type="button" class="m-2 btn btn-light" @click="activeTab = 'transfert'">
                         <i class="fa fa-paper-plane"></i>
-                        Transfert
+                        {{ $t('transfert.title') }}
                     </button>
                 </li>
                 <li class="nav-item">
-                    <button type="button" class="m-2 btn btn-light" @click="activeTab = 'motif'">
+                    <button type="button" class="m-2 btn btn-light" @click="activeTab = 'motive'">
                         <i class="fa fa-paint-brush"></i>
-                        Motif
+                        {{ $t('motive.title') }}
                     </button>
                 </li>
                 <li class="nav-item">
@@ -73,42 +78,82 @@
     </div>
 </template>
 
-
 <script lang="ts">
-import { computed, defineComponent, ref } from 'vue';
-import { useStore } from 'vuex';
-import MotiveSelectorComponent from './MotiveSelectorComponent.vue';
-import { Motive } from '../../../types';
+import { defineComponent, inject, ref } from "vue";
+import { useI18n } from "vue-i18n";
+import { useStore } from "vuex";
+
+// Types
+import { Comment, Motive, Ticket } from "../../../types";
+
+// Component
+import MotiveSelectorComponent from "./MotiveSelectorComponent.vue";
 
 export default defineComponent({
-    name: 'ActionToolbarComponent',
+    name: "ActionToolbarComponent",
     components: {
-        MotiveSelectorComponent
+        MotiveSelectorComponent,
     },
-    setup(props, ctx) {
+    setup() {
         const store = useStore();
-        const editor = ref();
+        const { t } = useI18n();
+        const toast = inject('toast') as any;
         const activeTab = ref("");
-        const comment = ref("");
-        const motives = computed(() => store.getters.getMotives as Motive[])
-        return {
-            motives,
-            activeTab,
-            comment,
-            editor,
-        };
 
+        const ticket = ref(store.getters.getTicket as Ticket);
+        const motives = ref(store.getters.getMotives as Motive[]);
+
+        const motive = ref({} as Motive);
+        const content = ref('' as Comment["content"]);
+
+
+
+        async function createMotive() {
+            try {
+                await store.dispatch("createMotive", {
+                    ticketId: ticket.value.id,
+                    motive: motive.value,
+                });
+                toast.success(t("motive.success"))
+            } catch (error) {
+                toast.error(error)
+            }
+        }
+
+        async function createComment() {
+            try {
+                await store.dispatch("createComment", {
+                    ticketId: ticket.value.id,
+                    content: content.value,
+                });
+                content.value = "";
+                toast.success(t("comment.success"))
+            } catch (error) {
+                toast.error(error)
+            }
+        }
+
+        return {
+            activeTab,
+            ticket,
+            motives,
+            motive,
+            content,
+            createMotive,
+            createComment,
+        };
     },
 });
 </script>
 <style lang="scss" scoped>
+
 div.fixed-bottom {
     div.footer-ticket-main {
-        background: none repeat scroll 0 0 #CABB9F;
+        background: none repeat scroll 0 0 #cabb9f;
     }
 
     div.footer-ticket-details {
-        background: none repeat scroll 0 0 #EFE2CA;
+        background: none repeat scroll 0 0 #efe2ca;
     }
 }
 </style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/MotiveSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/MotiveSelectorComponent.vue
index b528b2ebb..7f55443eb 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/MotiveSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/MotiveSelectorComponent.vue
@@ -1,38 +1,55 @@
 <template>
-    <div class="btn-group">
-        <button type="button" class="btn btn-light dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
-            {{ $t('motive.label') }}
-            <span class="visually-hidden">{{ $t('motive.label') }}</span>
-        </button>
-        <ul class="dropdown-menu">
-            <li v-for="motive in motives" :key="motive.label.fr"><button class="dropdown-item" type="button">
-                    {{ motive.label.fr }}
-                </button>
-            </li>
-        </ul>
+    <div class="row">
+        <div class="col-12 col-lg-4 col-md-6">
+            <vue-multiselect name="selectMotive" id="selectMotive" label="label" :custom-label="customLabel"
+                track-by="id" open-direction="top" :multiple="false" :searchable="true"
+                :placeholder="$t('motive.label')" :select-label="$t('multiselect.select_label')"
+                :deselect-label="$t('multiselect.deselect_label')" :selected-label="$t('multiselect.selected_label')"
+                :options="motives" v-model="motive" />
+        </div>
     </div>
 </template>
 
 <script lang="ts">
-
-import { PropType, defineComponent } from 'vue';
-
-
+import { PropType, defineComponent, ref, watch } from "vue";
+import { useI18n } from "vue-i18n";
+import VueMultiselect from "vue-multiselect";
 
 // Types
-import { Motive } from '../../../types';
+import { Motive } from "../../../types";
 
 export default defineComponent({
-    name: 'MotiveSelectorComponent',
+    name: "MotiveSelectorComponent",
     props: {
         motives: {
             type: Object as PropType<Motive[]>,
             required: true,
         },
+        currentMotive: {
+            type: Object as PropType<null|Motive>,
+            required: false,
+        },
+    },
+    components: {
+        VueMultiselect,
+    },
+    emits: ["update:modelValue"],
+
+    setup(props, ctx) {
+        const motive = ref(props.currentMotive ? props.currentMotive : {} as Motive);
+        const { t } = useI18n();
+
+        watch(motive, (motive) => {
+            ctx.emit("update:modelValue", motive);
+        });
+
+        return {
+            motive,
+            customLabel(motive: Motive) {
+                return motive.label ? motive.label.fr : t('motive.label');
+            },
+        };
     },
-    setup() {
-        return {}
-    }
 });
 </script>
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCommentComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCommentComponent.vue
new file mode 100644
index 000000000..c793adc05
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCommentComponent.vue
@@ -0,0 +1,29 @@
+<template>
+    <div class="col-12">
+        <i class="fa fa-comment"></i>
+        <span class="mx-1">
+            {{ $t('history.comment',{ comment: commentHistory.content}) }}
+        </span>
+    </div>
+</template>
+
+<script lang="ts">
+
+import { PropType, defineComponent } from 'vue';
+
+// Types
+import { Comment } from '../../../types';
+
+export default defineComponent({
+    name: 'TicketHistoryCommentComponent',
+    props: {
+        commentHistory: {
+            type: Object as PropType<Comment>,
+            required: true,
+        },
+    },
+    setup() {}
+});
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
index 42f5b071b..113cfd677 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
@@ -6,26 +6,20 @@
             </span>
             <span class="badge bg-white text-black mx-1">{{ history_line.by.username }}</span>
         </div>
-        <div class="card-body row fst-italic" v-if="history_line.event_type == 'add_person'">
-            <div class="col-12">
-                <i class="fa fa-bolt" style="min-width: 16px;"></i>
-                <span class="mx-1">
-                    {{ $t('history.person',{ text: history_line.data.person.text }) }}
-                </span>
-            </div>
+
+        <div class="card-body row fst-italic">
             <div class="col-12">
                 <i class="fa fa-eyedropper"></i>
                 <span class="mx-1">
-                    {{ $t('history.user',{ username: history_line.by.username }) }}
-                </span>
-            </div>
-
-            <div class="col-12">
-                <i class="fa fa-paint-brush"></i>
-                <span class="mx-1">
-                    {{ $t('history.motive',{ text: history_line.data.person.text }) }}
+                    {{ $t('history.user', { username: history_line.by.username }) }}
                 </span>
             </div>
+            <ticket-history-person-component :personHistory="history_line.data"
+                v-if="history_line.event_type == 'add_person'" />
+            <ticket-history-motive-component :motiveHistory="history_line.data"
+                v-else-if="history_line.event_type == 'set_motive'" />
+            <ticket-history-comment-component :commentHistory="history_line.data"
+                v-else-if="history_line.event_type == 'add_comment'" />
         </div>
     </div>
 </template>
@@ -34,10 +28,22 @@
 
 import { PropType, defineComponent } from 'vue';
 import { DateTime } from '../../../../../../../ChillMainBundle/Resources/public/types';
+
+// Types
 import { Ticket } from '../../../types';
 
+// Components
+import TicketHistoryPersonComponent from './TicketHistoryPersonComponent.vue';
+import TicketHistoryMotiveComponent from './TicketHistoryMotiveComponent.vue';
+import TicketHistoryCommentComponent from './TicketHistoryCommentComponent.vue';
+
 export default defineComponent({
     name: 'TicketHistoryListComponent',
+    components: {
+        TicketHistoryPersonComponent,
+        TicketHistoryMotiveComponent,
+        TicketHistoryCommentComponent,
+    },
     props: {
         history: {
             type: Array as PropType<Ticket["history"]>,
@@ -46,11 +52,10 @@ export default defineComponent({
     },
 
     setup() {
-
         function formatDate(d: DateTime) {
             const date = new Date(d.datetime);
             const month = date.toLocaleString('default', { month: 'long' });
-            return `${date.getDate()} ${month} ${date.getFullYear()}, ${date.getHours()}:${date.getMinutes()}`
+            return `${date.getDate()} ${month} ${date.getFullYear()}, ${date.toLocaleTimeString()}`
         }
 
         return { formatDate }
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryMotiveComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryMotiveComponent.vue
new file mode 100644
index 000000000..132d782c1
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryMotiveComponent.vue
@@ -0,0 +1,30 @@
+<template>
+    <div class="col-12">
+        <i class="fa fa-paint-brush"></i>
+        <span class="mx-1">
+            {{ $t('history.motive',{ motive: motiveHistory.motive.label.fr }) }}
+        </span>
+    </div>
+</template>
+
+<script lang="ts">
+
+import { PropType, defineComponent } from 'vue';
+
+// Types
+import { MotiveHistory } from '../../../types';
+
+export default defineComponent({
+    name: 'TicketHistoryMotiveComponent',
+    props: {
+        motiveHistory: {
+            type: Object as PropType<MotiveHistory>,
+            required: true,
+        },
+    },
+
+    setup() {}
+});
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryPersonComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryPersonComponent.vue
new file mode 100644
index 000000000..6ecd96039
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryPersonComponent.vue
@@ -0,0 +1,29 @@
+<template>
+    <div class="col-12">
+        <i class="fa fa-bolt" style="min-width: 16px;"></i>
+        <span class="mx-1">
+            {{ $t('history.person',{ person: personHistory.person.text }) }}
+        </span>
+    </div>
+</template>
+
+<script lang="ts">
+import { PropType, defineComponent } from 'vue';
+
+// Type
+import { PersonHistory } from '../../../types';
+
+export default defineComponent({
+    name: 'TicketHistoryPersonComponent',
+    props: {
+        personHistory: {
+            type: Object as PropType<PersonHistory>,
+            required: true,
+        },
+    },
+
+    setup() {}
+});
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketSelectorComponent.vue
index bfab4dfb8..ff291a11c 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketSelectorComponent.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="btn-group">
+    <div class="btn-group" @click="handleClick">
         <button type="button" class="btn btn-light dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
             {{ $t('ticket.previous_tickets') }}
             <span class="position-absolute top-0 start-100 translate-middle badge rounded-pill bg-chill-green">
@@ -8,11 +8,6 @@
             </span>
 
         </button>
-        <ul class="dropdown-menu">
-            <li><button class="dropdown-item" type="button">Action</button></li>
-            <li><button class="dropdown-item" type="button">Another action</button></li>
-            <li><button class="dropdown-item" type="button">Something else here</button></li>
-        </ul>
     </div>
 </template>
 
@@ -32,7 +27,10 @@ export default defineComponent({
         },
     },
     setup() {
-        return {}
+        function handleClick() {
+            alert('Sera disponible plus tard')
+        }
+        return { handleClick }
     }
 });
 </script>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
index 3b678559b..f1605c4a5 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
@@ -1,27 +1,36 @@
-export const messages = {
+import { multiSelectMessages } from"../../../../../../../ChillMainBundle/Resources/public/vuejs/_js/i18n";
+
+const messages = {
     fr: {
         ticket: {
             previous_tickets: "Précédents tickets",
         },
         history: {
-            person: "Ouverture par appel téléphonique de {text}",
+            person: "Ouverture par appel téléphonique de {person}",
             user: "Prise en charge par {username}",
             motive: "Motif indiqué: {motive}",
+            comment: "Commentaire: {comment}",
         },
         comment: {
             title: "Commentaire",
             label: "Ajouter un commentaire",
             save: "Enregistrer",
+            succcess: "Commentaire enregistré",
          },
          motive: {
             title: "Motif",
-            label: "Ajouter un motif",
+            label: "Choisir un motif",
             save: "Enregistrer",
+            success: "Motif enregistré",
          },
          transfert: {
             title: "Transfert",
             label: "Transferer vers",
             save: "Enregistrer",
+            success: "Transfert effectué",
          },
+         close: "Fermer"
     },
 };
+Object.assign(messages.fr, multiSelectMessages.fr);
+export default messages;
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts
index b26eaa611..82dd600a9 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts
@@ -1,15 +1,19 @@
 import { createStore } from "vuex";
 import { State as MotiveStates, moduleMotive } from "./modules/motive";
 import { State as TicketStates, moduleTicket } from "./modules/ticket";
+import {  State as CommentStates, moduleComment } from "./modules/comment";
 
 export type RootState = {
     motive: MotiveStates;
     ticket: TicketStates;
+    comment: CommentStates;
   };
 
 export const store = createStore({
     modules: {
         motive:moduleMotive,
         ticket:moduleTicket,
+        comment:moduleComment,
+
       }
 });
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/comment.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/comment.ts
new file mode 100644
index 000000000..b457e4e23
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/comment.ts
@@ -0,0 +1,40 @@
+import {
+    fetchResults,
+    makeFetch,
+} from "../../../../../../../../ChillMainBundle/Resources/public/lib/api/apiMethods";
+
+import { Module } from "vuex";
+import { RootState } from "..";
+
+import { Comment } from "../../../../types";
+
+export interface State {
+    comments: Array<Comment>;
+}
+
+export const moduleComment: Module<State, RootState> = {
+    state: () => ({
+        comments: [] as Array<Comment>,
+    }),
+    getters: {},
+    mutations: {},
+    actions: {
+        async createComment(
+            { commit },
+            datas: { ticketId: number; content: Comment["content"] }
+        ) {
+            const { ticketId, content } = datas;
+            try {
+                const result = await makeFetch(
+                    "POST",
+                    `/api/1.0/ticket/${ticketId}/comment/add`,
+                    { content }
+                );
+                commit("setTicket", result);
+            }
+            catch(e: any) {
+                throw e.name;
+            }
+        },
+    },
+};
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/motive.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/motive.ts
index 88d6091ba..296301fc2 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/motive.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/motive.ts
@@ -1,4 +1,7 @@
-import { fetchResults, makeFetch } from "../../../../../../../../ChillMainBundle/Resources/public/lib/api/apiMethods";
+import {
+    fetchResults,
+    makeFetch,
+} from "../../../../../../../../ChillMainBundle/Resources/public/lib/api/apiMethods";
 
 import { Module } from "vuex";
 import { RootState } from "..";
@@ -9,31 +12,55 @@ export interface State {
     motives: Array<Motive>;
 }
 
-export const moduleMotive: Module<State, RootState> ={
+export const moduleMotive: Module<State, RootState> = {
     state: () => ({
         motives: [] as Array<Motive>,
     }),
     getters: {
         getMotives(state) {
             return state.motives;
-          }
+        },
+        getMotiveOptions(state) {
+            return state.motives.map((motive) => ({
+                value: motive.id,
+                text: motive.label.fr,
+            }));
+        },
     },
     mutations: {
         setMotives(state, motives) {
             state.motives = motives;
-        }
+        },
     },
     actions: {
         async fetchMotives({ commit }) {
-            const results = await fetchResults("/api/1.0/ticket/motive.json") as Motive[];
-            commit("setMotives", results);
-            return results;
+            try {
+                const results = (await fetchResults(
+                    "/api/1.0/ticket/motive.json"
+                )) as Motive[];
+                commit("setMotives", results);
+            }
+            catch(e: any) {
+                throw e.name;
+            }
+        },
+
+        async createMotive(
+            { commit },
+            datas: { ticketId: number; motive: Motive }
+        ) {
+            const { ticketId, motive } = datas;
+            try {
+                const result = await makeFetch(
+                    "POST",
+                    `/api/1.0/ticket/${ticketId}/motive/set`,
+                    { motive }
+                );
+                commit("setTicket", result);
+            }
+            catch(e: any) {
+                throw e.name;
+            }
         },
-        async createMotive({ commit }, datas: {currentMotiveId: number, motive: Motive}) {
-            const { currentMotiveId, motive } = datas;
-            const result = await makeFetch("POST", `/api/1.0/ticket/${currentMotiveId}/motive/set`, motive);
-            commit("setMotives", result);
-            return result;
-        }
     },
 };
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/views/Banner/banner.html.twig b/src/Bundle/ChillTicketBundle/src/Resources/views/Banner/banner.html.twig
index ab53626b2..c8a7ff724 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/views/Banner/banner.html.twig
+++ b/src/Bundle/ChillTicketBundle/src/Resources/views/Banner/banner.html.twig
@@ -7,7 +7,14 @@
 						#{{ ticket.getExternalRef() }}
 					</h2>
 					<h1>
-						{{ticket.getMotive()}}
+						{% if ticket.getMotive() %}
+							{{ ticket.getMotive().label.fr }}
+						{% else %}
+							{{ ticket.getMotive() }}
+							<p class="chill-no-data-statement">
+								{{ "no_motive"|trans }}
+							</p>
+						{% endif %}
 					</h1>
 				</div>
 
diff --git a/src/Bundle/ChillTicketBundle/translations/messages.fr.yaml b/src/Bundle/ChillTicketBundle/translations/messages.fr.yaml
index 6f2c57afa..bcc75537e 100644
--- a/src/Bundle/ChillTicketBundle/translations/messages.fr.yaml
+++ b/src/Bundle/ChillTicketBundle/translations/messages.fr.yaml
@@ -3,3 +3,4 @@ caller: Appelant
 speaker: Intervenant
 open: Ouvert
 since: Depuis
+no_motive: Pas de motif

From 7b8cd90cf17eda4f2beefe01394d99a014aeffec Mon Sep 17 00:00:00 2001
From: Boris Waaub <boris.waaub@gmail.com>
Date: Thu, 2 May 2024 12:03:10 +0200
Subject: [PATCH 043/283] Add user store

---
 .../public/vuejs/TicketApp/store/index.ts     |  5 +-
 .../vuejs/TicketApp/store/modules/ticket.ts   |  2 -
 .../vuejs/TicketApp/store/modules/user.ts     | 70 +++++++++++++++++++
 3 files changed, 74 insertions(+), 3 deletions(-)
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/user.ts

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts
index 82dd600a9..61c13b9b9 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts
@@ -1,12 +1,14 @@
 import { createStore } from "vuex";
 import { State as MotiveStates, moduleMotive } from "./modules/motive";
 import { State as TicketStates, moduleTicket } from "./modules/ticket";
-import {  State as CommentStates, moduleComment } from "./modules/comment";
+import { State as CommentStates, moduleComment } from "./modules/comment";
+import { State as UserStates, moduleUser } from "./modules/user";
 
 export type RootState = {
     motive: MotiveStates;
     ticket: TicketStates;
     comment: CommentStates;
+    user: UserStates;
   };
 
 export const store = createStore({
@@ -14,6 +16,7 @@ export const store = createStore({
         motive:moduleMotive,
         ticket:moduleTicket,
         comment:moduleComment,
+        user:moduleUser,
 
       }
 });
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
index 4e3a55762..c02b520eb 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
@@ -1,5 +1,3 @@
-import { fetchResults, makeFetch } from "../../../../../../../../ChillMainBundle/Resources/public/lib/api/apiMethods";
-
 import { Module } from "vuex";
 import { RootState } from "..";
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/user.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/user.ts
new file mode 100644
index 000000000..5fa9e8be1
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/user.ts
@@ -0,0 +1,70 @@
+import {
+    fetchResults,
+    makeFetch,
+} from "../../../../../../../../ChillMainBundle/Resources/public/lib/api/apiMethods";
+
+import { Module } from "vuex";
+import { RootState } from "..";
+
+import {
+    User,
+    UserGroup,
+    UserGroupOrUser,
+} from "../../../../../../../../ChillMainBundle/Resources/public/types";
+
+export interface State {
+    userGroups: Array<UserGroup>;
+    users: Array<User>;
+}
+
+export const moduleUser: Module<State, RootState> = {
+    state: () => ({
+        userGroups: [] as Array<UserGroup>,
+        users: [] as Array<User>,
+    }),
+    getters: {
+        getUserGroups(state) {
+            return state.userGroups;
+        },
+        getUsers(state) {
+            return state.users;
+        },
+    },
+    mutations: {},
+    actions: {
+        getUserGroups({ commit }) {
+            try {
+                fetchResults("/api/1.0/main/user-group.json").then(
+                    (results) => {
+                        commit("setUserGroups", results);
+                    }
+                );
+            } catch (e: any) {
+                throw e.name;
+            }
+        },
+        getUsers({ commit }) {
+            try {
+                fetchResults("/1.0/main/user.json").then((results) => {
+                    commit("setUserGroups", results);
+                });
+            } catch (e: any) {
+                throw e.name;
+            }
+        },
+
+        async setAdressees({ commit }, datas: { ticketId: number; addressees:  Array<UserGroupOrUser>}) {
+            const { ticketId, addressees } = datas;
+            try {
+                const result = await makeFetch(
+                    "POST",
+                    `/api/1.0/ticket/${ticketId}/addressees/set`,
+                    addressees
+                );
+                commit("setTicket", result);
+            } catch (e: any) {
+                throw e.name;
+            }
+        },
+    },
+};

From eb0bf56cff7a1e8df36e6e38ba079efa43c74510 Mon Sep 17 00:00:00 2001
From: Boris Waaub <boris.waaub@gmail.com>
Date: Thu, 2 May 2024 13:18:45 +0200
Subject: [PATCH 044/283] Add user group addressee

---
 .../src/Resources/public/types.ts             |  2 +-
 .../Resources/public/vuejs/TicketApp/App.vue  |  6 +-
 .../components/ActionToolbarComponent.vue     | 49 ++++++++++----
 .../components/AddresseeSelectorComponent.vue | 65 +++++++++++++++++++
 .../components/MotiveSelectorComponent.vue    | 10 +--
 .../TicketHistoryAddresseeComponent .vue      | 30 +++++++++
 .../components/TicketHistoryListComponent.vue |  2 +
 .../public/vuejs/TicketApp/i18n/messages.ts   |  1 +
 .../vuejs/TicketApp/store/modules/motive.ts   | 19 +++---
 .../vuejs/TicketApp/store/modules/user.ts     | 28 ++++++--
 .../Resources/views/Banner/banner.html.twig   | 12 ++--
 11 files changed, 178 insertions(+), 46 deletions(-)
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent .vue

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
index 2c347977c..9c0d467f8 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
@@ -52,7 +52,7 @@ export interface Comment {
     updatedAt: DateTime|null,
 }
 
-interface AddresseeHistory {
+export interface AddresseeHistory {
     type: "ticket_addressee_history",
     id: number,
     startDate: DateTime|null,
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
index b993caa2f..cf4eff359 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
@@ -37,9 +37,11 @@ export default defineComponent({
         const motives = computed(() => store.getters.getMotives as Motive[])
         const ticket = computed(() => store.getters.getTicket as Ticket)
 
-        onMounted(() => {
+        onMounted(async () => {
             try {
-                store.dispatch('fetchMotives')
+                await store.dispatch('fetchMotives')
+                await store.dispatch('fetchUserGroups')
+                await store.dispatch('fetchUsers')
             } catch (error) {
                 toast.error(error)
             };
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
index 986e466eb..ed38bedae 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
@@ -24,19 +24,21 @@
                 </div>
 
                 <div v-if="activeTab === 'transfert'">
-                    <div class="d-flex justify-content-end p-2">
-                        <button class="btn btn-chill-green text-white float-right" type="submit">
-                            <i class="fa fa-pencil"></i>
-                            {{ $t("transfert.save") }}
-                        </button>
-                    </div>
+                    <form @submit.prevent="setAdressees">
+                        <addressee-selector-component v-model="addressees" :user-groups="userGroups" :users="users" />
+                        <div class="d-flex justify-content-end p-2">
+                            <button class="btn btn-chill-green text-white float-right" type="submit">
+                                <i class="fa fa-pencil"></i>
+                                {{ $t("transfert.save") }}
+                            </button>
+                        </div>
+                    </form>
                 </div>
 
                 <div v-if="activeTab === 'motive'">
                     <form @submit.prevent="createMotive">
 
-                        <motive-selector-component v-model="motive" :motives="motives"
-                            :current-motive="ticket.currentMotive" />
+                        <motive-selector-component v-model="motive" :motives="motives" />
                         <div class="d-flex justify-content-end p-2">
                             <button class="btn btn-chill-green text-white float-right" type="submit">
                                 <i class="fa fa-pencil"></i>
@@ -79,20 +81,23 @@
 </template>
 
 <script lang="ts">
-import { defineComponent, inject, ref } from "vue";
+import { computed, defineComponent, inject, ref } from "vue";
 import { useI18n } from "vue-i18n";
 import { useStore } from "vuex";
 
 // Types
+import { User, UserGroup, UserGroupOrUser } from "../../../../../../../ChillMainBundle/Resources/public/types";
 import { Comment, Motive, Ticket } from "../../../types";
 
 // Component
 import MotiveSelectorComponent from "./MotiveSelectorComponent.vue";
+import AddresseeSelectorComponent from "./AddresseeSelectorComponent.vue";
 
 export default defineComponent({
     name: "ActionToolbarComponent",
     components: {
         MotiveSelectorComponent,
+        AddresseeSelectorComponent,
     },
     setup() {
         const store = useStore();
@@ -100,11 +105,14 @@ export default defineComponent({
         const toast = inject('toast') as any;
         const activeTab = ref("");
 
-        const ticket = ref(store.getters.getTicket as Ticket);
-        const motives = ref(store.getters.getMotives as Motive[]);
+        const ticket = computed(() => store.getters.getTicket as Ticket);
+        const motives = computed(() => store.getters.getMotives as Motive[]);
+        const userGroups = computed(() => store.getters.getUserGroups as UserGroup[]);
+        const users = computed(() => store.getters.getUserGroups as User[]);
 
-        const motive = ref({} as Motive);
+        const motive = ref(ticket.value.currentMotive ? ticket.value.currentMotive: {} as Motive);
         const content = ref('' as Comment["content"]);
+        const addressees = ref(ticket.value.currentAddressees as Array<UserGroupOrUser>);
 
 
 
@@ -133,20 +141,35 @@ export default defineComponent({
             }
         }
 
+        async function setAdressees() {
+            try {
+                await store.dispatch("setAdressees", {
+                    ticketId: ticket.value.id,
+                    addressees: addressees.value,
+                });
+                toast.success(t("transfert.success"))
+            } catch (error) {
+                toast.error(error)
+            }
+        }
+
         return {
             activeTab,
             ticket,
             motives,
             motive,
+            userGroups,
+            addressees,
+            users,
             content,
             createMotive,
             createComment,
+            setAdressees,
         };
     },
 });
 </script>
 <style lang="scss" scoped>
-
 div.fixed-bottom {
     div.footer-ticket-main {
         background: none repeat scroll 0 0 #cabb9f;
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue
new file mode 100644
index 000000000..74affc297
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue
@@ -0,0 +1,65 @@
+<template>
+    <div class="row">
+        <div class="col-12 col-lg-4 col-md-6">
+            <vue-multiselect name="selectMotive" id="selectMotive" label="label" :custom-label="customUserGroupLabel"
+                track-by="id" open-direction="top" :multiple="false" :searchable="true"
+                :placeholder="$t('transfert.label')" :select-label="$t('multiselect.select_label')"
+                :deselect-label="$t('multiselect.deselect_label')" :selected-label="$t('multiselect.selected_label')"
+                :options="userGroups" v-model="userGroup" />
+        </div>
+    </div>
+</template>
+
+<script lang="ts">
+import { PropType, defineComponent, ref, watch } from "vue";
+import { useI18n } from "vue-i18n";
+import VueMultiselect from "vue-multiselect";
+
+// Types
+import { User, UserGroup, UserGroupOrUser } from "../../../../../../../ChillMainBundle/Resources/public/types";
+
+
+export default defineComponent({
+    name: "AddresseeSelectorComponent",
+    props: {
+        modelValue: {
+            type: Array as PropType<UserGroupOrUser[]>,
+            default: [],
+            required: false,
+        },
+        userGroups: {
+            type: Array as PropType<UserGroup[]>,
+            required: true,
+        },
+        users: {
+            type: Array as PropType<User[]>,
+            required: true,
+        },
+    },
+    components: {
+        VueMultiselect,
+    },
+    emits: ["update:modelValue"],
+
+    setup(props, ctx) {
+        const addressees = ref(props.modelValue as UserGroupOrUser[]);
+        const userGroup = ref({} as UserGroup);
+        const { t } = useI18n();
+
+        watch(userGroup, (userGroup) => {
+            addressees.value.push(userGroup);
+            ctx.emit("update:modelValue", addressees.value);
+        });
+
+        return {
+            addressees,
+            userGroup,
+            customUserGroupLabel(userGroup: UserGroup) {
+                return userGroup.label ? userGroup.label.fr : t('transfert.label');
+            },
+        };
+    },
+});
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/MotiveSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/MotiveSelectorComponent.vue
index 7f55443eb..c7f7f9b03 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/MotiveSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/MotiveSelectorComponent.vue
@@ -21,14 +21,14 @@ import { Motive } from "../../../types";
 export default defineComponent({
     name: "MotiveSelectorComponent",
     props: {
+        modelValue: {
+            type: Object as PropType<Motive>,
+            required: false,
+        },
         motives: {
             type: Object as PropType<Motive[]>,
             required: true,
         },
-        currentMotive: {
-            type: Object as PropType<null|Motive>,
-            required: false,
-        },
     },
     components: {
         VueMultiselect,
@@ -36,7 +36,7 @@ export default defineComponent({
     emits: ["update:modelValue"],
 
     setup(props, ctx) {
-        const motive = ref(props.currentMotive ? props.currentMotive : {} as Motive);
+        const motive = ref(props.modelValue);
         const { t } = useI18n();
 
         watch(motive, (motive) => {
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent .vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent .vue
new file mode 100644
index 000000000..08d5fcbd3
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent .vue	
@@ -0,0 +1,30 @@
+<template>
+    <div class="col-12">
+        <i class="fa fa-paint-brush"></i>
+        <span class="mx-1">
+            {{ $t('history.user_group.',{ user_group: addresseeHistory.addressee.label }) }}
+        </span>
+    </div>
+</template>
+
+<script lang="ts">
+
+import { PropType, defineComponent } from 'vue';
+
+// Types
+import { AddresseeHistory } from '../../../types';
+
+export default defineComponent({
+    name: 'TicketHistoryAddresseeComponent',
+    props: {
+        addresseeHistory: {
+            type: Object as PropType<AddresseeHistory>,
+            required: true,
+        },
+    },
+
+    setup() {}
+});
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
index 113cfd677..50761bc5e 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
@@ -20,6 +20,8 @@
                 v-else-if="history_line.event_type == 'set_motive'" />
             <ticket-history-comment-component :commentHistory="history_line.data"
                 v-else-if="history_line.event_type == 'add_comment'" />
+            <ticket-history-addressee-component :commentHistory="history_line.data"
+                v-else-if="history_line.event_type == 'add_addressee'" />
         </div>
     </div>
 </template>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
index f1605c4a5..e320b84e7 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
@@ -10,6 +10,7 @@ const messages = {
             user: "Prise en charge par {username}",
             motive: "Motif indiqué: {motive}",
             comment: "Commentaire: {comment}",
+            user_group: "Transferer au group: {user_group}",
         },
         comment: {
             title: "Commentaire",
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/motive.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/motive.ts
index 296301fc2..1c2696106 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/motive.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/motive.ts
@@ -20,12 +20,6 @@ export const moduleMotive: Module<State, RootState> = {
         getMotives(state) {
             return state.motives;
         },
-        getMotiveOptions(state) {
-            return state.motives.map((motive) => ({
-                value: motive.id,
-                text: motive.label.fr,
-            }));
-        },
     },
     mutations: {
         setMotives(state, motives) {
@@ -39,8 +33,7 @@ export const moduleMotive: Module<State, RootState> = {
                     "/api/1.0/ticket/motive.json"
                 )) as Motive[];
                 commit("setMotives", results);
-            }
-            catch(e: any) {
+            } catch (e: any) {
                 throw e.name;
             }
         },
@@ -54,11 +47,15 @@ export const moduleMotive: Module<State, RootState> = {
                 const result = await makeFetch(
                     "POST",
                     `/api/1.0/ticket/${ticketId}/motive/set`,
-                    { motive }
+                    {
+                        motive: {
+                            id: motive.id,
+                            type: motive.type,
+                        },
+                    }
                 );
                 commit("setTicket", result);
-            }
-            catch(e: any) {
+            } catch (e: any) {
                 throw e.name;
             }
         },
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/user.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/user.ts
index 5fa9e8be1..f4441e34b 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/user.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/user.ts
@@ -30,9 +30,16 @@ export const moduleUser: Module<State, RootState> = {
             return state.users;
         },
     },
-    mutations: {},
+    mutations: {
+        setUserGroups(state, userGroups) {
+            state.userGroups = userGroups;
+        },
+        setUsers(state, users) {
+            state.users = users;
+        },
+    },
     actions: {
-        getUserGroups({ commit }) {
+        fetchUserGroups({ commit }) {
             try {
                 fetchResults("/api/1.0/main/user-group.json").then(
                     (results) => {
@@ -43,23 +50,30 @@ export const moduleUser: Module<State, RootState> = {
                 throw e.name;
             }
         },
-        getUsers({ commit }) {
+        fetchUsers({ commit }) {
             try {
-                fetchResults("/1.0/main/user.json").then((results) => {
-                    commit("setUserGroups", results);
+                fetchResults("/api/1.0/main/user.json").then((results) => {
+                    commit("setUsers", results);
                 });
             } catch (e: any) {
                 throw e.name;
             }
         },
 
-        async setAdressees({ commit }, datas: { ticketId: number; addressees:  Array<UserGroupOrUser>}) {
+        async setAdressees(
+            { commit },
+            datas: { ticketId: number; addressees: Array<UserGroupOrUser> }
+        ) {
             const { ticketId, addressees } = datas;
             try {
                 const result = await makeFetch(
                     "POST",
                     `/api/1.0/ticket/${ticketId}/addressees/set`,
-                    addressees
+                    {
+                        addressees: addressees.map((addressee) => {
+                            return { id: addressee.id, type: addressee.type };
+                        }),
+                    }
                 );
                 commit("setTicket", result);
             } catch (e: any) {
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/views/Banner/banner.html.twig b/src/Bundle/ChillTicketBundle/src/Resources/views/Banner/banner.html.twig
index c8a7ff724..46f02d298 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/views/Banner/banner.html.twig
+++ b/src/Bundle/ChillTicketBundle/src/Resources/views/Banner/banner.html.twig
@@ -36,7 +36,7 @@
 					<h3 class="text-primary">{{'concerned_patient' | trans}}</h3>
 					<h2>
 						{% for person in ticket.getPersons()  %}
-							<span class="badge text-bg-light" v-for="person in ticket.currentPersons">
+							<span class="badge text-bg-light">
 								{{ person.firstName }}
 								{{ person.lastName }}
 							</span>
@@ -51,12 +51,10 @@
 					<h3 class="text-primary">{{'speaker' | trans}}</h3>
 					<h2>
 						{% for addressee in ticket.getCurrentAddressee() %}
-							<span class="badge text-bg-light" v-for="person in ticket.currentPersons">
-								{% if addressee.type=='chill_main_user_group'  %}
-									{{ addressee.label.fr }}
-								{% else %}
-									{{ addressee.username }}
-								{% endif %}
+							<span class="badge text-bg-light">
+
+								{{ addressee.label.fr }}
+
 							</span>
 						{% endfor %}
 					</h2>

From 1d0045714188f791a42a9fe95fdf68373cd66bda Mon Sep 17 00:00:00 2001
From: Boris Waaub <boris.waaub@gmail.com>
Date: Thu, 2 May 2024 14:09:52 +0200
Subject: [PATCH 045/283] =?UTF-8?q?Ajouter=20les=20propri=C3=A9t=C3=A9s=20?=
 =?UTF-8?q?createdAt=20et=20updatedBy=20=C3=A0=20l'interface=20Ticket?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/Bundle/ChillTicketBundle/src/Resources/public/types.ts | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
index 9c0d467f8..6d8657f82 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
@@ -80,5 +80,7 @@ export interface Ticket {
     currentPersons: Person[],
     currentMotive: null|Motive,
     history: TicketHistoryLine[],
+    createdAt: DateTime|null,
+    updatedBy: User|null,
 }
 

From 6500c24a7f436ced4bed0f1963c2f6fa7b7564d2 Mon Sep 17 00:00:00 2001
From: Boris Waaub <boris.waaub@gmail.com>
Date: Thu, 2 May 2024 14:10:22 +0200
Subject: [PATCH 046/283] =?UTF-8?q?D=C3=A9placer=20le=20r=C3=A9pertoire=20?=
 =?UTF-8?q?translation=20dans=20source?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ChillTicketBundle/{ => src}/translations/messages.fr.yaml     | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 rename src/Bundle/ChillTicketBundle/{ => src}/translations/messages.fr.yaml (100%)

diff --git a/src/Bundle/ChillTicketBundle/translations/messages.fr.yaml b/src/Bundle/ChillTicketBundle/src/translations/messages.fr.yaml
similarity index 100%
rename from src/Bundle/ChillTicketBundle/translations/messages.fr.yaml
rename to src/Bundle/ChillTicketBundle/src/translations/messages.fr.yaml

From 473765366a6c72f1bc78f2ec98272e095af8a647 Mon Sep 17 00:00:00 2001
From: Boris Waaub <boris.waaub@gmail.com>
Date: Mon, 6 May 2024 16:38:56 +0200
Subject: [PATCH 047/283] Add tranfert with AddPerson

---
 .../components/ActionToolbarComponent.vue     |  10 +-
 .../components/AddresseeSelectorComponent.vue | 184 ++++++++++++++++--
 .../TicketHistoryAddresseeComponent .vue      |  30 ---
 .../TicketHistoryAddresseeComponent.vue       |  48 +++++
 .../components/TicketHistoryListComponent.vue |  67 ++++---
 .../TicketHistoryPersonComponent.vue          |  20 +-
 .../public/vuejs/TicketApp/i18n/messages.ts   |   6 +-
 7 files changed, 275 insertions(+), 90 deletions(-)
 delete mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent .vue
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent.vue

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
index ed38bedae..d188bdab0 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
@@ -24,9 +24,9 @@
                 </div>
 
                 <div v-if="activeTab === 'transfert'">
-                    <form @submit.prevent="setAdressees">
+                    <form @submit.prevent="setAdressees" v-if="userGroups.length && users.length">
                         <addressee-selector-component v-model="addressees" :user-groups="userGroups" :users="users" />
-                        <div class="d-flex justify-content-end p-2">
+                        <div class="d-flex justify-content-end p-1">
                             <button class="btn btn-chill-green text-white float-right" type="submit">
                                 <i class="fa fa-pencil"></i>
                                 {{ $t("transfert.save") }}
@@ -39,7 +39,7 @@
                     <form @submit.prevent="createMotive">
 
                         <motive-selector-component v-model="motive" :motives="motives" />
-                        <div class="d-flex justify-content-end p-2">
+                        <div class="d-flex justify-content-end p-1">
                             <button class="btn btn-chill-green text-white float-right" type="submit">
                                 <i class="fa fa-pencil"></i>
                                 {{ $t("motive.save") }}
@@ -108,11 +108,11 @@ export default defineComponent({
         const ticket = computed(() => store.getters.getTicket as Ticket);
         const motives = computed(() => store.getters.getMotives as Motive[]);
         const userGroups = computed(() => store.getters.getUserGroups as UserGroup[]);
-        const users = computed(() => store.getters.getUserGroups as User[]);
+        const users = computed(() => store.getters.getUsers as User[]);
 
         const motive = ref(ticket.value.currentMotive ? ticket.value.currentMotive: {} as Motive);
         const content = ref('' as Comment["content"]);
-        const addressees = ref(ticket.value.currentAddressees as Array<UserGroupOrUser>);
+        const addressees = ref([] as Array<UserGroupOrUser>);
 
 
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue
index 74affc297..36e6d64a6 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue
@@ -1,23 +1,103 @@
 <template>
     <div class="row">
-        <div class="col-12 col-lg-4 col-md-6">
-            <vue-multiselect name="selectMotive" id="selectMotive" label="label" :custom-label="customUserGroupLabel"
-                track-by="id" open-direction="top" :multiple="false" :searchable="true"
-                :placeholder="$t('transfert.label')" :select-label="$t('multiselect.select_label')"
-                :deselect-label="$t('multiselect.deselect_label')" :selected-label="$t('multiselect.selected_label')"
-                :options="userGroups" v-model="userGroup" />
+        <div class="col-12 col-lg-6 col-md-6 mb-2 text-center">
+            <span class="m-1">
+                <input
+                    type="radio"
+                    class="btn-check"
+                    name="options-outlined"
+                    id="level-none"
+                    autocomplete="off"
+                    :value="{}"
+                    v-model="userGroupLevel"
+                />
+                <label :class="`btn btn-outline-primary`" for="level-none">
+                    Aucun
+                </label>
+            </span>
+            <span
+                v-for="userGroupItem in userGroups.filter(
+                    (userGroup) => userGroup.excludeKey == 'level'
+                )"
+                :key="userGroupItem.id"
+                class="m-1"
+            >
+                <input
+                    type="radio"
+                    class="btn-check"
+                    name="options-outlined"
+                    :id="`level-${userGroupItem.id}`"
+                    autocomplete="off"
+                    :value="userGroupItem"
+                    v-model="userGroupLevel"
+                />
+                <label
+                    :class="`btn btn-${userGroupItem.id}`"
+                    :for="`level-${userGroupItem.id}`"
+                    :style="getUserGroupBtnColor(userGroupItem)"
+                >
+                    {{ userGroupItem.label.fr }}
+                </label>
+            </span>
+        </div>
+        <div class="col-12 col-lg-6 col-md-6 mb-2 text-center">
+            <span
+                v-for="userGroupItem in userGroups.filter(
+                    (userGroup) => userGroup.excludeKey == ''
+                )"
+                :key="userGroupItem.id"
+                class="m-1"
+            >
+                <input
+                    type="checkbox"
+                    class="btn-check"
+                    name="options-outlined"
+                    :id="`user-group-${userGroupItem.id}`"
+                    autocomplete="off"
+                    :value="userGroupItem"
+                    v-model="userGroup"
+                />
+                <label
+                    :class="`btn btn-${userGroupItem.id}`"
+                    :for="`user-group-${userGroupItem.id}`"
+                    :style="getUserGroupBtnColor(userGroupItem)"
+                >
+                    {{ userGroupItem.label.fr }}
+                </label>
+            </span>
+        </div>
+
+        <div class="col-12 col-lg-6 col-md-6 mb-2 text-center">
+            <add-persons
+                :options="addPersonsOptions"
+                key="add-person-ticket"
+                buttonTitle="transfert.user_label"
+                modalTitle="transfert.user_label"
+                ref="addPersons"
+                @addNewPersons="addNewEntity"
+            />
+        </div>
+        <div class="col-12 col-lg-6 col-md-6 mb-2 mb-2 text-center">
+            <span class="badge text-bg-light m-1" v-for="user in users">
+                {{ user.username }}
+            </span>
         </div>
     </div>
 </template>
 
 <script lang="ts">
-import { PropType, defineComponent, ref, watch } from "vue";
+import { PropType, computed, defineComponent, ref, watch } from "vue";
 import { useI18n } from "vue-i18n";
-import VueMultiselect from "vue-multiselect";
 
 // Types
-import { User, UserGroup, UserGroupOrUser } from "../../../../../../../ChillMainBundle/Resources/public/types";
+import {
+    User,
+    UserGroup,
+    UserGroupOrUser,
+} from "../../../../../../../ChillMainBundle/Resources/public/types";
 
+// Components
+import AddPersons from "../../../../../../../ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue";
 
 export default defineComponent({
     name: "AddresseeSelectorComponent",
@@ -37,29 +117,99 @@ export default defineComponent({
         },
     },
     components: {
-        VueMultiselect,
+        AddPersons,
     },
     emits: ["update:modelValue"],
 
     setup(props, ctx) {
-        const addressees = ref(props.modelValue as UserGroupOrUser[]);
-        const userGroup = ref({} as UserGroup);
+        // Cant use UserGroupOrUser[] because of TS2367
+        // TS2367: This comparison appears to be unintentional because the types '"user" | "chill_main_user_group"' and '"user_group"' have no overlap.
+        const addressees = ref(props.modelValue as any[]);
+        const userGroupLevel = ref({} as UserGroupOrUser);
+        const userGroup = ref([] as UserGroupOrUser[]);
+        const users = ref([] as User[]);
+        const addPersons = ref();
+
         const { t } = useI18n();
 
-        watch(userGroup, (userGroup) => {
-            addressees.value.push(userGroup);
+        function getUserGroupBtnColor(userGroup: UserGroup) {
+            return [
+                `.btn-check:checked + .btn-${userGroup.id} {
+                color: ${userGroup.foregroundColor};
+                background-color: ${userGroup.backgroundColor};
+                }`,
+            ];
+        }
+        function addNewEntity(datas: any) {
+            const { selected, modal } = datas;
+            users.value = selected.map((selected: any) => selected.result);
+            addressees.value = addressees.value.filter(
+                (addressee) => addressee.type === "user_group"
+            );
+            addressees.value = [...addressees.value, ...users.value];
+            ctx.emit("update:modelValue", addressees.value);
+            addPersons.value.resetSearch();
+            modal.showModal = false;
+        }
+
+        const addPersonsOptions = computed(() => {
+            return {
+                uniq: false,
+                type: ["user"],
+                priority: null,
+                button: {
+                    size: "btn-sm",
+                    class: "btn-submit",
+                },
+            };
+        });
+
+        watch(userGroupLevel, (userGroupLevelAdd, userGroupLevelRem) => {
+            if (userGroupLevelRem) {
+                addressees.value.splice(
+                    addressees.value.indexOf(userGroupLevelRem),
+                    1
+                );
+            }
+            addressees.value.push(userGroupLevelAdd);
+            ctx.emit("update:modelValue", addressees.value);
+        });
+
+        watch(userGroup, (userGroupAdd) => {
+            addressees.value = addressees.value.filter(
+                (addressee) => addressee.excludeKey !== ""
+            );
+            addressees.value = [...addressees.value, ...userGroupAdd];
             ctx.emit("update:modelValue", addressees.value);
         });
 
         return {
             addressees,
+            userGroupLevel,
             userGroup,
-            customUserGroupLabel(userGroup: UserGroup) {
-                return userGroup.label ? userGroup.label.fr : t('transfert.label');
+            users,
+            addPersons,
+            addPersonsOptions,
+            addNewEntity,
+            getUserGroupBtnColor,
+            customUserGroupLabel(selectedUserGroup: UserGroup) {
+                return selectedUserGroup.label
+                    ? selectedUserGroup.label.fr
+                    : t("transfert.user_group_label");
             },
         };
     },
 });
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.btn-check:checked + .btn,
+:not(.btn-check) + .btn:active,
+.btn:first-child:active,
+.btn.active,
+.btn.show {
+    color: white;
+    box-shadow: 0 0 0 0.2rem var(--bs-chill-green);
+    outline: 0;
+}
+</style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent .vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent .vue
deleted file mode 100644
index 08d5fcbd3..000000000
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent .vue	
+++ /dev/null
@@ -1,30 +0,0 @@
-<template>
-    <div class="col-12">
-        <i class="fa fa-paint-brush"></i>
-        <span class="mx-1">
-            {{ $t('history.user_group.',{ user_group: addresseeHistory.addressee.label }) }}
-        </span>
-    </div>
-</template>
-
-<script lang="ts">
-
-import { PropType, defineComponent } from 'vue';
-
-// Types
-import { AddresseeHistory } from '../../../types';
-
-export default defineComponent({
-    name: 'TicketHistoryAddresseeComponent',
-    props: {
-        addresseeHistory: {
-            type: Object as PropType<AddresseeHistory>,
-            required: true,
-        },
-    },
-
-    setup() {}
-});
-</script>
-
-<style lang="scss" scoped></style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent.vue
new file mode 100644
index 000000000..3e4203561
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent.vue
@@ -0,0 +1,48 @@
+<template>
+    <div class="col-12" v-if="addressee.type == 'user_group'">
+        <i class="fa fa-paper-plane"></i>
+        <span class="mx-1">
+            {{
+                $t("history.transfert_user_group", {
+                    user_group: addressee.label.fr,
+                })
+            }}
+        </span>
+    </div>
+    <div class="col-12" v-if="addressee.type == 'user'">
+        <i class="fa fa-paper-plane"></i>
+        <span class="mx-1">
+            {{
+                $t("history.transfert_user", {
+                    user: addressee.username,
+                })
+            }}
+        </span>
+    </div>
+</template>
+
+<script lang="ts">
+import { PropType, defineComponent, ref } from "vue";
+
+// Types
+import { AddresseeHistory } from "../../../types";
+import { UserGroupOrUser } from "../../../../../../../ChillMainBundle/Resources/public/types";
+
+export default defineComponent({
+    name: "TicketHistoryAddresseeComponent",
+    props: {
+        addresseeHistory: {
+            type: Object as PropType<AddresseeHistory>,
+            required: true,
+        },
+    },
+
+    setup(props, ctx) {
+        return {
+            addressee: ref(props.addresseeHistory.addressee as UserGroupOrUser),
+        };
+    },
+});
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
index 50761bc5e..c7d809a3f 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
@@ -1,50 +1,59 @@
 <template>
-    <div class="card my-2 bg-light" v-for="history_line in history" :key="history_line.data.id">
+    <div
+        class="card my-2 bg-light"
+        v-for="history_line in history"
+        :key="history_line.data.id"
+    >
         <div class="card-header">
             <span class="fw-bold fst-italic">
                 {{ formatDate(history_line.at) }}
             </span>
-            <span class="badge bg-white text-black mx-1">{{ history_line.by.username }}</span>
+            <span class="badge bg-white text-black mx-1">{{
+                history_line.by.username
+            }}</span>
         </div>
-
+        {{history_line.event_type}}
         <div class="card-body row fst-italic">
-            <div class="col-12">
-                <i class="fa fa-eyedropper"></i>
-                <span class="mx-1">
-                    {{ $t('history.user', { username: history_line.by.username }) }}
-                </span>
-            </div>
-            <ticket-history-person-component :personHistory="history_line.data"
-                v-if="history_line.event_type == 'add_person'" />
-            <ticket-history-motive-component :motiveHistory="history_line.data"
-                v-else-if="history_line.event_type == 'set_motive'" />
-            <ticket-history-comment-component :commentHistory="history_line.data"
-                v-else-if="history_line.event_type == 'add_comment'" />
-            <ticket-history-addressee-component :commentHistory="history_line.data"
-                v-else-if="history_line.event_type == 'add_addressee'" />
+            <ticket-history-person-component
+                :personHistory="history_line.data"
+                v-if="history_line.event_type == 'add_person'"
+            />
+            <ticket-history-motive-component
+                :motiveHistory="history_line.data"
+                v-else-if="history_line.event_type == 'set_motive'"
+            />
+            <ticket-history-comment-component
+                :commentHistory="history_line.data"
+                v-else-if="history_line.event_type == 'add_comment'"
+            />
+            <ticket-history-addressee-component
+                :addresseeHistory="history_line.data"
+                v-else-if="history_line.event_type == 'add_addressee'"
+            />
         </div>
     </div>
 </template>
 
 <script lang="ts">
-
-import { PropType, defineComponent } from 'vue';
-import { DateTime } from '../../../../../../../ChillMainBundle/Resources/public/types';
+import { PropType, defineComponent } from "vue";
+import { DateTime } from "../../../../../../../ChillMainBundle/Resources/public/types";
 
 // Types
-import { Ticket } from '../../../types';
+import { Ticket } from "../../../types";
 
 // Components
-import TicketHistoryPersonComponent from './TicketHistoryPersonComponent.vue';
-import TicketHistoryMotiveComponent from './TicketHistoryMotiveComponent.vue';
-import TicketHistoryCommentComponent from './TicketHistoryCommentComponent.vue';
+import TicketHistoryPersonComponent from "./TicketHistoryPersonComponent.vue";
+import TicketHistoryMotiveComponent from "./TicketHistoryMotiveComponent.vue";
+import TicketHistoryCommentComponent from "./TicketHistoryCommentComponent.vue";
+import TicketHistoryAddresseeComponent from "./TicketHistoryAddresseeComponent.vue";
 
 export default defineComponent({
-    name: 'TicketHistoryListComponent',
+    name: "TicketHistoryListComponent",
     components: {
         TicketHistoryPersonComponent,
         TicketHistoryMotiveComponent,
         TicketHistoryCommentComponent,
+        TicketHistoryAddresseeComponent,
     },
     props: {
         history: {
@@ -56,12 +65,12 @@ export default defineComponent({
     setup() {
         function formatDate(d: DateTime) {
             const date = new Date(d.datetime);
-            const month = date.toLocaleString('default', { month: 'long' });
-            return `${date.getDate()} ${month} ${date.getFullYear()}, ${date.toLocaleTimeString()}`
+            const month = date.toLocaleString("default", { month: "long" });
+            return `${date.getDate()} ${month} ${date.getFullYear()}, ${date.toLocaleTimeString()}`;
         }
 
-        return { formatDate }
-    }
+        return { formatDate };
+    },
 });
 </script>
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryPersonComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryPersonComponent.vue
index 6ecd96039..f4831205b 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryPersonComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryPersonComponent.vue
@@ -1,20 +1,26 @@
 <template>
-    <div class="col-12">
-        <i class="fa fa-bolt" style="min-width: 16px;"></i>
+    <div class="col-12" v-if="personHistory.createdBy">
+        <i class="fa fa-eyedropper"></i>
         <span class="mx-1">
-            {{ $t('history.person',{ person: personHistory.person.text }) }}
+            {{ $t("history.user", { username: personHistory.createdBy.username }) }}
+        </span>
+    </div>
+    <div class="col-12">
+        <i class="fa fa-bolt" style="min-width: 16px"></i>
+        <span class="mx-1">
+            {{ $t("history.person", { person: personHistory.person.text }) }}
         </span>
     </div>
 </template>
 
 <script lang="ts">
-import { PropType, defineComponent } from 'vue';
+import { PropType, defineComponent } from "vue";
 
 // Type
-import { PersonHistory } from '../../../types';
+import { PersonHistory, Ticket } from "../../../types";
 
 export default defineComponent({
-    name: 'TicketHistoryPersonComponent',
+    name: "TicketHistoryPersonComponent",
     props: {
         personHistory: {
             type: Object as PropType<PersonHistory>,
@@ -22,7 +28,7 @@ export default defineComponent({
         },
     },
 
-    setup() {}
+    setup() {},
 });
 </script>
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
index e320b84e7..19a7db452 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
@@ -10,7 +10,8 @@ const messages = {
             user: "Prise en charge par {username}",
             motive: "Motif indiqué: {motive}",
             comment: "Commentaire: {comment}",
-            user_group: "Transferer au group: {user_group}",
+            transfert_user_group: "Transferé au groupe: {user_group}",
+            transfert_user: "Transferé vers l'utilisateur: {user}",
         },
         comment: {
             title: "Commentaire",
@@ -26,7 +27,8 @@ const messages = {
          },
          transfert: {
             title: "Transfert",
-            label: "Transferer vers",
+            user_group_label: "Transferer vers un groupe",
+            user_label: "Transferer vers un ou plusieurs utilisateurs",
             save: "Enregistrer",
             success: "Transfert effectué",
          },

From 3f9745d8cfc0d81ac5c43dbab42ce8ecedef30ec Mon Sep 17 00:00:00 2001
From: Boris Waaub <boris.waaub@gmail.com>
Date: Mon, 6 May 2024 18:03:04 +0200
Subject: [PATCH 048/283] Use teleport for banner

---
 .../ChillTicketBundle/src/Entity/Ticket.php   |  20 +++
 .../src/Resources/public/types.ts             |   1 -
 .../Resources/public/vuejs/TicketApp/App.vue  | 120 +++++++++++++++---
 .../components/TicketHistoryListComponent.vue |   3 +-
 .../components/TicketSelectorComponent.vue    |   5 +-
 .../public/vuejs/TicketApp/i18n/messages.ts   |  22 +++-
 .../Resources/views/Banner/banner.html.twig   |  57 ---------
 .../Normalizer/TicketNormalizer.php           |   2 +
 .../src/translations/messages.fr.yaml         |   6 -
 9 files changed, 142 insertions(+), 94 deletions(-)
 delete mode 100644 src/Bundle/ChillTicketBundle/src/translations/messages.fr.yaml

diff --git a/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php b/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php
index 04cfe828b..9fc4d6a15 100644
--- a/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php
+++ b/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php
@@ -69,6 +69,13 @@ class Ticket implements TrackCreationInterface, TrackUpdateInterface
     #[ORM\OneToMany(targetEntity: PersonHistory::class, mappedBy: 'ticket')]
     private Collection $personHistories;
 
+    #[ORM\ManyToOne(targetEntity: User::class)]
+    #[ORM\JoinColumn(nullable: true)]
+    private ?User $updatedBy = null;
+
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::DATETIME_IMMUTABLE, nullable: true)]
+    private ?\DateTimeImmutable $createdAt = null;
+
     public function __construct()
     {
         $this->addresseeHistory = new ArrayCollection();
@@ -76,6 +83,7 @@ class Ticket implements TrackCreationInterface, TrackUpdateInterface
         $this->motiveHistories = new ArrayCollection();
         $this->personHistories = new ArrayCollection();
         $this->inputHistories = new ArrayCollection();
+
     }
 
     public function getId(): ?int
@@ -211,4 +219,16 @@ class Ticket implements TrackCreationInterface, TrackUpdateInterface
     {
         return $this->addresseeHistory;
     }
+
+    public function getCreatedAt(): \DateTimeImmutable
+    {
+        return $this->createdAt;
+    }
+
+    public function getUpdatedBy(): ?User
+    {
+        return $this->updatedBy;
+    }
+
+
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
index 6d8657f82..1af87d044 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
@@ -2,7 +2,6 @@ import {
     DateTime,
     TranslatableString,
     User,
-    UserGroup,
     UserGroupOrUser
 } from "../../../../ChillMainBundle/Resources/public/types";
 import { Person } from "../../../../ChillPersonBundle/Resources/public/types";
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
index cf4eff359..e738bd10a 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
@@ -1,5 +1,75 @@
 <template>
-    <div class="container-xxl p-3" style="padding-bottom: 55px;">
+    <Teleport to="#header-ticket-main">
+        <div class="container-xxl text-primary">
+            <div class="row">
+                <div class="col-md-6 col-sm-12 ps-md-5 ps-xxl-0">
+                    <h2>#{{ ticket.externalRef }}</h2>
+                    <h1 v-if="ticket.currentMotive">
+                        {{ ticket.currentMotive.label.fr }}
+                    </h1>
+                    <p class="chill-no-data-statement" v-else>
+                        {{ $t("banner.no_motive") }}
+                    </p>
+                </div>
+
+                <div class="col-md-6 col-sm-12">
+                    <div class="float-end">
+                        <h1>
+                            <span class="badge text-bg-chill-green text-white">
+                                {{ $t("banner.open") }}
+                            </span>
+                        </h1>
+                        <h3 class="fst-italic" v-if="ticket.createdAt">
+                            {{
+                                $t("banner.since", {
+                                    days: getSince(ticket.createdAt),
+                                })
+                            }}
+                        </h3>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </Teleport>
+    <Teleport to="#header-ticket-details">
+        <div class="container-xxl">
+            <div class="row justify-content-between">
+                <!-- <div class="col-md-4 col-sm-12">
+                    <h3 class="text-primary">{{ $t("concerned_patient") }}</h3>
+                </div> -->
+                <div class="col-md-6 col-sm-12 ps-md-5 ps-xxl-0">
+                    <h3 class="text-primary">{{ $t("banner.caller") }}</h3>
+                    <h2>
+                        <span
+                            class="badge text-bg-light m-1"
+                            v-for="person in ticket.currentPersons"
+                            :key="person.id"
+                        >
+                            {{ person.firstName }}
+                            {{ person.lastName }}
+                        </span>
+                    </h2>
+                </div>
+                <div class="col-md-6 col-sm-12">
+                    <h3 class="text-primary">{{ $t("banner.speaker") }}</h3>
+                    <h2>
+                        <span
+                            class="badge text-bg-light m-1"
+                            v-for="addressee in ticket.currentAddressees"
+                            :key="addressee.id"
+                        >
+                            {{
+                                typeof addressee.label == "string"
+                                    ? addressee.label
+                                    : addressee.label.fr
+                            }}
+                        </span>
+                    </h2>
+                </div>
+            </div>
+        </div>
+    </Teleport>
+    <div class="container-xxl pt-1" style="padding-bottom: 55px">
         <ticket-selector-component :tickets="[]" />
         <ticket-history-list-component :history="ticket.history" />
     </div>
@@ -7,50 +77,60 @@
 </template>
 
 <script lang="ts">
-
-import { computed, defineComponent, inject, onMounted, ref } from 'vue';
-import { useStore } from 'vuex';
-
+import { computed, defineComponent, inject, onMounted, ref } from "vue";
+import { useStore } from "vuex";
 
 // Types
-import { Motive, Ticket } from '../../types';
+import { Motive, Ticket } from "../../types";
 
 // Components
-import TicketSelectorComponent from './components/TicketSelectorComponent.vue';
-import TicketHistoryListComponent from './components/TicketHistoryListComponent.vue';
-import ActionToolbarComponent from './components/ActionToolbarComponent.vue';
+import TicketSelectorComponent from "./components/TicketSelectorComponent.vue";
+import TicketHistoryListComponent from "./components/TicketHistoryListComponent.vue";
+import ActionToolbarComponent from "./components/ActionToolbarComponent.vue";
+import UserRenderBoxBadge from "../../../../../../ChillMainBundle/Resources/public/vuejs/_components/Entity/UserRenderBoxBadge.vue";
+import { DateTime } from "../../../../../../ChillMainBundle/Resources/public/types";
 
 export default defineComponent({
-    name: 'App',
+    name: "App",
     components: {
         TicketSelectorComponent,
         TicketHistoryListComponent,
-        ActionToolbarComponent
+        ActionToolbarComponent,
+        UserRenderBoxBadge,
     },
     setup() {
         const store = useStore();
-        const toast = inject('toast') as any;
+        const toast = inject("toast") as any;
         const headline = ref({} as HTMLHeadingElement);
 
-        store.commit('setTicket', JSON.parse(window.initialTicket) as Ticket);
+        store.commit("setTicket", JSON.parse(window.initialTicket) as Ticket);
 
-        const motives = computed(() => store.getters.getMotives as Motive[])
-        const ticket = computed(() => store.getters.getTicket as Ticket)
+        const motives = computed(() => store.getters.getMotives as Motive[]);
+        const ticket = computed(() => store.getters.getTicket as Ticket);
+
+        function getSince(createdAt: DateTime) {
+            const today = new Date();
+            const date = new Date(createdAt.datetime);
+            const timeDiff = Math.abs(today.getTime() - date.getTime());
+            const daysDiff = Math.ceil(timeDiff / (1000 * 3600 * 24));
+            return daysDiff;
+        }
 
         onMounted(async () => {
             try {
-                await store.dispatch('fetchMotives')
-                await store.dispatch('fetchUserGroups')
-                await store.dispatch('fetchUsers')
+                await store.dispatch("fetchMotives");
+                await store.dispatch("fetchUserGroups");
+                await store.dispatch("fetchUsers");
             } catch (error) {
-                toast.error(error)
-            };
+                toast.error(error);
+            }
         });
 
         return {
             headline,
             motives,
             ticket,
+            getSince,
         };
     },
 });
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
index c7d809a3f..4d0722c14 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
@@ -2,7 +2,7 @@
     <div
         class="card my-2 bg-light"
         v-for="history_line in history"
-        :key="history_line.data.id"
+        :key="history.indexOf(history_line)"
     >
         <div class="card-header">
             <span class="fw-bold fst-italic">
@@ -12,7 +12,6 @@
                 history_line.by.username
             }}</span>
         </div>
-        {{history_line.event_type}}
         <div class="card-body row fst-italic">
             <ticket-history-person-component
                 :personHistory="history_line.data"
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketSelectorComponent.vue
index ff291a11c..2057af898 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketSelectorComponent.vue
@@ -1,5 +1,6 @@
 <template>
-    <div class="btn-group" @click="handleClick">
+    <div class="d-flex justify-content-end">
+        <div class="btn-group" @click="handleClick">
         <button type="button" class="btn btn-light dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
             {{ $t('ticket.previous_tickets') }}
             <span class="position-absolute top-0 start-100 translate-middle badge rounded-pill bg-chill-green">
@@ -9,6 +10,8 @@
 
         </button>
     </div>
+    </div>
+
 </template>
 
 <script lang="ts">
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
index 19a7db452..31f5c94d7 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
@@ -1,4 +1,4 @@
-import { multiSelectMessages } from"../../../../../../../ChillMainBundle/Resources/public/vuejs/_js/i18n";
+import { multiSelectMessages } from "../../../../../../../ChillMainBundle/Resources/public/vuejs/_js/i18n";
 
 const messages = {
     fr: {
@@ -18,21 +18,29 @@ const messages = {
             label: "Ajouter un commentaire",
             save: "Enregistrer",
             succcess: "Commentaire enregistré",
-         },
-         motive: {
+        },
+        motive: {
             title: "Motif",
             label: "Choisir un motif",
             save: "Enregistrer",
             success: "Motif enregistré",
-         },
-         transfert: {
+        },
+        transfert: {
             title: "Transfert",
             user_group_label: "Transferer vers un groupe",
             user_label: "Transferer vers un ou plusieurs utilisateurs",
             save: "Enregistrer",
             success: "Transfert effectué",
-         },
-         close: "Fermer"
+        },
+        close: "Fermer",
+        banner: {
+            concerned_patient: "Patient concerné",
+            caller: "Appelant",
+            speaker: "Intervenant",
+            open: "Ouvert",
+            since: "Depuis 1 jour | Depuis {days} jour(s)",
+            no_motive: "Pas de motif",
+        },
     },
 };
 Object.assign(messages.fr, multiSelectMessages.fr);
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/views/Banner/banner.html.twig b/src/Bundle/ChillTicketBundle/src/Resources/views/Banner/banner.html.twig
index 46f02d298..5a33f7fc2 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/views/Banner/banner.html.twig
+++ b/src/Bundle/ChillTicketBundle/src/Resources/views/Banner/banner.html.twig
@@ -1,65 +1,8 @@
 <div class="banner banner-ticket ">
 	<div id="header-ticket-main" class="header-name">
-		<div class="container-xxl text-primary">
-			<div class="row">
-				<div class="col-md-6 ps-md-5 ps-xxl-0 ">
-					<h2>
-						#{{ ticket.getExternalRef() }}
-					</h2>
-					<h1>
-						{% if ticket.getMotive() %}
-							{{ ticket.getMotive().label.fr }}
-						{% else %}
-							{{ ticket.getMotive() }}
-							<p class="chill-no-data-statement">
-								{{ "no_motive"|trans }}
-							</p>
-						{% endif %}
-					</h1>
-				</div>
 
-				<div class="col-md-6">
-					<div class="float-end">
-						<h1>
-							<span class="badge text-bg-chill-green text-white">{{'open' | trans}}</span>
-						</h1>
-						<h3 class="fst-italic">{{'since' | trans}}</h3>
-					</div>
-				</div>
-			</div>
-		</div>
 	</div>
 	<div id="header-ticket-details" class="header-details">
-		<div class="container-xxl">
-			<div class="row justify-content-between">
-				<div class="col-md-4 col-sm-12">
-					<h3 class="text-primary">{{'concerned_patient' | trans}}</h3>
-					<h2>
-						{% for person in ticket.getPersons()  %}
-							<span class="badge text-bg-light">
-								{{ person.firstName }}
-								{{ person.lastName }}
-							</span>
-						{% endfor %}
-					</h2>
-				</div>
-				<div class="col-md-4 col-sm-12">
-					<h3 class="text-primary">{{'caller' | trans}}</h3>
-					<h2></h2>
-				</div>
-				<div class="col-md-4 col-sm-12">
-					<h3 class="text-primary">{{'speaker' | trans}}</h3>
-					<h2>
-						{% for addressee in ticket.getCurrentAddressee() %}
-							<span class="badge text-bg-light">
 
-								{{ addressee.label.fr }}
-
-							</span>
-						{% endfor %}
-					</h2>
-				</div>
-			</div>
-		</div>
 	</div>
 </div>
diff --git a/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php b/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
index f7aff602b..938ee2e9b 100644
--- a/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
+++ b/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
@@ -42,6 +42,8 @@ final class TicketNormalizer implements NormalizerInterface, NormalizerAwareInte
             'currentInputs' => $this->normalizer->normalize($object->getCurrentInputs(), $format, ['groups' => 'read']),
             'currentMotive' => $this->normalizer->normalize($object->getMotive(), $format, ['groups' => 'read']),
             'history' => array_values($this->serializeHistory($object, $format, ['groups' => 'read'])),
+            'createdAt' => $object->getCreatedAt(),
+            'updatedBy' => $object->getUpdatedBy(),
         ];
     }
 
diff --git a/src/Bundle/ChillTicketBundle/src/translations/messages.fr.yaml b/src/Bundle/ChillTicketBundle/src/translations/messages.fr.yaml
deleted file mode 100644
index bcc75537e..000000000
--- a/src/Bundle/ChillTicketBundle/src/translations/messages.fr.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-concerned_patient: Patient concerné
-caller: Appelant
-speaker: Intervenant
-open: Ouvert
-since: Depuis
-no_motive: Pas de motif

From ab850b7b705bedaff2b73875b3eaeddfd988261b Mon Sep 17 00:00:00 2001
From: Boris Waaub <boris.waaub@gmail.com>
Date: Mon, 6 May 2024 20:07:15 +0200
Subject: [PATCH 049/283] Fusionner les utilisateurs/goupes en une "Card"

---
 .../_components/Entity/UserRenderBoxBadge.vue |  1 +
 .../src/Resources/public/types.ts             |  3 +-
 .../Resources/public/vuejs/TicketApp/App.vue  | 36 +++++++---
 .../TicketHistoryAddresseeComponent.vue       | 21 +++---
 .../components/TicketHistoryListComponent.vue | 67 ++++++++++++-------
 .../public/vuejs/TicketApp/i18n/messages.ts   |  6 +-
 .../vuejs/TicketApp/store/modules/ticket.ts   | 19 +++++-
 7 files changed, 104 insertions(+), 49 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/UserRenderBoxBadge.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/UserRenderBoxBadge.vue
index a9c2db9b4..7655f5878 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/UserRenderBoxBadge.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/UserRenderBoxBadge.vue
@@ -1,6 +1,7 @@
 <template>
 <span class="chill-entity entity-user">
     {{ user.label }}
+    {{ user }}
     <span class="user-job" v-if="user.user_job !== null">({{ user.user_job.label.fr }})</span> <span class="main-scope" v-if="user.main_scope !== null">({{ user.main_scope.name.fr }})</span> <span v-if="user.isAbsent" class="badge bg-danger rounded-pill" :title="Absent">A</span>
 </span>
 </template>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
index 1af87d044..5ff90bc42 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
@@ -68,8 +68,9 @@ interface AddPersonEvent extends TicketHistory<"add_person", PersonHistory> {};
 interface AddCommentEvent extends TicketHistory<"add_comment", Comment> {};
 interface SetMotiveEvent extends TicketHistory<"set_motive", MotiveHistory> {};
 interface AddAddressee extends TicketHistory<"add_addressee", AddresseeHistory> {};
+interface RemoveAddressee extends TicketHistory<"remove_addressee", AddresseeHistory> {};
 
-type TicketHistoryLine = AddPersonEvent | AddCommentEvent | SetMotiveEvent | AddAddressee;
+type TicketHistoryLine = AddPersonEvent | AddCommentEvent | SetMotiveEvent | AddAddressee | RemoveAddressee;
 
 export interface Ticket {
     type: "ticket_ticket",
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
index e738bd10a..a605fd416 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
@@ -52,17 +52,27 @@
                 </div>
                 <div class="col-md-6 col-sm-12">
                     <h3 class="text-primary">{{ $t("banner.speaker") }}</h3>
+
                     <h2>
+                        <!-- Not rendering correctly -->
+                        <!-- <user-render-box-badge
+                            v-for="user in ticket.currentAddressees.filter((addressee) => addressee.type == 'user')"
+                            :user="user"
+                            :key="user.id"
+                        /> -->
                         <span
                             class="badge text-bg-light m-1"
-                            v-for="addressee in ticket.currentAddressees"
-                            :key="addressee.id"
+                            v-for="user_group in ticket.currentAddressees.filter((addressee) => addressee.type == 'user') as Array<User>"
+                            :key="user_group.id"
                         >
-                            {{
-                                typeof addressee.label == "string"
-                                    ? addressee.label
-                                    : addressee.label.fr
-                            }}
+                            {{ user_group.label }}
+                        </span>
+                        <span
+                            class="badge text-bg-light m-1"
+                            v-for="user_group in ticket.currentAddressees.filter((addressee) => addressee.type == 'user_group') as Array<UserGroup>"
+                            :key="user_group.id"
+                        >
+                            {{ user_group.label.fr }}
                         </span>
                     </h2>
                 </div>
@@ -71,7 +81,7 @@
     </Teleport>
     <div class="container-xxl pt-1" style="padding-bottom: 55px">
         <ticket-selector-component :tickets="[]" />
-        <ticket-history-list-component :history="ticket.history" />
+        <ticket-history-list-component :history="ticketHistory" />
     </div>
     <action-toolbar-component />
 </template>
@@ -81,6 +91,11 @@ import { computed, defineComponent, inject, onMounted, ref } from "vue";
 import { useStore } from "vuex";
 
 // Types
+import {
+    DateTime,
+    User,
+    UserGroup,
+} from "../../../../../../ChillMainBundle/Resources/public/types";
 import { Motive, Ticket } from "../../types";
 
 // Components
@@ -88,7 +103,6 @@ import TicketSelectorComponent from "./components/TicketSelectorComponent.vue";
 import TicketHistoryListComponent from "./components/TicketHistoryListComponent.vue";
 import ActionToolbarComponent from "./components/ActionToolbarComponent.vue";
 import UserRenderBoxBadge from "../../../../../../ChillMainBundle/Resources/public/vuejs/_components/Entity/UserRenderBoxBadge.vue";
-import { DateTime } from "../../../../../../ChillMainBundle/Resources/public/types";
 
 export default defineComponent({
     name: "App",
@@ -107,6 +121,9 @@ export default defineComponent({
 
         const motives = computed(() => store.getters.getMotives as Motive[]);
         const ticket = computed(() => store.getters.getTicket as Ticket);
+        const ticketHistory = computed(
+            () => store.getters.getDistinctAddressesHistory
+        );
 
         function getSince(createdAt: DateTime) {
             const today = new Date();
@@ -127,6 +144,7 @@ export default defineComponent({
         });
 
         return {
+            ticketHistory,
             headline,
             motives,
             ticket,
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent.vue
index 3e4203561..234dfb26f 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent.vue
@@ -1,19 +1,17 @@
 <template>
-    <div class="col-12" v-if="addressee.type == 'user_group'">
-        <i class="fa fa-paper-plane"></i>
-        <span class="mx-1">
+    <div class="col-12" >
+        <i class="fa fa-paper-plane" v-if="event_type === 'add_addressee'"></i>
+        <i class="fa fa-paper-plane-o" v-else></i>
+        <span class="mx-1" v-if="addressee.type == 'user_group'">
             {{
-                $t("history.transfert_user_group", {
+                $t(`history.${event_type}_user_group`, {
                     user_group: addressee.label.fr,
                 })
             }}
         </span>
-    </div>
-    <div class="col-12" v-if="addressee.type == 'user'">
-        <i class="fa fa-paper-plane"></i>
-        <span class="mx-1">
+        <span class="mx-1" v-else-if="addressee.type == 'user'">
             {{
-                $t("history.transfert_user", {
+                $t(`history.${event_type}_user`, {
                     user: addressee.username,
                 })
             }}
@@ -35,8 +33,11 @@ export default defineComponent({
             type: Object as PropType<AddresseeHistory>,
             required: true,
         },
+        event_type: {
+            type: String,
+            required: true,
+        },
     },
-
     setup(props, ctx) {
         return {
             addressee: ref(props.addresseeHistory.addressee as UserGroupOrUser),
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
index 4d0722c14..8c301178f 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
@@ -4,32 +4,47 @@
         v-for="history_line in history"
         :key="history.indexOf(history_line)"
     >
-        <div class="card-header">
-            <span class="fw-bold fst-italic">
-                {{ formatDate(history_line.at) }}
-            </span>
-            <span class="badge bg-white text-black mx-1">{{
-                history_line.by.username
-            }}</span>
-        </div>
-        <div class="card-body row fst-italic">
-            <ticket-history-person-component
-                :personHistory="history_line.data"
-                v-if="history_line.event_type == 'add_person'"
-            />
-            <ticket-history-motive-component
-                :motiveHistory="history_line.data"
-                v-else-if="history_line.event_type == 'set_motive'"
-            />
-            <ticket-history-comment-component
-                :commentHistory="history_line.data"
-                v-else-if="history_line.event_type == 'add_comment'"
-            />
-            <ticket-history-addressee-component
-                :addresseeHistory="history_line.data"
-                v-else-if="history_line.event_type == 'add_addressee'"
-            />
-        </div>
+        <template v-if="!Array.isArray(history_line)">
+            <div class="card-header">
+                <span class="fw-bold fst-italic">
+                    {{ formatDate(history_line.at) }}
+                </span>
+                <span class="badge bg-white text-black mx-1">{{
+                    history_line.by.username
+                }}</span>
+            </div>
+            <div class="card-body row fst-italic">
+                <ticket-history-person-component
+                    :personHistory="history_line.data"
+                    v-if="history_line.event_type == 'add_person'"
+                />
+                <ticket-history-motive-component
+                    :motiveHistory="history_line.data"
+                    v-else-if="history_line.event_type == 'set_motive'"
+                />
+                <ticket-history-comment-component
+                    :commentHistory="history_line.data"
+                    v-else-if="history_line.event_type == 'add_comment'"
+                />
+            </div>
+        </template>
+        <template v-else>
+            <div class="card-header">
+                <span class="fw-bold fst-italic">
+                    {{ formatDate(history_line[0].at) }}
+                </span>
+                <span class="badge bg-white text-black mx-1">{{
+                    history_line[0].by.username
+                }}</span>
+            </div>
+            <div
+                class="card-body row fst-italic"
+                v-for="addressee in history_line"
+                :key="history_line.indexOf(addressee)"
+            >
+                <ticket-history-addressee-component :addresseeHistory="addressee.data" :event_type="addressee.event_type"/>
+            </div>
+        </template>
     </div>
 </template>
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
index 31f5c94d7..77b63977e 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
@@ -10,8 +10,10 @@ const messages = {
             user: "Prise en charge par {username}",
             motive: "Motif indiqué: {motive}",
             comment: "Commentaire: {comment}",
-            transfert_user_group: "Transferé au groupe: {user_group}",
-            transfert_user: "Transferé vers l'utilisateur: {user}",
+            add_addressee_user_group: "Groupe {user_group} transferé",
+            remove_addressee_user_group: "Groupe {user_group} retiré",
+            add_addressee_user: " Utilisateur {user} Transferé",
+            remove_addressee_user: "Utilisateur {user} retiré",
         },
         comment: {
             title: "Commentaire",
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
index c02b520eb..f3db197c2 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
@@ -14,7 +14,24 @@ export const moduleTicket: Module<State, RootState> ={
     getters: {
         getTicket(state) {
             return state.ticket;
-          }
+          },
+        getDistinctAddressesHistory(state) {
+            const addresseeHistory = state.ticket.history.reduce((result, item) => {
+                const { datetime } = item.at;
+                if (!["add_addressee","remove_addressee"].includes(item.event_type)) {
+                    result[datetime] = item
+                    return result;
+                }
+
+                if (!result[datetime]) {
+                    result[datetime] = [];
+                }
+                result[datetime].push(item);
+                return result;
+            }, {} as any);
+            return Object.values(addresseeHistory) as Array<Ticket["history"]>;
+        }
+
     },
     mutations: {
         setTicket(state, ticket) {

From 19af0feb5723e0684f1455e9477a717e95353302 Mon Sep 17 00:00:00 2001
From: Boris Waaub <boriswaaub@Mac-Studio-de-Boris.local>
Date: Wed, 8 May 2024 17:54:03 +0200
Subject: [PATCH 050/283] Use PersonRenderBox

---
 .../Resources/public/vuejs/TicketApp/App.vue  | 31 ++++++++++---------
 1 file changed, 17 insertions(+), 14 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
index a605fd416..6a7ee99f0 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
@@ -40,26 +40,29 @@
                 <div class="col-md-6 col-sm-12 ps-md-5 ps-xxl-0">
                     <h3 class="text-primary">{{ $t("banner.caller") }}</h3>
                     <h2>
-                        <span
-                            class="badge text-bg-light m-1"
+                        <person-render-box
+                            render="badge"
                             v-for="person in ticket.currentPersons"
                             :key="person.id"
-                        >
-                            {{ person.firstName }}
-                            {{ person.lastName }}
-                        </span>
+                            :person="person"
+                            :options="{
+                                addLink: true,
+                                addId: false,
+                                addAltNames: false,
+                                addEntity: true,
+                                addInfo: true,
+                                hLevel: 3,
+                                isMultiline: true,
+                                isConfidential: false,
+
+                            }"
+                        />
                     </h2>
                 </div>
                 <div class="col-md-6 col-sm-12">
                     <h3 class="text-primary">{{ $t("banner.speaker") }}</h3>
 
                     <h2>
-                        <!-- Not rendering correctly -->
-                        <!-- <user-render-box-badge
-                            v-for="user in ticket.currentAddressees.filter((addressee) => addressee.type == 'user')"
-                            :user="user"
-                            :key="user.id"
-                        /> -->
                         <span
                             class="badge text-bg-light m-1"
                             v-for="user_group in ticket.currentAddressees.filter((addressee) => addressee.type == 'user') as Array<User>"
@@ -102,7 +105,7 @@ import { Motive, Ticket } from "../../types";
 import TicketSelectorComponent from "./components/TicketSelectorComponent.vue";
 import TicketHistoryListComponent from "./components/TicketHistoryListComponent.vue";
 import ActionToolbarComponent from "./components/ActionToolbarComponent.vue";
-import UserRenderBoxBadge from "../../../../../../ChillMainBundle/Resources/public/vuejs/_components/Entity/UserRenderBoxBadge.vue";
+import PersonRenderBox from "../../../../../../ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue";
 
 export default defineComponent({
     name: "App",
@@ -110,7 +113,7 @@ export default defineComponent({
         TicketSelectorComponent,
         TicketHistoryListComponent,
         ActionToolbarComponent,
-        UserRenderBoxBadge,
+        PersonRenderBox,
     },
     setup() {
         const store = useStore();

From 1d33ae1e399d609a00a8c5e06457451350098839 Mon Sep 17 00:00:00 2001
From: Boris Waaub <boriswaaub@Mac-Studio-de-Boris.local>
Date: Wed, 8 May 2024 18:03:50 +0200
Subject: [PATCH 051/283] use ckeditor

---
 .../components/ActionToolbarComponent.vue         | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
index d188bdab0..9d35dbcd5 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
@@ -11,8 +11,15 @@
 
                 <div v-if="activeTab === 'comment'">
                     <form @submit.prevent="createComment">
-                        <textarea v-model="content" class="form-control" id="content" rows="3"
-                            :placeholder="$t('comment.label')"></textarea>
+                        <ckeditor
+                        name="content"
+                        :placeholder="$t('comment.content')"
+                        :editor="editor"
+                        v-model="content"
+                        tag-name="textarea">
+                        </ckeditor>
+                        <!-- <textarea v-model="content" class="form-control" id="content" rows="3"
+                            :placeholder="$t('comment.label')"></textarea> -->
 
                         <div class="d-flex justify-content-end p-2">
                             <button class="btn btn-chill-green text-white float-right" type="submit">
@@ -84,6 +91,8 @@
 import { computed, defineComponent, inject, ref } from "vue";
 import { useI18n } from "vue-i18n";
 import { useStore } from "vuex";
+import CKEditor from '@ckeditor/ckeditor5-vue';
+import ClassicEditor from "../../../../../../../ChillMainBundle/Resources/public/module/ckeditor5";
 
 // Types
 import { User, UserGroup, UserGroupOrUser } from "../../../../../../../ChillMainBundle/Resources/public/types";
@@ -98,6 +107,7 @@ export default defineComponent({
     components: {
         MotiveSelectorComponent,
         AddresseeSelectorComponent,
+        ckeditor: CKEditor.component,
     },
     setup() {
         const store = useStore();
@@ -162,6 +172,7 @@ export default defineComponent({
             addressees,
             users,
             content,
+            editor: ClassicEditor,
             createMotive,
             createComment,
             setAdressees,

From 821fce3dd8fd83377f1f906de9bb1dfa8f7d3cda Mon Sep 17 00:00:00 2001
From: Boris Waaub <boriswaaub@Mac-Studio-de-Boris.local>
Date: Mon, 13 May 2024 11:38:28 +0200
Subject: [PATCH 052/283] =?UTF-8?q?$tc=20n'est=20plus=20support=C3=A9=20po?=
 =?UTF-8?q?ur=20i18n=20composiontion=20api,=20il=20faut=20utiliser=20$t.?=
 =?UTF-8?q?=20Source=20:=20https://github.com/intlify/vue-cli-plugin-i18n/?=
 =?UTF-8?q?issues/214=20i18n=20composion=20api=20:=20https://vue-i18n.intl?=
 =?UTF-8?q?ify.dev/api/composition?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vuejs/AccompanyingCourse/components/PersonsAssociated.vue | 4 ++--
 .../public/vuejs/AccompanyingCourse/components/Resources.vue  | 4 ++--
 .../vuejs/HouseholdMembersEditor/components/Household.vue     | 2 +-
 .../Resources/public/vuejs/_components/AddPersons.vue         | 4 ++--
 .../public/vuejs/_components/Entity/PersonRenderBox.vue       | 2 +-
 .../Resources/public/vuejs/_components/Entity/PersonText.vue  | 2 +-
 6 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
index 7762ed29e..62f094920 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
@@ -3,10 +3,10 @@
    <h2><a id="section-10"></a>{{ $t('persons_associated.title')}}</h2>
 
    <div v-if="currentParticipations.length > 0">
-      <label class="col-form-label">{{ $tc('persons_associated.counter', counter) }}</label>
+      <label class="col-form-label">{{ $t('persons_associated.counter', { count: counter }) }}</label>
    </div>
    <div v-else>
-      <label class="chill-no-data-statement">{{ $tc('persons_associated.counter', counter) }}</label>
+      <label class="chill-no-data-statement">{{ $t('persons_associated.counter', { count: counter }) }}</label>
    </div>
 
    <div v-if="participationWithoutHousehold.length > 0" class="alert alert-warning no-household">
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
index 7287437a3..78da9ade8 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
@@ -4,10 +4,10 @@
    <h2><a id="section-90"></a>{{ $t('resources.title')}}</h2>
 
    <div v-if="resources.length > 0">
-      <label class="col-form-label">{{ $tc('resources.counter', counter) }}</label>
+      <label class="col-form-label">{{ $t('resources.counter', { count: counter }) }}</label>
    </div>
    <div v-else>
-      <label class="chill-no-data-statement">{{ $tc('resources.counter', counter) }}</label>
+      <label class="chill-no-data-statement">{{ $t('resources.counter', { count: counter }) }}</label>
    </div>
 
    <div class="flex-table mb-3">
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
index c9b1b8f8a..9e129a4e3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
@@ -23,7 +23,7 @@
                   data-bs-toggle="collapse"
                   aria-expanded="false"
                   @click="toggleHouseholdSuggestion">
-            {{ $tc('household_members_editor.show_household_suggestion', countHouseholdSuggestion) }}
+            {{ $t('household_members_editor.show_household_suggestion', { count: countHouseholdSuggestion }) }}
           </button>
           <button v-if="showHouseholdSuggestion"
                   class="accordion-button"
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
index 05f622d00..e24724062 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
@@ -17,7 +17,7 @@
                <div class="search">
 
                   <label class="col-form-label" style="float: right;">
-                     {{ $tc('add_persons.suggested_counter', suggestedCounter) }}
+                     {{ $t('add_persons.suggested_counter', { count: suggestedCounter }) }}
                   </label>
 
                   <input id="search-persons"
@@ -42,7 +42,7 @@
                      </a>
                   </span>
                   <span v-if="selectedCounter > 0">
-                     {{ $tc('add_persons.selected_counter', selectedCounter) }}
+                     {{ $t('add_persons.selected_counter', { count: selectedCounter }) }}
                   </span>
                </div>
             </div>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
index 100dc9caf..e44e10d63 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -53,7 +53,7 @@
               </time>
 
               <span v-if="options.addAge && person.birthdate" class="age">{{
-                  $tc('renderbox.years_old', person.age)
+                    {{ $t('renderbox.years_old', { n: person.age }) }}
                 }}</span>
             </p>
           </div>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonText.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonText.vue
index 8b991e3da..040a14327 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonText.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonText.vue
@@ -7,7 +7,7 @@
             <span :class="'altname altname-' + altNameKey"> ({{ altNameLabel }})</span>
         </span>
         <span v-if="person.suffixText" class="suffixtext">&nbsp;{{ person.suffixText }}</span>
-        <span class="age" v-if="this.addAge && person.birthdate !== null && person.deathdate === null">{{ $tc('renderbox.years_old', person.age) }}</span>
+        <span class="age" v-if="this.addAge && person.birthdate !== null && person.deathdate === null">{{ $t('renderbox.years_old', { n: person.age }) }}</span>
         <span v-else-if="this.addAge && person.deathdate !== null">&nbsp;(‡)</span>
     </span>
 </template>

From d6f5eae0c90d71e80502df3423930a82650ed9a1 Mon Sep 17 00:00:00 2001
From: Boris Waaub <boriswaaub@Mac-Studio-de-Boris.local>
Date: Mon, 13 May 2024 11:59:50 +0200
Subject: [PATCH 053/283] Rendre les commentaire markdown

---
 .../components/ActionToolbarComponent.vue     |  2 -
 .../TicketHistoryCommentComponent.vue         | 52 ++++++++++++++++---
 2 files changed, 45 insertions(+), 9 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
index 9d35dbcd5..818a46536 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
@@ -18,8 +18,6 @@
                         v-model="content"
                         tag-name="textarea">
                         </ckeditor>
-                        <!-- <textarea v-model="content" class="form-control" id="content" rows="3"
-                            :placeholder="$t('comment.label')"></textarea> -->
 
                         <div class="d-flex justify-content-end p-2">
                             <button class="btn btn-chill-green text-white float-right" type="submit">
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCommentComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCommentComponent.vue
index c793adc05..c50c44194 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCommentComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCommentComponent.vue
@@ -2,28 +2,66 @@
     <div class="col-12">
         <i class="fa fa-comment"></i>
         <span class="mx-1">
-            {{ $t('history.comment',{ comment: commentHistory.content}) }}
+            {{ $t("history.comment") }}
         </span>
+        <div class="mt-2">
+            <div v-html="convertMarkdownToHtml(commentHistory.content)"></div>
+        </div>
     </div>
 </template>
 
 <script lang="ts">
-
-import { PropType, defineComponent } from 'vue';
+import { PropType, defineComponent } from "vue";
+import { marked } from "marked";
+import DOMPurify from "dompurify";
 
 // Types
-import { Comment } from '../../../types';
+import { Comment } from "../../../types";
 
 export default defineComponent({
-    name: 'TicketHistoryCommentComponent',
+    name: "TicketHistoryCommentComponent",
     props: {
         commentHistory: {
             type: Object as PropType<Comment>,
             required: true,
         },
     },
-    setup() {}
+    setup() {
+
+        const preprocess = (markdown: string): string => {
+            return markdown;
+        };
+
+        const postprocess = (html: string): string => {
+            DOMPurify.addHook("afterSanitizeAttributes", (node: any) => {
+                if ("target" in node) {
+                    node.setAttribute("target", "_blank");
+                    node.setAttribute("rel", "noopener noreferrer");
+                }
+                if (
+                    !node.hasAttribute("target") &&
+                    (node.hasAttribute("xlink:href") ||
+                        node.hasAttribute("href"))
+                ) {
+                    node.setAttribute("xlink:show", "new");
+                }
+            });
+
+            return DOMPurify.sanitize(html);
+        };
+
+        const convertMarkdownToHtml = (markdown: string): string => {
+            marked.use({ hooks: { postprocess, preprocess } });
+            const rawHtml = marked(markdown) as string;
+            return rawHtml;
+        };
+        return {
+            convertMarkdownToHtml,
+        };
+    },
 });
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+
+</style>

From 8991f0ef3f3ec3526bacb708280bcafa1d2623f3 Mon Sep 17 00:00:00 2001
From: Boris Waaub <boriswaaub@Mac-Studio-de-Boris.local>
Date: Mon, 13 May 2024 12:00:11 +0200
Subject: [PATCH 054/283] Modification i18n

---
 .../src/Resources/public/vuejs/TicketApp/i18n/messages.ts    | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
index 77b63977e..219c834bf 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
@@ -1,4 +1,5 @@
 import { multiSelectMessages } from "../../../../../../../ChillMainBundle/Resources/public/vuejs/_js/i18n";
+import { personMessages } from "../../../../../../../ChillPersonBundle/Resources/public/vuejs/_js/i18n";
 
 const messages = {
     fr: {
@@ -9,7 +10,7 @@ const messages = {
             person: "Ouverture par appel téléphonique de {person}",
             user: "Prise en charge par {username}",
             motive: "Motif indiqué: {motive}",
-            comment: "Commentaire: {comment}",
+            comment: "Commentaire",
             add_addressee_user_group: "Groupe {user_group} transferé",
             remove_addressee_user_group: "Groupe {user_group} retiré",
             add_addressee_user: " Utilisateur {user} Transferé",
@@ -20,6 +21,7 @@ const messages = {
             label: "Ajouter un commentaire",
             save: "Enregistrer",
             succcess: "Commentaire enregistré",
+            content: "Ajouter un commentaire",
         },
         motive: {
             title: "Motif",
@@ -46,4 +48,5 @@ const messages = {
     },
 };
 Object.assign(messages.fr, multiSelectMessages.fr);
+Object.assign(messages.fr, personMessages.fr);
 export default messages;

From d00b76ffcd23aaead1018b2b8cf4124bca5feaf8 Mon Sep 17 00:00:00 2001
From: Boris Waaub <boriswaaub@Mac-Studio-de-Boris.local>
Date: Mon, 13 May 2024 12:16:07 +0200
Subject: [PATCH 055/283] =?UTF-8?q?$tc=20n'est=20plus=20support=C3=A9=20po?=
 =?UTF-8?q?ur=20i18n=20composition=20api,=20il=20faut=20utiliser=20$t.=20F?=
 =?UTF-8?q?IX:=20Person=20PersonRenderBox?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../public/vuejs/_components/Entity/PersonRenderBox.vue       | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
index e44e10d63..2bd09eb1c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -52,9 +52,7 @@
                 {{ $t('renderbox.deathdate') + ' ' + deathdate }}
               </time>
 
-              <span v-if="options.addAge && person.birthdate" class="age">{{
-                    {{ $t('renderbox.years_old', { n: person.age }) }}
-                }}</span>
+              <span v-if="options.addAge && person.birthdate" class="age">{{ $t('renderbox.years_old', { n: person.age }) }}</span>
             </p>
           </div>
         </div>

From f0045edd6c5cf9289c8bb9257de1b9a2a84d0adf Mon Sep 17 00:00:00 2001
From: Boris Waaub <boriswaaub@Mac-Studio-de-Boris.local>
Date: Mon, 13 May 2024 12:33:11 +0200
Subject: [PATCH 056/283] FIX: Ouvert depuis

---
 .../src/Resources/public/vuejs/TicketApp/App.vue           | 7 ++++---
 .../src/Resources/public/vuejs/TicketApp/i18n/messages.ts  | 2 +-
 2 files changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
index 6a7ee99f0..305e22896 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
@@ -22,7 +22,7 @@
                         <h3 class="fst-italic" v-if="ticket.createdAt">
                             {{
                                 $t("banner.since", {
-                                    days: getSince(ticket.createdAt),
+                                    count: getSince(ticket.createdAt),
                                 })
                             }}
                         </h3>
@@ -128,9 +128,10 @@ export default defineComponent({
             () => store.getters.getDistinctAddressesHistory
         );
 
-        function getSince(createdAt: DateTime) {
+        function getSince(createdAt: any) {
             const today = new Date();
-            const date = new Date(createdAt.datetime);
+            const date = new Date(createdAt.date);
+
             const timeDiff = Math.abs(today.getTime() - date.getTime());
             const daysDiff = Math.ceil(timeDiff / (1000 * 3600 * 24));
             return daysDiff;
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
index 219c834bf..7175a7fe3 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
@@ -42,7 +42,7 @@ const messages = {
             caller: "Appelant",
             speaker: "Intervenant",
             open: "Ouvert",
-            since: "Depuis 1 jour | Depuis {days} jour(s)",
+            since: "Aucun jour | Depuis 1 jour | Depuis {count} jours",
             no_motive: "Pas de motif",
         },
     },

From c81828e04f46a992ce0a149c28012defa38aa8c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 17 May 2024 12:16:28 +0200
Subject: [PATCH 057/283] Add phone number parsing functionality

Added a new method 'parse' in the PhonenumberHelper class in ChillMainBundle to sanitize and parse phone numbers. This method specifically handles phone numbers that start with '00', '+' or '0'. Associated unit tests for this new method were also added in PhonenumberHelperTest.php.
---
 .../Phonenumber/PhonenumberHelper.php         | 18 ++++++++
 .../Phonenumber/PhonenumberHelperTest.php     | 45 +++++++++++++++++++
 2 files changed, 63 insertions(+)

diff --git a/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php b/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
index d08d393a3..dfdf0ca49 100644
--- a/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
+++ b/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
@@ -76,6 +76,24 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
             ->formatOutOfCountryCallingNumber($phoneNumber, $this->config['default_carrier_code']);
     }
 
+    /**
+     * @throws NumberParseException
+     */
+    public function parse(string $phoneNumber): PhoneNumber
+    {
+        $sanitizedPhoneNumber = $phoneNumber;
+
+        if (str_starts_with($sanitizedPhoneNumber, '00')) {
+            $sanitizedPhoneNumber = '+'.substr($sanitizedPhoneNumber, 2, null);
+        }
+
+        if (!str_starts_with($sanitizedPhoneNumber, '+') && !str_starts_with($sanitizedPhoneNumber, '0')) {
+            $sanitizedPhoneNumber = '+'.$sanitizedPhoneNumber;
+        }
+
+        return $this->phoneNumberUtil->parse($sanitizedPhoneNumber, $this->config['default_carrier_code']);
+    }
+
     /**
      * Get type (mobile, landline, ...) for phone number.
      */
diff --git a/src/Bundle/ChillMainBundle/Tests/Phonenumber/PhonenumberHelperTest.php b/src/Bundle/ChillMainBundle/Tests/Phonenumber/PhonenumberHelperTest.php
index 6f65c612f..556fa9fde 100644
--- a/src/Bundle/ChillMainBundle/Tests/Phonenumber/PhonenumberHelperTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Phonenumber/PhonenumberHelperTest.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Tests\Phonenumber;
 
 use Chill\MainBundle\Phonenumber\PhonenumberHelper;
+use libphonenumber\PhoneNumber;
 use libphonenumber\PhoneNumberUtil;
 use Psr\Log\NullLogger;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
@@ -52,12 +53,36 @@ final class PhonenumberHelperTest extends KernelTestCase
         ];
     }
 
+    public static function providePhoneNumbersToParse(): iterable
+    {
+        $util = PhoneNumberUtil::getInstance();
+
+        yield [
+            'FR',
+            '+32486544999',
+            $util->parse('+32486544999', 'FR'),
+        ];
+
+        yield [
+            'FR',
+            '32486544999',
+            $util->parse('+32486544999', 'FR'),
+        ];
+
+        yield [
+            'FR',
+            '0228858040',
+            $util->parse('+33228858040', 'FR'),
+        ];
+    }
+
     /**
      * @dataProvider formatPhonenumbers
      */
     public function testFormatPhonenumbers(string $defaultCarrierCode, string $phoneNumber, string $expected)
     {
         $util = PhoneNumberUtil::getInstance();
+
         $subject = new PhonenumberHelper(
             new ArrayAdapter(),
             new ParameterBag([
@@ -70,4 +95,24 @@ final class PhonenumberHelperTest extends KernelTestCase
 
         $this->assertEquals($expected, $subject->format($util->parse($phoneNumber)));
     }
+
+    /**
+     * @dataProvider providePhoneNumbersToParse
+     */
+    public function testParsePhonenumbers(string $defaultCarrierCode, string $phoneNumber, PhoneNumber $expected): void
+    {
+        $subject = new PhonenumberHelper(
+            new ArrayAdapter(),
+            new ParameterBag([
+                'chill_main.phone_helper' => [
+                    'default_carrier_code' => $defaultCarrierCode,
+                ],
+            ]),
+            new NullLogger()
+        );
+
+        $actual = $subject->parse($phoneNumber);
+
+        self::assertTrue($expected->equals($actual));
+    }
 }

From 3a8154ecce24183147cc3ee44a155eb7fb609396 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 17 May 2024 12:17:00 +0200
Subject: [PATCH 058/283] Replace PhoneNumberUtil with PhonenumberHelper

The PhoneNumberUtil has been replaced with PhonenumberHelper in AssociateByPhonenumberCommandHandler and its test class. The purpose of this change is to improve phone number parsing which is now delegated to the PhonenumberHelper class in the Chill\MainBundle\Phonenumber namespace. As a consequence, the related dependencies in both the service and the test class have been updated accordingly.
---
 .../AssociateByPhonenumberCommandHandler.php     |  6 +++---
 .../AssociateByPhonenumberCommandHandlerTest.php | 16 ++++++++++++++--
 2 files changed, 17 insertions(+), 5 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/AssociateByPhonenumberCommandHandler.php b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/AssociateByPhonenumberCommandHandler.php
index 40276622e..deec240f2 100644
--- a/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/AssociateByPhonenumberCommandHandler.php
+++ b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/AssociateByPhonenumberCommandHandler.php
@@ -11,26 +11,26 @@ declare(strict_types=1);
 
 namespace Chill\TicketBundle\Action\Ticket\Handler;
 
+use Chill\MainBundle\Phonenumber\PhonenumberHelper;
 use Chill\PersonBundle\Repository\PersonACLAwareRepositoryInterface;
 use Chill\TicketBundle\Action\Ticket\AssociateByPhonenumberCommand;
 use Chill\TicketBundle\Entity\PersonHistory;
 use Chill\TicketBundle\Entity\Ticket;
 use Doctrine\ORM\EntityManagerInterface;
-use libphonenumber\PhoneNumberUtil;
 use Symfony\Component\Clock\ClockInterface;
 
 class AssociateByPhonenumberCommandHandler
 {
     public function __construct(
         private PersonACLAwareRepositoryInterface $personRepository,
-        private PhoneNumberUtil $phoneNumberUtil,
+        private PhonenumberHelper $phonenumberHelper,
         private ClockInterface $clock,
         private EntityManagerInterface $entityManager,
     ) {}
 
     public function __invoke(Ticket $ticket, AssociateByPhonenumberCommand $command): void
     {
-        $phone = $this->phoneNumberUtil->parse($command->phonenumber);
+        $phone = $this->phonenumberHelper->parse($command->phonenumber);
         $persons = $this->personRepository->findByPhone($phone);
 
         foreach ($persons as $person) {
diff --git a/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/AssociateByPhonenumberCommandHandlerTest.php b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/AssociateByPhonenumberCommandHandlerTest.php
index 7907712ab..5ade6ec82 100644
--- a/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/AssociateByPhonenumberCommandHandlerTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/AssociateByPhonenumberCommandHandlerTest.php
@@ -11,17 +11,20 @@ declare(strict_types=1);
 
 namespace Chill\TicketBundle\Tests\Action\Ticket\Handler;
 
+use Chill\MainBundle\Phonenumber\PhonenumberHelper;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Repository\PersonACLAwareRepositoryInterface;
 use Chill\TicketBundle\Action\Ticket\AssociateByPhonenumberCommand;
 use Chill\TicketBundle\Action\Ticket\Handler\AssociateByPhonenumberCommandHandler;
 use Chill\TicketBundle\Entity\Ticket;
 use Doctrine\ORM\EntityManagerInterface;
-use libphonenumber\PhoneNumberUtil;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
+use Psr\Log\NullLogger;
+use Symfony\Component\Cache\Adapter\ArrayAdapter;
 use Symfony\Component\Clock\MockClock;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 
 /**
  * @internal
@@ -36,10 +39,19 @@ class AssociateByPhonenumberCommandHandlerTest extends TestCase
         PersonACLAwareRepositoryInterface $personACLAwareRepository,
     ): AssociateByPhonenumberCommandHandler {
         $entityManager = $this->prophesize(EntityManagerInterface::class);
+        $phonenumberHelper = new PhonenumberHelper(
+            new ArrayAdapter(),
+            new ParameterBag([
+                'chill_main.phone_helper' => [
+                    'default_carrier_code' => 'BE',
+                ],
+            ]),
+            new NullLogger()
+        );
 
         return new AssociateByPhonenumberCommandHandler(
             $personACLAwareRepository,
-            PhoneNumberUtil::getInstance(),
+            $phonenumberHelper,
             new MockClock(),
             $entityManager->reveal()
         );

From 66dc603c859e84cce4cb2b419e9d67f5d99ae296 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 17 May 2024 12:20:33 +0200
Subject: [PATCH 059/283] fix cs with new version of php-cs-fixer

---
 src/Bundle/ChillTicketBundle/src/Entity/Ticket.php | 3 ---
 1 file changed, 3 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php b/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php
index 9fc4d6a15..689f34e87 100644
--- a/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php
+++ b/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php
@@ -83,7 +83,6 @@ class Ticket implements TrackCreationInterface, TrackUpdateInterface
         $this->motiveHistories = new ArrayCollection();
         $this->personHistories = new ArrayCollection();
         $this->inputHistories = new ArrayCollection();
-
     }
 
     public function getId(): ?int
@@ -229,6 +228,4 @@ class Ticket implements TrackCreationInterface, TrackUpdateInterface
     {
         return $this->updatedBy;
     }
-
-
 }

From 78d17767331a05b7ce0baf497c139ed0c0b7a659 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 17 May 2024 13:14:26 +0200
Subject: [PATCH 060/283] Add functionality to find a caller by phone number

Added a new method in PersonRepository to allow querying people by phone number. Also, a new REST API endpoint "/public/api/1.0/ticket/find-caller" was introduced and it can find a caller by their phone number. Accompanied this feature addition with corresponding test cases.
---
 .../Repository/PersonRepository.php           |  39 ++++++
 .../src/Controller/FindCallerController.php   |  58 ++++++++
 .../Controller/FindCallerControllerTest.php   | 128 ++++++++++++++++++
 3 files changed, 225 insertions(+)
 create mode 100644 src/Bundle/ChillTicketBundle/src/Controller/FindCallerController.php
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Controller/FindCallerControllerTest.php

diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonRepository.php b/src/Bundle/ChillPersonBundle/Repository/PersonRepository.php
index b7104a843..6b36ddd11 100644
--- a/src/Bundle/ChillPersonBundle/Repository/PersonRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonRepository.php
@@ -12,10 +12,12 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Repository;
 
 use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Entity\PersonPhone;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ObjectRepository;
+use libphonenumber\PhoneNumber;
 
 class PersonRepository implements ObjectRepository
 {
@@ -29,6 +31,8 @@ class PersonRepository implements ObjectRepository
     /**
      * @throws \Doctrine\ORM\NoResultException
      * @throws \Doctrine\ORM\NonUniqueResultException
+     *
+     * @deprecated
      */
     public function countByPhone(
         string $phonenumber,
@@ -71,6 +75,8 @@ class PersonRepository implements ObjectRepository
 
     /**
      * @throws \Exception
+     *
+     * @deprecated Use @see{self::findByPhoneNumber} or use a dedicated method in PersonACLAwareRepository
      */
     public function findByPhone(
         string $phonenumber,
@@ -91,6 +97,25 @@ class PersonRepository implements ObjectRepository
         return $qb->getQuery()->getResult();
     }
 
+    /**
+     * Find a person which is associated to the given phonenumber, without restrictions
+     * on any.
+     *
+     * @return list<Person
+     */
+    public function findByPhoneNumber(PhoneNumber $phoneNumber, int $firstResult = 0, int $maxResults = 50): array
+    {
+        $qb = $this->repository->createQueryBuilder('p');
+        $qb->select('p');
+
+        $this->searchByPhoneNumbers($qb, $phoneNumber);
+
+        $qb->setFirstResult($firstResult)
+            ->setMaxResults($maxResults);
+
+        return $qb->getQuery()->getResult();
+    }
+
     public function findOneBy(array $criteria)
     {
         return $this->repository->findOneBy($criteria);
@@ -109,6 +134,20 @@ class PersonRepository implements ObjectRepository
         }
     }
 
+    private function searchByPhoneNumbers(QueryBuilder $qb, PhoneNumber $phoneNumber): void
+    {
+        $qb->setParameter('number', $phoneNumber, 'phone_number');
+
+        $orX = $qb->expr()->orX();
+        $orX->add($qb->expr()->eq('p.mobilenumber', ':number'));
+        $orX->add($qb->expr()->eq('p.phonenumber', ':number'));
+        $orX->add(
+            $qb->expr()->exists('SELECT 1 FROM '.PersonPhone::class.' k WHERE k.phonenumber = :number AND k.person = p')
+        );
+
+        $qb->andWhere($orX);
+    }
+
     /**
      * @throws \Exception
      */
diff --git a/src/Bundle/ChillTicketBundle/src/Controller/FindCallerController.php b/src/Bundle/ChillTicketBundle/src/Controller/FindCallerController.php
new file mode 100644
index 000000000..94febedaa
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Controller/FindCallerController.php
@@ -0,0 +1,58 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Controller;
+
+use Chill\MainBundle\Phonenumber\PhonenumberHelper;
+use Chill\PersonBundle\Repository\PersonRepository;
+use Chill\PersonBundle\Templating\Entity\PersonRenderInterface;
+use libphonenumber\NumberParseException;
+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;
+
+/**
+ * Controller for a rest api to find a caller for a given phonenumber.
+ *
+ * TODO: currently, this rest api is not secured
+ */
+class FindCallerController
+{
+    public function __construct(private PhonenumberHelper $phonenumberHelper, private PersonRepository $personRepository, private PersonRenderInterface $personRender) {}
+
+    #[Route('/public/api/1.0/ticket/find-caller', name: 'find-caller', methods: ['GET'])]
+    public function findCaller(Request $request): Response
+    {
+        $caller = $request->query->get('caller', '');
+
+        if ('' === $caller) {
+            throw new BadRequestHttpException('Missing "caller" query parameter');
+        }
+
+        try {
+            $phoneNumber = $this->phonenumberHelper->parse($caller);
+        } catch (NumberParseException $e) {
+            throw new BadRequestHttpException('Unable to parse number', $e);
+        }
+
+        $persons = $this->personRepository->findByPhoneNumber($phoneNumber, 0, 2);
+
+        $asArray = match (count($persons)) {
+            0 => ['found' => false, 'name' => null],
+            1 => ['found' => true, 'name' => $this->personRender->renderString($persons[0], ['addAge' => false])],
+            default => ['found' => true, 'name' => 'multiple'],
+        };
+
+        return new JsonResponse($asArray);
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/FindCallerControllerTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/FindCallerControllerTest.php
new file mode 100644
index 000000000..301b8f4ac
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/FindCallerControllerTest.php
@@ -0,0 +1,128 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Tests\Controller;
+
+use Chill\MainBundle\Phonenumber\PhonenumberHelper;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Repository\PersonRepository;
+use Chill\PersonBundle\Templating\Entity\PersonRenderInterface;
+use Chill\TicketBundle\Controller\FindCallerController;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Psr\Log\NullLogger;
+use Symfony\Component\Cache\Adapter\ArrayAdapter;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class FindCallerControllerTest extends TestCase
+{
+    use ProphecyTrait;
+
+    /**
+     * @dataProvider provideFindCaller
+     */
+    public function testFindCaller(string $caller, array $persons, array $expected): void
+    {
+        $controller = $this->buildController($persons);
+
+        $request = new Request(query: ['caller' => $caller]);
+
+        $response = $controller->findCaller($request);
+
+        $actual = json_decode($response->getContent(), true);
+
+        self::assertEqualsCanonicalizing($expected, $actual);
+    }
+
+    public function testFindCallerWithoutCallerArgument(): void
+    {
+        self::expectException(BadRequestHttpException::class);
+
+        $controller = $this->buildController([]);
+
+        $request = new Request(query: []);
+
+        $controller->findCaller($request);
+    }
+
+    public function testFindCallerWithEmptyCallerArgument(): void
+    {
+        self::expectException(BadRequestHttpException::class);
+
+        $controller = $this->buildController([]);
+
+        $request = new Request(query: ['caller' => '']);
+
+        $controller->findCaller($request);
+    }
+
+    public function testFindCallerWithInvalidCaller(): void
+    {
+        self::expectException(BadRequestHttpException::class);
+
+        $controller = $this->buildController([]);
+
+        $request = new Request(query: ['caller' => 'abcde']);
+
+        $controller->findCaller($request);
+    }
+
+    public static function provideFindCaller(): iterable
+    {
+        yield [
+            '32486540600',
+            [],
+            ['found' => false, 'name' => null],
+        ];
+
+        yield [
+            '32486540600',
+            [new Person()],
+            ['found' => true, 'name' => 'pppp'],
+        ]
+        ;
+        yield [
+            '32486540600',
+            [new Person(), new Person()],
+            ['found' => true, 'name' => 'multiple'],
+        ];
+    }
+
+    private function buildController(array $personsFound): FindCallerController
+    {
+        $phonenumberHelper =
+        $subject = new PhonenumberHelper(
+            new ArrayAdapter(),
+            new ParameterBag([
+                'chill_main.phone_helper' => [
+                    'default_carrier_code' => 'BE',
+                ],
+            ]),
+            new NullLogger()
+        );
+
+        $personRepository = $this->prophesize(PersonRepository::class);
+        $personRepository->findByPhoneNumber(Argument::any(), Argument::type('int'), Argument::type('int'))->willReturn($personsFound);
+
+        $personRender = $this->prophesize(PersonRenderInterface::class);
+        $personRender->renderString(Argument::type(Person::class), Argument::type('array'))->willReturn('pppp');
+
+        return new FindCallerController($phonenumberHelper, $personRepository->reveal(), $personRender->reveal());
+    }
+}

From 650d2596d9b4898b8d6bd4b71028b7793fc98ef3 Mon Sep 17 00:00:00 2001
From: Boris Waaub <boriswaaub@Mac-Studio-de-Boris.local>
Date: Tue, 21 May 2024 09:54:06 +0200
Subject: [PATCH 061/283] Update ticket display to use ticket ID instead of
 external reference

---
 .../src/Resources/public/vuejs/TicketApp/App.vue                | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
index 305e22896..3ef5bbea3 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
@@ -3,7 +3,7 @@
         <div class="container-xxl text-primary">
             <div class="row">
                 <div class="col-md-6 col-sm-12 ps-md-5 ps-xxl-0">
-                    <h2>#{{ ticket.externalRef }}</h2>
+                    <h2>#{{ ticket.id }}</h2>
                     <h1 v-if="ticket.currentMotive">
                         {{ ticket.currentMotive.label.fr }}
                     </h1>

From 2a23bf19cbb876b3f9ed4818a29935daf3cedd66 Mon Sep 17 00:00:00 2001
From: Boris Waaub <boriswaaub@Mac-Studio-de-Boris.local>
Date: Tue, 21 May 2024 10:53:25 +0200
Subject: [PATCH 062/283] use record_actions sticky-form-buttons

---
 .../components/ActionToolbarComponent.vue     | 154 +++++++++++-------
 .../public/vuejs/TicketApp/i18n/messages.ts   |   2 +
 2 files changed, 95 insertions(+), 61 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
index 818a46536..cf24952b2 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
@@ -1,83 +1,102 @@
 <template>
     <div class="fixed-bottom">
-        <div class="footer-ticket-details">
+        <div class="footer-ticket-details" v-if="activeTab">
             <div class="tab-content p-2">
-
-                <div v-if="activeTab">
+                <div>
                     <label class="col-form-label">
                         {{ $t(`${activeTab}.title`) }}
                     </label>
                 </div>
 
-                <div v-if="activeTab === 'comment'">
+                <div v-if="activeTab === 'comment'" class="p-2">
                     <form @submit.prevent="createComment">
                         <ckeditor
-                        name="content"
-                        :placeholder="$t('comment.content')"
-                        :editor="editor"
-                        v-model="content"
-                        tag-name="textarea">
+                            name="content"
+                            :placeholder="$t('comment.content')"
+                            :editor="editor"
+                            v-model="content"
+                            tag-name="textarea"
+                        >
                         </ckeditor>
-
-                        <div class="d-flex justify-content-end p-2">
-                            <button class="btn btn-chill-green text-white float-right" type="submit">
-                                <i class="fa fa-pencil"></i>
-                                {{ $t("comment.save") }}
-                            </button>
-                        </div>
                     </form>
                 </div>
 
                 <div v-if="activeTab === 'transfert'">
-                    <form @submit.prevent="setAdressees" v-if="userGroups.length && users.length">
-                        <addressee-selector-component v-model="addressees" :user-groups="userGroups" :users="users" />
-                        <div class="d-flex justify-content-end p-1">
-                            <button class="btn btn-chill-green text-white float-right" type="submit">
-                                <i class="fa fa-pencil"></i>
-                                {{ $t("transfert.save") }}
-                            </button>
-                        </div>
+                    <form
+                        @submit.prevent="setAdressees"
+                        v-if="userGroups.length && users.length"
+                    >
+                        <addressee-selector-component
+                            v-model="addressees"
+                            :user-groups="userGroups"
+                            :users="users"
+                        />
                     </form>
                 </div>
 
                 <div v-if="activeTab === 'motive'">
                     <form @submit.prevent="createMotive">
-
-                        <motive-selector-component v-model="motive" :motives="motives" />
-                        <div class="d-flex justify-content-end p-1">
-                            <button class="btn btn-chill-green text-white float-right" type="submit">
-                                <i class="fa fa-pencil"></i>
-                                {{ $t("motive.save") }}
-                            </button>
-                        </div>
+                        <motive-selector-component
+                            v-model="motive"
+                            :motives="motives"
+                        />
                     </form>
                 </div>
+
+                <ul class="record_actions sticky-form-buttons">
+                    <li class="cancel">
+                        <button @click="activeTab = ''" class="btn btn-cancel">
+                            {{ $t("ticket.cancel") }}
+                        </button>
+                    </li>
+                    <li>
+                        <button class="btn btn-update" type="submit">
+                            {{ $t("comment.save") }}
+                        </button>
+                    </li>
+                </ul>
             </div>
         </div>
         <div class="footer-ticket-main">
             <ul class="nav nav-tabs justify-content-end">
                 <li class="nav-item">
-                    <button type="button" class="m-2 btn btn-light" @click="activeTab = 'comment'">
+                    <button
+                        type="button"
+                        class="m-2 btn btn-light"
+                        @click="activeTab = 'comment'"
+                    >
                         <i class="fa fa-plus"></i>
-                        {{ $t('comment.title') }}
+                        {{ $t("comment.title") }}
                     </button>
                 </li>
                 <li class="nav-item">
-                    <button type="button" class="m-2 btn btn-light" @click="activeTab = 'transfert'">
+                    <button
+                        type="button"
+                        class="m-2 btn btn-light"
+                        @click="activeTab = 'transfert'"
+                    >
                         <i class="fa fa-paper-plane"></i>
-                        {{ $t('transfert.title') }}
+                        {{ $t("transfert.title") }}
                     </button>
                 </li>
                 <li class="nav-item">
-                    <button type="button" class="m-2 btn btn-light" @click="activeTab = 'motive'">
+                    <button
+                        type="button"
+                        class="m-2 btn btn-light"
+                        @click="activeTab = 'motive'"
+                    >
                         <i class="fa fa-paint-brush"></i>
-                        {{ $t('motive.title') }}
+                        {{ $t("motive.title") }}
                     </button>
                 </li>
                 <li class="nav-item">
-                    <button type="button" class="m-2 btn btn-light" @click="activeTab = ''">
+                    <button
+                        type="button"
+                        class="m-2 btn btn-light"
+                        @click="handleClick()"
+                    >
                         <i class="fa fa-bolt"></i>
-                        Fermer
+                        {{ $t("ticket.close") }}
                     </button>
                 </li>
             </ul>
@@ -89,11 +108,15 @@
 import { computed, defineComponent, inject, ref } from "vue";
 import { useI18n } from "vue-i18n";
 import { useStore } from "vuex";
-import CKEditor from '@ckeditor/ckeditor5-vue';
+import CKEditor from "@ckeditor/ckeditor5-vue";
 import ClassicEditor from "../../../../../../../ChillMainBundle/Resources/public/module/ckeditor5";
 
 // Types
-import { User, UserGroup, UserGroupOrUser } from "../../../../../../../ChillMainBundle/Resources/public/types";
+import {
+    User,
+    UserGroup,
+    UserGroupOrUser,
+} from "../../../../../../../ChillMainBundle/Resources/public/types";
 import { Comment, Motive, Ticket } from "../../../types";
 
 // Component
@@ -110,29 +133,33 @@ export default defineComponent({
     setup() {
         const store = useStore();
         const { t } = useI18n();
-        const toast = inject('toast') as any;
+        const toast = inject("toast") as any;
         const activeTab = ref("");
 
         const ticket = computed(() => store.getters.getTicket as Ticket);
         const motives = computed(() => store.getters.getMotives as Motive[]);
-        const userGroups = computed(() => store.getters.getUserGroups as UserGroup[]);
+        const userGroups = computed(
+            () => store.getters.getUserGroups as UserGroup[]
+        );
         const users = computed(() => store.getters.getUsers as User[]);
 
-        const motive = ref(ticket.value.currentMotive ? ticket.value.currentMotive: {} as Motive);
-        const content = ref('' as Comment["content"]);
+        const motive = ref(
+            ticket.value.currentMotive
+                ? ticket.value.currentMotive
+                : ({} as Motive)
+        );
+        const content = ref("" as Comment["content"]);
         const addressees = ref([] as Array<UserGroupOrUser>);
 
-
-
         async function createMotive() {
             try {
                 await store.dispatch("createMotive", {
                     ticketId: ticket.value.id,
                     motive: motive.value,
                 });
-                toast.success(t("motive.success"))
+                toast.success(t("motive.success"));
             } catch (error) {
-                toast.error(error)
+                toast.error(error);
             }
         }
 
@@ -143,9 +170,9 @@ export default defineComponent({
                     content: content.value,
                 });
                 content.value = "";
-                toast.success(t("comment.success"))
+                toast.success(t("comment.success"));
             } catch (error) {
-                toast.error(error)
+                toast.error(error);
             }
         }
 
@@ -155,11 +182,14 @@ export default defineComponent({
                     ticketId: ticket.value.id,
                     addressees: addressees.value,
                 });
-                toast.success(t("transfert.success"))
+                toast.success(t("transfert.success"));
             } catch (error) {
-                toast.error(error)
+                toast.error(error);
             }
         }
+        function handleClick() {
+            alert("Sera disponible plus tard");
+        }
 
         return {
             activeTab,
@@ -174,18 +204,20 @@ export default defineComponent({
             createMotive,
             createComment,
             setAdressees,
+            handleClick,
         };
     },
 });
 </script>
 <style lang="scss" scoped>
-div.fixed-bottom {
-    div.footer-ticket-main {
-        background: none repeat scroll 0 0 #cabb9f;
-    }
+.fixed-bottom {
+    margin-bottom: 100px;
+}
+div.footer-ticket-main {
+    background: none repeat scroll 0 0 #cabb9f;
+}
 
-    div.footer-ticket-details {
-        background: none repeat scroll 0 0 #efe2ca;
-    }
+div.footer-ticket-details {
+    background: none repeat scroll 0 0 #efe2ca;
 }
 </style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
index 7175a7fe3..5649a9849 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
@@ -5,6 +5,8 @@ const messages = {
     fr: {
         ticket: {
             previous_tickets: "Précédents tickets",
+            cancel: "Annuler",
+            close: "Fermer",
         },
         history: {
             person: "Ouverture par appel téléphonique de {person}",

From 4996ac3b7cc9717c917c92152a32c57331b0b6fa Mon Sep 17 00:00:00 2001
From: Boris Waaub <boriswaaub@Mac-Studio-de-Boris.local>
Date: Tue, 21 May 2024 15:22:13 +0200
Subject: [PATCH 063/283] Adapt layout action toolbar

---
 .../components/ActionToolbarComponent.vue     | 187 +++++++++---------
 .../components/AddCommentComponent.vue        |  49 +++++
 .../public/vuejs/TicketApp/i18n/messages.ts   |   9 +-
 3 files changed, 153 insertions(+), 92 deletions(-)
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddCommentComponent.vue

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
index cf24952b2..d1f103b66 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
@@ -8,53 +8,41 @@
                     </label>
                 </div>
 
-                <div v-if="activeTab === 'comment'" class="p-2">
-                    <form @submit.prevent="createComment">
-                        <ckeditor
-                            name="content"
-                            :placeholder="$t('comment.content')"
-                            :editor="editor"
-                            v-model="content"
-                            tag-name="textarea"
-                        >
-                        </ckeditor>
-                    </form>
-                </div>
+                <form @submit.prevent="submitAction">
+                    <add-comment-component
+                        v-model="content"
+                        v-if="activeTab === 'comment'"
+                    />
 
-                <div v-if="activeTab === 'transfert'">
-                    <form
-                        @submit.prevent="setAdressees"
-                        v-if="userGroups.length && users.length"
-                    >
-                        <addressee-selector-component
-                            v-model="addressees"
-                            :user-groups="userGroups"
-                            :users="users"
-                        />
-                    </form>
-                </div>
+                    <addressee-selector-component
+                        v-model="addressees"
+                        :user-groups="userGroups"
+                        :users="users"
+                        v-if="activeTab === 'transfert'"
+                    />
 
-                <div v-if="activeTab === 'motive'">
-                    <form @submit.prevent="createMotive">
-                        <motive-selector-component
-                            v-model="motive"
-                            :motives="motives"
-                        />
-                    </form>
-                </div>
+                    <motive-selector-component
+                        v-model="motive"
+                        :motives="motives"
+                        v-if="activeTab === 'motive'"
+                    />
 
-                <ul class="record_actions sticky-form-buttons">
-                    <li class="cancel">
-                        <button @click="activeTab = ''" class="btn btn-cancel">
-                            {{ $t("ticket.cancel") }}
-                        </button>
-                    </li>
-                    <li>
-                        <button class="btn btn-update" type="submit">
-                            {{ $t("comment.save") }}
-                        </button>
-                    </li>
-                </ul>
+                    <ul class="record_actions sticky-form-buttons">
+                        <li class="cancel">
+                            <button
+                                @click="activeTab = ''"
+                                class="btn btn-cancel"
+                            >
+                                {{ $t("ticket.cancel") }}
+                            </button>
+                        </li>
+                        <li>
+                            <button class="btn btn-create" type="submit">
+                                {{ $t("ticket.save") }}
+                            </button>
+                        </li>
+                    </ul>
+                </form>
             </div>
         </div>
         <div class="footer-ticket-main">
@@ -63,9 +51,13 @@
                     <button
                         type="button"
                         class="m-2 btn btn-light"
-                        @click="activeTab = 'comment'"
+                        @click="
+                            activeTab === 'comment'
+                                ? (activeTab = '')
+                                : (activeTab = 'comment')
+                        "
                     >
-                        <i class="fa fa-plus"></i>
+                        <i class="fa fa-comment"></i>
                         {{ $t("comment.title") }}
                     </button>
                 </li>
@@ -73,7 +65,11 @@
                     <button
                         type="button"
                         class="m-2 btn btn-light"
-                        @click="activeTab = 'transfert'"
+                        @click="
+                            activeTab === 'transfert'
+                                ? (activeTab = '')
+                                : (activeTab = 'transfert')
+                        "
                     >
                         <i class="fa fa-paper-plane"></i>
                         {{ $t("transfert.title") }}
@@ -83,7 +79,11 @@
                     <button
                         type="button"
                         class="m-2 btn btn-light"
-                        @click="activeTab = 'motive'"
+                        @click="
+                            activeTab === 'motive'
+                                ? (activeTab = '')
+                                : (activeTab = 'motive')
+                        "
                     >
                         <i class="fa fa-paint-brush"></i>
                         {{ $t("motive.title") }}
@@ -108,8 +108,6 @@
 import { computed, defineComponent, inject, ref } from "vue";
 import { useI18n } from "vue-i18n";
 import { useStore } from "vuex";
-import CKEditor from "@ckeditor/ckeditor5-vue";
-import ClassicEditor from "../../../../../../../ChillMainBundle/Resources/public/module/ckeditor5";
 
 // Types
 import {
@@ -122,19 +120,20 @@ import { Comment, Motive, Ticket } from "../../../types";
 // Component
 import MotiveSelectorComponent from "./MotiveSelectorComponent.vue";
 import AddresseeSelectorComponent from "./AddresseeSelectorComponent.vue";
+import AddCommentComponent from "./AddCommentComponent.vue";
 
 export default defineComponent({
     name: "ActionToolbarComponent",
     components: {
+        AddCommentComponent,
         MotiveSelectorComponent,
         AddresseeSelectorComponent,
-        ckeditor: CKEditor.component,
     },
     setup() {
         const store = useStore();
         const { t } = useI18n();
         const toast = inject("toast") as any;
-        const activeTab = ref("");
+        const activeTab = ref("" as "" | "comment" | "motive" | "transfert");
 
         const ticket = computed(() => store.getters.getTicket as Ticket);
         const motives = computed(() => store.getters.getMotives as Motive[]);
@@ -151,42 +150,52 @@ export default defineComponent({
         const content = ref("" as Comment["content"]);
         const addressees = ref([] as Array<UserGroupOrUser>);
 
-        async function createMotive() {
+        async function submitAction() {
             try {
-                await store.dispatch("createMotive", {
-                    ticketId: ticket.value.id,
-                    motive: motive.value,
-                });
-                toast.success(t("motive.success"));
+                switch (activeTab.value) {
+                    case "comment":
+                        if (!content.value) {
+                            toast.error(t("comment.error"));
+                        } else {
+                            await store.dispatch("createComment", {
+                                ticketId: ticket.value.id,
+                                content: content.value,
+                            });
+                            content.value = "";
+                            activeTab.value = "";
+                            toast.success(t("comment.success"));
+                        }
+                        break;
+                    case "motive":
+                        if (!motive.value.id) {
+                            toast.error(t("motive.error"));
+                        } else {
+                            await store.dispatch("createMotive", {
+                                ticketId: ticket.value.id,
+                                motive: motive.value,
+                            });
+                            activeTab.value = "";
+                            toast.success(t("motive.success"));
+                        }
+                        break;
+                    case "transfert":
+                        if (!addressees.value.length) {
+                            toast.error(t("transfert.error"));
+                        } else {
+                            await store.dispatch("setAdressees", {
+                                ticketId: ticket.value.id,
+                                addressees: addressees.value,
+                            });
+                            activeTab.value = "";
+                            toast.success(t("transfert.success"));
+                        }
+                        break;
+                }
             } catch (error) {
                 toast.error(error);
             }
         }
 
-        async function createComment() {
-            try {
-                await store.dispatch("createComment", {
-                    ticketId: ticket.value.id,
-                    content: content.value,
-                });
-                content.value = "";
-                toast.success(t("comment.success"));
-            } catch (error) {
-                toast.error(error);
-            }
-        }
-
-        async function setAdressees() {
-            try {
-                await store.dispatch("setAdressees", {
-                    ticketId: ticket.value.id,
-                    addressees: addressees.value,
-                });
-                toast.success(t("transfert.success"));
-            } catch (error) {
-                toast.error(error);
-            }
-        }
         function handleClick() {
             alert("Sera disponible plus tard");
         }
@@ -200,18 +209,20 @@ export default defineComponent({
             addressees,
             users,
             content,
-            editor: ClassicEditor,
-            createMotive,
-            createComment,
-            setAdressees,
+            submitAction,
             handleClick,
         };
     },
 });
 </script>
 <style lang="scss" scoped>
-.fixed-bottom {
-    margin-bottom: 100px;
+ul.record_actions.sticky-form-buttons {
+    padding-left: 0px;
+    padding-right: 0px;
+}
+.sticky-form-buttons {
+    margin-top: 0px;
+    background: none;
 }
 div.footer-ticket-main {
     background: none repeat scroll 0 0 #cabb9f;
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddCommentComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddCommentComponent.vue
new file mode 100644
index 000000000..e98e2771a
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddCommentComponent.vue
@@ -0,0 +1,49 @@
+<template>
+    <div class="row">
+        <div class="col-12">
+            <ckeditor
+                name="content"
+                :placeholder="$t('comment.content')"
+                :editor="editor"
+                v-model="content"
+                tag-name="textarea"
+            />
+        </div>
+    </div>
+</template>
+
+<script lang="ts">
+import { PropType, defineComponent, ref, watch } from "vue";
+
+import CKEditor from "@ckeditor/ckeditor5-vue";
+import ClassicEditor from "../../../../../../../ChillMainBundle/Resources/public/module/ckeditor5";
+
+export default defineComponent({
+    name: "AddCommentComponent",
+    props: {
+        modelValue: {
+            type: String,
+            required: false,
+        },
+    },
+    components: {
+        ckeditor: CKEditor.component,
+    },
+    emits: ["update:modelValue"],
+
+    setup(props, ctx) {
+        const content = ref(props.modelValue);
+
+        watch(content, (content) => {
+            ctx.emit("update:modelValue", content);
+        });
+
+        return {
+            content,
+            editor: ClassicEditor,
+        };
+    },
+});
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
index 5649a9849..cbee55a9f 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
@@ -6,6 +6,7 @@ const messages = {
         ticket: {
             previous_tickets: "Précédents tickets",
             cancel: "Annuler",
+            save: "Enregistrer",
             close: "Fermer",
         },
         history: {
@@ -21,22 +22,22 @@ const messages = {
         comment: {
             title: "Commentaire",
             label: "Ajouter un commentaire",
-            save: "Enregistrer",
-            succcess: "Commentaire enregistré",
+            success: "Commentaire enregistré",
             content: "Ajouter un commentaire",
+            error: "Aucun commentaire ajouté",
         },
         motive: {
             title: "Motif",
             label: "Choisir un motif",
-            save: "Enregistrer",
             success: "Motif enregistré",
+            error: "Aucun motif sélectionné",
         },
         transfert: {
             title: "Transfert",
             user_group_label: "Transferer vers un groupe",
             user_label: "Transferer vers un ou plusieurs utilisateurs",
-            save: "Enregistrer",
             success: "Transfert effectué",
+            error: "Aucun destinataire sélectionné",
         },
         close: "Fermer",
         banner: {

From 580a60c939fb90c4e72d1de7925e16d631a30027 Mon Sep 17 00:00:00 2001
From: Boris Waaub <boriswaaub@Mac-Studio-de-Boris.local>
Date: Tue, 21 May 2024 17:32:05 +0200
Subject: [PATCH 064/283] Add user_group for returning type

---
 .../ChillMainBundle/Resources/public/types.ts | 230 +++++++++---------
 1 file changed, 115 insertions(+), 115 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/types.ts b/src/Bundle/ChillMainBundle/Resources/public/types.ts
index ada3089a0..810f9ea24 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/types.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/types.ts
@@ -1,175 +1,175 @@
 export interface DateTime {
-  datetime: string;
-  datetime8601: string
+    datetime: string;
+    datetime8601: string;
 }
 
 export interface Civility {
-  id: number;
-  // TODO
+    id: number;
+    // TODO
 }
 
 export interface Job {
-  id: number;
-  type: "user_job";
-  label: {
-    "fr": string; // could have other key. How to do that in ts ?
-  }
+    id: number;
+    type: "user_job";
+    label: {
+        fr: string; // could have other key. How to do that in ts ?
+    };
 }
 
 export interface Center {
-  id: number;
-  type: "center";
-  name: string;
+    id: number;
+    type: "center";
+    name: string;
 }
 
 export interface Scope {
-  id: number;
-  type: "scope";
-  name: {
-    "fr": string
-  }
+    id: number;
+    type: "scope";
+    name: {
+        fr: string;
+    };
 }
 
 export interface User {
-  type: "user";
-  id: number;
-  username: string;
-  text: string;
-  text_without_absence: string;
-  email: string;
-  user_job: Job;
-  label: string;
-  // todo: mainCenter; mainJob; etc..
+    type: "user";
+    id: number;
+    username: string;
+    text: string;
+    text_without_absence: string;
+    email: string;
+    user_job: Job;
+    label: string;
+    // todo: mainCenter; mainJob; etc..
 }
 
 export interface UserGroup {
-    type: "chill_main_user_group",
-    id: number,
-    label: TranslatableString,
-    backgroundColor: string,
-    foregroundColor: string,
-    excludeKey: string,
+    type: "chill_main_user_group" | "user_group";
+    id: number;
+    label: TranslatableString;
+    backgroundColor: string;
+    foregroundColor: string;
+    excludeKey: string;
 }
 
 export type UserGroupOrUser = User | UserGroup;
 
 export interface UserAssociatedInterface {
-  type: "user";
-  id: number;
-};
-
-export type TranslatableString = {
-  fr?: string;
-  nl?: string;
+    type: "user";
+    id: number;
 }
 
+export type TranslatableString = {
+    fr?: string;
+    nl?: string;
+};
+
 export interface Postcode {
-  id: number;
-  name: string;
-  code: string;
-  center: Point;
+    id: number;
+    name: string;
+    code: string;
+    center: Point;
 }
 
 export type Point = {
-  type: "Point";
-  coordinates: [lat: number, lon: number];
-}
+    type: "Point";
+    coordinates: [lat: number, lon: number];
+};
 
 export interface Country {
-  id: number;
-  name: TranslatableString;
-  code: string;
+    id: number;
+    name: TranslatableString;
+    code: string;
 }
 
-export type AddressRefStatus = 'match'|'to_review'|'reviewed';
+export type AddressRefStatus = "match" | "to_review" | "reviewed";
 
 export interface Address {
-  type: "address";
-  address_id: number;
-  text: string;
-  street: string;
-  streetNumber: string;
-  postcode: Postcode;
-  country: Country;
-  floor: string | null;
-  corridor: string | null;
-  steps: string | null;
-  flat: string | null;
-  buildingName: string | null;
-  distribution: string | null;
-  extra: string | null;
-  confidential: boolean;
-  lines: string[];
-  addressReference: AddressReference | null;
-  validFrom: DateTime;
-  validTo: DateTime | null;
-  point: Point | null;
-  refStatus: AddressRefStatus;
-  isNoAddress: boolean;
+    type: "address";
+    address_id: number;
+    text: string;
+    street: string;
+    streetNumber: string;
+    postcode: Postcode;
+    country: Country;
+    floor: string | null;
+    corridor: string | null;
+    steps: string | null;
+    flat: string | null;
+    buildingName: string | null;
+    distribution: string | null;
+    extra: string | null;
+    confidential: boolean;
+    lines: string[];
+    addressReference: AddressReference | null;
+    validFrom: DateTime;
+    validTo: DateTime | null;
+    point: Point | null;
+    refStatus: AddressRefStatus;
+    isNoAddress: boolean;
 }
 
 export interface AddressWithPoint extends Address {
-  point: Point
+    point: Point;
 }
 
 export interface AddressReference {
-  id: number;
-  createdAt: DateTime | null;
-  deletedAt: DateTime | null;
-  municipalityCode: string;
-  point: Point;
-  postcode: Postcode;
-  refId: string;
-  source: string;
-  street: string;
-  streetNumber: string;
-  updatedAt: DateTime | null;
+    id: number;
+    createdAt: DateTime | null;
+    deletedAt: DateTime | null;
+    municipalityCode: string;
+    point: Point;
+    postcode: Postcode;
+    refId: string;
+    source: string;
+    street: string;
+    streetNumber: string;
+    updatedAt: DateTime | null;
 }
 
 export interface SimpleGeographicalUnit {
-  id: number;
-  layerId: number;
-  unitName: string;
-  unitRefId: string;
+    id: number;
+    layerId: number;
+    unitName: string;
+    unitRefId: string;
 }
 
 export interface GeographicalUnitLayer {
-  id: number;
-  name: TranslatableString;
-  refId: string;
+    id: number;
+    name: TranslatableString;
+    refId: string;
 }
 
 export interface Location {
-  type: "location";
-  id: number;
-  active: boolean;
-  address: Address | null;
-  availableForUsers: boolean;
-  createdAt: DateTime | null;
-  createdBy: User | null;
-  updatedAt: DateTime | null;
-  updatedBy: User | null;
-  email: string | null
-  name: string;
-  phonenumber1: string | null;
-  phonenumber2: string | null;
-  locationType: LocationType;
+    type: "location";
+    id: number;
+    active: boolean;
+    address: Address | null;
+    availableForUsers: boolean;
+    createdAt: DateTime | null;
+    createdBy: User | null;
+    updatedAt: DateTime | null;
+    updatedBy: User | null;
+    email: string | null;
+    name: string;
+    phonenumber1: string | null;
+    phonenumber2: string | null;
+    locationType: LocationType;
 }
 
 export interface LocationAssociated {
-  type: "location";
-  id: number;
+    type: "location";
+    id: number;
 }
 
 export interface LocationType {
-  type: "location-type";
-  id: number;
-  active: boolean;
-  addressRequired: "optional" | "required";
-  availableForUsers: boolean;
-  editableByUsers: boolean;
-  contactData: "optional" | "required";
-  title: TranslatableString;
+    type: "location-type";
+    id: number;
+    active: boolean;
+    addressRequired: "optional" | "required";
+    availableForUsers: boolean;
+    editableByUsers: boolean;
+    contactData: "optional" | "required";
+    title: TranslatableString;
 }
 
 export interface NewsItemType {

From 0c914c9f9f076f7f9a6306f3ac66095eca01a296 Mon Sep 17 00:00:00 2001
From: Boris Waaub <boriswaaub@Mac-Studio-de-Boris.local>
Date: Tue, 21 May 2024 17:32:40 +0200
Subject: [PATCH 065/283] Remove "remove_addressee" history line

---
 .../components/ActionToolbarComponent.vue     |   4 +-
 .../components/AddCommentComponent.vue        |   2 +-
 .../components/AddresseeSelectorComponent.vue | 168 ++++++++++--------
 .../TicketHistoryAddresseeComponent.vue       |   6 +-
 .../components/TicketHistoryListComponent.vue |   5 +-
 .../vuejs/TicketApp/store/modules/ticket.ts   |  46 +++--
 6 files changed, 128 insertions(+), 103 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
index d1f103b66..c9c228dc9 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
@@ -148,7 +148,9 @@ export default defineComponent({
                 : ({} as Motive)
         );
         const content = ref("" as Comment["content"]);
-        const addressees = ref([] as Array<UserGroupOrUser>);
+        const addressees = ref(
+            ticket.value.currentAddressees as Array<UserGroupOrUser>
+        );
 
         async function submitAction() {
             try {
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddCommentComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddCommentComponent.vue
index e98e2771a..4099ff41f 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddCommentComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddCommentComponent.vue
@@ -13,7 +13,7 @@
 </template>
 
 <script lang="ts">
-import { PropType, defineComponent, ref, watch } from "vue";
+import { defineComponent, ref, watch } from "vue";
 
 import CKEditor from "@ckeditor/ckeditor5-vue";
 import ClassicEditor from "../../../../../../../ChillMainBundle/Resources/public/module/ckeditor5";
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue
index 36e6d64a6..56388e41a 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue
@@ -1,73 +1,68 @@
 <template>
     <div class="row">
-        <div class="col-12 col-lg-6 col-md-6 mb-2 text-center">
-            <span class="m-1">
-                <input
-                    type="radio"
-                    class="btn-check"
-                    name="options-outlined"
-                    id="level-none"
-                    autocomplete="off"
-                    :value="{}"
-                    v-model="userGroupLevel"
-                />
-                <label :class="`btn btn-outline-primary`" for="level-none">
-                    Aucun
-                </label>
-            </span>
-            <span
-                v-for="userGroupItem in userGroups.filter(
-                    (userGroup) => userGroup.excludeKey == 'level'
-                )"
-                :key="userGroupItem.id"
-                class="m-1"
-            >
-                <input
-                    type="radio"
-                    class="btn-check"
-                    name="options-outlined"
-                    :id="`level-${userGroupItem.id}`"
-                    autocomplete="off"
-                    :value="userGroupItem"
-                    v-model="userGroupLevel"
-                />
-                <label
-                    :class="`btn btn-${userGroupItem.id}`"
-                    :for="`level-${userGroupItem.id}`"
-                    :style="getUserGroupBtnColor(userGroupItem)"
+        <div class="col-12 col-lg-6 col-md-6 text-center">
+            <div class="mb-2">
+                <span
+                    v-for="userGroupItem in userGroups.filter(
+                        (userGroup) => userGroup.excludeKey == 'level'
+                    )"
+                    :key="userGroupItem.id"
+                    class="m-1"
                 >
-                    {{ userGroupItem.label.fr }}
-                </label>
-            </span>
-        </div>
-        <div class="col-12 col-lg-6 col-md-6 mb-2 text-center">
-            <span
-                v-for="userGroupItem in userGroups.filter(
-                    (userGroup) => userGroup.excludeKey == ''
-                )"
-                :key="userGroupItem.id"
-                class="m-1"
-            >
-                <input
-                    type="checkbox"
-                    class="btn-check"
-                    name="options-outlined"
-                    :id="`user-group-${userGroupItem.id}`"
-                    autocomplete="off"
-                    :value="userGroupItem"
-                    v-model="userGroup"
-                />
-                <label
-                    :class="`btn btn-${userGroupItem.id}`"
-                    :for="`user-group-${userGroupItem.id}`"
-                    :style="getUserGroupBtnColor(userGroupItem)"
+                    <input
+                        type="radio"
+                        class="btn-check"
+                        name="options-outlined"
+                        :id="`level-${userGroupItem.id}`"
+                        autocomplete="off"
+                        :value="userGroupItem"
+                        v-model="userGroupLevel"
+                        @click="
+                            Object.values(userGroupLevel).includes(
+                                userGroupItem.id
+                            )
+                                ? (userGroupLevel = {})
+                                : (userGroupLevel = userGroupItem)
+                        "
+                    />
+                    <label
+                        :class="`btn btn-${userGroupItem.id}`"
+                        :for="`level-${userGroupItem.id}`"
+                        :style="getUserGroupBtnColor(userGroupItem)"
+                    >
+                        {{ userGroupItem.label.fr }}
+                    </label>
+                </span>
+            </div>
+            <div class="mb-2">
+                <span
+                    v-for="userGroupItem in userGroups.filter(
+                        (userGroup) => userGroup.excludeKey == ''
+                    )"
+                    :key="userGroupItem.id"
+                    class="m-1"
                 >
-                    {{ userGroupItem.label.fr }}
-                </label>
-            </span>
+                    <input
+                        type="checkbox"
+                        class="btn-check"
+                        name="options-outlined"
+                        :id="`user-group-${userGroupItem.id}`"
+                        autocomplete="off"
+                        :value="userGroupItem"
+                        v-model="userGroup"
+                    />
+                    <label
+                        :class="`btn btn-${userGroupItem.id}`"
+                        :for="`user-group-${userGroupItem.id}`"
+                        :style="getUserGroupBtnColor(userGroupItem)"
+                    >
+                        {{ userGroupItem.label.fr }}
+                    </label>
+                </span>
+            </div>
         </div>
 
-        <div class="col-12 col-lg-6 col-md-6 mb-2 text-center">
+        <div class="col-12 col-lg-6 col-md-6 mb-2 mb-2 text-center">
             <add-persons
                 :options="addPersonsOptions"
                 key="add-person-ticket"
@@ -76,11 +71,11 @@
                 ref="addPersons"
                 @addNewPersons="addNewEntity"
             />
-        </div>
-        <div class="col-12 col-lg-6 col-md-6 mb-2 mb-2 text-center">
-            <span class="badge text-bg-light m-1" v-for="user in users">
-                {{ user.username }}
-            </span>
+            <div class="mb-2">
+                <span class="badge text-bg-light m-1" v-for="user in users">
+                    {{ user.username }}
+                </span>
+            </div>
         </div>
     </div>
 </template>
@@ -122,12 +117,26 @@ export default defineComponent({
     emits: ["update:modelValue"],
 
     setup(props, ctx) {
-        // Cant use UserGroupOrUser[] because of TS2367
-        // TS2367: This comparison appears to be unintentional because the types '"user" | "chill_main_user_group"' and '"user_group"' have no overlap.
-        const addressees = ref(props.modelValue as any[]);
-        const userGroupLevel = ref({} as UserGroupOrUser);
-        const userGroup = ref([] as UserGroupOrUser[]);
-        const users = ref([] as User[]);
+        const addressees = ref(props.modelValue as UserGroupOrUser[]);
+        const userGroups = props.modelValue.filter(
+            (addressee) => addressee.type == "user_group"
+        ) as UserGroup[];
+
+        const userGroupLevel = ref(
+            userGroups.filter(
+                (userGroup) => userGroup.excludeKey == "level"
+            )[0] as UserGroup | {}
+        );
+        const userGroup = ref(
+            userGroups.filter((userGroup) => userGroup.excludeKey == "") as
+                | UserGroup[]
+                | []
+        );
+        const users = ref(
+            props.modelValue.filter((addressee) => addressee.type == "user") as
+                | User[]
+                | []
+        );
         const addPersons = ref();
 
         const { t } = useI18n();
@@ -167,16 +176,19 @@ export default defineComponent({
         watch(userGroupLevel, (userGroupLevelAdd, userGroupLevelRem) => {
             if (userGroupLevelRem) {
                 addressees.value.splice(
-                    addressees.value.indexOf(userGroupLevelRem),
+                    addressees.value.indexOf(userGroupLevelRem as UserGroup),
                     1
                 );
             }
-            addressees.value.push(userGroupLevelAdd);
+            addressees.value.push(userGroupLevelAdd as UserGroup);
             ctx.emit("update:modelValue", addressees.value);
         });
 
         watch(userGroup, (userGroupAdd) => {
-            addressees.value = addressees.value.filter(
+            const userGroups = addressees.value.filter(
+                (addressee) => addressee.type === "user_group"
+            ) as UserGroup[];
+            addressees.value = userGroups.filter(
                 (addressee) => addressee.excludeKey !== ""
             );
             addressees.value = [...addressees.value, ...userGroupAdd];
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent.vue
index 234dfb26f..21de182dd 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent.vue
@@ -1,7 +1,7 @@
 <template>
-    <div class="col-12" >
-        <i class="fa fa-paper-plane" v-if="event_type === 'add_addressee'"></i>
-        <i class="fa fa-paper-plane-o" v-else></i>
+    <div class="col-12">
+        <i class="fa fa-paper-plane"></i>
+
         <span class="mx-1" v-if="addressee.type == 'user_group'">
             {{
                 $t(`history.${event_type}_user_group`, {
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
index 8c301178f..fb10f8cb2 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
@@ -42,7 +42,10 @@
                 v-for="addressee in history_line"
                 :key="history_line.indexOf(addressee)"
             >
-                <ticket-history-addressee-component :addresseeHistory="addressee.data" :event_type="addressee.event_type"/>
+                <ticket-history-addressee-component
+                    :addresseeHistory="addressee.data"
+                    :event_type="addressee.event_type"
+                />
             </div>
         </template>
     </div>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
index f3db197c2..d44f7401a 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
@@ -7,37 +7,45 @@ export interface State {
     ticket: Ticket;
 }
 
-export const moduleTicket: Module<State, RootState> ={
+export const moduleTicket: Module<State, RootState> = {
     state: () => ({
         ticket: {} as Ticket,
     }),
     getters: {
         getTicket(state) {
             return state.ticket;
-          },
+        },
         getDistinctAddressesHistory(state) {
-            const addresseeHistory = state.ticket.history.reduce((result, item) => {
-                const { datetime } = item.at;
-                if (!["add_addressee","remove_addressee"].includes(item.event_type)) {
-                    result[datetime] = item
+            const addresseeHistory = state.ticket.history.reduce(
+                (result, item) => {
+                    const { datetime } = item.at;
+                    if (
+                        !["add_addressee", "remove_addressee"].includes(
+                            item.event_type
+                        )
+                    ) {
+                        result[datetime] = item;
+                        return result;
+                    }
+
+                    if (!result[datetime]) {
+                        result[datetime] = [];
+                    }
+
+                    if (item.event_type === "add_addressee") {
+                        result[datetime].push(item);
+                    }
                     return result;
-                }
-
-                if (!result[datetime]) {
-                    result[datetime] = [];
-                }
-                result[datetime].push(item);
-                return result;
-            }, {} as any);
+                },
+                {} as any
+            );
             return Object.values(addresseeHistory) as Array<Ticket["history"]>;
-        }
-
+        },
     },
     mutations: {
         setTicket(state, ticket) {
             state.ticket = ticket;
-        }
-    },
-    actions: {
+        },
     },
+    actions: {},
 };

From 3e8bc94af3453c0f1c3f2b4c0dfd2ba2b2e2ba47 Mon Sep 17 00:00:00 2001
From: Boris Waaub <boriswaaub@Mac-Studio-de-Boris.local>
Date: Tue, 21 May 2024 18:14:11 +0200
Subject: [PATCH 066/283] Remove user object display

---
 .../_components/Entity/UserRenderBoxBadge.vue | 24 +++++++++++++------
 1 file changed, 17 insertions(+), 7 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/UserRenderBoxBadge.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/UserRenderBoxBadge.vue
index 7655f5878..2ccfa7b99 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/UserRenderBoxBadge.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/UserRenderBoxBadge.vue
@@ -1,14 +1,24 @@
 <template>
-<span class="chill-entity entity-user">
-    {{ user.label }}
-    {{ user }}
-    <span class="user-job" v-if="user.user_job !== null">({{ user.user_job.label.fr }})</span> <span class="main-scope" v-if="user.main_scope !== null">({{ user.main_scope.name.fr }})</span> <span v-if="user.isAbsent" class="badge bg-danger rounded-pill" :title="Absent">A</span>
-</span>
+    <span class="chill-entity entity-user">
+        {{ user.label }}
+        <span class="user-job" v-if="user.user_job !== null"
+            >({{ user.user_job.label.fr }})</span
+        >
+        <span class="main-scope" v-if="user.main_scope !== null"
+            >({{ user.main_scope.name.fr }})</span
+        >
+        <span
+            v-if="user.isAbsent"
+            class="badge bg-danger rounded-pill"
+            :title="Absent"
+            >A</span
+        >
+    </span>
 </template>
 
 <script>
 export default {
     name: "UserRenderBoxBadge",
-    props: ['user'],
-}
+    props: ["user"],
+};
 </script>

From b9e130c159fda77a4cb5cb7b523218ecc49fc34c Mon Sep 17 00:00:00 2001
From: Boris Waaub <boriswaaub@Mac-Studio-de-Boris.local>
Date: Tue, 21 May 2024 20:44:23 +0200
Subject: [PATCH 067/283] Use suggestion for user asignee

---
 .../components/AddresseeSelectorComponent.vue | 21 +++++++++++++++----
 1 file changed, 17 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue
index 56388e41a..db763b4e9 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue
@@ -71,10 +71,14 @@
                 ref="addPersons"
                 @addNewPersons="addNewEntity"
             />
-            <div class="mb-2">
-                <span class="badge text-bg-light m-1" v-for="user in users">
-                    {{ user.username }}
-                </span>
+            <div class="p-2">
+                <ul class="list-suggest inline remove-items">
+                    <li v-for="user in users" :key="user.id">
+                        <span :title="user.username" @click="removeUser(user)">
+                            {{ user.username }}
+                        </span>
+                    </li>
+                </ul>
             </div>
         </div>
     </div>
@@ -173,6 +177,14 @@ export default defineComponent({
             };
         });
 
+        function removeUser(user: User) {
+            users.value.splice(users.value.indexOf(user), 1);
+            addressees.value = addressees.value.filter(
+                (addressee) => addressee.id !== user.id
+            );
+            ctx.emit("update:modelValue", addressees.value);
+        }
+
         watch(userGroupLevel, (userGroupLevelAdd, userGroupLevelRem) => {
             if (userGroupLevelRem) {
                 addressees.value.splice(
@@ -203,6 +215,7 @@ export default defineComponent({
             addPersons,
             addPersonsOptions,
             addNewEntity,
+            removeUser,
             getUserGroupBtnColor,
             customUserGroupLabel(selectedUserGroup: UserGroup) {
                 return selectedUserGroup.label

From c7d20eebc544ccf7d984af6ba575bfd498fa9bec Mon Sep 17 00:00:00 2001
From: Boris Waaub <boriswaaub@Mac-Studio-de-Boris.local>
Date: Tue, 21 May 2024 20:53:15 +0200
Subject: [PATCH 068/283] chore: Remove unused code in
 AddresseeSelectorComponent.vue

---
 .../vuejs/TicketApp/components/AddresseeSelectorComponent.vue   | 2 --
 1 file changed, 2 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue
index db763b4e9..6fe6dabba 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue
@@ -134,12 +134,10 @@ export default defineComponent({
         const userGroup = ref(
             userGroups.filter((userGroup) => userGroup.excludeKey == "") as
                 | UserGroup[]
-                | []
         );
         const users = ref(
             props.modelValue.filter((addressee) => addressee.type == "user") as
                 | User[]
-                | []
         );
         const addPersons = ref();
 

From 8778bb073189d9b1e82a9d26d9c4bf49cafca758 Mon Sep 17 00:00:00 2001
From: Boris Waaub <boriswaaub@Mac-Studio-de-Boris.local>
Date: Tue, 21 May 2024 22:22:33 +0200
Subject: [PATCH 069/283] Use colors and badges for history and banner

---
 .../Resources/public/vuejs/TicketApp/App.vue  | 105 +----------------
 .../components/AddresseeComponent.vue         |  74 ++++++++++++
 .../TicketApp/components/BannerComponent.vue  | 106 ++++++++++++++++++
 .../TicketHistoryAddresseeComponent.vue       |  36 ++----
 .../components/TicketHistoryListComponent.vue |  24 ++--
 .../public/vuejs/TicketApp/i18n/messages.ts   |   2 +-
 6 files changed, 206 insertions(+), 141 deletions(-)
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeComponent.vue
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
index 3ef5bbea3..d75694f0d 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
@@ -1,87 +1,5 @@
 <template>
-    <Teleport to="#header-ticket-main">
-        <div class="container-xxl text-primary">
-            <div class="row">
-                <div class="col-md-6 col-sm-12 ps-md-5 ps-xxl-0">
-                    <h2>#{{ ticket.id }}</h2>
-                    <h1 v-if="ticket.currentMotive">
-                        {{ ticket.currentMotive.label.fr }}
-                    </h1>
-                    <p class="chill-no-data-statement" v-else>
-                        {{ $t("banner.no_motive") }}
-                    </p>
-                </div>
-
-                <div class="col-md-6 col-sm-12">
-                    <div class="float-end">
-                        <h1>
-                            <span class="badge text-bg-chill-green text-white">
-                                {{ $t("banner.open") }}
-                            </span>
-                        </h1>
-                        <h3 class="fst-italic" v-if="ticket.createdAt">
-                            {{
-                                $t("banner.since", {
-                                    count: getSince(ticket.createdAt),
-                                })
-                            }}
-                        </h3>
-                    </div>
-                </div>
-            </div>
-        </div>
-    </Teleport>
-    <Teleport to="#header-ticket-details">
-        <div class="container-xxl">
-            <div class="row justify-content-between">
-                <!-- <div class="col-md-4 col-sm-12">
-                    <h3 class="text-primary">{{ $t("concerned_patient") }}</h3>
-                </div> -->
-                <div class="col-md-6 col-sm-12 ps-md-5 ps-xxl-0">
-                    <h3 class="text-primary">{{ $t("banner.caller") }}</h3>
-                    <h2>
-                        <person-render-box
-                            render="badge"
-                            v-for="person in ticket.currentPersons"
-                            :key="person.id"
-                            :person="person"
-                            :options="{
-                                addLink: true,
-                                addId: false,
-                                addAltNames: false,
-                                addEntity: true,
-                                addInfo: true,
-                                hLevel: 3,
-                                isMultiline: true,
-                                isConfidential: false,
-
-                            }"
-                        />
-                    </h2>
-                </div>
-                <div class="col-md-6 col-sm-12">
-                    <h3 class="text-primary">{{ $t("banner.speaker") }}</h3>
-
-                    <h2>
-                        <span
-                            class="badge text-bg-light m-1"
-                            v-for="user_group in ticket.currentAddressees.filter((addressee) => addressee.type == 'user') as Array<User>"
-                            :key="user_group.id"
-                        >
-                            {{ user_group.label }}
-                        </span>
-                        <span
-                            class="badge text-bg-light m-1"
-                            v-for="user_group in ticket.currentAddressees.filter((addressee) => addressee.type == 'user_group') as Array<UserGroup>"
-                            :key="user_group.id"
-                        >
-                            {{ user_group.label.fr }}
-                        </span>
-                    </h2>
-                </div>
-            </div>
-        </div>
-    </Teleport>
+    <banner-component :ticket="ticket" />
     <div class="container-xxl pt-1" style="padding-bottom: 55px">
         <ticket-selector-component :tickets="[]" />
         <ticket-history-list-component :history="ticketHistory" />
@@ -94,18 +12,13 @@ import { computed, defineComponent, inject, onMounted, ref } from "vue";
 import { useStore } from "vuex";
 
 // Types
-import {
-    DateTime,
-    User,
-    UserGroup,
-} from "../../../../../../ChillMainBundle/Resources/public/types";
 import { Motive, Ticket } from "../../types";
 
 // Components
 import TicketSelectorComponent from "./components/TicketSelectorComponent.vue";
 import TicketHistoryListComponent from "./components/TicketHistoryListComponent.vue";
 import ActionToolbarComponent from "./components/ActionToolbarComponent.vue";
-import PersonRenderBox from "../../../../../../ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue";
+import BannerComponent from "./components/BannerComponent.vue";
 
 export default defineComponent({
     name: "App",
@@ -113,12 +26,11 @@ export default defineComponent({
         TicketSelectorComponent,
         TicketHistoryListComponent,
         ActionToolbarComponent,
-        PersonRenderBox,
+        BannerComponent,
     },
     setup() {
         const store = useStore();
         const toast = inject("toast") as any;
-        const headline = ref({} as HTMLHeadingElement);
 
         store.commit("setTicket", JSON.parse(window.initialTicket) as Ticket);
 
@@ -128,15 +40,6 @@ export default defineComponent({
             () => store.getters.getDistinctAddressesHistory
         );
 
-        function getSince(createdAt: any) {
-            const today = new Date();
-            const date = new Date(createdAt.date);
-
-            const timeDiff = Math.abs(today.getTime() - date.getTime());
-            const daysDiff = Math.ceil(timeDiff / (1000 * 3600 * 24));
-            return daysDiff;
-        }
-
         onMounted(async () => {
             try {
                 await store.dispatch("fetchMotives");
@@ -149,10 +52,8 @@ export default defineComponent({
 
         return {
             ticketHistory,
-            headline,
             motives,
             ticket,
-            getSince,
         };
     },
 });
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeComponent.vue
new file mode 100644
index 000000000..274cf54f8
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeComponent.vue
@@ -0,0 +1,74 @@
+<template>
+    <h3>
+        <div class="col-12">
+            <span
+                class="badge m-1"
+                :style="`background-color: ${userGroup.backgroundColor}; color: white;`"
+                v-for="userGroup in userGroupLevels"
+                :key="userGroup.id"
+            >
+                {{ userGroup.label.fr }}
+            </span>
+        </div>
+        <div class="col-12">
+            <span
+                class="badge m-1"
+                :style="`background-color: ${userGroup.backgroundColor}; color: white;`"
+                v-for="userGroup in userGroups"
+                :key="userGroup.id"
+            >
+                {{ userGroup.label.fr }}
+            </span>
+        </div>
+    </h3>
+    <div class="col-12">
+        <span class="badge bg-primary m-1" v-for="user in users" :key="user.id">
+            {{ user.label }}
+        </span>
+    </div>
+</template>
+
+<script lang="ts">
+import { PropType, defineComponent, ref } from "vue";
+
+// Types
+import {
+    User,
+    UserGroup,
+    UserGroupOrUser,
+} from "../../../../../../../ChillMainBundle/Resources/public/types";
+import { Ticket } from "../../../types";
+
+export default defineComponent({
+    name: "AddresseeComponent",
+    props: {
+        addressees: {
+            type: Array as PropType<UserGroupOrUser[]>,
+            required: true,
+        },
+    },
+    setup(props, ctx) {
+        const userGroups = ref(
+            props.addressees.filter(
+                (addressee) =>
+                    addressee.type == "user_group" && addressee.excludeKey == ""
+            ) as UserGroup[]
+        );
+        const userGroupLevels = ref(
+            props.addressees.filter(
+                (addressee) =>
+                    addressee.type == "user_group" &&
+                    addressee.excludeKey == "level"
+            ) as UserGroup[]
+        );
+        const users = ref(
+            props.addressees.filter(
+                (addressee) => addressee.type == "user"
+            ) as User[]
+        );
+        return { userGroups, users, userGroupLevels };
+    },
+});
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
new file mode 100644
index 000000000..976036e48
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
@@ -0,0 +1,106 @@
+<template>
+    <Teleport to="#header-ticket-main">
+        <div class="container-xxl text-primary">
+            <div class="row">
+                <div class="col-md-6 col-sm-12 ps-md-5 ps-xxl-0">
+                    <h2>#{{ ticket.id }}</h2>
+                    <h1 v-if="ticket.currentMotive">
+                        {{ ticket.currentMotive.label.fr }}
+                    </h1>
+                    <p class="chill-no-data-statement" v-else>
+                        {{ $t("banner.no_motive") }}
+                    </p>
+                </div>
+
+                <div class="col-md-6 col-sm-12">
+                    <div class="float-end">
+                        <h1>
+                            <span class="badge text-bg-chill-green text-white">
+                                {{ $t("banner.open") }}
+                            </span>
+                        </h1>
+                        <h3 class="fst-italic" v-if="ticket.createdAt">
+                            {{
+                                $t("banner.since", {
+                                    count: getSince(ticket.createdAt),
+                                })
+                            }}
+                        </h3>
+                    </div>
+                </div>
+            </div>
+        </div>
+    </Teleport>
+    <Teleport to="#header-ticket-details">
+        <div class="container-xxl">
+            <div class="row justify-content-between">
+                <div class="col-md-6 col-sm-12 ps-md-5 ps-xxl-0">
+                    <h3 class="text-primary">{{ $t("banner.caller") }}</h3>
+
+                    <person-render-box
+                        render="badge"
+                        v-for="person in ticket.currentPersons"
+                        :key="person.id"
+                        :person="person"
+                        :options="{
+                            addLink: true,
+                            addId: false,
+                            addAltNames: false,
+                            addEntity: true,
+                            addInfo: true,
+                            hLevel: 3,
+                            isMultiline: true,
+                            isConfidential: false,
+                        }"
+                    />
+                </div>
+                <div class="col-md-6 col-sm-12">
+                    <h3 class="text-primary">{{ $t("banner.speaker") }}</h3>
+                    <addressee-component
+                        :addressees="ticket.currentAddressees"
+                    />
+                </div>
+            </div>
+        </div>
+    </Teleport>
+</template>
+
+<script lang="ts">
+import { PropType, defineComponent, ref, watch } from "vue";
+
+// Components
+import PersonRenderBox from "../../../../../../../ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue";
+import AddresseeComponent from "./AddresseeComponent.vue";
+
+// Types
+import {
+    User,
+    UserGroup,
+} from "../../../../../../../ChillMainBundle/Resources/public/types";
+import { Ticket } from "../../../types";
+
+export default defineComponent({
+    name: "BannerComponent",
+    props: {
+        ticket: {
+            type: Object as PropType<Ticket>,
+            required: true,
+        },
+    },
+    components: {
+        PersonRenderBox,
+        AddresseeComponent,
+    },
+    setup() {
+        function getSince(createdAt: any) {
+            const today = new Date();
+            const date = new Date(createdAt.date);
+
+            const timeDiff = Math.abs(today.getTime() - date.getTime());
+            const daysDiff = Math.ceil(timeDiff / (1000 * 3600 * 24));
+            return daysDiff;
+        }
+        return { getSince };
+    },
+});
+</script>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent.vue
index 21de182dd..26109946a 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent.vue
@@ -1,21 +1,6 @@
 <template>
     <div class="col-12">
-        <i class="fa fa-paper-plane"></i>
-
-        <span class="mx-1" v-if="addressee.type == 'user_group'">
-            {{
-                $t(`history.${event_type}_user_group`, {
-                    user_group: addressee.label.fr,
-                })
-            }}
-        </span>
-        <span class="mx-1" v-else-if="addressee.type == 'user'">
-            {{
-                $t(`history.${event_type}_user`, {
-                    user: addressee.username,
-                })
-            }}
-        </span>
+        <addressee-component :addressees="addressees" />
     </div>
 </template>
 
@@ -23,25 +8,24 @@
 import { PropType, defineComponent, ref } from "vue";
 
 // Types
-import { AddresseeHistory } from "../../../types";
 import { UserGroupOrUser } from "../../../../../../../ChillMainBundle/Resources/public/types";
 
+// Components
+import AddresseeComponent from "./AddresseeComponent.vue";
+
 export default defineComponent({
     name: "TicketHistoryAddresseeComponent",
     props: {
-        addresseeHistory: {
-            type: Object as PropType<AddresseeHistory>,
-            required: true,
-        },
-        event_type: {
-            type: String,
+        addressees: {
+            type: Array as PropType<UserGroupOrUser[]>,
             required: true,
         },
     },
+    components: {
+        AddresseeComponent,
+    },
     setup(props, ctx) {
-        return {
-            addressee: ref(props.addresseeHistory.addressee as UserGroupOrUser),
-        };
+        return {};
     },
 });
 </script>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
index fb10f8cb2..552cbb4c5 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
@@ -13,7 +13,7 @@
                     history_line.by.username
                 }}</span>
             </div>
-            <div class="card-body row fst-italic">
+            <div class="card-body row">
                 <ticket-history-person-component
                     :personHistory="history_line.data"
                     v-if="history_line.event_type == 'add_person'"
@@ -30,21 +30,21 @@
         </template>
         <template v-else>
             <div class="card-header">
-                <span class="fw-bold fst-italic">
+                <i class="fa fa-paper-plane me-1"></i>
+                <span class="fw-bold fst-italic mx-1">
                     {{ formatDate(history_line[0].at) }}
                 </span>
-                <span class="badge bg-white text-black mx-1">{{
-                    history_line[0].by.username
-                }}</span>
+                <span class="badge bg-white text-black mx-1">
+                    {{ history_line[0].by.username }}
+                </span>
             </div>
-            <div
-                class="card-body row fst-italic"
-                v-for="addressee in history_line"
-                :key="history_line.indexOf(addressee)"
-            >
+            <div class="card-body row">
                 <ticket-history-addressee-component
-                    :addresseeHistory="addressee.data"
-                    :event_type="addressee.event_type"
+                    :addressees="
+                        history_line
+                            .map((line) => line.data)
+                            .map((data) => data.addressee)
+                    "
                 />
             </div>
         </template>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
index cbee55a9f..8cef7037b 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
@@ -43,7 +43,7 @@ const messages = {
         banner: {
             concerned_patient: "Patient concerné",
             caller: "Appelant",
-            speaker: "Intervenant",
+            speaker: "Destinataire(s)",
             open: "Ouvert",
             since: "Aucun jour | Depuis 1 jour | Depuis {count} jours",
             no_motive: "Pas de motif",

From c73c1eb8d55b26af5e5b9b73f2de8158311848f4 Mon Sep 17 00:00:00 2001
From: Boris Waaub <boriswaaub@Mac-Studio-de-Boris.local>
Date: Tue, 21 May 2024 22:24:30 +0200
Subject: [PATCH 070/283]  Rename "appelant" by "patient"

---
 .../public/vuejs/TicketApp/components/BannerComponent.vue     | 4 +++-
 .../src/Resources/public/vuejs/TicketApp/i18n/messages.ts     | 2 --
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
index 976036e48..30e7a2c84 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
@@ -35,7 +35,9 @@
         <div class="container-xxl">
             <div class="row justify-content-between">
                 <div class="col-md-6 col-sm-12 ps-md-5 ps-xxl-0">
-                    <h3 class="text-primary">{{ $t("banner.caller") }}</h3>
+                    <h3 class="text-primary">
+                        {{ $t("banner.concerned_patient") }}
+                    </h3>
 
                     <person-render-box
                         render="badge"
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
index 8cef7037b..12599648e 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
@@ -39,10 +39,8 @@ const messages = {
             success: "Transfert effectué",
             error: "Aucun destinataire sélectionné",
         },
-        close: "Fermer",
         banner: {
             concerned_patient: "Patient concerné",
-            caller: "Appelant",
             speaker: "Destinataire(s)",
             open: "Ouvert",
             since: "Aucun jour | Depuis 1 jour | Depuis {count} jours",

From a20f9b4f864e475ab2b4c682e0b8be3759360d2f Mon Sep 17 00:00:00 2001
From: Boris Waaub <boriswaaub@Mac-Studio-de-Boris.local>
Date: Wed, 22 May 2024 00:38:47 +0200
Subject: [PATCH 071/283] Generalize ticket actions

---
 .../Resources/public/vuejs/TicketApp/App.vue  |  1 +
 .../components/ActionToolbarComponent.vue     | 53 ++++++++--------
 .../components/AddCommentComponent.vue        |  2 +-
 .../components/AddresseeComponent.vue         | 37 +++++------
 .../components/AddresseeSelectorComponent.vue | 47 +++++++-------
 .../TicketApp/components/BannerComponent.vue  | 61 ++++++++++++++-----
 .../components/MotiveSelectorComponent.vue    | 23 +++++--
 .../TicketHistoryCommentComponent.vue         | 13 +---
 .../components/TicketHistoryListComponent.vue | 18 +++---
 .../TicketHistoryMotiveComponent.vue          | 14 ++---
 .../TicketHistoryPersonComponent.vue          | 30 +++++++--
 .../public/vuejs/TicketApp/i18n/messages.ts   | 22 +++----
 .../public/vuejs/TicketApp/store/index.ts     | 15 +++--
 .../store/modules/{user.ts => addressee.ts}   |  0
 .../vuejs/TicketApp/store/modules/ticket.ts   | 15 +++++
 15 files changed, 213 insertions(+), 138 deletions(-)
 rename src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/{user.ts => addressee.ts} (100%)

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
index d75694f0d..e4fda5734 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
@@ -36,6 +36,7 @@ export default defineComponent({
 
         const motives = computed(() => store.getters.getMotives as Motive[]);
         const ticket = computed(() => store.getters.getTicket as Ticket);
+
         const ticketHistory = computed(
             () => store.getters.getDistinctAddressesHistory
         );
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
index c9c228dc9..30e4f83a1 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
@@ -11,20 +11,20 @@
                 <form @submit.prevent="submitAction">
                     <add-comment-component
                         v-model="content"
-                        v-if="activeTab === 'comment'"
+                        v-if="activeTab === 'add_comment'"
                     />
 
                     <addressee-selector-component
                         v-model="addressees"
                         :user-groups="userGroups"
                         :users="users"
-                        v-if="activeTab === 'transfert'"
+                        v-if="activeTab === 'add_addressee'"
                     />
 
                     <motive-selector-component
                         v-model="motive"
                         :motives="motives"
-                        v-if="activeTab === 'motive'"
+                        v-if="activeTab === 'set_motive'"
                     />
 
                     <ul class="record_actions sticky-form-buttons">
@@ -52,13 +52,13 @@
                         type="button"
                         class="m-2 btn btn-light"
                         @click="
-                            activeTab === 'comment'
+                            activeTab === 'add_comment'
                                 ? (activeTab = '')
-                                : (activeTab = 'comment')
+                                : (activeTab = 'add_comment')
                         "
                     >
-                        <i class="fa fa-comment"></i>
-                        {{ $t("comment.title") }}
+                        <i :class="actionIcons['add_comment']"></i>
+                        {{ $t("add_comment.title") }}
                     </button>
                 </li>
                 <li class="nav-item">
@@ -66,13 +66,13 @@
                         type="button"
                         class="m-2 btn btn-light"
                         @click="
-                            activeTab === 'transfert'
+                            activeTab === 'add_addressee'
                                 ? (activeTab = '')
-                                : (activeTab = 'transfert')
+                                : (activeTab = 'add_addressee')
                         "
                     >
-                        <i class="fa fa-paper-plane"></i>
-                        {{ $t("transfert.title") }}
+                        <i :class="actionIcons['add_addressee']"></i>
+                        {{ $t("add_addressee.title") }}
                     </button>
                 </li>
                 <li class="nav-item">
@@ -80,13 +80,13 @@
                         type="button"
                         class="m-2 btn btn-light"
                         @click="
-                            activeTab === 'motive'
+                            activeTab === 'set_motive'
                                 ? (activeTab = '')
-                                : (activeTab = 'motive')
+                                : (activeTab = 'set_motive')
                         "
                     >
-                        <i class="fa fa-paint-brush"></i>
-                        {{ $t("motive.title") }}
+                        <i :class="actionIcons['set_motive']"></i>
+                        {{ $t("set_motive.title") }}
                     </button>
                 </li>
                 <li class="nav-item">
@@ -133,7 +133,9 @@ export default defineComponent({
         const store = useStore();
         const { t } = useI18n();
         const toast = inject("toast") as any;
-        const activeTab = ref("" as "" | "comment" | "motive" | "transfert");
+        const activeTab = ref(
+            "" as "" | "add_comment" | "set_motive" | "add_addressee"
+        );
 
         const ticket = computed(() => store.getters.getTicket as Ticket);
         const motives = computed(() => store.getters.getMotives as Motive[]);
@@ -155,9 +157,9 @@ export default defineComponent({
         async function submitAction() {
             try {
                 switch (activeTab.value) {
-                    case "comment":
+                    case "add_comment":
                         if (!content.value) {
-                            toast.error(t("comment.error"));
+                            toast.error(t("add_comment.error"));
                         } else {
                             await store.dispatch("createComment", {
                                 ticketId: ticket.value.id,
@@ -165,31 +167,31 @@ export default defineComponent({
                             });
                             content.value = "";
                             activeTab.value = "";
-                            toast.success(t("comment.success"));
+                            toast.success(t("add_comment.success"));
                         }
                         break;
-                    case "motive":
+                    case "set_motive":
                         if (!motive.value.id) {
-                            toast.error(t("motive.error"));
+                            toast.error(t("set_motive.error"));
                         } else {
                             await store.dispatch("createMotive", {
                                 ticketId: ticket.value.id,
                                 motive: motive.value,
                             });
                             activeTab.value = "";
-                            toast.success(t("motive.success"));
+                            toast.success(t("set_motive.success"));
                         }
                         break;
-                    case "transfert":
+                    case "add_addressee":
                         if (!addressees.value.length) {
-                            toast.error(t("transfert.error"));
+                            toast.error(t("add_addressee.error"));
                         } else {
                             await store.dispatch("setAdressees", {
                                 ticketId: ticket.value.id,
                                 addressees: addressees.value,
                             });
                             activeTab.value = "";
-                            toast.success(t("transfert.success"));
+                            toast.success(t("add_addressee.success"));
                         }
                         break;
                 }
@@ -203,6 +205,7 @@ export default defineComponent({
         }
 
         return {
+            actionIcons: ref(store.getters.getActionIcons),
             activeTab,
             ticket,
             motives,
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddCommentComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddCommentComponent.vue
index 4099ff41f..4e33d3c68 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddCommentComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddCommentComponent.vue
@@ -3,7 +3,7 @@
         <div class="col-12">
             <ckeditor
                 name="content"
-                :placeholder="$t('comment.content')"
+                :placeholder="$t('add_comment.content')"
                 :editor="editor"
                 v-model="content"
                 tag-name="textarea"
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeComponent.vue
index 274cf54f8..966e15946 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeComponent.vue
@@ -29,7 +29,7 @@
 </template>
 
 <script lang="ts">
-import { PropType, defineComponent, ref } from "vue";
+import { PropType, computed, defineComponent, ref } from "vue";
 
 // Types
 import {
@@ -37,7 +37,6 @@ import {
     UserGroup,
     UserGroupOrUser,
 } from "../../../../../../../ChillMainBundle/Resources/public/types";
-import { Ticket } from "../../../types";
 
 export default defineComponent({
     name: "AddresseeComponent",
@@ -48,23 +47,27 @@ export default defineComponent({
         },
     },
     setup(props, ctx) {
-        const userGroups = ref(
-            props.addressees.filter(
-                (addressee) =>
-                    addressee.type == "user_group" && addressee.excludeKey == ""
-            ) as UserGroup[]
+        const userGroups = computed(
+            () =>
+                props.addressees.filter(
+                    (addressee) =>
+                        addressee.type == "user_group" &&
+                        addressee.excludeKey == ""
+                ) as UserGroup[]
         );
-        const userGroupLevels = ref(
-            props.addressees.filter(
-                (addressee) =>
-                    addressee.type == "user_group" &&
-                    addressee.excludeKey == "level"
-            ) as UserGroup[]
+        const userGroupLevels = computed(
+            () =>
+                props.addressees.filter(
+                    (addressee) =>
+                        addressee.type == "user_group" &&
+                        addressee.excludeKey == "level"
+                ) as UserGroup[]
         );
-        const users = ref(
-            props.addressees.filter(
-                (addressee) => addressee.type == "user"
-            ) as User[]
+        const users = computed(
+            () =>
+                props.addressees.filter(
+                    (addressee) => addressee.type == "user"
+                ) as User[]
         );
         return { userGroups, users, userGroupLevels };
     },
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue
index 6fe6dabba..aebb21895 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue
@@ -66,8 +66,8 @@
             <add-persons
                 :options="addPersonsOptions"
                 key="add-person-ticket"
-                buttonTitle="transfert.user_label"
-                modalTitle="transfert.user_label"
+                buttonTitle="add_addressee.user_label"
+                modalTitle="add_addressee.user_label"
                 ref="addPersons"
                 @addNewPersons="addNewEntity"
             />
@@ -121,10 +121,12 @@ export default defineComponent({
     emits: ["update:modelValue"],
 
     setup(props, ctx) {
-        const addressees = ref(props.modelValue as UserGroupOrUser[]);
-        const userGroups = props.modelValue.filter(
-            (addressee) => addressee.type == "user_group"
-        ) as UserGroup[];
+        const addressees = ref([...props.modelValue] as UserGroupOrUser[]);
+        const userGroups = [
+            ...props.modelValue.filter(
+                (addressee) => addressee.type == "user_group"
+            ),
+        ] as UserGroup[];
 
         const userGroupLevel = ref(
             userGroups.filter(
@@ -135,10 +137,9 @@ export default defineComponent({
             userGroups.filter((userGroup) => userGroup.excludeKey == "") as
                 | UserGroup[]
         );
-        const users = ref(
-            props.modelValue.filter((addressee) => addressee.type == "user") as
-                | User[]
-        );
+        const users = ref([
+            ...props.modelValue.filter((addressee) => addressee.type == "user"),
+        ] as User[]);
         const addPersons = ref();
 
         const { t } = useI18n();
@@ -184,24 +185,26 @@ export default defineComponent({
         }
 
         watch(userGroupLevel, (userGroupLevelAdd, userGroupLevelRem) => {
-            if (userGroupLevelRem) {
-                addressees.value.splice(
-                    addressees.value.indexOf(userGroupLevelRem as UserGroup),
-                    1
-                );
+            const index = addressees.value.indexOf(
+                userGroupLevelRem as UserGroup
+            );
+            if (index !== -1) {
+                addressees.value.splice(index, 1);
             }
             addressees.value.push(userGroupLevelAdd as UserGroup);
             ctx.emit("update:modelValue", addressees.value);
         });
 
         watch(userGroup, (userGroupAdd) => {
-            const userGroups = addressees.value.filter(
-                (addressee) => addressee.type === "user_group"
+            const userGroupLevel = addressees.value.filter(
+                (addressee) =>
+                    addressee.type == "user_group" &&
+                    addressee.excludeKey == "level"
             ) as UserGroup[];
-            addressees.value = userGroups.filter(
-                (addressee) => addressee.excludeKey !== ""
-            );
-            addressees.value = [...addressees.value, ...userGroupAdd];
+            const users = addressees.value.filter(
+                (addressee) => addressee.type == "user"
+            ) as UserGroup[];
+            addressees.value = [...users, ...userGroupLevel, ...userGroupAdd];
             ctx.emit("update:modelValue", addressees.value);
         });
 
@@ -218,7 +221,7 @@ export default defineComponent({
             customUserGroupLabel(selectedUserGroup: UserGroup) {
                 return selectedUserGroup.label
                     ? selectedUserGroup.label.fr
-                    : t("transfert.user_group_label");
+                    : t("add_addresseeuser_group_label");
             },
         };
     },
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
index 30e7a2c84..c63fad87c 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
@@ -13,16 +13,18 @@
                 </div>
 
                 <div class="col-md-6 col-sm-12">
-                    <div class="float-end">
+                    <div class="d-flex justify-content-end">
                         <h1>
                             <span class="badge text-bg-chill-green text-white">
                                 {{ $t("banner.open") }}
                             </span>
                         </h1>
+                    </div>
+                    <div class="d-flex justify-content-end">
                         <h3 class="fst-italic" v-if="ticket.createdAt">
                             {{
                                 $t("banner.since", {
-                                    count: getSince(ticket.createdAt),
+                                    time: since,
                                 })
                             }}
                         </h3>
@@ -68,17 +70,14 @@
 </template>
 
 <script lang="ts">
-import { PropType, defineComponent, ref, watch } from "vue";
+import { PropType, computed, defineComponent, ref } from "vue";
+import { useI18n } from "vue-i18n";
 
 // Components
 import PersonRenderBox from "../../../../../../../ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue";
 import AddresseeComponent from "./AddresseeComponent.vue";
 
 // Types
-import {
-    User,
-    UserGroup,
-} from "../../../../../../../ChillMainBundle/Resources/public/types";
 import { Ticket } from "../../../types";
 
 export default defineComponent({
@@ -93,16 +92,46 @@ export default defineComponent({
         PersonRenderBox,
         AddresseeComponent,
     },
-    setup() {
-        function getSince(createdAt: any) {
-            const today = new Date();
-            const date = new Date(createdAt.date);
+    setup(props) {
+        const { t } = useI18n();
+        const today = ref(new Date());
+        const createdAt = ref(props.ticket.createdAt as any);
 
-            const timeDiff = Math.abs(today.getTime() - date.getTime());
-            const daysDiff = Math.ceil(timeDiff / (1000 * 3600 * 24));
-            return daysDiff;
-        }
-        return { getSince };
+        setInterval(function () {
+            today.value = new Date();
+        }, 5000);
+
+        const since = computed(() => {
+            const date = new Date(createdAt.value.date);
+
+            const timeDiff = Math.abs(today.value.getTime() - date.getTime());
+            const daysDiff = Math.floor(timeDiff / (1000 * 3600 * 24));
+            const hoursDiff = Math.floor(
+                (timeDiff % (1000 * 3600 * 24)) / (1000 * 3600)
+            );
+            const minutesDiff = Math.floor(
+                (timeDiff % (1000 * 3600)) / (1000 * 60)
+            );
+
+            if (daysDiff < 1) {
+                return `${t("banner.hours", { count: hoursDiff })} ${t(
+                    "banner.and"
+                )} ${t("banner.minutes", {
+                    count: minutesDiff,
+                })}`;
+            } else {
+                return `${t("banner.days", { count: daysDiff })}, ${t(
+                    "banner.hours",
+                    {
+                        count: hoursDiff,
+                    }
+                )} ${t("banner.and")} ${t("banner.minutes", {
+                    count: minutesDiff,
+                })}`;
+            }
+        });
+
+        return { since };
     },
 });
 </script>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/MotiveSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/MotiveSelectorComponent.vue
index c7f7f9b03..e83e93fd5 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/MotiveSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/MotiveSelectorComponent.vue
@@ -1,11 +1,22 @@
 <template>
     <div class="row">
         <div class="col-12 col-lg-4 col-md-6">
-            <vue-multiselect name="selectMotive" id="selectMotive" label="label" :custom-label="customLabel"
-                track-by="id" open-direction="top" :multiple="false" :searchable="true"
-                :placeholder="$t('motive.label')" :select-label="$t('multiselect.select_label')"
-                :deselect-label="$t('multiselect.deselect_label')" :selected-label="$t('multiselect.selected_label')"
-                :options="motives" v-model="motive" />
+            <vue-multiselect
+                name="selectMotive"
+                id="selectMotive"
+                label="label"
+                :custom-label="customLabel"
+                track-by="id"
+                open-direction="top"
+                :multiple="false"
+                :searchable="true"
+                :placeholder="$t('set_motive.label')"
+                :select-label="$t('multiselect.select_label')"
+                :deselect-label="$t('multiselect.deselect_label')"
+                :selected-label="$t('multiselect.selected_label')"
+                :options="motives"
+                v-model="motive"
+            />
         </div>
     </div>
 </template>
@@ -46,7 +57,7 @@ export default defineComponent({
         return {
             motive,
             customLabel(motive: Motive) {
-                return motive.label ? motive.label.fr : t('motive.label');
+                return motive.label ? motive.label.fr : t("set_motive.label");
             },
         };
     },
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCommentComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCommentComponent.vue
index c50c44194..75ef7c090 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCommentComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCommentComponent.vue
@@ -1,12 +1,6 @@
 <template>
     <div class="col-12">
-        <i class="fa fa-comment"></i>
-        <span class="mx-1">
-            {{ $t("history.comment") }}
-        </span>
-        <div class="mt-2">
-            <div v-html="convertMarkdownToHtml(commentHistory.content)"></div>
-        </div>
+        <div v-html="convertMarkdownToHtml(commentHistory.content)"></div>
     </div>
 </template>
 
@@ -27,7 +21,6 @@ export default defineComponent({
         },
     },
     setup() {
-
         const preprocess = (markdown: string): string => {
             return markdown;
         };
@@ -62,6 +55,4 @@ export default defineComponent({
 });
 </script>
 
-<style lang="scss" scoped>
-
-</style>
+<style lang="scss" scoped></style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
index 552cbb4c5..e8b834f9d 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
@@ -6,12 +6,13 @@
     >
         <template v-if="!Array.isArray(history_line)">
             <div class="card-header">
-                <span class="fw-bold fst-italic">
+                <i :class="`${actionIcons[history_line.event_type]} me-1`"></i>
+                <span class="fw-bold fst-italic mx-1">
                     {{ formatDate(history_line.at) }}
                 </span>
-                <span class="badge bg-white text-black mx-1">{{
-                    history_line.by.username
-                }}</span>
+                <span class="badge bg-white text-black mx-1">
+                    {{ history_line.by.username }}
+                </span>
             </div>
             <div class="card-body row">
                 <ticket-history-person-component
@@ -52,10 +53,11 @@
 </template>
 
 <script lang="ts">
-import { PropType, defineComponent } from "vue";
-import { DateTime } from "../../../../../../../ChillMainBundle/Resources/public/types";
+import { PropType, defineComponent, ref } from "vue";
+import { useStore } from "vuex";
 
 // Types
+import { DateTime } from "../../../../../../../ChillMainBundle/Resources/public/types";
 import { Ticket } from "../../../types";
 
 // Components
@@ -80,13 +82,15 @@ export default defineComponent({
     },
 
     setup() {
+        const store = useStore();
+
         function formatDate(d: DateTime) {
             const date = new Date(d.datetime);
             const month = date.toLocaleString("default", { month: "long" });
             return `${date.getDate()} ${month} ${date.getFullYear()}, ${date.toLocaleTimeString()}`;
         }
 
-        return { formatDate };
+        return { actionIcons: ref(store.getters.getActionIcons), formatDate };
     },
 });
 </script>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryMotiveComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryMotiveComponent.vue
index 132d782c1..2153115da 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryMotiveComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryMotiveComponent.vue
@@ -1,21 +1,17 @@
 <template>
     <div class="col-12">
-        <i class="fa fa-paint-brush"></i>
-        <span class="mx-1">
-            {{ $t('history.motive',{ motive: motiveHistory.motive.label.fr }) }}
-        </span>
+        {{ motiveHistory.motive.label.fr }}
     </div>
 </template>
 
 <script lang="ts">
-
-import { PropType, defineComponent } from 'vue';
+import { PropType, defineComponent } from "vue";
 
 // Types
-import { MotiveHistory } from '../../../types';
+import { MotiveHistory } from "../../../types";
 
 export default defineComponent({
-    name: 'TicketHistoryMotiveComponent',
+    name: "TicketHistoryMotiveComponent",
     props: {
         motiveHistory: {
             type: Object as PropType<MotiveHistory>,
@@ -23,7 +19,7 @@ export default defineComponent({
         },
     },
 
-    setup() {}
+    setup() {},
 });
 </script>
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryPersonComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryPersonComponent.vue
index f4831205b..56cf73e25 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryPersonComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryPersonComponent.vue
@@ -1,21 +1,40 @@
 <template>
     <div class="col-12" v-if="personHistory.createdBy">
-        <i class="fa fa-eyedropper"></i>
         <span class="mx-1">
-            {{ $t("history.user", { username: personHistory.createdBy.username }) }}
+            {{ $t("history.user") }}
+            <span class="badge bg-primary m-1">
+                {{ personHistory.createdBy.username }}
+            </span>
         </span>
     </div>
     <div class="col-12">
-        <i class="fa fa-bolt" style="min-width: 16px"></i>
         <span class="mx-1">
-            {{ $t("history.person", { person: personHistory.person.text }) }}
+            {{ $t("history.person") }}
         </span>
+        <person-render-box
+            render="badge"
+            :key="personHistory.person.id"
+            :person="personHistory.person"
+            :options="{
+                addLink: true,
+                addId: false,
+                addAltNames: false,
+                addEntity: true,
+                addInfo: true,
+                hLevel: 3,
+                isMultiline: true,
+                isConfidential: false,
+            }"
+        />
     </div>
 </template>
 
 <script lang="ts">
 import { PropType, defineComponent } from "vue";
 
+// Components
+import PersonRenderBox from "../../../../../../../ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue";
+
 // Type
 import { PersonHistory, Ticket } from "../../../types";
 
@@ -27,6 +46,9 @@ export default defineComponent({
             required: true,
         },
     },
+    components: {
+        PersonRenderBox,
+    },
 
     setup() {},
 });
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
index 12599648e..5299b0cd7 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
@@ -10,29 +10,23 @@ const messages = {
             close: "Fermer",
         },
         history: {
-            person: "Ouverture par appel téléphonique de {person}",
-            user: "Prise en charge par {username}",
-            motive: "Motif indiqué: {motive}",
-            comment: "Commentaire",
-            add_addressee_user_group: "Groupe {user_group} transferé",
-            remove_addressee_user_group: "Groupe {user_group} retiré",
-            add_addressee_user: " Utilisateur {user} Transferé",
-            remove_addressee_user: "Utilisateur {user} retiré",
+            person: "Ouverture par appel téléphonique de ",
+            user: "Prise en charge par ",
         },
-        comment: {
+        add_comment: {
             title: "Commentaire",
             label: "Ajouter un commentaire",
             success: "Commentaire enregistré",
             content: "Ajouter un commentaire",
             error: "Aucun commentaire ajouté",
         },
-        motive: {
+        set_motive: {
             title: "Motif",
             label: "Choisir un motif",
             success: "Motif enregistré",
             error: "Aucun motif sélectionné",
         },
-        transfert: {
+        add_addressee: {
             title: "Transfert",
             user_group_label: "Transferer vers un groupe",
             user_label: "Transferer vers un ou plusieurs utilisateurs",
@@ -43,7 +37,11 @@ const messages = {
             concerned_patient: "Patient concerné",
             speaker: "Destinataire(s)",
             open: "Ouvert",
-            since: "Aucun jour | Depuis 1 jour | Depuis {count} jours",
+            since: "Depuis {time}",
+            and: "et",
+            days: "1 jour | {count} jours",
+            hours: "1 heure | {count} heures",
+            minutes: "1 minute | {count} minutes",
             no_motive: "Pas de motif",
         },
     },
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts
index 61c13b9b9..24508452c 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts
@@ -2,21 +2,20 @@ import { createStore } from "vuex";
 import { State as MotiveStates, moduleMotive } from "./modules/motive";
 import { State as TicketStates, moduleTicket } from "./modules/ticket";
 import { State as CommentStates, moduleComment } from "./modules/comment";
-import { State as UserStates, moduleUser } from "./modules/user";
+import { State as UserStates, moduleUser } from "./modules/addressee";
 
 export type RootState = {
     motive: MotiveStates;
     ticket: TicketStates;
     comment: CommentStates;
     user: UserStates;
-  };
+};
 
 export const store = createStore({
     modules: {
-        motive:moduleMotive,
-        ticket:moduleTicket,
-        comment:moduleComment,
-        user:moduleUser,
-
-      }
+        motive: moduleMotive,
+        ticket: moduleTicket,
+        comment: moduleComment,
+        user: moduleUser,
+    },
 });
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/user.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/addressee.ts
similarity index 100%
rename from src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/user.ts
rename to src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/addressee.ts
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
index d44f7401a..375846c25 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
@@ -5,16 +5,31 @@ import { Ticket } from "../../../../types";
 
 export interface State {
     ticket: Ticket;
+    action_icons: Object;
 }
 
 export const moduleTicket: Module<State, RootState> = {
     state: () => ({
         ticket: {} as Ticket,
+        action_icons: {
+            add_person: "fa fa-eyedropper",
+            add_comment: "fa fa-comment",
+            set_motive: "fa fa-paint-brush",
+            add_addressee: "fa fa-paper-plane",
+        },
+        toto: "toto",
     }),
     getters: {
         getTicket(state) {
+            state.ticket.history = state.ticket.history.sort((a, b) =>
+                b.at.datetime.localeCompare(a.at.datetime)
+            );
             return state.ticket;
         },
+
+        getActionIcons(state) {
+            return state.action_icons;
+        },
         getDistinctAddressesHistory(state) {
             const addresseeHistory = state.ticket.history.reduce(
                 (result, item) => {

From ca05e3d979bfade0b5efd4ca403f9147f185abda Mon Sep 17 00:00:00 2001
From: Boris Waaub <boriswaaub@Mac-Studio-de-Boris.local>
Date: Wed, 22 May 2024 11:12:22 +0200
Subject: [PATCH 072/283] Layout adaptation

---
 .../components/ActionToolbarComponent.vue     | 87 +++++++++++--------
 .../TicketApp/components/BannerComponent.vue  | 17 ++--
 .../components/MotiveSelectorComponent.vue    |  9 +-
 .../TicketHistoryAddresseeComponent.vue       |  6 +-
 .../TicketHistoryCommentComponent.vue         |  4 +-
 .../TicketHistoryMotiveComponent.vue          |  2 +-
 .../TicketHistoryPersonComponent.vue          |  2 +-
 .../public/vuejs/TicketApp/i18n/messages.ts   |  7 +-
 .../store/modules/{addressee.ts => user.ts}   |  0
 9 files changed, 79 insertions(+), 55 deletions(-)
 rename src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/{addressee.ts => user.ts} (100%)

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
index 30e4f83a1..9604caeec 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
@@ -47,38 +47,14 @@
         </div>
         <div class="footer-ticket-main">
             <ul class="nav nav-tabs justify-content-end">
-                <li class="nav-item">
+                <li class="nav-item p-2">
                     <button
                         type="button"
-                        class="m-2 btn btn-light"
-                        @click="
-                            activeTab === 'add_comment'
-                                ? (activeTab = '')
-                                : (activeTab = 'add_comment')
-                        "
-                    >
-                        <i :class="actionIcons['add_comment']"></i>
-                        {{ $t("add_comment.title") }}
-                    </button>
-                </li>
-                <li class="nav-item">
-                    <button
-                        type="button"
-                        class="m-2 btn btn-light"
-                        @click="
-                            activeTab === 'add_addressee'
-                                ? (activeTab = '')
-                                : (activeTab = 'add_addressee')
-                        "
-                    >
-                        <i :class="actionIcons['add_addressee']"></i>
-                        {{ $t("add_addressee.title") }}
-                    </button>
-                </li>
-                <li class="nav-item">
-                    <button
-                        type="button"
-                        class="m-2 btn btn-light"
+                        :class="`btn ${
+                            activeTab === 'set_motive'
+                                ? 'btn-primary'
+                                : 'btn-light'
+                        }`"
                         @click="
                             activeTab === 'set_motive'
                                 ? (activeTab = '')
@@ -89,10 +65,47 @@
                         {{ $t("set_motive.title") }}
                     </button>
                 </li>
-                <li class="nav-item">
+                <li class="nav-item p-2">
                     <button
                         type="button"
-                        class="m-2 btn btn-light"
+                        :class="`btn ${
+                            activeTab === 'add_comment'
+                                ? 'btn-primary'
+                                : 'btn-light'
+                        }`"
+                        @click="
+                            activeTab === 'add_comment'
+                                ? (activeTab = '')
+                                : (activeTab = 'add_comment')
+                        "
+                    >
+                        <i :class="actionIcons['add_comment']"></i>
+                        {{ $t("add_comment.title") }}
+                    </button>
+                </li>
+                <li class="nav-item p-2">
+                    <button
+                        type="button"
+                        :class="`btn ${
+                            activeTab === 'add_addressee'
+                                ? 'btn-primary'
+                                : 'btn-light'
+                        }`"
+                        @click="
+                            activeTab === 'add_addressee'
+                                ? (activeTab = '')
+                                : (activeTab = 'add_addressee')
+                        "
+                    >
+                        <i :class="actionIcons['add_addressee']"></i>
+                        {{ $t("add_addressee.title") }}
+                    </button>
+                </li>
+
+                <li class="nav-item p-2">
+                    <button
+                        type="button"
+                        class="btn btn-light"
                         @click="handleClick()"
                     >
                         <i class="fa fa-bolt"></i>
@@ -220,11 +233,8 @@ export default defineComponent({
     },
 });
 </script>
+
 <style lang="scss" scoped>
-ul.record_actions.sticky-form-buttons {
-    padding-left: 0px;
-    padding-right: 0px;
-}
 .sticky-form-buttons {
     margin-top: 0px;
     background: none;
@@ -236,4 +246,9 @@ div.footer-ticket-main {
 div.footer-ticket-details {
     background: none repeat scroll 0 0 #efe2ca;
 }
+
+.fixed-bottom {
+    max-width: 1272px;
+    margin: 0 auto;
+}
 </style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
index c63fad87c..b03b10405 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
@@ -99,7 +99,7 @@ export default defineComponent({
 
         setInterval(function () {
             today.value = new Date();
-        }, 5000);
+        }, 1000);
 
         const since = computed(() => {
             const date = new Date(createdAt.value.date);
@@ -112,20 +112,21 @@ export default defineComponent({
             const minutesDiff = Math.floor(
                 (timeDiff % (1000 * 3600)) / (1000 * 60)
             );
+            const secondsDiff = Math.floor((timeDiff % (1000 * 60)) / 1000);
 
-            if (daysDiff < 1) {
-                return `${t("banner.hours", { count: hoursDiff })} ${t(
-                    "banner.and"
-                )} ${t("banner.minutes", {
-                    count: minutesDiff,
-                })}`;
+            if (daysDiff < 1 && hoursDiff < 1 && minutesDiff < 1) {
+                return `${t("banner.seconds", { count: secondsDiff })}`;
+            } else if (daysDiff < 1) {
+                return `${t("banner.hours", { count: hoursDiff })}
+                ${t("banner.minutes", { count: minutesDiff })}
+                ${t("banner.seconds", { count: secondsDiff })}`;
             } else {
                 return `${t("banner.days", { count: daysDiff })}, ${t(
                     "banner.hours",
                     {
                         count: hoursDiff,
                     }
-                )} ${t("banner.and")} ${t("banner.minutes", {
+                )}  ${t("banner.minutes", {
                     count: minutesDiff,
                 })}`;
             }
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/MotiveSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/MotiveSelectorComponent.vue
index e83e93fd5..beb3268a9 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/MotiveSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/MotiveSelectorComponent.vue
@@ -1,6 +1,6 @@
 <template>
     <div class="row">
-        <div class="col-12 col-lg-4 col-md-6">
+        <div class="col-12">
             <vue-multiselect
                 name="selectMotive"
                 id="selectMotive"
@@ -16,6 +16,7 @@
                 :selected-label="$t('multiselect.selected_label')"
                 :options="motives"
                 v-model="motive"
+                class="mb-4"
             />
         </div>
     </div>
@@ -64,4 +65,8 @@ export default defineComponent({
 });
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+#selectMotive {
+    margin-bottom: 1.5em;
+}
+</style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent.vue
index 26109946a..3e78a7b96 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent.vue
@@ -5,7 +5,7 @@
 </template>
 
 <script lang="ts">
-import { PropType, defineComponent, ref } from "vue";
+import { PropType, defineComponent } from "vue";
 
 // Types
 import { UserGroupOrUser } from "../../../../../../../ChillMainBundle/Resources/public/types";
@@ -14,7 +14,7 @@ import { UserGroupOrUser } from "../../../../../../../ChillMainBundle/Resources/
 import AddresseeComponent from "./AddresseeComponent.vue";
 
 export default defineComponent({
-    name: "TicketHistoryAddresseeComponent",
+    name: "TicketHistoryAddresseeComponenvt",
     props: {
         addressees: {
             type: Array as PropType<UserGroupOrUser[]>,
@@ -24,7 +24,7 @@ export default defineComponent({
     components: {
         AddresseeComponent,
     },
-    setup(props, ctx) {
+    setup() {
         return {};
     },
 });
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCommentComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCommentComponent.vue
index 75ef7c090..21ede7c9e 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCommentComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCommentComponent.vue
@@ -1,6 +1,8 @@
 <template>
     <div class="col-12">
-        <div v-html="convertMarkdownToHtml(commentHistory.content)"></div>
+        <blockquote class="chill-user-quote">
+            <p v-html="convertMarkdownToHtml(commentHistory.content)"></p>
+        </blockquote>
     </div>
 </template>
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryMotiveComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryMotiveComponent.vue
index 2153115da..eb07671a1 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryMotiveComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryMotiveComponent.vue
@@ -1,5 +1,5 @@
 <template>
-    <div class="col-12">
+    <div class="col-12 fw-bolder">
         {{ motiveHistory.motive.label.fr }}
     </div>
 </template>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryPersonComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryPersonComponent.vue
index 56cf73e25..8b4f8a262 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryPersonComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryPersonComponent.vue
@@ -36,7 +36,7 @@ import { PropType, defineComponent } from "vue";
 import PersonRenderBox from "../../../../../../../ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue";
 
 // Type
-import { PersonHistory, Ticket } from "../../../types";
+import { PersonHistory } from "../../../types";
 
 export default defineComponent({
     name: "TicketHistoryPersonComponent",
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
index 5299b0cd7..39b034075 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
@@ -39,9 +39,10 @@ const messages = {
             open: "Ouvert",
             since: "Depuis {time}",
             and: "et",
-            days: "1 jour | {count} jours",
-            hours: "1 heure | {count} heures",
-            minutes: "1 minute | {count} minutes",
+            days: "‎|1 jour|{count} jours",
+            hours: "‎|1 heure et|{count} heures",
+            minutes: "‎|1 minute|{count} minutes",
+            seconds: "‎|1 seconde|{count} secondes",
             no_motive: "Pas de motif",
         },
     },
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/addressee.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/user.ts
similarity index 100%
rename from src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/addressee.ts
rename to src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/user.ts

From 4750d2c24e273905f7c4bff6dcf7739a18d67adb Mon Sep 17 00:00:00 2001
From: Boris Waaub <boriswaaub@Mac-Studio-de-Boris.local>
Date: Wed, 22 May 2024 11:16:18 +0200
Subject: [PATCH 073/283] Adapt module name

---
 .../src/Resources/public/vuejs/TicketApp/store/index.ts   | 8 ++++----
 .../TicketApp/store/modules/{user.ts => addressee.ts}     | 2 +-
 2 files changed, 5 insertions(+), 5 deletions(-)
 rename src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/{user.ts => addressee.ts} (97%)

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts
index 24508452c..73e9d274e 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts
@@ -2,20 +2,20 @@ import { createStore } from "vuex";
 import { State as MotiveStates, moduleMotive } from "./modules/motive";
 import { State as TicketStates, moduleTicket } from "./modules/ticket";
 import { State as CommentStates, moduleComment } from "./modules/comment";
-import { State as UserStates, moduleUser } from "./modules/addressee";
+import { State as AddresseeStates, moduleAddressee } from "./modules/addressee";
 
 export type RootState = {
     motive: MotiveStates;
     ticket: TicketStates;
     comment: CommentStates;
-    user: UserStates;
+    user: AddresseeStates;
 };
 
-export const store = createStore({
+export const store = createStore<RootState>({
     modules: {
         motive: moduleMotive,
         ticket: moduleTicket,
         comment: moduleComment,
-        user: moduleUser,
+        user: moduleAddressee,
     },
 });
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/user.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/addressee.ts
similarity index 97%
rename from src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/user.ts
rename to src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/addressee.ts
index f4441e34b..67802e899 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/user.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/addressee.ts
@@ -17,7 +17,7 @@ export interface State {
     users: Array<User>;
 }
 
-export const moduleUser: Module<State, RootState> = {
+export const moduleAddressee: Module<State, RootState> = {
     state: () => ({
         userGroups: [] as Array<UserGroup>,
         users: [] as Array<User>,

From 66c77580239e2875662ae829d32bdee370df983c Mon Sep 17 00:00:00 2001
From: Boris Waaub <boriswaaub@Mac-Studio-de-Boris.local>
Date: Wed, 22 May 2024 11:17:07 +0200
Subject: [PATCH 074/283] Adapt module name

---
 .../src/Resources/public/vuejs/TicketApp/store/index.ts       | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts
index 73e9d274e..cc7da9538 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts
@@ -8,7 +8,7 @@ export type RootState = {
     motive: MotiveStates;
     ticket: TicketStates;
     comment: CommentStates;
-    user: AddresseeStates;
+    addressee: AddresseeStates;
 };
 
 export const store = createStore<RootState>({
@@ -16,6 +16,6 @@ export const store = createStore<RootState>({
         motive: moduleMotive,
         ticket: moduleTicket,
         comment: moduleComment,
-        user: moduleAddressee,
+        addressee: moduleAddressee,
     },
 });

From e4b6a468f8c7162e8a312b3e8e19fb53b77868c2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 28 May 2024 13:47:58 +0200
Subject: [PATCH 075/283] adding fixtures for ticket in every environment

---
 src/Bundle/ChillTicketBundle/src/config/services.yaml | 6 ++----
 1 file changed, 2 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/src/config/services.yaml b/src/Bundle/ChillTicketBundle/src/config/services.yaml
index 4b662ecdc..35bdf54c9 100644
--- a/src/Bundle/ChillTicketBundle/src/config/services.yaml
+++ b/src/Bundle/ChillTicketBundle/src/config/services.yaml
@@ -17,7 +17,5 @@ services:
     Chill\TicketBundle\Serializer\:
         resource: '../Serializer/'
 
-when@dev:
-    services:
-        Chill\TicketBundle\DataFixtures\:
-            resource: '../DataFixtures/'
+    Chill\TicketBundle\DataFixtures\:
+        resource: '../DataFixtures/'

From 640fd71402b3a4718e549838b1d12d9383c6b673 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 28 May 2024 15:54:52 +0200
Subject: [PATCH 076/283] merge ticket-app-master and fix rector / cs

---
 src/Bundle/ChillMainBundle/Entity/UserGroup.php             | 6 +++---
 .../GeographicalUnitStatAggregator.php                      | 3 +--
 .../GeographicalUnitStatFilter.php                          | 3 +--
 .../ChillPersonBundle/Repository/PersonRepository.php       | 2 +-
 4 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Entity/UserGroup.php b/src/Bundle/ChillMainBundle/Entity/UserGroup.php
index 470a21a70..b5f3265ed 100644
--- a/src/Bundle/ChillMainBundle/Entity/UserGroup.php
+++ b/src/Bundle/ChillMainBundle/Entity/UserGroup.php
@@ -38,11 +38,11 @@ class UserGroup
     #[ORM\JoinTable(name: 'chill_main_user_group_user')]
     private Collection $users;
 
-    #[ORM\Column(type: 'text', nullable: false, options: ['default' => '#ffffffff'])]
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::TEXT, nullable: false, options: ['default' => '#ffffffff'])]
     #[Serializer\Groups(['read'])]
     private string $backgroundColor = '#ffffffff';
 
-    #[ORM\Column(type: 'text', nullable: false, options: ['default' => '#000000ff'])]
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::TEXT, nullable: false, options: ['default' => '#000000ff'])]
     #[Serializer\Groups(['read'])]
     private string $foregroundColor = '#000000ff';
 
@@ -52,7 +52,7 @@ class UserGroup
      *
      * An empty string means "no exclusion"
      */
-    #[ORM\Column(type: 'text', nullable: false, options: ['default' => ''])]
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::TEXT, nullable: false, options: ['default' => ''])]
     #[Serializer\Groups(['read'])]
     private string $excludeKey = '';
 
diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregator.php
index 0a861d64c..ffa5501dd 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregator.php
@@ -32,8 +32,7 @@ final readonly class GeographicalUnitStatAggregator implements AggregatorInterfa
         private GeographicalUnitLayerRepositoryInterface $geographicalUnitLayerRepository,
         private TranslatableStringHelperInterface $translatableStringHelper,
         private RollingDateConverterInterface $rollingDateConverter
-    ) {
-    }
+    ) {}
 
     public function addRole(): ?string
     {
diff --git a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilter.php b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilter.php
index d84745403..7adf03d13 100644
--- a/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilter.php
+++ b/src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/GeographicalUnitStatFilter.php
@@ -38,8 +38,7 @@ class GeographicalUnitStatFilter implements FilterInterface
         private readonly GeographicalUnitLayerRepositoryInterface $geographicalUnitLayerRepository,
         private readonly TranslatableStringHelperInterface $translatableStringHelper,
         private readonly RollingDateConverterInterface $rollingDateConverter
-    ) {
-    }
+    ) {}
 
     public function addRole(): ?string
     {
diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonRepository.php b/src/Bundle/ChillPersonBundle/Repository/PersonRepository.php
index 6b36ddd11..c962950d2 100644
--- a/src/Bundle/ChillPersonBundle/Repository/PersonRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonRepository.php
@@ -101,7 +101,7 @@ class PersonRepository implements ObjectRepository
      * Find a person which is associated to the given phonenumber, without restrictions
      * on any.
      *
-     * @return list<Person
+     * @return list<Person>
      */
     public function findByPhoneNumber(PhoneNumber $phoneNumber, int $firstResult = 0, int $maxResults = 50): array
     {

From e00ece420032c3bbb63a2f394b14bfe56d4d049b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 28 May 2024 15:58:17 +0200
Subject: [PATCH 077/283] Update form builder parameter in SearchController

Changed the first argument in the `createNamedBuilder` method from `null` to an empty string. This adjustment ensures the form factory correctly creates the builder in the SearchController.
---
 src/Bundle/ChillMainBundle/Controller/SearchController.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillMainBundle/Controller/SearchController.php b/src/Bundle/ChillMainBundle/Controller/SearchController.php
index 90fa6e1b5..4c4b6d22c 100644
--- a/src/Bundle/ChillMainBundle/Controller/SearchController.php
+++ b/src/Bundle/ChillMainBundle/Controller/SearchController.php
@@ -211,7 +211,7 @@ class SearchController extends AbstractController
         $builder = $this
             ->get('form.factory')
             ->createNamedBuilder(
-                null,
+                '',
                 FormType::class,
                 $data,
                 ['method' => Request::METHOD_POST]

From e65bcf7275fe5f242b5558016e7ad08d92dcb764 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 28 May 2024 16:33:13 +0200
Subject: [PATCH 078/283] Restore feature to see chill assets style preview in
 dev environment

This commit introduces a new dev.assets.html.twig file and updates the chill.yaml file to add new paths for the SASS Assets tests.
---
 .../Resources/views/Dev/dev.assets.html.twig  | 306 ++++++++++++++++++
 .../views/Dev/dev.assets.test1.html.twig      |  84 +++++
 .../views/Dev/dev.assets.test2.html.twig      |  78 +++++
 3 files changed, 468 insertions(+)
 create mode 100644 src/Bundle/ChillMainBundle/Resources/views/Dev/dev.assets.html.twig
 create mode 100644 src/Bundle/ChillMainBundle/Resources/views/Dev/dev.assets.test1.html.twig
 create mode 100644 src/Bundle/ChillMainBundle/Resources/views/Dev/dev.assets.test2.html.twig

diff --git a/src/Bundle/ChillMainBundle/Resources/views/Dev/dev.assets.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Dev/dev.assets.html.twig
new file mode 100644
index 000000000..6a7c4edf0
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Dev/dev.assets.html.twig
@@ -0,0 +1,306 @@
+{% extends '@ChillMain/layout.html.twig' %}
+
+{% block title %}
+  SASS Assets Catalogue
+{% endblock %}
+
+{% block css %}
+<style media="screen">
+    h2 { margin: 1.5em 0; }
+    div.flex-table ul, div.flex-bloc ul { padding-left: 1rem; }
+    div.flex-table div.item-bloc div.item-row div.item-col:first-child { flex-basis: 20%; }
+    div.flex-bloc div.item-bloc { flex-basis: 50%; }
+</style>
+{% endblock %}
+
+{% block content %}
+<div class="col-md-10">
+<h1 class="display-4">{{ block('title') }}</h1>
+
+<b>Voir aussi: </b>
+<a href="{{ path('sass_assets_test1') }}">Test 1</a> |
+<a href="{{ path('sass_assets_test2') }}">Test 2</a>
+
+<h2>Flex-table et flex-bloc</h2>
+<p>Base d'un placement flex alternatif à l'usage des tables.
+  Flex-table et flex-bloc utilisent la même structure html (seul la root class change).
+  Le placement est responsive.
+  La bordure utilise box-shadow pour simuler border-collapse (table).
+  </p>
+<p>Une classe separator peut être appliquée sur item-row</p>
+
+<xmp>
+<div class="flex-table">
+  <div class="item-bloc">
+    <div class="item-row">
+      <div class="item-col"></div>
+      <div class="item-col"></div>
+    </div>
+    <div class="item-row separator">
+      <div class="item-col"></div>
+      <div class="item-col"></div>
+    </div>
+  </div>
+  <div class="item-bloc">
+    <div class="item-row">
+      <div class="item-col"></div>
+      <div class="item-col"></div>
+    </div>
+    <div class="item-row">
+      <div class="item-col"></div>
+      <div class="item-col"></div>
+    </div>
+  </div>
+</div>
+</xmp>
+
+<h3>Flex-table</h3>
+<p>On fixe manuellement la largeur de la première colonne :
+<pre>div.flex-table div.item-bloc div.item-row div.item-col:first-child { flex-basis: 20%; }</pre>
+</p>
+<div class="flex-table debug">
+  <div class="item-bloc">
+    <div class="item-row">
+      <div class="item-col">Title row1</div>
+      <div class="item-col">
+        <ul class="list-content">
+          <li>Nam rhoncus tristique ligula, tincidunt iaculis augue tincidunt ac viverra et a dui.</li>
+          <li>Nam rhoncus tristique ligula, tincidunt iaculis augue tincidunt ac viverra et a dui.</li>
+        </ul>
+      </div>
+    </div>
+    <div class="item-row separator">
+      <div class="item-col">Title row2</div>
+      <div class="item-col">Nam rhoncus tristique ligula, tincidunt iaculis augue tincidunt ac viverra et a dui.</div>
+    </div>
+    <div class="item-row">
+      <div class="item-col">Title row3</div>
+      <div class="item-col">Nam rhoncus tristique ligula, tincidunt iaculis augue tincidunt ac viverra et a dui.</div>
+    </div>
+  </div>
+  <div class="item-bloc">
+    <div class="item-row">
+      <div class="item-col">Title row1</div>
+      <div class="item-col">
+        <ul class="list-content">
+          <li>Nam rhoncus tristique ligula, tincidunt iaculis augue tincidunt ac viverra et a dui.</li>
+          <li>Nam rhoncus tristique ligula, tincidunt iaculis augue tincidunt ac viverra et a dui.</li>
+        </ul>
+      </div>
+    </div>
+    <div class="item-row">
+      <div class="item-col">Title row2</div>
+      <div class="item-col">Nam rhoncus tristique ligula, tincidunt iaculis augue tincidunt ac viverra et a dui.</div>
+    </div>
+  </div>
+</div>
+
+<h3>Flex-bloc</h3>
+<p>On fixe manuellement la largeur des blocs :
+<pre>div.flex-bloc div.item-bloc { flex-basis: 50%; }</pre>
+</p>
+<div class="flex-bloc debug">
+  <div class="item-bloc">
+    <div class="item-row">
+      <div class="item-col">Title row1</div>
+      <div class="item-col">
+        <ul class="list-content">
+          <li>Nam rhoncus tristique ligula, tincidunt iaculis augue tincidunt ac viverra et a dui.</li>
+          <li>Nam rhoncus tristique ligula, tincidunt iaculis augue tincidunt ac viverra et a dui.</li>
+        </ul>
+      </div>
+    </div>
+    <div class="item-row separator">
+      <div class="item-col">Title row2</div>
+      <div class="item-col">Nam rhoncus tristique ligula, tincidunt iaculis augue tincidunt ac viverra et a dui.</div>
+    </div>
+    <div class="item-row">
+      <div class="item-col">Title row3</div>
+      <div class="item-col">Nam rhoncus tristique ligula, tincidunt iaculis augue tincidunt ac viverra et a dui.</div>
+    </div>
+  </div>
+  <div class="item-bloc">
+    <div class="item-row">
+      <div class="item-col">Title row1</div>
+      <div class="item-col">
+        <ul class="list-content">
+          <li>Nam rhoncus tristique ligula, tincidunt iaculis augue tincidunt ac viverra et a dui.</li>
+          <li>Nam rhoncus tristique ligula, tincidunt iaculis augue tincidunt ac viverra et a dui.</li>
+        </ul>
+      </div>
+    </div>
+    <div class="item-row">
+      <div class="item-col">Title row2</div>
+      <div class="item-col">Nam rhoncus tristique ligula, tincidunt iaculis augue tincidunt ac viverra et a dui.</div>
+    </div>
+  </div>
+</div>
+
+<h2>Wrap-list</h2>
+<p>Une liste inline qui s'aligne, puis glisse sous son titre.</p>
+<div class="wrap-list debug">
+    <div class="wl-row">
+        <div class="wl-col title">Usagers concernés</div>
+        <div class="wl-col list">
+            <p class="wl-item"><a href="#">Gaston Bah</a></p>
+            <p class="wl-item"><a href="#">Alain Bah</a></p>
+            <p class="wl-item"><a href="#">Adèle Gaillot</a></p>
+            <p class="wl-item"><a href="#">Corentine Bah</a></p>
+            <p class="wl-item"><a href="#">Justin Bah</a></p>
+            <p class="wl-item"><a href="#">Michel Sardou</a></p>
+            <p class="wl-item"><a href="#">Carine Rousseau</a></p>
+            <p class="wl-item"><a href="#">Mohamed Martin</a></p>
+        </div>
+    </div>
+    <div class="wl-row">
+        <div class="wl-col title">Problématiques sociales</div>
+        <div class="wl-col list">
+            <p class="wl-item"><a href="#">Gaston Bah</a></p>
+            <p class="wl-item"><a href="#">Alain Bah</a></p>
+            <p class="wl-item"><a href="#">Adèle Gaillot</a></p>
+        </div>
+    </div>
+</div>
+<xmp>
+<div class="wrap-list">
+  <div class="wl-row">
+    <div class="wl-col title">title</div>
+    <div class="wl-col list">
+      <p class="wl-item">item</p>
+      <p class="wl-item">item</p>
+      ...
+    </div>
+  </div>
+  ...
+</div>
+</xmp>
+
+<h2>Wrap-header</h2>
+<p>Réglage d'une zone de titre sur 2 lignes.</p>
+<div class="wrap-header debug">
+  <div class="wh-row">
+    <div class="wh-col">
+        <span class="h3"><b>Title</b></span>
+        <span class="badge rounded-pill bg-danger">badge</span>
+    </div>
+    <div class="wh-col">
+      <span class="badge rounded-pill bg-primary">badge</span>
+    </div>
+  </div>
+  <div class="wh-row">
+    <div class="wh-col">from startdate to enddate</div>
+    <div class="wh-col">text</div>
+  </div>
+</div>
+<xmp>
+<div class="wrap-header">
+  <div class="wh-row">
+    <div class="wh-col">line1 left</div>
+    <div class="wh-col">line1 right</div>
+  </div>
+  <div class="wh-row">
+    <div class="wh-col">line2 left</div>
+    <div class="wh-col">line2 right</div>
+  </div>
+</div>
+</xmp>
+
+<h2>Float-button top</h2>
+<p>Une zone de bouton flotte à droite d'un contenu. On peut voir en faisant varier la largeur que celui-ci vient s'adapter harmonieusement autour des boutons.</p>
+<div class="float-button top debug">
+    <div class="box">
+        <div class="action">
+            <ul class="record_actions">
+                <li><button type="button" name="button">Annuler</button></li>
+                <li><button type="button" name="button">Voir</button></li>
+                <li><button type="button" name="button">Enregistrer</button></li>
+            </ul>
+        </div>
+        Nam rhoncus tristique ligula, tincidunt iaculis augue tincidunt ac. Proin fermentum mauris quam, ut suscipit nisl auctor at. Ut vestibulum ligula eget ex congue, efficitur interdum ipsum tincidunt. Integer id sapien et nibh tristique viverra et a dui. Ut blandit pharetra consectetur. Sed scelerisque eget purus at tempus. Etiam sit amet tellus et eros semper tempor. Curabitur suscipit pulvinar enim at lobortis. Ut nisl augue, cursus vel hendrerit sed, posuere vel sapien. Proin hendrerit arcu velit, eu ultrices dui interdum eget. Vestibulum consectetur sodales enim a accumsan. In vitae tristique leo, a fringilla nisl.
+    </div>
+</div>
+<xmp>
+<div class="float-button top">
+  <div class="box">
+    <div class="action">
+      floating button
+    </div>
+    content ...
+  </div>
+</div>
+</xmp>
+
+<h2>Float-button bottom</h2>
+<p>Avec la même structure, on accroche la zone de bouton en bas, toujours à droite. Voir <a href="https://css-tricks.com/float-an-element-to-the-bottom-corner/">source</a>. </p>
+<div class="float-button bottom debug">
+    <div class="box">
+        <div class="action">
+            <ul class="record_actions">
+                <li><button type="button" name="button">Annuler</button></li>
+                <li><button type="button" name="button">Voir</button></li>
+                <li><button type="button" name="button">Enregistrer</button></li>
+            </ul>
+        </div>
+        Nam rhoncus tristique ligula, tincidunt iaculis augue tincidunt ac. Proin fermentum mauris quam, ut suscipit nisl auctor at. Ut vestibulum ligula eget ex congue, efficitur interdum ipsum tincidunt. Integer id sapien et nibh tristique viverra et a dui. Ut blandit pharetra consectetur. Sed scelerisque eget purus at tempus. Etiam sit amet tellus et eros semper tempor. Curabitur suscipit pulvinar enim at lobortis. Ut nisl augue, cursus vel hendrerit sed, posuere vel sapien. Proin hendrerit arcu velit, eu ultrices dui interdum eget. Vestibulum consectetur sodales enim a accumsan. In vitae tristique leo, a fringilla nisl.
+    </div>
+</div>
+<xmp>
+<div class="float-button bottom">
+  <div class="box">
+    <div class="action">
+      floating button
+    </div>
+    content ...
+  </div>
+</div>
+</xmp>
+
+
+<h1>Buttons</h1>
+<ul class="record_actions">
+  <li><a href="#" class="btn btn-submit">submit</a></li>
+  <li><a href="#" class="btn btn-save">save</a></li>
+  <li><a href="#" class="btn btn-create">create</a></li>
+  <li><a href="#" class="btn btn-new">new</a></li>
+  <li><a href="#" class="btn btn-duplicate">duplicate</a></li>
+  <li><a href="#" class="btn btn-not-duplicate">not-duplicate</a></li>
+  <li><a href="#" class="btn btn-reset">reset</a></li>
+  <li><a href="#" class="btn btn-delete">delete</a></li>
+  <li><a href="#" class="btn btn-danger">danger</a></li>
+  <li><a href="#" class="btn btn-remove">remove</a></li>
+  <li><a href="#" class="btn btn-unlink">unlink</a></li>
+  <li><a href="#" class="btn btn-action">action</a></li>
+  <li><a href="#" class="btn btn-edit">edit</a></li>
+  <li><a href="#" class="btn btn-update">update</a></li>
+  <li><a href="#" class="btn btn-show">show</a></li>
+  <li><a href="#" class="btn btn-view">view</a></li>
+  <li><a href="#" class="btn btn-misc">misc</a></li>
+  <li><a href="#" class="btn btn-cancel">cancel</a></li>
+  <li><a href="#" class="btn btn-choose">choose</a></li>
+  <li><a href="#" class="btn btn-notify">notify</a></li>
+  <li><a href="#" class="btn btn-tpchild">tpchild</a></li>
+  <li><a href="#" class="btn btn-chill-beige">my button</a></li>
+</ul>
+
+    <h2>Variants of <pre>record_actions</pre></h2>
+
+    <h3><pre>small</pre></h3>
+
+    <ul class="record_actions small">
+        <li><a href="#" class="btn btn-create"></a></li>
+    </ul>
+
+    <h3><pre>inline</pre></h3>
+
+    <div>
+        This is inline and small
+
+        <ul class="record_actions small inline">
+            <li><a href="#" class="btn btn-create"></a></li>
+        </ul>
+    </div>
+
+<xmp><a class="btn btn-submit">Text</a></xmp>
+Toutes les classes btn-* de bootstrap sont fonctionnelles
+</div>
+{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Dev/dev.assets.test1.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Dev/dev.assets.test1.html.twig
new file mode 100644
index 000000000..8b16da207
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Dev/dev.assets.test1.html.twig
@@ -0,0 +1,84 @@
+{% extends '@ChillMain/layout.html.twig' %}
+
+{% block title %}
+  SASS Assets Tests - page 1
+{% endblock %}
+
+{% block css %}
+<style media="screen">
+</style>
+{% endblock %}
+
+{% block content %}
+<div class="col-md-8">
+<h1>CSS Tests - page 1 : float-button</h1>
+
+<h2>1) avec des li</h2>
+<div class="float-button bottom debug">
+    <div class="box">
+        <div class="action">
+            <ul class="record_actions">
+                <li><button type="button" name="button">Annuler</button></li>
+                <li><button type="button" name="button">Voir</button></li>
+                <li><button type="button" name="button">Enregistrer</button></li>
+            </ul>
+        </div>
+        <ul class="list-content fa-ul">
+            <li><i class="fa fa-li fa-file-text-o"></i>Sed efficitur magna vel massa efficitur venenatis. Sed odio massa, scelerisque sit amet mauris eu, tristique dictum arcu. Sed posuere, elit eget cursus rhoncus, arcu ligula blandit nisi, in vulputate eros massa non risus.</li>
+            <li><i class="fa fa-li fa-map-marker"></i>
+                <div class="chill-entity entity-address my-3" data-v-8b2170ec="">
+                    <div class="address multiline" data-v-8b2170ec="">
+                        <p class="street" data-v-8b2170ec="">97, chemin Franck Julien, </p>
+                        <p class="postcode" data-v-8b2170ec="">1000 Bruxelles</p>
+                        <p class="country" data-v-8b2170ec="">Belgique</p>
+                    </div>
+                    <div class="address-more" data-v-8b2170ec="">
+                        <div data-v-8b2170ec="">
+                            <span class="corridor" data-v-8b2170ec="">
+                                <b data-v-8b2170ec="">Couloir</b>: 3
+                            </span>
+                        </div>
+                    </div>
+                </div>
+            </li>
+            <li><i class="fa fa-li fa-mobile"></i><a href="tel: +33 8 27 17 12 19">+33 8 27 17 12 19</a></li>
+            <li><i class="fa fa-li fa-envelope-o"></i><a href="mailto: gusikowski.yesenia@hotmail.com">gusikowski.yesenia@hotmail.com</a></li>
+        </ul>
+    </div>
+</div>
+<h2>2) avec des p</h2>
+
+<div class="float-button bottom debug">
+    <div class="box">
+        <div class="action">
+            <ul class="record_actions">
+                <li><button type="button" name="button">Annuler</button></li>
+                <li><button type="button" name="button">Voir</button></li>
+                <li><button type="button" name="button">Enregistrer</button></li>
+            </ul>
+        </div>
+        <p>Voir <a href="https://css-tricks.com/float-an-element-to-the-bottom-corner/">trick</a>.</p>
+        <p>Sed efficitur magna vel massa efficitur venenatis. Sed odio massa, scelerisque sit amet mauris eu, tristique dictum arcu. Sed posuere, elit eget cursus rhoncus, arcu ligula blandit nisi, in vulputate eros massa non risus. Proin lacinia, sapien in pharetra ultricies, justo urna fermentum lectus, non tempor ipsum leo a ante. Aenean porta, ipsum in fringilla hendrerit, nisi justo vestibulum ex, non lacinia risus felis vitae diam. Curabitur sem eros, consectetur a auctor vel, facilisis sit amet sem.</p>
+        <p>Aenean finibus a nisl a scelerisque. Donec bibendum facilisis odio id euismod. Pellentesque luctus justo ligula, eget dictum ligula ultrices quis. Pellentesque at nunc est. Aenean luctus, tortor in lacinia porta, ex nisl dignissim magna, non vehicula elit risus at elit. Suspendisse in velit non augue egestas laoreet. Etiam blandit lacus at semper aliquam. Integer leo nunc, condimentum sagittis accumsan sit amet, consectetur vel massa. Aenean convallis nibh vel augue ullamcorper tempus. Integer eu laoreet sapien.</p>
+    </div>
+</div>
+
+<h2>3) avec des div</h2>
+<div class="float-button bottom debug">
+    <div class="box">
+        <div class="action">
+            <ul class="record_actions">
+                <li><button type="button" name="button">Annuler</button></li>
+                <li><button type="button" name="button">Voir</button></li>
+                <li><button type="button" name="button">Enregistrer</button></li>
+            </ul>
+        </div>
+        <div>Voir <a href="https://css-tricks.com/float-an-element-to-the-bottom-corner/">trick</a>.</div>
+        <div>Sed efficitur magna vel massa efficitur venenatis. Sed odio massa, scelerisque sit amet mauris eu, tristique dictum arcu. Sed posuere, elit eget cursus rhoncus, arcu ligula blandit nisi, in vulputate eros massa non risus. Proin lacinia, sapien in pharetra ultricies, justo urna fermentum lectus, non tempor ipsum leo a ante. Aenean porta, ipsum in fringilla hendrerit, nisi justo vestibulum ex, non lacinia risus felis vitae diam.
+            <a href="#">Curabitur</a> sem eros, consectetur a auctor vel, facilisis sit amet sem.</div>
+        <div>Aenean finibus a nisl a scelerisque. Donec bibendum facilisis odio id euismod. Pellentesque luctus justo ligula, eget dictum ligula ultrices quis. Pellentesque at nunc est. Aenean luctus, tortor in lacinia porta, ex nisl dignissim magna, non vehicula elit risus at elit. Suspendisse in velit non augue egestas laoreet. Etiam blandit lacus at semper aliquam. Integer leo nunc, condimentum sagittis accumsan sit amet, consectetur vel massa. Aenean convallis nibh vel augue ullamcorper tempus. Integer eu laoreet sapien.</div>
+    </div>
+</div>
+
+</div>
+{% endblock %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Dev/dev.assets.test2.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Dev/dev.assets.test2.html.twig
new file mode 100644
index 000000000..712ba3eef
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Dev/dev.assets.test2.html.twig
@@ -0,0 +1,78 @@
+{% extends '@ChillMain/layout.html.twig' %}
+
+{% block title %}
+  SASS Assets Tests - page 2
+{% endblock %}
+
+{% block css %}
+{% endblock %}
+
+{% block content %}
+<div class="col-md-10">
+<h1>CSS Tests - page 2: grid layout</h1>
+
+<h2>1) mgrid 1-2: avec grid-column et grid-row</h2>
+
+<div class="mgrid debug">
+  <div class="area1">
+    Nam rhoncus tristique ligula, tincidunt iaculis augue tincidunt ac. Proin fermentum mauris quam, ut suscipit nisl auctor at. Ut vestibulum ligula eget ex congue, efficitur interdum ipsum tincidunt. Integer id sapien et nibh tristique viverra et a dui. Ut blandit pharetra consectetur. Sed scelerisque eget purus at tempus. Etiam sit amet tellus et eros semper tempor. Curabitur suscipit pulvinar enim at lobortis. Ut nisl augue, cursus vel hendrerit sed, posuere vel sapien. Proin hendrerit arcu velit, eu ultrices dui interdum eget. Vestibulum consectetur sodales enim a accumsan. In vitae tristique leo, a fringilla nisl.
+  </div>
+  <div class="area2">
+    <ul class="record_actions">
+      <li><button type="button" name="button">Annuler</button></li>
+      <li><button type="button" name="button">Voir</button></li>
+      <li><button type="button" name="button">Enregistrer</button></li>
+    </ul>
+  </div>
+</div>
+
+<h2>2) lgrid 3-4: avec grid-template-areas</h2>
+
+<div class="lgrid debug">
+  <div class="area3">
+    <i>La zone qu'on crée avec les noms doit être rectangulaires. Actuellement, il n'existe pas de méthode pour créer une zone avec une forme de L (bien que la spécification indique qu'une prochaine version pourrait couvrir cette fonctionnalité).
+    [...] Si des zones ne sont pas rectangulaires, cela sera également considéré comme invalide.</i>
+    Voir sur MDN: <a target="_blank" href="https://developer.mozilla.org/fr/docs/Web/CSS/CSS_Grid_Layout/Grid_Template_Areas#occuper_plusieurs_cellules">Définir des zones sur une grille</a>
+
+  </div>
+  <div class="area4">
+    <ul class="record_actions">
+      <li><button type="button" name="button">Annuler</button></li>
+      <li><button type="button" name="button">Voir</button></li>
+      <li><button type="button" name="button">Enregistrer</button></li>
+    </ul>
+  </div>
+</div>
+
+<h2>3) cgrid 5-6-7-8: avec masonry</h2>
+<p>Expérimental: dans FF <i>about:config</i>, il faut mettre <i>layout.css.grid-template-masonry-value.enabled = true</i></p>
+
+<div class="cgrid debug">
+  <div class="item">
+    1 Integer id sapien et nibh tristique viverra et a dui. Ut blandit pharetra consectetur. Sed scelerisque eget purus at tempus. Etiam sit amet tellus et eros semper tempor. Curabitur suscipit pulvinar enim at lobortis. Ut nisl augue, cursus vel hendrerit sed, posuere vel sapien. Proin hendrerit arcu velit, eu ultrices dui interdum eget. Vestibulum consectetur sodales enim a accumsan. In vitae tristique leo, a fringilla nisl.
+  </div>
+  <div class="item">
+    2 Sed scelerisque eget purus at tempus. Etiam sit amet tellus et eros semper tempor. Curabitur suscipit pulvinar enim at lobortis. Ut nisl augue, cursus vel hendrerit sed, posuere vel sapien. Proin hendrerit arcu velit, eu ultrices dui interdum eget. Vestibulum consectetur sodales enim a accumsan. In vitae tristique leo, a fringilla nisl.
+  </div>
+  <div class="item">
+    3 Curabitur suscipit pulvinar enim at lobortis. Ut nisl augue, cursus vel hendrerit sed, posuere vel sapien. Proin hendrerit arcu velit, eu ultrices dui interdum eget. Vestibulum consectetur sodales enim a accumsan. In vitae tristique leo, a fringilla nisl.
+  </div>
+  <div class="item">
+    4 Proin hendrerit arcu velit, eu ultrices dui interdum eget. Vestibulum consectetur sodales enim a accumsan. In vitae tristique leo, a fringilla nisl.
+  </div>
+  <div class="item">
+    5 Proin hendrerit arcu velit, eu ultrices dui interdum eget. Vestibulum consectetur sodales enim a accumsan.
+  </div>
+  <div class="item">
+    6 Proin hendrerit arcu velit, eu ultrices dui interdum eget. Vestibulum consectetur sodales enim.
+  </div>
+  <div class="item">
+    7 Proin hendrerit arcu velit, eu ultrices dui interdum eget.
+  </div>
+  <div class="item">
+    8 Eu ultrices dui interdum eget.
+  </div>
+</div>
+
+</div>
+{% endblock %}

From b863bd967d7dbc9a129529cef1a76fea00dbf128 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 30 May 2024 16:01:34 +0200
Subject: [PATCH 079/283] Update address list import to latest compiled
 addresses

The import of the address list has been upgraded to use the latest version of the compiled addresses from Belgian-best-address. In the AddressReferenceBEFromBestAddress class, the RELEASE constant has been updated to point to the v1.1.1 tag.
---
 .changes/unreleased/Feature-20240530-160003.yaml            | 6 ++++++
 .../Service/Import/AddressReferenceBEFromBestAddress.php    | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 .changes/unreleased/Feature-20240530-160003.yaml

diff --git a/.changes/unreleased/Feature-20240530-160003.yaml b/.changes/unreleased/Feature-20240530-160003.yaml
new file mode 100644
index 000000000..6b6baedc5
--- /dev/null
+++ b/.changes/unreleased/Feature-20240530-160003.yaml
@@ -0,0 +1,6 @@
+kind: Feature
+body: |
+  Upgrade import of address list to the last version of compiled addresses of belgian-best-address
+time: 2024-05-30T16:00:03.440767606+02:00
+custom:
+  Issue: ""
diff --git a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBEFromBestAddress.php b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBEFromBestAddress.php
index 25749aa89..f383bd799 100644
--- a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBEFromBestAddress.php
+++ b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBEFromBestAddress.php
@@ -18,7 +18,7 @@ use Symfony\Contracts\HttpClient\HttpClientInterface;
 
 class AddressReferenceBEFromBestAddress
 {
-    private const RELEASE = 'https://gitea.champs-libres.be/api/v1/repos/Chill-project/belgian-bestaddresses-transform/releases/tags/v1.0.0';
+    private const RELEASE = 'https://gitea.champs-libres.be/api/v1/repos/Chill-project/belgian-bestaddresses-transform/releases/tags/v1.1.1';
 
     public function __construct(private readonly HttpClientInterface $client, private readonly AddressReferenceBaseImporter $baseImporter, private readonly AddressToReferenceMatcher $addressToReferenceMatcher) {}
 

From e6202a2e341906d417c2e5ecefadc225fef52339 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 30 May 2024 16:06:34 +0200
Subject: [PATCH 080/283] Remove unnecessary fields and methods from Ticket
 entity

The "updatedAt" field and "getUpdatedAt" method, as well as the "createdBy" field and the "getCreatedBy" method have been removed from the Ticket entity. These fields and related methods were not necessary and their removal simplifies the entity structure.
---
 .../ChillTicketBundle/src/Entity/Ticket.php      | 16 ----------------
 1 file changed, 16 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php b/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php
index 689f34e87..e70447503 100644
--- a/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php
+++ b/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php
@@ -69,12 +69,6 @@ class Ticket implements TrackCreationInterface, TrackUpdateInterface
     #[ORM\OneToMany(targetEntity: PersonHistory::class, mappedBy: 'ticket')]
     private Collection $personHistories;
 
-    #[ORM\ManyToOne(targetEntity: User::class)]
-    #[ORM\JoinColumn(nullable: true)]
-    private ?User $updatedBy = null;
-
-    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::DATETIME_IMMUTABLE, nullable: true)]
-    private ?\DateTimeImmutable $createdAt = null;
 
     public function __construct()
     {
@@ -218,14 +212,4 @@ class Ticket implements TrackCreationInterface, TrackUpdateInterface
     {
         return $this->addresseeHistory;
     }
-
-    public function getCreatedAt(): \DateTimeImmutable
-    {
-        return $this->createdAt;
-    }
-
-    public function getUpdatedBy(): ?User
-    {
-        return $this->updatedBy;
-    }
 }

From 50025044d34238e61a0c3209847b9734fbfe6f35 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 31 May 2024 12:31:44 +0200
Subject: [PATCH 081/283] Add UserGroupRender and Interface for UserGroup
 templating

A new UserGroupRender class was added to manage the templating logic for UserGroup entities. The UserGroupRenderInterface was also created, extending the ChillEntityRenderInterface. Additionally, a Twig template for rendering user groups was added.
---
 .../views/Entity/user_group.html.twig         |  1 +
 .../Templating/Entity/UserGroupRender.php     | 38 +++++++++++++++++++
 .../Entity/UserGroupRenderInterface.php       | 14 +++++++
 .../config/services/templating.yaml           |  4 ++
 4 files changed, 57 insertions(+)
 create mode 100644 src/Bundle/ChillMainBundle/Resources/views/Entity/user_group.html.twig
 create mode 100644 src/Bundle/ChillMainBundle/Templating/Entity/UserGroupRender.php
 create mode 100644 src/Bundle/ChillMainBundle/Templating/Entity/UserGroupRenderInterface.php

diff --git a/src/Bundle/ChillMainBundle/Resources/views/Entity/user_group.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Entity/user_group.html.twig
new file mode 100644
index 000000000..8504a88dd
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Entity/user_group.html.twig
@@ -0,0 +1 @@
+<span class="badge" style="color: {{ user_group.foregroundColor }}; background-color: {{  user_group.backgroundColor }};">{{ user_group.label|localize_translatable_string }}</span>
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/UserGroupRender.php b/src/Bundle/ChillMainBundle/Templating/Entity/UserGroupRender.php
new file mode 100644
index 000000000..b63fca8cf
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/UserGroupRender.php
@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Templating\Entity;
+
+use Chill\MainBundle\Entity\UserGroup;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Twig\Environment;
+
+final readonly class UserGroupRender implements UserGroupRenderInterface
+{
+    public function __construct(private TranslatableStringHelperInterface $translatableStringHelper, private Environment $environment) {}
+
+    public function renderBox($entity, array $options): string
+    {
+        /* @var $entity UserGroup */
+        return $this->environment->render('@ChillMain/Entity/user_group.html.twig', ['user_group' => $entity]);
+    }
+
+    public function renderString($entity, array $options): string
+    {
+        /* @var $entity UserGroup */
+        return $this->translatableStringHelper->localize($entity->getLabel());
+    }
+
+    public function supports(object $entity, array $options): bool
+    {
+        return $entity instanceof UserGroup;
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/UserGroupRenderInterface.php b/src/Bundle/ChillMainBundle/Templating/Entity/UserGroupRenderInterface.php
new file mode 100644
index 000000000..7ebf70028
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/UserGroupRenderInterface.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Templating\Entity;
+
+interface UserGroupRenderInterface extends ChillEntityRenderInterface {}
diff --git a/src/Bundle/ChillMainBundle/config/services/templating.yaml b/src/Bundle/ChillMainBundle/config/services/templating.yaml
index 0baa91b69..015b074bc 100644
--- a/src/Bundle/ChillMainBundle/config/services/templating.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/templating.yaml
@@ -51,6 +51,10 @@ services:
 
     Chill\MainBundle\Templating\Entity\UserRender: ~
 
+    Chill\MainBundle\Templating\Entity\UserGroupRender: ~
+    Chill\MainBundle\Templating\Entity\UserGroupRenderInterface:
+        alias: Chill\MainBundle\Templating\Entity\UserGroupRender
+
     Chill\MainBundle\Templating\Listing\:
         resource: './../../Templating/Listing'
 

From 26dfa9b0280b787ba6925ed831817349a3eee913 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 31 May 2024 12:32:01 +0200
Subject: [PATCH 082/283] Add ticket listing and related enhancements

Added a new functionality for listing tickets with the ability for the user to order the list. A method was added to the User class to identify if an object is an instance of User. Similarly, a method was added to the UserGroup class. User.php, UserGroup.php, TicketRepository.php, and TicketRepositoryInterface.php were updated. A new TicketListController, MotiveRepository, and SectionMenuBuilder were created. Translations were included, and services.yaml was updated.
---
 src/Bundle/ChillMainBundle/Entity/User.php    | 10 ++
 .../ChillMainBundle/Entity/UserGroup.php      | 12 +++
 .../src/Controller/TicketListController.php   | 84 ++++++++++++++++
 .../src/Menu/SectionMenuBuilder.php           | 29 ++++++
 .../src/Repository/MotiveRepository.php       | 27 ++++++
 .../src/Repository/TicketRepository.php       | 10 +-
 .../Repository/TicketRepositoryInterface.php  |  5 +
 .../src/Resources/views/Ticket/list.html.twig | 97 +++++++++++++++++++
 .../src/config/services.yaml                  |  3 +
 .../src/translations/messages.fr.yml          |  9 ++
 10 files changed, 285 insertions(+), 1 deletion(-)
 create mode 100644 src/Bundle/ChillTicketBundle/src/Controller/TicketListController.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Menu/SectionMenuBuilder.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Repository/MotiveRepository.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/list.html.twig
 create mode 100644 src/Bundle/ChillTicketBundle/src/translations/messages.fr.yml

diff --git a/src/Bundle/ChillMainBundle/Entity/User.php b/src/Bundle/ChillMainBundle/Entity/User.php
index d00b241b2..1c56ccf71 100644
--- a/src/Bundle/ChillMainBundle/Entity/User.php
+++ b/src/Bundle/ChillMainBundle/Entity/User.php
@@ -608,4 +608,14 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter
 
         return $this;
     }
+
+    /**
+     * Check if the current object is an instance of User.
+     *
+     * @return bool returns true if the current object is an instance of User, false otherwise
+     */
+    public function isUser(): bool
+    {
+        return true;
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Entity/UserGroup.php b/src/Bundle/ChillMainBundle/Entity/UserGroup.php
index b5f3265ed..03da74326 100644
--- a/src/Bundle/ChillMainBundle/Entity/UserGroup.php
+++ b/src/Bundle/ChillMainBundle/Entity/UserGroup.php
@@ -136,4 +136,16 @@ class UserGroup
 
         return $this;
     }
+
+    /**
+     * Checks if the current object is an instance of the UserGroup class.
+     *
+     * In use in twig template, to discriminate when there an object can be polymorphic.
+     *
+     * @return bool returns true if the current object is an instance of UserGroup, false otherwise
+     */
+    public function isUserGroup(): bool
+    {
+        return true;
+    }
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Controller/TicketListController.php b/src/Bundle/ChillTicketBundle/src/Controller/TicketListController.php
new file mode 100644
index 000000000..ab335f108
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Controller/TicketListController.php
@@ -0,0 +1,84 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Controller;
+
+use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
+use Chill\MainBundle\Templating\Listing\FilterOrderHelperFactory;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\TicketBundle\Entity\Motive;
+use Chill\TicketBundle\Repository\MotiveRepository;
+use Chill\TicketBundle\Repository\TicketRepositoryInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Security;
+use Twig\Environment;
+use Twig\Error\LoaderError;
+use Twig\Error\RuntimeError;
+use Twig\Error\SyntaxError;
+
+final readonly class TicketListController
+{
+    public function __construct(
+        private Security $security,
+        private TicketRepositoryInterface $ticketRepository,
+        private Environment $twig,
+        private FilterOrderHelperFactory $filterOrderHelperFactory,
+        // private MotiveRepository $motiveRepository,
+        // private TranslatableStringHelperInterface $translatableStringHelper,
+    ) {}
+
+    /**
+     * @throws RuntimeError
+     * @throws SyntaxError
+     * @throws LoaderError
+     */
+    #[Route('/{_locale}/ticket/ticket/list', name: 'chill_ticket_ticket_list')]
+    public function __invoke(Request $request): Response
+    {
+        if (!$this->security->isGranted('ROLE_USER')) {
+            throw new AccessDeniedHttpException('only user can access this page');
+        }
+
+        $filter = $this->buildFilter();
+
+        $tickets = $this->ticketRepository->findAllOrdered();
+
+        return new Response(
+            $this->twig->render('@ChillTicket/Ticket/list.html.twig', [
+                'tickets' => $tickets,
+                'filter' => $filter,
+            ])
+        );
+    }
+
+    private function buildFilter(): FilterOrderHelper
+    {
+        // $motives = $this->motiveRepository->findAll();
+
+        return $this->filterOrderHelperFactory
+            ->create(__CLASS__)
+            ->addSingleCheckbox('to_me', 'chill_ticket.list.filter.to_me')
+            ->addSingleCheckbox('in_alert', 'chill_ticket.list.filter.in_alert')
+            ->addDateRange('created_between', 'chill_ticket.list.filter.created_between')
+            /*
+            ->addEntityChoice('by_motive', 'chill_ticket.list.filter.by_motive', Motive::class, $motives, [
+                'choice_label' => fn (Motive $motive) => $this->translatableStringHelper->localize($motive->getLabel()),
+                'expanded' => true,
+                'multiple' => true,
+                'attr' => ['class' => 'select2'],
+            ])
+            */
+            ->build();
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Menu/SectionMenuBuilder.php b/src/Bundle/ChillTicketBundle/src/Menu/SectionMenuBuilder.php
new file mode 100644
index 000000000..554aacc77
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Menu/SectionMenuBuilder.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Menu;
+
+use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Knp\Menu\MenuItem;
+
+class SectionMenuBuilder implements LocalMenuBuilderInterface
+{
+    public function buildMenu($menuId, MenuItem $menu, array $parameters)
+    {
+        $menu->addChild('Tickets', ['route' => 'chill_ticket_ticket_list'])
+            ->setExtras(['order' => 250]);
+    }
+
+    public static function getMenuIds(): array
+    {
+        return ['section'];
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Repository/MotiveRepository.php b/src/Bundle/ChillTicketBundle/src/Repository/MotiveRepository.php
new file mode 100644
index 000000000..0c1174a59
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Repository/MotiveRepository.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Repository;
+
+use Chill\TicketBundle\Entity\Motive;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
+
+/**
+ * @template-extends ServiceEntityRepository<Motive>
+ */
+class MotiveRepository extends ServiceEntityRepository
+{
+    public function __construct(ManagerRegistry $registry)
+    {
+        parent::__construct($registry, Motive::class);
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Repository/TicketRepository.php b/src/Bundle/ChillTicketBundle/src/Repository/TicketRepository.php
index d4301585a..d68598510 100644
--- a/src/Bundle/ChillTicketBundle/src/Repository/TicketRepository.php
+++ b/src/Bundle/ChillTicketBundle/src/Repository/TicketRepository.php
@@ -19,7 +19,7 @@ final readonly class TicketRepository implements TicketRepositoryInterface
 {
     private ObjectRepository $repository;
 
-    public function __construct(EntityManagerInterface $objectManager)
+    public function __construct(private EntityManagerInterface $objectManager)
     {
         $this->repository = $objectManager->getRepository($this->getClassName());
     }
@@ -34,6 +34,14 @@ final readonly class TicketRepository implements TicketRepositoryInterface
         return $this->repository->findAll();
     }
 
+    /**
+     * @return list<Ticket>
+     */
+    public function findAllOrdered(): array
+    {
+        return $this->objectManager->createQuery('SELECT t FROM '.$this->getClassName().' t ORDER BY t.id DESC')->getResult();
+    }
+
     public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
     {
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
diff --git a/src/Bundle/ChillTicketBundle/src/Repository/TicketRepositoryInterface.php b/src/Bundle/ChillTicketBundle/src/Repository/TicketRepositoryInterface.php
index 0b2cb4d66..9dc713e72 100644
--- a/src/Bundle/ChillTicketBundle/src/Repository/TicketRepositoryInterface.php
+++ b/src/Bundle/ChillTicketBundle/src/Repository/TicketRepositoryInterface.php
@@ -20,4 +20,9 @@ use Doctrine\Persistence\ObjectRepository;
 interface TicketRepositoryInterface extends ObjectRepository
 {
     public function findOneByExternalRef(string $extId): ?Ticket;
+
+    /**
+     * @return list<Ticket>
+     */
+    public function findAllOrdered(): array;
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/list.html.twig b/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/list.html.twig
new file mode 100644
index 000000000..6d25c5834
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/list.html.twig
@@ -0,0 +1,97 @@
+{% extends '@ChillMain/layout.html.twig' %}
+
+{% block title 'chill_ticket.list.title'|trans %}
+
+{% block content %}
+    <h1>{{ block('title') }}</h1>
+
+    {{ filter|chill_render_filter_order_helper }}
+
+    {% if tickets|length == 0 %}
+        <p class="chill-no-data-statement">{{ chill_ticket.list.no_tickets }}</p>
+    {% else %}
+        <div class="flex-table">
+            {% for ticket in tickets %}
+                <div class="item-bloc">
+                    <div class="item-row">
+                        <div class="wrap-header">
+                            <div class="wh-row">
+                                <div class="wh-col">
+                                    {% if ticket.motive is not null %}
+                                        <span class="h2" style="color: var(--bs-chill-blue); font-variant: all-small-caps">
+                                            {{ ticket.motive.label|localize_translatable_string }}
+                                        </span>
+                                    {% else %}
+                                        <span class="h3" style="color: var(--bs-chill-blue); font-style: italic">Sans motif</span>
+                                    {% endif %}
+                                </div>
+                                <div class="wh-col">
+                                    <p style="font-size: 1.5rem;"><span class="badge text-bg-chill-green text-white">Ouvert</span></p>
+                                </div>
+                            </div>
+                            <div class="wh-row">
+                                <div class="wh-col">
+                                    #{{ ticket.id }}
+                                </div>
+                                <div class="wh-col">
+                                    {% if ticket.createdAt is not null %}
+                                        <span title="{{ ticket.createdAt|format_datetime('long', 'long') }}" style="font-style: italic;">{{ ticket.createdAt|ago|capitalize }}</span>
+                                    {% endif %}
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                    {% if ticket.persons|length > 0 or ticket.currentAddressee|length > 0 %}
+                        <div class="item-row separator">
+                            <div class="wrap-list">
+                                {% if ticket.persons|length > 0 %}
+                                    <div class="wl-row">
+                                        <div class="wl-col title"><h3 class="mb-2">Patient concerné</h3></div>
+                                        <div class="wl-col list">
+                                            {% for p in ticket.persons %}
+                                                {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
+                                                    targetEntity: { name: 'person', id: p.id },
+                                                    action: 'show',
+                                                    displayBadge: true,
+                                                    buttonText: p|chill_entity_render_string,
+                                                    isDead: p.deathdate is not null
+                                                } %}
+                                            {% endfor %}
+                                        </div>
+                                    </div>
+                                {% endif %}
+                                {% if ticket.currentAddressee|length > 0 %}
+                                    <div class="wl-row">
+                                        <div class="wl-col title"><h3 class="mb-2">Destinataires</h3></div>
+                                        <div class="wl-col list">
+                                            {% for d in ticket.currentAddressee %}
+                                                {% if d.isUser is defined and d.isUser %}
+                                                    {{ d|chill_entity_render_box }}
+                                                {% elseif d.isUserGroup is defined and d.isUserGroup %}
+                                                    {{ d|chill_entity_render_box }}
+                                                {% endif %}
+                                            {% endfor %}
+                                        </div>
+                                    </div>
+                                {% endif %}
+                            </div>
+                        </div>
+                    {% endif %}
+                    <div class="item-row separator">
+                        <ul class="record_actions">
+                            <li>
+                                <a class="btn btn-update" href="{{ chill_path_add_return_path('chill_ticket_ticket_edit', {'id': ticket.id}) }}"></a>
+                            </li>
+                        </ul>
+                    </div>
+                </div>
+            {% endfor %}
+        </div>
+    {% endif %}
+
+    <ul class="record_actions sticky-form-buttons">
+        <li>
+            <a href="{{ chill_path_add_return_path('chill_ticket_createticket__invoke') }}" class="btn btn-create">{{ 'Create'|trans }}</a>
+        </li>
+    </ul>
+{% endblock %}
diff --git a/src/Bundle/ChillTicketBundle/src/config/services.yaml b/src/Bundle/ChillTicketBundle/src/config/services.yaml
index 35bdf54c9..331e03898 100644
--- a/src/Bundle/ChillTicketBundle/src/config/services.yaml
+++ b/src/Bundle/ChillTicketBundle/src/config/services.yaml
@@ -17,5 +17,8 @@ services:
     Chill\TicketBundle\Serializer\:
         resource: '../Serializer/'
 
+    Chill\TicketBundle\Menu\:
+        resource: '../Menu/'
+
     Chill\TicketBundle\DataFixtures\:
         resource: '../DataFixtures/'
diff --git a/src/Bundle/ChillTicketBundle/src/translations/messages.fr.yml b/src/Bundle/ChillTicketBundle/src/translations/messages.fr.yml
new file mode 100644
index 000000000..3cba033a1
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/translations/messages.fr.yml
@@ -0,0 +1,9 @@
+chill_ticket:
+    list:
+        title: Tickets
+        filter:
+            to_me: Tickets qui me sont attribués
+            in_alert: Tickets en alerte (délai de résolution dépassé)
+            created_between: Créés entre
+
+

From efe8a67697f31897f5c44380fcf7bdad8384af5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 31 May 2024 21:32:39 +0200
Subject: [PATCH 083/283] Upgrade CKEditor and refactor configuration with use
 of typescript

---
 .../unreleased/Feature-20240531-190242.yaml   |  6 ++++++
 package.json                                  | 13 ++++++------
 .../ckeditor5/{index.js => editor_config.ts}  | 20 +------------------
 .../public/module/ckeditor5/index.ts          | 15 ++++++++++++++
 .../ChillMainBundle/chill.webpack.config.js   |  6 +++---
 .../AccompanyingCourse/components/Comment.vue |  2 +-
 .../components/Resources/WriteComment.vue     |  2 +-
 .../vuejs/AccompanyingCourseWorkEdit/App.vue  |  2 +-
 .../components/FormEvaluation.vue             |  2 +-
 .../components/MemberDetails.vue              |  2 +-
 .../components/PersonComment.vue              |  2 +-
 .../public/vuejs/_js/{i18n.js => i18n.ts}     |  2 +-
 12 files changed, 39 insertions(+), 35 deletions(-)
 create mode 100644 .changes/unreleased/Feature-20240531-190242.yaml
 rename src/Bundle/ChillMainBundle/Resources/public/module/ckeditor5/{index.js => editor_config.ts} (72%)
 create mode 100644 src/Bundle/ChillMainBundle/Resources/public/module/ckeditor5/index.ts
 rename src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/{i18n.js => i18n.ts} (96%)

diff --git a/.changes/unreleased/Feature-20240531-190242.yaml b/.changes/unreleased/Feature-20240531-190242.yaml
new file mode 100644
index 000000000..083298a26
--- /dev/null
+++ b/.changes/unreleased/Feature-20240531-190242.yaml
@@ -0,0 +1,6 @@
+kind: Feature
+body: |
+  Upgrade CKEditor and refactor configuration with use of typescript
+time: 2024-05-31T19:02:42.776662753+02:00
+custom:
+  Issue: ""
diff --git a/package.json b/package.json
index 634cee4b6..52b359596 100644
--- a/package.json
+++ b/package.json
@@ -6,12 +6,13 @@
     "@apidevtools/swagger-cli": "^4.0.4",
     "@babel/core": "^7.20.5",
     "@babel/preset-env": "^7.20.2",
-    "@ckeditor/ckeditor5-build-classic": "^35.3.2",
-    "@ckeditor/ckeditor5-dev-utils": "^31.1.13",
+    "@ckeditor/ckeditor5-build-classic": "^41.4.2",
+    "@ckeditor/ckeditor5-dev-utils": "^40.2.0",
     "@ckeditor/ckeditor5-dev-webpack-plugin": "^31.1.13",
-    "@ckeditor/ckeditor5-markdown-gfm": "^35.3.2",
-    "@ckeditor/ckeditor5-theme-lark": "^35.3.2",
-    "@ckeditor/ckeditor5-vue": "^4.0.1",
+    "@ckeditor/ckeditor5-dev-translations": "^40.2.0",
+    "@ckeditor/ckeditor5-markdown-gfm": "^41.4.2",
+    "@ckeditor/ckeditor5-theme-lark": "^41.4.2",
+    "@ckeditor/ckeditor5-vue": "^5.1.0",
     "@symfony/webpack-encore": "^4.1.0",
     "@tsconfig/node14": "^1.0.1",
       "@types/dompurify": "^3.0.5",
@@ -31,7 +32,7 @@
     "select2-bootstrap-theme": "0.1.0-beta.10",
     "style-loader": "^3.3.1",
     "ts-loader": "^9.3.1",
-    "typescript": "^4.7.2",
+    "typescript": "^5.4.5",
     "vue-loader": "^17.0.0",
     "webpack": "^5.75.0",
     "webpack-cli": "^5.0.1"
diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/ckeditor5/index.js b/src/Bundle/ChillMainBundle/Resources/public/module/ckeditor5/editor_config.ts
similarity index 72%
rename from src/Bundle/ChillMainBundle/Resources/public/module/ckeditor5/index.js
rename to src/Bundle/ChillMainBundle/Resources/public/module/ckeditor5/editor_config.ts
index ddbc4afa7..7a72c0ffa 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/module/ckeditor5/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/ckeditor5/editor_config.ts
@@ -39,23 +39,5 @@ ClassicEditor.defaultConfig = {
             'redo'
         ]
     },
-    language: 'fr'
+    language: 'fr',
 };
-
-
-let Fields = [];
-Fields.push.apply(Fields, document.querySelectorAll('textarea[ckeditor]'));
-// enable for custom fields
-//Fields.push.apply(Fields, document.querySelectorAll('.cf-fields textarea'));
-
-Fields.forEach(function(field) {
-    ClassicEditor
-        .create( field )
-        .then( editor => {
-            //console.log( 'CkEditor was initialized', editor );
-        })
-        .catch( error => {
-            console.error( error.stack );
-        })
-    ;
-});
diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/ckeditor5/index.ts b/src/Bundle/ChillMainBundle/Resources/public/module/ckeditor5/index.ts
new file mode 100644
index 000000000..ed07ce9db
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/ckeditor5/index.ts
@@ -0,0 +1,15 @@
+import ClassicEditor from "./editor_config";
+
+const ckeditorFields: NodeListOf<HTMLTextAreaElement> = document.querySelectorAll('textarea[ckeditor]');
+ckeditorFields.forEach((field: HTMLTextAreaElement): void => {
+    ClassicEditor
+        .create( field )
+        .then( editor => {
+            //console.log( 'CkEditor was initialized', editor );
+        })
+        .catch( error => {
+            console.error( error.stack );
+        })
+    ;
+});
+//Fields.push.apply(Fields, document.querySelectorAll('.cf-fields textarea'));
diff --git a/src/Bundle/ChillMainBundle/chill.webpack.config.js b/src/Bundle/ChillMainBundle/chill.webpack.config.js
index 66731c7a4..287e6ae89 100644
--- a/src/Bundle/ChillMainBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillMainBundle/chill.webpack.config.js
@@ -1,10 +1,10 @@
-const CKEditorWebpackPlugin = require( '@ckeditor/ckeditor5-dev-webpack-plugin' );
 const { styles } = require( '@ckeditor/ckeditor5-dev-utils' );
+const {CKEditorTranslationsPlugin} = require("@ckeditor/ckeditor5-dev-translations");
 
 buildCKEditor = function(encore)
 {
     encore
-        .addPlugin( new CKEditorWebpackPlugin( {
+        .addPlugin( new CKEditorTranslationsPlugin( {
             language: 'fr',
             addMainLanguageTranslationsToAllAssets: true,
             verbose: !encore.isProduction(),
@@ -65,7 +65,7 @@ module.exports = function(encore, entries)
     encore.addEntry('mod_collection', __dirname + '/Resources/public/module/collection/index.ts');
     encore.addEntry('mod_forkawesome', __dirname + '/Resources/public/module/forkawesome/index.js');
     encore.addEntry('mod_bootstrap', __dirname + '/Resources/public/module/bootstrap/index.js');
-    encore.addEntry('mod_ckeditor5', __dirname + '/Resources/public/module/ckeditor5/index.js');
+    encore.addEntry('mod_ckeditor5', __dirname + '/Resources/public/module/ckeditor5/index');
     encore.addEntry('mod_disablebuttons', __dirname + '/Resources/public/module/disable-buttons/index.js');
     encore.addEntry('mod_blur', __dirname + '/Resources/public/module/blur/index.js');
     encore.addEntry('mod_input_address', __dirname + '/Resources/public/vuejs/Address/mod_input_address_index.js');
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
index 8ae7dfff4..d6c438cd9 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
@@ -52,7 +52,7 @@
 
 <script>
 import CKEditor from '@ckeditor/ckeditor5-vue';
-import ClassicEditor from "ChillMainAssets/module/ckeditor5";
+import ClassicEditor from "../../../../../../ChillMainBundle/Resources/public/module/ckeditor5/editor_config";
 import { mapState } from "vuex";
 
 export default {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/WriteComment.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/WriteComment.vue
index d34531356..99b1fa88d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/WriteComment.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/WriteComment.vue
@@ -41,7 +41,7 @@
 import Modal from 'ChillMainAssets/vuejs/_components/Modal.vue';
 import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
 import CKEditor from '@ckeditor/ckeditor5-vue';
-import ClassicEditor from "ChillMainAssets/module/ckeditor5";
+import ClassicEditor from "ChillMainAssets/module/ckeditor5/editor_config";
 
 export default {
    name: "WriteComment",
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index 07b735dee..c0f5178fd 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -331,7 +331,7 @@
 import {mapState, mapGetters,} from 'vuex';
 import {dateToISO, ISOToDate, ISOToDatetime} from 'ChillMainAssets/chill/js/date';
 import CKEditor from '@ckeditor/ckeditor5-vue';
-import ClassicEditor from 'ChillMainAssets/module/ckeditor5/index.js';
+import ClassicEditor from 'ChillMainAssets/module/ckeditor5/editor_config';
 import AddResult from './components/AddResult.vue';
 import AddEvaluation from './components/AddEvaluation.vue';
 import AddPersons from 'ChillPersonAssets/vuejs/_components/AddPersons.vue';
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
index eedcf9a52..6fd5bc78f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
@@ -195,7 +195,7 @@
 <script>
 import {dateToISO, ISOToDate, ISOToDatetime} from 'ChillMainAssets/chill/js/date';
 import CKEditor from '@ckeditor/ckeditor5-vue';
-import ClassicEditor from 'ChillMainAssets/module/ckeditor5/index.js';
+import ClassicEditor from 'ChillMainAssets/module/ckeditor5/editor_config';
 import { mapGetters, mapState } from 'vuex';
 import PickTemplate from 'ChillDocGeneratorAssets/vuejs/_components/PickTemplate.vue';
 import {buildLink} from 'ChillDocGeneratorAssets/lib/document-generator';
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/MemberDetails.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/MemberDetails.vue
index 687fc7b9f..2258d8b77 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/MemberDetails.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/MemberDetails.vue
@@ -75,7 +75,7 @@ div.participation-details {
 import { mapGetters } from 'vuex';
 import PersonRenderBox from 'ChillPersonAssets/vuejs/_components/Entity/PersonRenderBox.vue';
 import CKEditor from '@ckeditor/ckeditor5-vue';
-import ClassicEditor from 'ChillMainAssets/module/ckeditor5/index.js';
+import ClassicEditor from 'ChillMainAssets/module/ckeditor5/editor_config';
 
 export default {
   name: 'MemberDetails',
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/PersonComment.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/PersonComment.vue
index 8f61a74d1..f29cb1d4b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/PersonComment.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/PersonComment.vue
@@ -10,7 +10,7 @@
 
 <script>
 import CKEditor from '@ckeditor/ckeditor5-vue';
-import ClassicEditor from "ChillMainAssets/module/ckeditor5";
+import ClassicEditor from "ChillMainAssets/module/ckeditor5/editor_config";
 
 export default {
   name: "PersonComment.vue",
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.ts
similarity index 96%
rename from src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js
rename to src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.ts
index e5f468494..96cc73e07 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.ts
@@ -15,7 +15,7 @@ const personMessages = {
       person: {
          firstname: "Prénom",
          lastname: "Nom",
-         born: (ctx) => {
+         born: (ctx: {gender: "man"|"woman"|"unknown"}) => {
           if (ctx.gender === 'man') {
             return 'Né le';
           } else if (ctx.gender === 'woman') {

From 76cec5b5a813e4cc1bd803bf3ceef5d892d5acb2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 31 May 2024 22:22:34 +0200
Subject: [PATCH 084/283] fix indentation

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 52b359596..3b9d4c70a 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
     "@ckeditor/ckeditor5-vue": "^5.1.0",
     "@symfony/webpack-encore": "^4.1.0",
     "@tsconfig/node14": "^1.0.1",
-      "@types/dompurify": "^3.0.5",
+    "@types/dompurify": "^3.0.5",
     "bindings": "^1.5.0",
     "bootstrap": "5.2.3",
     "chokidar": "^3.5.1",

From a9c0567ee126cffe72f908247d2a8d424cf5f8d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 31 May 2024 22:22:49 +0200
Subject: [PATCH 085/283] add script to run php-cs-fixer

---
 composer.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 7d19d456b..25b5cda97 100644
--- a/composer.json
+++ b/composer.json
@@ -151,6 +151,7 @@
     "scripts": {
         "auto-scripts": {
             "cache:clear": "symfony-cmd"
-        }
+        },
+        "php-cs-fixer": "php-cs-fixer fix --config=./.php-cs-fixer.dist.php --show-progress=none"
     }
 }

From d2a61ce69b0866de5ae280cacf13463bde5c35ce Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 31 May 2024 22:23:13 +0200
Subject: [PATCH 086/283] Add return path support for ticket creation and
 editing

This commit introduces support for a return path query parameter during ticket creation and editing operations. This enables a more user-friendly redirection after a form submission operation where the return path provides more context on the next page. The return path is now also considered in the Vue.js components, with necessary checks and validations. A 'Cancel' button has been added to the ActionToolbarComponent.vue where the return path exists.
---
 .../src/Controller/CreateTicketController.php |  7 ++++-
 .../ChillTicketBundle/src/Entity/Ticket.php   |  1 -
 .../components/ActionToolbarComponent.vue     | 27 +++++++++++++++++++
 .../components/AddCommentComponent.vue        |  2 +-
 4 files changed, 34 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Controller/CreateTicketController.php b/src/Bundle/ChillTicketBundle/src/Controller/CreateTicketController.php
index a3bdf31c8..8e47d3afa 100644
--- a/src/Bundle/ChillTicketBundle/src/Controller/CreateTicketController.php
+++ b/src/Bundle/ChillTicketBundle/src/Controller/CreateTicketController.php
@@ -63,8 +63,13 @@ final readonly class CreateTicketController
 
         $this->entityManager->flush();
 
+        $query = [];
+        if ($request->query->has('returnPath')) {
+            $query['returnPath'] = $request->query->get('returnPath');
+        }
+
         return new RedirectResponse(
-            $this->urlGenerator->generate('chill_ticket_ticket_edit', ['id' => $ticket->getId()])
+            $this->urlGenerator->generate('chill_ticket_ticket_edit', ['id' => $ticket->getId(), ...$query])
         );
     }
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php b/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php
index e70447503..04cfe828b 100644
--- a/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php
+++ b/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php
@@ -69,7 +69,6 @@ class Ticket implements TrackCreationInterface, TrackUpdateInterface
     #[ORM\OneToMany(targetEntity: PersonHistory::class, mappedBy: 'ticket')]
     private Collection $personHistories;
 
-
     public function __construct()
     {
         $this->addresseeHistory = new ArrayCollection();
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
index 9604caeec..10ec72a8f 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
@@ -47,6 +47,9 @@
         </div>
         <div class="footer-ticket-main">
             <ul class="nav nav-tabs justify-content-end">
+                <li v-if="hasReturnPath" class="nav-item p-2 go-back">
+                    <a :href="returnPath" class="btn btn-cancel">Annuler</a>
+                </li>
                 <li class="nav-item p-2">
                     <button
                         type="button"
@@ -157,6 +160,22 @@ export default defineComponent({
         );
         const users = computed(() => store.getters.getUsers as User[]);
 
+        const hasReturnPath = computed((): boolean =>  {
+            const params = new URL(document.location.toString()).searchParams;
+            return params.has('returnPath');
+        });
+
+        const returnPath = computed((): string => {
+            const params = new URL(document.location.toString()).searchParams;
+            const returnPath = params.get('returnPath');
+
+            if (null === returnPath) {
+                throw new Error("there isn't any returnPath, please check the existence before");
+            }
+
+            return returnPath;
+        })
+
         const motive = ref(
             ticket.value.currentMotive
                 ? ticket.value.currentMotive
@@ -217,6 +236,7 @@ export default defineComponent({
             alert("Sera disponible plus tard");
         }
 
+
         return {
             actionIcons: ref(store.getters.getActionIcons),
             activeTab,
@@ -229,12 +249,19 @@ export default defineComponent({
             content,
             submitAction,
             handleClick,
+            hasReturnPath,
+            returnPath,
         };
     },
 });
 </script>
 
 <style lang="scss" scoped>
+
+.go-back {
+    margin-right: auto;
+}
+
 .sticky-form-buttons {
     margin-top: 0px;
     background: none;
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddCommentComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddCommentComponent.vue
index 4e33d3c68..16dbf4bce 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddCommentComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddCommentComponent.vue
@@ -16,7 +16,7 @@
 import { defineComponent, ref, watch } from "vue";
 
 import CKEditor from "@ckeditor/ckeditor5-vue";
-import ClassicEditor from "../../../../../../../ChillMainBundle/Resources/public/module/ckeditor5";
+import ClassicEditor from "../../../../../../../ChillMainBundle/Resources/public/module/ckeditor5/editor_config";
 
 export default defineComponent({
     name: "AddCommentComponent",

From 498572b96e9ceebd7a246abb50828a94441493f0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 31 May 2024 23:43:32 +0200
Subject: [PATCH 087/283] Refactor addressee history management

This commit refactors the management of addressees history in the ticketing system. Instead of individual addition and removal events for addressees, a new event 'addressees_state' is introduced to capture the state of addressees at any given point in the history. The structure and logic of normalized tickets have been adjusted accordingly.
---
 .../src/Resources/public/types.ts             | 11 ++-
 .../components/ActionToolbarComponent.vue     |  2 +-
 .../components/TicketHistoryListComponent.vue | 72 +++++++------------
 .../vuejs/TicketApp/store/modules/ticket.ts   |  3 +-
 .../Normalizer/TicketNormalizer.php           | 57 +++++++++++++++
 5 files changed, 95 insertions(+), 50 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
index 5ff90bc42..55607e2a4 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
@@ -64,13 +64,18 @@ export interface AddresseeHistory {
     updatedAt: DateTime|null,
 }
 
+export interface AddresseeState {
+    addressees: UserGroupOrUser[],
+}
+
 interface AddPersonEvent extends TicketHistory<"add_person", PersonHistory> {};
 interface AddCommentEvent extends TicketHistory<"add_comment", Comment> {};
 interface SetMotiveEvent extends TicketHistory<"set_motive", MotiveHistory> {};
-interface AddAddressee extends TicketHistory<"add_addressee", AddresseeHistory> {};
-interface RemoveAddressee extends TicketHistory<"remove_addressee", AddresseeHistory> {};
+//interface AddAddressee extends TicketHistory<"add_addressee", AddresseeHistory> {};
+//interface RemoveAddressee extends TicketHistory<"remove_addressee", AddresseeHistory> {};
+interface AddresseesStateEvent extends TicketHistory<"addressees_state", AddresseeState> {};
 
-type TicketHistoryLine = AddPersonEvent | AddCommentEvent | SetMotiveEvent | AddAddressee | RemoveAddressee;
+type TicketHistoryLine = AddPersonEvent | AddCommentEvent | SetMotiveEvent | /*AddAddressee | RemoveAddressee | */ AddresseesStateEvent;
 
 export interface Ticket {
     type: "ticket_ticket",
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
index 10ec72a8f..aa299ad26 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
@@ -100,7 +100,7 @@
                                 : (activeTab = 'add_addressee')
                         "
                     >
-                        <i :class="actionIcons['add_addressee']"></i>
+                        <i :class="actionIcons['addressees_state']"></i>
                         {{ $t("add_addressee.title") }}
                     </button>
                 </li>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
index e8b834f9d..512a1e5c5 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
@@ -4,51 +4,33 @@
         v-for="history_line in history"
         :key="history.indexOf(history_line)"
     >
-        <template v-if="!Array.isArray(history_line)">
-            <div class="card-header">
-                <i :class="`${actionIcons[history_line.event_type]} me-1`"></i>
-                <span class="fw-bold fst-italic mx-1">
-                    {{ formatDate(history_line.at) }}
-                </span>
-                <span class="badge bg-white text-black mx-1">
-                    {{ history_line.by.username }}
-                </span>
-            </div>
-            <div class="card-body row">
-                <ticket-history-person-component
-                    :personHistory="history_line.data"
-                    v-if="history_line.event_type == 'add_person'"
-                />
-                <ticket-history-motive-component
-                    :motiveHistory="history_line.data"
-                    v-else-if="history_line.event_type == 'set_motive'"
-                />
-                <ticket-history-comment-component
-                    :commentHistory="history_line.data"
-                    v-else-if="history_line.event_type == 'add_comment'"
-                />
-            </div>
-        </template>
-        <template v-else>
-            <div class="card-header">
-                <i class="fa fa-paper-plane me-1"></i>
-                <span class="fw-bold fst-italic mx-1">
-                    {{ formatDate(history_line[0].at) }}
-                </span>
-                <span class="badge bg-white text-black mx-1">
-                    {{ history_line[0].by.username }}
-                </span>
-            </div>
-            <div class="card-body row">
-                <ticket-history-addressee-component
-                    :addressees="
-                        history_line
-                            .map((line) => line.data)
-                            .map((data) => data.addressee)
-                    "
-                />
-            </div>
-        </template>
+        <div class="card-header">
+            <i :class="`${actionIcons[history_line.event_type]} me-1`"></i>
+            <span class="fw-bold fst-italic mx-1">
+                {{ formatDate(history_line.at) }}
+            </span>
+            <span class="badge bg-white text-black mx-1">
+                {{ history_line.by.username }}
+            </span>
+        </div>
+        <div class="card-body row">
+            <ticket-history-person-component
+                :personHistory="history_line.data"
+                v-if="history_line.event_type == 'add_person'"
+            />
+            <ticket-history-motive-component
+                :motiveHistory="history_line.data"
+                v-else-if="history_line.event_type == 'set_motive'"
+            />
+            <ticket-history-comment-component
+                :commentHistory="history_line.data"
+                v-else-if="history_line.event_type == 'add_comment'"
+            />
+            <ticket-history-addressee-component
+                :addressees="history_line.data.addressees"
+                v-else-if="history_line.event_type == 'addressees_state'"
+            />
+        </div>
     </div>
 </template>
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
index 375846c25..430c7b320 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
@@ -15,7 +15,8 @@ export const moduleTicket: Module<State, RootState> = {
             add_person: "fa fa-eyedropper",
             add_comment: "fa fa-comment",
             set_motive: "fa fa-paint-brush",
-            add_addressee: "fa fa-paper-plane",
+            //add_addressee: "fa fa-paper-plane",
+            addressees_state: "fa fa-paper-plane",
         },
         toto: "toto",
     }),
diff --git a/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php b/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
index 938ee2e9b..c505a835c 100644
--- a/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
+++ b/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
@@ -11,6 +11,8 @@ declare(strict_types=1);
 
 namespace Chill\TicketBundle\Serializer\Normalizer;
 
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Entity\UserGroup;
 use Chill\TicketBundle\Entity\AddresseeHistory;
 use Chill\TicketBundle\Entity\Comment;
 use Chill\TicketBundle\Entity\MotiveHistory;
@@ -82,6 +84,7 @@ final class TicketNormalizer implements NormalizerInterface, NormalizerAwareInte
                 ],
                 $ticket->getComments()->toArray(),
             ),
+            /*
             ...array_map(
                 fn (AddresseeHistory $history) => [
                     'event_type' => 'add_addressee',
@@ -100,6 +103,8 @@ final class TicketNormalizer implements NormalizerInterface, NormalizerAwareInte
                 ],
                 $ticket->getAddresseeHistories()->filter(fn (AddresseeHistory $history) => null !== $history->getEndDate())->toArray()
             ),
+            */
+            ...$this->addresseesStates($ticket),
         ];
 
         usort(
@@ -119,4 +124,56 @@ final class TicketNormalizer implements NormalizerInterface, NormalizerAwareInte
             $events
         );
     }
+
+    private function addresseesStates(Ticket $ticket): array
+    {
+        /** @var array{string, array{added: list<AddresseeHistory>, removed: list<AddresseeHistory>}} $changes */
+        $changes = [];
+        $dateFormat = 'Y-m-d-m-Y-H-i-s';
+
+        foreach ($ticket->getAddresseeHistories() as $history) {
+            $changes[$history->getStartDate()->format($dateFormat)]['added'][] = $history;
+        }
+        foreach ($ticket->getAddresseeHistories() as $history) {
+            if (null !== $history->getEndDate()) {
+                $changes[$history->getEndDate()->format($dateFormat)]['removed'][] = $history;
+            }
+        }
+
+        ksort($changes);
+
+        $currents = [];
+        $steps = [];
+        foreach ($changes as $change) {
+            $historiesAdded = $change['added'] ?? [];
+            $historiesRemoved = $change['removed'] ?? [];
+
+            if (0 < count($historiesAdded)) {
+                $at = $historiesAdded[0]->getStartDate();
+                $by = $historiesAdded[0]->getCreatedBy();
+            } elseif (0 < count($historiesRemoved)) {
+                $at = $historiesRemoved[0]->getStartDate();
+                $by = $historiesRemoved[0]->getRemovedBy();
+            } else {
+                throw new \LogicException('it should have at least one history');
+            }
+
+            $removed = array_map(fn (AddresseeHistory $history) => $history->getAddressee(), $historiesRemoved);
+            $currents = array_filter($currents, fn (User|UserGroup $a) => !in_array($a, $removed, true));
+            foreach ($historiesAdded as $history) {
+                $currents[] = $history->getAddressee();
+            }
+
+            $steps[] = [
+                'event_type' => 'addressees_state',
+                'at' => $at,
+                'by' => $by,
+                'data' => [
+                    'addressees' => array_values($currents),
+                ],
+            ];
+        }
+
+        return $steps;
+    }
 }

From ac4e2e5bf2da1411a2980babdd8d27685c97ad9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Sat, 1 Jun 2024 00:31:39 +0200
Subject: [PATCH 088/283] Update time calculations in BannerComponent and
 TicketNormalizer

Refactored BannerComponent to use an imported date function, improved time calculation logic, and enhanced code readability. Also, updated TicketNormalizer to properly normalize various datetime and user-related fields. A new date validation check has been added in the date utility file.
---
 .../Resources/public/chill/js/date.ts         |  4 ++++
 .../TicketApp/components/BannerComponent.vue  | 21 +++++++++++++------
 .../Normalizer/TicketNormalizer.php           |  6 ++++--
 3 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/js/date.ts b/src/Bundle/ChillMainBundle/Resources/public/chill/js/date.ts
index 8c087146a..9198f835e 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/js/date.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/js/date.ts
@@ -59,6 +59,10 @@ export const ISOToDatetime = (str: string|null): Date|null => {
         [hours, minutes, seconds] = time.split(':').map(s => parseInt(s));
     ;
 
+    if ('0000' === timezone) {
+        return new Date(Date.UTC(year, month-1, date, hours, minutes, seconds));
+    }
+
     return new Date(year, month-1, date, hours, minutes, seconds);
 }
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
index b03b10405..61b62eff9 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
@@ -79,6 +79,7 @@ import AddresseeComponent from "./AddresseeComponent.vue";
 
 // Types
 import { Ticket } from "../../../types";
+import {ISOToDatetime} from "../../../../../../../ChillMainBundle/Resources/public/chill/js/date";
 
 export default defineComponent({
     name: "BannerComponent",
@@ -95,14 +96,21 @@ export default defineComponent({
     setup(props) {
         const { t } = useI18n();
         const today = ref(new Date());
-        const createdAt = ref(props.ticket.createdAt as any);
+        const createdAt = ref(props.ticket.createdAt);
 
         setInterval(function () {
             today.value = new Date();
-        }, 1000);
+        }, 5000);
 
         const since = computed(() => {
-            const date = new Date(createdAt.value.date);
+            if (null === createdAt.value) {
+                return "";
+            }
+            const date = ISOToDatetime(createdAt.value.datetime);
+
+            if (null === date) {
+                return "";
+            }
 
             const timeDiff = Math.abs(today.value.getTime() - date.getTime());
             const daysDiff = Math.floor(timeDiff / (1000 * 3600 * 24));
@@ -115,11 +123,12 @@ export default defineComponent({
             const secondsDiff = Math.floor((timeDiff % (1000 * 60)) / 1000);
 
             if (daysDiff < 1 && hoursDiff < 1 && minutesDiff < 1) {
-                return `${t("banner.seconds", { count: secondsDiff })}`;
+                return `${t("banner.seconds", {count: secondsDiff})}`;
+            } else if (daysDiff < 1 && hoursDiff < 1) {
+                return `${t("banner.minutes", { count: minutesDiff })}`;
             } else if (daysDiff < 1) {
                 return `${t("banner.hours", { count: hoursDiff })}
-                ${t("banner.minutes", { count: minutesDiff })}
-                ${t("banner.seconds", { count: secondsDiff })}`;
+                ${t("banner.minutes", { count: minutesDiff })}`;
             } else {
                 return `${t("banner.days", { count: daysDiff })}, ${t(
                     "banner.hours",
diff --git a/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php b/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
index c505a835c..77dc3da26 100644
--- a/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
+++ b/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
@@ -44,8 +44,10 @@ final class TicketNormalizer implements NormalizerInterface, NormalizerAwareInte
             'currentInputs' => $this->normalizer->normalize($object->getCurrentInputs(), $format, ['groups' => 'read']),
             'currentMotive' => $this->normalizer->normalize($object->getMotive(), $format, ['groups' => 'read']),
             'history' => array_values($this->serializeHistory($object, $format, ['groups' => 'read'])),
-            'createdAt' => $object->getCreatedAt(),
-            'updatedBy' => $object->getUpdatedBy(),
+            'createdAt' => $this->normalizer->normalize($object->getCreatedAt(), $format, $context),
+            'updatedAt' => $this->normalizer->normalize($object->getUpdatedAt(), $format, $context),
+            'updatedBy' => $this->normalizer->normalize($object->getUpdatedBy(), $format, $context),
+            'createdBy' => $this->normalizer->normalize($object->getCreatedBy(), $format, $context),
         ];
     }
 

From 643028ffd6fbff243507833837f3d2a9f4ac7a9e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 3 Jun 2024 11:13:49 +0200
Subject: [PATCH 089/283] Update styles and markup for badges and ticket events

Updated the SCSS for badge components, including the introduction of a margin and specific font-weight for user-group badges. Additionally, changes have been made to the TicketApp store to comment out a specific condition. A few updates were made to the twig files in the ChillTicketBundle and ChillMainBundle to reflect these style changes.
---
 .../Resources/views/Entity/user_group.html.twig            | 2 +-
 .../Resources/public/chill/scss/badge.scss                 | 7 +++++++
 .../public/vuejs/TicketApp/store/modules/ticket.ts         | 3 ++-
 .../src/Resources/views/Ticket/list.html.twig              | 6 ++++--
 4 files changed, 14 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/views/Entity/user_group.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Entity/user_group.html.twig
index 8504a88dd..cb6c3be40 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Entity/user_group.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Entity/user_group.html.twig
@@ -1 +1 @@
-<span class="badge" style="color: {{ user_group.foregroundColor }}; background-color: {{  user_group.backgroundColor }};">{{ user_group.label|localize_translatable_string }}</span>
+<span class="badge-user-group" style="color: {{ user_group.foregroundColor }}; background-color: {{  user_group.backgroundColor }};">{{ user_group.label|localize_translatable_string }}</span>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss
index 072f13949..407a17f6d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss
@@ -3,8 +3,11 @@
 */
 
 span.badge-user,
+span.badge-user-group,
 span.badge-person,
 span.badge-thirdparty {
+    margin-top: 0.2rem;
+    margin-bottom: 0.2rem;
     display: inline-block;
     padding: 0 0.5em !important;
     background-color: $white;
@@ -18,6 +21,10 @@ span.badge-thirdparty {
     }
 }
 
+span.badge-user-group {
+    font-weight: 600;
+}
+
 span.badge-user {
     border-bottom-width: 1px;
     &.system {
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
index 430c7b320..2e1c53d42 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
@@ -47,10 +47,11 @@ export const moduleTicket: Module<State, RootState> = {
                     if (!result[datetime]) {
                         result[datetime] = [];
                     }
-
+                    /*
                     if (item.event_type === "add_addressee") {
                         result[datetime].push(item);
                     }
+                     */
                     return result;
                 },
                 {} as any
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/list.html.twig b/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/list.html.twig
index 6d25c5834..b4e58ca00 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/list.html.twig
+++ b/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/list.html.twig
@@ -66,9 +66,11 @@
                                         <div class="wl-col list">
                                             {% for d in ticket.currentAddressee %}
                                                 {% if d.isUser is defined and d.isUser %}
-                                                    {{ d|chill_entity_render_box }}
+                                                    <span class="badge-user">
+                                                        {{ d|chill_entity_render_box }}
+                                                    </span>
                                                 {% elseif d.isUserGroup is defined and d.isUserGroup %}
-                                                    {{ d|chill_entity_render_box }}
+                                                    {{ d|chill_entity_render_box() }}
                                                 {% endif %}
                                             {% endfor %}
                                         </div>

From be19dc00db80583ab56836576a355808e599f82d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 3 Jun 2024 11:20:50 +0200
Subject: [PATCH 090/283] Replace person-render-box with on-the-fly in
 BannerComponent

This change replaces the usage of person-render-box component with the on-the-fly component in the BannerComponent.vue file of ChillTicketBundle. Also, OnTheFly component is now being imported. This update simplifies the structure and improves the readability of the code.
---
 .../TicketApp/components/BannerComponent.vue  | 20 +++----------------
 1 file changed, 3 insertions(+), 17 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
index 61b62eff9..745847858 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
@@ -40,23 +40,7 @@
                     <h3 class="text-primary">
                         {{ $t("banner.concerned_patient") }}
                     </h3>
-
-                    <person-render-box
-                        render="badge"
-                        v-for="person in ticket.currentPersons"
-                        :key="person.id"
-                        :person="person"
-                        :options="{
-                            addLink: true,
-                            addId: false,
-                            addAltNames: false,
-                            addEntity: true,
-                            addInfo: true,
-                            hLevel: 3,
-                            isMultiline: true,
-                            isConfidential: false,
-                        }"
-                    />
+                    <on-the-fly v-for="person in ticket.currentPersons" :key="person.id" :type="person.type" :id="person.id" :buttonText="person.textAge" :displayBadge="'true' === 'true'" action="show"></on-the-fly>
                 </div>
                 <div class="col-md-6 col-sm-12">
                     <h3 class="text-primary">{{ $t("banner.speaker") }}</h3>
@@ -80,6 +64,7 @@ import AddresseeComponent from "./AddresseeComponent.vue";
 // Types
 import { Ticket } from "../../../types";
 import {ISOToDatetime} from "../../../../../../../ChillMainBundle/Resources/public/chill/js/date";
+import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue";
 
 export default defineComponent({
     name: "BannerComponent",
@@ -90,6 +75,7 @@ export default defineComponent({
         },
     },
     components: {
+        OnTheFly,
         PersonRenderBox,
         AddresseeComponent,
     },

From 0d74f0980fd592c6674e9bf562c91ceecddf9fe4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 3 Jun 2024 12:50:29 +0200
Subject: [PATCH 091/283] Multiple fixes and improvements

---
 .../Resources/public/chill/scss/badge.scss    |  4 +-
 .../src/Resources/public/types.ts             |  2 +-
 .../components/ActionToolbarComponent.vue     |  3 +
 .../components/AddresseeComponent.vue         | 22 +++---
 .../TicketApp/components/BannerComponent.vue  | 19 +++--
 .../components/TicketHistoryListComponent.vue | 69 +++++++++++++++----
 .../public/vuejs/TicketApp/i18n/messages.ts   | 10 +--
 .../src/Resources/views/Ticket/list.html.twig |  2 +-
 .../Normalizer/TicketNormalizer.php           |  4 +-
 9 files changed, 91 insertions(+), 44 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss
index 407a17f6d..d1faf5614 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss
+++ b/src/Bundle/ChillPersonBundle/Resources/public/chill/scss/badge.scss
@@ -6,8 +6,7 @@ span.badge-user,
 span.badge-user-group,
 span.badge-person,
 span.badge-thirdparty {
-    margin-top: 0.2rem;
-    margin-bottom: 0.2rem;
+    margin: 0.2rem 0.1rem;
     display: inline-block;
     padding: 0 0.5em !important;
     background-color: $white;
@@ -23,6 +22,7 @@ span.badge-thirdparty {
 
 span.badge-user-group {
     font-weight: 600;
+    border-width: 0px;
 }
 
 span.badge-user {
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
index 55607e2a4..d4115083e 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
@@ -75,7 +75,7 @@ interface SetMotiveEvent extends TicketHistory<"set_motive", MotiveHistory> {};
 //interface RemoveAddressee extends TicketHistory<"remove_addressee", AddresseeHistory> {};
 interface AddresseesStateEvent extends TicketHistory<"addressees_state", AddresseeState> {};
 
-type TicketHistoryLine = AddPersonEvent | AddCommentEvent | SetMotiveEvent | /*AddAddressee | RemoveAddressee | */ AddresseesStateEvent;
+export type TicketHistoryLine = AddPersonEvent | AddCommentEvent | SetMotiveEvent | /*AddAddressee | RemoveAddressee | */ AddresseesStateEvent;
 
 export interface Ticket {
     type: "ticket_ticket",
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
index aa299ad26..f21dc1278 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
@@ -50,6 +50,9 @@
                 <li v-if="hasReturnPath" class="nav-item p-2 go-back">
                     <a :href="returnPath" class="btn btn-cancel">Annuler</a>
                 </li>
+                <li v-else class="nav-item p-2 go-back">
+                    <a href="/fr/ticket/ticket/list" class="btn btn-cancel">Annuler</a>
+                </li>
                 <li class="nav-item p-2">
                     <button
                         type="button"
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeComponent.vue
index 966e15946..9f1d76d59 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeComponent.vue
@@ -1,31 +1,29 @@
 <template>
-    <h3>
         <div class="col-12">
             <span
-                class="badge m-1"
-                :style="`background-color: ${userGroup.backgroundColor}; color: white;`"
                 v-for="userGroup in userGroupLevels"
                 :key="userGroup.id"
+                class="badge-user-group"
+                :style="`background-color: ${userGroup.backgroundColor}; color: ${userGroup.foregroundColor};`"
             >
                 {{ userGroup.label.fr }}
             </span>
         </div>
         <div class="col-12">
             <span
-                class="badge m-1"
-                :style="`background-color: ${userGroup.backgroundColor}; color: white;`"
                 v-for="userGroup in userGroups"
                 :key="userGroup.id"
+                class="badge-user-group"
+                :style="`background-color: ${userGroup.backgroundColor}; color: ${userGroup.foregroundColor};`"
             >
                 {{ userGroup.label.fr }}
             </span>
         </div>
-    </h3>
-    <div class="col-12">
-        <span class="badge bg-primary m-1" v-for="user in users" :key="user.id">
-            {{ user.label }}
-        </span>
-    </div>
+        <div v-if="users.length > 0" class="col-12">
+            <span class="badge-user">
+                <user-render-box-badge v-for="user in users" :key="user.id" :user="user"></user-render-box-badge>
+            </span>
+        </div>
 </template>
 
 <script lang="ts">
@@ -37,9 +35,11 @@ import {
     UserGroup,
     UserGroupOrUser,
 } from "../../../../../../../ChillMainBundle/Resources/public/types";
+import UserRenderBoxBadge from "ChillMainAssets/vuejs/_components/Entity/UserRenderBoxBadge.vue";
 
 export default defineComponent({
     name: "AddresseeComponent",
+    components: {UserRenderBoxBadge},
     props: {
         addressees: {
             type: Array as PropType<UserGroupOrUser[]>,
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
index 745847858..b9535c284 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
@@ -14,20 +14,18 @@
 
                 <div class="col-md-6 col-sm-12">
                     <div class="d-flex justify-content-end">
-                        <h1>
-                            <span class="badge text-bg-chill-green text-white">
-                                {{ $t("banner.open") }}
-                            </span>
-                        </h1>
+                        <span class="badge text-bg-chill-green text-white" style="font-size: 1rem;">
+                            {{ $t("banner.open") }}
+                        </span>
                     </div>
                     <div class="d-flex justify-content-end">
-                        <h3 class="fst-italic" v-if="ticket.createdAt">
+                        <p class="created-at-timespan" v-if="ticket.createdAt">
                             {{
                                 $t("banner.since", {
                                     time: since,
                                 })
                             }}
-                        </h3>
+                        </p>
                     </div>
                 </div>
             </div>
@@ -53,6 +51,13 @@
     </Teleport>
 </template>
 
+<style lang="scss">
+.created-at-timespan {
+    font-weight: 600;
+    font-variant: all-petite-caps;
+}
+</style>
+
 <script lang="ts">
 import { PropType, computed, defineComponent, ref } from "vue";
 import { useI18n } from "vue-i18n";
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
index 512a1e5c5..c22b625c9 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
@@ -5,13 +5,22 @@
         :key="history.indexOf(history_line)"
     >
         <div class="card-header">
-            <i :class="`${actionIcons[history_line.event_type]} me-1`"></i>
-            <span class="fw-bold fst-italic mx-1">
-                {{ formatDate(history_line.at) }}
-            </span>
-            <span class="badge bg-white text-black mx-1">
-                {{ history_line.by.username }}
-            </span>
+            <div class="history-header">
+                <div class="description">
+                    <i :class="`${actionIcons[history_line.event_type]} me-1`"></i>
+                    <span>{{ explainSentence(history_line) }}</span>
+                </div>
+                <div>
+                    <span class="fw-bold fst-italic mx-1">
+                        {{ formatDate(history_line.at) }}
+                    </span>
+                </div>
+                <div>
+                    <span class="badge-user">
+                    <user-render-box-badge :user="history_line.by"></user-render-box-badge>
+                    </span>
+                </div>
+            </div>
         </div>
         <div class="card-body row">
             <ticket-history-person-component
@@ -35,22 +44,25 @@
 </template>
 
 <script lang="ts">
-import { PropType, defineComponent, ref } from "vue";
+import {PropType, defineComponent, ref, computed} from "vue";
 import { useStore } from "vuex";
 
 // Types
 import { DateTime } from "../../../../../../../ChillMainBundle/Resources/public/types";
-import { Ticket } from "../../../types";
+import {Ticket, TicketHistoryLine} from "../../../types";
 
 // Components
 import TicketHistoryPersonComponent from "./TicketHistoryPersonComponent.vue";
 import TicketHistoryMotiveComponent from "./TicketHistoryMotiveComponent.vue";
 import TicketHistoryCommentComponent from "./TicketHistoryCommentComponent.vue";
 import TicketHistoryAddresseeComponent from "./TicketHistoryAddresseeComponent.vue";
+import UserRenderBoxBadge from "ChillMainAssets/vuejs/_components/Entity/UserRenderBoxBadge.vue";
+import {ISOToDatetime} from "../../../../../../../ChillMainBundle/Resources/public/chill/js/date";
 
 export default defineComponent({
     name: "TicketHistoryListComponent",
     components: {
+        UserRenderBoxBadge,
         TicketHistoryPersonComponent,
         TicketHistoryMotiveComponent,
         TicketHistoryCommentComponent,
@@ -58,7 +70,7 @@ export default defineComponent({
     },
     props: {
         history: {
-            type: Array as PropType<Ticket["history"]>,
+            type: Array as PropType<TicketHistoryLine[]>,
             required: true,
         },
     },
@@ -66,15 +78,44 @@ export default defineComponent({
     setup() {
         const store = useStore();
 
-        function formatDate(d: DateTime) {
-            const date = new Date(d.datetime);
+        const explainSentence = (history: TicketHistoryLine): string => {
+            switch (history.event_type) {
+                case "add_comment":
+                    return "Nouveau commentaire";
+                case "addressees_state":
+                    return "Attributions";
+                case "add_person":
+                    return "Patients concernés";
+                case "set_motive":
+                    return "Nouveau motifs";
+                }
+            };
+
+        function formatDate(d: DateTime): string {
+            const date = ISOToDatetime(d.datetime);
+
+            if (date === null) {
+                return "";
+            }
+
             const month = date.toLocaleString("default", { month: "long" });
             return `${date.getDate()} ${month} ${date.getFullYear()}, ${date.toLocaleTimeString()}`;
         }
 
-        return { actionIcons: ref(store.getters.getActionIcons), formatDate };
+        return { actionIcons: ref(store.getters.getActionIcons), formatDate, explainSentence };
     },
 });
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+div.history-header {
+    display: flex;
+    flex-direction: row;
+    justify-content: flex-end;
+    align-items: center;
+
+    & > div.description {
+        margin-right: auto;
+    }
+}
+</style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
index 39b034075..92bd7873e 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
@@ -27,15 +27,15 @@ const messages = {
             error: "Aucun motif sélectionné",
         },
         add_addressee: {
-            title: "Transfert",
-            user_group_label: "Transferer vers un groupe",
-            user_label: "Transferer vers un ou plusieurs utilisateurs",
-            success: "Transfert effectué",
+            title: "Attribuer",
+            user_group_label: "Attributer à un groupe",
+            user_label: "Attribuer à un ou plusieurs utilisateurs",
+            success: "Attribution effectuée",
             error: "Aucun destinataire sélectionné",
         },
         banner: {
             concerned_patient: "Patient concerné",
-            speaker: "Destinataire(s)",
+            speaker: "Attribué à",
             open: "Ouvert",
             since: "Depuis {time}",
             and: "et",
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/list.html.twig b/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/list.html.twig
index b4e58ca00..a1bc6b2cb 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/list.html.twig
+++ b/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/list.html.twig
@@ -62,7 +62,7 @@
                                 {% endif %}
                                 {% if ticket.currentAddressee|length > 0 %}
                                     <div class="wl-row">
-                                        <div class="wl-col title"><h3 class="mb-2">Destinataires</h3></div>
+                                        <div class="wl-col title"><h3 class="mb-2">Attribué à</h3></div>
                                         <div class="wl-col list">
                                             {% for d in ticket.currentAddressee %}
                                                 {% if d.isUser is defined and d.isUser %}
diff --git a/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php b/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
index 77dc3da26..8cdaf9988 100644
--- a/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
+++ b/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
@@ -135,8 +135,6 @@ final class TicketNormalizer implements NormalizerInterface, NormalizerAwareInte
 
         foreach ($ticket->getAddresseeHistories() as $history) {
             $changes[$history->getStartDate()->format($dateFormat)]['added'][] = $history;
-        }
-        foreach ($ticket->getAddresseeHistories() as $history) {
             if (null !== $history->getEndDate()) {
                 $changes[$history->getEndDate()->format($dateFormat)]['removed'][] = $history;
             }
@@ -154,7 +152,7 @@ final class TicketNormalizer implements NormalizerInterface, NormalizerAwareInte
                 $at = $historiesAdded[0]->getStartDate();
                 $by = $historiesAdded[0]->getCreatedBy();
             } elseif (0 < count($historiesRemoved)) {
-                $at = $historiesRemoved[0]->getStartDate();
+                $at = $historiesRemoved[0]->getEndDate();
                 $by = $historiesRemoved[0]->getRemovedBy();
             } else {
                 throw new \LogicException('it should have at least one history');

From 348740f073c323749de227f0a97db6a20f0874e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 3 Jun 2024 13:22:46 +0200
Subject: [PATCH 092/283] Add TicketListController test

A new file, TicketListControllerTest.php, has been added to the test suite. This file includes tests to ensure that the TicketList controller is working as expected, including checking the successful response of the 'GET' request.
---
 .../Controller/TicketListControllerTest.php   | 20 +++++++++++++++++++
 1 file changed, 20 insertions(+)
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Chill/TicketBundle/Controller/TicketListControllerTest.php

diff --git a/src/Bundle/ChillTicketBundle/tests/Chill/TicketBundle/Controller/TicketListControllerTest.php b/src/Bundle/ChillTicketBundle/tests/Chill/TicketBundle/Controller/TicketListControllerTest.php
new file mode 100644
index 000000000..a7a1db425
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Chill/TicketBundle/Controller/TicketListControllerTest.php
@@ -0,0 +1,20 @@
+<?php
+
+namespace Controller;
+
+use Chill\MainBundle\Test\PrepareClientTrait;
+use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
+
+class TicketListControllerTest extends WebTestCase
+{
+    use PrepareClientTrait;
+
+    public function testList(): void
+    {
+        $client = $this->getClientAuthenticated();
+
+        $client->request('GET', '/fr/ticket/ticket/list');
+
+        self::assertResponseIsSuccessful();
+    }
+}

From bcfd317d8344174aa7026ed11cdc6a211776f395 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 3 Jun 2024 13:23:09 +0200
Subject: [PATCH 093/283] Remove ChillEventBundle and refactor framework.yaml
 configurations

This commit involves the deletion of ChillEventBundle from the bundles configuration. Additionally, test framework configurations are handled in a consolidated manner by moving assets configurations (json_manifest_path) from test/framework.yaml to framework.yaml. The obsolete test/framework.yaml has been deleted as it is no longer needed.
---
 tests/app/config/bundles.php                  | 1 -
 tests/app/config/packages/framework.yaml      | 2 ++
 tests/app/config/packages/test/framework.yaml | 6 ------
 3 files changed, 2 insertions(+), 7 deletions(-)
 delete mode 100644 tests/app/config/packages/test/framework.yaml

diff --git a/tests/app/config/bundles.php b/tests/app/config/bundles.php
index b20185210..38be80676 100644
--- a/tests/app/config/bundles.php
+++ b/tests/app/config/bundles.php
@@ -43,6 +43,5 @@ return [
     ChampsLibres\WopiBundle\WopiBundle::class => ['all' => true],
     Chill\WopiBundle\ChillWopiBundle::class => ['all' => true],
     \Lexik\Bundle\JWTAuthenticationBundle\LexikJWTAuthenticationBundle::class => ['all' => true],
-    Chill\EventBundle\ChillEventBundle::class => ['all' => true],
     Chill\TicketBundle\ChillTicketBundle::class => ['all' => true],
 ];
diff --git a/tests/app/config/packages/framework.yaml b/tests/app/config/packages/framework.yaml
index 011f5760c..a5ec738f2 100644
--- a/tests/app/config/packages/framework.yaml
+++ b/tests/app/config/packages/framework.yaml
@@ -38,3 +38,5 @@ when@test:
         test: true
         session:
             storage_factory_id: session.storage.factory.mock_file
+        assets:
+            json_manifest_path: null
diff --git a/tests/app/config/packages/test/framework.yaml b/tests/app/config/packages/test/framework.yaml
deleted file mode 100644
index 23906ec36..000000000
--- a/tests/app/config/packages/test/framework.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-framework:
-    test: true
-    session:
-        storage_id: session.storage.mock_file
-    assets:
-        json_manifest_path: NULL

From ca78d112c219d4b1faa7abb612644ac5a93fc399 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 3 Jun 2024 13:23:21 +0200
Subject: [PATCH 094/283] Add chill_ticket.yaml to configure routes

This commit adds a new file, chill_ticket.yaml, under the tests/app/config/routes directory in the ChillTicketBundle. This file is used to define the routes for the ChillTicket application.
---
 tests/app/config/routes/chill_ticket.yaml | 3 +++
 1 file changed, 3 insertions(+)
 create mode 100644 tests/app/config/routes/chill_ticket.yaml

diff --git a/tests/app/config/routes/chill_ticket.yaml b/tests/app/config/routes/chill_ticket.yaml
new file mode 100644
index 000000000..2ee15ef05
--- /dev/null
+++ b/tests/app/config/routes/chill_ticket.yaml
@@ -0,0 +1,3 @@
+chill_ticket_app:
+    resource: '@ChillTicketBundle/Controller/'
+    type: annotation
\ No newline at end of file

From a777588bb8efaca517d35cf126894a49df9695cf Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 3 Jun 2024 13:26:01 +0200
Subject: [PATCH 095/283] fixup! Add TicketListController test

---
 .../Controller/TicketListControllerTest.php        | 14 ++++++++++++++
 1 file changed, 14 insertions(+)

diff --git a/src/Bundle/ChillTicketBundle/tests/Chill/TicketBundle/Controller/TicketListControllerTest.php b/src/Bundle/ChillTicketBundle/tests/Chill/TicketBundle/Controller/TicketListControllerTest.php
index a7a1db425..65f237068 100644
--- a/src/Bundle/ChillTicketBundle/tests/Chill/TicketBundle/Controller/TicketListControllerTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Chill/TicketBundle/Controller/TicketListControllerTest.php
@@ -1,10 +1,24 @@
 <?php
 
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
 namespace Controller;
 
 use Chill\MainBundle\Test\PrepareClientTrait;
 use Symfony\Bundle\FrameworkBundle\Test\WebTestCase;
 
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
 class TicketListControllerTest extends WebTestCase
 {
     use PrepareClientTrait;

From 631f047338a5bcaa58ae86c339efdf86fb4697d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 3 Jun 2024 13:53:28 +0200
Subject: [PATCH 096/283] Manage the persons' assocation with ticket through
 SetPersonsCommand and dedicated handler

---
 .../Handler/SetPersonsCommandHandler.php      |  56 ++++++++
 .../src/Action/Ticket/SetPersonsCommand.php   |  28 ++++
 .../src/Controller/SetPersonsController.php   |  72 +++++++++++
 .../src/Entity/PersonHistory.php              |   5 +
 .../Handler/SetPersonsCommandHandlerTest.php  | 122 ++++++++++++++++++
 5 files changed, 283 insertions(+)
 create mode 100644 src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/SetPersonsCommandHandler.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Action/Ticket/SetPersonsCommand.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Controller/SetPersonsController.php
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/SetPersonsCommandHandlerTest.php

diff --git a/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/SetPersonsCommandHandler.php b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/SetPersonsCommandHandler.php
new file mode 100644
index 000000000..e0a7cfbd0
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/SetPersonsCommandHandler.php
@@ -0,0 +1,56 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Action\Ticket\Handler;
+
+use Chill\MainBundle\Entity\User;
+use Chill\TicketBundle\Action\Ticket\SetPersonsCommand;
+use Chill\TicketBundle\Entity\PersonHistory;
+use Chill\TicketBundle\Entity\Ticket;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\Clock\ClockInterface;
+use Symfony\Component\Security\Core\Security;
+
+final readonly class SetPersonsCommandHandler
+{
+    public function __construct(
+        private ClockInterface $clock,
+        private EntityManagerInterface $entityManager,
+        private Security $security,
+    ) {}
+
+    public function handle(Ticket $ticket, SetPersonsCommand $command): void
+    {
+        // remove existing addresses which are not in the new addresses
+        foreach ($ticket->getPersonHistories() as $personHistory) {
+            if (null !== $personHistory->getEndDate()) {
+                continue;
+            }
+
+            if (!in_array($personHistory->getPerson(), $command->persons, true)) {
+                $personHistory->setEndDate($this->clock->now());
+                if (($user = $this->security->getUser()) instanceof User) {
+                    $personHistory->setRemovedBy($user);
+                }
+            }
+        }
+
+        // add new addresses
+        foreach ($command->persons as $person) {
+            if (in_array($person, $ticket->getPersons(), true)) {
+                continue;
+            }
+
+            $history = new PersonHistory($person, $ticket, $this->clock->now());
+            $this->entityManager->persist($history);
+        }
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Action/Ticket/SetPersonsCommand.php b/src/Bundle/ChillTicketBundle/src/Action/Ticket/SetPersonsCommand.php
new file mode 100644
index 000000000..6bd47a567
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Action/Ticket/SetPersonsCommand.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Action\Ticket;
+
+use Chill\PersonBundle\Entity\Person;
+use Symfony\Component\Serializer\Annotation\Groups;
+use Symfony\Component\Validator\Constraints\GreaterThan;
+
+class SetPersonsCommand
+{
+    public function __construct(
+        /**
+         * @var list<Person>
+         */
+        #[GreaterThan(0)]
+        #[Groups(['read'])]
+        public array $persons
+    ) {}
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Controller/SetPersonsController.php b/src/Bundle/ChillTicketBundle/src/Controller/SetPersonsController.php
new file mode 100644
index 000000000..3fbe254a8
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Controller/SetPersonsController.php
@@ -0,0 +1,72 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Controller;
+
+use Chill\TicketBundle\Action\Ticket\Handler\SetPersonsCommandHandler;
+use Chill\TicketBundle\Action\Ticket\SetPersonsCommand;
+use Chill\TicketBundle\Entity\Ticket;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
+use Symfony\Component\Serializer\SerializerInterface;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
+
+final readonly class SetPersonsController
+{
+    public function __construct(
+        private Security $security,
+        private EntityManagerInterface $entityManager,
+        private SerializerInterface $serializer,
+        private SetPersonsCommandHandler $setPersonsCommandHandler,
+        private ValidatorInterface $validator,
+    ) {}
+
+    #[Route('/api/1.0/ticket/{id}/persons/set', methods: ['POST'])]
+    public function setPersons(Ticket $ticket, Request $request): Response
+    {
+        if (!$this->security->isGranted('ROLE_USER')) {
+            throw new AccessDeniedHttpException('Only users can set addressees.');
+        }
+
+        $command = $this->serializer->deserialize($request->getContent(), SetPersonsCommand::class, 'json', [AbstractNormalizer::GROUPS => ['read']]);
+
+        return $this->registerSetPersons($command, $ticket);
+    }
+
+    private function registerSetPersons(SetPersonsCommand $command, Ticket $ticket): Response
+    {
+        if (0 < count($errors = $this->validator->validate($command))) {
+            return new JsonResponse(
+                $this->serializer->serialize($errors, 'json'),
+                Response::HTTP_UNPROCESSABLE_ENTITY,
+                [],
+                true
+            );
+        }
+
+        $this->setPersonsCommandHandler->handle($ticket, $command);
+
+        $this->entityManager->flush();
+
+        return new JsonResponse(
+            $this->serializer->serialize($ticket, 'json', ['groups' => 'read']),
+            Response::HTTP_OK,
+            [],
+            true,
+        );
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Entity/PersonHistory.php b/src/Bundle/ChillTicketBundle/src/Entity/PersonHistory.php
index 927ea978f..1fce78fa1 100644
--- a/src/Bundle/ChillTicketBundle/src/Entity/PersonHistory.php
+++ b/src/Bundle/ChillTicketBundle/src/Entity/PersonHistory.php
@@ -91,4 +91,9 @@ class PersonHistory implements TrackCreationInterface
 
         return $this;
     }
+
+    public function setRemovedBy(?User $removedBy): void
+    {
+        $this->removedBy = $removedBy;
+    }
 }
diff --git a/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/SetPersonsCommandHandlerTest.php b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/SetPersonsCommandHandlerTest.php
new file mode 100644
index 000000000..3db50e7e6
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/SetPersonsCommandHandlerTest.php
@@ -0,0 +1,122 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Tests\Action\Ticket\Handler;
+
+use Chill\MainBundle\Entity\User;
+use Chill\PersonBundle\Entity\Person;
+use Chill\TicketBundle\Action\Ticket\Handler\SetPersonsCommandHandler;
+use Chill\TicketBundle\Action\Ticket\SetPersonsCommand;
+use Chill\TicketBundle\Entity\PersonHistory;
+use Chill\TicketBundle\Entity\Ticket;
+use Doctrine\ORM\EntityManagerInterface;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Component\Clock\MockClock;
+use Symfony\Component\Security\Core\Security;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+final class SetPersonsCommandHandlerTest extends TestCase
+{
+    use ProphecyTrait;
+
+    public function testHandleOnEmptyAddresses(): void
+    {
+        $ticket = new Ticket();
+        $command = new SetPersonsCommand([$person1 = new Person(), $group1 = new Person()]);
+
+        $entityManager = $this->prophesize(EntityManagerInterface::class);
+        $entityManager->persist(Argument::that(function ($arg) use ($person1) {
+            return $arg instanceof PersonHistory && $arg->getPerson() === $person1;
+        }))->shouldBeCalledOnce();
+        $entityManager->persist(Argument::that(function ($arg) use ($group1) {
+            return $arg instanceof PersonHistory && $arg->getPerson() === $group1;
+        }))->shouldBeCalledOnce();
+
+        $handler = $this->buildHandler($entityManager->reveal());
+
+        $handler->handle($ticket, $command);
+
+        self::assertCount(2, $ticket->getPersons());
+    }
+
+    public function testHandleExistingPersonIsNotRemovedNorCreatingDouble(): void
+    {
+        $ticket = new Ticket();
+        $person = new Person();
+        $history = new PersonHistory($person, $ticket, new \DateTimeImmutable('1 month ago'));
+        $command = new SetPersonsCommand([$person]);
+
+        $entityManager = $this->prophesize(EntityManagerInterface::class);
+        $entityManager->persist(Argument::that(function ($arg) use ($person) {
+            return $arg instanceof PersonHistory && $arg->getPerson() === $person;
+        }))->shouldNotBeCalled();
+
+        $handler = $this->buildHandler($entityManager->reveal());
+
+        $handler->handle($ticket, $command);
+
+        self::assertNull($history->getEndDate());
+        self::assertCount(1, $ticket->getPersons());
+    }
+
+    public function testHandleRemoveExistingPerson(): void
+    {
+        $ticket = new Ticket();
+        $person = new Person();
+        $person2 = new Person();
+        $history = new PersonHistory($person, $ticket, new \DateTimeImmutable('1 month ago'));
+        $command = new SetPersonsCommand([$person2]);
+
+        $entityManager = $this->prophesize(EntityManagerInterface::class);
+        $entityManager->persist(Argument::that(function ($arg) use ($person2) {
+            return $arg instanceof PersonHistory && $arg->getPerson() === $person2;
+        }))->shouldBeCalled();
+
+        $handler = $this->buildHandler($entityManager->reveal());
+
+        $handler->handle($ticket, $command);
+
+        self::assertNotNull($history->getEndDate());
+        self::assertContains($person2, $ticket->getPersons());
+    }
+
+    public function testAddingDoublingPersonsDoesNotCreateDoubleHistories(): void
+    {
+        $ticket = new Ticket();
+        $person = new Person();
+        $command = new SetPersonsCommand([$person, $person]);
+
+        $entityManager = $this->prophesize(EntityManagerInterface::class);
+        $entityManager->persist(Argument::that(function ($arg) use ($person) {
+            return $arg instanceof PersonHistory && $arg->getPerson() === $person;
+        }))->shouldBeCalledOnce();
+
+        $handler = $this->buildHandler($entityManager->reveal());
+
+        $handler->handle($ticket, $command);
+
+        self::assertCount(1, $ticket->getPersons());
+    }
+
+    private function buildHandler(EntityManagerInterface $entityManager): SetPersonsCommandHandler
+    {
+        $security = $this->prophesize(Security::class);
+        $security->getUser()->willReturn(new User());
+
+        return new SetPersonsCommandHandler(new MockClock(), $entityManager, $security->reveal());
+    }
+}

From 166a6fde20aecc2fdc8af699fdabd9e9947f30aa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 3 Jun 2024 22:30:12 +0200
Subject: [PATCH 097/283] Add feature to set concerned persons in a ticket

This commit adds the functionality to set and change the concerned persons in a ticket within the ChillTicketBundle. New vuejs components, serializers, and store modules have been introduced to achieve this. Moreover, necessary changes have been made in existing components and store index to support this functionality.
---
 .../src/Controller/SetPersonsController.php   |   2 +
 .../components/ActionToolbarComponent.vue     |  33 ++++-
 .../components/PersonsSelectorComponent.vue   | 131 ++++++++++++++++++
 .../public/vuejs/TicketApp/i18n/messages.ts   |   4 +
 .../public/vuejs/TicketApp/store/index.ts     |   3 +
 .../vuejs/TicketApp/store/modules/persons.ts  |  32 +++++
 .../vuejs/TicketApp/store/modules/ticket.ts   |   1 +
 .../SetPersonsCommandDenormalizer.php         |  51 +++++++
 8 files changed, 254 insertions(+), 3 deletions(-)
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PersonsSelectorComponent.vue
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/persons.ts
 create mode 100644 src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/SetPersonsCommandDenormalizer.php

diff --git a/src/Bundle/ChillTicketBundle/src/Controller/SetPersonsController.php b/src/Bundle/ChillTicketBundle/src/Controller/SetPersonsController.php
index 3fbe254a8..5289243c2 100644
--- a/src/Bundle/ChillTicketBundle/src/Controller/SetPersonsController.php
+++ b/src/Bundle/ChillTicketBundle/src/Controller/SetPersonsController.php
@@ -44,6 +44,8 @@ final readonly class SetPersonsController
 
         $command = $this->serializer->deserialize($request->getContent(), SetPersonsCommand::class, 'json', [AbstractNormalizer::GROUPS => ['read']]);
 
+        dump($command);
+
         return $this->registerSetPersons($command, $ticket);
     }
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
index f21dc1278..c73aed8a5 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
@@ -8,7 +8,7 @@
                     </label>
                 </div>
 
-                <form @submit.prevent="submitAction">
+                <form v-if="activeTab !== 'set_persons'" @submit.prevent="submitAction">
                     <add-comment-component
                         v-model="content"
                         v-if="activeTab === 'add_comment'"
@@ -37,12 +37,15 @@
                             </button>
                         </li>
                         <li>
-                            <button class="btn btn-create" type="submit">
+                            <button class="btn btn-save" type="submit">
                                 {{ $t("ticket.save") }}
                             </button>
                         </li>
                     </ul>
                 </form>
+                <template v-else>
+                    <persons-selector-component @closeRequested="closeAllActions()" />
+                </template>
             </div>
         </div>
         <div class="footer-ticket-main">
@@ -107,6 +110,24 @@
                         {{ $t("add_addressee.title") }}
                     </button>
                 </li>
+                <li class="nav-item p-2">
+                    <button
+                        type="button"
+                        :class="`btn ${
+                            activeTab === 'set_persons'
+                                ? 'btn-primary'
+                                : 'btn-light'
+                        }`"
+                        @click="
+                            activeTab === 'set_persons'
+                                ? (activeTab = '')
+                                : (activeTab = 'set_persons')
+                        "
+                    >
+                        <i :class="actionIcons['set_persons']"></i>
+                        Patients concernés
+                    </button>
+                </li>
 
                 <li class="nav-item p-2">
                     <button
@@ -140,10 +161,12 @@ import { Comment, Motive, Ticket } from "../../../types";
 import MotiveSelectorComponent from "./MotiveSelectorComponent.vue";
 import AddresseeSelectorComponent from "./AddresseeSelectorComponent.vue";
 import AddCommentComponent from "./AddCommentComponent.vue";
+import PersonsSelectorComponent from "./PersonsSelectorComponent.vue";
 
 export default defineComponent({
     name: "ActionToolbarComponent",
     components: {
+        PersonsSelectorComponent,
         AddCommentComponent,
         MotiveSelectorComponent,
         AddresseeSelectorComponent,
@@ -153,7 +176,7 @@ export default defineComponent({
         const { t } = useI18n();
         const toast = inject("toast") as any;
         const activeTab = ref(
-            "" as "" | "add_comment" | "set_motive" | "add_addressee"
+            "" as "" | "add_comment" | "set_motive" | "add_addressee" | "set_persons"
         );
 
         const ticket = computed(() => store.getters.getTicket as Ticket);
@@ -239,6 +262,9 @@ export default defineComponent({
             alert("Sera disponible plus tard");
         }
 
+        const closeAllActions = function() {
+            activeTab.value = "";
+        }
 
         return {
             actionIcons: ref(store.getters.getActionIcons),
@@ -254,6 +280,7 @@ export default defineComponent({
             handleClick,
             hasReturnPath,
             returnPath,
+            closeAllActions,
         };
     },
 });
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PersonsSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PersonsSelectorComponent.vue
new file mode 100644
index 000000000..4f91d0542
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PersonsSelectorComponent.vue
@@ -0,0 +1,131 @@
+<script setup lang="ts">
+
+import {useStore} from "vuex";
+import AddPersons from "ChillPersonAssets/vuejs/_components/AddPersons.vue";
+import {computed, inject, reactive} from "vue";
+import {Ticket} from "../../../types";
+import {Person} from "../../../../../../../ChillPersonBundle/Resources/public/types"
+import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue";
+import {ToastPluginApi} from "vue-toast-notification";
+
+const emit = defineEmits<{
+    (e: 'closeRequested'): void
+}>()
+
+const store = useStore();
+const toast = inject("toast") as ToastPluginApi;
+const ticket = computed<Ticket>(() => store.getters.getTicket);
+const persons = computed(() => ticket.value.currentPersons);
+
+const addPersonsOptions = {
+    uniq: false,
+    type: ['person'],
+    priority: null,
+    button: {
+        class: 'btn-submit',
+    },
+};
+
+const added: Person[] = reactive([]);
+const removed: Person[] = reactive([]);
+
+const computeCurrentPersons = (initial: Person[], added: Person[], removed: Person[]): Person[] => {
+    for (let p of added) {
+        if (initial.findIndex((element) => element.id === p.id) === -1) {
+            initial.push(p);
+        }
+    }
+
+    return initial.filter((p) => removed.findIndex((element) => element.id === p.id) === -1);
+}
+
+const currentPersons = computed((): Person[] => {
+    return computeCurrentPersons(persons.value, added, removed);
+})
+
+const removePerson = (p: Person) => {
+    removed.push(p);
+}
+
+const addNewEntity = (n: {modal: {showModal: boolean}, selected: Array<{result: Person}>}) => {
+    n.modal.showModal = false;
+    for (let p of n.selected) {
+        added.push(p.result);
+    }
+}
+
+const save = async function(): Promise<void> {
+    try {
+        await store.dispatch("setPersons", { persons: computeCurrentPersons(persons.value, added, removed) });
+        toast.success("Patients concernés sauvegardés");
+    } catch (e: any) {
+        console.error("error while saving", e);
+        toast.error((e as Error).message);
+        return Promise.resolve();
+    }
+    emit("closeRequested");
+}
+
+</script>
+
+<template>
+    <div>
+        <ul v-if="currentPersons.length > 0" class="person-list">
+            <li v-for="person in currentPersons" :key="person.id">
+                <on-the-fly :type="person.type" :id="person.id" :buttonText="person.textAge" :displayBadge="'true' === 'true'" action="show"></on-the-fly>
+                <button type="button" class="btn btn-delete remove-person" @click="removePerson(person)"></button>
+            </li>
+        </ul>
+        <p v-else class="chill-no-data-statement">Aucun patient</p>
+    </div>
+    <ul class="record_actions">
+        <li class="cancel">
+            <button
+                class="btn btn-cancel"
+                type="button"
+                @click="emit('closeRequested')"
+            >
+                {{ $t("ticket.cancel") }}
+            </button>
+        </li>
+        <li>
+            <add-persons
+                :options="addPersonsOptions"
+                key="add-person-ticket"
+                buttonTitle="set_persons.user_label"
+                modalTitle="set_persons.user_label"
+                ref="addPersons"
+                @addNewPersons="addNewEntity"
+            />
+        </li>
+        <li>
+            <button class="btn btn-save" type="submit" @click.prevent="save">
+                {{ $t("ticket.save") }}
+            </button>
+        </li>
+    </ul>
+</template>
+
+<style scoped lang="scss">
+ul.person-list {
+    list-style-type: none;
+
+    & > li {
+        display: inline-block;
+        border: 1px solid transparent;
+        border-radius: 6px;
+
+        button.remove-person {
+            opacity: 10%;
+        }
+    }
+
+    & > li:hover {
+        border: 1px solid white;
+
+        button.remove-person {
+            opacity: 100%;
+        }
+    }
+}
+</style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
index 92bd7873e..f16013802 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
@@ -33,6 +33,10 @@ const messages = {
             success: "Attribution effectuée",
             error: "Aucun destinataire sélectionné",
         },
+        set_persons: {
+            title: "Patients concernés",
+            user_label: "Ajouter un patient",
+        },
         banner: {
             concerned_patient: "Patient concerné",
             speaker: "Attribué à",
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts
index cc7da9538..71db5d60e 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts
@@ -3,12 +3,14 @@ import { State as MotiveStates, moduleMotive } from "./modules/motive";
 import { State as TicketStates, moduleTicket } from "./modules/ticket";
 import { State as CommentStates, moduleComment } from "./modules/comment";
 import { State as AddresseeStates, moduleAddressee } from "./modules/addressee";
+import { State as PersonsState,  modulePersons} from "./modules/persons";
 
 export type RootState = {
     motive: MotiveStates;
     ticket: TicketStates;
     comment: CommentStates;
     addressee: AddresseeStates;
+    persons: PersonsState;
 };
 
 export const store = createStore<RootState>({
@@ -17,5 +19,6 @@ export const store = createStore<RootState>({
         ticket: moduleTicket,
         comment: moduleComment,
         addressee: moduleAddressee,
+        persons: modulePersons,
     },
 });
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/persons.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/persons.ts
new file mode 100644
index 000000000..dd7229651
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/persons.ts
@@ -0,0 +1,32 @@
+import {
+    makeFetch,
+} from "../../../../../../../../ChillMainBundle/Resources/public/lib/api/apiMethods";
+import { Person } from "../../../../../../../../ChillPersonBundle/Resources/public/types";
+import { Module } from "vuex";
+import { RootState } from "..";
+import {Ticket} from "../../../../types";
+
+export interface State {};
+
+export const modulePersons: Module<State, RootState> = {
+    actions: {
+        async setPersons(
+                   { commit, rootState: RootState },
+                   payload: { persons: Person[] }
+        ) {
+            const persons = payload.persons.map((person: Person) => ({id: person.id, type: person.type}));
+            try {
+                const result: Ticket = await makeFetch(
+                    "POST",
+                    `/api/1.0/ticket/${RootState.ticket.ticket.id}/persons/set`,
+                    { persons },
+                );
+                commit("setTicket", result);
+
+                return Promise.resolve();
+            } catch (e: any) {
+                throw e.name;
+            }
+        },
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
index 2e1c53d42..6be4d6550 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
@@ -17,6 +17,7 @@ export const moduleTicket: Module<State, RootState> = {
             set_motive: "fa fa-paint-brush",
             //add_addressee: "fa fa-paper-plane",
             addressees_state: "fa fa-paper-plane",
+            set_persons: "fa fa-eyedropper",
         },
         toto: "toto",
     }),
diff --git a/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/SetPersonsCommandDenormalizer.php b/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/SetPersonsCommandDenormalizer.php
new file mode 100644
index 000000000..b0b29cbf7
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/SetPersonsCommandDenormalizer.php
@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Serializer\Normalizer;
+
+use Chill\PersonBundle\Entity\Person;
+use Chill\TicketBundle\Action\Ticket\SetPersonsCommand;
+use Symfony\Component\Serializer\Exception\UnexpectedValueException;
+use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
+use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+
+class SetPersonsCommandDenormalizer implements DenormalizerInterface, DenormalizerAwareInterface
+{
+    use DenormalizerAwareTrait;
+
+    public function denormalize($data, string $type, ?string $format = null, array $context = [])
+    {
+        if (null === $data) {
+            return null;
+        }
+
+        if (!array_key_exists('persons', $data)) {
+            throw new UnexpectedValueException("key 'persons' does exists");
+        }
+
+        if (!is_array($data['persons'])) {
+            throw new UnexpectedValueException("key 'persons' must be an array");
+        }
+
+        $persons = [];
+        foreach ($data['persons'] as $person) {
+            $persons[] = $this->denormalizer->denormalize($person, Person::class, $format, $context);
+        }
+
+        return new SetPersonsCommand($persons);
+    }
+
+    public function supportsDenormalization($data, string $type, ?string $format = null)
+    {
+        return SetPersonsCommand::class === $type;
+    }
+}

From e45af94c78a498cfec099e0e85b175efc02e92a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 3 Jun 2024 23:25:53 +0200
Subject: [PATCH 098/283] Update ticket history interface and functionality

Reworked the ticket history interface and added new functionalities. The history interface now supports multiple patients and shows changes in patients' state. Additionally, new ticket creation is now displayed in the history line, along with the creator information. Some minor textual changes were made to reflect support for multiple patients. Implemented code cleanup and removed debug statements for a cleaner codebase.
---
 .../src/Controller/SetPersonsController.php   |  2 -
 .../src/Resources/public/types.ts             | 24 +++++--
 .../TicketHistoryCreateComponent.vue          | 18 ++++++
 .../components/TicketHistoryListComponent.vue | 14 ++++-
 .../TicketHistoryPersonComponent.vue          | 52 ++++++----------
 .../public/vuejs/TicketApp/i18n/messages.ts   |  2 +-
 .../vuejs/TicketApp/store/modules/ticket.ts   |  4 +-
 .../src/Resources/views/Ticket/list.html.twig |  2 +-
 .../Normalizer/TicketNormalizer.php           | 62 +++++++++++++++++++
 9 files changed, 134 insertions(+), 46 deletions(-)
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCreateComponent.vue

diff --git a/src/Bundle/ChillTicketBundle/src/Controller/SetPersonsController.php b/src/Bundle/ChillTicketBundle/src/Controller/SetPersonsController.php
index 5289243c2..3fbe254a8 100644
--- a/src/Bundle/ChillTicketBundle/src/Controller/SetPersonsController.php
+++ b/src/Bundle/ChillTicketBundle/src/Controller/SetPersonsController.php
@@ -44,8 +44,6 @@ final readonly class SetPersonsController
 
         $command = $this->serializer->deserialize($request->getContent(), SetPersonsCommand::class, 'json', [AbstractNormalizer::GROUPS => ['read']]);
 
-        dump($command);
-
         return $this->registerSetPersons($command, $ticket);
     }
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
index d4115083e..888d3179e 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
@@ -68,14 +68,28 @@ export interface AddresseeState {
     addressees: UserGroupOrUser[],
 }
 
-interface AddPersonEvent extends TicketHistory<"add_person", PersonHistory> {};
-interface AddCommentEvent extends TicketHistory<"add_comment", Comment> {};
-interface SetMotiveEvent extends TicketHistory<"set_motive", MotiveHistory> {};
+export interface PersonsState {
+    persons: Person[]
+}
+
+export interface CreateTicketState {}
+
+//interface AddPersonEvent extends TicketHistory<"add_person", PersonHistory> {};
+export interface AddCommentEvent extends TicketHistory<"add_comment", Comment> {};
+export interface SetMotiveEvent extends TicketHistory<"set_motive", MotiveHistory> {};
 //interface AddAddressee extends TicketHistory<"add_addressee", AddresseeHistory> {};
 //interface RemoveAddressee extends TicketHistory<"remove_addressee", AddresseeHistory> {};
-interface AddresseesStateEvent extends TicketHistory<"addressees_state", AddresseeState> {};
+export interface AddresseesStateEvent extends TicketHistory<"addressees_state", AddresseeState> {};
+export interface CreateTicketEvent extends TicketHistory<"create_ticket", CreateTicketState> {};
+export interface PersonStateEvent extends TicketHistory<"persons_state", PersonsState> {};
 
-export type TicketHistoryLine = AddPersonEvent | AddCommentEvent | SetMotiveEvent | /*AddAddressee | RemoveAddressee | */ AddresseesStateEvent;
+export type TicketHistoryLine =
+    /* AddPersonEvent */
+    CreateTicketEvent |
+    AddCommentEvent |
+    SetMotiveEvent | /*AddAddressee | RemoveAddressee | */
+    AddresseesStateEvent |
+    PersonStateEvent;
 
 export interface Ticket {
     type: "ticket_ticket",
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCreateComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCreateComponent.vue
new file mode 100644
index 000000000..869689fdd
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCreateComponent.vue
@@ -0,0 +1,18 @@
+<script setup lang="ts">
+import {User} from "../../../../../../../ChillMainBundle/Resources/public/types";
+
+interface TicketHistoryCreateComponentConfig {
+    by: User
+}
+
+const props = defineProps<TicketHistoryCreateComponentConfig>();
+
+</script>
+
+<template>
+    <p>Ticket créé par {{ props.by.text }}</p>
+</template>
+
+<style scoped lang="scss">
+
+</style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
index c22b625c9..e60b7b235 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
@@ -25,7 +25,7 @@
         <div class="card-body row">
             <ticket-history-person-component
                 :personHistory="history_line.data"
-                v-if="history_line.event_type == 'add_person'"
+                v-if="history_line.event_type == 'persons_state'"
             />
             <ticket-history-motive-component
                 :motiveHistory="history_line.data"
@@ -39,6 +39,10 @@
                 :addressees="history_line.data.addressees"
                 v-else-if="history_line.event_type == 'addressees_state'"
             />
+            <ticket-history-create-component
+                :by="history_line.by"
+                v-else-if="history_line.event_type == 'create_ticket'"
+                />
         </div>
     </div>
 </template>
@@ -49,13 +53,14 @@ import { useStore } from "vuex";
 
 // Types
 import { DateTime } from "../../../../../../../ChillMainBundle/Resources/public/types";
-import {Ticket, TicketHistoryLine} from "../../../types";
+import {TicketHistoryLine} from "../../../types";
 
 // Components
 import TicketHistoryPersonComponent from "./TicketHistoryPersonComponent.vue";
 import TicketHistoryMotiveComponent from "./TicketHistoryMotiveComponent.vue";
 import TicketHistoryCommentComponent from "./TicketHistoryCommentComponent.vue";
 import TicketHistoryAddresseeComponent from "./TicketHistoryAddresseeComponent.vue";
+import TicketHistoryCreateComponent from "./TicketHistoryCreateComponent.vue";
 import UserRenderBoxBadge from "ChillMainAssets/vuejs/_components/Entity/UserRenderBoxBadge.vue";
 import {ISOToDatetime} from "../../../../../../../ChillMainBundle/Resources/public/chill/js/date";
 
@@ -67,6 +72,7 @@ export default defineComponent({
         TicketHistoryMotiveComponent,
         TicketHistoryCommentComponent,
         TicketHistoryAddresseeComponent,
+        TicketHistoryCreateComponent,
     },
     props: {
         history: {
@@ -84,10 +90,12 @@ export default defineComponent({
                     return "Nouveau commentaire";
                 case "addressees_state":
                     return "Attributions";
-                case "add_person":
+                case "persons_state":
                     return "Patients concernés";
                 case "set_motive":
                     return "Nouveau motifs";
+                case "create_ticket":
+                    return "Ticket créé";
                 }
             };
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryPersonComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryPersonComponent.vue
index 8b4f8a262..f17278a92 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryPersonComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryPersonComponent.vue
@@ -1,57 +1,43 @@
 <template>
-    <div class="col-12" v-if="personHistory.createdBy">
-        <span class="mx-1">
-            {{ $t("history.user") }}
-            <span class="badge bg-primary m-1">
-                {{ personHistory.createdBy.username }}
-            </span>
-        </span>
-    </div>
     <div class="col-12">
-        <span class="mx-1">
-            {{ $t("history.person") }}
-        </span>
-        <person-render-box
-            render="badge"
-            :key="personHistory.person.id"
-            :person="personHistory.person"
-            :options="{
-                addLink: true,
-                addId: false,
-                addAltNames: false,
-                addEntity: true,
-                addInfo: true,
-                hLevel: 3,
-                isMultiline: true,
-                isConfidential: false,
-            }"
-        />
+        <ul class="persons-list">
+            <li v-for="person in personHistory.persons" :key="person.id">
+                <on-the-fly :type="person.type" :id="person.id" :buttonText="person.textAge" :displayBadge="'true' === 'true'" action="show"></on-the-fly>
+            </li>
+        </ul>
     </div>
 </template>
 
 <script lang="ts">
 import { PropType, defineComponent } from "vue";
 
-// Components
-import PersonRenderBox from "../../../../../../../ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue";
-
 // Type
-import { PersonHistory } from "../../../types";
+import {PersonsState} from "../../../types";
+import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue";
 
 export default defineComponent({
     name: "TicketHistoryPersonComponent",
     props: {
         personHistory: {
-            type: Object as PropType<PersonHistory>,
+            type: Object as PropType<PersonsState>,
             required: true,
         },
     },
     components: {
-        PersonRenderBox,
+        OnTheFly,
     },
 
     setup() {},
 });
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+ul.persons-list {
+    list-style-type: none;
+
+    & > li {
+        display: inline-block;
+        margin: 0 0.15rem;
+    }
+}
+</style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
index f16013802..d64434119 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
@@ -38,7 +38,7 @@ const messages = {
             user_label: "Ajouter un patient",
         },
         banner: {
-            concerned_patient: "Patient concerné",
+            concerned_patient: "Patients concernés",
             speaker: "Attribué à",
             open: "Ouvert",
             since: "Depuis {time}",
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
index 6be4d6550..cf5c61757 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
@@ -12,12 +12,14 @@ export const moduleTicket: Module<State, RootState> = {
     state: () => ({
         ticket: {} as Ticket,
         action_icons: {
+            // TODO cleanup those keys
             add_person: "fa fa-eyedropper",
             add_comment: "fa fa-comment",
             set_motive: "fa fa-paint-brush",
             //add_addressee: "fa fa-paper-plane",
             addressees_state: "fa fa-paper-plane",
             set_persons: "fa fa-eyedropper",
+            persons_state: "fa fa-eyedropper",
         },
         toto: "toto",
     }),
@@ -37,7 +39,7 @@ export const moduleTicket: Module<State, RootState> = {
                 (result, item) => {
                     const { datetime } = item.at;
                     if (
-                        !["add_addressee", "remove_addressee"].includes(
+                        !["add_addressee", "remove_addressee", "add_person"].includes(
                             item.event_type
                         )
                     ) {
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/list.html.twig b/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/list.html.twig
index a1bc6b2cb..31465b83d 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/list.html.twig
+++ b/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/list.html.twig
@@ -46,7 +46,7 @@
                             <div class="wrap-list">
                                 {% if ticket.persons|length > 0 %}
                                     <div class="wl-row">
-                                        <div class="wl-col title"><h3 class="mb-2">Patient concerné</h3></div>
+                                        <div class="wl-col title"><h3 class="mb-2">Patients concernés</h3></div>
                                         <div class="wl-col list">
                                             {% for p in ticket.persons %}
                                                 {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
diff --git a/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php b/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
index 8cdaf9988..2b255f207 100644
--- a/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
+++ b/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
@@ -13,6 +13,7 @@ namespace Chill\TicketBundle\Serializer\Normalizer;
 
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\UserGroup;
+use Chill\PersonBundle\Entity\Person;
 use Chill\TicketBundle\Entity\AddresseeHistory;
 use Chill\TicketBundle\Entity\Comment;
 use Chill\TicketBundle\Entity\MotiveHistory;
@@ -107,8 +108,19 @@ final class TicketNormalizer implements NormalizerInterface, NormalizerAwareInte
             ),
             */
             ...$this->addresseesStates($ticket),
+            ...$this->personStates($ticket),
         ];
 
+        if (null !== $ticket->getCreatedBy() && null !== $ticket->getCreatedAt()) {
+            $events[] =
+                [
+                    'event_type' => 'create_ticket',
+                    'at' => $ticket->getCreatedAt()->sub(new \DateInterval('PT1S')), // TODO hack to avoid collision with creation of the ticket event,
+                    'by' => $ticket->getCreatedBy(),
+                    'data' => [],
+                ];
+        }
+
         usort(
             $events,
             static function (array $a, array $b): int {
@@ -176,4 +188,54 @@ final class TicketNormalizer implements NormalizerInterface, NormalizerAwareInte
 
         return $steps;
     }
+
+    private function personStates(Ticket $ticket): array
+    {
+        /** @var array{string, array{added: list<PersonHistory>, removed: list<PersonHistory>}} $changes */
+        $changes = [];
+        $dateFormat = 'Y-m-d-m-Y-H-i-s';
+
+        foreach ($ticket->getPersonHistories() as $history) {
+            $changes[$history->getStartDate()->format($dateFormat)]['added'][] = $history;
+            if (null !== $history->getEndDate()) {
+                $changes[$history->getEndDate()->format($dateFormat)]['removed'][] = $history;
+            }
+        }
+
+        ksort($changes);
+
+        $currents = [];
+        $steps = [];
+        foreach ($changes as $change) {
+            $historiesAdded = $change['added'] ?? [];
+            $historiesRemoved = $change['removed'] ?? [];
+
+            if (0 < count($historiesAdded)) {
+                $at = $historiesAdded[0]->getStartDate();
+                $by = $historiesAdded[0]->getCreatedBy();
+            } elseif (0 < count($historiesRemoved)) {
+                $at = $historiesRemoved[0]->getEndDate();
+                $by = $historiesRemoved[0]->getRemovedBy();
+            } else {
+                throw new \LogicException('it should have at least one history');
+            }
+
+            $removed = array_map(fn (PersonHistory $history) => $history->getPerson(), $historiesRemoved);
+            $currents = array_filter($currents, fn (Person $a) => !in_array($a, $removed, true));
+            foreach ($historiesAdded as $history) {
+                $currents[] = $history->getPerson();
+            }
+
+            $steps[] = [
+                'event_type' => 'persons_state',
+                'at' => $at,
+                'by' => $by,
+                'data' => [
+                    'persons' => array_values($currents),
+                ],
+            ];
+        }
+
+        return $steps;
+    }
 }

From 154fc3e2f6e4fbff91286714676feeca384f287d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 4 Jun 2024 11:59:26 +0200
Subject: [PATCH 099/283] Increase size between user-groups in
 AddresseeSelectorComponent.vue

---
 .../components/AddresseeSelectorComponent.vue     | 15 ++++++++++-----
 1 file changed, 10 insertions(+), 5 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue
index aebb21895..7d2652c90 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue
@@ -1,13 +1,13 @@
 <template>
     <div class="row">
         <div class="col-12 col-lg-6 col-md-6 text-center">
-            <div class="mb-2">
+            <div class="mb-5 level-line">
                 <span
                     v-for="userGroupItem in userGroups.filter(
                         (userGroup) => userGroup.excludeKey == 'level'
                     )"
                     :key="userGroupItem.id"
-                    class="m-1"
+                    class="m-2 as-user-group"
                 >
                     <input
                         type="radio"
@@ -34,13 +34,13 @@
                     </label>
                 </span>
             </div>
-            <div class="mb-2">
+            <div class="mb-2 level-line">
                 <span
                     v-for="userGroupItem in userGroups.filter(
                         (userGroup) => userGroup.excludeKey == ''
                     )"
                     :key="userGroupItem.id"
-                    class="m-1"
+                    class="m-2"
                 >
                     <input
                         type="checkbox"
@@ -146,7 +146,8 @@ export default defineComponent({
 
         function getUserGroupBtnColor(userGroup: UserGroup) {
             return [
-                `.btn-check:checked + .btn-${userGroup.id} {
+                `color: ${userGroup.foregroundColor};
+                .btn-check:checked + .btn-${userGroup.id} {
                 color: ${userGroup.foregroundColor};
                 background-color: ${userGroup.backgroundColor};
                 }`,
@@ -238,4 +239,8 @@ export default defineComponent({
     box-shadow: 0 0 0 0.2rem var(--bs-chill-green);
     outline: 0;
 }
+
+.as-user-group {
+    display: inline-block;
+}
 </style>

From 80bcc68ce576a6a7ee5f221cd7e994e311fd77c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 4 Jun 2024 15:40:05 +0200
Subject: [PATCH 100/283] WIP temporarily force extension to xlsx

---
 .../Resources/public/lib/download-report/download-report.js   | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/download-report/download-report.js b/src/Bundle/ChillMainBundle/Resources/public/lib/download-report/download-report.js
index 041e94c45..8b3429f28 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/lib/download-report/download-report.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/download-report/download-report.js
@@ -15,7 +15,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-var mime = require('mime')
+var mime = require('mime');
 
 var download_report = (url, container) => {
     var download_text = container.dataset.downloadText,
@@ -43,7 +43,7 @@ var download_report = (url, container) => {
                 content = URL.createObjectURL(blob);
             }
 
-            extension = mime.getExtension(type);
+            extension = 'xlsx';//mime.extension(type);
 
             link.appendChild(document.createTextNode(download_text));
             link.classList.add("btn", "btn-action");

From 1df542603ebe02667fc2445866f3cdcdebe489e4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 4 Jun 2024 21:51:42 +0200
Subject: [PATCH 101/283] Refactor export download script to use ES6 and
 webpack

The export download script was refactored to use ES6 syntax and webpack's modular system. This included separating out the download script into its own file for better organization, removing globally-scoped JavaScript, and adding the new download script as a webpack entry point. Also, the import method for the 'mime' library was adjusted to use ES6 syntax.
---
 .../lib/download-report/download-report.js       |  8 +++-----
 .../public/page/export/download-export.js        | 16 ++++++++++++++++
 .../Resources/views/Export/download.html.twig    | 14 ++++++--------
 .../ChillMainBundle/chill.webpack.config.js      |  2 ++
 4 files changed, 27 insertions(+), 13 deletions(-)
 create mode 100644 src/Bundle/ChillMainBundle/Resources/public/page/export/download-export.js

diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/download-report/download-report.js b/src/Bundle/ChillMainBundle/Resources/public/lib/download-report/download-report.js
index 8b3429f28..afbbe071a 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/lib/download-report/download-report.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/download-report/download-report.js
@@ -15,9 +15,9 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-var mime = require('mime');
+import mime from 'mime';
 
-var download_report = (url, container) => {
+export const download_report = (url, container) => {
     var download_text = container.dataset.downloadText,
         alias = container.dataset.alias;
 
@@ -43,7 +43,7 @@ var download_report = (url, container) => {
                 content = URL.createObjectURL(blob);
             }
 
-            extension = 'xlsx';//mime.extension(type);
+            extension = mime.getExtension(type);
 
             link.appendChild(document.createTextNode(download_text));
             link.classList.add("btn", "btn-action");
@@ -63,5 +63,3 @@ var download_report = (url, container) => {
                 .replaceChild(problem_text, container.firstChild);
         });
 };
-
-module.exports = download_report;
diff --git a/src/Bundle/ChillMainBundle/Resources/public/page/export/download-export.js b/src/Bundle/ChillMainBundle/Resources/public/page/export/download-export.js
new file mode 100644
index 000000000..a0559fdad
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/page/export/download-export.js
@@ -0,0 +1,16 @@
+import {download_report} from "../../lib/download-report/download-report";
+
+window.addEventListener("DOMContentLoaded", function(e) {
+  const export_generate_url = window.export_generate_url;
+
+  if (typeof export_generate_url === 'undefined') {
+    console.error('Alias not found!');
+    throw new Error('Alias not found!');
+  }
+
+  const query = window.location.search,
+    container = document.querySelector("#download_container")
+  ;
+
+  download_report(export_generate_url + "?" + query.toString(), container);
+});
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Export/download.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Export/download.html.twig
index bd7dbf7e9..13d064691 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Export/download.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Export/download.html.twig
@@ -22,15 +22,13 @@
 
 {% block js %}
 <script type="text/javascript">
-window.addEventListener("DOMContentLoaded", function(e) {
-    var url = "{{ path('chill_main_export_generate', { 'alias' : alias } ) }}",
-        query = window.location.search,
-        container = document.querySelector("#download_container")
-        ;
-
-    chill.download_report(url+query, container);
-});
+window.export_generate_url = "{{  path('chill_main_export_generate', { 'alias' : alias } ) }}";
 </script>
+{{ encore_entry_link_tags('page_download_exports') }}
+{% endblock %}
+
+{% block css %}
+    {{ encore_entry_script_tags('page_download_exports') }}
 {% endblock %}
 
 {% block content %}
diff --git a/src/Bundle/ChillMainBundle/chill.webpack.config.js b/src/Bundle/ChillMainBundle/chill.webpack.config.js
index 287e6ae89..6576b2e0b 100644
--- a/src/Bundle/ChillMainBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillMainBundle/chill.webpack.config.js
@@ -52,12 +52,14 @@ module.exports = function(encore, entries)
         Tabs: __dirname + '/Resources/public/lib/tabs'
     });
 
+
     // Page entrypoints
     encore.addEntry('page_login', __dirname + '/Resources/public/page/login/index.js');
     encore.addEntry('page_location', __dirname + '/Resources/public/page/location/index.js');
     encore.addEntry('page_workflow_show', __dirname + '/Resources/public/page/workflow-show/index.js');
     encore.addEntry('page_homepage_widget', __dirname + '/Resources/public/page/homepage_widget/index.js');
     encore.addEntry('page_export', __dirname + '/Resources/public/page/export/index.js');
+    encore.addEntry('page_download_exports', __dirname + '/Resources/public/page/export/download-export.js');
 
     buildCKEditor(encore);
 

From bdf2ed4bbd1f725158b6d0512f302ec5ba9470c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 21 May 2025 17:57:35 +0200
Subject: [PATCH 102/283] Fix typo

---
 .../notification_location_user_on_period_has_moved.fr.txt.twig  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/notification_location_user_on_period_has_moved.fr.txt.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/notification_location_user_on_period_has_moved.fr.txt.twig
index df932067c..85bce211f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/notification_location_user_on_period_has_moved.fr.txt.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingPeriod/notification_location_user_on_period_has_moved.fr.txt.twig
@@ -8,7 +8,7 @@ L'usager {{ oldPersonLocation|chill_entity_render_string }} a déménagé.
 Son adresse était utilisée pour localiser le parcours n°{{ period.id }}, dont vous êtes
 le référent.
 
-En conséquence de ce déménage, le parcours est toujours localisé à cette adresse, mais à l'aide d'une
+En conséquence de ce déménagement, le parcours est toujours localisé à cette adresse, mais à l'aide d'une
 adresse temporaire.
 
 Si vous continuez à suivre le parcours, vous pouvez le localiser à nouveau auprès de l'adresse de

From 128101dc46198733e1fae5c5b2159a445d3fdf67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 27 May 2025 09:59:51 +0200
Subject: [PATCH 103/283] Add ChillTicketBundle to project configuration

ChillTicketBundle is now registered in `composer.json`, `bundles.php`, and `doctrine_migrations_chill.yaml`. This integration ensures its autoloading, enables its functionality across environments, and sets up its migration paths.
---
 composer.json                                  | 1 +
 config/bundles.php                             | 1 +
 config/packages/doctrine_migrations_chill.yaml | 1 +
 3 files changed, 3 insertions(+)

diff --git a/composer.json b/composer.json
index 8d36d4d07..94338ce42 100644
--- a/composer.json
+++ b/composer.json
@@ -133,6 +133,7 @@
             "Chill\\TaskBundle\\": "src/Bundle/ChillTaskBundle",
             "Chill\\ThirdPartyBundle\\": "src/Bundle/ChillThirdPartyBundle",
             "Chill\\WopiBundle\\": "src/Bundle/ChillWopiBundle/src",
+            "Chill\\TicketBundle\\": "src/Bundle/ChillTicketBundle/src",
             "Chill\\Utils\\Rector\\": "utils/rector/src"
         }
     },
diff --git a/config/bundles.php b/config/bundles.php
index ec11bc0b6..2eb99868b 100644
--- a/config/bundles.php
+++ b/config/bundles.php
@@ -35,6 +35,7 @@ return [
     Chill\ThirdPartyBundle\ChillThirdPartyBundle::class => ['all' => true],
     Chill\BudgetBundle\ChillBudgetBundle::class => ['all' => true],
     Chill\WopiBundle\ChillWopiBundle::class => ['all' => true],
+    Chill\TicketBundle\ChillTicketBundle::class => ['all' => true],
     Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
     Symfony\UX\Translator\UxTranslatorBundle::class => ['all' => true],
 ];
diff --git a/config/packages/doctrine_migrations_chill.yaml b/config/packages/doctrine_migrations_chill.yaml
index 8b8bf539b..29acb8a49 100644
--- a/config/packages/doctrine_migrations_chill.yaml
+++ b/config/packages/doctrine_migrations_chill.yaml
@@ -14,6 +14,7 @@ doctrine_migrations:
         'Chill\Migrations\Calendar': '@ChillCalendarBundle/migrations'
         'Chill\Migrations\Budget': '@ChillBudgetBundle/migrations'
         'Chill\Migrations\Report': '@ChillReportBundle/migrations'
+        'Chill\Migrations\Ticket': '@ChillTicketBundle/migrations'
     all_or_nothing:
         true
 

From b035020c6fe52ec4cd9e227ee9969454b14dcc15 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 27 May 2025 10:20:55 +0200
Subject: [PATCH 104/283] Clarify and expand "create a new bundle"
 documentation

Rewrote the "create a new bundle" guide for clarity and completeness. Added detailed steps for creating a bundle class, registering namespaces in `composer.json`, updating configuration files, and dumping autoload. These changes aim to make the instructions easier to follow for new developers.
---
 .../development/create-a-new-bundle.rst       | 81 +++++++++++++++----
 1 file changed, 67 insertions(+), 14 deletions(-)

diff --git a/docs/source/development/create-a-new-bundle.rst b/docs/source/development/create-a-new-bundle.rst
index 087487ff0..61eda87bd 100644
--- a/docs/source/development/create-a-new-bundle.rst
+++ b/docs/source/development/create-a-new-bundle.rst
@@ -11,24 +11,77 @@
 Create a new bundle
 *******************
 
-Create your own bundle is not a trivial task.
-
-The easiest way to achieve this is seems to be : 
-
-1. Prepare a fresh installation of the chill project, in a new directory
-2. Create a new bundle in this project, in the src directory
-3. Initialize a git repository **at the root bundle**, and create your initial commit.
-4. Register the bundle with composer/packagist. If you do not plan to distribute your bundle with packagist, you may use a custom repository for achieve this [#f1]_
-5. Move to a development installation, made as described in the :ref:`installation-for-development` section, and add your new repository to the composer.json file
-6. Work as :ref:`usual <editing-code-and-commiting>`
-
 .. warning::
 
     This part of the doc is not yet tested
 
-TODO
+Create a new directory with Bundle class
+----------------------------------------
+
+.. code-block:: bash
+
+   mkdir -p src/Bundle/ChillSomeBundle/src
+
+Add a bundle file
+
+.. code-block:: php
+
+    <?php
+
+    declare(strict_types=1);
+
+    /*
+     * Chill is a software for social workers
+     *
+     * For the full copyright and license information, please view
+     * the LICENSE file that was distributed with this source code.
+     */
+
+    namespace Chill\SomeBundle;
+
+    use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+    class ChillSomeBundle extends Bundle {}
+
+Register the new psr-4 namespace
+--------------------------------
+
+In composer.json, add the new psr4 namespace
+
+.. code-block:: diff
+
+    {
+    "autoload": {
+        "psr-4": {
+    +        "Chill\\SomeBundle\\": "src/Bundle/ChillSomeBundle/src",
+        }
+    }
+    }
 
 
-.. rubric:: Footnotes
+Register the bundle
+-------------------
+
+Register in the file :code:`config/bundles.php`:
+
+.. code-block:: php
+    Vendor\Bundle\YourBundle\YourBundle::class => ['all' => true],
+
+Add the doctrine_migration namespace
+------------------------------------
+
+Add the namespace to :code:`config/packages/doctrine_migrations_chill.yaml`
+
+.. code-block:: diff
+
+   doctrine_migrations:
+       migrations_paths:
+   +        'Chill\Some\Ticket': '@ChillSomeBundle/migrations'
+
+Dump autoloading
+----------------
+
+.. code-block:: bash
+
+   symfony composer dump-autoload
 
-.. [#f1] Be aware that we use the Affero GPL Licence, which ensure that all users must have access to derivative works done with this software.

From 25be5c9ea318dc17b2eab27c26ef3b17ec7a07ff Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 27 May 2025 10:21:25 +0200
Subject: [PATCH 105/283] Automatic eslint fixes

---
 .../src/Resources/public/page/ticket/index.ts |   2 +-
 .../src/Resources/public/types.ts             | 130 +++++++++---------
 .../Resources/public/vuejs/TicketApp/App.vue  |   2 +-
 .../components/ActionToolbarComponent.vue     |  43 ++++--
 .../components/AddresseeComponent.vue         |  68 ++++-----
 .../components/AddresseeSelectorComponent.vue |  31 +++--
 .../TicketApp/components/BannerComponent.vue  |  25 +++-
 .../components/PersonsSelectorComponent.vue   |  65 +++++----
 .../TicketHistoryCreateComponent.vue          |   9 +-
 .../components/TicketHistoryListComponent.vue |  26 ++--
 .../TicketHistoryPersonComponent.vue          |  10 +-
 .../components/TicketSelectorComponent.vue    |  38 ++---
 .../Resources/public/vuejs/TicketApp/index.ts |  27 ++--
 .../public/vuejs/TicketApp/store/index.ts     |   6 +-
 .../TicketApp/store/modules/addressee.ts      |  14 +-
 .../vuejs/TicketApp/store/modules/comment.ts  |  11 +-
 .../vuejs/TicketApp/store/modules/motive.ts   |  10 +-
 .../vuejs/TicketApp/store/modules/persons.ts  |  21 +--
 .../vuejs/TicketApp/store/modules/ticket.ts   |  16 ++-
 19 files changed, 310 insertions(+), 244 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/page/ticket/index.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/page/ticket/index.ts
index 2361e49da..704996bc9 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/page/ticket/index.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/page/ticket/index.ts
@@ -1 +1 @@
-import './banner.scss';
+import "./banner.scss";
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
index 888d3179e..10ab90926 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
@@ -2,104 +2,108 @@ import {
     DateTime,
     TranslatableString,
     User,
-    UserGroupOrUser
+    UserGroupOrUser,
 } from "../../../../ChillMainBundle/Resources/public/types";
 import { Person } from "../../../../ChillPersonBundle/Resources/public/types";
 
 export interface Motive {
-    type: "ticket_motive"
-    id: number,
-    active: boolean,
-    label: TranslatableString
+    type: "ticket_motive";
+    id: number;
+    active: boolean;
+    label: TranslatableString;
 }
 
 interface TicketHistory<T extends string, D extends object> {
-    event_type: T,
-    at: DateTime,
-    by: User,
-    data: D
+    event_type: T;
+    at: DateTime;
+    by: User;
+    data: D;
 }
 
 export interface PersonHistory {
-    type: "ticket_person_history",
-    id: number,
-    startDate: DateTime,
-    endDate: null|DateTime,
-    person: Person,
-    removedBy: null,
-    createdBy: User|null,
-    createdAt: DateTime|null
+    type: "ticket_person_history";
+    id: number;
+    startDate: DateTime;
+    endDate: null | DateTime;
+    person: Person;
+    removedBy: null;
+    createdBy: User | null;
+    createdAt: DateTime | null;
 }
 
 export interface MotiveHistory {
-    type: "ticket_motive_history",
-    id: number,
-    startDate: null,
-    endDate: null|DateTime,
-    motive: Motive,
-    createdBy: User|null,
-    createdAt: DateTime|null,
+    type: "ticket_motive_history";
+    id: number;
+    startDate: null;
+    endDate: null | DateTime;
+    motive: Motive;
+    createdBy: User | null;
+    createdAt: DateTime | null;
 }
 
 export interface Comment {
-    type: "ticket_comment",
-    id: number,
-    content: string,
-    createdBy: User|null,
-    createdAt: DateTime|null,
-    updatedBy: User|null,
-    updatedAt: DateTime|null,
+    type: "ticket_comment";
+    id: number;
+    content: string;
+    createdBy: User | null;
+    createdAt: DateTime | null;
+    updatedBy: User | null;
+    updatedAt: DateTime | null;
 }
 
 export interface AddresseeHistory {
-    type: "ticket_addressee_history",
-    id: number,
-    startDate: DateTime|null,
-    addressee: UserGroupOrUser,
-    endDate: DateTime|null,
-    removedBy: User|null,
-    createdBy: User|null,
-    createdAt: DateTime|null,
-    updatedBy: User|null,
-    updatedAt: DateTime|null,
+    type: "ticket_addressee_history";
+    id: number;
+    startDate: DateTime | null;
+    addressee: UserGroupOrUser;
+    endDate: DateTime | null;
+    removedBy: User | null;
+    createdBy: User | null;
+    createdAt: DateTime | null;
+    updatedBy: User | null;
+    updatedAt: DateTime | null;
 }
 
 export interface AddresseeState {
-    addressees: UserGroupOrUser[],
+    addressees: UserGroupOrUser[];
 }
 
 export interface PersonsState {
-    persons: Person[]
+    persons: Person[];
 }
 
 export interface CreateTicketState {}
 
 //interface AddPersonEvent extends TicketHistory<"add_person", PersonHistory> {};
-export interface AddCommentEvent extends TicketHistory<"add_comment", Comment> {};
-export interface SetMotiveEvent extends TicketHistory<"set_motive", MotiveHistory> {};
+export interface AddCommentEvent
+    extends TicketHistory<"add_comment", Comment> {}
+export interface SetMotiveEvent
+    extends TicketHistory<"set_motive", MotiveHistory> {}
 //interface AddAddressee extends TicketHistory<"add_addressee", AddresseeHistory> {};
 //interface RemoveAddressee extends TicketHistory<"remove_addressee", AddresseeHistory> {};
-export interface AddresseesStateEvent extends TicketHistory<"addressees_state", AddresseeState> {};
-export interface CreateTicketEvent extends TicketHistory<"create_ticket", CreateTicketState> {};
-export interface PersonStateEvent extends TicketHistory<"persons_state", PersonsState> {};
+export interface AddresseesStateEvent
+    extends TicketHistory<"addressees_state", AddresseeState> {}
+export interface CreateTicketEvent
+    extends TicketHistory<"create_ticket", CreateTicketState> {}
+export interface PersonStateEvent
+    extends TicketHistory<"persons_state", PersonsState> {}
 
 export type TicketHistoryLine =
     /* AddPersonEvent */
-    CreateTicketEvent |
-    AddCommentEvent |
-    SetMotiveEvent | /*AddAddressee | RemoveAddressee | */
-    AddresseesStateEvent |
-    PersonStateEvent;
+    | CreateTicketEvent
+    | AddCommentEvent
+    | SetMotiveEvent /*AddAddressee | RemoveAddressee | */
+    | AddresseesStateEvent
+    | PersonStateEvent;
 
 export interface Ticket {
-    type: "ticket_ticket",
-    id: number,
-    externalRef: string,
-    currentAddressees: UserGroupOrUser[],
-    currentPersons: Person[],
-    currentMotive: null|Motive,
-    history: TicketHistoryLine[],
-    createdAt: DateTime|null,
-    updatedBy: User|null,
+    type: "ticket_ticket";
+    id: number;
+    externalRef: string;
+    currentAddressees: UserGroupOrUser[];
+    currentPersons: Person[];
+    currentMotive: null | Motive;
+    history: TicketHistoryLine[];
+    createdAt: DateTime | null;
+    updatedBy: User | null;
 }
-
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
index e4fda5734..14347604c 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
@@ -38,7 +38,7 @@ export default defineComponent({
         const ticket = computed(() => store.getters.getTicket as Ticket);
 
         const ticketHistory = computed(
-            () => store.getters.getDistinctAddressesHistory
+            () => store.getters.getDistinctAddressesHistory,
         );
 
         onMounted(async () => {
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
index c73aed8a5..18a97cce1 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
@@ -8,7 +8,10 @@
                     </label>
                 </div>
 
-                <form v-if="activeTab !== 'set_persons'" @submit.prevent="submitAction">
+                <form
+                    v-if="activeTab !== 'set_persons'"
+                    @submit.prevent="submitAction"
+                >
                     <add-comment-component
                         v-model="content"
                         v-if="activeTab === 'add_comment'"
@@ -44,7 +47,9 @@
                     </ul>
                 </form>
                 <template v-else>
-                    <persons-selector-component @closeRequested="closeAllActions()" />
+                    <persons-selector-component
+                        @closeRequested="closeAllActions()"
+                    />
                 </template>
             </div>
         </div>
@@ -54,7 +59,9 @@
                     <a :href="returnPath" class="btn btn-cancel">Annuler</a>
                 </li>
                 <li v-else class="nav-item p-2 go-back">
-                    <a href="/fr/ticket/ticket/list" class="btn btn-cancel">Annuler</a>
+                    <a href="/fr/ticket/ticket/list" class="btn btn-cancel"
+                        >Annuler</a
+                    >
                 </li>
                 <li class="nav-item p-2">
                     <button
@@ -176,40 +183,47 @@ export default defineComponent({
         const { t } = useI18n();
         const toast = inject("toast") as any;
         const activeTab = ref(
-            "" as "" | "add_comment" | "set_motive" | "add_addressee" | "set_persons"
+            "" as
+                | ""
+                | "add_comment"
+                | "set_motive"
+                | "add_addressee"
+                | "set_persons",
         );
 
         const ticket = computed(() => store.getters.getTicket as Ticket);
         const motives = computed(() => store.getters.getMotives as Motive[]);
         const userGroups = computed(
-            () => store.getters.getUserGroups as UserGroup[]
+            () => store.getters.getUserGroups as UserGroup[],
         );
         const users = computed(() => store.getters.getUsers as User[]);
 
-        const hasReturnPath = computed((): boolean =>  {
+        const hasReturnPath = computed((): boolean => {
             const params = new URL(document.location.toString()).searchParams;
-            return params.has('returnPath');
+            return params.has("returnPath");
         });
 
         const returnPath = computed((): string => {
             const params = new URL(document.location.toString()).searchParams;
-            const returnPath = params.get('returnPath');
+            const returnPath = params.get("returnPath");
 
             if (null === returnPath) {
-                throw new Error("there isn't any returnPath, please check the existence before");
+                throw new Error(
+                    "there isn't any returnPath, please check the existence before",
+                );
             }
 
             return returnPath;
-        })
+        });
 
         const motive = ref(
             ticket.value.currentMotive
                 ? ticket.value.currentMotive
-                : ({} as Motive)
+                : ({} as Motive),
         );
         const content = ref("" as Comment["content"]);
         const addressees = ref(
-            ticket.value.currentAddressees as Array<UserGroupOrUser>
+            ticket.value.currentAddressees as UserGroupOrUser[],
         );
 
         async function submitAction() {
@@ -262,9 +276,9 @@ export default defineComponent({
             alert("Sera disponible plus tard");
         }
 
-        const closeAllActions = function() {
+        const closeAllActions = function () {
             activeTab.value = "";
-        }
+        };
 
         return {
             actionIcons: ref(store.getters.getActionIcons),
@@ -287,7 +301,6 @@ export default defineComponent({
 </script>
 
 <style lang="scss" scoped>
-
 .go-back {
     margin-right: auto;
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeComponent.vue
index 9f1d76d59..068f5ff5d 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeComponent.vue
@@ -1,29 +1,33 @@
 <template>
-        <div class="col-12">
-            <span
-                v-for="userGroup in userGroupLevels"
-                :key="userGroup.id"
-                class="badge-user-group"
-                :style="`background-color: ${userGroup.backgroundColor}; color: ${userGroup.foregroundColor};`"
-            >
-                {{ userGroup.label.fr }}
-            </span>
-        </div>
-        <div class="col-12">
-            <span
-                v-for="userGroup in userGroups"
-                :key="userGroup.id"
-                class="badge-user-group"
-                :style="`background-color: ${userGroup.backgroundColor}; color: ${userGroup.foregroundColor};`"
-            >
-                {{ userGroup.label.fr }}
-            </span>
-        </div>
-        <div v-if="users.length > 0" class="col-12">
-            <span class="badge-user">
-                <user-render-box-badge v-for="user in users" :key="user.id" :user="user"></user-render-box-badge>
-            </span>
-        </div>
+    <div class="col-12">
+        <span
+            v-for="userGroup in userGroupLevels"
+            :key="userGroup.id"
+            class="badge-user-group"
+            :style="`background-color: ${userGroup.backgroundColor}; color: ${userGroup.foregroundColor};`"
+        >
+            {{ userGroup.label.fr }}
+        </span>
+    </div>
+    <div class="col-12">
+        <span
+            v-for="userGroup in userGroups"
+            :key="userGroup.id"
+            class="badge-user-group"
+            :style="`background-color: ${userGroup.backgroundColor}; color: ${userGroup.foregroundColor};`"
+        >
+            {{ userGroup.label.fr }}
+        </span>
+    </div>
+    <div v-if="users.length > 0" class="col-12">
+        <span class="badge-user">
+            <user-render-box-badge
+                v-for="user in users"
+                :key="user.id"
+                :user="user"
+            ></user-render-box-badge>
+        </span>
+    </div>
 </template>
 
 <script lang="ts">
@@ -39,7 +43,7 @@ import UserRenderBoxBadge from "ChillMainAssets/vuejs/_components/Entity/UserRen
 
 export default defineComponent({
     name: "AddresseeComponent",
-    components: {UserRenderBoxBadge},
+    components: { UserRenderBoxBadge },
     props: {
         addressees: {
             type: Array as PropType<UserGroupOrUser[]>,
@@ -52,22 +56,22 @@ export default defineComponent({
                 props.addressees.filter(
                     (addressee) =>
                         addressee.type == "user_group" &&
-                        addressee.excludeKey == ""
-                ) as UserGroup[]
+                        addressee.excludeKey == "",
+                ) as UserGroup[],
         );
         const userGroupLevels = computed(
             () =>
                 props.addressees.filter(
                     (addressee) =>
                         addressee.type == "user_group" &&
-                        addressee.excludeKey == "level"
-                ) as UserGroup[]
+                        addressee.excludeKey == "level",
+                ) as UserGroup[],
         );
         const users = computed(
             () =>
                 props.addressees.filter(
-                    (addressee) => addressee.type == "user"
-                ) as User[]
+                    (addressee) => addressee.type == "user",
+                ) as User[],
         );
         return { userGroups, users, userGroupLevels };
     },
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue
index 7d2652c90..92721319d 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue
@@ -4,7 +4,7 @@
             <div class="mb-5 level-line">
                 <span
                     v-for="userGroupItem in userGroups.filter(
-                        (userGroup) => userGroup.excludeKey == 'level'
+                        (userGroup) => userGroup.excludeKey == 'level',
                     )"
                     :key="userGroupItem.id"
                     class="m-2 as-user-group"
@@ -19,7 +19,7 @@
                         v-model="userGroupLevel"
                         @click="
                             Object.values(userGroupLevel).includes(
-                                userGroupItem.id
+                                userGroupItem.id,
                             )
                                 ? (userGroupLevel = {})
                                 : (userGroupLevel = userGroupItem)
@@ -37,7 +37,7 @@
             <div class="mb-2 level-line">
                 <span
                     v-for="userGroupItem in userGroups.filter(
-                        (userGroup) => userGroup.excludeKey == ''
+                        (userGroup) => userGroup.excludeKey == '',
                     )"
                     :key="userGroupItem.id"
                     class="m-2"
@@ -93,10 +93,10 @@ import {
     User,
     UserGroup,
     UserGroupOrUser,
-} from "../../../../../../../ChillMainBundle/Resources/public/types";
+} from "ChillMainAssets/types";
 
 // Components
-import AddPersons from "../../../../../../../ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue";
+import AddPersons from "ChillPersonAssets/Resources/public/vuejs/_components/AddPersons.vue";
 
 export default defineComponent({
     name: "AddresseeSelectorComponent",
@@ -124,18 +124,19 @@ export default defineComponent({
         const addressees = ref([...props.modelValue] as UserGroupOrUser[]);
         const userGroups = [
             ...props.modelValue.filter(
-                (addressee) => addressee.type == "user_group"
+                (addressee) => addressee.type == "user_group",
             ),
         ] as UserGroup[];
 
         const userGroupLevel = ref(
             userGroups.filter(
-                (userGroup) => userGroup.excludeKey == "level"
-            )[0] as UserGroup | {}
+                (userGroup) => userGroup.excludeKey == "level",
+            )[0] as UserGroup | {},
         );
         const userGroup = ref(
-            userGroups.filter((userGroup) => userGroup.excludeKey == "") as
-                | UserGroup[]
+            userGroups.filter(
+                (userGroup) => userGroup.excludeKey == "",
+            ) as UserGroup[],
         );
         const users = ref([
             ...props.modelValue.filter((addressee) => addressee.type == "user"),
@@ -157,7 +158,7 @@ export default defineComponent({
             const { selected, modal } = datas;
             users.value = selected.map((selected: any) => selected.result);
             addressees.value = addressees.value.filter(
-                (addressee) => addressee.type === "user_group"
+                (addressee) => addressee.type === "user_group",
             );
             addressees.value = [...addressees.value, ...users.value];
             ctx.emit("update:modelValue", addressees.value);
@@ -180,14 +181,14 @@ export default defineComponent({
         function removeUser(user: User) {
             users.value.splice(users.value.indexOf(user), 1);
             addressees.value = addressees.value.filter(
-                (addressee) => addressee.id !== user.id
+                (addressee) => addressee.id !== user.id,
             );
             ctx.emit("update:modelValue", addressees.value);
         }
 
         watch(userGroupLevel, (userGroupLevelAdd, userGroupLevelRem) => {
             const index = addressees.value.indexOf(
-                userGroupLevelRem as UserGroup
+                userGroupLevelRem as UserGroup,
             );
             if (index !== -1) {
                 addressees.value.splice(index, 1);
@@ -200,10 +201,10 @@ export default defineComponent({
             const userGroupLevel = addressees.value.filter(
                 (addressee) =>
                     addressee.type == "user_group" &&
-                    addressee.excludeKey == "level"
+                    addressee.excludeKey == "level",
             ) as UserGroup[];
             const users = addressees.value.filter(
-                (addressee) => addressee.type == "user"
+                (addressee) => addressee.type == "user",
             ) as UserGroup[];
             addressees.value = [...users, ...userGroupLevel, ...userGroupAdd];
             ctx.emit("update:modelValue", addressees.value);
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
index b9535c284..3ec37864c 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
@@ -14,7 +14,10 @@
 
                 <div class="col-md-6 col-sm-12">
                     <div class="d-flex justify-content-end">
-                        <span class="badge text-bg-chill-green text-white" style="font-size: 1rem;">
+                        <span
+                            class="badge text-bg-chill-green text-white"
+                            style="font-size: 1rem"
+                        >
                             {{ $t("banner.open") }}
                         </span>
                     </div>
@@ -38,7 +41,15 @@
                     <h3 class="text-primary">
                         {{ $t("banner.concerned_patient") }}
                     </h3>
-                    <on-the-fly v-for="person in ticket.currentPersons" :key="person.id" :type="person.type" :id="person.id" :buttonText="person.textAge" :displayBadge="'true' === 'true'" action="show"></on-the-fly>
+                    <on-the-fly
+                        v-for="person in ticket.currentPersons"
+                        :key="person.id"
+                        :type="person.type"
+                        :id="person.id"
+                        :buttonText="person.textAge"
+                        :displayBadge="'true' === 'true'"
+                        action="show"
+                    ></on-the-fly>
                 </div>
                 <div class="col-md-6 col-sm-12">
                     <h3 class="text-primary">{{ $t("banner.speaker") }}</h3>
@@ -68,7 +79,7 @@ import AddresseeComponent from "./AddresseeComponent.vue";
 
 // Types
 import { Ticket } from "../../../types";
-import {ISOToDatetime} from "../../../../../../../ChillMainBundle/Resources/public/chill/js/date";
+import { ISOToDatetime } from "../../../../../../../ChillMainBundle/Resources/public/chill/js/date";
 import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue";
 
 export default defineComponent({
@@ -106,15 +117,15 @@ export default defineComponent({
             const timeDiff = Math.abs(today.value.getTime() - date.getTime());
             const daysDiff = Math.floor(timeDiff / (1000 * 3600 * 24));
             const hoursDiff = Math.floor(
-                (timeDiff % (1000 * 3600 * 24)) / (1000 * 3600)
+                (timeDiff % (1000 * 3600 * 24)) / (1000 * 3600),
             );
             const minutesDiff = Math.floor(
-                (timeDiff % (1000 * 3600)) / (1000 * 60)
+                (timeDiff % (1000 * 3600)) / (1000 * 60),
             );
             const secondsDiff = Math.floor((timeDiff % (1000 * 60)) / 1000);
 
             if (daysDiff < 1 && hoursDiff < 1 && minutesDiff < 1) {
-                return `${t("banner.seconds", {count: secondsDiff})}`;
+                return `${t("banner.seconds", { count: secondsDiff })}`;
             } else if (daysDiff < 1 && hoursDiff < 1) {
                 return `${t("banner.minutes", { count: minutesDiff })}`;
             } else if (daysDiff < 1) {
@@ -125,7 +136,7 @@ export default defineComponent({
                     "banner.hours",
                     {
                         count: hoursDiff,
-                    }
+                    },
                 )}  ${t("banner.minutes", {
                     count: minutesDiff,
                 })}`;
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PersonsSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PersonsSelectorComponent.vue
index 4f91d0542..a288299f1 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PersonsSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PersonsSelectorComponent.vue
@@ -1,16 +1,13 @@
 <script setup lang="ts">
-
-import {useStore} from "vuex";
+import { useStore } from "vuex";
 import AddPersons from "ChillPersonAssets/vuejs/_components/AddPersons.vue";
-import {computed, inject, reactive} from "vue";
-import {Ticket} from "../../../types";
-import {Person} from "../../../../../../../ChillPersonBundle/Resources/public/types"
+import { computed, inject, reactive } from "vue";
+import { Ticket } from "../../../types";
+import { Person } from "../../../../../../../ChillPersonBundle/Resources/public/types";
 import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue";
-import {ToastPluginApi} from "vue-toast-notification";
+import { ToastPluginApi } from "vue-toast-notification";
 
-const emit = defineEmits<{
-    (e: 'closeRequested'): void
-}>()
+const emit = defineEmits<(e: "closeRequested") => void>();
 
 const store = useStore();
 const toast = inject("toast") as ToastPluginApi;
@@ -19,44 +16,55 @@ const persons = computed(() => ticket.value.currentPersons);
 
 const addPersonsOptions = {
     uniq: false,
-    type: ['person'],
+    type: ["person"],
     priority: null,
     button: {
-        class: 'btn-submit',
+        class: "btn-submit",
     },
 };
 
 const added: Person[] = reactive([]);
 const removed: Person[] = reactive([]);
 
-const computeCurrentPersons = (initial: Person[], added: Person[], removed: Person[]): Person[] => {
+const computeCurrentPersons = (
+    initial: Person[],
+    added: Person[],
+    removed: Person[],
+): Person[] => {
     for (let p of added) {
         if (initial.findIndex((element) => element.id === p.id) === -1) {
             initial.push(p);
         }
     }
 
-    return initial.filter((p) => removed.findIndex((element) => element.id === p.id) === -1);
-}
+    return initial.filter(
+        (p) => removed.findIndex((element) => element.id === p.id) === -1,
+    );
+};
 
 const currentPersons = computed((): Person[] => {
     return computeCurrentPersons(persons.value, added, removed);
-})
+});
 
 const removePerson = (p: Person) => {
     removed.push(p);
-}
+};
 
-const addNewEntity = (n: {modal: {showModal: boolean}, selected: Array<{result: Person}>}) => {
+const addNewEntity = (n: {
+    modal: { showModal: boolean };
+    selected: { result: Person }[];
+}) => {
     n.modal.showModal = false;
     for (let p of n.selected) {
         added.push(p.result);
     }
-}
+};
 
-const save = async function(): Promise<void> {
+const save = async function (): Promise<void> {
     try {
-        await store.dispatch("setPersons", { persons: computeCurrentPersons(persons.value, added, removed) });
+        await store.dispatch("setPersons", {
+            persons: computeCurrentPersons(persons.value, added, removed),
+        });
         toast.success("Patients concernés sauvegardés");
     } catch (e: any) {
         console.error("error while saving", e);
@@ -64,16 +72,25 @@ const save = async function(): Promise<void> {
         return Promise.resolve();
     }
     emit("closeRequested");
-}
-
+};
 </script>
 
 <template>
     <div>
         <ul v-if="currentPersons.length > 0" class="person-list">
             <li v-for="person in currentPersons" :key="person.id">
-                <on-the-fly :type="person.type" :id="person.id" :buttonText="person.textAge" :displayBadge="'true' === 'true'" action="show"></on-the-fly>
-                <button type="button" class="btn btn-delete remove-person" @click="removePerson(person)"></button>
+                <on-the-fly
+                    :type="person.type"
+                    :id="person.id"
+                    :buttonText="person.textAge"
+                    :displayBadge="'true' === 'true'"
+                    action="show"
+                ></on-the-fly>
+                <button
+                    type="button"
+                    class="btn btn-delete remove-person"
+                    @click="removePerson(person)"
+                ></button>
             </li>
         </ul>
         <p v-else class="chill-no-data-statement">Aucun patient</p>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCreateComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCreateComponent.vue
index 869689fdd..9cbc543ab 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCreateComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCreateComponent.vue
@@ -1,18 +1,15 @@
 <script setup lang="ts">
-import {User} from "../../../../../../../ChillMainBundle/Resources/public/types";
+import { User } from "../../../../../../../ChillMainBundle/Resources/public/types";
 
 interface TicketHistoryCreateComponentConfig {
-    by: User
+    by: User;
 }
 
 const props = defineProps<TicketHistoryCreateComponentConfig>();
-
 </script>
 
 <template>
     <p>Ticket créé par {{ props.by.text }}</p>
 </template>
 
-<style scoped lang="scss">
-
-</style>
+<style scoped lang="scss"></style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
index e60b7b235..dfa77e72b 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
@@ -7,7 +7,9 @@
         <div class="card-header">
             <div class="history-header">
                 <div class="description">
-                    <i :class="`${actionIcons[history_line.event_type]} me-1`"></i>
+                    <i
+                        :class="`${actionIcons[history_line.event_type]} me-1`"
+                    ></i>
                     <span>{{ explainSentence(history_line) }}</span>
                 </div>
                 <div>
@@ -17,7 +19,9 @@
                 </div>
                 <div>
                     <span class="badge-user">
-                    <user-render-box-badge :user="history_line.by"></user-render-box-badge>
+                        <user-render-box-badge
+                            :user="history_line.by"
+                        ></user-render-box-badge>
                     </span>
                 </div>
             </div>
@@ -42,18 +46,18 @@
             <ticket-history-create-component
                 :by="history_line.by"
                 v-else-if="history_line.event_type == 'create_ticket'"
-                />
+            />
         </div>
     </div>
 </template>
 
 <script lang="ts">
-import {PropType, defineComponent, ref, computed} from "vue";
+import { PropType, defineComponent, ref, computed } from "vue";
 import { useStore } from "vuex";
 
 // Types
 import { DateTime } from "../../../../../../../ChillMainBundle/Resources/public/types";
-import {TicketHistoryLine} from "../../../types";
+import { TicketHistoryLine } from "../../../types";
 
 // Components
 import TicketHistoryPersonComponent from "./TicketHistoryPersonComponent.vue";
@@ -62,7 +66,7 @@ import TicketHistoryCommentComponent from "./TicketHistoryCommentComponent.vue";
 import TicketHistoryAddresseeComponent from "./TicketHistoryAddresseeComponent.vue";
 import TicketHistoryCreateComponent from "./TicketHistoryCreateComponent.vue";
 import UserRenderBoxBadge from "ChillMainAssets/vuejs/_components/Entity/UserRenderBoxBadge.vue";
-import {ISOToDatetime} from "../../../../../../../ChillMainBundle/Resources/public/chill/js/date";
+import { ISOToDatetime } from "../../../../../../../ChillMainBundle/Resources/public/chill/js/date";
 
 export default defineComponent({
     name: "TicketHistoryListComponent",
@@ -96,8 +100,8 @@ export default defineComponent({
                     return "Nouveau motifs";
                 case "create_ticket":
                     return "Ticket créé";
-                }
-            };
+            }
+        };
 
         function formatDate(d: DateTime): string {
             const date = ISOToDatetime(d.datetime);
@@ -110,7 +114,11 @@ export default defineComponent({
             return `${date.getDate()} ${month} ${date.getFullYear()}, ${date.toLocaleTimeString()}`;
         }
 
-        return { actionIcons: ref(store.getters.getActionIcons), formatDate, explainSentence };
+        return {
+            actionIcons: ref(store.getters.getActionIcons),
+            formatDate,
+            explainSentence,
+        };
     },
 });
 </script>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryPersonComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryPersonComponent.vue
index f17278a92..b8657dc9c 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryPersonComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryPersonComponent.vue
@@ -2,7 +2,13 @@
     <div class="col-12">
         <ul class="persons-list">
             <li v-for="person in personHistory.persons" :key="person.id">
-                <on-the-fly :type="person.type" :id="person.id" :buttonText="person.textAge" :displayBadge="'true' === 'true'" action="show"></on-the-fly>
+                <on-the-fly
+                    :type="person.type"
+                    :id="person.id"
+                    :buttonText="person.textAge"
+                    :displayBadge="'true' === 'true'"
+                    action="show"
+                ></on-the-fly>
             </li>
         </ul>
     </div>
@@ -12,7 +18,7 @@
 import { PropType, defineComponent } from "vue";
 
 // Type
-import {PersonsState} from "../../../types";
+import { PersonsState } from "../../../types";
 import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue";
 
 export default defineComponent({
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketSelectorComponent.vue
index 2057af898..f6a6a5aaf 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketSelectorComponent.vue
@@ -1,28 +1,32 @@
 <template>
     <div class="d-flex justify-content-end">
         <div class="btn-group" @click="handleClick">
-        <button type="button" class="btn btn-light dropdown-toggle" data-bs-toggle="dropdown" aria-expanded="false">
-            {{ $t('ticket.previous_tickets') }}
-            <span class="position-absolute top-0 start-100 translate-middle badge rounded-pill bg-chill-green">
-                {{ tickets.length }}
-                <span class="visually-hidden">Tickets</span>
-            </span>
-
-        </button>
+            <button
+                type="button"
+                class="btn btn-light dropdown-toggle"
+                data-bs-toggle="dropdown"
+                aria-expanded="false"
+            >
+                {{ $t("ticket.previous_tickets") }}
+                <span
+                    class="position-absolute top-0 start-100 translate-middle badge rounded-pill bg-chill-green"
+                >
+                    {{ tickets.length }}
+                    <span class="visually-hidden">Tickets</span>
+                </span>
+            </button>
+        </div>
     </div>
-    </div>
-
 </template>
 
 <script lang="ts">
-
-import { PropType, defineComponent } from 'vue';
+import { PropType, defineComponent } from "vue";
 
 // Types
-import { Ticket } from '../../../types';
+import { Ticket } from "../../../types";
 
 export default defineComponent({
-    name: 'TicketSelectorComponent',
+    name: "TicketSelectorComponent",
     props: {
         tickets: {
             type: Object as PropType<Ticket[]>,
@@ -31,10 +35,10 @@ export default defineComponent({
     },
     setup() {
         function handleClick() {
-            alert('Sera disponible plus tard')
+            alert("Sera disponible plus tard");
         }
-        return { handleClick }
-    }
+        return { handleClick };
+    },
 });
 </script>
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts
index 753bd6ced..d7c763cea 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts
@@ -1,32 +1,31 @@
-import App from './App.vue';
-import {createApp} from "vue";
+import App from "./App.vue";
+import { createApp } from "vue";
 
 import { _createI18n } from "../../../../../../ChillMainBundle/Resources/public/vuejs/_js/i18n";
 
-import VueToast from 'vue-toast-notification';
-import 'vue-toast-notification/dist/theme-sugar.css';
+import VueToast from "vue-toast-notification";
+import "vue-toast-notification/dist/theme-sugar.css";
 
 import { store } from "./store";
-import messages from './i18n/messages';
+import messages from "./i18n/messages";
 
 declare global {
     interface Window {
-        initialTicket: string
+        initialTicket: string;
     }
 }
 
 const i18n = _createI18n(messages, false);
 
 const _app = createApp({
-        template: '<app></app>',
-    });
+    template: "<app></app>",
+});
 
-    _app
-    .use(store)
+_app.use(store)
     .use(i18n)
     // Cant use this.$toast in components in composition API so we need to provide it
     // Fix: with vue-toast-notification@^3
-    .use(VueToast).provide('toast', _app.config.globalProperties.$toast)
-    .component('app', App)
-    .mount('#ticketRoot');
-
+    .use(VueToast)
+    .provide("toast", _app.config.globalProperties.$toast)
+    .component("app", App)
+    .mount("#ticketRoot");
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts
index 71db5d60e..b300c682c 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts
@@ -3,15 +3,15 @@ import { State as MotiveStates, moduleMotive } from "./modules/motive";
 import { State as TicketStates, moduleTicket } from "./modules/ticket";
 import { State as CommentStates, moduleComment } from "./modules/comment";
 import { State as AddresseeStates, moduleAddressee } from "./modules/addressee";
-import { State as PersonsState,  modulePersons} from "./modules/persons";
+import { State as PersonsState, modulePersons } from "./modules/persons";
 
-export type RootState = {
+export interface RootState {
     motive: MotiveStates;
     ticket: TicketStates;
     comment: CommentStates;
     addressee: AddresseeStates;
     persons: PersonsState;
-};
+}
 
 export const store = createStore<RootState>({
     modules: {
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/addressee.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/addressee.ts
index 67802e899..3b833b21b 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/addressee.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/addressee.ts
@@ -13,14 +13,14 @@ import {
 } from "../../../../../../../../ChillMainBundle/Resources/public/types";
 
 export interface State {
-    userGroups: Array<UserGroup>;
-    users: Array<User>;
+    userGroups: UserGroup[];
+    users: User[];
 }
 
 export const moduleAddressee: Module<State, RootState> = {
     state: () => ({
-        userGroups: [] as Array<UserGroup>,
-        users: [] as Array<User>,
+        userGroups: [] as UserGroup[],
+        users: [] as User[],
     }),
     getters: {
         getUserGroups(state) {
@@ -44,7 +44,7 @@ export const moduleAddressee: Module<State, RootState> = {
                 fetchResults("/api/1.0/main/user-group.json").then(
                     (results) => {
                         commit("setUserGroups", results);
-                    }
+                    },
                 );
             } catch (e: any) {
                 throw e.name;
@@ -62,7 +62,7 @@ export const moduleAddressee: Module<State, RootState> = {
 
         async setAdressees(
             { commit },
-            datas: { ticketId: number; addressees: Array<UserGroupOrUser> }
+            datas: { ticketId: number; addressees: UserGroupOrUser[] },
         ) {
             const { ticketId, addressees } = datas;
             try {
@@ -73,7 +73,7 @@ export const moduleAddressee: Module<State, RootState> = {
                         addressees: addressees.map((addressee) => {
                             return { id: addressee.id, type: addressee.type };
                         }),
-                    }
+                    },
                 );
                 commit("setTicket", result);
             } catch (e: any) {
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/comment.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/comment.ts
index b457e4e23..34456ce07 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/comment.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/comment.ts
@@ -9,30 +9,29 @@ import { RootState } from "..";
 import { Comment } from "../../../../types";
 
 export interface State {
-    comments: Array<Comment>;
+    comments: Comment[];
 }
 
 export const moduleComment: Module<State, RootState> = {
     state: () => ({
-        comments: [] as Array<Comment>,
+        comments: [] as Comment[],
     }),
     getters: {},
     mutations: {},
     actions: {
         async createComment(
             { commit },
-            datas: { ticketId: number; content: Comment["content"] }
+            datas: { ticketId: number; content: Comment["content"] },
         ) {
             const { ticketId, content } = datas;
             try {
                 const result = await makeFetch(
                     "POST",
                     `/api/1.0/ticket/${ticketId}/comment/add`,
-                    { content }
+                    { content },
                 );
                 commit("setTicket", result);
-            }
-            catch(e: any) {
+            } catch (e: any) {
                 throw e.name;
             }
         },
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/motive.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/motive.ts
index 1c2696106..abd8547d2 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/motive.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/motive.ts
@@ -9,12 +9,12 @@ import { RootState } from "..";
 import { Motive } from "../../../../types";
 
 export interface State {
-    motives: Array<Motive>;
+    motives: Motive[];
 }
 
 export const moduleMotive: Module<State, RootState> = {
     state: () => ({
-        motives: [] as Array<Motive>,
+        motives: [] as Motive[],
     }),
     getters: {
         getMotives(state) {
@@ -30,7 +30,7 @@ export const moduleMotive: Module<State, RootState> = {
         async fetchMotives({ commit }) {
             try {
                 const results = (await fetchResults(
-                    "/api/1.0/ticket/motive.json"
+                    "/api/1.0/ticket/motive.json",
                 )) as Motive[];
                 commit("setMotives", results);
             } catch (e: any) {
@@ -40,7 +40,7 @@ export const moduleMotive: Module<State, RootState> = {
 
         async createMotive(
             { commit },
-            datas: { ticketId: number; motive: Motive }
+            datas: { ticketId: number; motive: Motive },
         ) {
             const { ticketId, motive } = datas;
             try {
@@ -52,7 +52,7 @@ export const moduleMotive: Module<State, RootState> = {
                             id: motive.id,
                             type: motive.type,
                         },
-                    }
+                    },
                 );
                 commit("setTicket", result);
             } catch (e: any) {
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/persons.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/persons.ts
index dd7229651..db0e8cdb6 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/persons.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/persons.ts
@@ -1,20 +1,21 @@
-import {
-    makeFetch,
-} from "../../../../../../../../ChillMainBundle/Resources/public/lib/api/apiMethods";
+import { makeFetch } from "../../../../../../../../ChillMainBundle/Resources/public/lib/api/apiMethods";
 import { Person } from "../../../../../../../../ChillPersonBundle/Resources/public/types";
 import { Module } from "vuex";
 import { RootState } from "..";
-import {Ticket} from "../../../../types";
+import { Ticket } from "../../../../types";
 
-export interface State {};
+export interface State {}
 
 export const modulePersons: Module<State, RootState> = {
     actions: {
         async setPersons(
-                   { commit, rootState: RootState },
-                   payload: { persons: Person[] }
+            { commit, rootState: RootState },
+            payload: { persons: Person[] },
         ) {
-            const persons = payload.persons.map((person: Person) => ({id: person.id, type: person.type}));
+            const persons = payload.persons.map((person: Person) => ({
+                id: person.id,
+                type: person.type,
+            }));
             try {
                 const result: Ticket = await makeFetch(
                     "POST",
@@ -28,5 +29,5 @@ export const modulePersons: Module<State, RootState> = {
                 throw e.name;
             }
         },
-    }
-}
+    },
+};
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
index cf5c61757..73e0e38fa 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
@@ -5,7 +5,7 @@ import { Ticket } from "../../../../types";
 
 export interface State {
     ticket: Ticket;
-    action_icons: Object;
+    action_icons: object;
 }
 
 export const moduleTicket: Module<State, RootState> = {
@@ -26,7 +26,7 @@ export const moduleTicket: Module<State, RootState> = {
     getters: {
         getTicket(state) {
             state.ticket.history = state.ticket.history.sort((a, b) =>
-                b.at.datetime.localeCompare(a.at.datetime)
+                b.at.datetime.localeCompare(a.at.datetime),
             );
             return state.ticket;
         },
@@ -39,9 +39,11 @@ export const moduleTicket: Module<State, RootState> = {
                 (result, item) => {
                     const { datetime } = item.at;
                     if (
-                        !["add_addressee", "remove_addressee", "add_person"].includes(
-                            item.event_type
-                        )
+                        ![
+                            "add_addressee",
+                            "remove_addressee",
+                            "add_person",
+                        ].includes(item.event_type)
                     ) {
                         result[datetime] = item;
                         return result;
@@ -57,9 +59,9 @@ export const moduleTicket: Module<State, RootState> = {
                      */
                     return result;
                 },
-                {} as any
+                {} as any,
             );
-            return Object.values(addresseeHistory) as Array<Ticket["history"]>;
+            return Object.values(addresseeHistory) as Ticket["history"][];
         },
     },
     mutations: {

From b15733076ccb95820008e02c474f9f70f38a037b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 27 May 2025 10:25:10 +0200
Subject: [PATCH 106/283] Add TicketBundle to the build of open api specs

---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 15697def7..5b27e235c 100644
--- a/package.json
+++ b/package.json
@@ -80,7 +80,7 @@
     "dev": "encore dev",
     "watch": "encore dev --watch",
     "build": "encore production --progress",
-    "specs-build": "yaml-merge src/Bundle/ChillMainBundle/chill.api.specs.yaml src/Bundle/ChillPersonBundle/chill.api.specs.yaml src/Bundle/ChillCalendarBundle/chill.api.specs.yaml src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml src/Bundle/ChillDocStoreBundle/chill.api.specs.yaml> templates/api/specs.yaml",
+    "specs-build": "yaml-merge src/Bundle/ChillMainBundle/chill.api.specs.yaml src/Bundle/ChillPersonBundle/chill.api.specs.yaml src/Bundle/ChillCalendarBundle/chill.api.specs.yaml src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml src/Bundle/ChillDocStoreBundle/chill.api.specs.yaml src/Bundle/ChillTicketBundle/chill.api.specs.yaml> templates/api/specs.yaml",
     "specs-validate": "swagger-cli validate templates/api/specs.yaml",
     "specs-create-dir": "mkdir -p templates/api",
     "specs": "yarn run specs-create-dir && yarn run specs-build && yarn run specs-validate",

From e28d7df533dffbe415e6a13cabeeb36742f8d4e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 27 May 2025 11:56:35 +0200
Subject: [PATCH 107/283] Add routing to ticket bundle

---
 config/routes/chill_ticket.yaml                     | 2 ++
 src/Bundle/ChillTicketBundle/src/config/routes.yaml | 3 +++
 2 files changed, 5 insertions(+)
 create mode 100644 config/routes/chill_ticket.yaml
 create mode 100644 src/Bundle/ChillTicketBundle/src/config/routes.yaml

diff --git a/config/routes/chill_ticket.yaml b/config/routes/chill_ticket.yaml
new file mode 100644
index 000000000..311a51992
--- /dev/null
+++ b/config/routes/chill_ticket.yaml
@@ -0,0 +1,2 @@
+chill_ticket_bundle:
+    resource: '@ChillTicketBundle/config/routes.yaml'
diff --git a/src/Bundle/ChillTicketBundle/src/config/routes.yaml b/src/Bundle/ChillTicketBundle/src/config/routes.yaml
new file mode 100644
index 000000000..9823744ea
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/config/routes.yaml
@@ -0,0 +1,3 @@
+chill_ticket_controller:
+    resource: '@ChillTicketBundle/Controller/'
+    type: annotation

From e97bd8c4efa7e80384fa40088e63d39c4b4bced5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 27 May 2025 11:59:29 +0200
Subject: [PATCH 108/283] doc for creating a new bundle: add route

---
 .../development/create-a-new-bundle.rst       | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/docs/source/development/create-a-new-bundle.rst b/docs/source/development/create-a-new-bundle.rst
index 61eda87bd..8206acee8 100644
--- a/docs/source/development/create-a-new-bundle.rst
+++ b/docs/source/development/create-a-new-bundle.rst
@@ -20,7 +20,8 @@ Create a new directory with Bundle class
 
 .. code-block:: bash
 
-   mkdir -p src/Bundle/ChillSomeBundle/src
+   mkdir -p src/Bundle/ChillSomeBundle/src/config
+   mkdir -p src/Bundle/ChillSomeBundle/src/Controller
 
 Add a bundle file
 
@@ -43,6 +44,14 @@ Add a bundle file
 
     class ChillSomeBundle extends Bundle {}
 
+And a route file:
+
+.. code-block:: yaml
+
+   chill_ticket_controller:
+       resource: '@ChillTicketBundle/Controller/'
+       type: annotation
+
 Register the new psr-4 namespace
 --------------------------------
 
@@ -65,8 +74,16 @@ Register the bundle
 Register in the file :code:`config/bundles.php`:
 
 .. code-block:: php
+
     Vendor\Bundle\YourBundle\YourBundle::class => ['all' => true],
 
+And import routes in :code:`config/routes/chill_some_bundle.yaml`:
+
+.. code-block:: yaml
+
+   chill_ticket_bundle:
+       resource: '@ChillSomeBundle/config/routes.yaml'
+
 Add the doctrine_migration namespace
 ------------------------------------
 

From b8b325f7d7da9b1af4cbc8ebe8f73b9667cab979 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 27 May 2025 11:59:36 +0200
Subject: [PATCH 109/283] Add path mapping for ChillPersonAssets in
 tsconfig.json

This update introduces a new path alias, "ChillPersonAssets/*", to the tsconfig.json file. It allows TypeScript to resolve imports for assets within the ChillPersonBundle more efficiently.
---
 tsconfig.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/tsconfig.json b/tsconfig.json
index aaf111406..6bd6667c7 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -7,7 +7,8 @@
         "paths": {
             "translator": ["./assets/translator.ts"],
             "ChillMainAssets/*": ["./src/Bundle/ChillMainBundle/Resources/public/*"],
-            "ChillDocStoreAssets/*": ["./src/Bundle/ChillDocStoreBundle/Resources/public/*"]
+            "ChillDocStoreAssets/*": ["./src/Bundle/ChillDocStoreBundle/Resources/public/*"],
+            "ChillPersonAssets/*": ["./src/Bundle/ChillPersonBundle/Resources/public/*"]
         }
     },
 }

From cf41fa95742e2da7951197f91754ce331c4e131d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 27 May 2025 11:59:52 +0200
Subject: [PATCH 110/283] fix compilation errors

---
 .../TicketApp/components/AddCommentComponent.vue     | 12 +++---------
 .../components/AddresseeSelectorComponent.vue        |  4 ++--
 2 files changed, 5 insertions(+), 11 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddCommentComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddCommentComponent.vue
index 16dbf4bce..efbb0fbf2 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddCommentComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddCommentComponent.vue
@@ -1,12 +1,8 @@
 <template>
     <div class="row">
         <div class="col-12">
-            <ckeditor
-                name="content"
-                :placeholder="$t('add_comment.content')"
-                :editor="editor"
+            <comment-editor
                 v-model="content"
-                tag-name="textarea"
             />
         </div>
     </div>
@@ -15,8 +11,7 @@
 <script lang="ts">
 import { defineComponent, ref, watch } from "vue";
 
-import CKEditor from "@ckeditor/ckeditor5-vue";
-import ClassicEditor from "../../../../../../../ChillMainBundle/Resources/public/module/ckeditor5/editor_config";
+import CommentEditor from "ChillMainAssets/vuejs/_components/CommentEditor/CommentEditor.vue"
 
 export default defineComponent({
     name: "AddCommentComponent",
@@ -27,7 +22,7 @@ export default defineComponent({
         },
     },
     components: {
-        ckeditor: CKEditor.component,
+        CommentEditor,
     },
     emits: ["update:modelValue"],
 
@@ -40,7 +35,6 @@ export default defineComponent({
 
         return {
             content,
-            editor: ClassicEditor,
         };
     },
 });
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue
index 92721319d..db37f51fe 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue
@@ -96,7 +96,7 @@ import {
 } from "ChillMainAssets/types";
 
 // Components
-import AddPersons from "ChillPersonAssets/Resources/public/vuejs/_components/AddPersons.vue";
+import AddPersons from "ChillPersonAssets/vuejs/_components/AddPersons.vue";
 
 export default defineComponent({
     name: "AddresseeSelectorComponent",
@@ -205,7 +205,7 @@ export default defineComponent({
             ) as UserGroup[];
             const users = addressees.value.filter(
                 (addressee) => addressee.type == "user",
-            ) as UserGroup[];
+            ) as User[];
             addressees.value = [...users, ...userGroupLevel, ...userGroupAdd];
             ctx.emit("update:modelValue", addressees.value);
         });

From 67d804e28e1f779a77fe2cf74bab55e704a3a17d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 27 May 2025 12:00:49 +0200
Subject: [PATCH 111/283] fix compilation errors

---
 .../ChillTicketBundle/src/Resources/views/Ticket/list.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/list.html.twig b/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/list.html.twig
index 31465b83d..4750e1a37 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/list.html.twig
+++ b/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/list.html.twig
@@ -8,7 +8,7 @@
     {{ filter|chill_render_filter_order_helper }}
 
     {% if tickets|length == 0 %}
-        <p class="chill-no-data-statement">{{ chill_ticket.list.no_tickets }}</p>
+        <p class="chill-no-data-statement">No tickets</p>
     {% else %}
         <div class="flex-table">
             {% for ticket in tickets %}

From 697b4ab436e3d0a14629e0bd12a5deed7561d672 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 27 May 2025 15:39:48 +0200
Subject: [PATCH 112/283] fix compilation errors

---
 .../vuejs/TicketApp/components/AddCommentComponent.vue      | 6 ++----
 .../TicketApp/components/AddresseeSelectorComponent.vue     | 6 +-----
 2 files changed, 3 insertions(+), 9 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddCommentComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddCommentComponent.vue
index efbb0fbf2..7a75e1e33 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddCommentComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddCommentComponent.vue
@@ -1,9 +1,7 @@
 <template>
     <div class="row">
         <div class="col-12">
-            <comment-editor
-                v-model="content"
-            />
+            <comment-editor v-model="content" />
         </div>
     </div>
 </template>
@@ -11,7 +9,7 @@
 <script lang="ts">
 import { defineComponent, ref, watch } from "vue";
 
-import CommentEditor from "ChillMainAssets/vuejs/_components/CommentEditor/CommentEditor.vue"
+import CommentEditor from "ChillMainAssets/vuejs/_components/CommentEditor/CommentEditor.vue";
 
 export default defineComponent({
     name: "AddCommentComponent",
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue
index db37f51fe..5699c0539 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue
@@ -89,11 +89,7 @@ import { PropType, computed, defineComponent, ref, watch } from "vue";
 import { useI18n } from "vue-i18n";
 
 // Types
-import {
-    User,
-    UserGroup,
-    UserGroupOrUser,
-} from "ChillMainAssets/types";
+import { User, UserGroup, UserGroupOrUser } from "ChillMainAssets/types";
 
 // Components
 import AddPersons from "ChillPersonAssets/vuejs/_components/AddPersons.vue";

From 16435423cf66b1021d7666d8cc2ee7151386d6e3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 27 May 2025 15:40:00 +0200
Subject: [PATCH 113/283] Replace node-sass with sass in package.json

Updated the dependency from node-sass to sass to ensure compatibility with modern tooling and resolve deprecation warnings. This change aligns with recommended practices for Sass-related workflows.
---
 package.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/package.json b/package.json
index 5315acbd0..f4e30cef9 100644
--- a/package.json
+++ b/package.json
@@ -29,7 +29,7 @@
     "fork-awesome": "^1.1.7",
     "intl-messageformat": "^10.5.11",
     "jquery": "^3.6.0",
-    "node-sass": "^8.0.0",
+    "sass": "^1.89.0",
     "popper.js": "^1.16.1",
     "postcss-loader": "^7.0.2",
     "prettier": "^3.3.3",

From e0abf34784a06713f356a852072b6c32c8dd3a01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 2 Jun 2025 11:11:18 +0200
Subject: [PATCH 114/283] Remove unnecessary files

---
 psalm-baseline.xml                            | 1523 ------
 psalm.xml                                     |   47 -
 src/Bundle/ChillActivityBundle/.gitlab-ci.yml |   64 -
 src/Bundle/ChillActivityBundle/CHANGELOG.md   |   31 -
 src/Bundle/ChillActivityBundle/apigen.neon    |   10 -
 src/Bundle/ChillActivityBundle/composer.json  |   40 -
 .../ChillActivityBundle/phpunit.xml.dist      |   23 -
 src/Bundle/ChillBudgetBundle/composer.json    |   30 -
 src/Bundle/ChillCalendarBundle/.gitignore     |   11 -
 src/Bundle/ChillCalendarBundle/LICENSE        |  661 ---
 src/Bundle/ChillCalendarBundle/composer.json  |   30 -
 src/Bundle/ChillCustomFieldsBundle/.gitignore |   32 -
 .../ChillCustomFieldsBundle/.gitlab-ci.yml    |   68 -
 .../ChillCustomFieldsBundle/LICENSE.txt       |  661 ---
 .../ChillCustomFieldsBundle/apigen.neon       |   15 -
 .../ChillCustomFieldsBundle/composer.json     |   41 -
 .../ChillCustomFieldsBundle/phpunit.xml.dist  |   24 -
 .../ChillCustomFieldsBundle/run-server.sh     |    1 -
 src/Bundle/ChillDocGeneratorBundle/.gitignore |   11 -
 src/Bundle/ChillDocGeneratorBundle/LICENSE    |  661 ---
 .../ChillDocGeneratorBundle/composer.json     |   31 -
 src/Bundle/ChillDocStoreBundle/.gitignore     |    1 -
 src/Bundle/ChillDocStoreBundle/.gitlab-ci.yml |   25 -
 src/Bundle/ChillDocStoreBundle/CHANGELOG.md   |   39 -
 src/Bundle/ChillDocStoreBundle/composer.json  |   15 -
 src/Bundle/ChillEventBundle/.gitignore        |   24 -
 src/Bundle/ChillEventBundle/.gitlab-ci.yml    |   75 -
 src/Bundle/ChillEventBundle/CHANGELOG.md      |   25 -
 src/Bundle/ChillEventBundle/LICENSE.txt       |  661 ---
 src/Bundle/ChillEventBundle/apigen.neon       |   12 -
 src/Bundle/ChillEventBundle/composer.json     |   43 -
 src/Bundle/ChillEventBundle/phpunit.xml.dist  |   23 -
 src/Bundle/ChillMainBundle/.gitignore         |   34 -
 src/Bundle/ChillMainBundle/.gitlab-ci.yml     |   65 -
 src/Bundle/ChillMainBundle/CHANGELOG.md       |  158 -
 src/Bundle/ChillMainBundle/LICENSE            |  661 ---
 src/Bundle/ChillMainBundle/apigen.neon        |   13 -
 src/Bundle/ChillMainBundle/composer.json      |   49 -
 src/Bundle/ChillMainBundle/phpdoc.dist.xml    |   14 -
 src/Bundle/ChillMainBundle/phpunit.xml.dist   |   24 -
 src/Bundle/ChillPersonBundle/.editorconfig    |   19 -
 src/Bundle/ChillPersonBundle/.gitignore       |   11 -
 src/Bundle/ChillPersonBundle/.gitlab-ci.yml   |   64 -
 src/Bundle/ChillPersonBundle/CHANGELOG.md     |  117 -
 src/Bundle/ChillPersonBundle/LICENSE          |  661 ---
 .../vuejs/AccompanyingCourse/composer.json    |   14 -
 src/Bundle/ChillPersonBundle/apigen.neon      |   15 -
 src/Bundle/ChillPersonBundle/composer.json    |   41 -
 src/Bundle/ChillPersonBundle/phpunit.xml.dist |   25 -
 src/Bundle/ChillReportBundle/.gitignore       |    6 -
 src/Bundle/ChillReportBundle/.gitlab-ci.yml   |   54 -
 src/Bundle/ChillReportBundle/CHANGELOG.md     |   18 -
 src/Bundle/ChillReportBundle/LICENSE          |  661 ---
 src/Bundle/ChillReportBundle/apigen.neon      |   11 -
 src/Bundle/ChillReportBundle/composer.json    |   41 -
 src/Bundle/ChillReportBundle/console.sh       |    1 -
 src/Bundle/ChillReportBundle/phpunit.xml.dist |   26 -
 src/Bundle/ChillTaskBundle/.gitignore         |    1 -
 src/Bundle/ChillTaskBundle/.gitlab-ci.yml     |   25 -
 src/Bundle/ChillTaskBundle/CHANGELOG.md       |   52 -
 src/Bundle/ChillTaskBundle/composer.json      |   39 -
 src/Bundle/ChillTaskBundle/composer.lock      | 4403 -----------------
 src/Bundle/ChillThirdPartyBundle/.gitignore   |   11 -
 .../ChillThirdPartyBundle/.gitlab-ci.yml      |   64 -
 src/Bundle/ChillThirdPartyBundle/CHANGELOG.md |    8 -
 src/Bundle/ChillThirdPartyBundle/LICENSE      |  661 ---
 .../ChillThirdPartyBundle/composer.json       |   39 -
 src/Bundle/ChillWopiBundle/.editorconfig      |   19 -
 src/Bundle/ChillWopiBundle/.gitignore         |   11 -
 src/Bundle/ChillWopiBundle/LICENSE            |  661 ---
 src/Bundle/ChillWopiBundle/composer.json      |   29 -
 src/Bundle/ChillWopiBundle/grumphp.yml        |    9 -
 src/Bundle/ChillWopiBundle/psalm.xml          |   15 -
 tests/Kernel.php                              |   34 -
 tests/app/config/packages/wopi.yaml           |    2 -
 tests/app/config/packages/workflow_chill.yaml |  294 --
 76 files changed, 14138 deletions(-)
 delete mode 100644 psalm-baseline.xml
 delete mode 100644 psalm.xml
 delete mode 100644 src/Bundle/ChillActivityBundle/.gitlab-ci.yml
 delete mode 100644 src/Bundle/ChillActivityBundle/CHANGELOG.md
 delete mode 100644 src/Bundle/ChillActivityBundle/apigen.neon
 delete mode 100644 src/Bundle/ChillActivityBundle/composer.json
 delete mode 100644 src/Bundle/ChillActivityBundle/phpunit.xml.dist
 delete mode 100644 src/Bundle/ChillBudgetBundle/composer.json
 delete mode 100644 src/Bundle/ChillCalendarBundle/.gitignore
 delete mode 100644 src/Bundle/ChillCalendarBundle/LICENSE
 delete mode 100644 src/Bundle/ChillCalendarBundle/composer.json
 delete mode 100644 src/Bundle/ChillCustomFieldsBundle/.gitignore
 delete mode 100644 src/Bundle/ChillCustomFieldsBundle/.gitlab-ci.yml
 delete mode 100644 src/Bundle/ChillCustomFieldsBundle/LICENSE.txt
 delete mode 100644 src/Bundle/ChillCustomFieldsBundle/apigen.neon
 delete mode 100644 src/Bundle/ChillCustomFieldsBundle/composer.json
 delete mode 100644 src/Bundle/ChillCustomFieldsBundle/phpunit.xml.dist
 delete mode 100755 src/Bundle/ChillCustomFieldsBundle/run-server.sh
 delete mode 100644 src/Bundle/ChillDocGeneratorBundle/.gitignore
 delete mode 100644 src/Bundle/ChillDocGeneratorBundle/LICENSE
 delete mode 100644 src/Bundle/ChillDocGeneratorBundle/composer.json
 delete mode 100644 src/Bundle/ChillDocStoreBundle/.gitignore
 delete mode 100644 src/Bundle/ChillDocStoreBundle/.gitlab-ci.yml
 delete mode 100644 src/Bundle/ChillDocStoreBundle/CHANGELOG.md
 delete mode 100644 src/Bundle/ChillDocStoreBundle/composer.json
 delete mode 100644 src/Bundle/ChillEventBundle/.gitignore
 delete mode 100644 src/Bundle/ChillEventBundle/.gitlab-ci.yml
 delete mode 100644 src/Bundle/ChillEventBundle/CHANGELOG.md
 delete mode 100644 src/Bundle/ChillEventBundle/LICENSE.txt
 delete mode 100644 src/Bundle/ChillEventBundle/apigen.neon
 delete mode 100644 src/Bundle/ChillEventBundle/composer.json
 delete mode 100644 src/Bundle/ChillEventBundle/phpunit.xml.dist
 delete mode 100644 src/Bundle/ChillMainBundle/.gitignore
 delete mode 100644 src/Bundle/ChillMainBundle/.gitlab-ci.yml
 delete mode 100644 src/Bundle/ChillMainBundle/CHANGELOG.md
 delete mode 100644 src/Bundle/ChillMainBundle/LICENSE
 delete mode 100644 src/Bundle/ChillMainBundle/apigen.neon
 delete mode 100644 src/Bundle/ChillMainBundle/composer.json
 delete mode 100644 src/Bundle/ChillMainBundle/phpdoc.dist.xml
 delete mode 100644 src/Bundle/ChillMainBundle/phpunit.xml.dist
 delete mode 100644 src/Bundle/ChillPersonBundle/.editorconfig
 delete mode 100644 src/Bundle/ChillPersonBundle/.gitignore
 delete mode 100644 src/Bundle/ChillPersonBundle/.gitlab-ci.yml
 delete mode 100644 src/Bundle/ChillPersonBundle/CHANGELOG.md
 delete mode 100644 src/Bundle/ChillPersonBundle/LICENSE
 delete mode 100644 src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/composer.json
 delete mode 100644 src/Bundle/ChillPersonBundle/apigen.neon
 delete mode 100644 src/Bundle/ChillPersonBundle/composer.json
 delete mode 100644 src/Bundle/ChillPersonBundle/phpunit.xml.dist
 delete mode 100644 src/Bundle/ChillReportBundle/.gitignore
 delete mode 100644 src/Bundle/ChillReportBundle/.gitlab-ci.yml
 delete mode 100644 src/Bundle/ChillReportBundle/CHANGELOG.md
 delete mode 100644 src/Bundle/ChillReportBundle/LICENSE
 delete mode 100644 src/Bundle/ChillReportBundle/apigen.neon
 delete mode 100644 src/Bundle/ChillReportBundle/composer.json
 delete mode 100755 src/Bundle/ChillReportBundle/console.sh
 delete mode 100644 src/Bundle/ChillReportBundle/phpunit.xml.dist
 delete mode 100644 src/Bundle/ChillTaskBundle/.gitignore
 delete mode 100644 src/Bundle/ChillTaskBundle/.gitlab-ci.yml
 delete mode 100644 src/Bundle/ChillTaskBundle/CHANGELOG.md
 delete mode 100644 src/Bundle/ChillTaskBundle/composer.json
 delete mode 100644 src/Bundle/ChillTaskBundle/composer.lock
 delete mode 100644 src/Bundle/ChillThirdPartyBundle/.gitignore
 delete mode 100644 src/Bundle/ChillThirdPartyBundle/.gitlab-ci.yml
 delete mode 100644 src/Bundle/ChillThirdPartyBundle/CHANGELOG.md
 delete mode 100644 src/Bundle/ChillThirdPartyBundle/LICENSE
 delete mode 100644 src/Bundle/ChillThirdPartyBundle/composer.json
 delete mode 100644 src/Bundle/ChillWopiBundle/.editorconfig
 delete mode 100644 src/Bundle/ChillWopiBundle/.gitignore
 delete mode 100644 src/Bundle/ChillWopiBundle/LICENSE
 delete mode 100644 src/Bundle/ChillWopiBundle/composer.json
 delete mode 100644 src/Bundle/ChillWopiBundle/grumphp.yml
 delete mode 100644 src/Bundle/ChillWopiBundle/psalm.xml
 delete mode 100644 tests/Kernel.php
 delete mode 100644 tests/app/config/packages/wopi.yaml
 delete mode 100644 tests/app/config/packages/workflow_chill.yaml

diff --git a/psalm-baseline.xml b/psalm-baseline.xml
deleted file mode 100644
index 392b3026a..000000000
--- a/psalm-baseline.xml
+++ /dev/null
@@ -1,1523 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<files psalm-version="4.18.0.0">
-  <file src="src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php">
-    <UndefinedClass occurrences="4">
-      <code>'ChillActivityBundle:ActivityReasonCategory'</code>
-      <code>'ChillActivityBundle:ActivityReasonCategory'</code>
-      <code>'ChillActivityBundle:ActivityReasonCategory'</code>
-      <code>'ChillActivityBundle:ActivityReasonCategory'</code>
-    </UndefinedClass>
-  </file>
-  <file src="src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php">
-    <UndefinedClass occurrences="4">
-      <code>'ChillActivityBundle:ActivityReason'</code>
-      <code>'ChillActivityBundle:ActivityReason'</code>
-      <code>'ChillActivityBundle:ActivityReason'</code>
-      <code>'ChillActivityBundle:ActivityReason'</code>
-    </UndefinedClass>
-  </file>
-  <file src="src/Bundle/ChillActivityBundle/Entity/Activity.php">
-    <ParamNameMismatch occurrences="1">
-      <code>$socialIssue</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillActivityBundle/Export/Export/CountActivity.php">
-    <ParamNameMismatch occurrences="1">
-      <code>$qb</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillActivityBundle/Export/Export/StatActivityDuration.php">
-    <ParamNameMismatch occurrences="1">
-      <code>$qb</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillActivityBundle/Form/ActivityReasonCategoryType.php">
-    <UndefinedDocblockClass occurrences="1">
-      <code>OptionsResolverInterface</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php">
-    <UndefinedVariable occurrences="1">
-      <code>$person</code>
-    </UndefinedVariable>
-  </file>
-  <file src="src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepositoryInterface.php">
-    <UndefinedDocblockClass occurrences="2">
-      <code>Activity[]|array</code>
-      <code>Activity[]|array</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/AppKernel.php">
-    <DuplicateClass occurrences="1">
-      <code>AppKernel</code>
-    </DuplicateClass>
-  </file>
-  <file src="src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/autoload.php">
-    <MissingFile occurrences="1">
-      <code>require __DIR__ . '/../../../../../vendor/autoload.php'</code>
-    </MissingFile>
-  </file>
-  <file src="src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/bootstrap.php.cache">
-    <NoValue occurrences="1">
-      <code>return trigger_error($e, E_USER_ERROR);</code>
-    </NoValue>
-    <ParadoxicalCondition occurrences="1">
-      <code>$baseUrl &amp;&amp; false !== $prefix = $this-&gt;getUrlencodedPrefix($requestUri, rtrim(dirname($baseUrl),'/'.DIRECTORY_SEPARATOR).'/')</code>
-    </ParadoxicalCondition>
-    <ParamNameMismatch occurrences="2">
-      <code>$files</code>
-      <code>$files</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillActivityBundle/Resources/test/Fixtures/App/app/cache/dev/appDevDebugProjectContainer.php">
-    <TooFewArguments occurrences="13">
-      <code>addProvider</code>
-      <code>addProvider</code>
-      <code>new \Chill\CustomFieldsBundle\Form\CustomFieldType($this-&gt;get('chill.custom_field.provider'))</code>
-      <code>new \Chill\CustomFieldsBundle\Templating\Twig\CustomFieldRenderingTwig()</code>
-      <code>new \Chill\MainBundle\Form\Type\Select2CountryType($this-&gt;get('request_stack'), $this-&gt;get('doctrine.orm.default_entity_manager'))</code>
-      <code>new \Chill\MainBundle\Form\Type\Select2LanguageType($this-&gt;get('request_stack'), $this-&gt;get('doctrine.orm.default_entity_manager'))</code>
-      <code>new \Chill\MainBundle\Routing\MenuComposer()</code>
-      <code>new \Chill\MainBundle\Security\Authorization\AuthorizationHelper($this-&gt;get('security.role_hierarchy'))</code>
-      <code>new \Chill\MainBundle\Templating\TranslatableStringHelper($this-&gt;get('request_stack'), $this-&gt;get('translator.default'))</code>
-      <code>new \Chill\MainBundle\Templating\TranslatableStringTwig()</code>
-      <code>new \Chill\PersonBundle\Search\PersonSearch($this-&gt;get('doctrine.orm.default_entity_manager'), $this-&gt;get('security.token_storage'), $this-&gt;get('chill.main.security.authorization.helper'))</code>
-      <code>new \Chill\PersonBundle\Timeline\TimelineAccompanyingPeriodClosing($this-&gt;get('doctrine.orm.default_entity_manager'))</code>
-      <code>new \Chill\PersonBundle\Timeline\TimelineAccompanyingPeriodOpening($this-&gt;get('doctrine.orm.default_entity_manager'))</code>
-    </TooFewArguments>
-    <UndefinedClass occurrences="47">
-      <code>InactiveScopeException</code>
-      <code>InactiveScopeException</code>
-      <code>\Assetic\Cache\ConfigCache</code>
-      <code>\Assetic\Extension\Twig\TwigFormulaLoader</code>
-      <code>\Assetic\Factory\LazyAssetManager</code>
-      <code>\Assetic\Factory\Loader\CachedFormulaLoader</code>
-      <code>\Assetic\Filter\CssRewriteFilter</code>
-      <code>\Chill\MainBundle\Form\Type\CenterType</code>
-      <code>\Chill\PersonBundle\Form\Type\ClosingMotiveType</code>
-      <code>\Doctrine\Common\Cache\ArrayCache</code>
-      <code>\Doctrine\Common\Cache\ArrayCache</code>
-      <code>\Doctrine\Common\Cache\ArrayCache</code>
-      <code>\Doctrine\Common\Persistence\Mapping\Driver\MappingDriverChain</code>
-      <code>\SensioLabs\Security\Command\SecurityCheckerCommand</code>
-      <code>\SensioLabs\Security\SecurityChecker</code>
-      <code>\Sensio\Bundle\DistributionBundle\Configurator\Configurator</code>
-      <code>\Sensio\Bundle\DistributionBundle\Configurator\Step\DoctrineStep</code>
-      <code>\Sensio\Bundle\DistributionBundle\Configurator\Step\SecretStep</code>
-      <code>\Symfony\Bridge\Monolog\Handler\DebugHandler</code>
-      <code>\Symfony\Bundle\AsseticBundle\CacheWarmer\AssetManagerCacheWarmer</code>
-      <code>\Symfony\Bundle\AsseticBundle\DefaultValueSupplier</code>
-      <code>\Symfony\Bundle\AsseticBundle\Factory\AssetFactory</code>
-      <code>\Symfony\Bundle\AsseticBundle\Factory\Resource\CoalescingDirectoryResource</code>
-      <code>\Symfony\Bundle\AsseticBundle\Factory\Resource\CoalescingDirectoryResource</code>
-      <code>\Symfony\Bundle\AsseticBundle\Factory\Resource\DirectoryResource</code>
-      <code>\Symfony\Bundle\AsseticBundle\Factory\Resource\DirectoryResource</code>
-      <code>\Symfony\Bundle\AsseticBundle\Factory\Resource\DirectoryResource</code>
-      <code>\Symfony\Bundle\AsseticBundle\Factory\Resource\DirectoryResource</code>
-      <code>\Symfony\Bundle\AsseticBundle\Factory\Resource\DirectoryResource</code>
-      <code>\Symfony\Bundle\AsseticBundle\FilterManager</code>
-      <code>\Symfony\Bundle\AsseticBundle\Twig\AsseticExtension</code>
-      <code>\Symfony\Bundle\FrameworkBundle\DataCollector\AjaxDataCollector</code>
-      <code>\Symfony\Bundle\FrameworkBundle\EventListener\SessionListener</code>
-      <code>\Symfony\Bundle\FrameworkBundle\EventListener\TestSessionListener</code>
-      <code>\Symfony\Bundle\FrameworkBundle\Translation\PhpExtractor</code>
-      <code>\Symfony\Bundle\FrameworkBundle\Translation\TranslationLoader</code>
-      <code>\Symfony\Bundle\FrameworkBundle\Validator\ConstraintValidatorFactory</code>
-      <code>\Symfony\Bundle\TwigBundle\Extension\ActionsExtension</code>
-      <code>\Symfony\Component\EventDispatcher\ContainerAwareEventDispatcher</code>
-      <code>\Symfony\Component\Form\Extension\Csrf\CsrfProvider\CsrfTokenManagerAdapter</code>
-      <code>\Symfony\Component\HttpKernel\DependencyInjection\ContainerAwareHttpKernel</code>
-      <code>\Symfony\Component\Security\Core\SecurityContext</code>
-      <code>\Symfony\Component\Security\Core\Util\SecureRandom</code>
-      <code>\Twig_Environment</code>
-      <code>\Twig_Extension_Debug</code>
-      <code>\Twig_Extensions_Extension_Intl</code>
-      <code>\Twig_Profiler_Profile</code>
-    </UndefinedClass>
-    <UndefinedDocblockClass occurrences="26">
-      <code>InactiveScopeException</code>
-      <code>InactiveScopeException</code>
-      <code>\Assetic\Factory\LazyAssetManager</code>
-      <code>\Assetic\Filter\CssRewriteFilter</code>
-      <code>\Chill\MainBundle\Form\Type\CenterType</code>
-      <code>\Chill\PersonBundle\Form\Type\ClosingMotiveType</code>
-      <code>\Doctrine\Common\Cache\ArrayCache</code>
-      <code>\Doctrine\Common\Cache\ArrayCache</code>
-      <code>\Doctrine\Common\Cache\ArrayCache</code>
-      <code>\SensioLabs\Security\Command\SecurityCheckerCommand</code>
-      <code>\SensioLabs\Security\SecurityChecker</code>
-      <code>\Sensio\Bundle\DistributionBundle\Configurator\Configurator</code>
-      <code>\Symfony\Bridge\Monolog\Handler\DebugHandler</code>
-      <code>\Symfony\Bundle\AsseticBundle\Factory\AssetFactory</code>
-      <code>\Symfony\Bundle\AsseticBundle\FilterManager</code>
-      <code>\Symfony\Bundle\FrameworkBundle\EventListener\SessionListener</code>
-      <code>\Symfony\Bundle\FrameworkBundle\EventListener\TestSessionListener</code>
-      <code>\Symfony\Bundle\FrameworkBundle\Translation\PhpExtractor</code>
-      <code>\Symfony\Bundle\FrameworkBundle\Translation\TranslationLoader</code>
-      <code>\Symfony\Component\Form\Extension\Csrf\CsrfProvider\CsrfTokenManagerAdapter</code>
-      <code>\Symfony\Component\HttpKernel\DependencyInjection\ContainerAwareHttpKernel</code>
-      <code>\Symfony\Component\Security\Core\SecurityContext</code>
-      <code>\Symfony\Component\Security\Core\Util\SecureRandom</code>
-      <code>\Twig_Environment</code>
-      <code>\Twig_Extensions_Extension_Intl</code>
-      <code>\Twig_Profiler_Profile</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillActivityBundle/Tests/Controller/ActivityControllerTest.php">
-    <UndefinedDocblockClass occurrences="3">
-      <code>type</code>
-      <code>type</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillActivityBundle/Tests/Export/Filter/PersonHavingActivityBetweenDateFilterTest.php">
-    <UndefinedDocblockClass occurrences="1">
-      <code>\Chill\PersonBundle\Export\Filter\PersonHavingActivityBetweenDateFilter</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityReasonTest.php">
-    <TooFewArguments occurrences="2"/>
-    <UndefinedDocblockClass occurrences="1">
-      <code>Prophecy\Prophet</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillActivityBundle/Tests/Security/Authorization/ActivityVoterTest.php">
-    <UndefinedDocblockClass occurrences="1">
-      <code>type</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidityValidator.php">
-    <ParamNameMismatch occurrences="1">
-      <code>$activity</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php">
-    <ParamNameMismatch occurrences="4">
-      <code>$createdAt</code>
-      <code>$createdBy</code>
-      <code>$updatedAt</code>
-      <code>$updatedBy</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillAsideActivityBundle/src/Templating/Entity/CategoryRender.php">
-    <ParamNameMismatch occurrences="3">
-      <code>$asideActivityCategory</code>
-      <code>$asideActivityCategory</code>
-      <code>$asideActivityCategory</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillBudgetBundle/Calculator/CalculatorManager.php">
-    <InvalidStaticInvocation occurrences="3">
-      <code>$calculator::getAlias()</code>
-      <code>$calculator::getAlias()</code>
-      <code>$calculator::getAlias()</code>
-    </InvalidStaticInvocation>
-  </file>
-  <file src="src/Bundle/ChillBudgetBundle/Entity/AbstractElement.php">
-    <UndefinedDocblockClass occurrences="1">
-      <code>decimal</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillBudgetBundle/Resources/migrations/Version20180522080432.php">
-    <UndefinedClass occurrences="1">
-      <code>AbstractMigration</code>
-    </UndefinedClass>
-  </file>
-  <file src="src/Bundle/ChillCalendarBundle/Controller/CalendarAPIController.php">
-    <ParamNameMismatch occurrences="1">
-      <code>$qb</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillCalendarBundle/Controller/CalendarController.php">
-    <UndefinedClass occurrences="3">
-      <code>'ChillCalendarBundle:Calendar'</code>
-      <code>'ChillCalendarBundle:Calendar'</code>
-      <code>'ChillCalendarBundle:Calendar'</code>
-    </UndefinedClass>
-  </file>
-  <file src="src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php">
-    <UndefinedClass occurrences="1">
-      <code>'ChillCustomFieldsBundle:CustomFieldsGroup'</code>
-    </UndefinedClass>
-  </file>
-  <file src="src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php">
-    <UndefinedClass occurrences="1">
-      <code>'ChillCustomFieldsBundle:CustomField'</code>
-    </UndefinedClass>
-  </file>
-  <file src="src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php">
-    <UndefinedClass occurrences="7">
-      <code>'ChillCustomFieldsBundle:CustomFieldsDefaultGroup'</code>
-      <code>'ChillCustomFieldsBundle:CustomFieldsGroup'</code>
-      <code>'ChillCustomFieldsBundle:CustomFieldsGroup'</code>
-      <code>'ChillCustomFieldsBundle:CustomFieldsGroup'</code>
-      <code>'ChillCustomFieldsBundle:CustomFieldsGroup'</code>
-      <code>'ChillCustomFieldsBundle:CustomFieldsGroup'</code>
-      <code>'ChillCustomFieldsBundle:CustomFieldsGroup'</code>
-    </UndefinedClass>
-  </file>
-  <file src="src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php">
-    <ParamNameMismatch occurrences="1">
-      <code>$date</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldInterface.php">
-    <UndefinedDocblockClass occurrences="6">
-      <code>\Chill\CustomFieldsBundle\CustomField\CustomField</code>
-      <code>\Chill\CustomFieldsBundle\CustomField\CustomField</code>
-      <code>\Chill\CustomFieldsBundle\CustomField\CustomField</code>
-      <code>\Chill\CustomFieldsBundle\CustomField\CustomField</code>
-      <code>\Chill\CustomFieldsBundle\CustomField\FormBuilderInterface</code>
-      <code>\Chill\CustomFieldsBundle\CustomField\FormBuilderInterface</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldType.php">
-    <UndefinedDocblockClass occurrences="2">
-      <code>OptionsResolverInterface</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/CustomFieldsGroupToIdTransformer.php">
-    <ParamNameMismatch occurrences="2">
-      <code>$customFieldsGroup</code>
-      <code>$id</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/JsonCustomFieldToArrayTransformer.php">
-    <ParamNameMismatch occurrences="2">
-      <code>$customFieldsArray</code>
-      <code>$customFieldsJSON</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillCustomFieldsBundle/Form/Type/CustomFieldType.php">
-    <UndefinedDocblockClass occurrences="2">
-      <code>$this-&gt;customFieldCompiler</code>
-      <code>CustomFieldCompiler</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/app/AppKernel.php">
-    <DuplicateClass occurrences="1">
-      <code>AppKernel</code>
-    </DuplicateClass>
-  </file>
-  <file src="src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/app/autoload.php">
-    <MissingFile occurrences="1">
-      <code>require __DIR__ . '/../../../../../vendor/autoload.php'</code>
-    </MissingFile>
-  </file>
-  <file src="src/Bundle/ChillCustomFieldsBundle/Resources/test/Fixtures/App/web/app_dev.php">
-    <MissingFile occurrences="1">
-      <code>require_once __DIR__ . '/../app/bootstrap.php.cache'</code>
-    </MissingFile>
-  </file>
-  <file src="src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldProvider.php">
-    <UndefinedDocblockClass occurrences="4">
-      <code>Container</code>
-      <code>CustomFieldInterface</code>
-      <code>type</code>
-      <code>type</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelper.php">
-    <UndefinedDocblockClass occurrences="4">
-      <code>$customFieldType</code>
-      <code>$customFieldType</code>
-      <code>$customFieldType</code>
-      <code>The</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldsGroupRenderingTwig.php">
-    <UndefinedDocblockClass occurrences="1">
-      <code>CustomFieldsGroud</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillCustomFieldsBundle/Tests/CustomFieldTestHelper.php">
-    <InvalidParamDefault occurrences="1">
-      <code>type</code>
-    </InvalidParamDefault>
-    <UndefinedDocblockClass occurrences="1">
-      <code>type</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillCustomFieldsBundle/Tests/CustomFields/CustomFieldsChoiceTest.php">
-    <UndefinedDocblockClass occurrences="4">
-      <code>type</code>
-      <code>type</code>
-      <code>type</code>
-      <code>type</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php">
-    <UndefinedClass occurrences="3">
-      <code>'ChillDocStoreBundle:DocumentCategory'</code>
-      <code>'ChillDocStoreBundle:DocumentCategory'</code>
-      <code>'ChillDocStoreBundle:DocumentCategory'</code>
-    </UndefinedClass>
-  </file>
-  <file src="src/Bundle/ChillDocStoreBundle/Entity/Document.php">
-    <UndefinedDocblockClass occurrences="1">
-      <code>\Chill\PersonBundle\Entity\user</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillDocStoreBundle/Entity/PersonDocument.php">
-    <UndefinedDocblockClass occurrences="2">
-      <code>$this-&gt;getPerson()</code>
-      <code>\Chill\MainBundle\Entity\Person</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillEventBundle/Controller/EventController.php">
-    <UndefinedClass occurrences="6">
-      <code>'ChillEventBundle:Event'</code>
-      <code>'ChillEventBundle:Event'</code>
-      <code>'ChillEventBundle:Event'</code>
-      <code>'ChillEventBundle:Participation'</code>
-      <code>'ChillEventBundle:Participation'</code>
-      <code>'ChillPersonBundle:Person'</code>
-    </UndefinedClass>
-  </file>
-  <file src="src/Bundle/ChillEventBundle/Controller/EventTypeController.php">
-    <UndefinedClass occurrences="5">
-      <code>'ChillEventBundle:EventType'</code>
-      <code>'ChillEventBundle:EventType'</code>
-      <code>'ChillEventBundle:EventType'</code>
-      <code>'ChillEventBundle:EventType'</code>
-      <code>'ChillEventBundle:EventType'</code>
-    </UndefinedClass>
-  </file>
-  <file src="src/Bundle/ChillEventBundle/Controller/ParticipationController.php">
-    <UndefinedClass occurrences="5">
-      <code>'ChillEventBundle:Event'</code>
-      <code>'ChillEventBundle:Event'</code>
-      <code>'ChillEventBundle:Event'</code>
-      <code>'ChillEventBundle:Participation'</code>
-      <code>'ChillPersonBundle:Person'</code>
-    </UndefinedClass>
-    <UndefinedDocblockClass occurrences="6">
-      <code>$participation</code>
-      <code>$participation</code>
-      <code>$participation</code>
-      <code>$participation</code>
-      <code>$participations[0]</code>
-      <code>Participation|Participations[]</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillEventBundle/Controller/RoleController.php">
-    <UndefinedClass occurrences="5">
-      <code>'ChillEventBundle:Role'</code>
-      <code>'ChillEventBundle:Role'</code>
-      <code>'ChillEventBundle:Role'</code>
-      <code>'ChillEventBundle:Role'</code>
-      <code>'ChillEventBundle:Role'</code>
-    </UndefinedClass>
-  </file>
-  <file src="src/Bundle/ChillEventBundle/Controller/StatusController.php">
-    <UndefinedClass occurrences="5">
-      <code>'ChillEventBundle:Status'</code>
-      <code>'ChillEventBundle:Status'</code>
-      <code>'ChillEventBundle:Status'</code>
-      <code>'ChillEventBundle:Status'</code>
-      <code>'ChillEventBundle:Status'</code>
-    </UndefinedClass>
-  </file>
-  <file src="src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadParticipation.php">
-    <UndefinedClass occurrences="2">
-      <code>'ChillMainBundle:Center'</code>
-      <code>'ChillPersonBundle:Person'</code>
-    </UndefinedClass>
-  </file>
-  <file src="src/Bundle/ChillEventBundle/Form/EventTypeType.php">
-    <UndefinedClass occurrences="1">
-      <code>OptionsResolverInterface</code>
-    </UndefinedClass>
-  </file>
-  <file src="src/Bundle/ChillEventBundle/Form/RoleType.php">
-    <UndefinedClass occurrences="1">
-      <code>OptionsResolverInterface</code>
-    </UndefinedClass>
-  </file>
-  <file src="src/Bundle/ChillEventBundle/Form/StatusType.php">
-    <UndefinedClass occurrences="1">
-      <code>OptionsResolverInterface</code>
-    </UndefinedClass>
-  </file>
-  <file src="src/Bundle/ChillEventBundle/Resources/test/Fixtures/App/AppKernel.php">
-    <DuplicateClass occurrences="1">
-      <code>AppKernel</code>
-    </DuplicateClass>
-  </file>
-  <file src="src/Bundle/ChillEventBundle/Tests/Controller/ParticipationControllerTest.php">
-    <InvalidParamDefault occurrences="1">
-      <code>type</code>
-    </InvalidParamDefault>
-    <UndefinedClass occurrences="8">
-      <code>'ChillEventBundle:Event'</code>
-      <code>'ChillEventBundle:Event'</code>
-      <code>'ChillEventBundle:Event'</code>
-      <code>'ChillEventBundle:Event'</code>
-      <code>'ChillMainBundle:Center'</code>
-      <code>'ChillMainBundle:Center'</code>
-      <code>'ChillMainBundle:Scope'</code>
-      <code>'ChillPersonBundle:Person'</code>
-    </UndefinedClass>
-    <UndefinedDocblockClass occurrences="1">
-      <code>type</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillEventBundle/Tests/Search/EventSearchTest.php">
-    <UndefinedClass occurrences="1">
-      <code>'ChillMainBundle:Scope'</code>
-    </UndefinedClass>
-    <UndefinedVariable occurrences="2">
-      <code>$dateTo</code>
-      <code>$dateTo</code>
-    </UndefinedVariable>
-  </file>
-  <file src="src/Bundle/ChillFamilyMembersBundle/Entity/AbstractFamilyMember.php">
-    <UndefinedDocblockClass occurrences="2">
-      <code>date_immutable|null</code>
-      <code>date_immutable|null</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillFamilyMembersBundle/Resources/migrations/Version20180522142023.php">
-    <UndefinedClass occurrences="1">
-      <code>AbstractMigration</code>
-    </UndefinedClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php">
-    <UndefinedDocblockClass occurrences="4">
-      <code>$this-&gt;buildQueryEntities($action, $request)</code>
-      <code>$this-&gt;buildQueryEntities($action, $request)</code>
-      <code>QueryBuilder</code>
-      <code>\Symfony\Component\Security\Core\Exception\AccessDeniedHttpException</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php">
-    <UndefinedClass occurrences="1">
-      <code>?Scope</code>
-    </UndefinedClass>
-    <UndefinedDocblockClass occurrences="5">
-      <code>$query</code>
-      <code>\Symfony\Component\Security\Core\Exception\AccessDeniedHttpException</code>
-      <code>type</code>
-      <code>type</code>
-      <code>type</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php">
-    <UndefinedDocblockClass occurrences="1"/>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Command/LoadAndUpdateLanguagesCommand.php">
-    <UndefinedClass occurrences="1">
-      <code>'ChillMainBundle:Language'</code>
-    </UndefinedClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Command/LoadCountriesCommand.php">
-    <UndefinedClass occurrences="1">
-      <code>'ChillMainBundle:Country'</code>
-    </UndefinedClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Command/SetPasswordCommand.php">
-    <UndefinedClass occurrences="1">
-      <code>'ChillMainBundle:User'</code>
-    </UndefinedClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Controller/AddressReferenceAPIController.php">
-    <ParamNameMismatch occurrences="1">
-      <code>$qb</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Controller/CenterController.php">
-    <UndefinedClass occurrences="4">
-      <code>'ChillMainBundle:Center'</code>
-      <code>'ChillMainBundle:Center'</code>
-      <code>'ChillMainBundle:Center'</code>
-      <code>'ChillMainBundle:Center'</code>
-    </UndefinedClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Controller/ExportController.php">
-    <UndefinedDocblockClass occurrences="2">
-      <code>Response</code>
-      <code>type</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php">
-    <UndefinedClass occurrences="8">
-      <code>'ChillMainBundle:PermissionsGroup'</code>
-      <code>'ChillMainBundle:PermissionsGroup'</code>
-      <code>'ChillMainBundle:PermissionsGroup'</code>
-      <code>'ChillMainBundle:PermissionsGroup'</code>
-      <code>'ChillMainBundle:PermissionsGroup'</code>
-      <code>'ChillMainBundle:PermissionsGroup'</code>
-      <code>'ChillMainBundle:RoleScope'</code>
-      <code>'ChillMainBundle:RoleScope'</code>
-    </UndefinedClass>
-    <UndefinedDocblockClass occurrences="3">
-      <code>Respon</code>
-      <code>redirection</code>
-      <code>type</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Controller/PostalCodeAPIController.php">
-    <ParamNameMismatch occurrences="1">
-      <code>$qb</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Controller/ScopeController.php">
-    <UndefinedClass occurrences="4">
-      <code>'ChillMainBundle:Scope'</code>
-      <code>'ChillMainBundle:Scope'</code>
-      <code>'ChillMainBundle:Scope'</code>
-      <code>'ChillMainBundle:Scope'</code>
-    </UndefinedClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Controller/SearchController.php">
-    <UndefinedDocblockClass occurrences="7">
-      <code>$search</code>
-      <code>$search</code>
-      <code>$search</code>
-      <code>$searchProvider</code>
-      <code>$searchProvider</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Controller/UserController.php">
-    <UndefinedClass occurrences="4">
-      <code>'ChillMainBundle:GroupCenter'</code>
-      <code>'ChillMainBundle:GroupCenter'</code>
-      <code>'ChillMainBundle:User'</code>
-      <code>'ChillMainBundle:User'</code>
-    </UndefinedClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUsers.php">
-    <UndefinedDocblockClass occurrences="1"/>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/MenuCompilerPass.php">
-    <UndefinedClass occurrences="1">
-      <code>$class::getMenuIds()</code>
-    </UndefinedClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php">
-    <UndefinedDocblockClass occurrences="1">
-      <code>unknown</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/DependencyInjection/Widget/AddWidgetConfigurationTrait.php">
-    <UndefinedDocblockClass occurrences="6">
-      <code>WidgetFactoryInterface[]</code>
-      <code>WidgetFactoryInterface[]</code>
-      <code>type</code>
-      <code>type</code>
-      <code>type</code>
-      <code>type</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/DependencyInjection/Widget/Factory/WidgetFactoryInterface.php">
-    <UndefinedDocblockClass occurrences="3">
-      <code>type</code>
-      <code>type</code>
-      <code>type</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/DependencyInjection/Widget/HasWidgetFactoriesExtensionInterface.php">
-    <UndefinedDocblockClass occurrences="1">
-      <code>\Chill\MainBundle\DependencyInjection\Widget\WidgetFactoryInterface</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Doctrine/Type/NativeDateIntervalType.php">
-    <ParamNameMismatch occurrences="1">
-      <code>$fieldDeclaration</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Entity/Country.php">
-    <UndefinedDocblockClass occurrences="1">
-      <code>the</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Entity/Embeddable/CommentEmbeddable.php">
-    <UndefinedDocblockClass occurrences="1">
-      <code>interger</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Entity/GroupCenter.php">
-    <UndefinedDocblockClass occurrences="1">
-      <code>PermissionGroup</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Entity/Location.php">
-    <ParamNameMismatch occurrences="4">
-      <code>$createdAt</code>
-      <code>$createdBy</code>
-      <code>$updatedAt</code>
-      <code>$updatedBy</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Entity/User.php">
-    <UndefinedDocblockClass occurrences="2">
-      <code>Agent</code>
-      <code>Report</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Entity/UserJob.php">
-    <UndefinedDocblockClass occurrences="2">
-      <code>array</code>
-      <code>protected array $label = [];</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Export/ExportManager.php">
-    <UndefinedDocblockClass occurrences="6">
-      <code>$this-&gt;authorizationChecker</code>
-      <code>AuthorizationChecker</code>
-      <code>type</code>
-      <code>type</code>
-      <code>type</code>
-      <code>type</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Export/Formatter/CSVListFormatter.php">
-    <UndefinedDocblockClass occurrences="1">
-      <code>type</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Export/Formatter/CSVPivotedListFormatter.php">
-    <UndefinedDocblockClass occurrences="1">
-      <code>type</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php">
-    <UndefinedClass occurrences="2">
-      <code>$this-&gt;aggregatorsData</code>
-      <code>$this-&gt;aggregatorsData</code>
-    </UndefinedClass>
-    <UndefinedDocblockClass occurrences="4">
-      <code>$this-&gt;formatterData</code>
-      <code>type</code>
-      <code>type</code>
-      <code>type</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php">
-    <UndefinedDocblockClass occurrences="1">
-      <code>type</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Form/AdvancedSearchType.php">
-    <UndefinedDocblockClass occurrences="1"/>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Form/CenterType.php">
-    <UndefinedDocblockClass occurrences="1">
-      <code>OptionsResolverInterface</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Form/DataMapper/AddressDataMapper.php">
-    <ParamNameMismatch occurrences="2">
-      <code>$address</code>
-      <code>$address</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Form/DataMapper/ScopePickerDataMapper.php">
-    <ParamNameMismatch occurrences="2">
-      <code>$data</code>
-      <code>$data</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Form/LocationFormType.php">
-    <UndefinedDocblockClass occurrences="1">
-      <code>OptionsResolverInterface</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Form/PermissionsGroupType.php">
-    <UndefinedDocblockClass occurrences="1">
-      <code>OptionsResolverInterface</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Form/ScopeType.php">
-    <UndefinedDocblockClass occurrences="1">
-      <code>OptionsResolverInterface</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Form/Type/DataTransformer/CenterTransformer.php">
-    <ParamNameMismatch occurrences="2">
-      <code>$center</code>
-      <code>$id</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Form/Type/DataTransformer/MultipleObjectsToIdTransformer.php">
-    <ParamNameMismatch occurrences="2">
-      <code>$array</code>
-      <code>$array</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ObjectToIdTransformer.php">
-    <ParamNameMismatch occurrences="2">
-      <code>$id</code>
-      <code>$object</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ScopeTransformer.php">
-    <ParamNameMismatch occurrences="2">
-      <code>$id</code>
-      <code>$scope</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Form/UserType.php">
-    <UndefinedDocblockClass occurrences="1">
-      <code>OptionsResolverInterface</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Pagination/PageGenerator.php">
-    <UndefinedVariable occurrences="1">
-      <code>$current</code>
-    </UndefinedVariable>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Pagination/Paginator.php">
-    <ParamNameMismatch occurrences="1">
-      <code>$itemPerPage</code>
-    </ParamNameMismatch>
-    <UndefinedDocblockClass occurrences="1">
-      <code>type</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Repository/AddressReferenceRepository.php">
-    <DuplicateArrayKey occurrences="1">
-      <code>$query-&gt;buildParameters()</code>
-    </DuplicateArrayKey>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Repository/PostalCodeRepository.php">
-    <DuplicateArrayKey occurrences="1">
-      <code>$query-&gt;buildParameters()</code>
-    </DuplicateArrayKey>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Repository/UserACLAwareRepository.php">
-    <ParamNameMismatch occurrences="1">
-      <code>$onlyEnabled</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Resources/test/Fixtures/App/app/autoload.php">
-    <MissingFile occurrences="1">
-      <code>require __DIR__ . '/../../../../../vendor/autoload.php'</code>
-    </MissingFile>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Search/AbstractSearch.php">
-    <UndefinedDocblockClass occurrences="1">
-      <code>type</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Search/SearchApiQuery.php">
-    <DuplicateArrayKey occurrences="13">
-      <code>$args</code>
-      <code>$args</code>
-      <code>$args</code>
-      <code>$params</code>
-      <code>$this-&gt;buildSelectParams($countOnly)</code>
-      <code>$this-&gt;fromClauseParams</code>
-      <code>$this-&gt;fromClauseParams</code>
-      <code>$this-&gt;jsonbMetadataParams</code>
-      <code>$this-&gt;pertinenceParams</code>
-      <code>$this-&gt;selectKeyParams</code>
-      <code>$this-&gt;selectParams</code>
-      <code>$this-&gt;whereClausesParams</code>
-      <code>$this-&gt;whereClausesParams</code>
-    </DuplicateArrayKey>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Search/SearchProvider.php">
-    <InvalidParamDefault occurrences="2">
-      <code>number</code>
-      <code>number</code>
-    </InvalidParamDefault>
-    <UndefinedDocblockClass occurrences="6">
-      <code>HasAdvancedSearchForm</code>
-      <code>HasAdvancedSearchForm[]</code>
-      <code>number</code>
-      <code>number</code>
-      <code>private $hasAdvancedFormSearchServices = [];</code>
-      <code>type</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperGenerator.php">
-    <ParamNameMismatch occurrences="1">
-      <code>$subject</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEvent.php">
-    <UndefinedDocblockClass occurrences="2">
-      <code>type</code>
-      <code>type</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Security/Resolver/ResolverTwigExtension.php">
-    <TooFewArguments occurrences="1">
-      <code>resolveScope</code>
-    </TooFewArguments>
-    <UndefinedDocblockClass occurrences="1">
-      <code>Center|Center[]|null</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php">
-    <ParamNameMismatch occurrences="1">
-      <code>$address</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Serializer/Normalizer/CenterNormalizer.php">
-    <ParamNameMismatch occurrences="1">
-      <code>$center</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Serializer/Normalizer/CollectionNormalizer.php">
-    <ParamNameMismatch occurrences="1">
-      <code>$collection</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Serializer/Normalizer/DateNormalizer.php">
-    <ParamNameMismatch occurrences="1">
-      <code>$date</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php">
-    <ParamNameMismatch occurrences="1">
-      <code>$user</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Templating/CSVCellTwig.php">
-    <UndefinedDocblockClass occurrences="1">
-      <code>The</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Templating/Entity/AddressRender.php">
-    <ParamNameMismatch occurrences="2">
-      <code>$addr</code>
-      <code>$addr</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Templating/Entity/ChillEntityRenderInterface.php">
-    <UndefinedDocblockClass occurrences="2">
-      <code>type</code>
-      <code>type</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Templating/TranslatableStringTwig.php">
-    <UndefinedDocblockClass occurrences="1">
-      <code>The</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Templating/Widget/WidgetRenderingTwig.php">
-    <UndefinedDocblockClass occurrences="2">
-      <code>$widget</code>
-      <code>$widget</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Test/Export/AbstractAggregatorTest.php">
-    <UndefinedDocblockClass occurrences="1">
-      <code>type</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Test/Export/AbstractExportTest.php">
-    <InaccessibleMethod occurrences="1">
-      <code>getClient</code>
-    </InaccessibleMethod>
-    <UndefinedClass occurrences="1">
-      <code>Query</code>
-    </UndefinedClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Test/Export/AbstractFilterTest.php">
-    <UndefinedDocblockClass occurrences="1">
-      <code>type</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Tests/Search/SearchProviderTest.php">
-    <UndefinedDocblockClass occurrences="1">
-      <code>unknown</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php">
-    <UndefinedDocblockClass occurrences="1">
-      <code>unknown</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillMainBundle/Timeline/TimelineProviderInterface.php">
-    <UndefinedDocblockClass occurrences="2">
-      <code>type</code>
-      <code>type</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Actions/ActionEvent.php">
-    <UndefinedDocblockClass occurrences="1">
-      <code>type</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php">
-    <UndefinedDocblockClass occurrences="1">
-      <code>type</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/CRUD/Controller/EntityPersonCRUDController.php">
-    <ReservedWord occurrences="1">
-      <code>\Chill\MainBundle\CRUD\Controller\string|string</code>
-    </ReservedWord>
-    <UndefinedDocblockClass occurrences="3">
-      <code>Symfony\Component\HttpKernel\Exception\NotFoundHttpException</code>
-      <code>\Chill\PersonBundle\CRUD\Controller\QueryBuilder</code>
-      <code>\Chill\PersonBundle\CRUD\Controller\QueryBuilder</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Command/ChillPersonMoveCommand.php">
-    <UndefinedClass occurrences="1">
-      <code>$sqls</code>
-    </UndefinedClass>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Command/ImportPeopleFromCSVCommand.php">
-    <UndefinedDocblockClass occurrences="3">
-      <code>$cfProvider-&gt;getCustomFieldByType($customField-&gt;getType())</code>
-      <code>type</code>
-      <code>type</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php">
-    <AssignmentToVoid occurrences="1">
-      <code>$participation</code>
-    </AssignmentToVoid>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php">
-    <UndefinedClass occurrences="1">
-      <code>'ChillPersonBundle:Person'</code>
-    </UndefinedClass>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Controller/AdminClosingMotiveController.php">
-    <ReservedWord occurrences="1">
-      <code>\Chill\MainBundle\CRUD\Controller\string|string</code>
-    </ReservedWord>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php">
-    <UndefinedDocblockClass occurrences="1">
-      <code>$person</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Controller/HouseholdController.php">
-    <UndefinedDocblockClass occurrences="1">
-      <code>$p</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Controller/OpeningApiController.php">
-    <ParamNameMismatch occurrences="1">
-      <code>$qb</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php">
-    <UndefinedClass occurrences="5">
-      <code>'ChillPersonBundle:Person'</code>
-      <code>'ChillPersonBundle:Person'</code>
-      <code>'ChillPersonBundle:Person'</code>
-      <code>'ChillPersonBundle:Person'</code>
-      <code>'ChillPersonBundle:Person'</code>
-    </UndefinedClass>
-    <UndefinedDocblockClass occurrences="1">
-      <code>Chill\PersonBundle\Entity\Person</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Controller/PersonController.php">
-    <UndefinedClass occurrences="1">
-      <code>'ChillCustomFieldsBundle:CustomFieldsDefaultGroup'</code>
-    </UndefinedClass>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php">
-    <UndefinedClass occurrences="3">
-      <code>$sqls</code>
-      <code>InvalidArgumentException</code>
-      <code>InvalidArgumentException</code>
-    </UndefinedClass>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php">
-    <UndefinedDocblockClass occurrences="1">
-      <code>\Chill\PersonBundle\DependencyInjection\containerBuilder</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart.php">
-    <AssignmentToVoid occurrences="1">
-      <code>$a</code>
-    </AssignmentToVoid>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php">
-    <ParamNameMismatch occurrences="1">
-      <code>$createdBy</code>
-    </ParamNameMismatch>
-    <UndefinedDocblockClass occurrences="2">
-      <code>Collection|SocialAction[]</code>
-      <code>Collection|SocialIssues[]</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php">
-    <ParamNameMismatch occurrences="2">
-      <code>$createdAt</code>
-      <code>$createdBy</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php">
-    <ParamNameMismatch occurrences="4">
-      <code>$createdAt</code>
-      <code>$createdBy</code>
-      <code>$updatedAt</code>
-      <code>$updatedBy</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationDocument.php">
-    <UndefinedDocblockClass occurrences="1">
-      <code>DateTimeImmutable|null</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php">
-    <ParamNameMismatch occurrences="3">
-      <code>$createdAt</code>
-      <code>$updatedAt</code>
-      <code>$updatedBy</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Entity/Household/Household.php">
-    <UndefinedDocblockClass occurrences="1">
-      <code>Person[]</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Entity/Person.php">
-    <ParamNameMismatch occurrences="1">
-      <code>$createdBy</code>
-    </ParamNameMismatch>
-    <UndefinedDocblockClass occurrences="5">
-      <code>Chill\MainBundle\Entity\Country</code>
-      <code>Chill\MainBundle\Entity\Country</code>
-      <code>Chill\MainBundle\Entity\Country</code>
-      <code>Report</code>
-      <code>type</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Entity/Relationships/Relationship.php">
-    <ParamNameMismatch occurrences="3">
-      <code>$createdAt</code>
-      <code>$updatedAt</code>
-      <code>$updatedBy</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Export/Export/CountPerson.php">
-    <ParamNameMismatch occurrences="1">
-      <code>$qb</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php">
-    <UndefinedClass occurrences="1">
-      <code>'ChillMainBundle:Country'</code>
-    </UndefinedClass>
-    <UndefinedDocblockClass occurrences="1"/>
-    <UndefinedVariable occurrences="1">
-      <code>$choiceSlug</code>
-    </UndefinedVariable>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php">
-    <UndefinedDocblockClass occurrences="1">
-      <code>EntityRepository</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Form/DataMapper/PersonAltNameDataMapper.php">
-    <UndefinedDocblockClass occurrences="1">
-      <code>FormInterface[]</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Form/DataTransformer/PersonToIdTransformer.php">
-    <ParamNameMismatch occurrences="2">
-      <code>$id</code>
-      <code>$issue</code>
-    </ParamNameMismatch>
-    <UndefinedClass occurrences="1">
-      <code>'ChillPersonBundle:Person'</code>
-    </UndefinedClass>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Form/PersonType.php">
-    <UndefinedDocblockClass occurrences="1">
-      <code>OptionsResolverInterface</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/app/AppKernel.php">
-    <DuplicateClass occurrences="1">
-      <code>AppKernel</code>
-    </DuplicateClass>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/app/autoload.php">
-    <MissingFile occurrences="1">
-      <code>require __DIR__ . '/../../../../../vendor/autoload.php'</code>
-    </MissingFile>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Resources/test/Fixtures/App/web/app_dev.php">
-    <MissingFile occurrences="1">
-      <code>require_once __DIR__ . '/../app/bootstrap.php.cache'</code>
-    </MissingFile>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php">
-    <ParamNameMismatch occurrences="1">
-      <code>$period</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodOriginNormalizer.php">
-    <ParamNameMismatch occurrences="1">
-      <code>$origin</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodParticipationNormalizer.php">
-    <ParamNameMismatch occurrences="1">
-      <code>$participation</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php">
-    <UndefinedFunction occurrences="1">
-      <code>·\is_array('concerned')</code>
-    </UndefinedFunction>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php">
-    <ParamNameMismatch occurrences="1">
-      <code>$person</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php">
-    <ParamNameMismatch occurrences="1">
-      <code>$person</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Serializer/Normalizer/RelationshipDocGenNormalizer.php">
-    <ParamNameMismatch occurrences="1">
-      <code>$relation</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialActionNormalizer.php">
-    <ParamNameMismatch occurrences="1">
-      <code>$socialAction</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialIssueNormalizer.php">
-    <ParamNameMismatch occurrences="1">
-      <code>$socialIssue</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php">
-    <ParamNameMismatch occurrences="2">
-      <code>$person</code>
-      <code>$person</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Templating/Entity/SocialActionRender.php">
-    <ParamNameMismatch occurrences="2">
-      <code>$socialAction</code>
-      <code>$socialAction</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Templating/Entity/SocialIssueRender.php">
-    <ParamNameMismatch occurrences="2">
-      <code>$socialIssue</code>
-      <code>$socialIssue</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/AccompanyingPeriod/AccompanyingPeriodConfidentialTest.php">
-    <UndefinedClass occurrences="2">
-      <code>AccompanyingPeriodRepository</code>
-      <code>stdClass</code>
-    </UndefinedClass>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Controller/AccompanyingPeriodControllerTest.php">
-    <InvalidThrow occurrences="1"/>
-    <UndefinedClass occurrences="3">
-      <code>'ChillMainBundle:Center'</code>
-      <code>'ChillPersonBundle:AccompanyingPeriod\ClosingMotive'</code>
-      <code>LogicalException</code>
-    </UndefinedClass>
-    <UndefinedDocblockClass occurrences="2">
-      <code>Chill\PersonBundle\Entity\AccompanyingPeriod</code>
-      <code>Chill\PersonBundle\Entity\AccompanyingPeriod</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Controller/HouseholdApiControllerTest.php">
-    <UndefinedClass occurrences="1">
-      <code>User</code>
-    </UndefinedClass>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Controller/PersonAddressControllerTest.php">
-    <InvalidScope occurrences="1">
-      <code>$this</code>
-    </InvalidScope>
-    <UndefinedClass occurrences="1">
-      <code>'ChillPersonBundle:Person'</code>
-    </UndefinedClass>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateTest.php">
-    <UndefinedClass occurrences="2">
-      <code>'ChillMainBundle:Country'</code>
-      <code>'ChillPersonBundle:Person'</code>
-    </UndefinedClass>
-    <UndefinedDocblockClass occurrences="1">
-      <code>$person-&gt;getCountryOfBirth()</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerUpdateWithHiddenFieldsTest.php">
-    <UndefinedClass occurrences="2">
-      <code>'ChillMainBundle:Country'</code>
-      <code>'ChillPersonBundle:Person'</code>
-    </UndefinedClass>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewTest.php">
-    <UndefinedClass occurrences="1">
-      <code>'ChillPersonBundle:Person'</code>
-    </UndefinedClass>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Controller/PersonControllerViewWithHiddenFieldsTest.php">
-    <UndefinedClass occurrences="1">
-      <code>'ChillPersonBundle:Person'</code>
-    </UndefinedClass>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Tests/Entity/AccompanyingPeriodTest.php">
-    <AssignmentToVoid occurrences="1">
-      <code>$participationL</code>
-    </AssignmentToVoid>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Timeline/AbstractTimelineAccompanyingPeriod.php">
-    <UndefinedClass occurrences="1">
-      <code>'ChillPersonBundle:AccompanyingPeriod'</code>
-    </UndefinedClass>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/AccompanyingPeriodValidityValidator.php">
-    <ParamNameMismatch occurrences="1">
-      <code>$period</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/LocationValidityValidator.php">
-    <ParamNameMismatch occurrences="1">
-      <code>$period</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ParticipationOverlapValidator.php">
-    <ParamNameMismatch occurrences="1">
-      <code>$participations</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ResourceDuplicateCheckValidator.php">
-    <ParamNameMismatch occurrences="1">
-      <code>$resources</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Validator/Constraints/Household/HouseholdMembershipSequentialValidator.php">
-    <ParamNameMismatch occurrences="1">
-      <code>$person</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Validator/Constraints/Household/MaxHolderValidator.php">
-    <ParamNameMismatch occurrences="1">
-      <code>$household</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Validator/Constraints/Person/PersonHasCenterValidator.php">
-    <ParamNameMismatch occurrences="1">
-      <code>$person</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillPersonBundle/Widget/PersonListWidget.php">
-    <UndefinedClass occurrences="1">
-      <code>'ChillCustomFieldsBundle:CustomField'</code>
-    </UndefinedClass>
-  </file>
-  <file src="src/Bundle/ChillReportBundle/Controller/ReportController.php">
-    <UndefinedClass occurrences="15">
-      <code>'ChillCustomFieldsBundle:CustomFieldsGroup'</code>
-      <code>'ChillCustomFieldsBundle:CustomFieldsGroup'</code>
-      <code>'ChillCustomFieldsBundle:CustomFieldsGroup'</code>
-      <code>'ChillCustomFieldsBundle:CustomFieldsGroup'</code>
-      <code>'ChillCustomFieldsBundle:CustomFieldsGroup'</code>
-      <code>'ChillPersonBundle:Person'</code>
-      <code>'ChillPersonBundle:Person'</code>
-      <code>'ChillPersonBundle:Person'</code>
-      <code>'ChillPersonBundle:Person'</code>
-      <code>'ChillPersonBundle:Person'</code>
-      <code>'ChillPersonBundle:Person'</code>
-      <code>'ChillReportBundle:Report'</code>
-      <code>'ChillReportBundle:Report'</code>
-      <code>'ChillReportBundle:Report'</code>
-      <code>'ChillReportBundle:Report'</code>
-    </UndefinedClass>
-    <UndefinedDocblockClass occurrences="9">
-      <code>A</code>
-      <code>Response</code>
-      <code>Response</code>
-      <code>Response</code>
-      <code>Response</code>
-      <code>Response</code>
-      <code>Response</code>
-      <code>Response</code>
-      <code>Response</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php">
-    <UndefinedDocblockClass occurrences="1">
-      <code>the</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillReportBundle/Export/Export/ReportList.php">
-    <UndefinedClass occurrences="1">
-      <code>'ChillMainBundle:Country'</code>
-    </UndefinedClass>
-    <UndefinedDocblockClass occurrences="1"/>
-    <UndefinedVariable occurrences="1">
-      <code>$choiceSlug</code>
-    </UndefinedVariable>
-  </file>
-  <file src="src/Bundle/ChillReportBundle/Resources/test/Fixtures/App/app/AppKernel.php">
-    <DuplicateClass occurrences="1">
-      <code>AppKernel</code>
-    </DuplicateClass>
-  </file>
-  <file src="src/Bundle/ChillReportBundle/Resources/test/Fixtures/App/app/autoload.php">
-    <MissingFile occurrences="1">
-      <code>require __DIR__ . '/../../../../../vendor/autoload.php'</code>
-    </MissingFile>
-  </file>
-  <file src="src/Bundle/ChillReportBundle/Tests/Controller/ReportControllerTest.php">
-    <InvalidParamDefault occurrences="1">
-      <code>type</code>
-    </InvalidParamDefault>
-    <UndefinedDocblockClass occurrences="31">
-      <code>$client</code>
-      <code>$client</code>
-      <code>$client</code>
-      <code>$client</code>
-      <code>$client</code>
-      <code>$client</code>
-      <code>$client</code>
-      <code>$client</code>
-      <code>$client</code>
-      <code>$client</code>
-      <code>$client</code>
-      <code>$client</code>
-      <code>$client</code>
-      <code>$client</code>
-      <code>$client</code>
-      <code>$client</code>
-      <code>$client</code>
-      <code>$client</code>
-      <code>$client</code>
-      <code>$client</code>
-      <code>$client</code>
-      <code>$client</code>
-      <code>$client</code>
-      <code>$client</code>
-      <code>$this-&gt;getAuthenticatedClient('center a_administrative')</code>
-      <code>Client</code>
-      <code>\Chill\ReportBundle\Tests\Controller\Person</code>
-      <code>\SClientymfony\Component\BrowserKit\</code>
-      <code>type</code>
-      <code>type</code>
-      <code>type</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillReportBundle/Tests/Security/Authorization/ReportVoterTest.php">
-    <UndefinedDocblockClass occurrences="3">
-      <code>type</code>
-      <code>type</code>
-      <code>type</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillReportBundle/Tests/Timeline/TimelineProviderTest.php">
-    <UndefinedClass occurrences="1">
-      <code>'ChillCustomFieldsBundle:CustomFieldsGroup'</code>
-    </UndefinedClass>
-  </file>
-  <file src="src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php">
-    <UndefinedClass occurrences="1">
-      <code>'ChillReportBundle:Report'</code>
-    </UndefinedClass>
-  </file>
-  <file src="src/Bundle/ChillReportBundle/migrations/Version20150622233319.php">
-    <UndefinedVariable occurrences="1">
-      <code>$defaultScopeId</code>
-    </UndefinedVariable>
-  </file>
-  <file src="src/Bundle/ChillTaskBundle/Controller/TaskController.php">
-    <UndefinedDocblockClass occurrences="1">
-      <code>\Chill\TaskBundle\Controller\AbstractTask</code>
-    </UndefinedDocblockClass>
-    <UndefinedVariable occurrences="1">
-      <code>$type</code>
-    </UndefinedVariable>
-  </file>
-  <file src="src/Bundle/ChillTaskBundle/DependencyInjection/Compiler/TaskWorkflowDefinitionCompilerPass.php">
-    <UndefinedClass occurrences="3">
-      <code>$definition-&gt;getClass()::getAssociatedWorkflowName()</code>
-      <code>$definition-&gt;getClass()::getAssociatedWorkflowName()</code>
-      <code>$definition-&gt;getClass()::getAssociatedWorkflowName()</code>
-    </UndefinedClass>
-  </file>
-  <file src="src/Bundle/ChillTaskBundle/Entity/AbstractTask.php">
-    <UndefinedDocblockClass occurrences="2">
-      <code>json</code>
-      <code>private $currentStates = [];</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillTaskBundle/Entity/RecurringTask.php">
-    <UndefinedDocblockClass occurrences="6">
-      <code>dateinterval</code>
-      <code>dateinterval</code>
-      <code>dateinterval</code>
-      <code>dateinterval</code>
-      <code>dateinterval</code>
-      <code>dateinterval</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillTaskBundle/Entity/Task/AbstractTaskPlaceEvent.php">
-    <UndefinedDocblockClass occurrences="3">
-      <code>datetime_immutable</code>
-      <code>datetime_immutable</code>
-      <code>datetime_immutable</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillTaskBundle/Repository/SingleTaskRepository.php">
-    <UndefinedDocblockClass occurrences="2">
-      <code>type</code>
-      <code>type</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillTaskBundle/Security/Authorization/AuthorizationEvent.php">
-    <UndefinedDocblockClass occurrences="1">
-      <code>\Chill\PersonBundle\Entity\Person|Chill\TaskBundle\Entity\AbstractTask|null</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillTaskBundle/Templating/UI/CountNotificationTask.php">
-    <UndefinedDocblockClass occurrences="5">
-      <code>$this-&gt;cachePool</code>
-      <code>$this-&gt;cachePool</code>
-      <code>$this-&gt;cachePool</code>
-      <code>$this-&gt;cachePool</code>
-      <code>CacheItempPoolInterface</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillThirdPartyBundle/DependencyInjection/CompilerPass/ThirdPartyTypeCompilerPass.php">
-    <UndefinedClass occurrences="1">
-      <code>$taggedService-&gt;getClass()::getKey()</code>
-    </UndefinedClass>
-  </file>
-  <file src="src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php">
-    <ParamNameMismatch occurrences="3">
-      <code>$createdAt</code>
-      <code>$updatedAt</code>
-      <code>$updatedBy</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php">
-    <InvalidParamDefault occurrences="1">
-      <code>type</code>
-    </InvalidParamDefault>
-    <UndefinedDocblockClass occurrences="1">
-      <code>type</code>
-    </UndefinedDocblockClass>
-  </file>
-  <file src="src/Bundle/ChillThirdPartyBundle/Serializer/Normalizer/ThirdPartyNormalizer.php">
-    <ParamNameMismatch occurrences="1">
-      <code>$thirdParty</code>
-    </ParamNameMismatch>
-  </file>
-  <file src="src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php">
-    <UndefinedDocblockClass occurrences="6">
-      <code>$object</code>
-      <code>$object</code>
-      <code>$object</code>
-      <code>$object-&gt;url</code>
-      <code>$object-&gt;url</code>
-      <code>$object-&gt;url</code>
-    </UndefinedDocblockClass>
-  </file>
-</files>
diff --git a/psalm.xml b/psalm.xml
deleted file mode 100644
index 77193f05b..000000000
--- a/psalm.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0"?>
-<psalm
-    errorLevel="7"
-    resolveFromConfigFile="true"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns="https://getpsalm.org/schema/config"
-    xsi:schemaLocation="https://getpsalm.org/schema/config tests/app/vendor/vimeo/psalm/config.xsd"
-    errorBaseline="psalm-baseline.xml"
-    cacheDirectory="./.psalm"
->
-    <projectFiles>
-        <directory name="src"/>
-        <ignoreFiles>
-            <directory name="./tests/"/>
-            <directory name="./node_modules/"/>
-        </ignoreFiles>
-    </projectFiles>
-
-    <!-- suppress error around parameter bags - see https://github.com/symfony/symfony/issues/45609#issuecomment-1056816975 -->
-    <!-- maybe to desactivate with php 8.1 ? -->
-    <issueHandlers>
-        <UndefinedDocblockClass>
-            <errorLevel type="suppress">
-                <referencedClass name="UnitEnum"/>
-            </errorLevel>
-        </UndefinedDocblockClass>
-    </issueHandlers>
-
-    <!--
-    <fileExtensions>
-        <extension name=".php"/>
-        <extension name=".twig" checker="tests/app/vendor/psalm/plugin-symfony/src/Twig/TemplateFileAnalyzer.php" />
-    </fileExtensions>
-    -->
-
-    <plugins>
-        <pluginClass class="Psalm\PhpUnitPlugin\Plugin"/>
-        <!--
-        <pluginClass class="Psalm\SymfonyPsalmPlugin\Plugin">
-            <containerXml>tests/app/var/cache/dev/srcApp_KernelDevDebugContainer.xml</containerXml>
-            <stubs>
-                <file name="vendor/symfony/dependency-injection/Loader/Configurator/ContainerConfigurator.php" />
-            </stubs>
-        </pluginClass>
-        -->
-    </plugins>
-</psalm>
diff --git a/src/Bundle/ChillActivityBundle/.gitlab-ci.yml b/src/Bundle/ChillActivityBundle/.gitlab-ci.yml
deleted file mode 100644
index f3c009a96..000000000
--- a/src/Bundle/ChillActivityBundle/.gitlab-ci.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-.test_definition: &test_definition
-    services:
-       - chill/database:latest
-     
-    before_script:
-       - composer config github-oauth.github.com $GITHUB_TOKEN
-       - php -d memory_limit=-1 /usr/local/bin/composer install --no-interaction
-       - cp  Resources/test/Fixtures/App/app/config/parameters.gitlab-ci.yml Resources/test/Fixtures/App/app/config/parameters.yml
-       - php Resources/test/Fixtures/App/app/console doctrine:migrations:migrate --env=test --no-interaction
-       - php Resources/test/Fixtures/App/app/console doctrine:fixtures:load --env=test --no-interaction
-
-stages:
-    - deploy
-    - test
-    - build-doc
-    - deploy-doc
-
-test:php-7.2:
-    stage: test
-    image: chill/ci-image:php-7.2
-    <<: *test_definition
-    script: php vendor/bin/phpunit
-
-deploy-packagist:    
-    stage: deploy    
-    image: chill/ci-image:php-7.2
-    before_script:        
-        # test that PACKAGIST USERNAME and PACKAGIST_TOKEN variable are set        
-        - if [ -z ${PACKAGIST_USERNAME+x} ]; then echo "Please set PACKAGIST_USERNAME variable"; exit -1;  fi        
-        - if [ -z ${PACKAGIST_TOKEN+x} ]; then echo "Please set PACKAGIST_TOKEN variable";  exit -1; fi    
-    script:        
-        - STATUSCODE=$(curl -XPOST -H'content-type:application/json' "https://packagist.org/api/update-package?username=$PACKAGIST_USERNAME&apiToken=$PACKAGIST_TOKEN" -d"{\"repository\":{\"url\":\"$CI_PROJECT_URL.git\"}}" --silent --output /dev/stderr --write-out "%{http_code}")        
-        - if [ $STATUSCODE = "202" ]; then exit 0; else exit $STATUSCODE; fi
-        
-# deploy documentation
-api-doc-build:
-   stage: build-doc
-   environment: api-doc
-   image: chill/ci-image:php-7.2
-   before_script:
-      - mkdir api-doc
-   script: apigen generate --destination api-doc/$CI_BUILD_REF_NAME/$CI_PROJECT_NAME
-   artifacts:
-      paths:
-         - "api-doc/"
-      name: api
-      expire_in: '2h'
-   only:
-      - master
-      - tags
-
-api-doc-deploy:
-   stage: deploy-doc
-   image: pallet/swiftclient:latest
-   before_script:
-        # test that CONTAINER_API variable is set        
-        - if [ -z ${CONTAINER_API+x} ]; then echo "Please set CONTAINER_API variable"; exit -1;  fi
-        # go to api-doc to have and url with PROJECT/BUILD
-        - cd api-doc
-        # upload, and keep files during 1 year
-   script: "swift upload --header \"X-Delete-After: 31536000\"  $CONTAINER_API $CI_BUILD_REF_NAME/$CI_PROJECT_NAME"
-   only:
-      - master
-      - tags
diff --git a/src/Bundle/ChillActivityBundle/CHANGELOG.md b/src/Bundle/ChillActivityBundle/CHANGELOG.md
deleted file mode 100644
index 4cda36f0c..000000000
--- a/src/Bundle/ChillActivityBundle/CHANGELOG.md
+++ /dev/null
@@ -1,31 +0,0 @@
-
-Version 1.5.1
-=============
-
-- [report activity count] fix error: do not show centers which are not selected in results.
-
-Version 1.5.2
-=============
-
-- [aggregate by activity type] fix translation in aggregate activity type
-- fix some translation in export
-- fix error when persons not loaded by other aggregators / filters
-- add "filter by activity type" filter
-
-Version 1.5.3
-=============
-
-- add privacy events to activity list / show / edit
-
-Version 1.5.4
-=============
-
-- [report activity]: add aggregator for activity users
-- fix bug: error when extracting activities without filter / aggregators selecting persons
-
-Version 1.5.5
-=============
-
-- [activity] replace dropdown for selecting reasons and use chillEntity for reason rendering
-- fix bug: error when trying to edit activity of which the type has been deactivated
-
diff --git a/src/Bundle/ChillActivityBundle/apigen.neon b/src/Bundle/ChillActivityBundle/apigen.neon
deleted file mode 100644
index 5fefb1f80..000000000
--- a/src/Bundle/ChillActivityBundle/apigen.neon
+++ /dev/null
@@ -1,10 +0,0 @@
-# configuration for apigen 
-
-source:    
-    - . 
-    
-exclude:    
-    - vendor/*    
-    - Test* 
-    
-title: Chill Activity Bundle
diff --git a/src/Bundle/ChillActivityBundle/composer.json b/src/Bundle/ChillActivityBundle/composer.json
deleted file mode 100644
index b860bc03b..000000000
--- a/src/Bundle/ChillActivityBundle/composer.json
+++ /dev/null
@@ -1,40 +0,0 @@
-{
-    "name": "chill-project/activity",
-    "description": "This bundle extend chill for recording the different activities of the user",
-    "type": "symfony-bundle",
-    "license": "AGPL-3.0",
-    "keywords" : ["chill", "social work"],
-    "homepage" : "https://github.com/Chill-project/Activity",
-    "autoload": {
-        "psr-4": { "Chill\\ActivityBundle\\": "" }
-    },
-    "autoload-dev": {
-        "classmap": [ "Resources/test/Fixtures/App/app/AppKernel.php" ]
-    },
-    "authors": [
-        {
-            "name": "Champs-Libres",
-            "email": "info@champs-libres.coop"
-        }
-    ],
-    "require": {
-    },
-    "require-dev": {
-    },
-    "scripts": {
-        "post-install-cmd": [
-            "ComposerBundleMigration\\Composer\\Migrations::synchronizeMigrations",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap"
-        ],
-        "post-update-cmd": [
-            "ComposerBundleMigration\\Composer\\Migrations::synchronizeMigrations",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap"
-        ]
-    },
-    "extra": {
-        "app-migrations-dir": "Resources/test/Fixtures/App/app/DoctrineMigrations",
-        "symfony-app-dir": "Test/Fixtures/App/app/"
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true
-}
diff --git a/src/Bundle/ChillActivityBundle/phpunit.xml.dist b/src/Bundle/ChillActivityBundle/phpunit.xml.dist
deleted file mode 100644
index 0438e08da..000000000
--- a/src/Bundle/ChillActivityBundle/phpunit.xml.dist
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit bootstrap="./Resources/test/Fixtures/App/app/autoload.php" colors="true">
-    <testsuites>
-        <testsuite name="ChillActivityBundle test suite">
-            <directory suffix="Test.php">./Tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Resources</directory>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-       </whitelist>
-    </filter>
-    <php>
-        <server name="KERNEL_DIR" value="Resources/test/Fixtures/App/app/" />
-        <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak" />
-    </php>  
-</phpunit>
diff --git a/src/Bundle/ChillBudgetBundle/composer.json b/src/Bundle/ChillBudgetBundle/composer.json
deleted file mode 100644
index 95e9d6710..000000000
--- a/src/Bundle/ChillBudgetBundle/composer.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "name": "chill-project/budget",
-    "description": "This bundle extend chill for recording element of a budget for peoples",
-    "type": "symfony-bundle",
-    "license": "AGPL-3.0",
-    "keywords" : ["chill", "social work"],
-    "homepage" : "https://framagit.org/Chill-project/BudgetBundle",
-    "autoload": {
-        "psr-4": { "Chill\\BudgetBundle\\": "" }
-    },
-    "autoload-dev": {
-        "classmap": [ "Resources/test/Fixtures/App/app/AppKernel.php" ]
-    },
-    "authors": [
-        {
-            "name": "Champs-Libres",
-            "email": "info@champs-libres.coop"
-        }
-    ],
-    "require": {
-    },
-    "require-dev": {
-    },
-    "extra": {
-        "app-migrations-dir": "Resources/test/Fixtures/App/app/DoctrineMigrations",
-        "symfony-app-dir": "Test/Fixtures/App/app/"
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true
-}
diff --git a/src/Bundle/ChillCalendarBundle/.gitignore b/src/Bundle/ChillCalendarBundle/.gitignore
deleted file mode 100644
index f443cb81e..000000000
--- a/src/Bundle/ChillCalendarBundle/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-composer.lock
-vendor/*
-parameters.yml
-*~
-*.DS_Store
-*.sass-cache
-Resources/node_modules/
-Tests/Fixtures/App/app/config/parameters.yml
-/nbproject/private/
-Resources/test/Fixtures/App/bootstrap.php.cache
-
diff --git a/src/Bundle/ChillCalendarBundle/LICENSE b/src/Bundle/ChillCalendarBundle/LICENSE
deleted file mode 100644
index 2def0e883..000000000
--- a/src/Bundle/ChillCalendarBundle/LICENSE
+++ /dev/null
@@ -1,661 +0,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.
\ No newline at end of file
diff --git a/src/Bundle/ChillCalendarBundle/composer.json b/src/Bundle/ChillCalendarBundle/composer.json
deleted file mode 100644
index fc96ea04b..000000000
--- a/src/Bundle/ChillCalendarBundle/composer.json
+++ /dev/null
@@ -1,30 +0,0 @@
-{
-    "name": "chill-project/calendar",
-    "description": "This bundle extends chill for managing a calendar",
-    "type": "symfony-bundle",
-    "license": "AGPL-3.0-or-later",
-    "keywords" : ["chill", "social work"],
-    "homepage" : "hhttps://gitlab.com/Chill-Projet/chill-bundles/",
-    "autoload": {
-        "psr-4": { "Chill\\CalendarBundle\\": "" }
-    },
-    "autoload-dev": {
-        "classmap": [ "Resources/test/Fixtures/App/app/AppKernel.php" ]
-    },
-    "authors": [
-        {
-            "name": "Champs-Libres",
-            "email": "info@champs-libres.coop"
-        }
-    ],
-    "require": {
-    },
-    "require-dev": {
-    },
-    "extra": {
-        "app-migrations-dir": "Resources/test/Fixtures/App/app/DoctrineMigrations",
-        "symfony-app-dir": "Test/Fixtures/App/app/"
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true
-}
diff --git a/src/Bundle/ChillCustomFieldsBundle/.gitignore b/src/Bundle/ChillCustomFieldsBundle/.gitignore
deleted file mode 100644
index b11589291..000000000
--- a/src/Bundle/ChillCustomFieldsBundle/.gitignore
+++ /dev/null
@@ -1,32 +0,0 @@
-/web/bundles/
-/app/cache/*
-!/app/cache/dev/security/nonces/index
-!/app/cache/prod/security/nonces/index
-/app/logs/*
-/vendor/
-/app/config/parameters.ini
-/app/config/parameters.yml
-/app/bootstrap*
-/src/Acme/
-/output/
-/web/uploads/images/*
-!/web/uploads/images/index.html
-/src/Progracqteur/WikipedaleBundle/DataFixtures/ORM/Files/*
-.gitignore~
-*~
-composer.phar
-composer.lock
-/nbproject/private/
-parameters.yml
-app/config/parameters.yml
-Tests/Fixtures/App/app/config/parameters.yml
-.DS_Store
-*bower_components
-bin/*
-/tmp/*
-src/Chill/CustomFieldsBundle/vendor/*
-bootstrap.php.cache
-#the file created by composer to store creds
-auth.json
-Tests/Fixtures/App/app/config/parameters.yml
-
diff --git a/src/Bundle/ChillCustomFieldsBundle/.gitlab-ci.yml b/src/Bundle/ChillCustomFieldsBundle/.gitlab-ci.yml
deleted file mode 100644
index 1936cb9cc..000000000
--- a/src/Bundle/ChillCustomFieldsBundle/.gitlab-ci.yml
+++ /dev/null
@@ -1,68 +0,0 @@
-.test_definition: &test_definition
-    services:
-       - chill/database:latest
-     
-    before_script:
-       - echo "PHP version is $(php --version)"
-       - composer config github-oauth.github.com $GITHUB_TOKEN
-       - if [ $CI_BUILD_REF_NAME = "1.0" ] ; then export COMPOSER_ROOT_VERSION="1.0-dev"; else export COMPOSER_ROOT_VERSION="dev-master"; fi
-       - php -d memory_limit=-1 /usr/local/bin/composer install --no-interaction 
-       - cp  Resources/test/Fixtures/App/app/config/parameters.gitlab-ci.yml Resources/test/Fixtures/App/app/config/parameters.yml
-       - php Resources/test/Fixtures/App/app/console --env=test cache:warmup
-       - php Resources/test/Fixtures/App/app/console doctrine:migrations:migrate --env=test --no-interaction
-       - php Resources/test/Fixtures/App/app/console doctrine:fixtures:load --env=test --no-interaction
-       
-stages:
-   - deploy
-   - test
-   - build-doc
-   - deploy-doc
-   
-test:php-7.2:
-   stage: test
-   image: chill/ci-image:php-7.2
-   <<: *test_definition
-   script: vendor/bin/phpunit
-
-deploy-packagist:    
-    stage: deploy    
-    image: chill/ci-image:php-7.2   
-    before_script:        
-        # test that PACKAGIST USERNAME and PACKAGIST_TOKEN variable are set        
-        - if [ -z ${PACKAGIST_USERNAME+x} ]; then echo "Please set PACKAGIST_USERNAME variable"; exit -1;  fi        
-        - if [ -z ${PACKAGIST_TOKEN+x} ]; then echo "Please set PACKAGIST_TOKEN variable";  exit -1; fi    
-    script:        
-        - STATUSCODE=$(curl -XPOST -H'content-type:application/json' "https://packagist.org/api/update-package?username=$PACKAGIST_USERNAME&apiToken=$PACKAGIST_TOKEN" -d"{\"repository\":{\"url\":\"$CI_PROJECT_URL.git\"}}" --silent --output /dev/stderr --write-out "%{http_code}")        
-        - if [ $STATUSCODE = "202" ]; then exit 0; else exit $STATUSCODE; fi
-        
-# deploy documentation
-api-doc-build:
-   stage: build-doc
-   environment: api-doc
-   image: chill/ci-image:php-7.2
-   before_script:
-      - mkdir api-doc
-   script: apigen generate --destination api-doc/$CI_BUILD_REF_NAME/$CI_PROJECT_NAME
-   artifacts:
-      paths:
-         - "api-doc/"
-      name: api
-      expire_in: '2h'
-   only:
-      - master
-      - tags
-
-api-doc-deploy:
-   stage: deploy-doc
-   image: pallet/swiftclient:latest
-   before_script:
-        # test that CONTAINER_API variable is set        
-        - if [ -z ${CONTAINER_API+x} ]; then echo "Please set CONTAINER_API variable"; exit -1;  fi
-        # go to api-doc to have and url with PROJECT/BUILD
-        - cd api-doc
-        # upload, and keep files during 1 year
-   script: "swift upload --header \"X-Delete-After: 31536000\"  $CONTAINER_API $CI_BUILD_REF_NAME/$CI_PROJECT_NAME"
-   only:
-      - master
-      - tags
-      
diff --git a/src/Bundle/ChillCustomFieldsBundle/LICENSE.txt b/src/Bundle/ChillCustomFieldsBundle/LICENSE.txt
deleted file mode 100644
index dba13ed2d..000000000
--- a/src/Bundle/ChillCustomFieldsBundle/LICENSE.txt
+++ /dev/null
@@ -1,661 +0,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.
diff --git a/src/Bundle/ChillCustomFieldsBundle/apigen.neon b/src/Bundle/ChillCustomFieldsBundle/apigen.neon
deleted file mode 100644
index 9138d76a2..000000000
--- a/src/Bundle/ChillCustomFieldsBundle/apigen.neon
+++ /dev/null
@@ -1,15 +0,0 @@
-# configuration for apigen
-
-
-source:
-   - .
-
-accessLevels: ["public", "protected"]
-
-exclude:
-   - vendor/*
-   - Resources/test/*
-   - Tests/Fixtures/*
-
-title: Chill CustomFields Bundle
-
diff --git a/src/Bundle/ChillCustomFieldsBundle/composer.json b/src/Bundle/ChillCustomFieldsBundle/composer.json
deleted file mode 100644
index 5f94dc59e..000000000
--- a/src/Bundle/ChillCustomFieldsBundle/composer.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "name": "chill-project/custom-fields",
-    "license": "AGPL-3.0",
-    "type": "symfony-bundle",
-    "description": "This bundle allow to add custom fields on entities.",
-    "keywords" : ["chill", "social work"],
-    "homepage" : "https://github.com/Chill-project/CustomFields",
-    "autoload": {
-        "psr-4": { "Chill\\CustomFieldsBundle\\": "" }
-    },
-    "autoload-dev": {
-        "classmap": [ "Resources/test/Fixtures/App/app/AppKernel.php" ]
-    },
-    "authors" : [
-        {
-            "name": "Champs-Libres",
-            "email": "info@champs-libres.coop",
-            "homepage": "http://www.champs-libres.coop"
-        }
-    ],
-    "require": {
-    },
-    "require-dev": {
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true,
-    "scripts": {
-        "post-install-cmd": [
-            "ComposerBundleMigration\\Composer\\Migrations::synchronizeMigrations",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap"
-        ],
-        "post-update-cmd": [
-            "ComposerBundleMigration\\Composer\\Migrations::synchronizeMigrations",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap"
-        ]
-    },
-    "extra": {
-        "symfony-app-dir": "Tests/Fixtures/App/app",
-        "app-migrations-dir": "Resources/test/Fixtures/App/app/DoctrineMigrations"
-    }
-}
diff --git a/src/Bundle/ChillCustomFieldsBundle/phpunit.xml.dist b/src/Bundle/ChillCustomFieldsBundle/phpunit.xml.dist
deleted file mode 100644
index 85bbef1f9..000000000
--- a/src/Bundle/ChillCustomFieldsBundle/phpunit.xml.dist
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit bootstrap="./Resources/test/Fixtures/App/app/autoload.php" colors="true">
-    <!-- the file "./Tests/boostrap.php" will be created on the next step -->
-    <testsuites>
-        <testsuite name="ChillCustomField test suite">
-            <directory suffix="Test.php">./Tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Resources</directory>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-       </whitelist>
-    </filter>
-    <php>
-        <server name="KERNEL_DIR" value="Resources/test/Fixtures/App/app/" />
-        <ini name="error_reporting" value="-16385"/>
-    </php>  
-</phpunit>
diff --git a/src/Bundle/ChillCustomFieldsBundle/run-server.sh b/src/Bundle/ChillCustomFieldsBundle/run-server.sh
deleted file mode 100755
index e12b22a86..000000000
--- a/src/Bundle/ChillCustomFieldsBundle/run-server.sh
+++ /dev/null
@@ -1 +0,0 @@
-php Tests/Fixtures/App/app/console.php server:run  --docroot=Tests/Fixtures/App/web/
diff --git a/src/Bundle/ChillDocGeneratorBundle/.gitignore b/src/Bundle/ChillDocGeneratorBundle/.gitignore
deleted file mode 100644
index f443cb81e..000000000
--- a/src/Bundle/ChillDocGeneratorBundle/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-composer.lock
-vendor/*
-parameters.yml
-*~
-*.DS_Store
-*.sass-cache
-Resources/node_modules/
-Tests/Fixtures/App/app/config/parameters.yml
-/nbproject/private/
-Resources/test/Fixtures/App/bootstrap.php.cache
-
diff --git a/src/Bundle/ChillDocGeneratorBundle/LICENSE b/src/Bundle/ChillDocGeneratorBundle/LICENSE
deleted file mode 100644
index 2def0e883..000000000
--- a/src/Bundle/ChillDocGeneratorBundle/LICENSE
+++ /dev/null
@@ -1,661 +0,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.
\ No newline at end of file
diff --git a/src/Bundle/ChillDocGeneratorBundle/composer.json b/src/Bundle/ChillDocGeneratorBundle/composer.json
deleted file mode 100644
index 42939bd2b..000000000
--- a/src/Bundle/ChillDocGeneratorBundle/composer.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-    "name": "chill-project/docgen",
-    "description": "This bundle extends chill for generation of documents",
-    "type": "symfony-bundle",
-    "license": "AGPL-3.0-or-later",
-    "keywords" : ["chill", "social work"],
-    "homepage" : "hhttps://gitlab.com/Chill-Projet/chill-bundles/",
-    "autoload": {
-        "psr-4": { "Chill\\DocGeneratorBundle\\": "" }
-    },
-    "autoload-dev": {
-        "classmap": [ "Resources/test/Fixtures/App/app/AppKernel.php" ]
-    },
-    "authors": [
-        {
-            "name": "Champs-Libres",
-            "email": "info@champs-libres.coop"
-        }
-    ],
-    "require": {
-        "spomky-labs/base64url": "^2"
-    },
-    "require-dev": {
-    },
-    "extra": {
-        "app-migrations-dir": "Resources/test/Fixtures/App/app/DoctrineMigrations",
-        "symfony-app-dir": "Test/Fixtures/App/app/"
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true
-}
diff --git a/src/Bundle/ChillDocStoreBundle/.gitignore b/src/Bundle/ChillDocStoreBundle/.gitignore
deleted file mode 100644
index 57872d0f1..000000000
--- a/src/Bundle/ChillDocStoreBundle/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/vendor/
diff --git a/src/Bundle/ChillDocStoreBundle/.gitlab-ci.yml b/src/Bundle/ChillDocStoreBundle/.gitlab-ci.yml
deleted file mode 100644
index e9826c3fb..000000000
--- a/src/Bundle/ChillDocStoreBundle/.gitlab-ci.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-.test_definition: &test_definition
-    services:
-        - chill/database:latest
-    before_script:
-        - composer config github-oauth.github.com $GITHUB_TOKEN
-        - composer install
-        - cp  Resources/test/Fixtures/App/app/config/parameters.gitlab-ci.yml Resources/test/Fixtures/App/app/config/parameters.yml
-        - php Resources/test/Fixtures/App/app/console --env=test cache:warmup
-        - php Resources/test/Fixtures/App/app/console doctrine:migrations:migrate --env=test --no-interaction
-        - php Resources/test/Fixtures/App/app/console doctrine:fixtures:load --env=test --no-interaction
-    
-
-stages:
-   - deploy
-      
-deploy-packagist:    
-    stage: deploy    
-    image: chill/ci-image:php-7.2    
-    before_script:        
-        # test that PACKAGIST USERNAME and PACKAGIST_TOKEN variable are set        
-        - if [ -z ${PACKAGIST_USERNAME+x} ]; then echo "Please set PACKAGIST_USERNAME variable"; exit -1;  fi        
-        - if [ -z ${PACKAGIST_TOKEN+x} ]; then echo "Please set PACKAGIST_TOKEN variable";  exit -1; fi    
-    script:        
-        - STATUSCODE=$(curl -XPOST -H'content-type:application/json' "https://packagist.org/api/update-package?username=$PACKAGIST_USERNAME&apiToken=$PACKAGIST_TOKEN" -d"{\"repository\":{\"url\":\"$CI_PROJECT_URL.git\"}}" --silent --output /dev/stderr --write-out "%{http_code}")        
-        - if [ $STATUSCODE = "202" ]; then exit 0; else exit $STATUSCODE; fi
diff --git a/src/Bundle/ChillDocStoreBundle/CHANGELOG.md b/src/Bundle/ChillDocStoreBundle/CHANGELOG.md
deleted file mode 100644
index 1d9c05143..000000000
--- a/src/Bundle/ChillDocStoreBundle/CHANGELOG.md
+++ /dev/null
@@ -1,39 +0,0 @@
-
-Version 1.5.1
-=============
-
-- adding .gitlab-ci to upgrade automatically packagist
-- adding fixtures for ACL and DocumentCategory
-
-Version 1.5.2
-=============
-
-- fix some missing translations on update / create document and "any document" in list
-- use dropzone to upload a document with a better UI
-
-You must add `"dropzone": "^5.5.1"` to your dependencies in `packages.json` at the root project.
-
-Version 1.5.3
-=============
-
-- the javascript for uploading a file now works within collections, listening to collection events.
-
-Version 1.5.4
-=============
-
-- replace default message on download button below dropzone ;
-- launch event when dropzone is initialized, to allow to customize events on dropzone;
-- add privacy events to document index / show
-- add privacy events to document edit / update
-- remove dump message
-
-Version 1.5.5
-=============
-
-- add button to remove existing document in form, and improve UI in this part
-- fix error when document is removed in form
-
-Master branch
-=============
-
-- fix capitalization of person document pages
diff --git a/src/Bundle/ChillDocStoreBundle/composer.json b/src/Bundle/ChillDocStoreBundle/composer.json
deleted file mode 100644
index aa636535e..000000000
--- a/src/Bundle/ChillDocStoreBundle/composer.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-    "name": "chill-project/chill-doc-store",
-    "description": "A Chill bundle to store documents",
-    "type": "symfony-bundle",
-    "autoload": {
-        "psr-4": {
-            "Chill\\DocStoreBundle\\": ""
-        }
-    },
-    "require": {
-        "symfony/mime": "^4 || ^5",
-        "symfony/http-foundation": "^4"
-    },
-    "license": "AGPL-3.0"
-}
diff --git a/src/Bundle/ChillEventBundle/.gitignore b/src/Bundle/ChillEventBundle/.gitignore
deleted file mode 100644
index 093d23fa5..000000000
--- a/src/Bundle/ChillEventBundle/.gitignore
+++ /dev/null
@@ -1,24 +0,0 @@
-*~
-# MacOS
-.DS_Store
-
-# Bootstrap
-app/bootstrap*
-
-# Symfony directories
-vendor/*
-*/logs/*
-*/cache/*
-web/uploads/*
-web/bundles/*
-
-# Configuration files
-app/config/parameters.ini
-app/config/parameters.yml
-Tests/Fixtures/App/config/parameters.yml
-
-# fixtures
-Resources/test/Fixtures/App/DoctrineMigrations/
-
-#composer
-composer.lock
diff --git a/src/Bundle/ChillEventBundle/.gitlab-ci.yml b/src/Bundle/ChillEventBundle/.gitlab-ci.yml
deleted file mode 100644
index ffd3e3a9f..000000000
--- a/src/Bundle/ChillEventBundle/.gitlab-ci.yml
+++ /dev/null
@@ -1,75 +0,0 @@
-.test_definition: &test_definition
-    services:
-        - chill/database:latest
-    before_script:
-        - composer config github-oauth.github.com $GITHUB_TOKEN
-        - php -d memory_limit=-1 /usr/local/bin/composer install
-        - cp  Resources/test/Fixtures/App/config/parameters.gitlab-ci.yml Resources/test/Fixtures/App/config/parameters.yml
-        - php Resources/test/Fixtures/App/console --env=test cache:warmup
-        - php Resources/test/Fixtures/App/console doctrine:migrations:migrate --env=test --no-interaction
-        - php Resources/test/Fixtures/App/console doctrine:fixtures:load --env=test --no-interaction
-    
-
-stages:
-   - test
-   - deploy
-   - build-doc
-   - deploy-doc
-
- 
-
-
-test:php-5.6:
-    stage: test
-    <<: *test_definition
-    image: chill/ci-image:php-5.6
-    script: phpunit
-    
-test:php-7:
-    stage: test
-    <<: *test_definition
-    image: chill/ci-image:php-7
-    script: phpunit
-
-      
-deploy-packagist:    
-    stage: deploy    
-    image: chill/ci-image:php-7    
-    before_script:        
-        # test that PACKAGIST USERNAME and PACKAGIST_TOKEN variable are set        
-        - if [ -z ${PACKAGIST_USERNAME+x} ]; then echo "Please set PACKAGIST_USERNAME variable"; exit -1;  fi        
-        - if [ -z ${PACKAGIST_TOKEN+x} ]; then echo "Please set PACKAGIST_TOKEN variable";  exit -1; fi    
-    script:        
-        - STATUSCODE=$(curl -XPOST -H'content-type:application/json' "https://packagist.org/api/update-package?username=$PACKAGIST_USERNAME&apiToken=$PACKAGIST_TOKEN" -d"{\"repository\":{\"url\":\"$CI_PROJECT_URL.git\"}}" --silent --output /dev/stderr --write-out "%{http_code}")        
-        - if [ $STATUSCODE = "202" ]; then exit 0; else exit $STATUSCODE; fi
-
-# deploy documentation
-api-doc-build:
-   stage: build-doc
-   environment: api-doc
-   image: chill/ci-image:php-7
-   before_script:
-      - mkdir api-doc
-   script: apigen generate --destination api-doc/$CI_BUILD_REF_NAME/$CI_PROJECT_NAME
-   artifacts:
-      paths:
-         - "api-doc/"
-      name: api
-      expire_in: '2h'
-   only:
-      - master
-      - tags
-
-api-doc-deploy:
-   stage: deploy-doc
-   image: pallet/swiftclient:latest
-   before_script:
-        # test that CONTAINER_API variable is set        
-        - if [ -z ${CONTAINER_API+x} ]; then echo "Please set CONTAINER_API variable"; exit -1;  fi
-        # go to api-doc to have and url with PROJECT/BUILD
-        - cd api-doc
-        # upload, and keep files during 1 year
-   script: "swift upload --header \"X-Delete-After: 31536000\"  $CONTAINER_API $CI_BUILD_REF_NAME/$CI_PROJECT_NAME"
-   only:
-      - master
-      - tags
diff --git a/src/Bundle/ChillEventBundle/CHANGELOG.md b/src/Bundle/ChillEventBundle/CHANGELOG.md
deleted file mode 100644
index 66a6d4c33..000000000
--- a/src/Bundle/ChillEventBundle/CHANGELOG.md
+++ /dev/null
@@ -1,25 +0,0 @@
-
-Branch sf3
-==========
-
-- fix symfony3 php depreciations ;
-- add time to event dates ;
-- add new moderator field on events ;
-- misc improvements form styles ;
-- adapt webpack config for styles sheets ;
-- add a new page 'events participation' in menu person, that list all events participation for a person ;
-- subscribe a person to an event from person context ;
-- improve message translation ;
-- add a first step to pick center in new event form ;
-- add events in history timeline ;
-- export participations list for an event ;
-- add event administration pages ;
-- add remove participation and remove event feature ;
-- fix the way the bundle compile assets ;
-    This modification will require to update Chill-Standard to the latest version.
-    At least, the file `webpack.config.js` should be upgrade [to the last 
-    version](https://framagit.org/Chill-project/Chill-Standard/-/blob/c7a7de68ec49d97c9e1481b72c1f848f9b5cb2d7/webpack.config.js)
-- fix redirection when only one participation edit ;
-
-
-
diff --git a/src/Bundle/ChillEventBundle/LICENSE.txt b/src/Bundle/ChillEventBundle/LICENSE.txt
deleted file mode 100644
index dba13ed2d..000000000
--- a/src/Bundle/ChillEventBundle/LICENSE.txt
+++ /dev/null
@@ -1,661 +0,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.
diff --git a/src/Bundle/ChillEventBundle/apigen.neon b/src/Bundle/ChillEventBundle/apigen.neon
deleted file mode 100644
index 7b4c4afc0..000000000
--- a/src/Bundle/ChillEventBundle/apigen.neon
+++ /dev/null
@@ -1,12 +0,0 @@
-# configuration for apigen
-
-
-source:
-   - .
-
-exclude:
-   - vendor/*
-   - Resources/test/*
-
-title: Chill EventBundle
-
diff --git a/src/Bundle/ChillEventBundle/composer.json b/src/Bundle/ChillEventBundle/composer.json
deleted file mode 100644
index 0a10b88f5..000000000
--- a/src/Bundle/ChillEventBundle/composer.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-    "name": "chill-project/event",
-    "description": "This bundle extend chill software. This bundle allow to define event and participation to those events.",
-    "type": "symfony-bundle",
-    "license": "AGPL-3.0-only",
-    "keywords" : ["chill", "social work"],
-    "homepage" : "https://git.framasoft.org/Chill-project/Chill-Group",
-    "autoload": {
-        "psr-4": { "Chill\\EventBundle\\": "" }
-    },
-    "support": {
-        "issues": "https://git.framasoft.org/Chill-project/Chill-Event/issues",
-        "source": "https://git.framasoft.org/Chill-project/Chill-Event",
-        "docs" :  "http://docs.chill.social",
-        "email":  "dev@listes.chill.social"
-    },
-    "authors": [
-        {
-            "name": "Champs-Libres",
-            "email": "info@champs-libres.coop"
-        }
-    ],
-    "require": {
-    },
-    "require-dev": {
-    },
-    "suggest" : {
-        "chill-project/group": "dev-master@dev"
-    },
-    "scripts": {
-        "post-install-cmd": [
-            "ComposerBundleMigration\\Composer\\Migrations::synchronizeMigrations"
-        ],
-        "post-update-cmd": [
-            "ComposerBundleMigration\\Composer\\Migrations::synchronizeMigrations"
-        ]
-    },
-    "extra": {
-        "app-migrations-dir": "Resources/test/Fixtures/App/DoctrineMigrations"
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true
-}
diff --git a/src/Bundle/ChillEventBundle/phpunit.xml.dist b/src/Bundle/ChillEventBundle/phpunit.xml.dist
deleted file mode 100644
index cb1f867cf..000000000
--- a/src/Bundle/ChillEventBundle/phpunit.xml.dist
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit bootstrap="./Resources/test/bootstrap.php" colors="true">
-    <testsuites>
-        <testsuite name="ChillEventBundle test suite">
-            <directory suffix="Test.php">./Tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Resources</directory>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-    <php>
-        <server name="KERNEL_DIR" value="./Resources/test/Fixtures/App/" />
-        <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak" />
-    </php>
-</phpunit>
diff --git a/src/Bundle/ChillMainBundle/.gitignore b/src/Bundle/ChillMainBundle/.gitignore
deleted file mode 100644
index eda88ae1f..000000000
--- a/src/Bundle/ChillMainBundle/.gitignore
+++ /dev/null
@@ -1,34 +0,0 @@
-# MacOS
-.DS_Store
-
-# Bootstrap
-app/bootstrap*
-
-# Symfony directories
-vendor/*
-*/logs/*
-*/cache/*
-web/uploads/*
-web/bundles/*
-
-# Configuration files
-app/config/parameters.ini
-app/config/parameters.yml
-Tests/Fixtures/App/config/parameters.yml
-
-#composer
-composer.lock
-#sass-cache
-Resources/assets/gumpy/.sass-cache
-Resources/public/stylesheets/sass
-*~
-
-Resources/.sass-cache/
-Resources/bower_components/
-Resources/node_modules/
-
-/nbproject/private/
-
-# Yarn lock
-Resources/package-lock.json
-Resources/yarn.lock
diff --git a/src/Bundle/ChillMainBundle/.gitlab-ci.yml b/src/Bundle/ChillMainBundle/.gitlab-ci.yml
deleted file mode 100644
index 4f26b8f29..000000000
--- a/src/Bundle/ChillMainBundle/.gitlab-ci.yml
+++ /dev/null
@@ -1,65 +0,0 @@
-.test_definition: &test_definition
-    services:
-        - chill/database:latest
-    before_script:
-        - composer config github-oauth.github.com $GITHUB_TOKEN
-        - composer install
-        - cp  Resources/test/Fixtures/App/app/config/parameters.gitlab-ci.yml Resources/test/Fixtures/App/app/config/parameters.yml
-        - php Resources/test/Fixtures/App/app/console --env=test cache:warmup
-        - php Resources/test/Fixtures/App/app/console doctrine:migrations:migrate --env=test --no-interaction
-        - php Resources/test/Fixtures/App/app/console doctrine:fixtures:load --env=test --no-interaction
-    
-
-stages:
-   - deploy
-   - test
-   - build-doc
-   - deploy-doc
- 
-test:php-7.2:
-    stage: test
-    <<: *test_definition
-    image: chill/ci-image:php-7.2
-    script: APP_ENV=test vendor/bin/phpunit
-
-# deploy documentation
-api-doc-build:
-   stage: build-doc
-   environment: api-doc
-   image: chill/ci-image:php-7.2
-   before_script:
-      - mkdir api-doc
-   script: apigen generate --destination api-doc/$CI_BUILD_REF_NAME/$CI_PROJECT_NAME
-   artifacts:
-      paths:
-         - "api-doc/"
-      name: api
-      expire_in: '2h'
-   only:
-      - master
-      - tags
-
-api-doc-deploy:
-   stage: deploy-doc
-   image: pallet/swiftclient:latest
-   before_script:
-        # test that CONTAINER_API variable is set        
-        - if [ -z ${CONTAINER_API+x} ]; then echo "Please set CONTAINER_API variable"; exit -1;  fi
-        # go to api-doc to have and url with PROJECT/BUILD
-        - cd api-doc
-        # upload, and keep files during 1 year
-   script: "swift upload --header \"X-Delete-After: 31536000\"  $CONTAINER_API $CI_BUILD_REF_NAME/$CI_PROJECT_NAME"
-   only:
-      - master
-      - tags
-      
-deploy-packagist:    
-    stage: deploy    
-    image: chill/ci-image:php-7.2    
-    before_script:        
-        # test that PACKAGIST USERNAME and PACKAGIST_TOKEN variable are set        
-        - if [ -z ${PACKAGIST_USERNAME+x} ]; then echo "Please set PACKAGIST_USERNAME variable"; exit -1;  fi        
-        - if [ -z ${PACKAGIST_TOKEN+x} ]; then echo "Please set PACKAGIST_TOKEN variable";  exit -1; fi    
-    script:        
-        - STATUSCODE=$(curl -XPOST -H'content-type:application/json' "https://packagist.org/api/update-package?username=$PACKAGIST_USERNAME&apiToken=$PACKAGIST_TOKEN" -d"{\"repository\":{\"url\":\"$CI_PROJECT_URL.git\"}}" --silent --output /dev/stderr --write-out "%{http_code}")        
-        - if [ $STATUSCODE = "202" ]; then exit 0; else exit $STATUSCODE; fi
diff --git a/src/Bundle/ChillMainBundle/CHANGELOG.md b/src/Bundle/ChillMainBundle/CHANGELOG.md
deleted file mode 100644
index 9cda80ae4..000000000
--- a/src/Bundle/ChillMainBundle/CHANGELOG.md
+++ /dev/null
@@ -1,158 +0,0 @@
-
-
-Version 1.5.1
-=============
-
-- add email to users on fixtures ;
-- spare ressource with recursive trigger on inserting user ;
-- fix error when no flags are used during edit and creation of permission group ;
-
-Version 1.5.2
-=============
-
-- allow to filters users shown by `UserPickerType` based on flags. This flags do an additional filter based on the flags assigned in permissions groups;
-- add a method to filters users by permissions groups flags in `UserRepository`
-
-Version 1.5.3
-=============
-
-- fix error when interval is hour only
-
-Version 1.5.4
-=============
-
-- layout of page "list exports"
-- create function "SIMILARITY" (see [posgtgresql documentation](https://www.postgresql.org/docs/9.6/static/pgtrgm.html)) 
-- create function "OVERLAPSI", which will detect period of date overlapping, replacing NULL date by infinity or -infinity (see [postgresql page for date time function and operators](https://www.postgresql.org/docs/9.6/static/functions-datetime.html))
-- add repository for Center class
-
-Version 1.5.5
-=============
-
-- add margin of 0.5rem beyond buttons ;
-- add a spreadsheet formatter (format xlsx, ods, csv) for lists
-- add possibility to generate DirectExport: exports without formatters, filters and aggregators ;
-- add api for grouping centers ;
-- select centers as grouped on step "pick centers" in exports ;
-
-Version 1.5.6
-=============
-
-- fix long url in report download. The exports parameters are now stored in redis.
-- add an option to allow address to be empty if street or postcode is not set. Used for embedding address in another form, when address is not required.
-
-Version 1.5.7
-=============
-
-- insert the title of the export inside the "download" page ;
-- add twig helper "print_or_message" ;
-- add twig helper for routing ;
-- add css layout for boxes ;
-- collect supplementary query parameters in SearchController ;
-
-Version 1.5.8
-=============
-
-- allow to remove interval units from DateInterval
-
-Version 1.5.9
-=============
-
-- add optionnal impersonate feature (if firewall option switch_user is true) ;
-
-Version 1.5.10
-==============
-
-- allow to group export in UI
-
-Version 1.5.11
-==============
-
-- improve return path functions and filters ;
-
-Version 1.5.12 
-==============
-
-- make the redirection to admin temporarily: some admin experienced cache problems (403 error)  when they switched from one admin account to a non-admin one ;
-
-Version 1.5.13
-==============
-
-- allow to customize logo on login screen and main layout ;
-- remove desert background image on page, handle it from cache in login screen; 
-
-Version 1.5.14
-==============
-
-- fix errors in pagination
-- fix search: usage of parenthesis
-- add DQL function REPLACE for replacing in strings: "REPLACE(string, 'from', 'to')"
-- add function to format phonenumber
-- improve `chill_print_or_message` to support date time;
-- add a module `show_hide` for javascript;
-- load assets using functions ; 
-- load a `runtime.js` assets for objects shared by webpack ;
-
-Version 1.5.15
-==============
-
-- create an api for rendering entities
-- css: render the placeholder in expanded choice item as italic (the "no specified" choice")
-- css: add an extra space around choices expanded widget
-- add Tabs parametric feature to easily render tabs panels
-- css: add a margin on the button "delete entry" in collection
-- module `show_hide`: add the possibility to launch a show hide manually and not on page loading. Useful when show/hide occurs in collection.
-- module `show_hide`: add events to module
-- [phonenumber validation] allow to validate against mobile **or** landline/voip phonenumbers;
-- [phonenumber validation & format] format and validation does not make the app fail when network is not available;
-
-Version 1.5.16
-==============
-
-- [translation] in french, replace "Modifier" by "Enregistrer" in the edit form
-- [entity render] do not throw an exception when null element are passed to `chill_entity_render_box` and `chill_entity_render_string`
-
-Version 1.5.17
-==============
-
-- [chill entity render] fix error when fallback to default entity render (usage of `__toString()`)
-- [CRUD] add step delete
-- [CRUD] check that action exists before inserting them in edit and view template
-- [CRUD] fix error when no crud are created
-
-Version 1.5.18
-==============
-
-- [webpack] add namespace for import sass ;
-- [activity] move activity.scss to own bundle ;
-
-Version 1.5.19
-==============
-
-- [address] add a "homeless" characteristic to addresses ;
-
-Version 1.5.20
-==============
-
-- [CRUD] make index query more abstract.
-
-    Improve build and count query in default index action to be customized 
-    in one dedicated method.
-
-Version 1.5.21
-==============
-
-- [Export list] improve alignment of last line
-- [CRUD] Forward query parameters when pushing button "save and new" in "create" page;
-- [Show/hide] Take selects input into account;
-
-Version 1.5.23
-==============
-
-- [address] allow to add custom fields to addresses
-
-Version 1.5.24
-==============
-
-- [bugfix] add missing migration files
-
diff --git a/src/Bundle/ChillMainBundle/LICENSE b/src/Bundle/ChillMainBundle/LICENSE
deleted file mode 100644
index dba13ed2d..000000000
--- a/src/Bundle/ChillMainBundle/LICENSE
+++ /dev/null
@@ -1,661 +0,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.
diff --git a/src/Bundle/ChillMainBundle/apigen.neon b/src/Bundle/ChillMainBundle/apigen.neon
deleted file mode 100644
index da1e35d3d..000000000
--- a/src/Bundle/ChillMainBundle/apigen.neon
+++ /dev/null
@@ -1,13 +0,0 @@
-# configuration for apigen
-
-
-source:
-   - .
-
-exclude:
-   - vendor/*
-   - Tests/*
-   - Resource/tests/*
-
-title: Chill MainBundle
-
diff --git a/src/Bundle/ChillMainBundle/composer.json b/src/Bundle/ChillMainBundle/composer.json
deleted file mode 100644
index 913a760cb..000000000
--- a/src/Bundle/ChillMainBundle/composer.json
+++ /dev/null
@@ -1,49 +0,0 @@
-{
-    "name": "chill-project/main",
-    "license": "AGPL-3.0",
-    "type": "symfony-bundle",
-    "description": "The main bundle for the Chill App",
-    "keywords" : ["chill", "social work", "software for social service"],
-    "homepage" : "http://chill.social",
-    "support": {
-        "email": "dev@lists.chill.social",
-        "issues": "https://git.framasoft.org/Chill-project/Chill-Main/issues",
-        "sources": "https://git.framasoft.org/Chill-project/Chill-Main",
-        "docs": "http://docs.chill.social"
-    },
-    "autoload": {
-        "psr-4": { "Chill\\MainBundle\\": "" }
-    },
-    "autoload-dev": {
-        "classmap": [ "Resources/test/Fixtures/App/app/AppKernel.php" ]
-    },
-    "authors" : [
-        {
-            "name": "Champs-Libres",
-            "email": "info@champs-libres.coop",
-            "homepage": "http://www.champs-libres.coop"
-        }
-    ],
-    "require": {
-        "league/csv": "^9.6",
-        "phpoffice/phpspreadsheet": "~1.2",
-        "odolbeau/phone-number-bundle": "^3.6"
-    },
-    "require-dev": {
-    },
-    "scripts": {
-        "post-install-cmd": [
-            "ComposerBundleMigration\\Composer\\Migrations::synchronizeMigrations",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap"
-        ],
-        "post-update-cmd": [
-            "ComposerBundleMigration\\Composer\\Migrations::synchronizeMigrations",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap"
-        ]
-    },
-    "extra": {
-        "app-migrations-dir": "Resources/test/Fixtures/App/app/DoctrineMigrations",
-        "symfony-app-dir": "Tests/Fixtures/App/"
-    },
-    "prefer-stable": true
-}
diff --git a/src/Bundle/ChillMainBundle/phpdoc.dist.xml b/src/Bundle/ChillMainBundle/phpdoc.dist.xml
deleted file mode 100644
index c9502576c..000000000
--- a/src/Bundle/ChillMainBundle/phpdoc.dist.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" ?>
-<phpdoc>
-  <parser>
-    <target>data/output</target>
-    <default-package-name>Chill\MainBundle</default-package-name>
-  </parser>
-  <transformer>
-    <target>data/output</target>
-  </transformer>
-  <files>
-    <directory>.</directory>
-    <ignore>Tests/Fixtures/App/AppKernel.php</ignore>
-  </files>
-</phpdoc>
diff --git a/src/Bundle/ChillMainBundle/phpunit.xml.dist b/src/Bundle/ChillMainBundle/phpunit.xml.dist
deleted file mode 100644
index f1f2cfc65..000000000
--- a/src/Bundle/ChillMainBundle/phpunit.xml.dist
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit bootstrap="./vendor/autoload.php" colors="true">
-    <testsuites>
-        <testsuite name="ChillMain test suite">
-            <directory suffix="Test.php">./Tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Resources</directory>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-    <php>
-        <server name="KERNEL_DIR" value="./Resources/test/Fixtures/App/app" />
-        <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak" />
-        <env name="APP_ENV" value="test" />
-    </php>
-</phpunit>
diff --git a/src/Bundle/ChillPersonBundle/.editorconfig b/src/Bundle/ChillPersonBundle/.editorconfig
deleted file mode 100644
index d769b46a4..000000000
--- a/src/Bundle/ChillPersonBundle/.editorconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-; top-most EditorConfig file
-root = true
-
-; Unix-style newlines
-[*]
-charset = utf-8
-end_of_line = LF
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*.{php,html,twig}]
-indent_style = space
-indent_size = 4
-
-[*.md]
-max_line_length = 80
-
-[COMMIT_EDITMSG]
-max_line_length = 0
diff --git a/src/Bundle/ChillPersonBundle/.gitignore b/src/Bundle/ChillPersonBundle/.gitignore
deleted file mode 100644
index f443cb81e..000000000
--- a/src/Bundle/ChillPersonBundle/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-composer.lock
-vendor/*
-parameters.yml
-*~
-*.DS_Store
-*.sass-cache
-Resources/node_modules/
-Tests/Fixtures/App/app/config/parameters.yml
-/nbproject/private/
-Resources/test/Fixtures/App/bootstrap.php.cache
-
diff --git a/src/Bundle/ChillPersonBundle/.gitlab-ci.yml b/src/Bundle/ChillPersonBundle/.gitlab-ci.yml
deleted file mode 100644
index be0b6078a..000000000
--- a/src/Bundle/ChillPersonBundle/.gitlab-ci.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-.test_definition: &test_definition
-   services:
-       - chill/database:latest
-   before_script: 
-       - if [ -z ${GITHUB_TOKEN+x} ]; then composer config github-oauth.github.com $GITHUB_TOKEN; fi
-       - php -d memory_limit=-1 /usr/local/bin/composer install --no-interaction 
-       - cp  Resources/test/Fixtures/App/app/config/parameters.gitlab-ci.yml Resources/test/Fixtures/App/app/config/parameters.yml
-       - php Resources/test/Fixtures/App/app/console --env=test cache:warmup
-       - php Resources/test/Fixtures/App/app/console doctrine:migrations:migrate --env=test --no-interaction
-       - php Resources/test/Fixtures/App/app/console doctrine:fixtures:load --env=test --no-interaction
-
-stages:
-   - deploy
-   - test
-   - build-doc
-   - deploy-doc
-
-test:php-7.2:
-   image: chill/ci-image:php-7.2
-   stage: test
-   <<: *test_definition
-   script: APP_ENV=test php vendor/bin/phpunit
-
-deploy-packagist:
-   stage: deploy
-   image: chill/ci-image:php-7.2
-   before_script: 
-       # test that PACKAGIST USERNAME and PACKAGIST_TOKEN variable are set
-       - if [ -z ${PACKAGIST_USERNAME+x} ]; then echo "Please set PACKAGIST_USERNAME variable"; exit -1;  fi
-       - if [ -z ${PACKAGIST_TOKEN+x} ]; then echo "Please set PACKAGIST_TOKEN variable";  exit -1; fi
-   script:
-       - STATUSCODE=$(curl -XPOST -H'content-type:application/json' "https://packagist.org/api/update-package?username=$PACKAGIST_USERNAME&apiToken=$PACKAGIST_TOKEN" -d"{\"repository\":{\"url\":\"$CI_PROJECT_URL.git\"}}" --silent --output /dev/stderr --write-out "%{http_code}")
-       - if [ $STATUSCODE = "202" ]; then exit 0; else exit $STATUSCODE; fi
-       
-# deploy documentation
-api-doc-build:
-   stage: build-doc
-   environment: api-doc
-   image: chill/ci-image:php-7.2
-   before_script:
-      - mkdir api-doc
-   script: apigen generate --destination api-doc/$CI_BUILD_REF_NAME/$CI_PROJECT_NAME
-   artifacts:
-      paths:
-         - "api-doc/"
-      name: api
-      expire_in: '2h'
-   only:
-      - master
-      - tags
-
-api-doc-deploy:
-   stage: deploy-doc
-   image: pallet/swiftclient:latest
-   before_script:
-        # test that CONTAINER_API variable is set        
-        - if [ -z ${CONTAINER_API+x} ]; then echo "Please set CONTAINER_API variable"; exit -1;  fi
-        # go to api-doc to have and url with PROJECT/BUILD
-        - cd api-doc
-        # upload, and keep files during 1 year
-   script: "swift upload --header \"X-Delete-After: 31536000\"  $CONTAINER_API $CI_BUILD_REF_NAME/$CI_PROJECT_NAME"
-   only:
-      - master
-      - tags
diff --git a/src/Bundle/ChillPersonBundle/CHANGELOG.md b/src/Bundle/ChillPersonBundle/CHANGELOG.md
deleted file mode 100644
index 5ba71f288..000000000
--- a/src/Bundle/ChillPersonBundle/CHANGELOG.md
+++ /dev/null
@@ -1,117 +0,0 @@
-
-Version 1.5.1
-=============
-
-- Improve import of person to allow multiple centers by file ;
-- Launch an event on person import ;
-- Allow person to have a `null` gender ;
-- Allow filters and aggregator to handle null gender ;
-- remove inexistant `person.css` file
-- fix bug in accompanying person validation
-
-Version 1.5.2
-==============
-
-- Add an column with fullname canonical (lowercase and unaccent) to persons entity ;
-- Add a trigram index on fullname canonical ;
-- Add a "similar person matcher", which allow to detect person with similar names when adding a person ;
-- Add a research of persons by fuzzy name, returning result with a similarity of 0.15 ;
-
-Thanks to @matla :-)
-
-Version 1.5.3
-=============
-
-- add filtering on accompanying period 
-- fix problems in gender filter
-
-Version 1.5.4
-=============
-
-- add filenumber in person header
-
-Version 1.5.5
-=============
-
-- Fix bug in accompanying period filter
-
-Version 1.5.6
-=============
-
-- Update address validation
-- Add command to move person and all data of a person to a new one, and delete the old one.
-
-Version 1.5.7
-=============
-
-- fix error on macro renderPerson / withLink not taken into account
-- add a link between accompanying person and user
-- add an icon when the file is opened / closed in result list, and in person rendering macro
-- improve command to move person and all data: allow to delete some entities during move and add events
-
-Version 1.5.8
-=============
-
--  add search by phonenumber, with a custom SearchInterface
-   
-   This can be activated or desactivated by config:
-
-   ```
-   chill_person:
-       enabled:              true
-       search:
-           enabled:              true
-
-           # enable search by phone. 'always' show the result on every result. 'on-domain' will show the result only if the domain is given in the search box. 'never' disable this feature
-           search_by_phone:      on-domain # One of "always"; "on-domain"; "never"
-   ```
--  format phonenumber using twilio (if available) ;
--  add `record_actions` in person search result list: users can click on a little eye to open person page ;
--  add new fields (email, mobilenumber, gender) into importPeopleFromCSV command
-- configure asset using a function
-
-
-Version 1.5.9
-=============
-
-- create CRUD 
-- add the ability to add alt names to persons 
-- [UI] set action button bottom of edit form according to crud template
-- [closing motive] add an hierarchy for closing motives ;
-- [closing motive] Add an admin section for closing motives ;
-
-<<<<<<< HEAD
-Version 1.5.10
-==============
-
-- [closing motive] display closing motive in remark
-
-Version 1.5.11
-==============
-
-- Fix versioning constraint to chill main
-
-Version 1.5.12
-==============
-
-- [addresses] add a homeless to person's addresses, and this information into 
-    person list
-
-Version 1.5.13
-==============
-
-- [CRUD] add step delete
-- [CRUD] improve index view in person CRUD
-- [CRUD] filter by basis on person by default in EntityPersonCRUDController
-- [CRUD] override relevant part of the main CRUD template
-- [CRUD] fix redirection on person view: add a `person_id` to every page redirected.
-
-Version 1.5.14
-==============
-
-- [Accompanying period list] Fix period label in list
-- [Accompanying period list] Fix label of closing motive
-- [Person details] Add an "empty" statement on place of birth
-- [Person list] Add a lock/unlock icon instead of open/closed folder in result list;
-- [Admin closing motive] Remove links to Closing motive View;
-- [Admin closing motive] Improve icons for active in list of closing motive;
diff --git a/src/Bundle/ChillPersonBundle/LICENSE b/src/Bundle/ChillPersonBundle/LICENSE
deleted file mode 100644
index 2def0e883..000000000
--- a/src/Bundle/ChillPersonBundle/LICENSE
+++ /dev/null
@@ -1,661 +0,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.
\ No newline at end of file
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/composer.json b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/composer.json
deleted file mode 100644
index d7e9b335b..000000000
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/composer.json
+++ /dev/null
@@ -1,14 +0,0 @@
-{
-  "name": "vendor_name/AccompanyingCourse",
-  "description": "description",
-  "minimum-stability": "stable",
-  "license": "proprietary",
-  "authors": [
-    {
-      "name": "mat",
-      "email": "email@example.com"
-    }
-  ],
-  "require": {
-  }
-}
diff --git a/src/Bundle/ChillPersonBundle/apigen.neon b/src/Bundle/ChillPersonBundle/apigen.neon
deleted file mode 100644
index 201e80edb..000000000
--- a/src/Bundle/ChillPersonBundle/apigen.neon
+++ /dev/null
@@ -1,15 +0,0 @@
-# configuration for apigen
-
-
-source:
-   - .
-
-accessLevels: ["public", "protected"]
-
-exclude:
-   - vendor/*
-   - Resources/test/*
-   - Tests/Fixtures/*
-
-title: Chill Activity Bundle
-
diff --git a/src/Bundle/ChillPersonBundle/composer.json b/src/Bundle/ChillPersonBundle/composer.json
deleted file mode 100644
index b6e7804aa..000000000
--- a/src/Bundle/ChillPersonBundle/composer.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{ 
-    "name": "chill-project/person",
-    "license": "AGPL-3.0",
-    "type": "symfony-bundle",
-    "description": "A bundle to deal with persons",
-    "keywords" : ["chill", "social work", "persons"],
-    "homepage" : "https://github.com/Chill-project/Person",
-    "autoload": {
-        "psr-4": { "Chill\\PersonBundle\\": "" }
-    },
-    "autoload-dev": {
-        "classmap": [ "Resources/test/Fixtures/App/app/AppKernel.php" ]
-    },
-    "authors" : [
-        {
-            "name": "Champs-Libres",
-            "email": "info@champs-libres.coop",
-            "homepage": "http://www.champs-libres.coop"
-        }
-    ],
-    "require": {
-
-    },
-    "require-dev": {
-
-    },
-    "scripts": {
-        "post-install-cmd": [
-            "ComposerBundleMigration\\Composer\\Migrations::synchronizeMigrations",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap"
-        ],
-        "post-update-cmd": [
-            "ComposerBundleMigration\\Composer\\Migrations::synchronizeMigrations",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap"
-        ]
-    },
-    "extra": {
-        "app-migrations-dir": "Resources/test/Fixtures/App/app/DoctrineMigrations",
-        "symfony-app-dir": "Tests/Fixtures/App/"
-    }
-}
diff --git a/src/Bundle/ChillPersonBundle/phpunit.xml.dist b/src/Bundle/ChillPersonBundle/phpunit.xml.dist
deleted file mode 100644
index 2d5dca36d..000000000
--- a/src/Bundle/ChillPersonBundle/phpunit.xml.dist
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit bootstrap="./Resources/test/Fixtures/App/app/autoload.php" colors="true">
-    <!-- the file ".Resources/test/boostrap.php" will be created on the next step -->
-    <testsuites>
-        <testsuite name="ChillPersonBundle test suite">
-            <directory suffix="Test.php">./Tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Resources</directory>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-       </whitelist>
-    </filter>
-    <php>
-        <server name="KERNEL_DIR" value="./Resources/test/Fixtures/App/app/" />
-        <env name="SYMFONY_DEPRECATIONS_HELPER" value="weak" />
-        <ini name="memory_limit" value="-1" />
-    </php>  
-</phpunit>
diff --git a/src/Bundle/ChillReportBundle/.gitignore b/src/Bundle/ChillReportBundle/.gitignore
deleted file mode 100644
index edf97d24e..000000000
--- a/src/Bundle/ChillReportBundle/.gitignore
+++ /dev/null
@@ -1,6 +0,0 @@
-/vendor/
-composer.lock
-Tests/Fixtures/App/app/config/parameters.yml
-*~
-auth.json
-/nbproject/private/
\ No newline at end of file
diff --git a/src/Bundle/ChillReportBundle/.gitlab-ci.yml b/src/Bundle/ChillReportBundle/.gitlab-ci.yml
deleted file mode 100644
index 126ed8194..000000000
--- a/src/Bundle/ChillReportBundle/.gitlab-ci.yml
+++ /dev/null
@@ -1,54 +0,0 @@
-.test_definition: &test_definition
-    services:
-        - chill/database:latest
-     
-    before_script:
-        - composer config github-oauth.github.com $GITHUB_TOKEN
-        - php -d memory_limit=-1 /usr/local/bin/composer install --no-interaction
-        - cp  Resources/test/Fixtures/App/app/config/parameters.gitlab-ci.yml Resources/test/Fixtures/App/app/config/parameters.yml
-        - php Resources/test/Fixtures/App/app/console --env=test cache:warmup
-        - php Resources/test/Fixtures/App/app/console doctrine:migrations:migrate --env=test --no-interaction
-        - php Resources/test/Fixtures/App/app/console doctrine:fixtures:load --env=test --no-interaction
-
-stages:
-    - test
-    - build-doc
-    - deploy-doc
-
-test:php-7.2:
-    stage: test
-    image: chill/ci-image:php-7.2
-    <<: *test_definition
-    script: php vendor/bin/phpunit
-
-# deploy documentation
-api-doc-build:
-   stage: build-doc
-   environment: api-doc
-   image: chill/ci-image:php-7.2
-   before_script:
-      - mkdir api-doc
-   script: apigen generate --destination api-doc/$CI_BUILD_REF_NAME/$CI_PROJECT_NAME
-   artifacts:
-      paths:
-         - "api-doc/"
-      name: api
-      expire_in: '2h'
-   only:
-      - master
-      - tags
-
-api-doc-deploy:
-   stage: deploy-doc
-   image: pallet/swiftclient:latest
-   before_script:
-        # test that CONTAINER_API variable is set        
-        - if [ -z ${CONTAINER_API+x} ]; then echo "Please set CONTAINER_API variable"; exit -1;  fi
-        # go to api-doc to have and url with PROJECT/BUILD
-        - cd api-doc
-        # upload, and keep files during 1 year
-   script: "swift upload --header \"X-Delete-After: 31536000\"  $CONTAINER_API $CI_BUILD_REF_NAME/$CI_PROJECT_NAME"
-   only:
-      - master
-      - tags
-
diff --git a/src/Bundle/ChillReportBundle/CHANGELOG.md b/src/Bundle/ChillReportBundle/CHANGELOG.md
deleted file mode 100644
index e0ed03792..000000000
--- a/src/Bundle/ChillReportBundle/CHANGELOG.md
+++ /dev/null
@@ -1,18 +0,0 @@
-
-Version 1.5.1
-=============
-
-- [list export] fix error "all custom fields are shown"
-
-Version 1.5.2
-=============
-
-- add privacy events to report list / view
-- add privacy events to report edit / update 
-
-Master branch
-=============
-
-
- 
-
diff --git a/src/Bundle/ChillReportBundle/LICENSE b/src/Bundle/ChillReportBundle/LICENSE
deleted file mode 100644
index dba13ed2d..000000000
--- a/src/Bundle/ChillReportBundle/LICENSE
+++ /dev/null
@@ -1,661 +0,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.
diff --git a/src/Bundle/ChillReportBundle/apigen.neon b/src/Bundle/ChillReportBundle/apigen.neon
deleted file mode 100644
index 6fd31b419..000000000
--- a/src/Bundle/ChillReportBundle/apigen.neon
+++ /dev/null
@@ -1,11 +0,0 @@
-# configuration for apigen 
-
-source:    
-    - . 
-    
-exclude:    
-    - vendor/*    
-    - Test* 
-    - Resources/test
-    
-title: Chill Report Bundle
diff --git a/src/Bundle/ChillReportBundle/composer.json b/src/Bundle/ChillReportBundle/composer.json
deleted file mode 100644
index a5c17a2ee..000000000
--- a/src/Bundle/ChillReportBundle/composer.json
+++ /dev/null
@@ -1,41 +0,0 @@
-{
-    "name": "chill-project/report",
-    "description": "The bundle for reports",
-    "type": "symfony-bundle",
-    "keywords" : ["chill", "social work"],
-    "license": "AGPL-3.0",
-    "homepage" : "https://github.com/Chill-project/Report",
-    "autoload": {
-        "psr-4": { "Chill\\ReportBundle\\": "" }
-    },
-    "autoload-dev": {
-        "classmap": [ "Resources/test/Fixtures/App/app/AppKernel.php" ]
-    },
-    "authors" : [
-        {
-            "name": "Champs-Libres",
-            "email": "info@champs-libres.coop",
-            "homepage": "http://www.champs-libres.coop"
-        }
-    ],
-    "require": {
-    },
-    "require-dev": {
-    },
-    "scripts": {
-        "post-install-cmd": [
-            "ComposerBundleMigration\\Composer\\Migrations::synchronizeMigrations",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap"
-        ],
-        "post-update-cmd": [
-            "ComposerBundleMigration\\Composer\\Migrations::synchronizeMigrations",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap"
-        ]
-    },
-    "extra": {
-        "app-migrations-dir": "Resources/test/Fixtures/App/app/DoctrineMigrations",
-        "symfony-app-dir": "Tests/Fixtures/App/app"
-    },
-    "minimum-stability": "dev",
-    "prefer-stable": true
-}
diff --git a/src/Bundle/ChillReportBundle/console.sh b/src/Bundle/ChillReportBundle/console.sh
deleted file mode 100755
index 609ce9cde..000000000
--- a/src/Bundle/ChillReportBundle/console.sh
+++ /dev/null
@@ -1 +0,0 @@
-php Tests/Fixtures/App/console $1 $2 $3 $4 $5
\ No newline at end of file
diff --git a/src/Bundle/ChillReportBundle/phpunit.xml.dist b/src/Bundle/ChillReportBundle/phpunit.xml.dist
deleted file mode 100644
index 5e67beade..000000000
--- a/src/Bundle/ChillReportBundle/phpunit.xml.dist
+++ /dev/null
@@ -1,26 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<phpunit bootstrap="./Resources/test/Fixtures/App/app/autoload.php" colors="true"
-         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-         xsi:noNamespaceSchemaLocation="http://schema.phpunit.de/4.1/phpunit.xsd"
-         backupGlobals="false">
-    <testsuites>
-        <testsuite name="ChillMain test suite">
-            <directory suffix="Test.php">./Tests</directory>
-        </testsuite>
-    </testsuites>
-    <filter>
-        <whitelist>
-            <directory>./</directory>
-            <exclude>
-                <directory>./Resources</directory>
-                <directory>./Tests</directory>
-                <directory>./vendor</directory>
-            </exclude>
-        </whitelist>
-    </filter>
-    <php>
-        <server name="KERNEL_DIR" value="./Resources/test/Fixtures/App/app/" />
-        <ini name="error_reporting" value="-16385"/>
-    </php>
-</phpunit>
diff --git a/src/Bundle/ChillTaskBundle/.gitignore b/src/Bundle/ChillTaskBundle/.gitignore
deleted file mode 100644
index 57872d0f1..000000000
--- a/src/Bundle/ChillTaskBundle/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-/vendor/
diff --git a/src/Bundle/ChillTaskBundle/.gitlab-ci.yml b/src/Bundle/ChillTaskBundle/.gitlab-ci.yml
deleted file mode 100644
index e9826c3fb..000000000
--- a/src/Bundle/ChillTaskBundle/.gitlab-ci.yml
+++ /dev/null
@@ -1,25 +0,0 @@
-.test_definition: &test_definition
-    services:
-        - chill/database:latest
-    before_script:
-        - composer config github-oauth.github.com $GITHUB_TOKEN
-        - composer install
-        - cp  Resources/test/Fixtures/App/app/config/parameters.gitlab-ci.yml Resources/test/Fixtures/App/app/config/parameters.yml
-        - php Resources/test/Fixtures/App/app/console --env=test cache:warmup
-        - php Resources/test/Fixtures/App/app/console doctrine:migrations:migrate --env=test --no-interaction
-        - php Resources/test/Fixtures/App/app/console doctrine:fixtures:load --env=test --no-interaction
-    
-
-stages:
-   - deploy
-      
-deploy-packagist:    
-    stage: deploy    
-    image: chill/ci-image:php-7.2    
-    before_script:        
-        # test that PACKAGIST USERNAME and PACKAGIST_TOKEN variable are set        
-        - if [ -z ${PACKAGIST_USERNAME+x} ]; then echo "Please set PACKAGIST_USERNAME variable"; exit -1;  fi        
-        - if [ -z ${PACKAGIST_TOKEN+x} ]; then echo "Please set PACKAGIST_TOKEN variable";  exit -1; fi    
-    script:        
-        - STATUSCODE=$(curl -XPOST -H'content-type:application/json' "https://packagist.org/api/update-package?username=$PACKAGIST_USERNAME&apiToken=$PACKAGIST_TOKEN" -d"{\"repository\":{\"url\":\"$CI_PROJECT_URL.git\"}}" --silent --output /dev/stderr --write-out "%{http_code}")        
-        - if [ $STATUSCODE = "202" ]; then exit 0; else exit $STATUSCODE; fi
diff --git a/src/Bundle/ChillTaskBundle/CHANGELOG.md b/src/Bundle/ChillTaskBundle/CHANGELOG.md
deleted file mode 100644
index c4662ce9d..000000000
--- a/src/Bundle/ChillTaskBundle/CHANGELOG.md
+++ /dev/null
@@ -1,52 +0,0 @@
-Version 1.5.1
-=============
-
-- fix bug in filter task form: allow to show the list of users, which was hidden when the user had access to multiple centers;
-- add assignee in task list;
-- fix some translation; 
-- add a filtering by center on list;
-- add color in boxes for task statuses;
-
-Version 1.5.4
-=============
-
-- adding indexes on place event and task
-
-Version 1.5.5
-=============
-
-- Fix error on the "see more" link which was not showed
-- Layout of the task list
-
-Version 1.5.6
-=============
-
-- fix: validation error on warning date interval is not shown
-- add privacy events to task show / list;
-- add privacy events to task edit / update;
-
-Version 1.5.7
-==============
-
-- fix error when showing task list without person in context (issue #3) ;
-
-Version 1.5.8
-=============
-
-- add returnPath to page Show and List for Single tasks ;
-
-Version 1.5.9
-=============
-
-- better exception description when task workflow is not found ;
-
-Version 1.5.10
-==============
-
-- load webpack config using a `configure` function ;
-
-Version 1.5.11
-==============
-
-- [task] fix loading of chill task list ;
-
diff --git a/src/Bundle/ChillTaskBundle/composer.json b/src/Bundle/ChillTaskBundle/composer.json
deleted file mode 100644
index ecd4a91e9..000000000
--- a/src/Bundle/ChillTaskBundle/composer.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "name": "chill-project/task",
-    "description": "Associate task with peoples in chill.social",
-    "type": "symfony-bundle",
-    "keywords": ["chill", "social work", "tasks"],
-    "homepage": "https://framagit.org/Chill-project/Chill-Task",
-    "autoload": {
-      "psr-4": { "Chill\\TaskBundle\\" : "" }
-    },
-    "autoload-dev": {
-        "classmap": [ "Resources/test/Fixtures/App/app/AppKernel.php" ]
-    },
-    "require": {
-
-    },
-    "require-dev": {
-    },
-    "license": "AGPL-3.0-or-later",
-    "authors": [
-        {
-            "name": "Champs-Libres",
-            "email": "info@champs-libres.coop"
-        }
-    ],
-    "scripts": {
-        "post-install-cmd": [
-            "ComposerBundleMigration\\Composer\\Migrations::synchronizeMigrations",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap"
-        ],
-        "post-update-cmd": [
-            "ComposerBundleMigration\\Composer\\Migrations::synchronizeMigrations",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap"
-        ]
-    },
-    "extra": {
-        "app-migrations-dir": "Resources/test/Fixtures/App/app/DoctrineMigrations",
-        "symfony-app-dir": "Resources/test/Fixtures/App/"
-    }
-}
diff --git a/src/Bundle/ChillTaskBundle/composer.lock b/src/Bundle/ChillTaskBundle/composer.lock
deleted file mode 100644
index 2ad9ca212..000000000
--- a/src/Bundle/ChillTaskBundle/composer.lock
+++ /dev/null
@@ -1,4403 +0,0 @@
-{
-    "_readme": [
-        "This file locks the dependencies of your project to a known state",
-        "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
-        "This file is @generated automatically"
-    ],
-    "content-hash": "c40de51f6aab3bbe16dc8bd7becbfbe8",
-    "packages": [
-        {
-            "name": "champs-libres/composer-bundle-migration",
-            "version": "1.0.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Champs-Libres/ComposerBundleMigration.git",
-                "reference": "556eecdf6de3a0bd7f7e7807dca00be5bb2babf0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Champs-Libres/ComposerBundleMigration/zipball/556eecdf6de3a0bd7f7e7807dca00be5bb2babf0",
-                "reference": "556eecdf6de3a0bd7f7e7807dca00be5bb2babf0",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">5.4"
-            },
-            "suggest": {
-                "doctrine/doctrine-migrations-bundle": "doctrine migrations for symfony app",
-                "doctrine/migrations": "the original doctrine migration bundle"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "ComposerBundleMigration\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "AGPL-3.0"
-            ],
-            "authors": [
-                {
-                    "name": "Julien Fastré",
-                    "email": "julien.fastre@champs-libres.coop"
-                },
-                {
-                    "name": "Champs-Libres",
-                    "email": "info@champs-libres.coop"
-                }
-            ],
-            "description": "Move DoctrineMigrations files from installed bundle to root package.",
-            "keywords": [
-                "doctrine",
-                "doctrine migrations",
-                "symfony"
-            ],
-            "time": "2015-02-23T08:33:12+00:00"
-        },
-        {
-            "name": "chill-project/custom-fields",
-            "version": "dev-upgrade-sf3",
-            "source": {
-                "type": "git",
-                "url": "/var/www/app/vendor/chill-project/custom-fields",
-                "reference": "7950ccfddb230cad5191594785710505ec8ad49e"
-            },
-            "require": {
-                "chill-project/main": "dev-upgrade-sf3@dev",
-                "chill-project/person": "dev-upgrade-sf3@dev"
-            },
-            "require-dev": {
-                "doctrine/doctrine-fixtures-bundle": "~2.2",
-                "fzaninotto/faker": "~1",
-                "phpunit/phpunit": "^6.2"
-            },
-            "type": "symfony-bundle",
-            "extra": {
-                "symfony-app-dir": "Tests/Fixtures/App/app",
-                "app-migrations-dir": "Resources/test/Fixtures/App/app/DoctrineMigrations"
-            },
-            "autoload": {
-                "psr-4": {
-                    "Chill\\CustomFieldsBundle\\": ""
-                }
-            },
-            "autoload-dev": {
-                "classmap": [
-                    "Resources/test/Fixtures/App/app/AppKernel.php"
-                ]
-            },
-            "scripts": {
-                "post-install-cmd": [
-                    "ComposerBundleMigration\\Composer\\Migrations::synchronizeMigrations",
-                    "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap"
-                ],
-                "post-update-cmd": [
-                    "ComposerBundleMigration\\Composer\\Migrations::synchronizeMigrations",
-                    "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap"
-                ]
-            },
-            "license": [
-                "AGPL-3.0"
-            ],
-            "authors": [
-                {
-                    "name": "Champs-Libres",
-                    "email": "info@champs-libres.coop",
-                    "homepage": "http://www.champs-libres.coop"
-                }
-            ],
-            "description": "This bundle allow to add custom fields on entities.",
-            "homepage": "https://github.com/Chill-project/CustomFields",
-            "keywords": [
-                "chill",
-                "social work"
-            ],
-            "time": "2018-04-24T12:31:41+00:00"
-        },
-        {
-            "name": "chill-project/main",
-            "version": "dev-upgrade-sf3",
-            "source": {
-                "type": "git",
-                "url": "/var/www/app/vendor/chill-project/main",
-                "reference": "19e30d90c5bc5d3f3058b6f1914df8f683edfbb6"
-            },
-            "require": {
-                "champs-libres/composer-bundle-migration": "~1.0",
-                "doctrine/common": "~2.8",
-                "doctrine/dbal": "~2.7",
-                "doctrine/doctrine-bundle": "~1.9",
-                "doctrine/doctrine-migrations-bundle": "~1.3",
-                "doctrine/migrations": "~1.0",
-                "doctrine/orm": "~2.6",
-                "php": "~7.2",
-                "phpoffice/phpspreadsheet": "~1.2",
-                "sensio/distribution-bundle": "^5.0",
-                "symfony/assetic-bundle": "~2.8",
-                "symfony/monolog-bundle": "~3.2",
-                "symfony/symfony": "~3.4",
-                "twig/extensions": "~1.5"
-            },
-            "require-dev": {
-                "doctrine/doctrine-fixtures-bundle": "~3.0",
-                "phpunit/phpunit": "~5.6",
-                "symfony/dom-crawler": "~3.4",
-                "symfony/phpunit-bridge": "~3.4"
-            },
-            "type": "symfony-bundle",
-            "extra": {
-                "app-migrations-dir": "Resources/test/Fixtures/App/app/DoctrineMigrations",
-                "symfony-app-dir": "Tests/Fixtures/App/"
-            },
-            "autoload": {
-                "psr-4": {
-                    "Chill\\MainBundle\\": ""
-                }
-            },
-            "autoload-dev": {
-                "classmap": [
-                    "Resources/test/Fixtures/App/app/AppKernel.php"
-                ]
-            },
-            "scripts": {
-                "post-install-cmd": [
-                    "ComposerBundleMigration\\Composer\\Migrations::synchronizeMigrations",
-                    "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap"
-                ],
-                "post-update-cmd": [
-                    "ComposerBundleMigration\\Composer\\Migrations::synchronizeMigrations",
-                    "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap"
-                ]
-            },
-            "license": [
-                "AGPL-3.0"
-            ],
-            "authors": [
-                {
-                    "name": "Champs-Libres",
-                    "email": "info@champs-libres.coop",
-                    "homepage": "http://www.champs-libres.coop"
-                }
-            ],
-            "description": "The main bundle for the Chill App",
-            "homepage": "http://chill.social",
-            "keywords": [
-                "chill",
-                "social work",
-                "software for social service"
-            ],
-            "support": {
-                "email": "dev@lists.chill.social",
-                "issues": "https://git.framasoft.org/Chill-project/Chill-Main/issues",
-                "sources": "https://git.framasoft.org/Chill-project/Chill-Main",
-                "docs": "http://docs.chill.social"
-            },
-            "time": "2018-04-24T12:21:11+00:00"
-        },
-        {
-            "name": "chill-project/person",
-            "version": "dev-upgrade-sf3",
-            "source": {
-                "type": "git",
-                "url": "/var/www/app/vendor/chill-project/person",
-                "reference": "c847be8534ddd7522ea5e231da658097e6e573b1"
-            },
-            "require": {
-                "chill-project/custom-fields": "dev-upgrade-sf3@dev",
-                "chill-project/main": "dev-upgrade-sf3"
-            },
-            "require-dev": {
-                "fzaninotto/faker": "~1",
-                "phpunit/phpunit": "~5.6",
-                "symfony/phpunit-bridge": "~3"
-            },
-            "type": "symfony-bundle",
-            "extra": {
-                "app-migrations-dir": "Resources/test/Fixtures/App/app/DoctrineMigrations",
-                "symfony-app-dir": "Tests/Fixtures/App/"
-            },
-            "autoload": {
-                "psr-4": {
-                    "Chill\\PersonBundle\\": ""
-                }
-            },
-            "autoload-dev": {
-                "classmap": [
-                    "Resources/test/Fixtures/App/app/AppKernel.php"
-                ]
-            },
-            "scripts": {
-                "post-install-cmd": [
-                    "ComposerBundleMigration\\Composer\\Migrations::synchronizeMigrations",
-                    "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap"
-                ],
-                "post-update-cmd": [
-                    "ComposerBundleMigration\\Composer\\Migrations::synchronizeMigrations",
-                    "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap"
-                ]
-            },
-            "license": [
-                "AGPL-3.0"
-            ],
-            "authors": [
-                {
-                    "name": "Champs-Libres",
-                    "email": "info@champs-libres.coop",
-                    "homepage": "http://www.champs-libres.coop"
-                }
-            ],
-            "description": "A bundle to deal with persons",
-            "homepage": "https://github.com/Chill-project/Person",
-            "keywords": [
-                "chill",
-                "persons",
-                "social work"
-            ],
-            "time": "2018-04-24T12:33:27+00:00"
-        },
-        {
-            "name": "composer/ca-bundle",
-            "version": "1.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/composer/ca-bundle.git",
-                "reference": "d2c0a83b7533d6912e8d516756ebd34f893e9169"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/composer/ca-bundle/zipball/d2c0a83b7533d6912e8d516756ebd34f893e9169",
-                "reference": "d2c0a83b7533d6912e8d516756ebd34f893e9169",
-                "shasum": ""
-            },
-            "require": {
-                "ext-openssl": "*",
-                "ext-pcre": "*",
-                "php": "^5.3.2 || ^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5",
-                "psr/log": "^1.0",
-                "symfony/process": "^2.5 || ^3.0 || ^4.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Composer\\CaBundle\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be",
-                    "homepage": "http://seld.be"
-                }
-            ],
-            "description": "Lets you find a path to the system CA bundle, and includes a fallback to the Mozilla CA bundle.",
-            "keywords": [
-                "cabundle",
-                "cacert",
-                "certificate",
-                "ssl",
-                "tls"
-            ],
-            "time": "2018-03-29T19:57:20+00:00"
-        },
-        {
-            "name": "doctrine/annotations",
-            "version": "v1.6.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/annotations.git",
-                "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/annotations/zipball/c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5",
-                "reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/lexer": "1.*",
-                "php": "^7.1"
-            },
-            "require-dev": {
-                "doctrine/cache": "1.*",
-                "phpunit/phpunit": "^6.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.6.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Jonathan Wage",
-                    "email": "jonwage@gmail.com"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com"
-                }
-            ],
-            "description": "Docblock Annotations Parser",
-            "homepage": "http://www.doctrine-project.org",
-            "keywords": [
-                "annotations",
-                "docblock",
-                "parser"
-            ],
-            "time": "2017-12-06T07:11:42+00:00"
-        },
-        {
-            "name": "doctrine/cache",
-            "version": "v1.7.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/cache.git",
-                "reference": "b3217d58609e9c8e661cd41357a54d926c4a2a1a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/cache/zipball/b3217d58609e9c8e661cd41357a54d926c4a2a1a",
-                "reference": "b3217d58609e9c8e661cd41357a54d926c4a2a1a",
-                "shasum": ""
-            },
-            "require": {
-                "php": "~7.1"
-            },
-            "conflict": {
-                "doctrine/common": ">2.2,<2.4"
-            },
-            "require-dev": {
-                "alcaeus/mongo-php-adapter": "^1.1",
-                "mongodb/mongodb": "^1.1",
-                "phpunit/phpunit": "^5.7",
-                "predis/predis": "~1.0"
-            },
-            "suggest": {
-                "alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.7.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Common\\Cache\\": "lib/Doctrine/Common/Cache"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Jonathan Wage",
-                    "email": "jonwage@gmail.com"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com"
-                }
-            ],
-            "description": "Caching library offering an object-oriented API for many cache backends",
-            "homepage": "http://www.doctrine-project.org",
-            "keywords": [
-                "cache",
-                "caching"
-            ],
-            "time": "2017-08-25T07:02:50+00:00"
-        },
-        {
-            "name": "doctrine/collections",
-            "version": "v1.5.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/collections.git",
-                "reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/collections/zipball/a01ee38fcd999f34d9bfbcee59dbda5105449cbf",
-                "reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1"
-            },
-            "require-dev": {
-                "doctrine/coding-standard": "~0.1@dev",
-                "phpunit/phpunit": "^5.7"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Doctrine\\Common\\Collections\\": "lib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Jonathan Wage",
-                    "email": "jonwage@gmail.com"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com"
-                }
-            ],
-            "description": "Collections Abstraction library",
-            "homepage": "http://www.doctrine-project.org",
-            "keywords": [
-                "array",
-                "collections",
-                "iterator"
-            ],
-            "time": "2017-07-22T10:37:32+00:00"
-        },
-        {
-            "name": "doctrine/common",
-            "version": "v2.8.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/common.git",
-                "reference": "f68c297ce6455e8fd794aa8ffaf9fa458f6ade66"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/common/zipball/f68c297ce6455e8fd794aa8ffaf9fa458f6ade66",
-                "reference": "f68c297ce6455e8fd794aa8ffaf9fa458f6ade66",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/annotations": "1.*",
-                "doctrine/cache": "1.*",
-                "doctrine/collections": "1.*",
-                "doctrine/inflector": "1.*",
-                "doctrine/lexer": "1.*",
-                "php": "~7.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^5.7"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.8.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Common\\": "lib/Doctrine/Common"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Jonathan Wage",
-                    "email": "jonwage@gmail.com"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com"
-                }
-            ],
-            "description": "Common Library for Doctrine projects",
-            "homepage": "http://www.doctrine-project.org",
-            "keywords": [
-                "annotations",
-                "collections",
-                "eventmanager",
-                "persistence",
-                "spl"
-            ],
-            "time": "2017-08-31T08:43:38+00:00"
-        },
-        {
-            "name": "doctrine/dbal",
-            "version": "v2.7.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/dbal.git",
-                "reference": "11037b4352c008373561dc6fc836834eed80c3b5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/dbal/zipball/11037b4352c008373561dc6fc836834eed80c3b5",
-                "reference": "11037b4352c008373561dc6fc836834eed80c3b5",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/common": "^2.7.1",
-                "ext-pdo": "*",
-                "php": "^7.1"
-            },
-            "require-dev": {
-                "doctrine/coding-standard": "^4.0",
-                "phpunit/phpunit": "^7.0",
-                "phpunit/phpunit-mock-objects": "!=3.2.4,!=3.2.5",
-                "symfony/console": "^2.0.5||^3.0",
-                "symfony/phpunit-bridge": "^3.4.5|^4.0.5"
-            },
-            "suggest": {
-                "symfony/console": "For helpful console commands such as SQL execution and import of files."
-            },
-            "bin": [
-                "bin/doctrine-dbal"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.7.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Doctrine\\DBAL\\": "lib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Jonathan Wage",
-                    "email": "jonwage@gmail.com"
-                }
-            ],
-            "description": "Database Abstraction Layer",
-            "homepage": "http://www.doctrine-project.org",
-            "keywords": [
-                "database",
-                "dbal",
-                "persistence",
-                "queryobject"
-            ],
-            "time": "2018-04-07T18:44:18+00:00"
-        },
-        {
-            "name": "doctrine/doctrine-bundle",
-            "version": "1.9.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/DoctrineBundle.git",
-                "reference": "703fad32e4c8cbe609caf45a71a1d4266c830f0f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/DoctrineBundle/zipball/703fad32e4c8cbe609caf45a71a1d4266c830f0f",
-                "reference": "703fad32e4c8cbe609caf45a71a1d4266c830f0f",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/dbal": "^2.5.12",
-                "doctrine/doctrine-cache-bundle": "~1.2",
-                "jdorn/sql-formatter": "^1.2.16",
-                "php": "^5.5.9|^7.0",
-                "symfony/console": "~2.7|~3.0|~4.0",
-                "symfony/dependency-injection": "~2.7|~3.0|~4.0",
-                "symfony/doctrine-bridge": "~2.7|~3.0|~4.0",
-                "symfony/framework-bundle": "^2.7.22|~3.0|~4.0"
-            },
-            "conflict": {
-                "symfony/http-foundation": "<2.6"
-            },
-            "require-dev": {
-                "doctrine/orm": "~2.4",
-                "phpunit/phpunit": "^4.8.36|^5.7|^6.4",
-                "satooshi/php-coveralls": "^1.0",
-                "symfony/phpunit-bridge": "~2.7|~3.0|~4.0",
-                "symfony/property-info": "~2.8|~3.0|~4.0",
-                "symfony/validator": "~2.7|~3.0|~4.0",
-                "symfony/web-profiler-bundle": "~2.7|~3.0|~4.0",
-                "symfony/yaml": "~2.7|~3.0|~4.0",
-                "twig/twig": "~1.26|~2.0"
-            },
-            "suggest": {
-                "doctrine/orm": "The Doctrine ORM integration is optional in the bundle.",
-                "symfony/web-profiler-bundle": "To use the data collector."
-            },
-            "type": "symfony-bundle",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.8.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Bundle\\DoctrineBundle\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Doctrine Project",
-                    "homepage": "http://www.doctrine-project.org/"
-                },
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                }
-            ],
-            "description": "Symfony DoctrineBundle",
-            "homepage": "http://www.doctrine-project.org",
-            "keywords": [
-                "database",
-                "dbal",
-                "orm",
-                "persistence"
-            ],
-            "time": "2018-04-19T14:07:39+00:00"
-        },
-        {
-            "name": "doctrine/doctrine-cache-bundle",
-            "version": "1.3.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/DoctrineCacheBundle.git",
-                "reference": "4c8e363f96427924e7e519c5b5119b4f54512697"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/4c8e363f96427924e7e519c5b5119b4f54512697",
-                "reference": "4c8e363f96427924e7e519c5b5119b4f54512697",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/cache": "^1.4.2",
-                "doctrine/inflector": "~1.0",
-                "php": ">=5.3.2",
-                "symfony/doctrine-bridge": "~2.7|~3.3|~4.0"
-            },
-            "require-dev": {
-                "instaclick/coding-standard": "~1.1",
-                "instaclick/object-calisthenics-sniffs": "dev-master",
-                "instaclick/symfony2-coding-standard": "dev-remaster",
-                "phpunit/phpunit": "~4|~5",
-                "predis/predis": "~0.8",
-                "satooshi/php-coveralls": "^1.0",
-                "squizlabs/php_codesniffer": "~1.5",
-                "symfony/console": "~2.7|~3.3|~4.0",
-                "symfony/finder": "~2.7|~3.3|~4.0",
-                "symfony/framework-bundle": "~2.7|~3.3|~4.0",
-                "symfony/phpunit-bridge": "~2.7|~3.3|~4.0",
-                "symfony/security-acl": "~2.7|~3.3",
-                "symfony/validator": "~2.7|~3.3|~4.0",
-                "symfony/yaml": "~2.7|~3.3|~4.0"
-            },
-            "suggest": {
-                "symfony/security-acl": "For using this bundle to cache ACLs"
-            },
-            "type": "symfony-bundle",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Bundle\\DoctrineCacheBundle\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Fabio B. Silva",
-                    "email": "fabio.bat.silva@gmail.com"
-                },
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@hotmail.com"
-                },
-                {
-                    "name": "Doctrine Project",
-                    "homepage": "http://www.doctrine-project.org/"
-                },
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                }
-            ],
-            "description": "Symfony Bundle for Doctrine Cache",
-            "homepage": "http://www.doctrine-project.org",
-            "keywords": [
-                "cache",
-                "caching"
-            ],
-            "time": "2018-03-27T09:22:12+00:00"
-        },
-        {
-            "name": "doctrine/doctrine-migrations-bundle",
-            "version": "v1.3.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/DoctrineMigrationsBundle.git",
-                "reference": "a9e506369f931351a2a6dd2aef588a822802b1b7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/DoctrineMigrationsBundle/zipball/a9e506369f931351a2a6dd2aef588a822802b1b7",
-                "reference": "a9e506369f931351a2a6dd2aef588a822802b1b7",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/doctrine-bundle": "~1.0",
-                "doctrine/migrations": "^1.1",
-                "php": ">=5.4.0",
-                "symfony/framework-bundle": "~2.7|~3.3|~4.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.8.36"
-            },
-            "type": "symfony-bundle",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Bundle\\MigrationsBundle\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
-                {
-                    "name": "Doctrine Project",
-                    "homepage": "http://www.doctrine-project.org"
-                },
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                }
-            ],
-            "description": "Symfony DoctrineMigrationsBundle",
-            "homepage": "http://www.doctrine-project.org",
-            "keywords": [
-                "dbal",
-                "migrations",
-                "schema"
-            ],
-            "time": "2017-11-01T09:13:26+00:00"
-        },
-        {
-            "name": "doctrine/inflector",
-            "version": "v1.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/inflector.git",
-                "reference": "5527a48b7313d15261292c149e55e26eae771b0a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/inflector/zipball/5527a48b7313d15261292c149e55e26eae771b0a",
-                "reference": "5527a48b7313d15261292c149e55e26eae771b0a",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Jonathan Wage",
-                    "email": "jonwage@gmail.com"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com"
-                }
-            ],
-            "description": "Common String Manipulations with regard to casing and singular/plural rules.",
-            "homepage": "http://www.doctrine-project.org",
-            "keywords": [
-                "inflection",
-                "pluralize",
-                "singularize",
-                "string"
-            ],
-            "time": "2018-01-09T20:05:19+00:00"
-        },
-        {
-            "name": "doctrine/instantiator",
-            "version": "1.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/instantiator.git",
-                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
-                "reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1"
-            },
-            "require-dev": {
-                "athletic/athletic": "~0.1.8",
-                "ext-pdo": "*",
-                "ext-phar": "*",
-                "phpunit/phpunit": "^6.2.3",
-                "squizlabs/php_codesniffer": "^3.0.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.2.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com",
-                    "homepage": "http://ocramius.github.com/"
-                }
-            ],
-            "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors",
-            "homepage": "https://github.com/doctrine/instantiator",
-            "keywords": [
-                "constructor",
-                "instantiate"
-            ],
-            "time": "2017-07-22T11:58:36+00:00"
-        },
-        {
-            "name": "doctrine/lexer",
-            "version": "v1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/lexer.git",
-                "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/lexer/zipball/83893c552fd2045dd78aef794c31e694c37c0b8c",
-                "reference": "83893c552fd2045dd78aef794c31e694c37c0b8c",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.2"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Doctrine\\Common\\Lexer\\": "lib/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Johannes Schmitt",
-                    "email": "schmittjoh@gmail.com"
-                }
-            ],
-            "description": "Base library for a lexer that can be used in Top-Down, Recursive Descent Parsers.",
-            "homepage": "http://www.doctrine-project.org",
-            "keywords": [
-                "lexer",
-                "parser"
-            ],
-            "time": "2014-09-09T13:34:57+00:00"
-        },
-        {
-            "name": "doctrine/migrations",
-            "version": "v1.6.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/migrations.git",
-                "reference": "e3faf7c96b8a6084045dedcaf51f74c7834644d4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/migrations/zipball/e3faf7c96b8a6084045dedcaf51f74c7834644d4",
-                "reference": "e3faf7c96b8a6084045dedcaf51f74c7834644d4",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/dbal": "~2.6",
-                "ocramius/proxy-manager": "^1.0|^2.0",
-                "php": "^7.1",
-                "symfony/console": "~3.3|^4.0",
-                "symfony/yaml": "~3.3|^4.0"
-            },
-            "require-dev": {
-                "doctrine/coding-standard": "^1.0",
-                "doctrine/orm": "~2.5",
-                "jdorn/sql-formatter": "~1.1",
-                "mikey179/vfsstream": "^1.6",
-                "phpunit/phpunit": "~6.2",
-                "squizlabs/php_codesniffer": "^3.0"
-            },
-            "suggest": {
-                "jdorn/sql-formatter": "Allows to generate formatted SQL with the diff command."
-            },
-            "bin": [
-                "bin/doctrine-migrations"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "v1.6.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\DBAL\\Migrations\\": "lib/Doctrine/DBAL/Migrations"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "LGPL-2.1"
-            ],
-            "authors": [
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Jonathan Wage",
-                    "email": "jonwage@gmail.com"
-                },
-                {
-                    "name": "Michael Simonson",
-                    "email": "contact@mikesimonson.com"
-                }
-            ],
-            "description": "Database Schema migrations using Doctrine DBAL",
-            "homepage": "http://www.doctrine-project.org",
-            "keywords": [
-                "database",
-                "migrations"
-            ],
-            "time": "2017-11-24T14:13:17+00:00"
-        },
-        {
-            "name": "doctrine/orm",
-            "version": "v2.6.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/doctrine/doctrine2.git",
-                "reference": "87ee409783a4a322b5597ebaae558661404055a7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/doctrine/doctrine2/zipball/87ee409783a4a322b5597ebaae558661404055a7",
-                "reference": "87ee409783a4a322b5597ebaae558661404055a7",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/annotations": "~1.5",
-                "doctrine/cache": "~1.6",
-                "doctrine/collections": "^1.4",
-                "doctrine/common": "^2.7.1",
-                "doctrine/dbal": "^2.6",
-                "doctrine/instantiator": "~1.1",
-                "ext-pdo": "*",
-                "php": "^7.1",
-                "symfony/console": "~3.0|~4.0"
-            },
-            "require-dev": {
-                "doctrine/coding-standard": "^1.0",
-                "phpunit/phpunit": "^6.5",
-                "squizlabs/php_codesniffer": "^3.2",
-                "symfony/yaml": "~3.4|~4.0"
-            },
-            "suggest": {
-                "symfony/yaml": "If you want to use YAML Metadata Mapping Driver"
-            },
-            "bin": [
-                "bin/doctrine"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.6.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Doctrine\\ORM\\": "lib/Doctrine/ORM"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Roman Borschel",
-                    "email": "roman@code-factory.org"
-                },
-                {
-                    "name": "Benjamin Eberlei",
-                    "email": "kontakt@beberlei.de"
-                },
-                {
-                    "name": "Guilherme Blanco",
-                    "email": "guilhermeblanco@gmail.com"
-                },
-                {
-                    "name": "Jonathan Wage",
-                    "email": "jonwage@gmail.com"
-                },
-                {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com"
-                }
-            ],
-            "description": "Object-Relational-Mapper for PHP",
-            "homepage": "http://www.doctrine-project.org",
-            "keywords": [
-                "database",
-                "orm"
-            ],
-            "time": "2018-02-27T07:30:56+00:00"
-        },
-        {
-            "name": "fig/link-util",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/link-util.git",
-                "reference": "1a07821801a148be4add11ab0603e4af55a72fac"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/link-util/zipball/1a07821801a148be4add11ab0603e4af55a72fac",
-                "reference": "1a07821801a148be4add11ab0603e4af55a72fac",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5.0",
-                "psr/link": "~1.0@dev"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^5.1",
-                "squizlabs/php_codesniffer": "^2.3.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Fig\\Link\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common utility implementations for HTTP links",
-            "keywords": [
-                "http",
-                "http-link",
-                "link",
-                "psr",
-                "psr-13",
-                "rest"
-            ],
-            "time": "2016-10-17T18:31:11+00:00"
-        },
-        {
-            "name": "jdorn/sql-formatter",
-            "version": "v1.2.17",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/jdorn/sql-formatter.git",
-                "reference": "64990d96e0959dff8e059dfcdc1af130728d92bc"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/jdorn/sql-formatter/zipball/64990d96e0959dff8e059dfcdc1af130728d92bc",
-                "reference": "64990d96e0959dff8e059dfcdc1af130728d92bc",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.2.4"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "3.7.*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "lib"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jeremy Dorn",
-                    "email": "jeremy@jeremydorn.com",
-                    "homepage": "http://jeremydorn.com/"
-                }
-            ],
-            "description": "a PHP SQL highlighting library",
-            "homepage": "https://github.com/jdorn/sql-formatter/",
-            "keywords": [
-                "highlight",
-                "sql"
-            ],
-            "time": "2014-01-12T16:20:24+00:00"
-        },
-        {
-            "name": "kriswallsmith/assetic",
-            "version": "v1.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/kriswallsmith/assetic.git",
-                "reference": "e911c437dbdf006a8f62c2f59b15b2d69a5e0aa1"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/kriswallsmith/assetic/zipball/e911c437dbdf006a8f62c2f59b15b2d69a5e0aa1",
-                "reference": "e911c437dbdf006a8f62c2f59b15b2d69a5e0aa1",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.1",
-                "symfony/process": "~2.1|~3.0"
-            },
-            "conflict": {
-                "twig/twig": "<1.27"
-            },
-            "require-dev": {
-                "leafo/lessphp": "^0.3.7",
-                "leafo/scssphp": "~0.1",
-                "meenie/javascript-packer": "^1.1",
-                "mrclay/minify": "<2.3",
-                "natxet/cssmin": "3.0.4",
-                "patchwork/jsqueeze": "~1.0|~2.0",
-                "phpunit/phpunit": "~4.8 || ^5.6",
-                "psr/log": "~1.0",
-                "ptachoire/cssembed": "~1.0",
-                "symfony/phpunit-bridge": "~2.7|~3.0",
-                "twig/twig": "~1.23|~2.0",
-                "yfix/packager": "dev-master"
-            },
-            "suggest": {
-                "leafo/lessphp": "Assetic provides the integration with the lessphp LESS compiler",
-                "leafo/scssphp": "Assetic provides the integration with the scssphp SCSS compiler",
-                "leafo/scssphp-compass": "Assetic provides the integration with the SCSS compass plugin",
-                "patchwork/jsqueeze": "Assetic provides the integration with the JSqueeze JavaScript compressor",
-                "ptachoire/cssembed": "Assetic provides the integration with phpcssembed to embed data uris",
-                "twig/twig": "Assetic provides the integration with the Twig templating engine"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Assetic": "src/"
-                },
-                "files": [
-                    "src/functions.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Kris Wallsmith",
-                    "email": "kris.wallsmith@gmail.com",
-                    "homepage": "http://kriswallsmith.net/"
-                }
-            ],
-            "description": "Asset Management for PHP",
-            "homepage": "https://github.com/kriswallsmith/assetic",
-            "keywords": [
-                "assets",
-                "compression",
-                "minification"
-            ],
-            "time": "2016-11-11T18:43:20+00:00"
-        },
-        {
-            "name": "monolog/monolog",
-            "version": "1.23.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Seldaek/monolog.git",
-                "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Seldaek/monolog/zipball/fd8c787753b3a2ad11bc60c063cff1358a32a3b4",
-                "reference": "fd8c787753b3a2ad11bc60c063cff1358a32a3b4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0",
-                "psr/log": "~1.0"
-            },
-            "provide": {
-                "psr/log-implementation": "1.0.0"
-            },
-            "require-dev": {
-                "aws/aws-sdk-php": "^2.4.9 || ^3.0",
-                "doctrine/couchdb": "~1.0@dev",
-                "graylog2/gelf-php": "~1.0",
-                "jakub-onderka/php-parallel-lint": "0.9",
-                "php-amqplib/php-amqplib": "~2.4",
-                "php-console/php-console": "^3.1.3",
-                "phpunit/phpunit": "~4.5",
-                "phpunit/phpunit-mock-objects": "2.3.0",
-                "ruflin/elastica": ">=0.90 <3.0",
-                "sentry/sentry": "^0.13",
-                "swiftmailer/swiftmailer": "^5.3|^6.0"
-            },
-            "suggest": {
-                "aws/aws-sdk-php": "Allow sending log messages to AWS services like DynamoDB",
-                "doctrine/couchdb": "Allow sending log messages to a CouchDB server",
-                "ext-amqp": "Allow sending log messages to an AMQP server (1.0+ required)",
-                "ext-mongo": "Allow sending log messages to a MongoDB server",
-                "graylog2/gelf-php": "Allow sending log messages to a GrayLog2 server",
-                "mongodb/mongodb": "Allow sending log messages to a MongoDB server via PHP Driver",
-                "php-amqplib/php-amqplib": "Allow sending log messages to an AMQP server using php-amqplib",
-                "php-console/php-console": "Allow sending log messages to Google Chrome",
-                "rollbar/rollbar": "Allow sending log messages to Rollbar",
-                "ruflin/elastica": "Allow sending log messages to an Elastic Search server",
-                "sentry/sentry": "Allow sending log messages to a Sentry server"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Monolog\\": "src/Monolog"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jordi Boggiano",
-                    "email": "j.boggiano@seld.be",
-                    "homepage": "http://seld.be"
-                }
-            ],
-            "description": "Sends your logs to files, sockets, inboxes, databases and various web services",
-            "homepage": "http://github.com/Seldaek/monolog",
-            "keywords": [
-                "log",
-                "logging",
-                "psr-3"
-            ],
-            "time": "2017-06-19T01:22:40+00:00"
-        },
-        {
-            "name": "ocramius/package-versions",
-            "version": "1.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Ocramius/PackageVersions.git",
-                "reference": "4489d5002c49d55576fa0ba786f42dbb009be46f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Ocramius/PackageVersions/zipball/4489d5002c49d55576fa0ba786f42dbb009be46f",
-                "reference": "4489d5002c49d55576fa0ba786f42dbb009be46f",
-                "shasum": ""
-            },
-            "require": {
-                "composer-plugin-api": "^1.0.0",
-                "php": "^7.1.0"
-            },
-            "require-dev": {
-                "composer/composer": "^1.6.3",
-                "ext-zip": "*",
-                "infection/infection": "^0.7.1",
-                "phpunit/phpunit": "^7.0.0"
-            },
-            "type": "composer-plugin",
-            "extra": {
-                "class": "PackageVersions\\Installer",
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "PackageVersions\\": "src/PackageVersions"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com"
-                }
-            ],
-            "description": "Composer plugin that provides efficient querying for installed package versions (no runtime IO)",
-            "time": "2018-02-05T13:05:30+00:00"
-        },
-        {
-            "name": "ocramius/proxy-manager",
-            "version": "2.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/Ocramius/ProxyManager.git",
-                "reference": "81d53b2878f1d1c40ad27270e64b51798485dfc5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/Ocramius/ProxyManager/zipball/81d53b2878f1d1c40ad27270e64b51798485dfc5",
-                "reference": "81d53b2878f1d1c40ad27270e64b51798485dfc5",
-                "shasum": ""
-            },
-            "require": {
-                "ocramius/package-versions": "^1.1.3",
-                "php": "^7.2.0",
-                "zendframework/zend-code": "^3.3.0"
-            },
-            "require-dev": {
-                "couscous/couscous": "^1.6.1",
-                "ext-phar": "*",
-                "humbug/humbug": "1.0.0-RC.0@RC",
-                "nikic/php-parser": "^3.1.1",
-                "padraic/phpunit-accelerator": "dev-master@DEV",
-                "phpbench/phpbench": "^0.12.2",
-                "phpstan/phpstan": "dev-master#856eb10a81c1d27c701a83f167dc870fd8f4236a as 0.9.999",
-                "phpstan/phpstan-phpunit": "dev-master#5629c0a1f4a9c417cb1077cf6693ad9753895761",
-                "phpunit/phpunit": "^6.4.3",
-                "squizlabs/php_codesniffer": "^2.9.1"
-            },
-            "suggest": {
-                "ocramius/generated-hydrator": "To have very fast object to array to object conversion for ghost objects",
-                "zendframework/zend-json": "To have the JsonRpc adapter (Remote Object feature)",
-                "zendframework/zend-soap": "To have the Soap adapter (Remote Object feature)",
-                "zendframework/zend-xmlrpc": "To have the XmlRpc adapter (Remote Object feature)"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "ProxyManager\\": "src"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Marco Pivetta",
-                    "email": "ocramius@gmail.com",
-                    "homepage": "http://ocramius.github.io/"
-                }
-            ],
-            "description": "A library providing utilities to generate, instantiate and generally operate with Object Proxies",
-            "homepage": "https://github.com/Ocramius/ProxyManager",
-            "keywords": [
-                "aop",
-                "lazy loading",
-                "proxy",
-                "proxy pattern",
-                "service proxies"
-            ],
-            "time": "2017-11-16T23:22:31+00:00"
-        },
-        {
-            "name": "paragonie/random_compat",
-            "version": "v2.0.12",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/paragonie/random_compat.git",
-                "reference": "258c89a6b97de7dfaf5b8c7607d0478e236b04fb"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/paragonie/random_compat/zipball/258c89a6b97de7dfaf5b8c7607d0478e236b04fb",
-                "reference": "258c89a6b97de7dfaf5b8c7607d0478e236b04fb",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.2.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "4.*|5.*"
-            },
-            "suggest": {
-                "ext-libsodium": "Provides a modern crypto API that can be used to generate random bytes."
-            },
-            "type": "library",
-            "autoload": {
-                "files": [
-                    "lib/random.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Paragon Initiative Enterprises",
-                    "email": "security@paragonie.com",
-                    "homepage": "https://paragonie.com"
-                }
-            ],
-            "description": "PHP 5.x polyfill for random_bytes() and random_int() from PHP 7",
-            "keywords": [
-                "csprng",
-                "pseudorandom",
-                "random"
-            ],
-            "time": "2018-04-04T21:24:14+00:00"
-        },
-        {
-            "name": "phpoffice/phpspreadsheet",
-            "version": "1.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/PHPOffice/PhpSpreadsheet.git",
-                "reference": "36acc372875c4d894dc093825ce4f62209db5a76"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/36acc372875c4d894dc093825ce4f62209db5a76",
-                "reference": "36acc372875c4d894dc093825ce4f62209db5a76",
-                "shasum": ""
-            },
-            "require": {
-                "ext-ctype": "*",
-                "ext-dom": "*",
-                "ext-gd": "*",
-                "ext-iconv": "*",
-                "ext-libxml": "*",
-                "ext-mbstring": "*",
-                "ext-simplexml": "*",
-                "ext-xml": "*",
-                "ext-xmlreader": "*",
-                "ext-xmlwriter": "*",
-                "ext-zip": "*",
-                "ext-zlib": "*",
-                "php": "^5.6|^7.0",
-                "psr/simple-cache": "^1.0"
-            },
-            "require-dev": {
-                "dompdf/dompdf": "^0.8.0",
-                "friendsofphp/php-cs-fixer": "@stable",
-                "jpgraph/jpgraph": "^4.0",
-                "mpdf/mpdf": "^7.0.0",
-                "phpunit/phpunit": "^5.7",
-                "squizlabs/php_codesniffer": "^2.7",
-                "tecnickcom/tcpdf": "^6.2"
-            },
-            "suggest": {
-                "dompdf/dompdf": "Option for rendering PDF with PDF Writer",
-                "jpgraph/jpgraph": "Option for rendering charts, or including charts with PDF or HTML Writers",
-                "mpdf/mpdf": "Option for rendering PDF with PDF Writer",
-                "tecnick.com/tcpdf": "Option for rendering PDF with PDF Writer"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "PhpOffice\\PhpSpreadsheet\\": "src/PhpSpreadsheet"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "LGPL-2.1-or-later"
-            ],
-            "authors": [
-                {
-                    "name": "Maarten Balliauw",
-                    "homepage": "http://blog.maartenballiauw.be"
-                },
-                {
-                    "name": "Erik Tilt"
-                },
-                {
-                    "name": "Franck Lefevre",
-                    "homepage": "http://rootslabs.net"
-                },
-                {
-                    "name": "Mark Baker",
-                    "homepage": "http://markbakeruk.net"
-                }
-            ],
-            "description": "PHPSpreadsheet - Read, Create and Write Spreadsheet documents in PHP - Spreadsheet engine",
-            "homepage": "https://github.com/PHPOffice/PhpSpreadsheet",
-            "keywords": [
-                "OpenXML",
-                "excel",
-                "gnumeric",
-                "ods",
-                "php",
-                "spreadsheet",
-                "xls",
-                "xlsx"
-            ],
-            "time": "2018-04-10T03:53:16+00:00"
-        },
-        {
-            "name": "psr/cache",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/cache.git",
-                "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/cache/zipball/d11b50ad223250cf17b86e38383413f5a6764bf8",
-                "reference": "d11b50ad223250cf17b86e38383413f5a6764bf8",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Cache\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for caching libraries",
-            "keywords": [
-                "cache",
-                "psr",
-                "psr-6"
-            ],
-            "time": "2016-08-06T20:24:11+00:00"
-        },
-        {
-            "name": "psr/container",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/container.git",
-                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/container/zipball/b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
-                "reference": "b7ce3b176482dbbc1245ebf52b181af44c2cf55f",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Container\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common Container Interface (PHP FIG PSR-11)",
-            "homepage": "https://github.com/php-fig/container",
-            "keywords": [
-                "PSR-11",
-                "container",
-                "container-interface",
-                "container-interop",
-                "psr"
-            ],
-            "time": "2017-02-14T16:28:37+00:00"
-        },
-        {
-            "name": "psr/link",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/link.git",
-                "reference": "eea8e8662d5cd3ae4517c9b864493f59fca95562"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/link/zipball/eea8e8662d5cd3ae4517c9b864493f59fca95562",
-                "reference": "eea8e8662d5cd3ae4517c9b864493f59fca95562",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Link\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interfaces for HTTP links",
-            "keywords": [
-                "http",
-                "http-link",
-                "link",
-                "psr",
-                "psr-13",
-                "rest"
-            ],
-            "time": "2016-10-28T16:06:13+00:00"
-        },
-        {
-            "name": "psr/log",
-            "version": "1.0.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/log.git",
-                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/log/zipball/4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
-                "reference": "4ebe3a8bf773a19edfe0a84b6585ba3d401b724d",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\Log\\": "Psr/Log/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interface for logging libraries",
-            "homepage": "https://github.com/php-fig/log",
-            "keywords": [
-                "log",
-                "psr",
-                "psr-3"
-            ],
-            "time": "2016-10-10T12:19:37+00:00"
-        },
-        {
-            "name": "psr/simple-cache",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/php-fig/simple-cache.git",
-                "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/php-fig/simple-cache/zipball/408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
-                "reference": "408d5eafb83c57f6365a3ca330ff23aa4a5fa39b",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Psr\\SimpleCache\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "PHP-FIG",
-                    "homepage": "http://www.php-fig.org/"
-                }
-            ],
-            "description": "Common interfaces for simple caching",
-            "keywords": [
-                "cache",
-                "caching",
-                "psr",
-                "psr-16",
-                "simple-cache"
-            ],
-            "time": "2017-10-23T01:57:42+00:00"
-        },
-        {
-            "name": "sensio/distribution-bundle",
-            "version": "v5.0.21",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sensiolabs/SensioDistributionBundle.git",
-                "reference": "eb6266b3b472e4002538610b28a0a04bcf94891a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sensiolabs/SensioDistributionBundle/zipball/eb6266b3b472e4002538610b28a0a04bcf94891a",
-                "reference": "eb6266b3b472e4002538610b28a0a04bcf94891a",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.9",
-                "sensiolabs/security-checker": "~3.0|~4.0",
-                "symfony/class-loader": "~2.3|~3.0",
-                "symfony/config": "~2.3|~3.0",
-                "symfony/dependency-injection": "~2.3|~3.0",
-                "symfony/filesystem": "~2.3|~3.0",
-                "symfony/http-kernel": "~2.3|~3.0",
-                "symfony/process": "~2.3|~3.0"
-            },
-            "type": "symfony-bundle",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "5.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Sensio\\Bundle\\DistributionBundle\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                }
-            ],
-            "description": "Base bundle for Symfony Distributions",
-            "keywords": [
-                "configuration",
-                "distribution"
-            ],
-            "time": "2017-08-25T16:55:44+00:00"
-        },
-        {
-            "name": "sensiolabs/security-checker",
-            "version": "v4.1.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sensiolabs/security-checker.git",
-                "reference": "dc270d5fec418cc6ac983671dba5d80ffaffb142"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sensiolabs/security-checker/zipball/dc270d5fec418cc6ac983671dba5d80ffaffb142",
-                "reference": "dc270d5fec418cc6ac983671dba5d80ffaffb142",
-                "shasum": ""
-            },
-            "require": {
-                "composer/ca-bundle": "^1.0",
-                "symfony/console": "~2.7|~3.0|~4.0"
-            },
-            "bin": [
-                "security-checker"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.1-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "SensioLabs\\Security": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien.potencier@gmail.com"
-                }
-            ],
-            "description": "A security checker for your composer.lock",
-            "time": "2018-02-28T22:10:01+00:00"
-        },
-        {
-            "name": "symfony/assetic-bundle",
-            "version": "v2.8.2",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/assetic-bundle.git",
-                "reference": "2e0a23a4874838e26de6f025e02fc63328921a4c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/assetic-bundle/zipball/2e0a23a4874838e26de6f025e02fc63328921a4c",
-                "reference": "2e0a23a4874838e26de6f025e02fc63328921a4c",
-                "shasum": ""
-            },
-            "require": {
-                "kriswallsmith/assetic": "~1.4",
-                "php": ">=5.3.0",
-                "symfony/console": "~2.3|~3.0",
-                "symfony/dependency-injection": "~2.3|~3.0",
-                "symfony/framework-bundle": "~2.3|~3.0",
-                "symfony/yaml": "~2.3|~3.0"
-            },
-            "conflict": {
-                "kriswallsmith/spork": "<=0.2",
-                "twig/twig": "<1.27"
-            },
-            "require-dev": {
-                "kriswallsmith/spork": "~0.3",
-                "patchwork/jsqueeze": "~1.0",
-                "symfony/class-loader": "~2.3|~3.0",
-                "symfony/css-selector": "~2.3|~3.0",
-                "symfony/dom-crawler": "~2.3|~3.0",
-                "symfony/phpunit-bridge": "~2.7|~3.0",
-                "symfony/twig-bundle": "~2.3|~3.0"
-            },
-            "suggest": {
-                "kriswallsmith/spork": "to be able to dump assets in parallel",
-                "symfony/twig-bundle": "to use the Twig integration"
-            },
-            "type": "symfony-bundle",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Bundle\\AsseticBundle\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Kris Wallsmith",
-                    "email": "kris.wallsmith@gmail.com",
-                    "homepage": "http://kriswallsmith.net/"
-                }
-            ],
-            "description": "Integrates Assetic into Symfony2",
-            "homepage": "https://github.com/symfony/AsseticBundle",
-            "keywords": [
-                "assets",
-                "compression",
-                "minification"
-            ],
-            "time": "2017-07-14T07:26:46+00:00"
-        },
-        {
-            "name": "symfony/monolog-bundle",
-            "version": "v3.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/monolog-bundle.git",
-                "reference": "8781649349fe418d51d194f8c9d212c0b97c40dd"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/monolog-bundle/zipball/8781649349fe418d51d194f8c9d212c0b97c40dd",
-                "reference": "8781649349fe418d51d194f8c9d212c0b97c40dd",
-                "shasum": ""
-            },
-            "require": {
-                "monolog/monolog": "~1.22",
-                "php": ">=5.3.2",
-                "symfony/config": "~2.7|~3.0|~4.0",
-                "symfony/dependency-injection": "~2.7|~3.0|~4.0",
-                "symfony/http-kernel": "~2.7|~3.0|~4.0",
-                "symfony/monolog-bridge": "~2.7|~3.0|~4.0"
-            },
-            "require-dev": {
-                "symfony/console": "~2.3|~3.0|~4.0",
-                "symfony/phpunit-bridge": "^3.3|^4.0",
-                "symfony/yaml": "~2.3|~3.0|~4.0"
-            },
-            "type": "symfony-bundle",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Bundle\\MonologBundle\\": ""
-                },
-                "exclude-from-classmap": [
-                    "/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Symfony Community",
-                    "homepage": "http://symfony.com/contributors"
-                },
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                }
-            ],
-            "description": "Symfony MonologBundle",
-            "homepage": "http://symfony.com",
-            "keywords": [
-                "log",
-                "logging"
-            ],
-            "time": "2018-03-05T14:51:36+00:00"
-        },
-        {
-            "name": "symfony/polyfill-apcu",
-            "version": "v1.7.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-apcu.git",
-                "reference": "e8ae2136ddb53dea314df56fcd88e318ab936c00"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-apcu/zipball/e8ae2136ddb53dea314df56fcd88e318ab936c00",
-                "reference": "e8ae2136ddb53dea314df56fcd88e318ab936c00",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.7-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Apcu\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting apcu_* functions to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "apcu",
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "time": "2018-01-30T19:27:44+00:00"
-        },
-        {
-            "name": "symfony/polyfill-intl-icu",
-            "version": "v1.7.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-intl-icu.git",
-                "reference": "254919c03761d46c29291616576ed003f10e91c1"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-intl-icu/zipball/254919c03761d46c29291616576ed003f10e91c1",
-                "reference": "254919c03761d46c29291616576ed003f10e91c1",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "symfony/intl": "~2.3|~3.0|~4.0"
-            },
-            "suggest": {
-                "ext-intl": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.7-dev"
-                }
-            },
-            "autoload": {
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for intl's ICU-related data and classes",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "icu",
-                "intl",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "time": "2018-01-30T19:27:44+00:00"
-        },
-        {
-            "name": "symfony/polyfill-mbstring",
-            "version": "v1.7.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-mbstring.git",
-                "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/78be803ce01e55d3491c1397cf1c64beb9c1b63b",
-                "reference": "78be803ce01e55d3491c1397cf1c64beb9c1b63b",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "suggest": {
-                "ext-mbstring": "For best performance"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.7-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Mbstring\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill for the Mbstring extension",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "mbstring",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "time": "2018-01-30T19:27:44+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php56",
-            "version": "v1.7.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php56.git",
-                "reference": "ebc999ce5f14204c5150b9bd15f8f04e621409d8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php56/zipball/ebc999ce5f14204c5150b9bd15f8f04e621409d8",
-                "reference": "ebc999ce5f14204c5150b9bd15f8f04e621409d8",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3",
-                "symfony/polyfill-util": "~1.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.7-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php56\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 5.6+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "time": "2018-01-30T19:27:44+00:00"
-        },
-        {
-            "name": "symfony/polyfill-php70",
-            "version": "v1.7.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-php70.git",
-                "reference": "3532bfcd8f933a7816f3a0a59682fc404776600f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-php70/zipball/3532bfcd8f933a7816f3a0a59682fc404776600f",
-                "reference": "3532bfcd8f933a7816f3a0a59682fc404776600f",
-                "shasum": ""
-            },
-            "require": {
-                "paragonie/random_compat": "~1.0|~2.0",
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.7-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Php70\\": ""
-                },
-                "files": [
-                    "bootstrap.php"
-                ],
-                "classmap": [
-                    "Resources/stubs"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony polyfill backporting some PHP 7.0+ features to lower PHP versions",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compatibility",
-                "polyfill",
-                "portable",
-                "shim"
-            ],
-            "time": "2018-01-30T19:27:44+00:00"
-        },
-        {
-            "name": "symfony/polyfill-util",
-            "version": "v1.7.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/polyfill-util.git",
-                "reference": "e17c808ec4228026d4f5a8832afa19be85979563"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/polyfill-util/zipball/e17c808ec4228026d4f5a8832afa19be85979563",
-                "reference": "e17c808ec4228026d4f5a8832afa19be85979563",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.7-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Polyfill\\Util\\": ""
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Nicolas Grekas",
-                    "email": "p@tchwork.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "Symfony utilities for portability of PHP codes",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "compat",
-                "compatibility",
-                "polyfill",
-                "shim"
-            ],
-            "time": "2018-01-31T18:08:44+00:00"
-        },
-        {
-            "name": "symfony/symfony",
-            "version": "v3.4.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/symfony/symfony.git",
-                "reference": "5304a36c5efbb01af7efe2bb5b1953dbaeebc293"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/symfony/symfony/zipball/5304a36c5efbb01af7efe2bb5b1953dbaeebc293",
-                "reference": "5304a36c5efbb01af7efe2bb5b1953dbaeebc293",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/common": "~2.4",
-                "ext-xml": "*",
-                "fig/link-util": "^1.0",
-                "php": "^5.5.9|>=7.0.8",
-                "psr/cache": "~1.0",
-                "psr/container": "^1.0",
-                "psr/link": "^1.0",
-                "psr/log": "~1.0",
-                "psr/simple-cache": "^1.0",
-                "symfony/polyfill-apcu": "~1.1",
-                "symfony/polyfill-intl-icu": "~1.0",
-                "symfony/polyfill-mbstring": "~1.0",
-                "symfony/polyfill-php56": "~1.0",
-                "symfony/polyfill-php70": "~1.6",
-                "twig/twig": "^1.35|^2.4.4"
-            },
-            "conflict": {
-                "phpdocumentor/reflection-docblock": "<3.0||>=3.2.0,<3.2.2",
-                "phpdocumentor/type-resolver": "<0.2.1",
-                "phpunit/phpunit": "<4.8.35|<5.4.3,>=5.0"
-            },
-            "provide": {
-                "psr/cache-implementation": "1.0",
-                "psr/container-implementation": "1.0",
-                "psr/log-implementation": "1.0",
-                "psr/simple-cache-implementation": "1.0"
-            },
-            "replace": {
-                "symfony/asset": "self.version",
-                "symfony/browser-kit": "self.version",
-                "symfony/cache": "self.version",
-                "symfony/class-loader": "self.version",
-                "symfony/config": "self.version",
-                "symfony/console": "self.version",
-                "symfony/css-selector": "self.version",
-                "symfony/debug": "self.version",
-                "symfony/debug-bundle": "self.version",
-                "symfony/dependency-injection": "self.version",
-                "symfony/doctrine-bridge": "self.version",
-                "symfony/dom-crawler": "self.version",
-                "symfony/dotenv": "self.version",
-                "symfony/event-dispatcher": "self.version",
-                "symfony/expression-language": "self.version",
-                "symfony/filesystem": "self.version",
-                "symfony/finder": "self.version",
-                "symfony/form": "self.version",
-                "symfony/framework-bundle": "self.version",
-                "symfony/http-foundation": "self.version",
-                "symfony/http-kernel": "self.version",
-                "symfony/inflector": "self.version",
-                "symfony/intl": "self.version",
-                "symfony/ldap": "self.version",
-                "symfony/lock": "self.version",
-                "symfony/monolog-bridge": "self.version",
-                "symfony/options-resolver": "self.version",
-                "symfony/process": "self.version",
-                "symfony/property-access": "self.version",
-                "symfony/property-info": "self.version",
-                "symfony/proxy-manager-bridge": "self.version",
-                "symfony/routing": "self.version",
-                "symfony/security": "self.version",
-                "symfony/security-bundle": "self.version",
-                "symfony/security-core": "self.version",
-                "symfony/security-csrf": "self.version",
-                "symfony/security-guard": "self.version",
-                "symfony/security-http": "self.version",
-                "symfony/serializer": "self.version",
-                "symfony/stopwatch": "self.version",
-                "symfony/templating": "self.version",
-                "symfony/translation": "self.version",
-                "symfony/twig-bridge": "self.version",
-                "symfony/twig-bundle": "self.version",
-                "symfony/validator": "self.version",
-                "symfony/var-dumper": "self.version",
-                "symfony/web-link": "self.version",
-                "symfony/web-profiler-bundle": "self.version",
-                "symfony/web-server-bundle": "self.version",
-                "symfony/workflow": "self.version",
-                "symfony/yaml": "self.version"
-            },
-            "require-dev": {
-                "cache/integration-tests": "dev-master",
-                "doctrine/annotations": "~1.0",
-                "doctrine/cache": "~1.6",
-                "doctrine/data-fixtures": "1.0.*",
-                "doctrine/dbal": "~2.4",
-                "doctrine/doctrine-bundle": "~1.4",
-                "doctrine/orm": "~2.4,>=2.4.5",
-                "egulias/email-validator": "~1.2,>=1.2.8|~2.0",
-                "monolog/monolog": "~1.11",
-                "ocramius/proxy-manager": "~0.4|~1.0|~2.0",
-                "phpdocumentor/reflection-docblock": "^3.0|^4.0",
-                "predis/predis": "~1.0",
-                "symfony/phpunit-bridge": "~3.4|~4.0",
-                "symfony/security-acl": "~2.8|~3.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Symfony\\Bridge\\Doctrine\\": "src/Symfony/Bridge/Doctrine/",
-                    "Symfony\\Bridge\\Monolog\\": "src/Symfony/Bridge/Monolog/",
-                    "Symfony\\Bridge\\ProxyManager\\": "src/Symfony/Bridge/ProxyManager/",
-                    "Symfony\\Bridge\\Twig\\": "src/Symfony/Bridge/Twig/",
-                    "Symfony\\Bundle\\": "src/Symfony/Bundle/",
-                    "Symfony\\Component\\": "src/Symfony/Component/"
-                },
-                "classmap": [
-                    "src/Symfony/Component/Intl/Resources/stubs"
-                ],
-                "exclude-from-classmap": [
-                    "**/Tests/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                },
-                {
-                    "name": "Symfony Community",
-                    "homepage": "https://symfony.com/contributors"
-                }
-            ],
-            "description": "The Symfony PHP framework",
-            "homepage": "https://symfony.com",
-            "keywords": [
-                "framework"
-            ],
-            "time": "2018-04-06T15:20:04+00:00"
-        },
-        {
-            "name": "twig/extensions",
-            "version": "v1.5.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/twigphp/Twig-extensions.git",
-                "reference": "d188c76168b853481cc75879ea045bf93d718e9c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig-extensions/zipball/d188c76168b853481cc75879ea045bf93d718e9c",
-                "reference": "d188c76168b853481cc75879ea045bf93d718e9c",
-                "shasum": ""
-            },
-            "require": {
-                "twig/twig": "~1.27|~2.0"
-            },
-            "require-dev": {
-                "symfony/phpunit-bridge": "~3.3@dev",
-                "symfony/translation": "~2.3|~3.0"
-            },
-            "suggest": {
-                "symfony/translation": "Allow the time_diff output to be translated"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.5-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Twig_Extensions_": "lib/"
-                },
-                "psr-4": {
-                    "Twig\\Extensions\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com"
-                }
-            ],
-            "description": "Common additional features for Twig that do not directly belong in core",
-            "homepage": "http://twig.sensiolabs.org/doc/extensions/index.html",
-            "keywords": [
-                "i18n",
-                "text"
-            ],
-            "time": "2017-06-08T18:19:53+00:00"
-        },
-        {
-            "name": "twig/twig",
-            "version": "v2.4.8",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/twigphp/Twig.git",
-                "reference": "7b604c89da162034bdf4bb66310f358d313dd16d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/twigphp/Twig/zipball/7b604c89da162034bdf4bb66310f358d313dd16d",
-                "reference": "7b604c89da162034bdf4bb66310f358d313dd16d",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0",
-                "symfony/polyfill-mbstring": "~1.0"
-            },
-            "require-dev": {
-                "psr/container": "^1.0",
-                "symfony/debug": "^2.7",
-                "symfony/phpunit-bridge": "^3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.4-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Twig_": "lib/"
-                },
-                "psr-4": {
-                    "Twig\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Fabien Potencier",
-                    "email": "fabien@symfony.com",
-                    "homepage": "http://fabien.potencier.org",
-                    "role": "Lead Developer"
-                },
-                {
-                    "name": "Armin Ronacher",
-                    "email": "armin.ronacher@active-4.com",
-                    "role": "Project Founder"
-                },
-                {
-                    "name": "Twig Team",
-                    "homepage": "http://twig.sensiolabs.org/contributors",
-                    "role": "Contributors"
-                }
-            ],
-            "description": "Twig, the flexible, fast, and secure template language for PHP",
-            "homepage": "http://twig.sensiolabs.org",
-            "keywords": [
-                "templating"
-            ],
-            "time": "2018-04-02T09:24:19+00:00"
-        },
-        {
-            "name": "zendframework/zend-code",
-            "version": "3.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/zendframework/zend-code.git",
-                "reference": "6b1059db5b368db769e4392c6cb6cc139e56640d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-code/zipball/6b1059db5b368db769e4392c6cb6cc139e56640d",
-                "reference": "6b1059db5b368db769e4392c6cb6cc139e56640d",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1",
-                "zendframework/zend-eventmanager": "^2.6 || ^3.0"
-            },
-            "require-dev": {
-                "doctrine/annotations": "~1.0",
-                "ext-phar": "*",
-                "phpunit/phpunit": "^6.2.3",
-                "zendframework/zend-coding-standard": "^1.0.0",
-                "zendframework/zend-stdlib": "^2.7 || ^3.0"
-            },
-            "suggest": {
-                "doctrine/annotations": "Doctrine\\Common\\Annotations >=1.0 for annotation features",
-                "zendframework/zend-stdlib": "Zend\\Stdlib component"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.2-dev",
-                    "dev-develop": "3.3-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Zend\\Code\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "provides facilities to generate arbitrary code using an object oriented interface",
-            "homepage": "https://github.com/zendframework/zend-code",
-            "keywords": [
-                "code",
-                "zf2"
-            ],
-            "time": "2017-10-20T15:21:32+00:00"
-        },
-        {
-            "name": "zendframework/zend-eventmanager",
-            "version": "3.2.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/zendframework/zend-eventmanager.git",
-                "reference": "9d72db10ceb6e42fb92350c0cb54460da61bd79c"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/zendframework/zend-eventmanager/zipball/9d72db10ceb6e42fb92350c0cb54460da61bd79c",
-                "reference": "9d72db10ceb6e42fb92350c0cb54460da61bd79c",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.6 || ^7.0"
-            },
-            "require-dev": {
-                "athletic/athletic": "^0.1",
-                "container-interop/container-interop": "^1.1.0",
-                "phpunit/phpunit": "^6.0.7 || ^5.7.14",
-                "zendframework/zend-coding-standard": "~1.0.0",
-                "zendframework/zend-stdlib": "^2.7.3 || ^3.0"
-            },
-            "suggest": {
-                "container-interop/container-interop": "^1.1.0, to use the lazy listeners feature",
-                "zendframework/zend-stdlib": "^2.7.3 || ^3.0, to use the FilterChain feature"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.2-dev",
-                    "dev-develop": "3.3-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Zend\\EventManager\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "description": "Trigger and listen to events within a PHP application",
-            "homepage": "https://github.com/zendframework/zend-eventmanager",
-            "keywords": [
-                "event",
-                "eventmanager",
-                "events",
-                "zf2"
-            ],
-            "time": "2017-07-11T19:17:22+00:00"
-        }
-    ],
-    "packages-dev": [
-        {
-            "name": "fzaninotto/faker",
-            "version": "v1.7.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/fzaninotto/Faker.git",
-                "reference": "d3ed4cc37051c1ca52d22d76b437d14809fc7e0d"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/d3ed4cc37051c1ca52d22d76b437d14809fc7e0d",
-                "reference": "d3ed4cc37051c1ca52d22d76b437d14809fc7e0d",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.3 || ^7.0"
-            },
-            "require-dev": {
-                "ext-intl": "*",
-                "phpunit/phpunit": "^4.0 || ^5.0",
-                "squizlabs/php_codesniffer": "^1.5"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.8-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Faker\\": "src/Faker/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "François Zaninotto"
-                }
-            ],
-            "description": "Faker is a PHP library that generates fake data for you.",
-            "keywords": [
-                "data",
-                "faker",
-                "fixtures"
-            ],
-            "time": "2017-08-15T16:48:10+00:00"
-        },
-        {
-            "name": "myclabs/deep-copy",
-            "version": "1.7.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/myclabs/DeepCopy.git",
-                "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/myclabs/DeepCopy/zipball/3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e",
-                "reference": "3b8a3a99ba1f6a3952ac2747d989303cbd6b7a3e",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.6 || ^7.0"
-            },
-            "require-dev": {
-                "doctrine/collections": "^1.0",
-                "doctrine/common": "^2.6",
-                "phpunit/phpunit": "^4.1"
-            },
-            "type": "library",
-            "autoload": {
-                "psr-4": {
-                    "DeepCopy\\": "src/DeepCopy/"
-                },
-                "files": [
-                    "src/DeepCopy/deep_copy.php"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "description": "Create deep copies (clones) of your objects",
-            "keywords": [
-                "clone",
-                "copy",
-                "duplicate",
-                "object",
-                "object graph"
-            ],
-            "time": "2017-10-19T19:58:43+00:00"
-        },
-        {
-            "name": "phar-io/manifest",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phar-io/manifest.git",
-                "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/manifest/zipball/2df402786ab5368a0169091f61a7c1e0eb6852d0",
-                "reference": "2df402786ab5368a0169091f61a7c1e0eb6852d0",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-phar": "*",
-                "phar-io/version": "^1.0.1",
-                "php": "^5.6 || ^7.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Arne Blankerts",
-                    "email": "arne@blankerts.de",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Sebastian Heuer",
-                    "email": "sebastian@phpeople.de",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Component for reading phar.io manifest information from a PHP Archive (PHAR)",
-            "time": "2017-03-05T18:14:27+00:00"
-        },
-        {
-            "name": "phar-io/version",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phar-io/version.git",
-                "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phar-io/version/zipball/a70c0ced4be299a63d32fa96d9281d03e94041df",
-                "reference": "a70c0ced4be299a63d32fa96d9281d03e94041df",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.6 || ^7.0"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Arne Blankerts",
-                    "email": "arne@blankerts.de",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Sebastian Heuer",
-                    "email": "sebastian@phpeople.de",
-                    "role": "Developer"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "Developer"
-                }
-            ],
-            "description": "Library for handling version information and constraints",
-            "time": "2017-03-05T17:38:23+00:00"
-        },
-        {
-            "name": "phpdocumentor/reflection-common",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionCommon.git",
-                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionCommon/zipball/21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
-                "reference": "21bdeb5f65d7ebf9f43b1b25d404f87deab5bfb6",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.5"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.6"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Jaap van Otterdijk",
-                    "email": "opensource@ijaap.nl"
-                }
-            ],
-            "description": "Common reflection classes used by phpdocumentor to reflect the code structure",
-            "homepage": "http://www.phpdoc.org",
-            "keywords": [
-                "FQSEN",
-                "phpDocumentor",
-                "phpdoc",
-                "reflection",
-                "static analysis"
-            ],
-            "time": "2017-09-11T18:02:19+00:00"
-        },
-        {
-            "name": "phpdocumentor/reflection-docblock",
-            "version": "4.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git",
-                "reference": "94fd0001232e47129dd3504189fa1c7225010d08"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/94fd0001232e47129dd3504189fa1c7225010d08",
-                "reference": "94fd0001232e47129dd3504189fa1c7225010d08",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0",
-                "phpdocumentor/reflection-common": "^1.0.0",
-                "phpdocumentor/type-resolver": "^0.4.0",
-                "webmozart/assert": "^1.0"
-            },
-            "require-dev": {
-                "doctrine/instantiator": "~1.0.5",
-                "mockery/mockery": "^1.0",
-                "phpunit/phpunit": "^6.4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "4.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                }
-            ],
-            "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
-            "time": "2017-11-30T07:14:17+00:00"
-        },
-        {
-            "name": "phpdocumentor/type-resolver",
-            "version": "0.4.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpDocumentor/TypeResolver.git",
-                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpDocumentor/TypeResolver/zipball/9c977708995954784726e25d0cd1dddf4e65b0f7",
-                "reference": "9c977708995954784726e25d0cd1dddf4e65b0f7",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.5 || ^7.0",
-                "phpdocumentor/reflection-common": "^1.0"
-            },
-            "require-dev": {
-                "mockery/mockery": "^0.9.4",
-                "phpunit/phpunit": "^5.2||^4.8.24"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "phpDocumentor\\Reflection\\": [
-                        "src/"
-                    ]
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Mike van Riel",
-                    "email": "me@mikevanriel.com"
-                }
-            ],
-            "time": "2017-07-14T14:27:02+00:00"
-        },
-        {
-            "name": "phpspec/prophecy",
-            "version": "1.7.6",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/phpspec/prophecy.git",
-                "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/phpspec/prophecy/zipball/33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
-                "reference": "33a7e3c4fda54e912ff6338c48823bd5c0f0b712",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.0.2",
-                "php": "^5.3|^7.0",
-                "phpdocumentor/reflection-docblock": "^2.0|^3.0.2|^4.0",
-                "sebastian/comparator": "^1.1|^2.0|^3.0",
-                "sebastian/recursion-context": "^1.0|^2.0|^3.0"
-            },
-            "require-dev": {
-                "phpspec/phpspec": "^2.5|^3.2",
-                "phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.7.x-dev"
-                }
-            },
-            "autoload": {
-                "psr-0": {
-                    "Prophecy\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Konstantin Kudryashov",
-                    "email": "ever.zet@gmail.com",
-                    "homepage": "http://everzet.com"
-                },
-                {
-                    "name": "Marcello Duarte",
-                    "email": "marcello.duarte@gmail.com"
-                }
-            ],
-            "description": "Highly opinionated mocking framework for PHP 5.3+",
-            "homepage": "https://github.com/phpspec/prophecy",
-            "keywords": [
-                "Double",
-                "Dummy",
-                "fake",
-                "mock",
-                "spy",
-                "stub"
-            ],
-            "time": "2018-04-18T13:57:24+00:00"
-        },
-        {
-            "name": "phpunit/php-code-coverage",
-            "version": "6.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-code-coverage.git",
-                "reference": "774a82c0c5da4c1c7701790c262035d235ab7856"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/774a82c0c5da4c1c7701790c262035d235ab7856",
-                "reference": "774a82c0c5da4c1c7701790c262035d235ab7856",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-xmlwriter": "*",
-                "php": "^7.1",
-                "phpunit/php-file-iterator": "^1.4.2",
-                "phpunit/php-text-template": "^1.2.1",
-                "phpunit/php-token-stream": "^3.0",
-                "sebastian/code-unit-reverse-lookup": "^1.0.1",
-                "sebastian/environment": "^3.1",
-                "sebastian/version": "^2.0.1",
-                "theseer/tokenizer": "^1.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^7.0"
-            },
-            "suggest": {
-                "ext-xdebug": "^2.6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "6.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.",
-            "homepage": "https://github.com/sebastianbergmann/php-code-coverage",
-            "keywords": [
-                "coverage",
-                "testing",
-                "xunit"
-            ],
-            "time": "2018-04-06T15:39:20+00:00"
-        },
-        {
-            "name": "phpunit/php-file-iterator",
-            "version": "1.4.5",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-file-iterator.git",
-                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/730b01bc3e867237eaac355e06a36b85dd93a8b4",
-                "reference": "730b01bc3e867237eaac355e06a36b85dd93a8b4",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.4.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sb@sebastian-bergmann.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "FilterIterator implementation that filters files based on a list of suffixes.",
-            "homepage": "https://github.com/sebastianbergmann/php-file-iterator/",
-            "keywords": [
-                "filesystem",
-                "iterator"
-            ],
-            "time": "2017-11-27T13:52:08+00:00"
-        },
-        {
-            "name": "phpunit/php-text-template",
-            "version": "1.2.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-text-template.git",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.3.3"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Simple template engine.",
-            "homepage": "https://github.com/sebastianbergmann/php-text-template/",
-            "keywords": [
-                "template"
-            ],
-            "time": "2015-06-21T13:50:34+00:00"
-        },
-        {
-            "name": "phpunit/php-timer",
-            "version": "2.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-timer.git",
-                "reference": "8b8454ea6958c3dee38453d3bd571e023108c91f"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/8b8454ea6958c3dee38453d3bd571e023108c91f",
-                "reference": "8b8454ea6958c3dee38453d3bd571e023108c91f",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^7.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Utility class for timing",
-            "homepage": "https://github.com/sebastianbergmann/php-timer/",
-            "keywords": [
-                "timer"
-            ],
-            "time": "2018-02-01T13:07:23+00:00"
-        },
-        {
-            "name": "phpunit/php-token-stream",
-            "version": "3.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/php-token-stream.git",
-                "reference": "21ad88bbba7c3d93530d93994e0a33cd45f02ace"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/21ad88bbba7c3d93530d93994e0a33cd45f02ace",
-                "reference": "21ad88bbba7c3d93530d93994e0a33cd45f02ace",
-                "shasum": ""
-            },
-            "require": {
-                "ext-tokenizer": "*",
-                "php": "^7.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^7.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Wrapper around PHP's tokenizer extension.",
-            "homepage": "https://github.com/sebastianbergmann/php-token-stream/",
-            "keywords": [
-                "tokenizer"
-            ],
-            "time": "2018-02-01T13:16:43+00:00"
-        },
-        {
-            "name": "phpunit/phpunit",
-            "version": "7.1.4",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit.git",
-                "reference": "6d51299e307dc510149e0b7cd1931dd11770e1cb"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/6d51299e307dc510149e0b7cd1931dd11770e1cb",
-                "reference": "6d51299e307dc510149e0b7cd1931dd11770e1cb",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-json": "*",
-                "ext-libxml": "*",
-                "ext-mbstring": "*",
-                "ext-xml": "*",
-                "myclabs/deep-copy": "^1.6.1",
-                "phar-io/manifest": "^1.0.1",
-                "phar-io/version": "^1.0",
-                "php": "^7.1",
-                "phpspec/prophecy": "^1.7",
-                "phpunit/php-code-coverage": "^6.0.1",
-                "phpunit/php-file-iterator": "^1.4.3",
-                "phpunit/php-text-template": "^1.2.1",
-                "phpunit/php-timer": "^2.0",
-                "phpunit/phpunit-mock-objects": "^6.1.1",
-                "sebastian/comparator": "^2.1 || ^3.0",
-                "sebastian/diff": "^3.0",
-                "sebastian/environment": "^3.1",
-                "sebastian/exporter": "^3.1",
-                "sebastian/global-state": "^2.0",
-                "sebastian/object-enumerator": "^3.0.3",
-                "sebastian/resource-operations": "^1.0",
-                "sebastian/version": "^2.0.1"
-            },
-            "require-dev": {
-                "ext-pdo": "*"
-            },
-            "suggest": {
-                "ext-xdebug": "*",
-                "phpunit/php-invoker": "^2.0"
-            },
-            "bin": [
-                "phpunit"
-            ],
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "7.1-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "The PHP Unit Testing framework.",
-            "homepage": "https://phpunit.de/",
-            "keywords": [
-                "phpunit",
-                "testing",
-                "xunit"
-            ],
-            "time": "2018-04-18T13:41:53+00:00"
-        },
-        {
-            "name": "phpunit/phpunit-mock-objects",
-            "version": "6.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git",
-                "reference": "70c740bde8fd9ea9ea295be1cd875dd7b267e157"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/70c740bde8fd9ea9ea295be1cd875dd7b267e157",
-                "reference": "70c740bde8fd9ea9ea295be1cd875dd7b267e157",
-                "shasum": ""
-            },
-            "require": {
-                "doctrine/instantiator": "^1.0.5",
-                "php": "^7.1",
-                "phpunit/php-text-template": "^1.2.1",
-                "sebastian/exporter": "^3.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^7.0"
-            },
-            "suggest": {
-                "ext-soap": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "6.1-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Mock Object library for PHPUnit",
-            "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/",
-            "keywords": [
-                "mock",
-                "xunit"
-            ],
-            "time": "2018-04-11T04:50:36+00:00"
-        },
-        {
-            "name": "sebastian/code-unit-reverse-lookup",
-            "version": "1.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/code-unit-reverse-lookup.git",
-                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/code-unit-reverse-lookup/zipball/4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
-                "reference": "4419fcdb5eabb9caa61a27c7a1db532a6b55dd18",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.6 || ^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^5.7 || ^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Looks up which function or method a line of code belongs to",
-            "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
-            "time": "2017-03-04T06:30:41+00:00"
-        },
-        {
-            "name": "sebastian/comparator",
-            "version": "3.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/comparator.git",
-                "reference": "ed5fd2281113729f1ebcc64d101ad66028aeb3d5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/ed5fd2281113729f1ebcc64d101ad66028aeb3d5",
-                "reference": "ed5fd2281113729f1ebcc64d101ad66028aeb3d5",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1",
-                "sebastian/diff": "^3.0",
-                "sebastian/exporter": "^3.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^7.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides the functionality to compare PHP values for equality",
-            "homepage": "https://github.com/sebastianbergmann/comparator",
-            "keywords": [
-                "comparator",
-                "compare",
-                "equality"
-            ],
-            "time": "2018-04-18T13:33:00+00:00"
-        },
-        {
-            "name": "sebastian/diff",
-            "version": "3.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/diff.git",
-                "reference": "e09160918c66281713f1c324c1f4c4c3037ba1e8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/e09160918c66281713f1c324c1f4c4c3037ba1e8",
-                "reference": "e09160918c66281713f1c324c1f4c4c3037ba1e8",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.1"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^7.0",
-                "symfony/process": "^2 || ^3.3 || ^4"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Kore Nordmann",
-                    "email": "mail@kore-nordmann.de"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Diff implementation",
-            "homepage": "https://github.com/sebastianbergmann/diff",
-            "keywords": [
-                "diff",
-                "udiff",
-                "unidiff",
-                "unified diff"
-            ],
-            "time": "2018-02-01T13:45:15+00:00"
-        },
-        {
-            "name": "sebastian/environment",
-            "version": "3.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/environment.git",
-                "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/cd0871b3975fb7fc44d11314fd1ee20925fce4f5",
-                "reference": "cd0871b3975fb7fc44d11314fd1ee20925fce4f5",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.1.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides functionality to handle HHVM/PHP environments",
-            "homepage": "http://www.github.com/sebastianbergmann/environment",
-            "keywords": [
-                "Xdebug",
-                "environment",
-                "hhvm"
-            ],
-            "time": "2017-07-01T08:51:00+00:00"
-        },
-        {
-            "name": "sebastian/exporter",
-            "version": "3.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/exporter.git",
-                "reference": "234199f4528de6d12aaa58b612e98f7d36adb937"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/234199f4528de6d12aaa58b612e98f7d36adb937",
-                "reference": "234199f4528de6d12aaa58b612e98f7d36adb937",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0",
-                "sebastian/recursion-context": "^3.0"
-            },
-            "require-dev": {
-                "ext-mbstring": "*",
-                "phpunit/phpunit": "^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.1.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Volker Dusch",
-                    "email": "github@wallbash.com"
-                },
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@2bepublished.at"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides the functionality to export PHP variables for visualization",
-            "homepage": "http://www.github.com/sebastianbergmann/exporter",
-            "keywords": [
-                "export",
-                "exporter"
-            ],
-            "time": "2017-04-03T13:19:02+00:00"
-        },
-        {
-            "name": "sebastian/global-state",
-            "version": "2.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/global-state.git",
-                "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",
-                "reference": "e8ba02eed7bbbb9e59e43dedd3dddeff4a56b0c4",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.0"
-            },
-            "suggest": {
-                "ext-uopz": "*"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Snapshotting of global state",
-            "homepage": "http://www.github.com/sebastianbergmann/global-state",
-            "keywords": [
-                "global state"
-            ],
-            "time": "2017-04-27T15:39:26+00:00"
-        },
-        {
-            "name": "sebastian/object-enumerator",
-            "version": "3.0.3",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/object-enumerator.git",
-                "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-enumerator/zipball/7cfd9e65d11ffb5af41198476395774d4c8a84c5",
-                "reference": "7cfd9e65d11ffb5af41198476395774d4c8a84c5",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0",
-                "sebastian/object-reflector": "^1.1.1",
-                "sebastian/recursion-context": "^3.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Traverses array structures and object graphs to enumerate all referenced objects",
-            "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
-            "time": "2017-08-03T12:35:26+00:00"
-        },
-        {
-            "name": "sebastian/object-reflector",
-            "version": "1.1.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/object-reflector.git",
-                "reference": "773f97c67f28de00d397be301821b06708fca0be"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/object-reflector/zipball/773f97c67f28de00d397be301821b06708fca0be",
-                "reference": "773f97c67f28de00d397be301821b06708fca0be",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.1-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Allows reflection of object attributes, including inherited and non-public ones",
-            "homepage": "https://github.com/sebastianbergmann/object-reflector/",
-            "time": "2017-03-29T09:07:27+00:00"
-        },
-        {
-            "name": "sebastian/recursion-context",
-            "version": "3.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/recursion-context.git",
-                "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8",
-                "reference": "5b0cd723502bac3b006cbf3dbf7a1e3fcefe4fa8",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "3.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Jeff Welch",
-                    "email": "whatthejeff@gmail.com"
-                },
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                },
-                {
-                    "name": "Adam Harvey",
-                    "email": "aharvey@php.net"
-                }
-            ],
-            "description": "Provides functionality to recursively process PHP variables",
-            "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
-            "time": "2017-03-03T06:23:57+00:00"
-        },
-        {
-            "name": "sebastian/resource-operations",
-            "version": "1.0.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/resource-operations.git",
-                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/resource-operations/zipball/ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
-                "reference": "ce990bb21759f94aeafd30209e8cfcdfa8bc3f52",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.6.0"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de"
-                }
-            ],
-            "description": "Provides a list of PHP built-in functions that operate on resources",
-            "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
-            "time": "2015-07-28T20:34:47+00:00"
-        },
-        {
-            "name": "sebastian/version",
-            "version": "2.0.1",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/sebastianbergmann/version.git",
-                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/99732be0ddb3361e16ad77b68ba41efc8e979019",
-                "reference": "99732be0ddb3361e16ad77b68ba41efc8e979019",
-                "shasum": ""
-            },
-            "require": {
-                "php": ">=5.6"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "2.0.x-dev"
-                }
-            },
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Sebastian Bergmann",
-                    "email": "sebastian@phpunit.de",
-                    "role": "lead"
-                }
-            ],
-            "description": "Library that helps with managing the version number of Git-hosted PHP projects",
-            "homepage": "https://github.com/sebastianbergmann/version",
-            "time": "2016-10-03T07:35:21+00:00"
-        },
-        {
-            "name": "theseer/tokenizer",
-            "version": "1.1.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/theseer/tokenizer.git",
-                "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/theseer/tokenizer/zipball/cb2f008f3f05af2893a87208fe6a6c4985483f8b",
-                "reference": "cb2f008f3f05af2893a87208fe6a6c4985483f8b",
-                "shasum": ""
-            },
-            "require": {
-                "ext-dom": "*",
-                "ext-tokenizer": "*",
-                "ext-xmlwriter": "*",
-                "php": "^7.0"
-            },
-            "type": "library",
-            "autoload": {
-                "classmap": [
-                    "src/"
-                ]
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "BSD-3-Clause"
-            ],
-            "authors": [
-                {
-                    "name": "Arne Blankerts",
-                    "email": "arne@blankerts.de",
-                    "role": "Developer"
-                }
-            ],
-            "description": "A small library for converting tokenized PHP source code into XML and potentially other formats",
-            "time": "2017-04-07T12:08:54+00:00"
-        },
-        {
-            "name": "webmozart/assert",
-            "version": "1.3.0",
-            "source": {
-                "type": "git",
-                "url": "https://github.com/webmozart/assert.git",
-                "reference": "0df1908962e7a3071564e857d86874dad1ef204a"
-            },
-            "dist": {
-                "type": "zip",
-                "url": "https://api.github.com/repos/webmozart/assert/zipball/0df1908962e7a3071564e857d86874dad1ef204a",
-                "reference": "0df1908962e7a3071564e857d86874dad1ef204a",
-                "shasum": ""
-            },
-            "require": {
-                "php": "^5.3.3 || ^7.0"
-            },
-            "require-dev": {
-                "phpunit/phpunit": "^4.6",
-                "sebastian/version": "^1.0.1"
-            },
-            "type": "library",
-            "extra": {
-                "branch-alias": {
-                    "dev-master": "1.3-dev"
-                }
-            },
-            "autoload": {
-                "psr-4": {
-                    "Webmozart\\Assert\\": "src/"
-                }
-            },
-            "notification-url": "https://packagist.org/downloads/",
-            "license": [
-                "MIT"
-            ],
-            "authors": [
-                {
-                    "name": "Bernhard Schussek",
-                    "email": "bschussek@gmail.com"
-                }
-            ],
-            "description": "Assertions to validate method input/output with nice error messages.",
-            "keywords": [
-                "assert",
-                "check",
-                "validate"
-            ],
-            "time": "2018-01-29T19:49:41+00:00"
-        }
-    ],
-    "aliases": [],
-    "minimum-stability": "dev",
-    "stability-flags": {
-        "chill-project/person": 20
-    },
-    "prefer-stable": true,
-    "prefer-lowest": false,
-    "platform": {
-        "php": "~7.2"
-    },
-    "platform-dev": []
-}
diff --git a/src/Bundle/ChillThirdPartyBundle/.gitignore b/src/Bundle/ChillThirdPartyBundle/.gitignore
deleted file mode 100644
index f443cb81e..000000000
--- a/src/Bundle/ChillThirdPartyBundle/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-composer.lock
-vendor/*
-parameters.yml
-*~
-*.DS_Store
-*.sass-cache
-Resources/node_modules/
-Tests/Fixtures/App/app/config/parameters.yml
-/nbproject/private/
-Resources/test/Fixtures/App/bootstrap.php.cache
-
diff --git a/src/Bundle/ChillThirdPartyBundle/.gitlab-ci.yml b/src/Bundle/ChillThirdPartyBundle/.gitlab-ci.yml
deleted file mode 100644
index cfbaa42e3..000000000
--- a/src/Bundle/ChillThirdPartyBundle/.gitlab-ci.yml
+++ /dev/null
@@ -1,64 +0,0 @@
-.test_definition: &test_definition
-   services:
-       - chill/database:latest
-   before_script:
-       - if [ -z ${GITHUB_TOKEN+x} ]; then composer config github-oauth.github.com $GITHUB_TOKEN; fi
-       - php -d memory_limit=-1 /usr/local/bin/composer install --no-interaction
-       - cp  Resources/test/Fixtures/App/app/config/parameters.gitlab-ci.yml Resources/test/Fixtures/App/app/config/parameters.yml
-       - php Resources/test/Fixtures/App/app/console --env=test cache:warmup
-       - php Resources/test/Fixtures/App/app/console doctrine:migrations:migrate --env=test --no-interaction
-       - php Resources/test/Fixtures/App/app/console doctrine:fixtures:load --env=test --no-interaction
-
-stages:
-   - deploy
-   - test
-   - build-doc
-   - deploy-doc
-
-test:php-7.2:
-   image: chill/ci-image:php-7.2
-   stage: test
-   <<: *test_definition
-   script: APP_ENV=test php vendor/bin/phpunit
-
-deploy-packagist:
-   stage: deploy
-   image: chill/ci-image:php-7.2
-   before_script:
-       # test that PACKAGIST USERNAME and PACKAGIST_TOKEN variable are set
-       - if [ -z ${PACKAGIST_USERNAME+x} ]; then echo "Please set PACKAGIST_USERNAME variable"; exit -1;  fi
-       - if [ -z ${PACKAGIST_TOKEN+x} ]; then echo "Please set PACKAGIST_TOKEN variable";  exit -1; fi
-   script:
-       - STATUSCODE=$(curl -XPOST -H'content-type:application/json' "https://packagist.org/api/update-package?username=$PACKAGIST_USERNAME&apiToken=$PACKAGIST_TOKEN" -d"{\"repository\":{\"url\":\"$CI_PROJECT_URL.git\"}}" --silent --output /dev/stderr --write-out "%{http_code}")
-       - if [ $STATUSCODE = "202" ]; then exit 0; else exit $STATUSCODE; fi
-
-# deploy documentation
-api-doc-build:
-   stage: build-doc
-   environment: api-doc
-   image: chill/ci-image:php-7.2
-   before_script:
-      - mkdir api-doc
-   script: apigen generate --destination api-doc/$CI_BUILD_REF_NAME/$CI_PROJECT_NAME
-   artifacts:
-      paths:
-         - "api-doc/"
-      name: api
-      expire_in: '2h'
-   only:
-      - master
-      - tags
-
-api-doc-deploy:
-   stage: deploy-doc
-   image: pallet/swiftclient:latest
-   before_script:
-        # test that CONTAINER_API variable is set
-        - if [ -z ${CONTAINER_API+x} ]; then echo "Please set CONTAINER_API variable"; exit -1;  fi
-        # go to api-doc to have and url with PROJECT/BUILD
-        - cd api-doc
-        # upload, and keep files during 1 year
-   script: "swift upload --header \"X-Delete-After: 31536000\"  $CONTAINER_API $CI_BUILD_REF_NAME/$CI_PROJECT_NAME"
-   only:
-      - master
-      - tags
diff --git a/src/Bundle/ChillThirdPartyBundle/CHANGELOG.md b/src/Bundle/ChillThirdPartyBundle/CHANGELOG.md
deleted file mode 100644
index 5653415df..000000000
--- a/src/Bundle/ChillThirdPartyBundle/CHANGELOG.md
+++ /dev/null
@@ -1,8 +0,0 @@
-
-branch master
-=============
-
-* initial commit 
-* add a render template for entity ThirdParty ;
-* remove dump messages ;
-
diff --git a/src/Bundle/ChillThirdPartyBundle/LICENSE b/src/Bundle/ChillThirdPartyBundle/LICENSE
deleted file mode 100644
index ddfcbd34e..000000000
--- a/src/Bundle/ChillThirdPartyBundle/LICENSE
+++ /dev/null
@@ -1,661 +0,0 @@
-GNU AFFERO GENERAL PUBLIC LICENSE
-   Version 3, 19 November 2007
-
-Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
-Everyone is permitted to copy and distribute verbatim copies
-of this license document, but changing it is not allowed.
-
-        Preamble
-
-The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-The precise terms and conditions for copying, distribution and
-modification follow.
-
-   TERMS AND CONDITIONS
-
-0. Definitions.
-
-"This License" refers to version 3 of the GNU Affero General Public License.
-
-"Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-"The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-1. Source Code.
-
-The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-The Corresponding Source for a work in source code form is that
-same work.
-
-2. Basic Permissions.
-
-All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-4. Conveying Verbatim Copies.
-
-You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-5. Conveying Modified Source Versions.
-
-You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-a) The work must carry prominent notices stating that you modified
-it, and giving a relevant date.
-
-b) The work must carry prominent notices stating that it is
-released under this License and any conditions added under section
-7.  This requirement modifies the requirement in section 4 to
-"keep intact all notices".
-
-c) You must license the entire work, as a whole, under this
-License to anyone who comes into possession of a copy.  This
-License will therefore apply, along with any applicable section 7
-additional terms, to the whole of the work, and all its parts,
-regardless of how they are packaged.  This License gives no
-permission to license the work in any other way, but it does not
-invalidate such permission if you have separately received it.
-
-d) If the work has interactive user interfaces, each must display
-Appropriate Legal Notices; however, if the Program has interactive
-interfaces that do not display Appropriate Legal Notices, your
-work need not make them do so.
-
-A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-6. Conveying Non-Source Forms.
-
-You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-a) Convey the object code in, or embodied in, a physical product
-(including a physical distribution medium), accompanied by the
-Corresponding Source fixed on a durable physical medium
-customarily used for software interchange.
-
-b) Convey the object code in, or embodied in, a physical product
-(including a physical distribution medium), accompanied by a
-written offer, valid for at least three years and valid for as
-long as you offer spare parts or customer support for that product
-model, to give anyone who possesses the object code either (1) a
-copy of the Corresponding Source for all the software in the
-product that is covered by this License, on a durable physical
-medium customarily used for software interchange, for a price no
-more than your reasonable cost of physically performing this
-conveying of source, or (2) access to copy the
-Corresponding Source from a network server at no charge.
-
-c) Convey individual copies of the object code with a copy of the
-written offer to provide the Corresponding Source.  This
-alternative is allowed only occasionally and noncommercially, and
-only if you received the object code with such an offer, in accord
-with subsection 6b.
-
-d) Convey the object code by offering access from a designated
-place (gratis or for a charge), and offer equivalent access to the
-Corresponding Source in the same way through the same place at no
-further charge.  You need not require recipients to copy the
-Corresponding Source along with the object code.  If the place to
-copy the object code is a network server, the Corresponding Source
-may be on a different server (operated by you or a third party)
-that supports equivalent copying facilities, provided you maintain
-clear directions next to the object code saying where to find the
-Corresponding Source.  Regardless of what server hosts the
-Corresponding Source, you remain obligated to ensure that it is
-available for as long as needed to satisfy these requirements.
-
-e) Convey the object code using peer-to-peer transmission, provided
-you inform other peers where the object code and Corresponding
-Source of the work are being offered to the general public at no
-charge under subsection 6d.
-
-A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-"Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-7. Additional Terms.
-
-"Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-a) Disclaiming warranty or limiting liability differently from the
-terms of sections 15 and 16 of this License; or
-
-b) Requiring preservation of specified reasonable legal notices or
-author attributions in that material or in the Appropriate Legal
-Notices displayed by works containing it; or
-
-c) Prohibiting misrepresentation of the origin of that material, or
-requiring that modified versions of such material be marked in
-reasonable ways as different from the original version; or
-
-d) Limiting the use for publicity purposes of names of licensors or
-authors of the material; or
-
-e) Declining to grant rights under trademark law for use of some
-trade names, trademarks, or service marks; or
-
-f) Requiring indemnification of licensors and authors of that
-material by anyone who conveys the material (or modified versions of
-it) with contractual assumptions of liability to the recipient, for
-any liability that these contractual assumptions directly impose on
-those licensors and authors.
-
-All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-8. Termination.
-
-You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-9. Acceptance Not Required for Having Copies.
-
-You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-10. Automatic Licensing of Downstream Recipients.
-
-Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-11. Patents.
-
-A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-12. No Surrender of Others' Freedom.
-
-If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-13. Remote Network Interaction; Use with the GNU General Public License.
-
-Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-14. Revised Versions of this License.
-
-The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-15. Disclaimer of Warranty.
-
-THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-16. Limitation of Liability.
-
-IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-17. Interpretation of Sections 15 and 16.
-
-If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-END OF TERMS AND CONDITIONS
-
-How to Apply These Terms to Your New Programs
-
-If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-<one line to give the program's name and a brief idea of what it does.>
-Copyright (C) <year>  <name of author>
-
-This program is free software: you can redistribute it and/or modify
-it under the terms of the GNU Affero General Public License as published by
-the Free Software Foundation, either version 3 of the License, or
-(at your option) any later version.
-
-This program is distributed in the hope that it will be useful,
-but WITHOUT ANY WARRANTY; without even the implied warranty of
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-GNU Affero General Public License for more details.
-
-You should have received a copy of the GNU Affero General Public License
-along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<http://www.gnu.org/licenses/>.
diff --git a/src/Bundle/ChillThirdPartyBundle/composer.json b/src/Bundle/ChillThirdPartyBundle/composer.json
deleted file mode 100644
index d54112504..000000000
--- a/src/Bundle/ChillThirdPartyBundle/composer.json
+++ /dev/null
@@ -1,39 +0,0 @@
-{
-    "name": "chill-project/third-party",
-    "license": "AGPL-3.0",
-    "type": "symfony-bundle",
-    "description": "A bundle to manage Third Party contact categories",
-    "keywords" : ["chill", "social work", "contacts"],
-    "homepage" : "https://framagit.org/Chill-project/Chill-ThirdParty",
-    "autoload": {
-        "psr-4": { "Chill\\ThirdPartyBundle\\": "" }
-    },
-    "autoload-dev": {
-        "classmap": [ "Resources/test/Fixtures/App/app/AppKernel.php" ]
-    },
-    "authors" : [
-        {
-            "name": "Champs-Libres",
-            "email": "info@champs-libres.coop",
-            "homepage": "http://www.champs-libres.coop"
-        }
-    ],
-    "require": {
-    },
-    "require-dev": {
-    },
-    "scripts": {
-        "post-install-cmd": [
-            "ComposerBundleMigration\\Composer\\Migrations::synchronizeMigrations",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap"
-        ],
-        "post-update-cmd": [
-            "ComposerBundleMigration\\Composer\\Migrations::synchronizeMigrations",
-            "Sensio\\Bundle\\DistributionBundle\\Composer\\ScriptHandler::buildBootstrap"
-        ]
-    },
-    "extra": {
-        "app-migrations-dir": "Resources/test/Fixtures/App/app/DoctrineMigrations",
-        "symfony-app-dir": "Tests/Fixtures/App/"
-    }
-}
diff --git a/src/Bundle/ChillWopiBundle/.editorconfig b/src/Bundle/ChillWopiBundle/.editorconfig
deleted file mode 100644
index d769b46a4..000000000
--- a/src/Bundle/ChillWopiBundle/.editorconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-; top-most EditorConfig file
-root = true
-
-; Unix-style newlines
-[*]
-charset = utf-8
-end_of_line = LF
-insert_final_newline = true
-trim_trailing_whitespace = true
-
-[*.{php,html,twig}]
-indent_style = space
-indent_size = 4
-
-[*.md]
-max_line_length = 80
-
-[COMMIT_EDITMSG]
-max_line_length = 0
diff --git a/src/Bundle/ChillWopiBundle/.gitignore b/src/Bundle/ChillWopiBundle/.gitignore
deleted file mode 100644
index f443cb81e..000000000
--- a/src/Bundle/ChillWopiBundle/.gitignore
+++ /dev/null
@@ -1,11 +0,0 @@
-composer.lock
-vendor/*
-parameters.yml
-*~
-*.DS_Store
-*.sass-cache
-Resources/node_modules/
-Tests/Fixtures/App/app/config/parameters.yml
-/nbproject/private/
-Resources/test/Fixtures/App/bootstrap.php.cache
-
diff --git a/src/Bundle/ChillWopiBundle/LICENSE b/src/Bundle/ChillWopiBundle/LICENSE
deleted file mode 100644
index be3f7b28e..000000000
--- a/src/Bundle/ChillWopiBundle/LICENSE
+++ /dev/null
@@ -1,661 +0,0 @@
-                    GNU AFFERO GENERAL PUBLIC LICENSE
-                       Version 3, 19 November 2007
-
- Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
-
-                            Preamble
-
-  The GNU Affero General Public License is a free, copyleft license for
-software and other kinds of works, specifically designed to ensure
-cooperation with the community in the case of network server software.
-
-  The licenses for most software and other practical works are designed
-to take away your freedom to share and change the works.  By contrast,
-our General Public Licenses are intended to guarantee your freedom to
-share and change all versions of a program--to make sure it remains free
-software for all its users.
-
-  When we speak of free software, we are referring to freedom, not
-price.  Our General Public Licenses are designed to make sure that you
-have the freedom to distribute copies of free software (and charge for
-them if you wish), that you receive source code or can get it if you
-want it, that you can change the software or use pieces of it in new
-free programs, and that you know you can do these things.
-
-  Developers that use our General Public Licenses protect your rights
-with two steps: (1) assert copyright on the software, and (2) offer
-you this License which gives you legal permission to copy, distribute
-and/or modify the software.
-
-  A secondary benefit of defending all users' freedom is that
-improvements made in alternate versions of the program, if they
-receive widespread use, become available for other developers to
-incorporate.  Many developers of free software are heartened and
-encouraged by the resulting cooperation.  However, in the case of
-software used on network servers, this result may fail to come about.
-The GNU General Public License permits making a modified version and
-letting the public access it on a server without ever releasing its
-source code to the public.
-
-  The GNU Affero General Public License is designed specifically to
-ensure that, in such cases, the modified source code becomes available
-to the community.  It requires the operator of a network server to
-provide the source code of the modified version running there to the
-users of that server.  Therefore, public use of a modified version, on
-a publicly accessible server, gives the public access to the source
-code of the modified version.
-
-  An older license, called the Affero General Public License and
-published by Affero, was designed to accomplish similar goals.  This is
-a different license, not a version of the Affero GPL, but Affero has
-released a new version of the Affero GPL which permits relicensing under
-this license.
-
-  The precise terms and conditions for copying, distribution and
-modification follow.
-
-                       TERMS AND CONDITIONS
-
-  0. Definitions.
-
-  "This License" refers to version 3 of the GNU Affero General Public License.
-
-  "Copyright" also means copyright-like laws that apply to other kinds of
-works, such as semiconductor masks.
-
-  "The Program" refers to any copyrightable work licensed under this
-License.  Each licensee is addressed as "you".  "Licensees" and
-"recipients" may be individuals or organizations.
-
-  To "modify" a work means to copy from or adapt all or part of the work
-in a fashion requiring copyright permission, other than the making of an
-exact copy.  The resulting work is called a "modified version" of the
-earlier work or a work "based on" the earlier work.
-
-  A "covered work" means either the unmodified Program or a work based
-on the Program.
-
-  To "propagate" a work means to do anything with it that, without
-permission, would make you directly or secondarily liable for
-infringement under applicable copyright law, except executing it on a
-computer or modifying a private copy.  Propagation includes copying,
-distribution (with or without modification), making available to the
-public, and in some countries other activities as well.
-
-  To "convey" a work means any kind of propagation that enables other
-parties to make or receive copies.  Mere interaction with a user through
-a computer network, with no transfer of a copy, is not conveying.
-
-  An interactive user interface displays "Appropriate Legal Notices"
-to the extent that it includes a convenient and prominently visible
-feature that (1) displays an appropriate copyright notice, and (2)
-tells the user that there is no warranty for the work (except to the
-extent that warranties are provided), that licensees may convey the
-work under this License, and how to view a copy of this License.  If
-the interface presents a list of user commands or options, such as a
-menu, a prominent item in the list meets this criterion.
-
-  1. Source Code.
-
-  The "source code" for a work means the preferred form of the work
-for making modifications to it.  "Object code" means any non-source
-form of a work.
-
-  A "Standard Interface" means an interface that either is an official
-standard defined by a recognized standards body, or, in the case of
-interfaces specified for a particular programming language, one that
-is widely used among developers working in that language.
-
-  The "System Libraries" of an executable work include anything, other
-than the work as a whole, that (a) is included in the normal form of
-packaging a Major Component, but which is not part of that Major
-Component, and (b) serves only to enable use of the work with that
-Major Component, or to implement a Standard Interface for which an
-implementation is available to the public in source code form.  A
-"Major Component", in this context, means a major essential component
-(kernel, window system, and so on) of the specific operating system
-(if any) on which the executable work runs, or a compiler used to
-produce the work, or an object code interpreter used to run it.
-
-  The "Corresponding Source" for a work in object code form means all
-the source code needed to generate, install, and (for an executable
-work) run the object code and to modify the work, including scripts to
-control those activities.  However, it does not include the work's
-System Libraries, or general-purpose tools or generally available free
-programs which are used unmodified in performing those activities but
-which are not part of the work.  For example, Corresponding Source
-includes interface definition files associated with source files for
-the work, and the source code for shared libraries and dynamically
-linked subprograms that the work is specifically designed to require,
-such as by intimate data communication or control flow between those
-subprograms and other parts of the work.
-
-  The Corresponding Source need not include anything that users
-can regenerate automatically from other parts of the Corresponding
-Source.
-
-  The Corresponding Source for a work in source code form is that
-same work.
-
-  2. Basic Permissions.
-
-  All rights granted under this License are granted for the term of
-copyright on the Program, and are irrevocable provided the stated
-conditions are met.  This License explicitly affirms your unlimited
-permission to run the unmodified Program.  The output from running a
-covered work is covered by this License only if the output, given its
-content, constitutes a covered work.  This License acknowledges your
-rights of fair use or other equivalent, as provided by copyright law.
-
-  You may make, run and propagate covered works that you do not
-convey, without conditions so long as your license otherwise remains
-in force.  You may convey covered works to others for the sole purpose
-of having them make modifications exclusively for you, or provide you
-with facilities for running those works, provided that you comply with
-the terms of this License in conveying all material for which you do
-not control copyright.  Those thus making or running the covered works
-for you must do so exclusively on your behalf, under your direction
-and control, on terms that prohibit them from making any copies of
-your copyrighted material outside their relationship with you.
-
-  Conveying under any other circumstances is permitted solely under
-the conditions stated below.  Sublicensing is not allowed; section 10
-makes it unnecessary.
-
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
-
-  No covered work shall be deemed part of an effective technological
-measure under any applicable law fulfilling obligations under article
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
-similar laws prohibiting or restricting circumvention of such
-measures.
-
-  When you convey a covered work, you waive any legal power to forbid
-circumvention of technological measures to the extent such circumvention
-is effected by exercising rights under this License with respect to
-the covered work, and you disclaim any intention to limit operation or
-modification of the work as a means of enforcing, against the work's
-users, your or third parties' legal rights to forbid circumvention of
-technological measures.
-
-  4. Conveying Verbatim Copies.
-
-  You may convey verbatim copies of the Program's source code as you
-receive it, in any medium, provided that you conspicuously and
-appropriately publish on each copy an appropriate copyright notice;
-keep intact all notices stating that this License and any
-non-permissive terms added in accord with section 7 apply to the code;
-keep intact all notices of the absence of any warranty; and give all
-recipients a copy of this License along with the Program.
-
-  You may charge any price or no price for each copy that you convey,
-and you may offer support or warranty protection for a fee.
-
-  5. Conveying Modified Source Versions.
-
-  You may convey a work based on the Program, or the modifications to
-produce it from the Program, in the form of source code under the
-terms of section 4, provided that you also meet all of these conditions:
-
-    a) The work must carry prominent notices stating that you modified
-    it, and giving a relevant date.
-
-    b) The work must carry prominent notices stating that it is
-    released under this License and any conditions added under section
-    7.  This requirement modifies the requirement in section 4 to
-    "keep intact all notices".
-
-    c) You must license the entire work, as a whole, under this
-    License to anyone who comes into possession of a copy.  This
-    License will therefore apply, along with any applicable section 7
-    additional terms, to the whole of the work, and all its parts,
-    regardless of how they are packaged.  This License gives no
-    permission to license the work in any other way, but it does not
-    invalidate such permission if you have separately received it.
-
-    d) If the work has interactive user interfaces, each must display
-    Appropriate Legal Notices; however, if the Program has interactive
-    interfaces that do not display Appropriate Legal Notices, your
-    work need not make them do so.
-
-  A compilation of a covered work with other separate and independent
-works, which are not by their nature extensions of the covered work,
-and which are not combined with it such as to form a larger program,
-in or on a volume of a storage or distribution medium, is called an
-"aggregate" if the compilation and its resulting copyright are not
-used to limit the access or legal rights of the compilation's users
-beyond what the individual works permit.  Inclusion of a covered work
-in an aggregate does not cause this License to apply to the other
-parts of the aggregate.
-
-  6. Conveying Non-Source Forms.
-
-  You may convey a covered work in object code form under the terms
-of sections 4 and 5, provided that you also convey the
-machine-readable Corresponding Source under the terms of this License,
-in one of these ways:
-
-    a) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by the
-    Corresponding Source fixed on a durable physical medium
-    customarily used for software interchange.
-
-    b) Convey the object code in, or embodied in, a physical product
-    (including a physical distribution medium), accompanied by a
-    written offer, valid for at least three years and valid for as
-    long as you offer spare parts or customer support for that product
-    model, to give anyone who possesses the object code either (1) a
-    copy of the Corresponding Source for all the software in the
-    product that is covered by this License, on a durable physical
-    medium customarily used for software interchange, for a price no
-    more than your reasonable cost of physically performing this
-    conveying of source, or (2) access to copy the
-    Corresponding Source from a network server at no charge.
-
-    c) Convey individual copies of the object code with a copy of the
-    written offer to provide the Corresponding Source.  This
-    alternative is allowed only occasionally and noncommercially, and
-    only if you received the object code with such an offer, in accord
-    with subsection 6b.
-
-    d) Convey the object code by offering access from a designated
-    place (gratis or for a charge), and offer equivalent access to the
-    Corresponding Source in the same way through the same place at no
-    further charge.  You need not require recipients to copy the
-    Corresponding Source along with the object code.  If the place to
-    copy the object code is a network server, the Corresponding Source
-    may be on a different server (operated by you or a third party)
-    that supports equivalent copying facilities, provided you maintain
-    clear directions next to the object code saying where to find the
-    Corresponding Source.  Regardless of what server hosts the
-    Corresponding Source, you remain obligated to ensure that it is
-    available for as long as needed to satisfy these requirements.
-
-    e) Convey the object code using peer-to-peer transmission, provided
-    you inform other peers where the object code and Corresponding
-    Source of the work are being offered to the general public at no
-    charge under subsection 6d.
-
-  A separable portion of the object code, whose source code is excluded
-from the Corresponding Source as a System Library, need not be
-included in conveying the object code work.
-
-  A "User Product" is either (1) a "consumer product", which means any
-tangible personal property which is normally used for personal, family,
-or household purposes, or (2) anything designed or sold for incorporation
-into a dwelling.  In determining whether a product is a consumer product,
-doubtful cases shall be resolved in favor of coverage.  For a particular
-product received by a particular user, "normally used" refers to a
-typical or common use of that class of product, regardless of the status
-of the particular user or of the way in which the particular user
-actually uses, or expects or is expected to use, the product.  A product
-is a consumer product regardless of whether the product has substantial
-commercial, industrial or non-consumer uses, unless such uses represent
-the only significant mode of use of the product.
-
-  "Installation Information" for a User Product means any methods,
-procedures, authorization keys, or other information required to install
-and execute modified versions of a covered work in that User Product from
-a modified version of its Corresponding Source.  The information must
-suffice to ensure that the continued functioning of the modified object
-code is in no case prevented or interfered with solely because
-modification has been made.
-
-  If you convey an object code work under this section in, or with, or
-specifically for use in, a User Product, and the conveying occurs as
-part of a transaction in which the right of possession and use of the
-User Product is transferred to the recipient in perpetuity or for a
-fixed term (regardless of how the transaction is characterized), the
-Corresponding Source conveyed under this section must be accompanied
-by the Installation Information.  But this requirement does not apply
-if neither you nor any third party retains the ability to install
-modified object code on the User Product (for example, the work has
-been installed in ROM).
-
-  The requirement to provide Installation Information does not include a
-requirement to continue to provide support service, warranty, or updates
-for a work that has been modified or installed by the recipient, or for
-the User Product in which it has been modified or installed.  Access to a
-network may be denied when the modification itself materially and
-adversely affects the operation of the network or violates the rules and
-protocols for communication across the network.
-
-  Corresponding Source conveyed, and Installation Information provided,
-in accord with this section must be in a format that is publicly
-documented (and with an implementation available to the public in
-source code form), and must require no special password or key for
-unpacking, reading or copying.
-
-  7. Additional Terms.
-
-  "Additional permissions" are terms that supplement the terms of this
-License by making exceptions from one or more of its conditions.
-Additional permissions that are applicable to the entire Program shall
-be treated as though they were included in this License, to the extent
-that they are valid under applicable law.  If additional permissions
-apply only to part of the Program, that part may be used separately
-under those permissions, but the entire Program remains governed by
-this License without regard to the additional permissions.
-
-  When you convey a copy of a covered work, you may at your option
-remove any additional permissions from that copy, or from any part of
-it.  (Additional permissions may be written to require their own
-removal in certain cases when you modify the work.)  You may place
-additional permissions on material, added by you to a covered work,
-for which you have or can give appropriate copyright permission.
-
-  Notwithstanding any other provision of this License, for material you
-add to a covered work, you may (if authorized by the copyright holders of
-that material) supplement the terms of this License with terms:
-
-    a) Disclaiming warranty or limiting liability differently from the
-    terms of sections 15 and 16 of this License; or
-
-    b) Requiring preservation of specified reasonable legal notices or
-    author attributions in that material or in the Appropriate Legal
-    Notices displayed by works containing it; or
-
-    c) Prohibiting misrepresentation of the origin of that material, or
-    requiring that modified versions of such material be marked in
-    reasonable ways as different from the original version; or
-
-    d) Limiting the use for publicity purposes of names of licensors or
-    authors of the material; or
-
-    e) Declining to grant rights under trademark law for use of some
-    trade names, trademarks, or service marks; or
-
-    f) Requiring indemnification of licensors and authors of that
-    material by anyone who conveys the material (or modified versions of
-    it) with contractual assumptions of liability to the recipient, for
-    any liability that these contractual assumptions directly impose on
-    those licensors and authors.
-
-  All other non-permissive additional terms are considered "further
-restrictions" within the meaning of section 10.  If the Program as you
-received it, or any part of it, contains a notice stating that it is
-governed by this License along with a term that is a further
-restriction, you may remove that term.  If a license document contains
-a further restriction but permits relicensing or conveying under this
-License, you may add to a covered work material governed by the terms
-of that license document, provided that the further restriction does
-not survive such relicensing or conveying.
-
-  If you add terms to a covered work in accord with this section, you
-must place, in the relevant source files, a statement of the
-additional terms that apply to those files, or a notice indicating
-where to find the applicable terms.
-
-  Additional terms, permissive or non-permissive, may be stated in the
-form of a separately written license, or stated as exceptions;
-the above requirements apply either way.
-
-  8. Termination.
-
-  You may not propagate or modify a covered work except as expressly
-provided under this License.  Any attempt otherwise to propagate or
-modify it is void, and will automatically terminate your rights under
-this License (including any patent licenses granted under the third
-paragraph of section 11).
-
-  However, if you cease all violation of this License, then your
-license from a particular copyright holder is reinstated (a)
-provisionally, unless and until the copyright holder explicitly and
-finally terminates your license, and (b) permanently, if the copyright
-holder fails to notify you of the violation by some reasonable means
-prior to 60 days after the cessation.
-
-  Moreover, your license from a particular copyright holder is
-reinstated permanently if the copyright holder notifies you of the
-violation by some reasonable means, this is the first time you have
-received notice of violation of this License (for any work) from that
-copyright holder, and you cure the violation prior to 30 days after
-your receipt of the notice.
-
-  Termination of your rights under this section does not terminate the
-licenses of parties who have received copies or rights from you under
-this License.  If your rights have been terminated and not permanently
-reinstated, you do not qualify to receive new licenses for the same
-material under section 10.
-
-  9. Acceptance Not Required for Having Copies.
-
-  You are not required to accept this License in order to receive or
-run a copy of the Program.  Ancillary propagation of a covered work
-occurring solely as a consequence of using peer-to-peer transmission
-to receive a copy likewise does not require acceptance.  However,
-nothing other than this License grants you permission to propagate or
-modify any covered work.  These actions infringe copyright if you do
-not accept this License.  Therefore, by modifying or propagating a
-covered work, you indicate your acceptance of this License to do so.
-
-  10. Automatic Licensing of Downstream Recipients.
-
-  Each time you convey a covered work, the recipient automatically
-receives a license from the original licensors, to run, modify and
-propagate that work, subject to this License.  You are not responsible
-for enforcing compliance by third parties with this License.
-
-  An "entity transaction" is a transaction transferring control of an
-organization, or substantially all assets of one, or subdividing an
-organization, or merging organizations.  If propagation of a covered
-work results from an entity transaction, each party to that
-transaction who receives a copy of the work also receives whatever
-licenses to the work the party's predecessor in interest had or could
-give under the previous paragraph, plus a right to possession of the
-Corresponding Source of the work from the predecessor in interest, if
-the predecessor has it or can get it with reasonable efforts.
-
-  You may not impose any further restrictions on the exercise of the
-rights granted or affirmed under this License.  For example, you may
-not impose a license fee, royalty, or other charge for exercise of
-rights granted under this License, and you may not initiate litigation
-(including a cross-claim or counterclaim in a lawsuit) alleging that
-any patent claim is infringed by making, using, selling, offering for
-sale, or importing the Program or any portion of it.
-
-  11. Patents.
-
-  A "contributor" is a copyright holder who authorizes use under this
-License of the Program or a work on which the Program is based.  The
-work thus licensed is called the contributor's "contributor version".
-
-  A contributor's "essential patent claims" are all patent claims
-owned or controlled by the contributor, whether already acquired or
-hereafter acquired, that would be infringed by some manner, permitted
-by this License, of making, using, or selling its contributor version,
-but do not include claims that would be infringed only as a
-consequence of further modification of the contributor version.  For
-purposes of this definition, "control" includes the right to grant
-patent sublicenses in a manner consistent with the requirements of
-this License.
-
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
-patent license under the contributor's essential patent claims, to
-make, use, sell, offer for sale, import and otherwise run, modify and
-propagate the contents of its contributor version.
-
-  In the following three paragraphs, a "patent license" is any express
-agreement or commitment, however denominated, not to enforce a patent
-(such as an express permission to practice a patent or covenant not to
-sue for patent infringement).  To "grant" such a patent license to a
-party means to make such an agreement or commitment not to enforce a
-patent against the party.
-
-  If you convey a covered work, knowingly relying on a patent license,
-and the Corresponding Source of the work is not available for anyone
-to copy, free of charge and under the terms of this License, through a
-publicly available network server or other readily accessible means,
-then you must either (1) cause the Corresponding Source to be so
-available, or (2) arrange to deprive yourself of the benefit of the
-patent license for this particular work, or (3) arrange, in a manner
-consistent with the requirements of this License, to extend the patent
-license to downstream recipients.  "Knowingly relying" means you have
-actual knowledge that, but for the patent license, your conveying the
-covered work in a country, or your recipient's use of the covered work
-in a country, would infringe one or more identifiable patents in that
-country that you have reason to believe are valid.
-
-  If, pursuant to or in connection with a single transaction or
-arrangement, you convey, or propagate by procuring conveyance of, a
-covered work, and grant a patent license to some of the parties
-receiving the covered work authorizing them to use, propagate, modify
-or convey a specific copy of the covered work, then the patent license
-you grant is automatically extended to all recipients of the covered
-work and works based on it.
-
-  A patent license is "discriminatory" if it does not include within
-the scope of its coverage, prohibits the exercise of, or is
-conditioned on the non-exercise of one or more of the rights that are
-specifically granted under this License.  You may not convey a covered
-work if you are a party to an arrangement with a third party that is
-in the business of distributing software, under which you make payment
-to the third party based on the extent of your activity of conveying
-the work, and under which the third party grants, to any of the
-parties who would receive the covered work from you, a discriminatory
-patent license (a) in connection with copies of the covered work
-conveyed by you (or copies made from those copies), or (b) primarily
-for and in connection with specific products or compilations that
-contain the covered work, unless you entered into that arrangement,
-or that patent license was granted, prior to 28 March 2007.
-
-  Nothing in this License shall be construed as excluding or limiting
-any implied license or other defenses to infringement that may
-otherwise be available to you under applicable patent law.
-
-  12. No Surrender of Others' Freedom.
-
-  If conditions are imposed on you (whether by court order, agreement or
-otherwise) that contradict the conditions of this License, they do not
-excuse you from the conditions of this License.  If you cannot convey a
-covered work so as to satisfy simultaneously your obligations under this
-License and any other pertinent obligations, then as a consequence you may
-not convey it at all.  For example, if you agree to terms that obligate you
-to collect a royalty for further conveying from those to whom you convey
-the Program, the only way you could satisfy both those terms and this
-License would be to refrain entirely from conveying the Program.
-
-  13. Remote Network Interaction; Use with the GNU General Public License.
-
-  Notwithstanding any other provision of this License, if you modify the
-Program, your modified version must prominently offer all users
-interacting with it remotely through a computer network (if your version
-supports such interaction) an opportunity to receive the Corresponding
-Source of your version by providing access to the Corresponding Source
-from a network server at no charge, through some standard or customary
-means of facilitating copying of software.  This Corresponding Source
-shall include the Corresponding Source for any work covered by version 3
-of the GNU General Public License that is incorporated pursuant to the
-following paragraph.
-
-  Notwithstanding any other provision of this License, you have
-permission to link or combine any covered work with a work licensed
-under version 3 of the GNU General Public License into a single
-combined work, and to convey the resulting work.  The terms of this
-License will continue to apply to the part which is the covered work,
-but the work with which it is combined will remain governed by version
-3 of the GNU General Public License.
-
-  14. Revised Versions of this License.
-
-  The Free Software Foundation may publish revised and/or new versions of
-the GNU Affero General Public License from time to time.  Such new versions
-will be similar in spirit to the present version, but may differ in detail to
-address new problems or concerns.
-
-  Each version is given a distinguishing version number.  If the
-Program specifies that a certain numbered version of the GNU Affero General
-Public License "or any later version" applies to it, you have the
-option of following the terms and conditions either of that numbered
-version or of any later version published by the Free Software
-Foundation.  If the Program does not specify a version number of the
-GNU Affero General Public License, you may choose any version ever published
-by the Free Software Foundation.
-
-  If the Program specifies that a proxy can decide which future
-versions of the GNU Affero General Public License can be used, that proxy's
-public statement of acceptance of a version permanently authorizes you
-to choose that version for the Program.
-
-  Later license versions may give you additional or different
-permissions.  However, no additional obligations are imposed on any
-author or copyright holder as a result of your choosing to follow a
-later version.
-
-  15. Disclaimer of Warranty.
-
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
-
-  16. Limitation of Liability.
-
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
-SUCH DAMAGES.
-
-  17. Interpretation of Sections 15 and 16.
-
-  If the disclaimer of warranty and limitation of liability provided
-above cannot be given local legal effect according to their terms,
-reviewing courts shall apply local law that most closely approximates
-an absolute waiver of all civil liability in connection with the
-Program, unless a warranty or assumption of liability accompanies a
-copy of the Program in return for a fee.
-
-                     END OF TERMS AND CONDITIONS
-
-            How to Apply These Terms to Your New Programs
-
-  If you develop a new program, and you want it to be of the greatest
-possible use to the public, the best way to achieve this is to make it
-free software which everyone can redistribute and change under these terms.
-
-  To do so, attach the following notices to the program.  It is safest
-to attach them to the start of each source file to most effectively
-state the exclusion of warranty; and each file should have at least
-the "copyright" line and a pointer to where the full notice is found.
-
-    <one line to give the program's name and a brief idea of what it does.>
-    Copyright (C) <year>  <name of author>
-
-    This program is free software: you can redistribute it and/or modify
-    it under the terms of the GNU Affero General Public License as published by
-    the Free Software Foundation, either version 3 of the License, or
-    (at your option) any later version.
-
-    This program is distributed in the hope that it will be useful,
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-    GNU Affero General Public License for more details.
-
-    You should have received a copy of the GNU Affero General Public License
-    along with this program.  If not, see <https://www.gnu.org/licenses/>.
-
-Also add information on how to contact you by electronic and paper mail.
-
-  If your software can interact with users remotely through a computer
-network, you should also make sure that it provides a way for users to
-get its source.  For example, if your program is a web application, its
-interface could display a "Source" link that leads users to an archive
-of the code.  There are many ways you could offer source, and different
-solutions will be better for different programs; see section 13 for the
-specific requirements.
-
-  You should also get your employer (if you work as a programmer) or school,
-if any, to sign a "copyright disclaimer" for the program, if necessary.
-For more information on this, and how to apply and follow the GNU AGPL, see
-<https://www.gnu.org/licenses/>.
diff --git a/src/Bundle/ChillWopiBundle/composer.json b/src/Bundle/ChillWopiBundle/composer.json
deleted file mode 100644
index 41737c8b1..000000000
--- a/src/Bundle/ChillWopiBundle/composer.json
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-    "name": "chill-project/chill-wopi-bundle",
-    "type": "symfony-bundle",
-    "description": "TODO",
-    "keywords": [
-        "chill",
-        "wopi"
-    ],
-    "homepage": "http://www.champs-libres.coop",
-    "license": "AGPL-3.0",
-    "authors": [
-        {
-            "name": "Champs-Libres",
-            "email": "info@champs-libres.coop",
-            "homepage": "http://www.champs-libres.coop"
-        }
-    ],
-    "require": {
-        "php": ">= 7.4",
-        "champs-libres/wopi-bundle": "dev-master",
-        "nyholm/psr7": "^1.4",
-        "symfony/mime": "^4 || ^5"
-    },
-    "autoload": {
-        "psr-4": {
-            "Chill\\WopiBundle\\": "src/"
-        }
-    }
-}
diff --git a/src/Bundle/ChillWopiBundle/grumphp.yml b/src/Bundle/ChillWopiBundle/grumphp.yml
deleted file mode 100644
index c6fe2e7f5..000000000
--- a/src/Bundle/ChillWopiBundle/grumphp.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-imports:
-  - { resource: vendor/drupol/php-conventions/config/php73/grumphp.yml }
-
-parameters:
-  tasks.license.holder: Champs-Libres
-  tasks.license.date_from: 2021
-  tasks.license.name: AGPL-3.0
-  extra_tasks:
-    phpunit: ~
diff --git a/src/Bundle/ChillWopiBundle/psalm.xml b/src/Bundle/ChillWopiBundle/psalm.xml
deleted file mode 100644
index 30258a709..000000000
--- a/src/Bundle/ChillWopiBundle/psalm.xml
+++ /dev/null
@@ -1,15 +0,0 @@
-<?xml version="1.0"?>
-<psalm
-    errorLevel="3"
-    resolveFromConfigFile="true"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xmlns="https://getpsalm.org/schema/config"
-    xsi:schemaLocation="https://getpsalm.org/schema/config vendor/vimeo/psalm/config.xsd"
->
-    <projectFiles>
-        <directory name="src" />
-        <ignoreFiles>
-            <directory name="vendor" />
-        </ignoreFiles>
-    </projectFiles>
-</psalm>
diff --git a/tests/Kernel.php b/tests/Kernel.php
deleted file mode 100644
index 2956c899b..000000000
--- a/tests/Kernel.php
+++ /dev/null
@@ -1,34 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace App;
-
-use Symfony\Bundle\FrameworkBundle\Kernel\MicroKernelTrait;
-use Symfony\Component\Config\Loader\LoaderInterface;
-use Symfony\Component\Config\Resource\FileResource;
-use Symfony\Component\DependencyInjection\ContainerBuilder;
-use Symfony\Component\HttpKernel\Kernel as BaseKernel;
-use Symfony\Component\Routing\RouteCollectionBuilder;
-
-class ernel extends BaseKernel
-{
-    use MicroKernelTrait;
-
-    private function getBundlesPath(): string
-    {
-        return $this->getConfigDir().'/bundles.php';
-    }
-
-    private function getConfigDir(): string
-    {
-        return $this->getProjectDir().'/tests/app/config';
-    }
-}
diff --git a/tests/app/config/packages/wopi.yaml b/tests/app/config/packages/wopi.yaml
deleted file mode 100644
index e02694625..000000000
--- a/tests/app/config/packages/wopi.yaml
+++ /dev/null
@@ -1,2 +0,0 @@
-wopi:
-    server: "%env(resolve:EDITOR_SERVER)%"
diff --git a/tests/app/config/packages/workflow_chill.yaml b/tests/app/config/packages/workflow_chill.yaml
deleted file mode 100644
index 82662461b..000000000
--- a/tests/app/config/packages/workflow_chill.yaml
+++ /dev/null
@@ -1,294 +0,0 @@
-framework:
-    workflows:
-        vendee_internal:
-            type: state_machine
-            metadata:
-                related_entity:
-                        - Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument
-                        - Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork
-                        - Chill\DocStoreBundle\Entity\AccompanyingCourseDocument
-                label:
-                    fr: 'Suivi'
-            support_strategy: Chill\MainBundle\Workflow\RelatedEntityWorkflowSupportsStrategy
-            initial_marking: 'initial'
-            marking_store:
-                property: step
-                type: method
-            places:
-                initial:
-                    metadata:
-                        label:
-                            fr: Étape initiale
-                attenteModification:
-                    metadata:
-                        label:
-                            fr: En attente de modification du document
-                        validationFilterInputLabels:
-                            forward: {fr: Modification effectuée}
-                            backward: {fr: Pas de modification effectuée}
-                            neutral: {fr: Autre}
-                attenteMiseEnForme:
-                    metadata:
-                        label:
-                            fr: En attente de mise en forme
-                        validationFilterInputLabels:
-                            forward: {fr: Mise en forme terminée}
-                            backward: {fr: Pas de mise en forme effectuée}
-                            neutral: {fr: Autre}
-                attenteVisa:
-                    metadata:
-                        label:
-                            fr: En attente de visa
-                        validationFilterInputLabels:
-                            forward: {fr: Visa accordé}
-                            backward: {fr: Visa refusé}
-                            neutral: {fr: Autre}
-                attenteSignature:
-                    metadata:
-                        label:
-                            fr: En attente de signature
-                        validationFilterInputLabels:
-                            forward: {fr: Signature accordée}
-                            backward: {fr: Signature refusée}
-                            neutral: {fr: Autre}
-                attenteTraitement:
-                    metadata:
-                        label:
-                            fr: En attente de traitement
-                        validationFilterInputLabels:
-                            forward: {fr: Traitement terminé favorablement}
-                            backward: {fr: Traitement terminé défavorablement}
-                            neutral: {fr: Autre}
-                attenteEnvoi:
-                    metadata:
-                        label:
-                            fr: En attente d'envoi
-                        validationFilterInputLabels:
-                            forward: {fr: Document envoyé}
-                            backward: {fr: Document non envoyé}
-                            neutral: {fr: Autre}
-                attenteValidationMiseEnForme:
-                    metadata:
-                        label:
-                            fr: En attente de validation de la mise en forme
-                        validationFilterInputLabels:
-                            forward: {fr: Validation de la mise en forme}
-                            backward: {fr: Refus de validation de la mise en forme}
-                            neutral: {fr: Autre}
-                annule:
-                    metadata:
-                        isFinal: true
-                        isFinalPositive: false
-                        label:
-                            fr: Annulé
-                final:
-                    metadata:
-                        isFinal: true
-                        isFinalPositive: true
-                        label:
-                            fr: Finalisé
-            transitions:
-                # transition qui avancent
-                demandeModificationDocument:
-                    from:
-                        - initial
-                    to: attenteModification
-                    metadata:
-                        label:
-                            fr: Demande de modification du document
-                        isForward: true
-                demandeMiseEnForme:
-                    from:
-                        - initial
-                        - attenteModification
-                    to: attenteMiseEnForme
-                    metadata:
-                        label:
-                            fr: Demande de mise en forme
-                        isForward: true
-                demandeValidationMiseEnForme:
-                    from:
-                        - attenteMiseEnForme
-                    to: attenteValidationMiseEnForme
-                    metadata:
-                        label:
-                            fr: Demande de validation de la mise en forme
-                        isForward: true
-                demandeVisa:
-                    from:
-                        - initial
-                        - attenteModification
-                        - attenteMiseEnForme
-                        - attenteValidationMiseEnForme
-                    to: attenteVisa
-                    metadata:
-                        label:
-                            fr: Demande de visa
-                        isForward: true
-                demandeSignature:
-                    from:
-                        - initial
-                        - attenteModification
-                        - attenteMiseEnForme
-                        - attenteValidationMiseEnForme
-                        - attenteVisa
-                    to: attenteSignature
-                    metadata:
-                        label: {fr: Demande de signature}
-                        isForward: true
-                demandeTraitement:
-                    from:
-                        - initial
-                        - attenteModification
-                        - attenteMiseEnForme
-                        - attenteValidationMiseEnForme
-                        - attenteVisa
-                        - attenteSignature
-                    to: attenteTraitement
-                    metadata:
-                        label: {fr: Demande de traitement}
-                        isForward: true
-                demandeEnvoi:
-                    from:
-                        - initial
-                        - attenteModification
-                        - attenteMiseEnForme
-                        - attenteValidationMiseEnForme
-                        - attenteVisa
-                        - attenteSignature
-                        - attenteTraitement
-                    to: attenteEnvoi
-                    metadata:
-                        label: {fr: Demande d'envoi}
-                        isForward: true
-                annulation:
-                    from:
-                        - initial
-                        - attenteModification
-                        - attenteMiseEnForme
-                        - attenteValidationMiseEnForme
-                        - attenteVisa
-                        - attenteSignature
-                        - attenteTraitement
-                        - attenteEnvoi
-                    to: annule
-                    metadata:
-                        label: {fr: Annulation}
-                        isForward: false
-                # transitions qui répètent l'étape
-                demandeMiseEnFormeSupplementaire:
-                    from:
-                        - attenteMiseEnForme
-                        - attenteValidationMiseEnForme
-                    to: attenteMiseEnForme
-                    metadata:
-                        label: {fr: Demande de mise en forme supplémentaire}
-                demandeVisaSupplementaire:
-                    from:
-                        - attenteVisa
-                    to: attenteVisa
-                    metadata:
-                        label: {fr: Demande de visa supplémentaire}
-                        isForward: true
-                demandeSignatureSupplementaire:
-                    from:
-                        - attenteSignature
-                    to: attenteSignature
-                    metadata:
-                        label: {fr: Demande de signature supplémentaire}
-                demandeTraitementSupplementaire:
-                    from:
-                        - attenteTraitement
-                    to: attenteTraitement
-                    metadata:
-                        label: {fr: Demande de traitement supplémentaire}
-                # transitions qui renvoient vers une étape précédente
-                refusEtModificationDocument:
-                    from:
-                        - attenteVisa
-                        - attenteSignature
-                        - attenteTraitement
-                        - attenteEnvoi
-                    to: attenteModification
-                    metadata:
-                        label:
-                            fr: Refus et demande de modification du document
-                        isForward: false
-                refusEtDemandeMiseEnForme:
-                    from:
-                        - attenteVisa
-                        - attenteSignature
-                        - attenteTraitement
-                        - attenteEnvoi
-                    to: attenteMiseEnForme
-                    metadata:
-                        label: {fr: Refus et demande de mise en forme}
-                        isForward: false
-                refusEtDemandeVisa:
-                    from:
-                        - attenteSignature
-                        - attenteTraitement
-                        - attenteEnvoi
-                    to: attenteVisa
-                    metadata:
-                        label: {fr: Refus et demande de visa}
-                        isForward: false
-                refusEtDemandeSignature:
-                    from:
-                        - attenteTraitement
-                        - attenteEnvoi
-                    to: attenteSignature
-                    metadata:
-                        label: {fr: Refus et demande de signature}
-                        isForward: false
-                refusEtDemandeTraitement:
-                    from:
-                        - attenteEnvoi
-                    to: attenteTraitement
-                    metadata:
-                        label: {fr: Refus et demande de traitement}
-                        isForward: false
-                # transition vers final
-                initialToFinal:
-                    from:
-                        - initial
-                    to: final
-                    metadata:
-                        label: {fr: Clotûre immédiate et cloture positive}
-                        isForward: true
-                attenteMiseEnFormeToFinal:
-                    from:
-                        - attenteMiseEnForme
-                        - attenteValidationMiseEnForme
-                    to: final
-                    metadata:
-                        label: {fr: Mise en forme terminée et cloture positive}
-                        isForward: true
-                attenteVisaToFinal:
-                    from:
-                        - attenteVisa
-                    to: final
-                    metadata:
-                        label: {fr: Accorde le visa et cloture positive}
-                        isForward: true
-                attenteSignatureToFinal:
-                    from:
-                        - attenteSignature
-                    to: final
-                    metadata:
-                        label: {fr: Accorde la signature et cloture positive}
-                        isForward: true
-                attenteTraitementToFinal:
-                    from:
-                        - attenteTraitement
-                    to: final
-                    metadata:
-                        label: {fr: Traitement terminé et cloture postive}
-                        isForward: true
-                attenteEnvoiToFinal:
-                    from:
-                        - attenteEnvoi
-                    to: final
-                    metadata:
-                        label: {fr: Envoyé et cloture postive}
-                        isForward: true

From 440a7837ac3d73f51c3821cce907876b0d4827c1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 2 Jun 2025 11:45:58 +0200
Subject: [PATCH 115/283] clean phpstan baseline

---
 phpstan-baseline-2024-05.neon                 |   14 -
 ...an-baseline-deprecations-doctrine-orm.neon |   58 -
 phpstan-baseline-level-2.neon                 |  301 --
 phpstan-baseline-level-3.neon                 |  804 ---
 phpstan-baseline-level-4.neon                 | 4793 -----------------
 phpstan-baseline-level-5.neon                 |  676 ---
 phpstan-baseline.neon                         | 4588 +++++++++++++++-
 phpstan-critical.neon                         |    6 -
 phpstan-deprecations-sf54.neon                |  153 -
 phpstan-deprecations.neon                     |   91 -
 phpstan-types.neon                            |  387 --
 phpstan.dist.neon                             |   10 -
 12 files changed, 4549 insertions(+), 7332 deletions(-)
 delete mode 100644 phpstan-baseline-2024-05.neon
 delete mode 100644 phpstan-baseline-deprecations-doctrine-orm.neon
 delete mode 100644 phpstan-baseline-level-2.neon
 delete mode 100644 phpstan-baseline-level-3.neon
 delete mode 100644 phpstan-baseline-level-4.neon
 delete mode 100644 phpstan-baseline-level-5.neon
 delete mode 100644 phpstan-critical.neon
 delete mode 100644 phpstan-deprecations-sf54.neon
 delete mode 100644 phpstan-deprecations.neon
 delete mode 100644 phpstan-types.neon

diff --git a/phpstan-baseline-2024-05.neon b/phpstan-baseline-2024-05.neon
deleted file mode 100644
index 12cb03856..000000000
--- a/phpstan-baseline-2024-05.neon
+++ /dev/null
@@ -1,14 +0,0 @@
-parameters:
-	ignoreErrors:
-		-
-			message: "#^Parameter \\#1 \\$records of method League\\\\Csv\\\\Writer\\:\\:insertAll\\(\\) expects iterable\\<array\\<float\\|int\\|string\\|Stringable\\|null\\>\\>, iterable\\<array\\<string, bool\\|int\\|string\\>\\> given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/UserExportController.php
-
-		-
-			message: """
-				#^Fetching deprecated class constant ASC of class Doctrine\\\\Common\\\\Collections\\\\Criteria\\:
-				use Order\\:\\:Ascending instead$#
-			"""
-			count: 1
-			path: src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
diff --git a/phpstan-baseline-deprecations-doctrine-orm.neon b/phpstan-baseline-deprecations-doctrine-orm.neon
deleted file mode 100644
index 824c0371f..000000000
--- a/phpstan-baseline-deprecations-doctrine-orm.neon
+++ /dev/null
@@ -1,58 +0,0 @@
-# See https://github.com/doctrine/orm/issues/11313 for a follow-up
-parameters:
-	ignoreErrors:
-		-
-			message: """
-				#^Fetching deprecated class constant ASC of class Doctrine\\\\Common\\\\Collections\\\\Criteria\\:
-				use Order\\:\\:Ascending instead$#
-			"""
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php
-
-		-
-			message: """
-				#^Fetching deprecated class constant ASC of class Doctrine\\\\Common\\\\Collections\\\\Criteria\\:
-				use Order\\:\\:Ascending instead$#
-			"""
-			count: 1
-			path: src/Bundle/ChillMainBundle/Entity/Notification.php
-
-		-
-			message: """
-				#^Fetching deprecated class constant DESC of class Doctrine\\\\Common\\\\Collections\\\\Criteria\\:
-				use Order\\:\\:Descending instead$#
-			"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
-
-		-
-			message: """
-				#^Fetching deprecated class constant DESC of class Doctrine\\\\Common\\\\Collections\\\\Criteria\\:
-				use Order\\:\\:Descending instead$#
-			"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
-
-		-
-			message: """
-				#^Fetching deprecated class constant DESC of class Doctrine\\\\Common\\\\Collections\\\\Criteria\\:
-				use Order\\:\\:Descending instead$#
-			"""
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Entity/Household/Household.php
-
-		-
-			message: """
-				#^Fetching deprecated class constant DESC of class Doctrine\\\\Common\\\\Collections\\\\Criteria\\:
-				use Order\\:\\:Descending instead$#
-			"""
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Entity/Person.php
-
-		-
-			message: """
-				#^Fetching deprecated class constant DESC of class Doctrine\\\\Common\\\\Collections\\\\Criteria\\:
-				use Order\\:\\:Descending instead$#
-			"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
diff --git a/phpstan-baseline-level-2.neon b/phpstan-baseline-level-2.neon
deleted file mode 100644
index 6f7cec495..000000000
--- a/phpstan-baseline-level-2.neon
+++ /dev/null
@@ -1,301 +0,0 @@
-parameters:
-	ignoreErrors:
-		-
-			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\ActivityBundle\\\\Entity\\\\Activity\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Controller/ActivityController.php
-
-		-
-			message: "#^Only booleans are allowed in a ternary operator condition, Chill\\\\MainBundle\\\\Entity\\\\Scope\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Controller/ActivityController.php
-
-		-
-			message: "#^Only booleans are allowed in a ternary operator condition, Chill\\\\PersonBundle\\\\Entity\\\\Person\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Controller/ActivityController.php
-
-		-
-			message: "#^Only booleans are allowed in a ternary operator condition, DateTime\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Controller/ActivityController.php
-
-		-
-			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\ActivityBundle\\\\Entity\\\\ActivityReasonCategory\\|null given\\.$#"
-			count: 3
-			path: src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php
-
-		-
-			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\ActivityBundle\\\\Entity\\\\ActivityReason\\|null given\\.$#"
-			count: 2
-			path: src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php
-
-		-
-			message: "#^Call to method DateTime\\:\\:setTimezone\\(\\) with incorrect case\\: setTimeZone$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Form/ActivityType.php
-
-		-
-			message: "#^Only booleans are allowed in &&, Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\|null given on the right side\\.$#"
-			count: 2
-			path: src/Bundle/ChillActivityBundle/Form/ActivityType.php
-
-		-
-			message: "#^Only booleans are allowed in an if condition, Chill\\\\AsideActivityBundle\\\\Entity\\\\AsideActivityCategory\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivityCategory.php
-
-		-
-			message: "#^Call to method DateTimeImmutable\\:\\:setTimezone\\(\\) with incorrect case\\: setTimeZone$#"
-			count: 1
-			path: src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
-
-		-
-			message: "#^Only booleans are allowed in a ternary operator condition, Chill\\\\MainBundle\\\\Entity\\\\Location\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
-
-		-
-			message: "#^Only booleans are allowed in an if condition, Symfony\\\\Component\\\\Validator\\\\ConstraintViolationListInterface given\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php
-
-		-
-			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomFieldsGroup\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php
-
-		-
-			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomField\\|null given\\.$#"
-			count: 3
-			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php
-
-		-
-			message: "#^Only booleans are allowed in a ternary operator condition, Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomFieldsGroup given\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php
-
-		-
-			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomFieldsGroup\\|null given\\.$#"
-			count: 4
-			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
-
-		-
-			message: "#^Only booleans are allowed in a ternary operator condition, string given\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php
-
-		-
-			message: "#^Only booleans are allowed in a negated boolean, string given\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/CustomFieldsGroupToIdTransformer.php
-
-		-
-			message: "#^Call to method Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:getFirstName\\(\\) with incorrect case\\: getFirstname$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Controller/EventController.php
-
-		-
-			message: "#^Call to method Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:getLastName\\(\\) with incorrect case\\: getLastname$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Controller/EventController.php
-
-		-
-			message: "#^Call to method Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:getMobilenumber\\(\\) with incorrect case\\: getMobileNumber$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Controller/EventController.php
-
-		-
-			message: "#^Call to method Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:getPhonenumber\\(\\) with incorrect case\\: getPhoneNumber$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Controller/EventController.php
-
-		-
-			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\EventBundle\\\\Entity\\\\Event given\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Controller/EventController.php
-
-		-
-			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\EventBundle\\\\Entity\\\\Event\\|null given\\.$#"
-			count: 3
-			path: src/Bundle/ChillEventBundle/Controller/EventController.php
-
-		-
-			message: "#^Only booleans are allowed in a ternary operator condition, int given\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Controller/EventController.php
-
-		-
-			message: "#^Only numeric types are allowed in pre\\-increment, string given\\.$#"
-			count: 2
-			path: src/Bundle/ChillEventBundle/Controller/EventController.php
-
-		-
-			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\EventBundle\\\\Entity\\\\EventType\\|null given\\.$#"
-			count: 4
-			path: src/Bundle/ChillEventBundle/Controller/EventTypeController.php
-
-		-
-			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\EventBundle\\\\Entity\\\\Participation\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Controller/ParticipationController.php
-
-		-
-			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\EventBundle\\\\Entity\\\\Role\\|null given\\.$#"
-			count: 4
-			path: src/Bundle/ChillEventBundle/Controller/RoleController.php
-
-		-
-			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\EventBundle\\\\Entity\\\\Status\\|null given\\.$#"
-			count: 4
-			path: src/Bundle/ChillEventBundle/Controller/StatusController.php
-
-		-
-			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\MainBundle\\\\Entity\\\\Language\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Command/LoadAndUpdateLanguagesCommand.php
-
-		-
-			message: "#^Only booleans are allowed in an if condition, Chill\\\\MainBundle\\\\Entity\\\\Language\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Command/LoadAndUpdateLanguagesCommand.php
-
-		-
-			message: "#^Only booleans are allowed in an if condition, int given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
-
-		-
-			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\MainBundle\\\\Entity\\\\Center\\|null given\\.$#"
-			count: 3
-			path: src/Bundle/ChillMainBundle/Controller/CenterController.php
-
-		-
-			message: "#^Call to method Redis\\:\\:setex\\(\\) with incorrect case\\: setEx$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Controller/ExportController.php
-
-		-
-			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\MainBundle\\\\Entity\\\\PermissionsGroup\\|null given\\.$#"
-			count: 5
-			path: src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php
-
-		-
-			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\MainBundle\\\\Entity\\\\RoleScope\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php
-
-		-
-			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\MainBundle\\\\Entity\\\\Scope\\|null given\\.$#"
-			count: 3
-			path: src/Bundle/ChillMainBundle/Controller/ScopeController.php
-
-		-
-			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\MainBundle\\\\Entity\\\\GroupCenter\\|null given\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Controller/UserController.php
-
-		-
-			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\MainBundle\\\\Entity\\\\User\\|null given\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Controller/UserController.php
-
-		-
-			message: "#^Only booleans are allowed in an if condition, int given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPostalCodes.php
-
-		-
-			message: "#^Only numeric types are allowed in pre\\-increment, string given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php
-
-		-
-			message: "#^Only booleans are allowed in an if condition, int given\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Form/DataTransformer/IdToEntityDataTransformer.php
-
-		-
-			message: "#^Only booleans are allowed in a ternary operator condition, string\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/Type/PickUserLocationType.php
-
-		-
-			message: "#^Only booleans are allowed in a ternary operator condition, int\\<0, max\\> given\\.$#"
-			count: 4
-			path: src/Bundle/ChillMainBundle/Search/SearchApiQuery.php
-
-		-
-			message: "#^Call to method Chill\\\\MainBundle\\\\Entity\\\\Address\\:\\:getPostcode\\(\\) with incorrect case\\: getPostCode$#"
-			count: 6
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
-
-		-
-			message: "#^Only booleans are allowed in an if condition, Symfony\\\\Component\\\\Serializer\\\\Mapping\\\\ClassDiscriminatorMapping\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/DoctrineExistingEntityNormalizer.php
-
-		-
-			message: "#^Only booleans are allowed in a negated boolean, null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/Person.php
-
-		-
-			message: "#^Only booleans are allowed in a ternary operator condition, Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriodParticipation\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/Person.php
-
-		-
-			message: "#^Call to method Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:getFirstName\\(\\) with incorrect case\\: getFirstname$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php
-
-		-
-			message: "#^Call to method Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:getLastName\\(\\) with incorrect case\\: getLastname$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php
-
-		-
-			message: "#^Only booleans are allowed in an if condition, int\\<0, max\\> given\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Search/SimilarPersonMatcher.php
-
-		-
-			message: "#^Only booleans are allowed in &&, null given on the left side\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
-
-		-
-			message: "#^Only booleans are allowed in a ternary operator condition, Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\Household\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
-
-		-
-			message: "#^Only booleans are allowed in a ternary operator condition, array\\<Chill\\\\PersonBundle\\\\Entity\\\\Person\\\\ResidentialAddress\\> given\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
-
-		-
-			message: "#^Call to method Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:getDeathdate\\(\\) with incorrect case\\: getDeathDate$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php
-
-		-
-			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\PersonBundle\\\\Entity\\\\Person\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
-
-		-
-			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\ReportBundle\\\\Entity\\\\Report given\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
-
-		-
-			message: "#^Call to method Chill\\\\ThirdPartyBundle\\\\Entity\\\\ThirdParty\\:\\:setFirstname\\(\\) with incorrect case\\: setFirstName$#"
-			count: 1
-			path: src/Bundle/ChillThirdPartyBundle/EventListener/ThirdPartyEventListener.php
-
-		-
-			message: "#^Dynamic call to static method Chill\\\\ThirdPartyBundle\\\\ThirdPartyType\\\\ThirdPartyTypeProviderInterface\\:\\:getKey\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillThirdPartyBundle/ThirdPartyType/ThirdPartyTypeManager.php
diff --git a/phpstan-baseline-level-3.neon b/phpstan-baseline-level-3.neon
deleted file mode 100644
index b7091f4ad..000000000
--- a/phpstan-baseline-level-3.neon
+++ /dev/null
@@ -1,804 +0,0 @@
-parameters:
-	ignoreErrors:
-		-
-			message: "#^Return type \\(array\\<Chill\\\\ActivityBundle\\\\Entity\\\\Activity\\>\\) of method Chill\\\\ActivityBundle\\\\Repository\\\\ActivityACLAwareRepository\\:\\:findByPerson\\(\\) should be covariant with return type \\(array\\<Chill\\\\ActivityBundle\\\\Repository\\\\Activity\\>\\) of method Chill\\\\ActivityBundle\\\\Repository\\\\ActivityACLAwareRepositoryInterface\\:\\:findByPerson\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
-
-		-
-			message: "#^Return type \\(array\\<Chill\\\\ActivityBundle\\\\Entity\\\\ActivityReason\\>\\) of method Chill\\\\ActivityBundle\\\\Repository\\\\ActivityReasonRepository\\:\\:findAll\\(\\) should be covariant with return type \\(array\\<int, object\\>\\) of method Doctrine\\\\ORM\\\\EntityRepository\\<object\\>\\:\\:findAll\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Repository/ActivityReasonRepository.php
-
-		-
-			message: "#^Return type \\(array\\<array\\<string\\>\\>\\) of method Chill\\\\AsideActivityBundle\\\\Security\\\\AsideActivityVoter\\:\\:getRolesWithHierarchy\\(\\) should be covariant with return type \\(array\\<string, array\\<int, string\\>\\>\\) of method Chill\\\\MainBundle\\\\Security\\\\ProvideRoleHierarchyInterface\\:\\:getRolesWithHierarchy\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillAsideActivityBundle/src/Security/AsideActivityVoter.php
-
-		-
-			message: "#^Parameter \\#1 \\$criteria \\(array\\<string, mixed\\>\\) of method Chill\\\\CalendarBundle\\\\Repository\\\\CalendarDocRepository\\:\\:findBy\\(\\) should be contravariant with parameter \\$criteria \\(array\\) of method Chill\\\\CalendarBundle\\\\Repository\\\\CalendarDocRepositoryInterface\\:\\:findBy\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/Repository/CalendarDocRepository.php
-
-		-
-			message: "#^Parameter \\#1 \\$criteria \\(array\\<string, mixed\\>\\) of method Chill\\\\CalendarBundle\\\\Repository\\\\CalendarDocRepository\\:\\:findOneBy\\(\\) should be contravariant with parameter \\$criteria \\(array\\) of method Chill\\\\CalendarBundle\\\\Repository\\\\CalendarDocRepositoryInterface\\:\\:findOneBy\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/Repository/CalendarDocRepository.php
-
-		-
-			message: "#^Parameter \\#2 \\$orderBy \\(array\\<string, 'ASC'\\|'asc'\\|'DESC'\\|'desc'\\>\\|null\\) of method Chill\\\\CalendarBundle\\\\Repository\\\\CalendarDocRepository\\:\\:findBy\\(\\) should be contravariant with parameter \\$orderBy \\(array\\|null\\) of method Chill\\\\CalendarBundle\\\\Repository\\\\CalendarDocRepositoryInterface\\:\\:findBy\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/Repository/CalendarDocRepository.php
-
-		-
-			message: "#^Return type \\(array\\<object\\>\\) of method Chill\\\\CalendarBundle\\\\Repository\\\\CalendarDocRepository\\:\\:findAll\\(\\) should be covariant with return type \\(array\\<Chill\\\\CalendarBundle\\\\Entity\\\\CalendarDoc\\>\\) of method Chill\\\\CalendarBundle\\\\Repository\\\\CalendarDocRepositoryInterface\\:\\:findAll\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/Repository/CalendarDocRepository.php
-
-		-
-			message: "#^Return type \\(array\\<object\\>\\) of method Chill\\\\CalendarBundle\\\\Repository\\\\CalendarDocRepository\\:\\:findBy\\(\\) should be covariant with return type \\(array\\<Chill\\\\CalendarBundle\\\\Entity\\\\CalendarDoc\\>\\) of method Chill\\\\CalendarBundle\\\\Repository\\\\CalendarDocRepositoryInterface\\:\\:findBy\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/Repository/CalendarDocRepository.php
-
-		-
-			message: "#^Parameter \\#2 \\$subject \\(Chill\\\\CalendarBundle\\\\Entity\\\\CalendarDoc\\) of method Chill\\\\CalendarBundle\\\\Security\\\\Voter\\\\CalendarDocVoter\\:\\:voteOnAttribute\\(\\) should be contravariant with parameter \\$subject \\(mixed\\) of method Symfony\\\\Component\\\\Security\\\\Core\\\\Authorization\\\\Voter\\\\Voter\\:\\:voteOnAttribute\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/Security/Voter/CalendarDocVoter.php
-
-		-
-			message: "#^Parameter \\#2 \\$subject \\(Chill\\\\CalendarBundle\\\\Entity\\\\Invite\\) of method Chill\\\\CalendarBundle\\\\Security\\\\Voter\\\\InviteVoter\\:\\:voteOnAttribute\\(\\) should be contravariant with parameter \\$subject \\(mixed\\) of method Symfony\\\\Component\\\\Security\\\\Core\\\\Authorization\\\\Voter\\\\Voter\\:\\:voteOnAttribute\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/Security/Voter/InviteVoter.php
-
-
-		-
-			message: "#^Return type \\(int\\|void\\|null\\) of method Chill\\\\CustomFieldsBundle\\\\Command\\\\CreateFieldsOnGroupCommand\\:\\:execute\\(\\) should be covariant with return type \\(int\\) of method Symfony\\\\Component\\\\Console\\\\Command\\\\Command\\:\\:execute\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php
-
-		-
-			message: "#^Parameter \\#1 \\$customFieldsGroup \\(Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomFieldsGroup\\|null\\) of method Chill\\\\CustomFieldsBundle\\\\Form\\\\DataTransformer\\\\CustomFieldsGroupToIdTransformer\\:\\:transform\\(\\) should be contravariant with parameter \\$value \\(mixed\\) of method Symfony\\\\Component\\\\Form\\\\DataTransformerInterface\\:\\:transform\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/CustomFieldsGroupToIdTransformer.php
-
-		-
-			message: "#^Parameter \\#1 \\$id \\(string\\) of method Chill\\\\CustomFieldsBundle\\\\Form\\\\DataTransformer\\\\CustomFieldsGroupToIdTransformer\\:\\:reverseTransform\\(\\) should be contravariant with parameter \\$value \\(mixed\\) of method Symfony\\\\Component\\\\Form\\\\DataTransformerInterface\\:\\:reverseTransform\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/CustomFieldsGroupToIdTransformer.php
-
-		-
-			message: "#^Parameter \\#2 \\$query \\(Doctrine\\\\ORM\\\\QueryBuilder\\) of method Chill\\\\DocGeneratorBundle\\\\Controller\\\\AdminDocGeneratorTemplateController\\:\\:orderQuery\\(\\) should be contravariant with parameter \\$query \\(mixed\\) of method Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\CRUDController\\:\\:orderQuery\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php
-
-		-
-			message: "#^Parameter \\#1 \\$object \\(Doctrine\\\\Common\\\\Collections\\\\Collection\\) of method Chill\\\\DocGeneratorBundle\\\\Serializer\\\\Normalizer\\\\CollectionDocGenNormalizer\\:\\:normalize\\(\\) should be contravariant with parameter \\$object \\(mixed\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:normalize\\(\\)$#"
-			count: 2
-			path: src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/CollectionDocGenNormalizer.php
-
-		-
-			message: "#^Parameter \\#2 \\$format \\(string\\) of method Chill\\\\DocGeneratorBundle\\\\Serializer\\\\Normalizer\\\\CollectionDocGenNormalizer\\:\\:supportsNormalization\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\ContextAwareNormalizerInterface\\:\\:supportsNormalization\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/CollectionDocGenNormalizer.php
-
-		-
-			message: "#^Parameter \\#2 \\$format \\(string\\) of method Chill\\\\DocGeneratorBundle\\\\Serializer\\\\Normalizer\\\\CollectionDocGenNormalizer\\:\\:supportsNormalization\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:supportsNormalization\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/CollectionDocGenNormalizer.php
-
-		-
-			message: "#^Return type \\(array\\|ArrayObject\\|bool\\|float\\|int\\|string\\|void\\|null\\) of method Chill\\\\DocGeneratorBundle\\\\Serializer\\\\Normalizer\\\\CollectionDocGenNormalizer\\:\\:normalize\\(\\) should be covariant with return type \\(array\\|ArrayObject\\|bool\\|float\\|int\\|string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:normalize\\(\\)$#"
-			count: 2
-			path: src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/CollectionDocGenNormalizer.php
-
-		-
-			message: "#^Parameter \\#2 \\$format \\(string\\) of method Chill\\\\DocGeneratorBundle\\\\Serializer\\\\Normalizer\\\\DocGenObjectNormalizer\\:\\:normalize\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:normalize\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/DocGenObjectNormalizer.php
-
-		-
-			message: "#^Parameter \\#2 \\$format \\(string\\) of method Chill\\\\DocGeneratorBundle\\\\Serializer\\\\Normalizer\\\\DocGenObjectNormalizer\\:\\:supportsNormalization\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:supportsNormalization\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/DocGenObjectNormalizer.php
-
-		-
-			message: "#^Return type \\(Chill\\\\MainBundle\\\\Entity\\\\Scope\\|null\\) of method Chill\\\\DocStoreBundle\\\\Entity\\\\PersonDocument\\:\\:getScope\\(\\) should be covariant with return type \\(Chill\\\\MainBundle\\\\Entity\\\\Scope\\) of method Chill\\\\MainBundle\\\\Entity\\\\HasScopeInterface\\:\\:getScope\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillDocStoreBundle/Entity/PersonDocument.php
-
-		-
-			message: "#^Parameter \\#2 \\$subject \\(Chill\\\\DocStoreBundle\\\\Entity\\\\PersonDocument\\) of method Chill\\\\DocStoreBundle\\\\Security\\\\Authorization\\\\PersonDocumentVoter\\:\\:voteOnAttribute\\(\\) should be contravariant with parameter \\$subject \\(mixed\\) of method Symfony\\\\Component\\\\Security\\\\Core\\\\Authorization\\\\Voter\\\\Voter\\:\\:voteOnAttribute\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillDocStoreBundle/Security/Authorization/PersonDocumentVoter.php
-
-		-
-			message: "#^Parameter \\#3 \\$format \\(string\\) of method Chill\\\\DocStoreBundle\\\\Serializer\\\\Normalizer\\\\StoredObjectDenormalizer\\:\\:denormalize\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\DenormalizerInterface\\:\\:denormalize\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillDocStoreBundle/Serializer/Normalizer/StoredObjectDenormalizer.php
-
-		-
-			message: "#^Parameter \\#3 \\$format \\(string\\) of method Chill\\\\DocStoreBundle\\\\Serializer\\\\Normalizer\\\\StoredObjectDenormalizer\\:\\:supportsDenormalization\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\DenormalizerInterface\\:\\:supportsDenormalization\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillDocStoreBundle/Serializer/Normalizer/StoredObjectDenormalizer.php
-
-		-
-			message: "#^Parameter \\#1 \\$object \\(Chill\\\\DocStoreBundle\\\\Entity\\\\AccompanyingCourseDocument\\) of method Chill\\\\DocStoreBundle\\\\Workflow\\\\AccompanyingCourseDocumentWorkflowHandler\\:\\:getRelatedObjects\\(\\) should be contravariant with parameter \\$object \\(object\\) of method Chill\\\\MainBundle\\\\Workflow\\\\EntityWorkflowHandlerInterface\\:\\:getRelatedObjects\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillDocStoreBundle/Workflow/AccompanyingCourseDocumentWorkflowHandler.php
-
-		-
-			message: "#^Parameter \\#1 \\$value \\(null\\) of method Chill\\\\EventBundle\\\\Form\\\\ChoiceLoader\\\\EventChoiceLoader\\:\\:loadChoiceList\\(\\) should be contravariant with parameter \\$value \\(\\(callable\\(\\)\\: mixed\\)\\|null\\) of method Symfony\\\\Component\\\\Form\\\\ChoiceList\\\\Loader\\\\ChoiceLoaderInterface\\:\\:loadChoiceList\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php
-
-		-
-			message: "#^Parameter \\#2 \\$value \\(null\\) of method Chill\\\\EventBundle\\\\Form\\\\ChoiceLoader\\\\EventChoiceLoader\\:\\:loadChoicesForValues\\(\\) should be contravariant with parameter \\$value \\(\\(callable\\(\\)\\: mixed\\)\\|null\\) of method Symfony\\\\Component\\\\Form\\\\ChoiceList\\\\Loader\\\\ChoiceLoaderInterface\\:\\:loadChoicesForValues\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php
-
-		-
-			message: "#^Parameter \\#2 \\$value \\(null\\) of method Chill\\\\EventBundle\\\\Form\\\\ChoiceLoader\\\\EventChoiceLoader\\:\\:loadValuesForChoices\\(\\) should be contravariant with parameter \\$value \\(\\(callable\\(\\)\\: mixed\\)\\|null\\) of method Symfony\\\\Component\\\\Form\\\\ChoiceList\\\\Loader\\\\ChoiceLoaderInterface\\:\\:loadValuesForChoices\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php
-
-		-
-			message: "#^Parameter \\#2 \\$subject \\(Chill\\\\EventBundle\\\\Entity\\\\Event\\) of method Chill\\\\EventBundle\\\\Security\\\\Authorization\\\\EventVoter\\:\\:voteOnAttribute\\(\\) should be contravariant with parameter \\$subject \\(mixed\\) of method Symfony\\\\Component\\\\Security\\\\Core\\\\Authorization\\\\Voter\\\\Voter\\:\\:voteOnAttribute\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Security/Authorization/EventVoter.php
-
-		-
-			message: "#^Parameter \\#2 \\$subject \\(Chill\\\\EventBundle\\\\Entity\\\\Participation\\) of method Chill\\\\EventBundle\\\\Security\\\\Authorization\\\\ParticipationVoter\\:\\:voteOnAttribute\\(\\) should be contravariant with parameter \\$subject \\(mixed\\) of method Symfony\\\\Component\\\\Security\\\\Core\\\\Authorization\\\\Voter\\\\Voter\\:\\:voteOnAttribute\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Security/Authorization/ParticipationVoter.php
-
-		-
-			message: "#^Parameter \\#1 \\$entity \\(Chill\\\\EventBundle\\\\Entity\\\\Event\\) of method Chill\\\\EventBundle\\\\Timeline\\\\TimelineEventProvider\\:\\:getEntityTemplate\\(\\) should be contravariant with parameter \\$entity \\(Chill\\\\MainBundle\\\\Timeline\\\\type\\) of method Chill\\\\MainBundle\\\\Timeline\\\\TimelineProviderInterface\\:\\:getEntityTemplate\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Timeline/TimelineEventProvider.php
-
-		-
-			message: "#^Parameter \\#2 \\$type \\(null\\) of method Chill\\\\MainBundle\\\\CRUD\\\\Routing\\\\CRUDRoutesLoader\\:\\:supports\\(\\) should be contravariant with parameter \\$type \\(string\\|null\\) of method Symfony\\\\Component\\\\Config\\\\Loader\\\\LoaderInterface\\:\\:supports\\(\\)$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/CRUD/Routing/CRUDRoutesLoader.php
-
-		-
-			message: "#^Parameter \\#2 \\$query \\(Doctrine\\\\ORM\\\\QueryBuilder\\) of method Chill\\\\MainBundle\\\\Controller\\\\LocationApiController\\:\\:orderQuery\\(\\) should be contravariant with parameter \\$query \\(mixed\\) of method Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\AbstractCRUDController\\:\\:orderQuery\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/LocationApiController.php
-
-		-
-			message: "#^Parameter \\#3 \\$query \\(Doctrine\\\\ORM\\\\QueryBuilder\\) of method Chill\\\\MainBundle\\\\Controller\\\\UserApiController\\:\\:customizeQuery\\(\\) should be contravariant with parameter \\$query \\(mixed\\) of method Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\AbstractCRUDController\\:\\:customizeQuery\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/UserApiController.php
-
-		-
-			message: "#^Return type \\(object\\|null\\) of method Chill\\\\MainBundle\\\\DependencyInjection\\\\ChillMainExtension\\:\\:getConfiguration\\(\\) should be covariant with return type \\(Symfony\\\\Component\\\\Config\\\\Definition\\\\ConfigurationInterface\\|null\\) of method Symfony\\\\Component\\\\DependencyInjection\\\\Extension\\\\ConfigurationExtensionInterface\\:\\:getConfiguration\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
-
-		-
-			message: "#^Return type \\(object\\|null\\) of method Chill\\\\MainBundle\\\\DependencyInjection\\\\ChillMainExtension\\:\\:getConfiguration\\(\\) should be covariant with return type \\(Symfony\\\\Component\\\\Config\\\\Definition\\\\ConfigurationInterface\\|null\\) of method Symfony\\\\Component\\\\DependencyInjection\\\\Extension\\\\Extension\\:\\:getConfiguration\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
-
-		-
-			message: "#^Parameter \\#1 \\$value \\(null\\) of method Chill\\\\MainBundle\\\\Form\\\\ChoiceLoader\\\\PostalCodeChoiceLoader\\:\\:loadChoiceList\\(\\) should be contravariant with parameter \\$value \\(\\(callable\\(\\)\\: mixed\\)\\|null\\) of method Symfony\\\\Component\\\\Form\\\\ChoiceList\\\\Loader\\\\ChoiceLoaderInterface\\:\\:loadChoiceList\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/ChoiceLoader/PostalCodeChoiceLoader.php
-
-		-
-			message: "#^Parameter \\#2 \\$value \\(null\\) of method Chill\\\\MainBundle\\\\Form\\\\ChoiceLoader\\\\PostalCodeChoiceLoader\\:\\:loadChoicesForValues\\(\\) should be contravariant with parameter \\$value \\(\\(callable\\(\\)\\: mixed\\)\\|null\\) of method Symfony\\\\Component\\\\Form\\\\ChoiceList\\\\Loader\\\\ChoiceLoaderInterface\\:\\:loadChoicesForValues\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/ChoiceLoader/PostalCodeChoiceLoader.php
-
-		-
-			message: "#^Parameter \\#2 \\$value \\(null\\) of method Chill\\\\MainBundle\\\\Form\\\\ChoiceLoader\\\\PostalCodeChoiceLoader\\:\\:loadValuesForChoices\\(\\) should be contravariant with parameter \\$value \\(\\(callable\\(\\)\\: mixed\\)\\|null\\) of method Symfony\\\\Component\\\\Form\\\\ChoiceList\\\\Loader\\\\ChoiceLoaderInterface\\:\\:loadValuesForChoices\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/ChoiceLoader/PostalCodeChoiceLoader.php
-
-		-
-			message: "#^Parameter \\#1 \\$address \\(Chill\\\\MainBundle\\\\Entity\\\\Address\\) of method Chill\\\\MainBundle\\\\Form\\\\DataMapper\\\\AddressDataMapper\\:\\:mapDataToForms\\(\\) should be contravariant with parameter \\$viewData \\(mixed\\) of method Symfony\\\\Component\\\\Form\\\\DataMapperInterface\\:\\:mapDataToForms\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/DataMapper/AddressDataMapper.php
-
-		-
-			message: "#^Parameter \\#1 \\$forms \\(Iterator\\) of method Chill\\\\MainBundle\\\\Form\\\\DataMapper\\\\AddressDataMapper\\:\\:mapFormsToData\\(\\) should be contravariant with parameter \\$forms \\(iterable\\<Symfony\\\\Component\\\\Form\\\\FormInterface\\>&Traversable\\) of method Symfony\\\\Component\\\\Form\\\\DataMapperInterface\\:\\:mapFormsToData\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/DataMapper/AddressDataMapper.php
-
-		-
-			message: "#^Parameter \\#2 \\$address \\(Chill\\\\MainBundle\\\\Entity\\\\Address\\) of method Chill\\\\MainBundle\\\\Form\\\\DataMapper\\\\AddressDataMapper\\:\\:mapFormsToData\\(\\) should be contravariant with parameter \\$viewData \\(mixed\\) of method Symfony\\\\Component\\\\Form\\\\DataMapperInterface\\:\\:mapFormsToData\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/DataMapper/AddressDataMapper.php
-
-		-
-			message: "#^Parameter \\#2 \\$forms \\(Iterator\\) of method Chill\\\\MainBundle\\\\Form\\\\DataMapper\\\\AddressDataMapper\\:\\:mapDataToForms\\(\\) should be contravariant with parameter \\$forms \\(iterable\\<Symfony\\\\Component\\\\Form\\\\FormInterface\\>&Traversable\\) of method Symfony\\\\Component\\\\Form\\\\DataMapperInterface\\:\\:mapDataToForms\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/DataMapper/AddressDataMapper.php
-
-		-
-			message: "#^Parameter \\#1 \\$value \\(string\\) of method Chill\\\\MainBundle\\\\Form\\\\DataTransformer\\\\IdToEntityDataTransformer\\:\\:reverseTransform\\(\\) should be contravariant with parameter \\$value \\(mixed\\) of method Symfony\\\\Component\\\\Form\\\\DataTransformerInterface\\:\\:reverseTransform\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/DataTransformer/IdToEntityDataTransformer.php
-
-		-
-			message: "#^Parameter \\#1 \\$value \\(array\\<Chill\\\\MainBundle\\\\Entity\\\\User\\>\\|Chill\\\\MainBundle\\\\Entity\\\\User\\) of method Chill\\\\MainBundle\\\\Form\\\\Type\\\\DataTransformer\\\\EntityToJsonTransformer\\:\\:transform\\(\\) should be contravariant with parameter \\$value \\(mixed\\) of method Symfony\\\\Component\\\\Form\\\\DataTransformerInterface\\:\\:transform\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php
-
-		-
-			message: "#^Parameter \\#1 \\$array \\(array\\) of method Chill\\\\MainBundle\\\\Form\\\\Type\\\\DataTransformer\\\\MultipleObjectsToIdTransformer\\:\\:transform\\(\\) should be contravariant with parameter \\$value \\(mixed\\) of method Symfony\\\\Component\\\\Form\\\\DataTransformerInterface\\:\\:transform\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/Type/DataTransformer/MultipleObjectsToIdTransformer.php
-
-		-
-			message: "#^Parameter \\#1 \\$id \\(string\\) of method Chill\\\\MainBundle\\\\Form\\\\Type\\\\DataTransformer\\\\ObjectToIdTransformer\\:\\:reverseTransform\\(\\) should be contravariant with parameter \\$value \\(mixed\\) of method Symfony\\\\Component\\\\Form\\\\DataTransformerInterface\\:\\:reverseTransform\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ObjectToIdTransformer.php
-
-		-
-			message: "#^Parameter \\#2 \\$subject \\(Chill\\\\MainBundle\\\\Entity\\\\Workflow\\\\EntityWorkflow\\) of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\EntityWorkflowVoter\\:\\:voteOnAttribute\\(\\) should be contravariant with parameter \\$subject \\(mixed\\) of method Symfony\\\\Component\\\\Security\\\\Core\\\\Authorization\\\\Voter\\\\Voter\\:\\:voteOnAttribute\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Security/Authorization/EntityWorkflowVoter.php
-
-		-
-			message: "#^Parameter \\#1 \\$entity \\(Chill\\\\MainBundle\\\\Entity\\\\HasCenterInterface\\) of method Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\DefaultCenterResolver\\:\\:resolveCenter\\(\\) should be contravariant with parameter \\$entity \\(object\\) of method Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverInterface\\:\\:resolveCenter\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Security/Resolver/DefaultCenterResolver.php
-
-		-
-			message: "#^Parameter \\#1 \\$entity \\(Chill\\\\MainBundle\\\\Entity\\\\HasScopeInterface\\|Chill\\\\MainBundle\\\\Entity\\\\HasScopesInterface\\) of method Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\DefaultScopeResolver\\:\\:resolveScope\\(\\) should be contravariant with parameter \\$entity \\(mixed\\) of method Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\ScopeResolverInterface\\:\\:resolveScope\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Security/Resolver/DefaultScopeResolver.php
-
-		-
-			message: "#^Parameter \\#1 \\$address \\(Chill\\\\MainBundle\\\\Entity\\\\Address\\) of method Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\AddressNormalizer\\:\\:normalize\\(\\) should be contravariant with parameter \\$object \\(mixed\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:normalize\\(\\)$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
-
-		-
-			message: "#^Parameter \\#2 \\$format \\(string\\) of method Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\AddressNormalizer\\:\\:supportsNormalization\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\ContextAwareNormalizerInterface\\:\\:supportsNormalization\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
-
-		-
-			message: "#^Parameter \\#2 \\$format \\(string\\) of method Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\AddressNormalizer\\:\\:supportsNormalization\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:supportsNormalization\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
-
-		-
-			message: "#^Parameter \\#2 \\$format \\(string\\) of method Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\CenterNormalizer\\:\\:normalize\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:normalize\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/CenterNormalizer.php
-
-		-
-			message: "#^Parameter \\#2 \\$format \\(string\\) of method Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\CenterNormalizer\\:\\:supportsNormalization\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:supportsNormalization\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/CenterNormalizer.php
-
-		-
-			message: "#^Parameter \\#3 \\$format \\(string\\) of method Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\CenterNormalizer\\:\\:denormalize\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\DenormalizerInterface\\:\\:denormalize\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/CenterNormalizer.php
-
-		-
-			message: "#^Parameter \\#3 \\$format \\(string\\) of method Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\CenterNormalizer\\:\\:supportsDenormalization\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\DenormalizerInterface\\:\\:supportsDenormalization\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/CenterNormalizer.php
-
-		-
-			message: "#^Parameter \\#1 \\$collection \\(Chill\\\\MainBundle\\\\Serializer\\\\Model\\\\Collection\\) of method Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\CollectionNormalizer\\:\\:normalize\\(\\) should be contravariant with parameter \\$object \\(mixed\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:normalize\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/CollectionNormalizer.php
-
-		-
-			message: "#^Parameter \\#2 \\$format \\(string\\) of method Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\CollectionNormalizer\\:\\:supportsNormalization\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:supportsNormalization\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/CollectionNormalizer.php
-
-		-
-			message: "#^Parameter \\#1 \\$object \\(Chill\\\\MainBundle\\\\Entity\\\\Embeddable\\\\CommentEmbeddable\\) of method Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\CommentEmbeddableDocGenNormalizer\\:\\:normalize\\(\\) should be contravariant with parameter \\$object \\(mixed\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:normalize\\(\\)$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/CommentEmbeddableDocGenNormalizer.php
-
-		-
-			message: "#^Parameter \\#2 \\$format \\(string\\) of method Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\DateNormalizer\\:\\:normalize\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:normalize\\(\\)$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/DateNormalizer.php
-
-		-
-			message: "#^Parameter \\#2 \\$format \\(string\\) of method Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\DateNormalizer\\:\\:supportsNormalization\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\ContextAwareNormalizerInterface\\:\\:supportsNormalization\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/DateNormalizer.php
-
-		-
-			message: "#^Parameter \\#2 \\$format \\(string\\) of method Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\DateNormalizer\\:\\:supportsNormalization\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:supportsNormalization\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/DateNormalizer.php
-
-		-
-			message: "#^Parameter \\#3 \\$format \\(string\\) of method Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\DateNormalizer\\:\\:denormalize\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\DenormalizerInterface\\:\\:denormalize\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/DateNormalizer.php
-
-		-
-			message: "#^Parameter \\#3 \\$format \\(string\\) of method Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\DateNormalizer\\:\\:supportsDenormalization\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\DenormalizerInterface\\:\\:supportsDenormalization\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/DateNormalizer.php
-
-		-
-			message: "#^Parameter \\#3 \\$format \\(string\\) of method Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\DiscriminatedObjectDenormalizer\\:\\:denormalize\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\DenormalizerInterface\\:\\:denormalize\\(\\)$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/DiscriminatedObjectDenormalizer.php
-
-		-
-			message: "#^Parameter \\#3 \\$format \\(string\\) of method Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\DiscriminatedObjectDenormalizer\\:\\:supportsDenormalization\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\ContextAwareDenormalizerInterface\\:\\:supportsDenormalization\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/DiscriminatedObjectDenormalizer.php
-
-		-
-			message: "#^Parameter \\#3 \\$format \\(string\\) of method Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\DiscriminatedObjectDenormalizer\\:\\:supportsDenormalization\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\DenormalizerInterface\\:\\:supportsDenormalization\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/DiscriminatedObjectDenormalizer.php
-
-		-
-			message: "#^Parameter \\#3 \\$format \\(string\\) of method Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\DoctrineExistingEntityNormalizer\\:\\:denormalize\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\DenormalizerInterface\\:\\:denormalize\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/DoctrineExistingEntityNormalizer.php
-
-		-
-			message: "#^Parameter \\#3 \\$format \\(string\\) of method Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\DoctrineExistingEntityNormalizer\\:\\:supportsDenormalization\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\DenormalizerInterface\\:\\:supportsDenormalization\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/DoctrineExistingEntityNormalizer.php
-
-		-
-			message: "#^Parameter \\#1 \\$object \\(Chill\\\\MainBundle\\\\Entity\\\\Workflow\\\\EntityWorkflow\\) of method Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\EntityWorkflowNormalizer\\:\\:normalize\\(\\) should be contravariant with parameter \\$object \\(mixed\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:normalize\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowNormalizer.php
-
-		-
-			message: "#^Parameter \\#1 \\$object \\(Chill\\\\MainBundle\\\\Entity\\\\Workflow\\\\EntityWorkflowStep\\) of method Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\EntityWorkflowStepNormalizer\\:\\:normalize\\(\\) should be contravariant with parameter \\$object \\(mixed\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:normalize\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowStepNormalizer.php
-
-		-
-			message: "#^Parameter \\#1 \\$object \\(Chill\\\\MainBundle\\\\Entity\\\\Notification\\) of method Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\NotificationNormalizer\\:\\:normalize\\(\\) should be contravariant with parameter \\$object \\(mixed\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:normalize\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/NotificationNormalizer.php
-
-		-
-			message: "#^Return type \\(array\\|ArrayObject\\|bool\\|float\\|int\\|string\\|void\\|null\\) of method Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\NotificationNormalizer\\:\\:normalize\\(\\) should be covariant with return type \\(array\\|ArrayObject\\|bool\\|float\\|int\\|string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:normalize\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/NotificationNormalizer.php
-
-		-
-			message: "#^Parameter \\#1 \\$data \\(string\\|null\\) of method Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\PhonenumberNormalizer\\:\\:denormalize\\(\\) should be contravariant with parameter \\$data \\(mixed\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\DenormalizerInterface\\:\\:denormalize\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
-
-		-
-			message: "#^Parameter \\#3 \\$format \\(string\\) of method Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\PhonenumberNormalizer\\:\\:supportsDenormalization\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\DenormalizerInterface\\:\\:supportsDenormalization\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
-
-		-
-			message: "#^Parameter \\#3 \\$format \\(string\\) of method Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\PointNormalizer\\:\\:denormalize\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\DenormalizerInterface\\:\\:denormalize\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/PointNormalizer.php
-
-		-
-			message: "#^Parameter \\#3 \\$format \\(string\\) of method Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\PointNormalizer\\:\\:supportsDenormalization\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\DenormalizerInterface\\:\\:supportsDenormalization\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/PointNormalizer.php
-
-		-
-			message: "#^Parameter \\#2 \\$format \\(string\\) of method Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\PrivateCommentEmbeddableNormalizer\\:\\:normalize\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:normalize\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php
-
-		-
-			message: "#^Parameter \\#2 \\$format \\(string\\) of method Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\UserNormalizer\\:\\:normalize\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:normalize\\(\\)$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php
-
-		-
-			message: "#^Parameter \\#2 \\$format \\(string\\) of method Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\UserNormalizer\\:\\:supportsNormalization\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\ContextAwareNormalizerInterface\\:\\:supportsNormalization\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php
-
-		-
-			message: "#^Parameter \\#2 \\$format \\(string\\) of method Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\UserNormalizer\\:\\:supportsNormalization\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:supportsNormalization\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php
-
-
-		-
-			message: "#^Parameter \\#1 \\$value \\(string\\) of method Chill\\\\MainBundle\\\\Validation\\\\Validator\\\\ValidPhonenumber\\:\\:validate\\(\\) should be contravariant with parameter \\$value \\(mixed\\) of method Symfony\\\\Component\\\\Validator\\\\ConstraintValidatorInterface\\:\\:validate\\(\\)$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Validation/Validator/ValidPhonenumber.php
-
-		-
-			message: "#^Parameter \\#2 \\$constraint \\(Chill\\\\MainBundle\\\\Validation\\\\Constraint\\\\PhonenumberConstraint\\) of method Chill\\\\MainBundle\\\\Validation\\\\Validator\\\\ValidPhonenumber\\:\\:validate\\(\\) should be contravariant with parameter \\$constraint \\(Symfony\\\\Component\\\\Validator\\\\Constraint\\) of method Symfony\\\\Component\\\\Validator\\\\ConstraintValidatorInterface\\:\\:validate\\(\\)$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Validation/Validator/ValidPhonenumber.php
-
-		-
-			message: "#^Parameter \\#1 \\$value \\(object\\) of method Chill\\\\MainBundle\\\\Validator\\\\Constraints\\\\Entity\\\\UserCircleConsistencyValidator\\:\\:validate\\(\\) should be contravariant with parameter \\$value \\(mixed\\) of method Symfony\\\\Component\\\\Validator\\\\ConstraintValidatorInterface\\:\\:validate\\(\\)$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Validator/Constraints/Entity/UserCircleConsistencyValidator.php
-
-		-
-			message: "#^Parameter \\#2 \\$constraint \\(Chill\\\\MainBundle\\\\Validator\\\\Constraints\\\\Entity\\\\UserCircleConsistency\\) of method Chill\\\\MainBundle\\\\Validator\\\\Constraints\\\\Entity\\\\UserCircleConsistencyValidator\\:\\:validate\\(\\) should be contravariant with parameter \\$constraint \\(Symfony\\\\Component\\\\Validator\\\\Constraint\\) of method Symfony\\\\Component\\\\Validator\\\\ConstraintValidatorInterface\\:\\:validate\\(\\)$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Validator/Constraints/Entity/UserCircleConsistencyValidator.php
-
-		-
-			message: "#^Parameter \\#1 \\$value \\(Chill\\\\MainBundle\\\\Entity\\\\Workflow\\\\EntityWorkflow\\) of method Chill\\\\MainBundle\\\\Workflow\\\\Validator\\\\EntityWorkflowCreationValidator\\:\\:validate\\(\\) should be contravariant with parameter \\$value \\(mixed\\) of method Symfony\\\\Component\\\\Validator\\\\ConstraintValidatorInterface\\:\\:validate\\(\\)$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Workflow/Validator/EntityWorkflowCreationValidator.php
-
-		-
-			message: "#^Parameter \\#1 \\$value \\(Chill\\\\MainBundle\\\\Entity\\\\Workflow\\\\EntityWorkflowStep\\) of method Chill\\\\MainBundle\\\\Workflow\\\\Validator\\\\StepDestValidValidator\\:\\:validate\\(\\) should be contravariant with parameter \\$value \\(mixed\\) of method Symfony\\\\Component\\\\Validator\\\\ConstraintValidatorInterface\\:\\:validate\\(\\)$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Workflow/Validator/StepDestValidValidator.php
-
-		-
-			message: "#^Parameter \\#3 \\$query \\(Doctrine\\\\ORM\\\\QueryBuilder\\) of method Chill\\\\PersonBundle\\\\Controller\\\\HouseholdCompositionTypeApiController\\:\\:customizeQuery\\(\\) should be contravariant with parameter \\$query \\(mixed\\) of method Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\AbstractCRUDController\\:\\:customizeQuery\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionTypeApiController.php
-
-		-
-			message: "#^Return type \\(Doctrine\\\\Common\\\\Collections\\\\Collection\\) of method Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\:\\:getScopes\\(\\) should be covariant with return type \\(iterable\\<Chill\\\\MainBundle\\\\Entity\\\\Scope\\>\\) of method Chill\\\\MainBundle\\\\Entity\\\\HasScopesInterface\\:\\:getScopes\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
-
-		-
-			message: "#^Return type \\(Chill\\\\MainBundle\\\\Entity\\\\Center\\|null\\) of method Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:getCenter\\(\\) should be covariant with return type \\(Chill\\\\MainBundle\\\\Entity\\\\Center\\) of method Chill\\\\MainBundle\\\\Entity\\\\HasCenterInterface\\:\\:getCenter\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/Person.php
-
-		-
-			message: "#^Parameter \\#1 \\$value \\(null\\) of method Chill\\\\PersonBundle\\\\Form\\\\ChoiceLoader\\\\PersonChoiceLoader\\:\\:loadChoiceList\\(\\) should be contravariant with parameter \\$value \\(\\(callable\\(\\)\\: mixed\\)\\|null\\) of method Symfony\\\\Component\\\\Form\\\\ChoiceList\\\\Loader\\\\ChoiceLoaderInterface\\:\\:loadChoiceList\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php
-
-		-
-			message: "#^Parameter \\#2 \\$value \\(null\\) of method Chill\\\\PersonBundle\\\\Form\\\\ChoiceLoader\\\\PersonChoiceLoader\\:\\:loadChoicesForValues\\(\\) should be contravariant with parameter \\$value \\(\\(callable\\(\\)\\: mixed\\)\\|null\\) of method Symfony\\\\Component\\\\Form\\\\ChoiceList\\\\Loader\\\\ChoiceLoaderInterface\\:\\:loadChoicesForValues\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php
-
-		-
-			message: "#^Parameter \\#2 \\$value \\(null\\) of method Chill\\\\PersonBundle\\\\Form\\\\ChoiceLoader\\\\PersonChoiceLoader\\:\\:loadValuesForChoices\\(\\) should be contravariant with parameter \\$value \\(\\(callable\\(\\)\\: mixed\\)\\|null\\) of method Symfony\\\\Component\\\\Form\\\\ChoiceList\\\\Loader\\\\ChoiceLoaderInterface\\:\\:loadValuesForChoices\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php
-
-		-
-			message: "#^Parameter \\#2 \\$viewData \\(Doctrine\\\\Common\\\\Collections\\\\Collection\\) of method Chill\\\\PersonBundle\\\\Form\\\\DataMapper\\\\PersonAltNameDataMapper\\:\\:mapFormsToData\\(\\) should be contravariant with parameter \\$viewData \\(mixed\\) of method Symfony\\\\Component\\\\Form\\\\DataMapperInterface\\:\\:mapFormsToData\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Form/DataMapper/PersonAltNameDataMapper.php
-
-		-
-			message: "#^Parameter \\#3 \\$limit \\(int\\) of method Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkEvaluationRepository\\:\\:findBy\\(\\) should be contravariant with parameter \\$limit \\(int\\|null\\) of method Doctrine\\\\Persistence\\\\ObjectRepository\\<object\\>\\:\\:findBy\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationRepository.php
-
-		-
-			message: "#^Parameter \\#4 \\$offset \\(int\\) of method Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkEvaluationRepository\\:\\:findBy\\(\\) should be contravariant with parameter \\$offset \\(int\\|null\\) of method Doctrine\\\\Persistence\\\\ObjectRepository\\<object\\>\\:\\:findBy\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationRepository.php
-
-		-
-			message: "#^Parameter \\#3 \\$limit \\(int\\) of method Chill\\\\PersonBundle\\\\Repository\\\\Household\\\\HouseholdCompositionRepository\\:\\:findBy\\(\\) should be contravariant with parameter \\$limit \\(int\\|null\\) of method Doctrine\\\\Persistence\\\\ObjectRepository\\<object\\>\\:\\:findBy\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionRepository.php
-
-		-
-			message: "#^Parameter \\#4 \\$offset \\(int\\) of method Chill\\\\PersonBundle\\\\Repository\\\\Household\\\\HouseholdCompositionRepository\\:\\:findBy\\(\\) should be contravariant with parameter \\$offset \\(int\\|null\\) of method Doctrine\\\\Persistence\\\\ObjectRepository\\<object\\>\\:\\:findBy\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionRepository.php
-
-		-
-			message: "#^Parameter \\#3 \\$limit \\(int\\) of method Chill\\\\PersonBundle\\\\Repository\\\\Household\\\\HouseholdCompositionRepositoryInterface\\:\\:findBy\\(\\) should be contravariant with parameter \\$limit \\(int\\|null\\) of method Doctrine\\\\Persistence\\\\ObjectRepository\\<object\\>\\:\\:findBy\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionRepositoryInterface.php
-
-		-
-			message: "#^Parameter \\#4 \\$offset \\(int\\) of method Chill\\\\PersonBundle\\\\Repository\\\\Household\\\\HouseholdCompositionRepositoryInterface\\:\\:findBy\\(\\) should be contravariant with parameter \\$offset \\(int\\|null\\) of method Doctrine\\\\Persistence\\\\ObjectRepository\\<object\\>\\:\\:findBy\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionRepositoryInterface.php
-
-		-
-			message: "#^Return type \\(class\\-string\\) of method Chill\\\\PersonBundle\\\\Repository\\\\SocialWork\\\\EvaluationRepository\\:\\:getClassName\\(\\) should be covariant with return type \\(class\\-string\\<object\\>\\) of method Doctrine\\\\Persistence\\\\ObjectRepository\\<object\\>\\:\\:getClassName\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepository.php
-
-		-
-			message: "#^Return type \\(class\\-string\\) of method Chill\\\\PersonBundle\\\\Repository\\\\SocialWork\\\\EvaluationRepositoryInterface\\:\\:getClassName\\(\\) should be covariant with return type \\(class\\-string\\<object\\>\\) of method Doctrine\\\\Persistence\\\\ObjectRepository\\<object\\>\\:\\:getClassName\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepositoryInterface.php
-
-		-
-			message: "#^Return type \\(class\\-string\\) of method Chill\\\\PersonBundle\\\\Repository\\\\SocialWork\\\\GoalRepository\\:\\:getClassName\\(\\) should be covariant with return type \\(class\\-string\\<object\\>\\) of method Doctrine\\\\Persistence\\\\ObjectRepository\\<object\\>\\:\\:getClassName\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php
-
-		-
-			message: "#^Return type \\(class\\-string\\) of method Chill\\\\PersonBundle\\\\Repository\\\\SocialWork\\\\ResultRepository\\:\\:getClassName\\(\\) should be covariant with return type \\(class\\-string\\<object\\>\\) of method Doctrine\\\\Persistence\\\\ObjectRepository\\<object\\>\\:\\:getClassName\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php
-
-		-
-			message: "#^Return type \\(class\\-string\\) of method Chill\\\\PersonBundle\\\\Repository\\\\SocialWork\\\\SocialActionRepository\\:\\:getClassName\\(\\) should be covariant with return type \\(class\\-string\\<object\\>\\) of method Doctrine\\\\Persistence\\\\ObjectRepository\\<object\\>\\:\\:getClassName\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialActionRepository.php
-
-		-
-			message: "#^Return type \\(class\\-string\\) of method Chill\\\\PersonBundle\\\\Repository\\\\SocialWork\\\\SocialIssueRepository\\:\\:getClassName\\(\\) should be covariant with return type \\(class\\-string\\<object\\>\\) of method Doctrine\\\\Persistence\\\\ObjectRepository\\<object\\>\\:\\:getClassName\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php
-
-		-
-			message: "#^Parameter \\#2 \\$subject \\(Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkEvaluationDocument\\) of method Chill\\\\PersonBundle\\\\Security\\\\Authorization\\\\AccompanyingPeriodWorkEvaluationDocumentVoter\\:\\:voteOnAttribute\\(\\) should be contravariant with parameter \\$subject \\(mixed\\) of method Symfony\\\\Component\\\\Security\\\\Core\\\\Authorization\\\\Voter\\\\Voter\\:\\:voteOnAttribute\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkEvaluationDocumentVoter.php
-
-		-
-			message: "#^Parameter \\#2 \\$subject \\(Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkEvaluation\\) of method Chill\\\\PersonBundle\\\\Security\\\\Authorization\\\\AccompanyingPeriodWorkEvaluationVoter\\:\\:voteOnAttribute\\(\\) should be contravariant with parameter \\$subject \\(mixed\\) of method Symfony\\\\Component\\\\Security\\\\Core\\\\Authorization\\\\Voter\\\\Voter\\:\\:voteOnAttribute\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkEvaluationVoter.php
-
-		-
-			message: "#^Parameter \\#2 \\$subject \\(Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\AccompanyingPeriodWork\\) of method Chill\\\\PersonBundle\\\\Security\\\\Authorization\\\\AccompanyingPeriodWorkVoter\\:\\:voteOnAttribute\\(\\) should be contravariant with parameter \\$subject \\(mixed\\) of method Symfony\\\\Component\\\\Security\\\\Core\\\\Authorization\\\\Voter\\\\Voter\\:\\:voteOnAttribute\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkVoter.php
-
-		-
-			message: "#^Parameter \\#1 \\$period \\(Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\|null\\) of method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\AccompanyingPeriodDocGenNormalizer\\:\\:normalize\\(\\) should be contravariant with parameter \\$object \\(mixed\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:normalize\\(\\)$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php
-
-		-
-			message: "#^Parameter \\#2 \\$format \\(string\\) of method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\AccompanyingPeriodDocGenNormalizer\\:\\:supportsNormalization\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\ContextAwareNormalizerInterface\\:\\:supportsNormalization\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php
-
-		-
-			message: "#^Parameter \\#2 \\$format \\(string\\) of method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\AccompanyingPeriodDocGenNormalizer\\:\\:supportsNormalization\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:supportsNormalization\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php
-
-		-
-			message: "#^Parameter \\#1 \\$origin \\(Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\Origin\\) of method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\AccompanyingPeriodOriginNormalizer\\:\\:normalize\\(\\) should be contravariant with parameter \\$object \\(mixed\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:normalize\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodOriginNormalizer.php
-
-		-
-			message: "#^Parameter \\#2 \\$format \\(string\\) of method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\AccompanyingPeriodOriginNormalizer\\:\\:supportsNormalization\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:supportsNormalization\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodOriginNormalizer.php
-
-		-
-			message: "#^Parameter \\#1 \\$participation \\(Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriodParticipation\\) of method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\AccompanyingPeriodParticipationNormalizer\\:\\:normalize\\(\\) should be contravariant with parameter \\$object \\(mixed\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:normalize\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodParticipationNormalizer.php
-
-		-
-			message: "#^Parameter \\#2 \\$format \\(string\\) of method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\AccompanyingPeriodParticipationNormalizer\\:\\:supportsNormalization\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:supportsNormalization\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodParticipationNormalizer.php
-
-		-
-			message: "#^Parameter \\#3 \\$format \\(string\\) of method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\AccompanyingPeriodResourceNormalizer\\:\\:denormalize\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\DenormalizerInterface\\:\\:denormalize\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodResourceNormalizer.php
-
-		-
-			message: "#^Parameter \\#3 \\$format \\(string\\) of method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\AccompanyingPeriodResourceNormalizer\\:\\:supportsDenormalization\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\DenormalizerInterface\\:\\:supportsDenormalization\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodResourceNormalizer.php
-
-		-
-			message: "#^Parameter \\#3 \\$format \\(string\\) of method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\AccompanyingPeriodWorkDenormalizer\\:\\:denormalize\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\DenormalizerInterface\\:\\:denormalize\\(\\)$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkDenormalizer.php
-
-		-
-			message: "#^Parameter \\#3 \\$format \\(string\\) of method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\AccompanyingPeriodWorkDenormalizer\\:\\:supportsDenormalization\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\ContextAwareDenormalizerInterface\\:\\:supportsDenormalization\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkDenormalizer.php
-
-		-
-			message: "#^Parameter \\#3 \\$format \\(string\\) of method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\AccompanyingPeriodWorkDenormalizer\\:\\:supportsDenormalization\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\DenormalizerInterface\\:\\:supportsDenormalization\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkDenormalizer.php
-
-		-
-			message: "#^Parameter \\#3 \\$format \\(string\\) of method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\AccompanyingPeriodWorkEvaluationDenormalizer\\:\\:denormalize\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\DenormalizerInterface\\:\\:denormalize\\(\\)$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationDenormalizer.php
-
-		-
-			message: "#^Parameter \\#3 \\$format \\(string\\) of method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\AccompanyingPeriodWorkEvaluationDenormalizer\\:\\:supportsDenormalization\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\ContextAwareDenormalizerInterface\\:\\:supportsDenormalization\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationDenormalizer.php
-
-		-
-			message: "#^Parameter \\#3 \\$format \\(string\\) of method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\AccompanyingPeriodWorkEvaluationDenormalizer\\:\\:supportsDenormalization\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\DenormalizerInterface\\:\\:supportsDenormalization\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationDenormalizer.php
-
-		-
-			message: "#^Parameter \\#1 \\$object \\(Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkEvaluation\\) of method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\AccompanyingPeriodWorkEvaluationNormalizer\\:\\:normalize\\(\\) should be contravariant with parameter \\$object \\(mixed\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:normalize\\(\\)$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationNormalizer.php
-
-		-
-			message: "#^Parameter \\#1 \\$object \\(Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\AccompanyingPeriodWork\\) of method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\AccompanyingPeriodWorkNormalizer\\:\\:normalize\\(\\) should be contravariant with parameter \\$object \\(mixed\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:normalize\\(\\)$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkNormalizer.php
-
-		-
-			message: "#^Parameter \\#3 \\$format \\(string\\) of method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\MembersEditorNormalizer\\:\\:denormalize\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\DenormalizerInterface\\:\\:denormalize\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
-
-		-
-			message: "#^Parameter \\#3 \\$format \\(string\\) of method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\MembersEditorNormalizer\\:\\:supportsDenormalization\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\DenormalizerInterface\\:\\:supportsDenormalization\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
-
-		-
-			message: "#^Parameter \\#2 \\$format \\(string\\) of method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\PersonDocGenNormalizer\\:\\:normalize\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:normalize\\(\\)$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
-
-		-
-			message: "#^Parameter \\#2 \\$format \\(string\\) of method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\PersonDocGenNormalizer\\:\\:supportsNormalization\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\ContextAwareNormalizerInterface\\:\\:supportsNormalization\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
-
-		-
-			message: "#^Parameter \\#2 \\$format \\(string\\) of method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\PersonDocGenNormalizer\\:\\:supportsNormalization\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:supportsNormalization\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
-
-		-
-			message: "#^Parameter \\#1 \\$person \\(Chill\\\\PersonBundle\\\\Entity\\\\Person\\) of method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\PersonJsonNormalizer\\:\\:normalize\\(\\) should be contravariant with parameter \\$object \\(mixed\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:normalize\\(\\)$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
-
-		-
-			message: "#^Parameter \\#2 \\$format \\(string\\) of method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\PersonJsonNormalizer\\:\\:supportsNormalization\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:supportsNormalization\\(\\)$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
-
-		-
-			message: "#^Parameter \\#3 \\$format \\(string\\) of method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\PersonJsonNormalizer\\:\\:denormalize\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\DenormalizerInterface\\:\\:denormalize\\(\\)$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
-
-		-
-			message: "#^Parameter \\#3 \\$format \\(string\\) of method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\PersonJsonNormalizer\\:\\:supportsDenormalization\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\DenormalizerInterface\\:\\:supportsDenormalization\\(\\)$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
-
-		-
-			message: "#^Parameter \\#1 \\$relation \\(Chill\\\\PersonBundle\\\\Entity\\\\Relationships\\\\Relationship\\) of method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\RelationshipDocGenNormalizer\\:\\:normalize\\(\\) should be contravariant with parameter \\$object \\(mixed\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:normalize\\(\\)$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/RelationshipDocGenNormalizer.php
-
-		-
-			message: "#^Parameter \\#2 \\$format \\(string\\) of method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\RelationshipDocGenNormalizer\\:\\:supportsNormalization\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\ContextAwareNormalizerInterface\\:\\:supportsNormalization\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/RelationshipDocGenNormalizer.php
-
-		-
-			message: "#^Parameter \\#2 \\$format \\(string\\) of method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\RelationshipDocGenNormalizer\\:\\:supportsNormalization\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:supportsNormalization\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/RelationshipDocGenNormalizer.php
-
-		-
-			message: "#^Parameter \\#2 \\$format \\(string\\) of method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\SocialActionNormalizer\\:\\:normalize\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:normalize\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialActionNormalizer.php
-
-		-
-			message: "#^Parameter \\#2 \\$format \\(string\\) of method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\SocialActionNormalizer\\:\\:supportsNormalization\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:supportsNormalization\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialActionNormalizer.php
-
-		-
-			message: "#^Parameter \\#2 \\$format \\(string\\) of method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\SocialIssueNormalizer\\:\\:normalize\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:normalize\\(\\)$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialIssueNormalizer.php
-
-		-
-			message: "#^Parameter \\#2 \\$format \\(string\\) of method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\SocialIssueNormalizer\\:\\:supportsNormalization\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\ContextAwareNormalizerInterface\\:\\:supportsNormalization\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialIssueNormalizer.php
-
-		-
-			message: "#^Parameter \\#2 \\$format \\(string\\) of method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\SocialIssueNormalizer\\:\\:supportsNormalization\\(\\) should be contravariant with parameter \\$format \\(string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:supportsNormalization\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialIssueNormalizer.php
-
-		-
-			message: "#^Parameter \\#1 \\$object \\(Chill\\\\MainBundle\\\\Entity\\\\Workflow\\\\EntityWorkflow\\) of method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\WorkflowNormalizer\\:\\:normalize\\(\\) should be contravariant with parameter \\$object \\(mixed\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:normalize\\(\\)$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/WorkflowNormalizer.php
-
-
-		-
-			message: "#^Parameter \\#1 \\$object \\(Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkEvaluationDocument\\) of method Chill\\\\PersonBundle\\\\Workflow\\\\AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler\\:\\:getRelatedObjects\\(\\) should be contravariant with parameter \\$object \\(object\\) of method Chill\\\\MainBundle\\\\Workflow\\\\EntityWorkflowHandlerInterface\\:\\:getRelatedObjects\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationDocumentWorkflowHandler.php
-
-		-
-			message: "#^Parameter \\#1 \\$object \\(Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkEvaluation\\) of method Chill\\\\PersonBundle\\\\Workflow\\\\AccompanyingPeriodWorkEvaluationWorkflowHandler\\:\\:getRelatedObjects\\(\\) should be contravariant with parameter \\$object \\(object\\) of method Chill\\\\MainBundle\\\\Workflow\\\\EntityWorkflowHandlerInterface\\:\\:getRelatedObjects\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkEvaluationWorkflowHandler.php
-
-		-
-			message: "#^Parameter \\#1 \\$object \\(Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\AccompanyingPeriodWork\\) of method Chill\\\\PersonBundle\\\\Workflow\\\\AccompanyingPeriodWorkWorkflowHandler\\:\\:getRelatedObjects\\(\\) should be contravariant with parameter \\$object \\(object\\) of method Chill\\\\MainBundle\\\\Workflow\\\\EntityWorkflowHandlerInterface\\:\\:getRelatedObjects\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Workflow/AccompanyingPeriodWorkWorkflowHandler.php
-
-		-
-			message: "#^Return type \\(Chill\\\\MainBundle\\\\Entity\\\\Center\\|null\\) of method Chill\\\\TaskBundle\\\\Entity\\\\AbstractTask\\:\\:getCenter\\(\\) should be covariant with return type \\(Chill\\\\MainBundle\\\\Entity\\\\Center\\) of method Chill\\\\MainBundle\\\\Entity\\\\HasCenterInterface\\:\\:getCenter\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Entity/AbstractTask.php
-
-		-
-			message: "#^Return type \\(Chill\\\\MainBundle\\\\Entity\\\\Scope\\|null\\) of method Chill\\\\TaskBundle\\\\Entity\\\\AbstractTask\\:\\:getScope\\(\\) should be covariant with return type \\(Chill\\\\MainBundle\\\\Entity\\\\Scope\\) of method Chill\\\\MainBundle\\\\Entity\\\\HasScopeInterface\\:\\:getScope\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Entity/AbstractTask.php
-
-		-
-			message: "#^Parameter \\#3 \\$entity \\(Chill\\\\ThirdPartyBundle\\\\Entity\\\\ThirdParty\\) of method Chill\\\\ThirdPartyBundle\\\\Controller\\\\ThirdPartyController\\:\\:onPostFetchEntity\\(\\) should be contravariant with parameter \\$entity \\(mixed\\) of method Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\CRUDController\\:\\:onPostFetchEntity\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyController.php
-
-		-
-			message: "#^Parameter \\#1 \\$createdAt \\(DateTimeImmutable\\) of method Chill\\\\ThirdPartyBundle\\\\Entity\\\\ThirdParty\\:\\:setCreatedAt\\(\\) should be contravariant with parameter \\$datetime \\(DateTimeInterface\\) of method Chill\\\\MainBundle\\\\Doctrine\\\\Model\\\\TrackCreationInterface\\:\\:setCreatedAt\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
-
-		-
-			message: "#^Parameter \\#1 \\$updatedAt \\(DateTimeImmutable\\) of method Chill\\\\ThirdPartyBundle\\\\Entity\\\\ThirdParty\\:\\:setUpdatedAt\\(\\) should be contravariant with parameter \\$datetime \\(DateTimeInterface\\) of method Chill\\\\MainBundle\\\\Doctrine\\\\Model\\\\TrackUpdateInterface\\:\\:setUpdatedAt\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
-
-		-
-			message: "#^Parameter \\#3 \\$limit \\(null\\) of method Chill\\\\ThirdPartyBundle\\\\Repository\\\\ThirdPartyRepository\\:\\:findBy\\(\\) should be contravariant with parameter \\$limit \\(int\\|null\\) of method Doctrine\\\\Persistence\\\\ObjectRepository\\<object\\>\\:\\:findBy\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php
-
-		-
-			message: "#^Parameter \\#4 \\$offset \\(null\\) of method Chill\\\\ThirdPartyBundle\\\\Repository\\\\ThirdPartyRepository\\:\\:findBy\\(\\) should be contravariant with parameter \\$offset \\(int\\|null\\) of method Doctrine\\\\Persistence\\\\ObjectRepository\\<object\\>\\:\\:findBy\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php
-
-		-
-			message: "#^Parameter \\#2 \\$subject \\(Chill\\\\ThirdPartyBundle\\\\Entity\\\\ThirdParty\\|null\\) of method Chill\\\\ThirdPartyBundle\\\\Security\\\\Voter\\\\ThirdPartyVoter\\:\\:voteOnAttribute\\(\\) should be contravariant with parameter \\$subject \\(mixed\\) of method Symfony\\\\Component\\\\Security\\\\Core\\\\Authorization\\\\Voter\\\\Voter\\:\\:voteOnAttribute\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php
-
-		-
-			message: "#^Parameter \\#1 \\$document \\(Chill\\\\DocStoreBundle\\\\Entity\\\\StoredObject\\) of method Chill\\\\WopiBundle\\\\Service\\\\Wopi\\\\ChillDocumentManager\\:\\:getBasename\\(\\) should be contravariant with parameter \\$document \\(ChampsLibres\\\\WopiLib\\\\Contract\\\\Entity\\\\Document\\) of method ChampsLibres\\\\WopiLib\\\\Contract\\\\Service\\\\DocumentManagerInterface\\:\\:getBasename\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
-
-		-
-			message: "#^Parameter \\#1 \\$document \\(Chill\\\\DocStoreBundle\\\\Entity\\\\StoredObject\\) of method Chill\\\\WopiBundle\\\\Service\\\\Wopi\\\\ChillDocumentManager\\:\\:getCreationDate\\(\\) should be contravariant with parameter \\$document \\(ChampsLibres\\\\WopiLib\\\\Contract\\\\Entity\\\\Document\\) of method ChampsLibres\\\\WopiLib\\\\Contract\\\\Service\\\\DocumentManagerInterface\\:\\:getCreationDate\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
-
-		-
-			message: "#^Parameter \\#1 \\$document \\(Chill\\\\DocStoreBundle\\\\Entity\\\\StoredObject\\) of method Chill\\\\WopiBundle\\\\Service\\\\Wopi\\\\ChillDocumentManager\\:\\:getDocumentId\\(\\) should be contravariant with parameter \\$document \\(ChampsLibres\\\\WopiLib\\\\Contract\\\\Entity\\\\Document\\) of method ChampsLibres\\\\WopiLib\\\\Contract\\\\Service\\\\DocumentManagerInterface\\:\\:getDocumentId\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
-
-		-
-			message: "#^Parameter \\#1 \\$document \\(Chill\\\\DocStoreBundle\\\\Entity\\\\StoredObject\\) of method Chill\\\\WopiBundle\\\\Service\\\\Wopi\\\\ChillDocumentManager\\:\\:getLastModifiedDate\\(\\) should be contravariant with parameter \\$document \\(ChampsLibres\\\\WopiLib\\\\Contract\\\\Entity\\\\Document\\) of method ChampsLibres\\\\WopiLib\\\\Contract\\\\Service\\\\DocumentManagerInterface\\:\\:getLastModifiedDate\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
diff --git a/phpstan-baseline-level-4.neon b/phpstan-baseline-level-4.neon
deleted file mode 100644
index 833a55afb..000000000
--- a/phpstan-baseline-level-4.neon
+++ /dev/null
@@ -1,4793 +0,0 @@
-parameters:
-	ignoreErrors:
-		-
-			message: "#^Access to an undefined property Chill\\\\ActivityBundle\\\\Entity\\\\Activity\\:\\:\\$personsAssociated\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Controller/ActivityController.php
-
-		-
-			message: "#^Access to an undefined property Chill\\\\ActivityBundle\\\\Entity\\\\Activity\\:\\:\\$personsNotAssociated\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Controller/ActivityController.php
-
-		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\Serializer\\\\SerializerInterface\\:\\:normalize\\(\\)\\.$#"
-			count: 2
-			path: src/Bundle/ChillActivityBundle/Controller/ActivityController.php
-
-		-
-			message: "#^Method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) invoked with 2 parameters, 1 required\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Controller/ActivityController.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and 'ChillActivityBundle…'\\|'ChillActivityBundle…' will always evaluate to false\\.$#"
-			count: 3
-			path: src/Bundle/ChillActivityBundle/Controller/ActivityController.php
-
-		-
-			message: "#^Method Chill\\\\ActivityBundle\\\\Controller\\\\ActivityReasonCategoryController\\:\\:createCreateForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php
-
-		-
-			message: "#^Method Chill\\\\ActivityBundle\\\\Controller\\\\ActivityReasonCategoryController\\:\\:createEditForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php
-
-		-
-			message: "#^Method Chill\\\\ActivityBundle\\\\Controller\\\\ActivityReasonController\\:\\:createCreateForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php
-
-		-
-			message: "#^Method Chill\\\\ActivityBundle\\\\Controller\\\\ActivityReasonController\\:\\:createEditForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php
-
-		-
-			message: "#^Else branch is unreachable because previous condition is always true\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php
-
-		-
-			message: "#^Strict comparison using \\!\\=\\= between null and Chill\\\\ActivityBundle\\\\Entity\\\\ActivityReason will always evaluate to true\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php
-
-		-
-			message: "#^Unreachable statement \\- code above always terminates\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityNotifications.php
-
-		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\NodeDefinition\\:\\:children\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php
-
-		-
-			message: "#^Method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\TreeBuilder\\:\\:getRootNode\\(\\) invoked with 1 parameter, 0 required\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php
-
-		-
-			message: "#^Property Chill\\\\ActivityBundle\\\\Entity\\\\Activity\\:\\:\\$user \\(Chill\\\\MainBundle\\\\Entity\\\\User\\) does not accept Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Entity/Activity.php
-
-		-
-			message: "#^Property Chill\\\\ActivityBundle\\\\Entity\\\\ActivityPresence\\:\\:\\$id is never written, only read\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Entity/ActivityPresence.php
-
-		-
-			message: "#^Property Chill\\\\ActivityBundle\\\\Entity\\\\ActivityReason\\:\\:\\$id is never written, only read\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Entity/ActivityReason.php
-
-		-
-			message: "#^Argument of an invalid type string supplied for foreach, only iterables are supported\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
-
-		-
-			message: "#^Binary operation \"\\.\" between 'ActivityReasonCateg…' and array results in an error\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
-
-		-
-			message: "#^Method Chill\\\\ActivityBundle\\\\Entity\\\\ActivityReasonCategory\\:\\:getName\\(\\) should return array but returns string\\.$#"
-			count: 3
-			path: src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
-
-		-
-			message: "#^Property Chill\\\\ActivityBundle\\\\Entity\\\\ActivityReasonCategory\\:\\:\\$id is never written, only read\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
-
-		-
-			message: "#^Property Chill\\\\ActivityBundle\\\\Entity\\\\ActivityReasonCategory\\:\\:\\$name \\(string\\) does not accept array\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
-
-		-
-			message: "#^Expression on left side of \\?\\? is not nullable\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/EntityListener/ActivityEntityListener.php
-
-		-
-			message: "#^Property Chill\\\\ActivityBundle\\\\Export\\\\Aggregator\\\\ACPAggregators\\\\DateAggregator\\:\\:\\$translator is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/DateAggregator.php
-
-		-
-			message: "#^PHPDoc tag @param for parameter \\$resolver with type Chill\\\\ActivityBundle\\\\Form\\\\OptionsResolverInterface is not subtype of native type Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolver\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Form/ActivityReasonCategoryType.php
-
-		-
-			message: "#^Parameter \\$resolver of method Chill\\\\ActivityBundle\\\\Form\\\\ActivityReasonCategoryType\\:\\:configureOptions\\(\\) has invalid type Chill\\\\ActivityBundle\\\\Form\\\\OptionsResolverInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Form/ActivityReasonCategoryType.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\ORM\\\\EntityRepository\\<Chill\\\\ActivityBundle\\\\Entity\\\\Activity\\>\\:\\:findByAccompanyingPeriod\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\ORM\\\\EntityRepository\\<Chill\\\\ActivityBundle\\\\Entity\\\\Activity\\>\\:\\:findByPersonImplied\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
-
-		-
-			message: "#^Method Chill\\\\ActivityBundle\\\\Repository\\\\ActivityACLAwareRepository\\:\\:findByAccompanyingPeriod\\(\\) has invalid return type Chill\\\\ActivityBundle\\\\Repository\\\\Activity\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
-
-		-
-			message: "#^Method Chill\\\\ActivityBundle\\\\Repository\\\\ActivityACLAwareRepository\\:\\:getWhereClause\\(\\) should return array but returns string\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
-
-		-
-			message: "#^Property Chill\\\\ActivityBundle\\\\Repository\\\\ActivityACLAwareRepository\\:\\:\\$repository is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
-
-		-
-			message: "#^Method Chill\\\\ActivityBundle\\\\Repository\\\\ActivityACLAwareRepositoryInterface\\:\\:findByAccompanyingPeriod\\(\\) has invalid return type Chill\\\\ActivityBundle\\\\Repository\\\\Activity\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepositoryInterface.php
-
-		-
-			message: "#^Method Chill\\\\ActivityBundle\\\\Repository\\\\ActivityACLAwareRepositoryInterface\\:\\:findByPerson\\(\\) has invalid return type Chill\\\\ActivityBundle\\\\Repository\\\\Activity\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepositoryInterface.php
-
-		-
-			message: "#^Expression on left side of \\?\\? is not nullable\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Repository/ActivityReasonRepository.php
-
-		-
-			message: "#^Property Chill\\\\ActivityBundle\\\\Service\\\\DocGenerator\\\\ActivityContext\\:\\:\\$documentCategoryRepository is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php
-
-		-
-			message: "#^Parameter \\$context of method Chill\\\\ActivityBundle\\\\Timeline\\\\TimelineActivityProvider\\:\\:getEntityTemplate\\(\\) has invalid type Chill\\\\MainBundle\\\\Timeline\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php
-
-		-
-			message: "#^Parameter \\$entity of method Chill\\\\ActivityBundle\\\\Timeline\\\\TimelineActivityProvider\\:\\:getEntityTemplate\\(\\) has invalid type Chill\\\\MainBundle\\\\Timeline\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php
-
-		-
-			message: "#^Result of && is always false\\.$#"
-			count: 7
-			path: src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidityValidator.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and Chill\\\\MainBundle\\\\Entity\\\\Embeddable\\\\CommentEmbeddable will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidityValidator.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and Chill\\\\MainBundle\\\\Entity\\\\User will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidityValidator.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and DateTime will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidityValidator.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and Doctrine\\\\Common\\\\Collections\\\\Collection will always evaluate to false\\.$#"
-			count: 2
-			path: src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidityValidator.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and bool will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidityValidator.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and string will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidityValidator.php
-
-		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\NodeDefinition\\:\\:children\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/Configuration.php
-
-		-
-			message: "#^Method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\TreeBuilder\\:\\:getRootNode\\(\\) invoked with 1 parameter, 0 required\\.$#"
-			count: 1
-			path: src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/Configuration.php
-
-		-
-			message: "#^Property Chill\\\\AsideActivityBundle\\\\Entity\\\\AsideActivity\\:\\:\\$id is never written, only read\\.$#"
-			count: 1
-			path: src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php
-
-		-
-			message: "#^Property Chill\\\\AsideActivityBundle\\\\Entity\\\\AsideActivityCategory\\:\\:\\$id is never written, only read\\.$#"
-			count: 1
-			path: src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivityCategory.php
-
-		-
-			message: "#^Call to method DateTimeImmutable\\:\\:add\\(\\) on a separate line has no effect\\.$#"
-			count: 1
-			path: src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
-
-		-
-			message: "#^Call to method DateTimeImmutable\\:\\:setTimezone\\(\\) on a separate line has no effect\\.$#"
-			count: 1
-			path: src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
-
-		-
-			message: "#^Property Chill\\\\AsideActivityBundle\\\\Form\\\\AsideActivityFormType\\:\\:\\$storage is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
-
-		-
-			message: "#^Static call to instance method Chill\\\\BudgetBundle\\\\Calculator\\\\CalculatorInterface\\:\\:getAlias\\(\\)\\.$#"
-			count: 3
-			path: src/Bundle/ChillBudgetBundle/Calculator/CalculatorManager.php
-
-		-
-			message: "#^Call to an undefined method Chill\\\\BudgetBundle\\\\Entity\\\\AbstractElement\\:\\:getId\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php
-
-		-
-			message: "#^Method Chill\\\\BudgetBundle\\\\Controller\\\\AbstractElementController\\:\\:createDeleteForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\ORM\\\\EntityRepository\\<Chill\\\\BudgetBundle\\\\Entity\\\\Charge\\>\\:\\:findByEntityAndDate\\(\\)\\.$#"
-			count: 3
-			path: src/Bundle/ChillBudgetBundle/Controller/ElementController.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\ORM\\\\EntityRepository\\<Chill\\\\BudgetBundle\\\\Entity\\\\Charge\\>\\:\\:findByHousehold\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillBudgetBundle/Controller/ElementController.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\ORM\\\\EntityRepository\\<Chill\\\\BudgetBundle\\\\Entity\\\\Charge\\>\\:\\:findByPerson\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillBudgetBundle/Controller/ElementController.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\ORM\\\\EntityRepository\\<Chill\\\\BudgetBundle\\\\Entity\\\\Resource\\>\\:\\:findByEntityAndDate\\(\\)\\.$#"
-			count: 3
-			path: src/Bundle/ChillBudgetBundle/Controller/ElementController.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\ORM\\\\EntityRepository\\<Chill\\\\BudgetBundle\\\\Entity\\\\Resource\\>\\:\\:findByHousehold\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillBudgetBundle/Controller/ElementController.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\ORM\\\\EntityRepository\\<Chill\\\\BudgetBundle\\\\Entity\\\\Resource\\>\\:\\:findByPerson\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillBudgetBundle/Controller/ElementController.php
-
-		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\NodeDefinition\\:\\:children\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillBudgetBundle/DependencyInjection/Configuration.php
-
-		-
-			message: "#^Method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\TreeBuilder\\:\\:getRootNode\\(\\) invoked with 1 parameter, 0 required\\.$#"
-			count: 1
-			path: src/Bundle/ChillBudgetBundle/DependencyInjection/Configuration.php
-
-		-
-			message: "#^Property Chill\\\\BudgetBundle\\\\Entity\\\\AbstractElement\\:\\:\\$startDate \\(DateTimeImmutable\\) does not accept null\\.$#"
-			count: 1
-			path: src/Bundle/ChillBudgetBundle/Entity/AbstractElement.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between 0 and string will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillBudgetBundle/Entity/AbstractElement.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and DateTimeImmutable will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillBudgetBundle/Entity/AbstractElement.php
-
-		-
-			message: "#^Property Chill\\\\BudgetBundle\\\\Entity\\\\ChargeKind\\:\\:\\$tags is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillBudgetBundle/Entity/ChargeKind.php
-
-		-
-			message: "#^Property Chill\\\\BudgetBundle\\\\Entity\\\\ResourceKind\\:\\:\\$tags is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillBudgetBundle/Entity/ResourceKind.php
-
-		-
-			message: "#^Method Chill\\\\BudgetBundle\\\\Repository\\\\ChargeKindRepository\\:\\:findAll\\(\\) has invalid return type Chill\\\\BudgetBundle\\\\Repository\\\\ChargeType\\.$#"
-			count: 1
-			path: src/Bundle/ChillBudgetBundle/Repository/ChargeKindRepository.php
-
-		-
-			message: "#^Method Chill\\\\BudgetBundle\\\\Repository\\\\ChargeKindRepository\\:\\:findAllActive\\(\\) has invalid return type Chill\\\\BudgetBundle\\\\Repository\\\\ChargeType\\.$#"
-			count: 1
-			path: src/Bundle/ChillBudgetBundle/Repository/ChargeKindRepository.php
-
-		-
-			message: "#^Method Chill\\\\BudgetBundle\\\\Repository\\\\ChargeKindRepository\\:\\:findAllByType\\(\\) has invalid return type Chill\\\\BudgetBundle\\\\Repository\\\\ChargeType\\.$#"
-			count: 1
-			path: src/Bundle/ChillBudgetBundle/Repository/ChargeKindRepository.php
-
-		-
-			message: "#^Method Chill\\\\BudgetBundle\\\\Repository\\\\ChargeKindRepository\\:\\:findBy\\(\\) has invalid return type Chill\\\\BudgetBundle\\\\Repository\\\\ChargeType\\.$#"
-			count: 1
-			path: src/Bundle/ChillBudgetBundle/Repository/ChargeKindRepository.php
-
-		-
-			message: "#^PHPDoc tag @param for parameter \\$limit with type mixed is not subtype of native type int\\|null\\.$#"
-			count: 1
-			path: src/Bundle/ChillBudgetBundle/Repository/ChargeKindRepository.php
-
-		-
-			message: "#^PHPDoc tag @param for parameter \\$offset with type mixed is not subtype of native type int\\|null\\.$#"
-			count: 1
-			path: src/Bundle/ChillBudgetBundle/Repository/ChargeKindRepository.php
-
-		-
-			message: "#^Method Chill\\\\BudgetBundle\\\\Repository\\\\ResourceKindRepository\\:\\:findAll\\(\\) has invalid return type Chill\\\\BudgetBundle\\\\Repository\\\\ResourceType\\.$#"
-			count: 1
-			path: src/Bundle/ChillBudgetBundle/Repository/ResourceKindRepository.php
-
-		-
-			message: "#^Method Chill\\\\BudgetBundle\\\\Repository\\\\ResourceKindRepository\\:\\:findAllActive\\(\\) has invalid return type Chill\\\\BudgetBundle\\\\Repository\\\\ResourceType\\.$#"
-			count: 1
-			path: src/Bundle/ChillBudgetBundle/Repository/ResourceKindRepository.php
-
-		-
-			message: "#^Method Chill\\\\BudgetBundle\\\\Repository\\\\ResourceKindRepository\\:\\:findAllByType\\(\\) has invalid return type Chill\\\\BudgetBundle\\\\Repository\\\\ResourceType\\.$#"
-			count: 1
-			path: src/Bundle/ChillBudgetBundle/Repository/ResourceKindRepository.php
-
-		-
-			message: "#^Method Chill\\\\BudgetBundle\\\\Repository\\\\ResourceKindRepository\\:\\:findBy\\(\\) has invalid return type Chill\\\\BudgetBundle\\\\Repository\\\\ResourceType\\.$#"
-			count: 1
-			path: src/Bundle/ChillBudgetBundle/Repository/ResourceKindRepository.php
-
-		-
-			message: "#^PHPDoc tag @param for parameter \\$limit with type mixed is not subtype of native type int\\|null\\.$#"
-			count: 1
-			path: src/Bundle/ChillBudgetBundle/Repository/ResourceKindRepository.php
-
-		-
-			message: "#^PHPDoc tag @param for parameter \\$offset with type mixed is not subtype of native type int\\|null\\.$#"
-			count: 1
-			path: src/Bundle/ChillBudgetBundle/Repository/ResourceKindRepository.php
-
-		-
-			message: "#^Property Chill\\\\BudgetBundle\\\\Service\\\\Summary\\\\SummaryBudget\\:\\:\\$chargeLabels is unused\\.$#"
-			count: 1
-			path: src/Bundle/ChillBudgetBundle/Service/Summary/SummaryBudget.php
-
-		-
-			message: "#^Property Chill\\\\BudgetBundle\\\\Service\\\\Summary\\\\SummaryBudget\\:\\:\\$resourcesLabels is unused\\.$#"
-			count: 1
-			path: src/Bundle/ChillBudgetBundle/Service/Summary/SummaryBudget.php
-
-		-
-			message: "#^Property Chill\\\\CalendarBundle\\\\Command\\\\AzureGrantAdminConsentAndAcquireToken\\:\\:\\$clientRegistry is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/Command/AzureGrantAdminConsentAndAcquireToken.php
-
-		-
-			message: "#^Property Chill\\\\CalendarBundle\\\\Command\\\\SendTestShortMessageOnCalendarCommand\\:\\:\\$phoneNumberHelper is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/Command/SendTestShortMessageOnCalendarCommand.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between false and DateInterval will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/Command/SendTestShortMessageOnCalendarCommand.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between false and DateTimeImmutable will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/Command/SendTestShortMessageOnCalendarCommand.php
-
-		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\Form\\\\FormInterface\\:\\:isClicked\\(\\)\\.$#"
-			count: 4
-			path: src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
-
-		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\Serializer\\\\SerializerInterface\\:\\:normalize\\(\\)\\.$#"
-			count: 2
-			path: src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
-
-		-
-			message: "#^Unreachable statement \\- code above always terminates\\.$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
-
-		-
-			message: "#^Property Chill\\\\CalendarBundle\\\\Controller\\\\CalendarDocController\\:\\:\\$docGeneratorTemplateRepository is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/Controller/CalendarDocController.php
-
-		-
-			message: "#^Property Chill\\\\CalendarBundle\\\\Controller\\\\CalendarDocController\\:\\:\\$serializer is unused\\.$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/Controller/CalendarDocController.php
-
-		-
-			message: "#^Method Symfony\\\\Component\\\\HttpFoundation\\\\Session\\\\SessionInterface\\:\\:remove\\(\\) invoked with 2 parameters, 1 required\\.$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarConnectAzureController.php
-
-		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\NodeDefinition\\:\\:children\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/DependencyInjection/Configuration.php
-
-		-
-			message: "#^Method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\TreeBuilder\\:\\:getRootNode\\(\\) invoked with 1 parameter, 0 required\\.$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/DependencyInjection/Configuration.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\Common\\\\Collections\\\\Collection\\:\\:matching\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/Entity/Calendar.php
-
-		-
-			message: "#^Property Chill\\\\CalendarBundle\\\\Entity\\\\CalendarRange\\:\\:\\$id is never written, only read\\.$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/Entity/CalendarRange.php
-
-		-
-			message: "#^Property Chill\\\\CalendarBundle\\\\Entity\\\\CancelReason\\:\\:\\$id is never written, only read\\.$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/Entity/CancelReason.php
-
-		-
-			message: "#^Property Chill\\\\CalendarBundle\\\\Messenger\\\\Message\\\\CalendarMessage\\:\\:\\$oldInvites \\(array\\<array\\{inviteId\\: int, userId\\: int, userEmail\\: int, userLabel\\: string\\}\\>\\) does not accept array\\<array\\{inviteId\\: int\\|null, userId\\: int\\|null, userEmail\\: string\\|null, userLabel\\: string\\}\\>\\.$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarMessage.php
-
-		-
-			message: "#^PHPDoc tag @return has invalid value \\(array\\<secret\\: string, id\\: string, expiration\\: int\\>\\)\\: Unexpected token \"\\:\", expected '\\>' at offset 408$#"
-			count: 2
-			path: src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/EventsOnUserSubscriptionCreator.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and string will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/EventsOnUserSubscriptionCreator.php
-
-		-
-			message: "#^Method Chill\\\\CalendarBundle\\\\RemoteCalendar\\\\Connector\\\\MSGraph\\\\OnBehalfOfUserTokenStorage\\:\\:getToken\\(\\) should return TheNetworg\\\\OAuth2\\\\Client\\\\Token\\\\AccessToken but returns League\\\\OAuth2\\\\Client\\\\Token\\\\AccessTokenInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/OnBehalfOfUserTokenStorage.php
-
-		-
-			message: "#^Call to method DateTimeImmutable\\:\\:setTimezone\\(\\) on a separate line has no effect\\.$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteEventConverter.php
-
-		-
-			message: "#^Unreachable statement \\- code above always terminates\\.$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteToLocalSync/CalendarSyncer.php
-
-		-
-			message: "#^Expression on left side of \\?\\? is not nullable\\.$#"
-			count: 2
-			path: src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraphRemoteCalendarConnector.php
-
-		-
-			message: "#^PHPDoc tag @return has invalid value \\(array\\{\\?id\\: string, \\?lastModifiedDateTime\\: int, \\?changeKey\\: string\\}\\)\\: Unexpected token \"\\:\", expected '\\}' at offset 129$#"
-			count: 2
-			path: src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraphRemoteCalendarConnector.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and string will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraphRemoteCalendarConnector.php
-
-		-
-			message: "#^Property Chill\\\\CalendarBundle\\\\Security\\\\Voter\\\\CalendarVoter\\:\\:\\$authorizationHelper is unused\\.$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/Security/Voter/CalendarVoter.php
-
-		-
-			message: "#^Property Chill\\\\CalendarBundle\\\\Security\\\\Voter\\\\CalendarVoter\\:\\:\\$centerResolverManager is unused\\.$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/Security/Voter/CalendarVoter.php
-
-		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\Console\\\\Helper\\\\HelperInterface\\:\\:ask\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php
-
-		-
-			message: "#^If condition is always true\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldInterface will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php
-
-		-
-			message: "#^Method Chill\\\\CustomFieldsBundle\\\\Controller\\\\CustomFieldController\\:\\:createCreateForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php
-
-		-
-			message: "#^Method Chill\\\\CustomFieldsBundle\\\\Controller\\\\CustomFieldController\\:\\:createEditForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php
-
-		-
-			message: "#^PHPDoc tag @param has invalid value \\(string\\)\\: Unexpected token \"\\\\n     \\* \", expected variable at offset 130$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php
-
-		-
-			message: "#^Ternary operator condition is always true\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\ObjectManager\\:\\:createQuery\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\ObjectRepository\\<Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomFieldsDefaultGroup\\>\\:\\:findOneByEntity\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\ObjectRepository\\<Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomFieldsGroup\\>\\:\\:findOneById\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
-
-		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\Form\\\\FormInterface\\:\\:isClicked\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
-
-		-
-			message: "#^Method Chill\\\\CustomFieldsBundle\\\\Controller\\\\CustomFieldsGroupController\\:\\:createCreateForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
-
-		-
-			message: "#^Method Chill\\\\CustomFieldsBundle\\\\Controller\\\\CustomFieldsGroupController\\:\\:createEditForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
-
-		-
-			message: "#^Method Chill\\\\CustomFieldsBundle\\\\Controller\\\\CustomFieldsGroupController\\:\\:createMakeDefaultForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
-
-		-
-			message: "#^Call to an undefined method Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface\\:\\:getFallbackLocales\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
-
-		-
-			message: "#^Method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldChoice\\:\\:buildOptionsForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\FormTypeInterface\\|null but returns Symfony\\\\Component\\\\Form\\\\FormBuilderInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
-
-		-
-			message: "#^Method Symfony\\\\Component\\\\Form\\\\FormBuilderInterface\\:\\:create\\(\\) invoked with 4 parameters, 1\\-3 required\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
-
-		-
-			message: "#^Parameter \\$builder of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldChoice\\:\\:buildForm\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\FormBuilderInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
-
-		-
-			message: "#^Parameter \\$builder of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldChoice\\:\\:buildOptionsForm\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\FormBuilderInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
-
-		-
-			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldChoice\\:\\:buildForm\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
-
-		-
-			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldChoice\\:\\:deserialize\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
-
-		-
-			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldChoice\\:\\:render\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
-
-		-
-			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldChoice\\:\\:serialize\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and array\\|string will always evaluate to false\\.$#"
-			count: 2
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
-
-		-
-			message: "#^Unreachable statement \\- code above always terminates\\.$#"
-			count: 3
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
-
-		-
-			message: "#^Method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldDate\\:\\:buildOptionsForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\FormTypeInterface\\|null but returns Symfony\\\\Component\\\\Form\\\\FormBuilderInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php
-
-		-
-			message: "#^Method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldDate\\:\\:render\\(\\) should return string but returns null\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php
-
-		-
-			message: "#^Parameter \\$builder of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldDate\\:\\:buildForm\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\FormBuilderInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php
-
-		-
-			message: "#^Parameter \\$builder of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldDate\\:\\:buildOptionsForm\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\FormBuilderInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php
-
-		-
-			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldDate\\:\\:buildForm\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php
-
-		-
-			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldDate\\:\\:deserialize\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php
-
-		-
-			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldDate\\:\\:render\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php
-
-		-
-			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldDate\\:\\:serialize\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php
-
-		-
-			message: "#^PHPDoc tag @param for parameter \\$builder with type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\FormBuilderInterface is not subtype of native type Symfony\\\\Component\\\\Form\\\\FormBuilderInterface\\.$#"
-			count: 2
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldInterface.php
-
-		-
-			message: "#^PHPDoc tag @param for parameter \\$customField with type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField is not subtype of native type Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomField\\.$#"
-			count: 4
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldInterface.php
-
-		-
-			message: "#^Parameter \\$builder of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldInterface\\:\\:buildForm\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\FormBuilderInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldInterface.php
-
-		-
-			message: "#^Parameter \\$builder of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldInterface\\:\\:buildOptionsForm\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\FormBuilderInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldInterface.php
-
-		-
-			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldInterface\\:\\:buildForm\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldInterface.php
-
-		-
-			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldInterface\\:\\:deserialize\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldInterface.php
-
-		-
-			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldInterface\\:\\:render\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldInterface.php
-
-		-
-			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldInterface\\:\\:serialize\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldInterface.php
-
-		-
-			message: "#^Anonymous function never returns null so it can be removed from the return type\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php
-
-		-
-			message: "#^Method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldLongChoice\\:\\:buildOptionsForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\FormTypeInterface\\|null but returns Symfony\\\\Component\\\\Form\\\\FormBuilderInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php
-
-		-
-			message: "#^Parameter \\$builder of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldLongChoice\\:\\:buildForm\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\FormBuilderInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php
-
-		-
-			message: "#^Parameter \\$builder of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldLongChoice\\:\\:buildOptionsForm\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\FormBuilderInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php
-
-		-
-			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldLongChoice\\:\\:buildForm\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php
-
-		-
-			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldLongChoice\\:\\:deserialize\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php
-
-		-
-			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldLongChoice\\:\\:render\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php
-
-		-
-			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldLongChoice\\:\\:serialize\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomFieldLongChoice\\\\Option will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php
-
-		-
-			message: "#^Ternary operator condition is always true\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php
-
-		-
-			message: "#^Method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldNumber\\:\\:buildOptionsForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\FormTypeInterface\\|null but returns Symfony\\\\Component\\\\Form\\\\FormBuilderInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php
-
-		-
-			message: "#^Parameter \\$builder of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldNumber\\:\\:buildForm\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\FormBuilderInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php
-
-		-
-			message: "#^Parameter \\$builder of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldNumber\\:\\:buildOptionsForm\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\FormBuilderInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php
-
-		-
-			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldNumber\\:\\:buildForm\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php
-
-		-
-			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldNumber\\:\\:deserialize\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php
-
-		-
-			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldNumber\\:\\:render\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php
-
-		-
-			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldNumber\\:\\:serialize\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php
-
-		-
-			message: "#^Method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldText\\:\\:buildOptionsForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\FormTypeInterface\\|null but returns Symfony\\\\Component\\\\Form\\\\FormBuilderInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php
-
-		-
-			message: "#^Parameter \\$builder of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldText\\:\\:buildForm\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\FormBuilderInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php
-
-		-
-			message: "#^Parameter \\$builder of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldText\\:\\:buildOptionsForm\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\FormBuilderInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php
-
-		-
-			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldText\\:\\:buildForm\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php
-
-		-
-			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldText\\:\\:deserialize\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php
-
-		-
-			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldText\\:\\:render\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php
-
-		-
-			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldText\\:\\:serialize\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php
-
-		-
-			message: "#^Property Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldText\\:\\:\\$requestStack is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php
-
-		-
-			message: "#^Method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldTitle\\:\\:buildOptionsForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\FormTypeInterface\\|null but returns Symfony\\\\Component\\\\Form\\\\FormBuilderInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php
-
-		-
-			message: "#^Parameter \\$builder of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldTitle\\:\\:buildForm\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\FormBuilderInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php
-
-		-
-			message: "#^Parameter \\$builder of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldTitle\\:\\:buildOptionsForm\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\FormBuilderInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php
-
-		-
-			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldTitle\\:\\:buildForm\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php
-
-		-
-			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldTitle\\:\\:deserialize\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php
-
-		-
-			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldTitle\\:\\:render\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php
-
-		-
-			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldTitle\\:\\:serialize\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php
-
-		-
-			message: "#^Property Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldTitle\\:\\:\\$requestStack is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php
-
-		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\NodeDefinition\\:\\:children\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/DependencyInjection/Configuration.php
-
-		-
-			message: "#^Method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\TreeBuilder\\:\\:getRootNode\\(\\) invoked with 1 parameter, 0 required\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/DependencyInjection/Configuration.php
-
-		-
-			message: "#^Method Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomField\\:\\:getName\\(\\) should return array but returns string\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php
-
-		-
-			message: "#^Property Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomField\\:\\:\\$id is never written, only read\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php
-
-		-
-			message: "#^Property Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomFieldLongChoice\\\\Option\\:\\:\\$children is never written, only read\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldLongChoice/Option.php
-
-		-
-			message: "#^Property Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomFieldLongChoice\\\\Option\\:\\:\\$id is never written, only read\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldLongChoice/Option.php
-
-		-
-			message: "#^Property Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomFieldsDefaultGroup\\:\\:\\$id is never written, only read\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsDefaultGroup.php
-
-		-
-			message: "#^Method Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomFieldsGroup\\:\\:getActiveCustomFields\\(\\) should return Doctrine\\\\Common\\\\Collections\\\\Collection but returns array\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php
-
-		-
-			message: "#^Method Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomFieldsGroup\\:\\:getName\\(\\) should return array but returns string\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php
-
-		-
-			message: "#^Property Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomFieldsGroup\\:\\:\\$id is never written, only read\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php
-
-		-
-			message: "#^Call to method buildOptionsForm\\(\\) on an unknown class Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldType.php
-
-		-
-			message: "#^PHPDoc tag @param for parameter \\$resolver with type Chill\\\\CustomFieldsBundle\\\\Form\\\\OptionsResolverInterface is not subtype of native type Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolver\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldType.php
-
-		-
-			message: "#^Parameter \\$resolver of method Chill\\\\CustomFieldsBundle\\\\Form\\\\CustomFieldType\\:\\:configureOptions\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\Form\\\\OptionsResolverInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldType.php
-
-		-
-			message: "#^Property Chill\\\\CustomFieldsBundle\\\\Form\\\\CustomFieldsGroupType\\:\\:\\$translator \\(Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\) does not accept Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldsGroupType.php
-
-		-
-			message: "#^Instanceof between Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomFieldsGroup and Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomFieldsGroup will always evaluate to true\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/CustomFieldsGroupToIdTransformer.php
-
-		-
-			message: "#^Instanceof between string and Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomFieldsGroup will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/CustomFieldsGroupToIdTransformer.php
-
-		-
-			message: "#^Method Chill\\\\CustomFieldsBundle\\\\Form\\\\DataTransformer\\\\CustomFieldsGroupToIdTransformer\\:\\:transform\\(\\) should return string but returns int\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/CustomFieldsGroupToIdTransformer.php
-
-		-
-			message: "#^Call to an undefined method Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomField\\:\\:getLabel\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/JsonCustomFieldToArrayTransformer.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\ObjectRepository\\<object\\>\\:\\:findOneById\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/JsonCustomFieldToArrayTransformer.php
-
-		-
-			message: "#^Call to method getCustomFieldByType\\(\\) on an unknown class Chill\\\\CustomFieldsBundle\\\\Form\\\\Type\\\\CustomFieldCompiler\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Form/Type/CustomFieldType.php
-
-		-
-			message: "#^Property Chill\\\\CustomFieldsBundle\\\\Form\\\\Type\\\\CustomFieldType\\:\\:\\$customFieldCompiler \\(Chill\\\\CustomFieldsBundle\\\\Form\\\\Type\\\\CustomFieldCompiler\\) does not accept Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldProvider\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Form/Type/CustomFieldType.php
-
-		-
-			message: "#^Property Chill\\\\CustomFieldsBundle\\\\Form\\\\Type\\\\CustomFieldType\\:\\:\\$customFieldCompiler has unknown class Chill\\\\CustomFieldsBundle\\\\Form\\\\Type\\\\CustomFieldCompiler as its type\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Form/Type/CustomFieldType.php
-
-		-
-			message: "#^Property Chill\\\\CustomFieldsBundle\\\\Form\\\\Type\\\\CustomFieldType\\:\\:\\$om is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Form/Type/CustomFieldType.php
-
-		-
-			message: "#^Invalid array key type Chill\\\\CustomFieldsBundle\\\\Service\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldProvider.php
-
-		-
-			message: "#^Method Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldProvider\\:\\:getCustomFieldByType\\(\\) has invalid return type Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldProvider.php
-
-		-
-			message: "#^Parameter \\$serviceName of method Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldProvider\\:\\:addCustomField\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\Service\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldProvider.php
-
-		-
-			message: "#^Parameter \\$type of method Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldProvider\\:\\:addCustomField\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\Service\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldProvider.php
-
-		-
-			message: "#^Property Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldProvider\\:\\:\\$container \\(Chill\\\\CustomFieldsBundle\\\\Service\\\\Container\\) does not accept Symfony\\\\Component\\\\DependencyInjection\\\\ContainerInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldProvider.php
-
-		-
-			message: "#^Property Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldProvider\\:\\:\\$container has unknown class Chill\\\\CustomFieldsBundle\\\\Service\\\\Container as its type\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldProvider.php
-
-		-
-			message: "#^Property Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldProvider\\:\\:\\$container is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldProvider.php
-
-		-
-			message: "#^Call to method deserialize\\(\\) on an unknown class Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelper.php
-
-		-
-			message: "#^Call to method isEmptyValue\\(\\) on an unknown class Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelper.php
-
-		-
-			message: "#^Call to method render\\(\\) on an unknown class Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelper.php
-
-		-
-			message: "#^Method Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldsHelper\\:\\:renderCustomField\\(\\) has invalid return type Chill\\\\CustomFieldsBundle\\\\Service\\\\The\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelper.php
-
-		-
-			message: "#^Property Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldsHelper\\:\\:\\$em is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelper.php
-
-		-
-			message: "#^Method Chill\\\\CustomFieldsBundle\\\\Templating\\\\Twig\\\\CustomFieldRenderingTwig\\:\\:renderWidget\\(\\) should return string but returns Chill\\\\CustomFieldsBundle\\\\Service\\\\The\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldRenderingTwig.php
-
-		-
-			message: "#^Property Chill\\\\CustomFieldsBundle\\\\Templating\\\\Twig\\\\CustomFieldRenderingTwig\\:\\:\\$container \\(Symfony\\\\Component\\\\DependencyInjection\\\\Container\\) does not accept Symfony\\\\Component\\\\DependencyInjection\\\\ContainerInterface\\|null\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldRenderingTwig.php
-
-		-
-			message: "#^Parameter \\$customFielsGroup of method Chill\\\\CustomFieldsBundle\\\\Templating\\\\Twig\\\\CustomFieldsGroupRenderingTwig\\:\\:renderWidget\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\Templating\\\\Twig\\\\CustomFieldsGroud\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldsGroupRenderingTwig.php
-
-		-
-			message: "#^Property Chill\\\\CustomFieldsBundle\\\\Templating\\\\Twig\\\\CustomFieldsGroupRenderingTwig\\:\\:\\$container \\(Symfony\\\\Component\\\\DependencyInjection\\\\Container\\) does not accept Symfony\\\\Component\\\\DependencyInjection\\\\ContainerInterface\\|null\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldsGroupRenderingTwig.php
-
-		-
-			message: "#^Left side of && is always true\\.$#"
-			count: 1
-			path: src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
-
-		-
-			message: "#^PHPDoc tag @return with type void is incompatible with native type Symfony\\\\Component\\\\HttpFoundation\\\\RedirectResponse\\.$#"
-			count: 1
-			path: src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and int will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
-
-		-
-			message: "#^Binary operation \"\\.\" between 'Adding doc…' and array\\{filename\\: 'pKNlhCrQDCRsAuC8vYH…', key\\: '\\{\"alg\"\\:\"A256CBC\",…', iv\\: '\\[86,231,83,148,117…', type\\: 'application/vnd…'\\} results in an error\\.$#"
-			count: 1
-			path: src/Bundle/ChillDocGeneratorBundle/DataFixtures/ORM/LoadDocGeneratorTemplate.php
-
-		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\NodeDefinition\\:\\:children\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillDocGeneratorBundle/DependencyInjection/Configuration.php
-
-		-
-			message: "#^Property Chill\\\\DocGeneratorBundle\\\\Entity\\\\DocGeneratorTemplate\\:\\:\\$id is never written, only read\\.$#"
-			count: 1
-			path: src/Bundle/ChillDocGeneratorBundle/Entity/DocGeneratorTemplate.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and Doctrine\\\\Common\\\\Collections\\\\Collection will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/CollectionDocGenNormalizer.php
-
-		-
-			message: "#^Call to an undefined method ReflectionType\\:\\:getName\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/DocGenObjectNormalizer.php
-
-		-
-			message: "#^Expression on left side of \\?\\? is not nullable\\.$#"
-			count: 1
-			path: src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/DocGenObjectNormalizer.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod will always evaluate to false\\.$#"
-			count: 2
-			path: src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\ObjectManager\\:\\:createQuery\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php
-
-		-
-			message: "#^Method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) invoked with 2 parameters, 1 required\\.$#"
-			count: 4
-			path: src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and Chill\\\\PersonBundle\\\\Entity\\\\Person will always evaluate to false\\.$#"
-			count: 2
-			path: src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
-
-		-
-			message: "#^Method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\TreeBuilder\\:\\:getRootNode\\(\\) invoked with 1 parameter, 0 required\\.$#"
-			count: 1
-			path: src/Bundle/ChillDocStoreBundle/DependencyInjection/Configuration.php
-
-		-
-			message: "#^Property Chill\\\\DocStoreBundle\\\\Entity\\\\Document\\:\\:\\$id is never written, only read\\.$#"
-			count: 1
-			path: src/Bundle/ChillDocStoreBundle/Entity/Document.php
-
-		-
-			message: "#^Property Chill\\\\DocStoreBundle\\\\Entity\\\\Document\\:\\:\\$user has unknown class Chill\\\\PersonBundle\\\\Entity\\\\user as its type\\.$#"
-			count: 1
-			path: src/Bundle/ChillDocStoreBundle/Entity/Document.php
-
-		-
-			message: "#^Property Chill\\\\DocStoreBundle\\\\Entity\\\\StoredObject\\:\\:\\$id is never written, only read\\.$#"
-			count: 1
-			path: src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\ORM\\\\EntityRepository\\<Chill\\\\DocStoreBundle\\\\Entity\\\\StoredObject\\>\\:\\:findByFilename\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillDocStoreBundle/Object/ObjectToAsyncFileTransformer.php
-
-		-
-			message: "#^Property Chill\\\\DocStoreBundle\\\\Repository\\\\AccompanyingCourseDocumentRepository\\:\\:\\$em is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillDocStoreBundle/Repository/AccompanyingCourseDocumentRepository.php
-
-		-
-			message: "#^Property Chill\\\\DocStoreBundle\\\\Repository\\\\DocumentCategoryRepository\\:\\:\\$em is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillDocStoreBundle/Repository/DocumentCategoryRepository.php
-
-		-
-			message: "#^Instanceof between Chill\\\\DocStoreBundle\\\\Entity\\\\PersonDocument and Chill\\\\DocStoreBundle\\\\Entity\\\\PersonDocument will always evaluate to true\\.$#"
-			count: 1
-			path: src/Bundle/ChillDocStoreBundle/Security/Authorization/PersonDocumentVoter.php
-
-		-
-			message: "#^Default value of the parameter \\#5 \\$options \\(array\\{\\}\\) of method Chill\\\\DocStoreBundle\\\\Templating\\\\WopiEditTwigExtensionRuntime\\:\\:renderButtonGroup\\(\\) is incompatible with type array\\{small\\: bool\\}\\.$#"
-			count: 1
-			path: src/Bundle/ChillDocStoreBundle/Templating/WopiEditTwigExtensionRuntime.php
-
-		-
-			message: "#^Property Chill\\\\DocStoreBundle\\\\Templating\\\\WopiEditTwigExtensionRuntime\\:\\:\\$discovery is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillDocStoreBundle/Templating/WopiEditTwigExtensionRuntime.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\ObjectRepository\\<Chill\\\\EventBundle\\\\Entity\\\\Participation\\>\\:\\:countByPerson\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Controller/EventController.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\ObjectRepository\\<Chill\\\\EventBundle\\\\Entity\\\\Participation\\>\\:\\:findByPersonInCircle\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Controller/EventController.php
-
-		-
-			message: "#^Cannot call method getUsernameCanonical\\(\\) on int\\<min, \\-1\\>\\|int\\<1, max\\>\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Controller/EventController.php
-
-		-
-			message: "#^Method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) invoked with 2 parameters, 1 required\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Controller/EventController.php
-
-		-
-			message: "#^Negated boolean expression is always false\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Controller/EventController.php
-
-		-
-			message: "#^Method Chill\\\\EventBundle\\\\Controller\\\\EventTypeController\\:\\:createCreateForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Controller/EventTypeController.php
-
-		-
-			message: "#^Method Chill\\\\EventBundle\\\\Controller\\\\EventTypeController\\:\\:createDeleteForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Controller/EventTypeController.php
-
-		-
-			message: "#^Method Chill\\\\EventBundle\\\\Controller\\\\EventTypeController\\:\\:createEditForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Controller/EventTypeController.php
-
-		-
-			message: "#^Call to an undefined method Traversable\\:\\:count\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Controller/ParticipationController.php
-
-		-
-			message: "#^Call to an undefined method Traversable\\:\\:current\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Controller/ParticipationController.php
-
-		-
-			message: "#^Method Chill\\\\EventBundle\\\\Controller\\\\ParticipationController\\:\\:handleRequest\\(\\) has invalid return type Chill\\\\EventBundle\\\\Controller\\\\Participations\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Controller/ParticipationController.php
-
-		-
-			message: "#^Strict comparison using \\!\\=\\= between null and int will always evaluate to true\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Controller/ParticipationController.php
-
-		-
-			message: "#^Strict comparison using \\!\\=\\= between null and int\\|string will always evaluate to true\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Controller/ParticipationController.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and Chill\\\\EventBundle\\\\Entity\\\\Event will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Controller/ParticipationController.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and Chill\\\\EventBundle\\\\Entity\\\\Participation will always evaluate to false\\.$#"
-			count: 2
-			path: src/Bundle/ChillEventBundle/Controller/ParticipationController.php
-
-		-
-			message: "#^Method Chill\\\\EventBundle\\\\Controller\\\\RoleController\\:\\:createCreateForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Controller/RoleController.php
-
-		-
-			message: "#^Method Chill\\\\EventBundle\\\\Controller\\\\RoleController\\:\\:createDeleteForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Controller/RoleController.php
-
-		-
-			message: "#^Method Chill\\\\EventBundle\\\\Controller\\\\RoleController\\:\\:createEditForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Controller/RoleController.php
-
-		-
-			message: "#^Method Chill\\\\EventBundle\\\\Controller\\\\StatusController\\:\\:createCreateForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Controller/StatusController.php
-
-		-
-			message: "#^Method Chill\\\\EventBundle\\\\Controller\\\\StatusController\\:\\:createDeleteForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Controller/StatusController.php
-
-		-
-			message: "#^Method Chill\\\\EventBundle\\\\Controller\\\\StatusController\\:\\:createEditForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Controller/StatusController.php
-
-		-
-			message: "#^Method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\TreeBuilder\\:\\:getRootNode\\(\\) invoked with 1 parameter, 0 required\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/DependencyInjection/Configuration.php
-
-		-
-			message: "#^Call to an undefined method Chill\\\\EventBundle\\\\Entity\\\\Participation\\:\\:getIterator\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Entity/Event.php
-
-		-
-			message: "#^Call to an undefined method Chill\\\\EventBundle\\\\Entity\\\\Participation\\:\\:removeElement\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Entity/Event.php
-
-		-
-			message: "#^Method Chill\\\\EventBundle\\\\Entity\\\\Event\\:\\:getModerator\\(\\) should return int but returns Chill\\\\MainBundle\\\\Entity\\\\User\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Entity/Event.php
-
-		-
-			message: "#^Property Chill\\\\EventBundle\\\\Entity\\\\Event\\:\\:\\$id is never written, only read\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Entity/Event.php
-
-		-
-			message: "#^Property Chill\\\\EventBundle\\\\Entity\\\\Event\\:\\:\\$moderator \\(Chill\\\\MainBundle\\\\Entity\\\\User\\) does not accept int\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Entity/Event.php
-
-		-
-			message: "#^Property Chill\\\\EventBundle\\\\Entity\\\\Event\\:\\:\\$participations \\(Chill\\\\EventBundle\\\\Entity\\\\Participation\\) does not accept Doctrine\\\\Common\\\\Collections\\\\ArrayCollection\\<\\*NEVER\\*, \\*NEVER\\*\\>\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Entity/Event.php
-
-		-
-			message: "#^Property Chill\\\\EventBundle\\\\Entity\\\\EventType\\:\\:\\$id is never written, only read\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Entity/EventType.php
-
-		-
-			message: "#^Property Chill\\\\EventBundle\\\\Entity\\\\Participation\\:\\:\\$id is never written, only read\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Entity/Participation.php
-
-		-
-			message: "#^Result of \\|\\| is always false\\.$#"
-			count: 2
-			path: src/Bundle/ChillEventBundle/Entity/Participation.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between Chill\\\\EventBundle\\\\Entity\\\\Event and null will always evaluate to false\\.$#"
-			count: 3
-			path: src/Bundle/ChillEventBundle/Entity/Participation.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between Chill\\\\EventBundle\\\\Entity\\\\Role and null will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Entity/Participation.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between Chill\\\\EventBundle\\\\Entity\\\\Status and null will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Entity/Participation.php
-
-		-
-			message: "#^Property Chill\\\\EventBundle\\\\Entity\\\\Role\\:\\:\\$id is never written, only read\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Entity/Role.php
-
-		-
-			message: "#^Property Chill\\\\EventBundle\\\\Entity\\\\Status\\:\\:\\$id is never written, only read\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Entity/Status.php
-
-		-
-			message: "#^Call to method setDefaults\\(\\) on an unknown class Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolverInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Form/EventTypeType.php
-
-		-
-			message: "#^Call to method setDefaults\\(\\) on an unknown class Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolverInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Form/RoleType.php
-
-		-
-			message: "#^Call to method setDefaults\\(\\) on an unknown class Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolverInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Form/StatusType.php
-
-		-
-			message: "#^Property Chill\\\\EventBundle\\\\Form\\\\Type\\\\PickEventType\\:\\:\\$user \\(Chill\\\\MainBundle\\\\Entity\\\\User\\) does not accept string\\|Stringable\\|Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Form/Type/PickEventType.php
-
-		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\Form\\\\ResolvedFormTypeInterface\\:\\:getName\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Form/Type/PickRoleType.php
-
-		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\Form\\\\ResolvedFormTypeInterface\\:\\:getName\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Form/Type/PickStatusType.php
-
-		-
-			message: "#^Method Chill\\\\EventBundle\\\\Search\\\\EventSearch\\:\\:renderResult\\(\\) should return string but returns array\\<string, array\\<int\\|string, array\\<string, mixed\\>\\|bool\\>\\>\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Search/EventSearch.php
-
-		-
-			message: "#^Property Chill\\\\EventBundle\\\\Search\\\\EventSearch\\:\\:\\$user \\(Chill\\\\MainBundle\\\\Entity\\\\User\\) does not accept string\\|Stringable\\|Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Search/EventSearch.php
-
-		-
-			message: "#^Instanceof between Chill\\\\EventBundle\\\\Entity\\\\Event and Chill\\\\EventBundle\\\\Entity\\\\Event will always evaluate to true\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Security/Authorization/EventVoter.php
-
-		-
-			message: "#^Unreachable statement \\- code above always terminates\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Security/Authorization/EventVoter.php
-
-		-
-			message: "#^Instanceof between Chill\\\\EventBundle\\\\Entity\\\\Participation and Chill\\\\EventBundle\\\\Entity\\\\Participation will always evaluate to true\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Security/Authorization/ParticipationVoter.php
-
-		-
-			message: "#^Unreachable statement \\- code above always terminates\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Security/Authorization/ParticipationVoter.php
-
-		-
-			message: "#^Parameter \\#2 \\$context \\(string\\) of method Chill\\\\EventBundle\\\\Timeline\\\\TimelineEventProvider\\:\\:getEntityTemplate\\(\\) should be compatible with parameter \\$context \\(Chill\\\\MainBundle\\\\Timeline\\\\type\\) of method Chill\\\\MainBundle\\\\Timeline\\\\TimelineProviderInterface\\:\\:getEntityTemplate\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Timeline/TimelineEventProvider.php
-
-		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\NodeDefinition\\:\\:children\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillFamilyMembersBundle/DependencyInjection/Configuration.php
-
-		-
-			message: "#^Method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\TreeBuilder\\:\\:getRootNode\\(\\) invoked with 1 parameter, 0 required\\.$#"
-			count: 1
-			path: src/Bundle/ChillFamilyMembersBundle/DependencyInjection/Configuration.php
-
-		-
-			message: "#^Instanceof between DateTimeImmutable and DateTime will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillFamilyMembersBundle/Entity/AbstractFamilyMember.php
-
-		-
-			message: "#^Instanceof between DateTimeImmutable and DateTimeImmutable will always evaluate to true\\.$#"
-			count: 2
-			path: src/Bundle/ChillFamilyMembersBundle/Entity/AbstractFamilyMember.php
-
-		-
-			message: "#^Method Chill\\\\FamilyMembersBundle\\\\Entity\\\\AbstractFamilyMember\\:\\:getBirthdate\\(\\) has invalid return type Chill\\\\FamilyMembersBundle\\\\Entity\\\\date_immutable\\.$#"
-			count: 1
-			path: src/Bundle/ChillFamilyMembersBundle/Entity/AbstractFamilyMember.php
-
-		-
-			message: "#^Method Chill\\\\FamilyMembersBundle\\\\Entity\\\\AbstractFamilyMember\\:\\:setBirthdate\\(\\) should return Chill\\\\FamilyMembersBundle\\\\Entity\\\\FamilyMember but returns \\$this\\(Chill\\\\FamilyMembersBundle\\\\Entity\\\\AbstractFamilyMember\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillFamilyMembersBundle/Entity/AbstractFamilyMember.php
-
-		-
-			message: "#^Method Chill\\\\FamilyMembersBundle\\\\Entity\\\\AbstractFamilyMember\\:\\:setEndDate\\(\\) should return Chill\\\\FamilyMembersBundle\\\\Entity\\\\FamilyMember but returns \\$this\\(Chill\\\\FamilyMembersBundle\\\\Entity\\\\AbstractFamilyMember\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillFamilyMembersBundle/Entity/AbstractFamilyMember.php
-
-		-
-			message: "#^Method Chill\\\\FamilyMembersBundle\\\\Entity\\\\AbstractFamilyMember\\:\\:setFirstname\\(\\) should return Chill\\\\FamilyMembersBundle\\\\Entity\\\\FamilyMember but returns \\$this\\(Chill\\\\FamilyMembersBundle\\\\Entity\\\\AbstractFamilyMember\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillFamilyMembersBundle/Entity/AbstractFamilyMember.php
-
-		-
-			message: "#^Method Chill\\\\FamilyMembersBundle\\\\Entity\\\\AbstractFamilyMember\\:\\:setGender\\(\\) should return Chill\\\\FamilyMembersBundle\\\\Entity\\\\FamilyMember but returns \\$this\\(Chill\\\\FamilyMembersBundle\\\\Entity\\\\AbstractFamilyMember\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillFamilyMembersBundle/Entity/AbstractFamilyMember.php
-
-		-
-			message: "#^Method Chill\\\\FamilyMembersBundle\\\\Entity\\\\AbstractFamilyMember\\:\\:setLastname\\(\\) should return Chill\\\\FamilyMembersBundle\\\\Entity\\\\FamilyMember but returns \\$this\\(Chill\\\\FamilyMembersBundle\\\\Entity\\\\AbstractFamilyMember\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillFamilyMembersBundle/Entity/AbstractFamilyMember.php
-
-		-
-			message: "#^Method Chill\\\\FamilyMembersBundle\\\\Entity\\\\AbstractFamilyMember\\:\\:setLink\\(\\) should return Chill\\\\FamilyMembersBundle\\\\Entity\\\\FamilyMember but returns \\$this\\(Chill\\\\FamilyMembersBundle\\\\Entity\\\\AbstractFamilyMember\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillFamilyMembersBundle/Entity/AbstractFamilyMember.php
-
-		-
-			message: "#^Method Chill\\\\FamilyMembersBundle\\\\Entity\\\\AbstractFamilyMember\\:\\:setProfessionnalSituation\\(\\) should return Chill\\\\FamilyMembersBundle\\\\Entity\\\\FamilyMember but returns \\$this\\(Chill\\\\FamilyMembersBundle\\\\Entity\\\\AbstractFamilyMember\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillFamilyMembersBundle/Entity/AbstractFamilyMember.php
-
-		-
-			message: "#^Method Chill\\\\FamilyMembersBundle\\\\Entity\\\\AbstractFamilyMember\\:\\:setStartDate\\(\\) should return Chill\\\\FamilyMembersBundle\\\\Entity\\\\FamilyMember but returns \\$this\\(Chill\\\\FamilyMembersBundle\\\\Entity\\\\AbstractFamilyMember\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillFamilyMembersBundle/Entity/AbstractFamilyMember.php
-
-		-
-			message: "#^Property Chill\\\\FamilyMembersBundle\\\\Entity\\\\AbstractFamilyMember\\:\\:\\$birthdate \\(Chill\\\\FamilyMembersBundle\\\\Entity\\\\date_immutable\\|null\\) does not accept DateTimeImmutable\\.$#"
-			count: 1
-			path: src/Bundle/ChillFamilyMembersBundle/Entity/AbstractFamilyMember.php
-
-		-
-			message: "#^Property Chill\\\\FamilyMembersBundle\\\\Entity\\\\AbstractFamilyMember\\:\\:\\$birthdate \\(Chill\\\\FamilyMembersBundle\\\\Entity\\\\date_immutable\\|null\\) does not accept DateTimeImmutable\\|null\\.$#"
-			count: 1
-			path: src/Bundle/ChillFamilyMembersBundle/Entity/AbstractFamilyMember.php
-
-		-
-			message: "#^Property Chill\\\\FamilyMembersBundle\\\\Entity\\\\AbstractFamilyMember\\:\\:\\$birthdate has unknown class Chill\\\\FamilyMembersBundle\\\\Entity\\\\date_immutable as its type\\.$#"
-			count: 1
-			path: src/Bundle/ChillFamilyMembersBundle/Entity/AbstractFamilyMember.php
-
-		-
-			message: "#^Result of \\|\\| is always true\\.$#"
-			count: 3
-			path: src/Bundle/ChillFamilyMembersBundle/Entity/AbstractFamilyMember.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and DateTimeImmutable will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillFamilyMembersBundle/Entity/AbstractFamilyMember.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and null will always evaluate to true\\.$#"
-			count: 1
-			path: src/Bundle/ChillFamilyMembersBundle/Entity/AbstractFamilyMember.php
-
-		-
-			message: "#^Property Chill\\\\FamilyMembersBundle\\\\Entity\\\\FamilyMember\\:\\:\\$id is never written, only read\\.$#"
-			count: 1
-			path: src/Bundle/ChillFamilyMembersBundle/Entity/FamilyMember.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\ObjectManager\\:\\:createQueryBuilder\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php
-
-		-
-			message: "#^Call to method select\\(\\) on an unknown class Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\QueryBuilder\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php
-
-		-
-			message: "#^Call to method setFirstResult\\(\\) on an unknown class Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\QueryBuilder\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\AbstractCRUDController\\:\\:buildQueryEntities\\(\\) has invalid return type Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\QueryBuilder\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php
-
-		-
-			message: "#^PHPDoc tag @throws with type Symfony\\\\Component\\\\Security\\\\Core\\\\Exception\\\\AccessDeniedHttpException is not subtype of Throwable$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php
-
-		-
-			message: "#^PHPDoc tag @param for parameter \\$postedDataContext with type string is incompatible with native type array\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
-
-		-
-			message: "#^PHPDoc tag @param has invalid value \\(mixed id\\)\\: Unexpected token \"id\", expected variable at offset 956$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
-
-		-
-			message: "#^PHPDoc tag @param has invalid value \\(string action\\)\\: Unexpected token \"action\", expected variable at offset 929$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
-
-		-
-			message: "#^PHPDoc tag @return with type void is incompatible with native type Symfony\\\\Component\\\\HttpFoundation\\\\Response\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and object will always evaluate to false\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
-
-		-
-			message: "#^Unreachable statement \\- code above always terminates\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\ObjectManager\\:\\:createQueryBuilder\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
-
-		-
-			message: "#^Call to method getQuery\\(\\) on an unknown class Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
-
-		-
-			message: "#^Instanceof between Symfony\\\\Component\\\\HttpFoundation\\\\RedirectResponse and Symfony\\\\Component\\\\HttpFoundation\\\\Response will always evaluate to true\\.$#"
-			count: 3
-			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\CRUDController\\:\\:index\\(\\) has invalid return type Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\CRUDController\\:\\:queryEntities\\(\\) has invalid return type Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
-
-		-
-			message: "#^PHPDoc tag @throws with type Symfony\\\\Component\\\\Security\\\\Core\\\\Exception\\\\AccessDeniedHttpException is not subtype of Throwable$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
-
-		-
-			message: "#^Parameter \\$formClass of method Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\CRUDController\\:\\:formCreateAction\\(\\) has invalid type Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
-
-		-
-			message: "#^Unreachable statement \\- code above always terminates\\.$#"
-			count: 3
-			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
-
-		-
-			message: "#^Constant Chill\\\\MainBundle\\\\CRUD\\\\Routing\\\\CRUDRoutesLoader\\:\\:ALL_INDEX_METHODS is unused\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/CRUD/Routing/CRUDRoutesLoader.php
-
-		-
-			message: "#^Constant Chill\\\\MainBundle\\\\CRUD\\\\Routing\\\\CRUDRoutesLoader\\:\\:ALL_SINGLE_METHODS is unused\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/CRUD/Routing/CRUDRoutesLoader.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between 'CRUD' and null will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/CRUD/Routing/CRUDRoutesLoader.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between 'collection' and 'single'\\|null will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/CRUD/Routing/CRUDRoutesLoader.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\ORM\\\\EntityRepository\\<Chill\\\\MainBundle\\\\Entity\\\\Center\\>\\:\\:findOneByName\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Command\\\\ChillImportUsersCommand\\:\\:getCenters\\(\\) should return array\\<Chill\\\\MainBundle\\\\Entity\\\\Center\\> but returns null\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Command\\\\ChillUserSendRenewPasswordCodeCommand\\:\\:\\$output is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Command/ChillUserSendRenewPasswordCodeCommand.php
-
-		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\Console\\\\Helper\\\\HelperInterface\\:\\:askHiddenResponse\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Command/SetPasswordCommand.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Controller\\\\CenterController\\:\\:createCreateForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/CenterController.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Controller\\\\CenterController\\:\\:createEditForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/CenterController.php
-
-		-
-			message: "#^Instanceof between Chill\\\\MainBundle\\\\Export\\\\DirectExportInterface and Chill\\\\MainBundle\\\\Export\\\\DirectExportInterface will always evaluate to true\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/ExportController.php
-
-		-
-			message: "#^PHPDoc tag @param for parameter \\$request with type string is incompatible with native type Symfony\\\\Component\\\\HttpFoundation\\\\Request\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/ExportController.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and string will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/ExportController.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\ObjectManager\\:\\:createQueryBuilder\\(\\)\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Controller/PasswordController.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\ObjectRepository\\<Chill\\\\MainBundle\\\\Entity\\\\User\\>\\:\\:findOneByUsernameCanonical\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/PasswordController.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Controller\\\\PasswordController\\:\\:passwordForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/PasswordController.php
-
-		-
-			message: "#^Method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) invoked with 2 parameters, 1 required\\.$#"
-			count: 4
-			path: src/Bundle/ChillMainBundle/Controller/PasswordController.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Controller\\\\PermissionsGroupController\\:\\:addLinkRoleScopeAction\\(\\) has invalid return type Chill\\\\MainBundle\\\\Controller\\\\Respon\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Controller\\\\PermissionsGroupController\\:\\:addLinkRoleScopeAction\\(\\) should return Chill\\\\MainBundle\\\\Controller\\\\Respon but returns Symfony\\\\Component\\\\HttpFoundation\\\\RedirectResponse\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Controller\\\\PermissionsGroupController\\:\\:addLinkRoleScopeAction\\(\\) should return Chill\\\\MainBundle\\\\Controller\\\\Respon but returns Symfony\\\\Component\\\\HttpFoundation\\\\Response\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Controller\\\\PermissionsGroupController\\:\\:createAddRoleScopeForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Controller\\\\PermissionsGroupController\\:\\:createCreateForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Controller\\\\PermissionsGroupController\\:\\:createDeleteRoleScopeForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Controller\\\\PermissionsGroupController\\:\\:createEditForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Controller\\\\PermissionsGroupController\\:\\:deleteLinkRoleScopeAction\\(\\) has invalid return type Chill\\\\MainBundle\\\\Controller\\\\redirection\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Controller\\\\PermissionsGroupController\\:\\:deleteLinkRoleScopeAction\\(\\) should return Chill\\\\MainBundle\\\\Controller\\\\redirection but returns Symfony\\\\Component\\\\HttpFoundation\\\\RedirectResponse\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php
-
-		-
-			message: "#^PHPDoc tag @param for parameter \\$permissionsGroup with type mixed is not subtype of native type Chill\\\\MainBundle\\\\Entity\\\\PermissionsGroup\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php
-
-		-
-			message: "#^PHPDoc tag @throws with type Chill\\\\MainBundle\\\\Controller\\\\type is not subtype of Throwable$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\ObjectManager\\:\\:createQuery\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/PostalCodeController.php
-
-		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\HttpFoundation\\\\Session\\\\SessionInterface\\:\\:getFlashBag\\(\\)\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Controller/SavedExportController.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Controller\\\\ScopeController\\:\\:createCreateForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/ScopeController.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Controller\\\\ScopeController\\:\\:createEditForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/ScopeController.php
-
-		-
-			message: "#^Call to method buildForm\\(\\) on an unknown class Chill\\\\MainBundle\\\\Search\\\\HasAdvancedSearchForm\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/SearchController.php
-
-		-
-			message: "#^Call to method convertFormDataToQuery\\(\\) on an unknown class Chill\\\\MainBundle\\\\Search\\\\HasAdvancedSearchForm\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/SearchController.php
-
-		-
-			message: "#^Call to method convertTermsToFormData\\(\\) on an unknown class Chill\\\\MainBundle\\\\Search\\\\HasAdvancedSearchForm\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/SearchController.php
-
-		-
-			message: "#^Call to method getAdvancedSearchTitle\\(\\) on an unknown class Chill\\\\MainBundle\\\\Search\\\\HasAdvancedSearchForm\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/SearchController.php
-
-		-
-			message: "#^PHPDoc tag @var for variable \\$variable contains unknown class Chill\\\\MainBundle\\\\Controller\\\\Chill\\\\MainBundle\\\\Search\\\\HasAdvancedSearchFormInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/SearchController.php
-
-		-
-			message: "#^PHPDoc tag @var for variable \\$variable contains unknown class Chill\\\\MainBundle\\\\Controller\\\\Chill\\\\MainBundle\\\\Search\\\\SearchProvider\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Controller/SearchController.php
-
-		-
-			message: "#^Variable \\$variable in PHPDoc tag @var does not match assigned variable \\$search\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/SearchController.php
-
-		-
-			message: "#^Variable \\$variable in PHPDoc tag @var does not match assigned variable \\$searchProvider\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Controller/SearchController.php
-
-		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\:\\:getGroupCenters\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/TimelineCenterController.php
-
-		-
-			message: "#^Instanceof between Symfony\\\\Component\\\\HttpFoundation\\\\RedirectResponse and Symfony\\\\Component\\\\HttpFoundation\\\\Response will always evaluate to true\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/UserController.php
-
-		-
-			message: "#^Unreachable statement \\- code above always terminates\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/UserController.php
-
-		-
-			message: "#^PHPDoc tag @return has invalid value \\(array\\<0\\: CronJobInterface\\[\\], 1\\: array\\<string, CronJobExecution\\>\\>\\)\\: Unexpected token \"\\:\", expected '\\>' at offset 26$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Cron/CronManager.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\DataFixtures\\\\ORM\\\\LoadAddressReferences\\:\\:\\$container is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAddressReferences.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\DataFixtures\\\\ORM\\\\LoadLocationType\\:\\:\\$container is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLocationType.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\DataFixtures\\\\ORM\\\\LoadUsers\\:\\:\\$container is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUsers.php
-
-		-
-			message: "#^Parameter \\$factory of method Chill\\\\MainBundle\\\\DependencyInjection\\\\ChillMainExtension\\:\\:addWidgetFactory\\(\\) has invalid type Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\WidgetFactoryInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
-
-		-
-			message: "#^Method Symfony\\\\Component\\\\DependencyInjection\\\\Container\\:\\:getParameter\\(\\) invoked with 2 parameters, 1 required\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ShortMessageCompilerPass.php
-
-		-
-			message: "#^Offset 'queries' does not exist on array\\{scheme\\: 'ovh', host\\?\\: string, port\\?\\: int\\<0, 65535\\>, user\\?\\: string, pass\\?\\: string, path\\?\\: string, query\\?\\: string, fragment\\?\\: string\\}\\.$#"
-			count: 5
-			path: src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ShortMessageCompilerPass.php
-
-		-
-			message: "#^Offset 'queries' does not exist on array\\{scheme\\?\\: string, host\\?\\: string, port\\?\\: int\\<0, 65535\\>, user\\?\\: string, pass\\?\\: string, path\\?\\: string, query\\?\\: string, fragment\\?\\: string\\}\\|false\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ShortMessageCompilerPass.php
-
-		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\NodeDefinition\\:\\:canBeUnset\\(\\)\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
-
-		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\NodeDefinition\\:\\:children\\(\\)\\.$#"
-			count: 3
-			path: src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\DependencyInjection\\\\Configuration\\:\\:getWidgetAliasesbyPlace\\(\\) has invalid return type Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\DependencyInjection\\\\Configuration\\:\\:getWidgetAliasesbyPlace\\(\\) should return Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\type but returns array\\<int, mixed\\>\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\DependencyInjection\\\\Configuration\\:\\:getWidgetFactories\\(\\) has invalid return type Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\WidgetFactoryInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
-
-		-
-			message: "#^Method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\TreeBuilder\\:\\:getRootNode\\(\\) invoked with 1 parameter, 0 required\\.$#"
-			count: 3
-			path: src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
-
-		-
-			message: "#^PHPDoc tag @param has invalid value \\(WidgetFactoryInterface\\[\\]\\)\\: Unexpected token \"\\\\n     \", expected variable at offset 42$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
-
-		-
-			message: "#^Parameter \\$place of method Chill\\\\MainBundle\\\\DependencyInjection\\\\Configuration\\:\\:getWidgetAliasesbyPlace\\(\\) has invalid type Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
-
-		-
-			message: "#^Parameter \\$widgetFactories of method Chill\\\\MainBundle\\\\DependencyInjection\\\\Configuration\\:\\:setWidgetFactories\\(\\) has invalid type Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\WidgetFactoryInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
-
-		-
-			message: "#^Call to an undefined method Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\WidgetFactoryInterface\\:\\:getAllowedPlaces\\(\\)\\.$#"
-			count: 3
-			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
-
-		-
-			message: "#^Instanceof between Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\HasWidgetFactoriesExtensionInterface and Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\HasWidgetFactoriesExtensionInterface will always evaluate to true\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\AbstractWidgetsCompilerPass\\:\\:isPlaceAllowedForWidget\\(\\) has invalid return type Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\unknown\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\AbstractWidgetsCompilerPass\\:\\:isPlaceAllowedForWidget\\(\\) should return Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\unknown but returns false\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\AbstractWidgetsCompilerPass\\:\\:isPlaceAllowedForWidget\\(\\) should return Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\unknown but returns true\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
-
-		-
-			message: "#^Negated boolean expression is always false\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
-
-		-
-			message: "#^Parameter \\$order of method Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\AbstractWidgetFactory\\:\\:createDefinition\\(\\) has invalid type Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/Factory/AbstractWidgetFactory.php
-
-		-
-			message: "#^Parameter \\$place of method Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\AbstractWidgetFactory\\:\\:createDefinition\\(\\) has invalid type Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/Factory/AbstractWidgetFactory.php
-
-		-
-			message: "#^Parameter \\$order of method Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\WidgetFactoryInterface\\:\\:createDefinition\\(\\) has invalid type Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/Factory/WidgetFactoryInterface.php
-
-		-
-			message: "#^Parameter \\$place of method Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\WidgetFactoryInterface\\:\\:configureOptions\\(\\) has invalid type Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/Factory/WidgetFactoryInterface.php
-
-		-
-			message: "#^Parameter \\$place of method Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\WidgetFactoryInterface\\:\\:createDefinition\\(\\) has invalid type Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/Factory/WidgetFactoryInterface.php
-
-		-
-			message: "#^PHPDoc tag @param for parameter \\$factory with type Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\WidgetFactoryInterface is not subtype of native type Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\WidgetFactoryInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/HasWidgetFactoriesExtensionInterface.php
-
-		-
-			message: "#^Parameter \\$factory of method Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\HasWidgetFactoriesExtensionInterface\\:\\:addWidgetFactory\\(\\) has invalid type Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\WidgetFactoryInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/HasWidgetFactoriesExtensionInterface.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between int\\<1, max\\> and 0 will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Doctrine/Type/NativeDateIntervalType.php
-
-		-
-			message: "#^Instanceof between DateTime and DateTime will always evaluate to true\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Entity/Address.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Entity\\\\Address\\:\\:\\$validTo \\(DateTime\\|null\\) does not accept DateTimeInterface\\|null\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Entity/Address.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and string will always evaluate to false\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Entity/Address.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Entity\\\\AddressReference\\:\\:setPostcode\\(\\) should return Chill\\\\MainBundle\\\\Entity\\\\Address but returns \\$this\\(Chill\\\\MainBundle\\\\Entity\\\\AddressReference\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Entity/AddressReference.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Entity\\\\AddressReference\\:\\:\\$addressCanonical is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Entity/AddressReference.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Entity\\\\AddressReference\\:\\:\\$id is never written, only read\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Entity/AddressReference.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Entity\\\\Country\\:\\:getCountryCode\\(\\) has invalid return type Chill\\\\MainBundle\\\\Entity\\\\the\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Entity/Country.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Entity\\\\Country\\:\\:getCountryCode\\(\\) should return Chill\\\\MainBundle\\\\Entity\\\\the but returns string\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Entity/Country.php
-
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Entity\\\\GeographicalUnit\\:\\:\\$geom is unused\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Entity/GeographicalUnit.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Entity\\\\GeographicalUnit\\:\\:\\$unitRefId is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Entity/GeographicalUnit.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Entity\\\\GroupCenter\\:\\:getPermissionsGroup\\(\\) has invalid return type Chill\\\\MainBundle\\\\Entity\\\\PermissionGroup\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Entity/GroupCenter.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Entity\\\\GroupCenter\\:\\:getPermissionsGroup\\(\\) should return Chill\\\\MainBundle\\\\Entity\\\\PermissionGroup but returns Chill\\\\MainBundle\\\\Entity\\\\PermissionsGroup\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Entity/GroupCenter.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Entity\\\\GroupCenter\\:\\:\\$id is never written, only read\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Entity/GroupCenter.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Entity\\\\GroupCenter\\:\\:\\$permissionsGroup \\(Chill\\\\MainBundle\\\\Entity\\\\PermissionsGroup\\) does not accept Doctrine\\\\Common\\\\Collections\\\\ArrayCollection\\<\\*NEVER\\*, \\*NEVER\\*\\>\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Entity/GroupCenter.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Entity\\\\Language\\:\\:getName\\(\\) should return string but returns array\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Entity/Language.php
-
-		-
-			message: "#^PHPDoc tag @param has invalid value \\(string array \\$name\\)\\: Unexpected token \"array\", expected variable at offset 49$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Entity/Language.php
-
-		-
-			message: "#^PHPDoc tag @var for property Chill\\\\MainBundle\\\\Entity\\\\Language\\:\\:\\$name with type string is incompatible with native type array\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Entity/Language.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Entity\\\\Location\\:\\:\\$createdAt \\(DateTimeImmutable\\|null\\) does not accept DateTimeInterface\\|null\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Entity/Location.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Entity\\\\Location\\:\\:\\$updatedAt \\(DateTimeImmutable\\|null\\) does not accept DateTimeInterface\\|null\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Entity/Location.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Entity\\\\Notification\\:\\:\\$updatedAt \\(DateTimeImmutable\\|null\\) does not accept DateTimeInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Entity/Notification.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Entity\\\\NotificationComment\\:\\:\\$createdAt \\(DateTimeImmutable\\|null\\) does not accept DateTimeInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Entity/NotificationComment.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Entity\\\\NotificationComment\\:\\:\\$updateAt \\(DateTimeImmutable\\|null\\) does not accept DateTimeInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Entity/NotificationComment.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Entity\\\\PermissionsGroup\\:\\:\\$groupCenters is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Entity/PermissionsGroup.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Entity\\\\PermissionsGroup\\:\\:\\$id is never written, only read\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Entity/PermissionsGroup.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Entity\\\\PostalCode\\:\\:\\$canonical is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Entity/PostalCode.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Entity\\\\PostalCode\\:\\:\\$deletedAt is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Entity/PostalCode.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Entity\\\\PostalCode\\:\\:\\$id is never written, only read\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Entity/PostalCode.php
-
-		-
-			message: "#^PHPDoc tag @var for property Chill\\\\MainBundle\\\\Entity\\\\Regroupment\\:\\:\\$centers with type Chill\\\\MainBundle\\\\Entity\\\\Center is not subtype of native type Doctrine\\\\Common\\\\Collections\\\\Collection\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Entity/Regroupment.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Entity\\\\RoleScope\\:\\:\\$permissionsGroups is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Entity/RoleScope.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and array will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Entity/User.php
-
-		-
-			message: "#^Call to an undefined method Traversable\\<\\(int\\|string\\), mixed\\>\\:\\:current\\(\\)\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
-
-		-
-			message: "#^Call to an undefined method Traversable\\<\\(int\\|string\\), mixed\\>\\:\\:next\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
-
-		-
-			message: "#^Call to an undefined method Traversable\\<\\(int\\|string\\), mixed\\>\\:\\:rewind\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
-
-		-
-			message: "#^Call to an undefined method Traversable\\<\\(int\\|string\\), mixed\\>\\:\\:valid\\(\\)\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
-
-		-
-			message: "#^Unreachable statement \\- code above always terminates\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php
-
-		-
-			message: "#^Access to offset \\(int\\|string\\) on an unknown class Chill\\\\MainBundle\\\\Export\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/ExportManager.php
-
-		-
-			message: "#^Call to an undefined method Chill\\\\MainBundle\\\\Export\\\\ExportElementInterface\\:\\:requiredRole\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/ExportManager.php
-
-		-
-			message: "#^Call to function is_iterable\\(\\) with array will always evaluate to true\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/ExportManager.php
-
-		-
-			message: "#^Empty array passed to foreach\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/ExportManager.php
-
-		-
-			message: "#^Instanceof between Doctrine\\\\ORM\\\\QueryBuilder and Doctrine\\\\ORM\\\\QueryBuilder will always evaluate to true\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/ExportManager.php
-
-		-
-			message: "#^Iterating over an object of an unknown class Chill\\\\MainBundle\\\\Export\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/ExportManager.php
-
-		-
-			message: "#^PHPDoc tag @param for parameter \\$aliases with type Generator is incompatible with native type array\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/ExportManager.php
-
-		-
-			message: "#^Parameter \\$data of method Chill\\\\MainBundle\\\\Export\\\\ExportManager\\:\\:handleAggregators\\(\\) has invalid type Chill\\\\MainBundle\\\\Export\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/ExportManager.php
-
-		-
-			message: "#^Parameter \\$data of method Chill\\\\MainBundle\\\\Export\\\\ExportManager\\:\\:retrieveUsedFilters\\(\\) has invalid type Chill\\\\MainBundle\\\\Export\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/ExportManager.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and Chill\\\\MainBundle\\\\Export\\\\type will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/ExportManager.php
-
-		-
-			message: "#^Yield can be used only with these return types\\: Generator, Iterator, Traversable, iterable\\.$#"
-			count: 5
-			path: src/Bundle/ChillMainBundle/Export/ExportManager.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and array\\|string will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/Formatter/CSVFormatter.php
-
-		-
-			message: "#^Variable \\$data in PHPDoc tag @var does not match assigned variable \\$contentData\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/Formatter/CSVFormatter.php
-
-		-
-			message: "#^Parameter \\#2 \\$exportAlias \\(Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\type\\) of method Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\CSVListFormatter\\:\\:buildForm\\(\\) should be compatible with parameter \\$exportAlias \\(string\\) of method Chill\\\\MainBundle\\\\Export\\\\FormatterInterface\\:\\:buildForm\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/Formatter/CSVListFormatter.php
-
-		-
-			message: "#^Parameter \\$exportAlias of method Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\CSVListFormatter\\:\\:buildForm\\(\\) has invalid type Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/Formatter/CSVListFormatter.php
-
-		-
-			message: "#^Parameter \\#2 \\$exportAlias \\(Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\type\\) of method Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\CSVPivotedListFormatter\\:\\:buildForm\\(\\) should be compatible with parameter \\$exportAlias \\(string\\) of method Chill\\\\MainBundle\\\\Export\\\\FormatterInterface\\:\\:buildForm\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/Formatter/CSVPivotedListFormatter.php
-
-		-
-			message: "#^Parameter \\$exportAlias of method Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\CSVPivotedListFormatter\\:\\:buildForm\\(\\) has invalid type Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/Formatter/CSVPivotedListFormatter.php
-
-		-
-			message: "#^Access to offset 'format' on an unknown class Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
-
-		-
-			message: "#^Access to offset mixed on an unknown class Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\type\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
-
-		-
-			message: "#^Iterating over an object of an unknown class Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\type\\.$#"
-			count: 3
-			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\SpreadSheetFormatter\\:\\:\\$aggregatorsData \\(Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\type\\) does not accept array\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\SpreadSheetFormatter\\:\\:\\$aggregatorsData has unknown class Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\type as its type\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\SpreadSheetFormatter\\:\\:\\$formatterData \\(Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\type\\) does not accept array\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\SpreadSheetFormatter\\:\\:\\$formatterData has unknown class Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\type as its type\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\SpreadSheetFormatter\\:\\:\\$result \\(Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\type\\) does not accept array\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\SpreadSheetFormatter\\:\\:\\$result has unknown class Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\type as its type\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and string will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
-
-		-
-			message: "#^Instanceof between string and DateTimeInterface will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php
-
-		-
-			message: "#^PHPDoc tag @param has invalid value \\(Array\\(String\\) \\$aggregatorAliases Array of the aliases of the aggregators\\. An aggregator do the \"group by\" on the data\\. \\$aggregatorAliases\\)\\: Unexpected token \"\\(\", expected variable at offset 343$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/FormatterInterface.php
-
-		-
-			message: "#^PHPDoc tag @var for property Chill\\\\MainBundle\\\\Export\\\\Helper\\\\ExportAddressHelper\\:\\:\\$unitNamesKeysCache contains unresolvable type\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/Helper/ExportAddressHelper.php
-
-		-
-			message: "#^PHPDoc tag @var for property Chill\\\\MainBundle\\\\Export\\\\Helper\\\\ExportAddressHelper\\:\\:\\$unitNamesKeysCache with type mixed is not subtype of native type array\\|null\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/Helper/ExportAddressHelper.php
-
-		-
-			message: "#^Call to method createSearchForm\\(\\) on an unknown class Chill\\\\MainBundle\\\\Search\\\\HasAdvancedSearchForm\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/AdvancedSearchType.php
-
-		-
-			message: "#^PHPDoc tag @param for parameter \\$resolver with type Chill\\\\MainBundle\\\\Form\\\\OptionsResolverInterface is not subtype of native type Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolver\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/CenterType.php
-
-		-
-			message: "#^Parameter \\$resolver of method Chill\\\\MainBundle\\\\Form\\\\CenterType\\:\\:configureOptions\\(\\) has invalid type Chill\\\\MainBundle\\\\Form\\\\OptionsResolverInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/CenterType.php
-
-		-
-			message: "#^Instanceof between Chill\\\\MainBundle\\\\Entity\\\\Address and Chill\\\\MainBundle\\\\Entity\\\\Address will always evaluate to true\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Form/DataMapper/AddressDataMapper.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and Chill\\\\MainBundle\\\\Entity\\\\Address will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/DataMapper/AddressDataMapper.php
-
-		-
-			message: "#^Else branch is unreachable because previous condition is always true\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/DataMapper/ScopePickerDataMapper.php
-
-		-
-			message: "#^Instanceof between Chill\\\\MainBundle\\\\Entity\\\\Scope and Chill\\\\MainBundle\\\\Entity\\\\Scope will always evaluate to true\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Form/DataMapper/ScopePickerDataMapper.php
-
-		-
-			message: "#^Unreachable statement \\- code above always terminates\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/DataMapper/ScopePickerDataMapper.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and string will always evaluate to false\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Form/DataTransformer/IdToEntityDataTransformer.php
-
-		-
-			message: "#^PHPDoc tag @param for parameter \\$resolver with type Chill\\\\MainBundle\\\\Form\\\\OptionsResolverInterface is not subtype of native type Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolver\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/LocationFormType.php
-
-		-
-			message: "#^Parameter \\$resolver of method Chill\\\\MainBundle\\\\Form\\\\LocationFormType\\:\\:configureOptions\\(\\) has invalid type Chill\\\\MainBundle\\\\Form\\\\OptionsResolverInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/LocationFormType.php
-
-		-
-			message: "#^PHPDoc tag @param for parameter \\$resolver with type Chill\\\\MainBundle\\\\Form\\\\OptionsResolverInterface is not subtype of native type Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolver\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/PermissionsGroupType.php
-
-		-
-			message: "#^Parameter \\$resolver of method Chill\\\\MainBundle\\\\Form\\\\PermissionsGroupType\\:\\:configureOptions\\(\\) has invalid type Chill\\\\MainBundle\\\\Form\\\\OptionsResolverInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/PermissionsGroupType.php
-
-		-
-			message: "#^PHPDoc tag @param for parameter \\$resolver with type Chill\\\\MainBundle\\\\Form\\\\OptionsResolverInterface is not subtype of native type Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolver\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/ScopeType.php
-
-		-
-			message: "#^Parameter \\$resolver of method Chill\\\\MainBundle\\\\Form\\\\ScopeType\\:\\:configureOptions\\(\\) has invalid type Chill\\\\MainBundle\\\\Form\\\\OptionsResolverInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/ScopeType.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Form\\\\Type\\\\ChillPhoneNumberType\\:\\:\\$phoneNumberUtil is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/Type/ChillPhoneNumberType.php
-
-		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\:\\:getId\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/Type/CommentType.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and array\\<Chill\\\\MainBundle\\\\Entity\\\\User\\>\\|Chill\\\\MainBundle\\\\Entity\\\\User will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Form\\\\Type\\\\DataTransformer\\\\MultipleObjectsToIdTransformer\\:\\:transform\\(\\) should return Doctrine\\\\Common\\\\Collections\\\\ArrayCollection but returns array\\<int, mixed\\>\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/Type/DataTransformer/MultipleObjectsToIdTransformer.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and string will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ObjectToIdTransformer.php
-
-		-
-			message: "#^Call to function is_int\\(\\) with int will always evaluate to true\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/Type/DataTransformer/PostalCodeToIdTransformer.php
-
-		-
-			message: "#^Instanceof between Chill\\\\MainBundle\\\\Export\\\\ExportInterface and Chill\\\\MainBundle\\\\Export\\\\ExportInterface will always evaluate to true\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Form/Type/Export/ExportType.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Form\\\\Type\\\\Select2CountryType\\:\\:\\$requestStack is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/Type/Select2CountryType.php
-
-		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolver\\:\\:replaceDefaults\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/Type/Select2EntityType.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Form\\\\Type\\\\Select2LanguageType\\:\\:\\$requestStack is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/Type/Select2LanguageType.php
-
-		-
-			message: "#^PHPDoc tag @param for parameter \\$resolver with type Chill\\\\MainBundle\\\\Form\\\\OptionsResolverInterface is not subtype of native type Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolver\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/UserType.php
-
-		-
-			message: "#^Parameter \\$resolver of method Chill\\\\MainBundle\\\\Form\\\\UserType\\:\\:configureOptions\\(\\) has invalid type Chill\\\\MainBundle\\\\Form\\\\OptionsResolverInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/UserType.php
-
-		-
-			message: "#^Method Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolver\\:\\:setDefined\\(\\) invoked with 2 parameters, 1 required\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/WorkflowStepType.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Notification\\\\Email\\\\NotificationMailer\\:\\:\\$translator is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Notification/Email/NotificationMailer.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Notification\\\\NotificationHandlerManager\\:\\:\\$em is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Notification/NotificationHandlerManager.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between 0 and float will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Pagination/Paginator.php
-
-		-
-			message: "#^PHPDoc tag @param for parameter \\$phoneNumber with type string is incompatible with native type libphonenumber\\\\PhoneNumber\\|null\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
-
-		-
-			message: "#^Expression on left side of \\?\\? is not nullable\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Phonenumber/Templating.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Repository\\\\GeographicalUnitRepository\\:\\:findBy\\(\\) should return Chill\\\\MainBundle\\\\Entity\\\\GeographicalUnit\\|null but returns array\\<int, object\\>\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Repository/GeographicalUnitRepository.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Repository\\\\GeographicalUnitRepository\\:\\:\\$em is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Repository/GeographicalUnitRepository.php
-
-		-
-			message: "#^Return type \\(Chill\\\\MainBundle\\\\Entity\\\\GeographicalUnit\\|null\\) of method Chill\\\\MainBundle\\\\Repository\\\\GeographicalUnitRepository\\:\\:findBy\\(\\) should be compatible with return type \\(array\\<object\\>\\) of method Doctrine\\\\Persistence\\\\ObjectRepository\\<object\\>\\:\\:findBy\\(\\)$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Repository/GeographicalUnitRepository.php
-
-		-
-			message: "#^The @implements tag of class Chill\\\\MainBundle\\\\Repository\\\\SavedExportRepository describes Doctrine\\\\Persistence\\\\ObjectRepository but the class implements\\: Chill\\\\MainBundle\\\\Repository\\\\SavedExportRepositoryInterface$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Repository/SavedExportRepository.php
-
-		-
-			message: "#^Interface Chill\\\\MainBundle\\\\Repository\\\\SavedExportRepositoryInterface has @implements tag, but can not implement any interface, must extend from it\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Repository/SavedExportRepositoryInterface.php
-
-		-
-			message: "#^Strict comparison using \\!\\=\\= between null and array\\<Chill\\\\MainBundle\\\\Entity\\\\Center\\>\\|Chill\\\\MainBundle\\\\Entity\\\\Center will always evaluate to true\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Repository/UserACLAwareRepository.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Routing\\\\MenuComposer\\:\\:\\$routeCollection is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Routing/MenuComposer.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Routing\\\\MenuTwig\\:\\:\\$container is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Routing/MenuTwig.php
-
-		-
-			message: "#^Parameter \\$string of method Chill\\\\MainBundle\\\\Search\\\\AbstractSearch\\:\\:parseDate\\(\\) has invalid type Chill\\\\MainBundle\\\\Search\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Search/AbstractSearch.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Search\\\\SearchApi\\:\\:getResults\\(\\) has invalid return type Chill\\\\MainBundle\\\\Search\\\\Model\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Search/SearchApi.php
-
-		-
-			message: "#^PHPDoc tag @return with type Chill\\\\MainBundle\\\\Search\\\\Model is not subtype of native type Chill\\\\MainBundle\\\\Serializer\\\\Model\\\\Collection\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Search/SearchApi.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Search\\\\SearchApiNoQueryException\\:\\:\\$parameters is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Search/SearchApiNoQueryException.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Search\\\\SearchApiNoQueryException\\:\\:\\$pattern is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Search/SearchApiNoQueryException.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Search\\\\SearchApiNoQueryException\\:\\:\\$types is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Search/SearchApiNoQueryException.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Search\\\\SearchApiResult\\:\\:\\$pertinence is unused\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Search/SearchApiResult.php
-
-		-
-			message: "#^Else branch is unreachable because previous condition is always true\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Search/SearchProvider.php
-
-		-
-			message: "#^If condition is always true\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Search/SearchProvider.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Search\\\\SearchProvider\\:\\:getHasAdvancedFormByName\\(\\) has invalid return type Chill\\\\MainBundle\\\\Search\\\\HasAdvancedSearchForm\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Search/SearchProvider.php
-
-		-
-			message: "#^Parameter \\$subject of method Chill\\\\MainBundle\\\\Search\\\\SearchProvider\\:\\:extractDomain\\(\\) has invalid type Chill\\\\MainBundle\\\\Search\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Search/SearchProvider.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Search\\\\SearchProvider\\:\\:\\$hasAdvancedFormSearchServices has unknown class Chill\\\\MainBundle\\\\Search\\\\HasAdvancedSearchForm as its type\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Search/SearchProvider.php
-
-		-
-			message: "#^Strict comparison using \\!\\=\\= between null and string will always evaluate to true\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Search/SearchProvider.php
-
-		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\:\\:getGroupCenters\\(\\)\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
-
-		-
-			message: "#^Empty array passed to foreach\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
-
-		-
-			message: "#^Instanceof between Chill\\\\MainBundle\\\\Entity\\\\Center\\|string and Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
-
-		-
-			message: "#^Instanceof between string and Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role will always evaluate to false\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and Chill\\\\MainBundle\\\\Entity\\\\Scope\\|iterable\\<Chill\\\\MainBundle\\\\Entity\\\\Scope\\> will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and null will always evaluate to true\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
-
-		-
-			message: "#^Unreachable statement \\- code above always terminates\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\DefaultVoterHelper\\:\\:\\$centerResolverDispatcher is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelper.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Workflow\\\\EntityWorkflowHandlerInterface\\:\\:getDeletionRoles\\(\\) invoked with 1 parameter, 0 required\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Security/Authorization/WorkflowEntityDeletionVoter.php
-
-		-
-			message: "#^Instanceof between Chill\\\\MainBundle\\\\Entity\\\\User and Chill\\\\MainBundle\\\\Entity\\\\User will always evaluate to true\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEvent.php
-
-		-
-			message: "#^Parameter \\$ip of method Chill\\\\MainBundle\\\\Security\\\\PasswordRecover\\\\PasswordRecoverEvent\\:\\:__construct\\(\\) has invalid type Chill\\\\MainBundle\\\\Security\\\\PasswordRecover\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEvent.php
-
-		-
-			message: "#^Parameter \\$token of method Chill\\\\MainBundle\\\\Security\\\\PasswordRecover\\\\PasswordRecoverEvent\\:\\:__construct\\(\\) has invalid type Chill\\\\MainBundle\\\\Security\\\\PasswordRecover\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEvent.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Security\\\\PasswordRecover\\\\PasswordRecoverEvent\\:\\:\\$ip \\(string\\) does not accept Chill\\\\MainBundle\\\\Security\\\\PasswordRecover\\\\type\\|null\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEvent.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Security\\\\PasswordRecover\\\\PasswordRecoverEvent\\:\\:\\$token \\(string\\) does not accept Chill\\\\MainBundle\\\\Security\\\\PasswordRecover\\\\type\\|null\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEvent.php
-
-		-
-			message: "#^Call to function is_array\\(\\) with array\\<Chill\\\\MainBundle\\\\Entity\\\\Center\\> will always evaluate to true\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverManager.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and array\\<Chill\\\\MainBundle\\\\Entity\\\\Center\\>\\|Chill\\\\MainBundle\\\\Entity\\\\Center will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverManager.php
-
-		-
-			message: "#^Unreachable statement \\- code above always terminates\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverManager.php
-
-		-
-			message: "#^Instanceof between Chill\\\\MainBundle\\\\Entity\\\\HasCenterInterface and Chill\\\\MainBundle\\\\Entity\\\\HasCenterInterface will always evaluate to true\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Security/Resolver/DefaultCenterResolver.php
-
-		-
-			message: "#^Unreachable statement \\- code above always terminates\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Security/Resolver/DefaultCenterResolver.php
-
-		-
-			message: "#^Instanceof between Chill\\\\MainBundle\\\\Entity\\\\HasScopesInterface and Chill\\\\MainBundle\\\\Entity\\\\HasScopesInterface will always evaluate to true\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Security/Resolver/DefaultScopeResolver.php
-
-		-
-			message: "#^Unreachable statement \\- code above always terminates\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Security/Resolver/DefaultScopeResolver.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\ResolverTwigExtension\\:\\:resolveCenter\\(\\) has invalid return type Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\Center\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Security/Resolver/ResolverTwigExtension.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\ResolverTwigExtension\\:\\:resolveCenter\\(\\) should return array\\<Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\Center\\>\\|Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\Center\\|null but returns array\\<Chill\\\\MainBundle\\\\Entity\\\\Center\\>\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Security/Resolver/ResolverTwigExtension.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\ScopeResolverDispatcher\\:\\:resolveScope\\(\\) invoked with 0 parameters, 1\\-2 required\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Security/Resolver/ResolverTwigExtension.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\ScopeResolverDispatcher\\:\\:resolveScope\\(\\) should return Chill\\\\MainBundle\\\\Entity\\\\Scope\\|iterable\\<Chill\\\\MainBundle\\\\Entity\\\\Scope\\> but returns null\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Security/Resolver/ScopeResolverDispatcher.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Security\\\\RoleProvider\\:\\:getRoleTitle\\(\\) should return string but returns null\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Security/RoleProvider.php
-
-		-
-			message: "#^Strict comparison using \\!\\=\\= between array\\<string\\> and null will always evaluate to true\\.$#"
-			count: 3
-			path: src/Bundle/ChillMainBundle/Security/RoleProvider.php
-
-		-
-			message: "#^Constant Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\AddressNormalizer\\:\\:NULL_POSTCODE_COUNTRY is unused\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
-
-		-
-			message: "#^Constant Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\AddressNormalizer\\:\\:NULL_VALUE is unused\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
-
-		-
-			message: "#^Instanceof between Chill\\\\MainBundle\\\\Entity\\\\Address and Chill\\\\MainBundle\\\\Entity\\\\Address will always evaluate to true\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
-
-		-
-			message: "#^Unreachable statement \\- code above always terminates\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and Chill\\\\MainBundle\\\\Entity\\\\Embeddable\\\\CommentEmbeddable will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/CommentEmbeddableDocGenNormalizer.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\DateNormalizer\\:\\:normalize\\(\\) should return array\\|ArrayObject\\|bool\\|float\\|int\\|string\\|null but return statement is missing\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/DateNormalizer.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and DateTimeInterface will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/DateNormalizer.php
-
-		-
-			message: "#^Instanceof between Doctrine\\\\ORM\\\\Mapping\\\\ClassMetadata\\<object\\> and Doctrine\\\\ORM\\\\Mapping\\\\ClassMetadata will always evaluate to true\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/DoctrineExistingEntityNormalizer.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between false and true will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/DoctrineExistingEntityNormalizer.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\NotificationNormalizer\\:\\:\\$notificationHandlerManager is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/NotificationNormalizer.php
-
-		-
-			message: "#^Result of && is always false\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and Chill\\\\MainBundle\\\\Entity\\\\User will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php
-
-		-
-			message: "#^Call to function is_int\\(\\) with int will always evaluate to true\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Service/Import/AddressReferenceFromBano.php
-
-		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\Mime\\\\RawMessage\\:\\:getSubject\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Service/Mailer/ChillMailer.php
-
-		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\Mime\\\\RawMessage\\:\\:getTo\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Service/Mailer/ChillMailer.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Templating\\\\CSVCellTwig\\:\\:getName\\(\\) has invalid return type Chill\\\\MainBundle\\\\Templating\\\\The\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Templating/CSVCellTwig.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Templating\\\\CSVCellTwig\\:\\:getName\\(\\) should return Chill\\\\MainBundle\\\\Templating\\\\The but returns string\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Templating/CSVCellTwig.php
-
-		-
-			message: "#^Instanceof between string and DateTimeInterface will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Templating/ChillTwigHelper.php
-
-		-
-			message: "#^PHPDoc tag @return has invalid value \\(array\\<'to'\\: DateTimeImmutable, 'from'\\: DateTimeImmutable\\>\\)\\: Unexpected token \"\\:\", expected '\\>' at offset 29$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Templating/Listing/FilterOrderHelper.php
-
-		-
-			message: "#^Call to an undefined method Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface\\:\\:getFallbackLocales\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Templating/TranslatableStringHelper.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between array\\{\\} and non\\-empty\\-array\\<int, \\(int\\|string\\)\\> will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Templating/TranslatableStringHelper.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Templating\\\\TranslatableStringTwig\\:\\:getName\\(\\) has invalid return type Chill\\\\MainBundle\\\\Templating\\\\The\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Templating/TranslatableStringTwig.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Templating\\\\TranslatableStringTwig\\:\\:getName\\(\\) should return Chill\\\\MainBundle\\\\Templating\\\\The but returns string\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Templating/TranslatableStringTwig.php
-
-		-
-			message: "#^Call to method render\\(\\) on an unknown class Chill\\\\MainBundle\\\\Templating\\\\Widget\\\\Widget\\\\WidgetInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Templating/Widget/WidgetRenderingTwig.php
-
-		-
-			message: "#^Method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) invoked with 2 parameters, 1 required\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Templating/Widget/WidgetRenderingTwig.php
-
-		-
-			message: "#^PHPDoc tag @var for variable \\$widget contains unknown class Chill\\\\MainBundle\\\\Templating\\\\Widget\\\\Widget\\\\WidgetInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Templating/Widget/WidgetRenderingTwig.php
-
-		-
-			message: "#^Parameter \\$context of method Chill\\\\MainBundle\\\\Timeline\\\\TimelineBuilder\\:\\:countItems\\(\\) has invalid type Chill\\\\MainBundle\\\\Timeline\\\\unknown\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php
-
-		-
-			message: "#^Unreachable statement \\- code above always terminates\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php
-
-		-
-			message: "#^Parameter \\$context of method Chill\\\\MainBundle\\\\Timeline\\\\TimelineProviderInterface\\:\\:getEntityTemplate\\(\\) has invalid type Chill\\\\MainBundle\\\\Timeline\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Timeline/TimelineProviderInterface.php
-
-		-
-			message: "#^Parameter \\$entity of method Chill\\\\MainBundle\\\\Timeline\\\\TimelineProviderInterface\\:\\:getEntityTemplate\\(\\) has invalid type Chill\\\\MainBundle\\\\Timeline\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Timeline/TimelineProviderInterface.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Util\\\\DateRangeCovering\\:\\:\\$intervals is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Util/DateRangeCovering.php
-
-		-
-			message: "#^Access to an undefined property Symfony\\\\Component\\\\Validator\\\\Constraint\\:\\:\\$messageDuplicateEmail\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Validation/Validator/UserUniqueEmailAndUsername.php
-
-		-
-			message: "#^Access to an undefined property Symfony\\\\Component\\\\Validator\\\\Constraint\\:\\:\\$messageDuplicateUsername\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Validation/Validator/UserUniqueEmailAndUsername.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and string will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Validation/Validator/ValidPhonenumber.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and Chill\\\\MainBundle\\\\Entity\\\\User will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Validator/Constraints/Entity/UserCircleConsistencyValidator.php
-
-		-
-			message: "#^Access to an undefined property Symfony\\\\Component\\\\Validator\\\\Constraint\\:\\:\\$element\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Validator/Constraints/Export/ExportElementConstraintValidator.php
-
-		-
-			message: "#^Property Chill\\\\MainBundle\\\\Workflow\\\\Templating\\\\WorkflowTwigExtensionRuntime\\:\\:\\$entityWorkflowManager is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Workflow/Templating/WorkflowTwigExtensionRuntime.php
-
-		-
-			message: "#^Instanceof between Chill\\\\MainBundle\\\\Entity\\\\Workflow\\\\EntityWorkflow and Chill\\\\MainBundle\\\\Entity\\\\Workflow\\\\EntityWorkflow will always evaluate to true\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Workflow/Validator/EntityWorkflowCreationValidator.php
-
-		-
-			message: "#^Instanceof between Chill\\\\MainBundle\\\\Entity\\\\Workflow\\\\EntityWorkflowStep and Chill\\\\MainBundle\\\\Entity\\\\Workflow\\\\EntityWorkflowStep will always evaluate to true\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Workflow/Validator/StepDestValidValidator.php
-
-		-
-			message: "#^PHPDoc tag @param for parameter \\$postSql with type Chill\\\\PersonBundle\\\\Actions\\\\type is incompatible with native type string\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Actions/ActionEvent.php
-
-		-
-			message: "#^Parameter \\$postSql of method Chill\\\\PersonBundle\\\\Actions\\\\ActionEvent\\:\\:addPostSql\\(\\) has invalid type Chill\\\\PersonBundle\\\\Actions\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Actions/ActionEvent.php
-
-		-
-			message: "#^Method Chill\\\\PersonBundle\\\\Actions\\\\Remove\\\\PersonMove\\:\\:getSQL\\(\\) has invalid return type Chill\\\\PersonBundle\\\\Actions\\\\Remove\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
-
-		-
-			message: "#^Method Chill\\\\PersonBundle\\\\Actions\\\\Remove\\\\PersonMove\\:\\:getSQL\\(\\) should return Chill\\\\PersonBundle\\\\Actions\\\\Remove\\\\type but returns array\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
-
-		-
-			message: "#^Method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) invoked with 2 parameters, 1 required\\.$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
-
-		-
-			message: "#^Method Chill\\\\PersonBundle\\\\CRUD\\\\Controller\\\\EntityPersonCRUDController\\:\\:filterQueryEntitiesByPerson\\(\\) has invalid return type Chill\\\\PersonBundle\\\\CRUD\\\\Controller\\\\QueryBuilder\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/CRUD/Controller/EntityPersonCRUDController.php
-
-		-
-			message: "#^PHPDoc tag @param for parameter \\$qb with type Chill\\\\PersonBundle\\\\CRUD\\\\Controller\\\\QueryBuilder is not subtype of native type Doctrine\\\\ORM\\\\QueryBuilder\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/CRUD/Controller/EntityPersonCRUDController.php
-
-		-
-			message: "#^PHPDoc tag @return with type Chill\\\\PersonBundle\\\\CRUD\\\\Controller\\\\QueryBuilder is not subtype of native type Doctrine\\\\ORM\\\\QueryBuilder\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/CRUD/Controller/EntityPersonCRUDController.php
-
-		-
-			message: "#^PHPDoc tag @throws with type Chill\\\\PersonBundle\\\\CRUD\\\\Controller\\\\Symfony\\\\Component\\\\HttpKernel\\\\Exception\\\\NotFoundHttpException is not subtype of Throwable$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/CRUD/Controller/EntityPersonCRUDController.php
-
-		-
-			message: "#^Parameter \\$action of method Chill\\\\PersonBundle\\\\CRUD\\\\Controller\\\\EntityPersonCRUDController\\:\\:createEntity\\(\\) has invalid type Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\string\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/CRUD/Controller/EntityPersonCRUDController.php
-
-		-
-			message: "#^Parameter \\$qb of method Chill\\\\PersonBundle\\\\CRUD\\\\Controller\\\\EntityPersonCRUDController\\:\\:filterQueryEntitiesByPerson\\(\\) has invalid type Chill\\\\PersonBundle\\\\CRUD\\\\Controller\\\\QueryBuilder\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/CRUD/Controller/EntityPersonCRUDController.php
-
-		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\DependencyInjection\\\\Extension\\\\ExtensionInterface\\:\\:addWidgetFactory\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/ChillPersonBundle.php
-
-		-
-			message: "#^Iterating over an object of an unknown class Chill\\\\PersonBundle\\\\Actions\\\\Remove\\\\type\\.$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Command/ChillPersonMoveCommand.php
-
-		-
-			message: "#^PHPDoc tag @var for property Chill\\\\PersonBundle\\\\Command\\\\ImportSocialWorkMetadata\\:\\:\\$importer with type Psr\\\\Log\\\\LoggerInterface is not subtype of native type Chill\\\\PersonBundle\\\\Service\\\\Import\\\\ChillImporter\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Command/ImportSocialWorkMetadata.php
-
-		-
-			message: "#^Method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) invoked with 2 parameters, 1 required\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Controller\\\\AccompanyingCourseApiController\\:\\:\\$accompanyingPeriodACLAwareRepository is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php
-
-		-
-			message: "#^Variable \\$accompanyingPeriod in PHPDoc tag @var does not match assigned variable \\$action\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php
-
-		-
-			message: "#^Strict comparison using \\!\\=\\= between null and Doctrine\\\\Common\\\\Collections\\\\Collection will always evaluate to true\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
-
-		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\Serializer\\\\SerializerInterface\\:\\:normalize\\(\\)\\.$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php
-
-		-
-			message: "#^Method Chill\\\\PersonBundle\\\\Controller\\\\AccompanyingCourseWorkController\\:\\:createDeleteForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\AccompanyingPeriodWork will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php
-
-		-
-			message: "#^Call to an undefined method Psr\\\\Container\\\\ContainerInterface\\:\\:getParameter\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
-
-		-
-			message: "#^Method Symfony\\\\Component\\\\Form\\\\FormInterface\\:\\:isValid\\(\\) invoked with 1 parameter, 0 required\\.$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
-
-		-
-			message: "#^Method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) invoked with 2 parameters, 1 required\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod will always evaluate to false\\.$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
-
-		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\HttpFoundation\\\\Session\\\\SessionInterface\\:\\:getFlashBag\\(\\)\\.$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\Common\\\\Collections\\\\Collection&iterable\\<Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\HouseholdMember\\>\\:\\:initialize\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\ObjectRepository\\<Chill\\\\PersonBundle\\\\Entity\\\\Person\\>\\:\\:findById\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php
-
-		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\Serializer\\\\SerializerInterface\\:\\:normalize\\(\\)\\.$#"
-			count: 3
-			path: src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php
-
-		-
-			message: "#^Elseif condition is always true\\.$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php
-
-		-
-			message: "#^Method Chill\\\\PersonBundle\\\\Controller\\\\PersonAddressController\\:\\:createCreateForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php
-
-		-
-			message: "#^Method Chill\\\\PersonBundle\\\\Controller\\\\PersonAddressController\\:\\:createEditForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php
-
-		-
-			message: "#^PHPDoc tag @param for parameter \\$person with type Chill\\\\PersonBundle\\\\Controller\\\\Chill\\\\PersonBundle\\\\Entity\\\\Person is not subtype of native type Chill\\\\PersonBundle\\\\Entity\\\\Person\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php
-
-		-
-			message: "#^Parameter \\$person of method Chill\\\\PersonBundle\\\\Controller\\\\PersonAddressController\\:\\:validatePerson\\(\\) has invalid type Chill\\\\PersonBundle\\\\Controller\\\\Chill\\\\PersonBundle\\\\Entity\\\\Person\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\ORM\\\\EntityRepository\\<Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomFieldsDefaultGroup\\>\\:\\:findOneByEntity\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/PersonController.php
-
-		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\Form\\\\FormInterface\\:\\:isClicked\\(\\)\\.$#"
-			count: 3
-			path: src/Bundle/ChillPersonBundle/Controller/PersonController.php
-
-		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\:\\:getGroupCenters\\(\\)\\.$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Controller/PersonController.php
-
-		-
-			message: "#^Method Chill\\\\PersonBundle\\\\Controller\\\\PersonController\\:\\:_validatePersonAndAccompanyingPeriod\\(\\) is unused\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/PersonController.php
-
-		-
-			message: "#^Method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) invoked with 2 parameters, 1 required\\.$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Controller/PersonController.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Controller\\\\PersonController\\:\\:\\$logger is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/PersonController.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and Chill\\\\PersonBundle\\\\Entity\\\\Person will always evaluate to false\\.$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Controller/PersonController.php
-
-		-
-			message: "#^Access to an undefined property Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:\\$counters\\.$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\ObjectRepository\\<Chill\\\\TaskBundle\\\\Entity\\\\SingleTask\\>\\:\\:countByParameters\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
-
-		-
-			message: "#^Cannot access property \\$getId on null\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
-
-		-
-			message: "#^Iterating over an object of an unknown class Chill\\\\PersonBundle\\\\Actions\\\\Remove\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
-
-		-
-			message: "#^Method Chill\\\\PersonBundle\\\\Controller\\\\PersonDuplicateController\\:\\:_getCounters\\(\\) never returns null so it can be removed from the return type\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
-
-		-
-			message: "#^Method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) invoked with 2 parameters, 1 required\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Controller\\\\PersonDuplicateController\\:\\:\\$translator \\(Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\) does not accept Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Controller\\\\PersonDuplicateController\\:\\:\\$translator is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
-
-		-
-			message: "#^Call to function is_int\\(\\) with int will always evaluate to true\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Controller\\\\ReassignAccompanyingPeriodController\\:\\:\\$userRender is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Controller\\\\RelationshipApiController\\:\\:\\$validator is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/RelationshipApiController.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Controller\\\\SocialWorkGoalApiController\\:\\:\\$paginator is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/SocialWorkGoalApiController.php
-
-		-
-			message: "#^Method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) invoked with 2 parameters, 1 required\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/TimelinePersonController.php
-
-		-
-			message: "#^Unreachable statement \\- code above always terminates\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodNotifications.php
-
-		-
-			message: "#^Invalid array key type array\\<int\\|string, int\\>\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadRelationships.php
-
-		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\NodeDefinition\\:\\:canBeDisabled\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php
-
-		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\NodeDefinition\\:\\:values\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php
-
-		-
-			message: "#^Method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\TreeBuilder\\:\\:getRootNode\\(\\) invoked with 1 parameter, 0 required\\.$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Doctrine\\\\DQL\\\\AddressPart\\:\\:\\$part is unused\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart.php
-
-		-
-			message: "#^Result of method Doctrine\\\\ORM\\\\Query\\\\Parser\\:\\:match\\(\\) \\(void\\) is used\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\Common\\\\Collections\\\\Collection&iterable\\<Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\AccompanyingPeriodLocationHistory\\>\\:\\:matching\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\Common\\\\Collections\\\\Collection\\:\\:matching\\(\\)\\.$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
-
-		-
-			message: "#^Instanceof between Chill\\\\PersonBundle\\\\Entity\\\\Person and Chill\\\\PersonBundle\\\\Entity\\\\Person will always evaluate to true\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
-
-
-		-
-			message: "#^Method Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\:\\:getCreatedAt\\(\\) should return DateTime\\|null but returns DateTimeInterface\\|null\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
-
-		-
-			message: "#^Method Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\:\\:getRecursiveSocialActions\\(\\) has invalid return type Chill\\\\PersonBundle\\\\Entity\\\\SocialAction\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
-
-		-
-			message: "#^Method Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\:\\:getRecursiveSocialIssues\\(\\) has invalid return type Chill\\\\PersonBundle\\\\Entity\\\\SocialIssues\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
-
-		-
-			message: "#^Negated boolean expression is always true\\.$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
-
-		-
-			message: "#^PHPDoc tag @return with type array\\<Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\AccompanyingPeriodWork\\> is incompatible with native type Doctrine\\\\Common\\\\Collections\\\\Collection\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
-
-		-
-			message: "#^PHPDoc tag @return with type iterable is not subtype of native type Doctrine\\\\Common\\\\Collections\\\\Collection\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\:\\:\\$updatedAt is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\:\\:\\$updatedBy is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\AccompanyingPeriodStepHistory will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
-
-		-
-			message: "#^Unreachable statement \\- code above always terminates\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\AccompanyingPeriodWork\\:\\:\\$createdAt \\(DateTimeImmutable\\|null\\) does not accept DateTimeInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\AccompanyingPeriodWork\\:\\:\\$endDate \\(DateTimeImmutable\\|null\\) does not accept DateTimeInterface\\|null\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\AccompanyingPeriodWork\\:\\:\\$startDate \\(DateTimeImmutable\\|null\\) does not accept DateTimeInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\AccompanyingPeriodWork\\:\\:\\$updatedAt \\(DateTimeImmutable\\|null\\) does not accept DateTimeInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
-
-		-
-			message: "#^PHPDoc tag @param for parameter \\$createdAt with type DateTimeImmutable\\|null is not subtype of native type DateTimeInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
-
-		-
-			message: "#^PHPDoc tag @param for parameter \\$updatedAt with type DateTimeImmutable\\|null is not subtype of native type DateTimeInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkEvaluation\\:\\:\\$createdAt \\(DateTimeImmutable\\|null\\) does not accept DateTimeInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkEvaluation\\:\\:\\$updatedAt \\(DateTimeImmutable\\|null\\) does not accept DateTimeInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\Comment\\:\\:\\$id is never written, only read\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php
-
-		-
-			message: "#^Method Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriodParticipation\\:\\:checkSameStartEnd\\(\\) is unused\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriodParticipation.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\Common\\\\Collections\\\\Collection&iterable\\<Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\HouseholdMember\\>\\:\\:matching\\(\\)\\.$#"
-			count: 3
-			path: src/Bundle/ChillPersonBundle/Entity/Household/Household.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\Common\\\\Collections\\\\Collection\\:\\:matching\\(\\)\\.$#"
-			count: 5
-			path: src/Bundle/ChillPersonBundle/Entity/Household/Household.php
-
-		-
-			message: "#^Call to an undefined method Traversable\\<\\(int\\|string\\), mixed\\>\\:\\:uasort\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/Household/Household.php
-
-		-
-			message: "#^Cannot call method filter\\(\\) on array\\<Chill\\\\MainBundle\\\\Entity\\\\Address\\>\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/Household/Household.php
-
-		-
-			message: "#^Cannot call method toArray\\(\\) on array\\<Chill\\\\MainBundle\\\\Entity\\\\Address\\>\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/Household/Household.php
-
-		-
-			message: "#^Method Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\Household\\:\\:getAddresses\\(\\) should return array\\<Chill\\\\MainBundle\\\\Entity\\\\Address\\> but returns Doctrine\\\\Common\\\\Collections\\\\Collection\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/Household/Household.php
-
-		-
-			message: "#^PHPDoc tag @return with type array\\<Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\HouseholdMember\\> is incompatible with native type Doctrine\\\\Common\\\\Collections\\\\Collection\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/Household/Household.php
-
-		-
-			message: "#^PHPDoc tag @return with type array\\<Chill\\\\PersonBundle\\\\Entity\\\\Person\\> is incompatible with native type Doctrine\\\\Common\\\\Collections\\\\Collection\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/Household/Household.php
-
-		-
-			message: "#^Strict comparison using \\!\\=\\= between null and Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\HouseholdMember will always evaluate to true\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/Household/Household.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and int will always evaluate to false\\.$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Entity/Household/Household.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\PersonHouseholdAddress\\:\\:\\$address is never written, only read\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/Household/PersonHouseholdAddress.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\PersonHouseholdAddress\\:\\:\\$household is never written, only read\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/Household/PersonHouseholdAddress.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\PersonHouseholdAddress\\:\\:\\$person is never written, only read\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/Household/PersonHouseholdAddress.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\PersonHouseholdAddress\\:\\:\\$validFrom is never written, only read\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/Household/PersonHouseholdAddress.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\PersonHouseholdAddress\\:\\:\\$validTo is never written, only read\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/Household/PersonHouseholdAddress.php
-
-		-
-			message: "#^PHPDoc tag @param has invalid value \\(string array \\$name\\)\\: Unexpected token \"array\", expected variable at offset 49$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/MaritalStatus.php
-
-		-
-			message: "#^PHPDoc tag @return with type string is incompatible with native type array\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/MaritalStatus.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\Common\\\\Collections\\\\Collection&iterable\\<Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriodParticipation\\>\\:\\:matching\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/Person.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\Common\\\\Collections\\\\Collection&iterable\\<Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\HouseholdMember\\>\\:\\:matching\\(\\)\\.$#"
-			count: 3
-			path: src/Bundle/ChillPersonBundle/Entity/Person.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\Common\\\\Collections\\\\Collection&iterable\\<Chill\\\\PersonBundle\\\\Entity\\\\Person\\\\PersonCenterHistory\\>\\:\\:matching\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/Person.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\Common\\\\Collections\\\\Collection\\:\\:matching\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/Person.php
-
-		-
-			message: "#^Instanceof between DateTime and DateTimeInterface will always evaluate to true\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/Person.php
-
-		-
-			message: "#^Negated boolean expression is always true\\.$#"
-			count: 3
-			path: src/Bundle/ChillPersonBundle/Entity/Person.php
-
-		-
-			message: "#^PHPDoc tag @return with type array\\<Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\HouseholdMember\\> is incompatible with native type Doctrine\\\\Common\\\\Collections\\\\Collection\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/Person.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:\\$calendars is unused\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/Person.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:\\$center is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/Person.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:\\$currentHouseholdAt is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/Person.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:\\$deathdate \\(DateTimeImmutable\\|null\\) does not accept DateTimeInterface\\|null\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/Person.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:\\$maritalStatusDate \\(DateTime\\|null\\) does not accept DateTimeInterface\\|null\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/Person.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:\\$periodLocatedOn is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/Person.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:\\$proxyAccompanyingPeriodOpenState is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/Person.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:\\$spokenLanguages \\(Doctrine\\\\Common\\\\Collections\\\\ArrayCollection\\) does not accept Doctrine\\\\Common\\\\Collections\\\\Collection\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/Person.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between true and Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriodParticipation\\|null will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/Person.php
-
-		-
-			message: "#^Unreachable statement \\- code above always terminates\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/Person.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\Person\\\\PersonResource\\:\\:\\$id is never written, only read\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/Person/PersonResource.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\Person\\\\ResidentialAddress\\:\\:\\$id is never written, only read\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/Person/ResidentialAddress.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\PersonAltName\\:\\:\\$id is never written, only read\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/PersonAltName.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\PersonPhone\\:\\:\\$id is never written, only read\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/PersonPhone.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\Relationships\\\\Relationship\\:\\:\\$createdAt \\(DateTimeImmutable\\|null\\) does not accept DateTimeInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/Relationships/Relationship.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\Relationships\\\\Relationship\\:\\:\\$updatedAt \\(DateTimeImmutable\\|null\\) does not accept DateTimeInterface\\|null\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/Relationships/Relationship.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\SocialWork\\\\Result\\:\\:\\$desactivationDate \\(DateTime\\|null\\) does not accept DateTimeInterface\\|null\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php
-
-		-
-			message: "#^If condition is always false\\.$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php
-
-		-
-			message: "#^Negated boolean expression is always true\\.$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php
-
-		-
-			message: "#^Call to an undefined method Chill\\\\PersonBundle\\\\Entity\\\\SocialWork\\\\SocialAction\\:\\:getSocialIssue\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php
-
-		-
-			message: "#^Call to an undefined method Chill\\\\PersonBundle\\\\Entity\\\\SocialWork\\\\SocialAction\\:\\:setSocialIssue\\(\\)\\.$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php
-
-		-
-			message: "#^If condition is always false\\.$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php
-
-		-
-			message: "#^Negated boolean expression is always true\\.$#"
-			count: 4
-			path: src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\SocialWork\\\\SocialIssue\\:\\:\\$id is never written, only read\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between DateTimeImmutable and null will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Event/Person/PersonAddressMoveEvent.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and DateTimeImmutable will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Event/Person/PersonAddressMoveEvent.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Export\\\\Aggregator\\\\AccompanyingCourseAggregators\\\\DurationAggregator\\:\\:\\$translator is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregator.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Export\\\\Aggregator\\\\EvaluationAggregators\\\\ByEndDateAggregator\\:\\:\\$translator is unused\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByEndDateAggregator.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Export\\\\Aggregator\\\\EvaluationAggregators\\\\ByMaxDateAggregator\\:\\:\\$translator is unused\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByMaxDateAggregator.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Export\\\\Aggregator\\\\EvaluationAggregators\\\\ByStartDateAggregator\\:\\:\\$translator is unused\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Export/Aggregator/EvaluationAggregators/ByStartDateAggregator.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Export\\\\Aggregator\\\\HouseholdAggregators\\\\ChildrenNumberAggregator\\:\\:\\$translator is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Export/Aggregator/HouseholdAggregators/ChildrenNumberAggregator.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Export\\\\Export\\\\ListAccompanyingPeriod\\:\\:\\$userHelper is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Export/Export/ListAccompanyingPeriod.php
-
-		-
-			message: "#^Call to method extractOtherValue\\(\\) on an unknown class Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
-
-		-
-			message: "#^Call to method getChoices\\(\\) on an unknown class Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldInterface\\.$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
-
-		-
-			message: "#^Call to method isChecked\\(\\) on an unknown class Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldInterface\\.$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
-
-		-
-			message: "#^Call to method isMultiple\\(\\) on an unknown class Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldInterface\\.$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
-
-		-
-			message: "#^Call to method render\\(\\) on an unknown class Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Export\\\\Export\\\\ListPersonDuplicate\\:\\:\\$translator \\(Symfony\\\\Component\\\\Translation\\\\TranslatorInterface\\) does not accept Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Export/Export/ListPersonDuplicate.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Export\\\\Filter\\\\AccompanyingCourseFilters\\\\AdministrativeLocationFilter\\:\\:\\$translatableStringHelper is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilter.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Export\\\\Filter\\\\AccompanyingCourseFilters\\\\SocialActionFilter\\:\\:\\$translatableStringHelper is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/SocialActionFilter.php
-
-		-
-			message: "#^Method Chill\\\\PersonBundle\\\\Export\\\\Filter\\\\AccompanyingCourseFilters\\\\UserScopeFilter\\:\\:getUserMainScope\\(\\) is unused\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/UserScopeFilter.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Export\\\\Filter\\\\SocialWorkFilters\\\\SocialWorkTypeFilter\\:\\:\\$socialActionRender is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/SocialWorkTypeFilter.php
-
-		-
-			message: "#^PHPDoc tag @param for parameter \\$personRepository with type Chill\\\\PersonBundle\\\\Form\\\\ChoiceLoader\\\\EntityRepository is not subtype of native type Chill\\\\PersonBundle\\\\Repository\\\\PersonRepository\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php
-
-		-
-			message: "#^Parameter \\$personRepository of method Chill\\\\PersonBundle\\\\Form\\\\ChoiceLoader\\\\PersonChoiceLoader\\:\\:__construct\\(\\) has invalid type Chill\\\\PersonBundle\\\\Form\\\\ChoiceLoader\\\\EntityRepository\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php
-
-		-
-			message: "#^Method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) invoked with 2 parameters, 1 required\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
-
-		-
-			message: "#^Call to function is_array\\(\\) with Doctrine\\\\Common\\\\Collections\\\\Collection will always evaluate to false\\.$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Form/DataMapper/PersonAltNameDataMapper.php
-
-		-
-			message: "#^Call to method getData\\(\\) on an unknown class Chill\\\\PersonBundle\\\\Form\\\\DataMapper\\\\FormInterface\\.$#"
-			count: 3
-			path: src/Bundle/ChillPersonBundle/Form/DataMapper/PersonAltNameDataMapper.php
-
-		-
-			message: "#^Parameter \\#1 \\$forms \\(array\\<Chill\\\\PersonBundle\\\\Form\\\\DataMapper\\\\FormInterface\\>\\) of method Chill\\\\PersonBundle\\\\Form\\\\DataMapper\\\\PersonAltNameDataMapper\\:\\:mapFormsToData\\(\\) should be compatible with parameter \\$forms \\(iterable\\<Symfony\\\\Component\\\\Form\\\\FormInterface\\>&Traversable\\) of method Symfony\\\\Component\\\\Form\\\\DataMapperInterface\\:\\:mapFormsToData\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Form/DataMapper/PersonAltNameDataMapper.php
-
-		-
-			message: "#^Parameter \\$forms of method Chill\\\\PersonBundle\\\\Form\\\\DataMapper\\\\PersonAltNameDataMapper\\:\\:mapFormsToData\\(\\) has invalid type Chill\\\\PersonBundle\\\\Form\\\\DataMapper\\\\FormInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Form/DataMapper/PersonAltNameDataMapper.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Form\\\\PersonResourceType\\:\\:\\$personRender is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Form/PersonResourceType.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Form\\\\PersonResourceType\\:\\:\\$thirdPartyRender is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Form/PersonResourceType.php
-
-		-
-			message: "#^PHPDoc tag @param for parameter \\$resolver with type Chill\\\\PersonBundle\\\\Form\\\\OptionsResolverInterface is not subtype of native type Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolver\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Form/PersonType.php
-
-		-
-			message: "#^Parameter \\$resolver of method Chill\\\\PersonBundle\\\\Form\\\\PersonType\\:\\:configureOptions\\(\\) has invalid type Chill\\\\PersonBundle\\\\Form\\\\OptionsResolverInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Form/PersonType.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Form\\\\PersonType\\:\\:\\$parameterBag is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Form/PersonType.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Form\\\\PersonType\\:\\:\\$translatableStringHelper \\(Chill\\\\MainBundle\\\\Templating\\\\TranslatableStringHelper\\) does not accept Chill\\\\MainBundle\\\\Templating\\\\TranslatableStringHelperInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Form/PersonType.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between 'create' and 'create' will always evaluate to true\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Form/SocialWork/SocialIssueType.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Form\\\\Type\\\\PickPersonType\\:\\:\\$user \\(Chill\\\\MainBundle\\\\Entity\\\\User\\) does not accept string\\|Stringable\\|Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\Common\\\\Collections\\\\Collection&iterable\\<Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\HouseholdMember\\>\\:\\:matching\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Household/MembersEditor.php
-
-		-
-			message: "#^Method Doctrine\\\\Common\\\\Collections\\\\ExpressionBuilder\\:\\:isNull\\(\\) invoked with 2 parameters, 1 required\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Household/MembersEditor.php
-
-		-
-			message: "#^Cannot call method getId\\(\\) on string\\|Stringable\\|Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Privacy/PrivacyEventSubscriber.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkGoalRepository\\:\\:\\$repository is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkGoalRepository.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\ORM\\\\EntityRepository\\:\\:countByAccompanyingPeriod\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\ORM\\\\EntityRepository\\:\\:findByAccompanyingPeriod\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\CommentRepository\\:\\:\\$repository is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/CommentRepository.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\OriginRepository\\:\\:\\$repository is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/OriginRepository.php
-
-		-
-			message: "#^PHPDoc tag @param has invalid value \\(array\\|PostalCode\\[\\]\\)\\: Unexpected token \"\\\\n     \\*\", expected variable at offset 36$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriodParticipationRepository\\:\\:\\$repository is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodParticipationRepository.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Repository\\\\Household\\\\HouseholdMembersRepository\\:\\:\\$repository is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Repository/Household/HouseholdMembersRepository.php
-
-		-
-			message: "#^Method Chill\\\\PersonBundle\\\\Repository\\\\Household\\\\PositionRepository\\:\\:findOneBy\\(\\) should return array\\<Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\Position\\> but returns object\\|null\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Repository/Household/PositionRepository.php
-
-		-
-			message: "#^Return type \\(array\\<Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\Position\\>\\) of method Chill\\\\PersonBundle\\\\Repository\\\\Household\\\\PositionRepository\\:\\:findOneBy\\(\\) should be compatible with return type \\(object\\|null\\) of method Doctrine\\\\Persistence\\\\ObjectRepository\\<object\\>\\:\\:findOneBy\\(\\)$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Repository/Household/PositionRepository.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Repository\\\\PersonACLAwareRepository\\:\\:\\$countryRepository is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Repository\\\\PersonAltNameRepository\\:\\:\\$repository is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Repository/PersonAltNameRepository.php
-
-		-
-			message: "#^PHPDoc tag @return with type array\\<Chill\\\\PersonBundle\\\\Entity\\\\Person\\\\ResidentialAddress\\>\\|null is not subtype of native type array\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Repository/ResidentialAddressRepository.php
-
-		-
-			message: "#^Method Chill\\\\PersonBundle\\\\Search\\\\PersonSearch\\:\\:renderResult\\(\\) should return string but returns array\\<string, array\\<bool\\|Chill\\\\PersonBundle\\\\Entity\\\\Person\\>\\>\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Search/PersonSearch.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Search\\\\SearchHouseholdApiProvider\\:\\:\\$authorizationHelper is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Search/SearchHouseholdApiProvider.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Search\\\\SearchHouseholdApiProvider\\:\\:\\$security is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Search/SearchHouseholdApiProvider.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Search\\\\SearchPersonApiProvider\\:\\:\\$authorizationHelper is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Search/SearchPersonApiProvider.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Search\\\\SearchPersonApiProvider\\:\\:\\$security is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Search/SearchPersonApiProvider.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Security\\\\Authorization\\\\AccompanyingPeriodVoter\\:\\:\\$security is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php
-
-		-
-			message: "#^PHPDoc tag @return with type bool\\|void is not subtype of native type bool\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkEvaluationDocumentVoter.php
-
-		-
-			message: "#^Elseif branch is unreachable because previous condition is always true\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkVoter.php
-
-		-
-			message: "#^Instanceof between \\*NEVER\\* and Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkVoter.php
-
-		-
-			message: "#^Instanceof between Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\AccompanyingPeriodWork and Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\AccompanyingPeriodWork will always evaluate to true\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkVoter.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Security\\\\Authorization\\\\AccompanyingPeriodWorkVoter\\:\\:\\$voterHelper is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkVoter.php
-
-		-
-			message: "#^Unreachable statement \\- code above always terminates\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkVoter.php
-
-		-
-			message: "#^Constant Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\AccompanyingPeriodDocGenNormalizer\\:\\:IGNORE_FIRST_PASS_KEY is unused\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php
-
-		-
-			message: "#^Strict comparison using \\!\\=\\= between Chill\\\\PersonBundle\\\\Entity\\\\Person\\|Chill\\\\ThirdPartyBundle\\\\Entity\\\\ThirdParty and null will always evaluate to true\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and null will always evaluate to true\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php
-
-		-
-			message: "#^Unreachable statement \\- code above always terminates\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php
-
-		-
-			message: "#^Unreachable statement \\- code above always terminates\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodParticipationNormalizer.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\AccompanyingPeriodWorkDenormalizer\\:\\:\\$em is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkDenormalizer.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\AccompanyingPeriodWorkDenormalizer\\:\\:\\$workRepository is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkDenormalizer.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\AccompanyingPeriodWorkEvaluationDocumentNormalizer\\:\\:\\$registry is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationDocumentNormalizer.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\AccompanyingPeriodWorkEvaluationNormalizer\\:\\:\\$registry is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationNormalizer.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\AccompanyingPeriodWorkNormalizer\\:\\:\\$registry is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkNormalizer.php
-
-		-
-			message: "#^Call to function is_array\\(\\) with 'concerned' will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
-
-		-
-			message: "#^Expression on left side of \\?\\? is not nullable\\.$#"
-			count: 3
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
-
-		-
-			message: "#^Left side of && is always false\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between false and false will always evaluate to true\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
-
-		-
-			message: "#^Instanceof between Chill\\\\PersonBundle\\\\Entity\\\\Person and Chill\\\\PersonBundle\\\\Entity\\\\Person will always evaluate to true\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
-
-		-
-			message: "#^Method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\PersonDocGenNormalizer\\:\\:hasGroup\\(\\) is unused\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and Chill\\\\PersonBundle\\\\Entity\\\\Person will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\PersonJsonNormalizer\\:\\:\\$phoneNumberHelper is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and Chill\\\\PersonBundle\\\\Entity\\\\Relationships\\\\Relationship will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/RelationshipDocGenNormalizer.php
-
-		-
-			message: "#^Method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\SocialIssueNormalizer\\:\\:normalize\\(\\) should return array\\|ArrayObject\\|bool\\|float\\|int\\|string\\|null but return statement is missing\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialIssueNormalizer.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and Chill\\\\PersonBundle\\\\Entity\\\\SocialWork\\\\SocialIssue will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialIssueNormalizer.php
-
-		-
-			message: "#^PHPDoc tag @return with type array\\|ArrayObject\\|bool\\|float\\|int\\|string\\|void\\|null is not subtype of native type array\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/WorkflowNormalizer.php
-
-		-
-			message: "#^Call to an undefined method Chill\\\\DocStoreBundle\\\\Entity\\\\Document\\:\\:setCourse\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
-
-		-
-			message: "#^Call to function array_key_exists\\(\\) with 'category' and array will always evaluate to true\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
-
-		-
-			message: "#^Else branch is unreachable because ternary operator condition is always true\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
-
-		-
-			message: "#^Call to an undefined method Chill\\\\DocStoreBundle\\\\Entity\\\\Document\\:\\:setPerson\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
-
-		-
-			message: "#^Call to function array_key_exists\\(\\) with 'category' and array will always evaluate to true\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
-
-		-
-			message: "#^Comparison operation \"\\<\" between 1 and array results in an error\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
-
-		-
-			message: "#^Else branch is unreachable because ternary operator condition is always true\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
-
-		-
-			message: "#^PHPDoc tag @param has invalid value \\(array\\<string, array\\<string, \\<\\|array\\|null\\>\\|SocialIssue\\|string, SocialAction\\|null\\>\\|Evaluation\\|Goal\\|Result\\> \\$previousRow\\)\\: Unexpected token \"\\<\", expected type at offset 333$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Service/Import/SocialWorkMetadata.php
-
-		-
-			message: "#^PHPDoc tag @return has invalid value \\(array\\<string, array\\<string, \\<\\|array\\|null\\>\\|SocialIssue\\|string, SocialAction\\|null\\>\\|Evaluation\\|Goal\\|Result\\>\\)\\: Unexpected token \"\\<\", expected type at offset 505$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Service/Import/SocialWorkMetadata.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Service\\\\Import\\\\SocialWorkMetadata\\:\\:\\$socialActionRepository is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Service/Import/SocialWorkMetadata.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Service\\\\Import\\\\SocialWorkMetadata\\:\\:\\$socialIssueRepository is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Service/Import/SocialWorkMetadata.php
-
-		-
-			message: "#^Call to method getId\\(\\) on an unknown class ChillPersonBundle\\:AccompanyingPeriod\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Timeline/AbstractTimelineAccompanyingPeriod.php
-
-		-
-			message: "#^Cannot call method setKey\\(\\) on array\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodClosing.php
-
-		-
-			message: "#^Parameter \\$context of method Chill\\\\PersonBundle\\\\Timeline\\\\TimelineAccompanyingPeriodClosing\\:\\:getEntityTemplate\\(\\) has invalid type Chill\\\\MainBundle\\\\Timeline\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodClosing.php
-
-		-
-			message: "#^Parameter \\$entity of method Chill\\\\PersonBundle\\\\Timeline\\\\TimelineAccompanyingPeriodClosing\\:\\:getEntityTemplate\\(\\) has invalid type Chill\\\\MainBundle\\\\Timeline\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodClosing.php
-
-		-
-			message: "#^Cannot call method setKey\\(\\) on array\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodOpening.php
-
-		-
-			message: "#^Parameter \\$context of method Chill\\\\PersonBundle\\\\Timeline\\\\TimelineAccompanyingPeriodOpening\\:\\:getEntityTemplate\\(\\) has invalid type Chill\\\\MainBundle\\\\Timeline\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodOpening.php
-
-		-
-			message: "#^Parameter \\$entity of method Chill\\\\PersonBundle\\\\Timeline\\\\TimelineAccompanyingPeriodOpening\\:\\:getEntityTemplate\\(\\) has invalid type Chill\\\\MainBundle\\\\Timeline\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodOpening.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Validator\\\\Constraints\\\\AccompanyingPeriod\\\\AccompanyingPeriodValidityValidator\\:\\:\\$token is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/AccompanyingPeriodValidityValidator.php
-
-		-
-			message: "#^Property Chill\\\\PersonBundle\\\\Validator\\\\Constraints\\\\AccompanyingPeriod\\\\ParticipationOverlapValidator\\:\\:\\$thirdpartyRender is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ParticipationOverlapValidator.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between 0 and int\\<2, max\\> will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ParticipationOverlapValidator.php
-
-		-
-			message: "#^Access to an undefined property Symfony\\\\Component\\\\Validator\\\\Constraint\\:\\:\\$message\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Validator/Constraints/Household/HouseholdMembershipSequentialValidator.php
-
-		-
-			message: "#^Access to an undefined property Symfony\\\\Component\\\\Validator\\\\Constraint\\:\\:\\$message\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Validator/Constraints/Household/MaxHolderValidator.php
-
-		-
-			message: "#^Access to an undefined property Symfony\\\\Component\\\\Validator\\\\Constraint\\:\\:\\$messageInfinity\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Validator/Constraints/Household/MaxHolderValidator.php
-
-		-
-			message: "#^Access to an undefined property Symfony\\\\Component\\\\Validator\\\\Constraint\\:\\:\\$message\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Validator/Constraints/Person/BirthdateValidator.php
-
-		-
-			message: "#^Access to an undefined property Symfony\\\\Component\\\\Validator\\\\Constraint\\:\\:\\$message\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Validator/Constraints/Person/PersonHasCenterValidator.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and string\\|Stringable\\|Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Widget/PersonListWidget.php
-
-		-
-			message: "#^Call to an undefined method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\NodeParentInterface\\:\\:info\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Widget/PersonListWidgetFactory.php
-
-		-
-			message: "#^Parameter \\$place of method Chill\\\\PersonBundle\\\\Widget\\\\PersonListWidgetFactory\\:\\:configureOptions\\(\\) has invalid type Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Widget/PersonListWidgetFactory.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\ObjectManager\\:\\:createQuery\\(\\)\\.$#"
-			count: 2
-			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\ObjectRepository\\<ChillReportBundle\\:Report\\>\\:\\:findByCFGroup\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
-
-		-
-			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\ObjectRepository\\<Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomFieldsGroup\\>\\:\\:findByEntity\\(\\)\\.$#"
-			count: 2
-			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
-
-		-
-			message: "#^Call to method getId\\(\\) on an unknown class ChillReportBundle\\:Report\\.$#"
-			count: 2
-			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
-
-		-
-			message: "#^Call to method getPerson\\(\\) on an unknown class ChillReportBundle\\:Report\\.$#"
-			count: 3
-			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
-
-		-
-			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:createAction\\(\\) has invalid return type Chill\\\\ReportBundle\\\\Controller\\\\Response\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
-
-		-
-			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:createAction\\(\\) should return Chill\\\\ReportBundle\\\\Controller\\\\Response but returns Symfony\\\\Component\\\\HttpFoundation\\\\RedirectResponse\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
-
-		-
-			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:createAction\\(\\) should return Chill\\\\ReportBundle\\\\Controller\\\\Response but returns Symfony\\\\Component\\\\HttpFoundation\\\\Response\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
-
-		-
-			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:createCreateForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
-
-		-
-			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:createEditForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
-
-		-
-			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:editAction\\(\\) has invalid return type Chill\\\\ReportBundle\\\\Controller\\\\Response\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
-
-		-
-			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:editAction\\(\\) should return Chill\\\\ReportBundle\\\\Controller\\\\Response but returns Symfony\\\\Component\\\\HttpFoundation\\\\Response\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
-
-		-
-			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:exportAction\\(\\) has invalid return type Chill\\\\ReportBundle\\\\Controller\\\\A\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
-
-		-
-			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:exportAction\\(\\) should return Chill\\\\ReportBundle\\\\Controller\\\\A but returns Symfony\\\\Component\\\\HttpFoundation\\\\Response\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
-
-		-
-			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:listAction\\(\\) has invalid return type Chill\\\\ReportBundle\\\\Controller\\\\Response\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
-
-		-
-			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:listAction\\(\\) should return Chill\\\\ReportBundle\\\\Controller\\\\Response but returns Symfony\\\\Component\\\\HttpFoundation\\\\Response\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
-
-		-
-			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:newAction\\(\\) has invalid return type Chill\\\\ReportBundle\\\\Controller\\\\Response\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
-
-		-
-			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:newAction\\(\\) should return Chill\\\\ReportBundle\\\\Controller\\\\Response but returns Symfony\\\\Component\\\\HttpFoundation\\\\Response\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
-
-		-
-			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:selectReportTypeAction\\(\\) has invalid return type Chill\\\\ReportBundle\\\\Controller\\\\Response\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
-
-		-
-			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:selectReportTypeAction\\(\\) should return Chill\\\\ReportBundle\\\\Controller\\\\Response but returns Symfony\\\\Component\\\\HttpFoundation\\\\RedirectResponse\\.$#"
-			count: 2
-			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
-
-		-
-			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:selectReportTypeAction\\(\\) should return Chill\\\\ReportBundle\\\\Controller\\\\Response but returns Symfony\\\\Component\\\\HttpFoundation\\\\Response\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
-
-		-
-			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:selectReportTypeForExportAction\\(\\) has invalid return type Chill\\\\ReportBundle\\\\Controller\\\\Response\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
-
-		-
-			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:selectReportTypeForExportAction\\(\\) should return Chill\\\\ReportBundle\\\\Controller\\\\Response but returns Symfony\\\\Component\\\\HttpFoundation\\\\RedirectResponse\\.$#"
-			count: 2
-			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
-
-		-
-			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:selectReportTypeForExportAction\\(\\) should return Chill\\\\ReportBundle\\\\Controller\\\\Response but returns Symfony\\\\Component\\\\HttpFoundation\\\\Response\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
-
-		-
-			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:updateAction\\(\\) has invalid return type Chill\\\\ReportBundle\\\\Controller\\\\Response\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
-
-		-
-			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:updateAction\\(\\) should return Chill\\\\ReportBundle\\\\Controller\\\\Response but returns Symfony\\\\Component\\\\HttpFoundation\\\\RedirectResponse\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
-
-		-
-			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:updateAction\\(\\) should return Chill\\\\ReportBundle\\\\Controller\\\\Response but returns Symfony\\\\Component\\\\HttpFoundation\\\\Response\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
-
-		-
-			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:viewAction\\(\\) has invalid return type Chill\\\\ReportBundle\\\\Controller\\\\Response\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
-
-		-
-			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:viewAction\\(\\) should return Chill\\\\ReportBundle\\\\Controller\\\\Response but returns Symfony\\\\Component\\\\HttpFoundation\\\\Response\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
-
-		-
-			message: "#^Method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) invoked with 2 parameters, 1 required\\.$#"
-			count: 4
-			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
-
-		-
-			message: "#^Negated boolean expression is always false\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
-
-		-
-			message: "#^Method Chill\\\\ReportBundle\\\\DataFixtures\\\\ORM\\\\LoadReports\\:\\:getRandomChoice\\(\\) never returns string so it can be removed from the return type\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php
-
-		-
-			message: "#^Method Chill\\\\ReportBundle\\\\DataFixtures\\\\ORM\\\\LoadReports\\:\\:getRandomChoice\\(\\) should return array\\<string\\>\\|string but returns array\\<string, Chill\\\\ReportBundle\\\\DataFixtures\\\\ORM\\\\the\\|null\\>\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php
-
-		-
-			message: "#^Method Chill\\\\ReportBundle\\\\DataFixtures\\\\ORM\\\\LoadReports\\:\\:pickChoice\\(\\) has invalid return type Chill\\\\ReportBundle\\\\DataFixtures\\\\ORM\\\\the\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between '_other' and Chill\\\\ReportBundle\\\\DataFixtures\\\\ORM\\\\the will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between DateTime and null will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php
-
-		-
-			message: "#^Method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\TreeBuilder\\:\\:getRootNode\\(\\) invoked with 1 parameter, 0 required\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/DependencyInjection/Configuration.php
-
-		-
-			message: "#^PHPDoc tag @param for parameter \\$scope with type string is incompatible with native type Chill\\\\MainBundle\\\\Entity\\\\Scope\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Entity/Report.php
-
-		-
-			message: "#^Property Chill\\\\ReportBundle\\\\Entity\\\\Report\\:\\:\\$id is never written, only read\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Entity/Report.php
-
-		-
-			message: "#^Call to method extractOtherValue\\(\\) on an unknown class Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Export/Export/ReportList.php
-
-		-
-			message: "#^Call to method getChoices\\(\\) on an unknown class Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldInterface\\.$#"
-			count: 2
-			path: src/Bundle/ChillReportBundle/Export/Export/ReportList.php
-
-		-
-			message: "#^Call to method isChecked\\(\\) on an unknown class Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldInterface\\.$#"
-			count: 2
-			path: src/Bundle/ChillReportBundle/Export/Export/ReportList.php
-
-		-
-			message: "#^Call to method isMultiple\\(\\) on an unknown class Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldInterface\\.$#"
-			count: 2
-			path: src/Bundle/ChillReportBundle/Export/Export/ReportList.php
-
-		-
-			message: "#^Call to method render\\(\\) on an unknown class Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Export/Export/ReportList.php
-
-		-
-			message: "#^Property Chill\\\\ReportBundle\\\\Form\\\\ReportType\\:\\:\\$user \\(Chill\\\\MainBundle\\\\Entity\\\\User\\) does not accept string\\|Stringable\\|Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Form/ReportType.php
-
-		-
-			message: "#^Call to method getId\\(\\) on an unknown class ChillReportBundle\\:Report\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php
-
-		-
-			message: "#^Parameter \\$context of method Chill\\\\ReportBundle\\\\Timeline\\\\TimelineReportProvider\\:\\:getEntityTemplate\\(\\) has invalid type Chill\\\\MainBundle\\\\Timeline\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php
-
-		-
-			message: "#^Parameter \\$entity of method Chill\\\\ReportBundle\\\\Timeline\\\\TimelineReportProvider\\:\\:getEntityTemplate\\(\\) has invalid type Chill\\\\MainBundle\\\\Timeline\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php
-
-		-
-			message: "#^Method Chill\\\\TaskBundle\\\\Controller\\\\SingleTaskController\\:\\:createDeleteForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
-
-		-
-			message: "#^Method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) invoked with 2 parameters, 1 required\\.$#"
-			count: 6
-			path: src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
-
-		-
-			message: "#^Property Chill\\\\TaskBundle\\\\Controller\\\\SingleTaskController\\:\\:\\$centerResolverDispatcher is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and int will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
-
-		-
-			message: "#^If condition is always true\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Controller/TaskController.php
-
-		-
-			message: "#^Method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) invoked with 2 parameters, 1 required\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Controller/TaskController.php
-
-		-
-			message: "#^PHPDoc tag @param for parameter \\$task with type Chill\\\\TaskBundle\\\\Controller\\\\AbstractTask is not subtype of native type Chill\\\\TaskBundle\\\\Entity\\\\AbstractTask\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Controller/TaskController.php
-
-		-
-			message: "#^Parameter \\$task of method Chill\\\\TaskBundle\\\\Controller\\\\TaskController\\:\\:createTransitionForm\\(\\) has invalid type Chill\\\\TaskBundle\\\\Controller\\\\AbstractTask\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Controller/TaskController.php
-
-		-
-			message: "#^Method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\TreeBuilder\\:\\:getRootNode\\(\\) invoked with 1 parameter, 0 required\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/DependencyInjection/Configuration.php
-
-		-
-			message: "#^Property Chill\\\\TaskBundle\\\\Entity\\\\AbstractTask\\:\\:\\$currentStates \\(Chill\\\\TaskBundle\\\\Entity\\\\json\\) does not accept array\\<int, int\\|string\\>\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Entity/AbstractTask.php
-
-		-
-			message: "#^Property Chill\\\\TaskBundle\\\\Entity\\\\AbstractTask\\:\\:\\$currentStates \\(Chill\\\\TaskBundle\\\\Entity\\\\json\\) does not accept default value of type array\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Entity/AbstractTask.php
-
-		-
-			message: "#^Property Chill\\\\TaskBundle\\\\Entity\\\\AbstractTask\\:\\:\\$currentStates has unknown class Chill\\\\TaskBundle\\\\Entity\\\\json as its type\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Entity/AbstractTask.php
-
-		-
-			message: "#^Unreachable statement \\- code above always terminates\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Entity/AbstractTask.php
-
-		-
-			message: "#^Method Chill\\\\TaskBundle\\\\Entity\\\\RecurringTask\\:\\:getOccurenceStartDate\\(\\) has invalid return type Chill\\\\TaskBundle\\\\Entity\\\\dateinterval\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Entity/RecurringTask.php
-
-		-
-			message: "#^Method Chill\\\\TaskBundle\\\\Entity\\\\RecurringTask\\:\\:getOccurenceWarningInterval\\(\\) has invalid return type Chill\\\\TaskBundle\\\\Entity\\\\dateinterval\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Entity/RecurringTask.php
-
-		-
-			message: "#^Parameter \\$occurenceStartDate of method Chill\\\\TaskBundle\\\\Entity\\\\RecurringTask\\:\\:setOccurenceStartDate\\(\\) has invalid type Chill\\\\TaskBundle\\\\Entity\\\\dateinterval\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Entity/RecurringTask.php
-
-		-
-			message: "#^Parameter \\$occurenceWarningInterval of method Chill\\\\TaskBundle\\\\Entity\\\\RecurringTask\\:\\:setOccurenceWarningInterval\\(\\) has invalid type Chill\\\\TaskBundle\\\\Entity\\\\dateinterval\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Entity/RecurringTask.php
-
-		-
-			message: "#^Property Chill\\\\TaskBundle\\\\Entity\\\\RecurringTask\\:\\:\\$id is never written, only read\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Entity/RecurringTask.php
-
-		-
-			message: "#^Property Chill\\\\TaskBundle\\\\Entity\\\\RecurringTask\\:\\:\\$occurenceStartDate has unknown class Chill\\\\TaskBundle\\\\Entity\\\\dateinterval as its type\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Entity/RecurringTask.php
-
-		-
-			message: "#^Property Chill\\\\TaskBundle\\\\Entity\\\\RecurringTask\\:\\:\\$occurenceWarningInterval has unknown class Chill\\\\TaskBundle\\\\Entity\\\\dateinterval as its type\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Entity/RecurringTask.php
-
-		-
-			message: "#^Property Chill\\\\TaskBundle\\\\Entity\\\\RecurringTask\\:\\:\\$singleTasks is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Entity/RecurringTask.php
-
-		-
-			message: "#^Method Chill\\\\TaskBundle\\\\Entity\\\\SingleTask\\:\\:getWarningDate\\(\\) should return DateTimeImmutable but returns null\\.$#"
-			count: 2
-			path: src/Bundle/ChillTaskBundle/Entity/SingleTask.php
-
-		-
-			message: "#^Property Chill\\\\TaskBundle\\\\Entity\\\\SingleTask\\:\\:\\$id is never written, only read\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Entity/SingleTask.php
-
-		-
-			message: "#^Property Chill\\\\TaskBundle\\\\Entity\\\\SingleTask\\:\\:\\$warningInterval \\(DateInterval\\) does not accept string\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Entity/SingleTask.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between DateInterval and null will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Entity/SingleTask.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between DateTime and null will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Entity/SingleTask.php
-
-		-
-			message: "#^Method Chill\\\\TaskBundle\\\\Entity\\\\Task\\\\AbstractTaskPlaceEvent\\:\\:getDatetime\\(\\) has invalid return type Chill\\\\TaskBundle\\\\Entity\\\\Task\\\\datetime_immutable\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Entity/Task/AbstractTaskPlaceEvent.php
-
-		-
-			message: "#^Parameter \\$datetime of method Chill\\\\TaskBundle\\\\Entity\\\\Task\\\\AbstractTaskPlaceEvent\\:\\:setDatetime\\(\\) has invalid type Chill\\\\TaskBundle\\\\Entity\\\\Task\\\\datetime_immutable\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Entity/Task/AbstractTaskPlaceEvent.php
-
-		-
-			message: "#^Property Chill\\\\TaskBundle\\\\Entity\\\\Task\\\\AbstractTaskPlaceEvent\\:\\:\\$data \\(string\\) does not accept default value of type array\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Entity/Task/AbstractTaskPlaceEvent.php
-
-		-
-			message: "#^Property Chill\\\\TaskBundle\\\\Entity\\\\Task\\\\AbstractTaskPlaceEvent\\:\\:\\$datetime \\(Chill\\\\TaskBundle\\\\Entity\\\\Task\\\\datetime_immutable\\) does not accept DateTimeImmutable\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Entity/Task/AbstractTaskPlaceEvent.php
-
-		-
-			message: "#^Property Chill\\\\TaskBundle\\\\Entity\\\\Task\\\\AbstractTaskPlaceEvent\\:\\:\\$datetime has unknown class Chill\\\\TaskBundle\\\\Entity\\\\Task\\\\datetime_immutable as its type\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Entity/Task/AbstractTaskPlaceEvent.php
-
-		-
-			message: "#^Property Chill\\\\TaskBundle\\\\Entity\\\\Task\\\\AbstractTaskPlaceEvent\\:\\:\\$id is never written, only read\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Entity/Task/AbstractTaskPlaceEvent.php
-
-		-
-			message: "#^Call to an undefined method Chill\\\\TaskBundle\\\\Entity\\\\AbstractTask\\:\\:getTaskPlaceEvents\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Event/Lifecycle/TaskLifecycleEvent.php
-
-		-
-			message: "#^Method Knp\\\\Menu\\\\MenuItem\\:\\:setExtras\\(\\) invoked with 2 parameters, 1 required\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Menu/MenuBuilder.php
-
-		-
-			message: "#^Call to an undefined method Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface\\:\\:transChoice\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Menu/UserMenuBuilder.php
-
-		-
-			message: "#^Method Chill\\\\TaskBundle\\\\Repository\\\\SingleTaskRepository\\:\\:findByParameters\\(\\) has invalid return type Chill\\\\TaskBundle\\\\Repository\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Repository/SingleTaskRepository.php
-
-		-
-			message: "#^Parameter \\$params of method Chill\\\\TaskBundle\\\\Repository\\\\SingleTaskRepository\\:\\:findByParameters\\(\\) has invalid type Chill\\\\TaskBundle\\\\Repository\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Repository/SingleTaskRepository.php
-
-		-
-			message: "#^Property Chill\\\\TaskBundle\\\\Security\\\\Authorization\\\\AuthorizationEvent\\:\\:\\$subject has unknown class Chill\\\\TaskBundle\\\\Security\\\\Authorization\\\\Chill\\\\TaskBundle\\\\Entity\\\\AbstractTask as its type\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Security/Authorization/AuthorizationEvent.php
-
-		-
-			message: "#^Property Chill\\\\TaskBundle\\\\Security\\\\Authorization\\\\AuthorizationEvent\\:\\:\\$vote \\(bool\\) does not accept null\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Security/Authorization/AuthorizationEvent.php
-
-		-
-			message: "#^Method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) invoked with 2 parameters, 1 required\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Security/Authorization/TaskVoter.php
-
-		-
-			message: "#^Call to method deleteItem\\(\\) on an unknown class Chill\\\\TaskBundle\\\\Templating\\\\UI\\\\CacheItempPoolInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Templating/UI/CountNotificationTask.php
-
-		-
-			message: "#^Call to method getItem\\(\\) on an unknown class Chill\\\\TaskBundle\\\\Templating\\\\UI\\\\CacheItempPoolInterface\\.$#"
-			count: 2
-			path: src/Bundle/ChillTaskBundle/Templating/UI/CountNotificationTask.php
-
-		-
-			message: "#^Call to method save\\(\\) on an unknown class Chill\\\\TaskBundle\\\\Templating\\\\UI\\\\CacheItempPoolInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Templating/UI/CountNotificationTask.php
-
-		-
-			message: "#^Property Chill\\\\TaskBundle\\\\Templating\\\\UI\\\\CountNotificationTask\\:\\:\\$cachePool \\(Chill\\\\TaskBundle\\\\Templating\\\\UI\\\\CacheItempPoolInterface\\) does not accept Psr\\\\Cache\\\\CacheItemPoolInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Templating/UI/CountNotificationTask.php
-
-		-
-			message: "#^Property Chill\\\\TaskBundle\\\\Templating\\\\UI\\\\CountNotificationTask\\:\\:\\$cachePool has unknown class Chill\\\\TaskBundle\\\\Templating\\\\UI\\\\CacheItempPoolInterface as its type\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Templating/UI/CountNotificationTask.php
-
-		-
-			message: "#^Call to method getData\\(\\) on an unknown class Chill\\\\MainBundle\\\\Timeline\\\\type\\.$#"
-			count: 2
-			path: src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php
-
-		-
-			message: "#^Call to method getTask\\(\\) on an unknown class Chill\\\\MainBundle\\\\Timeline\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php
-
-		-
-			message: "#^Call to method getTransition\\(\\) on an unknown class Chill\\\\MainBundle\\\\Timeline\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php
-
-		-
-			message: "#^Parameter \\$context of method Chill\\\\TaskBundle\\\\Timeline\\\\SingleTaskTaskLifeCycleEventTimelineProvider\\:\\:getEntityTemplate\\(\\) has invalid type Chill\\\\MainBundle\\\\Timeline\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php
-
-		-
-			message: "#^Parameter \\$entity of method Chill\\\\TaskBundle\\\\Timeline\\\\SingleTaskTaskLifeCycleEventTimelineProvider\\:\\:getEntityTemplate\\(\\) has invalid type Chill\\\\MainBundle\\\\Timeline\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php
-
-		-
-			message: "#^Call to method getData\\(\\) on an unknown class Chill\\\\MainBundle\\\\Timeline\\\\type\\.$#"
-			count: 2
-			path: src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
-
-		-
-			message: "#^Call to method getTask\\(\\) on an unknown class Chill\\\\MainBundle\\\\Timeline\\\\type\\.$#"
-			count: 2
-			path: src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
-
-		-
-			message: "#^Call to method getTransition\\(\\) on an unknown class Chill\\\\MainBundle\\\\Timeline\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
-
-		-
-			message: "#^Parameter \\$context of method Chill\\\\TaskBundle\\\\Timeline\\\\TaskLifeCycleEventTimelineProvider\\:\\:getEntityTemplate\\(\\) has invalid type Chill\\\\MainBundle\\\\Timeline\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
-
-		-
-			message: "#^Parameter \\$entity of method Chill\\\\TaskBundle\\\\Timeline\\\\TaskLifeCycleEventTimelineProvider\\:\\:getEntityTemplate\\(\\) has invalid type Chill\\\\MainBundle\\\\Timeline\\\\type\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
-
-		-
-			message: "#^Call to an undefined method Chill\\\\TaskBundle\\\\Entity\\\\AbstractTask\\:\\:getId\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Workflow/TaskWorkflowManager.php
-
-		-
-			message: "#^Call to an undefined method Chill\\\\TaskBundle\\\\Workflow\\\\TaskWorkflowDefinition\\:\\:getAssociatedWorkflowName\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Workflow/TaskWorkflowManager.php
-
-		-
-			message: "#^Call to an undefined method Chill\\\\TaskBundle\\\\Workflow\\\\TaskWorkflowDefinition\\:\\:getWorkflowMetadata\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Workflow/TaskWorkflowManager.php
-
-		-
-			message: "#^Call to an undefined method Chill\\\\TaskBundle\\\\Workflow\\\\TaskWorkflowDefinition\\:\\:isClosed\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Workflow/TaskWorkflowManager.php
-
-		-
-			message: "#^Call to an undefined method Chill\\\\TaskBundle\\\\Workflow\\\\TaskWorkflowDefinition\\:\\:supports\\(\\)\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Workflow/TaskWorkflowManager.php
-
-		-
-			message: "#^Method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\TreeBuilder\\:\\:getRootNode\\(\\) invoked with 1 parameter, 0 required\\.$#"
-			count: 1
-			path: src/Bundle/ChillThirdPartyBundle/DependencyInjection/Configuration.php
-
-		-
-			message: "#^PHPDoc tag @return with type DateTime\\|null is not subtype of native type DateTimeImmutable\\|null\\.$#"
-			count: 1
-			path: src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
-
-		-
-			message: "#^PHPDoc tag @var for property Chill\\\\ThirdPartyBundle\\\\Entity\\\\ThirdParty\\:\\:\\$categories with type Chill\\\\ThirdPartyBundle\\\\Entity\\\\ThirdPartyCategory is not subtype of native type Doctrine\\\\Common\\\\Collections\\\\Collection\\.$#"
-			count: 1
-			path: src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
-
-		-
-			message: "#^Property Chill\\\\ThirdPartyBundle\\\\Entity\\\\ThirdParty\\:\\:\\$canonicalized is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
-
-		-
-			message: "#^Property Chill\\\\ThirdPartyBundle\\\\Entity\\\\ThirdParty\\:\\:\\$createdBy is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
-
-		-
-			message: "#^Property Chill\\\\ThirdPartyBundle\\\\Repository\\\\ThirdPartyACLAwareRepository\\:\\:\\$authorizationHelper is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyACLAwareRepository.php
-
-		-
-			message: "#^Property Chill\\\\ThirdPartyBundle\\\\Repository\\\\ThirdPartyACLAwareRepository\\:\\:\\$security is never read, only written\\.$#"
-			count: 1
-			path: src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyACLAwareRepository.php
-
-		-
-			message: "#^Argument of an invalid type string supplied for foreach, only iterables are supported\\.$#"
-			count: 1
-			path: src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php
-
-		-
-			message: "#^Method Chill\\\\ThirdPartyBundle\\\\Search\\\\ThirdPartySearch\\:\\:renderResult\\(\\) should return string but returns array\\<string, array\\|bool\\>\\.$#"
-			count: 1
-			path: src/Bundle/ChillThirdPartyBundle/Search/ThirdPartySearch.php
-
-		-
-			message: "#^Unreachable statement \\- code above always terminates\\.$#"
-			count: 1
-			path: src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between null and Chill\\\\DocStoreBundle\\\\Entity\\\\StoredObject will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillWopiBundle/src/Controller/Editor.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between false and array will always evaluate to false\\.$#"
-			count: 1
-			path: src/Bundle/ChillWopiBundle/src/Service/Wopi/AuthorizationManager.php
-
-		-
-			message: "#^Default value of the parameter \\#2 \\$properties \\(array\\{\\}\\) of method Chill\\\\WopiBundle\\\\Service\\\\Wopi\\\\ChillDocumentManager\\:\\:write\\(\\) is incompatible with type array\\{content\\: string, size\\: int\\}\\.$#"
-			count: 1
-			path: src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
-
-		-
-			message: "#^Method ChampsLibres\\\\WopiLib\\\\Contract\\\\Service\\\\WopiInterface\\:\\:checkFileInfo\\(\\) invoked with 4 parameters, 3 required\\.$#"
-			count: 1
-			path: src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php
diff --git a/phpstan-baseline-level-5.neon b/phpstan-baseline-level-5.neon
deleted file mode 100644
index 34e2825a3..000000000
--- a/phpstan-baseline-level-5.neon
+++ /dev/null
@@ -1,676 +0,0 @@
-parameters:
-	ignoreErrors:
-		-
-			message: "#^Parameter \\#1 \\$event of method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) expects object, string given\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Controller/ActivityController.php
-
-		-
-			message: "#^Parameter \\#1 \\$context of method Chill\\\\ActivityBundle\\\\Timeline\\\\TimelineActivityProvider\\:\\:checkContext\\(\\) expects string, Chill\\\\MainBundle\\\\Timeline\\\\type given\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php
-
-		-
-			message: "#^Parameter \\#1 \\$callback of function array_map expects \\(callable\\(Chill\\\\BudgetBundle\\\\Repository\\\\ChargeType\\)\\: mixed\\)\\|null, Closure\\(Chill\\\\BudgetBundle\\\\Entity\\\\ChargeKind\\)\\: int\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillBudgetBundle/Service/Summary/SummaryBudget.php
-
-		-
-			message: "#^Parameter \\#1 \\$callback of function array_map expects \\(callable\\(Chill\\\\BudgetBundle\\\\Repository\\\\ResourceType\\)\\: mixed\\)\\|null, Closure\\(Chill\\\\BudgetBundle\\\\Entity\\\\ResourceKind\\)\\: int\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillBudgetBundle/Service/Summary/SummaryBudget.php
-
-		-
-			message: "#^Parameter \\#2 \\$byUser of class Chill\\\\CalendarBundle\\\\Messenger\\\\Message\\\\InviteUpdateMessage constructor expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/Controller/InviteApiController.php
-
-		-
-			message: "#^Parameter \\#2 \\$byUser of class Chill\\\\CalendarBundle\\\\Messenger\\\\Message\\\\CalendarRemovedMessage constructor expects Chill\\\\MainBundle\\\\Entity\\\\User\\|null, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarEntityListener.php
-
-		-
-			message: "#^Parameter \\#3 \\$byUser of class Chill\\\\CalendarBundle\\\\Messenger\\\\Message\\\\CalendarMessage constructor expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
-			count: 2
-			path: src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarEntityListener.php
-
-		-
-			message: "#^Parameter \\#2 \\$byUser of class Chill\\\\CalendarBundle\\\\Messenger\\\\Message\\\\CalendarRangeRemovedMessage constructor expects Chill\\\\MainBundle\\\\Entity\\\\User\\|null, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarRangeEntityListener.php
-
-		-
-			message: "#^Parameter \\#3 \\$byUser of class Chill\\\\CalendarBundle\\\\Messenger\\\\Message\\\\CalendarRangeMessage constructor expects Chill\\\\MainBundle\\\\Entity\\\\User\\|null, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
-			count: 2
-			path: src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarRangeEntityListener.php
-
-		-
-			message: "#^Parameter \\#1 \\$token of method Chill\\\\CalendarBundle\\\\RemoteCalendar\\\\Connector\\\\MSGraph\\\\OnBehalfOfUserTokenStorage\\:\\:setToken\\(\\) expects TheNetworg\\\\OAuth2\\\\Client\\\\Token\\\\AccessToken, League\\\\OAuth2\\\\Client\\\\Token\\\\AccessTokenInterface given\\.$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/OnBehalfOfUserTokenStorage.php
-
-		-
-			message: "#^Parameter \\#2 \\$code of class Exception constructor expects int, array\\<string, int\\|string\\|null\\> given\\.$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraphRemoteCalendarConnector.php
-
-		-
-			message: "#^Parameter \\#4 \\$offset of method Chill\\\\CalendarBundle\\\\Repository\\\\CalendarRepository\\:\\:findBy\\(\\) expects int\\|null, array\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php
-
-		-
-			message: "#^Parameter \\#1 \\$prefix of function uniqid expects string, int\\<0, max\\> given\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoicesListType.php
-
-		-
-			message: "#^Parameter \\#2 \\$callback of function array_filter expects callable\\(Symfony\\\\Component\\\\Serializer\\\\Mapping\\\\AttributeMetadataInterface\\)\\: mixed, Closure\\(Symfony\\\\Component\\\\Serializer\\\\Mapping\\\\AttributeMetadata\\)\\: bool given\\.$#"
-			count: 1
-			path: src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/DocGenObjectNormalizer.php
-
-		-
-			message: "#^Parameter \\#3 \\$metadata of method Chill\\\\DocGeneratorBundle\\\\Serializer\\\\Normalizer\\\\DocGenObjectNormalizer\\:\\:normalizeNullData\\(\\) expects Symfony\\\\Component\\\\Serializer\\\\Mapping\\\\ClassMetadata, Symfony\\\\Component\\\\Serializer\\\\Mapping\\\\ClassMetadataInterface given\\.$#"
-			count: 1
-			path: src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/DocGenObjectNormalizer.php
-
-		-
-			message: "#^Parameter \\#4 \\$attributes of method Chill\\\\DocGeneratorBundle\\\\Serializer\\\\Normalizer\\\\DocGenObjectNormalizer\\:\\:normalizeNullData\\(\\) expects array\\<Symfony\\\\Component\\\\Serializer\\\\Mapping\\\\AttributeMetadata\\>, array\\<Symfony\\\\Component\\\\Serializer\\\\Mapping\\\\AttributeMetadataInterface\\> given\\.$#"
-			count: 1
-			path: src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/DocGenObjectNormalizer.php
-
-		-
-			message: "#^Parameter \\#5 \\$metadata of method Chill\\\\DocGeneratorBundle\\\\Serializer\\\\Normalizer\\\\DocGenObjectNormalizer\\:\\:normalizeObject\\(\\) expects Symfony\\\\Component\\\\Serializer\\\\Mapping\\\\ClassMetadata, Symfony\\\\Component\\\\Serializer\\\\Mapping\\\\ClassMetadataInterface given\\.$#"
-			count: 1
-			path: src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/DocGenObjectNormalizer.php
-
-		-
-			message: "#^Parameter \\#6 \\$attributes of method Chill\\\\DocGeneratorBundle\\\\Serializer\\\\Normalizer\\\\DocGenObjectNormalizer\\:\\:normalizeObject\\(\\) expects array\\<Symfony\\\\Component\\\\Serializer\\\\Mapping\\\\AttributeMetadata\\>, array\\<Symfony\\\\Component\\\\Serializer\\\\Mapping\\\\AttributeMetadataInterface\\> given\\.$#"
-			count: 1
-			path: src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/DocGenObjectNormalizer.php
-
-		-
-			message: "#^Parameter \\#1 \\$event of method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) expects object, string given\\.$#"
-			count: 4
-			path: src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
-
-		-
-			message: "#^Parameter \\#1 \\$event of method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) expects object, string given\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Controller/EventController.php
-
-		-
-			message: "#^Parameter \\#1 \\$value of function count expects array\\|Countable, Chill\\\\MainBundle\\\\Entity\\\\Center given\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Controller/EventController.php
-
-		-
-			message: "#^Parameter \\#1 \\$participations of method Chill\\\\EventBundle\\\\Controller\\\\ParticipationController\\:\\:createEditFormMultiple\\(\\) expects ArrayIterator, Traversable given\\.$#"
-			count: 2
-			path: src/Bundle/ChillEventBundle/Controller/ParticipationController.php
-
-		-
-			message: "#^Parameter \\#1 \\$callback of function call_user_func expects callable\\(\\)\\: mixed, null given\\.$#"
-			count: 2
-			path: src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php
-
-		-
-			message: "#^Parameter \\#2 \\$previous of class Symfony\\\\Component\\\\HttpKernel\\\\Exception\\\\BadRequestHttpException constructor expects Throwable\\|null, int given\\.$#"
-			count: 3
-			path: src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
-
-		-
-			message: "#^Parameter \\#3 \\$code of class Symfony\\\\Component\\\\HttpKernel\\\\Exception\\\\BadRequestHttpException constructor expects int, Symfony\\\\Component\\\\Serializer\\\\Exception\\\\NotEncodableValueException given\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
-
-		-
-			message: "#^Parameter \\#3 \\$code of class Symfony\\\\Component\\\\HttpKernel\\\\Exception\\\\BadRequestHttpException constructor expects int, Symfony\\\\Component\\\\Serializer\\\\Exception\\\\UnexpectedValueException given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
-
-		-
-			message: "#^Parameter \\#2 \\$role of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:\\:getReachableCenters\\(\\) expects string, Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
-
-		-
-			message: "#^Parameter \\#3 \\$formClass of method Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\CRUDController\\:\\:createFormFor\\(\\) expects string\\|null, Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\type\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
-
-		-
-			message: "#^Parameter \\#3 \\$scope of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:\\:getReachableCenters\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\Scope\\|null, Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\Scope\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
-
-		-
-			message: "#^Parameter \\#1 \\$name of method Chill\\\\MainBundle\\\\Entity\\\\Country\\:\\:setName\\(\\) expects string, array\\<int\\|string, string\\> given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Command/LoadCountriesCommand.php
-
-		-
-			message: "#^Parameter \\#4 \\.\\.\\.\\$values of function sprintf expects bool\\|float\\|int\\|string\\|null, Chill\\\\MainBundle\\\\Entity\\\\the given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
-
-		-
-			message: "#^Parameter \\#1 \\$alias of method Chill\\\\MainBundle\\\\Export\\\\ExportManager\\:\\:getExport\\(\\) expects string, Symfony\\\\Component\\\\HttpFoundation\\\\Request given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/ExportController.php
-
-		-
-			message: "#^Parameter \\#3 \\$alias of method Chill\\\\MainBundle\\\\Controller\\\\ExportController\\:\\:exportFormStep\\(\\) expects string, Symfony\\\\Component\\\\HttpFoundation\\\\Request given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/ExportController.php
-
-		-
-			message: "#^Parameter \\#3 \\$alias of method Chill\\\\MainBundle\\\\Controller\\\\ExportController\\:\\:formatterFormStep\\(\\) expects string, Symfony\\\\Component\\\\HttpFoundation\\\\Request given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/ExportController.php
-
-		-
-			message: "#^Parameter \\#3 \\$alias of method Chill\\\\MainBundle\\\\Controller\\\\ExportController\\:\\:forwardToGenerate\\(\\) expects string, Symfony\\\\Component\\\\HttpFoundation\\\\Request given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/ExportController.php
-
-		-
-			message: "#^Parameter \\#3 \\$alias of method Chill\\\\MainBundle\\\\Controller\\\\ExportController\\:\\:selectCentersStep\\(\\) expects string, Symfony\\\\Component\\\\HttpFoundation\\\\Request given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/ExportController.php
-
-		-
-			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Repository\\\\NotificationRepository\\:\\:countUnreadByUser\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/NotificationApiController.php
-
-		-
-			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Repository\\\\NotificationRepository\\:\\:findUnreadByUser\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/NotificationApiController.php
-
-		-
-			message: "#^Parameter \\#1 \\$addressee of method Chill\\\\MainBundle\\\\Repository\\\\NotificationRepository\\:\\:countAllForAttendee\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/NotificationController.php
-
-		-
-			message: "#^Parameter \\#1 \\$addressee of method Chill\\\\MainBundle\\\\Repository\\\\NotificationRepository\\:\\:findAllForAttendee\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/NotificationController.php
-
-		-
-			message: "#^Parameter \\#1 \\$sender of method Chill\\\\MainBundle\\\\Repository\\\\NotificationRepository\\:\\:countAllForSender\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/NotificationController.php
-
-		-
-			message: "#^Parameter \\#1 \\$sender of method Chill\\\\MainBundle\\\\Repository\\\\NotificationRepository\\:\\:findAllForSender\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/NotificationController.php
-
-		-
-			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Repository\\\\NotificationRepository\\:\\:countUnreadByUserWhereAddressee\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/NotificationController.php
-
-		-
-			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Repository\\\\NotificationRepository\\:\\:countUnreadByUserWhereSender\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/NotificationController.php
-
-		-
-			message: "#^Parameter \\#1 \\$event of method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) expects object, string given\\.$#"
-			count: 4
-			path: src/Bundle/ChillMainBundle/Controller/PasswordController.php
-
-		-
-			message: "#^Parameter \\#1 \\$token of class Chill\\\\MainBundle\\\\Security\\\\PasswordRecover\\\\PasswordRecoverEvent constructor expects Chill\\\\MainBundle\\\\Security\\\\PasswordRecover\\\\type\\|null, string given\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Controller/PasswordController.php
-
-		-
-			message: "#^Parameter \\#3 \\$ip of class Chill\\\\MainBundle\\\\Security\\\\PasswordRecover\\\\PasswordRecoverEvent constructor expects Chill\\\\MainBundle\\\\Security\\\\PasswordRecover\\\\type\\|null, string\\|null given\\.$#"
-			count: 4
-			path: src/Bundle/ChillMainBundle/Controller/PasswordController.php
-
-		-
-			message: "#^Parameter \\#1 \\$context of method Chill\\\\MainBundle\\\\Timeline\\\\TimelineBuilder\\:\\:countItems\\(\\) expects Chill\\\\MainBundle\\\\Timeline\\\\unknown, string given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/TimelineCenterController.php
-
-		-
-			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Entity\\\\Workflow\\\\EntityWorkflow\\:\\:addSubscriberToFinal\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php
-
-		-
-			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Entity\\\\Workflow\\\\EntityWorkflow\\:\\:addSubscriberToStep\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php
-
-		-
-			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Entity\\\\Workflow\\\\EntityWorkflow\\:\\:isUserSubscribedToFinal\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php
-
-		-
-			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Entity\\\\Workflow\\\\EntityWorkflow\\:\\:isUserSubscribedToStep\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php
-
-		-
-			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Entity\\\\Workflow\\\\EntityWorkflow\\:\\:removeSubscriberToFinal\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php
-
-		-
-			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Entity\\\\Workflow\\\\EntityWorkflow\\:\\:removeSubscriberToStep\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php
-
-		-
-			message: "#^Parameter \\#1 \\$place of method Chill\\\\MainBundle\\\\DependencyInjection\\\\Configuration\\:\\:filterWidgetByPlace\\(\\) expects string, Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\type given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
-
-		-
-			message: "#^Parameter \\#1 \\$place of method Chill\\\\MainBundle\\\\DependencyInjection\\\\Configuration\\:\\:getWidgetAliasesbyPlace\\(\\) expects Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\type, string given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
-
-		-
-			message: "#^Parameter \\#2 \\$array of function implode expects array\\|null, Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\type given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
-
-		-
-			message: "#^Parameter \\#2 \\$place of method Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\WidgetFactoryInterface\\:\\:createDefinition\\(\\) expects Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\type, string given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
-
-		-
-			message: "#^Parameter \\#3 \\$order of method Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\WidgetFactoryInterface\\:\\:createDefinition\\(\\) expects Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\type, float given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
-
-		-
-			message: "#^Parameter \\#2 \\$place of method Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\WidgetFactoryInterface\\:\\:getServiceId\\(\\) expects string, Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\type given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/Factory/AbstractWidgetFactory.php
-
-		-
-			message: "#^Parameter \\#3 \\$order of method Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\WidgetFactoryInterface\\:\\:getServiceId\\(\\) expects float, Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\type given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/Factory/AbstractWidgetFactory.php
-
-		-
-			message: "#^Parameter \\#1 \\$iterator of function iterator_to_array expects Traversable, array\\<Chill\\\\MainBundle\\\\Export\\\\AggregatorInterface\\> given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/ExportManager.php
-
-		-
-			message: "#^Parameter \\#2 \\$nbAggregators of method Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\CSVFormatter\\:\\:appendAggregatorForm\\(\\) expects string, int\\<0, max\\> given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/Formatter/CSVFormatter.php
-
-		-
-			message: "#^Parameter \\#2 \\$array of function array_map expects array, Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\type given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
-
-		-
-			message: "#^Parameter \\#2 \\$nbAggregators of method Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\SpreadSheetFormatter\\:\\:appendAggregatorForm\\(\\) expects string, int\\<0, max\\> given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
-
-		-
-			message: "#^Parameter \\#1 \\$callback of function call_user_func expects callable\\(\\)\\: mixed, null given\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Form/ChoiceLoader/PostalCodeChoiceLoader.php
-
-		-
-			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Entity\\\\Embeddable\\\\PrivateCommentEmbeddable\\:\\:getCommentForUser\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/DataMapper/PrivateCommentDataMapper.php
-
-		-
-			message: "#^Parameter \\#1 \\$em of class Chill\\\\MainBundle\\\\Form\\\\Type\\\\DataTransformer\\\\ObjectToIdTransformer constructor expects Doctrine\\\\ORM\\\\EntityManagerInterface, Doctrine\\\\Persistence\\\\ObjectManager given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/Type/Select2CountryType.php
-
-		-
-			message: "#^Parameter \\#1 \\$em of class Chill\\\\MainBundle\\\\Form\\\\Type\\\\DataTransformer\\\\MultipleObjectsToIdTransformer constructor expects Doctrine\\\\ORM\\\\EntityManagerInterface, Doctrine\\\\Persistence\\\\ObjectManager given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/Type/Select2LanguageType.php
-
-		-
-			message: "#^Parameter \\#1 \\$translatableStrings of method Chill\\\\MainBundle\\\\Templating\\\\TranslatableStringHelper\\:\\:localize\\(\\) expects array, string given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/Type/Select2LanguageType.php
-
-		-
-			message: "#^Parameter \\#1 \\$datetime of class DateTime constructor expects string, Chill\\\\MainBundle\\\\Search\\\\type given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Search/AbstractSearch.php
-
-		-
-			message: "#^Parameter \\#4 \\$paginator of method Chill\\\\MainBundle\\\\Search\\\\SearchApi\\:\\:fetchRawResult\\(\\) expects Chill\\\\MainBundle\\\\Pagination\\\\Paginator, Chill\\\\MainBundle\\\\Pagination\\\\PaginatorInterface given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Search/SearchApi.php
-
-		-
-			message: "#^Parameter \\#2 \\$callback of function uasort expects callable\\(Chill\\\\MainBundle\\\\Search\\\\HasAdvancedSearchForm, Chill\\\\MainBundle\\\\Search\\\\HasAdvancedSearchForm\\)\\: int, Closure\\(Chill\\\\MainBundle\\\\Search\\\\SearchInterface, Chill\\\\MainBundle\\\\Search\\\\SearchInterface\\)\\: \\-1\\|0\\|1 given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Search/SearchProvider.php
-
-		-
-			message: "#^Parameter \\#2 \\$subject of function preg_match_all expects string, Chill\\\\MainBundle\\\\Search\\\\type given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Search/SearchProvider.php
-
-		-
-			message: "#^Parameter \\#1 \\$object of function get_class expects object, array\\<Chill\\\\MainBundle\\\\Entity\\\\Center\\> given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
-
-		-
-			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Entity\\\\Notification\\:\\:isReadBy\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/NotificationNormalizer.php
-
-		-
-			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Entity\\\\Embeddable\\\\PrivateCommentEmbeddable\\:\\:setCommentForUser\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php
-
-		-
-			message: "#^Parameter \\#1 \\$event of method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) expects object, string given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Templating/Widget/WidgetRenderingTwig.php
-
-		-
-			message: "#^Parameter \\#1 \\$context of method Chill\\\\MainBundle\\\\Timeline\\\\TimelineBuilder\\:\\:buildUnionQuery\\(\\) expects string, Chill\\\\MainBundle\\\\Timeline\\\\unknown given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php
-
-		-
-			message: "#^Parameter \\#2 \\$context of method Chill\\\\MainBundle\\\\Timeline\\\\TimelineProviderInterface\\:\\:getEntityTemplate\\(\\) expects Chill\\\\MainBundle\\\\Timeline\\\\type, string given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php
-
-		-
-			message: "#^Parameter \\#1 \\$phoneNumber of method Chill\\\\MainBundle\\\\Phonenumber\\\\PhoneNumberHelperInterface\\:\\:format\\(\\) expects libphonenumber\\\\PhoneNumber\\|null, string given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Validation/Validator/ValidPhonenumber.php
-
-		-
-			message: "#^Parameter \\#1 \\$transitionBy of method Chill\\\\MainBundle\\\\Entity\\\\Workflow\\\\EntityWorkflowStep\\:\\:setTransitionBy\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User\\|null, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Workflow/EventSubscriber/EntityWorkflowTransitionEventSubscriber.php
-
-		-
-			message: "#^Parameter \\#1 \\$event of method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) expects object, string given\\.$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
-
-		-
-			message: "#^Parameter \\#1 \\$event of method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) expects object, string given\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php
-
-		-
-			message: "#^Parameter \\#1 \\$event of method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) expects object, string given\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
-
-		-
-			message: "#^Parameter \\#2 \\$callback of function usort expects callable\\(mixed, mixed\\)\\: int, Closure\\(mixed, mixed\\)\\: bool given\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
-
-		-
-			message: "#^Parameter \\#1 \\$user of method Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkEvaluationRepository\\:\\:countNearMaxDateByUser\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationApiController.php
-
-		-
-			message: "#^Parameter \\#1 \\$user of method Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkEvaluationRepository\\:\\:findNearMaxDateByUser\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationApiController.php
-
-		-
-			message: "#^Parameter \\#1 \\$object of static method DateTimeImmutable\\:\\:createFromMutable\\(\\) expects DateTime, DateTimeInterface given\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php
-
-		-
-			message: "#^Parameter \\#2 \\$callback of function usort expects callable\\(mixed, mixed\\)\\: int, Closure\\(mixed, mixed\\)\\: bool given\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
-
-		-
-			message: "#^Parameter \\#2 \\$previous of class Symfony\\\\Component\\\\HttpKernel\\\\Exception\\\\BadRequestHttpException constructor expects Throwable\\|null, int given\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php
-
-		-
-			message: "#^Parameter \\#3 \\$code of class Symfony\\\\Component\\\\HttpKernel\\\\Exception\\\\BadRequestHttpException constructor expects int, Symfony\\\\Component\\\\Serializer\\\\Exception\\\\InvalidArgumentException\\|Symfony\\\\Component\\\\Serializer\\\\Exception\\\\UnexpectedValueException given\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php
-
-		-
-			message: "#^Parameter \\#1 \\$event of method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) expects object, string given\\.$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Controller/PersonController.php
-
-		-
-			message: "#^Parameter \\#1 \\$form of method Chill\\\\PersonBundle\\\\Controller\\\\PersonController\\:\\:isLastPostDataChanges\\(\\) expects Symfony\\\\Component\\\\Form\\\\Form, Symfony\\\\Component\\\\Form\\\\FormInterface given\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/PersonController.php
-
-		-
-			message: "#^Parameter \\#1 \\$event of method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) expects object, string given\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
-
-		-
-			message: "#^Parameter \\#2 \\$precision of method Chill\\\\PersonBundle\\\\Search\\\\SimilarPersonMatcher\\:\\:matchPerson\\(\\) expects float, Chill\\\\PersonBundle\\\\Repository\\\\PersonNotDuplicateRepository given\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
-
-		-
-			message: "#^Parameter \\#3 \\$orderBy of method Chill\\\\PersonBundle\\\\Search\\\\SimilarPersonMatcher\\:\\:matchPerson\\(\\) expects string, float given\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
-
-		-
-			message: "#^Parameter \\#4 \\$addYearComparison of method Chill\\\\PersonBundle\\\\Search\\\\SimilarPersonMatcher\\:\\:matchPerson\\(\\) expects bool, string given\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
-
-		-
-			message: "#^Parameter \\#1 \\$context of method Chill\\\\MainBundle\\\\Timeline\\\\TimelineBuilder\\:\\:countItems\\(\\) expects Chill\\\\MainBundle\\\\Timeline\\\\unknown, string given\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/TimelinePersonController.php
-
-		-
-			message: "#^Parameter \\#1 \\$event of method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) expects object, string given\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/TimelinePersonController.php
-
-		-
-			message: "#^Parameter \\#1 \\$period of method Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\AccompanyingPeriodLocationHistory\\:\\:setPeriod\\(\\) expects Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod, null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
-
-		-
-			message: "#^Parameter \\#1 \\$now of method Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\Household\\:\\:getCurrentMembers\\(\\) expects DateTimeImmutable\\|null, DateTimeInterface\\|null given\\.$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Entity/Household/Household.php
-
-		-
-			message: "#^Parameter \\#1 \\$now of method Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\Household\\:\\:getNonCurrentMembers\\(\\) expects DateTimeImmutable\\|null, DateTimeInterface\\|null given\\.$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Entity/Household/Household.php
-
-		-
-			message: "#^Parameter \\#1 \\$key of method Doctrine\\\\Common\\\\Collections\\\\Collection\\<\\(int\\|string\\),mixed\\>\\:\\:remove\\(\\) expects \\(int\\|string\\), Chill\\\\PersonBundle\\\\Entity\\\\SocialWork\\\\SocialAction given\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Entity/SocialWork/Evaluation.php
-
-		-
-			message: "#^Parameter \\#1 \\$translatableStrings of method Chill\\\\MainBundle\\\\Templating\\\\TranslatableStringHelper\\:\\:localize\\(\\) expects array, string given\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Export/Helper/ListPersonHelper.php
-
-		-
-			message: "#^Parameter \\#1 \\$callback of function call_user_func expects callable\\(\\)\\: mixed, null given\\.$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php
-
-		-
-			message: "#^Parameter \\#1 \\$entityName of method Doctrine\\\\ORM\\\\EntityManager\\:\\:getRepository\\(\\) expects class\\-string\\<ChillPersonBundle\\:AccompanyingPeriod\\>, string given\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Timeline/AbstractTimelineAccompanyingPeriod.php
-
-		-
-			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:\\:filterReachableCenters\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Timeline/AbstractTimelineAccompanyingPeriod.php
-
-		-
-			message: "#^Parameter \\#3 \\$context of method Chill\\\\PersonBundle\\\\Timeline\\\\AbstractTimelineAccompanyingPeriod\\:\\:getBasicEntityTemplate\\(\\) expects string, Chill\\\\MainBundle\\\\Timeline\\\\type given\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodClosing.php
-
-		-
-			message: "#^Parameter \\#3 \\$context of method Chill\\\\PersonBundle\\\\Timeline\\\\AbstractTimelineAccompanyingPeriod\\:\\:getBasicEntityTemplate\\(\\) expects string, Chill\\\\MainBundle\\\\Timeline\\\\type given\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodOpening.php
-
-		-
-			message: "#^Parameter \\#2 \\$role of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelperInterface\\:\\:getReachableCenters\\(\\) expects string, Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role given\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Widget/PersonListWidget.php
-
-		-
-			message: "#^Parameter \\#1 \\$className of method Doctrine\\\\Persistence\\\\ObjectManager\\:\\:getRepository\\(\\) expects class\\-string\\<ChillReportBundle\\:Report\\>, string given\\.$#"
-			count: 4
-			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
-
-		-
-			message: "#^Parameter \\#1 \\$entity of method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:createEditForm\\(\\) expects Chill\\\\ReportBundle\\\\Entity\\\\Report, ChillReportBundle\\:Report given\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
-
-		-
-			message: "#^Parameter \\#1 \\$event of method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) expects object, string given\\.$#"
-			count: 4
-			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
-
-		-
-			message: "#^Parameter \\#2 \\$role of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:\\:getReachableScopes\\(\\) expects string, Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role given\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
-
-		-
-			message: "#^Parameter \\#1 \\$em of class Chill\\\\MainBundle\\\\Form\\\\Type\\\\DataTransformer\\\\ScopeTransformer constructor expects Doctrine\\\\ORM\\\\EntityManagerInterface, Doctrine\\\\Persistence\\\\ObjectManager given\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Form/ReportType.php
-
-		-
-			message: "#^Parameter \\#2 \\$role of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:\\:getReachableScopes\\(\\) expects string, Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role given\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Form/ReportType.php
-
-		-
-			message: "#^Parameter \\#2 \\$role of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:\\:getReachableCenters\\(\\) expects string, Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role given\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Search/ReportSearch.php
-
-		-
-			message: "#^Parameter \\#2 \\$role of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:\\:getReachableScopes\\(\\) expects string, Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role given\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Search/ReportSearch.php
-
-		-
-			message: "#^Parameter \\#1 \\$context of method Chill\\\\ReportBundle\\\\Timeline\\\\TimelineReportProvider\\:\\:checkContext\\(\\) expects string, Chill\\\\MainBundle\\\\Timeline\\\\type given\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php
-
-		-
-			message: "#^Parameter \\#1 \\$entity of method Chill\\\\ReportBundle\\\\Timeline\\\\TimelineReportProvider\\:\\:getFieldsToRender\\(\\) expects Chill\\\\ReportBundle\\\\Entity\\\\Report, Chill\\\\MainBundle\\\\Timeline\\\\type given\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php
-
-		-
-			message: "#^Parameter \\#1 \\$entityName of method Doctrine\\\\ORM\\\\EntityManager\\:\\:getRepository\\(\\) expects class\\-string\\<ChillReportBundle\\:Report\\>, string given\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php
-
-		-
-			message: "#^Parameter \\#1 \\$event of method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) expects object, string given\\.$#"
-			count: 6
-			path: src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
-
-		-
-			message: "#^Parameter \\#1 \\$event of method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) expects object, string given\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Controller/TaskController.php
-
-		-
-			message: "#^Parameter \\#1 \\$keys of function array_fill_keys expects array, Chill\\\\TaskBundle\\\\Entity\\\\json given\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Entity/AbstractTask.php
-
-		-
-			message: "#^Parameter \\#1 \\$task of method Chill\\\\TaskBundle\\\\Entity\\\\Task\\\\SingleTaskPlaceEvent\\:\\:setTask\\(\\) expects Chill\\\\TaskBundle\\\\Entity\\\\SingleTask, Chill\\\\TaskBundle\\\\Entity\\\\AbstractTask given\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Event/Lifecycle/TaskLifecycleEvent.php
-
-		-
-			message: "#^Parameter \\#1 \\$repository of class Chill\\\\PersonBundle\\\\Form\\\\DataTransformer\\\\PersonToIdTransformer constructor expects Chill\\\\PersonBundle\\\\Repository\\\\PersonRepository, Doctrine\\\\ORM\\\\EntityManagerInterface given\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Form/SingleTaskListType.php
-
-		-
-			message: "#^Parameter \\#2 \\$role of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:\\:getReachableCenters\\(\\) expects string, Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role given\\.$#"
-			count: 4
-			path: src/Bundle/ChillTaskBundle/Form/SingleTaskListType.php
-
-		-
-			message: "#^Parameter \\#1 \\$extras of method Knp\\\\Menu\\\\MenuItem\\:\\:setExtras\\(\\) expects array\\<string, mixed\\>, string given\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Menu/MenuBuilder.php
-
-		-
-			message: "#^Parameter \\#2 \\$role of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:\\:getReachableCenters\\(\\) expects string, Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role given\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Repository/SingleTaskRepository.php
-
-		-
-			message: "#^Parameter \\#1 \\$event of method Symfony\\\\Contracts\\\\EventDispatcher\\\\EventDispatcherInterface\\:\\:dispatch\\(\\) expects object, string given\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Security/Authorization/TaskVoter.php
-
-		-
-			message: "#^Parameter \\#2 \\$role of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:\\:getReachableCenters\\(\\) expects string, Symfony\\\\Component\\\\Security\\\\Core\\\\Role\\\\Role given\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
-
-		-
-			message: "#^Parameter \\#1 \\$storedObject of method Chill\\\\WopiBundle\\\\Service\\\\Wopi\\\\ChillDocumentManager\\:\\:getContent\\(\\) expects Chill\\\\DocStoreBundle\\\\Entity\\\\StoredObject, ChampsLibres\\\\WopiLib\\\\Contract\\\\Entity\\\\Document given\\.$#"
-			count: 3
-			path: src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
-
-		-
-			message: "#^Parameter \\#1 \\$storedObject of method Chill\\\\WopiBundle\\\\Service\\\\Wopi\\\\ChillDocumentManager\\:\\:setContent\\(\\) expects Chill\\\\DocStoreBundle\\\\Entity\\\\StoredObject, ChampsLibres\\\\WopiLib\\\\Contract\\\\Entity\\\\Document given\\.$#"
-			count: 1
-			path: src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
-
-		-
-			message: "#^Parameter \\#1 \\$type of method Chill\\\\DocStoreBundle\\\\Entity\\\\StoredObject\\:\\:setType\\(\\) expects string\\|null, false given\\.$#"
-			count: 1
-			path: src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
diff --git a/phpstan-baseline.neon b/phpstan-baseline.neon
index 641bb5dcd..7c969f941 100644
--- a/phpstan-baseline.neon
+++ b/phpstan-baseline.neon
@@ -1,10 +1,883 @@
 parameters:
 	ignoreErrors:
+		-
+			message: "#^Access to an undefined property Chill\\\\ActivityBundle\\\\Entity\\\\Activity\\:\\:\\$personsAssociated\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+
+		-
+			message: "#^Access to an undefined property Chill\\\\ActivityBundle\\\\Entity\\\\Activity\\:\\:\\$personsNotAssociated\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+
+		-
+			message: "#^Call to an undefined method Symfony\\\\Component\\\\Serializer\\\\SerializerInterface\\:\\:normalize\\(\\)\\.$#"
+			count: 2
+			path: src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\ActivityBundle\\\\Entity\\\\Activity\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+
+		-
+			message: "#^Only booleans are allowed in a ternary operator condition, Chill\\\\MainBundle\\\\Entity\\\\Scope\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+
+		-
+			message: "#^Only booleans are allowed in a ternary operator condition, Chill\\\\PersonBundle\\\\Entity\\\\Person\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+
+		-
+			message: "#^Only booleans are allowed in a ternary operator condition, DateTime\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+
+		-
+			message: "#^Method Chill\\\\ActivityBundle\\\\Controller\\\\ActivityReasonCategoryController\\:\\:createCreateForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php
+
+		-
+			message: "#^Method Chill\\\\ActivityBundle\\\\Controller\\\\ActivityReasonCategoryController\\:\\:createEditForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\ActivityBundle\\\\Entity\\\\ActivityReasonCategory\\|null given\\.$#"
+			count: 3
+			path: src/Bundle/ChillActivityBundle/Controller/ActivityReasonCategoryController.php
+
+		-
+			message: "#^Method Chill\\\\ActivityBundle\\\\Controller\\\\ActivityReasonController\\:\\:createCreateForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php
+
+		-
+			message: "#^Method Chill\\\\ActivityBundle\\\\Controller\\\\ActivityReasonController\\:\\:createEditForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\ActivityBundle\\\\Entity\\\\ActivityReason\\|null given\\.$#"
+			count: 2
+			path: src/Bundle/ChillActivityBundle/Controller/ActivityReasonController.php
+
+		-
+			message: "#^Else branch is unreachable because previous condition is always true\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php
+
+		-
+			message: "#^Strict comparison using \\!\\=\\= between null and Chill\\\\ActivityBundle\\\\Entity\\\\ActivityReason will always evaluate to true\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php
+
+		-
+			message: "#^Unreachable statement \\- code above always terminates\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivityNotifications.php
+
+		-
+			message: "#^Call to an undefined method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\NodeDefinition\\:\\:children\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/DependencyInjection/Configuration.php
+
+		-
+			message: "#^Binary operation \"\\.\" between 'ActivityReasonCateg…' and array results in an error\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
+
+		-
+			message: "#^Method Chill\\\\ActivityBundle\\\\Entity\\\\ActivityReasonCategory\\:\\:getName\\(\\) should return array but returns string\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
+
+		-
+			message: "#^Expression on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/EntityListener/ActivityEntityListener.php
+
+		-
+			message: "#^PHPDoc tag @param for parameter \\$resolver with type Chill\\\\ActivityBundle\\\\Form\\\\OptionsResolverInterface is not subtype of native type Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolver\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Form/ActivityReasonCategoryType.php
+
+		-
+			message: "#^Parameter \\$resolver of method Chill\\\\ActivityBundle\\\\Form\\\\ActivityReasonCategoryType\\:\\:configureOptions\\(\\) has invalid type Chill\\\\ActivityBundle\\\\Form\\\\OptionsResolverInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Form/ActivityReasonCategoryType.php
+
+		-
+			message: "#^Call to method DateTime\\:\\:setTimezone\\(\\) with incorrect case\\: setTimeZone$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Form/ActivityType.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Form/ActivityType.php
+
+		-
+			message: "#^Method Chill\\\\ActivityBundle\\\\Repository\\\\ActivityACLAwareRepository\\:\\:getWhereClause\\(\\) should return array but returns string\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
+
+		-
+			message: "#^Expression on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Repository/ActivityReasonRepository.php
+
+		-
+			message: "#^Return type \\(array\\<Chill\\\\ActivityBundle\\\\Entity\\\\ActivityReason\\>\\) of method Chill\\\\ActivityBundle\\\\Repository\\\\ActivityReasonRepository\\:\\:findAll\\(\\) should be covariant with return type \\(array\\<int, object\\>\\) of method Doctrine\\\\ORM\\\\EntityRepository\\<object\\>\\:\\:findAll\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Repository/ActivityReasonRepository.php
+
+		-
+			message: "#^Parameter \\#1 \\$context of method Chill\\\\ActivityBundle\\\\Timeline\\\\TimelineActivityProvider\\:\\:checkContext\\(\\) expects string, Chill\\\\MainBundle\\\\Timeline\\\\type given\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php
+
+		-
+			message: "#^Parameter \\$context of method Chill\\\\ActivityBundle\\\\Timeline\\\\TimelineActivityProvider\\:\\:getEntityTemplate\\(\\) has invalid type Chill\\\\MainBundle\\\\Timeline\\\\type\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php
+
+		-
+			message: "#^Parameter \\$entity of method Chill\\\\ActivityBundle\\\\Timeline\\\\TimelineActivityProvider\\:\\:getEntityTemplate\\(\\) has invalid type Chill\\\\MainBundle\\\\Timeline\\\\type\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php
+
+		-
+			message: "#^Result of && is always false\\.$#"
+			count: 6
+			path: src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidityValidator.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between null and Chill\\\\MainBundle\\\\Entity\\\\Embeddable\\\\CommentEmbeddable will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidityValidator.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between null and DateTime will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidityValidator.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between null and Doctrine\\\\Common\\\\Collections\\\\Collection will always evaluate to false\\.$#"
+			count: 2
+			path: src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidityValidator.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between null and bool will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidityValidator.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between null and string will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillActivityBundle/Validator/Constraints/ActivityValidityValidator.php
+
+		-
+			message: "#^Call to an undefined method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\NodeDefinition\\:\\:children\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/Configuration.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, Chill\\\\AsideActivityBundle\\\\Entity\\\\AsideActivityCategory\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivityCategory.php
+
+		-
+			message: "#^Property Chill\\\\AsideActivityBundle\\\\Entity\\\\AsideActivityCategory\\:\\:\\$id is never written, only read\\.$#"
+			count: 1
+			path: src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivityCategory.php
+
+		-
+			message: "#^Call to method DateTimeImmutable\\:\\:setTimezone\\(\\) on a separate line has no effect\\.$#"
+			count: 1
+			path: src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
+
+		-
+			message: "#^Call to method DateTimeImmutable\\:\\:setTimezone\\(\\) with incorrect case\\: setTimeZone$#"
+			count: 1
+			path: src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
+
+		-
+			message: "#^Return type \\(array\\<array\\<string\\>\\>\\) of method Chill\\\\AsideActivityBundle\\\\Security\\\\AsideActivityVoter\\:\\:getRolesWithHierarchy\\(\\) should be covariant with return type \\(array\\<string, array\\<int, string\\>\\>\\) of method Chill\\\\MainBundle\\\\Security\\\\ProvideRoleHierarchyInterface\\:\\:getRolesWithHierarchy\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillAsideActivityBundle/src/Security/AsideActivityVoter.php
+
+		-
+			message: "#^Call to an undefined method Chill\\\\BudgetBundle\\\\Entity\\\\AbstractElement\\:\\:getId\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php
+
+		-
+			message: "#^Call to an undefined method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\NodeDefinition\\:\\:children\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillBudgetBundle/DependencyInjection/Configuration.php
+
+		-
+			message: "#^Property Chill\\\\BudgetBundle\\\\Entity\\\\AbstractElement\\:\\:\\$startDate \\(DateTimeImmutable\\) does not accept null\\.$#"
+			count: 1
+			path: src/Bundle/ChillBudgetBundle/Entity/AbstractElement.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between 0 and string will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillBudgetBundle/Entity/AbstractElement.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between null and DateTimeImmutable will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillBudgetBundle/Entity/AbstractElement.php
+
+		-
+			message: "#^Property Chill\\\\BudgetBundle\\\\Entity\\\\ChargeKind\\:\\:\\$tags is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillBudgetBundle/Entity/ChargeKind.php
+
+		-
+			message: "#^Property Chill\\\\BudgetBundle\\\\Entity\\\\ResourceKind\\:\\:\\$tags is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillBudgetBundle/Entity/ResourceKind.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			count: 3
+			path: src/Bundle/ChillBudgetBundle/Form/ChargeType.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			count: 2
+			path: src/Bundle/ChillBudgetBundle/Form/ResourceType.php
+
+		-
+			message: "#^PHPDoc tag @param for parameter \\$limit with type mixed is not subtype of native type int\\|null\\.$#"
+			count: 1
+			path: src/Bundle/ChillBudgetBundle/Repository/ChargeKindRepository.php
+
+		-
+			message: "#^PHPDoc tag @param for parameter \\$offset with type mixed is not subtype of native type int\\|null\\.$#"
+			count: 1
+			path: src/Bundle/ChillBudgetBundle/Repository/ChargeKindRepository.php
+
+		-
+			message: "#^PHPDoc tag @param for parameter \\$limit with type mixed is not subtype of native type int\\|null\\.$#"
+			count: 1
+			path: src/Bundle/ChillBudgetBundle/Repository/ResourceKindRepository.php
+
+		-
+			message: "#^PHPDoc tag @param for parameter \\$offset with type mixed is not subtype of native type int\\|null\\.$#"
+			count: 1
+			path: src/Bundle/ChillBudgetBundle/Repository/ResourceKindRepository.php
+
+		-
+			message: "#^Property Chill\\\\CalendarBundle\\\\Command\\\\AzureGrantAdminConsentAndAcquireToken\\:\\:\\$clientRegistry is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillCalendarBundle/Command/AzureGrantAdminConsentAndAcquireToken.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between false and DateInterval will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillCalendarBundle/Command/SendTestShortMessageOnCalendarCommand.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between false and DateTimeImmutable will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillCalendarBundle/Command/SendTestShortMessageOnCalendarCommand.php
+
+		-
+			message: "#^Call to an undefined method Symfony\\\\Component\\\\Form\\\\FormInterface\\:\\:isClicked\\(\\)\\.$#"
+			count: 4
+			path: src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
+
+		-
+			message: "#^Call to an undefined method Symfony\\\\Component\\\\Serializer\\\\SerializerInterface\\:\\:normalize\\(\\)\\.$#"
+			count: 2
+			path: src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
+
+		-
+			message: "#^Only booleans are allowed in a ternary operator condition, Chill\\\\MainBundle\\\\Entity\\\\Location\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
+
+		-
+			message: "#^Unreachable statement \\- code above always terminates\\.$#"
+			count: 1
+			path: src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
+
+		-
+			message: "#^Parameter \\#2 \\$byUser of class Chill\\\\CalendarBundle\\\\Messenger\\\\Message\\\\InviteUpdateMessage constructor expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillCalendarBundle/Controller/InviteApiController.php
+
+		-
+			message: "#^Method Symfony\\\\Component\\\\HttpFoundation\\\\Session\\\\SessionInterface\\:\\:remove\\(\\) invoked with 2 parameters, 1 required\\.$#"
+			count: 1
+			path: src/Bundle/ChillCalendarBundle/Controller/RemoteCalendarConnectAzureController.php
+
+		-
+			message: "#^Call to an undefined method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\NodeDefinition\\:\\:children\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillCalendarBundle/DependencyInjection/Configuration.php
+
+		-
+			message: "#^Parameter \\#2 \\$byUser of class Chill\\\\CalendarBundle\\\\Messenger\\\\Message\\\\CalendarRemovedMessage constructor expects Chill\\\\MainBundle\\\\Entity\\\\User\\|null, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarEntityListener.php
+
+		-
+			message: "#^Parameter \\#3 \\$byUser of class Chill\\\\CalendarBundle\\\\Messenger\\\\Message\\\\CalendarMessage constructor expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 2
+			path: src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarEntityListener.php
+
+		-
+			message: "#^Parameter \\#2 \\$byUser of class Chill\\\\CalendarBundle\\\\Messenger\\\\Message\\\\CalendarRangeRemovedMessage constructor expects Chill\\\\MainBundle\\\\Entity\\\\User\\|null, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarRangeEntityListener.php
+
+		-
+			message: "#^Parameter \\#3 \\$byUser of class Chill\\\\CalendarBundle\\\\Messenger\\\\Message\\\\CalendarRangeMessage constructor expects Chill\\\\MainBundle\\\\Entity\\\\User\\|null, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 2
+			path: src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarRangeEntityListener.php
+
+		-
+			message: "#^Property Chill\\\\CalendarBundle\\\\Messenger\\\\Message\\\\CalendarMessage\\:\\:\\$oldInvites \\(array\\<array\\{inviteId\\: int, userId\\: int, userEmail\\: int, userLabel\\: string\\}\\>\\) does not accept array\\<array\\{inviteId\\: int\\|null, userId\\: int\\|null, userEmail\\: string\\|null, userLabel\\: string\\}\\>\\.$#"
+			count: 1
+			path: src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarMessage.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between null and string will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/EventsOnUserSubscriptionCreator.php
+
+		-
+			message: "#^Method Chill\\\\CalendarBundle\\\\RemoteCalendar\\\\Connector\\\\MSGraph\\\\OnBehalfOfUserTokenStorage\\:\\:getToken\\(\\) should return TheNetworg\\\\OAuth2\\\\Client\\\\Token\\\\AccessToken but returns League\\\\OAuth2\\\\Client\\\\Token\\\\AccessTokenInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/OnBehalfOfUserTokenStorage.php
+
+		-
+			message: "#^Parameter \\#1 \\$token of method Chill\\\\CalendarBundle\\\\RemoteCalendar\\\\Connector\\\\MSGraph\\\\OnBehalfOfUserTokenStorage\\:\\:setToken\\(\\) expects TheNetworg\\\\OAuth2\\\\Client\\\\Token\\\\AccessToken, League\\\\OAuth2\\\\Client\\\\Token\\\\AccessTokenInterface given\\.$#"
+			count: 1
+			path: src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/OnBehalfOfUserTokenStorage.php
+
+		-
+			message: "#^Expression on left side of \\?\\? is not nullable\\.$#"
+			count: 2
+			path: src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraphRemoteCalendarConnector.php
+
+		-
+			message: "#^PHPDoc tag @return has invalid value \\(array\\{\\?id\\: string, \\?lastModifiedDateTime\\: int, \\?changeKey\\: string\\}\\)\\: Unexpected token \"\\:\", expected '\\}' at offset 129$#"
+			count: 2
+			path: src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraphRemoteCalendarConnector.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between null and string will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraphRemoteCalendarConnector.php
+
+		-
+			message: "#^Parameter \\#1 \\$criteria \\(array\\<string, mixed\\>\\) of method Chill\\\\CalendarBundle\\\\Repository\\\\CalendarDocRepository\\:\\:findBy\\(\\) should be contravariant with parameter \\$criteria \\(array\\) of method Chill\\\\CalendarBundle\\\\Repository\\\\CalendarDocRepositoryInterface\\:\\:findBy\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillCalendarBundle/Repository/CalendarDocRepository.php
+
+		-
+			message: "#^Parameter \\#1 \\$criteria \\(array\\<string, mixed\\>\\) of method Chill\\\\CalendarBundle\\\\Repository\\\\CalendarDocRepository\\:\\:findOneBy\\(\\) should be contravariant with parameter \\$criteria \\(array\\) of method Chill\\\\CalendarBundle\\\\Repository\\\\CalendarDocRepositoryInterface\\:\\:findOneBy\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillCalendarBundle/Repository/CalendarDocRepository.php
+
+		-
+			message: "#^Parameter \\#2 \\$orderBy \\(array\\<string, 'ASC'\\|'asc'\\|'DESC'\\|'desc'\\>\\|null\\) of method Chill\\\\CalendarBundle\\\\Repository\\\\CalendarDocRepository\\:\\:findBy\\(\\) should be contravariant with parameter \\$orderBy \\(array\\|null\\) of method Chill\\\\CalendarBundle\\\\Repository\\\\CalendarDocRepositoryInterface\\:\\:findBy\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillCalendarBundle/Repository/CalendarDocRepository.php
+
+		-
+			message: "#^Return type \\(array\\<object\\>\\) of method Chill\\\\CalendarBundle\\\\Repository\\\\CalendarDocRepository\\:\\:findAll\\(\\) should be covariant with return type \\(array\\<Chill\\\\CalendarBundle\\\\Entity\\\\CalendarDoc\\>\\) of method Chill\\\\CalendarBundle\\\\Repository\\\\CalendarDocRepositoryInterface\\:\\:findAll\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillCalendarBundle/Repository/CalendarDocRepository.php
+
+		-
+			message: "#^Return type \\(array\\<object\\>\\) of method Chill\\\\CalendarBundle\\\\Repository\\\\CalendarDocRepository\\:\\:findBy\\(\\) should be covariant with return type \\(array\\<Chill\\\\CalendarBundle\\\\Entity\\\\CalendarDoc\\>\\) of method Chill\\\\CalendarBundle\\\\Repository\\\\CalendarDocRepositoryInterface\\:\\:findBy\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillCalendarBundle/Repository/CalendarDocRepository.php
+
+		-
+			message: "#^Parameter \\#4 \\$offset of method Chill\\\\CalendarBundle\\\\Repository\\\\CalendarRepository\\:\\:findBy\\(\\) expects int\\|null, array\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php
+
+		-
+			message: "#^Parameter \\#2 \\$subject \\(Chill\\\\CalendarBundle\\\\Entity\\\\Invite\\) of method Chill\\\\CalendarBundle\\\\Security\\\\Voter\\\\InviteVoter\\:\\:voteOnAttribute\\(\\) should be contravariant with parameter \\$subject \\(mixed\\) of method Symfony\\\\Component\\\\Security\\\\Core\\\\Authorization\\\\Voter\\\\Voter\\:\\:voteOnAttribute\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillCalendarBundle/Security/Voter/InviteVoter.php
+
+		-
+			message: "#^Call to an undefined method Symfony\\\\Component\\\\Console\\\\Helper\\\\HelperInterface\\:\\:ask\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php
+
+		-
+			message: "#^If condition is always true\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, Symfony\\\\Component\\\\Validator\\\\ConstraintViolationListInterface given\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between null and Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldInterface will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php
+
+		-
+			message: "#^Method Chill\\\\CustomFieldsBundle\\\\Controller\\\\CustomFieldController\\:\\:createCreateForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php
+
+		-
+			message: "#^Method Chill\\\\CustomFieldsBundle\\\\Controller\\\\CustomFieldController\\:\\:createEditForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomFieldsGroup\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomField\\|null given\\.$#"
+			count: 2
+			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php
+
+		-
+			message: "#^Only booleans are allowed in a ternary operator condition, Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomFieldsGroup given\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php
+
+		-
+			message: "#^Ternary operator condition is always true\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldController.php
+
+		-
+			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\ObjectManager\\:\\:createQuery\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
+
+		-
+			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\ObjectRepository\\<Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomFieldsDefaultGroup\\>\\:\\:findOneByEntity\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
+
+		-
+			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\ObjectRepository\\<Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomFieldsGroup\\>\\:\\:findOneById\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
+
+		-
+			message: "#^Call to an undefined method Symfony\\\\Component\\\\Form\\\\FormInterface\\:\\:isClicked\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
+
+		-
+			message: """
+				#^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
+				since Symfony 5\\.4, use method or constructor injection in your controller instead$#
+			"""
+			count: 2
+			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
+
 		-
 			message: "#^Foreach overwrites \\$key with its key variable\\.$#"
 			count: 1
 			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
 
+		-
+			message: "#^Method Chill\\\\CustomFieldsBundle\\\\Controller\\\\CustomFieldsGroupController\\:\\:createCreateForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
+
+		-
+			message: "#^Method Chill\\\\CustomFieldsBundle\\\\Controller\\\\CustomFieldsGroupController\\:\\:createEditForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
+
+		-
+			message: "#^Method Chill\\\\CustomFieldsBundle\\\\Controller\\\\CustomFieldsGroupController\\:\\:createMakeDefaultForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomFieldsGroup\\|null given\\.$#"
+			count: 4
+			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/AbstractCustomField.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 4
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
+
+		-
+			message: "#^Method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldChoice\\:\\:buildForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\FormTypeInterface but return statement is missing\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
+
+		-
+			message: "#^Method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldChoice\\:\\:buildOptionsForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\FormTypeInterface\\|null but returns Symfony\\\\Component\\\\Form\\\\FormBuilderInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
+
+		-
+			message: "#^Method Symfony\\\\Component\\\\Form\\\\FormBuilderInterface\\:\\:create\\(\\) invoked with 4 parameters, 1\\-3 required\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
+
+		-
+			message: "#^Parameter \\$builder of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldChoice\\:\\:buildForm\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\FormBuilderInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
+
+		-
+			message: "#^Parameter \\$builder of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldChoice\\:\\:buildOptionsForm\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\FormBuilderInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
+
+		-
+			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldChoice\\:\\:buildForm\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
+
+		-
+			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldChoice\\:\\:deserialize\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
+
+		-
+			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldChoice\\:\\:render\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
+
+		-
+			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldChoice\\:\\:serialize\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between null and array\\|string will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
+
+		-
+			message: "#^Unreachable statement \\- code above always terminates\\.$#"
+			count: 3
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php
+
+		-
+			message: "#^Method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldDate\\:\\:buildForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\FormTypeInterface but return statement is missing\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php
+
+		-
+			message: "#^Method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldDate\\:\\:buildOptionsForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\FormTypeInterface\\|null but returns Symfony\\\\Component\\\\Form\\\\FormBuilderInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php
+
+		-
+			message: "#^Method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldDate\\:\\:render\\(\\) should return string but returns null\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php
+
+		-
+			message: "#^Parameter \\$builder of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldDate\\:\\:buildForm\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\FormBuilderInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php
+
+		-
+			message: "#^Parameter \\$builder of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldDate\\:\\:buildOptionsForm\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\FormBuilderInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php
+
+		-
+			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldDate\\:\\:buildForm\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php
+
+		-
+			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldDate\\:\\:deserialize\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php
+
+		-
+			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldDate\\:\\:render\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php
+
+		-
+			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldDate\\:\\:serialize\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php
+
+		-
+			message: "#^PHPDoc tag @param for parameter \\$builder with type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\FormBuilderInterface is not subtype of native type Symfony\\\\Component\\\\Form\\\\FormBuilderInterface\\.$#"
+			count: 2
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldInterface.php
+
+		-
+			message: "#^PHPDoc tag @param for parameter \\$customField with type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField is not subtype of native type Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomField\\.$#"
+			count: 4
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldInterface.php
+
+		-
+			message: "#^Parameter \\$builder of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldInterface\\:\\:buildForm\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\FormBuilderInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldInterface.php
+
+		-
+			message: "#^Parameter \\$builder of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldInterface\\:\\:buildOptionsForm\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\FormBuilderInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldInterface.php
+
+		-
+			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldInterface\\:\\:buildForm\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldInterface.php
+
+		-
+			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldInterface\\:\\:deserialize\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldInterface.php
+
+		-
+			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldInterface\\:\\:render\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldInterface.php
+
+		-
+			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldInterface\\:\\:serialize\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldInterface.php
+
+		-
+			message: "#^Method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldLongChoice\\:\\:buildForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\FormTypeInterface but return statement is missing\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php
+
+		-
+			message: "#^Method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldLongChoice\\:\\:buildOptionsForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\FormTypeInterface\\|null but returns Symfony\\\\Component\\\\Form\\\\FormBuilderInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php
+
+		-
+			message: "#^Only booleans are allowed in a ternary operator condition, string given\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php
+
+		-
+			message: "#^Parameter \\$builder of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldLongChoice\\:\\:buildForm\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\FormBuilderInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php
+
+		-
+			message: "#^Parameter \\$builder of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldLongChoice\\:\\:buildOptionsForm\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\FormBuilderInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php
+
+		-
+			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldLongChoice\\:\\:buildForm\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php
+
+		-
+			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldLongChoice\\:\\:deserialize\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php
+
+		-
+			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldLongChoice\\:\\:render\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php
+
+		-
+			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldLongChoice\\:\\:serialize\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php
+
+		-
+			message: "#^Ternary operator condition is always true\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php
+
+		-
+			message: "#^Method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldNumber\\:\\:buildForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\FormTypeInterface but return statement is missing\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php
+
+		-
+			message: "#^Method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldNumber\\:\\:buildOptionsForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\FormTypeInterface\\|null but returns Symfony\\\\Component\\\\Form\\\\FormBuilderInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php
+
+		-
+			message: "#^Parameter \\$builder of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldNumber\\:\\:buildForm\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\FormBuilderInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php
+
+		-
+			message: "#^Parameter \\$builder of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldNumber\\:\\:buildOptionsForm\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\FormBuilderInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php
+
+		-
+			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldNumber\\:\\:buildForm\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php
+
+		-
+			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldNumber\\:\\:deserialize\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php
+
+		-
+			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldNumber\\:\\:render\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php
+
+		-
+			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldNumber\\:\\:serialize\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php
+
+		-
+			message: "#^Method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldText\\:\\:buildForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\FormTypeInterface but return statement is missing\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php
+
+		-
+			message: "#^Method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldText\\:\\:buildOptionsForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\FormTypeInterface\\|null but returns Symfony\\\\Component\\\\Form\\\\FormBuilderInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php
+
+		-
+			message: "#^Parameter \\$builder of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldText\\:\\:buildForm\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\FormBuilderInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php
+
+		-
+			message: "#^Parameter \\$builder of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldText\\:\\:buildOptionsForm\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\FormBuilderInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php
+
+		-
+			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldText\\:\\:buildForm\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php
+
+		-
+			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldText\\:\\:deserialize\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php
+
+		-
+			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldText\\:\\:render\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php
+
+		-
+			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldText\\:\\:serialize\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php
+
+		-
+			message: "#^Method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldTitle\\:\\:buildForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\FormTypeInterface but return statement is missing\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php
+
+		-
+			message: "#^Method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldTitle\\:\\:buildOptionsForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\FormTypeInterface\\|null but returns Symfony\\\\Component\\\\Form\\\\FormBuilderInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php
+
+		-
+			message: "#^Parameter \\$builder of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldTitle\\:\\:buildForm\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\FormBuilderInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php
+
+		-
+			message: "#^Parameter \\$builder of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldTitle\\:\\:buildOptionsForm\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\FormBuilderInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php
+
+		-
+			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldTitle\\:\\:buildForm\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php
+
+		-
+			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldTitle\\:\\:deserialize\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php
+
+		-
+			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldTitle\\:\\:render\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php
+
+		-
+			message: "#^Parameter \\$customField of method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldTitle\\:\\:serialize\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\CustomField\\\\CustomField\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php
+
+		-
+			message: "#^Call to an undefined method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\NodeDefinition\\:\\:children\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/DependencyInjection/Configuration.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php
+
+		-
+			message: "#^Method Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomField\\:\\:getName\\(\\) should return array but returns string\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php
+
 		-
 			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
 			count: 1
@@ -15,26 +888,454 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php
 
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php
+
+		-
+			message: """
+				#^Fetching deprecated class constant ASC of class Doctrine\\\\Common\\\\Collections\\\\Criteria\\:
+				use Order\\:\\:Ascending instead$#
+			"""
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php
+
+		-
+			message: "#^Call to method buildOptionsForm\\(\\) on an unknown class Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldType.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, mixed given\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldType.php
+
+		-
+			message: "#^PHPDoc tag @param for parameter \\$resolver with type Chill\\\\CustomFieldsBundle\\\\Form\\\\OptionsResolverInterface is not subtype of native type Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolver\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldType.php
+
+		-
+			message: "#^Parameter \\$resolver of method Chill\\\\CustomFieldsBundle\\\\Form\\\\CustomFieldType\\:\\:configureOptions\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\Form\\\\OptionsResolverInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldType.php
+
+		-
+			message: "#^Instanceof between Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomFieldsGroup and Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomFieldsGroup will always evaluate to true\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/CustomFieldsGroupToIdTransformer.php
+
+		-
+			message: "#^Instanceof between string and Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomFieldsGroup will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/CustomFieldsGroupToIdTransformer.php
+
+		-
+			message: "#^Method Chill\\\\CustomFieldsBundle\\\\Form\\\\DataTransformer\\\\CustomFieldsGroupToIdTransformer\\:\\:transform\\(\\) should return string but returns int\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/CustomFieldsGroupToIdTransformer.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, string given\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/CustomFieldsGroupToIdTransformer.php
+
+		-
+			message: "#^Parameter \\#1 \\$customFieldsGroup \\(Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomFieldsGroup\\|null\\) of method Chill\\\\CustomFieldsBundle\\\\Form\\\\DataTransformer\\\\CustomFieldsGroupToIdTransformer\\:\\:transform\\(\\) should be contravariant with parameter \\$value \\(mixed\\) of method Symfony\\\\Component\\\\Form\\\\DataTransformerInterface\\:\\:transform\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/CustomFieldsGroupToIdTransformer.php
+
+		-
+			message: "#^Parameter \\#1 \\$id \\(string\\) of method Chill\\\\CustomFieldsBundle\\\\Form\\\\DataTransformer\\\\CustomFieldsGroupToIdTransformer\\:\\:reverseTransform\\(\\) should be contravariant with parameter \\$value \\(mixed\\) of method Symfony\\\\Component\\\\Form\\\\DataTransformerInterface\\:\\:reverseTransform\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/CustomFieldsGroupToIdTransformer.php
+
+		-
+			message: "#^Call to an undefined method Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomField\\:\\:getLabel\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/JsonCustomFieldToArrayTransformer.php
+
+		-
+			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\ObjectRepository\\<object\\>\\:\\:findOneById\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Form/DataTransformer/JsonCustomFieldToArrayTransformer.php
+
+		-
+			message: "#^Parameter \\#1 \\$prefix of function uniqid expects string, int\\<0, max\\> given\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoicesListType.php
+
+		-
+			message: "#^Call to method getCustomFieldByType\\(\\) on an unknown class Chill\\\\CustomFieldsBundle\\\\Form\\\\Type\\\\CustomFieldCompiler\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Form/Type/CustomFieldType.php
+
+		-
+			message: "#^Property Chill\\\\CustomFieldsBundle\\\\Form\\\\Type\\\\CustomFieldType\\:\\:\\$customFieldCompiler \\(Chill\\\\CustomFieldsBundle\\\\Form\\\\Type\\\\CustomFieldCompiler\\) does not accept Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldProvider\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Form/Type/CustomFieldType.php
+
+		-
+			message: "#^Property Chill\\\\CustomFieldsBundle\\\\Form\\\\Type\\\\CustomFieldType\\:\\:\\$customFieldCompiler has unknown class Chill\\\\CustomFieldsBundle\\\\Form\\\\Type\\\\CustomFieldCompiler as its type\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Form/Type/CustomFieldType.php
+
+		-
+			message: "#^Property Chill\\\\CustomFieldsBundle\\\\Form\\\\Type\\\\CustomFieldType\\:\\:\\$om is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Form/Type/CustomFieldType.php
+
+		-
+			message: "#^Invalid array key type Chill\\\\CustomFieldsBundle\\\\Service\\\\type\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldProvider.php
+
+		-
+			message: "#^Method Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldProvider\\:\\:getCustomFieldByType\\(\\) has invalid return type Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldProvider.php
+
+		-
+			message: "#^Parameter \\$serviceName of method Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldProvider\\:\\:addCustomField\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\Service\\\\type\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldProvider.php
+
+		-
+			message: "#^Parameter \\$type of method Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldProvider\\:\\:addCustomField\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\Service\\\\type\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldProvider.php
+
+		-
+			message: "#^Property Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldProvider\\:\\:\\$container \\(Chill\\\\CustomFieldsBundle\\\\Service\\\\Container\\) does not accept Symfony\\\\Component\\\\DependencyInjection\\\\ContainerInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldProvider.php
+
+		-
+			message: "#^Property Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldProvider\\:\\:\\$container has unknown class Chill\\\\CustomFieldsBundle\\\\Service\\\\Container as its type\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldProvider.php
+
+		-
+			message: "#^Property Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldProvider\\:\\:\\$container is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldProvider.php
+
+		-
+			message: "#^Call to method deserialize\\(\\) on an unknown class Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelper.php
+
+		-
+			message: "#^Call to method isEmptyValue\\(\\) on an unknown class Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelper.php
+
+		-
+			message: "#^Call to method render\\(\\) on an unknown class Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelper.php
+
+		-
+			message: "#^Method Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldsHelper\\:\\:renderCustomField\\(\\) has invalid return type Chill\\\\CustomFieldsBundle\\\\Service\\\\The\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelper.php
+
+		-
+			message: "#^Property Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldsHelper\\:\\:\\$em is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldsHelper.php
+
+		-
+			message: "#^Method Chill\\\\CustomFieldsBundle\\\\Templating\\\\Twig\\\\CustomFieldRenderingTwig\\:\\:renderWidget\\(\\) should return string but returns Chill\\\\CustomFieldsBundle\\\\Service\\\\The\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldRenderingTwig.php
+
+		-
+			message: "#^Parameter \\$customFielsGroup of method Chill\\\\CustomFieldsBundle\\\\Templating\\\\Twig\\\\CustomFieldsGroupRenderingTwig\\:\\:renderWidget\\(\\) has invalid type Chill\\\\CustomFieldsBundle\\\\Templating\\\\Twig\\\\CustomFieldsGroud\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Templating/Twig/CustomFieldsGroupRenderingTwig.php
+
+		-
+			message: "#^Parameter \\#2 \\$query \\(Doctrine\\\\ORM\\\\QueryBuilder\\) of method Chill\\\\DocGeneratorBundle\\\\Controller\\\\AdminDocGeneratorTemplateController\\:\\:orderQuery\\(\\) should be contravariant with parameter \\$query \\(mixed\\) of method Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\CRUDController\\:\\:orderQuery\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php
+
+		-
+			message: "#^Left side of && is always true\\.$#"
+			count: 1
+			path: src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
+
+		-
+			message: "#^PHPDoc tag @return with type void is incompatible with native type Symfony\\\\Component\\\\HttpFoundation\\\\RedirectResponse\\.$#"
+			count: 1
+			path: src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between null and int will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillDocGeneratorBundle/Controller/DocGeneratorTemplateController.php
+
+		-
+			message: "#^Call to an undefined method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\NodeDefinition\\:\\:children\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillDocGeneratorBundle/DependencyInjection/Configuration.php
+
+		-
+			message: "#^Parameter \\#1 \\$object \\(Doctrine\\\\Common\\\\Collections\\\\Collection\\) of method Chill\\\\DocGeneratorBundle\\\\Serializer\\\\Normalizer\\\\CollectionDocGenNormalizer\\:\\:normalize\\(\\) should be contravariant with parameter \\$object \\(mixed\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:normalize\\(\\)$#"
+			count: 2
+			path: src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/CollectionDocGenNormalizer.php
+
+		-
+			message: "#^Return type \\(array\\|ArrayObject\\|bool\\|float\\|int\\|string\\|void\\|null\\) of method Chill\\\\DocGeneratorBundle\\\\Serializer\\\\Normalizer\\\\CollectionDocGenNormalizer\\:\\:normalize\\(\\) should be covariant with return type \\(array\\|ArrayObject\\|bool\\|float\\|int\\|string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:normalize\\(\\)$#"
+			count: 2
+			path: src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/CollectionDocGenNormalizer.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between null and Doctrine\\\\Common\\\\Collections\\\\Collection will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/CollectionDocGenNormalizer.php
+
+		-
+			message: "#^Call to an undefined method ReflectionType\\:\\:getName\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/DocGenObjectNormalizer.php
+
+		-
+			message: "#^Expression on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/DocGenObjectNormalizer.php
+
+		-
+			message: "#^Parameter \\#4 \\$attributes of method Chill\\\\DocGeneratorBundle\\\\Serializer\\\\Normalizer\\\\DocGenObjectNormalizer\\:\\:normalizeNullData\\(\\) expects array\\<Symfony\\\\Component\\\\Serializer\\\\Mapping\\\\AttributeMetadata\\>, array\\<Symfony\\\\Component\\\\Serializer\\\\Mapping\\\\AttributeMetadataInterface\\> given\\.$#"
+			count: 1
+			path: src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/DocGenObjectNormalizer.php
+
+		-
+			message: "#^Parameter \\#6 \\$attributes of method Chill\\\\DocGeneratorBundle\\\\Serializer\\\\Normalizer\\\\DocGenObjectNormalizer\\:\\:normalizeObject\\(\\) expects array\\<Symfony\\\\Component\\\\Serializer\\\\Mapping\\\\AttributeMetadata\\>, array\\<Symfony\\\\Component\\\\Serializer\\\\Mapping\\\\AttributeMetadataInterface\\> given\\.$#"
+			count: 1
+			path: src/Bundle/ChillDocGeneratorBundle/Serializer/Normalizer/DocGenObjectNormalizer.php
+
 		-
 			message: "#^Parameter \\#1 \\$user of method Chill\\\\DocStoreBundle\\\\Entity\\\\Document\\:\\:setUser\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User\\|null, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
 			count: 2
 			path: src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php
 
+		-
+			message: "#^Strict comparison using \\=\\=\\= between null and Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php
+
+		-
+			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\ObjectManager\\:\\:createQuery\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillDocStoreBundle/Controller/DocumentCategoryController.php
+
 		-
 			message: "#^Parameter \\#1 \\$user of method Chill\\\\DocStoreBundle\\\\Entity\\\\Document\\:\\:setUser\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User\\|null, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
 			count: 2
 			path: src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
 
+		-
+			message: "#^Strict comparison using \\=\\=\\= between null and Chill\\\\PersonBundle\\\\Entity\\\\Person will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillDocStoreBundle/Entity/DocumentCategory.php
+
+		-
+			message: "#^Return type \\(Chill\\\\MainBundle\\\\Entity\\\\Scope\\|null\\) of method Chill\\\\DocStoreBundle\\\\Entity\\\\PersonDocument\\:\\:getScope\\(\\) should be covariant with return type \\(Chill\\\\MainBundle\\\\Entity\\\\Scope\\) of method Chill\\\\MainBundle\\\\Entity\\\\HasScopeInterface\\:\\:getScope\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillDocStoreBundle/Entity/PersonDocument.php
+
+		-
+			message: "#^Property Chill\\\\DocStoreBundle\\\\Repository\\\\DocumentCategoryRepository\\:\\:\\$em is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillDocStoreBundle/Repository/DocumentCategoryRepository.php
+
+		-
+			message: "#^Instanceof between Chill\\\\DocStoreBundle\\\\Entity\\\\PersonDocument and Chill\\\\DocStoreBundle\\\\Entity\\\\PersonDocument will always evaluate to true\\.$#"
+			count: 1
+			path: src/Bundle/ChillDocStoreBundle/Security/Authorization/PersonDocumentVoter.php
+
+		-
+			message: "#^Parameter \\#2 \\$subject \\(Chill\\\\DocStoreBundle\\\\Entity\\\\PersonDocument\\) of method Chill\\\\DocStoreBundle\\\\Security\\\\Authorization\\\\PersonDocumentVoter\\:\\:voteOnAttribute\\(\\) should be contravariant with parameter \\$subject \\(mixed\\) of method Symfony\\\\Component\\\\Security\\\\Core\\\\Authorization\\\\Voter\\\\Voter\\:\\:voteOnAttribute\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillDocStoreBundle/Security/Authorization/PersonDocumentVoter.php
+
+		-
+			message: "#^Default value of the parameter \\#5 \\$options \\(array\\{\\}\\) of method Chill\\\\DocStoreBundle\\\\Templating\\\\WopiEditTwigExtensionRuntime\\:\\:renderButtonGroup\\(\\) is incompatible with type array\\{small\\: bool\\}\\.$#"
+			count: 1
+			path: src/Bundle/ChillDocStoreBundle/Templating/WopiEditTwigExtensionRuntime.php
+
+		-
+			message: "#^Property Chill\\\\DocStoreBundle\\\\Templating\\\\WopiEditTwigExtensionRuntime\\:\\:\\$discovery is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillDocStoreBundle/Templating/WopiEditTwigExtensionRuntime.php
+
+		-
+			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\ObjectRepository\\<Chill\\\\EventBundle\\\\Entity\\\\Participation\\>\\:\\:countByPerson\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillEventBundle/Controller/EventController.php
+
+		-
+			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\ObjectRepository\\<Chill\\\\EventBundle\\\\Entity\\\\Participation\\>\\:\\:findByPersonInCircle\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillEventBundle/Controller/EventController.php
+
+		-
+			message: "#^Call to method Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:getFirstName\\(\\) with incorrect case\\: getFirstname$#"
+			count: 1
+			path: src/Bundle/ChillEventBundle/Controller/EventController.php
+
+		-
+			message: "#^Call to method Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:getLastName\\(\\) with incorrect case\\: getLastname$#"
+			count: 1
+			path: src/Bundle/ChillEventBundle/Controller/EventController.php
+
+		-
+			message: "#^Call to method Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:getMobilenumber\\(\\) with incorrect case\\: getMobileNumber$#"
+			count: 1
+			path: src/Bundle/ChillEventBundle/Controller/EventController.php
+
+		-
+			message: "#^Call to method Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:getPhonenumber\\(\\) with incorrect case\\: getPhoneNumber$#"
+			count: 1
+			path: src/Bundle/ChillEventBundle/Controller/EventController.php
+
+		-
+			message: "#^Negated boolean expression is always false\\.$#"
+			count: 1
+			path: src/Bundle/ChillEventBundle/Controller/EventController.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\EventBundle\\\\Entity\\\\Event given\\.$#"
+			count: 1
+			path: src/Bundle/ChillEventBundle/Controller/EventController.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\EventBundle\\\\Entity\\\\Event\\|null given\\.$#"
+			count: 2
+			path: src/Bundle/ChillEventBundle/Controller/EventController.php
+
+		-
+			message: "#^Parameter \\#1 \\$value of function count expects array\\|Countable, Chill\\\\MainBundle\\\\Entity\\\\Center given\\.$#"
+			count: 1
+			path: src/Bundle/ChillEventBundle/Controller/EventController.php
+
+		-
+			message: "#^Method Chill\\\\EventBundle\\\\Controller\\\\EventTypeController\\:\\:createCreateForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillEventBundle/Controller/EventTypeController.php
+
+		-
+			message: "#^Method Chill\\\\EventBundle\\\\Controller\\\\EventTypeController\\:\\:createEditForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillEventBundle/Controller/EventTypeController.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\EventBundle\\\\Entity\\\\EventType\\|null given\\.$#"
+			count: 4
+			path: src/Bundle/ChillEventBundle/Controller/EventTypeController.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\EventBundle\\\\Entity\\\\Participation\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillEventBundle/Controller/ParticipationController.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between null and Chill\\\\EventBundle\\\\Entity\\\\Event will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillEventBundle/Controller/ParticipationController.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between null and Chill\\\\EventBundle\\\\Entity\\\\Participation will always evaluate to false\\.$#"
+			count: 2
+			path: src/Bundle/ChillEventBundle/Controller/ParticipationController.php
+
 		-
 			message: "#^Variable \\$participation might not be defined\\.$#"
 			count: 3
 			path: src/Bundle/ChillEventBundle/Controller/ParticipationController.php
 
+		-
+			message: "#^Method Chill\\\\EventBundle\\\\Controller\\\\RoleController\\:\\:createCreateForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillEventBundle/Controller/RoleController.php
+
+		-
+			message: "#^Method Chill\\\\EventBundle\\\\Controller\\\\RoleController\\:\\:createEditForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillEventBundle/Controller/RoleController.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\EventBundle\\\\Entity\\\\Role\\|null given\\.$#"
+			count: 4
+			path: src/Bundle/ChillEventBundle/Controller/RoleController.php
+
+		-
+			message: "#^Method Chill\\\\EventBundle\\\\Controller\\\\StatusController\\:\\:createCreateForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillEventBundle/Controller/StatusController.php
+
+		-
+			message: "#^Method Chill\\\\EventBundle\\\\Controller\\\\StatusController\\:\\:createEditForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillEventBundle/Controller/StatusController.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\EventBundle\\\\Entity\\\\Status\\|null given\\.$#"
+			count: 4
+			path: src/Bundle/ChillEventBundle/Controller/StatusController.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php
+
 		-
 			message: "#^Foreach overwrites \\$value with its value variable\\.$#"
 			count: 1
 			path: src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php
 
+		-
+			message: "#^Parameter \\#1 \\$callback of function call_user_func expects callable\\(\\)\\: mixed, null given\\.$#"
+			count: 2
+			path: src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php
+
+		-
+			message: "#^Parameter \\#1 \\$value \\(null\\) of method Chill\\\\EventBundle\\\\Form\\\\ChoiceLoader\\\\EventChoiceLoader\\:\\:loadChoiceList\\(\\) should be contravariant with parameter \\$value \\(\\(callable\\(\\)\\: mixed\\)\\|null\\) of method Symfony\\\\Component\\\\Form\\\\ChoiceList\\\\Loader\\\\ChoiceLoaderInterface\\:\\:loadChoiceList\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php
+
+		-
+			message: "#^Parameter \\#2 \\$value \\(null\\) of method Chill\\\\EventBundle\\\\Form\\\\ChoiceLoader\\\\EventChoiceLoader\\:\\:loadChoicesForValues\\(\\) should be contravariant with parameter \\$value \\(\\(callable\\(\\)\\: mixed\\)\\|null\\) of method Symfony\\\\Component\\\\Form\\\\ChoiceList\\\\Loader\\\\ChoiceLoaderInterface\\:\\:loadChoicesForValues\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php
+
+		-
+			message: "#^Parameter \\#2 \\$value \\(null\\) of method Chill\\\\EventBundle\\\\Form\\\\ChoiceLoader\\\\EventChoiceLoader\\:\\:loadValuesForChoices\\(\\) should be contravariant with parameter \\$value \\(\\(callable\\(\\)\\: mixed\\)\\|null\\) of method Symfony\\\\Component\\\\Form\\\\ChoiceList\\\\Loader\\\\ChoiceLoaderInterface\\:\\:loadValuesForChoices\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 2
+			path: src/Bundle/ChillEventBundle/Search/EventSearch.php
+
+		-
+			message: "#^Parameter \\#1 \\$entity \\(Chill\\\\EventBundle\\\\Entity\\\\Event\\) of method Chill\\\\EventBundle\\\\Timeline\\\\TimelineEventProvider\\:\\:getEntityTemplate\\(\\) should be contravariant with parameter \\$entity \\(Chill\\\\MainBundle\\\\Timeline\\\\type\\) of method Chill\\\\MainBundle\\\\Timeline\\\\TimelineProviderInterface\\:\\:getEntityTemplate\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillEventBundle/Timeline/TimelineEventProvider.php
+
+		-
+			message: "#^Parameter \\#2 \\$context \\(string\\) of method Chill\\\\EventBundle\\\\Timeline\\\\TimelineEventProvider\\:\\:getEntityTemplate\\(\\) should be compatible with parameter \\$context \\(Chill\\\\MainBundle\\\\Timeline\\\\type\\) of method Chill\\\\MainBundle\\\\Timeline\\\\TimelineProviderInterface\\:\\:getEntityTemplate\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillEventBundle/Timeline/TimelineEventProvider.php
+
 		-
 			message: "#^Comparison operation \"\\>\" between \\(bool\\|int\\|Redis\\) and 0 results in an error\\.$#"
 			count: 1
@@ -50,11 +1351,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillFranceTravailApiBundle/src/ApiHelper/PartenaireRomeAppellation.php
 
-		-
-			message: "#^Function GuzzleHttp\\\\Psr7\\\\str not found\\.$#"
-			count: 2
-			path: src/Bundle/ChillFranceTravailApiBundle/src/ApiHelper/PartenaireRomeAppellation.php
-
 		-
 			message: "#^Parameter \\#1 \\$seconds of function sleep expects int, string given\\.$#"
 			count: 1
@@ -65,31 +1361,11 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillJobBundle/src/Controller/CSPersonController.php
 
-		-
-			message: "#^Parameter \\#1 \\$interval of method DateTimeImmutable\\:\\:add\\(\\) expects DateInterval, string\\|null given\\.$#"
-			count: 1
-			path: src/Bundle/ChillJobBundle/src/Entity/Immersion.php
-
-		-
-			message: "#^Parameter \\#1 \\$object of static method DateTimeImmutable\\:\\:createFromMutable\\(\\) expects DateTime, DateTimeInterface given\\.$#"
-			count: 1
-			path: src/Bundle/ChillJobBundle/src/Entity/Immersion.php
-
 		-
 			message: "#^Property Chill\\\\JobBundle\\\\Entity\\\\Rome\\\\Metier\\:\\:\\$appellations is never read, only written\\.$#"
 			count: 1
 			path: src/Bundle/ChillJobBundle/src/Entity/Rome/Metier.php
 
-		-
-			message: "#^Method Chill\\\\JobBundle\\\\Export\\\\ListCSPerson\\:\\:splitArrayToColumns\\(\\) never returns Closure so it can be removed from the return type\\.$#"
-			count: 1
-			path: src/Bundle/ChillJobBundle/src/Export/ListCSPerson.php
-
-		-
-			message: "#^Variable \\$f might not be defined\\.$#"
-			count: 1
-			path: src/Bundle/ChillJobBundle/src/Export/ListCSPerson.php
-
 		-
 			message: "#^Method Chill\\\\JobBundle\\\\Export\\\\ListFrein\\:\\:splitArrayToColumns\\(\\) never returns Closure so it can be removed from the return type\\.$#"
 			count: 1
@@ -105,16 +1381,6 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillJobBundle/src/Form/ChoiceLoader/RomeAppellationChoiceLoader.php
 
-		-
-			message: "#^Result of && is always false\\.$#"
-			count: 1
-			path: src/Bundle/ChillJobBundle/src/Form/ChoiceLoader/RomeAppellationChoiceLoader.php
-
-		-
-			message: "#^Strict comparison using \\=\\=\\= between array\\{\\} and Symfony\\\\Component\\\\Validator\\\\ConstraintViolationListInterface will always evaluate to false\\.$#"
-			count: 2
-			path: src/Bundle/ChillJobBundle/src/Form/ChoiceLoader/RomeAppellationChoiceLoader.php
-
 		-
 			message: "#^Strict comparison using \\=\\=\\= between null and string will always evaluate to false\\.$#"
 			count: 1
@@ -126,25 +1392,718 @@ parameters:
 			path: src/Bundle/ChillJobBundle/src/Form/ChoiceLoader/RomeAppellationChoiceLoader.php
 
 		-
-			message: "#^Parameter \\#1 \\$interval of method DateTimeImmutable\\:\\:add\\(\\) expects DateInterval, string\\|null given\\.$#"
+			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\ObjectManager\\:\\:createQueryBuilder\\(\\)\\.$#"
 			count: 1
-			path: src/Bundle/ChillJobBundle/src/Security/Authorization/CSConnectesVoter.php
+			path: src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php
 
 		-
-			message: "#^Parameter \\#1 \\$object of static method DateTimeImmutable\\:\\:createFromMutable\\(\\) expects DateTime, DateTimeInterface given\\.$#"
+			message: """
+				#^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
+				since Symfony 5\\.4, use method or constructor injection in your controller instead$#
+			"""
 			count: 1
-			path: src/Bundle/ChillJobBundle/src/Security/Authorization/CSConnectesVoter.php
+			path: src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
+
+		-
+			message: "#^PHPDoc tag @param for parameter \\$postedDataContext with type string is incompatible with native type array\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
+
+		-
+			message: "#^PHPDoc tag @param has invalid value \\(mixed id\\)\\: Unexpected token \"id\", expected variable at offset 956$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
+
+		-
+			message: "#^PHPDoc tag @param has invalid value \\(string action\\)\\: Unexpected token \"action\", expected variable at offset 929$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
+
+		-
+			message: "#^PHPDoc tag @return with type void is incompatible with native type Symfony\\\\Component\\\\HttpFoundation\\\\Response\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between null and object will always evaluate to false\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
+
+		-
+			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\ObjectManager\\:\\:createQueryBuilder\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
+
+		-
+			message: """
+				#^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
+				since Symfony 5\\.4, use method or constructor injection in your controller instead$#
+			"""
+			count: 3
+			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
+
+		-
+			message: "#^Call to method getQuery\\(\\) on an unknown class Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\type\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
+
+		-
+			message: "#^Method Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\CRUDController\\:\\:index\\(\\) has invalid return type Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\type\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
+
+		-
+			message: "#^Method Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\CRUDController\\:\\:queryEntities\\(\\) has invalid return type Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\type\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
+
+		-
+			message: "#^PHPDoc tag @throws with type Symfony\\\\Component\\\\Security\\\\Core\\\\Exception\\\\AccessDeniedHttpException is not subtype of Throwable$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
+
+		-
+			message: "#^Parameter \\#3 \\$formClass of method Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\CRUDController\\:\\:createFormFor\\(\\) expects string\\|null, Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\type\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
+
+		-
+			message: "#^Parameter \\#3 \\$scope of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:\\:getReachableCenters\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\Scope\\|null, Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\Scope\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
+
+		-
+			message: "#^Parameter \\$formClass of method Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\CRUDController\\:\\:formCreateAction\\(\\) has invalid type Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\type\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
+
+		-
+			message: "#^Parameter \\$scope of method Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\CRUDController\\:\\:getReachableCenters\\(\\) has invalid type Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\Scope\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/CRUD/Resolver/Resolver.php
+
+		-
+			message: "#^Method Chill\\\\MainBundle\\\\CRUD\\\\Resolver\\\\Resolver\\:\\:getConfigValue\\(\\) should return string but return statement is missing\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/CRUD/Resolver/Resolver.php
+
+		-
+			message: "#^Constant Chill\\\\MainBundle\\\\CRUD\\\\Routing\\\\CRUDRoutesLoader\\:\\:ALL_INDEX_METHODS is unused\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/CRUD/Routing/CRUDRoutesLoader.php
+
+		-
+			message: "#^Constant Chill\\\\MainBundle\\\\CRUD\\\\Routing\\\\CRUDRoutesLoader\\:\\:ALL_SINGLE_METHODS is unused\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/CRUD/Routing/CRUDRoutesLoader.php
+
+		-
+			message: "#^Parameter \\#2 \\$type \\(null\\) of method Chill\\\\MainBundle\\\\CRUD\\\\Routing\\\\CRUDRoutesLoader\\:\\:supports\\(\\) should be contravariant with parameter \\$type \\(string\\|null\\) of method Symfony\\\\Component\\\\Config\\\\Loader\\\\LoaderInterface\\:\\:supports\\(\\)$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/CRUD/Routing/CRUDRoutesLoader.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between 'CRUD' and null will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/CRUD/Routing/CRUDRoutesLoader.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between 'collection' and 'single'\\|null will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/CRUD/Routing/CRUDRoutesLoader.php
+
+		-
+			message: "#^Call to an undefined method Doctrine\\\\ORM\\\\EntityRepository\\<Chill\\\\MainBundle\\\\Entity\\\\Center\\>\\:\\:findOneByName\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php
+
+		-
+			message: """
+				#^Call to deprecated method getUsername\\(\\) of class Chill\\\\MainBundle\\\\Entity\\\\User\\:
+				since Symfony 5\\.3, use getUserIdentifier\\(\\) instead$#
+			"""
+			count: 2
+			path: src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php
+
+		-
+			message: "#^Method Chill\\\\MainBundle\\\\Command\\\\ChillImportUsersCommand\\:\\:getCenters\\(\\) should return array\\<Chill\\\\MainBundle\\\\Entity\\\\Center\\> but returns null\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php
+
+		-
+			message: """
+				#^Call to deprecated method getUsername\\(\\) of class Chill\\\\MainBundle\\\\Entity\\\\User\\:
+				since Symfony 5\\.3, use getUserIdentifier\\(\\) instead$#
+			"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Command/ChillUserSendRenewPasswordCodeCommand.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Command/ChillUserSendRenewPasswordCodeCommand.php
+
+		-
+			message: "#^Property Chill\\\\MainBundle\\\\Command\\\\ChillUserSendRenewPasswordCodeCommand\\:\\:\\$output is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Command/ChillUserSendRenewPasswordCodeCommand.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, mixed given\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Command/LoadAndUpdateLanguagesCommand.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, int given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
+
+		-
+			message: "#^Call to an undefined method Symfony\\\\Component\\\\Console\\\\Helper\\\\HelperInterface\\:\\:askHiddenResponse\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Command/SetPasswordCommand.php
+
+		-
+			message: """
+				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Encoder\\\\EncoderFactory\\:
+				since Symfony 5\\.3, use \\{@link PasswordHasherFactory\\} instead$#
+			"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Command/SetPasswordCommand.php
+
+		-
+			message: "#^Call to method Redis\\:\\:setex\\(\\) with incorrect case\\: setEx$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Controller/ExportController.php
 
 		-
 			message: "#^Cannot unset offset '_token' on array\\{formatter\\: mixed, export\\: mixed, centers\\: mixed, alias\\: string\\}\\.$#"
 			count: 1
 			path: src/Bundle/ChillMainBundle/Controller/ExportController.php
 
+		-
+			message: "#^Instanceof between Chill\\\\MainBundle\\\\Export\\\\DirectExportInterface and Chill\\\\MainBundle\\\\Export\\\\DirectExportInterface will always evaluate to true\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/ExportController.php
+
+		-
+			message: "#^Parameter \\#2 \\$query \\(Doctrine\\\\ORM\\\\QueryBuilder\\) of method Chill\\\\MainBundle\\\\Controller\\\\LocationApiController\\:\\:orderQuery\\(\\) should be contravariant with parameter \\$query \\(mixed\\) of method Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\AbstractCRUDController\\:\\:orderQuery\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/LocationApiController.php
+
+		-
+			message: """
+				#^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
+				since Symfony 5\\.4, use method or constructor injection in your controller instead$#
+			"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/MenuController.php
+
+		-
+			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Repository\\\\NotificationRepository\\:\\:countUnreadByUser\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/NotificationApiController.php
+
+		-
+			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Repository\\\\NotificationRepository\\:\\:findUnreadByUser\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/NotificationApiController.php
+
+		-
+			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\ObjectManager\\:\\:createQueryBuilder\\(\\)\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Controller/PasswordController.php
+
+		-
+			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\ObjectRepository\\<Chill\\\\MainBundle\\\\Entity\\\\User\\>\\:\\:findOneByUsernameCanonical\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/PasswordController.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/PasswordController.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\MainBundle\\\\Entity\\\\PermissionsGroup\\|null given\\.$#"
+			count: 5
+			path: src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\MainBundle\\\\Entity\\\\RoleScope\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/PermissionsGroupController.php
+
+		-
+			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\ObjectManager\\:\\:createQuery\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/PostalCodeController.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/PostalCodeController.php
+
+		-
+			message: "#^Call to an undefined method Symfony\\\\Component\\\\HttpFoundation\\\\Session\\\\SessionInterface\\:\\:getFlashBag\\(\\)\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Controller/SavedExportController.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\MainBundle\\\\Entity\\\\Scope\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/ScopeController.php
+
+		-
+			message: """
+				#^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
+				since Symfony 5\\.4, use method or constructor injection in your controller instead$#
+			"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/SearchController.php
+
+		-
+			message: "#^PHPDoc tag @var for variable \\$variable contains unknown class Chill\\\\MainBundle\\\\Controller\\\\Chill\\\\MainBundle\\\\Search\\\\HasAdvancedSearchFormInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/SearchController.php
+
+		-
+			message: "#^PHPDoc tag @var for variable \\$variable contains unknown class Chill\\\\MainBundle\\\\Controller\\\\Chill\\\\MainBundle\\\\Search\\\\SearchProvider\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Controller/SearchController.php
+
+		-
+			message: "#^Variable \\$variable in PHPDoc tag @var does not match assigned variable \\$search\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/SearchController.php
+
+		-
+			message: "#^Variable \\$variable in PHPDoc tag @var does not match assigned variable \\$searchProvider\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Controller/SearchController.php
+
+		-
+			message: "#^Call to an undefined method Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\:\\:getGroupCenters\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/TimelineCenterController.php
+
+		-
+			message: "#^Parameter \\#1 \\$context of method Chill\\\\MainBundle\\\\Timeline\\\\TimelineBuilder\\:\\:countItems\\(\\) expects Chill\\\\MainBundle\\\\Timeline\\\\unknown, string given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/TimelineCenterController.php
+
+		-
+			message: "#^Parameter \\#3 \\$query \\(Doctrine\\\\ORM\\\\QueryBuilder\\) of method Chill\\\\MainBundle\\\\Controller\\\\UserApiController\\:\\:customizeQuery\\(\\) should be contravariant with parameter \\$query \\(mixed\\) of method Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\AbstractCRUDController\\:\\:customizeQuery\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/UserApiController.php
+
+		-
+			message: "#^Call to an undefined method Chill\\\\MainBundle\\\\Controller\\\\UserController\\:\\:createEditForm\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/UserController.php
+
+		-
+			message: """
+				#^Call to deprecated method getUsername\\(\\) of class Chill\\\\MainBundle\\\\Entity\\\\User\\:
+				since Symfony 5\\.3, use getUserIdentifier\\(\\) instead$#
+			"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/UserController.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\MainBundle\\\\Entity\\\\GroupCenter\\|null given\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Controller/UserController.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\MainBundle\\\\Entity\\\\User\\|null given\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Controller/UserController.php
+
+		-
+			message: "#^Parameter \\#1 \\$records of method League\\\\Csv\\\\Writer\\:\\:insertAll\\(\\) expects iterable\\<array\\<float\\|int\\|string\\|Stringable\\|null\\>\\>, iterable\\<array\\<string, bool\\|int\\|string\\>\\> given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/UserExportController.php
+
+		-
+			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Entity\\\\Workflow\\\\EntityWorkflow\\:\\:addSubscriberToFinal\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php
+
+		-
+			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Entity\\\\Workflow\\\\EntityWorkflow\\:\\:addSubscriberToStep\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php
+
+		-
+			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Entity\\\\Workflow\\\\EntityWorkflow\\:\\:isUserSubscribedToFinal\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php
+
+		-
+			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Entity\\\\Workflow\\\\EntityWorkflow\\:\\:isUserSubscribedToStep\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php
+
+		-
+			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Entity\\\\Workflow\\\\EntityWorkflow\\:\\:removeSubscriberToFinal\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php
+
+		-
+			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Entity\\\\Workflow\\\\EntityWorkflow\\:\\:removeSubscriberToStep\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php
+
+		-
+			message: "#^Property Chill\\\\MainBundle\\\\DataFixtures\\\\ORM\\\\LoadAddressReferences\\:\\:\\$container is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAddressReferences.php
+
+		-
+			message: "#^Property Chill\\\\MainBundle\\\\DataFixtures\\\\ORM\\\\LoadLocationType\\:\\:\\$container is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLocationType.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, int given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadPostalCodes.php
+
+		-
+			message: """
+				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Encoder\\\\EncoderFactory\\:
+				since Symfony 5\\.3, use \\{@link PasswordHasherFactory\\} instead$#
+			"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUsers.php
+
+		-
+			message: "#^Property Chill\\\\MainBundle\\\\DataFixtures\\\\ORM\\\\LoadUsers\\:\\:\\$container is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUsers.php
+
+		-
+			message: "#^Parameter \\$factory of method Chill\\\\MainBundle\\\\DependencyInjection\\\\ChillMainExtension\\:\\:addWidgetFactory\\(\\) has invalid type Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\WidgetFactoryInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
+
+		-
+			message: "#^Call to an undefined method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\NodeDefinition\\:\\:canBeUnset\\(\\)\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
+
+		-
+			message: "#^Call to an undefined method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\NodeDefinition\\:\\:children\\(\\)\\.$#"
+			count: 3
+			path: src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
+
+		-
+			message: "#^Method Chill\\\\MainBundle\\\\DependencyInjection\\\\Configuration\\:\\:getWidgetFactories\\(\\) has invalid return type Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\WidgetFactoryInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
+
+		-
+			message: "#^PHPDoc tag @param has invalid value \\(WidgetFactoryInterface\\[\\]\\)\\: Unexpected token \"\\\\n     \", expected variable at offset 42$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
+
+		-
+			message: "#^Parameter \\#1 \\$place of method Chill\\\\MainBundle\\\\DependencyInjection\\\\Configuration\\:\\:filterWidgetByPlace\\(\\) expects string, Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\type given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
+
+		-
+			message: "#^Parameter \\#1 \\$place of method Chill\\\\MainBundle\\\\DependencyInjection\\\\Configuration\\:\\:getWidgetAliasesbyPlace\\(\\) expects Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\type, string given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
+
+		-
+			message: "#^Parameter \\$place of method Chill\\\\MainBundle\\\\DependencyInjection\\\\Configuration\\:\\:getWidgetAliasesbyPlace\\(\\) has invalid type Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\type\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
+
+		-
+			message: "#^Parameter \\$widgetFactories of method Chill\\\\MainBundle\\\\DependencyInjection\\\\Configuration\\:\\:setWidgetFactories\\(\\) has invalid type Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\WidgetFactoryInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
+
+		-
+			message: "#^Call to an undefined method Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\WidgetFactoryInterface\\:\\:getAllowedPlaces\\(\\)\\.$#"
+			count: 3
+			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
+
+		-
+			message: "#^Instanceof between Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\HasWidgetFactoriesExtensionInterface and Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\HasWidgetFactoriesExtensionInterface will always evaluate to true\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
+
+		-
+			message: "#^Method Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\AbstractWidgetsCompilerPass\\:\\:isPlaceAllowedForWidget\\(\\) has invalid return type Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\unknown\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
+
+		-
+			message: "#^Method Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\AbstractWidgetsCompilerPass\\:\\:isPlaceAllowedForWidget\\(\\) should return Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\unknown but returns false\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
+
+		-
+			message: "#^Method Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\AbstractWidgetsCompilerPass\\:\\:isPlaceAllowedForWidget\\(\\) should return Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\unknown but returns true\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
+
+		-
+			message: "#^Negated boolean expression is always false\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
+
+		-
+			message: "#^Parameter \\#2 \\$place of method Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\WidgetFactoryInterface\\:\\:createDefinition\\(\\) expects Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\type, string given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
+
+		-
+			message: "#^Parameter \\#3 \\$order of method Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\WidgetFactoryInterface\\:\\:createDefinition\\(\\) expects Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\type, float given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
+
+		-
+			message: "#^Parameter \\#2 \\$place of method Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\WidgetFactoryInterface\\:\\:getServiceId\\(\\) expects string, Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\type given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/Factory/AbstractWidgetFactory.php
+
+		-
+			message: "#^Parameter \\#3 \\$order of method Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\WidgetFactoryInterface\\:\\:getServiceId\\(\\) expects float, Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\type given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/Factory/AbstractWidgetFactory.php
+
+		-
+			message: "#^Parameter \\$order of method Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\AbstractWidgetFactory\\:\\:createDefinition\\(\\) has invalid type Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\type\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/Factory/AbstractWidgetFactory.php
+
+		-
+			message: "#^Parameter \\$place of method Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\AbstractWidgetFactory\\:\\:createDefinition\\(\\) has invalid type Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\type\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/Factory/AbstractWidgetFactory.php
+
+		-
+			message: "#^Parameter \\$order of method Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\WidgetFactoryInterface\\:\\:createDefinition\\(\\) has invalid type Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\type\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/Factory/WidgetFactoryInterface.php
+
+		-
+			message: "#^Parameter \\$place of method Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\WidgetFactoryInterface\\:\\:configureOptions\\(\\) has invalid type Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\type\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/Factory/WidgetFactoryInterface.php
+
+		-
+			message: "#^Parameter \\$place of method Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\WidgetFactoryInterface\\:\\:createDefinition\\(\\) has invalid type Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\type\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/Factory/WidgetFactoryInterface.php
+
+		-
+			message: "#^PHPDoc tag @param for parameter \\$factory with type Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\WidgetFactoryInterface is not subtype of native type Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\WidgetFactoryInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/HasWidgetFactoriesExtensionInterface.php
+
+		-
+			message: "#^Parameter \\$factory of method Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\HasWidgetFactoriesExtensionInterface\\:\\:addWidgetFactory\\(\\) has invalid type Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\WidgetFactoryInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/HasWidgetFactoriesExtensionInterface.php
+
+		-
+			message: "#^Instanceof between DateTime and DateTime will always evaluate to true\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Entity/Address.php
+
+		-
+			message: "#^Property Chill\\\\MainBundle\\\\Entity\\\\Address\\:\\:\\$validTo \\(DateTime\\|null\\) does not accept DateTimeInterface\\|null\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Entity/Address.php
+
+		-
+			message: "#^Method Chill\\\\MainBundle\\\\Entity\\\\AddressReference\\:\\:setPostcode\\(\\) should return Chill\\\\MainBundle\\\\Entity\\\\Address but returns \\$this\\(Chill\\\\MainBundle\\\\Entity\\\\AddressReference\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Entity/AddressReference.php
+
+		-
+			message: "#^Property Chill\\\\MainBundle\\\\Entity\\\\AddressReference\\:\\:\\$addressCanonical is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Entity/AddressReference.php
+
+		-
+			message: "#^Property Chill\\\\MainBundle\\\\Entity\\\\GeographicalUnit\\:\\:\\$geom is unused\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Entity/GeographicalUnit.php
+
+		-
+			message: "#^Property Chill\\\\MainBundle\\\\Entity\\\\GeographicalUnit\\:\\:\\$unitRefId is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Entity/GeographicalUnit.php
+
+		-
+			message: "#^Method Chill\\\\MainBundle\\\\Entity\\\\Language\\:\\:getName\\(\\) should return string but returns array\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Entity/Language.php
+
+		-
+			message: "#^PHPDoc tag @param has invalid value \\(string array \\$name\\)\\: Unexpected token \"array\", expected variable at offset 49$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Entity/Language.php
+
+		-
+			message: "#^PHPDoc tag @var for property Chill\\\\MainBundle\\\\Entity\\\\Language\\:\\:\\$name with type string is incompatible with native type array\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Entity/Language.php
+
+		-
+			message: "#^Property Chill\\\\MainBundle\\\\Entity\\\\Location\\:\\:\\$createdAt \\(DateTimeImmutable\\|null\\) does not accept DateTimeInterface\\|null\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Entity/Location.php
+
+		-
+			message: "#^Property Chill\\\\MainBundle\\\\Entity\\\\Location\\:\\:\\$updatedAt \\(DateTimeImmutable\\|null\\) does not accept DateTimeInterface\\|null\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Entity/Location.php
+
+		-
+			message: """
+				#^Fetching deprecated class constant ASC of class Doctrine\\\\Common\\\\Collections\\\\Criteria\\:
+				use Order\\:\\:Ascending instead$#
+			"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Entity/Notification.php
+
+		-
+			message: "#^Property Chill\\\\MainBundle\\\\Entity\\\\Notification\\:\\:\\$updatedAt \\(DateTimeImmutable\\|null\\) does not accept DateTimeInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Entity/Notification.php
+
+		-
+			message: "#^Property Chill\\\\MainBundle\\\\Entity\\\\NotificationComment\\:\\:\\$createdAt \\(DateTimeImmutable\\|null\\) does not accept DateTimeInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Entity/NotificationComment.php
+
+		-
+			message: "#^Property Chill\\\\MainBundle\\\\Entity\\\\NotificationComment\\:\\:\\$updateAt \\(DateTimeImmutable\\|null\\) does not accept DateTimeInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Entity/NotificationComment.php
+
+		-
+			message: "#^Property Chill\\\\MainBundle\\\\Entity\\\\PermissionsGroup\\:\\:\\$groupCenters is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Entity/PermissionsGroup.php
+
+		-
+			message: "#^Property Chill\\\\MainBundle\\\\Entity\\\\PostalCode\\:\\:\\$canonical is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Entity/PostalCode.php
+
+		-
+			message: "#^Property Chill\\\\MainBundle\\\\Entity\\\\PostalCode\\:\\:\\$deletedAt is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Entity/PostalCode.php
+
+		-
+			message: "#^Property Chill\\\\MainBundle\\\\Entity\\\\RoleScope\\:\\:\\$permissionsGroups is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Entity/RoleScope.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between null and array will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Entity/User.php
+
+		-
+			message: """
+				#^Fetching deprecated class constant ASC of class Doctrine\\\\Common\\\\Collections\\\\Criteria\\:
+				use Order\\:\\:Ascending instead$#
+			"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php
+
+		-
+			message: "#^Call to an undefined method Chill\\\\MainBundle\\\\Export\\\\ExportElementInterface\\:\\:requiredRole\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/ExportManager.php
+
+		-
+			message: "#^Call to function is_iterable\\(\\) with array will always evaluate to true\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/ExportManager.php
+
 		-
 			message: "#^Foreach overwrites \\$line with its value variable\\.$#"
 			count: 2
 			path: src/Bundle/ChillMainBundle/Export/Formatter/CSVFormatter.php
 
+		-
+			message: "#^Parameter \\#2 \\$nbAggregators of method Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\CSVFormatter\\:\\:appendAggregatorForm\\(\\) expects string, int\\<0, max\\> given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/Formatter/CSVFormatter.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between null and array\\|string will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/Formatter/CSVFormatter.php
+
+		-
+			message: "#^Variable \\$data in PHPDoc tag @var does not match assigned variable \\$contentData\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/Formatter/CSVFormatter.php
+
+		-
+			message: "#^Parameter \\#2 \\$exportAlias \\(Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\type\\) of method Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\CSVListFormatter\\:\\:buildForm\\(\\) should be compatible with parameter \\$exportAlias \\(string\\) of method Chill\\\\MainBundle\\\\Export\\\\FormatterInterface\\:\\:buildForm\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/Formatter/CSVListFormatter.php
+
+		-
+			message: "#^Parameter \\$exportAlias of method Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\CSVListFormatter\\:\\:buildForm\\(\\) has invalid type Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\type\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/Formatter/CSVListFormatter.php
+
+		-
+			message: "#^Parameter \\#2 \\$exportAlias \\(Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\type\\) of method Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\CSVPivotedListFormatter\\:\\:buildForm\\(\\) should be compatible with parameter \\$exportAlias \\(string\\) of method Chill\\\\MainBundle\\\\Export\\\\FormatterInterface\\:\\:buildForm\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/Formatter/CSVPivotedListFormatter.php
+
+		-
+			message: "#^Parameter \\$exportAlias of method Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\CSVPivotedListFormatter\\:\\:buildForm\\(\\) has invalid type Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\type\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/Formatter/CSVPivotedListFormatter.php
+
+		-
+			message: "#^Access to offset 'format' on an unknown class Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\type\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
+
+		-
+			message: "#^Access to offset mixed on an unknown class Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\type\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
+
 		-
 			message: "#^Foreach overwrites \\$key with its key variable\\.$#"
 			count: 1
@@ -155,37 +2114,2588 @@ parameters:
 			count: 3
 			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
 
+		-
+			message: "#^Iterating over an object of an unknown class Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\type\\.$#"
+			count: 3
+			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
+
+		-
+			message: "#^Parameter \\#2 \\$array of function array_map expects array, Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\type given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
+
+		-
+			message: "#^Property Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\SpreadSheetFormatter\\:\\:\\$aggregatorsData \\(Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\type\\) does not accept array\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
+
+		-
+			message: "#^Property Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\SpreadSheetFormatter\\:\\:\\$aggregatorsData has unknown class Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\type as its type\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
+
+		-
+			message: "#^Property Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\SpreadSheetFormatter\\:\\:\\$formatterData \\(Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\type\\) does not accept array\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
+
+		-
+			message: "#^Property Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\SpreadSheetFormatter\\:\\:\\$formatterData has unknown class Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\type as its type\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
+
+		-
+			message: "#^Property Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\SpreadSheetFormatter\\:\\:\\$result \\(Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\type\\) does not accept array\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
+
+		-
+			message: "#^Property Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\SpreadSheetFormatter\\:\\:\\$result has unknown class Chill\\\\MainBundle\\\\Export\\\\Formatter\\\\type as its type\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadSheetFormatter.php
+
+		-
+			message: "#^Instanceof between string and DateTimeInterface will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php
+
+		-
+			message: "#^PHPDoc tag @var for property Chill\\\\MainBundle\\\\Export\\\\Helper\\\\ExportAddressHelper\\:\\:\\$unitNamesKeysCache contains unresolvable type\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/Helper/ExportAddressHelper.php
+
+		-
+			message: "#^PHPDoc tag @var for property Chill\\\\MainBundle\\\\Export\\\\Helper\\\\ExportAddressHelper\\:\\:\\$unitNamesKeysCache with type mixed is not subtype of native type array\\|null\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Export/Helper/ExportAddressHelper.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/ChoiceLoader/PostalCodeChoiceLoader.php
+
 		-
 			message: "#^Foreach overwrites \\$value with its value variable\\.$#"
 			count: 1
 			path: src/Bundle/ChillMainBundle/Form/ChoiceLoader/PostalCodeChoiceLoader.php
 
+		-
+			message: "#^Parameter \\#1 \\$callback of function call_user_func expects callable\\(\\)\\: mixed, null given\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Form/ChoiceLoader/PostalCodeChoiceLoader.php
+
+		-
+			message: "#^Parameter \\#1 \\$value \\(null\\) of method Chill\\\\MainBundle\\\\Form\\\\ChoiceLoader\\\\PostalCodeChoiceLoader\\:\\:loadChoiceList\\(\\) should be contravariant with parameter \\$value \\(\\(callable\\(\\)\\: mixed\\)\\|null\\) of method Symfony\\\\Component\\\\Form\\\\ChoiceList\\\\Loader\\\\ChoiceLoaderInterface\\:\\:loadChoiceList\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/ChoiceLoader/PostalCodeChoiceLoader.php
+
+		-
+			message: "#^Parameter \\#2 \\$value \\(null\\) of method Chill\\\\MainBundle\\\\Form\\\\ChoiceLoader\\\\PostalCodeChoiceLoader\\:\\:loadChoicesForValues\\(\\) should be contravariant with parameter \\$value \\(\\(callable\\(\\)\\: mixed\\)\\|null\\) of method Symfony\\\\Component\\\\Form\\\\ChoiceList\\\\Loader\\\\ChoiceLoaderInterface\\:\\:loadChoicesForValues\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/ChoiceLoader/PostalCodeChoiceLoader.php
+
+		-
+			message: "#^Parameter \\#2 \\$value \\(null\\) of method Chill\\\\MainBundle\\\\Form\\\\ChoiceLoader\\\\PostalCodeChoiceLoader\\:\\:loadValuesForChoices\\(\\) should be contravariant with parameter \\$value \\(\\(callable\\(\\)\\: mixed\\)\\|null\\) of method Symfony\\\\Component\\\\Form\\\\ChoiceList\\\\Loader\\\\ChoiceLoaderInterface\\:\\:loadValuesForChoices\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/ChoiceLoader/PostalCodeChoiceLoader.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/DataMapper/AddressDataMapper.php
+
+		-
+			message: "#^Instanceof between Chill\\\\MainBundle\\\\Entity\\\\Address and Chill\\\\MainBundle\\\\Entity\\\\Address will always evaluate to true\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Form/DataMapper/AddressDataMapper.php
+
+		-
+			message: "#^Parameter \\#1 \\$address \\(Chill\\\\MainBundle\\\\Entity\\\\Address\\) of method Chill\\\\MainBundle\\\\Form\\\\DataMapper\\\\AddressDataMapper\\:\\:mapDataToForms\\(\\) should be contravariant with parameter \\$viewData \\(mixed\\) of method Symfony\\\\Component\\\\Form\\\\DataMapperInterface\\:\\:mapDataToForms\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/DataMapper/AddressDataMapper.php
+
+		-
+			message: "#^Parameter \\#1 \\$forms \\(Iterator\\) of method Chill\\\\MainBundle\\\\Form\\\\DataMapper\\\\AddressDataMapper\\:\\:mapFormsToData\\(\\) should be contravariant with parameter \\$forms \\(iterable\\<Symfony\\\\Component\\\\Form\\\\FormInterface\\>&Traversable\\) of method Symfony\\\\Component\\\\Form\\\\DataMapperInterface\\:\\:mapFormsToData\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/DataMapper/AddressDataMapper.php
+
+		-
+			message: "#^Parameter \\#2 \\$address \\(Chill\\\\MainBundle\\\\Entity\\\\Address\\) of method Chill\\\\MainBundle\\\\Form\\\\DataMapper\\\\AddressDataMapper\\:\\:mapFormsToData\\(\\) should be contravariant with parameter \\$viewData \\(mixed\\) of method Symfony\\\\Component\\\\Form\\\\DataMapperInterface\\:\\:mapFormsToData\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/DataMapper/AddressDataMapper.php
+
+		-
+			message: "#^Parameter \\#2 \\$forms \\(Iterator\\) of method Chill\\\\MainBundle\\\\Form\\\\DataMapper\\\\AddressDataMapper\\:\\:mapDataToForms\\(\\) should be contravariant with parameter \\$forms \\(iterable\\<Symfony\\\\Component\\\\Form\\\\FormInterface\\>&Traversable\\) of method Symfony\\\\Component\\\\Form\\\\DataMapperInterface\\:\\:mapDataToForms\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/DataMapper/AddressDataMapper.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between null and Chill\\\\MainBundle\\\\Entity\\\\Address will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/DataMapper/AddressDataMapper.php
+
+		-
+			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Entity\\\\Embeddable\\\\PrivateCommentEmbeddable\\:\\:getCommentForUser\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/DataMapper/PrivateCommentDataMapper.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, int given\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Form/DataTransformer/IdToEntityDataTransformer.php
+
+		-
+			message: "#^Parameter \\#1 \\$value \\(string\\) of method Chill\\\\MainBundle\\\\Form\\\\DataTransformer\\\\IdToEntityDataTransformer\\:\\:reverseTransform\\(\\) should be contravariant with parameter \\$value \\(mixed\\) of method Symfony\\\\Component\\\\Form\\\\DataTransformerInterface\\:\\:reverseTransform\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/DataTransformer/IdToEntityDataTransformer.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between null and string will always evaluate to false\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Form/DataTransformer/IdToEntityDataTransformer.php
+
+		-
+			message: "#^PHPDoc tag @param for parameter \\$resolver with type Chill\\\\MainBundle\\\\Form\\\\OptionsResolverInterface is not subtype of native type Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolver\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/LocationFormType.php
+
+		-
+			message: "#^Parameter \\$resolver of method Chill\\\\MainBundle\\\\Form\\\\LocationFormType\\:\\:configureOptions\\(\\) has invalid type Chill\\\\MainBundle\\\\Form\\\\OptionsResolverInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/LocationFormType.php
+
+		-
+			message: "#^PHPDoc tag @param for parameter \\$resolver with type Chill\\\\MainBundle\\\\Form\\\\OptionsResolverInterface is not subtype of native type Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolver\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/PermissionsGroupType.php
+
+		-
+			message: "#^Parameter \\$resolver of method Chill\\\\MainBundle\\\\Form\\\\PermissionsGroupType\\:\\:configureOptions\\(\\) has invalid type Chill\\\\MainBundle\\\\Form\\\\OptionsResolverInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/PermissionsGroupType.php
+
+		-
+			message: "#^PHPDoc tag @param for parameter \\$resolver with type Chill\\\\MainBundle\\\\Form\\\\OptionsResolverInterface is not subtype of native type Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolver\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/ScopeType.php
+
+		-
+			message: "#^Parameter \\$resolver of method Chill\\\\MainBundle\\\\Form\\\\ScopeType\\:\\:configureOptions\\(\\) has invalid type Chill\\\\MainBundle\\\\Form\\\\OptionsResolverInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/ScopeType.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, mixed given\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Form/Type/AddressType.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Form/Type/AddressType.php
+
+		-
+			message: "#^Property Chill\\\\MainBundle\\\\Form\\\\Type\\\\ChillPhoneNumberType\\:\\:\\$phoneNumberUtil is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/Type/ChillPhoneNumberType.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, mixed given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/Type/ChillTextareaType.php
+
+		-
+			message: "#^Call to an undefined method Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\:\\:getId\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/Type/CommentType.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 3
+			path: src/Bundle/ChillMainBundle/Form/Type/DataTransformer/DateIntervalTransformer.php
+
+		-
+			message: "#^Parameter \\#1 \\$value \\(array\\<Chill\\\\MainBundle\\\\Entity\\\\User\\>\\|Chill\\\\MainBundle\\\\Entity\\\\User\\) of method Chill\\\\MainBundle\\\\Form\\\\Type\\\\DataTransformer\\\\EntityToJsonTransformer\\:\\:transform\\(\\) should be contravariant with parameter \\$value \\(mixed\\) of method Symfony\\\\Component\\\\Form\\\\DataTransformerInterface\\:\\:transform\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between null and array\\<Chill\\\\MainBundle\\\\Entity\\\\User\\>\\|Chill\\\\MainBundle\\\\Entity\\\\User will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/Type/DataTransformer/EntityToJsonTransformer.php
+
+		-
+			message: "#^Parameter \\#1 \\$array \\(array\\) of method Chill\\\\MainBundle\\\\Form\\\\Type\\\\DataTransformer\\\\MultipleObjectsToIdTransformer\\:\\:transform\\(\\) should be contravariant with parameter \\$value \\(mixed\\) of method Symfony\\\\Component\\\\Form\\\\DataTransformerInterface\\:\\:transform\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/Type/DataTransformer/MultipleObjectsToIdTransformer.php
+
+		-
+			message: "#^Parameter \\#1 \\$id \\(string\\) of method Chill\\\\MainBundle\\\\Form\\\\Type\\\\DataTransformer\\\\ObjectToIdTransformer\\:\\:reverseTransform\\(\\) should be contravariant with parameter \\$value \\(mixed\\) of method Symfony\\\\Component\\\\Form\\\\DataTransformerInterface\\:\\:reverseTransform\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ObjectToIdTransformer.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between null and string will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/Type/DataTransformer/ObjectToIdTransformer.php
+
+		-
+			message: "#^Call to function is_int\\(\\) with int will always evaluate to true\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/Type/DataTransformer/PostalCodeToIdTransformer.php
+
+		-
+			message: "#^Only booleans are allowed in a ternary operator condition, string\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/Type/PickUserLocationType.php
+
+		-
+			message: "#^Parameter \\#1 \\$em of class Chill\\\\MainBundle\\\\Form\\\\Type\\\\DataTransformer\\\\ObjectToIdTransformer constructor expects Doctrine\\\\ORM\\\\EntityManagerInterface, Doctrine\\\\Persistence\\\\ObjectManager given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/Type/Select2CountryType.php
+
+		-
+			message: "#^Property Chill\\\\MainBundle\\\\Form\\\\Type\\\\Select2CountryType\\:\\:\\$requestStack is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/Type/Select2CountryType.php
+
+		-
+			message: "#^Call to an undefined method Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolver\\:\\:replaceDefaults\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/Type/Select2EntityType.php
+
+		-
+			message: "#^Parameter \\#1 \\$em of class Chill\\\\MainBundle\\\\Form\\\\Type\\\\DataTransformer\\\\MultipleObjectsToIdTransformer constructor expects Doctrine\\\\ORM\\\\EntityManagerInterface, Doctrine\\\\Persistence\\\\ObjectManager given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/Type/Select2LanguageType.php
+
+		-
+			message: "#^Parameter \\#1 \\$translatableStrings of method Chill\\\\MainBundle\\\\Templating\\\\TranslatableStringHelper\\:\\:localize\\(\\) expects array, string given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/Type/Select2LanguageType.php
+
+		-
+			message: "#^Property Chill\\\\MainBundle\\\\Form\\\\Type\\\\Select2LanguageType\\:\\:\\$requestStack is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/Type/Select2LanguageType.php
+
+		-
+			message: "#^PHPDoc tag @param for parameter \\$resolver with type Chill\\\\MainBundle\\\\Form\\\\OptionsResolverInterface is not subtype of native type Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolver\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/UserType.php
+
+		-
+			message: "#^Parameter \\$resolver of method Chill\\\\MainBundle\\\\Form\\\\UserType\\:\\:configureOptions\\(\\) has invalid type Chill\\\\MainBundle\\\\Form\\\\OptionsResolverInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Form/UserType.php
+
+		-
+			message: "#^Property Chill\\\\MainBundle\\\\Notification\\\\Email\\\\NotificationMailer\\:\\:\\$translator is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Notification/Email/NotificationMailer.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between 0 and float will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Pagination/Paginator.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
+
+		-
+			message: "#^PHPDoc tag @param for parameter \\$phoneNumber with type string is incompatible with native type libphonenumber\\\\PhoneNumber\\|null\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
+
+		-
+			message: "#^Expression on left side of \\?\\? is not nullable\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Phonenumber/Templating.php
+
+		-
+			message: "#^Method Chill\\\\MainBundle\\\\Repository\\\\GeographicalUnitRepository\\:\\:findBy\\(\\) should return Chill\\\\MainBundle\\\\Entity\\\\GeographicalUnit\\|null but returns array\\<int, object\\>\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Repository/GeographicalUnitRepository.php
+
+		-
+			message: "#^Return type \\(Chill\\\\MainBundle\\\\Entity\\\\GeographicalUnit\\|null\\) of method Chill\\\\MainBundle\\\\Repository\\\\GeographicalUnitRepository\\:\\:findBy\\(\\) should be compatible with return type \\(array\\<object\\>\\) of method Doctrine\\\\Persistence\\\\ObjectRepository\\<object\\>\\:\\:findBy\\(\\)$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Repository/GeographicalUnitRepository.php
+
 		-
 			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
 			count: 2
 			path: src/Bundle/ChillMainBundle/Repository/NotificationRepository.php
 
+		-
+			message: "#^The @implements tag of class Chill\\\\MainBundle\\\\Repository\\\\SavedExportRepository describes Doctrine\\\\Persistence\\\\ObjectRepository but the class implements\\: Chill\\\\MainBundle\\\\Repository\\\\SavedExportRepositoryInterface$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Repository/SavedExportRepository.php
+
+		-
+			message: "#^Interface Chill\\\\MainBundle\\\\Repository\\\\SavedExportRepositoryInterface has @implements tag, but can not implement any interface, must extend from it\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Repository/SavedExportRepositoryInterface.php
+
+		-
+			message: "#^Property Chill\\\\MainBundle\\\\Routing\\\\MenuComposer\\:\\:\\$routeCollection is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Routing/MenuComposer.php
+
+		-
+			message: "#^Property Chill\\\\MainBundle\\\\Search\\\\SearchApiNoQueryException\\:\\:\\$parameters is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Search/SearchApiNoQueryException.php
+
+		-
+			message: "#^Property Chill\\\\MainBundle\\\\Search\\\\SearchApiNoQueryException\\:\\:\\$pattern is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Search/SearchApiNoQueryException.php
+
+		-
+			message: "#^Property Chill\\\\MainBundle\\\\Search\\\\SearchApiNoQueryException\\:\\:\\$types is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Search/SearchApiNoQueryException.php
+
+		-
+			message: "#^Only booleans are allowed in a ternary operator condition, int\\<0, max\\> given\\.$#"
+			count: 4
+			path: src/Bundle/ChillMainBundle/Search/SearchApiQuery.php
+
+		-
+			message: "#^Else branch is unreachable because previous condition is always true\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Search/SearchProvider.php
+
+		-
+			message: "#^If condition is always true\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Search/SearchProvider.php
+
+		-
+			message: "#^Parameter \\#2 \\$subject of function preg_match_all expects string, Chill\\\\MainBundle\\\\Search\\\\type given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Search/SearchProvider.php
+
+		-
+			message: "#^Parameter \\$subject of method Chill\\\\MainBundle\\\\Search\\\\SearchProvider\\:\\:extractDomain\\(\\) has invalid type Chill\\\\MainBundle\\\\Search\\\\type\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Search/SearchProvider.php
+
+		-
+			message: "#^Strict comparison using \\!\\=\\= between null and string will always evaluate to true\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Search/SearchProvider.php
+
+		-
+			message: "#^Call to an undefined method Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\:\\:getGroupCenters\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
+
+		-
+			message: """
+				#^Call to deprecated method getUsername\\(\\) of class Chill\\\\MainBundle\\\\Entity\\\\User\\:
+				since Symfony 5\\.3, use getUserIdentifier\\(\\) instead$#
+			"""
+			count: 2
+			path: src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
+
+		-
+			message: "#^Empty array passed to foreach\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
+
 		-
 			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:\\:userHasAccessForCenter\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface given\\.$#"
 			count: 1
 			path: src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
 
+		-
+			message: "#^Parameter \\#2 \\$subject \\(Chill\\\\MainBundle\\\\Entity\\\\Workflow\\\\EntityWorkflow\\) of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\EntityWorkflowVoter\\:\\:voteOnAttribute\\(\\) should be contravariant with parameter \\$subject \\(mixed\\) of method Symfony\\\\Component\\\\Security\\\\Core\\\\Authorization\\\\Voter\\\\Voter\\:\\:voteOnAttribute\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Security/Authorization/EntityWorkflowVoter.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEvent.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Security/PasswordRecover/TokenManager.php
+
+		-
+			message: """
+				#^Class Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcher implements deprecated interface Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcherInterface\\:
+				Use CenterResolverManager and its interface CenterResolverManagerInterface$#
+			"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverDispatcher.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between null and array\\<Chill\\\\MainBundle\\\\Entity\\\\Center\\>\\|Chill\\\\MainBundle\\\\Entity\\\\Center will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverManager.php
+
+		-
+			message: "#^Unreachable statement \\- code above always terminates\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverManager.php
+
+		-
+			message: "#^Instanceof between Chill\\\\MainBundle\\\\Entity\\\\HasCenterInterface and Chill\\\\MainBundle\\\\Entity\\\\HasCenterInterface will always evaluate to true\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Security/Resolver/DefaultCenterResolver.php
+
+		-
+			message: "#^Parameter \\#1 \\$entity \\(Chill\\\\MainBundle\\\\Entity\\\\HasCenterInterface\\) of method Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\DefaultCenterResolver\\:\\:resolveCenter\\(\\) should be contravariant with parameter \\$entity \\(object\\) of method Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverInterface\\:\\:resolveCenter\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Security/Resolver/DefaultCenterResolver.php
+
+		-
+			message: "#^Unreachable statement \\- code above always terminates\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Security/Resolver/DefaultCenterResolver.php
+
+		-
+			message: "#^Parameter \\#1 \\$entity \\(Chill\\\\MainBundle\\\\Entity\\\\HasScopeInterface\\|Chill\\\\MainBundle\\\\Entity\\\\HasScopesInterface\\) of method Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\DefaultScopeResolver\\:\\:resolveScope\\(\\) should be contravariant with parameter \\$entity \\(mixed\\) of method Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\ScopeResolverInterface\\:\\:resolveScope\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Security/Resolver/DefaultScopeResolver.php
+
+		-
+			message: "#^Unreachable statement \\- code above always terminates\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Security/Resolver/DefaultScopeResolver.php
+
+		-
+			message: "#^Method Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\ResolverTwigExtension\\:\\:resolveCenter\\(\\) has invalid return type Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\Center\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Security/Resolver/ResolverTwigExtension.php
+
+		-
+			message: "#^Method Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\ResolverTwigExtension\\:\\:resolveCenter\\(\\) should return array\\<Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\Center\\>\\|Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\Center\\|null but returns array\\<Chill\\\\MainBundle\\\\Entity\\\\Center\\>\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Security/Resolver/ResolverTwigExtension.php
+
+		-
+			message: "#^Method Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\ScopeResolverDispatcher\\:\\:resolveScope\\(\\) invoked with 0 parameters, 1\\-2 required\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Security/Resolver/ResolverTwigExtension.php
+
+		-
+			message: "#^Method Chill\\\\MainBundle\\\\Security\\\\RoleProvider\\:\\:getRoleTitle\\(\\) should return string but returns null\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Security/RoleProvider.php
+
+		-
+			message: "#^Call to method Chill\\\\MainBundle\\\\Entity\\\\Address\\:\\:getPostcode\\(\\) with incorrect case\\: getPostCode$#"
+			count: 6
+			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
+
+		-
+			message: "#^Constant Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\AddressNormalizer\\:\\:NULL_POSTCODE_COUNTRY is unused\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
+
+		-
+			message: "#^Constant Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\AddressNormalizer\\:\\:NULL_VALUE is unused\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
+
+		-
+			message: "#^Instanceof between Chill\\\\MainBundle\\\\Entity\\\\Address and Chill\\\\MainBundle\\\\Entity\\\\Address will always evaluate to true\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
+
+		-
+			message: "#^Parameter \\#1 \\$address \\(Chill\\\\MainBundle\\\\Entity\\\\Address\\) of method Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\AddressNormalizer\\:\\:normalize\\(\\) should be contravariant with parameter \\$object \\(mixed\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:normalize\\(\\)$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
+
+		-
+			message: "#^Unreachable statement \\- code above always terminates\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/AddressNormalizer.php
+
+		-
+			message: "#^Parameter \\#1 \\$collection \\(Chill\\\\MainBundle\\\\Serializer\\\\Model\\\\Collection\\) of method Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\CollectionNormalizer\\:\\:normalize\\(\\) should be contravariant with parameter \\$object \\(mixed\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:normalize\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/CollectionNormalizer.php
+
+		-
+			message: "#^Parameter \\#1 \\$object \\(Chill\\\\MainBundle\\\\Entity\\\\Embeddable\\\\CommentEmbeddable\\) of method Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\CommentEmbeddableDocGenNormalizer\\:\\:normalize\\(\\) should be contravariant with parameter \\$object \\(mixed\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:normalize\\(\\)$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/CommentEmbeddableDocGenNormalizer.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between null and Chill\\\\MainBundle\\\\Entity\\\\Embeddable\\\\CommentEmbeddable will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/CommentEmbeddableDocGenNormalizer.php
+
+		-
+			message: "#^Instanceof between Doctrine\\\\ORM\\\\Mapping\\\\ClassMetadata\\<object\\> and Doctrine\\\\ORM\\\\Mapping\\\\ClassMetadata will always evaluate to true\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/DoctrineExistingEntityNormalizer.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, Symfony\\\\Component\\\\Serializer\\\\Mapping\\\\ClassDiscriminatorMapping\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/DoctrineExistingEntityNormalizer.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between false and true will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/DoctrineExistingEntityNormalizer.php
+
+		-
+			message: "#^Parameter \\#1 \\$object \\(Chill\\\\MainBundle\\\\Entity\\\\Workflow\\\\EntityWorkflow\\) of method Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\EntityWorkflowNormalizer\\:\\:normalize\\(\\) should be contravariant with parameter \\$object \\(mixed\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:normalize\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowNormalizer.php
+
+		-
+			message: "#^Parameter \\#1 \\$object \\(Chill\\\\MainBundle\\\\Entity\\\\Workflow\\\\EntityWorkflowStep\\) of method Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\EntityWorkflowStepNormalizer\\:\\:normalize\\(\\) should be contravariant with parameter \\$object \\(mixed\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:normalize\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowStepNormalizer.php
+
+		-
+			message: "#^Parameter \\#1 \\$object \\(Chill\\\\MainBundle\\\\Entity\\\\Notification\\) of method Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\NotificationNormalizer\\:\\:normalize\\(\\) should be contravariant with parameter \\$object \\(mixed\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:normalize\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/NotificationNormalizer.php
+
+		-
+			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Entity\\\\Notification\\:\\:isReadBy\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/NotificationNormalizer.php
+
+		-
+			message: "#^Property Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\NotificationNormalizer\\:\\:\\$notificationHandlerManager is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/NotificationNormalizer.php
+
+		-
+			message: "#^Return type \\(array\\|ArrayObject\\|bool\\|float\\|int\\|string\\|void\\|null\\) of method Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\NotificationNormalizer\\:\\:normalize\\(\\) should be covariant with return type \\(array\\|ArrayObject\\|bool\\|float\\|int\\|string\\|null\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:normalize\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/NotificationNormalizer.php
+
+		-
+			message: "#^Parameter \\#1 \\$data \\(string\\|null\\) of method Chill\\\\MainBundle\\\\Serializer\\\\Normalizer\\\\PhonenumberNormalizer\\:\\:denormalize\\(\\) should be contravariant with parameter \\$data \\(mixed\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\DenormalizerInterface\\:\\:denormalize\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
+
+		-
+			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Entity\\\\Embeddable\\\\PrivateCommentEmbeddable\\:\\:setCommentForUser\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/PrivateCommentEmbeddableNormalizer.php
+
+		-
+			message: """
+				#^Call to deprecated method getUsername\\(\\) of class Chill\\\\MainBundle\\\\Entity\\\\User\\:
+				since Symfony 5\\.3, use getUserIdentifier\\(\\) instead$#
+			"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php
+
+		-
+			message: "#^Result of && is always false\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between null and Chill\\\\MainBundle\\\\Entity\\\\User will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php
+
+		-
+			message: "#^Call to function is_int\\(\\) with int will always evaluate to true\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Service/Import/AddressReferenceFromBano.php
+
+		-
+			message: "#^Call to an undefined method Symfony\\\\Component\\\\Mime\\\\RawMessage\\:\\:getSubject\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Service/Mailer/ChillMailer.php
+
+		-
+			message: "#^Call to an undefined method Symfony\\\\Component\\\\Mime\\\\RawMessage\\:\\:getTo\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Service/Mailer/ChillMailer.php
+
+		-
+			message: "#^Method Chill\\\\MainBundle\\\\Templating\\\\CSVCellTwig\\:\\:getName\\(\\) has invalid return type Chill\\\\MainBundle\\\\Templating\\\\The\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Templating/CSVCellTwig.php
+
+		-
+			message: "#^Method Chill\\\\MainBundle\\\\Templating\\\\CSVCellTwig\\:\\:getName\\(\\) should return Chill\\\\MainBundle\\\\Templating\\\\The but returns string\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Templating/CSVCellTwig.php
+
+		-
+			message: "#^Instanceof between string and DateTimeInterface will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Templating/ChillTwigHelper.php
+
 		-
 			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
 			count: 1
 			path: src/Bundle/ChillMainBundle/Templating/ChillTwigRoutingHelper.php
 
+		-
+			message: "#^Call to an undefined method Symfony\\\\Contracts\\\\Translation\\\\TranslatorInterface\\:\\:getFallbackLocales\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Templating/TranslatableStringHelper.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between array\\{\\} and non\\-empty\\-array\\<int, \\(int\\|string\\)\\> will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Templating/TranslatableStringHelper.php
+
+		-
+			message: "#^Method Chill\\\\MainBundle\\\\Templating\\\\TranslatableStringTwig\\:\\:getName\\(\\) has invalid return type Chill\\\\MainBundle\\\\Templating\\\\The\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Templating/TranslatableStringTwig.php
+
+		-
+			message: "#^Method Chill\\\\MainBundle\\\\Templating\\\\TranslatableStringTwig\\:\\:getName\\(\\) should return Chill\\\\MainBundle\\\\Templating\\\\The but returns string\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Templating/TranslatableStringTwig.php
+
+		-
+			message: "#^Call to method render\\(\\) on an unknown class Chill\\\\MainBundle\\\\Templating\\\\Widget\\\\Widget\\\\WidgetInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Templating/Widget/WidgetRenderingTwig.php
+
+		-
+			message: "#^PHPDoc tag @var for variable \\$widget contains unknown class Chill\\\\MainBundle\\\\Templating\\\\Widget\\\\Widget\\\\WidgetInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Templating/Widget/WidgetRenderingTwig.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php
+
+		-
+			message: "#^Method Chill\\\\MainBundle\\\\Timeline\\\\TimelineBuilder\\:\\:getTemplateData\\(\\) should return array but return statement is missing\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php
+
+		-
+			message: "#^Parameter \\#1 \\$context of method Chill\\\\MainBundle\\\\Timeline\\\\TimelineBuilder\\:\\:buildUnionQuery\\(\\) expects string, Chill\\\\MainBundle\\\\Timeline\\\\unknown given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php
+
+		-
+			message: "#^Parameter \\#2 \\$context of method Chill\\\\MainBundle\\\\Timeline\\\\TimelineProviderInterface\\:\\:getEntityTemplate\\(\\) expects Chill\\\\MainBundle\\\\Timeline\\\\type, string given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php
+
+		-
+			message: "#^Parameter \\$context of method Chill\\\\MainBundle\\\\Timeline\\\\TimelineBuilder\\:\\:countItems\\(\\) has invalid type Chill\\\\MainBundle\\\\Timeline\\\\unknown\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php
+
+		-
+			message: "#^Unreachable statement \\- code above always terminates\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php
+
+		-
+			message: "#^Parameter \\$context of method Chill\\\\MainBundle\\\\Timeline\\\\TimelineProviderInterface\\:\\:getEntityTemplate\\(\\) has invalid type Chill\\\\MainBundle\\\\Timeline\\\\type\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Timeline/TimelineProviderInterface.php
+
+		-
+			message: "#^Parameter \\$entity of method Chill\\\\MainBundle\\\\Timeline\\\\TimelineProviderInterface\\:\\:getEntityTemplate\\(\\) has invalid type Chill\\\\MainBundle\\\\Timeline\\\\type\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Timeline/TimelineProviderInterface.php
+
+		-
+			message: "#^Property Chill\\\\MainBundle\\\\Util\\\\DateRangeCovering\\:\\:\\$intervals is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Util/DateRangeCovering.php
+
+		-
+			message: "#^Access to an undefined property Symfony\\\\Component\\\\Validator\\\\Constraint\\:\\:\\$messageDuplicateEmail\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Validation/Validator/UserUniqueEmailAndUsername.php
+
+		-
+			message: "#^Access to an undefined property Symfony\\\\Component\\\\Validator\\\\Constraint\\:\\:\\$messageDuplicateUsername\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Validation/Validator/UserUniqueEmailAndUsername.php
+
+		-
+			message: """
+				#^Call to deprecated method getUsername\\(\\) of class Chill\\\\MainBundle\\\\Entity\\\\User\\:
+				since Symfony 5\\.3, use getUserIdentifier\\(\\) instead$#
+			"""
+			count: 3
+			path: src/Bundle/ChillMainBundle/Validation/Validator/UserUniqueEmailAndUsername.php
+
+		-
+			message: "#^Parameter \\#1 \\$phoneNumber of method Chill\\\\MainBundle\\\\Phonenumber\\\\PhoneNumberHelperInterface\\:\\:format\\(\\) expects libphonenumber\\\\PhoneNumber\\|null, string given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Validation/Validator/ValidPhonenumber.php
+
+		-
+			message: "#^Parameter \\#1 \\$value \\(string\\) of method Chill\\\\MainBundle\\\\Validation\\\\Validator\\\\ValidPhonenumber\\:\\:validate\\(\\) should be contravariant with parameter \\$value \\(mixed\\) of method Symfony\\\\Component\\\\Validator\\\\ConstraintValidatorInterface\\:\\:validate\\(\\)$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Validation/Validator/ValidPhonenumber.php
+
+		-
+			message: "#^Parameter \\#2 \\$constraint \\(Chill\\\\MainBundle\\\\Validation\\\\Constraint\\\\PhonenumberConstraint\\) of method Chill\\\\MainBundle\\\\Validation\\\\Validator\\\\ValidPhonenumber\\:\\:validate\\(\\) should be contravariant with parameter \\$constraint \\(Symfony\\\\Component\\\\Validator\\\\Constraint\\) of method Symfony\\\\Component\\\\Validator\\\\ConstraintValidatorInterface\\:\\:validate\\(\\)$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Validation/Validator/ValidPhonenumber.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between null and string will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Validation/Validator/ValidPhonenumber.php
+
+		-
+			message: """
+				#^Call to deprecated method getUsername\\(\\) of class Chill\\\\MainBundle\\\\Entity\\\\User\\:
+				since Symfony 5\\.3, use getUserIdentifier\\(\\) instead$#
+			"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Validator/Constraints/Entity/UserCircleConsistencyValidator.php
+
+		-
+			message: "#^Parameter \\#1 \\$value \\(object\\) of method Chill\\\\MainBundle\\\\Validator\\\\Constraints\\\\Entity\\\\UserCircleConsistencyValidator\\:\\:validate\\(\\) should be contravariant with parameter \\$value \\(mixed\\) of method Symfony\\\\Component\\\\Validator\\\\ConstraintValidatorInterface\\:\\:validate\\(\\)$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Validator/Constraints/Entity/UserCircleConsistencyValidator.php
+
+		-
+			message: "#^Parameter \\#2 \\$constraint \\(Chill\\\\MainBundle\\\\Validator\\\\Constraints\\\\Entity\\\\UserCircleConsistency\\) of method Chill\\\\MainBundle\\\\Validator\\\\Constraints\\\\Entity\\\\UserCircleConsistencyValidator\\:\\:validate\\(\\) should be contravariant with parameter \\$constraint \\(Symfony\\\\Component\\\\Validator\\\\Constraint\\) of method Symfony\\\\Component\\\\Validator\\\\ConstraintValidatorInterface\\:\\:validate\\(\\)$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Validator/Constraints/Entity/UserCircleConsistencyValidator.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between null and Chill\\\\MainBundle\\\\Entity\\\\User will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Validator/Constraints/Entity/UserCircleConsistencyValidator.php
+
+		-
+			message: "#^Access to an undefined property Symfony\\\\Component\\\\Validator\\\\Constraint\\:\\:\\$element\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Validator/Constraints/Export/ExportElementConstraintValidator.php
+
+		-
+			message: "#^Instanceof between Chill\\\\MainBundle\\\\Entity\\\\Workflow\\\\EntityWorkflow and Chill\\\\MainBundle\\\\Entity\\\\Workflow\\\\EntityWorkflow will always evaluate to true\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Workflow/Validator/EntityWorkflowCreationValidator.php
+
+		-
+			message: "#^Parameter \\#1 \\$value \\(Chill\\\\MainBundle\\\\Entity\\\\Workflow\\\\EntityWorkflow\\) of method Chill\\\\MainBundle\\\\Workflow\\\\Validator\\\\EntityWorkflowCreationValidator\\:\\:validate\\(\\) should be contravariant with parameter \\$value \\(mixed\\) of method Symfony\\\\Component\\\\Validator\\\\ConstraintValidatorInterface\\:\\:validate\\(\\)$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Workflow/Validator/EntityWorkflowCreationValidator.php
+
+		-
+			message: "#^Instanceof between Chill\\\\MainBundle\\\\Entity\\\\Workflow\\\\EntityWorkflowStep and Chill\\\\MainBundle\\\\Entity\\\\Workflow\\\\EntityWorkflowStep will always evaluate to true\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Workflow/Validator/StepDestValidValidator.php
+
+		-
+			message: "#^Parameter \\#1 \\$value \\(Chill\\\\MainBundle\\\\Entity\\\\Workflow\\\\EntityWorkflowStep\\) of method Chill\\\\MainBundle\\\\Workflow\\\\Validator\\\\StepDestValidValidator\\:\\:validate\\(\\) should be contravariant with parameter \\$value \\(mixed\\) of method Symfony\\\\Component\\\\Validator\\\\ConstraintValidatorInterface\\:\\:validate\\(\\)$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Workflow/Validator/StepDestValidValidator.php
+
+		-
+			message: "#^PHPDoc tag @param for parameter \\$postSql with type Chill\\\\PersonBundle\\\\Actions\\\\type is incompatible with native type string\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Actions/ActionEvent.php
+
+		-
+			message: "#^Parameter \\$postSql of method Chill\\\\PersonBundle\\\\Actions\\\\ActionEvent\\:\\:addPostSql\\(\\) has invalid type Chill\\\\PersonBundle\\\\Actions\\\\type\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Actions/ActionEvent.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
+
+		-
+			message: "#^Method Chill\\\\PersonBundle\\\\Actions\\\\Remove\\\\PersonMove\\:\\:getSQL\\(\\) has invalid return type Chill\\\\PersonBundle\\\\Actions\\\\Remove\\\\type\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
+
+		-
+			message: "#^Method Chill\\\\PersonBundle\\\\Actions\\\\Remove\\\\PersonMove\\:\\:getSQL\\(\\) should return Chill\\\\PersonBundle\\\\Actions\\\\Remove\\\\type but returns array\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
+
+		-
+			message: "#^Method Chill\\\\PersonBundle\\\\CRUD\\\\Controller\\\\EntityPersonCRUDController\\:\\:filterQueryEntitiesByPerson\\(\\) has invalid return type Chill\\\\PersonBundle\\\\CRUD\\\\Controller\\\\QueryBuilder\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/CRUD/Controller/EntityPersonCRUDController.php
+
+		-
+			message: "#^PHPDoc tag @param for parameter \\$qb with type Chill\\\\PersonBundle\\\\CRUD\\\\Controller\\\\QueryBuilder is not subtype of native type Doctrine\\\\ORM\\\\QueryBuilder\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/CRUD/Controller/EntityPersonCRUDController.php
+
+		-
+			message: "#^PHPDoc tag @return with type Chill\\\\PersonBundle\\\\CRUD\\\\Controller\\\\QueryBuilder is not subtype of native type Doctrine\\\\ORM\\\\QueryBuilder\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/CRUD/Controller/EntityPersonCRUDController.php
+
+		-
+			message: "#^PHPDoc tag @throws with type Chill\\\\PersonBundle\\\\CRUD\\\\Controller\\\\Symfony\\\\Component\\\\HttpKernel\\\\Exception\\\\NotFoundHttpException is not subtype of Throwable$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/CRUD/Controller/EntityPersonCRUDController.php
+
+		-
+			message: "#^Parameter \\$action of method Chill\\\\PersonBundle\\\\CRUD\\\\Controller\\\\EntityPersonCRUDController\\:\\:createEntity\\(\\) has invalid type Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\string\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/CRUD/Controller/EntityPersonCRUDController.php
+
+		-
+			message: "#^Parameter \\$qb of method Chill\\\\PersonBundle\\\\CRUD\\\\Controller\\\\EntityPersonCRUDController\\:\\:filterQueryEntitiesByPerson\\(\\) has invalid type Chill\\\\PersonBundle\\\\CRUD\\\\Controller\\\\QueryBuilder\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/CRUD/Controller/EntityPersonCRUDController.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/CRUD/Controller/OneToOneEntityPersonCRUDController.php
+
+		-
+			message: "#^Call to an undefined method Symfony\\\\Component\\\\DependencyInjection\\\\Extension\\\\ExtensionInterface\\:\\:addWidgetFactory\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/ChillPersonBundle.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Command/ChillPersonMoveCommand.php
+
+		-
+			message: "#^Iterating over an object of an unknown class Chill\\\\PersonBundle\\\\Actions\\\\Remove\\\\type\\.$#"
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Command/ChillPersonMoveCommand.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Command/ChillPersonMoveCommand.php
+
+		-
+			message: "#^Variable \\$accompanyingPeriod in PHPDoc tag @var does not match assigned variable \\$action\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseApiController.php
+
+		-
+			message: "#^Strict comparison using \\!\\=\\= between null and Doctrine\\\\Common\\\\Collections\\\\Collection will always evaluate to true\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between null and Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseController.php
+
+		-
+			message: "#^Call to an undefined method Symfony\\\\Component\\\\Serializer\\\\SerializerInterface\\:\\:normalize\\(\\)\\.$#"
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between null and Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\AccompanyingPeriodWork will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingCourseWorkController.php
+
+		-
+			message: "#^Call to an undefined method Psr\\\\Container\\\\ContainerInterface\\:\\:getParameter\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
+
+		-
+			message: """
+				#^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
+				since Symfony 5\\.4, use method or constructor injection in your controller instead$#
+			"""
+			count: 13
+			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
+
+		-
+			message: """
+				#^Call to deprecated method getCurrentAccompanyingPeriod\\(\\) of class Chill\\\\PersonBundle\\\\Entity\\\\Person\\:
+				since 1\\.1 use `getOpenedAccompanyingPeriod instead$#
+			"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
+
+		-
+			message: "#^Method Symfony\\\\Component\\\\Form\\\\FormInterface\\:\\:isValid\\(\\) invoked with 1 parameter, 0 required\\.$#"
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between null and Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod will always evaluate to false\\.$#"
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
+
+		-
+			message: "#^Parameter \\#1 \\$user of method Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkEvaluationRepository\\:\\:countNearMaxDateByUser\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationApiController.php
+
+		-
+			message: "#^Parameter \\#1 \\$user of method Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkEvaluationRepository\\:\\:findNearMaxDateByUser\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodWorkEvaluationApiController.php
+
+		-
+			message: "#^Parameter \\#1 \\$object of static method DateTimeImmutable\\:\\:createFromMutable\\(\\) expects DateTime, DateTimeInterface given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/HouseholdApiController.php
+
+		-
+			message: "#^Call to an undefined method Symfony\\\\Component\\\\HttpFoundation\\\\Session\\\\SessionInterface\\:\\:getFlashBag\\(\\)\\.$#"
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionController.php
+
+		-
+			message: "#^Parameter \\#3 \\$query \\(Doctrine\\\\ORM\\\\QueryBuilder\\) of method Chill\\\\PersonBundle\\\\Controller\\\\HouseholdCompositionTypeApiController\\:\\:customizeQuery\\(\\) should be contravariant with parameter \\$query \\(mixed\\) of method Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\AbstractCRUDController\\:\\:customizeQuery\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/HouseholdCompositionTypeApiController.php
+
+		-
+			message: "#^Call to an undefined method Doctrine\\\\Common\\\\Collections\\\\Collection&iterable\\<Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\HouseholdMember\\>\\:\\:initialize\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/HouseholdController.php
+
+		-
+			message: "#^Call to an undefined method Symfony\\\\Component\\\\Serializer\\\\SerializerInterface\\:\\:normalize\\(\\)\\.$#"
+			count: 3
+			path: src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php
+
+		-
+			message: "#^Parameter \\#2 \\$previous of class Symfony\\\\Component\\\\HttpKernel\\\\Exception\\\\BadRequestHttpException constructor expects Throwable\\|null, int given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php
+
+		-
+			message: "#^Parameter \\#3 \\$code of class Symfony\\\\Component\\\\HttpKernel\\\\Exception\\\\BadRequestHttpException constructor expects int, Symfony\\\\Component\\\\Serializer\\\\Exception\\\\InvalidArgumentException\\|Symfony\\\\Component\\\\Serializer\\\\Exception\\\\UnexpectedValueException given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/HouseholdMemberController.php
+
+		-
+			message: "#^Elseif condition is always true\\.$#"
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php
+
+		-
+			message: "#^Method Chill\\\\PersonBundle\\\\Controller\\\\PersonAddressController\\:\\:createCreateForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php
+
+		-
+			message: "#^Method Chill\\\\PersonBundle\\\\Controller\\\\PersonAddressController\\:\\:createEditForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/PersonAddressController.php
+
+		-
+			message: "#^Call to an undefined method Doctrine\\\\ORM\\\\EntityRepository\\<Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomFieldsDefaultGroup\\>\\:\\:findOneByEntity\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/PersonController.php
+
+		-
+			message: "#^Call to an undefined method Symfony\\\\Component\\\\Form\\\\FormInterface\\:\\:isClicked\\(\\)\\.$#"
+			count: 3
+			path: src/Bundle/ChillPersonBundle/Controller/PersonController.php
+
+		-
+			message: """
+				#^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
+				since Symfony 5\\.4, use method or constructor injection in your controller instead$#
+			"""
+			count: 4
+			path: src/Bundle/ChillPersonBundle/Controller/PersonController.php
+
+		-
+			message: "#^Method Chill\\\\PersonBundle\\\\Controller\\\\PersonController\\:\\:_validatePersonAndAccompanyingPeriod\\(\\) is unused\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/PersonController.php
+
+		-
+			message: "#^Parameter \\#1 \\$form of method Chill\\\\PersonBundle\\\\Controller\\\\PersonController\\:\\:isLastPostDataChanges\\(\\) expects Symfony\\\\Component\\\\Form\\\\Form, Symfony\\\\Component\\\\Form\\\\FormInterface given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/PersonController.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between null and Chill\\\\PersonBundle\\\\Entity\\\\Person will always evaluate to false\\.$#"
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Controller/PersonController.php
+
+		-
+			message: "#^Access to an undefined property Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:\\$counters\\.$#"
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
+
+		-
+			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\ObjectRepository\\<Chill\\\\TaskBundle\\\\Entity\\\\SingleTask\\>\\:\\:countByParameters\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
+
+		-
+			message: "#^Iterating over an object of an unknown class Chill\\\\PersonBundle\\\\Actions\\\\Remove\\\\type\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
+
+		-
+			message: "#^Method Chill\\\\PersonBundle\\\\Controller\\\\PersonDuplicateController\\:\\:_getCounters\\(\\) never returns null so it can be removed from the return type\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/PersonDuplicateController.php
+
+		-
+			message: "#^Call to function is_int\\(\\) with int will always evaluate to true\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Controller\\\\ReassignAccompanyingPeriodController\\:\\:\\$userRender is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/ReassignAccompanyingPeriodController.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Controller\\\\SocialWorkGoalApiController\\:\\:\\$paginator is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/SocialWorkGoalApiController.php
+
+		-
+			message: "#^Parameter \\#1 \\$context of method Chill\\\\MainBundle\\\\Timeline\\\\TimelineBuilder\\:\\:countItems\\(\\) expects Chill\\\\MainBundle\\\\Timeline\\\\unknown, string given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Controller/TimelinePersonController.php
+
+		-
+			message: "#^Unreachable statement \\- code above always terminates\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadAccompanyingPeriodNotifications.php
+
+		-
+			message: "#^Call to an undefined method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\NodeDefinition\\:\\:canBeDisabled\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php
+
+		-
+			message: "#^Call to an undefined method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\NodeDefinition\\:\\:values\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/DependencyInjection/Configuration.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Doctrine\\\\DQL\\\\AddressPart\\:\\:\\$part is unused\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart.php
+
+		-
+			message: "#^Result of method Doctrine\\\\ORM\\\\Query\\\\Parser\\:\\:match\\(\\) \\(void\\) is used\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Doctrine/DQL/AddressPart.php
+
+		-
+			message: "#^Call to an undefined method Doctrine\\\\Common\\\\Collections\\\\Collection&iterable\\<Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\AccompanyingPeriodLocationHistory\\>\\:\\:matching\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
+
+		-
+			message: "#^Call to an undefined method Doctrine\\\\Common\\\\Collections\\\\Collection\\:\\:matching\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
+
+		-
+			message: """
+				#^Fetching deprecated class constant DESC of class Doctrine\\\\Common\\\\Collections\\\\Criteria\\:
+				use Order\\:\\:Descending instead$#
+			"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
+
+		-
+			message: "#^Method Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\:\\:getRecursiveSocialActions\\(\\) has invalid return type Chill\\\\PersonBundle\\\\Entity\\\\SocialAction\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
+
+		-
+			message: "#^Method Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\:\\:getRecursiveSocialIssues\\(\\) has invalid return type Chill\\\\PersonBundle\\\\Entity\\\\SocialIssues\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
+
+		-
+			message: "#^Negated boolean expression is always true\\.$#"
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
+
+		-
+			message: "#^PHPDoc tag @return with type array\\<Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\AccompanyingPeriodWork\\> is incompatible with native type Doctrine\\\\Common\\\\Collections\\\\Collection\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
+
+		-
+			message: "#^PHPDoc tag @return with type iterable is not subtype of native type Doctrine\\\\Common\\\\Collections\\\\Collection\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
+
+		-
+			message: "#^Parameter \\#1 \\$period of method Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\AccompanyingPeriodLocationHistory\\:\\:setPeriod\\(\\) expects Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod, null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\:\\:\\$updatedAt is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\:\\:\\$updatedBy is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
+
+		-
+			message: "#^Return type \\(Doctrine\\\\Common\\\\Collections\\\\Collection\\) of method Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\:\\:getScopes\\(\\) should be covariant with return type \\(iterable\\<Chill\\\\MainBundle\\\\Entity\\\\Scope\\>\\) of method Chill\\\\MainBundle\\\\Entity\\\\HasScopesInterface\\:\\:getScopes\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between null and Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\AccompanyingPeriodStepHistory will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
+
+		-
+			message: """
+				#^Fetching deprecated class constant DESC of class Doctrine\\\\Common\\\\Collections\\\\Criteria\\:
+				use Order\\:\\:Descending instead$#
+			"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\AccompanyingPeriodWork\\:\\:\\$createdAt \\(DateTimeImmutable\\|null\\) does not accept DateTimeInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\AccompanyingPeriodWork\\:\\:\\$endDate \\(DateTimeImmutable\\|null\\) does not accept DateTimeInterface\\|null\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
+
+		-
+			message: """
+				#^Fetching deprecated class constant DESC of class Doctrine\\\\Common\\\\Collections\\\\Criteria\\:
+				use Order\\:\\:Descending instead$#
+			"""
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
+
+		-
+			message: "#^PHPDoc tag @param for parameter \\$createdAt with type DateTimeImmutable\\|null is not subtype of native type DateTimeInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
+
+		-
+			message: "#^PHPDoc tag @param for parameter \\$updatedAt with type DateTimeImmutable\\|null is not subtype of native type DateTimeInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkEvaluation\\:\\:\\$createdAt \\(DateTimeImmutable\\|null\\) does not accept DateTimeInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkEvaluation\\:\\:\\$updatedAt \\(DateTimeImmutable\\|null\\) does not accept DateTimeInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWorkEvaluation.php
+
+		-
+			message: "#^Method Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriodParticipation\\:\\:checkSameStartEnd\\(\\) is unused\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriodParticipation.php
+
+		-
+			message: "#^Call to an undefined method Doctrine\\\\Common\\\\Collections\\\\Collection&iterable\\<Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\HouseholdMember\\>\\:\\:matching\\(\\)\\.$#"
+			count: 3
+			path: src/Bundle/ChillPersonBundle/Entity/Household/Household.php
+
+		-
+			message: "#^Call to an undefined method Doctrine\\\\Common\\\\Collections\\\\Collection\\:\\:matching\\(\\)\\.$#"
+			count: 4
+			path: src/Bundle/ChillPersonBundle/Entity/Household/Household.php
+
+		-
+			message: "#^Call to an undefined method Traversable\\<\\(int\\|string\\), mixed\\>\\:\\:uasort\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/Household/Household.php
+
+		-
+			message: """
+				#^Fetching deprecated class constant DESC of class Doctrine\\\\Common\\\\Collections\\\\Criteria\\:
+				use Order\\:\\:Descending instead$#
+			"""
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Entity/Household/Household.php
+
+		-
+			message: "#^PHPDoc tag @return with type array\\<Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\HouseholdMember\\> is incompatible with native type Doctrine\\\\Common\\\\Collections\\\\Collection\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/Household/Household.php
+
+		-
+			message: "#^Parameter \\#1 \\$now of method Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\Household\\:\\:getCurrentMembers\\(\\) expects DateTimeImmutable\\|null, DateTimeInterface\\|null given\\.$#"
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Entity/Household/Household.php
+
+		-
+			message: "#^Parameter \\#1 \\$now of method Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\Household\\:\\:getNonCurrentMembers\\(\\) expects DateTimeImmutable\\|null, DateTimeInterface\\|null given\\.$#"
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Entity/Household/Household.php
+
+		-
+			message: "#^Strict comparison using \\!\\=\\= between null and Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\HouseholdMember will always evaluate to true\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/Household/Household.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between null and int will always evaluate to false\\.$#"
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Entity/Household/Household.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\PersonHouseholdAddress\\:\\:\\$validFrom is never written, only read\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/Household/PersonHouseholdAddress.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\PersonHouseholdAddress\\:\\:\\$validTo is never written, only read\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/Household/PersonHouseholdAddress.php
+
+		-
+			message: "#^PHPDoc tag @param has invalid value \\(string array \\$name\\)\\: Unexpected token \"array\", expected variable at offset 49$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/MaritalStatus.php
+
+		-
+			message: "#^PHPDoc tag @return with type string is incompatible with native type array\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/MaritalStatus.php
+
+		-
+			message: "#^Access to deprecated property \\$proxyAccompanyingPeriodOpenState of class Chill\\\\PersonBundle\\\\Entity\\\\Person\\.$#"
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Entity/Person.php
+
+		-
+			message: "#^Call to an undefined method Doctrine\\\\Common\\\\Collections\\\\Collection&iterable\\<Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriodParticipation\\>\\:\\:matching\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/Person.php
+
+		-
+			message: "#^Call to an undefined method Doctrine\\\\Common\\\\Collections\\\\Collection&iterable\\<Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\HouseholdMember\\>\\:\\:matching\\(\\)\\.$#"
+			count: 3
+			path: src/Bundle/ChillPersonBundle/Entity/Person.php
+
+		-
+			message: "#^Call to an undefined method Doctrine\\\\Common\\\\Collections\\\\Collection\\:\\:matching\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/Person.php
+
+		-
+			message: """
+				#^Fetching deprecated class constant DESC of class Doctrine\\\\Common\\\\Collections\\\\Criteria\\:
+				use Order\\:\\:Descending instead$#
+			"""
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Entity/Person.php
+
+		-
+			message: "#^Negated boolean expression is always true\\.$#"
+			count: 3
+			path: src/Bundle/ChillPersonBundle/Entity/Person.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/Person.php
+
+		-
+			message: "#^Only booleans are allowed in a ternary operator condition, Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriodParticipation\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/Person.php
+
+		-
+			message: "#^PHPDoc tag @return with type array\\<Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\HouseholdMember\\> is incompatible with native type Doctrine\\\\Common\\\\Collections\\\\Collection\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/Person.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:\\$center is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/Person.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:\\$currentHouseholdAt is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/Person.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:\\$deathdate \\(DateTimeImmutable\\|null\\) does not accept DateTimeInterface\\|null\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/Person.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:\\$maritalStatusDate \\(DateTime\\|null\\) does not accept DateTimeInterface\\|null\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/Person.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:\\$periodLocatedOn is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/Person.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:\\$proxyAccompanyingPeriodOpenState is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/Person.php
+
+		-
+			message: "#^Return type \\(Chill\\\\MainBundle\\\\Entity\\\\Center\\|null\\) of method Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:getCenter\\(\\) should be covariant with return type \\(Chill\\\\MainBundle\\\\Entity\\\\Center\\) of method Chill\\\\MainBundle\\\\Entity\\\\HasCenterInterface\\:\\:getCenter\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/Person.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between true and Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriodParticipation\\|null will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/Person.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Entity\\\\SocialWork\\\\Result\\:\\:\\$desactivationDate \\(DateTime\\|null\\) does not accept DateTimeInterface\\|null\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Entity/SocialWork/Result.php
+
+		-
+			message: "#^If condition is always false\\.$#"
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php
+
+		-
+			message: "#^Negated boolean expression is always true\\.$#"
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialAction.php
+
+		-
+			message: "#^If condition is always false\\.$#"
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php
+
+		-
+			message: "#^Negated boolean expression is always true\\.$#"
+			count: 4
+			path: src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Export\\\\Aggregator\\\\AccompanyingCourseAggregators\\\\DurationAggregator\\:\\:\\$translator is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/DurationAggregator.php
+
+		-
+			message: "#^Call to method extractOtherValue\\(\\) on an unknown class Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
+
+		-
+			message: "#^Call to method getChoices\\(\\) on an unknown class Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldInterface\\.$#"
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
+
+		-
+			message: "#^Call to method isChecked\\(\\) on an unknown class Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldInterface\\.$#"
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
+
+		-
+			message: "#^Call to method isMultiple\\(\\) on an unknown class Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldInterface\\.$#"
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
+
+		-
+			message: "#^Call to method render\\(\\) on an unknown class Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Export/ListPerson.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Export\\\\Filter\\\\AccompanyingCourseFilters\\\\AdministrativeLocationFilter\\:\\:\\$translatableStringHelper is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Filter/AccompanyingCourseFilters/AdministrativeLocationFilter.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Export\\\\Filter\\\\SocialWorkFilters\\\\SocialWorkTypeFilter\\:\\:\\$socialActionRender is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Filter/SocialWorkFilters/SocialWorkTypeFilter.php
+
+		-
+			message: "#^Parameter \\#1 \\$translatableStrings of method Chill\\\\MainBundle\\\\Templating\\\\TranslatableStringHelper\\:\\:localize\\(\\) expects array, string given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Export/Helper/ListPersonHelper.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php
+
 		-
 			message: "#^Foreach overwrites \\$value with its value variable\\.$#"
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php
 
+		-
+			message: "#^Parameter \\#1 \\$callback of function call_user_func expects callable\\(\\)\\: mixed, null given\\.$#"
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php
+
+		-
+			message: "#^Parameter \\#1 \\$value \\(null\\) of method Chill\\\\PersonBundle\\\\Form\\\\ChoiceLoader\\\\PersonChoiceLoader\\:\\:loadChoiceList\\(\\) should be contravariant with parameter \\$value \\(\\(callable\\(\\)\\: mixed\\)\\|null\\) of method Symfony\\\\Component\\\\Form\\\\ChoiceList\\\\Loader\\\\ChoiceLoaderInterface\\:\\:loadChoiceList\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php
+
+		-
+			message: "#^Parameter \\#2 \\$value \\(null\\) of method Chill\\\\PersonBundle\\\\Form\\\\ChoiceLoader\\\\PersonChoiceLoader\\:\\:loadChoicesForValues\\(\\) should be contravariant with parameter \\$value \\(\\(callable\\(\\)\\: mixed\\)\\|null\\) of method Symfony\\\\Component\\\\Form\\\\ChoiceList\\\\Loader\\\\ChoiceLoaderInterface\\:\\:loadChoicesForValues\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php
+
+		-
+			message: "#^Parameter \\#2 \\$value \\(null\\) of method Chill\\\\PersonBundle\\\\Form\\\\ChoiceLoader\\\\PersonChoiceLoader\\:\\:loadValuesForChoices\\(\\) should be contravariant with parameter \\$value \\(\\(callable\\(\\)\\: mixed\\)\\|null\\) of method Symfony\\\\Component\\\\Form\\\\ChoiceList\\\\Loader\\\\ChoiceLoaderInterface\\:\\:loadValuesForChoices\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Form/DataMapper/PersonAltNameDataMapper.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Form\\\\PersonResourceType\\:\\:\\$personRender is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Form/PersonResourceType.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Form\\\\PersonResourceType\\:\\:\\$thirdPartyRender is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Form/PersonResourceType.php
+
 		-
 			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Form/PersonType.php
 
+		-
+			message: "#^PHPDoc tag @param for parameter \\$resolver with type Chill\\\\PersonBundle\\\\Form\\\\OptionsResolverInterface is not subtype of native type Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolver\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Form/PersonType.php
+
+		-
+			message: "#^Parameter \\$resolver of method Chill\\\\PersonBundle\\\\Form\\\\PersonType\\:\\:configureOptions\\(\\) has invalid type Chill\\\\PersonBundle\\\\Form\\\\OptionsResolverInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Form/PersonType.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between 'create' and 'create' will always evaluate to true\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Form/SocialWork/SocialIssueType.php
+
+		-
+			message: "#^Only booleans are allowed in a ternary operator condition, mixed given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Form/Type/PersonAltNameType.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Form/Type/PersonPhoneType.php
+
+		-
+			message: "#^Call to method Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:getFirstName\\(\\) with incorrect case\\: getFirstname$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php
+
+		-
+			message: "#^Call to method Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:getLastName\\(\\) with incorrect case\\: getLastname$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Form/Type/PickPersonType.php
+
+		-
+			message: "#^Call to an undefined method Doctrine\\\\Common\\\\Collections\\\\Collection&iterable\\<Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\HouseholdMember\\>\\:\\:matching\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Household/MembersEditor.php
+
+		-
+			message: "#^Parameter \\#3 \\$limit \\(int\\) of method Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkEvaluationRepository\\:\\:findBy\\(\\) should be contravariant with parameter \\$limit \\(int\\|null\\) of method Doctrine\\\\Persistence\\\\ObjectRepository\\<object\\>\\:\\:findBy\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationRepository.php
+
+		-
+			message: "#^Parameter \\#4 \\$offset \\(int\\) of method Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkEvaluationRepository\\:\\:findBy\\(\\) should be contravariant with parameter \\$offset \\(int\\|null\\) of method Doctrine\\\\Persistence\\\\ObjectRepository\\<object\\>\\:\\:findBy\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkEvaluationRepository.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkGoalRepository\\:\\:\\$repository is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkGoalRepository.php
+
+		-
+			message: "#^Call to an undefined method Doctrine\\\\ORM\\\\EntityRepository\\:\\:countByAccompanyingPeriod\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
+
+		-
+			message: "#^Call to an undefined method Doctrine\\\\ORM\\\\EntityRepository\\:\\:findByAccompanyingPeriod\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/AccompanyingPeriodWorkRepository.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\CommentRepository\\:\\:\\$repository is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/CommentRepository.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriod\\\\OriginRepository\\:\\:\\$repository is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriod/OriginRepository.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriodParticipationRepository\\:\\:\\$repository is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodParticipationRepository.php
+
+		-
+			message: "#^Parameter \\#3 \\$limit \\(int\\) of method Chill\\\\PersonBundle\\\\Repository\\\\Household\\\\HouseholdCompositionRepository\\:\\:findBy\\(\\) should be contravariant with parameter \\$limit \\(int\\|null\\) of method Doctrine\\\\Persistence\\\\ObjectRepository\\<object\\>\\:\\:findBy\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionRepository.php
+
+		-
+			message: "#^Parameter \\#4 \\$offset \\(int\\) of method Chill\\\\PersonBundle\\\\Repository\\\\Household\\\\HouseholdCompositionRepository\\:\\:findBy\\(\\) should be contravariant with parameter \\$offset \\(int\\|null\\) of method Doctrine\\\\Persistence\\\\ObjectRepository\\<object\\>\\:\\:findBy\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionRepository.php
+
+		-
+			message: "#^Parameter \\#3 \\$limit \\(int\\) of method Chill\\\\PersonBundle\\\\Repository\\\\Household\\\\HouseholdCompositionRepositoryInterface\\:\\:findBy\\(\\) should be contravariant with parameter \\$limit \\(int\\|null\\) of method Doctrine\\\\Persistence\\\\ObjectRepository\\<object\\>\\:\\:findBy\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionRepositoryInterface.php
+
+		-
+			message: "#^Parameter \\#4 \\$offset \\(int\\) of method Chill\\\\PersonBundle\\\\Repository\\\\Household\\\\HouseholdCompositionRepositoryInterface\\:\\:findBy\\(\\) should be contravariant with parameter \\$offset \\(int\\|null\\) of method Doctrine\\\\Persistence\\\\ObjectRepository\\<object\\>\\:\\:findBy\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Repository/Household/HouseholdCompositionRepositoryInterface.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Repository\\\\Household\\\\HouseholdMembersRepository\\:\\:\\$repository is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Repository/Household/HouseholdMembersRepository.php
+
+		-
+			message: "#^Method Chill\\\\PersonBundle\\\\Repository\\\\Household\\\\PositionRepository\\:\\:findOneBy\\(\\) should return array\\<Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\Position\\> but returns object\\|null\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Repository/Household/PositionRepository.php
+
+		-
+			message: "#^Return type \\(array\\<Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\Position\\>\\) of method Chill\\\\PersonBundle\\\\Repository\\\\Household\\\\PositionRepository\\:\\:findOneBy\\(\\) should be compatible with return type \\(object\\|null\\) of method Doctrine\\\\Persistence\\\\ObjectRepository\\<object\\>\\:\\:findOneBy\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Repository/Household/PositionRepository.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Repository\\\\PersonACLAwareRepository\\:\\:\\$countryRepository is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Repository\\\\PersonAltNameRepository\\:\\:\\$repository is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Repository/PersonAltNameRepository.php
+
+		-
+			message: "#^PHPDoc tag @return with type array\\<Chill\\\\PersonBundle\\\\Entity\\\\Person\\\\ResidentialAddress\\>\\|null is not subtype of native type array\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Repository/ResidentialAddressRepository.php
+
+		-
+			message: "#^Return type \\(class\\-string\\) of method Chill\\\\PersonBundle\\\\Repository\\\\SocialWork\\\\EvaluationRepository\\:\\:getClassName\\(\\) should be covariant with return type \\(class\\-string\\<object\\>\\) of method Doctrine\\\\Persistence\\\\ObjectRepository\\<object\\>\\:\\:getClassName\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepository.php
+
+		-
+			message: "#^Return type \\(class\\-string\\) of method Chill\\\\PersonBundle\\\\Repository\\\\SocialWork\\\\EvaluationRepositoryInterface\\:\\:getClassName\\(\\) should be covariant with return type \\(class\\-string\\<object\\>\\) of method Doctrine\\\\Persistence\\\\ObjectRepository\\<object\\>\\:\\:getClassName\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Repository/SocialWork/EvaluationRepositoryInterface.php
+
+		-
+			message: "#^Return type \\(class\\-string\\) of method Chill\\\\PersonBundle\\\\Repository\\\\SocialWork\\\\GoalRepository\\:\\:getClassName\\(\\) should be covariant with return type \\(class\\-string\\<object\\>\\) of method Doctrine\\\\Persistence\\\\ObjectRepository\\<object\\>\\:\\:getClassName\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Repository/SocialWork/GoalRepository.php
+
+		-
+			message: "#^Return type \\(class\\-string\\) of method Chill\\\\PersonBundle\\\\Repository\\\\SocialWork\\\\ResultRepository\\:\\:getClassName\\(\\) should be covariant with return type \\(class\\-string\\<object\\>\\) of method Doctrine\\\\Persistence\\\\ObjectRepository\\<object\\>\\:\\:getClassName\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Repository/SocialWork/ResultRepository.php
+
+		-
+			message: "#^Return type \\(class\\-string\\) of method Chill\\\\PersonBundle\\\\Repository\\\\SocialWork\\\\SocialActionRepository\\:\\:getClassName\\(\\) should be covariant with return type \\(class\\-string\\<object\\>\\) of method Doctrine\\\\Persistence\\\\ObjectRepository\\<object\\>\\:\\:getClassName\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialActionRepository.php
+
+		-
+			message: "#^Return type \\(class\\-string\\) of method Chill\\\\PersonBundle\\\\Repository\\\\SocialWork\\\\SocialIssueRepository\\:\\:getClassName\\(\\) should be covariant with return type \\(class\\-string\\<object\\>\\) of method Doctrine\\\\Persistence\\\\ObjectRepository\\<object\\>\\:\\:getClassName\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Repository/SocialWork/SocialIssueRepository.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Search\\\\SearchHouseholdApiProvider\\:\\:\\$authorizationHelper is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Search/SearchHouseholdApiProvider.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Search\\\\SearchHouseholdApiProvider\\:\\:\\$security is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Search/SearchHouseholdApiProvider.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Search\\\\SearchPersonApiProvider\\:\\:\\$authorizationHelper is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Search/SearchPersonApiProvider.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Search\\\\SearchPersonApiProvider\\:\\:\\$security is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Search/SearchPersonApiProvider.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, int\\<0, max\\> given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Search/SimilarPersonMatcher.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Security\\\\Authorization\\\\AccompanyingPeriodVoter\\:\\:\\$security is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodVoter.php
+
+		-
+			message: "#^PHPDoc tag @return with type bool\\|void is not subtype of native type bool\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkEvaluationDocumentVoter.php
+
+		-
+			message: "#^Parameter \\#2 \\$subject \\(Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkEvaluationDocument\\) of method Chill\\\\PersonBundle\\\\Security\\\\Authorization\\\\AccompanyingPeriodWorkEvaluationDocumentVoter\\:\\:voteOnAttribute\\(\\) should be contravariant with parameter \\$subject \\(mixed\\) of method Symfony\\\\Component\\\\Security\\\\Core\\\\Authorization\\\\Voter\\\\Voter\\:\\:voteOnAttribute\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkEvaluationDocumentVoter.php
+
+		-
+			message: "#^Parameter \\#2 \\$subject \\(Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkEvaluation\\) of method Chill\\\\PersonBundle\\\\Security\\\\Authorization\\\\AccompanyingPeriodWorkEvaluationVoter\\:\\:voteOnAttribute\\(\\) should be contravariant with parameter \\$subject \\(mixed\\) of method Symfony\\\\Component\\\\Security\\\\Core\\\\Authorization\\\\Voter\\\\Voter\\:\\:voteOnAttribute\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkEvaluationVoter.php
+
+		-
+			message: "#^Elseif branch is unreachable because previous condition is always true\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkVoter.php
+
+		-
+			message: "#^Instanceof between \\*NEVER\\* and Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkVoter.php
+
+		-
+			message: "#^Instanceof between Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\AccompanyingPeriodWork and Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\AccompanyingPeriodWork will always evaluate to true\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkVoter.php
+
+		-
+			message: "#^Parameter \\#2 \\$subject \\(Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\AccompanyingPeriodWork\\) of method Chill\\\\PersonBundle\\\\Security\\\\Authorization\\\\AccompanyingPeriodWorkVoter\\:\\:voteOnAttribute\\(\\) should be contravariant with parameter \\$subject \\(mixed\\) of method Symfony\\\\Component\\\\Security\\\\Core\\\\Authorization\\\\Voter\\\\Voter\\:\\:voteOnAttribute\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkVoter.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Security\\\\Authorization\\\\AccompanyingPeriodWorkVoter\\:\\:\\$voterHelper is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkVoter.php
+
+		-
+			message: "#^Unreachable statement \\- code above always terminates\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Security/Authorization/AccompanyingPeriodWorkVoter.php
+
+		-
+			message: "#^Constant Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\AccompanyingPeriodDocGenNormalizer\\:\\:IGNORE_FIRST_PASS_KEY is unused\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php
+
+		-
+			message: "#^Parameter \\#1 \\$period \\(Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\|null\\) of method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\AccompanyingPeriodDocGenNormalizer\\:\\:normalize\\(\\) should be contravariant with parameter \\$object \\(mixed\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:normalize\\(\\)$#"
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php
+
+		-
+			message: "#^Unreachable statement \\- code above always terminates\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodDocGenNormalizer.php
+
+		-
+			message: "#^Parameter \\#1 \\$origin \\(Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\Origin\\) of method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\AccompanyingPeriodOriginNormalizer\\:\\:normalize\\(\\) should be contravariant with parameter \\$object \\(mixed\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:normalize\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodOriginNormalizer.php
+
+		-
+			message: "#^Parameter \\#1 \\$participation \\(Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriodParticipation\\) of method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\AccompanyingPeriodParticipationNormalizer\\:\\:normalize\\(\\) should be contravariant with parameter \\$object \\(mixed\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:normalize\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodParticipationNormalizer.php
+
+		-
+			message: "#^Unreachable statement \\- code above always terminates\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodParticipationNormalizer.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\AccompanyingPeriodWorkDenormalizer\\:\\:\\$em is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkDenormalizer.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\AccompanyingPeriodWorkDenormalizer\\:\\:\\$workRepository is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkDenormalizer.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\AccompanyingPeriodWorkEvaluationDocumentNormalizer\\:\\:\\$registry is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationDocumentNormalizer.php
+
+		-
+			message: "#^Parameter \\#1 \\$object \\(Chill\\\\PersonBundle\\\\Entity\\\\AccompanyingPeriod\\\\AccompanyingPeriodWorkEvaluation\\) of method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\AccompanyingPeriodWorkEvaluationNormalizer\\:\\:normalize\\(\\) should be contravariant with parameter \\$object \\(mixed\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:normalize\\(\\)$#"
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationNormalizer.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\AccompanyingPeriodWorkEvaluationNormalizer\\:\\:\\$registry is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkEvaluationNormalizer.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\AccompanyingPeriodWorkNormalizer\\:\\:\\$registry is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/AccompanyingPeriodWorkNormalizer.php
+
+		-
+			message: "#^Call to function is_array\\(\\) with 'concerned' will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
+
+		-
+			message: "#^Expression on left side of \\?\\? is not nullable\\.$#"
+			count: 3
+			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
+
+		-
+			message: "#^Left side of && is always false\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
+
+		-
+			message: "#^Only booleans are allowed in &&, null given on the left side\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between false and false will always evaluate to true\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/MembersEditorNormalizer.php
+
+		-
+			message: "#^Instanceof between Chill\\\\PersonBundle\\\\Entity\\\\Person and Chill\\\\PersonBundle\\\\Entity\\\\Person will always evaluate to true\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
+
+		-
+			message: "#^Method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\PersonDocGenNormalizer\\:\\:hasGroup\\(\\) is unused\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between null and Chill\\\\PersonBundle\\\\Entity\\\\Person will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonDocGenNormalizer.php
+
+		-
+			message: "#^Only booleans are allowed in a ternary operator condition, Chill\\\\PersonBundle\\\\Entity\\\\Household\\\\Household\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
+
+		-
+			message: "#^Only booleans are allowed in a ternary operator condition, array\\<Chill\\\\PersonBundle\\\\Entity\\\\Person\\\\ResidentialAddress\\> given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
+
+		-
+			message: "#^Parameter \\#1 \\$person \\(Chill\\\\PersonBundle\\\\Entity\\\\Person\\) of method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\PersonJsonNormalizer\\:\\:normalize\\(\\) should be contravariant with parameter \\$object \\(mixed\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:normalize\\(\\)$#"
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\PersonJsonNormalizer\\:\\:\\$phoneNumberHelper is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
+
+		-
+			message: "#^Parameter \\#1 \\$relation \\(Chill\\\\PersonBundle\\\\Entity\\\\Relationships\\\\Relationship\\) of method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\RelationshipDocGenNormalizer\\:\\:normalize\\(\\) should be contravariant with parameter \\$object \\(mixed\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:normalize\\(\\)$#"
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/RelationshipDocGenNormalizer.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between null and Chill\\\\PersonBundle\\\\Entity\\\\Relationships\\\\Relationship will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/RelationshipDocGenNormalizer.php
+
+		-
+			message: "#^Method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\SocialIssueNormalizer\\:\\:normalize\\(\\) should return array\\|ArrayObject\\|bool\\|float\\|int\\|string\\|null but return statement is missing\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/SocialIssueNormalizer.php
+
+		-
+			message: "#^PHPDoc tag @return with type array\\|ArrayObject\\|bool\\|float\\|int\\|string\\|void\\|null is not subtype of native type array\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/WorkflowNormalizer.php
+
+		-
+			message: "#^Parameter \\#1 \\$object \\(Chill\\\\MainBundle\\\\Entity\\\\Workflow\\\\EntityWorkflow\\) of method Chill\\\\PersonBundle\\\\Serializer\\\\Normalizer\\\\WorkflowNormalizer\\:\\:normalize\\(\\) should be contravariant with parameter \\$object \\(mixed\\) of method Symfony\\\\Component\\\\Serializer\\\\Normalizer\\\\NormalizerInterface\\:\\:normalize\\(\\)$#"
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Serializer/Normalizer/WorkflowNormalizer.php
+
+		-
+			message: "#^Call to an undefined method Chill\\\\DocStoreBundle\\\\Entity\\\\Document\\:\\:setCourse\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Service/DocGenerator/AccompanyingPeriodContext.php
+
+		-
+			message: "#^Call to an undefined method Chill\\\\DocStoreBundle\\\\Entity\\\\Document\\:\\:setPerson\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Service\\\\Import\\\\SocialWorkMetadata\\:\\:\\$socialActionRepository is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Service/Import/SocialWorkMetadata.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Service\\\\Import\\\\SocialWorkMetadata\\:\\:\\$socialIssueRepository is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Service/Import/SocialWorkMetadata.php
+
+		-
+			message: "#^Call to method Chill\\\\PersonBundle\\\\Entity\\\\Person\\:\\:getDeathdate\\(\\) with incorrect case\\: getDeathDate$#"
+			count: 2
+			path: src/Bundle/ChillPersonBundle/Templating/Entity/PersonRender.php
+
+		-
+			message: "#^Call to method getId\\(\\) on an unknown class ChillPersonBundle\\:AccompanyingPeriod\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Timeline/AbstractTimelineAccompanyingPeriod.php
+
+		-
+			message: "#^Parameter \\#1 \\$entityName of method Doctrine\\\\ORM\\\\EntityManager\\:\\:getRepository\\(\\) expects class\\-string\\<ChillPersonBundle\\:AccompanyingPeriod\\>, string given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Timeline/AbstractTimelineAccompanyingPeriod.php
+
+		-
+			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:\\:filterReachableCenters\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Timeline/AbstractTimelineAccompanyingPeriod.php
+
+		-
+			message: "#^Cannot call method setKey\\(\\) on array\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodClosing.php
+
+		-
+			message: "#^Parameter \\#3 \\$context of method Chill\\\\PersonBundle\\\\Timeline\\\\AbstractTimelineAccompanyingPeriod\\:\\:getBasicEntityTemplate\\(\\) expects string, Chill\\\\MainBundle\\\\Timeline\\\\type given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodClosing.php
+
+		-
+			message: "#^Parameter \\$context of method Chill\\\\PersonBundle\\\\Timeline\\\\TimelineAccompanyingPeriodClosing\\:\\:getEntityTemplate\\(\\) has invalid type Chill\\\\MainBundle\\\\Timeline\\\\type\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodClosing.php
+
+		-
+			message: "#^Parameter \\$entity of method Chill\\\\PersonBundle\\\\Timeline\\\\TimelineAccompanyingPeriodClosing\\:\\:getEntityTemplate\\(\\) has invalid type Chill\\\\MainBundle\\\\Timeline\\\\type\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodClosing.php
+
+		-
+			message: "#^Cannot call method setKey\\(\\) on array\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodOpening.php
+
+		-
+			message: "#^Parameter \\#3 \\$context of method Chill\\\\PersonBundle\\\\Timeline\\\\AbstractTimelineAccompanyingPeriod\\:\\:getBasicEntityTemplate\\(\\) expects string, Chill\\\\MainBundle\\\\Timeline\\\\type given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodOpening.php
+
+		-
+			message: "#^Parameter \\$context of method Chill\\\\PersonBundle\\\\Timeline\\\\TimelineAccompanyingPeriodOpening\\:\\:getEntityTemplate\\(\\) has invalid type Chill\\\\MainBundle\\\\Timeline\\\\type\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodOpening.php
+
+		-
+			message: "#^Parameter \\$entity of method Chill\\\\PersonBundle\\\\Timeline\\\\TimelineAccompanyingPeriodOpening\\:\\:getEntityTemplate\\(\\) has invalid type Chill\\\\MainBundle\\\\Timeline\\\\type\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Timeline/TimelineAccompanyingPeriodOpening.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Validator\\\\Constraints\\\\AccompanyingPeriod\\\\AccompanyingPeriodValidityValidator\\:\\:\\$token is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/AccompanyingPeriodValidityValidator.php
+
+		-
+			message: "#^Property Chill\\\\PersonBundle\\\\Validator\\\\Constraints\\\\AccompanyingPeriod\\\\ParticipationOverlapValidator\\:\\:\\$thirdpartyRender is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ParticipationOverlapValidator.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between 0 and int\\<2, max\\> will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Validator/Constraints/AccompanyingPeriod/ParticipationOverlapValidator.php
+
+		-
+			message: "#^Access to an undefined property Symfony\\\\Component\\\\Validator\\\\Constraint\\:\\:\\$message\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Validator/Constraints/Household/HouseholdMembershipSequentialValidator.php
+
+		-
+			message: "#^Access to an undefined property Symfony\\\\Component\\\\Validator\\\\Constraint\\:\\:\\$message\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Validator/Constraints/Household/MaxHolderValidator.php
+
+		-
+			message: "#^Access to an undefined property Symfony\\\\Component\\\\Validator\\\\Constraint\\:\\:\\$messageInfinity\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Validator/Constraints/Household/MaxHolderValidator.php
+
+		-
+			message: "#^Access to an undefined property Symfony\\\\Component\\\\Validator\\\\Constraint\\:\\:\\$message\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Validator/Constraints/Person/PersonHasCenterValidator.php
+
+		-
+			message: "#^Call to an undefined method Symfony\\\\Component\\\\Config\\\\Definition\\\\Builder\\\\NodeParentInterface\\:\\:info\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Widget/PersonListWidgetFactory.php
+
+		-
+			message: "#^Parameter \\$place of method Chill\\\\PersonBundle\\\\Widget\\\\PersonListWidgetFactory\\:\\:configureOptions\\(\\) has invalid type Chill\\\\MainBundle\\\\DependencyInjection\\\\Widget\\\\Factory\\\\type\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Widget/PersonListWidgetFactory.php
+
+		-
+			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\ObjectManager\\:\\:createQuery\\(\\)\\.$#"
+			count: 2
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\ObjectRepository\\<ChillReportBundle\\:Report\\>\\:\\:findByCFGroup\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message: "#^Call to an undefined method Doctrine\\\\Persistence\\\\ObjectRepository\\<Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomFieldsGroup\\>\\:\\:findByEntity\\(\\)\\.$#"
+			count: 2
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message: """
+				#^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
+				since Symfony 5\\.4, use method or constructor injection in your controller instead$#
+			"""
+			count: 7
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message: "#^Call to method getId\\(\\) on an unknown class ChillReportBundle\\:Report\\.$#"
+			count: 2
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message: "#^Call to method getPerson\\(\\) on an unknown class ChillReportBundle\\:Report\\.$#"
+			count: 3
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:createAction\\(\\) has invalid return type Chill\\\\ReportBundle\\\\Controller\\\\Response\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:createAction\\(\\) should return Chill\\\\ReportBundle\\\\Controller\\\\Response but returns Symfony\\\\Component\\\\HttpFoundation\\\\RedirectResponse\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:createAction\\(\\) should return Chill\\\\ReportBundle\\\\Controller\\\\Response but returns Symfony\\\\Component\\\\HttpFoundation\\\\Response\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:createCreateForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:createEditForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\Form but returns Symfony\\\\Component\\\\Form\\\\FormInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:editAction\\(\\) has invalid return type Chill\\\\ReportBundle\\\\Controller\\\\Response\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:editAction\\(\\) should return Chill\\\\ReportBundle\\\\Controller\\\\Response but returns Symfony\\\\Component\\\\HttpFoundation\\\\Response\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:exportAction\\(\\) has invalid return type Chill\\\\ReportBundle\\\\Controller\\\\A\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:exportAction\\(\\) should return Chill\\\\ReportBundle\\\\Controller\\\\A but returns Symfony\\\\Component\\\\HttpFoundation\\\\Response\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:listAction\\(\\) has invalid return type Chill\\\\ReportBundle\\\\Controller\\\\Response\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:listAction\\(\\) should return Chill\\\\ReportBundle\\\\Controller\\\\Response but returns Symfony\\\\Component\\\\HttpFoundation\\\\Response\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:newAction\\(\\) has invalid return type Chill\\\\ReportBundle\\\\Controller\\\\Response\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:newAction\\(\\) should return Chill\\\\ReportBundle\\\\Controller\\\\Response but returns Symfony\\\\Component\\\\HttpFoundation\\\\Response\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:selectReportTypeAction\\(\\) has invalid return type Chill\\\\ReportBundle\\\\Controller\\\\Response\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:selectReportTypeAction\\(\\) should return Chill\\\\ReportBundle\\\\Controller\\\\Response but returns Symfony\\\\Component\\\\HttpFoundation\\\\RedirectResponse\\.$#"
+			count: 2
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:selectReportTypeAction\\(\\) should return Chill\\\\ReportBundle\\\\Controller\\\\Response but returns Symfony\\\\Component\\\\HttpFoundation\\\\Response\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:selectReportTypeForExportAction\\(\\) has invalid return type Chill\\\\ReportBundle\\\\Controller\\\\Response\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:selectReportTypeForExportAction\\(\\) should return Chill\\\\ReportBundle\\\\Controller\\\\Response but returns Symfony\\\\Component\\\\HttpFoundation\\\\RedirectResponse\\.$#"
+			count: 2
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:selectReportTypeForExportAction\\(\\) should return Chill\\\\ReportBundle\\\\Controller\\\\Response but returns Symfony\\\\Component\\\\HttpFoundation\\\\Response\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:updateAction\\(\\) has invalid return type Chill\\\\ReportBundle\\\\Controller\\\\Response\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:updateAction\\(\\) should return Chill\\\\ReportBundle\\\\Controller\\\\Response but returns Symfony\\\\Component\\\\HttpFoundation\\\\RedirectResponse\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:updateAction\\(\\) should return Chill\\\\ReportBundle\\\\Controller\\\\Response but returns Symfony\\\\Component\\\\HttpFoundation\\\\Response\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:viewAction\\(\\) has invalid return type Chill\\\\ReportBundle\\\\Controller\\\\Response\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message: "#^Method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:viewAction\\(\\) should return Chill\\\\ReportBundle\\\\Controller\\\\Response but returns Symfony\\\\Component\\\\HttpFoundation\\\\Response\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message: "#^Negated boolean expression is always false\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\PersonBundle\\\\Entity\\\\Person\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message: "#^Only booleans are allowed in a negated boolean, Chill\\\\ReportBundle\\\\Entity\\\\Report given\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message: "#^Parameter \\#1 \\$className of method Doctrine\\\\Persistence\\\\ObjectManager\\:\\:getRepository\\(\\) expects class\\-string\\<ChillReportBundle\\:Report\\>, string given\\.$#"
+			count: 4
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message: "#^Parameter \\#1 \\$entity of method Chill\\\\ReportBundle\\\\Controller\\\\ReportController\\:\\:createEditForm\\(\\) expects Chill\\\\ReportBundle\\\\Entity\\\\Report, ChillReportBundle\\:Report given\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
+
+		-
+			message: "#^PHPDoc tag @param for parameter \\$scope with type string is incompatible with native type Chill\\\\MainBundle\\\\Entity\\\\Scope\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Entity/Report.php
+
+		-
+			message: "#^Call to method extractOtherValue\\(\\) on an unknown class Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Export/Export/ReportList.php
+
+		-
+			message: "#^Call to method getChoices\\(\\) on an unknown class Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldInterface\\.$#"
+			count: 2
+			path: src/Bundle/ChillReportBundle/Export/Export/ReportList.php
+
+		-
+			message: "#^Call to method isChecked\\(\\) on an unknown class Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldInterface\\.$#"
+			count: 2
+			path: src/Bundle/ChillReportBundle/Export/Export/ReportList.php
+
+		-
+			message: "#^Call to method isMultiple\\(\\) on an unknown class Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldInterface\\.$#"
+			count: 2
+			path: src/Bundle/ChillReportBundle/Export/Export/ReportList.php
+
+		-
+			message: "#^Call to method render\\(\\) on an unknown class Chill\\\\CustomFieldsBundle\\\\Service\\\\CustomFieldInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Export/Export/ReportList.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 2
+			path: src/Bundle/ChillReportBundle/Export/Export/ReportList.php
+
+		-
+			message: "#^Parameter \\#1 \\$em of class Chill\\\\MainBundle\\\\Form\\\\Type\\\\DataTransformer\\\\ScopeTransformer constructor expects Doctrine\\\\ORM\\\\EntityManagerInterface, Doctrine\\\\Persistence\\\\ObjectManager given\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Form/ReportType.php
+
+		-
+			message: "#^Method Chill\\\\ReportBundle\\\\Security\\\\Authorization\\\\ReportVoter\\:\\:supports\\(\\) should return bool but return statement is missing\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Security/Authorization/ReportVoter.php
+
+		-
+			message: "#^Call to method getId\\(\\) on an unknown class ChillReportBundle\\:Report\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php
+
+		-
+			message: "#^Parameter \\#1 \\$context of method Chill\\\\ReportBundle\\\\Timeline\\\\TimelineReportProvider\\:\\:checkContext\\(\\) expects string, Chill\\\\MainBundle\\\\Timeline\\\\type given\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php
+
+		-
+			message: "#^Parameter \\#1 \\$entity of method Chill\\\\ReportBundle\\\\Timeline\\\\TimelineReportProvider\\:\\:getFieldsToRender\\(\\) expects Chill\\\\ReportBundle\\\\Entity\\\\Report, Chill\\\\MainBundle\\\\Timeline\\\\type given\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php
+
+		-
+			message: "#^Parameter \\#1 \\$entityName of method Doctrine\\\\ORM\\\\EntityManager\\:\\:getRepository\\(\\) expects class\\-string\\<ChillReportBundle\\:Report\\>, string given\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php
+
+		-
+			message: "#^Parameter \\$context of method Chill\\\\ReportBundle\\\\Timeline\\\\TimelineReportProvider\\:\\:getEntityTemplate\\(\\) has invalid type Chill\\\\MainBundle\\\\Timeline\\\\type\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php
+
+		-
+			message: "#^Parameter \\$entity of method Chill\\\\ReportBundle\\\\Timeline\\\\TimelineReportProvider\\:\\:getEntityTemplate\\(\\) has invalid type Chill\\\\MainBundle\\\\Timeline\\\\type\\.$#"
+			count: 1
+			path: src/Bundle/ChillReportBundle/Timeline/TimelineReportProvider.php
+
+		-
+			message: """
+				#^Parameter \\$centerResolverDispatcher of method Chill\\\\TaskBundle\\\\Controller\\\\SingleTaskController\\:\\:__construct\\(\\) has typehint with deprecated interface Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcherInterface\\:
+				Use CenterResolverManager and its interface CenterResolverManagerInterface$#
+			"""
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
+
+		-
+			message: "#^Property Chill\\\\TaskBundle\\\\Controller\\\\SingleTaskController\\:\\:\\$centerResolverDispatcher is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between null and int will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
+
+		-
+			message: "#^If condition is always true\\.$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Controller/TaskController.php
+
+		-
+			message: "#^Casting to string something that's already string\\.$#"
+			count: 3
+			path: src/Bundle/ChillTaskBundle/Entity/AbstractTask.php
+
+		-
+			message: "#^Return type \\(Chill\\\\MainBundle\\\\Entity\\\\Center\\|null\\) of method Chill\\\\TaskBundle\\\\Entity\\\\AbstractTask\\:\\:getCenter\\(\\) should be covariant with return type \\(Chill\\\\MainBundle\\\\Entity\\\\Center\\) of method Chill\\\\MainBundle\\\\Entity\\\\HasCenterInterface\\:\\:getCenter\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Entity/AbstractTask.php
+
+		-
+			message: "#^Return type \\(Chill\\\\MainBundle\\\\Entity\\\\Scope\\|null\\) of method Chill\\\\TaskBundle\\\\Entity\\\\AbstractTask\\:\\:getScope\\(\\) should be covariant with return type \\(Chill\\\\MainBundle\\\\Entity\\\\Scope\\) of method Chill\\\\MainBundle\\\\Entity\\\\HasScopeInterface\\:\\:getScope\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Entity/AbstractTask.php
+
+		-
+			message: "#^Property Chill\\\\TaskBundle\\\\Entity\\\\RecurringTask\\:\\:\\$singleTasks is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Entity/RecurringTask.php
+
+		-
+			message: "#^Method Chill\\\\TaskBundle\\\\Entity\\\\SingleTask\\:\\:getWarningDate\\(\\) should return DateTimeImmutable but returns null\\.$#"
+			count: 2
+			path: src/Bundle/ChillTaskBundle/Entity/SingleTask.php
+
+		-
+			message: "#^Call to an undefined method Chill\\\\TaskBundle\\\\Entity\\\\AbstractTask\\:\\:getTaskPlaceEvents\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Event/Lifecycle/TaskLifecycleEvent.php
+
+		-
+			message: "#^Parameter \\#1 \\$task of method Chill\\\\TaskBundle\\\\Entity\\\\Task\\\\SingleTaskPlaceEvent\\:\\:setTask\\(\\) expects Chill\\\\TaskBundle\\\\Entity\\\\SingleTask, Chill\\\\TaskBundle\\\\Entity\\\\AbstractTask given\\.$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Event/Lifecycle/TaskLifecycleEvent.php
+
+		-
+			message: """
+				#^Call to deprecated method getUsername\\(\\) of class Chill\\\\MainBundle\\\\Entity\\\\User\\:
+				since Symfony 5\\.3, use getUserIdentifier\\(\\) instead$#
+			"""
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Form/SingleTaskListType.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			count: 2
+			path: src/Bundle/ChillTaskBundle/Form/SingleTaskListType.php
+
+		-
+			message: "#^Parameter \\#1 \\$repository of class Chill\\\\PersonBundle\\\\Form\\\\DataTransformer\\\\PersonToIdTransformer constructor expects Chill\\\\PersonBundle\\\\Repository\\\\PersonRepository, Doctrine\\\\ORM\\\\EntityManagerInterface given\\.$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Form/SingleTaskListType.php
+
+		-
+			message: """
+				#^Parameter \\$centerResolverDispatcher of method Chill\\\\TaskBundle\\\\Form\\\\SingleTaskType\\:\\:__construct\\(\\) has typehint with deprecated interface Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcherInterface\\:
+				Use CenterResolverManager and its interface CenterResolverManagerInterface$#
+			"""
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Form/SingleTaskType.php
+
+		-
+			message: "#^Parameter \\#1 \\$extras of method Knp\\\\Menu\\\\MenuItem\\:\\:setExtras\\(\\) expects array\\<string, mixed\\>, string given\\.$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Menu/MenuBuilder.php
+
+		-
+			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
+			count: 5
+			path: src/Bundle/ChillTaskBundle/Repository/SingleTaskRepository.php
+
+		-
+			message: "#^Method Chill\\\\TaskBundle\\\\Repository\\\\SingleTaskRepository\\:\\:findByParameters\\(\\) has invalid return type Chill\\\\TaskBundle\\\\Repository\\\\type\\.$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Repository/SingleTaskRepository.php
+
+		-
+			message: "#^Parameter \\$params of method Chill\\\\TaskBundle\\\\Repository\\\\SingleTaskRepository\\:\\:findByParameters\\(\\) has invalid type Chill\\\\TaskBundle\\\\Repository\\\\type\\.$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Repository/SingleTaskRepository.php
+
+		-
+			message: "#^Property Chill\\\\TaskBundle\\\\Security\\\\Authorization\\\\AuthorizationEvent\\:\\:\\$vote \\(bool\\) does not accept null\\.$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Security/Authorization/AuthorizationEvent.php
+
+		-
+			message: "#^Call to method deleteItem\\(\\) on an unknown class Chill\\\\TaskBundle\\\\Templating\\\\UI\\\\CacheItempPoolInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Templating/UI/CountNotificationTask.php
+
+		-
+			message: "#^Call to method getItem\\(\\) on an unknown class Chill\\\\TaskBundle\\\\Templating\\\\UI\\\\CacheItempPoolInterface\\.$#"
+			count: 2
+			path: src/Bundle/ChillTaskBundle/Templating/UI/CountNotificationTask.php
+
+		-
+			message: "#^Call to method save\\(\\) on an unknown class Chill\\\\TaskBundle\\\\Templating\\\\UI\\\\CacheItempPoolInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Templating/UI/CountNotificationTask.php
+
+		-
+			message: "#^Property Chill\\\\TaskBundle\\\\Templating\\\\UI\\\\CountNotificationTask\\:\\:\\$cachePool \\(Chill\\\\TaskBundle\\\\Templating\\\\UI\\\\CacheItempPoolInterface\\) does not accept Psr\\\\Cache\\\\CacheItemPoolInterface\\.$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Templating/UI/CountNotificationTask.php
+
+		-
+			message: "#^Property Chill\\\\TaskBundle\\\\Templating\\\\UI\\\\CountNotificationTask\\:\\:\\$cachePool has unknown class Chill\\\\TaskBundle\\\\Templating\\\\UI\\\\CacheItempPoolInterface as its type\\.$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Templating/UI/CountNotificationTask.php
+
+		-
+			message: "#^Call to method getData\\(\\) on an unknown class Chill\\\\MainBundle\\\\Timeline\\\\type\\.$#"
+			count: 2
+			path: src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php
+
+		-
+			message: "#^Call to method getTask\\(\\) on an unknown class Chill\\\\MainBundle\\\\Timeline\\\\type\\.$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php
+
+		-
+			message: "#^Call to method getTransition\\(\\) on an unknown class Chill\\\\MainBundle\\\\Timeline\\\\type\\.$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php
+
+		-
+			message: "#^Method Chill\\\\TaskBundle\\\\Timeline\\\\SingleTaskTaskLifeCycleEventTimelineProvider\\:\\:getTransitionByName\\(\\) should return Symfony\\\\Component\\\\Workflow\\\\Transition but return statement is missing\\.$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php
+
+		-
+			message: "#^Parameter \\$context of method Chill\\\\TaskBundle\\\\Timeline\\\\SingleTaskTaskLifeCycleEventTimelineProvider\\:\\:getEntityTemplate\\(\\) has invalid type Chill\\\\MainBundle\\\\Timeline\\\\type\\.$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php
+
+		-
+			message: "#^Parameter \\$entity of method Chill\\\\TaskBundle\\\\Timeline\\\\SingleTaskTaskLifeCycleEventTimelineProvider\\:\\:getEntityTemplate\\(\\) has invalid type Chill\\\\MainBundle\\\\Timeline\\\\type\\.$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php
+
+		-
+			message: "#^Call to method getData\\(\\) on an unknown class Chill\\\\MainBundle\\\\Timeline\\\\type\\.$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
+
+		-
+			message: "#^Call to method getTask\\(\\) on an unknown class Chill\\\\MainBundle\\\\Timeline\\\\type\\.$#"
+			count: 2
+			path: src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
+
+		-
+			message: "#^Call to method getTransition\\(\\) on an unknown class Chill\\\\MainBundle\\\\Timeline\\\\type\\.$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
+
+		-
+			message: "#^Method Chill\\\\TaskBundle\\\\Timeline\\\\TaskLifeCycleEventTimelineProvider\\:\\:getTransitionByName\\(\\) should return Symfony\\\\Component\\\\Workflow\\\\Transition but return statement is missing\\.$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
+
+		-
+			message: "#^Parameter \\$context of method Chill\\\\TaskBundle\\\\Timeline\\\\TaskLifeCycleEventTimelineProvider\\:\\:getEntityTemplate\\(\\) has invalid type Chill\\\\MainBundle\\\\Timeline\\\\type\\.$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
+
+		-
+			message: "#^Parameter \\$entity of method Chill\\\\TaskBundle\\\\Timeline\\\\TaskLifeCycleEventTimelineProvider\\:\\:getEntityTemplate\\(\\) has invalid type Chill\\\\MainBundle\\\\Timeline\\\\type\\.$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
+
+		-
+			message: "#^Call to an undefined method Chill\\\\TaskBundle\\\\Entity\\\\AbstractTask\\:\\:getId\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Workflow/TaskWorkflowManager.php
+
+		-
+			message: "#^Call to an undefined method Chill\\\\TaskBundle\\\\Workflow\\\\TaskWorkflowDefinition\\:\\:getAssociatedWorkflowName\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Workflow/TaskWorkflowManager.php
+
+		-
+			message: "#^Call to an undefined method Chill\\\\TaskBundle\\\\Workflow\\\\TaskWorkflowDefinition\\:\\:getWorkflowMetadata\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Workflow/TaskWorkflowManager.php
+
+		-
+			message: "#^Call to an undefined method Chill\\\\TaskBundle\\\\Workflow\\\\TaskWorkflowDefinition\\:\\:isClosed\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Workflow/TaskWorkflowManager.php
+
+		-
+			message: "#^Call to an undefined method Chill\\\\TaskBundle\\\\Workflow\\\\TaskWorkflowDefinition\\:\\:supports\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillTaskBundle/Workflow/TaskWorkflowManager.php
+
+		-
+			message: "#^Parameter \\#3 \\$entity \\(Chill\\\\ThirdPartyBundle\\\\Entity\\\\ThirdParty\\) of method Chill\\\\ThirdPartyBundle\\\\Controller\\\\ThirdPartyController\\:\\:onPostFetchEntity\\(\\) should be contravariant with parameter \\$entity \\(mixed\\) of method Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\CRUDController\\:\\:onPostFetchEntity\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillThirdPartyBundle/Controller/ThirdPartyController.php
+
+		-
+			message: "#^PHPDoc tag @return with type DateTime\\|null is not subtype of native type DateTimeImmutable\\|null\\.$#"
+			count: 1
+			path: src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
+
+		-
+			message: "#^Parameter \\#1 \\$createdAt \\(DateTimeImmutable\\) of method Chill\\\\ThirdPartyBundle\\\\Entity\\\\ThirdParty\\:\\:setCreatedAt\\(\\) should be contravariant with parameter \\$datetime \\(DateTimeInterface\\) of method Chill\\\\MainBundle\\\\Doctrine\\\\Model\\\\TrackCreationInterface\\:\\:setCreatedAt\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
+
+		-
+			message: "#^Parameter \\#1 \\$updatedAt \\(DateTimeImmutable\\) of method Chill\\\\ThirdPartyBundle\\\\Entity\\\\ThirdParty\\:\\:setUpdatedAt\\(\\) should be contravariant with parameter \\$datetime \\(DateTimeInterface\\) of method Chill\\\\MainBundle\\\\Doctrine\\\\Model\\\\TrackUpdateInterface\\:\\:setUpdatedAt\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
+
+		-
+			message: "#^Property Chill\\\\ThirdPartyBundle\\\\Entity\\\\ThirdParty\\:\\:\\$canonicalized is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
+
+		-
+			message: "#^Property Chill\\\\ThirdPartyBundle\\\\Entity\\\\ThirdParty\\:\\:\\$createdBy is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
+
+		-
+			message: "#^Call to method Chill\\\\ThirdPartyBundle\\\\Entity\\\\ThirdParty\\:\\:setFirstname\\(\\) with incorrect case\\: setFirstName$#"
+			count: 1
+			path: src/Bundle/ChillThirdPartyBundle/EventListener/ThirdPartyEventListener.php
+
 		-
 			message: "#^Foreach overwrites \\$value with its value variable\\.$#"
 			count: 1
 			path: src/Bundle/ChillThirdPartyBundle/Form/ChoiceLoader/ThirdPartyChoiceLoader.php
+
+		-
+			message: "#^Property Chill\\\\ThirdPartyBundle\\\\Repository\\\\ThirdPartyACLAwareRepository\\:\\:\\$authorizationHelper is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyACLAwareRepository.php
+
+		-
+			message: "#^Property Chill\\\\ThirdPartyBundle\\\\Repository\\\\ThirdPartyACLAwareRepository\\:\\:\\$security is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyACLAwareRepository.php
+
+		-
+			message: "#^Argument of an invalid type string supplied for foreach, only iterables are supported\\.$#"
+			count: 1
+			path: src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php
+
+		-
+			message: "#^Parameter \\#3 \\$limit \\(null\\) of method Chill\\\\ThirdPartyBundle\\\\Repository\\\\ThirdPartyRepository\\:\\:findBy\\(\\) should be contravariant with parameter \\$limit \\(int\\|null\\) of method Doctrine\\\\Persistence\\\\ObjectRepository\\<object\\>\\:\\:findBy\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php
+
+		-
+			message: "#^Parameter \\#4 \\$offset \\(null\\) of method Chill\\\\ThirdPartyBundle\\\\Repository\\\\ThirdPartyRepository\\:\\:findBy\\(\\) should be contravariant with parameter \\$offset \\(int\\|null\\) of method Doctrine\\\\Persistence\\\\ObjectRepository\\<object\\>\\:\\:findBy\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php
+
+		-
+			message: "#^Parameter \\#2 \\$subject \\(Chill\\\\ThirdPartyBundle\\\\Entity\\\\ThirdParty\\|null\\) of method Chill\\\\ThirdPartyBundle\\\\Security\\\\Voter\\\\ThirdPartyVoter\\:\\:voteOnAttribute\\(\\) should be contravariant with parameter \\$subject \\(mixed\\) of method Symfony\\\\Component\\\\Security\\\\Core\\\\Authorization\\\\Voter\\\\Voter\\:\\:voteOnAttribute\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php
+
+		-
+			message: "#^Unreachable statement \\- code above always terminates\\.$#"
+			count: 1
+			path: src/Bundle/ChillThirdPartyBundle/Security/Voter/ThirdPartyVoter.php
+
+		-
+			message: "#^Dynamic call to static method Chill\\\\ThirdPartyBundle\\\\ThirdPartyType\\\\ThirdPartyTypeProviderInterface\\:\\:getKey\\(\\)\\.$#"
+			count: 1
+			path: src/Bundle/ChillThirdPartyBundle/ThirdPartyType/ThirdPartyTypeManager.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between null and Chill\\\\DocStoreBundle\\\\Entity\\\\StoredObject will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillWopiBundle/src/Controller/Editor.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between false and array will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillWopiBundle/src/Service/Wopi/AuthorizationManager.php
+
+		-
+			message: "#^Default value of the parameter \\#2 \\$properties \\(array\\{\\}\\) of method Chill\\\\WopiBundle\\\\Service\\\\Wopi\\\\ChillDocumentManager\\:\\:write\\(\\) is incompatible with type array\\{content\\: string, size\\: int\\}\\.$#"
+			count: 1
+			path: src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
+
+		-
+			message: "#^Parameter \\#1 \\$document \\(Chill\\\\DocStoreBundle\\\\Entity\\\\StoredObject\\) of method Chill\\\\WopiBundle\\\\Service\\\\Wopi\\\\ChillDocumentManager\\:\\:getBasename\\(\\) should be contravariant with parameter \\$document \\(ChampsLibres\\\\WopiLib\\\\Contract\\\\Entity\\\\Document\\) of method ChampsLibres\\\\WopiLib\\\\Contract\\\\Service\\\\DocumentManagerInterface\\:\\:getBasename\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
+
+		-
+			message: "#^Parameter \\#1 \\$document \\(Chill\\\\DocStoreBundle\\\\Entity\\\\StoredObject\\) of method Chill\\\\WopiBundle\\\\Service\\\\Wopi\\\\ChillDocumentManager\\:\\:getCreationDate\\(\\) should be contravariant with parameter \\$document \\(ChampsLibres\\\\WopiLib\\\\Contract\\\\Entity\\\\Document\\) of method ChampsLibres\\\\WopiLib\\\\Contract\\\\Service\\\\DocumentManagerInterface\\:\\:getCreationDate\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
+
+		-
+			message: "#^Parameter \\#1 \\$document \\(Chill\\\\DocStoreBundle\\\\Entity\\\\StoredObject\\) of method Chill\\\\WopiBundle\\\\Service\\\\Wopi\\\\ChillDocumentManager\\:\\:getDocumentId\\(\\) should be contravariant with parameter \\$document \\(ChampsLibres\\\\WopiLib\\\\Contract\\\\Entity\\\\Document\\) of method ChampsLibres\\\\WopiLib\\\\Contract\\\\Service\\\\DocumentManagerInterface\\:\\:getDocumentId\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
+
+		-
+			message: "#^Parameter \\#1 \\$document \\(Chill\\\\DocStoreBundle\\\\Entity\\\\StoredObject\\) of method Chill\\\\WopiBundle\\\\Service\\\\Wopi\\\\ChillDocumentManager\\:\\:getLastModifiedDate\\(\\) should be contravariant with parameter \\$document \\(ChampsLibres\\\\WopiLib\\\\Contract\\\\Entity\\\\Document\\) of method ChampsLibres\\\\WopiLib\\\\Contract\\\\Service\\\\DocumentManagerInterface\\:\\:getLastModifiedDate\\(\\)$#"
+			count: 1
+			path: src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
+
+		-
+			message: "#^Parameter \\#1 \\$storedObject of method Chill\\\\WopiBundle\\\\Service\\\\Wopi\\\\ChillDocumentManager\\:\\:getContent\\(\\) expects Chill\\\\DocStoreBundle\\\\Entity\\\\StoredObject, ChampsLibres\\\\WopiLib\\\\Contract\\\\Entity\\\\Document given\\.$#"
+			count: 3
+			path: src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
+
+		-
+			message: "#^Parameter \\#1 \\$storedObject of method Chill\\\\WopiBundle\\\\Service\\\\Wopi\\\\ChillDocumentManager\\:\\:setContent\\(\\) expects Chill\\\\DocStoreBundle\\\\Entity\\\\StoredObject, ChampsLibres\\\\WopiLib\\\\Contract\\\\Entity\\\\Document given\\.$#"
+			count: 1
+			path: src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillDocumentManager.php
+
+		-
+			message: "#^Method ChampsLibres\\\\WopiLib\\\\Contract\\\\Service\\\\WopiInterface\\:\\:checkFileInfo\\(\\) invoked with 4 parameters, 3 required\\.$#"
+			count: 1
+			path: src/Bundle/ChillWopiBundle/src/Service/Wopi/ChillWopi.php
diff --git a/phpstan-critical.neon b/phpstan-critical.neon
deleted file mode 100644
index 158c7384b..000000000
--- a/phpstan-critical.neon
+++ /dev/null
@@ -1,6 +0,0 @@
-parameters:
-    ignoreErrors:
-        -
-            message: "#^Call to an undefined method Chill\\\\MainBundle\\\\Controller\\\\UserController\\:\\:createEditForm\\(\\)\\.$#"
-            count: 1
-            path: src/Bundle/ChillMainBundle/Controller/UserController.php
diff --git a/phpstan-deprecations-sf54.neon b/phpstan-deprecations-sf54.neon
deleted file mode 100644
index e2e5e85a6..000000000
--- a/phpstan-deprecations-sf54.neon
+++ /dev/null
@@ -1,153 +0,0 @@
-parameters:
-	ignoreErrors:
-		-
-			message: """
-				#^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
-				since Symfony 5\\.4, use method or constructor injection in your controller instead$#
-			"""
-			count: 2
-			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
-
-		-
-			message: """
-				#^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
-				since Symfony 5\\.4, use method or constructor injection in your controller instead$#
-			"""
-			count: 1
-			path: src/Bundle/ChillMainBundle/CRUD/Controller/AbstractCRUDController.php
-
-		-
-			message: """
-				#^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
-				since Symfony 5\\.4, use method or constructor injection in your controller instead$#
-			"""
-			count: 1
-			path: src/Bundle/ChillMainBundle/CRUD/Controller/ApiController.php
-
-		-
-			message: """
-				#^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
-				since Symfony 5\\.4, use method or constructor injection in your controller instead$#
-			"""
-			count: 3
-			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
-
-		-
-			message: """
-				#^Call to deprecated method getUsername\\(\\) of class Chill\\\\MainBundle\\\\Entity\\\\User\\:
-				since Symfony 5\\.3, use getUserIdentifier\\(\\) instead$#
-			"""
-			count: 2
-			path: src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php
-
-		-
-			message: """
-				#^Call to deprecated method getUsername\\(\\) of class Chill\\\\MainBundle\\\\Entity\\\\User\\:
-				since Symfony 5\\.3, use getUserIdentifier\\(\\) instead$#
-			"""
-			count: 1
-			path: src/Bundle/ChillMainBundle/Command/ChillUserSendRenewPasswordCodeCommand.php
-
-		-
-			message: """
-				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Encoder\\\\EncoderFactory\\:
-				since Symfony 5\\.3, use \\{@link PasswordHasherFactory\\} instead$#
-			"""
-			count: 1
-			path: src/Bundle/ChillMainBundle/Command/SetPasswordCommand.php
-
-		-
-			message: """
-				#^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
-				since Symfony 5\\.4, use method or constructor injection in your controller instead$#
-			"""
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/MenuController.php
-
-		-
-			message: """
-				#^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
-				since Symfony 5\\.4, use method or constructor injection in your controller instead$#
-			"""
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/SearchController.php
-
-		-
-			message: """
-				#^Call to deprecated method getUsername\\(\\) of class Chill\\\\MainBundle\\\\Entity\\\\User\\:
-				since Symfony 5\\.3, use getUserIdentifier\\(\\) instead$#
-			"""
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/UserController.php
-
-		-
-			message: """
-				#^Instantiation of deprecated class Symfony\\\\Component\\\\Security\\\\Core\\\\Encoder\\\\EncoderFactory\\:
-				since Symfony 5\\.3, use \\{@link PasswordHasherFactory\\} instead$#
-			"""
-			count: 1
-			path: src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUsers.php
-
-		-
-			message: """
-				#^Call to deprecated method getUsername\\(\\) of class Chill\\\\MainBundle\\\\Entity\\\\User\\:
-				since Symfony 5\\.3, use getUserIdentifier\\(\\) instead$#
-			"""
-			count: 2
-			path: src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
-
-		-
-			message: """
-				#^Call to deprecated method getUsername\\(\\) of class Chill\\\\MainBundle\\\\Entity\\\\User\\:
-				since Symfony 5\\.3, use getUserIdentifier\\(\\) instead$#
-			"""
-			count: 1
-			path: src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php
-
-		-
-			message: """
-				#^Call to deprecated method getUsername\\(\\) of class Chill\\\\MainBundle\\\\Entity\\\\User\\:
-				since Symfony 5\\.3, use getUserIdentifier\\(\\) instead$#
-			"""
-			count: 3
-			path: src/Bundle/ChillMainBundle/Validation/Validator/UserUniqueEmailAndUsername.php
-
-		-
-			message: """
-				#^Call to deprecated method getUsername\\(\\) of class Chill\\\\MainBundle\\\\Entity\\\\User\\:
-				since Symfony 5\\.3, use getUserIdentifier\\(\\) instead$#
-			"""
-			count: 1
-			path: src/Bundle/ChillMainBundle/Validator/Constraints/Entity/UserCircleConsistencyValidator.php
-
-		-
-			message: """
-				#^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
-				since Symfony 5\\.4, use method or constructor injection in your controller instead$#
-			"""
-			count: 13
-			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
-
-		-
-			message: """
-				#^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
-				since Symfony 5\\.4, use method or constructor injection in your controller instead$#
-			"""
-			count: 4
-			path: src/Bundle/ChillPersonBundle/Controller/PersonController.php
-
-		-
-			message: """
-				#^Call to deprecated method get\\(\\) of class Symfony\\\\Bundle\\\\FrameworkBundle\\\\Controller\\\\AbstractController\\:
-				since Symfony 5\\.4, use method or constructor injection in your controller instead$#
-			"""
-			count: 7
-			path: src/Bundle/ChillReportBundle/Controller/ReportController.php
-
-		-
-			message: """
-				#^Call to deprecated method getUsername\\(\\) of class Chill\\\\MainBundle\\\\Entity\\\\User\\:
-				since Symfony 5\\.3, use getUserIdentifier\\(\\) instead$#
-			"""
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Form/SingleTaskListType.php
diff --git a/phpstan-deprecations.neon b/phpstan-deprecations.neon
deleted file mode 100644
index 7f47e9c71..000000000
--- a/phpstan-deprecations.neon
+++ /dev/null
@@ -1,91 +0,0 @@
-parameters:
-	ignoreErrors:
-
-		-
-			message: """
-				#^Parameter \\$centerResolverDispatcher of method Chill\\\\ActivityBundle\\\\Repository\\\\ActivityACLAwareRepository\\:\\:__construct\\(\\) has typehint with deprecated interface Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcherInterface\\:
-				Use CenterResolverManager and its interface CenterResolverManagerInterface$#
-			"""
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php
-
-		-
-			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
-
-		-
-			message: """
-				#^Parameter \\$centerResolverDispatcher of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:\\:__construct\\(\\) has typehint with deprecated interface Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcherInterface\\:
-				Use CenterResolverManager and its interface CenterResolverManagerInterface$#
-			"""
-			count: 1
-			path: src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
-
-		-
-			message: """
-				#^Parameter \\$centerResolverDispatcher of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\DefaultVoterHelper\\:\\:__construct\\(\\) has typehint with deprecated interface Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcherInterface\\:
-				Use CenterResolverManager and its interface CenterResolverManagerInterface$#
-			"""
-			count: 1
-			path: src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelper.php
-
-		-
-			message: """
-				#^Parameter \\$centerResolverDispatcher of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\DefaultVoterHelperFactory\\:\\:__construct\\(\\) has typehint with deprecated interface Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcherInterface\\:
-				Use CenterResolverManager and its interface CenterResolverManagerInterface$#
-			"""
-			count: 1
-			path: src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperFactory.php
-
-		-
-			message: """
-				#^Parameter \\$centerResolverDispatcher of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\DefaultVoterHelperGenerator\\:\\:__construct\\(\\) has typehint with deprecated interface Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcherInterface\\:
-				Use CenterResolverManager and its interface CenterResolverManagerInterface$#
-			"""
-			count: 1
-			path: src/Bundle/ChillMainBundle/Security/Authorization/DefaultVoterHelperGenerator.php
-
-		-
-			message: """
-				#^Class Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcher implements deprecated interface Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcherInterface\\:
-				Use CenterResolverManager and its interface CenterResolverManagerInterface$#
-			"""
-			count: 1
-			path: src/Bundle/ChillMainBundle/Security/Resolver/CenterResolverDispatcher.php
-
-		-
-			message: """
-				#^Call to deprecated method getCurrentAccompanyingPeriod\\(\\) of class Chill\\\\PersonBundle\\\\Entity\\\\Person\\:
-				since 1\\.1 use `getOpenedAccompanyingPeriod instead$#
-			"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Controller/AccompanyingPeriodController.php
-
-		-
-			message: "#^Access to deprecated property \\$proxyAccompanyingPeriodOpenState of class Chill\\\\PersonBundle\\\\Entity\\\\Person\\.$#"
-			count: 2
-			path: src/Bundle/ChillPersonBundle/Entity/Person.php
-		-
-			message: """
-				#^Parameter \\$centerResolverDispatcher of method Chill\\\\PersonBundle\\\\Repository\\\\AccompanyingPeriodACLAwareRepository\\:\\:__construct\\(\\) has typehint with deprecated interface Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcherInterface\\:
-				Use CenterResolverManager and its interface CenterResolverManagerInterface$#
-			"""
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Repository/AccompanyingPeriodACLAwareRepository.php
-
-		-
-			message: """
-				#^Parameter \\$centerResolverDispatcher of method Chill\\\\TaskBundle\\\\Controller\\\\SingleTaskController\\:\\:__construct\\(\\) has typehint with deprecated interface Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcherInterface\\:
-				Use CenterResolverManager and its interface CenterResolverManagerInterface$#
-			"""
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Controller/SingleTaskController.php
-
-		-
-			message: """
-				#^Parameter \\$centerResolverDispatcher of method Chill\\\\TaskBundle\\\\Form\\\\SingleTaskType\\:\\:__construct\\(\\) has typehint with deprecated interface Chill\\\\MainBundle\\\\Security\\\\Resolver\\\\CenterResolverDispatcherInterface\\:
-				Use CenterResolverManager and its interface CenterResolverManagerInterface$#
-			"""
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Form/SingleTaskType.php
diff --git a/phpstan-types.neon b/phpstan-types.neon
deleted file mode 100644
index 3368c94d2..000000000
--- a/phpstan-types.neon
+++ /dev/null
@@ -1,387 +0,0 @@
-parameters:
-	ignoreErrors:
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Entity/ActivityReason.php
-
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php
-
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 1
-			path: src/Bundle/ChillActivityBundle/Form/ActivityType.php
-
-		-
-			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
-			count: 3
-			path: src/Bundle/ChillBudgetBundle/Form/ChargeType.php
-
-		-
-			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
-			count: 2
-			path: src/Bundle/ChillBudgetBundle/Form/ResourceType.php
-
-		-
-			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Command/CreateFieldsOnGroupCommand.php
-
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/AbstractCustomField.php
-
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 4
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
-
-		-
-			message: "#^Method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldChoice\\:\\:buildForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\FormTypeInterface but return statement is missing\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldChoice.php
-
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php
-
-		-
-			message: "#^Method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldDate\\:\\:buildForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\FormTypeInterface but return statement is missing\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldDate.php
-
-		-
-			message: "#^Method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldLongChoice\\:\\:buildForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\FormTypeInterface but return statement is missing\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldLongChoice.php
-
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php
-
-		-
-			message: "#^Method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldNumber\\:\\:buildForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\FormTypeInterface but return statement is missing\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldNumber.php
-
-		-
-			message: "#^Method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldText\\:\\:buildForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\FormTypeInterface but return statement is missing\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldText.php
-
-		-
-			message: "#^Method Chill\\\\CustomFieldsBundle\\\\CustomFields\\\\CustomFieldTitle\\:\\:buildForm\\(\\) should return Symfony\\\\Component\\\\Form\\\\FormTypeInterface but return statement is missing\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/CustomFields/CustomFieldTitle.php
-
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php
-
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php
-
-		-
-			message: "#^Only booleans are allowed in a negated boolean, mixed given\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Form/CustomFieldType.php
-
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 1
-			path: src/Bundle/ChillDocStoreBundle/Entity/DocumentCategory.php
-
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php
-
-		-
-			message: "#^Parameter \\$resolver of method Chill\\\\EventBundle\\\\Form\\\\EventTypeType\\:\\:setDefaultOptions\\(\\) has invalid type Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolverInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Form/EventTypeType.php
-
-		-
-			message: "#^Parameter \\$resolver of method Chill\\\\EventBundle\\\\Form\\\\RoleType\\:\\:setDefaultOptions\\(\\) has invalid type Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolverInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Form/RoleType.php
-
-		-
-			message: "#^Parameter \\$resolver of method Chill\\\\EventBundle\\\\Form\\\\StatusType\\:\\:setDefaultOptions\\(\\) has invalid type Symfony\\\\Component\\\\OptionsResolver\\\\OptionsResolverInterface\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Form/StatusType.php
-
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 2
-			path: src/Bundle/ChillEventBundle/Search/EventSearch.php
-
-		-
-			message: "#^Method Chill\\\\EventBundle\\\\Search\\\\EventSearch\\:\\:renderResult\\(\\) should return string but return statement is missing\\.$#"
-			count: 1
-			path: src/Bundle/ChillEventBundle/Search/EventSearch.php
-
-		-
-			message: "#^Casting to string something that's already string\\.$#"
-			count: 5
-			path: src/Bundle/ChillFamilyMembersBundle/Entity/AbstractFamilyMember.php
-
-		-
-			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
-			count: 2
-			path: src/Bundle/ChillFamilyMembersBundle/Form/FamilyMemberType.php
-
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
-
-		-
-			message: "#^Parameter \\$scope of method Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\CRUDController\\:\\:getReachableCenters\\(\\) has invalid type Chill\\\\MainBundle\\\\CRUD\\\\Controller\\\\Scope\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
-
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/CRUD/Resolver/Resolver.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\CRUD\\\\Resolver\\\\Resolver\\:\\:getConfigValue\\(\\) should return string but return statement is missing\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/CRUD/Resolver/Resolver.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Command\\\\ChillImportUsersCommand\\:\\:execute\\(\\) should return int but return statement is missing\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php
-
-		-
-			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php
-
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Command/ChillUserSendRenewPasswordCodeCommand.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Command\\\\ChillUserSendRenewPasswordCodeCommand\\:\\:execute\\(\\) should return int but return statement is missing\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Command/ChillUserSendRenewPasswordCodeCommand.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Command\\\\LoadAndUpdateLanguagesCommand\\:\\:execute\\(\\) should return int but return statement is missing\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Command/LoadAndUpdateLanguagesCommand.php
-
-		-
-			message: "#^Only booleans are allowed in a negated boolean, mixed given\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Command/LoadAndUpdateLanguagesCommand.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Command\\\\LoadCountriesCommand\\:\\:execute\\(\\) should return int but return statement is missing\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Command/LoadCountriesCommand.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Command\\\\LoadPostalCodesCommand\\:\\:execute\\(\\) should return int but return statement is missing\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Command/LoadPostalCodesCommand.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Command\\\\SetPasswordCommand\\:\\:execute\\(\\) should return int but return statement is missing\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Command/SetPasswordCommand.php
-
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/PasswordController.php
-
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Controller/PostalCodeController.php
-
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/DependencyInjection/Widget/AbstractWidgetsCompilerPass.php
-
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Entity/Address.php
-
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Entity/User.php
-
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/ChoiceLoader/PostalCodeChoiceLoader.php
-
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/DataMapper/AddressDataMapper.php
-
-		-
-			message: "#^Only booleans are allowed in a negated boolean, mixed given\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Form/Type/AddressType.php
-
-		-
-			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Form/Type/AddressType.php
-
-		-
-			message: "#^Only booleans are allowed in a negated boolean, mixed given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Form/Type/ChillTextareaType.php
-
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 3
-			path: src/Bundle/ChillMainBundle/Form/Type/DataTransformer/DateIntervalTransformer.php
-
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 2
-			path: src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
-
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Security/PasswordRecover/PasswordRecoverEvent.php
-
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Security/PasswordRecover/TokenManager.php
-
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php
-
-		-
-			message: "#^Method Chill\\\\MainBundle\\\\Timeline\\\\TimelineBuilder\\:\\:getTemplateData\\(\\) should return array but return statement is missing\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Timeline/TimelineBuilder.php
-
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Actions/Remove/PersonMove.php
-
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/CRUD/Controller/OneToOneEntityPersonCRUDController.php
-
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Command/ChillPersonMoveCommand.php
-
-		-
-			message: "#^Method Chill\\\\PersonBundle\\\\Command\\\\ChillPersonMoveCommand\\:\\:execute\\(\\) should return int but return statement is missing\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Command/ChillPersonMoveCommand.php
-
-		-
-			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Command/ChillPersonMoveCommand.php
-
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php
-
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Form/DataMapper/PersonAltNameDataMapper.php
-
-		-
-			message: "#^Only booleans are allowed in a ternary operator condition, mixed given\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Form/Type/PersonAltNameType.php
-
-		-
-			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Form/Type/PersonPhoneType.php
-
-		-
-			message: "#^Method Chill\\\\PersonBundle\\\\Search\\\\PersonSearch\\:\\:renderResult\\(\\) should return string but return statement is missing\\.$#"
-			count: 1
-			path: src/Bundle/ChillPersonBundle/Search/PersonSearch.php
-
-		-
-			message: "#^Method Chill\\\\ReportBundle\\\\DataFixtures\\\\ORM\\\\LoadReports\\:\\:getRandomChoice\\(\\) should return array\\<string\\>\\|string but return statement is missing\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/DataFixtures/ORM/LoadReports.php
-
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 2
-			path: src/Bundle/ChillReportBundle/Export/Export/ReportList.php
-
-		-
-			message: "#^Method Chill\\\\ReportBundle\\\\Security\\\\Authorization\\\\ReportVoter\\:\\:supports\\(\\) should return bool but return statement is missing\\.$#"
-			count: 1
-			path: src/Bundle/ChillReportBundle/Security/Authorization/ReportVoter.php
-
-		-
-			message: "#^Casting to string something that's already string\\.$#"
-			count: 3
-			path: src/Bundle/ChillTaskBundle/Entity/AbstractTask.php
-
-		-
-			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
-			count: 2
-			path: src/Bundle/ChillTaskBundle/Form/SingleTaskListType.php
-
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Repository/SingleTaskAclAwareRepository.php
-
-		-
-			message: "#^Construct empty\\(\\) is not allowed\\. Use more strict comparison\\.$#"
-			count: 5
-			path: src/Bundle/ChillTaskBundle/Repository/SingleTaskRepository.php
-
-		-
-			message: "#^Method Chill\\\\TaskBundle\\\\Timeline\\\\SingleTaskTaskLifeCycleEventTimelineProvider\\:\\:getTransitionByName\\(\\) should return Symfony\\\\Component\\\\Workflow\\\\Transition but return statement is missing\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Timeline/SingleTaskTaskLifeCycleEventTimelineProvider.php
-
-		-
-			message: "#^Method Chill\\\\TaskBundle\\\\Timeline\\\\TaskLifeCycleEventTimelineProvider\\:\\:getTransitionByName\\(\\) should return Symfony\\\\Component\\\\Workflow\\\\Transition but return statement is missing\\.$#"
-			count: 1
-			path: src/Bundle/ChillTaskBundle/Timeline/TaskLifeCycleEventTimelineProvider.php
-
-		-
-			message: "#^Method Chill\\\\ThirdPartyBundle\\\\Search\\\\ThirdPartySearch\\:\\:renderResult\\(\\) should return string but return statement is missing\\.$#"
-			count: 1
-			path: src/Bundle/ChillThirdPartyBundle/Search/ThirdPartySearch.php
-
diff --git a/phpstan.dist.neon b/phpstan.dist.neon
index ec4045858..feb453c81 100644
--- a/phpstan.dist.neon
+++ b/phpstan.dist.neon
@@ -24,14 +24,4 @@ parameters:
 
 includes:
     - phpstan-baseline.neon
-    - phpstan-critical.neon
-    - phpstan-deprecations.neon
-    - phpstan-types.neon
-    - phpstan-baseline-level-2.neon
-    - phpstan-baseline-level-3.neon
-    - phpstan-baseline-level-4.neon
-    - phpstan-baseline-level-5.neon
-    - phpstan-deprecations-sf54.neon
-    - phpstan-baseline-deprecations-doctrine-orm.neon
-    - phpstan-baseline-2024-05.neon
 

From 631ae3eedd1b8c904aa88eac229b7e48da2cb3d2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 2 Jun 2025 11:46:25 +0200
Subject: [PATCH 116/283] first impl for junie guildelines

---
 .junie/guidelines.md | 101 +++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 101 insertions(+)
 create mode 100644 .junie/guidelines.md

diff --git a/.junie/guidelines.md b/.junie/guidelines.md
new file mode 100644
index 000000000..482e33232
--- /dev/null
+++ b/.junie/guidelines.md
@@ -0,0 +1,101 @@
+# Project Guidelines for Junie
+
+## Project Overview
+
+Chill is a comprehensive web application built as a set of Symfony bundles. It is a case management system, for social work. The project consists of multiple specialized bundles that provide different functionalities:
+
+- **ChillMainBundle**: Core bundles that provide the foundation of the application
+- **ChillPersonBundle**: Core bundles that provide the foundation of the bundles associated to person (which is the case for all other bundles)
+- **ChillCalendarBundle**: Calendar and scheduling functionality
+- **ChillDocStoreBundle** and **ChillDocGeneratorBundle**: Document management and generation
+- **ChillActivityBundle**, **ChillEventBundle**, **ChillTaskBundle**: Activity and task tracking
+- **ChillBudgetBundle**: Financial management
+- **ChillThirdPartyBundle**: Integration with external systems
+- **ChillCustomFieldsBundle**: Extensibility through custom fields
+- **ChillReportBundle**: Reporting capabilities
+- And several other specialized bundles
+
+## Technology Stack
+
+- **Backend**: PHP 8.3+, Symfony 5.4
+- **Frontend**: JavaScript/TypeScript, Vue.js 3, Bootstrap 5
+- **Build Tools**: Webpack Encore, Yarn
+- **Database**: PostgreSQL with materialized views
+- **Other Services**: Redis, AMQP (RabbitMQ), SMTP
+
+## Project Structure
+
+Note: This is a project which exists from a long time ago, and we found multiple structure inside each bundle. When having the choice, the developers should choose the new structure.
+
+The project follows a standard Symfony bundle structure:
+- `/src/Bundle/`: Contains all the Chill bundles. The code is either at the root of the bundle directory, or within a `src/` directory (preferred). See psr4 mapping at the root's `composer.json`.
+- each bundle come with his own tests, either in the `Tests` directory (when the code is directly within the bundle directory (for instance `src/Bundle/ChillMainBundle/Tests`, `src/Bundle/ChillPersonBundle/Tests`)), or inside the `tests` directory, alongside to the `src/` sub-directory (example: `src/Bundle/ChillWopiBundle/tests`) (this is the preferred way).
+- `/docs/`: Contains project documentation
+
+Each bundle typically has the following structure:
+
+- `Controller/`: Contains controllers
+- `Entity/`: Contains Doctrine entities
+- `Repository/`: Contains Doctrine repositories
+- `Resources/`: Contains views, translations, and public assets
+- `DependencyInjection/`: Contains service configuration
+- `Export/`: Contains services related to exports
+- `Security/`: Contains services related to security. Most of the time, those are new voters, and so on.
+
+## Development Guidelines
+
+### Building the Project
+
+Before submitting any changes, you should build the project to ensure that all assets are properly compiled:
+
+```bash
+yarn run encore production
+```
+
+For development with hot-reloading:
+
+```bash
+yarn run encore dev --watch
+```
+
+### Testing
+
+The project uses PHPUnit for testing. Each bundle has its own test suite, and there's also a global test suite at the root level. When making changes, you should run the relevant tests to ensure that your changes don't break existing functionality.
+
+The tests are run globally, but each bundle is within a test suite.
+
+```bash
+# to run test for a bundle "Name":
+vendor/bin/phpunit --testsuite NameBundle
+```
+
+### Code Style
+
+The project uses ESLint for JavaScript/TypeScript code quality. You can run the linter with:
+
+```bash
+yarn run eslint
+```
+
+For PHP, we use three tools:
+
+- php-cs-fixer, that we can run using globally installed php-cs-fixer command;
+- phpstan, that we can run using `vendor/bin/phpstan`. We use level phpstan level 5.
+- rector, that we can run using `vendor/bin/rector`.
+
+## Deployment
+
+The project can be deployed in a production environment following Symfony's deployment guidelines. The documentation provides detailed instructions for setting up a production environment.
+
+## Documentation
+
+Comprehensive documentation is available in the `/docs/` directory, including installation instructions, configuration guides, and operational procedures.
+
+## Conclusion
+
+When working with this project, Junie should:
+
+1. Understand the modular bundle structure and how the different components interact
+2. Build the project before submitting changes to ensure assets are properly compiled
+3. Run relevant tests to ensure changes don't break existing functionality
+4. Follow the established code style and patterns

From f1a5b5c49eefb9ccd2f666e45acf5a7a636a77b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 2 Jun 2025 15:32:52 +0200
Subject: [PATCH 117/283] add info for junie

---
 .junie/guidelines.md | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/.junie/guidelines.md b/.junie/guidelines.md
index 482e33232..51915484c 100644
--- a/.junie/guidelines.md
+++ b/.junie/guidelines.md
@@ -12,7 +12,9 @@ Chill is a comprehensive web application built as a set of Symfony bundles. It i
 - **ChillBudgetBundle**: Financial management
 - **ChillThirdPartyBundle**: Integration with external systems
 - **ChillCustomFieldsBundle**: Extensibility through custom fields
-- **ChillReportBundle**: Reporting capabilities
+- **ChillReportBundle**: Save arbitrary reports about persons
+- **ChillTicketBundle**: Record and track issues about persons
+
 - And several other specialized bundles
 
 ## Technology Stack
@@ -42,6 +44,10 @@ Each bundle typically has the following structure:
 - `Export/`: Contains services related to exports
 - `Security/`: Contains services related to security. Most of the time, those are new voters, and so on.
 
+### A special word about TicketBundle
+
+The ticket bundle is developed using a kind of "Command" pattern. The controller fill a "Command", and a "CommandHandler" handle this command. They are savec in the `src/Bundle/ChillTicketBundle/src/Action` directory.
+
 ## Development Guidelines
 
 ### Building the Project

From fc61dfdf3a928b56ed22c6b03894898f866ecdab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 2 Jun 2025 15:51:11 +0200
Subject: [PATCH 118/283] Fix CS and add more comments within ticket bundle

---
 .../GeographicalUnitStatAggregator.php             |  2 +-
 .../PersonACLAwareRepositoryInterface.php          |  2 +-
 .../src/Action/Ticket/AddAddresseeCommand.php      |  2 +-
 .../src/Action/Ticket/SetAddresseesCommand.php     |  2 +-
 .../src/Action/Ticket/SetPersonsCommand.php        |  2 +-
 .../src/Controller/EditTicketController.php        |  4 ++--
 .../src/Entity/AddresseeHistory.php                |  7 +++++++
 .../ChillTicketBundle/src/Entity/Comment.php       |  5 +++++
 .../ChillTicketBundle/src/Entity/InputHistory.php  |  5 +++++
 .../ChillTicketBundle/src/Entity/MotiveHistory.php |  8 +++++++-
 .../ChillTicketBundle/src/Entity/PersonHistory.php |  4 ++++
 src/Bundle/ChillTicketBundle/src/Entity/Ticket.php | 14 ++++++++++++++
 .../SetAddresseesCommandDenormalizer.php           |  2 +-
 13 files changed, 50 insertions(+), 9 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregator.php b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregator.php
index ffa5501dd..caf8808cf 100644
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregator.php
@@ -31,7 +31,7 @@ final readonly class GeographicalUnitStatAggregator implements AggregatorInterfa
     public function __construct(
         private GeographicalUnitLayerRepositoryInterface $geographicalUnitLayerRepository,
         private TranslatableStringHelperInterface $translatableStringHelper,
-        private RollingDateConverterInterface $rollingDateConverter
+        private RollingDateConverterInterface $rollingDateConverter,
     ) {}
 
     public function addRole(): ?string
diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepositoryInterface.php b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepositoryInterface.php
index d63c25bd8..aeaefecd4 100644
--- a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepositoryInterface.php
@@ -68,6 +68,6 @@ interface PersonACLAwareRepositoryInterface
     public function findByPhone(
         PhoneNumber $phoneNumber,
         int $start = 0,
-        int $limit = 20
+        int $limit = 20,
     ): array;
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Action/Ticket/AddAddresseeCommand.php b/src/Bundle/ChillTicketBundle/src/Action/Ticket/AddAddresseeCommand.php
index d7f9c545f..0e16876d8 100644
--- a/src/Bundle/ChillTicketBundle/src/Action/Ticket/AddAddresseeCommand.php
+++ b/src/Bundle/ChillTicketBundle/src/Action/Ticket/AddAddresseeCommand.php
@@ -24,6 +24,6 @@ final readonly class AddAddresseeCommand
 {
     public function __construct(
         #[Groups(['read'])]
-        public User|UserGroup $addressee
+        public User|UserGroup $addressee,
     ) {}
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Action/Ticket/SetAddresseesCommand.php b/src/Bundle/ChillTicketBundle/src/Action/Ticket/SetAddresseesCommand.php
index e0d474d11..f258731f7 100644
--- a/src/Bundle/ChillTicketBundle/src/Action/Ticket/SetAddresseesCommand.php
+++ b/src/Bundle/ChillTicketBundle/src/Action/Ticket/SetAddresseesCommand.php
@@ -27,7 +27,7 @@ final readonly class SetAddresseesCommand
         #[UserGroupDoNotExclude]
         #[GreaterThan(0)]
         #[Groups(['read'])]
-        public array $addressees
+        public array $addressees,
     ) {}
 
     public static function fromAddAddresseeCommand(AddAddresseeCommand $command, Ticket $ticket): self
diff --git a/src/Bundle/ChillTicketBundle/src/Action/Ticket/SetPersonsCommand.php b/src/Bundle/ChillTicketBundle/src/Action/Ticket/SetPersonsCommand.php
index 6bd47a567..69ba61977 100644
--- a/src/Bundle/ChillTicketBundle/src/Action/Ticket/SetPersonsCommand.php
+++ b/src/Bundle/ChillTicketBundle/src/Action/Ticket/SetPersonsCommand.php
@@ -23,6 +23,6 @@ class SetPersonsCommand
          */
         #[GreaterThan(0)]
         #[Groups(['read'])]
-        public array $persons
+        public array $persons,
     ) {}
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Controller/EditTicketController.php b/src/Bundle/ChillTicketBundle/src/Controller/EditTicketController.php
index 0e8fcd7e5..fcff2aa56 100644
--- a/src/Bundle/ChillTicketBundle/src/Controller/EditTicketController.php
+++ b/src/Bundle/ChillTicketBundle/src/Controller/EditTicketController.php
@@ -19,12 +19,12 @@ use Twig\Environment;
 class EditTicketController
 {
     public function __construct(
-        private Environment $templating
+        private Environment $templating,
     ) {}
 
     #[Route('/{_locale}/ticket/ticket/{id}/edit', name: 'chill_ticket_ticket_edit')]
     public function __invoke(
-        Ticket $ticket
+        Ticket $ticket,
     ): Response {
         return new Response(
             $this->templating->render(
diff --git a/src/Bundle/ChillTicketBundle/src/Entity/AddresseeHistory.php b/src/Bundle/ChillTicketBundle/src/Entity/AddresseeHistory.php
index 2717df2a5..ee1d87dee 100644
--- a/src/Bundle/ChillTicketBundle/src/Entity/AddresseeHistory.php
+++ b/src/Bundle/ChillTicketBundle/src/Entity/AddresseeHistory.php
@@ -20,6 +20,13 @@ use Chill\MainBundle\Entity\UserGroup;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation as Serializer;
 
+/**
+ * Represents the history entity for addressees in the context of a ticketing system.
+ *
+ * Tracks information about addressees for a specific ticket, including user or group associability,
+ * timestamps marking the start and end of the association, and the removal of assignments.
+ * Implements mechanisms for tracking entity creation and updates.
+ */
 #[ORM\Entity()]
 #[ORM\Table(name: 'addressee_history', schema: 'chill_ticket')]
 #[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['ticket_addressee_history' => AddresseeHistory::class])]
diff --git a/src/Bundle/ChillTicketBundle/src/Entity/Comment.php b/src/Bundle/ChillTicketBundle/src/Entity/Comment.php
index 8e11ff489..8da2342ee 100644
--- a/src/Bundle/ChillTicketBundle/src/Entity/Comment.php
+++ b/src/Bundle/ChillTicketBundle/src/Entity/Comment.php
@@ -19,6 +19,11 @@ use Doctrine\ORM\Mapping as ORM;
 use Doctrine\ORM\Mapping\JoinColumn;
 use Symfony\Component\Serializer\Annotation as Serializer;
 
+/**
+ * Represents a comment entity within the application.
+ *
+ * This entity is associated with a specific ticket and includes creation and update tracking.
+ */
 #[ORM\Entity()]
 #[ORM\Table(name: 'comment', schema: 'chill_ticket')]
 #[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['ticket_comment' => Comment::class])]
diff --git a/src/Bundle/ChillTicketBundle/src/Entity/InputHistory.php b/src/Bundle/ChillTicketBundle/src/Entity/InputHistory.php
index 2b25ae6ac..a43bf7a1f 100644
--- a/src/Bundle/ChillTicketBundle/src/Entity/InputHistory.php
+++ b/src/Bundle/ChillTicketBundle/src/Entity/InputHistory.php
@@ -16,6 +16,11 @@ use Chill\PersonBundle\Entity\Person;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Doctrine\ORM\Mapping as ORM;
 
+/**
+ * History of input for a single ticket.
+ *
+ * An input is someone who triggered the opening of the ticket. Typically, it's the "caller" of a call.
+ */
 #[ORM\Entity()]
 #[ORM\Table(name: 'input_history', schema: 'chill_ticket')]
 class InputHistory
diff --git a/src/Bundle/ChillTicketBundle/src/Entity/MotiveHistory.php b/src/Bundle/ChillTicketBundle/src/Entity/MotiveHistory.php
index 1922459e8..e2902aae3 100644
--- a/src/Bundle/ChillTicketBundle/src/Entity/MotiveHistory.php
+++ b/src/Bundle/ChillTicketBundle/src/Entity/MotiveHistory.php
@@ -16,6 +16,12 @@ use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation as Serializer;
 
+/**
+ * Represents the history of a motive associated with a ticket.
+ *
+ * This entity is used to track the changes in a ticket's motive over time.
+ * Implements the TrackCreationInterface for tracking entity lifecycle creation.
+ */
 #[ORM\Entity]
 #[ORM\Table(name: 'motives_history', schema: 'chill_ticket')]
 #[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['ticket_motive_history' => MotiveHistory::class])]
@@ -43,7 +49,7 @@ class MotiveHistory implements TrackCreationInterface
         private Ticket $ticket,
         #[ORM\Column(type: \Doctrine\DBAL\Types\Types::DATETIME_IMMUTABLE, nullable: false)]
         #[Serializer\Groups(['read'])]
-        private \DateTimeImmutable $startDate = new \DateTimeImmutable('now')
+        private \DateTimeImmutable $startDate = new \DateTimeImmutable('now'),
     ) {
         $ticket->addMotiveHistory($this);
     }
diff --git a/src/Bundle/ChillTicketBundle/src/Entity/PersonHistory.php b/src/Bundle/ChillTicketBundle/src/Entity/PersonHistory.php
index 1fce78fa1..042b7395b 100644
--- a/src/Bundle/ChillTicketBundle/src/Entity/PersonHistory.php
+++ b/src/Bundle/ChillTicketBundle/src/Entity/PersonHistory.php
@@ -18,6 +18,10 @@ use Chill\PersonBundle\Entity\Person;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation as Serializer;
 
+/**
+ * Represents a history entity associated with a person and a ticket.
+ * Tracks the start date, end date, and the user who removed the entry (if applicable).
+ */
 #[ORM\Entity]
 #[ORM\Table(name: 'person_history', schema: 'chill_ticket')]
 #[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['ticket_person_history' => PersonHistory::class])]
diff --git a/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php b/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php
index 04cfe828b..84b07eb17 100644
--- a/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php
+++ b/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php
@@ -24,6 +24,20 @@ use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\ReadableCollection;
 use Doctrine\ORM\Mapping as ORM;
 
+/**
+ * This entity represents a `Ticket` in the application and provides functionality for managing its associated
+ * histories, comments, and current data such as addressees, inputs, and motives.
+ *
+ * Most of the associated data are handle through "histories", with a many-to-one relationship (a ticket may have multiple)
+ * history. The history contains the associated data (see below) and start dates and end dates.
+ *
+ * There are histories for:
+ *
+ * - association between the ticket and persons: @see{PersonHistory};
+ * - association between the ticket and motive: @see{MotiveHistory};
+ * - association between the ticket and addresses: @see{AddresseeHistory};
+ * - association between the ticket and input: @see{InputHistory};
+ */
 #[ORM\Entity]
 #[ORM\Table(name: 'ticket', schema: 'chill_ticket')]
 class Ticket implements TrackCreationInterface, TrackUpdateInterface
diff --git a/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/SetAddresseesCommandDenormalizer.php b/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/SetAddresseesCommandDenormalizer.php
index d97ca5d92..86a843cd5 100644
--- a/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/SetAddresseesCommandDenormalizer.php
+++ b/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/SetAddresseesCommandDenormalizer.php
@@ -42,7 +42,7 @@ final class SetAddresseesCommandDenormalizer implements DenormalizerInterface, D
             $addresses[] = match ($address['type'] ?? '') {
                 'user_group' => $this->denormalizer->denormalize($address, UserGroup::class, $format, $context),
                 'user' => $this->denormalizer->denormalize($address, User::class, $format, $context),
-                default => throw new UnexpectedValueException('the type is not set or not supported')
+                default => throw new UnexpectedValueException('the type is not set or not supported'),
             };
         }
 

From 7633e587bb3ad1a2ca300662b2026b5d71a7ac5b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 2 Jun 2025 16:02:33 +0200
Subject: [PATCH 119/283] Expand and refine development guidelines

Added detailed setup instructions, including Docker and asset management steps. Updated guidelines on testing structure, code quality tools, debugging, and deployment processes. Enhanced clarity and streamlined processes for developers. Updated `TicketTest` with additional tests for `externalRef`.
---
 .junie/guidelines.md                          | 239 ++++++++++++++++--
 .../tests/Entity/TicketTest.php               |  19 ++
 2 files changed, 241 insertions(+), 17 deletions(-)

diff --git a/.junie/guidelines.md b/.junie/guidelines.md
index 51915484c..8ef0b7c8d 100644
--- a/.junie/guidelines.md
+++ b/.junie/guidelines.md
@@ -50,53 +50,257 @@ The ticket bundle is developed using a kind of "Command" pattern. The controller
 
 ## Development Guidelines
 
-### Building the Project
+### Building and Configuration Instructions
+
+All the command should be run through the `symfony` command, which will configure the required variables.
+
+For assets, we must ensure that we use node at version `^20.0.0`. This is done using `nvm use 20`.
+
+#### Initial Setup
+
+1. **Clone the Repository**:
+   ```bash
+   git clone <repository-url>
+   cd chill-bundles
+   ```
+
+2. **Install PHP Dependencies**:
+   ```bash
+   composer install
+   ```
+
+3. **Install JavaScript Dependencies**:
+   ```bash
+   nvm use 20
+   yarn install
+   ```
+
+4. **Configure Environment Variables**:
+
+   - Create a `.env.local` file with minimal configuration
+   ```bash
+   echo "APP_ENV=dev" >> .env.local
+   ```
+
+5. Start the associated services (database, and so on):
+   ```bash
+   docker compose up -d
+   ```
+
+5. **Set Up the Database**:
+   ```bash
+   # Create the database
+   symfony console doctrine:database:create
+
+   # Run migrations
+   symfony console doctrine:migrations:migrate
+
+   # Load fixtures (optional)
+   symfony console doctrine:fixtures:load
+   ```
+
+6. **Build Assets**:
+   ```bash
+   nvm use 20
+   yarn run encore dev
+   ```
+
+7. **Start the Development Server**:
+   ```bash
+   symfony server:start -d
+   ```
+
+#### Docker Setup
+
+The project includes Docker configuration for easier development:
+
+1. **Start Docker Services**:
+   ```bash
+   docker-compose up -d
+   ```
+
+2. **Access the Application**:
+   - The application will be available at `http://localhost:8000`
+   - PostgreSQL will be available at `localhost:5432`
+   - Redis will be available at `localhost:6379`
+
+#### Building Assets
 
 Before submitting any changes, you should build the project to ensure that all assets are properly compiled:
 
 ```bash
+# For production
 yarn run encore production
-```
 
-For development with hot-reloading:
-
-```bash
+# For development with hot-reloading
 yarn run encore dev --watch
+
+# for development
+yarn run encore dev
 ```
 
-### Testing
+#### Configuration Files
 
-The project uses PHPUnit for testing. Each bundle has its own test suite, and there's also a global test suite at the root level. When making changes, you should run the relevant tests to ensure that your changes don't break existing functionality.
+Key configuration files:
 
-The tests are run globally, but each bundle is within a test suite.
+- `config/packages/*.yaml`: Symfony bundle configurations
+- `webpack.config.js`: Webpack Encore configuration
+- `composer.json`: PHP dependencies and scripts
+- `package.json`: JavaScript dependencies and scripts
+- `.env`: Default environment variables. Must usually not be updated: use `.env.local` instead.
+
+### Testing Information
+
+The project uses PHPUnit for testing. Each bundle has its own test suite, and there's also a global test suite at the root level.
+
+For creating mock, we prefer using prophecy (library phpspec/prophecy).
+
+#### Running Tests
 
 ```bash
-# to run test for a bundle "Name":
+# Run all tests
+vendor/bin/phpunit
+
+# Run tests for a specific bundle
 vendor/bin/phpunit --testsuite NameBundle
+
+# Run a specific test file
+vendor/bin/phpunit path/to/TestFile.php
+
+# Run a specific test method
+vendor/bin/phpunit --filter methodName path/to/TestFile.php
 ```
 
-### Code Style
+#### Test Structure
 
-The project uses ESLint for JavaScript/TypeScript code quality. You can run the linter with:
+Tests are organized by bundle and follow the same structure as the bundle itself:
+
+- Unit tests: Test individual components in isolation
+- Integration tests: Test components working together
+- Functional tests: Test the application from the user's perspective
+
+#### Writing Tests
+
+Tests should be placed in the appropriate bundle's test directory. For example, tests for the TicketBundle should be placed in `src/Bundle/ChillTicketBundle/tests/`.
+
+Here's an example of a simple entity test:
+
+```php
+<?php
+
+namespace Chill\TicketBundle\Tests\Entity;
+
+use Chill\TicketBundle\Entity\Ticket;
+use PHPUnit\Framework\TestCase;
+
+class TicketTest extends TestCase
+{
+    public function testGetAndSetExternalRef(): void
+    {
+        $ticket = new Ticket();
+        $externalRef = 'REF-123';
+
+        // Set the external reference
+        $ticket->setExternalRef($externalRef);
+
+        // Verify that getExternalRef returns the correct value
+        self::assertSame($externalRef, $ticket->getExternalRef());
+
+        // Change the external reference
+        $newExternalRef = 'REF-456';
+        $ticket->setExternalRef($newExternalRef);
+
+        // Verify that getExternalRef returns the updated value
+        self::assertSame($newExternalRef, $ticket->getExternalRef());
+    }
+}
+```
+
+#### Test Database
+
+For tests that require a database, the project uses an in-memory SQLite database by default. You can configure a different database for testing in the `.env.test` file.
+
+### Code Quality Tools
+
+The project uses several tools to maintain code quality:
+
+#### PHP Code Style
+
+The project uses PHP-CS-Fixer for code style. You can run it with:
+
+```bash
+# Using the composer script
+composer php-cs-fixer
+
+# Or directly
+php-cs-fixer fix --config=./.php-cs-fixer.dist.php
+```
+
+#### Static Analysis
+
+The project uses PHPStan for static analysis. You can run it with:
+
+```bash
+# Using the composer script
+composer phpstan
+
+# Or directly
+vendor/bin/phpstan analyse
+```
+
+#### Automated Refactoring
+
+The project uses Rector for automated refactoring. You can run it with:
+
+```bash
+# Using the composer script
+composer rector
+
+# Or directly
+vendor/bin/rector
+```
+
+#### JavaScript/TypeScript Linting
+
+The project uses ESLint for JavaScript/TypeScript code quality. You can run it with:
 
 ```bash
 yarn run eslint
 ```
 
-For PHP, we use three tools:
-
-- php-cs-fixer, that we can run using globally installed php-cs-fixer command;
-- phpstan, that we can run using `vendor/bin/phpstan`. We use level phpstan level 5.
-- rector, that we can run using `vendor/bin/rector`.
-
 ## Deployment
 
 The project can be deployed in a production environment following Symfony's deployment guidelines. The documentation provides detailed instructions for setting up a production environment.
 
+### Production Deployment Checklist
+
+1. Set environment variables for production
+2. Optimize Composer autoloader: `composer install --no-dev --optimize-autoloader`
+3. Compile assets for production: `yarn run encore production`
+4. Clear and warm up the cache: `php bin/console cache:clear --env=prod`
+5. Run database migrations: `php bin/console doctrine:migrations:migrate --env=prod`
+
 ## Documentation
 
 Comprehensive documentation is available in the `/docs/` directory, including installation instructions, configuration guides, and operational procedures.
 
+## Development Workflow
+
+1. **Create a Feature Branch**: Always create a new branch for your feature or bugfix
+2. **Write Tests**: Write tests for your changes before implementing them
+3. **Implement Changes**: Implement your changes following the project's coding standards
+4. **Run Tests**: Make sure all tests pass
+5. **Run Code Quality Tools**: Make sure your code passes all code quality checks
+6. **Submit a Pull Request**: Submit a pull request for review
+
+## Debugging
+
+The project includes several tools for debugging:
+
+- **Symfony Profiler**: Available in development mode at `/_profiler`
+- **Xdebug**: Configure your IDE to use Xdebug for step-by-step debugging
+- **Symfony Debug Toolbar**: Available at the bottom of the page in development mode
+
 ## Conclusion
 
 When working with this project, Junie should:
@@ -105,3 +309,4 @@ When working with this project, Junie should:
 2. Build the project before submitting changes to ensure assets are properly compiled
 3. Run relevant tests to ensure changes don't break existing functionality
 4. Follow the established code style and patterns
+5. Use the provided tools for debugging and code quality
diff --git a/src/Bundle/ChillTicketBundle/tests/Entity/TicketTest.php b/src/Bundle/ChillTicketBundle/tests/Entity/TicketTest.php
index f0efe5493..b3a9f0b93 100644
--- a/src/Bundle/ChillTicketBundle/tests/Entity/TicketTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Entity/TicketTest.php
@@ -89,4 +89,23 @@ class TicketTest extends KernelTestCase
         self::assertCount(1, $ticket->getCurrentAddressee());
         self::assertSame($group, $ticket->getCurrentAddressee()[0]);
     }
+
+    public function testGetAndSetExternalRef(): void
+    {
+        $ticket = new Ticket();
+        $externalRef = 'REF-123';
+
+        // Set the external reference
+        $ticket->setExternalRef($externalRef);
+
+        // Verify that getExternalRef returns the correct value
+        self::assertSame($externalRef, $ticket->getExternalRef());
+
+        // Change the external reference
+        $newExternalRef = 'REF-456';
+        $ticket->setExternalRef($newExternalRef);
+
+        // Verify that getExternalRef returns the updated value
+        self::assertSame($newExternalRef, $ticket->getExternalRef());
+    }
 }

From 2b99a480ac6e2677457b0cd4f4dd13d00dddb1f6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 3 Jun 2025 12:19:52 +0200
Subject: [PATCH 120/283] Add `StateHistory` and `StateEnum` entities to track
 ticket state changes

Integrated the `StateHistory` entity to manage state transitions in tickets and the `StateEnum` for defining state values (`open`, `closed`). Updated `Ticket` to handle associations with state histories and provide state management methods. Added migration for `state_history` table and extended `TicketTest` for state-related tests.
---
 .../src/Entity/StateEnum.php                  | 21 +++++
 .../src/Entity/StateHistory.php               | 85 ++++++++++++++++++
 .../ChillTicketBundle/src/Entity/Ticket.php   | 35 ++++++++
 .../src/migrations/Version20250603085035.php  | 89 +++++++++++++++++++
 .../tests/Entity/TicketTest.php               | 27 ++++++
 5 files changed, 257 insertions(+)
 create mode 100644 src/Bundle/ChillTicketBundle/src/Entity/StateEnum.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Entity/StateHistory.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/migrations/Version20250603085035.php

diff --git a/src/Bundle/ChillTicketBundle/src/Entity/StateEnum.php b/src/Bundle/ChillTicketBundle/src/Entity/StateEnum.php
new file mode 100644
index 000000000..0c59a1ad9
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Entity/StateEnum.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Entity;
+
+/**
+ * Represents the state of a ticket (open or closed).
+ */
+enum StateEnum: string
+{
+    case OPEN = 'open';
+    case CLOSED = 'closed';
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Entity/StateHistory.php b/src/Bundle/ChillTicketBundle/src/Entity/StateHistory.php
new file mode 100644
index 000000000..e6ddf1f88
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Entity/StateHistory.php
@@ -0,0 +1,85 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Entity;
+
+use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
+use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation as Serializer;
+
+/**
+ * Represents the history of a state associated with a ticket.
+ *
+ * This entity is used to track the changes in a ticket's state over time.
+ * Implements the TrackCreationInterface for tracking entity lifecycle creation.
+ */
+#[ORM\Entity]
+#[ORM\Table(name: 'state_history', schema: 'chill_ticket')]
+#[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['ticket_state_history' => StateHistory::class])]
+class StateHistory implements TrackCreationInterface
+{
+    use TrackCreationTrait;
+
+    #[ORM\Id]
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::INTEGER, nullable: false)]
+    #[ORM\GeneratedValue(strategy: 'AUTO')]
+    #[Serializer\Groups(['read'])]
+    private ?int $id = null;
+
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::DATETIME_IMMUTABLE, nullable: true, options: ['default' => null])]
+    #[Serializer\Groups(['read'])]
+    private ?\DateTimeImmutable $endDate = null;
+
+    public function __construct(
+        #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, nullable: false, enumType: StateEnum::class)]
+        #[Serializer\Groups(['read'])]
+        private StateEnum $state,
+        #[ORM\ManyToOne(targetEntity: Ticket::class)]
+        #[ORM\JoinColumn(nullable: false)]
+        private Ticket $ticket,
+        #[ORM\Column(type: \Doctrine\DBAL\Types\Types::DATETIME_IMMUTABLE, nullable: false)]
+        #[Serializer\Groups(['read'])]
+        private \DateTimeImmutable $startDate = new \DateTimeImmutable('now'),
+    ) {
+        $ticket->addStateHistory($this);
+    }
+
+    public function getEndDate(): ?\DateTimeImmutable
+    {
+        return $this->endDate;
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getState(): StateEnum
+    {
+        return $this->state;
+    }
+
+    public function getStartDate(): \DateTimeImmutable
+    {
+        return $this->startDate;
+    }
+
+    public function getTicket(): Ticket
+    {
+        return $this->ticket;
+    }
+
+    public function setEndDate(?\DateTimeImmutable $endDate): void
+    {
+        $this->endDate = $endDate;
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php b/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php
index 84b07eb17..128c27502 100644
--- a/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php
+++ b/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php
@@ -37,6 +37,7 @@ use Doctrine\ORM\Mapping as ORM;
  * - association between the ticket and motive: @see{MotiveHistory};
  * - association between the ticket and addresses: @see{AddresseeHistory};
  * - association between the ticket and input: @see{InputHistory};
+ * - association between the ticket and state: @see{StateHistory};
  */
 #[ORM\Entity]
 #[ORM\Table(name: 'ticket', schema: 'chill_ticket')]
@@ -83,6 +84,12 @@ class Ticket implements TrackCreationInterface, TrackUpdateInterface
     #[ORM\OneToMany(targetEntity: PersonHistory::class, mappedBy: 'ticket')]
     private Collection $personHistories;
 
+    /**
+     * @var Collection<int, StateHistory>
+     */
+    #[ORM\OneToMany(targetEntity: StateHistory::class, mappedBy: 'ticket', cascade: ['persist', 'remove'])]
+    private Collection $stateHistories;
+
     public function __construct()
     {
         $this->addresseeHistory = new ArrayCollection();
@@ -90,6 +97,7 @@ class Ticket implements TrackCreationInterface, TrackUpdateInterface
         $this->motiveHistories = new ArrayCollection();
         $this->personHistories = new ArrayCollection();
         $this->inputHistories = new ArrayCollection();
+        $this->stateHistories = new ArrayCollection();
     }
 
     public function getId(): ?int
@@ -225,4 +233,31 @@ class Ticket implements TrackCreationInterface, TrackUpdateInterface
     {
         return $this->addresseeHistory;
     }
+
+    /**
+     * @internal use @see{StateHistory::__construct} instead
+     */
+    public function addStateHistory(StateHistory $stateHistory): void
+    {
+        $this->stateHistories->add($stateHistory);
+    }
+
+    public function getState(): ?StateEnum
+    {
+        foreach ($this->stateHistories as $stateHistory) {
+            if (null === $stateHistory->getEndDate()) {
+                return $stateHistory->getState();
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * @return ReadableCollection<int, StateHistory>
+     */
+    public function getStateHistories(): ReadableCollection
+    {
+        return $this->stateHistories;
+    }
 }
diff --git a/src/Bundle/ChillTicketBundle/src/migrations/Version20250603085035.php b/src/Bundle/ChillTicketBundle/src/migrations/Version20250603085035.php
new file mode 100644
index 000000000..a99f550c5
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/migrations/Version20250603085035.php
@@ -0,0 +1,89 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\Migrations\Ticket;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20250603085035 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add a state to tickets';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql(<<<'SQL'
+            CREATE SEQUENCE chill_ticket.state_history_id_seq INCREMENT BY 1 MINVALUE 1 START 1
+        SQL);
+        $this->addSql(<<<'SQL'
+            CREATE TABLE chill_ticket.state_history (id INT NOT NULL, ticket_id INT NOT NULL,
+            endDate TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, state VARCHAR(255) NOT NULL,
+            startDate TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL DEFAULT CURRENT_TIMESTAMP,
+            createdAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL,
+            createdBy_id INT DEFAULT NULL, PRIMARY KEY(id))
+        SQL);
+        $this->addSql(<<<'SQL'
+            CREATE INDEX IDX_B1DCD379700047D2 ON chill_ticket.state_history (ticket_id)
+        SQL);
+        $this->addSql(<<<'SQL'
+            CREATE INDEX IDX_B1DCD3793174800F ON chill_ticket.state_history (createdBy_id)
+        SQL);
+        $this->addSql(<<<'SQL'
+            COMMENT ON COLUMN chill_ticket.state_history.endDate IS '(DC2Type:datetime_immutable)'
+        SQL);
+        $this->addSql(<<<'SQL'
+            COMMENT ON COLUMN chill_ticket.state_history.startDate IS '(DC2Type:datetime_immutable)'
+        SQL);
+        $this->addSql(<<<'SQL'
+            COMMENT ON COLUMN chill_ticket.state_history.createdAt IS '(DC2Type:datetime_immutable)'
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE chill_ticket.state_history ADD CONSTRAINT FK_B1DCD379700047D2 FOREIGN KEY (ticket_id)
+            REFERENCES chill_ticket.ticket (id) NOT DEFERRABLE INITIALLY IMMEDIATE
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE chill_ticket.state_history ADD CONSTRAINT FK_B1DCD3793174800F FOREIGN KEY (createdBy_id)
+            REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE chill_ticket.state_history ADD CONSTRAINT ticket_state_not_overlaps
+            exclude using gist (ticket_id with =, tsrange(startdate, enddate) with &&)
+            deferrable initially deferred
+        SQL);
+        $this->addSql(<<<'SQL'
+            INSERT INTO chill_ticket.state_history  (id, ticket_id, state, startDate, createdAt, createdBy_id)
+            SELECT nextval('chill_ticket.state_history_id_seq'), id, 'open', createdAt, createdAt, createdBy_id
+            FROM chill_ticket.ticket
+        SQL);
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql(<<<'SQL'
+            DROP SEQUENCE chill_ticket.state_history_id_seq CASCADE
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE chill_ticket.state_history DROP CONSTRAINT FK_B1DCD379700047D2
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE chill_ticket.state_history DROP CONSTRAINT FK_B1DCD3793174800F
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE chill_ticket.state_history DROP CONSTRAINT ticket_state_not_overlaps
+        SQL);
+        $this->addSql(<<<'SQL'
+            DROP TABLE chill_ticket.state_history
+        SQL);
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Entity/TicketTest.php b/src/Bundle/ChillTicketBundle/tests/Entity/TicketTest.php
index b3a9f0b93..6ce8b53ea 100644
--- a/src/Bundle/ChillTicketBundle/tests/Entity/TicketTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Entity/TicketTest.php
@@ -18,6 +18,8 @@ use Chill\TicketBundle\Entity\AddresseeHistory;
 use Chill\TicketBundle\Entity\Motive;
 use Chill\TicketBundle\Entity\MotiveHistory;
 use Chill\TicketBundle\Entity\PersonHistory;
+use Chill\TicketBundle\Entity\StateEnum;
+use Chill\TicketBundle\Entity\StateHistory;
 use Chill\TicketBundle\Entity\Ticket;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 
@@ -108,4 +110,29 @@ class TicketTest extends KernelTestCase
         // Verify that getExternalRef returns the updated value
         self::assertSame($newExternalRef, $ticket->getExternalRef());
     }
+
+    public function testGetState(): void
+    {
+        $ticket = new Ticket();
+        $openState = new StateEnum(StateEnum::OPEN, ['en' => 'Open', 'fr' => 'Ouvert']);
+
+        // Initially, the ticket has no state
+        self::assertNull($ticket->getState());
+
+        // Create a state history entry with the open state
+        $history = new StateHistory($openState, $ticket);
+
+        // Verify that the ticket now has the open state
+        self::assertSame($openState, $ticket->getState());
+        self::assertCount(1, $ticket->getStateHistories());
+
+        // Change the state to closed
+        $closedState = new StateEnum(StateEnum::CLOSED, ['en' => 'Closed', 'fr' => 'Fermé']);
+        $history->setEndDate(new \DateTimeImmutable());
+        $history2 = new StateHistory($closedState, $ticket);
+
+        // Verify that the ticket now has the closed state
+        self::assertCount(2, $ticket->getStateHistories());
+        self::assertSame($closedState, $ticket->getState());
+    }
 }

From a8dd1b3548401c285155884452cfee0800b69c91 Mon Sep 17 00:00:00 2001
From: Boris Waaub <boris.waaub@digitalternative.be>
Date: Mon, 16 Jun 2025 10:59:42 +0000
Subject: [PATCH 121/283] 1277 refacto use symfony translation

---
 .vscode/launch.json                           |  30 +
 .vscode/tasks.json                            |  23 +
 .../ChillMainBundle/Resources/public/types.ts |  24 +
 .../vuejs/OnTheFly/components/Create.vue      | 113 +--
 .../vuejs/OnTheFly/components/OnTheFly.vue    | 479 +++++++------
 .../Entity/GenderIconRenderBox.vue            |  23 +-
 .../public/vuejs/_components/Modal.vue        |  23 +-
 .../translations/messages+intl-icu.fr.yaml    |  27 +
 .../translations/messages.fr.yml              |  31 +
 .../Resources/public/types.ts                 |  63 +-
 .../_api/{AddPersons.js => AddPersons.ts}     |  37 +-
 .../AccompanyingPeriod/SetReferrer.vue        |  65 +-
 .../public/vuejs/_components/AddPersons.vue   | 657 +++++++++---------
 .../AddPersons/PersonSuggestion.vue           | 109 ++-
 .../_components/AddPersons/TypeHousehold.vue  |  21 +-
 .../_components/AddPersons/TypePerson.vue     |  54 +-
 .../_components/AddPersons/TypeThirdParty.vue | 123 ++--
 .../vuejs/_components/AddPersons/TypeUser.vue |  32 +-
 .../_components/AddPersons/TypeUserGroup.vue  |  32 +-
 .../_components/Entity/HouseholdRenderBox.vue | 155 ++---
 .../_components/Entity/PersonRenderBox.vue    | 289 ++++----
 .../vuejs/_components/Entity/PersonText.vue   |  92 +--
 .../vuejs/_components/OnTheFly/Person.vue     | 601 ++++++++--------
 .../translations/messages+intl-icu.fr.yaml    |  56 ++
 .../translations/messages.fr.yml              |  45 ++
 .../vuejs/_components/OnTheFly/ThirdParty.vue | 367 +++++-----
 .../translations/messages.fr.yml              |  13 +
 .../src/Resources/public/types.ts             |  12 +
 .../Resources/public/vuejs/TicketApp/App.vue  |  54 +-
 .../components/ActionToolbarComponent.vue     | 294 ++++----
 .../components/AddCommentComponent.vue        |  34 +-
 .../components/AddresseeComponent.vue         |  68 +-
 .../components/AddresseeSelectorComponent.vue | 244 +++----
 .../TicketApp/components/BannerComponent.vue  | 147 ++--
 .../components/MotiveSelectorComponent.vue    |  71 +-
 .../components/PersonsSelectorComponent.vue   | 136 ++--
 .../TicketHistoryAddresseeComponent.vue       |  23 +-
 .../TicketHistoryCommentComponent.vue         |  66 +-
 .../TicketHistoryCreateComponent.vue          |   9 +-
 .../components/TicketHistoryListComponent.vue |  98 +--
 .../TicketHistoryMotiveComponent.vue          |  16 +-
 .../TicketHistoryPersonComponent.vue          |  24 +-
 .../components/TicketSelectorComponent.vue    |  27 +-
 .../public/vuejs/TicketApp/i18n/messages.ts   |  56 --
 .../Resources/public/vuejs/TicketApp/index.ts |   8 -
 .../src/translations/messages+intl-icu.fr.yml |  66 ++
 .../src/translations/messages.fr.yml          |   9 -
 47 files changed, 2646 insertions(+), 2400 deletions(-)
 create mode 100644 .vscode/launch.json
 create mode 100644 .vscode/tasks.json
 rename src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/{AddPersons.js => AddPersons.ts} (57%)
 delete mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
 create mode 100644 src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
 delete mode 100644 src/Bundle/ChillTicketBundle/src/translations/messages.fr.yml

diff --git a/.vscode/launch.json b/.vscode/launch.json
new file mode 100644
index 000000000..d7a227605
--- /dev/null
+++ b/.vscode/launch.json
@@ -0,0 +1,30 @@
+{
+    // Use IntelliSense to learn about possible attributes.
+    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
+    "version": "0.2.0",
+    "configurations": [
+        {
+            "name": "Chill Debug",
+            "type": "php",
+            "request": "launch",
+            "port": 9000,
+            "pathMappings": {
+                "/var/www/html": "${workspaceFolder}"
+            },
+            "preLaunchTask": "symfony"
+        },
+        {
+            "name": "Yarn Encore Dev (Watch)",
+            "type": "node-terminal",
+            "request": "launch",
+            "command": "yarn encore dev --watch",
+            "cwd": "${workspaceFolder}"
+        }
+    ],
+    "compounds": [
+        {
+            "name": "Chill Debug + Yarn Encore Dev (Watch)",
+            "configurations": ["Chill Debug", "Yarn Encore Dev (Watch)"]
+        }
+    ]
+}
diff --git a/.vscode/tasks.json b/.vscode/tasks.json
new file mode 100644
index 000000000..a652cfe03
--- /dev/null
+++ b/.vscode/tasks.json
@@ -0,0 +1,23 @@
+{
+    "tasks": [
+        {
+            "type": "shell",
+            "command": "symfony",
+            "args": [
+                "server:start",
+                "--allow-http",
+                "--no-tls",
+                "--port=8000",
+                "--allow-all-ip",
+                "-d"
+            ],
+            "label": "symfony"
+        },
+        {
+            "type": "shell",
+            "command": "yarn",
+            "args": ["encore", "dev", "--watch"],
+            "label": "webpack"
+        }
+    ]
+}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/types.ts b/src/Bundle/ChillMainBundle/Resources/public/types.ts
index 90ddacf22..e520ac747 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/types.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/types.ts
@@ -49,6 +49,30 @@ export interface User {
     // todo: mainCenter; mainJob; etc..
 }
 
+// TODO : Add missing household properties
+export interface Household {
+    type: "household";
+    id: number;
+}
+
+export interface ThirdParty {
+    type: "thirdparty";
+    id: number;
+    firstname: string;
+    name: string;
+    email: string;
+    telephone: string;
+    telephone2: string;
+    address: {
+        address_id: number;
+        text: string;
+        postcode: {
+            name: string;
+        };
+        id: number;
+    };
+}
+
 export interface UserGroup {
     type: "user_group";
     id: number;
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/Create.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/Create.vue
index 9a4325060..f05080fba 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/Create.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/Create.vue
@@ -10,7 +10,7 @@
                         v-model="radioType"
                         value="person"
                     />
-                    {{ $t("onthefly.create.person") }}
+                    {{ trans(ONTHEFLY_CREATE_PERSON) }}
                 </label>
             </a>
         </li>
@@ -24,7 +24,7 @@
                         v-model="radioType"
                         value="thirdparty"
                     />
-                    {{ $t("onthefly.create.thirdparty") }}
+                    {{ trans(ONTHEFLY_CREATE_THIRDPARTY) }}
                 </label>
             </a>
         </li>
@@ -46,64 +46,67 @@
         />
     </div>
 </template>
-
-<script>
+<script setup>
+import { ref, computed, onMounted } from "vue";
 import OnTheFlyPerson from "ChillPersonAssets/vuejs/_components/OnTheFly/Person.vue";
 import OnTheFlyThirdparty from "ChillThirdPartyAssets/vuejs/_components/OnTheFly/ThirdParty.vue";
+import {
+    trans,
+    ONTHEFLY_CREATE_PERSON,
+    ONTHEFLY_CREATE_THIRDPARTY,
+} from "translator";
 
-export default {
-    name: "OnTheFlyCreate",
-    props: ["action", "allowedTypes", "query"],
-    components: {
-        OnTheFlyPerson,
-        OnTheFlyThirdparty,
-    },
-    data() {
-        return {
-            type: null,
-        };
-    },
-    computed: {
-        radioType: {
-            set(type) {
-                this.type = type;
-                console.log("## type:", type, ", action:", this.action);
-            },
-            get() {
-                return this.type;
-            },
-        },
-    },
-    mounted() {
-        this.type =
-            this.allowedTypes.length === 1 &&
-            this.allowedTypes.includes("thirdparty")
-                ? "thirdparty"
-                : "person";
-    },
-    methods: {
-        isActive(tab) {
-            return this.type === tab ? true : false;
-        },
-        castDataByType() {
-            switch (this.radioType) {
-                case "person":
-                    return this.$refs.castPerson.$data.person;
-                case "thirdparty":
-                    let data = this.$refs.castThirdparty.$data.thirdparty;
-                    if (data.address !== undefined && data.address !== null) {
-                        data.address = { id: data.address.address_id };
-                    } else {
-                        data.address = null;
-                    }
+const props = defineProps({
+    action: String,
+    allowedTypes: Array,
+    query: String,
+});
 
-                    return data;
-                default:
-                    throw Error("Invalid type of entity");
+const type = ref(null);
+
+const radioType = computed({
+    get: () => type.value,
+    set: (val) => {
+        type.value = val;
+        console.log("## type:", val, ", action:", props.action);
+    },
+});
+
+const castPerson = ref(null);
+const castThirdparty = ref(null);
+
+onMounted(() => {
+    type.value =
+        props.allowedTypes.length === 1 &&
+        props.allowedTypes.includes("thirdparty")
+            ? "thirdparty"
+            : "person";
+});
+
+function isActive(tab) {
+    return type.value === tab;
+}
+
+function castDataByType() {
+    switch (radioType.value) {
+        case "person":
+            return castPerson.value.$data.person;
+        case "thirdparty":
+            let data = castThirdparty.value.$data.thirdparty;
+            if (data.address !== undefined && data.address !== null) {
+                data.address = { id: data.address.address_id };
+            } else {
+                data.address = null;
             }
-        },
-    },
-};
+            return data;
+        default:
+            throw Error("Invalid type of entity");
+    }
+}
+
+defineExpose({
+    castDataByType,
+});
 </script>
 
 <style lang="css" scoped>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
index 452ac0396..700f71e48 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
@@ -9,7 +9,7 @@
         class="btn btn-sm"
         target="_blank"
         :class="classAction"
-        :title="$t(titleAction)"
+        :title="trans(titleAction)"
         @click="openModal"
     >
         {{ buttonText }}<span v-if="isDead"> (‡)</span>
@@ -23,10 +23,10 @@
         >
             <template #header>
                 <h3 v-if="parent" class="modal-title">
-                    {{ $t(titleModal, { q: parent.text }) }}
+                    {{ trans(titleModal, { q: parent.text }) }}
                 </h3>
                 <h3 v-else class="modal-title">
-                    {{ $t(titleModal) }}
+                    {{ trans(titleModal) }}
                 </h3>
             </template>
 
@@ -38,7 +38,7 @@
                     ref="castPerson"
                 />
                 <div v-if="hasResourceComment">
-                    <h3>{{ $t("onthefly.resource_comment_title") }}</h3>
+                    <h3>{{ trans(ONTHEFLY_RESOURCE_COMMENT_TITLE) }}</h3>
                     <blockquote class="chill-user-quote">
                         {{ parent.comment }}
                     </blockquote>
@@ -53,7 +53,7 @@
                     ref="castThirdparty"
                 />
                 <div v-if="hasResourceComment">
-                    <h3>{{ $t("onthefly.resource_comment_title") }}</h3>
+                    <h3>{{ trans(ONTHEFLY_RESOURCE_COMMENT_TITLE) }}</h3>
                     <blockquote class="chill-user-quote">
                         {{ parent.comment }}
                     </blockquote>
@@ -82,242 +82,273 @@
                 <a
                     v-if="action === 'show'"
                     :href="buildLocation(id, type)"
-                    :title="$t(titleMessage)"
+                    :title="trans(titleMessage)"
                     class="btn btn-show"
-                    >{{ $t(buttonMessage) }}
+                    >{{ trans(buttonMessage) }}
                 </a>
                 <a v-else class="btn btn-save" @click="saveAction">
-                    {{ $t("action.save") }}
+                    {{ trans(ACTION_SAVE) }}
                 </a>
             </template>
         </modal>
     </teleport>
 </template>
-
-<script>
+<script setup>
+import { ref, computed, defineEmits, defineProps } from "vue";
 import Modal from "ChillMainAssets/vuejs/_components/Modal.vue";
 import OnTheFlyCreate from "./Create.vue";
 import OnTheFlyPerson from "ChillPersonAssets/vuejs/_components/OnTheFly/Person.vue";
 import OnTheFlyThirdparty from "ChillThirdPartyAssets/vuejs/_components/OnTheFly/ThirdParty.vue";
+import {
+    trans,
+    ACTION_SHOW,
+    ACTION_EDIT,
+    ACTION_CREATE,
+    ACTION_ADDCONTACT,
+    ONTHEFLY_CREATE_TITLE_DEFAULT,
+    ONTHEFLY_CREATE_TITLE_PERSON,
+    ONTHEFLY_CREATE_TITLE_THIRDPARTY,
+    ONTHEFLY_SHOW_PERSON,
+    ONTHEFLY_SHOW_THIRDPARTY,
+    ONTHEFLY_EDIT_PERSON,
+    ONTHEFLY_EDIT_THIRDPARTY,
+    ONTHEFLY_ADDCONTACT_TITLE,
+    ACTION_REDIRECT_PERSON,
+    ACTION_REDIRECT_THIRDPARTY,
+    ONTHEFLY_SHOW_FILE_PERSON,
+    ONTHEFLY_SHOW_FILE_THIRDPARTY,
+    ONTHEFLY_SHOW_FILE_DEFAULT,
+    ONTHEFLY_RESOURCE_COMMENT_TITLE,
+    ACTION_SAVE,
+} from "translator";
 
-export default {
-    name: "OnTheFly",
-    components: {
-        Modal,
-        OnTheFlyPerson,
-        OnTheFlyThirdparty,
-        OnTheFlyCreate,
-    },
-    props: [
-        "type",
-        "id",
-        "action",
-        "buttonText",
-        "displayBadge",
-        "isDead",
-        "parent",
-        "allowedTypes",
-        "query",
-    ],
-    emits: ["saveFormOnTheFly"],
-    data() {
-        return {
-            modal: {
-                showModal: false,
-                modalDialogClass: "modal-dialog-scrollable modal-xl",
-            },
-        };
-    },
-    computed: {
-        hasResourceComment() {
-            return (
-                typeof this.parent !== "undefined" &&
-                this.parent !== null &&
-                this.action === "show" &&
-                this.parent.type === "accompanying_period_resource" &&
-                this.parent.comment !== null &&
-                this.parent.comment !== ""
-            );
-        },
-        classAction() {
-            switch (this.action) {
-                case "show":
-                    return "btn-show";
-                case "edit":
-                    return "btn-update";
-                case "create":
-                    return "btn-create";
-                case "addContact":
-                    return "btn-tpchild";
-                default:
-                    return "";
-            }
-        },
-        titleAction() {
-            switch (this.action) {
-                case "show":
-                    return "action.show";
-                case "edit":
-                    return "action.edit";
-                case "create":
-                    return "action.create";
-                case "addContact":
-                    return "action.addContact";
-                default:
-                    return "";
-            }
-        },
-        titleCreate() {
-            if (typeof this.allowedTypes === "undefined") {
-                return "onthefly.create.title.default";
-            }
-            return this.allowedTypes.every((t) => t === "person")
-                ? "onthefly.create.title.person"
-                : this.allowedTypes.every((t) => t === "thirdparty")
-                  ? "onthefly.create.title.thirdparty"
-                  : "onthefly.create.title.default";
-        },
-        titleModal() {
-            switch (this.action) {
-                case "show":
-                    return "onthefly.show." + this.type;
-                case "edit":
-                    return "onthefly.edit." + this.type;
-                case "create":
-                    return this.titleCreate;
-                case "addContact":
-                    return "onthefly.addContact.title";
-                default:
-                    return "";
-            }
-        },
-        titleMessage() {
-            switch (this.type) {
-                case "person":
-                    return "action.redirect." + this.type;
-                case "thirdparty":
-                    return "action.redirect." + this.type;
-                default:
-                    return "";
-            }
-        },
-        buttonMessage() {
-            switch (this.type) {
-                case "person":
-                    return "onthefly.show.file_" + this.type;
-                case "thirdparty":
-                    return "onthefly.show.file_" + this.type;
-            }
-        },
-        isDisplayBadge() {
-            return this.displayBadge === true && this.buttonText !== null;
-        },
-        badgeType() {
-            return "entity-" + this.type + " badge-" + this.type;
-        },
-        getReturnPath() {
-            return `?returnPath=${window.location.pathname}${window.location.search}${window.location.hash}`;
-        },
-    },
-    methods: {
-        closeModal() {
-            this.modal.showModal = false;
-        },
-        openModal() {
-            // console.log('## OPEN ON THE FLY MODAL');
-            // console.log('## type:', this.type, ', action:', this.action);
-            this.modal.showModal = true;
-            this.$nextTick(function () {
-                //this.$refs.search.focus();
-            });
-        },
-        changeActionTo(action) {
-            this.$data.action = action;
-        },
-        saveAction() {
-            // console.log('saveAction button: create/edit action with', this.type);
-            let type = this.type,
-                data = {};
-            switch (type) {
-                case "person":
-                    data = this.$refs.castPerson.$data.person;
-                    console.log("person data are", data);
-                    break;
+const props = defineProps({
+    type: String,
+    id: [String, Number],
+    action: String,
+    buttonText: String,
+    displayBadge: Boolean,
+    isDead: Boolean,
+    parent: Object,
+    allowedTypes: Array,
+    query: String,
+});
 
-                case "thirdparty":
-                    data = this.$refs.castThirdparty.$data.thirdparty;
-                    /* never executed ? */
-                    break;
+const emit = defineEmits(["saveFormOnTheFly"]);
 
-                default:
-                    if (typeof this.type === "undefined") {
-                        // action=create or addContact
-                        // console.log('will rewrite data');
-                        if (this.action === "addContact") {
-                            type = "thirdparty";
-                            data = this.$refs.castThirdparty.$data.thirdparty;
-                            // console.log('data original', data);
-                            data.parent = {
-                                type: "thirdparty",
-                                id: this.parent.id,
-                            };
-                            data.civility =
-                                data.civility !== null
-                                    ? {
-                                          type: "chill_main_civility",
-                                          id: data.civility.id,
-                                      }
-                                    : null;
-                            data.profession =
-                                data.profession !== "" ? data.profession : "";
-                        } else {
-                            type = this.$refs.castNew.radioType;
-                            data = this.$refs.castNew.castDataByType();
-                            // console.log('type', type);
-                            if (
-                                typeof data.civility !== "undefined" &&
-                                null !== data.civility
-                            ) {
-                                data.civility =
-                                    data.civility !== null
-                                        ? {
-                                              type: "chill_main_civility",
-                                              id: data.civility.id,
-                                          }
-                                        : null;
-                            }
-                            if (
-                                typeof data.profession !== "undefined" &&
-                                "" !== data.profession
-                            ) {
-                                data.profession =
-                                    data.profession !== ""
-                                        ? data.profession
-                                        : "";
-                            }
-                            // console.log('onthefly data', data);
-                        }
-                    } else {
-                        throw "error with object type";
+const modal = ref({
+    showModal: false,
+    modalDialogClass: "modal-dialog-scrollable modal-xl",
+});
+
+const castPerson = ref();
+const castThirdparty = ref();
+const castNew = ref();
+
+const hasResourceComment = computed(() => {
+    return (
+        typeof props.parent !== "undefined" &&
+        props.parent !== null &&
+        props.action === "show" &&
+        props.parent.type === "accompanying_period_resource" &&
+        props.parent.comment !== null &&
+        props.parent.comment !== ""
+    );
+});
+
+const classAction = computed(() => {
+    switch (props.action) {
+        case "show":
+            return "btn-show";
+        case "edit":
+            return "btn-update";
+        case "create":
+            return "btn-create";
+        case "addContact":
+            return "btn-tpchild";
+        default:
+            return "";
+    }
+});
+
+const titleAction = computed(() => {
+    switch (props.action) {
+        case "show":
+            return ACTION_SHOW;
+        case "edit":
+            return ACTION_EDIT;
+        case "create":
+            return ACTION_CREATE;
+        case "addContact":
+            return ACTION_ADDCONTACT;
+        default:
+            return "";
+    }
+});
+
+const titleCreate = computed(() => {
+    if (typeof props.allowedTypes === "undefined") {
+        return ONTHEFLY_CREATE_TITLE_DEFAULT;
+    }
+    return props.allowedTypes.every((t) => t === "person")
+        ? ONTHEFLY_CREATE_TITLE_PERSON
+        : props.allowedTypes.every((t) => t === "thirdparty")
+          ? ONTHEFLY_CREATE_TITLE_THIRDPARTY
+          : ONTHEFLY_CREATE_TITLE_DEFAULT;
+});
+
+const titleModal = computed(() => {
+    switch (props.action) {
+        case "show":
+            if (props.type == "person") {
+                return ONTHEFLY_SHOW_PERSON;
+            } else if (props.type == "thirdparty") {
+                return ONTHEFLY_SHOW_THIRDPARTY;
+            }
+            break;
+        case "edit":
+            if (props.type == "person") {
+                return ONTHEFLY_EDIT_PERSON;
+            } else if (props.type == "thirdparty") {
+                return ONTHEFLY_EDIT_THIRDPARTY;
+            }
+            break;
+        case "create":
+            return titleCreate.value;
+        case "addContact":
+            return ONTHEFLY_ADDCONTACT_TITLE;
+        default:
+            break;
+    }
+    return "";
+});
+
+const titleMessage = computed(() => {
+    switch (props.type) {
+        case "person":
+            return ACTION_REDIRECT_PERSON;
+        case "thirdparty":
+            return ACTION_REDIRECT_THIRDPARTY;
+        default:
+            return "";
+    }
+});
+
+const buttonMessage = computed(() => {
+    switch (props.type) {
+        case "person":
+            return ONTHEFLY_SHOW_FILE_PERSON;
+        case "thirdparty":
+            return ONTHEFLY_SHOW_FILE_THIRDPARTY;
+        default:
+            return ONTHEFLY_SHOW_FILE_DEFAULT;
+    }
+});
+
+const isDisplayBadge = computed(() => {
+    return props.displayBadge === true && props.buttonText !== null;
+});
+
+const badgeType = computed(() => {
+    return "entity-" + props.type + " badge-" + props.type;
+});
+
+const getReturnPath = computed(() => {
+    return `?returnPath=${window.location.pathname}${window.location.search}${window.location.hash}`;
+});
+
+function closeModal() {
+    modal.value.showModal = false;
+}
+
+function openModal() {
+    modal.value.showModal = true;
+}
+
+function changeActionTo(action) {
+    console.log(action);
+    // Not reactive in setup, but you can emit or use a ref if needed
+}
+
+function saveAction() {
+    let type = props.type,
+        data = {};
+    switch (type) {
+        case "person":
+            data = castPerson.value?.$data.person;
+            break;
+        case "thirdparty":
+            data = castThirdparty.value?.$data.thirdparty;
+            break;
+        default:
+            if (typeof props.type === "undefined") {
+                if (props.action === "addContact") {
+                    type = "thirdparty";
+                    data = castThirdparty.value?.$data.thirdparty;
+                    data.parent = {
+                        type: "thirdparty",
+                        id: props.parent.id,
+                    };
+                    data.civility =
+                        data.civility !== null
+                            ? {
+                                  type: "chill_main_civility",
+                                  id: data.civility.id,
+                              }
+                            : null;
+                    data.profession =
+                        data.profession !== "" ? data.profession : "";
+                } else {
+                    type = castNew.value.radioType;
+                    data = castNew.value.castDataByType();
+                    if (
+                        typeof data.civility !== "undefined" &&
+                        null !== data.civility
+                    ) {
+                        data.civility =
+                            data.civility !== null
+                                ? {
+                                      type: "chill_main_civility",
+                                      id: data.civility.id,
+                                  }
+                                : null;
                     }
+                    if (
+                        typeof data.profession !== "undefined" &&
+                        "" !== data.profession
+                    ) {
+                        data.profession =
+                            data.profession !== "" ? data.profession : "";
+                    }
+                }
+            } else {
+                throw "error with object type";
             }
-            // pass datas to parent
-            this.$emit("saveFormOnTheFly", { type: type, data: data });
-        },
-        buildLocation(id, type) {
-            if (type === "person") {
-                // TODO i18n
-                return encodeURI(
-                    `/fr/person/${id}/general${this.getReturnPath}`,
-                );
-            } else if (type === "thirdparty") {
-                return encodeURI(
-                    `/fr/3party/3party/${id}/view${this.getReturnPath}`,
-                );
-            }
-        },
-    },
-};
+    }
+    emit("saveFormOnTheFly", { type: type, data: data });
+}
+
+function buildLocation(id, type) {
+    if (type === "person") {
+        return encodeURI(`/fr/person/${id}/general${getReturnPath.value}`);
+    } else if (type === "thirdparty") {
+        return encodeURI(`/fr/3party/3party/${id}/view${getReturnPath.value}`);
+    }
+}
+
+defineExpose({
+    openModal,
+    closeModal,
+    changeActionTo,
+    saveAction,
+    castPerson,
+    castThirdparty,
+    castNew,
+    hasResourceComment,
+    modal,
+    isDisplayBadge,
+    Modal,
+});
 </script>
 
 <style lang="css" scoped>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/GenderIconRenderBox.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/GenderIconRenderBox.vue
index d47b9b777..0579b4c5f 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/GenderIconRenderBox.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/GenderIconRenderBox.vue
@@ -1,9 +1,28 @@
 <template>
-    <i :class="gender.icon" />
+    <i :class="['fa', genderClass, 'px-1']" />
 </template>
 
 <script setup>
+import { computed } from "vue";
 const props = defineProps({
-    gender: Object,
+    gender: {
+        type: Object,
+        required: true,
+    },
+});
+
+const genderClass = computed(() => {
+    switch (props.gender.genderTranslation) {
+        case "woman":
+            return "fa-venus";
+        case "man":
+            return "fa-mars";
+        case "both":
+            return "fa-neuter";
+        case "unknown":
+            return "fa-genderless";
+        default:
+            return "fa-genderless";
+    }
 });
 </script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
index 06e1bfa1a..9350fc897 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
@@ -1,6 +1,6 @@
 <template>
     <transition name="modal">
-        <div class="modal-mask">
+        <div class="modal-mask" v-if="show">
             <!-- :: styles bootstrap :: -->
             <div
                 class="modal fade show"
@@ -8,7 +8,7 @@
                 aria-modal="true"
                 role="dialog"
             >
-                <div class="modal-dialog" :class="props.modalDialogClass || {}">
+                <div class="modal-dialog" :class="modalDialogClass || {}">
                     <div class="modal-content">
                         <div class="modal-header">
                             <slot name="header"></slot>
@@ -53,14 +53,23 @@ import { trans, MODAL_ACTION_CLOSE } from "translator";
 import { defineProps } from "vue";
 
 export interface ModalProps {
-    modalDialogClass: object | null;
+    modalDialogClass: string;
     hideFooter: boolean;
 }
 
-// Define the props
-const props = withDefaults(defineProps<ModalProps>(), {
-    hideFooter: false,
-    modalDialogClass: null,
+defineProps({
+    modalDialogClass: {
+        type: String,
+        default: "",
+    },
+    hideFooter: {
+        type: Boolean,
+        default: false,
+    },
+    show: {
+        type: Boolean,
+        default: true,
+    },
 });
 
 const emits = defineEmits<{
diff --git a/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml b/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml
index e86484114..4d16b837d 100644
--- a/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml
+++ b/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml
@@ -129,3 +129,30 @@ filter_order:
     Search: Chercher dans la liste
     By date: Filtrer par date
     search_box: Filtrer par contenu
+renderbox:
+    person: "Usager"
+    birthday:
+        man: "Né le"
+        woman: "Née le"
+        neutral: "Né·e le"
+        unknown: "Né·e le"
+    deathdate: "Date de décès"
+    household_without_address: "Le ménage de l'usager est sans adresse"
+    no_data: "Aucune information renseignée"
+    type:
+        thirdparty: "Tiers"
+        person: "Usager"
+    holder: "Titulaire"
+    years_old: >-
+        {n, plural,
+            =0 {0 an}
+            one {1 an}
+            other {# ans}
+        }
+    residential_address: "Adresse de résidence"
+    located_at: "réside chez"
+    household_number: "Ménage n°{number}"
+    current_members: "Membres actuels"
+    no_current_address: "Sans adresse actuellement"
+    new_household: "Nouveau ménage"
+    no_members_yet: "Aucun membre actuellement"
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index c883cb91c..695698434 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -919,3 +919,34 @@ multiselect:
 editor:
     switch_to_simple: Éditeur simple
     switch_to_complex: Éditeur riche
+action:
+    actions: Actions
+    show: Voir
+    edit: Modifier
+    create: Créer
+    remove: Enlever
+    delete: Supprimer
+    save: Enregistrer
+    valid: Valider
+    valid_and_see: Valider et voir
+    add: Ajouter
+    show_modal: Ouvrir une modale
+    ok: OK
+    cancel: Annuler
+    close: Fermer
+    back: Retour
+    check_all: cocher tout
+    reset: réinitialiser
+    redirect:
+        person: Quitter la page et ouvrir la fiche de l'usager
+        thirdparty: Quitter la page et voir le tiers
+    refresh: Rafraîchir
+    addContact: Ajouter un contact
+
+nav:
+    next: "Suivant"
+    previous: "Précédent"
+    top: "Haut"
+    bottom: "Bas"
+
+
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/types.ts b/src/Bundle/ChillPersonBundle/Resources/public/types.ts
index 5e75553a5..33d704ec4 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/types.ts
+++ b/src/Bundle/ChillPersonBundle/Resources/public/types.ts
@@ -1,12 +1,15 @@
+import { StoredObject } from "ChillDocStoreAssets/types";
 import {
   Address,
   Center,
   Civility,
   DateTime,
+  Household,
+  ThirdParty,
   User,
+  UserGroup,
   WorkflowAvailable,
 } from "../../../ChillMainBundle/Resources/public/types";
-import { StoredObject } from "../../../ChillDocStoreBundle/Resources/public/types";
 
 export interface Person {
   id: number;
@@ -41,3 +44,61 @@ export interface AccompanyingPeriodWorkEvaluationDocument {
   workflows_availables: WorkflowAvailable[];
   workflows: object[];
 }
+
+export type Entities = (UserGroup | User | Person | ThirdParty | Household) & {
+  address?: Address | null;
+  kind?: string;
+  text?: string;
+  profession?: string;
+};
+
+export type Result = Entities & {
+  parent?: Entities | null;
+};
+
+export interface Suggestion {
+  key: string;
+  relevance: number;
+  result: Result;
+}
+
+export interface SearchPagination {
+  first: number;
+  items_per_page: number;
+  next: number | null;
+  previous: number | null;
+  more: boolean;
+}
+
+export interface Search {
+  count: number;
+  pagination: SearchPagination;
+  results: Suggestion[];
+}
+
+export interface SearchOptions {
+  uniq: boolean;
+  type: string[];
+  priority: number | null;
+  button: {
+    size: string;
+    class: string;
+    type: string;
+    display: string;
+  };
+}
+
+export class MakeFetchException extends Error {
+  sta: number;
+  txt: string;
+  violations: unknown | null;
+
+  constructor(txt: string, sta: number, violations: unknown | null = null) {
+    super(txt);
+    this.name = "ValidationException";
+    this.sta = sta;
+    this.txt = txt;
+    this.violations = violations;
+    Object.setPrototypeOf(this, MakeFetchException.prototype);
+  }
+}
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/AddPersons.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/AddPersons.ts
similarity index 57%
rename from src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/AddPersons.js
rename to src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/AddPersons.ts
index 1d0a607ed..519a3d3e7 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/AddPersons.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/AddPersons.ts
@@ -1,7 +1,15 @@
+import { Search, SearchOptions } from "ChillPersonAssets/types";
+
 /*
  * Build query string with query and options
  */
-const parametersToString = ({ query, options }) => {
+const parametersToString = ({
+  query,
+  options,
+}: {
+  query: string;
+  options: SearchOptions;
+}) => {
   let types = "";
   options.type.forEach(function (type) {
     types += "&type[]=" + type;
@@ -16,11 +24,13 @@ const parametersToString = ({ query, options }) => {
  *  @query string - the query to search for
  *  @deprecated
  */
-const searchPersons = ({ query, options }, signal) => {
-  console.err("deprecated");
-  let queryStr = parametersToString({ query, options });
-  let url = `/fr/search.json?name=person_regular&${queryStr}`;
-  let fetchOpts = {
+export function searchPersons(
+  { query, options }: { query: string; options: SearchOptions },
+  signal: AbortSignal,
+): Promise<Search> {
+  const queryStr = parametersToString({ query, options });
+  const url = `/fr/search.json?name=person_regular&${queryStr}`;
+  const fetchOpts = {
     method: "GET",
     headers: {
       "Content-Type": "application/json;charset=utf-8",
@@ -34,7 +44,7 @@ const searchPersons = ({ query, options }, signal) => {
     }
     throw Error("Error with request resource response");
   });
-};
+}
 
 /*
  * Endpoint v.2 chill_main_search_global
@@ -43,15 +53,16 @@ const searchPersons = ({ query, options }, signal) => {
  * @param query string - the query to search for
  *
  */
-const searchEntities = ({ query, options }, signal) => {
-  let queryStr = parametersToString({ query, options });
-  let url = `/api/1.0/search.json?${queryStr}`;
+export function searchEntities(
+  { query, options }: { query: string; options: SearchOptions },
+  signal: AbortSignal,
+): Promise<Search> {
+  const queryStr = parametersToString({ query, options });
+  const url = `/api/1.0/search.json?${queryStr}`;
   return fetch(url, { signal }).then((response) => {
     if (response.ok) {
       return response.json();
     }
     throw Error("Error with request resource response");
   });
-};
-
-export { searchPersons, searchEntities };
+}
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriod/SetReferrer.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriod/SetReferrer.vue
index fe4cdae74..0a8d07f30 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriod/SetReferrer.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriod/SetReferrer.vue
@@ -6,48 +6,39 @@
   </ul>
 </template>
 
-<script>
+<script setup>
 import { makeFetch } from "ChillMainAssets/lib/api/apiMethods.ts";
+import { defineProps, defineEmits } from "vue";
 
-export default {
-  name: "SetReferrer",
-  props: {
-    suggested: {
-      type: Array,
-      required: false,
-      //default: [],
-    },
-    periodId: {
-      type: Number,
-      required: true,
-    },
+const props = defineProps({
+  suggested: {
+    type: Array,
+    required: false,
+    // default: [],
   },
-  data() {
-    return {
-      /*suggested: [
-        {id: 5, text: 'Robert'}, {id: 8, text: 'Monique'},
-      ]*/
-    };
+  periodId: {
+    type: Number,
+    required: true,
   },
-  emits: ["referrerSet"],
-  methods: {
-    setReferrer: function (ref) {
-      const url = `/api/1.0/person/accompanying-course/${this.periodId}.json`;
-      const body = {
-        type: "accompanying_period",
-        user: { id: ref.id, type: ref.type },
-      };
+});
 
-      return makeFetch("PATCH", url, body)
-        .then((response) => {
-          this.$emit("referrerSet", ref);
-        })
-        .catch((error) => {
-          throw error;
-        });
-    },
-  },
-};
+const emit = defineEmits(["referrerSet"]);
+
+function setReferrer(ref) {
+  const url = `/api/1.0/person/accompanying-course/${props.periodId}.json`;
+  const body = {
+    type: "accompanying_period",
+    user: { id: ref.id, type: ref.type },
+  };
+
+  return makeFetch("PATCH", url, body)
+    .then(() => {
+      emit("referrerSet", ref);
+    })
+    .catch((error) => {
+      throw error;
+    });
+}
 </script>
 
 <style scoped></style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
index 9d05f6883..bcdad2835 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
@@ -2,21 +2,23 @@
   <a
     class="btn"
     :class="getClassButton"
-    :title="$t(buttonTitle || '')"
+    :title="buttonTitle"
     @click="openModal"
   >
-    <span v-if="displayTextButton">{{ $t(buttonTitle || "") }}</span>
+    <span v-if="displayTextButton">{{ buttonTitle }}</span>
   </a>
 
   <teleport to="body">
     <modal
-      v-if="modal.showModal"
-      :modal-dialog-class="modal.modalDialogClass"
-      @close="modal.showModal = false"
+      v-if="showModal"
+      @close="closeModal"
+      :modal-dialog-class="modalDialogClass"
+      :show="showModal"
+      :hide-footer="false"
     >
       <template #header>
         <h3 class="modal-title">
-          {{ $t(modalTitle) }}
+          {{ modalTitle }}
         </h3>
       </template>
 
@@ -24,15 +26,19 @@
         <div class="modal-body">
           <div class="search">
             <label class="col-form-label" style="float: right">
-              {{ $tc("add_persons.suggested_counter", suggestedCounter) }}
+              {{
+                trans(ADD_PERSONS_SUGGESTED_COUNTER, {
+                  count: suggestedCounter,
+                })
+              }}
             </label>
 
             <input
               id="search-persons"
               name="query"
               v-model="query"
-              :placeholder="$t('add_persons.search_some_persons')"
-              ref="search"
+              :placeholder="trans(ADD_PERSONS_SEARCH_SOME_PERSONS)"
+              ref="searchRef"
             />
             <i class="fa fa-search fa-lg" />
             <i
@@ -46,15 +52,19 @@
           <div class="count">
             <span>
               <a v-if="suggestedCounter > 2" @click="selectAll">
-                {{ $t("action.check_all") }}
+                {{ trans(ACTION_CHECK_ALL) }}
               </a>
               <a v-if="selectedCounter > 0" @click="resetSelection">
                 <i v-if="suggestedCounter > 2"> • </i>
-                {{ $t("action.reset") }}
+                {{ trans(ACTION_RESET) }}
               </a>
             </span>
             <span v-if="selectedCounter > 0">
-              {{ $tc("add_persons.selected_counter", selectedCounter) }}
+              {{
+                trans(ADD_PERSONS_SELECTED_COUNTER, {
+                  count: selectedCounter,
+                })
+              }}
             </span>
           </div>
         </div>
@@ -63,7 +73,7 @@
       <template #body>
         <div class="results">
           <person-suggestion
-            v-for="item in this.selectedAndSuggested.slice().reverse()"
+            v-for="item in selectedAndSuggested.slice().reverse()"
             :key="itemKey(item)"
             :item="item"
             :search="search"
@@ -80,7 +90,7 @@
                 (options.type.includes('person') ||
                   options.type.includes('thirdparty'))
               "
-              :button-text="$t('onthefly.create.button', { q: query })"
+              :button-text="trans(ONTHEFLY_CREATE_BUTTON, { q: query })"
               :allowed-types="options.type"
               :query="query"
               action="create"
@@ -94,333 +104,335 @@
       <template #footer>
         <button
           class="btn btn-create"
-          @click.prevent="$emit('addNewPersons', { selected, modal })"
+          @click.prevent="
+            () => {
+              $emit('addNewPersons', { selected: selectedComputed });
+              query = '';
+              closeModal();
+            }
+          "
         >
-          {{ $t("action.add") }}
+          {{ trans(ACTION_ADD) }}
         </button>
       </template>
     </modal>
   </teleport>
 </template>
 
-<script>
-import Modal from "ChillMainAssets/vuejs/_components/Modal";
-import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue";
-import PersonSuggestion from "./AddPersons/PersonSuggestion";
+<script setup lang="ts">
+// eslint-disable-next-line @typescript-eslint/no-unused-vars
+import Modal from "ChillMainAssets/vuejs/_components/Modal.vue";
+import { ref, reactive, computed, nextTick, watch, shallowRef } from "vue";
+import PersonSuggestion from "./AddPersons/PersonSuggestion.vue";
 import { searchEntities } from "ChillPersonAssets/vuejs/_api/AddPersons";
+import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue";
+
 import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
 
-export default {
-  name: "AddPersons",
-  components: {
-    Modal,
-    PersonSuggestion,
-    OnTheFly,
-  },
-  props: ["buttonTitle", "modalTitle", "options"],
-  emits: ["addNewPersons"],
-  data() {
-    return {
-      modal: {
-        showModal: false,
-        modalDialogClass: "modal-dialog-scrollable modal-xl",
-      },
-      search: {
-        query: "",
-        previousQuery: "",
-        currentSearchQueryController: null,
-        suggested: [],
-        selected: [],
-        priorSuggestion: {},
-      },
-    };
-  },
-  computed: {
-    query: {
-      set(query) {
-        return this.setQuery(query);
-      },
-      get() {
-        return this.search.query;
-      },
-    },
-    queryLength() {
-      return this.search.query.length;
-    },
-    suggested() {
-      return this.search.suggested;
-    },
-    suggestedCounter() {
-      return this.search.suggested.length;
-    },
-    selected() {
-      return this.search.selected;
-    },
-    selectedCounter() {
-      return this.search.selected.length;
-    },
-    selectedAndSuggested() {
-      this.addPriorSuggestion();
-      const uniqBy = (a, key) => [
-        ...new Map(a.map((x) => [key(x), x])).values(),
-      ];
-      let union = [
-        ...new Set([
-          ...this.suggested.slice().reverse(),
-          ...this.selected.slice().reverse(),
-        ]),
-      ];
-      return uniqBy(union, (k) => k.key);
-    },
-    getClassButton() {
-      let size =
-        typeof this.options.button !== "undefined" &&
-        typeof this.options.button.size !== "undefined"
-          ? this.options.button.size
-          : "";
-      let type =
-        typeof this.options.button !== "undefined" &&
-        typeof this.options.button.type !== "undefined"
-          ? this.options.button.type
-          : "btn-create";
-      return size ? size + " " + type : type;
-    },
-    displayTextButton() {
-      return typeof this.options.button !== "undefined" &&
-        typeof this.options.button.display !== "undefined"
-        ? this.options.button.display
-        : true;
-    },
-    checkUniq() {
-      if (this.options.uniq === true) {
-        return "radio";
-      }
-      return "checkbox";
-    },
-    priorSuggestion() {
-      return this.search.priorSuggestion;
-    },
-    hasPriorSuggestion() {
-      return this.search.priorSuggestion.key ? true : false;
-    },
-  },
-  methods: {
-    openModal() {
-      this.modal.showModal = true;
-      this.$nextTick(function () {
-        this.$refs.search.focus();
+import {
+  trans,
+  ADD_PERSONS_SUGGESTED_COUNTER,
+  ADD_PERSONS_SEARCH_SOME_PERSONS,
+  ADD_PERSONS_SELECTED_COUNTER,
+  ONTHEFLY_CREATE_BUTTON,
+  ACTION_CHECK_ALL,
+  ACTION_RESET,
+  ACTION_ADD,
+} from "translator";
+import {
+  Suggestion,
+  Search,
+  Result as OriginalResult,
+  SearchOptions,
+} from "ChillPersonAssets/types";
+
+// Extend Result type to include optional addressId
+type Result = OriginalResult & { addressId?: number };
+
+const props = defineProps({
+  suggested: { type: Array as () => Suggestion[], default: () => [] },
+  selected: { type: Array as () => Suggestion[], default: () => [] },
+  buttonTitle: { type: String, required: true },
+  modalTitle: { type: String, required: true },
+  options: { type: Object as () => SearchOptions, required: true },
+});
+
+defineEmits(["addNewPersons"]);
+
+const showModal = ref(false);
+const modalDialogClass = ref("modal-dialog-scrollable modal-xl");
+
+const modal = shallowRef({
+  showModal: false,
+  modalDialogClass: "modal-dialog-scrollable modal-xl",
+});
+
+const search = reactive({
+  query: "" as string,
+  previousQuery: "" as string,
+  currentSearchQueryController: null as AbortController | null,
+  suggested: props.suggested as Suggestion[],
+  selected: props.selected as Suggestion[],
+  priorSuggestion: {} as Partial<Suggestion>,
+});
+
+const searchRef = ref<HTMLInputElement | null>(null);
+const onTheFly = ref<InstanceType<typeof OnTheFly> | null>(null);
+
+const query = computed({
+  get: () => search.query,
+  set: (val) => setQuery(val),
+});
+const queryLength = computed(() => search.query.length);
+const suggestedCounter = computed(() => search.suggested.length);
+const selectedComputed = computed(() => search.selected);
+const selectedCounter = computed(() => search.selected.length);
+
+const getClassButton = computed(() => {
+  let size = props.options?.button?.size ?? "";
+  let type = props.options?.button?.type ?? "btn-create";
+  return size ? size + " " + type : type;
+});
+const displayTextButton = computed(() =>
+  props.options?.button?.display !== undefined
+    ? props.options.button.display
+    : true,
+);
+
+const checkUniq = computed(() =>
+  props.options.uniq === true ? "radio" : "checkbox",
+);
+
+const priorSuggestion = computed(() => search.priorSuggestion);
+const hasPriorSuggestion = computed(() => !!search.priorSuggestion.key);
+
+const itemKey = (item: Suggestion) => item.result.type + item.result.id;
+
+function addPriorSuggestion() {
+  if (hasPriorSuggestion.value) {
+    // Type assertion is safe here due to the checks above
+    search.suggested.unshift(priorSuggestion.value as Suggestion);
+    search.selected.unshift(priorSuggestion.value as Suggestion);
+    newPriorSuggestion(null);
+  }
+}
+
+const selectedAndSuggested = computed(() => {
+  addPriorSuggestion();
+  const uniqBy = (a: Suggestion[], key: (item: Suggestion) => string) => [
+    ...new Map(a.map((x) => [key(x), x])).values(),
+  ];
+  let union = [
+    ...new Set([
+      ...search.suggested.slice().reverse(),
+      ...search.selected.slice().reverse(),
+    ]),
+  ];
+  return uniqBy(union, (k: Suggestion) => k.key);
+});
+
+function openModal() {
+  showModal.value = true;
+  nextTick(() => {
+    if (searchRef.value) searchRef.value.focus();
+  });
+}
+function closeModal() {
+  showModal.value = false;
+}
+
+function setQuery(q: string) {
+  search.query = q;
+
+  // Clear previous search if any
+  if (search.currentSearchQueryController) {
+    search.currentSearchQueryController.abort();
+    search.currentSearchQueryController = null;
+  }
+
+  if (q === "") {
+    loadSuggestions([]);
+    return;
+  }
+
+  // Debounce delay based on query length
+  const delay = q.length > 3 ? 300 : 700;
+
+  setTimeout(() => {
+    // Only search if query hasn't changed in the meantime
+    if (q !== search.query) return;
+
+    search.currentSearchQueryController = new AbortController();
+
+    searchEntities(
+      { query: q, options: props.options },
+      search.currentSearchQueryController.signal,
+    )
+      .then((suggested: Search) => {
+        loadSuggestions(suggested.results);
+      })
+      .catch((error: DOMException) => {
+        if (error instanceof DOMException && error.name === "AbortError") {
+          // Request was aborted, ignore
+          return;
+        }
+        throw error;
       });
-    },
-    setQuery(query) {
-      this.search.query = query;
+  }, delay);
+}
 
-      setTimeout(
-        function () {
-          if (query === "") {
-            this.loadSuggestions([]);
-            return;
-          }
-          if (query === this.search.query) {
-            if (this.search.currentSearchQueryController !== null) {
-              this.search.currentSearchQueryController.abort();
-            }
-            this.search.currentSearchQueryController = new AbortController();
-            searchEntities(
-              { query, options: this.options },
-              this.search.currentSearchQueryController.signal,
-            )
-              .then(
-                (suggested) =>
-                  new Promise((resolve) => {
-                    this.loadSuggestions(suggested.results);
-                    resolve();
-                  }),
-              )
-              .catch((error) => {
-                if (error instanceof DOMException) {
-                  if (error.name === "AbortError") {
-                    console.log("request aborted due to user continue typing");
-                    return;
-                  }
-                }
+function loadSuggestions(suggestedArr: Suggestion[]) {
+  search.suggested = suggestedArr;
+  search.suggested.forEach((item) => {
+    item.key = itemKey(item);
+  });
+}
 
-                throw error;
-              });
-          }
-        }.bind(this),
-        query.length > 3 ? 300 : 700,
-      );
-    },
-    loadSuggestions(suggested) {
-      this.search.suggested = suggested;
-      this.search.suggested.forEach(function (item) {
-        item.key = this.itemKey(item);
-      }, this);
-    },
-    updateSelected(value) {
-      //console.log('value', value);
-      this.search.selected = value;
-    },
-    resetSearch() {
-      this.resetSelection();
-      this.resetSuggestion();
-    },
-    resetSuggestion() {
-      this.search.query = "";
-      this.search.suggested = [];
-    },
-    resetSelection() {
-      this.search.selected = [];
-    },
-    selectAll() {
-      this.search.suggested.forEach(function (item) {
-        this.search.selected.push(item);
-      }, this);
-    },
-    itemKey(item) {
-      return item.result.type + item.result.id;
-    },
-    addPriorSuggestion() {
-      // console.log('prior suggestion', this.priorSuggestion);
-      if (this.hasPriorSuggestion) {
-        // console.log('addPriorSuggestion',);
-        this.suggested.unshift(this.priorSuggestion);
-        this.selected.unshift(this.priorSuggestion);
+function updateSelected(value: Suggestion[]) {
+  search.selected = value;
+}
 
-        this.newPriorSuggestion(null);
-      }
-    },
-    newPriorSuggestion(entity) {
-      // console.log('newPriorSuggestion', entity);
-      if (entity !== null) {
-        let suggestion = {
-          key: entity.type + entity.id,
-          relevance: 0.5,
-          result: entity,
-        };
-        this.search.priorSuggestion = suggestion;
-        // console.log('search priorSuggestion', this.search.priorSuggestion);
-        this.addPriorSuggestion(suggestion);
-      } else {
-        this.search.priorSuggestion = {};
-      }
-    },
-    saveFormOnTheFly({ type, data }) {
-      console.log(
-        "saveFormOnTheFly from addPersons, type",
-        type,
-        ", data",
+function resetSuggestion() {
+  search.query = "";
+  search.suggested = [];
+}
+
+function resetSelection() {
+  search.selected = [];
+}
+
+function resetSearch() {
+  resetSelection();
+  resetSuggestion();
+}
+
+function selectAll() {
+  search.suggested.forEach((item) => {
+    search.selected.push(item);
+  });
+}
+
+function newPriorSuggestion(entity: Result | null) {
+  if (entity !== null) {
+    let suggestion = {
+      key: entity.type + entity.id,
+      relevance: 0.5,
+      result: entity,
+    };
+    search.priorSuggestion = suggestion;
+  } else {
+    search.priorSuggestion = {};
+  }
+}
+
+async function saveFormOnTheFly({
+  type,
+  data,
+}: {
+  type: string;
+  data: Result;
+}) {
+  try {
+    if (type === "person") {
+      const responsePerson: Result = await makeFetch(
+        "POST",
+        "/api/1.0/person/person.json",
         data,
       );
-      if (type === "person") {
-        makeFetch("POST", "/api/1.0/person/person.json", data)
-          .then((responsePerson) => {
-            this.newPriorSuggestion(responsePerson);
-            this.$refs.onTheFly.closeModal();
+      newPriorSuggestion(responsePerson);
+      if (onTheFly.value) onTheFly.value.closeModal();
 
-            if (null !== data.addressId) {
-              const household = {
-                type: "household",
-              };
-              const address = {
-                id: data.addressId,
-              };
-              makeFetch("POST", "/api/1.0/person/household.json", household)
-                .then((responseHousehold) => {
-                  const member = {
-                    concerned: [
-                      {
-                        person: {
-                          type: "person",
-                          id: responsePerson.id,
-                        },
-                        start_date: {
-                          // TODO: use date.ts methods (low priority)
-                          datetime: `${new Date().toISOString().split("T")[0]}T00:00:00+02:00`,
-                        },
-                        holder: false,
-                        comment: null,
-                      },
-                    ],
-                    destination: {
-                      type: "household",
-                      id: responseHousehold.id,
-                    },
-                    composition: null,
-                  };
-                  return makeFetch(
-                    "POST",
-                    "/api/1.0/person/household/members/move.json",
-                    member,
-                  )
-                    .then((_response) => {
-                      makeFetch(
-                        "POST",
-                        `/api/1.0/person/household/${responseHousehold.id}/address.json`,
-                        address,
-                      )
-                        .then((_response) => {
-                          console.log(_response);
-                        })
-                        .catch((error) => {
-                          if (error.name === "ValidationException") {
-                            for (let v of error.violations) {
-                              this.$toast.open({ message: v });
-                            }
-                          } else {
-                            this.$toast.open({ message: "An error occurred" });
-                          }
-                        });
-                    })
-                    .catch((error) => {
-                      if (error.name === "ValidationException") {
-                        for (let v of error.violations) {
-                          this.$toast.open({ message: v });
-                        }
-                      } else {
-                        this.$toast.open({ message: "An error occurred" });
-                      }
-                    });
-                })
-                .catch((error) => {
-                  if (error.name === "ValidationException") {
-                    for (let v of error.violations) {
-                      this.$toast.open({ message: v });
-                    }
-                  } else {
-                    this.$toast.open({ message: "An error occurred" });
-                  }
-                });
-            }
-          })
-          .catch((error) => {
-            if (error.name === "ValidationException") {
-              for (let v of error.violations) {
-                this.$toast.open({ message: v });
-              }
-            } else {
-              this.$toast.open({ message: "An error occurred" });
-            }
-          });
-      } else if (type === "thirdparty") {
-        makeFetch("POST", "/api/1.0/thirdparty/thirdparty.json", data)
-          .then((response) => {
-            this.newPriorSuggestion(response);
-            this.$refs.onTheFly.closeModal();
-          })
-          .catch((error) => {
-            if (error.name === "ValidationException") {
-              for (let v of error.violations) {
-                this.$toast.open({ message: v });
-              }
-            } else {
-              this.$toast.open({ message: "An error occurred" });
-            }
-          });
+      if (data.addressId != null) {
+        const household = { type: "household" };
+        const address = { id: data.addressId };
+        try {
+          const responseHousehold: Result = await makeFetch(
+            "POST",
+            "/api/1.0/person/household.json",
+            household,
+          );
+          const member = {
+            concerned: [
+              {
+                person: {
+                  type: "person",
+                  id: responsePerson.id,
+                },
+                start_date: {
+                  datetime: `${new Date().toISOString().split("T")[0]}T00:00:00+02:00`,
+                },
+                holder: false,
+                comment: null,
+              },
+            ],
+            destination: {
+              type: "household",
+              id: responseHousehold.id,
+            },
+            composition: null,
+          };
+          await makeFetch(
+            "POST",
+            "/api/1.0/person/household/members/move.json",
+            member,
+          );
+          try {
+            const _response = await makeFetch(
+              "POST",
+              `/api/1.0/person/household/${responseHousehold.id}/address.json`,
+              address,
+            );
+            console.log(_response);
+          } catch (error) {
+            console.error(error);
+          }
+        } catch (error) {
+          console.error(error);
+        }
       }
-    },
+    } else if (type === "thirdparty") {
+      const response: Result = await makeFetch(
+        "POST",
+        "/api/1.0/thirdparty/thirdparty.json",
+        data,
+      );
+      newPriorSuggestion(response);
+      if (onTheFly.value) onTheFly.value.closeModal();
+    }
+  } catch (error) {
+    console.error(error);
+  }
+}
+
+watch(
+  () => props.selected,
+  (newSelected) => {
+    search.selected = newSelected;
   },
-};
+  { deep: true },
+);
+
+watch(
+  () => props.suggested,
+  (newSuggested) => {
+    search.suggested = newSuggested;
+  },
+  { deep: true },
+);
+
+watch(
+  () => modal,
+  (val) => {
+    showModal.value = val.value.showModal;
+    modalDialogClass.value = val.value.modalDialogClass;
+  },
+  { deep: true },
+);
+
+defineExpose({
+  resetSearch,
+  showModal,
+});
 </script>
 
 <style lang="scss">
@@ -438,7 +450,6 @@ div.body-head {
       input {
         width: 100%;
         padding: 1.2em 1.5em 1.2em 2.5em;
-        //margin: 1em 0;
       }
       i {
         position: absolute;
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonSuggestion.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonSuggestion.vue
index bef3967b5..4499b40c8 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonSuggestion.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonSuggestion.vue
@@ -3,87 +3,80 @@
     <label>
       <div>
         <input
-          v-bind:type="type"
+          :type="type"
           v-model="selected"
           name="item"
-          v-bind:id="item"
-          v-bind:value="setValueByType(item, type)"
+          :id="item.key"
+          :value="setValueByType(item, type)"
         />
       </div>
 
       <suggestion-person
         v-if="item.result.type === 'person'"
-        v-bind:item="item"
-      >
-      </suggestion-person>
+        :item="item"
+      ></suggestion-person>
 
       <suggestion-third-party
         v-if="item.result.type === 'thirdparty'"
         @newPriorSuggestion="newPriorSuggestion"
-        v-bind:item="item"
-      >
-      </suggestion-third-party>
+        :item="item"
+      ></suggestion-third-party>
 
-      <suggestion-user v-if="item.result.type === 'user'" v-bind:item="item">
-      </suggestion-user>
+      <suggestion-user
+        v-if="item.result.type === 'user'"
+        :item="item"
+      ></suggestion-user>
 
       <suggestion-user-group
         v-if="item.result.type === 'user_group'"
-        v-bind:item="item"
-      >
-        ></suggestion-user-group
-      >
+        :item="item"
+      ></suggestion-user-group>
 
       <suggestion-household
         v-if="item.result.type === 'household'"
-        v-bind:item="item"
-      >
-      </suggestion-household>
+        :item="item"
+      ></suggestion-household>
     </label>
   </div>
 </template>
 
-<script>
-import SuggestionPerson from "./TypePerson";
-import SuggestionThirdParty from "./TypeThirdParty";
-import SuggestionUser from "./TypeUser";
-import SuggestionHousehold from "./TypeHousehold";
-import SuggestionUserGroup from "./TypeUserGroup";
+<script setup lang="ts">
+import { computed } from "vue";
 
-export default {
-  name: "PersonSuggestion",
-  components: {
-    SuggestionPerson,
-    SuggestionThirdParty,
-    SuggestionUser,
-    SuggestionHousehold,
-    SuggestionUserGroup,
-  },
-  props: ["item", "search", "type"],
-  emits: ["updateSelected", "newPriorSuggestion"],
-  computed: {
-    selected: {
-      set(value) {
-        //console.log('value', value);
-        this.$emit("updateSelected", value);
-      },
-      get() {
-        return this.search.selected;
-      },
-    },
-    isChecked() {
-      return this.search.selected.indexOf(this.item) === -1 ? false : true;
-    },
-  },
-  methods: {
-    setValueByType(value, type) {
-      return type === "radio" ? [value] : value;
-    },
-    newPriorSuggestion(response) {
-      this.$emit("newPriorSuggestion", response);
-    },
-  },
-};
+// Components
+import SuggestionPerson from "./TypePerson.vue";
+import SuggestionThirdParty from "./TypeThirdParty.vue";
+import SuggestionUser from "./TypeUser.vue";
+import SuggestionHousehold from "./TypeHousehold.vue";
+import SuggestionUserGroup from "./TypeUserGroup.vue";
+
+// Types
+import { Result, Suggestion } from "ChillPersonAssets/types";
+
+const props = defineProps<{
+  item: Suggestion;
+  search: { selected: Suggestion[] };
+  type: string;
+}>();
+const emit = defineEmits(["updateSelected", "newPriorSuggestion"]);
+
+// v-model for selected
+const selected = computed({
+  get: () => props.search.selected,
+  set: (value) => emit("updateSelected", value),
+});
+
+const isChecked = computed(
+  () => props.search.selected.indexOf(props.item) !== -1,
+);
+
+function setValueByType(value: Suggestion, type: string) {
+  return type === "radio" ? [value] : value;
+}
+
+function newPriorSuggestion(response: Result) {
+  emit("newPriorSuggestion", response);
+}
 </script>
 
 <style lang="scss">
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeHousehold.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeHousehold.vue
index 63b39ebc7..a1e33c4de 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeHousehold.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeHousehold.vue
@@ -1,26 +1,25 @@
 <template>
   <div class="container household">
-    <household-render-box
+    <HouseholdRenderBox
       :household="item.result"
       :is-address-multiline="false"
     />
   </div>
 
   <div class="right_actions">
-    <badge-entity :entity="item.result" :options="{ displayLong: true }" />
+    <BadgeEntity :entity="item.result" :options="{ displayLong: true }" />
   </div>
 </template>
 
-<script>
+<script setup lang="ts">
+import { defineProps } from "vue";
 import BadgeEntity from "ChillMainAssets/vuejs/_components/BadgeEntity.vue";
 import HouseholdRenderBox from "ChillPersonAssets/vuejs/_components/Entity/HouseholdRenderBox.vue";
+import { Suggestion } from "ChillPersonAssets/types";
 
-export default {
-  name: "SuggestionHousehold",
-  components: {
-    BadgeEntity,
-    HouseholdRenderBox,
-  },
-  props: ["item"],
-};
+interface TypeHouseholdProps {
+  item: Suggestion;
+}
+
+defineProps<TypeHouseholdProps>();
 </script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypePerson.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypePerson.vue
index 773609316..e9ef26d37 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypePerson.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypePerson.vue
@@ -4,11 +4,11 @@
       <person-text :person="item.result" />
     </span>
     <span class="birthday" v-if="hasBirthdate">
-      {{ $d(item.result.birthdate.datetime, "short") }}
+      {{ formatDate(item.result.birthdate?.datetime, "short") }}
     </span>
     <span class="location" v-if="hasAddress">
-      {{ item.result.current_household_address.text }} -
-      {{ item.result.current_household_address.postcode.name }}
+      {{ item.result.current_household_address?.text }} -
+      {{ item.result.current_household_address?.postcode?.name }}
     </span>
   </div>
 
@@ -18,26 +18,38 @@
   </div>
 </template>
 
-<script>
+<script lang="ts" setup>
+import { computed, defineProps } from "vue";
 import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue";
 import BadgeEntity from "ChillMainAssets/vuejs/_components/BadgeEntity.vue";
 import PersonText from "ChillPersonAssets/vuejs/_components/Entity/PersonText.vue";
 
-export default {
-  name: "SuggestionPerson",
-  components: {
-    OnTheFly,
-    BadgeEntity,
-    PersonText,
-  },
-  props: ["item"],
-  computed: {
-    hasBirthdate() {
-      return this.item.result.birthdate !== null;
-    },
-    hasAddress() {
-      return this.item.result.current_household_address !== null;
-    },
-  },
-};
+function formatDate(dateString: string | undefined, format: string) {
+  if (!dateString) return "";
+  // Use Intl.DateTimeFormat or your preferred formatting here
+  const date = new Date(dateString);
+  if (format === "short") {
+    return date.toLocaleDateString();
+  }
+  return date.toString();
+}
+
+const props = defineProps<{
+  item: {
+    result: {
+      id: number | string;
+      birthdate: { datetime: string } | null;
+      current_household_address: {
+        text: string;
+        postcode: { name: string };
+      } | null;
+      // add other fields as needed
+    };
+  };
+}>();
+
+const hasBirthdate = computed(() => props.item.result.birthdate !== null);
+const hasAddress = computed(
+  () => props.item.result.current_household_address !== null,
+);
 </script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue
index bbcc553d0..3f99e5d11 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue
@@ -7,13 +7,13 @@
       <span class="name"> {{ item.result.text }}&nbsp; </span>
       <span class="location">
         <template v-if="hasAddress">
-          {{ getAddress.text }} -
-          {{ getAddress.postcode.name }}
+          {{ getAddress?.text }} -
+          {{ getAddress?.postcode?.name }}
         </template>
       </span>
     </div>
     <div class="tpartyparent" v-if="hasParent">
-      <span class="name"> > {{ item.result.parent.text }} </span>
+      <span class="name"> &gt; {{ item.result.parent?.text }} </span>
     </div>
   </div>
 
@@ -30,11 +30,72 @@
   </div>
 </template>
 
-<script>
+<script lang="ts" setup>
+import { computed, ref } from "vue";
 import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue";
 import BadgeEntity from "ChillMainAssets/vuejs/_components/BadgeEntity.vue";
 import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
+import { useToast } from "vue-toast-notification";
+import { ThirdParty } from "ChillMainAssets/types";
+import { Result, Suggestion } from "ChillPersonAssets/types";
 
+interface TypeThirdPartyProps {
+  item: Suggestion;
+}
+
+const props = defineProps<TypeThirdPartyProps>();
+
+const emit = defineEmits<(e: "newPriorSuggestion", payload: unknown) => void>();
+
+const onTheFly = ref<InstanceType<typeof OnTheFly> | null>(null);
+const toast = useToast();
+
+const hasAddress = computed(() => {
+  if (props.item.result.address !== null) {
+    return true;
+  }
+  if (props.item.result.parent !== null) {
+    if (props.item.result.parent) {
+      return props.item.result.parent.address !== null;
+    }
+  }
+  return false;
+});
+
+const hasParent = computed(() => {
+  return props.item.result.parent !== null;
+});
+
+const getAddress = computed(() => {
+  if (props.item.result.address !== null) {
+    return props.item.result.address;
+  }
+  if (props.item.result.parent && props.item.result.parent.address !== null) {
+    return props.item.result.parent.address;
+  }
+  return null;
+});
+
+function saveFormOnTheFly({ data }: { data: ThirdParty }) {
+  makeFetch("POST", "/api/1.0/thirdparty/thirdparty.json", data)
+    .then((response: unknown) => {
+      const result = response as Result;
+      emit("newPriorSuggestion", result);
+      if (onTheFly.value) onTheFly.value.closeModal();
+    })
+    .catch((error: unknown) => {
+      const errorResponse = error as { name: string; violations: string[] };
+      if (errorResponse.name === "ValidationException") {
+        for (let v of errorResponse.violations) {
+          if (toast) toast.open({ message: v });
+        }
+      } else {
+        if (toast) toast.open({ message: "An error occurred" });
+      }
+    });
+}
+
+// i18n config (if needed elsewhere)
 const i18n = {
   messages: {
     fr: {
@@ -46,59 +107,9 @@ const i18n = {
     },
   },
 };
-
-export default {
-  name: "SuggestionThirdParty",
-  components: {
-    OnTheFly,
-    BadgeEntity,
-  },
-  props: ["item"],
-  emits: ["newPriorSuggestion"],
+defineExpose({
   i18n,
-  computed: {
-    hasAddress() {
-      if (this.$props.item.result.address !== null) {
-        return true;
-      }
-      if (this.$props.item.result.parent !== null) {
-        return this.$props.item.result.parent.address !== null;
-      }
-      return false;
-    },
-    hasParent() {
-      return this.$props.item.result.parent !== null;
-    },
-    getAddress() {
-      if (this.$props.item.result.address !== null) {
-        return this.$props.item.result.address;
-      }
-      if (this.$props.item.result.parent.address !== null) {
-        return this.$props.item.result.parent.address;
-      }
-
-      return null;
-    },
-  },
-  methods: {
-    saveFormOnTheFly({ data }) {
-      makeFetch("POST", "/api/1.0/thirdparty/thirdparty.json", data)
-        .then((response) => {
-          this.$emit("newPriorSuggestion", response);
-          this.$refs.onTheFly.closeModal();
-        })
-        .catch((error) => {
-          if (error.name === "ValidationException") {
-            for (let v of error.violations) {
-              this.$toast.open({ message: v });
-            }
-          } else {
-            this.$toast.open({ message: "An error occurred" });
-          }
-        });
-    },
-  },
-};
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUser.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUser.vue
index 35759a810..74f80c321 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUser.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUser.vue
@@ -1,31 +1,31 @@
 <template>
   <div class="container usercontainer">
     <div class="user-identification">
-      <user-render-box-badge :user="item.result" />
+      <UserRenderBoxBadge :user="item.result" />
     </div>
   </div>
   <div class="right_actions">
-    <badge-entity :entity="item.result" :options="{ displayLong: true }" />
+    <BadgeEntity :entity="item.result" :options="{ displayLong: true }" />
   </div>
 </template>
 
-<script>
+<script lang="ts" setup>
+import { computed, defineProps } from "vue";
 import BadgeEntity from "ChillMainAssets/vuejs/_components/BadgeEntity.vue";
 import UserRenderBoxBadge from "ChillMainAssets/vuejs/_components/Entity/UserRenderBoxBadge.vue";
+import { Suggestion } from "ChillPersonAssets/types";
 
-export default {
-  name: "SuggestionUser",
-  components: {
-    UserRenderBoxBadge,
-    BadgeEntity,
-  },
-  props: ["item"],
-  computed: {
-    hasParent() {
-      return this.$props.item.result.parent !== null;
-    },
-  },
-};
+interface TypeUserProps {
+  item: Suggestion;
+}
+
+const props = defineProps<TypeUserProps>();
+
+const hasParent = computed(() => props.item.result.parent !== null);
+
+defineExpose({
+  hasParent,
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUserGroup.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUserGroup.vue
index cc8c6ca66..ca3aa2cb8 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUserGroup.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUserGroup.vue
@@ -1,25 +1,7 @@
-<script setup lang="ts">
-import {
-  ResultItem,
-  UserGroup,
-} from "../../../../../../ChillMainBundle/Resources/public/types";
-import BadgeEntity from "ChillMainAssets/vuejs/_components/BadgeEntity.vue";
-import UserRenderBoxBadge from "ChillMainAssets/vuejs/_components/Entity/UserRenderBoxBadge.vue";
-import UserGroupRenderBox from "ChillMainAssets/vuejs/_components/Entity/UserGroupRenderBox.vue";
-
-interface TypeUserGroupProps {
-  item: ResultItem<UserGroup>;
-}
-
-const props = defineProps<TypeUserGroupProps>();
-</script>
-
 <template>
   <div class="container user-group-container">
     <div class="user-group-identification">
-      <user-group-render-box
-        :user-group="props.item.result"
-      ></user-group-render-box>
+      <user-group-render-box :user-group="props.item.result as UserGroup" />
     </div>
   </div>
   <div class="right_actions">
@@ -27,4 +9,16 @@ const props = defineProps<TypeUserGroupProps>();
   </div>
 </template>
 
+<script setup lang="ts">
+import { UserGroup } from "../../../../../../ChillMainBundle/Resources/public/types";
+import UserGroupRenderBox from "ChillMainAssets/vuejs/_components/Entity/UserGroupRenderBox.vue";
+import { Suggestion } from "ChillPersonAssets/types";
+
+interface TypeUserGroupProps {
+  item: Suggestion;
+}
+
+const props = defineProps<TypeUserGroupProps>();
+</script>
+
 <style scoped lang="scss"></style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
index a9d937250..e6f50708b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/HouseholdRenderBox.vue
@@ -5,11 +5,11 @@
         <!-- identifier -->
         <div v-if="isHouseholdNew()" class="h4">
           <i class="fa fa-home" />
-          {{ $t("new_household") }}
+          {{ trans(RENDERBOX_NEW_HOUSEHOLD) }}
         </div>
         <div v-else class="h4">
           <i class="fa fa-home" />
-          {{ $t("household_number", { number: household.id }) }}
+          {{ trans(RENDERBOX_HOUSEHOLD_NUMBER, { number: household.id }) }}
         </div>
       </div>
       <div class="item-col">
@@ -18,7 +18,7 @@
           <li
             v-if="hasCurrentMembers"
             class="members"
-            :title="$t('current_members')"
+            :title="trans(RENDERBOX_CURRENT_MEMBERS)"
           >
             <span
               v-for="m in currentMembers()"
@@ -42,9 +42,9 @@
               </person-render-box>
             </span>
           </li>
-          <li v-else class="members" :title="$t('current_members')">
+          <li v-else class="members" :title="trans(RENDERBOX_CURRENT_MEMBERS)">
             <p class="chill-no-data-statement">
-              {{ $t("no_members_yet") }}
+              {{ trans(RENDERBOX_NO_MEMBERS_YET) }}
             </p>
           </li>
 
@@ -57,7 +57,7 @@
           </li>
           <li v-else>
             <span class="chill-no-data-statement">{{
-              $t("no_current_address")
+              trans(RENDERBOX_NO_CURRENT_ADDRESS)
             }}</span>
           </li>
         </ul>
@@ -65,89 +65,82 @@
     </div>
   </section>
 </template>
-
-<script>
+<script setup>
+import { computed } from "vue";
 import PersonRenderBox from "ChillPersonAssets/vuejs/_components/Entity/PersonRenderBox.vue";
 import AddressRenderBox from "ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue";
+import {
+  trans,
+  RENDERBOX_NEW_HOUSEHOLD,
+  RENDERBOX_HOUSEHOLD_NUMBER,
+  RENDERBOX_CURRENT_MEMBERS,
+  RENDERBOX_NO_MEMBERS_YET,
+  RENDERBOX_NO_CURRENT_ADDRESS,
+} from "translator";
 
-const i18n = {
-  messages: {
-    fr: {
-      household_number: "Ménage n°{number}",
-      current_members: "Membres actuels",
-      no_current_address: "Sans adresse actuellement",
-      new_household: "Nouveau ménage",
-      no_members_yet: "Aucun membre actuellement",
-      holder: "titulaire",
-    },
-  },
-};
+const props = defineProps({
+  household: { type: Object, required: true },
+  isAddressMultiline: { type: Boolean, default: false },
+});
 
-export default {
-  name: "HouseholdRenderBox",
-  props: ["household", "isAddressMultiline"],
-  components: {
-    PersonRenderBox,
-    AddressRenderBox,
-  },
-  i18n,
-  computed: {
-    isMultiline() {
-      return typeof this.isAddressMultiline !== "undefined"
-        ? this.isAddressMultiline
-        : false;
-    },
-  },
-  methods: {
-    hasCurrentMembers() {
-      return this.household.current_members_id.length > 0;
-    },
-    currentMembers() {
-      let members = this.household.members
-        .filter((m) => this.household.current_members_id.includes(m.id))
-        .sort((a, b) => {
-          const orderA = a.position ? a.position.ordering : 0;
-          const orderB = b.position ? b.position.ordering : 0;
+const isMultiline = computed(() =>
+  typeof props.isAddressMultiline !== "undefined"
+    ? props.isAddressMultiline
+    : false,
+);
 
-          if (orderA < orderB) {
-            return -1;
-          }
-          if (orderA > orderB) {
-            return 1;
-          }
-          if (a.holder && !b.holder) {
-            return -1;
-          }
-          if (!a.holder && b.holder) {
-            return 1;
-          }
-          return 0;
-        });
+function hasCurrentMembers() {
+  return props.household.current_members_id.length > 0;
+}
 
-      if (this.household.new_members !== undefined) {
-        this.household.new_members
-          .map((m) => {
-            m.is_new = true;
-            return m;
-          })
-          .forEach((m) => {
-            members.push(m);
-          });
+function currentMembers() {
+  let members = props.household.members
+    .filter((m) => props.household.current_members_id.includes(m.id))
+    .sort((a, b) => {
+      const orderA = a.position ? a.position.ordering : 0;
+      const orderB = b.position ? b.position.ordering : 0;
+
+      if (orderA < orderB) {
+        return -1;
       }
+      if (orderA > orderB) {
+        return 1;
+      }
+      if (a.holder && !b.holder) {
+        return -1;
+      }
+      if (!a.holder && b.holder) {
+        return 1;
+      }
+      return 0;
+    });
 
-      return members;
-    },
-    currentMembersLength() {
-      return this.household.current_members_id.length;
-    },
-    isHouseholdNew() {
-      return !Number.isInteger(this.household.id);
-    },
-    hasAddress() {
-      return this.household.current_address !== null;
-    },
-  },
-};
+  if (props.household.new_members !== undefined) {
+    props.household.new_members
+      .map((m) => {
+        m.is_new = true;
+        return m;
+      })
+      .forEach((m) => {
+        members.push(m);
+      });
+  }
+
+  return members;
+}
+
+function currentMembersLength() {
+  return props.household.current_members_id.length;
+}
+
+function isHouseholdNew() {
+  return !Number.isInteger(props.household.id);
+}
+
+function hasAddress() {
+  return props.household.current_address !== null;
+}
+defineExpose(currentMembersLength);
 </script>
 
 <style lang="scss">
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
index dcb0c45e2..0d9e3ec5f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -23,7 +23,7 @@
               </a>
 
               <!-- use person-text here to avoid code duplication ? TODO -->
-              <span class="firstname">{{ person.firstName }}</span>
+              <span class="firstname">{{ person.firstName + " " }}</span>
               <span class="lastname">{{ person.lastName }}</span>
               <span v-if="person.suffixText" class="suffixtext"
                 >&nbsp;{{ person.suffixText }}</span
@@ -63,13 +63,11 @@
                 :title="birthdate"
               >
                 {{
-                  $t(
-                    person.gender
-                      ? `renderbox.birthday.${person.gender.genderTranslation}`
-                      : "renderbox.birthday.neutral",
-                  ) +
+                  trans(birthdateTranslation) +
                   " " +
-                  $d(birthdate, "text")
+                  new Intl.DateTimeFormat("fr-FR", {
+                    dateStyle: "long",
+                  }).format(birthdate)
                 }}
               </time>
 
@@ -78,7 +76,17 @@
                 :datetime="person.deathdate"
                 :title="person.deathdate"
               >
-                {{ $d(birthdate) }} - {{ $d(deathdate) }}
+                {{
+                  new Intl.DateTimeFormat("fr-FR", {
+                    dateStyle: "long",
+                  }).format(birthdate)
+                }}
+                -
+                {{
+                  new Intl.DateTimeFormat("fr-FR", {
+                    dateStyle: "long",
+                  }).format(deathdate)
+                }}
               </time>
 
               <time
@@ -86,12 +94,18 @@
                 :datetime="person.deathdate"
                 :title="person.deathdate"
               >
-                {{ $t("renderbox.deathdate") + " " + deathdate }}
+                {{
+                  trans(RENDERBOX_DEATHDATE) +
+                  " " +
+                  new Intl.DateTimeFormat("fr-FR", {
+                    dateStyle: "long",
+                  }).format(deathdate)
+                }}
               </time>
 
-              <span v-if="options.addAge && person.birthdate" class="age">{{
-                $tc("renderbox.years_old", person.age)
-              }}</span>
+              <span v-if="options.addAge && person.birthdate" class="age">
+                ({{ trans(RENDERBOX_YEARS_OLD, { n: person.age }) }})
+              </span>
             </p>
           </div>
         </div>
@@ -111,13 +125,13 @@
                     :is-multiline="isMultiline"
                   />
                   <p v-else class="chill-no-data-statement">
-                    {{ $t("renderbox.household_without_address") }}
+                    {{ trans(RENDERBOX_HOUSEHOLD_WITHOUT_ADDRESS) }}
                   </p>
                   <a
                     v-if="options.addHouseholdLink === true"
                     :href="getCurrentHouseholdUrl"
                     :title="
-                      $t('persons_associated.show_household_number', {
+                      trans(PERSONS_ASSOCIATED_SHOW_HOUSEHOLD_NUMBER, {
                         id: person.current_household_id,
                       })
                     "
@@ -125,14 +139,14 @@
                     <span class="badge rounded-pill bg-chill-beige">
                       <i
                         class="fa fa-fw fa-home"
-                      /><!--{{ $t('persons_associated.show_household') }}-->
+                      /><!--{{ trans(PERSONS_ASSOCIATED_SHOW_HOUSEHOLD) }}-->
                     </span>
                   </a>
                 </li>
                 <li v-else-if="options.addNoData">
                   <i class="fa fa-li fa-map-marker" />
                   <p class="chill-no-data-statement">
-                    {{ $t("renderbox.no_data") }}
+                    {{ trans(RENDERBOX_NO_DATA) }}
                   </p>
                 </li>
 
@@ -148,9 +162,9 @@
                   >
                     <i class="fa fa-li fa-map-marker" />
                     <div v-if="addr.address">
-                      <span class="item-key"
-                        >{{ $t("renderbox.residential_address") }}:</span
-                      >
+                      <span class="item-key">
+                        {{ trans(RENDERBOX_RESIDENTIAL_ADDRESS) }}:
+                      </span>
                       <div style="margin-top: -1em">
                         <address-render-box
                           :address="addr.address"
@@ -159,7 +173,7 @@
                       </div>
                     </div>
                     <div v-else-if="addr.hostPerson" class="mt-3">
-                      <p>{{ $t("renderbox.located_at") }}:</p>
+                      <p>{{ trans(RENDERBOX_LOCATED_AT) }}:</p>
                       <span class="chill-entity entity-person badge-person">
                         <person-text
                           v-if="addr.hostPerson"
@@ -173,7 +187,7 @@
                       />
                     </div>
                     <div v-else-if="addr.hostThirdParty" class="mt-3">
-                      <p>{{ $t("renderbox.located_at") }}:</p>
+                      <p>{{ trans(RENDERBOX_LOCATED_AT) }}:</p>
                       <span class="chill-entity entity-person badge-thirdparty">
                         <third-party-text
                           v-if="addr.hostThirdParty"
@@ -196,32 +210,32 @@
                 <li v-else-if="options.addNoData">
                   <i class="fa fa-li fa-envelope-o" />
                   <p class="chill-no-data-statement">
-                    {{ $t("renderbox.no_data") }}
+                    {{ trans(RENDERBOX_NO_DATA) }}
                   </p>
                 </li>
 
                 <li v-if="person.mobilenumber">
                   <i class="fa fa-li fa-mobile" />
-                  <a :href="'tel: ' + person.mobilenumber">{{
-                    person.mobilenumber
-                  }}</a>
+                  <a :href="'tel: ' + person.mobilenumber">
+                    {{ person.mobilenumber }}
+                  </a>
                 </li>
                 <li v-else-if="options.addNoData">
                   <i class="fa fa-li fa-mobile" />
                   <p class="chill-no-data-statement">
-                    {{ $t("renderbox.no_data") }}
+                    {{ trans(RENDERBOX_NO_DATA) }}
                   </p>
                 </li>
                 <li v-if="person.phonenumber">
                   <i class="fa fa-li fa-phone" />
-                  <a :href="'tel: ' + person.phonenumber">{{
-                    person.phonenumber
-                  }}</a>
+                  <a :href="'tel: ' + person.phonenumber">
+                    {{ person.phonenumber }}
+                  </a>
                 </li>
                 <li v-else-if="options.addNoData">
                   <i class="fa fa-li fa-phone" />
                   <p class="chill-no-data-statement">
-                    {{ $t("renderbox.no_data") }}
+                    {{ trans(RENDERBOX_NO_DATA) }}
                   </p>
                 </li>
 
@@ -240,7 +254,7 @@
                 <li v-else-if="options.addNoData">
                   <i class="fa fa-li fa-long-arrow-right" />
                   <p class="chill-no-data-statement">
-                    {{ $t("renderbox.no_data") }}
+                    {{ trans(RENDERBOX_NO_DATA) }}
                   </p>
                 </li>
                 <slot name="custom-zone" />
@@ -262,7 +276,7 @@
       <span
         v-if="options.isHolder"
         class="fa-stack fa-holder"
-        :title="$t('renderbox.holder')"
+        :title="trans(RENDERBOX_HOLDER)"
       >
         <i class="fa fa-circle fa-stack-1x text-success" />
         <i class="fa fa-stack-1x">T</i>
@@ -274,7 +288,7 @@
       <span
         v-if="options.isHolder"
         class="fa-stack fa-holder"
-        :title="$t('renderbox.holder')"
+        :title="trans(RENDERBOX_HOLDER)"
       >
         <i class="fa fa-circle fa-stack-1x text-success" />
         <i class="fa fa-stack-1x">T</i>
@@ -285,131 +299,120 @@
   </span>
 </template>
 
-<script>
+<script setup>
+import { computed } from "vue";
 import { ISOToDate } from "ChillMainAssets/chill/js/date";
 import AddressRenderBox from "ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue";
 import GenderIconRenderBox from "ChillMainAssets/vuejs/_components/Entity/GenderIconRenderBox.vue";
 import BadgeEntity from "ChillMainAssets/vuejs/_components/BadgeEntity.vue";
 import PersonText from "ChillPersonAssets/vuejs/_components/Entity/PersonText.vue";
 import ThirdPartyText from "ChillThirdPartyAssets/vuejs/_components/Entity/ThirdPartyText.vue";
+import {
+  trans,
+  RENDERBOX_HOLDER,
+  RENDERBOX_NO_DATA,
+  RENDERBOX_DEATHDATE,
+  RENDERBOX_HOUSEHOLD_WITHOUT_ADDRESS,
+  RENDERBOX_RESIDENTIAL_ADDRESS,
+  RENDERBOX_LOCATED_AT,
+  RENDERBOX_BIRTHDAY_MAN,
+  RENDERBOX_BIRTHDAY_WOMAN,
+  RENDERBOX_BIRTHDAY_UNKNOWN,
+  RENDERBOX_BIRTHDAY_NEUTRAL,
+  PERSONS_ASSOCIATED_SHOW_HOUSEHOLD_NUMBER,
+  RENDERBOX_YEARS_OLD,
+} from "translator";
 
-export default {
-  name: "PersonRenderBox",
-  components: {
-    AddressRenderBox,
-    GenderIconRenderBox,
-    BadgeEntity,
-    PersonText,
-    ThirdPartyText,
+const props = defineProps({
+  person: {
+    required: true,
   },
-  props: {
-    person: {
-      required: true,
-    },
-    options: {
-      type: Object,
-      required: false,
-    },
-    render: {
-      type: String,
-    },
-    returnPath: {
-      type: String,
-    },
-    showResidentialAddresses: {
-      type: Boolean,
-      default: false,
-    },
+  options: {
+    type: Object,
+    required: false,
   },
-  computed: {
-    isMultiline: function () {
-      if (this.options.isMultiline) {
-        return this.options.isMultiline;
-      } else {
-        return false;
-      }
-    },
-    birthdate: function () {
-      if (
-        this.person.birthdate !== null ||
-        this.person.birthdate === "undefined"
-      ) {
-        return ISOToDate(this.person.birthdate.datetime);
-      } else {
-        return "";
-      }
-    },
-    deathdate: function () {
-      if (
-        this.person.deathdate !== null ||
-        this.person.birthdate === "undefined"
-      ) {
-        return new Date(this.person.deathdate.datetime);
-      } else {
-        return "";
-      }
-    },
-    altNameLabel: function () {
-      let altNameLabel = "";
-      this.person.altNames.forEach(
-        (altName) => (altNameLabel += altName.label),
-      );
-      return altNameLabel;
-    },
-    altNameKey: function () {
-      let altNameKey = "";
-      this.person.altNames.forEach((altName) => (altNameKey += altName.key));
-      return altNameKey;
-    },
-    getUrl: function () {
-      return `/fr/person/${this.person.id}/general`;
-    },
-    getCurrentHouseholdUrl: function () {
-      let returnPath = this.returnPath ? `?returnPath=${this.returnPath}` : ``;
-      return `/fr/person/household/${this.person.current_household_id}/summary${returnPath}`;
-    },
+  render: {
+    type: String,
   },
-};
-</script>
+  returnPath: {
+    type: String,
+  },
+  showResidentialAddresses: {
+    type: Boolean,
+    default: false,
+  },
+});
 
-<style lang="scss" scoped>
-@import "ChillMainAssets/module/bootstrap/shared";
-@import "ChillPersonAssets/chill/scss/mixins";
-@import "ChillMainAssets/chill/scss/chill_variables";
-
-.lastname:before {
-  content: " ";
-}
-
-div.flex-table {
-  div.item-bloc {
-    div.item-row {
-      div.item-col:first-child {
-        width: 33%;
-      }
-
-      @include media-breakpoint-down(sm) {
-        div.item-col:first-child {
-          width: unset;
-        }
-      }
-
-      div.item-col:last-child {
-        justify-content: flex-start;
-      }
+const birthdateTranslation = computed(() => {
+  if (props.person.gender) {
+    const { genderTranslation } = props.person.gender;
+    switch (genderTranslation) {
+      case "man":
+        return RENDERBOX_BIRTHDAY_MAN;
+      case "woman":
+        return RENDERBOX_BIRTHDAY_WOMAN;
+      case "neutral":
+        return RENDERBOX_BIRTHDAY_NEUTRAL;
+      case "unknown":
+        return RENDERBOX_BIRTHDAY_UNKNOWN;
+      default:
+        return RENDERBOX_BIRTHDAY_UNKNOWN;
     }
+  } else {
+    return RENDERBOX_BIRTHDAY_UNKNOWN;
   }
-}
+});
 
-.age {
-  margin-left: 0.5em;
+const isMultiline = computed(() => {
+  return props.options?.isMultiline || false;
+});
 
-  &:before {
-    content: "(";
+const birthdate = computed(() => {
+  if (
+    props.person.birthdate !== null &&
+    props.person.birthdate !== undefined &&
+    props.person.birthdate.datetime
+  ) {
+    return ISOToDate(props.person.birthdate.datetime);
+  } else {
+    return "";
   }
+});
 
-  &:after {
-    content: ")";
+const deathdate = computed(() => {
+  if (
+    props.person.deathdate !== null &&
+    props.person.deathdate !== undefined &&
+    props.person.deathdate.datetime
+  ) {
+    return new Date(props.person.deathdate.datetime);
+  } else {
+    return "";
   }
-}
-</style>
+});
+
+const altNameLabel = computed(() => {
+  let altNameLabel = "";
+  (props.person.altNames || []).forEach(
+    (altName) => (altNameLabel += altName.label),
+  );
+  return altNameLabel;
+});
+
+const altNameKey = computed(() => {
+  let altNameKey = "";
+  (props.person.altNames || []).forEach(
+    (altName) => (altNameKey += altName.key),
+  );
+  return altNameKey;
+});
+
+const getUrl = computed(() => {
+  return `/fr/person/${props.person.id}/general`;
+});
+
+const getCurrentHouseholdUrl = computed(() => {
+  let returnPath = props.returnPath ? `?returnPath=${props.returnPath}` : ``;
+  return `/fr/person/household/${props.person.current_household_id}/summary${returnPath}`;
+});
+</script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonText.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonText.vue
index f3005f235..36be069b6 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonText.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonText.vue
@@ -2,65 +2,65 @@
   <span v-if="isCut">{{ cutText }}</span>
   <span v-else class="person-text">
     <span class="firstname">{{ person.firstName }}</span>
-    <!-- display: inline -->
     <span class="lastname">&nbsp;{{ person.lastName }}</span>
     <span v-if="person.altNames && person.altNames.length > 0" class="altnames">
-      <!-- display: inline -->
       <span :class="'altname altname-' + altNameKey"
         >&nbsp;({{ altNameLabel }})</span
       >
     </span>
-    <!-- display: inline -->
     <span v-if="person.suffixText" class="suffixtext"
       >&nbsp;{{ person.suffixText }}</span
     >
-    <!-- display: inline -->
     <span
       class="age"
-      v-if="
-        this.addAge && person.birthdate !== null && person.deathdate === null
-      "
-      >&nbsp;{{ $tc("renderbox.years_old", person.age) }}</span
+      v-if="addAge && person.birthdate !== null && person.deathdate === null"
+      >&nbsp;{{ trans(RENDERBOX_YEARS_OLD, person.age) }}</span
     >
-    <span v-else-if="this.addAge && person.deathdate !== null">&nbsp;(‡)</span>
+    <span v-else-if="addAge && person.deathdate !== null">&nbsp;(‡)</span>
   </span>
 </template>
 
-<script>
-export default {
-  name: "PersonText",
-  props: {
-    person: {
-      required: true,
-    },
-    isCut: {
-      type: Boolean,
-      required: false,
-      default: false,
-    },
-    addAge: {
-      type: Boolean,
-      required: false,
-      default: true,
-    },
-  },
-  computed: {
-    altNameLabel: function () {
-      let altNameLabel = "";
-      this.person.altNames.forEach(
-        (altName) => (altNameLabel += altName.label),
-      );
-      return altNameLabel;
-    },
-    altNameKey: function () {
-      let altNameKey = "";
-      this.person.altNames.forEach((altName) => (altNameKey += altName.key));
-      return altNameKey;
-    },
-    cutText: function () {
-      let more = this.person.text.length > 15 ? "…" : "";
-      return this.person.text.slice(0, 15) + more;
-    },
-  },
-};
+<script lang="ts" setup>
+import { computed, toRefs } from "vue";
+import { trans, RENDERBOX_YEARS_OLD } from "translator";
+
+interface AltName {
+  label: string;
+  key: string;
+}
+
+interface Person {
+  firstName: string;
+  lastName: string;
+  altNames: AltName[];
+  suffixText?: string;
+  birthdate: string | null;
+  deathdate: string | null;
+  age: number;
+  text: string;
+}
+
+const props = defineProps<{
+  person: Person;
+  isCut?: boolean;
+  addAge?: boolean;
+}>();
+
+const { person, isCut = false, addAge = true } = toRefs(props);
+
+const altNameLabel = computed(() => {
+  if (!person.value.altNames) return "";
+  return person.value.altNames.map((a: AltName) => a.label).join("");
+});
+
+const altNameKey = computed(() => {
+  if (!person.value.altNames) return "";
+  return person.value.altNames.map((a: AltName) => a.key).join("");
+});
+
+const cutText = computed(() => {
+  if (!person.value.text) return "";
+  const more = person.value.text.length > 15 ? "…" : "";
+  return person.value.text.slice(0, 15) + more;
+});
 </script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
index 9abd03991..3a93a305d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
@@ -17,7 +17,7 @@
           isMultiline: true,
         }"
         :show-residential-addresses="true"
-      ></person-render-box>
+      />
     </div>
   </div>
 
@@ -27,10 +27,10 @@
         class="form-control form-control-lg"
         id="lastname"
         v-model="lastName"
-        :placeholder="$t('person.lastname')"
+        :placeholder="trans(PERSON_MESSAGES_PERSON_LASTNAME)"
         @change="checkErrors"
       />
-      <label for="lastname">{{ $t("person.lastname") }}</label>
+      <label for="lastname">{{ trans(PERSON_MESSAGES_PERSON_LASTNAME) }}</label>
     </div>
 
     <div v-if="queryItems">
@@ -50,10 +50,12 @@
         class="form-control form-control-lg"
         id="firstname"
         v-model="firstName"
-        :placeholder="$t('person.firstname')"
+        :placeholder="trans(PERSON_MESSAGES_PERSON_FIRSTNAME)"
         @change="checkErrors"
       />
-      <label for="firstname">{{ $t("person.firstname") }}</label>
+      <label for="firstname">{{
+        trans(PERSON_MESSAGES_PERSON_FIRSTNAME)
+      }}</label>
     </div>
 
     <div v-if="queryItems">
@@ -86,12 +88,14 @@
    -->
     <div class="form-floating mb-3">
       <select class="form-select form-select-lg" id="gender" v-model="gender">
-        <option selected disabled>{{ $t("person.gender.placeholder") }}</option>
+        <option selected disabled>
+          {{ trans(PERSON_MESSAGES_PERSON_GENDER_PLACEHOLDER) }}
+        </option>
         <option v-for="g in config.genders" :value="g.id" :key="g.id">
           {{ g.label }}
         </option>
       </select>
-      <label>{{ $t("person.gender.title") }}</label>
+      <label>{{ trans(PERSON_MESSAGES_PERSON_GENDER_TITLE) }}</label>
     </div>
 
     <div
@@ -99,12 +103,14 @@
       v-if="showCenters && config.centers.length > 1"
     >
       <select class="form-select form-select-lg" id="center" v-model="center">
-        <option selected disabled>{{ $t("person.center.placeholder") }}</option>
+        <option selected disabled>
+          {{ trans(PERSON_MESSAGES_PERSON_CENTER_PLACEHOLDER) }}
+        </option>
         <option v-for="c in config.centers" :value="c" :key="c.id">
           {{ c.name }}
         </option>
       </select>
-      <label>{{ $t("person.center.title") }}</label>
+      <label>{{ trans(PERSON_MESSAGES_PERSON_CENTER_TITLE) }}</label>
     </div>
 
     <div class="form-floating mb-3">
@@ -114,64 +120,50 @@
         v-model="civility"
       >
         <option selected disabled>
-          {{ $t("person.civility.placeholder") }}
+          {{ trans(PERSON_MESSAGES_PERSON_CIVILITY_PLACEHOLDER) }}
         </option>
         <option v-for="c in config.civilities" :value="c.id" :key="c.id">
           {{ localizeString(c.name) }}
         </option>
       </select>
-      <label>{{ $t("person.civility.title") }}</label>
+      <label>{{ trans(PERSON_MESSAGES_PERSON_CIVILITY_TITLE) }}</label>
     </div>
 
     <div class="input-group mb-3">
-      <span class="input-group-text" id="birthdate"
-        ><i class="fa fa-fw fa-birthday-cake"></i
-      ></span>
-      <input
-        type="date"
-        class="form-control form-control-lg"
-        id="chill_personbundle_person_birthdate"
-        name="chill_personbundle_person[birthdate]"
-        v-model="birthDate"
-        aria-describedby="birthdate"
-      />
-    </div>
-
-    <div class="input-group mb-3">
-      <span class="input-group-text" id="phonenumber"
-        ><i class="fa fa-fw fa-phone"></i
-      ></span>
+      <span class="input-group-text" id="phonenumber">
+        <i class="fa fa-fw fa-phone"></i>
+      </span>
       <input
         class="form-control form-control-lg"
         v-model="phonenumber"
-        :placeholder="$t('person.phonenumber')"
-        :aria-label="$t('person.phonenumber')"
+        :placeholder="trans(PERSON_MESSAGES_PERSON_PHONENUMBER)"
+        :aria-label="trans(PERSON_MESSAGES_PERSON_PHONENUMBER)"
         aria-describedby="phonenumber"
       />
     </div>
 
     <div class="input-group mb-3">
-      <span class="input-group-text" id="mobilenumber"
-        ><i class="fa fa-fw fa-mobile"></i
-      ></span>
+      <span class="input-group-text" id="mobilenumber">
+        <i class="fa fa-fw fa-mobile"></i>
+      </span>
       <input
         class="form-control form-control-lg"
         v-model="mobilenumber"
-        :placeholder="$t('person.mobilenumber')"
-        :aria-label="$t('person.mobilenumber')"
+        :placeholder="trans(PERSON_MESSAGES_PERSON_MOBILENUMBER)"
+        :aria-label="trans(PERSON_MESSAGES_PERSON_MOBILENUMBER)"
         aria-describedby="mobilenumber"
       />
     </div>
 
     <div class="input-group mb-3">
-      <span class="input-group-text" id="email"
-        ><i class="fa fa-fw fa-at"></i
-      ></span>
+      <span class="input-group-text" id="email">
+        <i class="fa fa-fw fa-at"></i>
+      </span>
       <input
         class="form-control form-control-lg"
         v-model="email"
-        :placeholder="$t('person.email')"
-        :aria-label="$t('person.email')"
+        :placeholder="trans(PERSON_MESSAGES_PERSON_EMAIL)"
+        :aria-label="trans(PERSON_MESSAGES_PERSON_EMAIL)"
         aria-describedby="email"
       />
     </div>
@@ -183,22 +175,21 @@
         v-model="showAddressForm"
         name="showAddressForm"
       />
-      <label class="form-check-label">{{
-        $t("person.address.show_address_form")
-      }}</label>
+      <label class="form-check-label">
+        {{ trans(PERSON_MESSAGES_PERSON_ADDRESS_SHOW_ADDRESS_FORM) }}
+      </label>
     </div>
     <div
       v-if="action === 'create' && showAddressFormValue"
       class="form-floating mb-3"
     >
-      <p>{{ $t("person.address.warning") }}</p>
-      <add-address
+      <p>{{ trans(PERSON_MESSAGES_PERSON_ADDRESS_WARNING) }}</p>
+      <AddAddress
         :context="addAddress.context"
         :options="addAddress.options"
         :addressChangedCallback="submitNewAddress"
         ref="addAddress"
-      >
-      </add-address>
+      />
     </div>
 
     <div class="alert alert-warning" v-if="errors.length">
@@ -208,8 +199,8 @@
     </div>
   </div>
 </template>
-
-<script>
+<script setup>
+import { ref, reactive, computed, onMounted } from "vue";
 import {
   getCentersForPersonCreation,
   getCivilities,
@@ -220,286 +211,256 @@ import {
 import PersonRenderBox from "../Entity/PersonRenderBox.vue";
 import AddAddress from "ChillMainAssets/vuejs/Address/components/AddAddress.vue";
 import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
+import {
+  trans,
+  PERSON_MESSAGES_PERSON_LASTNAME,
+  PERSON_MESSAGES_PERSON_FIRSTNAME,
+  PERSON_MESSAGES_PERSON_GENDER_PLACEHOLDER,
+  PERSON_MESSAGES_PERSON_GENDER_TITLE,
+  PERSON_MESSAGES_PERSON_CENTER_PLACEHOLDER,
+  PERSON_MESSAGES_PERSON_CENTER_TITLE,
+  PERSON_MESSAGES_PERSON_CIVILITY_PLACEHOLDER,
+  PERSON_MESSAGES_PERSON_CIVILITY_TITLE,
+  PERSON_MESSAGES_PERSON_PHONENUMBER,
+  PERSON_MESSAGES_PERSON_MOBILENUMBER,
+  PERSON_MESSAGES_PERSON_EMAIL,
+  PERSON_MESSAGES_PERSON_ADDRESS_SHOW_ADDRESS_FORM,
+  PERSON_MESSAGES_PERSON_ADDRESS_WARNING,
+} from "translator";
 
-export default {
-  name: "OnTheFlyPerson",
-  props: ["id", "type", "action", "query"],
-  //emits: ['createAction'],
-  components: {
-    PersonRenderBox,
-    AddAddress,
-  },
-  data() {
-    return {
-      person: {
-        type: "person",
-        lastName: "",
-        firstName: "",
-        altNames: [],
-        addressId: null,
-        center: null,
-      },
-      config: {
-        altNames: [],
-        civilities: [],
-        centers: [],
-        genders: [],
-      },
-      showCenters: false, // NOTE: must remains false if the form is not in create mode
-      showAddressFormValue: false,
-      addAddress: {
-        options: {
-          button: {
-            text: { create: "person.address.create_address" },
-            size: "btn-sm",
-          },
-          title: { create: "person.address.create_address" },
-        },
-        context: {
-          target: {}, // boilerplate for getting the address id
-          edit: false,
-          addressId: null,
-          defaults: window.addaddress,
-        },
-      },
-      errors: [],
-    };
-  },
-  computed: {
-    firstName: {
-      set(value) {
-        this.person.firstName = value;
-      },
-      get() {
-        return this.person.firstName;
-      },
-    },
-    lastName: {
-      set(value) {
-        this.person.lastName = value;
-      },
-      get() {
-        return this.person.lastName;
-      },
-    },
-    gender: {
-      set(value) {
-        this.person.gender = { id: value, type: "chill_main_gender" };
-      },
-      get() {
-        return this.person.gender ? this.person.gender.id : null;
-      },
-    },
-    civility: {
-      set(value) {
-        this.person.civility = { id: value, type: "chill_main_civility" };
-      },
-      get() {
-        return this.person.civility ? this.person.civility.id : null;
-      },
-    },
-    birthDate: {
-      set(value) {
-        if (this.person.birthdate) {
-          this.person.birthdate.datetime = value + "T00:00:00+0100";
-        } else {
-          this.person.birthdate = { datetime: value + "T00:00:00+0100" };
-        }
-      },
-      get() {
-        return this.person.birthdate
-          ? this.person.birthdate.datetime.split("T")[0]
-          : "";
-      },
-    },
-    phonenumber: {
-      set(value) {
-        this.person.phonenumber = value;
-      },
-      get() {
-        return this.person.phonenumber;
-      },
-    },
-    mobilenumber: {
-      set(value) {
-        this.person.mobilenumber = value;
-      },
-      get() {
-        return this.person.mobilenumber;
-      },
-    },
-    email: {
-      set(value) {
-        this.person.email = value;
-      },
-      get() {
-        return this.person.email;
-      },
-    },
-    showAddressForm: {
-      set(value) {
-        this.showAddressFormValue = value;
-      },
-      get() {
-        return this.showAddressFormValue;
-      },
-    },
-    center: {
-      set(value) {
-        console.log("will set center", value);
-        this.person.center = { id: value.id, type: value.type };
-      },
-      get() {
-        const center = this.config.centers.find(
-          (c) => this.person.center !== null && this.person.center.id === c.id,
-        );
+const props = defineProps({
+  id: [String, Number],
+  type: String,
+  action: String,
+  query: String,
+});
 
-        console.log("center get", center);
+const person = reactive({
+  type: "person",
+  lastName: "",
+  firstName: "",
+  altNames: [],
+  addressId: null,
+  center: null,
+  gender: null,
+  civility: null,
+  birthdate: null,
+  phonenumber: "",
+  mobilenumber: "",
+  email: "",
+});
 
-        return typeof center === "undefined" ? null : center;
-      },
-    },
-    genderClass() {
-      switch (this.person.gender) {
-        case "woman":
-          return "fa-venus";
-        case "man":
-          return "fa-mars";
-        case "both":
-          return "fa-neuter";
-        case "unknown":
-          return "fa-genderless";
-        default:
-          return "fa-genderless";
-      }
-    },
-    genderTranslation() {
-      switch (this.person.gender.genderTranslation) {
-        case "woman":
-          return "person.gender.woman";
-        case "man":
-          return "person.gender.man";
-        case "neutral":
-          return "person.gender.neutral";
-        case "unknown":
-          return "person.gender.unknown";
-        default:
-          return "person.gender.unknown";
-      }
-    },
-    feminized() {
-      return this.person.gender === "woman" ? "e" : "";
-    },
-    personAltNamesLabels() {
-      return this.person.altNames.map((a) => (a ? a.label : ""));
-    },
-    queryItems() {
-      return this.query ? this.query.split(" ") : null;
+const config = reactive({
+  altNames: [],
+  civilities: [],
+  centers: [],
+  genders: [],
+});
+
+const showCenters = ref(false);
+const showAddressFormValue = ref(false);
+const errors = ref([]);
+
+const addAddress = reactive({
+  options: {
+    button: {
+      text: { create: "person.address.create_address" },
+      size: "btn-sm",
     },
+    title: { create: "person.address.create_address" },
   },
-  mounted() {
-    getPersonAltNames().then((altNames) => {
-      this.config.altNames = altNames;
-    });
-    getCivilities().then((civilities) => {
-      if ("results" in civilities) {
-        this.config.civilities = civilities.results;
-      }
-    });
-    getGenders().then((genders) => {
-      if ("results" in genders) {
-        console.log("genders", genders.results);
-        this.config.genders = genders.results;
-      }
-    });
-    if (this.action !== "create") {
-      this.loadData();
+  context: {
+    target: {},
+    edit: false,
+    addressId: null,
+    defaults: window.addaddress,
+  },
+});
+
+const firstName = computed({
+  get: () => person.firstName,
+  set: (value) => {
+    person.firstName = value;
+  },
+});
+const lastName = computed({
+  get: () => person.lastName,
+  set: (value) => {
+    person.lastName = value;
+  },
+});
+const gender = computed({
+  get: () => (person.gender ? person.gender.id : null),
+  set: (value) => {
+    person.gender = { id: value, type: "chill_main_gender" };
+  },
+});
+const civility = computed({
+  get: () => (person.civility ? person.civility.id : null),
+  set: (value) => {
+    person.civility = { id: value, type: "chill_main_civility" };
+  },
+});
+const birthDate = computed({
+  get: () => (person.birthdate ? person.birthdate.datetime.split("T")[0] : ""),
+  set: (value) => {
+    if (person.birthdate) {
+      person.birthdate.datetime = value + "T00:00:00+0100";
     } else {
-      // console.log('show centers', this.showCenters);
-      getCentersForPersonCreation().then((params) => {
-        this.config.centers = params.centers.filter((c) => c.isActive);
-        this.showCenters = params.showCenters;
-        // console.log('centers', this.config.centers)
-        // console.log('show centers inside', this.showCenters);
-        if (this.showCenters && this.config.centers.length === 1) {
-          this.person.center = this.config.centers[0];
-        }
-      });
+      person.birthdate = { datetime: value + "T00:00:00+0100" };
     }
   },
-  methods: {
-    localizeString,
-    checkErrors() {
-      this.errors = [];
-      if (this.person.lastName === "") {
-        this.errors.push("Le nom ne doit pas être vide.");
-      }
-      if (this.person.firstName === "") {
-        this.errors.push("Le prénom ne doit pas être vide.");
-      }
-      if (!this.person.gender) {
-        this.errors.push("Le genre doit être renseigné");
-      }
-      if (this.showCenters && this.person.center === null) {
-        this.errors.push("Le centre doit être renseigné");
-      }
-    },
-    loadData() {
-      getPerson(this.id).then(
-        (person) =>
-          new Promise((resolve) => {
-            this.person = person;
-            //console.log('get person', this.person);
-            resolve();
-          }),
-      );
-    },
-    onAltNameInput(event) {
-      const key = event.target.id;
-      const label = event.target.value;
-      let updateAltNames = this.person.altNames.filter((a) => a.key !== key);
-      updateAltNames.push({ key: key, label: label });
-      this.person.altNames = updateAltNames;
-    },
-    addQueryItem(field, queryItem) {
-      switch (field) {
-        case "lastName":
-          this.person.lastName = this.person.lastName
-            ? (this.person.lastName += ` ${queryItem}`)
-            : queryItem;
-          break;
-        case "firstName":
-          this.person.firstName = this.person.firstName
-            ? (this.person.firstName += ` ${queryItem}`)
-            : queryItem;
-          break;
-      }
-    },
-    submitNewAddress(payload) {
-      this.person.addressId = payload.addressId;
-    },
+});
+const phonenumber = computed({
+  get: () => person.phonenumber,
+  set: (value) => {
+    person.phonenumber = value;
   },
-};
-</script>
+});
+const mobilenumber = computed({
+  get: () => person.mobilenumber,
+  set: (value) => {
+    person.mobilenumber = value;
+  },
+});
+const email = computed({
+  get: () => person.email,
+  set: (value) => {
+    person.email = value;
+  },
+});
+const showAddressForm = computed({
+  get: () => showAddressFormValue.value,
+  set: (value) => {
+    showAddressFormValue.value = value;
+  },
+});
+const center = computed({
+  get: () => {
+    const c = config.centers.find(
+      (c) => person.center !== null && person.center.id === c.id,
+    );
+    return typeof c === "undefined" ? null : c;
+  },
+  set: (value) => {
+    person.center = { id: value.id, type: value.type };
+  },
+});
 
-<style lang="scss" scoped>
-div.flex-table {
-  div.item-bloc {
-    div.item-row {
-      div.item-col:last-child {
-        justify-content: flex-start;
-      }
+const genderClass = computed(() => {
+  switch (person.gender && person.gender.id) {
+    case "woman":
+      return "fa-venus";
+    case "man":
+      return "fa-mars";
+    case "both":
+      return "fa-neuter";
+    case "unknown":
+      return "fa-genderless";
+    default:
+      return "fa-genderless";
+  }
+});
+
+const genderTranslation = computed(() => {
+  switch (person.gender && person.gender.genderTranslation) {
+    case "woman":
+      return PERSON_MESSAGES_PERSON_GENDER_WOMAN;
+    case "man":
+      return PERSON_MESSAGES_PERSON_GENDER_MAN;
+    case "neutral":
+      return PERSON_MESSAGES_PERSON_GENDER_NEUTRAL;
+    case "unknown":
+      return PERSON_MESSAGES_PERSON_GENDER_UNKNOWN;
+    default:
+      return PERSON_MESSAGES_PERSON_GENDER_UNKNOWN;
+  }
+});
+const feminized = computed(() =>
+  person.gender && person.gender.id === "woman" ? "e" : "",
+);
+const personAltNamesLabels = computed(() =>
+  person.altNames.map((a) => (a ? a.label : "")),
+);
+const queryItems = computed(() =>
+  props.query ? props.query.split(" ") : null,
+);
+
+function checkErrors() {
+  errors.value = [];
+  if (person.lastName === "") {
+    errors.value.push("Le nom ne doit pas être vide.");
+  }
+  if (person.firstName === "") {
+    errors.value.push("Le prénom ne doit pas être vide.");
+  }
+  if (!person.gender) {
+    errors.value.push("Le genre doit être renseigné");
+  }
+  if (showCenters.value && person.center === null) {
+    errors.value.push("Le centre doit être renseigné");
+  }
+}
+
+function loadData() {
+  getPerson(props.id).then((p) => {
+    Object.assign(person, p);
+  });
+}
+
+function onAltNameInput(event) {
+  const key = event.target.id;
+  const label = event.target.value;
+  let updateAltNames = person.altNames.filter((a) => a.key !== key);
+  updateAltNames.push({ key: key, label: label });
+  person.altNames = updateAltNames;
+}
+
+function addQueryItem(field, queryItem) {
+  switch (field) {
+    case "lastName":
+      person.lastName = person.lastName
+        ? (person.lastName += ` ${queryItem}`)
+        : queryItem;
+      break;
+    case "firstName":
+      person.firstName = person.firstName
+        ? (person.firstName += ` ${queryItem}`)
+        : queryItem;
+      break;
+  }
+}
+
+function submitNewAddress(payload) {
+  person.addressId = payload.addressId;
+}
+
+onMounted(() => {
+  getPersonAltNames().then((altNames) => {
+    config.altNames = altNames;
+  });
+  getCivilities().then((civilities) => {
+    if ("results" in civilities) {
+      config.civilities = civilities.results;
     }
+  });
+  getGenders().then((genders) => {
+    if ("results" in genders) {
+      config.genders = genders.results;
+    }
+  });
+  if (props.action !== "create") {
+    loadData();
+  } else {
+    getCentersForPersonCreation().then((params) => {
+      config.centers = params.centers.filter((c) => c.isActive);
+      showCenters.value = params.showCenters;
+      if (showCenters.value && config.centers.length === 1) {
+        person.center = config.centers[0];
+      }
+    });
   }
-}
-dl {
-  dd {
-    margin-left: 1em;
-  }
-}
-div.form-check {
-  label {
-    margin-left: 0.5em !important;
-  }
-}
-</style>
+});
+
+defineExpose(genderClass, genderTranslation, feminized, birthDate);
+</script>
diff --git a/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml b/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
index 830e21d2d..f81efac8c 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
+++ b/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
@@ -198,3 +198,59 @@ accompanying_course_evaluation_document:
 
 accompanying_period_work:
     title: Action d'accompagnement (n°{id}) - {action_title}
+
+add_persons:
+    title: "Ajouter des usagers"
+    suggested_counter: >-
+        {count, plural,
+            =0    {Pas de résultats}
+            =1    {1 résultat}
+            other {# résultats}
+        }
+    selected_counter: >-
+        {count, plural,
+            =1    {1 sélectionné}
+            other {# sélectionnés}
+        }
+    search_some_persons: "Rechercher des personnes.."
+
+    item:
+        type_person: "Usager"
+        type_user: "TMS"
+        type_thirdparty: "Tiers professionnel"
+        type_household: "Ménage"
+
+    person:
+        firstname: "Prénom"
+        lastname: "Nom"
+        born:
+            man: "Né le"
+            woman: "Née le"
+            neutral: "Né·e le"
+        center_id: "Identifiant du centre"
+        center_type: "Type de centre"
+        center_name: "Territoire"
+        phonenumber: "Téléphone"
+        mobilenumber: "Mobile"
+        altnames: "Autres noms"
+        email: "Courriel"
+        gender:
+            title: "Genre"
+            placeholder: "Choisissez le genre de l'usager"
+            woman: "Féminin"
+            man: "Masculin"
+            neutral: "Neutre, non binaire"
+            unknown: "Non renseigné"
+            undefined: "Non renseigné"
+        civility:
+            title: "Civilité"
+            placeholder: "Choisissez la civilité"
+        address:
+            create_address: "Ajouter une adresse"
+            show_address_form: "Ajouter une adresse pour un usager non suivi et seul dans un ménage"
+            warning: "Un nouveau ménage va être créé. L'usager sera membre de ce ménage."
+        center:
+            placeholder: "Choisissez un centre"
+            title: "Centre"
+
+    error_only_one_person: "Une seule personne peut être sélectionnée !"
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index 9bce912a0..47d4feed3 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -1505,3 +1505,48 @@ my_parcours_filters:
   parcours_intervening: Intervenant
   is_open: Parcours ouverts
   is_closed: Parcours clôturés
+
+person_messages:
+    add_persons:
+        title: "Ajouter des usagers"
+        suggested_counter: "Pas de résultats | 1 résultat | {count} résultats"
+        selected_counter: " 1 sélectionné | {count} sélectionnés"
+        search_some_persons: "Rechercher des personnes.."
+    item:
+        type_person: "Usager"
+        type_user: "TMS"
+        type_thirdparty: "Tiers professionnel"
+        type_household: "Ménage"
+    person:
+        firstname: "Prénom"
+        lastname: "Nom"
+        born:
+            man: "Né le"
+            woman: "Née le"
+            neutral: "Né·e le"
+        center_id: "Identifiant du centre"
+        center_type: "Type de centre"
+        center_name: "Territoire"
+        phonenumber: "Téléphone"
+        mobilenumber: "Mobile"
+        altnames: "Autres noms"
+        email: "Courriel"
+        gender:
+            title: "Genre"
+            placeholder: "Choisissez le genre de l'usager"
+            woman: "Féminin"
+            man: "Masculin"
+            neutral: "Neutre, non binaire"
+            unknown: "Non renseigné"
+            undefined: "Non renseigné"
+        civility:
+            title: "Civilité"
+            placeholder: "Choisissez la civilité"
+        address:
+            create_address: "Ajouter une adresse"
+            show_address_form: "Ajouter une adresse pour un usager non suivi et seul dans un ménage"
+            warning: "Un nouveau ménage va être créé. L'usager sera membre de ce ménage."
+        center:
+            placeholder: "Choisissez un centre"
+            title: "Centre"
+    error_only_one_person: "Une seule personne peut être sélectionnée !"
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
index 623926807..eab1db50b 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
@@ -27,18 +27,18 @@
         <div v-if="parent">
             <div class="parent-info">
                 <i class="fa fa-li fa-hand-o-right" />
-                <b class="me-2">{{ $t("child_of") }}</b>
+                <b class="me-2">{{ trans(THIRDPARTY_MESSAGES_CHILD_OF) }}</b>
                 <span class="chill-entity badge-thirdparty">{{
                     parent.text
                 }}</span>
             </div>
         </div>
-        <div class="form-floating mb-3" v-else-if="kind !== 'child'">
+        <div class="form-floating mb-3" v-else-if="kind.value !== 'child'">
             <div class="form-check">
                 <input
                     class="form-check-input mt-0"
                     type="radio"
-                    v-model="kind"
+                    v-model="kind.value"
                     value="company"
                     id="tpartyKindInstitution"
                 />
@@ -53,7 +53,7 @@
                 <input
                     class="form-check-input mt-0"
                     type="radio"
-                    v-model="kind"
+                    v-model="kind.value"
                     value="contact"
                     id="tpartyKindContact"
                 />
@@ -95,7 +95,7 @@
                         v-model="thirdparty.civility"
                     >
                         <option selected disabled :value="null">
-                            {{ $t("thirdparty.civility") }}
+                            {{ trans(THIRDPARTY_MESSAGES_THIRDPARTY_CIVILITY) }}
                         </option>
                         <option
                             v-for="civility in civilities"
@@ -110,8 +110,12 @@
                     <input
                         class="form-control form-control-lg"
                         v-model="thirdparty.profession"
-                        :placeholder="$t('thirdparty.profession')"
-                        :aria-label="$t('thirdparty.profession')"
+                        :placeholder="
+                            trans(THIRDPARTY_MESSAGES_THIRDPARTY_PROFESSION)
+                        "
+                        :aria-label="
+                            trans(THIRDPARTY_MESSAGES_THIRDPARTY_PROFESSION)
+                        "
                         aria-describedby="profession"
                     />
                 </div>
@@ -123,10 +127,12 @@
                             class="form-control form-control-lg"
                             id="firstname"
                             v-model="thirdparty.firstname"
-                            :placeholder="$t('thirdparty.firstname')"
+                            :placeholder="
+                                trans(THIRDPARTY_MESSAGES_THIRDPARTY_FIRSTNAME)
+                            "
                         />
                         <label for="firstname">{{
-                            $t("thirdparty.firstname")
+                            trans(THIRDPARTY_MESSAGES_THIRDPARTY_FIRSTNAME)
                         }}</label>
                     </div>
                     <div v-if="queryItems">
@@ -147,10 +153,12 @@
                             class="form-control form-control-lg"
                             id="name"
                             v-model="thirdparty.name"
-                            :placeholder="$t('thirdparty.lastname')"
+                            :placeholder="
+                                trans(THIRDPARTY_MESSAGES_THIRDPARTY_LASTNAME)
+                            "
                         />
                         <label for="name">{{
-                            $t("thirdparty.lastname")
+                            trans(THIRDPARTY_MESSAGES_THIRDPARTY_LASTNAME)
                         }}</label>
                     </div>
                     <div v-if="queryItems">
@@ -174,9 +182,11 @@
                     class="form-control form-control-lg"
                     id="name"
                     v-model="thirdparty.name"
-                    :placeholder="$t('thirdparty.name')"
+                    :placeholder="trans(THIRDPARTY_MESSAGES_THIRDPARTY_NAME)"
                 />
-                <label for="name">{{ $t("thirdparty.name") }}</label>
+                <label for="name">{{
+                    trans(THIRDPARTY_MESSAGES_THIRDPARTY_NAME)
+                }}</label>
             </div>
             <div v-if="query">
                 <ul class="list-suggest add-items inline">
@@ -188,7 +198,7 @@
         </div>
 
         <template v-if="thirdparty.kind !== 'child'">
-            <add-address
+            <AddAddress
                 key="thirdparty"
                 :context="context"
                 :options="addAddress.options"
@@ -204,8 +214,8 @@
             <input
                 class="form-control form-control-lg"
                 v-model="thirdparty.email"
-                :placeholder="$t('thirdparty.email')"
-                :aria-label="$t('thirdparty.email')"
+                :placeholder="trans(THIRDPARTY_MESSAGES_THIRDPARTY_EMAIL)"
+                :aria-label="trans(THIRDPARTY_MESSAGES_THIRDPARTY_EMAIL)"
                 aria-describedby="email"
             />
         </div>
@@ -217,8 +227,8 @@
             <input
                 class="form-control form-control-lg"
                 v-model="thirdparty.telephone"
-                :placeholder="$t('thirdparty.phonenumber')"
-                :aria-label="$t('thirdparty.phonenumber')"
+                :placeholder="trans(THIRDPARTY_MESSAGES_THIRDPARTY_PHONENUMBER)"
+                :aria-label="trans(THIRDPARTY_MESSAGES_THIRDPARTY_PHONENUMBER)"
                 aria-describedby="phonenumber"
             />
         </div>
@@ -230,8 +240,10 @@
             <input
                 class="form-control form-control-lg"
                 v-model="thirdparty.telephone2"
-                :placeholder="$t('thirdparty.phonenumber2')"
-                :aria-label="$t('thirdparty.phonenumber2')"
+                :placeholder="
+                    trans(THIRDPARTY_MESSAGES_THIRDPARTY_PHONENUMBER2)
+                "
+                :aria-label="trans(THIRDPARTY_MESSAGES_THIRDPARTY_PHONENUMBER2)"
                 aria-describedby="phonenumber2"
             />
         </div>
@@ -243,7 +255,7 @@
                 /></span>
                 <textarea
                     class="form-control form-control-lg"
-                    :placeholder="$t('thirdparty.comment')"
+                    :placeholder="trans(THIRDPARTY_MESSAGES_THIRDPARTY_COMMENT)"
                     v-model="thirdparty.comment"
                 />
             </div>
@@ -251,173 +263,178 @@
     </div>
 </template>
 
-<script>
+<script setup>
+import { ref, reactive, computed, onMounted, getCurrentInstance } from "vue";
 import ThirdPartyRenderBox from "../Entity/ThirdPartyRenderBox.vue";
 import AddAddress from "ChillMainAssets/vuejs/Address/components/AddAddress";
 import { getThirdparty } from "../../_api/OnTheFly";
 import BadgeEntity from "ChillMainAssets/vuejs/_components/BadgeEntity.vue";
 import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
-import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
+import { localizeString as _localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
+import {
+    trans,
+    THIRDPARTY_MESSAGES_THIRDPARTY_FIRSTNAME,
+    THIRDPARTY_MESSAGES_THIRDPARTY_LASTNAME,
+    THIRDPARTY_MESSAGES_THIRDPARTY_NAME,
+    THIRDPARTY_MESSAGES_THIRDPARTY_EMAIL,
+    THIRDPARTY_MESSAGES_THIRDPARTY_PHONENUMBER,
+    THIRDPARTY_MESSAGES_THIRDPARTY_PHONENUMBER2,
+    THIRDPARTY_MESSAGES_THIRDPARTY_COMMENT,
+    THIRDPARTY_MESSAGES_THIRDPARTY_PROFESSION,
+    THIRDPARTY_MESSAGES_THIRDPARTY_CIVILITY,
+    THIRDPARTY_MESSAGES_CHILD_OF,
+} from "translator";
+// Props
+const props = defineProps(["id", "type", "action", "query", "parent"]);
 
-export default {
-    name: "OnTheFlyThirdParty",
-    props: ["id", "type", "action", "query", "parent"],
-    components: {
-        ThirdPartyRenderBox,
-        AddAddress,
-        BadgeEntity,
-    },
-    data() {
-        return {
-            //context: {}, <--
-            thirdparty: {
-                type: "thirdparty",
-                address: null,
-                kind: "company",
-                firstname: "",
-                name: "",
-                telephone: "",
-                telephone2: "",
-                civility: null,
-                profession: "",
-            },
-            civilities: [],
-            addAddress: {
-                options: {
-                    openPanesInModal: true,
-                    onlyButton: false,
-                    button: {
-                        size: "btn-sm",
-                    },
-                    title: {
-                        create: "add_an_address_title",
-                        edit: "edit_address",
-                    },
-                },
-            },
-        };
-    },
-    computed: {
-        kind: {
-            get() {
-                // note: there are also default to 'institution' set in the "mounted" method
-                if (this.$data.thirdparty.kind !== undefined) {
-                    return this.$data.thirdparty.kind;
-                } else {
-                    return "company";
-                }
-            },
-            set(v) {
-                this.$data.thirdparty.kind = v;
-            },
+// Instance for $t and $toast
+const { proxy } = getCurrentInstance();
+
+// State
+const thirdparty = reactive({
+    type: "thirdparty",
+    address: null,
+    kind: "company",
+    firstname: "",
+    name: "",
+    telephone: "",
+    telephone2: "",
+    civility: null,
+    profession: "",
+    comment: "",
+    parent: props.parent ? props.parent : undefined,
+});
+const civilities = ref([]);
+const addAddress = reactive({
+    options: {
+        openPanesInModal: true,
+        onlyButton: false,
+        button: {
+            size: "btn-sm",
         },
-        context() {
-            let context = {
-                target: {
-                    name: this.type,
-                    id: this.id,
-                },
-                edit: false,
-                addressId: null,
-                defaults: window.addaddress,
-            };
-            if (
-                !(
-                    this.thirdparty.address === undefined ||
-                    this.thirdparty.address === null
-                ) &&
-                this.thirdparty.address.address_id !== null
-            ) {
-                // to complete
-                context.addressId = this.thirdparty.address.address_id;
-                context.edit = true;
-            }
-            //this.context = context; <--
-            return context;
-        },
-        queryItems() {
-            return this.query ? this.query.split(" ") : null;
+        title: {
+            create: "add_an_address_title",
+            edit: "edit_address",
         },
     },
-    methods: {
-        localizeString,
-        loadData() {
-            return getThirdparty(this.id).then(
-                (thirdparty) =>
-                    new Promise((resolve) => {
-                        this.thirdparty = thirdparty;
-                        this.thirdparty.kind = thirdparty.kind;
-                        if (this.action !== "show") {
-                            if (thirdparty.address !== null) {
-                                // bof! we force getInitialAddress because addressId not available when mounted
-                                this.$refs.addAddress.getInitialAddress(
-                                    thirdparty.address.address_id,
-                                );
-                            }
-                        }
-                        resolve();
-                    }),
-            );
+});
+const addAddressRef = ref(null);
+
+// Kind as computed ref
+const kind = computed({
+    get() {
+        return thirdparty.kind !== undefined ? thirdparty.kind : "company";
+    },
+    set(v) {
+        thirdparty.kind = v;
+    },
+});
+
+// Context as computed
+const context = computed(() => {
+    let ctx = {
+        target: {
+            name: props.type,
+            id: props.id,
         },
-        loadCivilities() {
-            const url = `/api/1.0/main/civility.json`;
-            return makeFetch("GET", url)
-                .then((response) => {
-                    this.$data.civilities = response.results;
-                    return Promise.resolve();
-                })
-                .catch((error) => {
-                    console.log(error);
-                    this.$toast.open({ message: error.body });
-                });
-        },
-        submitAddress(payload) {
-            console.log("submitAddress", payload);
-            if (typeof payload.addressId !== "undefined") {
-                // <--
-                this.context.edit = true;
-                this.context.addressId = payload.addressId; // bof! use legacy and not legacy in payload
-                this.thirdparty.address = payload.address; // <--
-                console.log("switch address to edit mode", this.context);
-            }
-        },
-        addQueryItem(field, queryItem) {
-            switch (field) {
-                case "name":
-                    if (this.thirdparty.name) {
-                        this.thirdparty.name += ` ${queryItem}`;
-                    } else {
-                        this.thirdparty.name = queryItem;
+        edit: false,
+        addressId: null,
+        defaults: window.addaddress,
+    };
+    if (
+        !(thirdparty.address === undefined || thirdparty.address === null) &&
+        thirdparty.address.address_id !== null
+    ) {
+        ctx.addressId = thirdparty.address.address_id;
+        ctx.edit = true;
+    }
+    return ctx;
+});
+
+// Query items
+const queryItems = computed(() =>
+    props.query ? props.query.split(" ") : null,
+);
+
+// Methods
+function localizeString(str) {
+    return _localizeString(str);
+}
+
+function loadData() {
+    return getThirdparty(props.id).then(
+        (tp) =>
+            new Promise((resolve) => {
+                Object.assign(thirdparty, tp);
+                thirdparty.kind = tp.kind;
+                if (props.action !== "show") {
+                    if (tp.address !== null && addAddressRef.value) {
+                        addAddressRef.value.getInitialAddress(
+                            tp.address.address_id,
+                        );
                     }
-                    break;
-                case "firstName":
-                    this.thirdparty.firstname = queryItem;
-                    break;
+                }
+                resolve();
+            }),
+    );
+}
+
+function loadCivilities() {
+    const url = `/api/1.0/main/civility.json`;
+    return makeFetch("GET", url)
+        .then((response) => {
+            civilities.value = response.results;
+            return Promise.resolve();
+        })
+        .catch((error) => {
+            console.log(error);
+            proxy.$toast.open({ message: error.body });
+        });
+}
+
+function submitAddress(payload) {
+    if (typeof payload.addressId !== "undefined") {
+        context.value.edit = true;
+        context.value.addressId = payload.addressId;
+        thirdparty.address = payload.address;
+    }
+}
+
+function addQueryItem(field, queryItem) {
+    switch (field) {
+        case "name":
+            if (thirdparty.name) {
+                thirdparty.name += ` ${queryItem}`;
+            } else {
+                thirdparty.name = queryItem;
             }
-        },
-        addQuery(query) {
-            this.thirdparty.name = query;
-        },
-    },
-    mounted() {
-        let dependencies = [];
-        dependencies.push(this.loadCivilities());
-        if (this.action !== "create") {
-            if (this.id) {
-                dependencies.push(this.loadData());
-                // here we can do something when all promises are resolve, with
-                // Promise.all(dependencies).then(() => { /* do something */ });
-            }
-            if (this.action === "addContact") {
-                this.$data.thirdparty.kind = "child";
-                // this.$data.thirdparty.parent = this.parent.id
-                this.$data.thirdparty.address = null;
-            }
-        } else {
-            this.thirdparty.kind = "company";
+            break;
+        case "firstName":
+            thirdparty.firstname = queryItem;
+            break;
+    }
+}
+
+function addQuery(query) {
+    thirdparty.name = query;
+}
+
+// Lifecycle
+onMounted(() => {
+    let dependencies = [];
+    dependencies.push(loadCivilities());
+    if (props.action !== "create") {
+        if (props.id) {
+            dependencies.push(loadData());
         }
-    },
-};
+        if (props.action === "addContact") {
+            thirdparty.kind = "child";
+            thirdparty.address = null;
+        }
+    } else {
+        thirdparty.kind = "company";
+    }
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml b/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
index c5a5a110f..de2c489bb 100644
--- a/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
@@ -155,3 +155,16 @@ Telephone2: Autre téléphone
 Contact email: Courrier électronique du contact
 Contact address: Adresse du contact
 Contact profession: Profession du contact
+thirdpartyMessages:
+    thirdparty:
+      firstname: "Prénom"
+      lastname: "Nom"
+      name: "Dénomination"
+      email: "Courriel"
+      phonenumber: "Téléphone"
+      phonenumber2: "Autre numéro de téléphone"
+      comment: "Commentaire"
+      profession: "Qualité"
+      civility: "Civilité"
+    child_of: "Contact de: "
+    children: "Personnes de contact: "
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
index 10ab90926..88047673d 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
@@ -107,3 +107,15 @@ export interface Ticket {
     createdAt: DateTime | null;
     updatedBy: User | null;
 }
+
+export interface addNewPersons {
+    selected: Selected[];
+    modal: Modal;
+}
+export interface Modal {
+    showModal: boolean;
+    modalDialogClass: string;
+}
+export interface Selected {
+    result: User;
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
index 14347604c..9263fd30e 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
@@ -6,13 +6,13 @@
     </div>
     <action-toolbar-component />
 </template>
-
-<script lang="ts">
-import { computed, defineComponent, inject, onMounted, ref } from "vue";
+<script setup lang="ts">
+import { useToast } from "vue-toast-notification";
+import { computed, onMounted } from "vue";
 import { useStore } from "vuex";
 
 // Types
-import { Motive, Ticket } from "../../types";
+import { Ticket } from "../../types";
 
 // Components
 import TicketSelectorComponent from "./components/TicketSelectorComponent.vue";
@@ -20,43 +20,23 @@ import TicketHistoryListComponent from "./components/TicketHistoryListComponent.
 import ActionToolbarComponent from "./components/ActionToolbarComponent.vue";
 import BannerComponent from "./components/BannerComponent.vue";
 
-export default defineComponent({
-    name: "App",
-    components: {
-        TicketSelectorComponent,
-        TicketHistoryListComponent,
-        ActionToolbarComponent,
-        BannerComponent,
-    },
-    setup() {
-        const store = useStore();
-        const toast = inject("toast") as any;
+const store = useStore();
+const toast = useToast();
 
-        store.commit("setTicket", JSON.parse(window.initialTicket) as Ticket);
+store.commit("setTicket", JSON.parse(window.initialTicket) as Ticket);
 
-        const motives = computed(() => store.getters.getMotives as Motive[]);
-        const ticket = computed(() => store.getters.getTicket as Ticket);
+const ticket = computed(() => store.getters.getTicket as Ticket);
 
-        const ticketHistory = computed(
-            () => store.getters.getDistinctAddressesHistory,
-        );
+const ticketHistory = computed(() => store.getters.getDistinctAddressesHistory);
 
-        onMounted(async () => {
-            try {
-                await store.dispatch("fetchMotives");
-                await store.dispatch("fetchUserGroups");
-                await store.dispatch("fetchUsers");
-            } catch (error) {
-                toast.error(error);
-            }
-        });
-
-        return {
-            ticketHistory,
-            motives,
-            ticket,
-        };
-    },
+onMounted(async () => {
+    try {
+        await store.dispatch("fetchMotives");
+        await store.dispatch("fetchUserGroups");
+        await store.dispatch("fetchUsers");
+    } catch (error) {
+        toast.error(error as string);
+    }
 });
 </script>
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
index 18a97cce1..fd965dab8 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
@@ -4,7 +4,7 @@
             <div class="tab-content p-2">
                 <div>
                     <label class="col-form-label">
-                        {{ $t(`${activeTab}.title`) }}
+                        {{ activeTabTitle }}
                     </label>
                 </div>
 
@@ -36,12 +36,20 @@
                                 @click="activeTab = ''"
                                 class="btn btn-cancel"
                             >
-                                {{ $t("ticket.cancel") }}
+                                {{
+                                    trans(
+                                        CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CANCEL,
+                                    )
+                                }}
                             </button>
                         </li>
                         <li>
                             <button class="btn btn-save" type="submit">
-                                {{ $t("ticket.save") }}
+                                {{
+                                    trans(
+                                        CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_SAVE,
+                                    )
+                                }}
                             </button>
                         </li>
                     </ul>
@@ -78,7 +86,7 @@
                         "
                     >
                         <i :class="actionIcons['set_motive']"></i>
-                        {{ $t("set_motive.title") }}
+                        {{ trans(CHILL_TICKET_TICKET_SET_MOTIVE_TITLE) }}
                     </button>
                 </li>
                 <li class="nav-item p-2">
@@ -96,7 +104,7 @@
                         "
                     >
                         <i :class="actionIcons['add_comment']"></i>
-                        {{ $t("add_comment.title") }}
+                        {{ trans(CHILL_TICKET_TICKET_ADD_COMMENT_TITLE) }}
                     </button>
                 </li>
                 <li class="nav-item p-2">
@@ -114,7 +122,7 @@
                         "
                     >
                         <i :class="actionIcons['addressees_state']"></i>
-                        {{ $t("add_addressee.title") }}
+                        {{ trans(CHILL_TICKET_TICKET_ADD_ADDRESSEE_TITLE) }}
                     </button>
                 </li>
                 <li class="nav-item p-2">
@@ -132,7 +140,7 @@
                         "
                     >
                         <i :class="actionIcons['set_persons']"></i>
-                        Patients concernés
+                        {{ trans(CHILL_TICKET_TICKET_SET_PERSONS_TITLE) }}
                     </button>
                 </li>
 
@@ -143,7 +151,7 @@
                         @click="handleClick()"
                     >
                         <i class="fa fa-bolt"></i>
-                        {{ $t("ticket.close") }}
+                        {{ trans(CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CLOSE) }}
                     </button>
                 </li>
             </ul>
@@ -151,10 +159,34 @@
     </div>
 </template>
 
-<script lang="ts">
-import { computed, defineComponent, inject, ref } from "vue";
-import { useI18n } from "vue-i18n";
+<script setup lang="ts">
+import { computed, ref } from "vue";
 import { useStore } from "vuex";
+import { useToast } from "vue-toast-notification";
+
+// Component
+import MotiveSelectorComponent from "./MotiveSelectorComponent.vue";
+import AddresseeSelectorComponent from "./AddresseeSelectorComponent.vue";
+import AddCommentComponent from "./AddCommentComponent.vue";
+import PersonsSelectorComponent from "./PersonsSelectorComponent.vue";
+
+// Translations
+import {
+    trans,
+    CHILL_TICKET_TICKET_ADD_ADDRESSEE_TITLE,
+    CHILL_TICKET_TICKET_ADD_ADDRESSEE_ERROR,
+    CHILL_TICKET_TICKET_ADD_ADDRESSEE_SUCCESS,
+    CHILL_TICKET_TICKET_ADD_COMMENT_TITLE,
+    CHILL_TICKET_TICKET_ADD_COMMENT_ERROR,
+    CHILL_TICKET_TICKET_ADD_COMMENT_SUCCESS,
+    CHILL_TICKET_TICKET_SET_MOTIVE_TITLE,
+    CHILL_TICKET_TICKET_SET_MOTIVE_ERROR,
+    CHILL_TICKET_TICKET_SET_MOTIVE_SUCCESS,
+    CHILL_TICKET_TICKET_SET_PERSONS_TITLE,
+    CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CLOSE,
+    CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CANCEL,
+    CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_SAVE,
+} from "translator";
 
 // Types
 import {
@@ -164,140 +196,118 @@ import {
 } from "../../../../../../../ChillMainBundle/Resources/public/types";
 import { Comment, Motive, Ticket } from "../../../types";
 
-// Component
-import MotiveSelectorComponent from "./MotiveSelectorComponent.vue";
-import AddresseeSelectorComponent from "./AddresseeSelectorComponent.vue";
-import AddCommentComponent from "./AddCommentComponent.vue";
-import PersonsSelectorComponent from "./PersonsSelectorComponent.vue";
+const store = useStore();
+const toast = useToast();
 
-export default defineComponent({
-    name: "ActionToolbarComponent",
-    components: {
-        PersonsSelectorComponent,
-        AddCommentComponent,
-        MotiveSelectorComponent,
-        AddresseeSelectorComponent,
-    },
-    setup() {
-        const store = useStore();
-        const { t } = useI18n();
-        const toast = inject("toast") as any;
-        const activeTab = ref(
-            "" as
-                | ""
-                | "add_comment"
-                | "set_motive"
-                | "add_addressee"
-                | "set_persons",
-        );
+const activeTab = ref(
+    "" as "" | "add_comment" | "set_motive" | "add_addressee" | "set_persons",
+);
 
-        const ticket = computed(() => store.getters.getTicket as Ticket);
-        const motives = computed(() => store.getters.getMotives as Motive[]);
-        const userGroups = computed(
-            () => store.getters.getUserGroups as UserGroup[],
-        );
-        const users = computed(() => store.getters.getUsers as User[]);
-
-        const hasReturnPath = computed((): boolean => {
-            const params = new URL(document.location.toString()).searchParams;
-            return params.has("returnPath");
-        });
-
-        const returnPath = computed((): string => {
-            const params = new URL(document.location.toString()).searchParams;
-            const returnPath = params.get("returnPath");
-
-            if (null === returnPath) {
-                throw new Error(
-                    "there isn't any returnPath, please check the existence before",
-                );
-            }
-
-            return returnPath;
-        });
-
-        const motive = ref(
-            ticket.value.currentMotive
-                ? ticket.value.currentMotive
-                : ({} as Motive),
-        );
-        const content = ref("" as Comment["content"]);
-        const addressees = ref(
-            ticket.value.currentAddressees as UserGroupOrUser[],
-        );
-
-        async function submitAction() {
-            try {
-                switch (activeTab.value) {
-                    case "add_comment":
-                        if (!content.value) {
-                            toast.error(t("add_comment.error"));
-                        } else {
-                            await store.dispatch("createComment", {
-                                ticketId: ticket.value.id,
-                                content: content.value,
-                            });
-                            content.value = "";
-                            activeTab.value = "";
-                            toast.success(t("add_comment.success"));
-                        }
-                        break;
-                    case "set_motive":
-                        if (!motive.value.id) {
-                            toast.error(t("set_motive.error"));
-                        } else {
-                            await store.dispatch("createMotive", {
-                                ticketId: ticket.value.id,
-                                motive: motive.value,
-                            });
-                            activeTab.value = "";
-                            toast.success(t("set_motive.success"));
-                        }
-                        break;
-                    case "add_addressee":
-                        if (!addressees.value.length) {
-                            toast.error(t("add_addressee.error"));
-                        } else {
-                            await store.dispatch("setAdressees", {
-                                ticketId: ticket.value.id,
-                                addressees: addressees.value,
-                            });
-                            activeTab.value = "";
-                            toast.success(t("add_addressee.success"));
-                        }
-                        break;
-                }
-            } catch (error) {
-                toast.error(error);
-            }
-        }
-
-        function handleClick() {
-            alert("Sera disponible plus tard");
-        }
-
-        const closeAllActions = function () {
-            activeTab.value = "";
-        };
-
-        return {
-            actionIcons: ref(store.getters.getActionIcons),
-            activeTab,
-            ticket,
-            motives,
-            motive,
-            userGroups,
-            addressees,
-            users,
-            content,
-            submitAction,
-            handleClick,
-            hasReturnPath,
-            returnPath,
-            closeAllActions,
-        };
-    },
+const activeTabTitle = computed((): string => {
+    switch (activeTab.value) {
+        case "add_comment":
+            return trans(CHILL_TICKET_TICKET_ADD_COMMENT_TITLE);
+        case "set_motive":
+            return trans(CHILL_TICKET_TICKET_SET_MOTIVE_TITLE);
+        case "add_addressee":
+            return trans(CHILL_TICKET_TICKET_ADD_ADDRESSEE_TITLE);
+        case "set_persons":
+            return trans(CHILL_TICKET_TICKET_SET_PERSONS_TITLE);
+        default:
+            return "";
+    }
 });
+
+const ticket = computed(() => store.getters.getTicket as Ticket);
+const motives = computed(() => store.getters.getMotives as Motive[]);
+const userGroups = computed(() => store.getters.getUserGroups as UserGroup[]);
+const users = computed(() => store.getters.getUsers as User[]);
+
+const hasReturnPath = computed((): boolean => {
+    const params = new URL(document.location.toString()).searchParams;
+    return params.has("returnPath");
+});
+
+const returnPath = computed((): string => {
+    const params = new URL(document.location.toString()).searchParams;
+    const returnPath = params.get("returnPath");
+
+    if (null === returnPath) {
+        throw new Error(
+            "there isn't any returnPath, please check the existence before",
+        );
+    }
+
+    return returnPath;
+});
+
+const motive = ref(
+    ticket.value.currentMotive ? ticket.value.currentMotive : ({} as Motive),
+);
+const content = ref("" as Comment["content"]);
+const addressees = ref(ticket.value.currentAddressees as UserGroupOrUser[]);
+
+async function submitAction() {
+    try {
+        switch (activeTab.value) {
+            case "add_comment":
+                if (!content.value) {
+                    toast.error(trans(CHILL_TICKET_TICKET_ADD_COMMENT_ERROR));
+                } else {
+                    await store.dispatch("createComment", {
+                        ticketId: ticket.value.id,
+                        content: content.value,
+                    });
+                    content.value = "";
+                    activeTab.value = "";
+                    toast.success(
+                        trans(CHILL_TICKET_TICKET_ADD_COMMENT_SUCCESS),
+                    );
+                }
+                break;
+            case "set_motive":
+                if (!motive.value.id) {
+                    toast.error(trans(CHILL_TICKET_TICKET_SET_MOTIVE_ERROR));
+                } else {
+                    await store.dispatch("createMotive", {
+                        ticketId: ticket.value.id,
+                        motive: motive.value,
+                    });
+                    activeTab.value = "";
+                    toast.success(
+                        trans(CHILL_TICKET_TICKET_SET_MOTIVE_SUCCESS),
+                    );
+                }
+                break;
+            case "add_addressee":
+                if (!addressees.value.length) {
+                    toast.error(trans(CHILL_TICKET_TICKET_ADD_ADDRESSEE_ERROR));
+                } else {
+                    await store.dispatch("setAdressees", {
+                        ticketId: ticket.value.id,
+                        addressees: addressees.value,
+                    });
+                    activeTab.value = "";
+                    toast.success(
+                        trans(CHILL_TICKET_TICKET_ADD_ADDRESSEE_SUCCESS),
+                    );
+                }
+                break;
+        }
+    } catch (error) {
+        toast.error(error as string);
+    }
+}
+
+function handleClick() {
+    alert("Sera disponible plus tard");
+}
+
+function closeAllActions() {
+    activeTab.value = "";
+}
+
+const actionIcons = ref(store.getters.getActionIcons);
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddCommentComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddCommentComponent.vue
index 7a75e1e33..c105dce5f 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddCommentComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddCommentComponent.vue
@@ -6,35 +6,21 @@
     </div>
 </template>
 
-<script lang="ts">
-import { defineComponent, ref, watch } from "vue";
-
+<script setup lang="ts">
+import { ref, watch } from "vue";
 import CommentEditor from "ChillMainAssets/vuejs/_components/CommentEditor/CommentEditor.vue";
 
-export default defineComponent({
-    name: "AddCommentComponent",
-    props: {
-        modelValue: {
-            type: String,
-            required: false,
-        },
-    },
-    components: {
-        CommentEditor,
-    },
-    emits: ["update:modelValue"],
+const props = defineProps<{
+    modelValue?: string;
+}>();
 
-    setup(props, ctx) {
-        const content = ref(props.modelValue);
+const emit =
+    defineEmits<(e: "update:modelValue", value: string | undefined) => void>();
 
-        watch(content, (content) => {
-            ctx.emit("update:modelValue", content);
-        });
+const content = ref(props.modelValue);
 
-        return {
-            content,
-        };
-    },
+watch(content, (value) => {
+    emit("update:modelValue", value);
 });
 </script>
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeComponent.vue
index 068f5ff5d..4505eef43 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeComponent.vue
@@ -30,8 +30,11 @@
     </div>
 </template>
 
-<script lang="ts">
-import { PropType, computed, defineComponent, ref } from "vue";
+<script setup lang="ts">
+import { computed } from "vue";
+
+// Components
+import UserRenderBoxBadge from "ChillMainAssets/vuejs/_components/Entity/UserRenderBoxBadge.vue";
 
 // Types
 import {
@@ -39,43 +42,32 @@ import {
     UserGroup,
     UserGroupOrUser,
 } from "../../../../../../../ChillMainBundle/Resources/public/types";
-import UserRenderBoxBadge from "ChillMainAssets/vuejs/_components/Entity/UserRenderBoxBadge.vue";
 
-export default defineComponent({
-    name: "AddresseeComponent",
-    components: { UserRenderBoxBadge },
-    props: {
-        addressees: {
-            type: Array as PropType<UserGroupOrUser[]>,
-            required: true,
-        },
-    },
-    setup(props, ctx) {
-        const userGroups = computed(
-            () =>
-                props.addressees.filter(
-                    (addressee) =>
-                        addressee.type == "user_group" &&
-                        addressee.excludeKey == "",
-                ) as UserGroup[],
-        );
-        const userGroupLevels = computed(
-            () =>
-                props.addressees.filter(
-                    (addressee) =>
-                        addressee.type == "user_group" &&
-                        addressee.excludeKey == "level",
-                ) as UserGroup[],
-        );
-        const users = computed(
-            () =>
-                props.addressees.filter(
-                    (addressee) => addressee.type == "user",
-                ) as User[],
-        );
-        return { userGroups, users, userGroupLevels };
-    },
-});
+const props = defineProps<{ addressees: UserGroupOrUser[] }>();
+
+const userGroups = computed(
+    () =>
+        props.addressees.filter(
+            (addressee: UserGroupOrUser) =>
+                addressee.type == "user_group" && addressee.excludeKey == "",
+        ) as UserGroup[],
+);
+
+const userGroupLevels = computed(
+    () =>
+        props.addressees.filter(
+            (addressee: UserGroupOrUser) =>
+                addressee.type == "user_group" &&
+                addressee.excludeKey == "level",
+        ) as UserGroup[],
+);
+
+const users = computed(
+    () =>
+        props.addressees.filter(
+            (addressee: UserGroupOrUser) => addressee.type == "user",
+        ) as User[],
+);
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue
index 5699c0539..3dde74bfc 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue
@@ -66,9 +66,14 @@
             <add-persons
                 :options="addPersonsOptions"
                 key="add-person-ticket"
-                buttonTitle="add_addressee.user_label"
-                modalTitle="add_addressee.user_label"
-                ref="addPersons"
+                :buttonTitle="
+                    trans(CHILL_TICKET_TICKET_ADD_ADDRESSEE_USER_LABEL)
+                "
+                :modalTitle="
+                    trans(CHILL_TICKET_TICKET_ADD_ADDRESSEE_USER_LABEL)
+                "
+                :selected="selectedValues"
+                :suggested="suggestedValues"
                 @addNewPersons="addNewEntity"
             />
             <div class="p-2">
@@ -84,145 +89,120 @@
     </div>
 </template>
 
-<script lang="ts">
-import { PropType, computed, defineComponent, ref, watch } from "vue";
-import { useI18n } from "vue-i18n";
-
-// Types
-import { User, UserGroup, UserGroupOrUser } from "ChillMainAssets/types";
+<script lang="ts" setup>
+import { ref, watch, defineProps, defineEmits } from "vue";
 
 // Components
 import AddPersons from "ChillPersonAssets/vuejs/_components/AddPersons.vue";
 
-export default defineComponent({
-    name: "AddresseeSelectorComponent",
-    props: {
-        modelValue: {
-            type: Array as PropType<UserGroupOrUser[]>,
-            default: [],
-            required: false,
-        },
-        userGroups: {
-            type: Array as PropType<UserGroup[]>,
-            required: true,
-        },
-        users: {
-            type: Array as PropType<User[]>,
-            required: true,
-        },
+// Types
+import type { User, UserGroup, UserGroupOrUser } from "ChillMainAssets/types";
+import { SearchOptions, Suggestion } from "ChillPersonAssets/types";
+import type { addNewPersons } from "../../../types";
+
+// Translations
+import {
+    CHILL_TICKET_TICKET_ADD_ADDRESSEE_USER_LABEL,
+    trans,
+} from "translator";
+
+const props = defineProps<{
+    modelValue?: UserGroupOrUser[];
+    userGroups: UserGroup[];
+    users: User[];
+}>();
+
+const selectedValues = ref<Suggestion[]>([]);
+const suggestedValues = ref<Suggestion[]>([]);
+
+const emit =
+    defineEmits<(e: "update:modelValue", value: UserGroupOrUser[]) => void>();
+
+const addressees = ref<UserGroupOrUser[]>([...(props.modelValue ?? [])]);
+
+const userGroupsInit = [
+    ...(props.modelValue ?? []).filter(
+        (addressee: UserGroupOrUser) => addressee.type == "user_group",
+    ),
+] as UserGroup[];
+
+const userGroupLevel = ref<UserGroup | Record<string, never>>(
+    (userGroupsInit.filter(
+        (userGroup: UserGroup) => userGroup.excludeKey == "level",
+    )[0] as UserGroup) ?? {},
+);
+
+const userGroup = ref<UserGroup[]>(
+    userGroupsInit.filter(
+        (userGroup: UserGroup) => userGroup.excludeKey == "",
+    ) as UserGroup[],
+);
+
+const users = ref<User[]>([
+    ...(props.modelValue ?? []).filter(
+        (addressee: UserGroupOrUser) => addressee.type == "user",
+    ),
+] as User[]);
+
+const addPersonsOptions = {
+    uniq: false,
+    type: ["user"],
+    priority: null,
+    button: {
+        size: "btn-sm",
+        class: "btn-submit",
     },
-    components: {
-        AddPersons,
-    },
-    emits: ["update:modelValue"],
+} as SearchOptions;
 
-    setup(props, ctx) {
-        const addressees = ref([...props.modelValue] as UserGroupOrUser[]);
-        const userGroups = [
-            ...props.modelValue.filter(
-                (addressee) => addressee.type == "user_group",
-            ),
-        ] as UserGroup[];
+function getUserGroupBtnColor(userGroup: UserGroup) {
+    return [
+        `color: ${userGroup.foregroundColor};
+        .btn-check:checked + .btn-${userGroup.id} {
+        color: ${userGroup.foregroundColor};
+        background-color: ${userGroup.backgroundColor};
+        }`,
+    ];
+}
 
-        const userGroupLevel = ref(
-            userGroups.filter(
-                (userGroup) => userGroup.excludeKey == "level",
-            )[0] as UserGroup | {},
-        );
-        const userGroup = ref(
-            userGroups.filter(
-                (userGroup) => userGroup.excludeKey == "",
-            ) as UserGroup[],
-        );
-        const users = ref([
-            ...props.modelValue.filter((addressee) => addressee.type == "user"),
-        ] as User[]);
-        const addPersons = ref();
+function addNewEntity(datas: addNewPersons) {
+    const { selected } = datas;
+    users.value = selected.map((selected) => selected.result);
+    addressees.value = addressees.value.filter(
+        (addressee) => addressee.type === "user_group",
+    );
+    addressees.value = [...addressees.value, ...users.value];
+    emit("update:modelValue", addressees.value);
+    selectedValues.value = [];
+    suggestedValues.value = [];
+}
 
-        const { t } = useI18n();
+function removeUser(user: User) {
+    users.value.splice(users.value.indexOf(user), 1);
+    addressees.value = addressees.value.filter(
+        (addressee) => addressee.id !== user.id,
+    );
+    emit("update:modelValue", addressees.value);
+}
 
-        function getUserGroupBtnColor(userGroup: UserGroup) {
-            return [
-                `color: ${userGroup.foregroundColor};
-                .btn-check:checked + .btn-${userGroup.id} {
-                color: ${userGroup.foregroundColor};
-                background-color: ${userGroup.backgroundColor};
-                }`,
-            ];
-        }
-        function addNewEntity(datas: any) {
-            const { selected, modal } = datas;
-            users.value = selected.map((selected: any) => selected.result);
-            addressees.value = addressees.value.filter(
-                (addressee) => addressee.type === "user_group",
-            );
-            addressees.value = [...addressees.value, ...users.value];
-            ctx.emit("update:modelValue", addressees.value);
-            addPersons.value.resetSearch();
-            modal.showModal = false;
-        }
+watch(userGroupLevel, (userGroupLevelAdd, userGroupLevelRem) => {
+    const index = addressees.value.indexOf(userGroupLevelRem as UserGroup);
+    if (index !== -1) {
+        addressees.value.splice(index, 1);
+    }
+    addressees.value.push(userGroupLevelAdd as UserGroup);
+    emit("update:modelValue", addressees.value);
+});
 
-        const addPersonsOptions = computed(() => {
-            return {
-                uniq: false,
-                type: ["user"],
-                priority: null,
-                button: {
-                    size: "btn-sm",
-                    class: "btn-submit",
-                },
-            };
-        });
-
-        function removeUser(user: User) {
-            users.value.splice(users.value.indexOf(user), 1);
-            addressees.value = addressees.value.filter(
-                (addressee) => addressee.id !== user.id,
-            );
-            ctx.emit("update:modelValue", addressees.value);
-        }
-
-        watch(userGroupLevel, (userGroupLevelAdd, userGroupLevelRem) => {
-            const index = addressees.value.indexOf(
-                userGroupLevelRem as UserGroup,
-            );
-            if (index !== -1) {
-                addressees.value.splice(index, 1);
-            }
-            addressees.value.push(userGroupLevelAdd as UserGroup);
-            ctx.emit("update:modelValue", addressees.value);
-        });
-
-        watch(userGroup, (userGroupAdd) => {
-            const userGroupLevel = addressees.value.filter(
-                (addressee) =>
-                    addressee.type == "user_group" &&
-                    addressee.excludeKey == "level",
-            ) as UserGroup[];
-            const users = addressees.value.filter(
-                (addressee) => addressee.type == "user",
-            ) as User[];
-            addressees.value = [...users, ...userGroupLevel, ...userGroupAdd];
-            ctx.emit("update:modelValue", addressees.value);
-        });
-
-        return {
-            addressees,
-            userGroupLevel,
-            userGroup,
-            users,
-            addPersons,
-            addPersonsOptions,
-            addNewEntity,
-            removeUser,
-            getUserGroupBtnColor,
-            customUserGroupLabel(selectedUserGroup: UserGroup) {
-                return selectedUserGroup.label
-                    ? selectedUserGroup.label.fr
-                    : t("add_addresseeuser_group_label");
-            },
-        };
-    },
+watch(userGroup, (userGroupAdd) => {
+    const userGroupLevelArr = addressees.value.filter(
+        (addressee) =>
+            addressee.type == "user_group" && addressee.excludeKey == "level",
+    ) as UserGroup[];
+    const usersArr = addressees.value.filter(
+        (addressee) => addressee.type == "user",
+    ) as User[];
+    addressees.value = [...usersArr, ...userGroupLevelArr, ...userGroupAdd];
+    emit("update:modelValue", addressees.value);
 });
 </script>
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
index 3ec37864c..846a748b8 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
@@ -8,7 +8,7 @@
                         {{ ticket.currentMotive.label.fr }}
                     </h1>
                     <p class="chill-no-data-statement" v-else>
-                        {{ $t("banner.no_motive") }}
+                        {{ trans(CHILL_TICKET_TICKET_BANNER_NO_MOTIVE) }}
                     </p>
                 </div>
 
@@ -18,13 +18,13 @@
                             class="badge text-bg-chill-green text-white"
                             style="font-size: 1rem"
                         >
-                            {{ $t("banner.open") }}
+                            {{ trans(CHILL_TICKET_TICKET_BANNER_OPEN) }}
                         </span>
                     </div>
                     <div class="d-flex justify-content-end">
                         <p class="created-at-timespan" v-if="ticket.createdAt">
                             {{
-                                $t("banner.since", {
+                                trans(CHILL_TICKET_TICKET_BANNER_SINCE, {
                                     time: since,
                                 })
                             }}
@@ -39,7 +39,7 @@
             <div class="row justify-content-between">
                 <div class="col-md-6 col-sm-12 ps-md-5 ps-xxl-0">
                     <h3 class="text-primary">
-                        {{ $t("banner.concerned_patient") }}
+                        {{ trans(CHILL_TICKET_TICKET_BANNER_CONCERNED_USAGER) }}
                     </h3>
                     <on-the-fly
                         v-for="person in ticket.currentPersons"
@@ -49,10 +49,13 @@
                         :buttonText="person.textAge"
                         :displayBadge="'true' === 'true'"
                         action="show"
+                        CHILL_TICKET_TICKET_BANNER_CONCERNED_USAGER
                     ></on-the-fly>
                 </div>
                 <div class="col-md-6 col-sm-12">
-                    <h3 class="text-primary">{{ $t("banner.speaker") }}</h3>
+                    <h3 class="text-primary">
+                        {{ trans(CHILL_TICKET_TICKET_BANNER_SPEAKER) }}
+                    </h3>
                     <addressee-component
                         :addressees="ticket.currentAddressees"
                     />
@@ -69,81 +72,91 @@
 }
 </style>
 
-<script lang="ts">
-import { PropType, computed, defineComponent, ref } from "vue";
-import { useI18n } from "vue-i18n";
+<script setup lang="ts">
+import { ref, computed } from "vue";
 
 // Components
-import PersonRenderBox from "../../../../../../../ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue";
 import AddresseeComponent from "./AddresseeComponent.vue";
+import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue";
 
 // Types
 import { Ticket } from "../../../types";
 import { ISOToDatetime } from "../../../../../../../ChillMainBundle/Resources/public/chill/js/date";
-import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue";
 
-export default defineComponent({
-    name: "BannerComponent",
-    props: {
-        ticket: {
-            type: Object as PropType<Ticket>,
-            required: true,
-        },
-    },
-    components: {
-        OnTheFly,
-        PersonRenderBox,
-        AddresseeComponent,
-    },
-    setup(props) {
-        const { t } = useI18n();
-        const today = ref(new Date());
-        const createdAt = ref(props.ticket.createdAt);
+// Translations
+import {
+    trans,
+    CHILL_TICKET_TICKET_BANNER_NO_MOTIVE,
+    CHILL_TICKET_TICKET_BANNER_OPEN,
+    CHILL_TICKET_TICKET_BANNER_SINCE,
+    CHILL_TICKET_TICKET_BANNER_CONCERNED_USAGER,
+    CHILL_TICKET_TICKET_BANNER_SPEAKER,
+    CHILL_TICKET_TICKET_BANNER_DAYS,
+    CHILL_TICKET_TICKET_BANNER_HOURS,
+    CHILL_TICKET_TICKET_BANNER_MINUTES,
+    CHILL_TICKET_TICKET_BANNER_SECONDS,
+    CHILL_TICKET_TICKET_BANNER_AND,
+} from "translator";
 
-        setInterval(function () {
-            today.value = new Date();
-        }, 5000);
+const props = defineProps<{
+    ticket: Ticket;
+}>();
 
-        const since = computed(() => {
-            if (null === createdAt.value) {
-                return "";
-            }
-            const date = ISOToDatetime(createdAt.value.datetime);
+const today = ref(new Date());
+const createdAt = ref(props.ticket.createdAt);
 
-            if (null === date) {
-                return "";
-            }
+setInterval(() => {
+    today.value = new Date();
+}, 5000);
 
-            const timeDiff = Math.abs(today.value.getTime() - date.getTime());
-            const daysDiff = Math.floor(timeDiff / (1000 * 3600 * 24));
-            const hoursDiff = Math.floor(
-                (timeDiff % (1000 * 3600 * 24)) / (1000 * 3600),
-            );
-            const minutesDiff = Math.floor(
-                (timeDiff % (1000 * 3600)) / (1000 * 60),
-            );
-            const secondsDiff = Math.floor((timeDiff % (1000 * 60)) / 1000);
+const since = computed(() => {
+    if (createdAt.value == null) {
+        return "";
+    }
+    const date = ISOToDatetime(createdAt.value.datetime);
 
-            if (daysDiff < 1 && hoursDiff < 1 && minutesDiff < 1) {
-                return `${t("banner.seconds", { count: secondsDiff })}`;
-            } else if (daysDiff < 1 && hoursDiff < 1) {
-                return `${t("banner.minutes", { count: minutesDiff })}`;
-            } else if (daysDiff < 1) {
-                return `${t("banner.hours", { count: hoursDiff })}
-                ${t("banner.minutes", { count: minutesDiff })}`;
-            } else {
-                return `${t("banner.days", { count: daysDiff })}, ${t(
-                    "banner.hours",
-                    {
-                        count: hoursDiff,
-                    },
-                )}  ${t("banner.minutes", {
-                    count: minutesDiff,
-                })}`;
-            }
+    if (date == null) {
+        return "";
+    }
+
+    const timeDiff = Math.abs(today.value.getTime() - date.getTime());
+    const daysDiff = Math.floor(timeDiff / (1000 * 3600 * 24));
+    const hoursDiff = Math.floor(
+        (timeDiff % (1000 * 3600 * 24)) / (1000 * 3600),
+    );
+    const minutesDiff = Math.floor((timeDiff % (1000 * 3600)) / (1000 * 60));
+    const secondsDiff = Math.floor((timeDiff % (1000 * 60)) / 1000);
+
+    // On construit la liste des parties à afficher
+    const parts: string[] = [];
+    if (daysDiff > 0) {
+        parts.push(trans(CHILL_TICKET_TICKET_BANNER_DAYS, { count: daysDiff }));
+    }
+    if (hoursDiff > 0 || daysDiff > 0) {
+        parts.push(
+            trans(CHILL_TICKET_TICKET_BANNER_HOURS, { count: hoursDiff }),
+        );
+    }
+    if (minutesDiff > 0 || hoursDiff > 0 || daysDiff > 0) {
+        parts.push(
+            trans(CHILL_TICKET_TICKET_BANNER_MINUTES, { count: minutesDiff }),
+        );
+    }
+    if (parts.length === 0) {
+        return trans(CHILL_TICKET_TICKET_BANNER_SECONDS, {
+            count: secondsDiff,
         });
-
-        return { since };
-    },
+    }
+    if (parts.length > 1) {
+        const last = parts.pop();
+        return (
+            parts.join(", ") +
+            " " +
+            trans(CHILL_TICKET_TICKET_BANNER_AND) +
+            " " +
+            last
+        );
+    }
+    return parts[0];
 });
 </script>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/MotiveSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/MotiveSelectorComponent.vue
index beb3268a9..cff382f03 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/MotiveSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/MotiveSelectorComponent.vue
@@ -10,10 +10,10 @@
                 open-direction="top"
                 :multiple="false"
                 :searchable="true"
-                :placeholder="$t('set_motive.label')"
-                :select-label="$t('multiselect.select_label')"
-                :deselect-label="$t('multiselect.deselect_label')"
-                :selected-label="$t('multiselect.selected_label')"
+                :placeholder="trans(CHILL_TICKET_TICKET_SET_MOTIVE_LABEL)"
+                :select-label="trans(MULTISELECT_SELECT_LABEL)"
+                :deselect-label="trans(MULTISELECT_DESELECT_LABEL)"
+                :selected-label="trans(MULTISELECT_SELECTED_LABEL)"
                 :options="motives"
                 v-model="motive"
                 class="mb-4"
@@ -22,47 +22,46 @@
     </div>
 </template>
 
-<script lang="ts">
-import { PropType, defineComponent, ref, watch } from "vue";
-import { useI18n } from "vue-i18n";
+<script setup lang="ts">
+import { ref, watch } from "vue";
 import VueMultiselect from "vue-multiselect";
 
 // Types
 import { Motive } from "../../../types";
 
-export default defineComponent({
-    name: "MotiveSelectorComponent",
-    props: {
-        modelValue: {
-            type: Object as PropType<Motive>,
-            required: false,
-        },
-        motives: {
-            type: Object as PropType<Motive[]>,
-            required: true,
-        },
-    },
-    components: {
-        VueMultiselect,
-    },
-    emits: ["update:modelValue"],
+// Translations
+import {
+    trans,
+    CHILL_TICKET_TICKET_SET_MOTIVE_LABEL,
+    MULTISELECT_SELECT_LABEL,
+    MULTISELECT_DESELECT_LABEL,
+    MULTISELECT_SELECTED_LABEL,
+} from "translator";
 
-    setup(props, ctx) {
-        const motive = ref(props.modelValue);
-        const { t } = useI18n();
+const props = defineProps<{
+    modelValue?: Motive;
+    motives: Motive[];
+}>();
 
-        watch(motive, (motive) => {
-            ctx.emit("update:modelValue", motive);
-        });
+const emit =
+    defineEmits<(e: "update:modelValue", value: Motive | undefined) => void>();
 
-        return {
-            motive,
-            customLabel(motive: Motive) {
-                return motive.label ? motive.label.fr : t("set_motive.label");
-            },
-        };
-    },
+const motive = ref(props.modelValue);
+
+watch(motive, (val) => {
+    emit("update:modelValue", val);
 });
+
+watch(
+    () => props.modelValue,
+    (val) => {
+        motive.value = val;
+    },
+);
+
+function customLabel(motive: Motive) {
+    return motive?.label?.fr ?? trans(CHILL_TICKET_TICKET_SET_MOTIVE_LABEL);
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PersonsSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PersonsSelectorComponent.vue
index a288299f1..fa8fd4db9 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PersonsSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PersonsSelectorComponent.vue
@@ -1,12 +1,68 @@
+<template>
+    <div>
+        <div style="display: flex; flex-direction: column; align-items: center">
+            <add-persons
+                :options="addPersonsOptions"
+                key="add-person-selector"
+                :buttonTitle="trans(CHILL_TICKET_TICKET_SET_PERSONS_USER_LABEL)"
+                :modalTitle="trans(CHILL_TICKET_TICKET_SET_PERSONS_USER_LABEL)"
+                :selected="selectedValues"
+                :suggested="suggestedValues"
+                @addNewPersons="addNewEntity"
+            />
+            <div class="p-2">
+                <ul class="list-suggest inline remove-items">
+                    <li v-for="person in currentPersons" :key="person.id">
+                        <span
+                            :title="`${person.firstName} ${person.lastName}`"
+                            @click="removePerson(person)"
+                        >
+                            {{ `${person.firstName} ${person.lastName}` }}
+                        </span>
+                    </li>
+                </ul>
+            </div>
+        </div>
+    </div>
+    <ul class="record_actions">
+        <li class="cancel">
+            <button
+                class="btn btn-cancel"
+                type="button"
+                @click="emit('closeRequested')"
+            >
+                {{ trans(CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CANCEL) }}
+            </button>
+        </li>
+        <li>
+            <button class="btn btn-save" type="submit" @click.prevent="save">
+                {{ trans(CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_SAVE) }}
+            </button>
+        </li>
+    </ul>
+</template>
+
 <script setup lang="ts">
+import { computed, inject, reactive, ref } from "vue";
 import { useStore } from "vuex";
-import AddPersons from "ChillPersonAssets/vuejs/_components/AddPersons.vue";
-import { computed, inject, reactive } from "vue";
-import { Ticket } from "../../../types";
-import { Person } from "../../../../../../../ChillPersonBundle/Resources/public/types";
-import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue";
 import { ToastPluginApi } from "vue-toast-notification";
 
+// Components
+import AddPersons from "ChillPersonAssets/vuejs/_components/AddPersons.vue";
+
+// Types
+import { SearchOptions, Suggestion, Person } from "ChillPersonAssets/types";
+import { Ticket } from "../../../types";
+
+// Translations
+import {
+    trans,
+    CHILL_TICKET_TICKET_SET_PERSONS_USER_LABEL,
+    CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CANCEL,
+    CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_SAVE,
+    CHILL_TICKET_TICKET_SET_PERSONS_SUCCESS,
+} from "translator";
+
 const emit = defineEmits<(e: "closeRequested") => void>();
 
 const store = useStore();
@@ -19,9 +75,13 @@ const addPersonsOptions = {
     type: ["person"],
     priority: null,
     button: {
+        size: "btn-sm",
         class: "btn-submit",
     },
-};
+} as SearchOptions;
+
+const selectedValues = ref<Suggestion[]>([]);
+const suggestedValues = ref<Suggestion[]>([]);
 
 const added: Person[] = reactive([]);
 const removed: Person[] = reactive([]);
@@ -50,14 +110,12 @@ const removePerson = (p: Person) => {
     removed.push(p);
 };
 
-const addNewEntity = (n: {
-    modal: { showModal: boolean };
-    selected: { result: Person }[];
-}) => {
-    n.modal.showModal = false;
+const addNewEntity = (n: { selected: { result: Person }[] }) => {
     for (let p of n.selected) {
         added.push(p.result);
     }
+    selectedValues.value = [];
+    suggestedValues.value = [];
 };
 
 const save = async function (): Promise<void> {
@@ -65,64 +123,14 @@ const save = async function (): Promise<void> {
         await store.dispatch("setPersons", {
             persons: computeCurrentPersons(persons.value, added, removed),
         });
-        toast.success("Patients concernés sauvegardés");
-    } catch (e: any) {
-        console.error("error while saving", e);
-        toast.error((e as Error).message);
+        toast.success(trans(CHILL_TICKET_TICKET_SET_PERSONS_SUCCESS));
+    } catch (error) {
+        toast.error((error as Error).message);
         return Promise.resolve();
     }
     emit("closeRequested");
 };
 </script>
-
-<template>
-    <div>
-        <ul v-if="currentPersons.length > 0" class="person-list">
-            <li v-for="person in currentPersons" :key="person.id">
-                <on-the-fly
-                    :type="person.type"
-                    :id="person.id"
-                    :buttonText="person.textAge"
-                    :displayBadge="'true' === 'true'"
-                    action="show"
-                ></on-the-fly>
-                <button
-                    type="button"
-                    class="btn btn-delete remove-person"
-                    @click="removePerson(person)"
-                ></button>
-            </li>
-        </ul>
-        <p v-else class="chill-no-data-statement">Aucun patient</p>
-    </div>
-    <ul class="record_actions">
-        <li class="cancel">
-            <button
-                class="btn btn-cancel"
-                type="button"
-                @click="emit('closeRequested')"
-            >
-                {{ $t("ticket.cancel") }}
-            </button>
-        </li>
-        <li>
-            <add-persons
-                :options="addPersonsOptions"
-                key="add-person-ticket"
-                buttonTitle="set_persons.user_label"
-                modalTitle="set_persons.user_label"
-                ref="addPersons"
-                @addNewPersons="addNewEntity"
-            />
-        </li>
-        <li>
-            <button class="btn btn-save" type="submit" @click.prevent="save">
-                {{ $t("ticket.save") }}
-            </button>
-        </li>
-    </ul>
-</template>
-
 <style scoped lang="scss">
 ul.person-list {
     list-style-type: none;
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent.vue
index 3e78a7b96..464eec294 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent.vue
@@ -3,31 +3,16 @@
         <addressee-component :addressees="addressees" />
     </div>
 </template>
-
-<script lang="ts">
-import { PropType, defineComponent } from "vue";
-
+<script setup lang="ts">
 // Types
 import { UserGroupOrUser } from "../../../../../../../ChillMainBundle/Resources/public/types";
 
 // Components
 import AddresseeComponent from "./AddresseeComponent.vue";
 
-export default defineComponent({
-    name: "TicketHistoryAddresseeComponenvt",
-    props: {
-        addressees: {
-            type: Array as PropType<UserGroupOrUser[]>,
-            required: true,
-        },
-    },
-    components: {
-        AddresseeComponent,
-    },
-    setup() {
-        return {};
-    },
-});
+defineProps<{
+    addressees: UserGroupOrUser[];
+}>();
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCommentComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCommentComponent.vue
index 21ede7c9e..aad593b23 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCommentComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCommentComponent.vue
@@ -6,55 +6,41 @@
     </div>
 </template>
 
-<script lang="ts">
-import { PropType, defineComponent } from "vue";
+<script setup lang="ts">
 import { marked } from "marked";
 import DOMPurify from "dompurify";
 
 // Types
 import { Comment } from "../../../types";
 
-export default defineComponent({
-    name: "TicketHistoryCommentComponent",
-    props: {
-        commentHistory: {
-            type: Object as PropType<Comment>,
-            required: true,
-        },
-    },
-    setup() {
-        const preprocess = (markdown: string): string => {
-            return markdown;
-        };
+defineProps<{ commentHistory: Comment }>();
 
-        const postprocess = (html: string): string => {
-            DOMPurify.addHook("afterSanitizeAttributes", (node: any) => {
-                if ("target" in node) {
-                    node.setAttribute("target", "_blank");
-                    node.setAttribute("rel", "noopener noreferrer");
-                }
-                if (
-                    !node.hasAttribute("target") &&
-                    (node.hasAttribute("xlink:href") ||
-                        node.hasAttribute("href"))
-                ) {
-                    node.setAttribute("xlink:show", "new");
-                }
-            });
+const preprocess = (markdown: string): string => {
+    return markdown;
+};
 
-            return DOMPurify.sanitize(html);
-        };
+const postprocess = (html: string): string => {
+    DOMPurify.addHook("afterSanitizeAttributes", (node: Element) => {
+        if ("target" in node) {
+            node.setAttribute("target", "_blank");
+            node.setAttribute("rel", "noopener noreferrer");
+        }
+        if (
+            !node.hasAttribute("target") &&
+            (node.hasAttribute("xlink:href") || node.hasAttribute("href"))
+        ) {
+            node.setAttribute("xlink:show", "new");
+        }
+    });
 
-        const convertMarkdownToHtml = (markdown: string): string => {
-            marked.use({ hooks: { postprocess, preprocess } });
-            const rawHtml = marked(markdown) as string;
-            return rawHtml;
-        };
-        return {
-            convertMarkdownToHtml,
-        };
-    },
-});
+    return DOMPurify.sanitize(html);
+};
+
+const convertMarkdownToHtml = (markdown: string): string => {
+    marked.use({ hooks: { postprocess, preprocess } });
+    const rawHtml = marked(markdown) as string;
+    return rawHtml;
+};
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCreateComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCreateComponent.vue
index 9cbc543ab..5f22875f9 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCreateComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCreateComponent.vue
@@ -1,4 +1,9 @@
+<template>
+    <p>Ticket créé par {{ props.by.text }}</p>
+</template>
+
 <script setup lang="ts">
+// Types
 import { User } from "../../../../../../../ChillMainBundle/Resources/public/types";
 
 interface TicketHistoryCreateComponentConfig {
@@ -8,8 +13,4 @@ interface TicketHistoryCreateComponentConfig {
 const props = defineProps<TicketHistoryCreateComponentConfig>();
 </script>
 
-<template>
-    <p>Ticket créé par {{ props.by.text }}</p>
-</template>
-
 <style scoped lang="scss"></style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
index dfa77e72b..548ccdc8a 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
@@ -50,9 +50,8 @@
         </div>
     </div>
 </template>
-
-<script lang="ts">
-import { PropType, defineComponent, ref, computed } from "vue";
+<script setup lang="ts">
+import { ref } from "vue";
 import { useStore } from "vuex";
 
 // Types
@@ -66,72 +65,41 @@ import TicketHistoryCommentComponent from "./TicketHistoryCommentComponent.vue";
 import TicketHistoryAddresseeComponent from "./TicketHistoryAddresseeComponent.vue";
 import TicketHistoryCreateComponent from "./TicketHistoryCreateComponent.vue";
 import UserRenderBoxBadge from "ChillMainAssets/vuejs/_components/Entity/UserRenderBoxBadge.vue";
+
+// Utils
 import { ISOToDatetime } from "../../../../../../../ChillMainBundle/Resources/public/chill/js/date";
 
-export default defineComponent({
-    name: "TicketHistoryListComponent",
-    components: {
-        UserRenderBoxBadge,
-        TicketHistoryPersonComponent,
-        TicketHistoryMotiveComponent,
-        TicketHistoryCommentComponent,
-        TicketHistoryAddresseeComponent,
-        TicketHistoryCreateComponent,
-    },
-    props: {
-        history: {
-            type: Array as PropType<TicketHistoryLine[]>,
-            required: true,
-        },
-    },
+defineProps<{ history: TicketHistoryLine[] }>();
 
-    setup() {
-        const store = useStore();
+const store = useStore();
 
-        const explainSentence = (history: TicketHistoryLine): string => {
-            switch (history.event_type) {
-                case "add_comment":
-                    return "Nouveau commentaire";
-                case "addressees_state":
-                    return "Attributions";
-                case "persons_state":
-                    return "Patients concernés";
-                case "set_motive":
-                    return "Nouveau motifs";
-                case "create_ticket":
-                    return "Ticket créé";
-            }
-        };
+const actionIcons = ref(store.getters.getActionIcons);
 
-        function formatDate(d: DateTime): string {
-            const date = ISOToDatetime(d.datetime);
-
-            if (date === null) {
-                return "";
-            }
-
-            const month = date.toLocaleString("default", { month: "long" });
-            return `${date.getDate()} ${month} ${date.getFullYear()}, ${date.toLocaleTimeString()}`;
-        }
-
-        return {
-            actionIcons: ref(store.getters.getActionIcons),
-            formatDate,
-            explainSentence,
-        };
-    },
-});
-</script>
-
-<style lang="scss" scoped>
-div.history-header {
-    display: flex;
-    flex-direction: row;
-    justify-content: flex-end;
-    align-items: center;
-
-    & > div.description {
-        margin-right: auto;
+function explainSentence(history: TicketHistoryLine): string {
+    switch (history.event_type) {
+        case "add_comment":
+            return "Nouveau commentaire";
+        case "addressees_state":
+            return "Attributions";
+        case "persons_state":
+            return "Usagés concernés";
+        case "set_motive":
+            return "Nouveau motifs";
+        case "create_ticket":
+            return "Ticket créé";
+        default:
+            return "";
     }
 }
-</style>
+
+function formatDate(d: DateTime): string {
+    const date = ISOToDatetime(d.datetime);
+
+    if (date === null) {
+        return "";
+    }
+
+    const month = date.toLocaleString("default", { month: "long" });
+    return `${date.getDate()} ${month} ${date.getFullYear()}, ${date.toLocaleTimeString()}`;
+}
+</script>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryMotiveComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryMotiveComponent.vue
index eb07671a1..167c43fc3 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryMotiveComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryMotiveComponent.vue
@@ -4,23 +4,11 @@
     </div>
 </template>
 
-<script lang="ts">
-import { PropType, defineComponent } from "vue";
-
+<script lang="ts" setup>
 // Types
 import { MotiveHistory } from "../../../types";
 
-export default defineComponent({
-    name: "TicketHistoryMotiveComponent",
-    props: {
-        motiveHistory: {
-            type: Object as PropType<MotiveHistory>,
-            required: true,
-        },
-    },
-
-    setup() {},
-});
+defineProps<{ motiveHistory: MotiveHistory }>();
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryPersonComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryPersonComponent.vue
index b8657dc9c..2fa369b3b 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryPersonComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryPersonComponent.vue
@@ -6,7 +6,7 @@
                     :type="person.type"
                     :id="person.id"
                     :buttonText="person.textAge"
-                    :displayBadge="'true' === 'true'"
+                    :displayBadge="true"
                     action="show"
                 ></on-the-fly>
             </li>
@@ -14,27 +14,13 @@
     </div>
 </template>
 
-<script lang="ts">
-import { PropType, defineComponent } from "vue";
-
-// Type
-import { PersonsState } from "../../../types";
+<script setup lang="ts">
 import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue";
 
-export default defineComponent({
-    name: "TicketHistoryPersonComponent",
-    props: {
-        personHistory: {
-            type: Object as PropType<PersonsState>,
-            required: true,
-        },
-    },
-    components: {
-        OnTheFly,
-    },
+// Types
+import { PersonsState } from "../../../types";
 
-    setup() {},
-});
+defineProps<{ personHistory: PersonsState }>();
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketSelectorComponent.vue
index f6a6a5aaf..2d532b8fd 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketSelectorComponent.vue
@@ -7,7 +7,7 @@
                 data-bs-toggle="dropdown"
                 aria-expanded="false"
             >
-                {{ $t("ticket.previous_tickets") }}
+                {{ trans(CHILL_TICKET_TICKET_PREVIOUS_TICKETS) }}
                 <span
                     class="position-absolute top-0 start-100 translate-middle badge rounded-pill bg-chill-green"
                 >
@@ -19,27 +19,18 @@
     </div>
 </template>
 
-<script lang="ts">
-import { PropType, defineComponent } from "vue";
+<script setup lang="ts">
+// Translations
+import { trans, CHILL_TICKET_TICKET_PREVIOUS_TICKETS } from "translator";
 
 // Types
 import { Ticket } from "../../../types";
 
-export default defineComponent({
-    name: "TicketSelectorComponent",
-    props: {
-        tickets: {
-            type: Object as PropType<Ticket[]>,
-            required: true,
-        },
-    },
-    setup() {
-        function handleClick() {
-            alert("Sera disponible plus tard");
-        }
-        return { handleClick };
-    },
-});
+defineProps<{ tickets: Ticket[] }>();
+
+function handleClick() {
+    alert("Sera disponible plus tard");
+}
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
deleted file mode 100644
index d64434119..000000000
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/i18n/messages.ts
+++ /dev/null
@@ -1,56 +0,0 @@
-import { multiSelectMessages } from "../../../../../../../ChillMainBundle/Resources/public/vuejs/_js/i18n";
-import { personMessages } from "../../../../../../../ChillPersonBundle/Resources/public/vuejs/_js/i18n";
-
-const messages = {
-    fr: {
-        ticket: {
-            previous_tickets: "Précédents tickets",
-            cancel: "Annuler",
-            save: "Enregistrer",
-            close: "Fermer",
-        },
-        history: {
-            person: "Ouverture par appel téléphonique de ",
-            user: "Prise en charge par ",
-        },
-        add_comment: {
-            title: "Commentaire",
-            label: "Ajouter un commentaire",
-            success: "Commentaire enregistré",
-            content: "Ajouter un commentaire",
-            error: "Aucun commentaire ajouté",
-        },
-        set_motive: {
-            title: "Motif",
-            label: "Choisir un motif",
-            success: "Motif enregistré",
-            error: "Aucun motif sélectionné",
-        },
-        add_addressee: {
-            title: "Attribuer",
-            user_group_label: "Attributer à un groupe",
-            user_label: "Attribuer à un ou plusieurs utilisateurs",
-            success: "Attribution effectuée",
-            error: "Aucun destinataire sélectionné",
-        },
-        set_persons: {
-            title: "Patients concernés",
-            user_label: "Ajouter un patient",
-        },
-        banner: {
-            concerned_patient: "Patients concernés",
-            speaker: "Attribué à",
-            open: "Ouvert",
-            since: "Depuis {time}",
-            and: "et",
-            days: "‎|1 jour|{count} jours",
-            hours: "‎|1 heure et|{count} heures",
-            minutes: "‎|1 minute|{count} minutes",
-            seconds: "‎|1 seconde|{count} secondes",
-            no_motive: "Pas de motif",
-        },
-    },
-};
-Object.assign(messages.fr, multiSelectMessages.fr);
-Object.assign(messages.fr, personMessages.fr);
-export default messages;
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts
index d7c763cea..df1074496 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts
@@ -1,13 +1,10 @@
 import App from "./App.vue";
 import { createApp } from "vue";
 
-import { _createI18n } from "../../../../../../ChillMainBundle/Resources/public/vuejs/_js/i18n";
-
 import VueToast from "vue-toast-notification";
 import "vue-toast-notification/dist/theme-sugar.css";
 
 import { store } from "./store";
-import messages from "./i18n/messages";
 
 declare global {
     interface Window {
@@ -15,16 +12,11 @@ declare global {
     }
 }
 
-const i18n = _createI18n(messages, false);
-
 const _app = createApp({
     template: "<app></app>",
 });
 
 _app.use(store)
-    .use(i18n)
-    // Cant use this.$toast in components in composition API so we need to provide it
-    // Fix: with vue-toast-notification@^3
     .use(VueToast)
     .provide("toast", _app.config.globalProperties.$toast)
     .component("app", App)
diff --git a/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml b/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
new file mode 100644
index 000000000..f825a7786
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
@@ -0,0 +1,66 @@
+chill_ticket:
+    list:
+        title: Tickets
+        filter:
+            to_me: Tickets qui me sont attribués
+            in_alert: Tickets en alerte (délai de résolution dépassé)
+            created_between: Créés entre
+    ticket:
+        previous_tickets: "Précédents tickets"
+        actions_toolbar:
+            cancel: "Annuler"
+            save: "Enregistrer"
+            close: "Fermer"
+        add_comment:
+            title: "Commentaire"
+            label: "Ajouter un commentaire"
+            success: "Commentaire enregistré"
+            content: "Ajouter un commentaire"
+            error: "Aucun commentaire ajouté"
+        set_motive:
+            title: "Motif"
+            label: "Choisir un motif"
+            success: "Motif enregistré"
+            error: "Aucun motif sélectionné"
+        add_addressee:
+            title: "Attribuer"
+            user_group_label: "Attributer à un groupe"
+            user_label: "Attribuer à un ou plusieurs utilisateurs"
+            success: "Attribution effectuée"
+            error: "Aucun destinataire sélectionné"
+        set_persons:
+            title: "Usagers concernés"
+            user_label: "Ajouter un usager"
+            success: "Usager ajouté"
+            error: "Aucun usager sélectionné"
+        banner:
+            concerned_usager: "Usagers concernés"
+            speaker: "Attribué à"
+            open: "Ouvert"
+            since: "Depuis {time}"
+            and: "et"
+            days: >-
+                {count, plural,
+                    =0    {aucun jour}
+                    =1    {1 jour}
+                    other {# jours}
+                }
+            hours: >-
+                {count, plural,
+                    =0    {aucune heure}
+                    =1    {1 heure}
+                    other {# heures}
+                }
+            minutes: >-
+                {count, plural,
+                    =0    {aucune minute}
+                    =1    {1 minute}
+                    other {# minutes}
+                }
+            seconds: >-
+                {count, plural,
+                    =0    {aucune seconde}
+                    =1    {1 seconde}
+                    other {# secondes}
+                }
+            no_motive: "Pas de motif"
diff --git a/src/Bundle/ChillTicketBundle/src/translations/messages.fr.yml b/src/Bundle/ChillTicketBundle/src/translations/messages.fr.yml
deleted file mode 100644
index 3cba033a1..000000000
--- a/src/Bundle/ChillTicketBundle/src/translations/messages.fr.yml
+++ /dev/null
@@ -1,9 +0,0 @@
-chill_ticket:
-    list:
-        title: Tickets
-        filter:
-            to_me: Tickets qui me sont attribués
-            in_alert: Tickets en alerte (délai de résolution dépassé)
-            created_between: Créés entre
-
-

From 95975fae5507ad0a8072c6cb6402409826e48fd5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 20 Jun 2025 17:35:19 +0200
Subject: [PATCH 122/283] fix cs

---
 .../Phonenumber/PhonenumberHelperTest.php     |  80 +++++++-------
 .../Controller/FindCallerControllerTest.php   |  42 ++++----
 .../ReplaceMotiveControllerTest.php           |  36 +++----
 .../SetAddresseesControllerTest.php           |  52 ++++-----
 .../Normalizer/TicketNormalizerTest.php       | 102 +++++++++---------
 5 files changed, 156 insertions(+), 156 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Tests/Phonenumber/PhonenumberHelperTest.php b/src/Bundle/ChillMainBundle/Tests/Phonenumber/PhonenumberHelperTest.php
index 556fa9fde..cae0cdd48 100644
--- a/src/Bundle/ChillMainBundle/Tests/Phonenumber/PhonenumberHelperTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Phonenumber/PhonenumberHelperTest.php
@@ -26,6 +26,26 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
  */
 final class PhonenumberHelperTest extends KernelTestCase
 {
+    /**
+     * @dataProvider formatPhonenumbers
+     */
+    public function testFormatPhonenumbers(string $defaultCarrierCode, string $phoneNumber, string $expected)
+    {
+        $util = PhoneNumberUtil::getInstance();
+
+        $subject = new PhonenumberHelper(
+            new ArrayAdapter(),
+            new ParameterBag([
+                'chill_main.phone_helper' => [
+                    'default_carrier_code' => $defaultCarrierCode,
+                ],
+            ]),
+            new NullLogger()
+        );
+
+        $this->assertEquals($expected, $subject->format($util->parse($phoneNumber)));
+    }
+
     public static function formatPhonenumbers()
     {
         yield [
@@ -53,6 +73,26 @@ final class PhonenumberHelperTest extends KernelTestCase
         ];
     }
 
+    /**
+     * @dataProvider providePhoneNumbersToParse
+     */
+    public function testParsePhonenumbers(string $defaultCarrierCode, string $phoneNumber, PhoneNumber $expected): void
+    {
+        $subject = new PhonenumberHelper(
+            new ArrayAdapter(),
+            new ParameterBag([
+                'chill_main.phone_helper' => [
+                    'default_carrier_code' => $defaultCarrierCode,
+                ],
+            ]),
+            new NullLogger()
+        );
+
+        $actual = $subject->parse($phoneNumber);
+
+        self::assertTrue($expected->equals($actual));
+    }
+
     public static function providePhoneNumbersToParse(): iterable
     {
         $util = PhoneNumberUtil::getInstance();
@@ -75,44 +115,4 @@ final class PhonenumberHelperTest extends KernelTestCase
             $util->parse('+33228858040', 'FR'),
         ];
     }
-
-    /**
-     * @dataProvider formatPhonenumbers
-     */
-    public function testFormatPhonenumbers(string $defaultCarrierCode, string $phoneNumber, string $expected)
-    {
-        $util = PhoneNumberUtil::getInstance();
-
-        $subject = new PhonenumberHelper(
-            new ArrayAdapter(),
-            new ParameterBag([
-                'chill_main.phone_helper' => [
-                    'default_carrier_code' => $defaultCarrierCode,
-                ],
-            ]),
-            new NullLogger()
-        );
-
-        $this->assertEquals($expected, $subject->format($util->parse($phoneNumber)));
-    }
-
-    /**
-     * @dataProvider providePhoneNumbersToParse
-     */
-    public function testParsePhonenumbers(string $defaultCarrierCode, string $phoneNumber, PhoneNumber $expected): void
-    {
-        $subject = new PhonenumberHelper(
-            new ArrayAdapter(),
-            new ParameterBag([
-                'chill_main.phone_helper' => [
-                    'default_carrier_code' => $defaultCarrierCode,
-                ],
-            ]),
-            new NullLogger()
-        );
-
-        $actual = $subject->parse($phoneNumber);
-
-        self::assertTrue($expected->equals($actual));
-    }
 }
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/FindCallerControllerTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/FindCallerControllerTest.php
index 301b8f4ac..997017e97 100644
--- a/src/Bundle/ChillTicketBundle/tests/Controller/FindCallerControllerTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/FindCallerControllerTest.php
@@ -50,6 +50,27 @@ class FindCallerControllerTest extends TestCase
         self::assertEqualsCanonicalizing($expected, $actual);
     }
 
+    public static function provideFindCaller(): iterable
+    {
+        yield [
+            '32486540600',
+            [],
+            ['found' => false, 'name' => null],
+        ];
+
+        yield [
+            '32486540600',
+            [new Person()],
+            ['found' => true, 'name' => 'pppp'],
+        ]
+        ;
+        yield [
+            '32486540600',
+            [new Person(), new Person()],
+            ['found' => true, 'name' => 'multiple'],
+        ];
+    }
+
     public function testFindCallerWithoutCallerArgument(): void
     {
         self::expectException(BadRequestHttpException::class);
@@ -83,27 +104,6 @@ class FindCallerControllerTest extends TestCase
         $controller->findCaller($request);
     }
 
-    public static function provideFindCaller(): iterable
-    {
-        yield [
-            '32486540600',
-            [],
-            ['found' => false, 'name' => null],
-        ];
-
-        yield [
-            '32486540600',
-            [new Person()],
-            ['found' => true, 'name' => 'pppp'],
-        ]
-        ;
-        yield [
-            '32486540600',
-            [new Person(), new Person()],
-            ['found' => true, 'name' => 'multiple'],
-        ];
-    }
-
     private function buildController(array $personsFound): FindCallerController
     {
         $phonenumberHelper =
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/ReplaceMotiveControllerTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/ReplaceMotiveControllerTest.php
index dcf6a2318..95c8ec5f4 100644
--- a/src/Bundle/ChillTicketBundle/tests/Controller/ReplaceMotiveControllerTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/ReplaceMotiveControllerTest.php
@@ -70,6 +70,24 @@ class ReplaceMotiveControllerTest extends KernelTestCase
         self::assertEquals(201, $response->getStatusCode());
     }
 
+    public static function generateMotiveId(): iterable
+    {
+        self::bootKernel();
+        $em = self::getContainer()->get(EntityManagerInterface::class);
+
+        $motive = $em->createQuery('SELECT m FROM '.Motive::class.' m ')
+            ->setMaxResults(1)
+            ->getOneOrNullResult();
+
+        if (null === $motive) {
+            throw new \RuntimeException('the motive table seems to be empty');
+        }
+
+        self::ensureKernelShutdown();
+
+        yield [$motive->getId()];
+    }
+
     private function buildController(): ReplaceMotiveController
     {
         $security = $this->prophesize(Security::class);
@@ -92,22 +110,4 @@ class ReplaceMotiveControllerTest extends KernelTestCase
             $entityManager->reveal(),
         );
     }
-
-    public static function generateMotiveId(): iterable
-    {
-        self::bootKernel();
-        $em = self::getContainer()->get(EntityManagerInterface::class);
-
-        $motive = $em->createQuery('SELECT m FROM '.Motive::class.' m ')
-            ->setMaxResults(1)
-            ->getOneOrNullResult();
-
-        if (null === $motive) {
-            throw new \RuntimeException('the motive table seems to be empty');
-        }
-
-        self::ensureKernelShutdown();
-
-        yield [$motive->getId()];
-    }
 }
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/SetAddresseesControllerTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/SetAddresseesControllerTest.php
index af0d48e87..1455f711f 100644
--- a/src/Bundle/ChillTicketBundle/tests/Controller/SetAddresseesControllerTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/SetAddresseesControllerTest.php
@@ -85,6 +85,32 @@ class SetAddresseesControllerTest extends KernelTestCase
         self::assertGreaterThan(0, count($asArray['violations']));
     }
 
+    public static function getContentData(): iterable
+    {
+        self::bootKernel();
+        $entityManager = self::getContainer()->get(EntityManagerInterface::class);
+
+        $userGroup = $entityManager->createQuery('SELECT ug FROM '.UserGroup::class.' ug ')
+            ->setMaxResults(1)->getOneOrNullResult();
+
+        if (null === $userGroup) {
+            throw new \RuntimeException('User group not existing in database');
+        }
+
+        $user = $entityManager->createQuery('SELECT u FROM '.User::class.' u')
+            ->setMaxResults(1)->getOneOrNullResult();
+
+        if (null === $user) {
+            throw new \RuntimeException('User not existing in database');
+        }
+
+        self::ensureKernelShutdown();
+
+        yield [[['type' => 'user', 'id' => $user->getId()]]];
+        yield [[['type' => 'user', 'id' => $user->getId()], ['type' => 'user_group', 'id' => $userGroup->getId()]]];
+        yield [[['type' => 'user_group', 'id' => $userGroup->getId()]]];
+    }
+
     /**
      * @dataProvider getContentDataUnique
      */
@@ -149,32 +175,6 @@ class SetAddresseesControllerTest extends KernelTestCase
         yield [['type' => 'user_group', 'id' => $userGroup->getId()]];
     }
 
-    public static function getContentData(): iterable
-    {
-        self::bootKernel();
-        $entityManager = self::getContainer()->get(EntityManagerInterface::class);
-
-        $userGroup = $entityManager->createQuery('SELECT ug FROM '.UserGroup::class.' ug ')
-            ->setMaxResults(1)->getOneOrNullResult();
-
-        if (null === $userGroup) {
-            throw new \RuntimeException('User group not existing in database');
-        }
-
-        $user = $entityManager->createQuery('SELECT u FROM '.User::class.' u')
-            ->setMaxResults(1)->getOneOrNullResult();
-
-        if (null === $user) {
-            throw new \RuntimeException('User not existing in database');
-        }
-
-        self::ensureKernelShutdown();
-
-        yield [[['type' => 'user', 'id' => $user->getId()]]];
-        yield [[['type' => 'user', 'id' => $user->getId()], ['type' => 'user_group', 'id' => $userGroup->getId()]]];
-        yield [[['type' => 'user_group', 'id' => $userGroup->getId()]]];
-    }
-
     private function buildController(bool $willSave, bool $isValid): SetAddresseesController
     {
         $user = new User();
diff --git a/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/TicketNormalizerTest.php b/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/TicketNormalizerTest.php
index 415fc15fb..035ce95a6 100644
--- a/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/TicketNormalizerTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/TicketNormalizerTest.php
@@ -59,6 +59,57 @@ class TicketNormalizerTest extends KernelTestCase
         }
     }
 
+    public static function provideTickets(): iterable
+    {
+        yield [
+            // this a nearly empty ticket
+            new Ticket(),
+            [
+                'type' => 'ticket_ticket',
+                'id' => null,
+                'externalRef' => '',
+                'currentPersons' => [],
+                'currentAddressees' => [],
+                'currentInputs' => [],
+                'currentMotive' => null,
+                'history' => [],
+            ],
+        ];
+
+        // ticket with more features
+        $ticket = new Ticket();
+        $ticket->setExternalRef('2134');
+        $personHistory = new PersonHistory(new Person(), $ticket, new \DateTimeImmutable('2024-04-01T12:00:00'));
+        $ticketHistory = new MotiveHistory(new Motive(), $ticket, new \DateTimeImmutable('2024-04-01T12:02:00'));
+        $comment = new Comment('blabla test', $ticket);
+        $comment->setCreatedAt(new \DateTimeImmutable('2024-04-01T12:04:00'));
+        $comment->setCreatedBy(new User());
+        $addresseeHistory = new AddresseeHistory(new User(), new \DateTimeImmutable('2024-04-01T12:05:00'), $ticket);
+        $addresseeHistory->setEndDate(new \DateTimeImmutable('2024-04-01T12:06:00'));
+        new AddresseeHistory(new UserGroup(), new \DateTimeImmutable('2024-04-01T12:07:00'), $ticket);
+
+        yield [
+            $ticket,
+            [
+                'type' => 'ticket_ticket',
+                'id' => null,
+                'externalRef' => '2134',
+                'currentPersons' => ['embedded'],
+                'currentAddressees' => ['embedded'],
+                'currentInputs' => [],
+                'currentMotive' => ['type' => 'motive', 'id' => 0],
+                'history' => [
+                    ['event_type' => 'add_person'],
+                    ['event_type' => 'set_motive'],
+                    ['event_type' => 'add_comment'],
+                    ['event_type' => 'add_addressee'],
+                    ['event_type' => 'remove_addressee'],
+                    ['event_type' => 'add_addressee'],
+                ],
+            ],
+        ];
+    }
+
     private function buildNormalizer(): TicketNormalizer
     {
         $normalizer = $this->prophesize(NormalizerInterface::class);
@@ -120,55 +171,4 @@ class TicketNormalizerTest extends KernelTestCase
 
         return $ticketNormalizer;
     }
-
-    public static function provideTickets(): iterable
-    {
-        yield [
-            // this a nearly empty ticket
-            new Ticket(),
-            [
-                'type' => 'ticket_ticket',
-                'id' => null,
-                'externalRef' => '',
-                'currentPersons' => [],
-                'currentAddressees' => [],
-                'currentInputs' => [],
-                'currentMotive' => null,
-                'history' => [],
-            ],
-        ];
-
-        // ticket with more features
-        $ticket = new Ticket();
-        $ticket->setExternalRef('2134');
-        $personHistory = new PersonHistory(new Person(), $ticket, new \DateTimeImmutable('2024-04-01T12:00:00'));
-        $ticketHistory = new MotiveHistory(new Motive(), $ticket, new \DateTimeImmutable('2024-04-01T12:02:00'));
-        $comment = new Comment('blabla test', $ticket);
-        $comment->setCreatedAt(new \DateTimeImmutable('2024-04-01T12:04:00'));
-        $comment->setCreatedBy(new User());
-        $addresseeHistory = new AddresseeHistory(new User(), new \DateTimeImmutable('2024-04-01T12:05:00'), $ticket);
-        $addresseeHistory->setEndDate(new \DateTimeImmutable('2024-04-01T12:06:00'));
-        new AddresseeHistory(new UserGroup(), new \DateTimeImmutable('2024-04-01T12:07:00'), $ticket);
-
-        yield [
-            $ticket,
-            [
-                'type' => 'ticket_ticket',
-                'id' => null,
-                'externalRef' => '2134',
-                'currentPersons' => ['embedded'],
-                'currentAddressees' => ['embedded'],
-                'currentInputs' => [],
-                'currentMotive' => ['type' => 'motive', 'id' => 0],
-                'history' => [
-                    ['event_type' => 'add_person'],
-                    ['event_type' => 'set_motive'],
-                    ['event_type' => 'add_comment'],
-                    ['event_type' => 'add_addressee'],
-                    ['event_type' => 'remove_addressee'],
-                    ['event_type' => 'add_addressee'],
-                ],
-            ],
-        ];
-    }
 }

From c72432efae71cd683a5a9362874d74261b71e224 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 20 Jun 2025 15:42:43 +0000
Subject: [PATCH 123/283] Add api endpoint to open and close ticket

---
 .junie/guidelines.md                          |  10 +-
 .../ChillTicketBundle/chill.api.specs.yaml    |  94 ++++++++++++
 .../src/Action/Ticket/ChangeStateCommand.php  |  24 +++
 .../AssociateByPhonenumberCommandHandler.php  |   8 +-
 .../Handler/ChangeStateCommandHandler.php     |  49 ++++++
 .../Handler/CreateTicketCommandHandler.php    |   7 +
 .../Controller/ChangeStateApiController.php   |  73 +++++++++
 .../src/Controller/EditTicketController.php   |   2 +-
 .../src/Controller/FindCallerController.php   |   2 +-
 .../src/Controller/TicketControllerApi.php    |  31 ++++
 .../src/Controller/TicketListController.php   |   2 +-
 .../src/Resources/public/types.ts             |  16 +-
 .../Normalizer/TicketNormalizer.php           |  40 ++---
 .../Handler/ChangeStateCommandHandlerTest.php | 118 ++++++++++++++
 .../CreateTicketCommandHandlerTest.php        |   6 +-
 .../SetAddressesCommandHandlerTest.php        |  20 +--
 .../Handler/SetPersonsCommandHandlerTest.php  |  20 +--
 .../ChangeStateApiControllerTest.php          | 144 ++++++++++++++++++
 .../SetAddresseesControllerTest.php           |   4 +-
 .../tests/Entity/TicketTest.php               |  10 +-
 .../Normalizer/TicketNormalizerTest.php       |  89 +++++++++--
 21 files changed, 685 insertions(+), 84 deletions(-)
 create mode 100644 src/Bundle/ChillTicketBundle/src/Action/Ticket/ChangeStateCommand.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/ChangeStateCommandHandler.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Controller/ChangeStateApiController.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Controller/TicketControllerApi.php
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/ChangeStateCommandHandlerTest.php
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Controller/ChangeStateApiControllerTest.php

diff --git a/.junie/guidelines.md b/.junie/guidelines.md
index 8ef0b7c8d..899c890b1 100644
--- a/.junie/guidelines.md
+++ b/.junie/guidelines.md
@@ -149,6 +149,14 @@ Key configuration files:
 - `package.json`: JavaScript dependencies and scripts
 - `.env`: Default environment variables. Must usually not be updated: use `.env.local` instead.
 
+### Development guidelines
+
+#### Usage of clock
+
+When we need to use a DateTime or DateTimeImmutable that need to express "now", we prefer the usage of
+`Symfony\Component\Clock\ClockInterface`, where possible. This is usually not possible in doctrine entities,
+where injection does not work when restoring an entity from database, but usually possible in services.
+
 ### Testing Information
 
 The project uses PHPUnit for testing. Each bundle has its own test suite, and there's also a global test suite at the root level.
@@ -218,7 +226,7 @@ class TicketTest extends TestCase
 
 #### Test Database
 
-For tests that require a database, the project uses an in-memory SQLite database by default. You can configure a different database for testing in the `.env.test` file.
+For tests that require a database, the project uses postgresql database filled by fixtures (usage of doctrine-fixtures). You can configure a different database for testing in the `.env.test` file.
 
 ### Code Quality Tools
 
diff --git a/src/Bundle/ChillTicketBundle/chill.api.specs.yaml b/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
index 5be9ac0c0..3aac7f2ec 100644
--- a/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
@@ -27,6 +27,23 @@ components:
                 - type
 
 paths:
+    /1.0/ticket/ticket/{id}:
+        get:
+            tags:
+                - ticket
+            summary: Details of a ticket
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The ticket id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            responses:
+                200:
+                    description: "OK"
     /1.0/ticket/motive.json:
         get:
             tags:
@@ -94,6 +111,34 @@ paths:
                 422:
                     description: "UNPROCESSABLE ENTITY"
 
+    /1.0/ticket/{id}/persons/set:
+        post:
+            tags:
+                - ticket
+            summary: Associate a person with the ticket
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The ticket id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            requestBody:
+                required: true
+                content:
+                    application/json:
+                        schema:
+                            type: object
+                            properties:
+                                persons:
+                                    type: array
+                                    items:
+                                        $ref: '#/components/schemas/PersonById'
+            responses:
+                200:
+                    description: "OK"
     /1.0/ticket/{id}/addressees/set:
         post:
             tags:
@@ -161,3 +206,52 @@ paths:
                     description: "ACCEPTED"
                 422:
                     description: "UNPROCESSABLE ENTITY"
+
+    /1.0/ticket/ticket/{id}/close:
+        post:
+            tags:
+                - ticket
+            summary: Close a ticket
+            description: |
+                Close an existing ticket.
+
+                If the ticket is already close, no action will be performed on this ticket: his state will remains unchanged, and the
+                ticket will be returned.
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The ticket id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            responses:
+                200:
+                    description: "OK"
+                401:
+                    description: "UNAUTHORIZED"
+    /1.0/ticket/ticket/{id}/open:
+        post:
+            tags:
+                - ticket
+            summary: Open a ticket
+            description: |
+                Re-open an existing ticket.
+
+                If the ticket is already opened, no action will be performed on this ticket: his state will remains unchanged, and the
+                ticket will be returned.
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The ticket id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            responses:
+                200:
+                    description: "OK"
+                401:
+                    description: "UNAUTHORIZED"
diff --git a/src/Bundle/ChillTicketBundle/src/Action/Ticket/ChangeStateCommand.php b/src/Bundle/ChillTicketBundle/src/Action/Ticket/ChangeStateCommand.php
new file mode 100644
index 000000000..f668a2455
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Action/Ticket/ChangeStateCommand.php
@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Action\Ticket;
+
+use Chill\TicketBundle\Entity\StateEnum;
+
+/**
+ * Command to change the state of a ticket.
+ */
+final readonly class ChangeStateCommand
+{
+    public function __construct(
+        public StateEnum $newState,
+    ) {}
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/AssociateByPhonenumberCommandHandler.php b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/AssociateByPhonenumberCommandHandler.php
index deec240f2..d794250c5 100644
--- a/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/AssociateByPhonenumberCommandHandler.php
+++ b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/AssociateByPhonenumberCommandHandler.php
@@ -22,10 +22,10 @@ use Symfony\Component\Clock\ClockInterface;
 class AssociateByPhonenumberCommandHandler
 {
     public function __construct(
-        private PersonACLAwareRepositoryInterface $personRepository,
-        private PhonenumberHelper $phonenumberHelper,
-        private ClockInterface $clock,
-        private EntityManagerInterface $entityManager,
+        private readonly PersonACLAwareRepositoryInterface $personRepository,
+        private readonly PhonenumberHelper $phonenumberHelper,
+        private readonly ClockInterface $clock,
+        private readonly EntityManagerInterface $entityManager,
     ) {}
 
     public function __invoke(Ticket $ticket, AssociateByPhonenumberCommand $command): void
diff --git a/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/ChangeStateCommandHandler.php b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/ChangeStateCommandHandler.php
new file mode 100644
index 000000000..7558b0d75
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/ChangeStateCommandHandler.php
@@ -0,0 +1,49 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Action\Ticket\Handler;
+
+use Chill\TicketBundle\Action\Ticket\ChangeStateCommand;
+use Chill\TicketBundle\Entity\StateHistory;
+use Chill\TicketBundle\Entity\Ticket;
+use Symfony\Component\Clock\ClockInterface;
+
+/**
+ * Handler for changing the state of a ticket.
+ */
+class ChangeStateCommandHandler
+{
+    public function __construct(private readonly ClockInterface $clock) {}
+
+    public function __invoke(Ticket $ticket, ChangeStateCommand $command): Ticket
+    {
+        // If the ticket is already in the requested state, return it without changes
+        if ($command->newState === $ticket->getState()) {
+            return $ticket;
+        }
+
+        // End the current state history (if any)
+        foreach ($ticket->getStateHistories() as $stateHistory) {
+            if (null === $stateHistory->getEndDate()) {
+                $stateHistory->setEndDate($this->clock->now());
+            }
+        }
+
+        // Create a new state history with the new state
+        new StateHistory(
+            $command->newState,
+            $ticket,
+            $this->clock->now(),
+        );
+
+        return $ticket;
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/CreateTicketCommandHandler.php b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/CreateTicketCommandHandler.php
index 4fdbfa8f3..c354294d0 100644
--- a/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/CreateTicketCommandHandler.php
+++ b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/CreateTicketCommandHandler.php
@@ -12,15 +12,22 @@ declare(strict_types=1);
 namespace Chill\TicketBundle\Action\Ticket\Handler;
 
 use Chill\TicketBundle\Action\Ticket\CreateTicketCommand;
+use Chill\TicketBundle\Entity\StateEnum;
+use Chill\TicketBundle\Entity\StateHistory;
 use Chill\TicketBundle\Entity\Ticket;
+use Symfony\Component\Clock\ClockInterface;
 
 class CreateTicketCommandHandler
 {
+    public function __construct(private readonly ClockInterface $clock) {}
+
     public function __invoke(CreateTicketCommand $command): Ticket
     {
         $ticket = new Ticket();
         $ticket->setExternalRef($command->externalReference);
 
+        new StateHistory(StateEnum::OPEN, $ticket, $this->clock->now());
+
         return $ticket;
     }
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Controller/ChangeStateApiController.php b/src/Bundle/ChillTicketBundle/src/Controller/ChangeStateApiController.php
new file mode 100644
index 000000000..55e09162d
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Controller/ChangeStateApiController.php
@@ -0,0 +1,73 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Controller;
+
+use Chill\TicketBundle\Action\Ticket\ChangeStateCommand;
+use Chill\TicketBundle\Action\Ticket\Handler\ChangeStateCommandHandler;
+use Chill\TicketBundle\Entity\StateEnum;
+use Chill\TicketBundle\Entity\Ticket;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\SerializerInterface;
+
+/**
+ * Controller for changing the state of a ticket.
+ */
+final readonly class ChangeStateApiController
+{
+    public function __construct(
+        private ChangeStateCommandHandler $changeStateCommandHandler,
+        private Security $security,
+        private EntityManagerInterface $entityManager,
+        private SerializerInterface $serializer,
+    ) {}
+
+    #[Route('/api/1.0/ticket/ticket/{id}/close', name: 'chill_ticket_ticket_close_api', requirements: ['id' => '\d+'], methods: ['POST'])]
+    public function close(Ticket $ticket): Response
+    {
+        if (!$this->security->isGranted('ROLE_USER')) {
+            throw new AccessDeniedHttpException('Only users are allowed to close tickets.');
+        }
+
+        $command = new ChangeStateCommand(StateEnum::CLOSED);
+        $this->changeStateCommandHandler->__invoke($ticket, $command);
+
+        $this->entityManager->flush();
+
+        return new JsonResponse(
+            $this->serializer->serialize($ticket, 'json', ['groups' => ['read']]),
+            json: true
+        );
+    }
+
+    #[Route('/api/1.0/ticket/ticket/{id}/open', name: 'chill_ticket_ticket_open_api', requirements: ['id' => '\d+'], methods: ['POST'])]
+    public function open(Ticket $ticket): Response
+    {
+        if (!$this->security->isGranted('ROLE_USER')) {
+            throw new AccessDeniedHttpException('Only users are allowed to open tickets.');
+        }
+
+        $command = new ChangeStateCommand(StateEnum::OPEN);
+        $this->changeStateCommandHandler->__invoke($ticket, $command);
+
+        $this->entityManager->flush();
+
+        return new JsonResponse(
+            $this->serializer->serialize($ticket, 'json', ['groups' => ['read']]),
+            json: true
+        );
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Controller/EditTicketController.php b/src/Bundle/ChillTicketBundle/src/Controller/EditTicketController.php
index fcff2aa56..c9886759c 100644
--- a/src/Bundle/ChillTicketBundle/src/Controller/EditTicketController.php
+++ b/src/Bundle/ChillTicketBundle/src/Controller/EditTicketController.php
@@ -19,7 +19,7 @@ use Twig\Environment;
 class EditTicketController
 {
     public function __construct(
-        private Environment $templating,
+        private readonly Environment $templating,
     ) {}
 
     #[Route('/{_locale}/ticket/ticket/{id}/edit', name: 'chill_ticket_ticket_edit')]
diff --git a/src/Bundle/ChillTicketBundle/src/Controller/FindCallerController.php b/src/Bundle/ChillTicketBundle/src/Controller/FindCallerController.php
index 94febedaa..c5d476361 100644
--- a/src/Bundle/ChillTicketBundle/src/Controller/FindCallerController.php
+++ b/src/Bundle/ChillTicketBundle/src/Controller/FindCallerController.php
@@ -28,7 +28,7 @@ use Symfony\Component\Routing\Annotation\Route;
  */
 class FindCallerController
 {
-    public function __construct(private PhonenumberHelper $phonenumberHelper, private PersonRepository $personRepository, private PersonRenderInterface $personRender) {}
+    public function __construct(private readonly PhonenumberHelper $phonenumberHelper, private readonly PersonRepository $personRepository, private readonly PersonRenderInterface $personRender) {}
 
     #[Route('/public/api/1.0/ticket/find-caller', name: 'find-caller', methods: ['GET'])]
     public function findCaller(Request $request): Response
diff --git a/src/Bundle/ChillTicketBundle/src/Controller/TicketControllerApi.php b/src/Bundle/ChillTicketBundle/src/Controller/TicketControllerApi.php
new file mode 100644
index 000000000..36cde311a
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Controller/TicketControllerApi.php
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Controller;
+
+use Chill\TicketBundle\Entity\Ticket;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Serializer\SerializerInterface;
+
+class TicketControllerApi
+{
+    public function __construct(private readonly SerializerInterface $serializer) {}
+
+    #[Route('/api/1.0/ticket/ticket/{id}', methods: ['GET'])]
+    public function get(Ticket $ticket): JsonResponse
+    {
+        return new JsonResponse(
+            $this->serializer->serialize($ticket, 'json', ['groups' => ['read']]),
+            json: true
+        );
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Controller/TicketListController.php b/src/Bundle/ChillTicketBundle/src/Controller/TicketListController.php
index ab335f108..f15329689 100644
--- a/src/Bundle/ChillTicketBundle/src/Controller/TicketListController.php
+++ b/src/Bundle/ChillTicketBundle/src/Controller/TicketListController.php
@@ -67,7 +67,7 @@ final readonly class TicketListController
         // $motives = $this->motiveRepository->findAll();
 
         return $this->filterOrderHelperFactory
-            ->create(__CLASS__)
+            ->create(self::class)
             ->addSingleCheckbox('to_me', 'chill_ticket.list.filter.to_me')
             ->addSingleCheckbox('in_alert', 'chill_ticket.list.filter.in_alert')
             ->addDateRange('created_between', 'chill_ticket.list.filter.created_between')
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
index 88047673d..3615887f7 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
@@ -3,8 +3,8 @@ import {
     TranslatableString,
     User,
     UserGroupOrUser,
-} from "../../../../ChillMainBundle/Resources/public/types";
-import { Person } from "../../../../ChillPersonBundle/Resources/public/types";
+} from "ChillMainAssets/types";
+import { Person } from "ChillPersonAssets/types";
 
 export interface Motive {
     type: "ticket_motive";
@@ -13,6 +13,8 @@ export interface Motive {
     label: TranslatableString;
 }
 
+export type TicketState = "open"|"closed";
+
 interface TicketHistory<T extends string, D extends object> {
     event_type: T;
     at: DateTime;
@@ -72,6 +74,10 @@ export interface PersonsState {
     persons: Person[];
 }
 
+export interface StateChange {
+    new_state: TicketState
+}
+
 export interface CreateTicketState {}
 
 //interface AddPersonEvent extends TicketHistory<"add_person", PersonHistory> {};
@@ -87,6 +93,8 @@ export interface CreateTicketEvent
     extends TicketHistory<"create_ticket", CreateTicketState> {}
 export interface PersonStateEvent
     extends TicketHistory<"persons_state", PersonsState> {}
+export interface ChangeStateEvent
+    extends TicketHistory<"state_change", StateChange> {}
 
 export type TicketHistoryLine =
     /* AddPersonEvent */
@@ -94,7 +102,8 @@ export type TicketHistoryLine =
     | AddCommentEvent
     | SetMotiveEvent /*AddAddressee | RemoveAddressee | */
     | AddresseesStateEvent
-    | PersonStateEvent;
+    | PersonStateEvent
+    | ChangeStateEvent;
 
 export interface Ticket {
     type: "ticket_ticket";
@@ -106,6 +115,7 @@ export interface Ticket {
     history: TicketHistoryLine[];
     createdAt: DateTime | null;
     updatedBy: User | null;
+    currentState: TicketState | null;
 }
 
 export interface addNewPersons {
diff --git a/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php b/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
index 2b255f207..36e68fae9 100644
--- a/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
+++ b/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
@@ -18,6 +18,7 @@ use Chill\TicketBundle\Entity\AddresseeHistory;
 use Chill\TicketBundle\Entity\Comment;
 use Chill\TicketBundle\Entity\MotiveHistory;
 use Chill\TicketBundle\Entity\PersonHistory;
+use Chill\TicketBundle\Entity\StateHistory;
 use Chill\TicketBundle\Entity\Ticket;
 use Symfony\Component\Serializer\Exception\UnexpectedValueException;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
@@ -49,6 +50,7 @@ final class TicketNormalizer implements NormalizerInterface, NormalizerAwareInte
             'updatedAt' => $this->normalizer->normalize($object->getUpdatedAt(), $format, $context),
             'updatedBy' => $this->normalizer->normalize($object->getUpdatedBy(), $format, $context),
             'createdBy' => $this->normalizer->normalize($object->getCreatedBy(), $format, $context),
+            'currentState' => $object->getState()?->value,
         ];
     }
 
@@ -60,6 +62,17 @@ final class TicketNormalizer implements NormalizerInterface, NormalizerAwareInte
     private function serializeHistory(Ticket $ticket, string $format, array $context): array
     {
         $events = [
+            ...array_map(
+                fn (StateHistory $stateHistory) => [
+                    'event_type' => 'state_change',
+                    'at' => $stateHistory->getStartDate(),
+                    'by' => $stateHistory->getCreatedBy(),
+                    'data' => [
+                        'new_state' => $stateHistory->getState()->value,
+                    ],
+                ],
+                $ticket->getStateHistories()->toArray(),
+            ),
             ...array_map(
                 fn (MotiveHistory $motiveHistory) => [
                     'event_type' => 'set_motive',
@@ -87,26 +100,6 @@ final class TicketNormalizer implements NormalizerInterface, NormalizerAwareInte
                 ],
                 $ticket->getComments()->toArray(),
             ),
-            /*
-            ...array_map(
-                fn (AddresseeHistory $history) => [
-                    'event_type' => 'add_addressee',
-                    'at' => $history->getStartDate(),
-                    'by' => $history->getCreatedBy(),
-                    'data' => $history,
-                ],
-                $ticket->getAddresseeHistories()->toArray(),
-            ),
-            ...array_map(
-                fn (AddresseeHistory $history) => [
-                    'event_type' => 'remove_addressee',
-                    'at' => $history->getStartDate(),
-                    'by' => $history->getRemovedBy(),
-                    'data' => $history,
-                ],
-                $ticket->getAddresseeHistories()->filter(fn (AddresseeHistory $history) => null !== $history->getEndDate())->toArray()
-            ),
-            */
             ...$this->addresseesStates($ticket),
             ...$this->personStates($ticket),
         ];
@@ -115,7 +108,8 @@ final class TicketNormalizer implements NormalizerInterface, NormalizerAwareInte
             $events[] =
                 [
                     'event_type' => 'create_ticket',
-                    'at' => $ticket->getCreatedAt()->sub(new \DateInterval('PT1S')), // TODO hack to avoid collision with creation of the ticket event,
+                    'at' => \DateTimeImmutable::createFromInterface($ticket->getCreatedAt())
+                        ->sub(new \DateInterval('PT1S')), // TODO hack to avoid collision with creation of the ticket event,
                     'by' => $ticket->getCreatedBy(),
                     'data' => [],
                 ];
@@ -123,9 +117,7 @@ final class TicketNormalizer implements NormalizerInterface, NormalizerAwareInte
 
         usort(
             $events,
-            static function (array $a, array $b): int {
-                return $a['at'] <=> $b['at'];
-            }
+            static fn (array $a, array $b): int => $a['at'] <=> $b['at']
         );
 
         return array_map(
diff --git a/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/ChangeStateCommandHandlerTest.php b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/ChangeStateCommandHandlerTest.php
new file mode 100644
index 000000000..a19c89479
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/ChangeStateCommandHandlerTest.php
@@ -0,0 +1,118 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Tests\Action\Ticket\Handler;
+
+use Chill\TicketBundle\Action\Ticket\ChangeStateCommand;
+use Chill\TicketBundle\Action\Ticket\Handler\ChangeStateCommandHandler;
+use Chill\TicketBundle\Entity\StateEnum;
+use Chill\TicketBundle\Entity\StateHistory;
+use Chill\TicketBundle\Entity\Ticket;
+use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Component\Clock\MockClock;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+final class ChangeStateCommandHandlerTest extends TestCase
+{
+    use ProphecyTrait;
+
+    public function testInvokeWithAlreadyClosedTicket(): void
+    {
+        $ticket = new Ticket();
+
+        // Create a closed state history
+        new StateHistory(StateEnum::CLOSED, $ticket);
+
+        $handler = new ChangeStateCommandHandler(new MockClock());
+        $command = new ChangeStateCommand(StateEnum::CLOSED);
+
+        $result = $handler->__invoke($ticket, $command);
+
+        // Assert that the ticket is returned unchanged
+        $this->assertSame($ticket, $result);
+        $this->assertSame(StateEnum::CLOSED, $ticket->getState());
+
+        // Assert that no new state history was created
+        $stateHistories = $ticket->getStateHistories();
+        $this->assertCount(1, $stateHistories);
+    }
+
+    public function testInvokeWithOpenTicketToClose(): void
+    {
+        $ticket = new Ticket();
+
+        // Create an open state history
+        new StateHistory(StateEnum::OPEN, $ticket);
+
+        $handler = new ChangeStateCommandHandler(new MockClock());
+        $command = new ChangeStateCommand(StateEnum::CLOSED);
+
+        $result = $handler->__invoke($ticket, $command);
+
+        // Assert that the ticket is returned
+        $this->assertSame($ticket, $result);
+
+        // Assert that the ticket state is now closed
+        $this->assertSame(StateEnum::CLOSED, $ticket->getState());
+
+        // Assert that the old state history was ended and a new one was created
+        $stateHistories = $ticket->getStateHistories();
+        $this->assertCount(2, $stateHistories);
+
+        // The first state history should be ended
+        $openStateHistory = $stateHistories->first();
+        $this->assertNotNull($openStateHistory->getEndDate());
+        $this->assertSame(StateEnum::OPEN, $openStateHistory->getState());
+
+        // The last state history should be closed and active
+        $closedStateHistory = $stateHistories->last();
+        $this->assertNull($closedStateHistory->getEndDate());
+        $this->assertSame(StateEnum::CLOSED, $closedStateHistory->getState());
+    }
+
+    public function testInvokeWithClosedTicketToOpen(): void
+    {
+        $ticket = new Ticket();
+
+        // Create a closed state history
+        new StateHistory(StateEnum::CLOSED, $ticket);
+
+        $handler = new ChangeStateCommandHandler(new MockClock());
+        $command = new ChangeStateCommand(StateEnum::OPEN);
+
+        $result = $handler->__invoke($ticket, $command);
+
+        // Assert that the ticket is returned
+        $this->assertSame($ticket, $result);
+
+        // Assert that the ticket state is now open
+        $this->assertSame(StateEnum::OPEN, $ticket->getState());
+
+        // Assert that the old state history was ended and a new one was created
+        $stateHistories = $ticket->getStateHistories();
+        $this->assertCount(2, $stateHistories);
+
+        // The first state history should be ended
+        $closedStateHistory = $stateHistories->first();
+        $this->assertNotNull($closedStateHistory->getEndDate());
+        $this->assertSame(StateEnum::CLOSED, $closedStateHistory->getState());
+
+        // The last state history should be open and active
+        $openStateHistory = $stateHistories->last();
+        $this->assertNull($openStateHistory->getEndDate());
+        $this->assertSame(StateEnum::OPEN, $openStateHistory->getState());
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/CreateTicketCommandHandlerTest.php b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/CreateTicketCommandHandlerTest.php
index 73f84b171..5d4e11566 100644
--- a/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/CreateTicketCommandHandlerTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/CreateTicketCommandHandlerTest.php
@@ -13,8 +13,10 @@ namespace Chill\TicketBundle\Tests\Action\Ticket\Handler;
 
 use Chill\TicketBundle\Action\Ticket\CreateTicketCommand;
 use Chill\TicketBundle\Action\Ticket\Handler\CreateTicketCommandHandler;
+use Chill\TicketBundle\Entity\StateEnum;
 use Chill\TicketBundle\Entity\Ticket;
 use PHPUnit\Framework\TestCase;
+use Symfony\Component\Clock\MockClock;
 
 /**
  * @internal
@@ -25,7 +27,7 @@ class CreateTicketCommandHandlerTest extends TestCase
 {
     private function getHandler(): CreateTicketCommandHandler
     {
-        return new CreateTicketCommandHandler();
+        return new CreateTicketCommandHandler(new MockClock());
     }
 
     public function testHandleWithoutReference(): void
@@ -35,6 +37,7 @@ class CreateTicketCommandHandlerTest extends TestCase
 
         self::assertInstanceOf(Ticket::class, $actual);
         self::assertEquals('', $actual->getExternalRef());
+        self::assertEquals(StateEnum::OPEN, $actual->getState());
     }
 
     public function testHandleWithReference(): void
@@ -44,5 +47,6 @@ class CreateTicketCommandHandlerTest extends TestCase
 
         self::assertInstanceOf(Ticket::class, $actual);
         self::assertEquals($ref, $actual->getExternalRef());
+        self::assertEquals(StateEnum::OPEN, $actual->getState());
     }
 }
diff --git a/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/SetAddressesCommandHandlerTest.php b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/SetAddressesCommandHandlerTest.php
index cef1ae153..3fc45db8a 100644
--- a/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/SetAddressesCommandHandlerTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/SetAddressesCommandHandlerTest.php
@@ -39,12 +39,8 @@ final class SetAddressesCommandHandlerTest extends TestCase
         $command = new SetAddresseesCommand([$user1 = new User(), $group1 = new UserGroup()]);
 
         $entityManager = $this->prophesize(EntityManagerInterface::class);
-        $entityManager->persist(Argument::that(function ($arg) use ($user1) {
-            return $arg instanceof AddresseeHistory && $arg->getAddressee() === $user1;
-        }))->shouldBeCalledOnce();
-        $entityManager->persist(Argument::that(function ($arg) use ($group1) {
-            return $arg instanceof AddresseeHistory && $arg->getAddressee() === $group1;
-        }))->shouldBeCalledOnce();
+        $entityManager->persist(Argument::that(fn ($arg) => $arg instanceof AddresseeHistory && $arg->getAddressee() === $user1))->shouldBeCalledOnce();
+        $entityManager->persist(Argument::that(fn ($arg) => $arg instanceof AddresseeHistory && $arg->getAddressee() === $group1))->shouldBeCalledOnce();
 
         $handler = $this->buildHandler($entityManager->reveal());
 
@@ -61,9 +57,7 @@ final class SetAddressesCommandHandlerTest extends TestCase
         $command = new SetAddresseesCommand([$user]);
 
         $entityManager = $this->prophesize(EntityManagerInterface::class);
-        $entityManager->persist(Argument::that(function ($arg) use ($user) {
-            return $arg instanceof AddresseeHistory && $arg->getAddressee() === $user;
-        }))->shouldNotBeCalled();
+        $entityManager->persist(Argument::that(fn ($arg) => $arg instanceof AddresseeHistory && $arg->getAddressee() === $user))->shouldNotBeCalled();
 
         $handler = $this->buildHandler($entityManager->reveal());
 
@@ -82,9 +76,7 @@ final class SetAddressesCommandHandlerTest extends TestCase
         $command = new SetAddresseesCommand([$group]);
 
         $entityManager = $this->prophesize(EntityManagerInterface::class);
-        $entityManager->persist(Argument::that(function ($arg) use ($group) {
-            return $arg instanceof AddresseeHistory && $arg->getAddressee() === $group;
-        }))->shouldBeCalled();
+        $entityManager->persist(Argument::that(fn ($arg) => $arg instanceof AddresseeHistory && $arg->getAddressee() === $group))->shouldBeCalled();
 
         $handler = $this->buildHandler($entityManager->reveal());
 
@@ -101,9 +93,7 @@ final class SetAddressesCommandHandlerTest extends TestCase
         $command = new SetAddresseesCommand([$group, $group]);
 
         $entityManager = $this->prophesize(EntityManagerInterface::class);
-        $entityManager->persist(Argument::that(function ($arg) use ($group) {
-            return $arg instanceof AddresseeHistory && $arg->getAddressee() === $group;
-        }))->shouldBeCalledOnce();
+        $entityManager->persist(Argument::that(fn ($arg) => $arg instanceof AddresseeHistory && $arg->getAddressee() === $group))->shouldBeCalledOnce();
 
         $handler = $this->buildHandler($entityManager->reveal());
 
diff --git a/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/SetPersonsCommandHandlerTest.php b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/SetPersonsCommandHandlerTest.php
index 3db50e7e6..5c609b543 100644
--- a/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/SetPersonsCommandHandlerTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/SetPersonsCommandHandlerTest.php
@@ -39,12 +39,8 @@ final class SetPersonsCommandHandlerTest extends TestCase
         $command = new SetPersonsCommand([$person1 = new Person(), $group1 = new Person()]);
 
         $entityManager = $this->prophesize(EntityManagerInterface::class);
-        $entityManager->persist(Argument::that(function ($arg) use ($person1) {
-            return $arg instanceof PersonHistory && $arg->getPerson() === $person1;
-        }))->shouldBeCalledOnce();
-        $entityManager->persist(Argument::that(function ($arg) use ($group1) {
-            return $arg instanceof PersonHistory && $arg->getPerson() === $group1;
-        }))->shouldBeCalledOnce();
+        $entityManager->persist(Argument::that(fn ($arg) => $arg instanceof PersonHistory && $arg->getPerson() === $person1))->shouldBeCalledOnce();
+        $entityManager->persist(Argument::that(fn ($arg) => $arg instanceof PersonHistory && $arg->getPerson() === $group1))->shouldBeCalledOnce();
 
         $handler = $this->buildHandler($entityManager->reveal());
 
@@ -61,9 +57,7 @@ final class SetPersonsCommandHandlerTest extends TestCase
         $command = new SetPersonsCommand([$person]);
 
         $entityManager = $this->prophesize(EntityManagerInterface::class);
-        $entityManager->persist(Argument::that(function ($arg) use ($person) {
-            return $arg instanceof PersonHistory && $arg->getPerson() === $person;
-        }))->shouldNotBeCalled();
+        $entityManager->persist(Argument::that(fn ($arg) => $arg instanceof PersonHistory && $arg->getPerson() === $person))->shouldNotBeCalled();
 
         $handler = $this->buildHandler($entityManager->reveal());
 
@@ -82,9 +76,7 @@ final class SetPersonsCommandHandlerTest extends TestCase
         $command = new SetPersonsCommand([$person2]);
 
         $entityManager = $this->prophesize(EntityManagerInterface::class);
-        $entityManager->persist(Argument::that(function ($arg) use ($person2) {
-            return $arg instanceof PersonHistory && $arg->getPerson() === $person2;
-        }))->shouldBeCalled();
+        $entityManager->persist(Argument::that(fn ($arg) => $arg instanceof PersonHistory && $arg->getPerson() === $person2))->shouldBeCalled();
 
         $handler = $this->buildHandler($entityManager->reveal());
 
@@ -101,9 +93,7 @@ final class SetPersonsCommandHandlerTest extends TestCase
         $command = new SetPersonsCommand([$person, $person]);
 
         $entityManager = $this->prophesize(EntityManagerInterface::class);
-        $entityManager->persist(Argument::that(function ($arg) use ($person) {
-            return $arg instanceof PersonHistory && $arg->getPerson() === $person;
-        }))->shouldBeCalledOnce();
+        $entityManager->persist(Argument::that(fn ($arg) => $arg instanceof PersonHistory && $arg->getPerson() === $person))->shouldBeCalledOnce();
 
         $handler = $this->buildHandler($entityManager->reveal());
 
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/ChangeStateApiControllerTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/ChangeStateApiControllerTest.php
new file mode 100644
index 000000000..ab8c2b3cb
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/ChangeStateApiControllerTest.php
@@ -0,0 +1,144 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Tests\Controller;
+
+use Chill\TicketBundle\Action\Ticket\ChangeStateCommand;
+use Chill\TicketBundle\Action\Ticket\Handler\ChangeStateCommandHandler;
+use Chill\TicketBundle\Controller\ChangeStateApiController;
+use Chill\TicketBundle\Entity\StateEnum;
+use Chill\TicketBundle\Entity\Ticket;
+use Doctrine\ORM\EntityManagerInterface;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\SerializerInterface;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+final class ChangeStateApiControllerTest extends TestCase
+{
+    use ProphecyTrait;
+
+    public function testCloseWithoutPermission(): void
+    {
+        $ticket = new Ticket();
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(false);
+
+        $changeStateCommandHandler = $this->prophesize(ChangeStateCommandHandler::class);
+        $entityManager = $this->prophesize(EntityManagerInterface::class);
+        $serializer = $this->prophesize(SerializerInterface::class);
+
+        $controller = new ChangeStateApiController(
+            $changeStateCommandHandler->reveal(),
+            $security->reveal(),
+            $entityManager->reveal(),
+            $serializer->reveal(),
+        );
+
+        $this->expectException(AccessDeniedHttpException::class);
+        $controller->close($ticket);
+    }
+
+    public function testCloseWithPermission(): void
+    {
+        $ticket = new Ticket();
+
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $changeStateCommandHandler = $this->prophesize(ChangeStateCommandHandler::class);
+        $changeStateCommandHandler->__invoke(
+            $ticket,
+            Argument::that(fn (ChangeStateCommand $command) => StateEnum::CLOSED === $command->newState)
+        )->willReturn($ticket);
+
+        $entityManager = $this->prophesize(EntityManagerInterface::class);
+        $entityManager->flush()->shouldBeCalled();
+
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $serializer->serialize($ticket, 'json', ['groups' => ['read']])
+            ->willReturn('{}')
+            ->shouldBeCalled();
+
+        $controller = new ChangeStateApiController(
+            $changeStateCommandHandler->reveal(),
+            $security->reveal(),
+            $entityManager->reveal(),
+            $serializer->reveal(),
+        );
+
+        $response = $controller->close($ticket);
+
+        $this->assertInstanceOf(JsonResponse::class, $response);
+    }
+
+    public function testOpenWithoutPermission(): void
+    {
+        $ticket = new Ticket();
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(false);
+
+        $changeStateCommandHandler = $this->prophesize(ChangeStateCommandHandler::class);
+        $entityManager = $this->prophesize(EntityManagerInterface::class);
+        $serializer = $this->prophesize(SerializerInterface::class);
+
+        $controller = new ChangeStateApiController(
+            $changeStateCommandHandler->reveal(),
+            $security->reveal(),
+            $entityManager->reveal(),
+            $serializer->reveal(),
+        );
+
+        $this->expectException(AccessDeniedHttpException::class);
+        $controller->open($ticket);
+    }
+
+    public function testOpenWithPermission(): void
+    {
+        $ticket = new Ticket();
+
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $changeStateCommandHandler = $this->prophesize(ChangeStateCommandHandler::class);
+        $changeStateCommandHandler->__invoke(
+            $ticket,
+            Argument::that(fn (ChangeStateCommand $command) => StateEnum::OPEN === $command->newState)
+        )->willReturn($ticket);
+
+        $entityManager = $this->prophesize(EntityManagerInterface::class);
+        $entityManager->flush()->shouldBeCalled();
+
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $serializer->serialize($ticket, 'json', ['groups' => ['read']])
+            ->willReturn('{}')
+            ->shouldBeCalled();
+
+        $controller = new ChangeStateApiController(
+            $changeStateCommandHandler->reveal(),
+            $security->reveal(),
+            $entityManager->reveal(),
+            $serializer->reveal(),
+        );
+
+        $response = $controller->open($ticket);
+
+        $this->assertInstanceOf(JsonResponse::class, $response);
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/SetAddresseesControllerTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/SetAddresseesControllerTest.php
index 1455f711f..5ff4bfd77 100644
--- a/src/Bundle/ChillTicketBundle/tests/Controller/SetAddresseesControllerTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/SetAddresseesControllerTest.php
@@ -81,7 +81,7 @@ class SetAddresseesControllerTest extends KernelTestCase
 
         $asArray = json_decode($response->getContent(), true, 512, JSON_THROW_ON_ERROR);
         self::assertIsArray($asArray);
-        self::arrayHasKey('violations', $asArray);
+        self::arrayHasKey('violations');
         self::assertGreaterThan(0, count($asArray['violations']));
     }
 
@@ -147,7 +147,7 @@ class SetAddresseesControllerTest extends KernelTestCase
 
         $asArray = json_decode($response->getContent(), true, 512, JSON_THROW_ON_ERROR);
         self::assertIsArray($asArray);
-        self::arrayHasKey('violations', $asArray);
+        self::arrayHasKey('violations');
         self::assertGreaterThan(0, count($asArray['violations']));
     }
 
diff --git a/src/Bundle/ChillTicketBundle/tests/Entity/TicketTest.php b/src/Bundle/ChillTicketBundle/tests/Entity/TicketTest.php
index 6ce8b53ea..5776b3a00 100644
--- a/src/Bundle/ChillTicketBundle/tests/Entity/TicketTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Entity/TicketTest.php
@@ -114,25 +114,23 @@ class TicketTest extends KernelTestCase
     public function testGetState(): void
     {
         $ticket = new Ticket();
-        $openState = new StateEnum(StateEnum::OPEN, ['en' => 'Open', 'fr' => 'Ouvert']);
 
         // Initially, the ticket has no state
         self::assertNull($ticket->getState());
 
         // Create a state history entry with the open state
-        $history = new StateHistory($openState, $ticket);
+        $history = new StateHistory(StateEnum::OPEN, $ticket);
 
         // Verify that the ticket now has the open state
-        self::assertSame($openState, $ticket->getState());
+        self::assertSame(StateEnum::OPEN, $ticket->getState());
         self::assertCount(1, $ticket->getStateHistories());
 
         // Change the state to closed
-        $closedState = new StateEnum(StateEnum::CLOSED, ['en' => 'Closed', 'fr' => 'Fermé']);
         $history->setEndDate(new \DateTimeImmutable());
-        $history2 = new StateHistory($closedState, $ticket);
+        $history2 = new StateHistory(StateEnum::CLOSED, $ticket);
 
         // Verify that the ticket now has the closed state
         self::assertCount(2, $ticket->getStateHistories());
-        self::assertSame($closedState, $ticket->getState());
+        self::assertSame(StateEnum::CLOSED, $ticket->getState());
     }
 }
diff --git a/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/TicketNormalizerTest.php b/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/TicketNormalizerTest.php
index 035ce95a6..940c93d97 100644
--- a/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/TicketNormalizerTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/TicketNormalizerTest.php
@@ -19,6 +19,8 @@ use Chill\TicketBundle\Entity\Comment;
 use Chill\TicketBundle\Entity\Motive;
 use Chill\TicketBundle\Entity\MotiveHistory;
 use Chill\TicketBundle\Entity\PersonHistory;
+use Chill\TicketBundle\Entity\StateEnum;
+use Chill\TicketBundle\Entity\StateHistory;
 use Chill\TicketBundle\Entity\Ticket;
 use Chill\TicketBundle\Serializer\Normalizer\TicketNormalizer;
 use Prophecy\Argument;
@@ -41,7 +43,6 @@ class TicketNormalizerTest extends KernelTestCase
     public function testNormalize(Ticket $ticket, array $expected): void
     {
         $actual = $this->buildNormalizer()->normalize($ticket, 'json', ['groups' => 'read']);
-
         self::assertEqualsCanonicalizing(array_keys($expected), array_keys($actual));
 
         foreach (array_keys($expected) as $k) {
@@ -61,23 +62,67 @@ class TicketNormalizerTest extends KernelTestCase
 
     public static function provideTickets(): iterable
     {
+        $t = new Ticket();
+
+        // added by action
+        new StateHistory(StateEnum::OPEN, $t, new \DateTimeImmutable('2024-06-16T00:00:00Z'));
+
+        // those are added by doctrine listeners
+        $t->setCreatedAt(new \DateTimeImmutable('2024-06-16T00:00:00Z'));
+        $t->setCreatedBy(new User());
+        $t->setUpdatedAt(new \DateTimeImmutable('2024-06-16T00:00:00Z'));
+        $t->setUpdatedBy(new User());
+
         yield [
             // this a nearly empty ticket
-            new Ticket(),
+            $t,
             [
                 'type' => 'ticket_ticket',
+                'createdAt' => $t->getCreatedAt()?->getTimestamp(),
+                'createdBy' => ['user'],
                 'id' => null,
                 'externalRef' => '',
                 'currentPersons' => [],
                 'currentAddressees' => [],
                 'currentInputs' => [],
                 'currentMotive' => null,
-                'history' => [],
+                'history' => [
+                    [
+                        'event_type' => 'create_ticket',
+                        'at' => 1718495999,
+                        'by' => [
+                            0 => 'user',
+                        ],
+                        'data' => [],
+                    ],
+                    [
+                        'event_type' => 'state_change',
+                        'at' => 1718495999,
+                        'by' => [
+                            0 => 'user',
+                        ],
+                        'data' => [
+                            'new_state' => 'open',
+                        ],
+                    ],
+                ],
+                'currentState' => 'open',
+                'updatedAt' => $t->getUpdatedAt()->getTimestamp(),
+                'updatedBy' => ['user'],
             ],
         ];
 
         // ticket with more features
         $ticket = new Ticket();
+
+        // added by action
+        new StateHistory(StateEnum::OPEN, $ticket, new \DateTimeImmutable('2024-06-16T00:00:00Z'));
+
+        // those are added by doctrine listeners
+        $ticket->setCreatedAt(new \DateTimeImmutable('2024-06-16T00:00:00Z'));
+        $ticket->setCreatedBy(new User());
+        $ticket->setUpdatedAt(new \DateTimeImmutable('2024-06-16T00:00:00Z'));
+        $ticket->setUpdatedBy(new User());
         $ticket->setExternalRef('2134');
         $personHistory = new PersonHistory(new Person(), $ticket, new \DateTimeImmutable('2024-04-01T12:00:00'));
         $ticketHistory = new MotiveHistory(new Motive(), $ticket, new \DateTimeImmutable('2024-04-01T12:02:00'));
@@ -92,6 +137,8 @@ class TicketNormalizerTest extends KernelTestCase
             $ticket,
             [
                 'type' => 'ticket_ticket',
+                'createdAt' => $ticket->getCreatedAt()?->getTimestamp(),
+                'createdBy' => ['user'],
                 'id' => null,
                 'externalRef' => '2134',
                 'currentPersons' => ['embedded'],
@@ -100,12 +147,18 @@ class TicketNormalizerTest extends KernelTestCase
                 'currentMotive' => ['type' => 'motive', 'id' => 0],
                 'history' => [
                     ['event_type' => 'add_person'],
+                    ['event_type' => 'persons_state'],
                     ['event_type' => 'set_motive'],
                     ['event_type' => 'add_comment'],
-                    ['event_type' => 'add_addressee'],
-                    ['event_type' => 'remove_addressee'],
-                    ['event_type' => 'add_addressee'],
+                    ['event_type' => 'addressees_state'],
+                    ['event_type' => 'addressees_state'],
+                    ['event_type' => 'addressees_state'],
+                    ['event_type' => 'create_ticket'],
+                    ['event_type' => 'state_change'],
                 ],
+                'currentState' => 'open',
+                'updatedAt' => $ticket->getUpdatedAt()->getTimestamp(),
+                'updatedBy' => ['user'],
             ],
         ];
     }
@@ -126,9 +179,7 @@ class TicketNormalizerTest extends KernelTestCase
             Argument::that(fn ($arg) => is_array($arg) && 0 < count($arg) && is_object($arg[0])),
             'json',
             Argument::type('array')
-        )->will(function ($args) {
-            return array_fill(0, count($args[0]), 'embedded');
-        });
+        )->will(fn ($args) => array_fill(0, count($args[0]), 'embedded'));
 
         // array of event type
         $normalizer->normalize(
@@ -144,10 +195,28 @@ class TicketNormalizerTest extends KernelTestCase
 
             return $events;
         });
+        // array of persons
+        $normalizer->normalize(
+            Argument::that(fn ($arg) => is_array($arg) && 1 === count($arg) && array_key_exists('persons', $arg)),
+            'json',
+            ['groups' => 'read']
+        )->will(fn ($args): array => ['persons' => []]);
+        // array of addresses
+        $normalizer->normalize(
+            Argument::that(fn ($arg) => is_array($arg) && 1 === count($arg) && array_key_exists('addressees', $arg)),
+            'json',
+            ['groups' => 'read']
+        )->will(fn ($args): array => ['addressees' => []]);
+        // state data
+        $normalizer->normalize(
+            Argument::that(fn ($arg) => is_array($arg) && 1 === count($arg) && array_key_exists('new_state', $arg)),
+            'json',
+            ['groups' => 'read']
+        )->will(fn ($args): array => $args[0]);
 
         // datetime
         $normalizer->normalize(Argument::type(\DateTimeImmutable::class), 'json', Argument::type('array'))
-            ->will(function ($args) { return $args[0]->getTimestamp(); });
+            ->will(fn ($args) => $args[0]->getTimestamp());
         // user
         $normalizer->normalize(Argument::type(User::class), 'json', Argument::type('array'))
             ->willReturn(['user']);

From 0a331aab37e1144d80b2294341c424d9931b5012 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 24 Jun 2025 10:42:51 +0000
Subject: [PATCH 124/283] Record that a ticket can be in emergency, or not

---
 .junie/guidelines.md                          |  32 +++-
 .../ChillTicketBundle/chill.api.specs.yaml    |  33 ++++
 .../Ticket/ChangeEmergencyStateCommand.php    |  24 +++
 .../ChangeEmergencyStateCommandHandler.php    |  49 ++++++
 .../Handler/CreateTicketCommandHandler.php    |   4 +
 .../Handler/ReplaceMotiveCommandHandler.php   |   8 +
 .../ChangeEmergencyStateApiController.php     |  73 +++++++++
 .../src/Entity/EmergencyStatusEnum.php        |  21 +++
 .../src/Entity/EmergencyStatusHistory.php     |  85 +++++++++++
 .../ChillTicketBundle/src/Entity/Motive.php   |  19 +++
 .../ChillTicketBundle/src/Entity/Ticket.php   |  34 +++++
 .../src/Resources/public/types.ts             |   3 +
 .../Normalizer/TicketNormalizer.php           |  15 +-
 .../src/migrations/Version20250620145414.php  |  82 ++++++++++
 .../src/migrations/Version20250620164517.php  |  37 +++++
 ...ChangeEmergencyStateCommandHandlerTest.php | 118 ++++++++++++++
 .../CreateTicketCommandHandlerTest.php        |   3 +
 .../ReplaceMotiveCommandHandlerTest.php       |  75 ++++++++-
 .../ChangeEmergencyStateApiControllerTest.php | 144 ++++++++++++++++++
 .../ReplaceMotiveControllerTest.php           |   6 +-
 .../tests/Entity/TicketTest.php               |  25 +++
 .../Normalizer/TicketNormalizerTest.php       |  11 ++
 22 files changed, 896 insertions(+), 5 deletions(-)
 create mode 100644 src/Bundle/ChillTicketBundle/src/Action/Ticket/ChangeEmergencyStateCommand.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/ChangeEmergencyStateCommandHandler.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Controller/ChangeEmergencyStateApiController.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Entity/EmergencyStatusEnum.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Entity/EmergencyStatusHistory.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/migrations/Version20250620145414.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/migrations/Version20250620164517.php
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/ChangeEmergencyStateCommandHandlerTest.php
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Controller/ChangeEmergencyStateApiControllerTest.php

diff --git a/.junie/guidelines.md b/.junie/guidelines.md
index 899c890b1..eace2f4fa 100644
--- a/.junie/guidelines.md
+++ b/.junie/guidelines.md
@@ -22,7 +22,7 @@ Chill is a comprehensive web application built as a set of Symfony bundles. It i
 - **Backend**: PHP 8.3+, Symfony 5.4
 - **Frontend**: JavaScript/TypeScript, Vue.js 3, Bootstrap 5
 - **Build Tools**: Webpack Encore, Yarn
-- **Database**: PostgreSQL with materialized views
+- **Database**: PostgreSQL with materialized views. We do not support other databases.
 - **Other Services**: Redis, AMQP (RabbitMQ), SMTP
 
 ## Project Structure
@@ -149,7 +149,35 @@ Key configuration files:
 - `package.json`: JavaScript dependencies and scripts
 - `.env`: Default environment variables. Must usually not be updated: use `.env.local` instead.
 
-### Development guidelines
+### Database migrations
+
+Each time a doctrine entity is created, we generate migration to adapt the database.
+
+The migration are created using the command `symfony console doctrine:migrations:diff --no-interaction --namespace <namespace>`, where the namespace is the relevant namespace for migration. As this is a bash script, do not forget to quote the `\` (`\` must become `\\` in your command).
+
+Each bundle has his own namespace for migration (always ask me to confirm that command, with a list of updated / created entities so that I can confirm you that it is ok):
+
+- `Chill\Bundle\ActivityBundle` writes migrations to `Chill\Migrations\Activity`;
+- `Chill\Bundle\BudgetBundle` writes migrations to `Chill\Migrations\Budget`;
+- `Chill\Bundle\CustomFieldsBundle` writes migrations to `Chill\Migrations\CustomFields`;
+- `Chill\Bundle\DocGeneratorBundle` writes migrations to `Chill\Migrations\DocGenerator`;
+- `Chill\Bundle\DocStoreBundle` writes migrations to `Chill\Migrations\DocStore`;
+- `Chill\Bundle\EventBundle` writes migrations to `Chill\Migrations\Event`;
+- `Chill\Bundle\CalendarBundle` writes migrations to `Chill\Migrations\Calendar`;
+- `Chill\Bundle\FamilyMembersBundle` writes migrations to `Chill\Migrations\FamilyMembers`;
+- `Chill\Bundle\FranceTravailApiBundle` writes migrations to `Chill\Migrations\FranceTravailApi`;
+- `Chill\Bundle\JobBundle` writes migrations to `Chill\Migrations\Job`;
+- `Chill\Bundle\MainBundle` writes migrations to `Chill\Migrations\Main`;
+- `Chill\Bundle\PersonBundle` writes migrations to `Chill\Migrations\Person`;
+- `Chill\Bundle\ReportBundle` writes migrations to `Chill\Migrations\Report`;
+- `Chill\Bundle\TaskBundle` writes migrations to `Chill\Migrations\Task`;
+- `Chill\Bundle\ThirdPartyBundle` writes migrations to `Chill\Migrations\ThirdParty`;
+- `Chill\Bundle\TicketBundle` writes migrations to `Chill\Migrations\Ticket`;
+- `Chill\Bundle\WopiBundle` writes migrations to `Chill\Migrations\Wopi`;
+
+Once created the, comment's classes should be removed and a description of the changes made to the entities should be added to the migrations, using the `getDescription` method. The migration should not be cleaned by any artificial intelligence, as modifying this migration is error prone.
+
+### Guidelines related to code structure and requirements
 
 #### Usage of clock
 
diff --git a/src/Bundle/ChillTicketBundle/chill.api.specs.yaml b/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
index 3aac7f2ec..77bf2797d 100644
--- a/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
@@ -255,3 +255,36 @@ paths:
                     description: "OK"
                 401:
                     description: "UNAUTHORIZED"
+    /1.0/ticket/ticket/{id}/emergency/{emergency}:
+        post:
+            tags:
+                - ticket
+            summary: Set a ticket as emergency
+            description: |
+                Re-open an existing ticket.
+
+                If the ticket is already opened, no action will be performed on this ticket: his state will remains unchanged, and the
+                ticket will be returned.
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The ticket id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+                -   name: emergency
+                    in: path
+                    required: true
+                    description: the new state of emergency
+                    schema:
+                        type: string
+                        enum:
+                            - yes
+                            - no
+            responses:
+                200:
+                    description: "OK"
+                401:
+                    description: "UNAUTHORIZED"
diff --git a/src/Bundle/ChillTicketBundle/src/Action/Ticket/ChangeEmergencyStateCommand.php b/src/Bundle/ChillTicketBundle/src/Action/Ticket/ChangeEmergencyStateCommand.php
new file mode 100644
index 000000000..7a72b9910
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Action/Ticket/ChangeEmergencyStateCommand.php
@@ -0,0 +1,24 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Action\Ticket;
+
+use Chill\TicketBundle\Entity\EmergencyStatusEnum;
+
+/**
+ * Command to change the emergency status of a ticket.
+ */
+final readonly class ChangeEmergencyStateCommand
+{
+    public function __construct(
+        public EmergencyStatusEnum $newEmergencyStatus,
+    ) {}
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/ChangeEmergencyStateCommandHandler.php b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/ChangeEmergencyStateCommandHandler.php
new file mode 100644
index 000000000..2a5440916
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/ChangeEmergencyStateCommandHandler.php
@@ -0,0 +1,49 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Action\Ticket\Handler;
+
+use Chill\TicketBundle\Action\Ticket\ChangeEmergencyStateCommand;
+use Chill\TicketBundle\Entity\EmergencyStatusHistory;
+use Chill\TicketBundle\Entity\Ticket;
+use Symfony\Component\Clock\ClockInterface;
+
+/**
+ * Handler for changing the emergency status of a ticket.
+ */
+class ChangeEmergencyStateCommandHandler
+{
+    public function __construct(private readonly ClockInterface $clock) {}
+
+    public function __invoke(Ticket $ticket, ChangeEmergencyStateCommand $command): Ticket
+    {
+        // If the ticket is already in the requested emergency status, return it without changes
+        if ($command->newEmergencyStatus === $ticket->getEmergencyStatus()) {
+            return $ticket;
+        }
+
+        // End the current emergency status history (if any)
+        foreach ($ticket->getEmergencyStatusHistories() as $emergencyStatusHistory) {
+            if (null === $emergencyStatusHistory->getEndDate()) {
+                $emergencyStatusHistory->setEndDate($this->clock->now());
+            }
+        }
+
+        // Create a new emergency status history with the new status
+        new EmergencyStatusHistory(
+            $command->newEmergencyStatus,
+            $ticket,
+            $this->clock->now(),
+        );
+
+        return $ticket;
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/CreateTicketCommandHandler.php b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/CreateTicketCommandHandler.php
index c354294d0..c22f95ee9 100644
--- a/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/CreateTicketCommandHandler.php
+++ b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/CreateTicketCommandHandler.php
@@ -12,6 +12,8 @@ declare(strict_types=1);
 namespace Chill\TicketBundle\Action\Ticket\Handler;
 
 use Chill\TicketBundle\Action\Ticket\CreateTicketCommand;
+use Chill\TicketBundle\Entity\EmergencyStatusEnum;
+use Chill\TicketBundle\Entity\EmergencyStatusHistory;
 use Chill\TicketBundle\Entity\StateEnum;
 use Chill\TicketBundle\Entity\StateHistory;
 use Chill\TicketBundle\Entity\Ticket;
@@ -26,7 +28,9 @@ class CreateTicketCommandHandler
         $ticket = new Ticket();
         $ticket->setExternalRef($command->externalReference);
 
+        // initialize the first states
         new StateHistory(StateEnum::OPEN, $ticket, $this->clock->now());
+        new EmergencyStatusHistory(EmergencyStatusEnum::NO, $ticket, $this->clock->now());
 
         return $ticket;
     }
diff --git a/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/ReplaceMotiveCommandHandler.php b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/ReplaceMotiveCommandHandler.php
index 026ab377b..5ad6eed05 100644
--- a/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/ReplaceMotiveCommandHandler.php
+++ b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/ReplaceMotiveCommandHandler.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\TicketBundle\Action\Ticket\Handler;
 
+use Chill\TicketBundle\Action\Ticket\ChangeEmergencyStateCommand;
 use Chill\TicketBundle\Action\Ticket\ReplaceMotiveCommand;
 use Chill\TicketBundle\Entity\MotiveHistory;
 use Chill\TicketBundle\Entity\Ticket;
@@ -22,6 +23,7 @@ final readonly class ReplaceMotiveCommandHandler
     public function __construct(
         private ClockInterface $clock,
         private EntityManagerInterface $entityManager,
+        private ChangeEmergencyStateCommandHandler $changeEmergencyStateCommandHandler,
     ) {}
 
     public function handle(Ticket $ticket, ReplaceMotiveCommand $command): void
@@ -50,6 +52,12 @@ final readonly class ReplaceMotiveCommandHandler
         if ($readyToAdd) {
             $history = new MotiveHistory($command->motive, $ticket, $this->clock->now());
             $this->entityManager->persist($history);
+
+            // Check if the motive has makeTicketEmergency set and update the ticket's emergency status if needed
+            if ($command->motive->isMakeTicketEmergency()) {
+                $changeEmergencyCommand = new ChangeEmergencyStateCommand($command->motive->getMakeTicketEmergency());
+                ($this->changeEmergencyStateCommandHandler)($ticket, $changeEmergencyCommand);
+            }
         }
     }
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Controller/ChangeEmergencyStateApiController.php b/src/Bundle/ChillTicketBundle/src/Controller/ChangeEmergencyStateApiController.php
new file mode 100644
index 000000000..1ebc442d6
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Controller/ChangeEmergencyStateApiController.php
@@ -0,0 +1,73 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Controller;
+
+use Chill\TicketBundle\Action\Ticket\ChangeEmergencyStateCommand;
+use Chill\TicketBundle\Action\Ticket\Handler\ChangeEmergencyStateCommandHandler;
+use Chill\TicketBundle\Entity\EmergencyStatusEnum;
+use Chill\TicketBundle\Entity\Ticket;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\SerializerInterface;
+
+/**
+ * Controller for changing the emergency status of a ticket.
+ */
+final readonly class ChangeEmergencyStateApiController
+{
+    public function __construct(
+        private ChangeEmergencyStateCommandHandler $changeEmergencyStateCommandHandler,
+        private Security $security,
+        private EntityManagerInterface $entityManager,
+        private SerializerInterface $serializer,
+    ) {}
+
+    #[Route('/api/1.0/ticket/ticket/{id}/emergency/yes', name: 'chill_ticket_ticket_emergency_yes_api', requirements: ['id' => '\d+'], methods: ['POST'])]
+    public function setEmergencyYes(Ticket $ticket): Response
+    {
+        if (!$this->security->isGranted('ROLE_USER')) {
+            throw new AccessDeniedHttpException('Only users are allowed to set emergency status to YES.');
+        }
+
+        $command = new ChangeEmergencyStateCommand(EmergencyStatusEnum::YES);
+        $this->changeEmergencyStateCommandHandler->__invoke($ticket, $command);
+
+        $this->entityManager->flush();
+
+        return new JsonResponse(
+            $this->serializer->serialize($ticket, 'json', ['groups' => ['read']]),
+            json: true
+        );
+    }
+
+    #[Route('/api/1.0/ticket/ticket/{id}/emergency/no', name: 'chill_ticket_ticket_emergency_no_api', requirements: ['id' => '\d+'], methods: ['POST'])]
+    public function setEmergencyNo(Ticket $ticket): Response
+    {
+        if (!$this->security->isGranted('ROLE_USER')) {
+            throw new AccessDeniedHttpException('Only users are allowed to set emergency status to NO.');
+        }
+
+        $command = new ChangeEmergencyStateCommand(EmergencyStatusEnum::NO);
+        $this->changeEmergencyStateCommandHandler->__invoke($ticket, $command);
+
+        $this->entityManager->flush();
+
+        return new JsonResponse(
+            $this->serializer->serialize($ticket, 'json', ['groups' => ['read']]),
+            json: true
+        );
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Entity/EmergencyStatusEnum.php b/src/Bundle/ChillTicketBundle/src/Entity/EmergencyStatusEnum.php
new file mode 100644
index 000000000..aa070fbf5
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Entity/EmergencyStatusEnum.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Entity;
+
+/**
+ * Represents the emergency status of a ticket (yes or no).
+ */
+enum EmergencyStatusEnum: string
+{
+    case YES = 'yes';
+    case NO = 'no';
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Entity/EmergencyStatusHistory.php b/src/Bundle/ChillTicketBundle/src/Entity/EmergencyStatusHistory.php
new file mode 100644
index 000000000..74501be6f
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Entity/EmergencyStatusHistory.php
@@ -0,0 +1,85 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Entity;
+
+use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
+use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation as Serializer;
+
+/**
+ * Represents the history of an emergency status associated with a ticket.
+ *
+ * This entity is used to track the changes in a ticket's emergency status over time.
+ * Implements the TrackCreationInterface for tracking entity lifecycle creation.
+ */
+#[ORM\Entity]
+#[ORM\Table(name: 'emergency_status_history', schema: 'chill_ticket')]
+#[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['ticket_emergency_status_history' => EmergencyStatusHistory::class])]
+class EmergencyStatusHistory implements TrackCreationInterface
+{
+    use TrackCreationTrait;
+
+    #[ORM\Id]
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::INTEGER, nullable: false)]
+    #[ORM\GeneratedValue(strategy: 'AUTO')]
+    #[Serializer\Groups(['read'])]
+    private ?int $id = null;
+
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::DATETIME_IMMUTABLE, nullable: true, options: ['default' => null])]
+    #[Serializer\Groups(['read'])]
+    private ?\DateTimeImmutable $endDate = null;
+
+    public function __construct(
+        #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, nullable: false, enumType: EmergencyStatusEnum::class)]
+        #[Serializer\Groups(['read'])]
+        private EmergencyStatusEnum $emergencyStatus,
+        #[ORM\ManyToOne(targetEntity: Ticket::class)]
+        #[ORM\JoinColumn(nullable: false)]
+        private Ticket $ticket,
+        #[ORM\Column(type: \Doctrine\DBAL\Types\Types::DATETIME_IMMUTABLE, nullable: false)]
+        #[Serializer\Groups(['read'])]
+        private \DateTimeImmutable $startDate = new \DateTimeImmutable('now'),
+    ) {
+        $ticket->addEmergencyStatusHistory($this);
+    }
+
+    public function getEndDate(): ?\DateTimeImmutable
+    {
+        return $this->endDate;
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getEmergencyStatus(): EmergencyStatusEnum
+    {
+        return $this->emergencyStatus;
+    }
+
+    public function getStartDate(): \DateTimeImmutable
+    {
+        return $this->startDate;
+    }
+
+    public function getTicket(): Ticket
+    {
+        return $this->ticket;
+    }
+
+    public function setEndDate(?\DateTimeImmutable $endDate): void
+    {
+        $this->endDate = $endDate;
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Entity/Motive.php b/src/Bundle/ChillTicketBundle/src/Entity/Motive.php
index eceefdf46..8dadecde0 100644
--- a/src/Bundle/ChillTicketBundle/src/Entity/Motive.php
+++ b/src/Bundle/ChillTicketBundle/src/Entity/Motive.php
@@ -33,6 +33,10 @@ class Motive
     #[Serializer\Groups(['read'])]
     private bool $active = true;
 
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, nullable: true, enumType: EmergencyStatusEnum::class)]
+    #[Serializer\Groups(['read'])]
+    private ?EmergencyStatusEnum $makeTicketEmergency = null;
+
     public function isActive(): bool
     {
         return $this->active;
@@ -57,4 +61,19 @@ class Motive
     {
         $this->label = $label;
     }
+
+    public function getMakeTicketEmergency(): ?EmergencyStatusEnum
+    {
+        return $this->makeTicketEmergency;
+    }
+
+    public function setMakeTicketEmergency(?EmergencyStatusEnum $makeTicketEmergency): void
+    {
+        $this->makeTicketEmergency = $makeTicketEmergency;
+    }
+
+    public function isMakeTicketEmergency(): bool
+    {
+        return null !== $this->makeTicketEmergency;
+    }
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php b/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php
index 128c27502..8ef4f64a9 100644
--- a/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php
+++ b/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php
@@ -90,6 +90,12 @@ class Ticket implements TrackCreationInterface, TrackUpdateInterface
     #[ORM\OneToMany(targetEntity: StateHistory::class, mappedBy: 'ticket', cascade: ['persist', 'remove'])]
     private Collection $stateHistories;
 
+    /**
+     * @var Collection<int, EmergencyStatusHistory>
+     */
+    #[ORM\OneToMany(targetEntity: EmergencyStatusHistory::class, mappedBy: 'ticket', cascade: ['persist', 'remove'])]
+    private Collection $emergencyStatusHistories;
+
     public function __construct()
     {
         $this->addresseeHistory = new ArrayCollection();
@@ -98,6 +104,7 @@ class Ticket implements TrackCreationInterface, TrackUpdateInterface
         $this->personHistories = new ArrayCollection();
         $this->inputHistories = new ArrayCollection();
         $this->stateHistories = new ArrayCollection();
+        $this->emergencyStatusHistories = new ArrayCollection();
     }
 
     public function getId(): ?int
@@ -260,4 +267,31 @@ class Ticket implements TrackCreationInterface, TrackUpdateInterface
     {
         return $this->stateHistories;
     }
+
+    /**
+     * @internal use @see{EmergencyStatusHistory::__construct} instead
+     */
+    public function addEmergencyStatusHistory(EmergencyStatusHistory $emergencyStatusHistory): void
+    {
+        $this->emergencyStatusHistories->add($emergencyStatusHistory);
+    }
+
+    public function getEmergencyStatus(): ?EmergencyStatusEnum
+    {
+        foreach ($this->emergencyStatusHistories as $emergencyStatusHistory) {
+            if (null === $emergencyStatusHistory->getEndDate()) {
+                return $emergencyStatusHistory->getEmergencyStatus();
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * @return ReadableCollection<int, EmergencyStatusHistory>
+     */
+    public function getEmergencyStatusHistories(): ReadableCollection
+    {
+        return $this->emergencyStatusHistories;
+    }
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
index 3615887f7..5f35d9bfe 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
@@ -15,6 +15,8 @@ export interface Motive {
 
 export type TicketState = "open"|"closed";
 
+export type TicketEmergencyState = "yes"|"no";
+
 interface TicketHistory<T extends string, D extends object> {
     event_type: T;
     at: DateTime;
@@ -116,6 +118,7 @@ export interface Ticket {
     createdAt: DateTime | null;
     updatedBy: User | null;
     currentState: TicketState | null;
+    emergency: TicketEmergencyState | null;
 }
 
 export interface addNewPersons {
diff --git a/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php b/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
index 36e68fae9..87aa5ad05 100644
--- a/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
+++ b/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
@@ -16,6 +16,7 @@ use Chill\MainBundle\Entity\UserGroup;
 use Chill\PersonBundle\Entity\Person;
 use Chill\TicketBundle\Entity\AddresseeHistory;
 use Chill\TicketBundle\Entity\Comment;
+use Chill\TicketBundle\Entity\EmergencyStatusHistory;
 use Chill\TicketBundle\Entity\MotiveHistory;
 use Chill\TicketBundle\Entity\PersonHistory;
 use Chill\TicketBundle\Entity\StateHistory;
@@ -50,7 +51,8 @@ final class TicketNormalizer implements NormalizerInterface, NormalizerAwareInte
             'updatedAt' => $this->normalizer->normalize($object->getUpdatedAt(), $format, $context),
             'updatedBy' => $this->normalizer->normalize($object->getUpdatedBy(), $format, $context),
             'createdBy' => $this->normalizer->normalize($object->getCreatedBy(), $format, $context),
-            'currentState' => $object->getState()?->value,
+            'currentState' => $object->getState()?->value ?? 'open',
+            'emergency' => $object->getEmergencyStatus()?->value ?? 'no',
         ];
     }
 
@@ -102,6 +104,17 @@ final class TicketNormalizer implements NormalizerInterface, NormalizerAwareInte
             ),
             ...$this->addresseesStates($ticket),
             ...$this->personStates($ticket),
+            ...array_map(
+                fn (EmergencyStatusHistory $stateHistory) => [
+                    'event_type' => 'emergency_change',
+                    'at' => $stateHistory->getStartDate(),
+                    'by' => $stateHistory->getCreatedBy(),
+                    'data' => [
+                        'new_emergency' => $stateHistory->getEmergencyStatus()->value,
+                    ],
+                ],
+                $ticket->getEmergencyStatusHistories()->toArray(),
+            ),
         ];
 
         if (null !== $ticket->getCreatedBy() && null !== $ticket->getCreatedAt()) {
diff --git a/src/Bundle/ChillTicketBundle/src/migrations/Version20250620145414.php b/src/Bundle/ChillTicketBundle/src/migrations/Version20250620145414.php
new file mode 100644
index 000000000..586bdebb4
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/migrations/Version20250620145414.php
@@ -0,0 +1,82 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\Migrations\Ticket;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20250620145414 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add emergency status to ticket';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql(<<<'SQL'
+            CREATE SEQUENCE chill_ticket.emergency_status_history_id_seq INCREMENT BY 1 MINVALUE 1 START 1
+        SQL);
+        $this->addSql(<<<'SQL'
+            CREATE TABLE chill_ticket.emergency_status_history (
+            id INT NOT NULL,
+            ticket_id INT NOT NULL,
+            endDate TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL,
+            emergencyStatus VARCHAR(255) NOT NULL,
+            startDate TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL,
+            createdAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL,
+            createdBy_id INT DEFAULT NULL, PRIMARY KEY(id))
+        SQL);
+        $this->addSql(<<<'SQL'
+            CREATE INDEX IDX_16CF4FDB700047D2 ON chill_ticket.emergency_status_history (ticket_id)
+        SQL);
+        $this->addSql(<<<'SQL'
+            CREATE INDEX IDX_16CF4FDB3174800F ON chill_ticket.emergency_status_history (createdBy_id)
+        SQL);
+        $this->addSql(<<<'SQL'
+            COMMENT ON COLUMN chill_ticket.emergency_status_history.endDate IS '(DC2Type:datetime_immutable)'
+        SQL);
+        $this->addSql(<<<'SQL'
+            COMMENT ON COLUMN chill_ticket.emergency_status_history.startDate IS '(DC2Type:datetime_immutable)'
+        SQL);
+        $this->addSql(<<<'SQL'
+            COMMENT ON COLUMN chill_ticket.emergency_status_history.createdAt IS '(DC2Type:datetime_immutable)'
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE chill_ticket.emergency_status_history ADD CONSTRAINT FK_16CF4FDB700047D2 FOREIGN KEY (ticket_id) REFERENCES chill_ticket.ticket (id) NOT DEFERRABLE INITIALLY IMMEDIATE
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE chill_ticket.emergency_status_history ADD CONSTRAINT FK_16CF4FDB3174800F FOREIGN KEY (createdBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE chill_ticket.emergency_status_history ADD CONSTRAINT ticket_emergency_state_not_overlaps
+            exclude using gist (ticket_id with =, tsrange(startdate, enddate) with &&)
+            deferrable initially deferred
+        SQL);
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql(<<<'SQL'
+            ALTER TABLE chill_ticket.emergency_status_history DROP CONSTRAINT FK_16CF4FDB700047D2
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE chill_ticket.emergency_status_history DROP CONSTRAINT FK_16CF4FDB3174800F
+        SQL);
+        $this->addSql(<<<'SQL'
+            DROP TABLE chill_ticket.emergency_status_history
+        SQL);
+        $this->addSql(<<<'SQL'
+            DROP SEQUENCE chill_ticket.emergency_status_history_id_seq
+        SQL);
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/migrations/Version20250620164517.php b/src/Bundle/ChillTicketBundle/src/migrations/Version20250620164517.php
new file mode 100644
index 000000000..3022b2b23
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/migrations/Version20250620164517.php
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\Migrations\Ticket;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20250620164517 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add makeTicketEmergency field to Motive entity to allow automatic emergency status changes when a motive is associated with a ticket';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql(<<<'SQL'
+            ALTER TABLE chill_ticket.motive ADD makeTicketEmergency VARCHAR(255) DEFAULT NULL
+        SQL);
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql(<<<'SQL'
+            ALTER TABLE chill_ticket.motive DROP makeTicketEmergency
+        SQL);
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/ChangeEmergencyStateCommandHandlerTest.php b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/ChangeEmergencyStateCommandHandlerTest.php
new file mode 100644
index 000000000..c80204490
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/ChangeEmergencyStateCommandHandlerTest.php
@@ -0,0 +1,118 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Tests\Action\Ticket\Handler;
+
+use Chill\TicketBundle\Action\Ticket\ChangeEmergencyStateCommand;
+use Chill\TicketBundle\Action\Ticket\Handler\ChangeEmergencyStateCommandHandler;
+use Chill\TicketBundle\Entity\EmergencyStatusEnum;
+use Chill\TicketBundle\Entity\EmergencyStatusHistory;
+use Chill\TicketBundle\Entity\Ticket;
+use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Component\Clock\MockClock;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+final class ChangeEmergencyStateCommandHandlerTest extends TestCase
+{
+    use ProphecyTrait;
+
+    public function testInvokeWithAlreadyYesEmergencyStatus(): void
+    {
+        $ticket = new Ticket();
+
+        // Create a YES emergency status history
+        new EmergencyStatusHistory(EmergencyStatusEnum::YES, $ticket);
+
+        $handler = new ChangeEmergencyStateCommandHandler(new MockClock());
+        $command = new ChangeEmergencyStateCommand(EmergencyStatusEnum::YES);
+
+        $result = $handler->__invoke($ticket, $command);
+
+        // Assert that the ticket is returned unchanged
+        $this->assertSame($ticket, $result);
+        $this->assertSame(EmergencyStatusEnum::YES, $ticket->getEmergencyStatus());
+
+        // Assert that no new emergency status history was created
+        $emergencyStatusHistories = $ticket->getEmergencyStatusHistories();
+        $this->assertCount(1, $emergencyStatusHistories);
+    }
+
+    public function testInvokeWithYesEmergencyStatusToNo(): void
+    {
+        $ticket = new Ticket();
+
+        // Create a YES emergency status history
+        new EmergencyStatusHistory(EmergencyStatusEnum::YES, $ticket);
+
+        $handler = new ChangeEmergencyStateCommandHandler(new MockClock());
+        $command = new ChangeEmergencyStateCommand(EmergencyStatusEnum::NO);
+
+        $result = $handler->__invoke($ticket, $command);
+
+        // Assert that the ticket is returned
+        $this->assertSame($ticket, $result);
+
+        // Assert that the ticket emergency status is now NO
+        $this->assertSame(EmergencyStatusEnum::NO, $ticket->getEmergencyStatus());
+
+        // Assert that the old emergency status history was ended and a new one was created
+        $emergencyStatusHistories = $ticket->getEmergencyStatusHistories();
+        $this->assertCount(2, $emergencyStatusHistories);
+
+        // The first emergency status history should be ended
+        $yesEmergencyStatusHistory = $emergencyStatusHistories->first();
+        $this->assertNotNull($yesEmergencyStatusHistory->getEndDate());
+        $this->assertSame(EmergencyStatusEnum::YES, $yesEmergencyStatusHistory->getEmergencyStatus());
+
+        // The last emergency status history should be NO and active
+        $noEmergencyStatusHistory = $emergencyStatusHistories->last();
+        $this->assertNull($noEmergencyStatusHistory->getEndDate());
+        $this->assertSame(EmergencyStatusEnum::NO, $noEmergencyStatusHistory->getEmergencyStatus());
+    }
+
+    public function testInvokeWithNoEmergencyStatusToYes(): void
+    {
+        $ticket = new Ticket();
+
+        // Create a NO emergency status history
+        new EmergencyStatusHistory(EmergencyStatusEnum::NO, $ticket);
+
+        $handler = new ChangeEmergencyStateCommandHandler(new MockClock());
+        $command = new ChangeEmergencyStateCommand(EmergencyStatusEnum::YES);
+
+        $result = $handler->__invoke($ticket, $command);
+
+        // Assert that the ticket is returned
+        $this->assertSame($ticket, $result);
+
+        // Assert that the ticket emergency status is now YES
+        $this->assertSame(EmergencyStatusEnum::YES, $ticket->getEmergencyStatus());
+
+        // Assert that the old emergency status history was ended and a new one was created
+        $emergencyStatusHistories = $ticket->getEmergencyStatusHistories();
+        $this->assertCount(2, $emergencyStatusHistories);
+
+        // The first emergency status history should be ended
+        $noEmergencyStatusHistory = $emergencyStatusHistories->first();
+        $this->assertNotNull($noEmergencyStatusHistory->getEndDate());
+        $this->assertSame(EmergencyStatusEnum::NO, $noEmergencyStatusHistory->getEmergencyStatus());
+
+        // The last emergency status history should be YES and active
+        $yesEmergencyStatusHistory = $emergencyStatusHistories->last();
+        $this->assertNull($yesEmergencyStatusHistory->getEndDate());
+        $this->assertSame(EmergencyStatusEnum::YES, $yesEmergencyStatusHistory->getEmergencyStatus());
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/CreateTicketCommandHandlerTest.php b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/CreateTicketCommandHandlerTest.php
index 5d4e11566..b58d3f2a2 100644
--- a/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/CreateTicketCommandHandlerTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/CreateTicketCommandHandlerTest.php
@@ -13,6 +13,7 @@ namespace Chill\TicketBundle\Tests\Action\Ticket\Handler;
 
 use Chill\TicketBundle\Action\Ticket\CreateTicketCommand;
 use Chill\TicketBundle\Action\Ticket\Handler\CreateTicketCommandHandler;
+use Chill\TicketBundle\Entity\EmergencyStatusEnum;
 use Chill\TicketBundle\Entity\StateEnum;
 use Chill\TicketBundle\Entity\Ticket;
 use PHPUnit\Framework\TestCase;
@@ -38,6 +39,7 @@ class CreateTicketCommandHandlerTest extends TestCase
         self::assertInstanceOf(Ticket::class, $actual);
         self::assertEquals('', $actual->getExternalRef());
         self::assertEquals(StateEnum::OPEN, $actual->getState());
+        self::assertEquals(EmergencyStatusEnum::NO, $actual->getEmergencyStatus());
     }
 
     public function testHandleWithReference(): void
@@ -48,5 +50,6 @@ class CreateTicketCommandHandlerTest extends TestCase
         self::assertInstanceOf(Ticket::class, $actual);
         self::assertEquals($ref, $actual->getExternalRef());
         self::assertEquals(StateEnum::OPEN, $actual->getState());
+        self::assertEquals(EmergencyStatusEnum::NO, $actual->getEmergencyStatus());
     }
 }
diff --git a/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/ReplaceMotiveCommandHandlerTest.php b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/ReplaceMotiveCommandHandlerTest.php
index b0f49dd61..17b1e88d9 100644
--- a/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/ReplaceMotiveCommandHandlerTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/ReplaceMotiveCommandHandlerTest.php
@@ -11,8 +11,11 @@ declare(strict_types=1);
 
 namespace Chill\TicketBundle\Tests\Action\Ticket\Handler;
 
+use Chill\TicketBundle\Action\Ticket\ChangeEmergencyStateCommand;
+use Chill\TicketBundle\Action\Ticket\Handler\ChangeEmergencyStateCommandHandler;
 use Chill\TicketBundle\Action\Ticket\Handler\ReplaceMotiveCommandHandler;
 use Chill\TicketBundle\Action\Ticket\ReplaceMotiveCommand;
+use Chill\TicketBundle\Entity\EmergencyStatusEnum;
 use Chill\TicketBundle\Entity\Motive;
 use Chill\TicketBundle\Entity\MotiveHistory;
 use Chill\TicketBundle\Entity\Ticket;
@@ -33,10 +36,15 @@ final class ReplaceMotiveCommandHandlerTest extends KernelTestCase
 
     private function buildHandler(
         EntityManagerInterface $entityManager,
+        ?ChangeEmergencyStateCommandHandler $changeEmergencyStateCommandHandler = null,
     ): ReplaceMotiveCommandHandler {
         $clock = new MockClock();
 
-        return new ReplaceMotiveCommandHandler($clock, $entityManager);
+        if (null === $changeEmergencyStateCommandHandler) {
+            $changeEmergencyStateCommandHandler = $this->prophesize(ChangeEmergencyStateCommandHandler::class)->reveal();
+        }
+
+        return new ReplaceMotiveCommandHandler($clock, $entityManager, $changeEmergencyStateCommandHandler);
     }
 
     public function testHandleOnTicketWithoutMotive(): void
@@ -105,4 +113,69 @@ final class ReplaceMotiveCommandHandlerTest extends KernelTestCase
         self::assertSame($motive, $ticket->getMotive());
         self::assertCount(1, $ticket->getMotiveHistories());
     }
+
+    public function testHandleUpdatesEmergencyStatusWhenMotiveHasMakeTicketEmergency(): void
+    {
+        // Create a motive with makeTicketEmergency set to YES
+        $motive = new Motive();
+        $motive->setMakeTicketEmergency(EmergencyStatusEnum::YES);
+
+        // Create a ticket with no emergency status
+        $ticket = new Ticket();
+
+        // Mock the entity manager
+        $entityManager = $this->prophesize(EntityManagerInterface::class);
+        $entityManager->persist(Argument::type(MotiveHistory::class))->shouldBeCalled();
+
+        // Mock the ChangeEmergencyStateCommandHandler
+        $changeEmergencyStateCommandHandler = $this->prophesize(ChangeEmergencyStateCommandHandler::class);
+        $changeEmergencyStateCommandHandler->__invoke(
+            $ticket,
+            Argument::that(fn (ChangeEmergencyStateCommand $command) => EmergencyStatusEnum::YES === $command->newEmergencyStatus)
+        )->shouldBeCalled();
+
+        // Create the handler with our mocks
+        $handler = $this->buildHandler(
+            $entityManager->reveal(),
+            $changeEmergencyStateCommandHandler->reveal()
+        );
+
+        // Handle the command
+        $handler->handle($ticket, new ReplaceMotiveCommand($motive));
+
+        // Assert that the motive was set on the ticket
+        self::assertSame($motive, $ticket->getMotive());
+    }
+
+    public function testHandleDoesNotUpdateEmergencyStatusWhenMotiveHasNoMakeTicketEmergency(): void
+    {
+        // Create a motive with makeTicketEmergency set to null
+        $motive = new Motive();
+        $motive->setMakeTicketEmergency(null);
+
+        // Create a ticket with no emergency status
+        $ticket = new Ticket();
+
+        // Mock the entity manager
+        $entityManager = $this->prophesize(EntityManagerInterface::class);
+        $entityManager->persist(Argument::type(MotiveHistory::class))->shouldBeCalled();
+
+        // Mock the ChangeEmergencyStateCommandHandler - it should NOT be called
+        $changeEmergencyStateCommandHandler = $this->prophesize(ChangeEmergencyStateCommandHandler::class);
+        $changeEmergencyStateCommandHandler->__invoke(
+            Argument::cetera()
+        )->shouldNotBeCalled();
+
+        // Create the handler with our mocks
+        $handler = $this->buildHandler(
+            $entityManager->reveal(),
+            $changeEmergencyStateCommandHandler->reveal()
+        );
+
+        // Handle the command
+        $handler->handle($ticket, new ReplaceMotiveCommand($motive));
+
+        // Assert that the motive was set on the ticket
+        self::assertSame($motive, $ticket->getMotive());
+    }
 }
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/ChangeEmergencyStateApiControllerTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/ChangeEmergencyStateApiControllerTest.php
new file mode 100644
index 000000000..1a479bc64
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/ChangeEmergencyStateApiControllerTest.php
@@ -0,0 +1,144 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Tests\Controller;
+
+use Chill\TicketBundle\Action\Ticket\ChangeEmergencyStateCommand;
+use Chill\TicketBundle\Action\Ticket\Handler\ChangeEmergencyStateCommandHandler;
+use Chill\TicketBundle\Controller\ChangeEmergencyStateApiController;
+use Chill\TicketBundle\Entity\EmergencyStatusEnum;
+use Chill\TicketBundle\Entity\Ticket;
+use Doctrine\ORM\EntityManagerInterface;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\SerializerInterface;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+final class ChangeEmergencyStateApiControllerTest extends TestCase
+{
+    use ProphecyTrait;
+
+    public function testSetEmergencyYesWithoutPermission(): void
+    {
+        $ticket = new Ticket();
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(false);
+
+        $changeEmergencyStateCommandHandler = $this->prophesize(ChangeEmergencyStateCommandHandler::class);
+        $entityManager = $this->prophesize(EntityManagerInterface::class);
+        $serializer = $this->prophesize(SerializerInterface::class);
+
+        $controller = new ChangeEmergencyStateApiController(
+            $changeEmergencyStateCommandHandler->reveal(),
+            $security->reveal(),
+            $entityManager->reveal(),
+            $serializer->reveal(),
+        );
+
+        $this->expectException(AccessDeniedHttpException::class);
+        $controller->setEmergencyYes($ticket);
+    }
+
+    public function testSetEmergencyYesWithPermission(): void
+    {
+        $ticket = new Ticket();
+
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $changeEmergencyStateCommandHandler = $this->prophesize(ChangeEmergencyStateCommandHandler::class);
+        $changeEmergencyStateCommandHandler->__invoke(
+            $ticket,
+            Argument::that(fn (ChangeEmergencyStateCommand $command) => EmergencyStatusEnum::YES === $command->newEmergencyStatus)
+        )->willReturn($ticket)->shouldBeCalled();
+
+        $entityManager = $this->prophesize(EntityManagerInterface::class);
+        $entityManager->flush()->shouldBeCalled();
+
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $serializer->serialize($ticket, 'json', ['groups' => ['read']])
+            ->willReturn('{}')
+            ->shouldBeCalled();
+
+        $controller = new ChangeEmergencyStateApiController(
+            $changeEmergencyStateCommandHandler->reveal(),
+            $security->reveal(),
+            $entityManager->reveal(),
+            $serializer->reveal(),
+        );
+
+        $response = $controller->setEmergencyYes($ticket);
+
+        $this->assertInstanceOf(JsonResponse::class, $response);
+    }
+
+    public function testSetEmergencyNoWithoutPermission(): void
+    {
+        $ticket = new Ticket();
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(false);
+
+        $changeEmergencyStateCommandHandler = $this->prophesize(ChangeEmergencyStateCommandHandler::class);
+        $entityManager = $this->prophesize(EntityManagerInterface::class);
+        $serializer = $this->prophesize(SerializerInterface::class);
+
+        $controller = new ChangeEmergencyStateApiController(
+            $changeEmergencyStateCommandHandler->reveal(),
+            $security->reveal(),
+            $entityManager->reveal(),
+            $serializer->reveal(),
+        );
+
+        $this->expectException(AccessDeniedHttpException::class);
+        $controller->setEmergencyNo($ticket);
+    }
+
+    public function testSetEmergencyNoWithPermission(): void
+    {
+        $ticket = new Ticket();
+
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $changeEmergencyStateCommandHandler = $this->prophesize(ChangeEmergencyStateCommandHandler::class);
+        $changeEmergencyStateCommandHandler->__invoke(
+            $ticket,
+            Argument::that(fn (ChangeEmergencyStateCommand $command) => EmergencyStatusEnum::NO === $command->newEmergencyStatus)
+        )->willReturn($ticket)->shouldBeCalled();
+
+        $entityManager = $this->prophesize(EntityManagerInterface::class);
+        $entityManager->flush()->shouldBeCalled();
+
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $serializer->serialize($ticket, 'json', ['groups' => ['read']])
+            ->willReturn('{}')
+            ->shouldBeCalled();
+
+        $controller = new ChangeEmergencyStateApiController(
+            $changeEmergencyStateCommandHandler->reveal(),
+            $security->reveal(),
+            $entityManager->reveal(),
+            $serializer->reveal(),
+        );
+
+        $response = $controller->setEmergencyNo($ticket);
+
+        $this->assertInstanceOf(JsonResponse::class, $response);
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/ReplaceMotiveControllerTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/ReplaceMotiveControllerTest.php
index 95c8ec5f4..409cbcf0e 100644
--- a/src/Bundle/ChillTicketBundle/tests/Controller/ReplaceMotiveControllerTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/ReplaceMotiveControllerTest.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\TicketBundle\Tests\Controller;
 
+use Chill\TicketBundle\Action\Ticket\Handler\ChangeEmergencyStateCommandHandler;
 use Chill\TicketBundle\Action\Ticket\Handler\ReplaceMotiveCommandHandler;
 use Chill\TicketBundle\Controller\ReplaceMotiveController;
 use Chill\TicketBundle\Entity\Motive;
@@ -97,9 +98,12 @@ class ReplaceMotiveControllerTest extends KernelTestCase
         $entityManager->persist(Argument::type(MotiveHistory::class))->shouldBeCalled();
         $entityManager->flush()->shouldBeCalled();
 
+        $changeEmergencyCommandHandler = $this->prophesize(ChangeEmergencyStateCommandHandler::class);
+
         $handler = new ReplaceMotiveCommandHandler(
             new MockClock(),
-            $entityManager->reveal()
+            $entityManager->reveal(),
+            $changeEmergencyCommandHandler->reveal(),
         );
 
         return new ReplaceMotiveController(
diff --git a/src/Bundle/ChillTicketBundle/tests/Entity/TicketTest.php b/src/Bundle/ChillTicketBundle/tests/Entity/TicketTest.php
index 5776b3a00..975a8e2e2 100644
--- a/src/Bundle/ChillTicketBundle/tests/Entity/TicketTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Entity/TicketTest.php
@@ -18,6 +18,8 @@ use Chill\TicketBundle\Entity\AddresseeHistory;
 use Chill\TicketBundle\Entity\Motive;
 use Chill\TicketBundle\Entity\MotiveHistory;
 use Chill\TicketBundle\Entity\PersonHistory;
+use Chill\TicketBundle\Entity\EmergencyStatusEnum;
+use Chill\TicketBundle\Entity\EmergencyStatusHistory;
 use Chill\TicketBundle\Entity\StateEnum;
 use Chill\TicketBundle\Entity\StateHistory;
 use Chill\TicketBundle\Entity\Ticket;
@@ -133,4 +135,27 @@ class TicketTest extends KernelTestCase
         self::assertCount(2, $ticket->getStateHistories());
         self::assertSame(StateEnum::CLOSED, $ticket->getState());
     }
+
+    public function testGetEmergencyStatus(): void
+    {
+        $ticket = new Ticket();
+
+        // Initially, the ticket has no emergency status
+        self::assertNull($ticket->getEmergencyStatus());
+
+        // Create an emergency status history entry with the YES status
+        $history = new EmergencyStatusHistory(EmergencyStatusEnum::YES, $ticket);
+
+        // Verify that the ticket now has the YES status
+        self::assertSame(EmergencyStatusEnum::YES, $ticket->getEmergencyStatus());
+        self::assertCount(1, $ticket->getEmergencyStatusHistories());
+
+        // Change the emergency status to NO
+        $history->setEndDate(new \DateTimeImmutable());
+        $history2 = new EmergencyStatusHistory(EmergencyStatusEnum::NO, $ticket);
+
+        // Verify that the ticket now has the NO status
+        self::assertCount(2, $ticket->getEmergencyStatusHistories());
+        self::assertSame(EmergencyStatusEnum::NO, $ticket->getEmergencyStatus());
+    }
 }
diff --git a/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/TicketNormalizerTest.php b/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/TicketNormalizerTest.php
index 940c93d97..d30334b0d 100644
--- a/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/TicketNormalizerTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/TicketNormalizerTest.php
@@ -16,6 +16,8 @@ use Chill\MainBundle\Entity\UserGroup;
 use Chill\PersonBundle\Entity\Person;
 use Chill\TicketBundle\Entity\AddresseeHistory;
 use Chill\TicketBundle\Entity\Comment;
+use Chill\TicketBundle\Entity\EmergencyStatusEnum;
+use Chill\TicketBundle\Entity\EmergencyStatusHistory;
 use Chill\TicketBundle\Entity\Motive;
 use Chill\TicketBundle\Entity\MotiveHistory;
 use Chill\TicketBundle\Entity\PersonHistory;
@@ -109,6 +111,7 @@ class TicketNormalizerTest extends KernelTestCase
                 'currentState' => 'open',
                 'updatedAt' => $t->getUpdatedAt()->getTimestamp(),
                 'updatedBy' => ['user'],
+                'emergency' => 'no',
             ],
         ];
 
@@ -117,6 +120,7 @@ class TicketNormalizerTest extends KernelTestCase
 
         // added by action
         new StateHistory(StateEnum::OPEN, $ticket, new \DateTimeImmutable('2024-06-16T00:00:00Z'));
+        new EmergencyStatusHistory(EmergencyStatusEnum::YES, $ticket, new \DateTimeImmutable('2024-06-16T00:00:10Z'));
 
         // those are added by doctrine listeners
         $ticket->setCreatedAt(new \DateTimeImmutable('2024-06-16T00:00:00Z'));
@@ -155,10 +159,12 @@ class TicketNormalizerTest extends KernelTestCase
                     ['event_type' => 'addressees_state'],
                     ['event_type' => 'create_ticket'],
                     ['event_type' => 'state_change'],
+                    ['event_type' => 'emergency_change'],
                 ],
                 'currentState' => 'open',
                 'updatedAt' => $ticket->getUpdatedAt()->getTimestamp(),
                 'updatedBy' => ['user'],
+                'emergency' => 'yes',
             ],
         ];
     }
@@ -213,6 +219,11 @@ class TicketNormalizerTest extends KernelTestCase
             'json',
             ['groups' => 'read']
         )->will(fn ($args): array => $args[0]);
+        $normalizer->normalize(
+            Argument::that(fn ($arg) => is_array($arg) && 1 === count($arg) && array_key_exists('new_emergency', $arg)),
+            'json',
+            ['groups' => 'read']
+        )->will(fn ($args): array => $args[0]);
 
         // datetime
         $normalizer->normalize(Argument::type(\DateTimeImmutable::class), 'json', Argument::type('array'))

From f4eeee159825b41be46b0c05dd899151088632fa Mon Sep 17 00:00:00 2001
From: Boris Waaub <boris.waaub@digitalternative.be>
Date: Tue, 24 Jun 2025 10:44:03 +0000
Subject: [PATCH 125/283] Add feature open and close ticket

---
 .../src/Resources/public/types.ts             |  23 ++-
 .../components/ActionToolbarComponent.vue     | 170 +++++++++---------
 .../TicketApp/components/BannerComponent.vue  |  16 +-
 .../TicketHistoryAddresseeComponent.vue       |   6 +-
 .../components/TicketHistoryListComponent.vue |  34 ++--
 .../TicketHistoryStateComponent.vue           |  41 +++++
 .../vuejs/TicketApp/store/modules/ticket.ts   |  64 ++++---
 .../src/translations/messages+intl-icu.fr.yml |   6 +
 8 files changed, 220 insertions(+), 140 deletions(-)
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryStateComponent.vue

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
index 3615887f7..d41fb62f8 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
@@ -13,7 +13,7 @@ export interface Motive {
     label: TranslatableString;
 }
 
-export type TicketState = "open"|"closed";
+export type TicketState = "open" | "closed";
 
 interface TicketHistory<T extends string, D extends object> {
     event_type: T;
@@ -75,16 +75,20 @@ export interface PersonsState {
 }
 
 export interface StateChange {
-    new_state: TicketState
+    new_state: TicketState;
 }
 
-export interface CreateTicketState {}
+export interface StateChange {
+    new_state: TicketState;
+}
 
-//interface AddPersonEvent extends TicketHistory<"add_person", PersonHistory> {};
-export interface AddCommentEvent
-    extends TicketHistory<"add_comment", Comment> {}
-export interface SetMotiveEvent
-    extends TicketHistory<"set_motive", MotiveHistory> {}
+export interface CreateTicketState {
+    by: User;
+}
+
+interface AddPersonEvent extends TicketHistory<"add_person", PersonHistory> {}
+export type AddCommentEvent = TicketHistory<"add_comment", Comment>;
+export type SetMotiveEvent = TicketHistory<"set_motive", MotiveHistory>;
 //interface AddAddressee extends TicketHistory<"add_addressee", AddresseeHistory> {};
 //interface RemoveAddressee extends TicketHistory<"remove_addressee", AddresseeHistory> {};
 export interface AddresseesStateEvent
@@ -96,8 +100,9 @@ export interface PersonStateEvent
 export interface ChangeStateEvent
     extends TicketHistory<"state_change", StateChange> {}
 
+// TODO : Remove add_persont event from TicketHistoryLine
 export type TicketHistoryLine =
-    /* AddPersonEvent */
+    | AddPersonEvent
     | CreateTicketEvent
     | AddCommentEvent
     | SetMotiveEvent /*AddAddressee | RemoveAddressee | */
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
index fd965dab8..eca289ef1 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
@@ -9,7 +9,7 @@
                 </div>
 
                 <form
-                    v-if="activeTab !== 'set_persons'"
+                    v-if="activeTab !== 'persons_state'"
                     @submit.prevent="submitAction"
                 >
                     <add-comment-component
@@ -21,7 +21,7 @@
                         v-model="addressees"
                         :user-groups="userGroups"
                         :users="users"
-                        v-if="activeTab === 'add_addressee'"
+                        v-if="activeTab === 'addressees_state'"
                     />
 
                     <motive-selector-component
@@ -71,87 +71,41 @@
                         >Annuler</a
                     >
                 </li>
-                <li class="nav-item p-2">
+                <li
+                    v-for="btn in actionButtons"
+                    :key="btn.key"
+                    class="nav-item p-2"
+                >
                     <button
                         type="button"
-                        :class="`btn ${
-                            activeTab === 'set_motive'
-                                ? 'btn-primary'
-                                : 'btn-light'
-                        }`"
+                        :class="`btn ${activeTab === btn.key ? 'btn-primary' : 'btn-light'}`"
                         @click="
-                            activeTab === 'set_motive'
+                            activeTab === btn.key
                                 ? (activeTab = '')
-                                : (activeTab = 'set_motive')
+                                : (activeTab = btn.key)
                         "
+                        :disabled="btn.disabled.value"
                     >
-                        <i :class="actionIcons['set_motive']"></i>
-                        {{ trans(CHILL_TICKET_TICKET_SET_MOTIVE_TITLE) }}
+                        <i :class="actionIcons[btn.key]" />
+                        {{ trans(btn.label) }}
                     </button>
                 </li>
-                <li class="nav-item p-2">
-                    <button
-                        type="button"
-                        :class="`btn ${
-                            activeTab === 'add_comment'
-                                ? 'btn-primary'
-                                : 'btn-light'
-                        }`"
-                        @click="
-                            activeTab === 'add_comment'
-                                ? (activeTab = '')
-                                : (activeTab = 'add_comment')
-                        "
-                    >
-                        <i :class="actionIcons['add_comment']"></i>
-                        {{ trans(CHILL_TICKET_TICKET_ADD_COMMENT_TITLE) }}
-                    </button>
-                </li>
-                <li class="nav-item p-2">
-                    <button
-                        type="button"
-                        :class="`btn ${
-                            activeTab === 'add_addressee'
-                                ? 'btn-primary'
-                                : 'btn-light'
-                        }`"
-                        @click="
-                            activeTab === 'add_addressee'
-                                ? (activeTab = '')
-                                : (activeTab = 'add_addressee')
-                        "
-                    >
-                        <i :class="actionIcons['addressees_state']"></i>
-                        {{ trans(CHILL_TICKET_TICKET_ADD_ADDRESSEE_TITLE) }}
-                    </button>
-                </li>
-                <li class="nav-item p-2">
-                    <button
-                        type="button"
-                        :class="`btn ${
-                            activeTab === 'set_persons'
-                                ? 'btn-primary'
-                                : 'btn-light'
-                        }`"
-                        @click="
-                            activeTab === 'set_persons'
-                                ? (activeTab = '')
-                                : (activeTab = 'set_persons')
-                        "
-                    >
-                        <i :class="actionIcons['set_persons']"></i>
-                        {{ trans(CHILL_TICKET_TICKET_SET_PERSONS_TITLE) }}
-                    </button>
-                </li>
-
                 <li class="nav-item p-2">
                     <button
                         type="button"
                         class="btn btn-light"
-                        @click="handleClick()"
+                        @click="isOpen ? closeTicket() : reopenTicket()"
                     >
-                        <i class="fa fa-bolt"></i>
-                        {{ trans(CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CLOSE) }}
+                        <i :class="actionIcons['state_change']"></i>
+                        {{
+                            isOpen
+                                ? trans(
+                                      CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CLOSE,
+                                  )
+                                : trans(
+                                      CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_REOPEN,
+                                  )
+                        }}
                     </button>
                 </li>
             </ul>
@@ -183,9 +137,14 @@ import {
     CHILL_TICKET_TICKET_SET_MOTIVE_ERROR,
     CHILL_TICKET_TICKET_SET_MOTIVE_SUCCESS,
     CHILL_TICKET_TICKET_SET_PERSONS_TITLE,
-    CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CLOSE,
     CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CANCEL,
     CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_SAVE,
+    CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CLOSE,
+    CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CLOSE_SUCCESS,
+    CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CLOSE_ERROR,
+    CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_REOPEN,
+    CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_REOPEN_SUCCESS,
+    CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_REOPEN_ERROR,
 } from "translator";
 
 // Types
@@ -199,9 +158,8 @@ import { Comment, Motive, Ticket } from "../../../types";
 const store = useStore();
 const toast = useToast();
 
-const activeTab = ref(
-    "" as "" | "add_comment" | "set_motive" | "add_addressee" | "set_persons",
-);
+const activeTab = ref("" as string);
+const actionIcons = ref(store.getters.getActionIcons);
 
 const activeTabTitle = computed((): string => {
     switch (activeTab.value) {
@@ -209,16 +167,44 @@ const activeTabTitle = computed((): string => {
             return trans(CHILL_TICKET_TICKET_ADD_COMMENT_TITLE);
         case "set_motive":
             return trans(CHILL_TICKET_TICKET_SET_MOTIVE_TITLE);
-        case "add_addressee":
+        case "addressees_state":
             return trans(CHILL_TICKET_TICKET_ADD_ADDRESSEE_TITLE);
-        case "set_persons":
+        case "persons_state":
             return trans(CHILL_TICKET_TICKET_SET_PERSONS_TITLE);
         default:
             return "";
     }
 });
 
+const actionButtons = [
+    {
+        key: "set_motive",
+        label: CHILL_TICKET_TICKET_SET_MOTIVE_TITLE,
+        icon: computed(() => actionIcons.value["set_motive"]),
+        disabled: computed(() => !isOpen.value),
+    },
+    {
+        key: "add_comment",
+        label: CHILL_TICKET_TICKET_ADD_COMMENT_TITLE,
+        icon: computed(() => actionIcons.value["add_comment"]),
+        disabled: computed(() => !isOpen.value),
+    },
+    {
+        key: "addressees_state",
+        label: CHILL_TICKET_TICKET_ADD_ADDRESSEE_TITLE,
+        icon: computed(() => actionIcons.value["addressees_state"]),
+        disabled: computed(() => !isOpen.value),
+    },
+    {
+        key: "persons_state",
+        label: CHILL_TICKET_TICKET_SET_PERSONS_TITLE,
+        icon: computed(() => actionIcons.value["persons_state"]),
+        disabled: computed(() => !isOpen.value),
+    },
+];
+
 const ticket = computed(() => store.getters.getTicket as Ticket);
+const isOpen = computed(() => store.getters.isOpen);
 const motives = computed(() => store.getters.getMotives as Motive[]);
 const userGroups = computed(() => store.getters.getUserGroups as UserGroup[]);
 const users = computed(() => store.getters.getUsers as User[]);
@@ -279,7 +265,7 @@ async function submitAction() {
                     );
                 }
                 break;
-            case "add_addressee":
+            case "addressees_state":
                 if (!addressees.value.length) {
                     toast.error(trans(CHILL_TICKET_TICKET_ADD_ADDRESSEE_ERROR));
                 } else {
@@ -299,15 +285,32 @@ async function submitAction() {
     }
 }
 
-function handleClick() {
-    alert("Sera disponible plus tard");
+async function closeTicket() {
+    try {
+        await store.dispatch("closeTicket");
+        closeAllActions();
+        toast.success(trans(CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CLOSE_SUCCESS));
+    } catch (error) {
+        console.error(error);
+        toast.success(trans(CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CLOSE_ERROR));
+    }
+}
+
+async function reopenTicket() {
+    try {
+        await store.dispatch("reopenTicket");
+        toast.success(
+            trans(CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_REOPEN_SUCCESS),
+        );
+    } catch (error) {
+        console.error(error);
+        toast.error(trans(CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_REOPEN_ERROR));
+    }
 }
 
 function closeAllActions() {
     activeTab.value = "";
 }
-
-const actionIcons = ref(store.getters.getActionIcons);
 </script>
 
 <style lang="scss" scoped>
@@ -328,7 +331,8 @@ div.footer-ticket-details {
 }
 
 .fixed-bottom {
-    max-width: 1272px;
-    margin: 0 auto;
+    position: sticky;
+    top: 0;
+    overflow: hidden;
 }
 </style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
index 846a748b8..848f827a5 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
@@ -17,9 +17,17 @@
                         <span
                             class="badge text-bg-chill-green text-white"
                             style="font-size: 1rem"
+                            v-if="isOpen"
                         >
                             {{ trans(CHILL_TICKET_TICKET_BANNER_OPEN) }}
                         </span>
+                        <span
+                            class="badge text-bg-chill-red text-white"
+                            style="font-size: 1rem"
+                            v-else
+                        >
+                            {{ trans(CHILL_TICKET_TICKET_BANNER_CLOSED) }}
+                        </span>
                     </div>
                     <div class="d-flex justify-content-end">
                         <p class="created-at-timespan" v-if="ticket.createdAt">
@@ -49,7 +57,6 @@
                         :buttonText="person.textAge"
                         :displayBadge="'true' === 'true'"
                         action="show"
-                        CHILL_TICKET_TICKET_BANNER_CONCERNED_USAGER
                     ></on-the-fly>
                 </div>
                 <div class="col-md-6 col-sm-12">
@@ -88,6 +95,7 @@ import {
     trans,
     CHILL_TICKET_TICKET_BANNER_NO_MOTIVE,
     CHILL_TICKET_TICKET_BANNER_OPEN,
+    CHILL_TICKET_TICKET_BANNER_CLOSED,
     CHILL_TICKET_TICKET_BANNER_SINCE,
     CHILL_TICKET_TICKET_BANNER_CONCERNED_USAGER,
     CHILL_TICKET_TICKET_BANNER_SPEAKER,
@@ -98,10 +106,14 @@ import {
     CHILL_TICKET_TICKET_BANNER_AND,
 } from "translator";
 
+// Store
+import { useStore } from "vuex";
+
 const props = defineProps<{
     ticket: Ticket;
 }>();
 
+const store = useStore();
 const today = ref(new Date());
 const createdAt = ref(props.ticket.createdAt);
 
@@ -109,6 +121,8 @@ setInterval(() => {
     today.value = new Date();
 }, 5000);
 
+const isOpen = computed(() => store.getters.isOpen);
+
 const since = computed(() => {
     if (createdAt.value == null) {
         return "";
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent.vue
index 464eec294..f3b67e318 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent.vue
@@ -1,17 +1,17 @@
 <template>
     <div class="col-12">
-        <addressee-component :addressees="addressees" />
+        <addressee-component :addressees="addresseeState.addressees" />
     </div>
 </template>
 <script setup lang="ts">
 // Types
-import { UserGroupOrUser } from "../../../../../../../ChillMainBundle/Resources/public/types";
+import { AddresseeState } from "../../../types";
 
 // Components
 import AddresseeComponent from "./AddresseeComponent.vue";
 
 defineProps<{
-    addressees: UserGroupOrUser[];
+    addresseeState: AddresseeState;
 }>();
 </script>
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
index 548ccdc8a..fbd1e5ac4 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
@@ -1,21 +1,24 @@
 <template>
     <div
         class="card my-2 bg-light"
-        v-for="history_line in history"
+        v-for="history_line in history.filter(
+            (line) => line.event_type != 'add_person',
+        )"
         :key="history.indexOf(history_line)"
     >
         <div class="card-header">
-            <div class="history-header">
-                <div class="description">
+            <div
+                class="history-header d-flex align-items-center justify-content-between"
+            >
+                <div class="d-flex align-items-center fw-bold">
                     <i
                         :class="`${actionIcons[history_line.event_type]} me-1`"
                     ></i>
                     <span>{{ explainSentence(history_line) }}</span>
-                </div>
-                <div>
-                    <span class="fw-bold fst-italic mx-1">
-                        {{ formatDate(history_line.at) }}
-                    </span>
+                    <TicketHistoryStateComponent
+                        :new_state="history_line.data.new_state"
+                        v-if="history_line.event_type == 'state_change'"
+                    />
                 </div>
                 <div>
                     <span class="badge-user">
@@ -23,10 +26,16 @@
                             :user="history_line.by"
                         ></user-render-box-badge>
                     </span>
+                    <span class="fst-italic mx-2">
+                        {{ formatDate(history_line.at) }}
+                    </span>
                 </div>
             </div>
         </div>
-        <div class="card-body row">
+        <div
+            class="card-body row"
+            v-if="history_line.event_type != 'state_change'"
+        >
             <ticket-history-person-component
                 :personHistory="history_line.data"
                 v-if="history_line.event_type == 'persons_state'"
@@ -40,7 +49,7 @@
                 v-else-if="history_line.event_type == 'add_comment'"
             />
             <ticket-history-addressee-component
-                :addressees="history_line.data.addressees"
+                :addresseeState="history_line.data"
                 v-else-if="history_line.event_type == 'addressees_state'"
             />
             <ticket-history-create-component
@@ -64,8 +73,9 @@ import TicketHistoryMotiveComponent from "./TicketHistoryMotiveComponent.vue";
 import TicketHistoryCommentComponent from "./TicketHistoryCommentComponent.vue";
 import TicketHistoryAddresseeComponent from "./TicketHistoryAddresseeComponent.vue";
 import TicketHistoryCreateComponent from "./TicketHistoryCreateComponent.vue";
-import UserRenderBoxBadge from "ChillMainAssets/vuejs/_components/Entity/UserRenderBoxBadge.vue";
+import TicketHistoryStateComponent from "./TicketHistoryStateComponent.vue";
 
+import UserRenderBoxBadge from "ChillMainAssets/vuejs/_components/Entity/UserRenderBoxBadge.vue";
 // Utils
 import { ISOToDatetime } from "../../../../../../../ChillMainBundle/Resources/public/chill/js/date";
 
@@ -87,6 +97,8 @@ function explainSentence(history: TicketHistoryLine): string {
             return "Nouveau motifs";
         case "create_ticket":
             return "Ticket créé";
+        case "state_change":
+            return "Status du ticket modifié";
         default:
             return "";
     }
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryStateComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryStateComponent.vue
new file mode 100644
index 000000000..ccaa97e83
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryStateComponent.vue
@@ -0,0 +1,41 @@
+<template>
+    <span
+        class="text-chill-green mx-2"
+        style="
+            font-size: 1rem;
+            max-width: 80px;
+            white-space: normal;
+            word-break: break-word;
+        "
+        v-if="props.new_state == 'open'"
+    >
+        {{ trans(CHILL_TICKET_TICKET_BANNER_OPEN) }}
+    </span>
+    <span
+        class="text-chill-red mx-2"
+        style="
+            font-size: 1rem;
+            max-width: 80px;
+            white-space: normal;
+            word-break: break-word;
+        "
+        v-else-if="props.new_state == 'closed'"
+    >
+        {{ trans(CHILL_TICKET_TICKET_BANNER_CLOSED) }}
+    </span>
+</template>
+
+<script setup lang="ts">
+// Types
+import { StateChange } from "../../../types";
+
+// Translations
+import {
+    trans,
+    CHILL_TICKET_TICKET_BANNER_OPEN,
+    CHILL_TICKET_TICKET_BANNER_CLOSED,
+} from "translator";
+const props = defineProps<StateChange>();
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
index 73e0e38fa..f4c9037a6 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
@@ -2,6 +2,7 @@ import { Module } from "vuex";
 import { RootState } from "..";
 
 import { Ticket } from "../../../../types";
+import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
 
 export interface State {
     ticket: Ticket;
@@ -12,18 +13,18 @@ export const moduleTicket: Module<State, RootState> = {
     state: () => ({
         ticket: {} as Ticket,
         action_icons: {
-            // TODO cleanup those keys
             add_person: "fa fa-eyedropper",
             add_comment: "fa fa-comment",
             set_motive: "fa fa-paint-brush",
-            //add_addressee: "fa fa-paper-plane",
             addressees_state: "fa fa-paper-plane",
-            set_persons: "fa fa-eyedropper",
             persons_state: "fa fa-eyedropper",
+            state_change: "fa fa-bolt",
         },
-        toto: "toto",
     }),
     getters: {
+        isOpen(state) {
+            return state.ticket.currentState === "open";
+        },
         getTicket(state) {
             state.ticket.history = state.ticket.history.sort((a, b) =>
                 b.at.datetime.localeCompare(a.at.datetime),
@@ -35,39 +36,36 @@ export const moduleTicket: Module<State, RootState> = {
             return state.action_icons;
         },
         getDistinctAddressesHistory(state) {
-            const addresseeHistory = state.ticket.history.reduce(
-                (result, item) => {
-                    const { datetime } = item.at;
-                    if (
-                        ![
-                            "add_addressee",
-                            "remove_addressee",
-                            "add_person",
-                        ].includes(item.event_type)
-                    ) {
-                        result[datetime] = item;
-                        return result;
-                    }
-
-                    if (!result[datetime]) {
-                        result[datetime] = [];
-                    }
-                    /*
-                    if (item.event_type === "add_addressee") {
-                        result[datetime].push(item);
-                    }
-                     */
-                    return result;
-                },
-                {} as any,
-            );
-            return Object.values(addresseeHistory) as Ticket["history"][];
+            return state.ticket.history;
         },
     },
     mutations: {
-        setTicket(state, ticket) {
+        setTicket(state, ticket: Ticket) {
             state.ticket = ticket;
         },
     },
-    actions: {},
+    actions: {
+        async closeTicket({ commit, state }) {
+            try {
+                const result: Ticket = await makeFetch(
+                    "POST",
+                    `/api/1.0/ticket/ticket/${state.ticket.id}/close`,
+                );
+                commit("setTicket", result as Ticket);
+            } catch (e: any) {
+                throw e.name;
+            }
+        },
+        async reopenTicket({ commit, state }) {
+            try {
+                const result: Ticket = await makeFetch(
+                    "POST",
+                    `/api/1.0/ticket/ticket/${state.ticket.id}/open`,
+                );
+                commit("setTicket", result as Ticket);
+            } catch (e: any) {
+                throw e.name;
+            }
+        },
+    },
 };
diff --git a/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml b/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
index f825a7786..b3cbb32c1 100644
--- a/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
+++ b/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
@@ -11,6 +11,11 @@ chill_ticket:
             cancel: "Annuler"
             save: "Enregistrer"
             close: "Fermer"
+            close_success: "Ticket fermé"
+            close_error: "Erreur lors de la fermeture du ticket"
+            reopen: "Rouvrir"
+            reopen_success: "Rouverture du ticket réussie"
+            reopen_error: "Erreur lors de la rouverture du ticket"
         add_comment:
             title: "Commentaire"
             label: "Ajouter un commentaire"
@@ -37,6 +42,7 @@ chill_ticket:
             concerned_usager: "Usagers concernés"
             speaker: "Attribué à"
             open: "Ouvert"
+            closed: "Fermé"
             since: "Depuis {time}"
             and: "et"
             days: >-

From 4f9315087455ccdec8ff7785d08112163179ef89 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 1 Jul 2025 12:38:02 +0000
Subject: [PATCH 126/283] =?UTF-8?q?Cr=C3=A9er=20un=20point=20d'api=20de=20?=
 =?UTF-8?q?suggestion=20des=20usagers=20pour=20un=20ticket?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Export/Formatter/CSVFormatter.php         |   1 -
 .../Export/Formatter/CSVListFormatter.php     |   1 -
 .../Formatter/SpreadsheetListFormatter.php    |   1 -
 .../Repository/ThirdPartyRepository.php       |  42 +++-
 .../ChillTicketBundle/chill.api.specs.yaml    |  87 +++++++-
 .../AssociateByPhonenumberCommandHandler.php  |  13 +-
 .../Handler/SetCallerCommandHandler.php       |  50 +++++
 .../src/Action/Ticket/SetCallerCommand.php    |  29 +++
 .../src/Controller/SetCallerApiController.php |  66 ++++++
 .../SuggestPersonForTicketApiController.php   |  45 ++++
 .../src/Entity/CallerHistory.php              | 148 +++++++++++++
 .../ChillTicketBundle/src/Entity/Ticket.php   |  39 ++++
 .../PersonTicketACLAwareRepository.php        |  60 ++++++
 ...ersonTicketACLAwareRepositoryInterface.php |  29 +++
 .../Normalizer/TicketNormalizer.php           |  13 ++
 .../Service/Ticket/SuggestPersonForTicket.php |  30 +++
 .../SuggestPersonForTicketInterface.php       |  26 +++
 .../src/config/services.yaml                  |   3 +
 .../src/migrations/Version20250624105842.php  |  93 ++++++++
 ...sociateByPhonenumberCommandHandlerTest.php |  26 ++-
 .../Handler/SetCallerCommandHandlerTest.php   | 178 ++++++++++++++++
 .../Controller/SetCallerApiControllerTest.php | 200 ++++++++++++++++++
 .../tests/Entity/CallerHistoryTest.php        |  63 ++++++
 .../tests/Entity/TicketCallerTest.php         |  82 +++++++
 .../PersonTicketACLAwareRepositoryTest.php    |  64 ++++++
 .../Normalizer/TicketNormalizerTest.php       |  52 +++--
 .../Ticket/SuggestPersonForTicketTest.php     |  70 ++++++
 27 files changed, 1485 insertions(+), 26 deletions(-)
 create mode 100644 src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/SetCallerCommandHandler.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Action/Ticket/SetCallerCommand.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Controller/SetCallerApiController.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Controller/SuggestPersonForTicketApiController.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Entity/CallerHistory.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Repository/PersonTicketACLAwareRepository.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Repository/PersonTicketACLAwareRepositoryInterface.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Service/Ticket/SuggestPersonForTicket.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Service/Ticket/SuggestPersonForTicketInterface.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/migrations/Version20250624105842.php
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/SetCallerCommandHandlerTest.php
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Controller/SetCallerApiControllerTest.php
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Entity/CallerHistoryTest.php
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Entity/TicketCallerTest.php
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Repository/PersonTicketACLAwareRepositoryTest.php
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Service/Ticket/SuggestPersonForTicketTest.php

diff --git a/src/Bundle/ChillMainBundle/Export/Formatter/CSVFormatter.php b/src/Bundle/ChillMainBundle/Export/Formatter/CSVFormatter.php
index f0c2b9cee..c7ee03fe8 100644
--- a/src/Bundle/ChillMainBundle/Export/Formatter/CSVFormatter.php
+++ b/src/Bundle/ChillMainBundle/Export/Formatter/CSVFormatter.php
@@ -18,7 +18,6 @@ use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function count;
 
 /**
  * Command to get the report with curl:
diff --git a/src/Bundle/ChillMainBundle/Export/Formatter/CSVListFormatter.php b/src/Bundle/ChillMainBundle/Export/Formatter/CSVListFormatter.php
index fda49f202..1a54eee5f 100644
--- a/src/Bundle/ChillMainBundle/Export/Formatter/CSVListFormatter.php
+++ b/src/Bundle/ChillMainBundle/Export/Formatter/CSVListFormatter.php
@@ -17,7 +17,6 @@ use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function count;
 
 // command to get the report with curl : curl --user "center a_social:password" "http://localhost:8000/fr/exports/generate/count_person?export[filters][person_gender_filter][enabled]=&export[filters][person_nationality_filter][enabled]=&export[filters][person_nationality_filter][form][nationalities]=&export[aggregators][person_nationality_aggregator][order]=1&export[aggregators][person_nationality_aggregator][form][group_by_level]=country&export[submit]=&export[_token]=RHpjHl389GrK-bd6iY5NsEqrD5UKOTHH40QKE9J1edU" --globoff
 
diff --git a/src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php b/src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php
index 3c5e90381..0a35e087f 100644
--- a/src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php
+++ b/src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php
@@ -21,7 +21,6 @@ use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use function count;
 
 // command to get the report with curl : curl --user "center a_social:password" "http://localhost:8000/fr/exports/generate/count_person?export[filters][person_gender_filter][enabled]=&export[filters][person_nationality_filter][enabled]=&export[filters][person_nationality_filter][form][nationalities]=&export[aggregators][person_nationality_aggregator][order]=1&export[aggregators][person_nationality_aggregator][form][group_by_level]=country&export[submit]=&export[_token]=RHpjHl389GrK-bd6iY5NsEqrD5UKOTHH40QKE9J1edU" --globoff
 
diff --git a/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php b/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php
index 111be4089..de9cdd270 100644
--- a/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php
+++ b/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php
@@ -18,12 +18,15 @@ use Doctrine\ORM\EntityRepository;
 use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ObjectRepository;
+use libphonenumber\PhoneNumber;
+use libphonenumber\PhoneNumberFormat;
+use libphonenumber\PhoneNumberUtil;
 
 class ThirdPartyRepository implements ObjectRepository
 {
     private readonly EntityRepository $repository;
 
-    public function __construct(EntityManagerInterface $em, private readonly Connection $connection)
+    public function __construct(EntityManagerInterface $em, private readonly Connection $connection, private readonly PhoneNumberUtil $phonenumberUtil)
     {
         $this->repository = $em->getRepository(ThirdParty::class);
     }
@@ -122,6 +125,43 @@ class ThirdPartyRepository implements ObjectRepository
         return $this->repository->findBy($criteria, $orderBy, $limit, $offset);
     }
 
+    /**
+     * Finds third-party records by phone number.
+     *
+     * The search is performed agains every phonenumber field (there are two phonenumber on a thirdParty).
+     *
+     * @param string|PhoneNumber $phonenumber The phone number to search for. Can be a string or a PhoneNumber object.
+     * @param int                $firstResult the index of the first result to retrieve (pagination start)
+     * @param int                $maxResults  the maximum number of results to retrieve (pagination limit)
+     *
+     * @return list<ThirdParty> the result set containing matching third-party records
+     */
+    public function findByPhonenumber(string|PhoneNumber $phonenumber, int $firstResult = 0, int $maxResults = 20): array
+    {
+        if ('' === $phonenumber) {
+            return [];
+        }
+
+        $qb = $this->createQueryBuilder('tp');
+        $qb->select('tp');
+
+        $qb->where(
+            $qb->expr()->orX(
+                $qb->expr()->eq('t.telephone', ':phonenumber'),
+                $qb->expr()->eq('t.telephone2', ':phonenumber')
+            )
+        );
+
+        $qb->setParameter(
+            'phonenumber',
+            is_string($phonenumber) ? $phonenumber : $this->phonenumberUtil->format($phonenumber, PhoneNumberFormat::E164)
+        );
+
+        $qb->setFirstResult($firstResult)->setMaxResults($maxResults);
+
+        return $qb->getQuery()->getResult();
+    }
+
     /**
      * Search amongst parties associated to $centers, with $terms parameters.
      *
diff --git a/src/Bundle/ChillTicketBundle/chill.api.specs.yaml b/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
index 77bf2797d..3e40cab66 100644
--- a/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
@@ -164,8 +164,8 @@ paths:
                                     type: array
                                     items:
                                         oneOf:
-                                            - $ref: '#/components/schemas/UserGroupById'
-                                            - $ref: '#/components/schemas/UserById'
+                                            -   $ref: '#/components/schemas/UserGroupById'
+                                            -   $ref: '#/components/schemas/UserById'
 
 
             responses:
@@ -197,8 +197,8 @@ paths:
                             properties:
                                 addressee:
                                     oneOf:
-                                        - $ref: '#/components/schemas/UserGroupById'
-                                        - $ref: '#/components/schemas/UserById'
+                                        -   $ref: '#/components/schemas/UserGroupById'
+                                        -   $ref: '#/components/schemas/UserById'
 
 
             responses:
@@ -288,3 +288,82 @@ paths:
                     description: "OK"
                 401:
                     description: "UNAUTHORIZED"
+
+    /1.0/ticket/ticket/{id}/set-caller:
+        post:
+            tags:
+                - ticket
+            summary: Set a caller for this ticket
+            description: |
+                Set a caller to the ticket.
+
+                To remove the caller, set the caller field to null
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The ticket id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            requestBody:
+                required: true
+                content:
+                    application/json:
+                        schema:
+                            type: object
+                            properties:
+                                caller:
+                                    nullable: true
+                                    oneOf:
+                                        -   $ref: '#/components/schemas/PersonById'
+                                        -   $ref: '#/components/schemas/ThirdPartyById'
+                        examples:
+                            add_user:
+                                value:
+                                    caller:
+                                        type: person
+                                        id: 8
+                                summary: Set the person with id 8
+                            add_third_party:
+                                value:
+                                    caller:
+                                        type: thirdparty
+                                        id: 10
+                                summary: Set the third party with id 10
+                            remove:
+                                value:
+                                    caller: null
+                                summary: Remove the caller (set the caller to null)
+
+            responses:
+                200:
+                    description: "OK"
+                401:
+                    description: "UNAUTHORIZED"
+    /1.0/ticket/ticket/{id}/suggest-person:
+        get:
+            tags:
+                - ticket
+            summary: Get a list of person suggested for the given ticket
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The ticket id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            responses:
+                401:
+                    description: "UNAUTHORIZED"
+                200:
+                    description: "OK"
+                    content:
+                        application/json:
+                            schema:
+                                type: array
+                                items:
+                                    $ref: '#/components/schemas/Person'
diff --git a/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/AssociateByPhonenumberCommandHandler.php b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/AssociateByPhonenumberCommandHandler.php
index d794250c5..a5518504f 100644
--- a/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/AssociateByPhonenumberCommandHandler.php
+++ b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/AssociateByPhonenumberCommandHandler.php
@@ -13,8 +13,9 @@ namespace Chill\TicketBundle\Action\Ticket\Handler;
 
 use Chill\MainBundle\Phonenumber\PhonenumberHelper;
 use Chill\PersonBundle\Repository\PersonACLAwareRepositoryInterface;
+use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
 use Chill\TicketBundle\Action\Ticket\AssociateByPhonenumberCommand;
-use Chill\TicketBundle\Entity\PersonHistory;
+use Chill\TicketBundle\Entity\CallerHistory;
 use Chill\TicketBundle\Entity\Ticket;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Clock\ClockInterface;
@@ -23,6 +24,7 @@ class AssociateByPhonenumberCommandHandler
 {
     public function __construct(
         private readonly PersonACLAwareRepositoryInterface $personRepository,
+        private readonly ThirdPartyRepository $thirdPartyRepository,
         private readonly PhonenumberHelper $phonenumberHelper,
         private readonly ClockInterface $clock,
         private readonly EntityManagerInterface $entityManager,
@@ -31,10 +33,13 @@ class AssociateByPhonenumberCommandHandler
     public function __invoke(Ticket $ticket, AssociateByPhonenumberCommand $command): void
     {
         $phone = $this->phonenumberHelper->parse($command->phonenumber);
-        $persons = $this->personRepository->findByPhone($phone);
+        $callers = [
+            ...$this->personRepository->findByPhone($phone),
+            ...$this->thirdPartyRepository->findByPhonenumber($phone),
+        ];
 
-        foreach ($persons as $person) {
-            $history = new PersonHistory($person, $ticket, $this->clock->now());
+        if (count($callers) > 0) {
+            $history = new CallerHistory($callers[0], $ticket, $this->clock->now());
             $this->entityManager->persist($history);
         }
     }
diff --git a/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/SetCallerCommandHandler.php b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/SetCallerCommandHandler.php
new file mode 100644
index 000000000..ae37f3945
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/SetCallerCommandHandler.php
@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Action\Ticket\Handler;
+
+use Chill\TicketBundle\Action\Ticket\SetCallerCommand;
+use Chill\TicketBundle\Entity\CallerHistory;
+use Chill\TicketBundle\Entity\Ticket;
+use Symfony\Component\Clock\ClockInterface;
+
+/**
+ * Handler for setting the caller of a ticket.
+ */
+class SetCallerCommandHandler
+{
+    public function __construct(private readonly ClockInterface $clock) {}
+
+    public function __invoke(Ticket $ticket, SetCallerCommand $command): Ticket
+    {
+        // If the ticket already has the requested caller, return it without changes
+        $currentCaller = $ticket->getCaller();
+        if ($currentCaller === $command->caller) {
+            return $ticket;
+        }
+
+        // End the current caller history (if any)
+        foreach ($ticket->getCallerHistories() as $callerHistory) {
+            if (null === $callerHistory->getEndDate()) {
+                $callerHistory->setEndDate($this->clock->now());
+            }
+        }
+
+        // Create a new caller history with the new caller
+        new CallerHistory(
+            $command->caller,
+            $ticket,
+            $this->clock->now(),
+        );
+
+        return $ticket;
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Action/Ticket/SetCallerCommand.php b/src/Bundle/ChillTicketBundle/src/Action/Ticket/SetCallerCommand.php
new file mode 100644
index 000000000..2589abac4
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Action/Ticket/SetCallerCommand.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Action\Ticket;
+
+use Chill\PersonBundle\Entity\Person;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+
+/**
+ * Command to set the caller of a ticket.
+ * The caller can be either a Person or a ThirdParty.
+ */
+final readonly class SetCallerCommand
+{
+    /**
+     * @param Person|ThirdParty|null $caller The caller to associate with the ticket
+     */
+    public function __construct(
+        public Person|ThirdParty|null $caller,
+    ) {}
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Controller/SetCallerApiController.php b/src/Bundle/ChillTicketBundle/src/Controller/SetCallerApiController.php
new file mode 100644
index 000000000..8393ca4d4
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Controller/SetCallerApiController.php
@@ -0,0 +1,66 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Controller;
+
+use Chill\TicketBundle\Action\Ticket\SetCallerCommand;
+use Chill\TicketBundle\Action\Ticket\Handler\SetCallerCommandHandler;
+use Chill\TicketBundle\Entity\Ticket;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\HttpFoundation\JsonResponse;
+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\Component\Serializer\SerializerInterface;
+
+/**
+ * Controller for setting the caller of a ticket.
+ */
+final readonly class SetCallerApiController
+{
+    public function __construct(
+        private SetCallerCommandHandler $setCallerCommandHandler,
+        private Security $security,
+        private EntityManagerInterface $entityManager,
+        private SerializerInterface $serializer,
+    ) {}
+
+    #[Route('/api/1.0/ticket/ticket/{id}/set-caller', name: 'chill_ticket_ticket_set_caller_api', requirements: ['id' => '\d+'], methods: ['POST'])]
+    public function setCaller(Ticket $ticket, Request $request): Response
+    {
+        if (!$this->security->isGranted('ROLE_USER')) {
+            throw new AccessDeniedHttpException('Only users are allowed to set ticket callers.');
+        }
+
+        try {
+            /** @var SetCallerCommand $command */
+            $command = $this->serializer->deserialize(
+                $request->getContent(),
+                SetCallerCommand::class,
+                'json'
+            );
+        } catch (\Throwable $e) {
+            throw new BadRequestHttpException('Invalid request body: '.$e->getMessage(), $e);
+        }
+
+        $this->setCallerCommandHandler->__invoke($ticket, $command);
+
+        $this->entityManager->flush();
+
+        return new JsonResponse(
+            $this->serializer->serialize($ticket, 'json', ['groups' => ['read']]),
+            json: true
+        );
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Controller/SuggestPersonForTicketApiController.php b/src/Bundle/ChillTicketBundle/src/Controller/SuggestPersonForTicketApiController.php
new file mode 100644
index 000000000..a71065b73
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Controller/SuggestPersonForTicketApiController.php
@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Controller;
+
+use Chill\TicketBundle\Entity\Ticket;
+use Chill\TicketBundle\Service\Ticket\SuggestPersonForTicketInterface;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\SerializerInterface;
+
+final readonly class SuggestPersonForTicketApiController
+{
+    public function __construct(
+        private SuggestPersonForTicketInterface $suggestPersonForTicket,
+        private SerializerInterface $serializer,
+        private Security $security,
+    ) {}
+
+    #[Route('/api/1.0/ticket/ticket/{id}/suggest-person', name: 'chill_ticket_ticket_suggest_person_api', requirements: ['id' => '\d+'], methods: ['GET'])]
+    public function __invoke(Ticket $ticket): Response
+    {
+        if (!$this->security->isGranted('ROLE_USER')) {
+            throw new AccessDeniedHttpException('Only users are allowed to suggest persons for tickets.');
+        }
+
+        $persons = $this->suggestPersonForTicket->suggestPerson($ticket, 0, 10);
+
+        return new JsonResponse(
+            $this->serializer->serialize($persons, 'json', ['groups' => ['read']]),
+            json: true,
+        );
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Entity/CallerHistory.php b/src/Bundle/ChillTicketBundle/src/Entity/CallerHistory.php
new file mode 100644
index 000000000..491f347a5
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Entity/CallerHistory.php
@@ -0,0 +1,148 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Entity;
+
+use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
+use Chill\MainBundle\Doctrine\Model\TrackCreationTrait;
+use Chill\PersonBundle\Entity\Person;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation as Serializer;
+
+/**
+ * Represents the history of a caller associated with a ticket.
+ *
+ * This entity is used to track the changes in a ticket's caller over time.
+ * The caller can be either a Person or a ThirdParty.
+ * Implements the TrackCreationInterface for tracking entity lifecycle creation.
+ */
+#[ORM\Entity]
+#[ORM\Table(name: 'caller_history', schema: 'chill_ticket')]
+#[Serializer\DiscriminatorMap(typeProperty: 'type', mapping: ['ticket_caller_history' => CallerHistory::class])]
+class CallerHistory implements TrackCreationInterface
+{
+    use TrackCreationTrait;
+
+    #[ORM\Id]
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::INTEGER, nullable: false)]
+    #[ORM\GeneratedValue(strategy: 'AUTO')]
+    #[Serializer\Groups(['read'])]
+    private ?int $id = null;
+
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::DATETIME_IMMUTABLE, nullable: true, options: ['default' => null])]
+    #[Serializer\Groups(['read'])]
+    private ?\DateTimeImmutable $endDate = null;
+
+    #[ORM\ManyToOne(targetEntity: Person::class)]
+    #[ORM\JoinColumn(nullable: true)]
+    #[Serializer\Groups(['read'])]
+    private ?Person $person = null;
+
+    #[ORM\ManyToOne(targetEntity: ThirdParty::class)]
+    #[ORM\JoinColumn(nullable: true)]
+    #[Serializer\Groups(['read'])]
+    private ?ThirdParty $thirdParty = null;
+
+    public function __construct(
+        ThirdParty|Person|null $caller,
+        #[ORM\ManyToOne(targetEntity: Ticket::class)]
+        #[ORM\JoinColumn(nullable: false)]
+        private Ticket $ticket,
+        #[ORM\Column(type: \Doctrine\DBAL\Types\Types::DATETIME_IMMUTABLE, nullable: false)]
+        #[Serializer\Groups(['read'])]
+        private \DateTimeImmutable $startDate = new \DateTimeImmutable('now'),
+    ) {
+        $this->setCaller($caller);
+        $ticket->addCallerHistory($this);
+    }
+
+    public function getEndDate(): ?\DateTimeImmutable
+    {
+        return $this->endDate;
+    }
+
+    public function getId(): ?int
+    {
+        return $this->id;
+    }
+
+    public function getPerson(): ?Person
+    {
+        return $this->person;
+    }
+
+    public function getThirdParty(): ?ThirdParty
+    {
+        return $this->thirdParty;
+    }
+
+    public function getStartDate(): \DateTimeImmutable
+    {
+        return $this->startDate;
+    }
+
+    public function getTicket(): Ticket
+    {
+        return $this->ticket;
+    }
+
+    public function setEndDate(?\DateTimeImmutable $endDate): void
+    {
+        $this->endDate = $endDate;
+    }
+
+    public function setPerson(?Person $person): self
+    {
+        $this->person = $person;
+
+        // If setting a person, ensure thirdParty is null
+        if (null !== $person) {
+            $this->thirdParty = null;
+        }
+
+        return $this;
+    }
+
+    public function setThirdParty(?ThirdParty $thirdParty): self
+    {
+        $this->thirdParty = $thirdParty;
+
+        // If setting a thirdParty, ensure person is null
+        if (null !== $thirdParty) {
+            $this->person = null;
+        }
+
+        return $this;
+    }
+
+    /**
+     * Set the caller.
+     *
+     * This is a private method and should be only called while instance creation
+     */
+    private function setCaller(Person|ThirdParty|null $caller): void
+    {
+        if ($caller instanceof Person) {
+            $this->setPerson($caller);
+        } elseif ($caller instanceof ThirdParty) {
+            $this->setThirdParty($caller);
+        }
+    }
+
+    /**
+     * Get the caller, which can be either a Person or a ThirdParty.
+     */
+    public function getCaller(): Person|ThirdParty|null
+    {
+        return $this->person ?? $this->thirdParty;
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php b/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php
index 8ef4f64a9..092aa5a35 100644
--- a/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php
+++ b/src/Bundle/ChillTicketBundle/src/Entity/Ticket.php
@@ -96,6 +96,12 @@ class Ticket implements TrackCreationInterface, TrackUpdateInterface
     #[ORM\OneToMany(targetEntity: EmergencyStatusHistory::class, mappedBy: 'ticket', cascade: ['persist', 'remove'])]
     private Collection $emergencyStatusHistories;
 
+    /**
+     * @var Collection<int, CallerHistory>
+     */
+    #[ORM\OneToMany(targetEntity: CallerHistory::class, mappedBy: 'ticket', cascade: ['persist', 'remove'])]
+    private Collection $callerHistories;
+
     public function __construct()
     {
         $this->addresseeHistory = new ArrayCollection();
@@ -105,6 +111,7 @@ class Ticket implements TrackCreationInterface, TrackUpdateInterface
         $this->inputHistories = new ArrayCollection();
         $this->stateHistories = new ArrayCollection();
         $this->emergencyStatusHistories = new ArrayCollection();
+        $this->callerHistories = new ArrayCollection();
     }
 
     public function getId(): ?int
@@ -294,4 +301,36 @@ class Ticket implements TrackCreationInterface, TrackUpdateInterface
     {
         return $this->emergencyStatusHistories;
     }
+
+    /**
+     * @internal use @see{CallerHistory::__construct} instead
+     */
+    public function addCallerHistory(CallerHistory $callerHistory): void
+    {
+        $this->callerHistories->add($callerHistory);
+    }
+
+    /**
+     * Get the current caller (Person or ThirdParty) associated with this ticket.
+     *
+     * @return Person|ThirdParty|null
+     */
+    public function getCaller()
+    {
+        foreach ($this->callerHistories as $callerHistory) {
+            if (null === $callerHistory->getEndDate()) {
+                return $callerHistory->getCaller();
+            }
+        }
+
+        return null;
+    }
+
+    /**
+     * @return ReadableCollection<int, CallerHistory>
+     */
+    public function getCallerHistories(): ReadableCollection
+    {
+        return $this->callerHistories;
+    }
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Repository/PersonTicketACLAwareRepository.php b/src/Bundle/ChillTicketBundle/src/Repository/PersonTicketACLAwareRepository.php
new file mode 100644
index 000000000..21b61eb18
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Repository/PersonTicketACLAwareRepository.php
@@ -0,0 +1,60 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Repository;
+
+use Chill\PersonBundle\Entity\Person;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\Query\ResultSetMappingBuilder;
+
+final readonly class PersonTicketACLAwareRepository implements PersonTicketACLAwareRepositoryInterface
+{
+    public function __construct(private EntityManagerInterface $em) {}
+
+    public function findPersonPreviouslyAssociatedWithCaller(Person|ThirdParty $caller, int $start = 0, int $limit = 100): array
+    {
+        $resultSetMappingBuilder = new ResultSetMappingBuilder($this->em);
+        $resultSetMappingBuilder->addRootEntityFromClassMetadata(Person::class, 'p');
+
+        $callerClause = match ($caller instanceof Person) {
+            true => 'caller_history.person_id = :callerId',
+            false => 'caller_history.thirdparty_id = :callerId',
+        };
+
+        $query = <<<SQL
+        SELECT DISTINCT {$resultSetMappingBuilder->generateSelectClause()} FROM chill_person_person p
+        WHERE p.id IN (
+            SELECT person_id
+            FROM chill_ticket.person_history person_history
+            WHERE person_history.endDate IS NULL
+              AND EXISTS (
+                SELECT 1 FROM chill_ticket.caller_history
+                WHERE
+                    caller_history.ticket_id = person_history.ticket_id
+                  AND caller_history.endDate IS NULL
+                  AND {$callerClause}
+            )
+            ORDER BY person_history.startDate DESC, p.id ASC
+        )
+        OFFSET :start LIMIT :limit;
+        SQL;
+
+        $nql = $this->em->createNativeQuery($query, $resultSetMappingBuilder);
+        $nql
+            ->setParameter('callerId', $caller->getId())
+            ->setParameter('start', $start)
+            ->setParameter('limit', $limit);
+
+
+        return $nql->getResult();
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Repository/PersonTicketACLAwareRepositoryInterface.php b/src/Bundle/ChillTicketBundle/src/Repository/PersonTicketACLAwareRepositoryInterface.php
new file mode 100644
index 000000000..dd1a1d014
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Repository/PersonTicketACLAwareRepositoryInterface.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Repository;
+
+use Chill\PersonBundle\Entity\Person;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+
+/**
+ * Interface for repository operations related to accessing and managing
+ * person tickets within an ACL-aware context.
+ */
+interface PersonTicketACLAwareRepositoryInterface
+{
+    /**
+     * Find all the Person entity that were previously associated with a ticket with the same caller.
+     *
+     * @return list<Person>
+     */
+    public function findPersonPreviouslyAssociatedWithCaller(Person|ThirdParty $caller, int $start = 0, int $limit = 100): array;
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php b/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
index 87aa5ad05..b10a0873d 100644
--- a/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
+++ b/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
@@ -15,6 +15,7 @@ use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\UserGroup;
 use Chill\PersonBundle\Entity\Person;
 use Chill\TicketBundle\Entity\AddresseeHistory;
+use Chill\TicketBundle\Entity\CallerHistory;
 use Chill\TicketBundle\Entity\Comment;
 use Chill\TicketBundle\Entity\EmergencyStatusHistory;
 use Chill\TicketBundle\Entity\MotiveHistory;
@@ -53,6 +54,7 @@ final class TicketNormalizer implements NormalizerInterface, NormalizerAwareInte
             'createdBy' => $this->normalizer->normalize($object->getCreatedBy(), $format, $context),
             'currentState' => $object->getState()?->value ?? 'open',
             'emergency' => $object->getEmergencyStatus()?->value ?? 'no',
+            'caller' => $this->normalizer->normalize($object->getCaller(), $format, ['groups' => 'read']),
         ];
     }
 
@@ -115,6 +117,17 @@ final class TicketNormalizer implements NormalizerInterface, NormalizerAwareInte
                 ],
                 $ticket->getEmergencyStatusHistories()->toArray(),
             ),
+            ...array_map(
+                fn (CallerHistory $stateHistory) => [
+                    'event_type' => 'set_caller',
+                    'at' => $stateHistory->getStartDate(),
+                    'by' => $stateHistory->getCreatedBy(),
+                    'data' => [
+                        'new_caller' => $this->normalizer->normalize($ticket->getCaller(), $format, ['groups' => ['read']]),
+                    ],
+                ],
+                $ticket->getCallerHistories()->toArray(),
+            ),
         ];
 
         if (null !== $ticket->getCreatedBy() && null !== $ticket->getCreatedAt()) {
diff --git a/src/Bundle/ChillTicketBundle/src/Service/Ticket/SuggestPersonForTicket.php b/src/Bundle/ChillTicketBundle/src/Service/Ticket/SuggestPersonForTicket.php
new file mode 100644
index 000000000..a454408dd
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Service/Ticket/SuggestPersonForTicket.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Service\Ticket;
+
+use Chill\TicketBundle\Entity\Ticket;
+use Chill\TicketBundle\Repository\PersonTicketACLAwareRepositoryInterface;
+
+final readonly class SuggestPersonForTicket implements SuggestPersonForTicketInterface
+{
+    public function __construct(private PersonTicketACLAwareRepositoryInterface $personTicketACLAwareRepository) {}
+
+    public function suggestPerson(Ticket $ticket, int $start = 0, int $limit = 20): array
+    {
+        $caller = $ticket->getCaller();
+        if (null === $caller) {
+            return [];
+        }
+
+        return $this->personTicketACLAwareRepository->findPersonPreviouslyAssociatedWithCaller($caller, $start, $limit);
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Service/Ticket/SuggestPersonForTicketInterface.php b/src/Bundle/ChillTicketBundle/src/Service/Ticket/SuggestPersonForTicketInterface.php
new file mode 100644
index 000000000..10d0eb31b
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Service/Ticket/SuggestPersonForTicketInterface.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Service\Ticket;
+
+use Chill\PersonBundle\Entity\Person;
+use Chill\TicketBundle\Entity\Ticket;
+
+/**
+ * Suggest Person entities for a ticket.
+ */
+interface SuggestPersonForTicketInterface
+{
+    /**
+     * @return list<Person>
+     */
+    public function suggestPerson(Ticket $ticket, int $start = 0, int $limit = 20): array;
+}
diff --git a/src/Bundle/ChillTicketBundle/src/config/services.yaml b/src/Bundle/ChillTicketBundle/src/config/services.yaml
index 331e03898..e5618284a 100644
--- a/src/Bundle/ChillTicketBundle/src/config/services.yaml
+++ b/src/Bundle/ChillTicketBundle/src/config/services.yaml
@@ -17,6 +17,9 @@ services:
     Chill\TicketBundle\Serializer\:
         resource: '../Serializer/'
 
+    Chill\TicketBundle\Service\:
+        resource: '../Service/'
+
     Chill\TicketBundle\Menu\:
         resource: '../Menu/'
 
diff --git a/src/Bundle/ChillTicketBundle/src/migrations/Version20250624105842.php b/src/Bundle/ChillTicketBundle/src/migrations/Version20250624105842.php
new file mode 100644
index 000000000..1a49a4f5b
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/migrations/Version20250624105842.php
@@ -0,0 +1,93 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\Migrations\Ticket;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20250624105842 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add CallerHistory entity to associate a ticket with either a Person or a ThirdParty entity';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql(<<<'SQL'
+            CREATE SEQUENCE chill_ticket.caller_history_id_seq INCREMENT BY 1 MINVALUE 1 START 1
+        SQL);
+        $this->addSql(<<<'SQL'
+            CREATE TABLE chill_ticket.caller_history (id INT NOT NULL, person_id INT DEFAULT NULL, ticket_id INT NOT NULL, endDate TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, startDate TIMESTAMP(0) WITHOUT TIME ZONE NOT NULL, createdAt TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL, thirdParty_id INT DEFAULT NULL, createdBy_id INT DEFAULT NULL, PRIMARY KEY(id))
+        SQL);
+        $this->addSql(<<<'SQL'
+            CREATE INDEX IDX_AD0DCE24217BBB47 ON chill_ticket.caller_history (person_id)
+        SQL);
+        $this->addSql(<<<'SQL'
+            CREATE INDEX IDX_AD0DCE243EA5CAB0 ON chill_ticket.caller_history (thirdParty_id)
+        SQL);
+        $this->addSql(<<<'SQL'
+            CREATE INDEX IDX_AD0DCE24700047D2 ON chill_ticket.caller_history (ticket_id)
+        SQL);
+        $this->addSql(<<<'SQL'
+            CREATE INDEX IDX_AD0DCE243174800F ON chill_ticket.caller_history (createdBy_id)
+        SQL);
+        $this->addSql(<<<'SQL'
+            COMMENT ON COLUMN chill_ticket.caller_history.endDate IS '(DC2Type:datetime_immutable)'
+        SQL);
+        $this->addSql(<<<'SQL'
+            COMMENT ON COLUMN chill_ticket.caller_history.startDate IS '(DC2Type:datetime_immutable)'
+        SQL);
+        $this->addSql(<<<'SQL'
+            COMMENT ON COLUMN chill_ticket.caller_history.createdAt IS '(DC2Type:datetime_immutable)'
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE chill_ticket.caller_history ADD CONSTRAINT FK_AD0DCE24217BBB47 FOREIGN KEY (person_id) REFERENCES chill_person_person (id) NOT DEFERRABLE INITIALLY IMMEDIATE
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE chill_ticket.caller_history ADD CONSTRAINT FK_AD0DCE243EA5CAB0 FOREIGN KEY (thirdParty_id) REFERENCES chill_3party.third_party (id) NOT DEFERRABLE INITIALLY IMMEDIATE
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE chill_ticket.caller_history ADD CONSTRAINT FK_AD0DCE24700047D2 FOREIGN KEY (ticket_id) REFERENCES chill_ticket.ticket (id) NOT DEFERRABLE INITIALLY IMMEDIATE
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE chill_ticket.caller_history ADD CONSTRAINT FK_AD0DCE243174800F FOREIGN KEY (createdBy_id) REFERENCES users (id) NOT DEFERRABLE INITIALLY IMMEDIATE
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE chill_ticket.caller_history ADD CONSTRAINT caller_history_not_overlaps
+            exclude using gist (ticket_id with =, tsrange(startdate, enddate) with &&)
+            deferrable initially deferred
+        SQL);
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql(<<<'SQL'
+            DROP SEQUENCE chill_ticket.caller_history_id_seq CASCADE
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE chill_ticket.caller_history DROP CONSTRAINT FK_AD0DCE24217BBB47
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE chill_ticket.caller_history DROP CONSTRAINT FK_AD0DCE243EA5CAB0
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE chill_ticket.caller_history DROP CONSTRAINT FK_AD0DCE24700047D2
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE chill_ticket.caller_history DROP CONSTRAINT FK_AD0DCE243174800F
+        SQL);
+        $this->addSql(<<<'SQL'
+            DROP TABLE chill_ticket.caller_history
+        SQL);
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/AssociateByPhonenumberCommandHandlerTest.php b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/AssociateByPhonenumberCommandHandlerTest.php
index 5ade6ec82..067443bd9 100644
--- a/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/AssociateByPhonenumberCommandHandlerTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/AssociateByPhonenumberCommandHandlerTest.php
@@ -14,10 +14,13 @@ namespace Chill\TicketBundle\Tests\Action\Ticket\Handler;
 use Chill\MainBundle\Phonenumber\PhonenumberHelper;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Repository\PersonACLAwareRepositoryInterface;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Chill\ThirdPartyBundle\Repository\ThirdPartyRepository;
 use Chill\TicketBundle\Action\Ticket\AssociateByPhonenumberCommand;
 use Chill\TicketBundle\Action\Ticket\Handler\AssociateByPhonenumberCommandHandler;
 use Chill\TicketBundle\Entity\Ticket;
 use Doctrine\ORM\EntityManagerInterface;
+use libphonenumber\PhoneNumber;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
@@ -37,6 +40,7 @@ class AssociateByPhonenumberCommandHandlerTest extends TestCase
 
     private function getHandler(
         PersonACLAwareRepositoryInterface $personACLAwareRepository,
+        ThirdPartyRepository $thirdPartyRepository,
     ): AssociateByPhonenumberCommandHandler {
         $entityManager = $this->prophesize(EntityManagerInterface::class);
         $phonenumberHelper = new PhonenumberHelper(
@@ -51,6 +55,7 @@ class AssociateByPhonenumberCommandHandlerTest extends TestCase
 
         return new AssociateByPhonenumberCommandHandler(
             $personACLAwareRepository,
+            $thirdPartyRepository,
             $phonenumberHelper,
             new MockClock(),
             $entityManager->reveal()
@@ -63,12 +68,29 @@ class AssociateByPhonenumberCommandHandlerTest extends TestCase
 
         $personAclAwareRepository = $this->prophesize(PersonACLAwareRepositoryInterface::class);
         $personAclAwareRepository->findByPhone(Argument::any())->willReturn([$person]);
+        $thirdPartyRepository = $this->prophesize(ThirdPartyRepository::class);
+        $thirdPartyRepository->findByPhonenumber(Argument::type(PhoneNumber::class))->willReturn([]);
 
-        $handler = $this->getHandler($personAclAwareRepository->reveal());
+        $handler = $this->getHandler($personAclAwareRepository->reveal(), $thirdPartyRepository->reveal());
 
         $ticket = new Ticket();
         $handler($ticket, new AssociateByPhonenumberCommand('+3281136917'));
 
-        self::assertSame($person, $ticket->getPersons()[0]);
+        self::assertSame($person, $ticket->getCaller());
+    }
+
+    public function testHandleWithThirdPartyFoundByPhonenumber(): void
+    {
+        $personAclAwareRepository = $this->prophesize(PersonACLAwareRepositoryInterface::class);
+        $personAclAwareRepository->findByPhone(Argument::any())->willReturn([]);
+        $thirdPartyRepository = $this->prophesize(ThirdPartyRepository::class);
+        $thirdPartyRepository->findByPhonenumber(Argument::type(PhoneNumber::class))->willReturn([$thirdParty = new ThirdParty()]);
+
+        $handler = $this->getHandler($personAclAwareRepository->reveal(), $thirdPartyRepository->reveal());
+
+        $ticket = new Ticket();
+        $handler($ticket, new AssociateByPhonenumberCommand('081136917'));
+
+        self::assertSame($thirdParty, $ticket->getCaller());
     }
 }
diff --git a/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/SetCallerCommandHandlerTest.php b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/SetCallerCommandHandlerTest.php
new file mode 100644
index 000000000..e2e8a642b
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/SetCallerCommandHandlerTest.php
@@ -0,0 +1,178 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Tests\Action\Ticket\Handler;
+
+use Chill\PersonBundle\Entity\Person;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Chill\TicketBundle\Action\Ticket\Handler\SetCallerCommandHandler;
+use Chill\TicketBundle\Action\Ticket\SetCallerCommand;
+use Chill\TicketBundle\Entity\CallerHistory;
+use Chill\TicketBundle\Entity\Ticket;
+use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Component\Clock\ClockInterface;
+use Symfony\Component\Clock\MockClock;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class SetCallerCommandHandlerTest extends TestCase
+{
+    use ProphecyTrait;
+
+    private \DateTimeImmutable $now;
+    private ClockInterface $clock;
+    private SetCallerCommandHandler $handler;
+
+    protected function setUp(): void
+    {
+        $this->now = new \DateTimeImmutable('2023-01-01 12:00:00');
+        $this->clock = new MockClock($this->now);
+        $this->handler = new SetCallerCommandHandler($this->clock);
+    }
+
+    public function testSetPersonAsCaller(): void
+    {
+        // Arrange
+        $ticket = new Ticket();
+        $person = new Person();
+        $command = new SetCallerCommand($person);
+
+        // Act
+        $result = ($this->handler)($ticket, $command);
+
+        // Assert
+        self::assertSame($ticket, $result);
+        self::assertSame($person, $ticket->getCaller());
+        self::assertCount(1, $ticket->getCallerHistories());
+
+        $callerHistory = $ticket->getCallerHistories()->first();
+        self::assertInstanceOf(CallerHistory::class, $callerHistory);
+        self::assertSame($person, $callerHistory->getPerson());
+        self::assertNull($callerHistory->getThirdParty());
+        self::assertEquals($this->now->getTimestamp(), $callerHistory->getStartDate()->getTimestamp());
+        self::assertNull($callerHistory->getEndDate());
+    }
+
+    public function testSetThirdPartyAsCaller(): void
+    {
+        // Arrange
+        $ticket = new Ticket();
+        $thirdParty = new ThirdParty();
+        $command = new SetCallerCommand($thirdParty);
+
+        // Act
+        $result = ($this->handler)($ticket, $command);
+
+        // Assert
+        self::assertSame($ticket, $result);
+        self::assertSame($thirdParty, $ticket->getCaller());
+        self::assertCount(1, $ticket->getCallerHistories());
+
+        $callerHistory = $ticket->getCallerHistories()->first();
+        self::assertInstanceOf(CallerHistory::class, $callerHistory);
+        self::assertNull($callerHistory->getPerson());
+        self::assertSame($thirdParty, $callerHistory->getThirdParty());
+        self::assertEquals($this->now->getTimestamp(), $callerHistory->getStartDate()->getTimestamp());
+        self::assertNull($callerHistory->getEndDate());
+    }
+
+    public function testChangeCallerFromPersonToThirdParty(): void
+    {
+        // Arrange
+        $ticket = new Ticket();
+        $person = new Person();
+        $thirdParty = new ThirdParty();
+
+        // Set initial person caller
+        $initialCallerHistory = new CallerHistory($person, $ticket, $this->now);
+        $initialCallerHistory->setPerson($person);
+
+        // Create command to change to third party
+        $command = new SetCallerCommand($thirdParty);
+
+        // Act
+        $this->clock->modify('+ 10 minutes');
+        $result = ($this->handler)($ticket, $command);
+
+        // Assert
+        self::assertSame($ticket, $result);
+        self::assertSame($thirdParty, $ticket->getCaller());
+        self::assertCount(2, $ticket->getCallerHistories());
+
+        // Check that the first history is ended
+        $firstCallerHistory = $ticket->getCallerHistories()->first();
+        self::assertSame($person, $firstCallerHistory->getPerson());
+        self::assertEquals($this->clock->now()->getTimestamp(), $firstCallerHistory->getEndDate()->getTimestamp());
+
+        // Check that the new history is created correctly
+        $lastCallerHistory = $ticket->getCallerHistories()->last();
+        self::assertNull($lastCallerHistory->getPerson());
+        self::assertSame($thirdParty, $lastCallerHistory->getThirdParty());
+        self::assertSame($this->clock->now()->getTimestamp(), $lastCallerHistory->getStartDate()->getTimestamp());
+        self::assertNull($lastCallerHistory->getEndDate());
+    }
+
+    public function testRemoveCaller(): void
+    {
+        // Arrange
+        $ticket = new Ticket();
+        $person = new Person();
+
+        // Set initial person caller
+        $initialCallerHistory = new CallerHistory($person, $ticket, $this->now);
+
+        // Create command to remove caller
+        $command = new SetCallerCommand(null);
+
+        // Act
+        $result = ($this->handler)($ticket, $command);
+
+        // Assert
+        self::assertSame($ticket, $result);
+        self::assertNull($ticket->getCaller());
+        self::assertCount(2, $ticket->getCallerHistories());
+
+        // Check that the history is ended
+        $callerHistory = $ticket->getCallerHistories()->first();
+        self::assertSame($person, $callerHistory->getPerson());
+        self::assertEquals($this->now->getTimestamp(), $callerHistory->getEndDate()->getTimestamp());
+    }
+
+    public function testNoChangeWhenCallerIsAlreadySet(): void
+    {
+        // Arrange
+        $ticket = new Ticket();
+        $person = new Person();
+
+        // Set initial person caller
+        $initialCallerHistory = new CallerHistory($person, $ticket, $this->now);
+
+        // Create command with the same person
+        $command = new SetCallerCommand($person);
+
+        // Act
+        $result = ($this->handler)($ticket, $command);
+
+        // Assert
+        self::assertSame($ticket, $result);
+        self::assertSame($person, $ticket->getCaller());
+        self::assertCount(1, $ticket->getCallerHistories());
+
+        // Check that the history is unchanged
+        $callerHistory = $ticket->getCallerHistories()->first();
+        self::assertSame($person, $callerHistory->getPerson());
+        self::assertNull($callerHistory->getEndDate());
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/SetCallerApiControllerTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/SetCallerApiControllerTest.php
new file mode 100644
index 000000000..aad6342dd
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/SetCallerApiControllerTest.php
@@ -0,0 +1,200 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Tests\Controller;
+
+use Chill\PersonBundle\Entity\Person;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Chill\TicketBundle\Action\Ticket\Handler\SetCallerCommandHandler;
+use Chill\TicketBundle\Action\Ticket\SetCallerCommand;
+use Chill\TicketBundle\Controller\SetCallerApiController;
+use Chill\TicketBundle\Entity\Ticket;
+use Doctrine\ORM\EntityManagerInterface;
+use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\SerializerInterface;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+final class SetCallerApiControllerTest extends TestCase
+{
+    use ProphecyTrait;
+
+    public function testSetCallerWithoutPermission(): void
+    {
+        $ticket = new Ticket();
+        $request = new Request();
+
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(false);
+
+        $setCallerCommandHandler = $this->prophesize(SetCallerCommandHandler::class);
+        $entityManager = $this->prophesize(EntityManagerInterface::class);
+        $serializer = $this->prophesize(SerializerInterface::class);
+
+        $controller = new SetCallerApiController(
+            $setCallerCommandHandler->reveal(),
+            $security->reveal(),
+            $entityManager->reveal(),
+            $serializer->reveal(),
+        );
+
+        $this->expectException(AccessDeniedHttpException::class);
+        $controller->setCaller($ticket, $request);
+    }
+
+    public function testSetCallerWithInvalidRequestBody(): void
+    {
+        $ticket = new Ticket();
+        $request = new Request([], [], [], [], [], [], 'invalid json');
+
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $setCallerCommandHandler = $this->prophesize(SetCallerCommandHandler::class);
+        $entityManager = $this->prophesize(EntityManagerInterface::class);
+
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $serializer->deserialize('invalid json', SetCallerCommand::class, 'json')
+            ->willThrow(new \Exception('Invalid JSON'));
+
+        $controller = new SetCallerApiController(
+            $setCallerCommandHandler->reveal(),
+            $security->reveal(),
+            $entityManager->reveal(),
+            $serializer->reveal(),
+        );
+
+        $this->expectException(BadRequestHttpException::class);
+        $controller->setCaller($ticket, $request);
+    }
+
+    public function testSetCallerWithValidRequest(): void
+    {
+        $ticket = new Ticket();
+        $request = new Request([], [], [], [], [], [], '{"caller": {"id": 123, "type": "person"}}');
+
+        $person = new Person();
+        $command = new SetCallerCommand($person);
+
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $serializer->deserialize('{"caller": {"id": 123, "type": "person"}}', SetCallerCommand::class, 'json')
+            ->willReturn($command);
+        $serializer->serialize($ticket, 'json', ['groups' => ['read']])
+            ->willReturn('{}')
+            ->shouldBeCalled();
+
+        $setCallerCommandHandler = $this->prophesize(SetCallerCommandHandler::class);
+        $setCallerCommandHandler->__invoke($ticket, $command)
+            ->willReturn($ticket)
+            ->shouldBeCalled();
+
+        $entityManager = $this->prophesize(EntityManagerInterface::class);
+        $entityManager->flush()->shouldBeCalled();
+
+        $controller = new SetCallerApiController(
+            $setCallerCommandHandler->reveal(),
+            $security->reveal(),
+            $entityManager->reveal(),
+            $serializer->reveal(),
+        );
+
+        $response = $controller->setCaller($ticket, $request);
+
+        $this->assertInstanceOf(JsonResponse::class, $response);
+    }
+
+    public function testSetCallerWithThirdParty(): void
+    {
+        $ticket = new Ticket();
+        $request = new Request([], [], [], [], [], [], '{"caller": {"id": 456, "type": "thirdParty"}}');
+
+        $thirdParty = $this->prophesize(ThirdParty::class)->reveal();
+        $command = new SetCallerCommand($thirdParty);
+
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $serializer->deserialize('{"caller": {"id": 456, "type": "thirdParty"}}', SetCallerCommand::class, 'json')
+            ->willReturn($command);
+        $serializer->serialize($ticket, 'json', ['groups' => ['read']])
+            ->willReturn('{}')
+            ->shouldBeCalled();
+
+        $setCallerCommandHandler = $this->prophesize(SetCallerCommandHandler::class);
+        $setCallerCommandHandler->__invoke($ticket, $command)
+            ->willReturn($ticket)
+            ->shouldBeCalled();
+
+        $entityManager = $this->prophesize(EntityManagerInterface::class);
+        $entityManager->flush()->shouldBeCalled();
+
+        $controller = new SetCallerApiController(
+            $setCallerCommandHandler->reveal(),
+            $security->reveal(),
+            $entityManager->reveal(),
+            $serializer->reveal(),
+        );
+
+        $response = $controller->setCaller($ticket, $request);
+
+        $this->assertInstanceOf(JsonResponse::class, $response);
+    }
+
+    public function testSetCallerToNull(): void
+    {
+        $ticket = new Ticket();
+        $request = new Request([], [], [], [], [], [], '{"caller": null}');
+
+        $command = new SetCallerCommand(null);
+
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $serializer->deserialize('{"caller": null}', SetCallerCommand::class, 'json')
+            ->willReturn($command);
+        $serializer->serialize($ticket, 'json', ['groups' => ['read']])
+            ->willReturn('{}')
+            ->shouldBeCalled();
+
+        $setCallerCommandHandler = $this->prophesize(SetCallerCommandHandler::class);
+        $setCallerCommandHandler->__invoke($ticket, $command)
+            ->willReturn($ticket)
+            ->shouldBeCalled();
+
+        $entityManager = $this->prophesize(EntityManagerInterface::class);
+        $entityManager->flush()->shouldBeCalled();
+
+        $controller = new SetCallerApiController(
+            $setCallerCommandHandler->reveal(),
+            $security->reveal(),
+            $entityManager->reveal(),
+            $serializer->reveal(),
+        );
+
+        $response = $controller->setCaller($ticket, $request);
+
+        $this->assertInstanceOf(JsonResponse::class, $response);
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Entity/CallerHistoryTest.php b/src/Bundle/ChillTicketBundle/tests/Entity/CallerHistoryTest.php
new file mode 100644
index 000000000..36024fde5
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Entity/CallerHistoryTest.php
@@ -0,0 +1,63 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Tests\Entity;
+
+use Chill\PersonBundle\Entity\Person;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Chill\TicketBundle\Entity\CallerHistory;
+use Chill\TicketBundle\Entity\Ticket;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class CallerHistoryTest extends TestCase
+{
+    public function testConstructorWithPerson(): void
+    {
+        $ticket = new Ticket();
+
+        $callerHistory = new CallerHistory($person = new Person(), $ticket);
+
+        self::assertSame($ticket, $callerHistory->getTicket());
+        self::assertNull($callerHistory->getEndDate());
+        self::assertSame($person, $callerHistory->getPerson());
+        self::assertNull($callerHistory->getThirdParty());
+        self::assertSame($person, $callerHistory->getCaller());
+    }
+
+    public function testConstructorWithThirdParty(): void
+    {
+        $ticket = new Ticket();
+
+        $callerHistory = new CallerHistory($thirdParty = new ThirdParty(), $ticket);
+
+        self::assertSame($ticket, $callerHistory->getTicket());
+        self::assertNull($callerHistory->getEndDate());
+        self::assertNull($callerHistory->getPerson());
+        self::assertSame($thirdParty, $callerHistory->getThirdParty());
+        self::assertSame($thirdParty, $callerHistory->getCaller());
+    }
+
+    public function testSetEndDate(): void
+    {
+        $ticket = $this->createMock(Ticket::class);
+        $callerHistory = new CallerHistory(new ThirdParty(), $ticket);
+
+        $endDate = new \DateTimeImmutable('2023-01-01');
+        $callerHistory->setEndDate($endDate);
+
+        self::assertSame($endDate, $callerHistory->getEndDate());
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Entity/TicketCallerTest.php b/src/Bundle/ChillTicketBundle/tests/Entity/TicketCallerTest.php
new file mode 100644
index 000000000..ad9b8ecaf
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Entity/TicketCallerTest.php
@@ -0,0 +1,82 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Tests\Entity;
+
+use Chill\PersonBundle\Entity\Person;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Chill\TicketBundle\Entity\CallerHistory;
+use Chill\TicketBundle\Entity\Ticket;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class TicketCallerTest extends TestCase
+{
+    public function testGetCaller(): void
+    {
+        $ticket = new Ticket();
+
+        // Initially, there should be no caller
+        self::assertNull($ticket->getCaller());
+
+        // Create a person
+        $person = new Person();
+
+        // Create a caller history with the person
+        $callerHistory = new CallerHistory($person, $ticket);
+
+        // The ticket should now return the person as the caller
+        self::assertSame($person, $ticket->getCaller());
+
+        // Create a third party
+        $thirdParty = new ThirdParty();
+
+        // Create a new caller history with the third party
+        $callerHistory2 = new CallerHistory($thirdParty, $ticket);
+
+        // End the first caller history
+        $callerHistory->setEndDate(new \DateTimeImmutable());
+
+        // The ticket should now return the third party as the caller
+        self::assertSame($thirdParty, $ticket->getCaller());
+
+        // End the second caller history
+        $callerHistory2->setEndDate(new \DateTimeImmutable());
+
+        // The ticket should now return null as there is no active caller
+        self::assertNull($ticket->getCaller());
+    }
+
+    public function testGetCallerHistories(): void
+    {
+        $ticket = new Ticket();
+
+        // Initially, there should be no caller histories
+        self::assertCount(0, $ticket->getCallerHistories());
+
+        // Create a caller history
+        $callerHistory = new CallerHistory(new Person(), $ticket);
+
+        // The ticket should now have one caller history
+        self::assertCount(1, $ticket->getCallerHistories());
+        self::assertSame($callerHistory, $ticket->getCallerHistories()->first());
+
+        // Create another caller history
+        $callerHistory2 = new CallerHistory(new ThirdParty(), $ticket);
+
+        // The ticket should now have two caller histories
+        self::assertCount(2, $ticket->getCallerHistories());
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Repository/PersonTicketACLAwareRepositoryTest.php b/src/Bundle/ChillTicketBundle/tests/Repository/PersonTicketACLAwareRepositoryTest.php
new file mode 100644
index 000000000..654ba2467
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Repository/PersonTicketACLAwareRepositoryTest.php
@@ -0,0 +1,64 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Repository;
+
+use Chill\PersonBundle\DataFixtures\Helper\RandomPersonHelperTrait;
+use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Chill\TicketBundle\Repository\PersonTicketACLAwareRepository;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class PersonTicketACLAwareRepositoryTest extends KernelTestCase
+{
+    use RandomPersonHelperTrait;
+
+    private PersonTicketACLAwareRepository $repository;
+    private EntityManagerInterface $entityManager;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+        $this->repository = self::getContainer()->get(PersonTicketACLAwareRepository::class);
+        $this->entityManager = self::getContainer()->get(EntityManagerInterface::class);
+    }
+
+    public function testFindPersonPreviouslyAssociatedWithCallerWithPerson()
+    {
+        $person = $this->getRandomPerson(self::getContainer()->get(EntityManagerInterface::class));
+
+        $actual = $this->repository->findPersonPreviouslyAssociatedWithCaller($person);
+
+        self::assertIsList($actual);
+    }
+
+    public function testFindPersonPreviouslyAssociatedWithCallerWithThirdParty()
+    {
+        $thirdParty = $this->entityManager->createQuery(
+            sprintf('SELECT t FROM %s t', ThirdParty::class)
+        )
+            ->setMaxResults(1)
+            ->getSingleResult();
+
+        if (null === $thirdParty) {
+            throw new \RuntimeException('the third party table seems to be empty');
+        }
+
+        $actual = $this->repository->findPersonPreviouslyAssociatedWithCaller($thirdParty);
+
+        self::assertIsList($actual);
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/TicketNormalizerTest.php b/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/TicketNormalizerTest.php
index d30334b0d..2e3de468d 100644
--- a/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/TicketNormalizerTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/TicketNormalizerTest.php
@@ -15,6 +15,7 @@ use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\UserGroup;
 use Chill\PersonBundle\Entity\Person;
 use Chill\TicketBundle\Entity\AddresseeHistory;
+use Chill\TicketBundle\Entity\CallerHistory;
 use Chill\TicketBundle\Entity\Comment;
 use Chill\TicketBundle\Entity\EmergencyStatusEnum;
 use Chill\TicketBundle\Entity\EmergencyStatusHistory;
@@ -91,27 +92,16 @@ class TicketNormalizerTest extends KernelTestCase
                 'history' => [
                     [
                         'event_type' => 'create_ticket',
-                        'at' => 1718495999,
-                        'by' => [
-                            0 => 'user',
-                        ],
-                        'data' => [],
                     ],
                     [
                         'event_type' => 'state_change',
-                        'at' => 1718495999,
-                        'by' => [
-                            0 => 'user',
-                        ],
-                        'data' => [
-                            'new_state' => 'open',
-                        ],
                     ],
                 ],
                 'currentState' => 'open',
                 'updatedAt' => $t->getUpdatedAt()->getTimestamp(),
                 'updatedBy' => ['user'],
                 'emergency' => 'no',
+                'caller' => null,
             ],
         ];
 
@@ -165,6 +155,36 @@ class TicketNormalizerTest extends KernelTestCase
                 'updatedAt' => $ticket->getUpdatedAt()->getTimestamp(),
                 'updatedBy' => ['user'],
                 'emergency' => 'yes',
+                'caller' => null,
+            ],
+        ];
+
+        // ticket with caller
+        $ticket = new Ticket();
+        $ticket->setCreatedAt(new \DateTimeImmutable('2024-06-16T00:00:00'));
+        $ticket->setUpdatedAt(new \DateTimeImmutable('2024-06-16T00:00:00'));
+        new CallerHistory(new Person(), $ticket, new \DateTimeImmutable('2024-04-01T12:00:00'));
+
+        yield [
+            $ticket,
+            [
+                'type' => 'ticket_ticket',
+                'createdAt' => $ticket->getCreatedAt()?->getTimestamp(),
+                'createdBy' => null,
+                'id' => null,
+                'externalRef' => '',
+                'currentPersons' => [],
+                'currentAddressees' => [],
+                'currentInputs' => [],
+                'currentMotive' => null,
+                'history' => [
+                    ['event_type' => 'set_caller'],
+                ],
+                'currentState' => 'open',
+                'updatedAt' => $ticket->getUpdatedAt()->getTimestamp(),
+                'updatedBy' => null,
+                'emergency' => 'no',
+                'caller' => ['person'],
             ],
         ];
     }
@@ -224,6 +244,11 @@ class TicketNormalizerTest extends KernelTestCase
             'json',
             ['groups' => 'read']
         )->will(fn ($args): array => $args[0]);
+        $normalizer->normalize(
+            Argument::that(fn ($arg) => is_array($arg) && 1 === count($arg) && array_key_exists('new_caller', $arg)),
+            'json',
+            ['groups' => 'read']
+        )->will(fn ($args): array => ['new_caller' => ['dummy']]);
 
         // datetime
         $normalizer->normalize(Argument::type(\DateTimeImmutable::class), 'json', Argument::type('array'))
@@ -231,6 +256,9 @@ class TicketNormalizerTest extends KernelTestCase
         // user
         $normalizer->normalize(Argument::type(User::class), 'json', Argument::type('array'))
             ->willReturn(['user']);
+        // person
+        $normalizer->normalize(Argument::type(Person::class), 'json', Argument::type('array'))
+            ->willReturn(['person']);
         // motive
         $normalizer->normalize(Argument::type(Motive::class), 'json', Argument::type('array'))->willReturn(['type' => 'motive', 'id' => 0]);
         // person history
diff --git a/src/Bundle/ChillTicketBundle/tests/Service/Ticket/SuggestPersonForTicketTest.php b/src/Bundle/ChillTicketBundle/tests/Service/Ticket/SuggestPersonForTicketTest.php
new file mode 100644
index 000000000..05a786385
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Service/Ticket/SuggestPersonForTicketTest.php
@@ -0,0 +1,70 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Service\Ticket;
+
+use Chill\PersonBundle\Entity\Person;
+use Chill\TicketBundle\Entity\CallerHistory;
+use Chill\TicketBundle\Entity\Ticket;
+use Chill\TicketBundle\Repository\PersonTicketACLAwareRepositoryInterface;
+use Chill\TicketBundle\Service\Ticket\SuggestPersonForTicket;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class SuggestPersonForTicketTest extends TestCase
+{
+    use ProphecyTrait;
+
+    private \Prophecy\Prophecy\ObjectProphecy $repository;
+
+    protected function setUp(): void
+    {
+        $this->repository = $this->prophesize(PersonTicketACLAwareRepositoryInterface::class);
+    }
+
+    private function buildSuggestPersonForTicket(): SuggestPersonForTicket
+    {
+        return new SuggestPersonForTicket($this->repository->reveal());
+    }
+
+    public function testSuggestPersonNoCaller()
+    {
+        $ticket = new Ticket();
+
+        assert(null === $ticket->getCaller());
+
+        $this->repository->findPersonPreviouslyAssociatedWithCaller(Argument::any())->shouldNotBeCalled();
+        $suggester = $this->buildSuggestPersonForTicket();
+
+        self::assertEquals([], $suggester->suggestPerson($ticket));
+    }
+
+    public function testSuggestPersonCaller()
+    {
+        $ticket = new Ticket();
+        new CallerHistory($person = new Person(), $ticket);
+
+        assert($person === $ticket->getCaller());
+
+        $this->repository->findPersonPreviouslyAssociatedWithCaller($person, 0, 20)
+            ->willReturn($result = [new Person(), new Person()])
+            ->shouldBeCalledOnce();
+        $suggester = $this->buildSuggestPersonForTicket();
+
+        self::assertEquals($result, $suggester->suggestPerson($ticket, 0, 20));
+    }
+}

From 3df4043eb99e58c4fb33d8db22a4f23fa2bd703c Mon Sep 17 00:00:00 2001
From: Boris Waaub <boris.waaub@digitalternative.be>
Date: Fri, 4 Jul 2025 07:45:33 +0000
Subject: [PATCH 127/283] =?UTF-8?q?Afficher=20les=20patients=20sugg=C3=A9r?=
 =?UTF-8?q?=C3=A9s=20et=20ajouter=20un=20s=C3=A9lecteur=20urgent/non=20urg?=
 =?UTF-8?q?ent?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ChillMainBundle/Resources/public/types.ts |  71 +-
 .../public/vuejs/PickEntity/PickEntity.vue    | 390 ++++++----
 .../translations/messages+intl-icu.fr.yaml    |  28 +
 .../Resources/public/types.ts                 | 476 ++++++-------
 .../public/vuejs/_components/AddPersons.vue   | 664 +++++++++---------
 .../src/Resources/public/types.ts             |  57 +-
 .../Resources/public/vuejs/TicketApp/App.vue  |   1 +
 .../components/ActionToolbarComponent.vue     | 115 ++-
 .../components/AddresseeComponent.vue         |   8 +-
 .../components/AddresseeSelectorComponent.vue | 249 ++-----
 .../TicketApp/components/BannerComponent.vue  |  38 +-
 .../components/CallerSelectorComponent.vue    |  85 +++
 .../components/PersonsSelectorComponent.vue   | 163 ++---
 .../TicketHistoryEmergencyComponent.vue       |  18 +
 .../components/TicketHistoryListComponent.vue |  50 +-
 .../TicketHistoryPersonComponent.vue          |   9 +-
 .../TicketHistoryStateComponent.vue           |  17 +-
 .../TicketApp/components/ToggleFlags.vue      |  67 ++
 .../TicketApp/store/modules/addressee.ts      |  16 +-
 .../vuejs/TicketApp/store/modules/comment.ts  |  11 +-
 .../vuejs/TicketApp/store/modules/motive.ts   |  11 +-
 .../vuejs/TicketApp/store/modules/persons.ts  |  59 +-
 .../vuejs/TicketApp/store/modules/ticket.ts   |  39 +-
 .../src/translations/messages+intl-icu.fr.yml |  18 +-
 24 files changed, 1539 insertions(+), 1121 deletions(-)
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/CallerSelectorComponent.vue
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryEmergencyComponent.vue
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ToggleFlags.vue

diff --git a/src/Bundle/ChillMainBundle/Resources/public/types.ts b/src/Bundle/ChillMainBundle/Resources/public/types.ts
index 5eed6d9b4..5af22147b 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/types.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/types.ts
@@ -10,6 +10,11 @@ export interface Civility {
     // TODO
 }
 
+export interface Household {
+    type: "household";
+    id: number;
+}
+
 export interface Job {
     id: number;
     type: "user_job";
@@ -48,16 +53,10 @@ export interface User {
     label: string;
     // todo: mainCenter; mainJob; etc..
 }
-
-// TODO : Add missing household properties
-export interface Household {
-    type: "household";
-    id: number;
-}
-
 export interface ThirdParty {
     type: "thirdparty";
     id: number;
+    text: string;
     firstname: string;
     name: string;
     email: string;
@@ -228,3 +227,61 @@ export interface WorkflowAttachment {
 export interface PrivateCommentEmbeddable {
     comments: Record<number, string>;
 }
+
+// API Exception types
+export interface TransportExceptionInterface {
+    name: string;
+}
+
+export interface ValidationExceptionInterface
+    extends TransportExceptionInterface {
+    name: "ValidationException";
+    error: object;
+    violations: string[];
+    titles: string[];
+    propertyPaths: string[];
+}
+
+export interface AccessExceptionInterface extends TransportExceptionInterface {
+    name: "AccessException";
+    violations: string[];
+}
+
+export interface NotFoundExceptionInterface
+    extends TransportExceptionInterface {
+    name: "NotFoundException";
+}
+
+export interface ServerExceptionInterface extends TransportExceptionInterface {
+    name: "ServerException";
+    message: string;
+    code: number;
+    body: string;
+}
+
+export interface ConflictHttpExceptionInterface
+    extends TransportExceptionInterface {
+    name: "ConflictHttpException";
+    violations: string[];
+}
+
+export type ApiException =
+    | ValidationExceptionInterface
+    | AccessExceptionInterface
+    | NotFoundExceptionInterface
+    | ServerExceptionInterface
+    | ConflictHttpExceptionInterface;
+
+export interface Modal {
+    showModal: boolean;
+    modalDialogClass: string;
+}
+
+export interface Selected {
+    result: UserGroupOrUser;
+}
+
+export interface addNewEntities {
+    selected: Selected[];
+    modal: Modal;
+}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
index 56e324133..1ddf054b6 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
@@ -1,142 +1,272 @@
 <template>
-    <ul :class="listClasses" v-if="picked.length && displayPicked">
-        <li v-for="p in picked" @click="removeEntity(p)" :key="p.type + p.id">
-            <span class="chill_denomination">{{ p.text }}</span>
-        </li>
-    </ul>
-    <ul class="record_actions">
-        <li class="add-persons">
-            <add-persons
-                :options="addPersonsOptions"
-                :key="uniqid"
-                :buttonTitle="translatedListOfTypes"
-                :modalTitle="translatedListOfTypes"
-                ref="addPersons"
-                @addNewPersons="addNewEntity"
+    <div class="grey-card">
+        <ul :class="listClasses" v-if="picked.length && displayPicked">
+            <li
+                v-for="p in picked"
+                @click="removeEntity(p)"
+                :key="p.type + p.id"
             >
-            </add-persons>
-        </li>
-    </ul>
-    <ul class="list-suggest add-items inline">
-        <li v-for="s in suggested" :key="s.id" @click="addNewSuggested(s)">
-            <span>{{ s.text }}</span>
-        </li>
-    </ul>
+                <span
+                    :class="getBadgeClass(p)"
+                    class="chill_denomination"
+                    :style="getBadgeStyle(p)"
+                >
+                    {{ p.text }}
+                </span>
+            </li>
+        </ul>
+        <ul class="record_actions">
+            <li class="add-persons">
+                <add-persons
+                    :options="addPersonsOptions"
+                    :key="uniqid"
+                    :buttonTitle="translatedListOfTypes"
+                    :modalTitle="translatedListOfTypes"
+                    @addNewPersons="addNewEntity"
+                >
+                </add-persons>
+            </li>
+        </ul>
+
+        <ul class="badge-suggest add-items inline" style="float: right">
+            <li v-for="s in suggested" :key="s.id" @click="addNewSuggested(s)">
+                <span :class="getBadgeClass(s)" :style="getBadgeStyle(s)">
+                    {{ s.text }}
+                </span>
+            </li>
+        </ul>
+    </div>
 </template>
 
-<script>
+<script lang="ts" setup>
+import { ref, computed, defineProps, defineEmits, defineComponent } from "vue";
 import AddPersons from "ChillPersonAssets/vuejs/_components/AddPersons.vue";
-import { appMessages } from "./i18n";
+import { Entities, EntityType, SearchOptions } from "ChillPersonAssets/types";
+import {
+    PICK_ENTITY_MODAL_TITLE,
+    PICK_ENTITY_USER,
+    PICK_ENTITY_USER_GROUP,
+    PICK_ENTITY_PERSON,
+    PICK_ENTITY_THIRDPARTY,
+    trans,
+} from "translator";
+import { addNewEntities } from "ChillMainAssets/types";
 
-export default {
-    name: "PickEntity",
-    props: {
-        multiple: {
-            type: Boolean,
-            required: true,
-        },
-        types: {
-            type: Array,
-            required: true,
-        },
-        picked: {
-            required: true,
-        },
-        uniqid: {
-            type: String,
-            required: true,
-        },
-        removableIfSet: {
-            type: Boolean,
-            default: true,
-        },
-        displayPicked: {
-            // display picked entities.
-            type: Boolean,
-            default: true,
-        },
-        suggested: {
-            type: Array,
-            default: [],
-        },
-        label: {
-            type: String,
-            required: false,
-        },
-    },
-    emits: ["addNewEntity", "removeEntity", "addNewEntityProcessEnded"],
+defineComponent({
     components: {
         AddPersons,
     },
-    data() {
-        return {
-            key: "",
-        };
-    },
-    computed: {
-        addPersonsOptions() {
-            return {
-                uniq: !this.multiple,
-                type: this.types,
-                priority: null,
-                button: {
-                    size: "btn-sm",
-                    class: "btn-submit",
-                },
-            };
-        },
-        translatedListOfTypes() {
-            if (this.label !== "") {
-                return this.label;
-            }
+});
+const props = defineProps<{
+    multiple: boolean;
+    types: EntityType[];
+    picked: Entities[];
+    uniqid: string;
+    removableIfSet?: boolean;
+    displayPicked?: boolean;
+    suggested?: Entities[];
+    label?: string;
+}>();
 
-            let trans = [];
-            this.types.forEach((t) => {
-                if (this.$props.multiple) {
-                    trans.push(appMessages.fr.pick_entity[t].toLowerCase());
-                } else {
-                    trans.push(
-                        appMessages.fr.pick_entity[t + "_one"].toLowerCase(),
-                    );
-                }
-            });
+const emits = defineEmits<{
+    (e: "addNewEntity", payload: { entity: Entities }): void;
+    (e: "removeEntity", payload: { entity: Entities }): void;
+    (e: "addNewEntityProcessEnded"): void;
+}>();
 
-            if (this.$props.multiple) {
-                return (
-                    appMessages.fr.pick_entity.modal_title + trans.join(", ")
-                );
-            } else {
-                return (
-                    appMessages.fr.pick_entity.modal_title_one +
-                    trans.join(", ")
-                );
-            }
-        },
-        listClasses() {
-            return {
-                "list-suggest": true,
-                "remove-items": this.$props.removableIfSet,
-            };
-        },
-    },
-    methods: {
-        addNewSuggested(entity) {
-            this.$emit("addNewEntity", { entity: entity });
-        },
-        addNewEntity({ selected, modal }) {
-            selected.forEach((item) => {
-                this.$emit("addNewEntity", { entity: item.result });
-            }, this);
-            this.$refs.addPersons.resetSearch(); // to cast child method
-            modal.showModal = false;
-            this.$emit("addNewEntityProcessEnded");
-        },
-        removeEntity(entity) {
-            if (!this.$props.removableIfSet) {
-                return;
-            }
-            this.$emit("removeEntity", { entity: entity });
-        },
-    },
-};
+const addPersons = ref();
+
+const addPersonsOptions = computed(
+    () =>
+        ({
+            uniq: !props.multiple,
+            type: props.types,
+            priority: null,
+            button: {
+                size: "btn-sm",
+                class: "btn-submit",
+            },
+        }) as SearchOptions,
+);
+
+const translatedListOfTypes = computed(() => {
+    if (props.label !== undefined && props.label !== "") {
+        return props.label;
+    }
+
+    const translatedTypes = props.types.map((type: EntityType) => {
+        switch (type) {
+            case "user":
+                return trans(PICK_ENTITY_USER, {
+                    count: props.multiple ? 2 : 1,
+                });
+            case "person":
+                return trans(PICK_ENTITY_PERSON, {
+                    count: props.multiple ? 2 : 1,
+                });
+            case "third_party":
+                return trans(PICK_ENTITY_THIRDPARTY, {
+                    count: props.multiple ? 2 : 1,
+                });
+            case "user_group":
+                return trans(PICK_ENTITY_USER_GROUP, {
+                    count: props.multiple ? 2 : 1,
+                });
+        }
+    });
+
+    return `${trans(PICK_ENTITY_MODAL_TITLE, {
+        count: props.multiple ? 2 : 1,
+    })} ${translatedTypes.join(", ")}`;
+});
+
+const listClasses = computed(() => ({
+    "badge-suggest": true,
+    "remove-items": props.removableIfSet !== false,
+    inline: true,
+}));
+
+function addNewSuggested(entity: Entities) {
+    emits("addNewEntity", { entity });
+}
+
+function addNewEntity({ selected }: addNewEntities) {
+    Object.values(selected).forEach((item) => {
+        emits("addNewEntity", { entity: item.result });
+    });
+    addPersons.value?.resetSearch();
+
+    emits("addNewEntityProcessEnded");
+}
+
+function removeEntity(entity: Entities) {
+    if (props.removableIfSet === false) {
+        return;
+    }
+    emits("removeEntity", { entity });
+}
+
+function getBadgeClass(entities: Entities) {
+    if (entities.type !== "user_group") {
+        return entities.type;
+    }
+    return "";
+}
+
+function getBadgeStyle(entities: Entities) {
+    if (entities.type === "user_group") {
+        return [
+            `ul.badge-suggest li > span {
+                color: ${entities.foregroundColor}!important;
+                border-bottom-color: ${entities.backgroundColor};
+        }`,
+        ];
+    }
+    return [];
+}
 </script>
+
+<style lang="scss" scoped>
+.grey-card {
+    background: #f8f9fa;
+    border-radius: 8px;
+    padding: 1.5rem;
+    min-height: 160px;
+}
+
+.btn-check:checked + .btn,
+:not(.btn-check) + .btn:active,
+.btn:first-child:active,
+.btn.active,
+.btn.show {
+    color: white;
+    box-shadow: 0 0 0 0.2rem var(--bs-chill-green);
+    outline: 0;
+}
+
+.as-user-group {
+    display: inline-block;
+}
+ul.badge-suggest {
+    list-style-type: none;
+    padding-left: 0;
+    margin-bottom: 0px;
+}
+ul.badge-suggest li > span {
+    white-space: normal;
+    text-align: start;
+    margin-bottom: 3px;
+}
+
+ul.badge-suggest.inline li {
+    display: inline-block;
+    margin-right: 0.2em;
+}
+ul.badge-suggest.add-items li {
+    position: relative;
+}
+ul.badge-suggest.add-items li span {
+    cursor: pointer;
+    padding-left: 2rem;
+}
+ul.badge-suggest.add-items li span:hover {
+    color: #ced4da;
+}
+ul.badge-suggest.add-items li > span:before {
+    font: normal normal normal 13px ForkAwesome;
+    margin-right: 1.8em;
+    content: "\f067";
+    color: var(--bs-success);
+    position: absolute;
+    display: block;
+    top: 50%;
+    left: 0.75rem;
+    -webkit-transform: translateY(-50%);
+    -moz-transform: translateY(-50%);
+    -ms-transform: translateY(-50%);
+    transform: translateY(-50%);
+}
+ul.badge-suggest.remove-items li {
+    position: relative;
+}
+ul.badge-suggest.remove-items li span {
+    cursor: pointer;
+    padding-left: 2rem;
+}
+ul.badge-suggest.remove-items li span:hover {
+    color: #ced4da;
+}
+ul.badge-suggest.remove-items li > span:before {
+    font: normal normal normal 13px ForkAwesome;
+    margin-right: 1.8em;
+    content: "\f1f8";
+    color: var(--bs-danger);
+    position: absolute;
+    display: block;
+    top: 50%;
+    left: 0.75rem;
+    -webkit-transform: translateY(-50%);
+    -moz-transform: translateY(-50%);
+    -ms-transform: translateY(-50%);
+    transform: translateY(-50%);
+}
+ul.badge-suggest li > span {
+    margin: 0.2rem 0.1rem;
+    display: inline-block;
+    padding: 0 1em 0 2.2em !important;
+    background-color: #fff;
+    border: 1px solid #dee2e6;
+    border-bottom-width: 3px;
+    border-bottom-style: solid;
+    border-radius: 6px;
+    font-size: 0.75em;
+    font-weight: 700;
+}
+
+ul.badge-suggest li > span.person {
+    border-bottom-color: #43b29d;
+}
+ul.badge-suggest li > span.thirdparty {
+    border-bottom-color: rgb(198.9, 72, 98.1);
+}
+</style>
diff --git a/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml b/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml
index 4d16b837d..37dddae29 100644
--- a/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml
+++ b/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml
@@ -156,3 +156,31 @@ renderbox:
     no_current_address: "Sans adresse actuellement"
     new_household: "Nouveau ménage"
     no_members_yet: "Aucun membre actuellement"
+
+pick_entity:
+    add: "Ajouter"
+    modal_title: >-
+        {count, plural,
+            one {Indiquer un}
+            other {Ajouter des}
+        }
+    user: >-
+        {count, plural,
+            one {Utilisateur}
+            other {Utilisateurs}
+        }
+    user_group: >-
+        {count, plural,
+            one {Groupe d'utilisateur}
+            other {Groupes d'utilisateurs}
+        }
+    person: >-
+        {count, plural,
+            one {Usager}
+            other {Usagers}
+        }
+    thirdparty: >-
+        {count, plural,
+            one {Tiers}
+            other {Tiers}
+        }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/types.ts b/src/Bundle/ChillPersonBundle/Resources/public/types.ts
index 32a0c5934..18ce72046 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/types.ts
+++ b/src/Bundle/ChillPersonBundle/Resources/public/types.ts
@@ -1,317 +1,309 @@
 import { StoredObject } from "ChillDocStoreAssets/types";
 import {
     Address,
-    Scope,
-  Center,
-  Civility,
-  DateTime,
-  User,
-  WorkflowAvailable,
-  Job,
-    Household,
+    Center,
+    Civility,
+    DateTime,
     User,
     UserGroup,
-    WorkflowAvailable,
+    Household,
     ThirdParty,
+    WorkflowAvailable,
+    Scope,
+    Job,
     PrivateCommentEmbeddable,
-} from "ChillMainAssets/types";
-import { StoredObject } from "ChillDocStoreAssets/types";
+} from "../../../ChillMainBundle/Resources/public/types";
 import { Thirdparty } from "../../../ChillThirdPartyBundle/Resources/public/types";
 import { Calendar } from "../../../ChillCalendarBundle/Resources/public/types";
 
 export interface Person {
-  id: number;
-  type: "person";
-  text: string;
-  textAge: string;
-  firstName: string;
-  lastName: string;
-  current_household_address: Address | null;
-  birthdate: DateTime | null;
-  deathdate: DateTime | null;
-  age: number;
-  phonenumber: string;
-  mobilenumber: string;
-  email: string;
-  gender: "woman" | "man" | "other";
-  centers: Center[];
-  civility: Civility | null;
-  current_household_id: number;
-  current_residential_addresses: Address[];
+    id: number;
+    type: "person";
+    text: string;
+    textAge: string;
+    firstName: string;
+    lastName: string;
+    current_household_address: Address | null;
+    birthdate: DateTime | null;
+    deathdate: DateTime | null;
+    age: number;
+    phonenumber: string;
+    mobilenumber: string;
+    email: string;
+    gender: "woman" | "man" | "other";
+    centers: Center[];
+    civility: Civility | null;
+    current_household_id: number;
+    current_residential_addresses: Address[];
 }
 
 export interface AccompanyingPeriod {
-  id: number;
-  addressLocation?: Address | null;
-  administrativeLocation?: Location | null;
-  calendars: Calendar[];
-  closingDate?: Date | null;
-  closingMotive?: ClosingMotive | null;
-  comments: Comment[];
-  confidential: boolean;
-  createdAt?: Date | null;
-  createdBy?: User | null;
-  emergency: boolean;
-  intensity?: "occasional" | "regular";
-  job?: Job | null;
-  locationHistories: AccompanyingPeriodLocationHistory[];
-  openingDate?: Date | null;
-  origin?: Origin | null;
-  participations: AccompanyingPeriodParticipation[];
-  personLocation?: Person | null;
-  pinnedComment?: Comment | null;
-  preventUserIsChangedNotification: boolean;
-  remark: string;
-  requestorAnonymous: boolean;
-  requestorPerson?: Person | null;
-  requestorThirdParty?: Thirdparty | null;
-  resources: AccompanyingPeriodResource[];
-  scopes: Scope[];
-  socialIssues: SocialIssue[];
-  step?:
-    | "CLOSED"
-    | "CONFIRMED"
-    | "CONFIRMED_INACTIVE_SHORT"
-    | "CONFIRMED_INACTIVE_LONG"
-    | "DRAFT";
-}
-
-export interface AccompanyingPeriodWorkEvaluationDocument {
-  id: number;
-  type: "accompanying_period_work_evaluation_document";
-  storedObject: StoredObject;
-  title: string;
-  createdAt: DateTime | null;
-  createdBy: User | null;
-  updatedAt: DateTime | null;
-  updatedBy: User | null;
-  workflows_availables: WorkflowAvailable[];
-  workflows: object[];
+    id: number;
+    addressLocation?: Address | null;
+    administrativeLocation?: Location | null;
+    calendars: Calendar[];
+    closingDate?: Date | null;
+    closingMotive?: ClosingMotive | null;
+    comments: Comment[];
+    confidential: boolean;
+    createdAt?: Date | null;
+    createdBy?: User | null;
+    emergency: boolean;
+    intensity?: "occasional" | "regular";
+    job?: Job | null;
+    locationHistories: AccompanyingPeriodLocationHistory[];
+    openingDate?: Date | null;
+    origin?: Origin | null;
+    participations: AccompanyingPeriodParticipation[];
+    personLocation?: Person | null;
+    pinnedComment?: Comment | null;
+    preventUserIsChangedNotification: boolean;
+    remark: string;
+    requestorAnonymous: boolean;
+    requestorPerson?: Person | null;
+    requestorThirdParty?: Thirdparty | null;
+    resources: AccompanyingPeriodResource[];
+    scopes: Scope[];
+    socialIssues: SocialIssue[];
+    step?:
+        | "CLOSED"
+        | "CONFIRMED"
+        | "CONFIRMED_INACTIVE_SHORT"
+        | "CONFIRMED_INACTIVE_LONG"
+        | "DRAFT";
 }
 
 export interface AccompanyingPeriodWork {
-  id: number;
-  accompanyingPeriod?: AccompanyingPeriod;
-  accompanyingPeriodWorkEvaluations: AccompanyingPeriodWorkEvaluation[];
-  createdAt?: string;
-  createdAutomatically: boolean;
-  createdAutomaticallyReason: string;
-  createdBy: User;
-  endDate?: string;
-  goals: AccompanyingPeriodWorkGoal[];
-  handlingThierParty?: Thirdparty;
-  note: string;
-  persons: Person[];
-  privateComment: PrivateCommentEmbeddable;
-  referrersHistory: AccompanyingPeriodWorkReferrerHistory[];
-  results: Result[];
-  socialAction?: SocialAction;
-  startDate?: string;
-  thirdParties: Thirdparty[];
-  updatedAt?: string;
-  updatedBy: User;
-  version: number;
+    id: number;
+    accompanyingPeriod?: AccompanyingPeriod;
+    accompanyingPeriodWorkEvaluations: AccompanyingPeriodWorkEvaluation[];
+    createdAt?: string;
+    createdAutomatically: boolean;
+    createdAutomaticallyReason: string;
+    createdBy: User;
+    endDate?: string;
+    goals: AccompanyingPeriodWorkGoal[];
+    handlingThierParty?: Thirdparty;
+    note: string;
+    persons: Person[];
+    privateComment: PrivateCommentEmbeddable;
+    referrersHistory: AccompanyingPeriodWorkReferrerHistory[];
+    results: Result[];
+    socialAction?: SocialAction;
+    startDate?: string;
+    thirdParties: Thirdparty[];
+    updatedAt?: string;
+    updatedBy: User;
+    version: number;
 }
 
-interface SocialAction {
-  id: number;
-  parent?: SocialAction | null;
-  children: SocialAction[];
-  issue?: SocialIssue | null;
-  ordering: number;
-  title: {
-    fr: string;
-  };
-  defaultNotificationDelay?: string | null;
-  desactivationDate?: string | null;
-  evaluations: Evaluation[];
-  goals: Goal[];
-  results: Result[];
+export interface SocialAction {
+    id: number;
+    parent?: SocialAction | null;
+    children: SocialAction[];
+    issue?: SocialIssue | null;
+    ordering: number;
+    title: {
+        fr: string;
+    };
+    defaultNotificationDelay?: string | null;
+    desactivationDate?: string | null;
+    evaluations: Evaluation[];
+    goals: Goal[];
+    results: Result[];
 }
 
 export interface AccompanyingPeriodResource {
-  id: number;
-  accompanyingPeriod: AccompanyingPeriod;
-  comment?: string | null;
-  person?: Person | null;
-  thirdParty?: Thirdparty | null;
+    id: number;
+    accompanyingPeriod: AccompanyingPeriod;
+    comment?: string | null;
+    person?: Person | null;
+    thirdParty?: Thirdparty | null;
 }
 
 export interface Origin {
-  id: number;
-  label: {
-    fr: string;
-  };
-  noActiveAfter: DateTime;
+    id: number;
+    label: {
+        fr: string;
+    };
+    noActiveAfter: DateTime;
 }
 
 export interface ClosingMotive {
-  id: number;
-  active: boolean;
-  name: {
-    fr: string;
-  };
-  ordering: number;
-  isCanceledAccompanyingPeriod: boolean;
-  parent?: ClosingMotive | null;
-  children: ClosingMotive[];
+    id: number;
+    active: boolean;
+    name: {
+        fr: string;
+    };
+    ordering: number;
+    isCanceledAccompanyingPeriod: boolean;
+    parent?: ClosingMotive | null;
+    children: ClosingMotive[];
 }
 
 export interface AccompanyingPeriodParticipation {
-  id: number;
-  startDate: DateTime;
-  endDate?: DateTime | null;
-  accompanyingPeriod: AccompanyingPeriod;
-  person: Person;
+    id: number;
+    startDate: DateTime;
+    endDate?: DateTime | null;
+    accompanyingPeriod: AccompanyingPeriod;
+    person: Person;
 }
 
 export interface AccompanyingPeriodLocationHistory {
-  id: number;
-  startDate: DateTime;
-  endDate?: DateTime | null;
-  addressLocation?: Address | null;
-  period: AccompanyingPeriod;
-  personLocation?: Person | null;
+    id: number;
+    startDate: DateTime;
+    endDate?: DateTime | null;
+    addressLocation?: Address | null;
+    period: AccompanyingPeriod;
+    personLocation?: Person | null;
 }
 
 export interface SocialIssue {
-  id: number;
-  parent?: SocialIssue | null;
-  children: SocialIssue[];
-  socialActions?: SocialAction[] | null;
-  ordering: number;
-  title: {
-    fr: string;
-  };
-  desactivationDate?: string | null;
+    id: number;
+    parent?: SocialIssue | null;
+    children: SocialIssue[];
+    socialActions?: SocialAction[] | null;
+    ordering: number;
+    title: {
+        fr: string;
+    };
+    desactivationDate?: string | null;
 }
 
 export interface Goal {
-  id: number;
-  results: Result[];
-  socialActions?: SocialAction[] | null;
-  title: {
-    fr: string;
-  };
-}
-
-export interface Result {
-  id: number;
-  accompanyingPeriodWorks: AccompanyingPeriodWork[];
-  accompanyingPeriodWorkGoals: AccompanyingPeriodWorkGoal[];
-  goals: Goal[];
-  socialActions: SocialAction[];
-  title: {
-    fr: string;
-  };
-  desactivationDate?: string | null;
+    id: number;
+    results: Result[];
+    socialActions?: SocialAction[] | null;
+    title: {
+        fr: string;
+    };
 }
 
 export interface AccompanyingPeriodWorkGoal {
-  id: number;
-  accompanyingPeriodWork: AccompanyingPeriodWork;
-  goal: Goal;
-  note: string;
-  results: Result[];
+    id: number;
+    accompanyingPeriodWork: AccompanyingPeriodWork;
+    goal: Goal;
+    note: string;
+    results: Result[];
 }
 
 export interface AccompanyingPeriodWorkEvaluation {
-  accompanyingPeriodWork: AccompanyingPeriodWork | null;
-  comment: string;
-  createdAt: DateTime | null;
-  createdBy: User | null;
-  documents: AccompanyingPeriodWorkEvaluationDocument[];
-  endDate: DateTime | null;
-  evaluation: Evaluation | null;
-  id: number | null;
-  // eslint-disable-next-line @typescript-eslint/no-explicit-any
-  key: any;
-  maxDate: DateTime | null;
-  startDate: DateTime | null;
-  updatedAt: DateTime | null;
-  updatedBy: User | null;
-  warningInterval: string | null;
-  timeSpent: number | null;
+    accompanyingPeriodWork: AccompanyingPeriodWork | null;
+    comment: string;
+    createdAt: DateTime | null;
+    createdBy: User | null;
+    documents: AccompanyingPeriodWorkEvaluationDocument[];
+    endDate: DateTime | null;
+    evaluation: Evaluation | null;
+    id: number | null;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    key: any;
+    maxDate: DateTime | null;
+    startDate: DateTime | null;
+    updatedAt: DateTime | null;
+    updatedBy: User | null;
+    warningInterval: string | null;
+    timeSpent: number | null;
 }
 
 export interface Evaluation {
-  id: number;
-  url: string;
-  socialActions: SocialAction[];
-  title: {
-    fr: string;
-  };
-  active: boolean;
-  delay: string;
-  notificationDelay: string;
+    id: number;
+    url: string;
+    socialActions: SocialAction[];
+    title: {
+        fr: string;
+    };
+    active: boolean;
+    delay: string;
+    notificationDelay: string;
 }
 
 export interface AccompanyingPeriodWorkReferrerHistory {
-  id: number;
-  accompanyingPeriodWork: AccompanyingPeriodWork;
-  user: User;
-  startDate: DateTime;
-  endDate: DateTime | null;
-  createdAt: DateTime;
-  updatedAt: DateTime | null;
-  createdBy: User;
-  updatedBy: User | null;
+    id: number;
+    accompanyingPeriodWork: AccompanyingPeriodWork;
+    user: User;
+    startDate: DateTime;
+    endDate: DateTime | null;
+    createdAt: DateTime;
+    updatedAt: DateTime | null;
+    createdBy: User;
+    updatedBy: User | null;
 }
 
+export interface AccompanyingPeriodWorkEvaluationDocument {
+    id: number;
+    type: "accompanying_period_work_evaluation_document";
+    storedObject: StoredObject;
+    title: string;
+    createdAt: DateTime | null;
+    createdBy: User | null;
+    updatedAt: DateTime | null;
+    updatedBy: User | null;
+    workflows_availables: WorkflowAvailable[];
+    workflows: object[];
+}
+
+export type EntityType =
+    | "user_group"
+    | "user"
+    | "person"
+    | "third_party"
+    | "household";
+
 export type Entities = (UserGroup | User | Person | ThirdParty | Household) & {
-  address?: Address | null;
-  kind?: string;
-  text?: string;
-  profession?: string;
+    address?: Address | null;
+    kind?: string;
+    text?: string;
+    profession?: string;
 };
 
 export type Result = Entities & {
-  parent?: Entities | null;
+    parent?: Entities | null;
 };
 
 export interface Suggestion {
-  key: string;
-  relevance: number;
-  result: Result;
+    key: string;
+    relevance: number;
+    result: Result;
 }
 
 export interface SearchPagination {
-  first: number;
-  items_per_page: number;
-  next: number | null;
-  previous: number | null;
-  more: boolean;
+    first: number;
+    items_per_page: number;
+    next: number | null;
+    previous: number | null;
+    more: boolean;
 }
 
 export interface Search {
-  count: number;
-  pagination: SearchPagination;
-  results: Suggestion[];
+    count: number;
+    pagination: SearchPagination;
+    results: Suggestion[];
 }
 
 export interface SearchOptions {
-  uniq: boolean;
-  type: string[];
-  priority: number | null;
-  button: {
-    size: string;
-    class: string;
-    type: string;
-    display: string;
-  };
+    uniq: boolean;
+    type: string[];
+    priority: number | null;
+    button: {
+        size: string;
+        class: string;
+        type: string;
+        display: string;
+    };
 }
 
 export class MakeFetchException extends Error {
-  sta: number;
-  txt: string;
-  violations: unknown | null;
+    sta: number;
+    txt: string;
+    violations: unknown | null;
 
-  constructor(txt: string, sta: number, violations: unknown | null = null) {
-    super(txt);
-    this.name = "ValidationException";
-    this.sta = sta;
-    this.txt = txt;
-    this.violations = violations;
-    Object.setPrototypeOf(this, MakeFetchException.prototype);
-  }
+    constructor(txt: string, sta: number, violations: unknown | null = null) {
+        super(txt);
+        this.name = "ValidationException";
+        this.sta = sta;
+        this.txt = txt;
+        this.violations = violations;
+        Object.setPrototypeOf(this, MakeFetchException.prototype);
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
index 670f0ea30..186b79e1d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
@@ -11,10 +11,10 @@
     <teleport to="body">
         <modal
             v-if="showModal"
-      @close="closeModal"
+            @close="closeModal"
             :modal-dialog-class="modalDialogClass"
             :show="showModal"
-      :hide-footer="false"
+            :hide-footer="false"
         >
             <template #header>
                 <h3 class="modal-title">
@@ -22,101 +22,110 @@
                 </h3>
             </template>
 
-      <template #body-head>
-        <div class="modal-body">
-          <div class="search">
-            <label class="col-form-label" style="float: right">
-              {{
-                trans(ADD_PERSONS_SUGGESTED_COUNTER, {
-                  count: suggestedCounter,
-                })
-              }}
-            </label>
+            <template #body-head>
+                <div class="modal-body">
+                    <div class="search">
+                        <label class="col-form-label" style="float: right">
+                            {{
+                                trans(ADD_PERSONS_SUGGESTED_COUNTER, {
+                                    count: suggestedCounter,
+                                })
+                            }}
+                        </label>
 
-            <input
-              id="search-persons"
-              name="query"
-              v-model="query"
-              :placeholder="trans(ADD_PERSONS_SEARCH_SOME_PERSONS)"
-              ref="searchRef"
-            />
-            <i class="fa fa-search fa-lg" />
-            <i
-              class="fa fa-times"
-              v-if="queryLength >= 3"
-              @click="resetSuggestion"
-            />
-          </div>
-        </div>
-        <div class="modal-body" v-if="checkUniq === 'checkbox'">
-          <div class="count">
-            <span>
-              <a v-if="suggestedCounter > 2" @click="selectAll">
-                {{ trans(ACTION_CHECK_ALL) }}
-              </a>
-              <a v-if="selectedCounter > 0" @click="resetSelection">
-                <i v-if="suggestedCounter > 2"> • </i>
-                {{ trans(ACTION_RESET) }}
-              </a>
-            </span>
-            <span v-if="selectedCounter > 0">
-              {{
-                trans(ADD_PERSONS_SELECTED_COUNTER, {
-                  count: selectedCounter,
-                })
-              }}
-            </span>
-          </div>
-        </div>
-      </template>
+                        <input
+                            id="search-persons"
+                            name="query"
+                            v-model="query"
+                            :placeholder="
+                                trans(ADD_PERSONS_SEARCH_SOME_PERSONS)
+                            "
+                            ref="searchRef"
+                        />
+                        <i class="fa fa-search fa-lg" />
+                        <i
+                            class="fa fa-times"
+                            v-if="queryLength >= 3"
+                            @click="resetSuggestion"
+                        />
+                    </div>
+                </div>
+                <div class="modal-body" v-if="checkUniq === 'checkbox'">
+                    <div class="count">
+                        <span>
+                            <a v-if="suggestedCounter > 2" @click="selectAll">
+                                {{ trans(ACTION_CHECK_ALL) }}
+                            </a>
+                            <a
+                                v-if="selectedCounter > 0"
+                                @click="resetSelection"
+                            >
+                                <i v-if="suggestedCounter > 2"> • </i>
+                                {{ trans(ACTION_RESET) }}
+                            </a>
+                        </span>
+                        <span v-if="selectedCounter > 0">
+                            {{
+                                trans(ADD_PERSONS_SELECTED_COUNTER, {
+                                    count: selectedCounter,
+                                })
+                            }}
+                        </span>
+                    </div>
+                </div>
+            </template>
 
-      <template #body>
-        <div class="results">
-          <person-suggestion
-            v-for="item in selectedAndSuggested.slice().reverse()"
-            :key="itemKey(item)"
-            :item="item"
-            :search="search"
-            :type="checkUniq"
-            @save-form-on-the-fly="saveFormOnTheFly"
-            @new-prior-suggestion="newPriorSuggestion"
-            @update-selected="updateSelected"
-          />
+            <template #body>
+                <div class="results">
+                    <person-suggestion
+                        v-for="item in selectedAndSuggested.slice().reverse()"
+                        :key="itemKey(item)"
+                        :item="item"
+                        :search="search"
+                        :type="checkUniq"
+                        @save-form-on-the-fly="saveFormOnTheFly"
+                        @new-prior-suggestion="newPriorSuggestion"
+                        @update-selected="updateSelected"
+                    />
 
-          <div class="create-button">
-            <on-the-fly
-              v-if="
-                queryLength >= 3 &&
-                (options.type.includes('person') ||
-                  options.type.includes('thirdparty'))
-              "
-              :button-text="trans(ONTHEFLY_CREATE_BUTTON, { q: query })"
-              :allowed-types="options.type"
-              :query="query"
-              action="create"
-              @save-form-on-the-fly="saveFormOnTheFly"
-              ref="onTheFly"
-            />
-          </div>
-        </div>
-      </template>
+                    <div class="create-button">
+                        <on-the-fly
+                            v-if="
+                                queryLength >= 3 &&
+                                (options.type.includes('person') ||
+                                    options.type.includes('thirdparty'))
+                            "
+                            :button-text="
+                                trans(ONTHEFLY_CREATE_BUTTON, { q: query })
+                            "
+                            :allowed-types="options.type"
+                            :query="query"
+                            action="create"
+                            @save-form-on-the-fly="saveFormOnTheFly"
+                            ref="onTheFly"
+                        />
+                    </div>
+                </div>
+            </template>
 
-      <template #footer>
-        <button
-          class="btn btn-create"
-          @click.prevent="
-            () => {
-              $emit('addNewPersons', { selected: selectedComputed });
-              query = '';
-              closeModal();
-            }
-          "
-        >
-          {{ trans(ACTION_ADD) }}
-        </button>
-      </template>
-    </modal>
-  </teleport>
+            <template #footer>
+                <button
+                    class="btn btn-create"
+                    @click.prevent="
+                        () => {
+                            $emit('addNewPersons', {
+                                selected: selectedComputed,
+                            });
+                            query = '';
+                            closeModal();
+                        }
+                    "
+                >
+                    {{ trans(ACTION_ADD) }}
+                </button>
+            </template>
+        </modal>
+    </teleport>
 </template>
 
 <script setup lang="ts">
@@ -130,31 +139,31 @@ import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue";
 import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
 
 import {
-  trans,
-  ADD_PERSONS_SUGGESTED_COUNTER,
-  ADD_PERSONS_SEARCH_SOME_PERSONS,
-  ADD_PERSONS_SELECTED_COUNTER,
-  ONTHEFLY_CREATE_BUTTON,
-  ACTION_CHECK_ALL,
-  ACTION_RESET,
-  ACTION_ADD,
+    trans,
+    ADD_PERSONS_SUGGESTED_COUNTER,
+    ADD_PERSONS_SEARCH_SOME_PERSONS,
+    ADD_PERSONS_SELECTED_COUNTER,
+    ONTHEFLY_CREATE_BUTTON,
+    ACTION_CHECK_ALL,
+    ACTION_RESET,
+    ACTION_ADD,
 } from "translator";
 import {
-  Suggestion,
-  Search,
-  Result as OriginalResult,
-  SearchOptions,
+    Suggestion,
+    Search,
+    Result as OriginalResult,
+    SearchOptions,
 } from "ChillPersonAssets/types";
 
 // Extend Result type to include optional addressId
 type Result = OriginalResult & { addressId?: number };
 
 const props = defineProps({
-  suggested: { type: Array as () => Suggestion[], default: () => [] },
-  selected: { type: Array as () => Suggestion[], default: () => [] },
-  buttonTitle: { type: String, required: true },
-  modalTitle: { type: String, required: true },
-  options: { type: Object as () => SearchOptions, required: true },
+    suggested: { type: Array as () => Suggestion[], default: () => [] },
+    selected: { type: Array as () => Suggestion[], default: () => [] },
+    buttonTitle: { type: String, required: true },
+    modalTitle: { type: String, required: true },
+    options: { type: Object as () => SearchOptions, required: true },
 });
 
 defineEmits(["addNewPersons"]);
@@ -163,25 +172,25 @@ const showModal = ref(false);
 const modalDialogClass = ref("modal-dialog-scrollable modal-xl");
 
 const modal = shallowRef({
-  showModal: false,
-  modalDialogClass: "modal-dialog-scrollable modal-xl",
+    showModal: false,
+    modalDialogClass: "modal-dialog-scrollable modal-xl",
 });
 
 const search = reactive({
-  query: "" as string,
-  previousQuery: "" as string,
-  currentSearchQueryController: null as AbortController | null,
-  suggested: props.suggested as Suggestion[],
-  selected: props.selected as Suggestion[],
-  priorSuggestion: {} as Partial<Suggestion>,
+    query: "" as string,
+    previousQuery: "" as string,
+    currentSearchQueryController: null as AbortController | null,
+    suggested: props.suggested as Suggestion[],
+    selected: props.selected as Suggestion[],
+    priorSuggestion: {} as Partial<Suggestion>,
 });
 
 const searchRef = ref<HTMLInputElement | null>(null);
 const onTheFly = ref<InstanceType<typeof OnTheFly> | null>(null);
 
 const query = computed({
-  get: () => search.query,
-  set: (val) => setQuery(val),
+    get: () => search.query,
+    set: (val) => setQuery(val),
 });
 const queryLength = computed(() => search.query.length);
 const suggestedCounter = computed(() => search.suggested.length);
@@ -189,18 +198,18 @@ const selectedComputed = computed(() => search.selected);
 const selectedCounter = computed(() => search.selected.length);
 
 const getClassButton = computed(() => {
-  let size = props.options?.button?.size ?? "";
-  let type = props.options?.button?.type ?? "btn-create";
-  return size ? size + " " + type : type;
+    let size = props.options?.button?.size ?? "";
+    let type = props.options?.button?.type ?? "btn-create";
+    return size ? size + " " + type : type;
 });
 const displayTextButton = computed(() =>
-  props.options?.button?.display !== undefined
-    ? props.options.button.display
-    : true,
+    props.options?.button?.display !== undefined
+        ? props.options.button.display
+        : true,
 );
 
 const checkUniq = computed(() =>
-  props.options.uniq === true ? "radio" : "checkbox",
+    props.options.uniq === true ? "radio" : "checkbox",
 );
 
 const priorSuggestion = computed(() => search.priorSuggestion);
@@ -209,229 +218,232 @@ const hasPriorSuggestion = computed(() => !!search.priorSuggestion.key);
 const itemKey = (item: Suggestion) => item.result.type + item.result.id;
 
 function addPriorSuggestion() {
-  if (hasPriorSuggestion.value) {
-    // Type assertion is safe here due to the checks above
-    search.suggested.unshift(priorSuggestion.value as Suggestion);
-    search.selected.unshift(priorSuggestion.value as Suggestion);
-    newPriorSuggestion(null);
-  }
+    if (hasPriorSuggestion.value) {
+        // Type assertion is safe here due to the checks above
+        search.suggested.unshift(priorSuggestion.value as Suggestion);
+        search.selected.unshift(priorSuggestion.value as Suggestion);
+        newPriorSuggestion(null);
+    }
 }
 
 const selectedAndSuggested = computed(() => {
-  addPriorSuggestion();
-  const uniqBy = (a: Suggestion[], key: (item: Suggestion) => string) => [
-    ...new Map(a.map((x) => [key(x), x])).values(),
-  ];
-  let union = [
-    ...new Set([
-      ...search.suggested.slice().reverse(),
-      ...search.selected.slice().reverse(),
-    ]),
-  ];
-  return uniqBy(union, (k: Suggestion) => k.key);
+    addPriorSuggestion();
+    const uniqBy = (a: Suggestion[], key: (item: Suggestion) => string) => [
+        ...new Map(a.map((x) => [key(x), x])).values(),
+    ];
+    let union = [
+        ...new Set([
+            ...search.suggested.slice().reverse(),
+            ...search.selected.slice().reverse(),
+        ]),
+    ];
+    return uniqBy(union, (k: Suggestion) => k.key);
 });
 
 function openModal() {
-  showModal.value = true;
-  nextTick(() => {
-    if (searchRef.value) searchRef.value.focus();
-  });
+    showModal.value = true;
+    nextTick(() => {
+        if (searchRef.value) searchRef.value.focus();
+    });
 }
 function closeModal() {
-  showModal.value = false;
+    showModal.value = false;
 }
 
 function setQuery(q: string) {
-  search.query = q;
+    search.query = q;
 
-  // Clear previous search if any
-  if (search.currentSearchQueryController) {
-    search.currentSearchQueryController.abort();
-    search.currentSearchQueryController = null;
-  }
+    // Clear previous search if any
+    if (search.currentSearchQueryController) {
+        search.currentSearchQueryController.abort();
+        search.currentSearchQueryController = null;
+    }
 
-  if (q === "") {
-    loadSuggestions([]);
-    return;
-  }
+    if (q === "") {
+        loadSuggestions([]);
+        return;
+    }
 
-  // Debounce delay based on query length
-  const delay = q.length > 3 ? 300 : 700;
+    // Debounce delay based on query length
+    const delay = q.length > 3 ? 300 : 700;
 
-  setTimeout(() => {
-    // Only search if query hasn't changed in the meantime
-    if (q !== search.query) return;
+    setTimeout(() => {
+        // Only search if query hasn't changed in the meantime
+        if (q !== search.query) return;
 
-    search.currentSearchQueryController = new AbortController();
+        search.currentSearchQueryController = new AbortController();
 
-    searchEntities(
-      { query: q, options: props.options },
-      search.currentSearchQueryController.signal,
-    )
-      .then((suggested: Search) => {
-        loadSuggestions(suggested.results);
-      })
-      .catch((error: DOMException) => {
-        if (error instanceof DOMException && error.name === "AbortError") {
-          // Request was aborted, ignore
-          return;
-        }
-        throw error;
-      });
-  }, delay);
+        searchEntities(
+            { query: q, options: props.options },
+            search.currentSearchQueryController.signal,
+        )
+            .then((suggested: Search) => {
+                loadSuggestions(suggested.results);
+            })
+            .catch((error: DOMException) => {
+                if (
+                    error instanceof DOMException &&
+                    error.name === "AbortError"
+                ) {
+                    // Request was aborted, ignore
+                    return;
+                }
+                throw error;
+            });
+    }, delay);
 }
 
 function loadSuggestions(suggestedArr: Suggestion[]) {
-  search.suggested = suggestedArr;
-  search.suggested.forEach((item) => {
-    item.key = itemKey(item);
-  });
+    search.suggested = suggestedArr;
+    search.suggested.forEach((item) => {
+        item.key = itemKey(item);
+    });
 }
 
 function updateSelected(value: Suggestion[]) {
-  search.selected = value;
+    search.selected = value;
 }
 
 function resetSuggestion() {
-  search.query = "";
-  search.suggested = [];
+    search.query = "";
+    search.suggested = [];
 }
 
 function resetSelection() {
-  search.selected = [];
+    search.selected = [];
 }
 
 function resetSearch() {
-  resetSelection();
-  resetSuggestion();
+    resetSelection();
+    resetSuggestion();
 }
 
 function selectAll() {
-  search.suggested.forEach((item) => {
-    search.selected.push(item);
-  });
+    search.suggested.forEach((item) => {
+        search.selected.push(item);
+    });
 }
 
 function newPriorSuggestion(entity: Result | null) {
-  if (entity !== null) {
-    let suggestion = {
-      key: entity.type + entity.id,
-      relevance: 0.5,
-      result: entity,
-    };
-    search.priorSuggestion = suggestion;
-  } else {
-    search.priorSuggestion = {};
-  }
+    if (entity !== null) {
+        let suggestion = {
+            key: entity.type + entity.id,
+            relevance: 0.5,
+            result: entity,
+        };
+        search.priorSuggestion = suggestion;
+    } else {
+        search.priorSuggestion = {};
+    }
 }
 
 async function saveFormOnTheFly({
-  type,
-  data,
+    type,
+    data,
 }: {
-  type: string;
-  data: Result;
+    type: string;
+    data: Result;
 }) {
-  try {
-    if (type === "person") {
-      const responsePerson: Result = await makeFetch(
-        "POST",
-        "/api/1.0/person/person.json",
-        data,
-      );
-      newPriorSuggestion(responsePerson);
-      if (onTheFly.value) onTheFly.value.closeModal();
-
-      if (data.addressId != null) {
-        const household = { type: "household" };
-        const address = { id: data.addressId };
-        try {
-          const responseHousehold: Result = await makeFetch(
-            "POST",
-            "/api/1.0/person/household.json",
-            household,
-          );
-          const member = {
-            concerned: [
-              {
-                person: {
-                  type: "person",
-                  id: responsePerson.id,
-                },
-                start_date: {
-                  datetime: `${new Date().toISOString().split("T")[0]}T00:00:00+02:00`,
-                },
-                holder: false,
-                comment: null,
-              },
-            ],
-            destination: {
-              type: "household",
-              id: responseHousehold.id,
-            },
-            composition: null,
-          };
-          await makeFetch(
-            "POST",
-            "/api/1.0/person/household/members/move.json",
-            member,
-          );
-          try {
-            const _response = await makeFetch(
-              "POST",
-              `/api/1.0/person/household/${responseHousehold.id}/address.json`,
-              address,
+    try {
+        if (type === "person") {
+            const responsePerson: Result = await makeFetch(
+                "POST",
+                "/api/1.0/person/person.json",
+                data,
             );
-            console.log(_response);
-          } catch (error) {
-            console.error(error);
-          }
-        } catch (error) {
-          console.error(error);
+            newPriorSuggestion(responsePerson);
+            if (onTheFly.value) onTheFly.value.closeModal();
+
+            if (data.addressId != null) {
+                const household = { type: "household" };
+                const address = { id: data.addressId };
+                try {
+                    const responseHousehold: Result = await makeFetch(
+                        "POST",
+                        "/api/1.0/person/household.json",
+                        household,
+                    );
+                    const member = {
+                        concerned: [
+                            {
+                                person: {
+                                    type: "person",
+                                    id: responsePerson.id,
+                                },
+                                start_date: {
+                                    datetime: `${new Date().toISOString().split("T")[0]}T00:00:00+02:00`,
+                                },
+                                holder: false,
+                                comment: null,
+                            },
+                        ],
+                        destination: {
+                            type: "household",
+                            id: responseHousehold.id,
+                        },
+                        composition: null,
+                    };
+                    await makeFetch(
+                        "POST",
+                        "/api/1.0/person/household/members/move.json",
+                        member,
+                    );
+                    try {
+                        const _response = await makeFetch(
+                            "POST",
+                            `/api/1.0/person/household/${responseHousehold.id}/address.json`,
+                            address,
+                        );
+                        console.log(_response);
+                    } catch (error) {
+                        console.error(error);
+                    }
+                } catch (error) {
+                    console.error(error);
+                }
+            }
+        } else if (type === "thirdparty") {
+            const response: Result = await makeFetch(
+                "POST",
+                "/api/1.0/thirdparty/thirdparty.json",
+                data,
+            );
+            newPriorSuggestion(response);
+            if (onTheFly.value) onTheFly.value.closeModal();
         }
-      }
-    } else if (type === "thirdparty") {
-      const response: Result = await makeFetch(
-        "POST",
-        "/api/1.0/thirdparty/thirdparty.json",
-        data,
-      );
-      newPriorSuggestion(response);
-      if (onTheFly.value) onTheFly.value.closeModal();
+    } catch (error) {
+        console.error(error);
     }
-  } catch (error) {
-    console.error(error);
-  }
 }
 
 watch(
-  () => props.selected,
-  (newSelected) => {
-    search.selected = newSelected;
-  },
-  { deep: true },
+    () => props.selected,
+    (newSelected) => {
+        search.selected = newSelected;
+    },
+    { deep: true },
 );
 
 watch(
-  () => props.suggested,
-  (newSuggested) => {
-    search.suggested = newSuggested;
-  },
-  { deep: true },
+    () => props.suggested,
+    (newSuggested) => {
+        search.suggested = newSuggested;
+    },
+    { deep: true },
 );
 
 watch(
-  () => modal,
-  (val) => {
-    showModal.value = val.value.showModal;
-    modalDialogClass.value = val.value.modalDialogClass;
-  },
-  { deep: true },
+    () => modal,
+    (val) => {
+        showModal.value = val.value.showModal;
+        modalDialogClass.value = val.value.modalDialogClass;
+    },
+    { deep: true },
 );
 
 defineExpose({
-  resetSearch,
-  showModal,
+    resetSearch,
+    showModal,
 });
 </script>
 
@@ -442,42 +454,42 @@ li.add-persons {
     }
 }
 div.body-head {
-  overflow-y: unset;
-  div.modal-body:first-child {
-    margin: auto 4em;
-    div.search {
-      position: relative;
-      input {
-        width: 100%;
-        padding: 1.2em 1.5em 1.2em 2.5em;
-      }
-      i {
-        position: absolute;
-        opacity: 0.5;
-        padding: 0.65em 0;
-        top: 50%;
-      }
-      i.fa-search {
-        left: 0.5em;
-      }
-      i.fa-times {
-        right: 1em;
-        padding: 0.75em 0;
-        cursor: pointer;
-      }
+    overflow-y: unset;
+    div.modal-body:first-child {
+        margin: auto 4em;
+        div.search {
+            position: relative;
+            input {
+                width: 100%;
+                padding: 1.2em 1.5em 1.2em 2.5em;
+            }
+            i {
+                position: absolute;
+                opacity: 0.5;
+                padding: 0.65em 0;
+                top: 50%;
+            }
+            i.fa-search {
+                left: 0.5em;
+            }
+            i.fa-times {
+                right: 1em;
+                padding: 0.75em 0;
+                cursor: pointer;
+            }
+        }
     }
-  }
-  div.modal-body:last-child {
-    padding-bottom: 0;
-  }
-  div.count {
-    margin: -0.5em 0 0.7em;
-    display: flex;
-    justify-content: space-between;
-    a {
-      cursor: pointer;
+    div.modal-body:last-child {
+        padding-bottom: 0;
+    }
+    div.count {
+        margin: -0.5em 0 0.7em;
+        display: flex;
+        justify-content: space-between;
+        a {
+            cursor: pointer;
+        }
     }
-  }
 }
 .create-button > a {
     margin-top: 0.5em;
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
index 897387bfc..c048121cf 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
@@ -15,7 +15,7 @@ export interface Motive {
 
 export type TicketState = "open" | "closed";
 
-export type TicketEmergencyState = "yes"|"no";
+export type TicketEmergencyState = "yes" | "no";
 
 interface TicketHistory<T extends string, D extends object> {
     event_type: T;
@@ -75,42 +75,52 @@ export interface AddresseeState {
 export interface PersonsState {
     persons: Person[];
 }
+export interface CallerState {
+    new_caller: Person | null;
+}
 
 export interface StateChange {
     new_state: TicketState;
 }
 
-export interface StateChange {
-    new_state: TicketState;
+export interface EmergencyChange {
+    new_emergency: TicketEmergencyState;
 }
 
 export interface CreateTicketState {
     by: User;
 }
 
-interface AddPersonEvent extends TicketHistory<"add_person", PersonHistory> {}
 export type AddCommentEvent = TicketHistory<"add_comment", Comment>;
 export type SetMotiveEvent = TicketHistory<"set_motive", MotiveHistory>;
-//interface AddAddressee extends TicketHistory<"add_addressee", AddresseeHistory> {};
-//interface RemoveAddressee extends TicketHistory<"remove_addressee", AddresseeHistory> {};
-export interface AddresseesStateEvent
-    extends TicketHistory<"addressees_state", AddresseeState> {}
-export interface CreateTicketEvent
-    extends TicketHistory<"create_ticket", CreateTicketState> {}
-export interface PersonStateEvent
-    extends TicketHistory<"persons_state", PersonsState> {}
-export interface ChangeStateEvent
-    extends TicketHistory<"state_change", StateChange> {}
+export type AddPersonEvent = TicketHistory<"add_person", PersonHistory>;
+export type AddresseesStateEvent = TicketHistory<
+    "addressees_state",
+    AddresseeState
+>;
+export type CreateTicketEvent = TicketHistory<
+    "create_ticket",
+    CreateTicketState
+>;
+export type PersonStateEvent = TicketHistory<"persons_state", PersonsState>;
+export type ChangeStateEvent = TicketHistory<"state_change", StateChange>;
+export type EmergencyStateEvent = TicketHistory<
+    "emergency_change",
+    EmergencyChange
+>;
+export type CallerStateEvent = TicketHistory<"set_caller", CallerState>;
 
-// TODO : Remove add_persont event from TicketHistoryLine
+// TODO : Remove add_person event from TicketHistoryLine
 export type TicketHistoryLine =
     | AddPersonEvent
     | CreateTicketEvent
     | AddCommentEvent
-    | SetMotiveEvent /*AddAddressee | RemoveAddressee | */
+    | SetMotiveEvent
     | AddresseesStateEvent
     | PersonStateEvent
-    | ChangeStateEvent;
+    | ChangeStateEvent
+    | EmergencyStateEvent
+    | CallerStateEvent;
 
 export interface Ticket {
     type: "ticket_ticket";
@@ -124,16 +134,5 @@ export interface Ticket {
     updatedBy: User | null;
     currentState: TicketState | null;
     emergency: TicketEmergencyState | null;
-}
-
-export interface addNewPersons {
-    selected: Selected[];
-    modal: Modal;
-}
-export interface Modal {
-    showModal: boolean;
-    modalDialogClass: string;
-}
-export interface Selected {
-    result: User;
+    caller: Person | null;
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
index 9263fd30e..ec52ce9ee 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
@@ -34,6 +34,7 @@ onMounted(async () => {
         await store.dispatch("fetchMotives");
         await store.dispatch("fetchUserGroups");
         await store.dispatch("fetchUsers");
+        await store.dispatch("getSuggestedPersons");
     } catch (error) {
         toast.error(error as string);
     }
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
index eca289ef1..5eaade60d 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
@@ -2,25 +2,38 @@
     <div class="fixed-bottom">
         <div class="footer-ticket-details" v-if="activeTab">
             <div class="tab-content p-2">
-                <div>
+                <button
+                    type="button"
+                    class="btn btn-link p-0"
+                    style="
+                        position: absolute;
+                        top: 0.5rem;
+                        right: 0.5rem;
+                        font-size: 2rem;
+                        line-height: 1;
+                        color: #888;
+                        text-decoration: none;
+                    "
+                    @click="closeAllActions"
+                    aria-label="Fermer"
+                    title="Fermer"
+                >
+                    <span aria-hidden="true">&times;</span>
+                </button>
+                <div v-if="activeTabTitle">
                     <label class="col-form-label">
                         {{ activeTabTitle }}
                     </label>
                 </div>
 
-                <form
-                    v-if="activeTab !== 'persons_state'"
-                    @submit.prevent="submitAction"
-                >
+                <form @submit.prevent="submitAction">
                     <add-comment-component
                         v-model="content"
                         v-if="activeTab === 'add_comment'"
                     />
-
                     <addressee-selector-component
                         v-model="addressees"
-                        :user-groups="userGroups"
-                        :users="users"
+                        :suggested="userGroups"
                         v-if="activeTab === 'addressees_state'"
                     />
 
@@ -29,20 +42,40 @@
                         :motives="motives"
                         v-if="activeTab === 'set_motive'"
                     />
-
-                    <ul class="record_actions sticky-form-buttons">
-                        <li class="cancel">
-                            <button
-                                @click="activeTab = ''"
-                                class="btn btn-cancel"
-                            >
+                    <div v-if="activeTab === 'persons_state'">
+                        <div class="row">
+                            <label class="col col-form-label">
                                 {{
                                     trans(
-                                        CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CANCEL,
+                                        CHILL_TICKET_TICKET_SET_PERSONS_TITLE_CALLER,
                                     )
                                 }}
-                            </button>
-                        </li>
+                            </label>
+                            <label class="col col-form-label">
+                                {{
+                                    trans(
+                                        CHILL_TICKET_TICKET_SET_PERSONS_TITLE_PERSON,
+                                    )
+                                }}
+                            </label>
+                        </div>
+                        <div class="row">
+                            <div class="col">
+                                <caller-selector-component
+                                    v-model="caller"
+                                    :suggested="[]"
+                                />
+                            </div>
+                            <div class="col">
+                                <persons-selector-component
+                                    v-model="persons"
+                                    :suggested="suggestedPersons"
+                                />
+                            </div>
+                        </div>
+                    </div>
+
+                    <ul class="record_actions sticky-form-buttons">
                         <li>
                             <button class="btn btn-save" type="submit">
                                 {{
@@ -54,11 +87,6 @@
                         </li>
                     </ul>
                 </form>
-                <template v-else>
-                    <persons-selector-component
-                        @closeRequested="closeAllActions()"
-                    />
-                </template>
             </div>
         </div>
         <div class="footer-ticket-main">
@@ -67,8 +95,16 @@
                     <a :href="returnPath" class="btn btn-cancel">Annuler</a>
                 </li>
                 <li v-else class="nav-item p-2 go-back">
-                    <a href="/fr/ticket/ticket/list" class="btn btn-cancel"
-                        >Annuler</a
+                    <button
+                        type="button"
+                        class="btn btn-link p-0"
+                        style="font-size: 1.5rem; line-height: 1; color: #888"
+                        @click="closeAllActions"
+                        aria-label="Fermer"
+                        title="Fermer"
+                    >
+                        <span aria-hidden="true">&times;</span>
+                    </button>
                     >
                 </li>
                 <li
@@ -114,7 +150,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, ref } from "vue";
+import { computed, ref, watch } from "vue";
 import { useStore } from "vuex";
 import { useToast } from "vue-toast-notification";
 
@@ -123,6 +159,7 @@ import MotiveSelectorComponent from "./MotiveSelectorComponent.vue";
 import AddresseeSelectorComponent from "./AddresseeSelectorComponent.vue";
 import AddCommentComponent from "./AddCommentComponent.vue";
 import PersonsSelectorComponent from "./PersonsSelectorComponent.vue";
+import CallerSelectorComponent from "./CallerSelectorComponent.vue";
 
 // Translations
 import {
@@ -136,8 +173,10 @@ import {
     CHILL_TICKET_TICKET_SET_MOTIVE_TITLE,
     CHILL_TICKET_TICKET_SET_MOTIVE_ERROR,
     CHILL_TICKET_TICKET_SET_MOTIVE_SUCCESS,
+    CHILL_TICKET_TICKET_SET_PERSONS_TITLE_PERSON,
+    CHILL_TICKET_TICKET_SET_PERSONS_TITLE_CALLER,
     CHILL_TICKET_TICKET_SET_PERSONS_TITLE,
-    CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CANCEL,
+    CHILL_TICKET_TICKET_SET_PERSONS_SUCCESS,
     CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_SAVE,
     CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CLOSE,
     CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CLOSE_SUCCESS,
@@ -149,11 +188,11 @@ import {
 
 // Types
 import {
-    User,
     UserGroup,
     UserGroupOrUser,
 } from "../../../../../../../ChillMainBundle/Resources/public/types";
 import { Comment, Motive, Ticket } from "../../../types";
+import { Person } from "ChillPersonAssets/types";
 
 const store = useStore();
 const toast = useToast();
@@ -169,8 +208,6 @@ const activeTabTitle = computed((): string => {
             return trans(CHILL_TICKET_TICKET_SET_MOTIVE_TITLE);
         case "addressees_state":
             return trans(CHILL_TICKET_TICKET_ADD_ADDRESSEE_TITLE);
-        case "persons_state":
-            return trans(CHILL_TICKET_TICKET_SET_PERSONS_TITLE);
         default:
             return "";
     }
@@ -207,8 +244,8 @@ const ticket = computed(() => store.getters.getTicket as Ticket);
 const isOpen = computed(() => store.getters.isOpen);
 const motives = computed(() => store.getters.getMotives as Motive[]);
 const userGroups = computed(() => store.getters.getUserGroups as UserGroup[]);
-const users = computed(() => store.getters.getUsers as User[]);
-
+const suggestedPersons = computed(() => store.getters.getPersons as Person[]);
+console.log("suggestedPersons", suggestedPersons.value);
 const hasReturnPath = computed((): boolean => {
     const params = new URL(document.location.toString()).searchParams;
     return params.has("returnPath");
@@ -232,6 +269,8 @@ const motive = ref(
 );
 const content = ref("" as Comment["content"]);
 const addressees = ref(ticket.value.currentAddressees as UserGroupOrUser[]);
+const persons = ref(ticket.value.currentPersons as Person[]);
+const caller = ref(ticket.value.caller as Person);
 
 async function submitAction() {
     try {
@@ -279,6 +318,13 @@ async function submitAction() {
                     );
                 }
                 break;
+            case "persons_state":
+                await store.dispatch("setPersons", {
+                    persons: persons.value,
+                });
+                activeTab.value = "";
+                toast.success(trans(CHILL_TICKET_TICKET_SET_PERSONS_SUCCESS));
+                break;
         }
     } catch (error) {
         toast.error(error as string);
@@ -311,6 +357,11 @@ async function reopenTicket() {
 function closeAllActions() {
     activeTab.value = "";
 }
+
+watch(caller, async (newCaller) => {
+    await store.dispatch("setCaller", { caller: newCaller });
+    await store.dispatch("getSuggestedPersons");
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeComponent.vue
index 4505eef43..1e17e6f87 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeComponent.vue
@@ -20,12 +20,8 @@
         </span>
     </div>
     <div v-if="users.length > 0" class="col-12">
-        <span class="badge-user">
-            <user-render-box-badge
-                v-for="user in users"
-                :key="user.id"
-                :user="user"
-            ></user-render-box-badge>
+        <span class="badge-user" v-for="user in users" :key="user.id">
+            <user-render-box-badge :user="user" />
         </span>
     </div>
 </template>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue
index 3dde74bfc..8760c2855 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue
@@ -1,90 +1,18 @@
 <template>
     <div class="row">
-        <div class="col-12 col-lg-6 col-md-6 text-center">
-            <div class="mb-5 level-line">
-                <span
-                    v-for="userGroupItem in userGroups.filter(
-                        (userGroup) => userGroup.excludeKey == 'level',
-                    )"
-                    :key="userGroupItem.id"
-                    class="m-2 as-user-group"
-                >
-                    <input
-                        type="radio"
-                        class="btn-check"
-                        name="options-outlined"
-                        :id="`level-${userGroupItem.id}`"
-                        autocomplete="off"
-                        :value="userGroupItem"
-                        v-model="userGroupLevel"
-                        @click="
-                            Object.values(userGroupLevel).includes(
-                                userGroupItem.id,
-                            )
-                                ? (userGroupLevel = {})
-                                : (userGroupLevel = userGroupItem)
-                        "
-                    />
-                    <label
-                        :class="`btn btn-${userGroupItem.id}`"
-                        :for="`level-${userGroupItem.id}`"
-                        :style="getUserGroupBtnColor(userGroupItem)"
-                    >
-                        {{ userGroupItem.label.fr }}
-                    </label>
-                </span>
-            </div>
-            <div class="mb-2 level-line">
-                <span
-                    v-for="userGroupItem in userGroups.filter(
-                        (userGroup) => userGroup.excludeKey == '',
-                    )"
-                    :key="userGroupItem.id"
-                    class="m-2"
-                >
-                    <input
-                        type="checkbox"
-                        class="btn-check"
-                        name="options-outlined"
-                        :id="`user-group-${userGroupItem.id}`"
-                        autocomplete="off"
-                        :value="userGroupItem"
-                        v-model="userGroup"
-                    />
-                    <label
-                        :class="`btn btn-${userGroupItem.id}`"
-                        :for="`user-group-${userGroupItem.id}`"
-                        :style="getUserGroupBtnColor(userGroupItem)"
-                    >
-                        {{ userGroupItem.label.fr }}
-                    </label>
-                </span>
-            </div>
-        </div>
-
-        <div class="col-12 col-lg-6 col-md-6 mb-2 mb-2 text-center">
-            <add-persons
-                :options="addPersonsOptions"
-                key="add-person-ticket"
-                :buttonTitle="
-                    trans(CHILL_TICKET_TICKET_ADD_ADDRESSEE_USER_LABEL)
-                "
-                :modalTitle="
-                    trans(CHILL_TICKET_TICKET_ADD_ADDRESSEE_USER_LABEL)
-                "
-                :selected="selectedValues"
+        <div class="col-12">
+            <pick-entity
+                uniqid="ticket-addressee-selector"
+                :types="['user', 'user_group', 'third_party']"
+                :picked="selectedEntities"
                 :suggested="suggestedValues"
-                @addNewPersons="addNewEntity"
+                :multiple="true"
+                :removable-if-set="true"
+                :display-picked="true"
+                :label="trans(CHILL_TICKET_TICKET_ADD_ADDRESSEE_USER_LABEL)"
+                @add-new-entity="addNewEntity"
+                @remove-entity="removeEntity"
             />
-            <div class="p-2">
-                <ul class="list-suggest inline remove-items">
-                    <li v-for="user in users" :key="user.id">
-                        <span :title="user.username" @click="removeUser(user)">
-                            {{ user.username }}
-                        </span>
-                    </li>
-                </ul>
-            </div>
         </div>
     </div>
 </template>
@@ -93,12 +21,10 @@
 import { ref, watch, defineProps, defineEmits } from "vue";
 
 // Components
-import AddPersons from "ChillPersonAssets/vuejs/_components/AddPersons.vue";
+import PickEntity from "ChillMainAssets/vuejs/PickEntity/PickEntity.vue";
 
 // Types
-import type { User, UserGroup, UserGroupOrUser } from "ChillMainAssets/types";
-import { SearchOptions, Suggestion } from "ChillPersonAssets/types";
-import type { addNewPersons } from "../../../types";
+import { Entities } from "ChillPersonAssets/types";
 
 // Translations
 import {
@@ -107,117 +33,62 @@ import {
 } from "translator";
 
 const props = defineProps<{
-    modelValue?: UserGroupOrUser[];
-    userGroups: UserGroup[];
-    users: User[];
+    modelValue: Entities[];
+    suggested: Entities[];
 }>();
 
-const selectedValues = ref<Suggestion[]>([]);
-const suggestedValues = ref<Suggestion[]>([]);
+const emit = defineEmits<(e: "update:modelValue", value: Entities[]) => void>();
 
-const emit =
-    defineEmits<(e: "update:modelValue", value: UserGroupOrUser[]) => void>();
+const selectedEntities = ref<Entities[]>([...props.modelValue]);
+const suggestedValues = ref<Entities[]>([...props.suggested]);
+watch(
+    () => [props.suggested, props.modelValue],
+    () => {
+        const modelValue = props.modelValue ?? [];
 
-const addressees = ref<UserGroupOrUser[]>([...(props.modelValue ?? [])]);
-
-const userGroupsInit = [
-    ...(props.modelValue ?? []).filter(
-        (addressee: UserGroupOrUser) => addressee.type == "user_group",
-    ),
-] as UserGroup[];
-
-const userGroupLevel = ref<UserGroup | Record<string, never>>(
-    (userGroupsInit.filter(
-        (userGroup: UserGroup) => userGroup.excludeKey == "level",
-    )[0] as UserGroup) ?? {},
-);
-
-const userGroup = ref<UserGroup[]>(
-    userGroupsInit.filter(
-        (userGroup: UserGroup) => userGroup.excludeKey == "",
-    ) as UserGroup[],
-);
-
-const users = ref<User[]>([
-    ...(props.modelValue ?? []).filter(
-        (addressee: UserGroupOrUser) => addressee.type == "user",
-    ),
-] as User[]);
-
-const addPersonsOptions = {
-    uniq: false,
-    type: ["user"],
-    priority: null,
-    button: {
-        size: "btn-sm",
-        class: "btn-submit",
+        suggestedValues.value = props.suggested.filter(
+            (suggested: Entities) => {
+                return !modelValue.some((selected: Entities) => {
+                    if (
+                        suggested.type == "user_group" &&
+                        selected.type == "user_group"
+                    ) {
+                        switch (selected.excludeKey) {
+                            case "level":
+                                return suggested.excludeKey === "level";
+                            case "":
+                                return (
+                                    suggested.excludeKey === "" &&
+                                    suggested.id === selected.id
+                                );
+                            default:
+                                return false;
+                        }
+                    } else {
+                        return (
+                            suggested.type === selected.type &&
+                            suggested.id === selected.id
+                        );
+                    }
+                });
+            },
+        );
     },
-} as SearchOptions;
+    { immediate: true, deep: true },
+);
 
-function getUserGroupBtnColor(userGroup: UserGroup) {
-    return [
-        `color: ${userGroup.foregroundColor};
-        .btn-check:checked + .btn-${userGroup.id} {
-        color: ${userGroup.foregroundColor};
-        background-color: ${userGroup.backgroundColor};
-        }`,
-    ];
+function addNewEntity({ entity }: { entity: Entities }) {
+    selectedEntities.value.push(entity);
+    emit("update:modelValue", selectedEntities.value);
 }
 
-function addNewEntity(datas: addNewPersons) {
-    const { selected } = datas;
-    users.value = selected.map((selected) => selected.result);
-    addressees.value = addressees.value.filter(
-        (addressee) => addressee.type === "user_group",
+function removeEntity({ entity }: { entity: Entities }) {
+    const index = selectedEntities.value.findIndex(
+        (selectedEntity) => selectedEntity === entity,
     );
-    addressees.value = [...addressees.value, ...users.value];
-    emit("update:modelValue", addressees.value);
-    selectedValues.value = [];
-    suggestedValues.value = [];
-}
-
-function removeUser(user: User) {
-    users.value.splice(users.value.indexOf(user), 1);
-    addressees.value = addressees.value.filter(
-        (addressee) => addressee.id !== user.id,
-    );
-    emit("update:modelValue", addressees.value);
-}
-
-watch(userGroupLevel, (userGroupLevelAdd, userGroupLevelRem) => {
-    const index = addressees.value.indexOf(userGroupLevelRem as UserGroup);
     if (index !== -1) {
-        addressees.value.splice(index, 1);
+        selectedEntities.value.splice(index, 1);
     }
-    addressees.value.push(userGroupLevelAdd as UserGroup);
-    emit("update:modelValue", addressees.value);
-});
-
-watch(userGroup, (userGroupAdd) => {
-    const userGroupLevelArr = addressees.value.filter(
-        (addressee) =>
-            addressee.type == "user_group" && addressee.excludeKey == "level",
-    ) as UserGroup[];
-    const usersArr = addressees.value.filter(
-        (addressee) => addressee.type == "user",
-    ) as User[];
-    addressees.value = [...usersArr, ...userGroupLevelArr, ...userGroupAdd];
-    emit("update:modelValue", addressees.value);
-});
+    emit("update:modelValue", selectedEntities.value);
+}
 </script>
-
-<style lang="scss" scoped>
-.btn-check:checked + .btn,
-:not(.btn-check) + .btn:active,
-.btn:first-child:active,
-.btn.active,
-.btn.show {
-    color: white;
-    box-shadow: 0 0 0 0.2rem var(--bs-chill-green);
-    outline: 0;
-}
-
-.as-user-group {
-    display: inline-block;
-}
-</style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
index 848f827a5..12489f91a 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
@@ -3,17 +3,25 @@
         <div class="container-xxl text-primary">
             <div class="row">
                 <div class="col-md-6 col-sm-12 ps-md-5 ps-xxl-0">
-                    <h2>#{{ ticket.id }}</h2>
                     <h1 v-if="ticket.currentMotive">
-                        {{ ticket.currentMotive.label.fr }}
+                        #{{ ticket.id }} {{ ticket.currentMotive.label.fr }}
                     </h1>
                     <p class="chill-no-data-statement" v-else>
                         {{ trans(CHILL_TICKET_TICKET_BANNER_NO_MOTIVE) }}
                     </p>
+                    <h2 v-if="ticket.currentPersons.length">
+                        {{
+                            ticket.currentPersons
+                                .map((person) => person.text)
+                                .join(", ")
+                        }}
+                    </h2>
                 </div>
 
                 <div class="col-md-6 col-sm-12">
                     <div class="d-flex justify-content-end">
+                        <toggle-flags />
+
                         <span
                             class="badge text-bg-chill-green text-white"
                             style="font-size: 1rem"
@@ -45,7 +53,25 @@
     <Teleport to="#header-ticket-details">
         <div class="container-xxl">
             <div class="row justify-content-between">
-                <div class="col-md-6 col-sm-12 ps-md-5 ps-xxl-0">
+                <div
+                    class="col-md-4 col-sm-12 d-flex flex-column align-items-start"
+                >
+                    <h3 class="text-primary">
+                        {{ trans(CHILL_TICKET_TICKET_BANNER_CALLER) }}
+                    </h3>
+                    <on-the-fly
+                        v-if="ticket.caller"
+                        :key="ticket.caller.id"
+                        :type="ticket.caller.type"
+                        :id="ticket.caller.id"
+                        :buttonText="ticket.caller.textAge"
+                        :displayBadge="'true' === 'true'"
+                        action="show"
+                    ></on-the-fly>
+                </div>
+                <div
+                    class="col-md-4 col-sm-12 d-flex flex-column align-items-start"
+                >
                     <h3 class="text-primary">
                         {{ trans(CHILL_TICKET_TICKET_BANNER_CONCERNED_USAGER) }}
                     </h3>
@@ -59,7 +85,9 @@
                         action="show"
                     ></on-the-fly>
                 </div>
-                <div class="col-md-6 col-sm-12">
+                <div
+                    class="col-md-4 col-sm-12 d-flex flex-column align-items-start"
+                >
                     <h3 class="text-primary">
                         {{ trans(CHILL_TICKET_TICKET_BANNER_SPEAKER) }}
                     </h3>
@@ -84,6 +112,7 @@ import { ref, computed } from "vue";
 
 // Components
 import AddresseeComponent from "./AddresseeComponent.vue";
+import ToggleFlags from "./ToggleFlags.vue";
 import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue";
 
 // Types
@@ -104,6 +133,7 @@ import {
     CHILL_TICKET_TICKET_BANNER_MINUTES,
     CHILL_TICKET_TICKET_BANNER_SECONDS,
     CHILL_TICKET_TICKET_BANNER_AND,
+    CHILL_TICKET_TICKET_BANNER_CALLER,
 } from "translator";
 
 // Store
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/CallerSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/CallerSelectorComponent.vue
new file mode 100644
index 000000000..1afa0691f
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/CallerSelectorComponent.vue
@@ -0,0 +1,85 @@
+<template>
+    <pick-entity
+        uniqid="ticket-person-selector"
+        :types="['person', 'third_party']"
+        :picked="selectedEntity ? [selectedEntity] : []"
+        :suggested="suggestedValues"
+        :multiple="false"
+        :removable-if-set="true"
+        :display-picked="true"
+        :label="trans(CHILL_TICKET_TICKET_SET_PERSONS_CALLER_LABEL)"
+        @add-new-entity="addNewEntity"
+        @remove-entity="removeEntity"
+    />
+</template>
+
+<script setup lang="ts">
+import { ref, watch, defineProps, defineEmits } from "vue";
+
+// Components
+import PickEntity from "ChillMainAssets/vuejs/PickEntity/PickEntity.vue";
+
+// Types
+import { Entities } from "ChillPersonAssets/types";
+
+// Translations
+import {
+    trans,
+    CHILL_TICKET_TICKET_SET_PERSONS_CALLER_LABEL,
+} from "translator";
+
+const props = defineProps<{
+    modelValue: Entities | null;
+    suggested: Entities[];
+}>();
+const emit =
+    defineEmits<(event: "update:modelValue", value: Entities | null) => void>();
+
+const selectedEntity = ref<Entities | null>(props.modelValue);
+const suggestedValues = ref<Entities[]>([...props.suggested]);
+
+watch(
+    () => [props.suggested, props.modelValue],
+    () => {
+        suggestedValues.value = props.suggested.filter(
+            (suggested: Entities) =>
+                suggested.id === selectedEntity.value?.id &&
+                suggested.type === selectedEntity.value?.type,
+        );
+    },
+    { immediate: true, deep: true },
+);
+
+function addNewEntity({ entity }: { entity: Entities }) {
+    selectedEntity.value = entity;
+    emit("update:modelValue", selectedEntity.value);
+}
+
+function removeEntity() {
+    selectedEntity.value = null;
+    emit("update:modelValue", null);
+}
+</script>
+<style scoped lang="scss">
+ul.person-list {
+    list-style-type: none;
+
+    & > li {
+        display: inline-block;
+        border: 1px solid transparent;
+        border-radius: 6px;
+
+        button.remove-person {
+            opacity: 10%;
+        }
+    }
+
+    & > li:hover {
+        border: 1px solid white;
+
+        button.remove-person {
+            opacity: 100%;
+        }
+    }
+}
+</style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PersonsSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PersonsSelectorComponent.vue
index fa8fd4db9..0e0a55b32 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PersonsSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PersonsSelectorComponent.vue
@@ -1,135 +1,70 @@
 <template>
-    <div>
-        <div style="display: flex; flex-direction: column; align-items: center">
-            <add-persons
-                :options="addPersonsOptions"
-                key="add-person-selector"
-                :buttonTitle="trans(CHILL_TICKET_TICKET_SET_PERSONS_USER_LABEL)"
-                :modalTitle="trans(CHILL_TICKET_TICKET_SET_PERSONS_USER_LABEL)"
-                :selected="selectedValues"
-                :suggested="suggestedValues"
-                @addNewPersons="addNewEntity"
-            />
-            <div class="p-2">
-                <ul class="list-suggest inline remove-items">
-                    <li v-for="person in currentPersons" :key="person.id">
-                        <span
-                            :title="`${person.firstName} ${person.lastName}`"
-                            @click="removePerson(person)"
-                        >
-                            {{ `${person.firstName} ${person.lastName}` }}
-                        </span>
-                    </li>
-                </ul>
-            </div>
-        </div>
-    </div>
-    <ul class="record_actions">
-        <li class="cancel">
-            <button
-                class="btn btn-cancel"
-                type="button"
-                @click="emit('closeRequested')"
-            >
-                {{ trans(CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CANCEL) }}
-            </button>
-        </li>
-        <li>
-            <button class="btn btn-save" type="submit" @click.prevent="save">
-                {{ trans(CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_SAVE) }}
-            </button>
-        </li>
-    </ul>
+    <pick-entity
+        uniqid="ticket-person-selector"
+        :types="['person']"
+        :picked="selectedEntities"
+        :suggested="suggestedValues"
+        :multiple="false"
+        :removable-if-set="true"
+        :display-picked="true"
+        :label="trans(CHILL_TICKET_TICKET_SET_PERSONS_USER_LABEL)"
+        @add-new-entity="addNewEntity"
+        @remove-entity="removeEntity"
+    />
 </template>
 
 <script setup lang="ts">
-import { computed, inject, reactive, ref } from "vue";
-import { useStore } from "vuex";
-import { ToastPluginApi } from "vue-toast-notification";
+import { ref, watch, defineProps, defineEmits } from "vue";
 
 // Components
-import AddPersons from "ChillPersonAssets/vuejs/_components/AddPersons.vue";
+import PickEntity from "ChillMainAssets/vuejs/PickEntity/PickEntity.vue";
 
 // Types
-import { SearchOptions, Suggestion, Person } from "ChillPersonAssets/types";
-import { Ticket } from "../../../types";
+import { Entities } from "ChillPersonAssets/types";
 
 // Translations
-import {
-    trans,
-    CHILL_TICKET_TICKET_SET_PERSONS_USER_LABEL,
-    CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CANCEL,
-    CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_SAVE,
-    CHILL_TICKET_TICKET_SET_PERSONS_SUCCESS,
-} from "translator";
+import { trans, CHILL_TICKET_TICKET_SET_PERSONS_USER_LABEL } from "translator";
 
-const emit = defineEmits<(e: "closeRequested") => void>();
+const props = defineProps<{
+    modelValue: Entities[];
+    suggested: Entities[];
+}>();
+const emit = defineEmits<{
+    "update:modelValue": [value: Entities[]];
+}>();
 
-const store = useStore();
-const toast = inject("toast") as ToastPluginApi;
-const ticket = computed<Ticket>(() => store.getters.getTicket);
-const persons = computed(() => ticket.value.currentPersons);
+const selectedEntities = ref<Entities[]>([...props.modelValue]);
+const suggestedValues = ref<Entities[]>([...props.suggested]);
 
-const addPersonsOptions = {
-    uniq: false,
-    type: ["person"],
-    priority: null,
-    button: {
-        size: "btn-sm",
-        class: "btn-submit",
+watch(
+    () => [props.suggested, props.modelValue],
+    () => {
+        suggestedValues.value = props.suggested.filter(
+            (suggested: Entities) =>
+                !props.modelValue.some(
+                    (selected: Entities) =>
+                        suggested.id === selected.id &&
+                        suggested.type === selected.type,
+                ),
+        );
     },
-} as SearchOptions;
+    { immediate: true, deep: true },
+);
 
-const selectedValues = ref<Suggestion[]>([]);
-const suggestedValues = ref<Suggestion[]>([]);
+function addNewEntity({ entity }: { entity: Entities }) {
+    selectedEntities.value.push(entity);
+    emit("update:modelValue", selectedEntities.value);
+}
 
-const added: Person[] = reactive([]);
-const removed: Person[] = reactive([]);
-
-const computeCurrentPersons = (
-    initial: Person[],
-    added: Person[],
-    removed: Person[],
-): Person[] => {
-    for (let p of added) {
-        if (initial.findIndex((element) => element.id === p.id) === -1) {
-            initial.push(p);
-        }
-    }
-
-    return initial.filter(
-        (p) => removed.findIndex((element) => element.id === p.id) === -1,
+function removeEntity({ entity }: { entity: Entities }) {
+    const index = selectedEntities.value.findIndex(
+        (selectedEntity) => selectedEntity === entity,
     );
-};
-
-const currentPersons = computed((): Person[] => {
-    return computeCurrentPersons(persons.value, added, removed);
-});
-
-const removePerson = (p: Person) => {
-    removed.push(p);
-};
-
-const addNewEntity = (n: { selected: { result: Person }[] }) => {
-    for (let p of n.selected) {
-        added.push(p.result);
+    if (index !== -1) {
+        selectedEntities.value.splice(index, 1);
     }
-    selectedValues.value = [];
-    suggestedValues.value = [];
-};
-
-const save = async function (): Promise<void> {
-    try {
-        await store.dispatch("setPersons", {
-            persons: computeCurrentPersons(persons.value, added, removed),
-        });
-        toast.success(trans(CHILL_TICKET_TICKET_SET_PERSONS_SUCCESS));
-    } catch (error) {
-        toast.error((error as Error).message);
-        return Promise.resolve();
-    }
-    emit("closeRequested");
-};
+    emit("update:modelValue", selectedEntities.value);
+}
 </script>
 <style scoped lang="scss">
 ul.person-list {
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryEmergencyComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryEmergencyComponent.vue
new file mode 100644
index 000000000..00f275f37
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryEmergencyComponent.vue
@@ -0,0 +1,18 @@
+<template>
+    <div>
+        <span
+            class="badge rounded-pill me-1 mx-2"
+            :class="{
+                'bg-danger': new_emergency === 'yes',
+                'bg-secondary': new_emergency === 'no',
+            }"
+        >
+            {{ trans(CHILL_TICKET_TICKET_BANNER_EMERGENCY) }}
+        </span>
+    </div>
+</template>
+<script setup lang="ts">
+import { trans, CHILL_TICKET_TICKET_BANNER_EMERGENCY } from "translator";
+
+defineProps<{ new_emergency: string }>();
+</script>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
index fbd1e5ac4..71761b7b3 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
@@ -19,6 +19,10 @@
                         :new_state="history_line.data.new_state"
                         v-if="history_line.event_type == 'state_change'"
                     />
+                    <TicketHistoryEmergencyComponent
+                        v-if="history_line.event_type == 'emergency_change'"
+                        :new_emergency="history_line.data.new_emergency"
+                    />
                 </div>
                 <div>
                     <span class="badge-user">
@@ -34,12 +38,24 @@
         </div>
         <div
             class="card-body row"
-            v-if="history_line.event_type != 'state_change'"
+            v-if="
+                !['state_change', 'emergency_change'].includes(
+                    history_line.event_type,
+                )
+            "
         >
             <ticket-history-person-component
-                :personHistory="history_line.data"
+                :persons="history_line.data.persons"
                 v-if="history_line.event_type == 'persons_state'"
             />
+            <ticket-history-person-component
+                :persons="
+                    history_line.data.new_caller
+                        ? [history_line.data.new_caller]
+                        : []
+                "
+                v-if="history_line.event_type == 'set_caller'"
+            />
             <ticket-history-motive-component
                 :motiveHistory="history_line.data"
                 v-else-if="history_line.event_type == 'set_motive'"
@@ -74,11 +90,25 @@ import TicketHistoryCommentComponent from "./TicketHistoryCommentComponent.vue";
 import TicketHistoryAddresseeComponent from "./TicketHistoryAddresseeComponent.vue";
 import TicketHistoryCreateComponent from "./TicketHistoryCreateComponent.vue";
 import TicketHistoryStateComponent from "./TicketHistoryStateComponent.vue";
+import TicketHistoryEmergencyComponent from "./TicketHistoryEmergencyComponent.vue";
 
 import UserRenderBoxBadge from "ChillMainAssets/vuejs/_components/Entity/UserRenderBoxBadge.vue";
+
 // Utils
 import { ISOToDatetime } from "../../../../../../../ChillMainBundle/Resources/public/chill/js/date";
 
+// Translations
+import {
+    trans,
+    CHILL_TICKET_TICKET_HISTORY_ADD_COMMENT,
+    CHILL_TICKET_TICKET_HISTORY_ADDRESSEES_STATE,
+    CHILL_TICKET_TICKET_HISTORY_PERSONS_STATE,
+    CHILL_TICKET_TICKET_HISTORY_SET_MOTIVE,
+    CHILL_TICKET_TICKET_HISTORY_CREATE_TICKET,
+    CHILL_TICKET_TICKET_HISTORY_STATE_CHANGE,
+    CHILL_TICKET_TICKET_HISTORY_EMERGENCY_CHANGE,
+    CHILL_TICKET_TICKET_HISTORY_SET_CALLER,
+} from "translator";
 defineProps<{ history: TicketHistoryLine[] }>();
 
 const store = useStore();
@@ -88,17 +118,21 @@ const actionIcons = ref(store.getters.getActionIcons);
 function explainSentence(history: TicketHistoryLine): string {
     switch (history.event_type) {
         case "add_comment":
-            return "Nouveau commentaire";
+            return trans(CHILL_TICKET_TICKET_HISTORY_ADD_COMMENT);
         case "addressees_state":
-            return "Attributions";
+            return trans(CHILL_TICKET_TICKET_HISTORY_ADDRESSEES_STATE);
         case "persons_state":
-            return "Usagés concernés";
+            return trans(CHILL_TICKET_TICKET_HISTORY_PERSONS_STATE);
         case "set_motive":
-            return "Nouveau motifs";
+            return trans(CHILL_TICKET_TICKET_HISTORY_SET_MOTIVE);
         case "create_ticket":
-            return "Ticket créé";
+            return trans(CHILL_TICKET_TICKET_HISTORY_CREATE_TICKET);
         case "state_change":
-            return "Status du ticket modifié";
+            return trans(CHILL_TICKET_TICKET_HISTORY_STATE_CHANGE);
+        case "emergency_change":
+            return trans(CHILL_TICKET_TICKET_HISTORY_EMERGENCY_CHANGE);
+        case "set_caller":
+            return trans(CHILL_TICKET_TICKET_HISTORY_SET_CALLER);
         default:
             return "";
     }
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryPersonComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryPersonComponent.vue
index 2fa369b3b..d8fc7fa94 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryPersonComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryPersonComponent.vue
@@ -1,7 +1,7 @@
 <template>
     <div class="col-12">
-        <ul class="persons-list">
-            <li v-for="person in personHistory.persons" :key="person.id">
+        <ul class="persons-list" v-if="persons.length > 0">
+            <li v-for="person in persons" :key="person.id">
                 <on-the-fly
                     :type="person.type"
                     :id="person.id"
@@ -11,6 +11,7 @@
                 ></on-the-fly>
             </li>
         </ul>
+        <div v-else class="text-muted">Aucune personne concernée</div>
     </div>
 </template>
 
@@ -18,9 +19,9 @@
 import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue";
 
 // Types
-import { PersonsState } from "../../../types";
+import { Person } from "ChillPersonAssets/types";
 
-defineProps<{ personHistory: PersonsState }>();
+defineProps<{ persons: Person[] }>();
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryStateComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryStateComponent.vue
index ccaa97e83..4527bd72c 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryStateComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryStateComponent.vue
@@ -1,4 +1,19 @@
 <template>
+    <span
+        class="badge rounded-pill me-1 mx-2"
+        :class="{
+            'bg-chill-red': props.new_state == 'closed',
+            'bg-chill-green': props.new_state == 'open',
+        }"
+    >
+        <template v-if="props.new_state == 'open'">
+            {{ trans(CHILL_TICKET_TICKET_BANNER_OPEN) }}
+        </template>
+        <template v-else-if="props.new_state == 'closed'">
+            {{ trans(CHILL_TICKET_TICKET_BANNER_CLOSED) }}
+        </template>
+    </span>
+    <!--
     <span
         class="text-chill-green mx-2"
         style="
@@ -22,7 +37,7 @@
         v-else-if="props.new_state == 'closed'"
     >
         {{ trans(CHILL_TICKET_TICKET_BANNER_CLOSED) }}
-    </span>
+    </span> -->
 </template>
 
 <script setup lang="ts">
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ToggleFlags.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ToggleFlags.vue
new file mode 100644
index 000000000..e9472db33
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ToggleFlags.vue
@@ -0,0 +1,67 @@
+<template>
+    <span class="d-block d-sm-inline-block ms-sm-3 ms-md-0">
+        <button
+            class="badge rounded-pill me-1"
+            :class="{
+                'bg-danger': isEmergency,
+                'bg-secondary': !isEmergency,
+            }"
+            @click="toggleEmergency"
+        >
+            {{ trans(CHILL_TICKET_TICKET_BANNER_EMERGENCY) }}
+        </button>
+    </span>
+</template>
+
+<script lang="ts" setup>
+import { computed } from "vue";
+import { useStore } from "vuex";
+import { useToast } from "vue-toast-notification";
+import { trans, CHILL_TICKET_TICKET_BANNER_EMERGENCY } from "translator";
+
+const store = useStore();
+const toast = useToast();
+
+const isEmergency = computed(() => store.getters.isEmergency);
+
+// Methods
+function toggleEmergency() {
+    store
+        .dispatch("toggleEmergency", isEmergency.value ? "no" : "yes")
+        .catch(({ name, violations }) => {
+            if (name === "ValidationException" || name === "AccessException") {
+                violations.forEach((violation: string) =>
+                    toast.open({ message: violation }),
+                );
+            } else {
+                toast.open({ message: "An error occurred" });
+            }
+        });
+}
+</script>
+
+<style lang="scss" scoped>
+a.flag-toggle {
+    color: white;
+    cursor: pointer;
+    &:hover {
+        color: white;
+        text-decoration: underline;
+        border-radius: 20px;
+    }
+    i {
+        margin: auto 0.4em;
+    }
+    span.on {
+        font-weight: bolder;
+    }
+}
+button.badge {
+    &.bg-secondary {
+        opacity: 0.5;
+        &:hover {
+            opacity: 0.7;
+        }
+    }
+}
+</style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/addressee.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/addressee.ts
index 3b833b21b..a6c00253a 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/addressee.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/addressee.ts
@@ -7,6 +7,7 @@ import { Module } from "vuex";
 import { RootState } from "..";
 
 import {
+    ApiException,
     User,
     UserGroup,
     UserGroupOrUser,
@@ -46,8 +47,9 @@ export const moduleAddressee: Module<State, RootState> = {
                         commit("setUserGroups", results);
                     },
                 );
-            } catch (e: any) {
-                throw e.name;
+            } catch (e: unknown) {
+                const error = e as ApiException;
+                throw error.name;
             }
         },
         fetchUsers({ commit }) {
@@ -55,8 +57,9 @@ export const moduleAddressee: Module<State, RootState> = {
                 fetchResults("/api/1.0/main/user.json").then((results) => {
                     commit("setUsers", results);
                 });
-            } catch (e: any) {
-                throw e.name;
+            } catch (e: unknown) {
+                const error = e as ApiException;
+                throw error.name;
             }
         },
 
@@ -76,8 +79,9 @@ export const moduleAddressee: Module<State, RootState> = {
                     },
                 );
                 commit("setTicket", result);
-            } catch (e: any) {
-                throw e.name;
+            } catch (e: unknown) {
+                const error = e as ApiException;
+                throw error.name;
             }
         },
     },
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/comment.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/comment.ts
index 34456ce07..2e56ff28a 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/comment.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/comment.ts
@@ -1,12 +1,10 @@
-import {
-    fetchResults,
-    makeFetch,
-} from "../../../../../../../../ChillMainBundle/Resources/public/lib/api/apiMethods";
+import { makeFetch } from "../../../../../../../../ChillMainBundle/Resources/public/lib/api/apiMethods";
 
 import { Module } from "vuex";
 import { RootState } from "..";
 
 import { Comment } from "../../../../types";
+import { ApiException } from "../../../../../../../../ChillMainBundle/Resources/public/types";
 
 export interface State {
     comments: Comment[];
@@ -31,8 +29,9 @@ export const moduleComment: Module<State, RootState> = {
                     { content },
                 );
                 commit("setTicket", result);
-            } catch (e: any) {
-                throw e.name;
+            } catch (e: unknown) {
+                const error = e as ApiException;
+                throw error.name;
             }
         },
     },
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/motive.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/motive.ts
index abd8547d2..f8e775232 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/motive.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/motive.ts
@@ -7,6 +7,7 @@ import { Module } from "vuex";
 import { RootState } from "..";
 
 import { Motive } from "../../../../types";
+import { ApiException } from "../../../../../../../../ChillMainBundle/Resources/public/types";
 
 export interface State {
     motives: Motive[];
@@ -33,8 +34,9 @@ export const moduleMotive: Module<State, RootState> = {
                     "/api/1.0/ticket/motive.json",
                 )) as Motive[];
                 commit("setMotives", results);
-            } catch (e: any) {
-                throw e.name;
+            } catch (e: unknown) {
+                const error = e as ApiException;
+                throw error.name;
             }
         },
 
@@ -55,8 +57,9 @@ export const moduleMotive: Module<State, RootState> = {
                     },
                 );
                 commit("setTicket", result);
-            } catch (e: any) {
-                throw e.name;
+            } catch (e: unknown) {
+                const error = e as ApiException;
+                throw error.name;
             }
         },
     },
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/persons.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/persons.ts
index db0e8cdb6..be09a41a8 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/persons.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/persons.ts
@@ -1,12 +1,28 @@
 import { makeFetch } from "../../../../../../../../ChillMainBundle/Resources/public/lib/api/apiMethods";
 import { Person } from "../../../../../../../../ChillPersonBundle/Resources/public/types";
+import { ApiException } from "../../../../../../../../ChillMainBundle/Resources/public/types";
 import { Module } from "vuex";
 import { RootState } from "..";
 import { Ticket } from "../../../../types";
 
-export interface State {}
+export interface State {
+    persons: Person[];
+}
 
 export const modulePersons: Module<State, RootState> = {
+    state: () => ({
+        persons: [] as Person[],
+    }),
+    getters: {
+        getPersons(state) {
+            return state.persons;
+        },
+    },
+    mutations: {
+        setPersons(state, persons: Person[]) {
+            state.persons = persons;
+        },
+    },
     actions: {
         async setPersons(
             { commit, rootState: RootState },
@@ -25,8 +41,45 @@ export const modulePersons: Module<State, RootState> = {
                 commit("setTicket", result);
 
                 return Promise.resolve();
-            } catch (e: any) {
-                throw e.name;
+            } catch (e: unknown) {
+                const error = e as ApiException;
+                throw error.name;
+            }
+        },
+        async setCaller(
+            { commit, rootState: RootState },
+            payload: { caller: Person | null },
+        ) {
+            try {
+                const caller = payload.caller
+                    ? {
+                          id: payload.caller.id,
+                          type: payload.caller.type,
+                      }
+                    : null;
+                const result: Ticket = await makeFetch(
+                    "POST",
+                    `/api/1.0/ticket/ticket/${RootState.ticket.ticket.id}/set-caller`,
+                    { caller },
+                );
+                commit("setTicket", result as Ticket);
+            } catch (e: unknown) {
+                const error = e as ApiException;
+                throw error.name;
+            }
+        },
+
+        async getSuggestedPersons({ commit, rootState: RootState }) {
+            try {
+                const ticketId = RootState.ticket.ticket.id;
+                const result: Person[] = await makeFetch(
+                    "GET",
+                    `/api/1.0/ticket/ticket/${ticketId}/suggest-person`,
+                );
+                commit("setPersons", result);
+            } catch (e: unknown) {
+                const error = e as ApiException;
+                throw error.name;
             }
         },
     },
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
index f4c9037a6..25acaeaed 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
@@ -1,8 +1,9 @@
 import { Module } from "vuex";
 import { RootState } from "..";
 
-import { Ticket } from "../../../../types";
+import { Ticket, TicketEmergencyState } from "../../../../types";
 import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
+import { ApiException } from "../../../../../../../../ChillMainBundle/Resources/public/types";
 
 export interface State {
     ticket: Ticket;
@@ -13,18 +14,23 @@ export const moduleTicket: Module<State, RootState> = {
     state: () => ({
         ticket: {} as Ticket,
         action_icons: {
-            add_person: "fa fa-eyedropper",
+            add_person: "fa fa-user-plus",
             add_comment: "fa fa-comment",
             set_motive: "fa fa-paint-brush",
             addressees_state: "fa fa-paper-plane",
-            persons_state: "fa fa-eyedropper",
-            state_change: "fa fa-bolt",
+            persons_state: "fa fa-user",
+            set_caller: "fa fa-phone",
+            state_change: "",
+            emergency_change: "",
         },
     }),
     getters: {
         isOpen(state) {
             return state.ticket.currentState === "open";
         },
+        isEmergency(state) {
+            return state.ticket.emergency == "yes" ? true : false;
+        },
         getTicket(state) {
             state.ticket.history = state.ticket.history.sort((a, b) =>
                 b.at.datetime.localeCompare(a.at.datetime),
@@ -52,8 +58,9 @@ export const moduleTicket: Module<State, RootState> = {
                     `/api/1.0/ticket/ticket/${state.ticket.id}/close`,
                 );
                 commit("setTicket", result as Ticket);
-            } catch (e: any) {
-                throw e.name;
+            } catch (e: unknown) {
+                const error = e as ApiException;
+                throw error.name;
             }
         },
         async reopenTicket({ commit, state }) {
@@ -63,8 +70,24 @@ export const moduleTicket: Module<State, RootState> = {
                     `/api/1.0/ticket/ticket/${state.ticket.id}/open`,
                 );
                 commit("setTicket", result as Ticket);
-            } catch (e: any) {
-                throw e.name;
+            } catch (e: unknown) {
+                const error = e as ApiException;
+                throw error.name;
+            }
+        },
+        async toggleEmergency(
+            { commit, state },
+            emergency: TicketEmergencyState,
+        ) {
+            try {
+                const result: Ticket = await makeFetch(
+                    "POST",
+                    `/api/1.0/ticket/ticket/${state.ticket.id}/emergency/${emergency}`,
+                );
+                commit("setTicket", result as Ticket);
+            } catch (e: unknown) {
+                const error = e as ApiException;
+                throw error.name;
             }
         },
     },
diff --git a/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml b/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
index b3cbb32c1..86b7dd046 100644
--- a/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
+++ b/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
@@ -6,6 +6,15 @@ chill_ticket:
             in_alert: Tickets en alerte (délai de résolution dépassé)
             created_between: Créés entre
     ticket:
+        history:
+            add_comment: "Nouveau commentaire"
+            addressees_state: "Attributions"
+            persons_state: "Usagé(s) concerné(s)"
+            set_caller: "Appelant Concerné"
+            set_motive: "Nouveau motifs"
+            create_ticket: "Ticket créé"
+            state_change: ""
+            emergency_change: ""
         previous_tickets: "Précédents tickets"
         actions_toolbar:
             cancel: "Annuler"
@@ -34,13 +43,17 @@ chill_ticket:
             success: "Attribution effectuée"
             error: "Aucun destinataire sélectionné"
         set_persons:
-            title: "Usagers concernés"
+            title: "Appelant et usager(s)"
+            title_person: "Usager(s)"
+            title_caller: "Appelant"
             user_label: "Ajouter un usager"
-            success: "Usager ajouté"
+            caller_label: "Ajouter un appelant"
+            success: "Appelants et usagers mis à jour"
             error: "Aucun usager sélectionné"
         banner:
             concerned_usager: "Usagers concernés"
             speaker: "Attribué à"
+            caller: "Appelant"
             open: "Ouvert"
             closed: "Fermé"
             since: "Depuis {time}"
@@ -70,3 +83,4 @@ chill_ticket:
                     other {# secondes}
                 }
             no_motive: "Pas de motif"
+            emergency: "URGENT"

From 11698a52e397cda04428f412aa3a3d251ac3105a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 4 Jul 2025 09:00:12 +0000
Subject: [PATCH 128/283] Ajout d'une liste de tickets

---
 .../ChillMainBundle/chill.api.specs.yaml      |  25 ++
 .../ChillTicketBundle/chill.api.specs.yaml    |  39 ++++
 .../src/Controller/TicketControllerApi.php    |   2 +-
 .../Controller/TicketListApiController.php    |  68 ++++++
 .../Repository/TicketACLAwareRepository.php   |  63 ++++++
 .../TicketACLAwareRepositoryInterface.php     |  37 +++
 .../src/Resources/public/types.ts             |  21 +-
 .../Normalizer/TicketNormalizer.php           |  20 +-
 .../TicketListApiControllerTest.php           | 213 ++++++++++++++++++
 .../TicketACLAwareRepositoryTest.php          |  66 ++++++
 .../Normalizer/TicketNormalizerTest.php       |  83 +++++++
 11 files changed, 628 insertions(+), 9 deletions(-)
 create mode 100644 src/Bundle/ChillTicketBundle/src/Controller/TicketListApiController.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepository.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepositoryInterface.php
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerTest.php
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Repository/TicketACLAwareRepositoryTest.php

diff --git a/src/Bundle/ChillMainBundle/chill.api.specs.yaml b/src/Bundle/ChillMainBundle/chill.api.specs.yaml
index 8d204803f..326918c61 100644
--- a/src/Bundle/ChillMainBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillMainBundle/chill.api.specs.yaml
@@ -10,6 +10,31 @@ servers:
 
 components:
     schemas:
+        Collection:
+            type: object
+            properties:
+                count:
+                    type: number
+                    format: u64
+                pagination:
+                    type: object
+                    properties:
+                        first:
+                            type: number
+                            format: u64
+                        items_per_page:
+                            type: number
+                            format: u64
+                        next:
+                            type: string
+                            format: uri
+                            nullable: true
+                        previous:
+                            type: string
+                            format: uri
+                            nullable: true
+                        more:
+                            type: boolean
         EntityWorkflowAttachment:
             type: object
             properties:
diff --git a/src/Bundle/ChillTicketBundle/chill.api.specs.yaml b/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
index 3e40cab66..c9f1aacea 100644
--- a/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
@@ -1,5 +1,10 @@
 components:
     schemas:
+        TicketSimple:
+            type: object
+            properties:
+                id:
+                    type: integer
         Motive:
             type: object
             properties:
@@ -44,6 +49,40 @@ paths:
             responses:
                 200:
                     description: "OK"
+    /1.0/ticket/ticket/list:
+        get:
+            tags:
+                - ticket
+            summary: List of tickets
+            parameters:
+                - name: byPerson
+                  in: query
+                  description: the id of the person
+                  required: false
+                  style: form
+                  explode: false
+                  schema:
+                      type: array
+                      items:
+                          type: integer
+                          format: integer
+                          minimum: 1
+            responses:
+                200:
+                    description: OK
+                    content:
+                        application/json:
+                            schema:
+                                allOf:
+                                    - $ref: '#components/schemas/Collection'
+                                    - type: object
+                                      properties:
+                                          results:
+                                              type: array
+                                              items:
+                                                  $ref: '#component/schema/TicketSimple'
+
+
     /1.0/ticket/motive.json:
         get:
             tags:
diff --git a/src/Bundle/ChillTicketBundle/src/Controller/TicketControllerApi.php b/src/Bundle/ChillTicketBundle/src/Controller/TicketControllerApi.php
index 36cde311a..aa9b16a59 100644
--- a/src/Bundle/ChillTicketBundle/src/Controller/TicketControllerApi.php
+++ b/src/Bundle/ChillTicketBundle/src/Controller/TicketControllerApi.php
@@ -20,7 +20,7 @@ class TicketControllerApi
 {
     public function __construct(private readonly SerializerInterface $serializer) {}
 
-    #[Route('/api/1.0/ticket/ticket/{id}', methods: ['GET'])]
+    #[Route('/api/1.0/ticket/ticket/{id}', requirements: ['id' => '\d+'], methods: ['GET'])]
     public function get(Ticket $ticket): JsonResponse
     {
         return new JsonResponse(
diff --git a/src/Bundle/ChillTicketBundle/src/Controller/TicketListApiController.php b/src/Bundle/ChillTicketBundle/src/Controller/TicketListApiController.php
new file mode 100644
index 000000000..8c9a90ab5
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Controller/TicketListApiController.php
@@ -0,0 +1,68 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Controller;
+
+use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
+use Chill\MainBundle\Serializer\Model\Collection;
+use Chill\PersonBundle\Repository\PersonRepository;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use Chill\TicketBundle\Repository\TicketACLAwareRepositoryInterface;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\SerializerInterface;
+
+final readonly class TicketListApiController
+{
+    public function __construct(
+        private Security $security,
+        private TicketACLAwareRepositoryInterface $ticketRepository,
+        private PaginatorFactoryInterface $paginatorFactory,
+        private SerializerInterface $serializer,
+        private PersonRepository $personRepository,
+    ) {}
+
+    #[Route('/api/1.0/ticket/ticket/list', name: 'chill_ticket_list_api', methods: ['GET'])]
+    public function listTicket(Request $request): JsonResponse
+    {
+        if (!$this->security->isGranted('ROLE_USER')) {
+            throw new AccessDeniedHttpException('Only users are allowed to list tickets.');
+        }
+
+        $params = [];
+
+        if ($request->query->has('byPerson')) {
+            $params = explode(',', $request->query->get('byPerson'));
+            foreach ($params as $id) {
+                $params['byPerson'][] = $person = $this->personRepository->find($id);
+
+                if (!$this->security->isGranted(PersonVoter::SEE, $person)) {
+                    throw new AccessDeniedHttpException(sprintf('Not allowed to see a person with id %d', $id));
+                }
+            }
+        }
+
+        $nb = $this->ticketRepository->countTickets($params);
+        $paginator = $this->paginatorFactory->create($nb);
+
+        $tickets = $this->ticketRepository->findTickets($params, $paginator->getCurrentPageFirstItemNumber(), $paginator->getItemsPerPage());
+
+        $collection = new Collection($tickets, $paginator);
+
+        return new JsonResponse(
+            $this->serializer->serialize($collection, 'json', ['groups' => 'read:simple']),
+            json: true
+        );
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepository.php b/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepository.php
new file mode 100644
index 000000000..634f55214
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepository.php
@@ -0,0 +1,63 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Repository;
+
+use Chill\TicketBundle\Entity\PersonHistory;
+use Chill\TicketBundle\Entity\Ticket;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\QueryBuilder;
+
+final readonly class TicketACLAwareRepository implements TicketACLAwareRepositoryInterface
+{
+    public function __construct(private EntityManagerInterface $em) {}
+
+    public function findTickets(array $params, int $start = 0, int $limit = 100): array
+    {
+        return $this->buildQuery($params)->select('t')->getQuery()->setFirstResult($start)
+            ->setMaxResults($limit)->getResult();
+    }
+
+    public function countTickets(array $params): int
+    {
+        return $this->buildQuery($params)->select('COUNT(t)')->getQuery()->getSingleScalarResult();
+    }
+
+    private function buildQuery(array $params): QueryBuilder
+    {
+        $qb = $this->em->createQueryBuilder();
+        $qb->from(Ticket::class, 't');
+        // counter for all the loops
+        $i = 0;
+
+        if (array_key_exists('byPerson', $params)) {
+            $or = $qb->expr()->orX();
+
+            foreach ($params['byPerson'] as $person) {
+                $or->add(
+                    $qb->expr()->exists(sprintf(
+                        'SELECT 1 FROM %s tp_%d WHERE tp_%d.ticket = t AND tp_%d.person = :person_%d AND tp_%d.endDate IS NULL',
+                        PersonHistory::class,
+                        ++$i,
+                        $i,
+                        $i,
+                        $i,
+                        $i,
+                    ))
+                );
+                $qb->setParameter(sprintf('person_%d', $i), $person);
+            }
+            $qb->andWhere($or);
+        }
+
+        return $qb;
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepositoryInterface.php b/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepositoryInterface.php
new file mode 100644
index 000000000..e946c1ded
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepositoryInterface.php
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Repository;
+
+use Chill\PersonBundle\Entity\Person;
+use Chill\TicketBundle\Entity\Ticket;
+
+/**
+ * Repository to find tickets, taking care of permissions.
+ */
+interface TicketACLAwareRepositoryInterface
+{
+    /**
+     * Find tickets.
+     *
+     * @param array{byPerson?: list<Person>} $params
+     *
+     * @return list<Ticket>
+     */
+    public function findTickets(array $params, int $start = 0, int $limit = 100): array;
+
+    /**
+     * Find tickets.
+     *
+     * @param array{byPerson?: list<Person>} $params
+     */
+    public function countTickets(array $params): int;
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
index c048121cf..4a244e9a4 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
@@ -5,6 +5,7 @@ import {
     UserGroupOrUser,
 } from "ChillMainAssets/types";
 import { Person } from "ChillPersonAssets/types";
+import {Thirdparty} from "../../../../ChillThirdPartyBundle/Resources/public/types";
 
 export interface Motive {
     type: "ticket_motive";
@@ -122,17 +123,29 @@ export type TicketHistoryLine =
     | EmergencyStateEvent
     | CallerStateEvent;
 
-export interface Ticket {
+interface BaseTicket<T extends "ticket_ticket:simple"|"ticket_ticket:extended" = "ticket_ticket:simple"> {
+    type_extended: T;
+}
+
+export interface TicketSimple extends BaseTicket<"ticket_ticket:simple"> {
     type: "ticket_ticket";
+    type_extended: "ticket_ticket:simple";
     id: number;
     externalRef: string;
     currentAddressees: UserGroupOrUser[];
     currentPersons: Person[];
     currentMotive: null | Motive;
-    history: TicketHistoryLine[];
-    createdAt: DateTime | null;
-    updatedBy: User | null;
     currentState: TicketState | null;
     emergency: TicketEmergencyState | null;
+    caller: Person | Thirdparty | null;
+}
+
+export interface Ticket extends BaseTicket<"ticket_ticket:extended"> {
+    type_extended: "ticket_ticket:extended";
+    createdAt: DateTime | null;
+    createdBy: DateTime | null;
+    updatedBy: User | null;
+    updatedAt: DateTime | null;
+    history: TicketHistoryLine[];
     caller: Person | null;
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php b/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
index b10a0873d..61cbb9461 100644
--- a/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
+++ b/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
@@ -37,7 +37,7 @@ final class TicketNormalizer implements NormalizerInterface, NormalizerAwareInte
             throw new UnexpectedValueException();
         }
 
-        return [
+        $data = [
             'type' => 'ticket_ticket',
             'id' => $object->getId(),
             'externalRef' => $object->getExternalRef(),
@@ -47,15 +47,27 @@ final class TicketNormalizer implements NormalizerInterface, NormalizerAwareInte
             'currentAddressees' => $this->normalizer->normalize($object->getCurrentAddressee(), $format, ['groups' => 'read']),
             'currentInputs' => $this->normalizer->normalize($object->getCurrentInputs(), $format, ['groups' => 'read']),
             'currentMotive' => $this->normalizer->normalize($object->getMotive(), $format, ['groups' => 'read']),
+            'currentState' => $object->getState()?->value ?? 'open',
+            'emergency' => $object->getEmergencyStatus()?->value ?? 'no',
+            'caller' => $this->normalizer->normalize($object->getCaller(), $format, ['groups' => 'read']),
+        ];
+
+        if ('read:simple' === $context['groups']) {
+            $data += ['type_extended' => 'ticket_ticket:simple'];
+
+            return $data;
+        }
+
+        $data += [
+            'type_extended' => 'ticket_ticket:extended',
             'history' => array_values($this->serializeHistory($object, $format, ['groups' => 'read'])),
             'createdAt' => $this->normalizer->normalize($object->getCreatedAt(), $format, $context),
             'updatedAt' => $this->normalizer->normalize($object->getUpdatedAt(), $format, $context),
             'updatedBy' => $this->normalizer->normalize($object->getUpdatedBy(), $format, $context),
             'createdBy' => $this->normalizer->normalize($object->getCreatedBy(), $format, $context),
-            'currentState' => $object->getState()?->value ?? 'open',
-            'emergency' => $object->getEmergencyStatus()?->value ?? 'no',
-            'caller' => $this->normalizer->normalize($object->getCaller(), $format, ['groups' => 'read']),
         ];
+
+        return $data;
     }
 
     public function supportsNormalization($data, ?string $format = null)
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerTest.php
new file mode 100644
index 000000000..f75ec9925
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerTest.php
@@ -0,0 +1,213 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Tests\Controller;
+
+use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Serializer\Model\Collection;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Repository\PersonRepository;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use Chill\TicketBundle\Controller\TicketListApiController;
+use Chill\TicketBundle\Entity\Ticket;
+use Chill\TicketBundle\Repository\TicketACLAwareRepositoryInterface;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\SerializerInterface;
+
+/**
+ * @internal
+ *
+ * @covers \Chill\TicketBundle\Controller\TicketListApiController
+ */
+final class TicketListApiControllerTest extends TestCase
+{
+    use ProphecyTrait;
+
+    public function testListTicketNoParameter(): void
+    {
+        // Mock dependencies
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $ticketRepository = $this->prophesize(TicketACLAwareRepositoryInterface::class);
+        $tickets = [new Ticket(), new Ticket()];
+        $ticketRepository->countTickets([])->willReturn(2);
+        $ticketRepository->findTickets([], 0, 10)->willReturn($tickets);
+
+        $paginator = $this->prophesize(PaginatorInterface::class);
+        $paginator->getCurrentPageFirstItemNumber()->willReturn(0);
+        $paginator->getItemsPerPage()->willReturn(10);
+
+        $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
+        $paginatorFactory->create(2)->willReturn($paginator->reveal());
+
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $serializer->serialize(
+            Argument::that(fn(Collection $collection) => $collection->getItems() === $tickets),
+            'json',
+            ['groups' => 'read']
+        )->willReturn('{"items":[{},{}],"pagination":{}}');
+
+        $personRepository = $this->prophesize(PersonRepository::class);
+
+        // Create controller
+        $controller = new TicketListApiController(
+            $security->reveal(),
+            $ticketRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $serializer->reveal(),
+            $personRepository->reveal()
+        );
+
+        // Create request
+        $request = new Request();
+
+        // Call controller method
+        $response = $controller->listTicket($request);
+
+        // Assert response
+        $this->assertInstanceOf(JsonResponse::class, $response);
+        $this->assertEquals('{"items":[{},{}],"pagination":{}}', $response->getContent());
+    }
+
+    public function testListTicketWithPersonFilter(): void
+    {
+        // Mock dependencies
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $person = new Person();
+        $security->isGranted(PersonVoter::SEE, $person)->willReturn(true);
+
+        $ticketRepository = $this->prophesize(TicketACLAwareRepositoryInterface::class);
+        $tickets = [new Ticket(), new Ticket()];
+        $ticketRepository->countTickets(Argument::that(fn($params) => isset($params['byPerson']) && in_array($person, $params['byPerson'])))->willReturn(2);
+        $ticketRepository->findTickets(
+            Argument::that(fn($params) => isset($params['byPerson']) && in_array($person, $params['byPerson'])),
+            0,
+            10
+        )->willReturn($tickets);
+
+        $paginator = $this->prophesize(PaginatorInterface::class);
+        $paginator->getCurrentPageFirstItemNumber()->willReturn(0);
+        $paginator->getItemsPerPage()->willReturn(10);
+
+        $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
+        $paginatorFactory->create(2)->willReturn($paginator->reveal());
+
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $serializer->serialize(
+            Argument::that(fn(Collection $collection) => $collection->getItems() === $tickets),
+            'json',
+            ['groups' => 'read']
+        )->willReturn('{"items":[{},{}],"pagination":{}}');
+
+        $personRepository = $this->prophesize(PersonRepository::class);
+        $personRepository->find(123)->willReturn($person);
+
+        // Create controller
+        $controller = new TicketListApiController(
+            $security->reveal(),
+            $ticketRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $serializer->reveal(),
+            $personRepository->reveal()
+        );
+
+        // Create request with person filter
+        $request = new Request(
+            query: ['byPerson' => '123']
+        );
+
+        // Call controller method
+        $response = $controller->listTicket($request);
+
+        // Assert response
+        $this->assertInstanceOf(JsonResponse::class, $response);
+        $this->assertEquals('{"items":[{},{}],"pagination":{}}', $response->getContent());
+    }
+
+    public function testListTicketWithoutUserRole(): void
+    {
+        // Mock dependencies
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(false);
+
+        $ticketRepository = $this->prophesize(TicketACLAwareRepositoryInterface::class);
+        $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $personRepository = $this->prophesize(PersonRepository::class);
+
+        // Create controller
+        $controller = new TicketListApiController(
+            $security->reveal(),
+            $ticketRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $serializer->reveal(),
+            $personRepository->reveal()
+        );
+
+        // Create request
+        $request = new Request();
+
+        // Expect exception
+        $this->expectException(AccessDeniedHttpException::class);
+        $this->expectExceptionMessage('Only users are allowed to list tickets.');
+
+        // Call controller method
+        $controller->listTicket($request);
+    }
+
+    public function testListTicketWithPersonWithoutAccess(): void
+    {
+        // Mock dependencies
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $person = new Person();
+        $security->isGranted(PersonVoter::SEE, $person)->willReturn(false);
+
+        $ticketRepository = $this->prophesize(TicketACLAwareRepositoryInterface::class);
+        $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
+        $serializer = $this->prophesize(SerializerInterface::class);
+
+        $personRepository = $this->prophesize(PersonRepository::class);
+        $personRepository->find(123)->willReturn($person);
+
+        // Create controller
+        $controller = new TicketListApiController(
+            $security->reveal(),
+            $ticketRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $serializer->reveal(),
+            $personRepository->reveal()
+        );
+
+        // Create request with person filter
+        $request = new Request(
+            query: ['byPerson' => '123']
+        );
+
+        // Expect exception
+        $this->expectException(AccessDeniedHttpException::class);
+        $this->expectExceptionMessage('Not allowed to see a person with id 123');
+
+        // Call controller method
+        $controller->listTicket($request);
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Repository/TicketACLAwareRepositoryTest.php b/src/Bundle/ChillTicketBundle/tests/Repository/TicketACLAwareRepositoryTest.php
new file mode 100644
index 000000000..4dac71bb1
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Repository/TicketACLAwareRepositoryTest.php
@@ -0,0 +1,66 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Tests\Repository;
+
+use Chill\PersonBundle\DataFixtures\Helper\RandomPersonHelperTrait;
+use Chill\TicketBundle\Repository\TicketACLAwareRepository;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class TicketACLAwareRepositoryTest extends KernelTestCase
+{
+    use RandomPersonHelperTrait;
+
+    private TicketACLAwareRepository $repository;
+    private EntityManagerInterface $entityManager;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+        $this->entityManager = self::getContainer()->get(EntityManagerInterface::class);
+        $this->repository = new TicketACLAwareRepository($this->entityManager);
+    }
+
+    public function testFindNoParameters(): void
+    {
+        // Test the findTickets method with byPerson parameter
+        $actual = $this->repository->findTickets([]);
+
+        // Only verify that the query executes successfully without checking results
+        self::assertIsList($actual);
+    }
+
+    public function testFindTicketByPerson(): void
+    {
+        $person = $this->getRandomPerson($this->entityManager);
+
+        // Test the findTickets method with byPerson parameter
+        $actual = $this->repository->findTickets(['byPerson' => [$person]]);
+
+        // Only verify that the query executes successfully without checking results
+        self::assertIsList($actual);
+    }
+
+    public function testCountTicketsByPerson(): void
+    {
+        $person = $this->getRandomPerson($this->entityManager);
+
+        $result = $this->repository->countTickets(['byPerson' => [$person]]);
+
+        self::assertIsInt($result);
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/TicketNormalizerTest.php b/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/TicketNormalizerTest.php
index 2e3de468d..bda2fd485 100644
--- a/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/TicketNormalizerTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/TicketNormalizerTest.php
@@ -81,6 +81,7 @@ class TicketNormalizerTest extends KernelTestCase
             $t,
             [
                 'type' => 'ticket_ticket',
+                'type_extended' => 'ticket_ticket:extended',
                 'createdAt' => $t->getCreatedAt()?->getTimestamp(),
                 'createdBy' => ['user'],
                 'id' => null,
@@ -131,6 +132,7 @@ class TicketNormalizerTest extends KernelTestCase
             $ticket,
             [
                 'type' => 'ticket_ticket',
+                'type_extended' => 'ticket_ticket:extended',
                 'createdAt' => $ticket->getCreatedAt()?->getTimestamp(),
                 'createdBy' => ['user'],
                 'id' => null,
@@ -169,6 +171,7 @@ class TicketNormalizerTest extends KernelTestCase
             $ticket,
             [
                 'type' => 'ticket_ticket',
+                'type_extended' => 'ticket_ticket:extended',
                 'createdAt' => $ticket->getCreatedAt()?->getTimestamp(),
                 'createdBy' => null,
                 'id' => null,
@@ -189,6 +192,86 @@ class TicketNormalizerTest extends KernelTestCase
         ];
     }
 
+    public function testNormalizeReadSimple(): void
+    {
+        // Create a ticket with some data
+        $ticket = new Ticket();
+        $ticket->setExternalRef('TEST-123');
+
+        // Add state history
+        new StateHistory(StateEnum::OPEN, $ticket, new \DateTimeImmutable('2024-06-16T00:00:00Z'));
+
+        // Add emergency status
+        new EmergencyStatusHistory(EmergencyStatusEnum::YES, $ticket, new \DateTimeImmutable('2024-06-16T00:00:10Z'));
+
+        // Add person
+        $personHistory = new PersonHistory(new Person(), $ticket, new \DateTimeImmutable('2024-04-01T12:00:00'));
+
+        // Add motive
+        $motiveHistory = new MotiveHistory(new Motive(), $ticket, new \DateTimeImmutable('2024-04-01T12:02:00'));
+
+        // Add comment
+        $comment = new Comment('Test comment', $ticket);
+        $comment->setCreatedAt(new \DateTimeImmutable('2024-04-01T12:04:00'));
+        $comment->setCreatedBy(new User());
+
+        // Add addressee
+        new AddresseeHistory(new User(), new \DateTimeImmutable('2024-04-01T12:05:00'), $ticket);
+
+        // Add caller
+        new CallerHistory(new Person(), $ticket, new \DateTimeImmutable('2024-04-01T12:00:00'));
+
+        // Set created/updated metadata
+        $ticket->setCreatedAt(new \DateTimeImmutable('2024-06-16T00:00:00Z'));
+        $ticket->setCreatedBy(new User());
+        $ticket->setUpdatedAt(new \DateTimeImmutable('2024-06-16T00:00:00Z'));
+        $ticket->setUpdatedBy(new User());
+
+        // Normalize with read:simple group
+        $actual = $this->buildNormalizer()->normalize($ticket, 'json', ['groups' => 'read:simple']);
+
+        // Expected keys in read:simple normalization
+        $expectedKeys = [
+            'type',
+            'type_extended',
+            'id',
+            'externalRef',
+            'currentPersons',
+            'currentAddressees',
+            'currentInputs',
+            'currentMotive',
+            'currentState',
+            'emergency',
+            'caller',
+        ];
+
+        // Keys that should not be present in read:simple normalization
+        $unexpectedKeys = [
+            'history',
+            'createdAt',
+            'updatedAt',
+            'updatedBy',
+            'createdBy',
+        ];
+
+        // Assert that all expected keys are present
+        foreach ($expectedKeys as $key) {
+            self::assertArrayHasKey($key, $actual, "Expected key '{$key}' is missing");
+        }
+
+        // Assert that none of the unexpected keys are present
+        foreach ($unexpectedKeys as $key) {
+            self::assertArrayNotHasKey($key, $actual, "Unexpected key '{$key}' is present");
+        }
+
+        // Assert specific values
+        self::assertEquals('ticket_ticket', $actual['type']);
+        self::assertEquals('ticket_ticket:simple', $actual['type_extended']);
+        self::assertEquals('TEST-123', $actual['externalRef']);
+        self::assertEquals('open', $actual['currentState']);
+        self::assertEquals('yes', $actual['emergency']);
+    }
+
     private function buildNormalizer(): TicketNormalizer
     {
         $normalizer = $this->prophesize(NormalizerInterface::class);

From c8e5d0eb37ac4412cb9673fa73f51348b62774af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 4 Jul 2025 14:35:46 +0200
Subject: [PATCH 129/283] fix rector

---
 .../tests/Controller/TicketListApiControllerTest.php      | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerTest.php
index f75ec9925..bcaf2336d 100644
--- a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerTest.php
@@ -58,7 +58,7 @@ final class TicketListApiControllerTest extends TestCase
 
         $serializer = $this->prophesize(SerializerInterface::class);
         $serializer->serialize(
-            Argument::that(fn(Collection $collection) => $collection->getItems() === $tickets),
+            Argument::that(fn (Collection $collection) => $collection->getItems() === $tickets),
             'json',
             ['groups' => 'read']
         )->willReturn('{"items":[{},{}],"pagination":{}}');
@@ -96,9 +96,9 @@ final class TicketListApiControllerTest extends TestCase
 
         $ticketRepository = $this->prophesize(TicketACLAwareRepositoryInterface::class);
         $tickets = [new Ticket(), new Ticket()];
-        $ticketRepository->countTickets(Argument::that(fn($params) => isset($params['byPerson']) && in_array($person, $params['byPerson'])))->willReturn(2);
+        $ticketRepository->countTickets(Argument::that(fn ($params) => isset($params['byPerson']) && in_array($person, $params['byPerson'])))->willReturn(2);
         $ticketRepository->findTickets(
-            Argument::that(fn($params) => isset($params['byPerson']) && in_array($person, $params['byPerson'])),
+            Argument::that(fn ($params) => isset($params['byPerson']) && in_array($person, $params['byPerson'])),
             0,
             10
         )->willReturn($tickets);
@@ -112,7 +112,7 @@ final class TicketListApiControllerTest extends TestCase
 
         $serializer = $this->prophesize(SerializerInterface::class);
         $serializer->serialize(
-            Argument::that(fn(Collection $collection) => $collection->getItems() === $tickets),
+            Argument::that(fn (Collection $collection) => $collection->getItems() === $tickets),
             'json',
             ['groups' => 'read']
         )->willReturn('{"items":[{},{}],"pagination":{}}');

From 2b22d4cb7c82e459a469a67f9570685224049729 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 4 Jul 2025 14:36:31 +0200
Subject: [PATCH 130/283] Add configuration for ChillTicketBundle parameters:
 add an option to set one / multi Person entities per ticket

---
 config/packages/chill_ticket.yaml             |  4 ++
 .../ChillTicketExtension.php                  |  5 +++
 .../src/DependencyInjection/Configuration.php | 42 +++++++++++++++++++
 3 files changed, 51 insertions(+)
 create mode 100644 config/packages/chill_ticket.yaml
 create mode 100644 src/Bundle/ChillTicketBundle/src/DependencyInjection/Configuration.php

diff --git a/config/packages/chill_ticket.yaml b/config/packages/chill_ticket.yaml
new file mode 100644
index 000000000..acb5571dc
--- /dev/null
+++ b/config/packages/chill_ticket.yaml
@@ -0,0 +1,4 @@
+chill_ticket:
+    ticket:
+        person_per_ticket:    one # One of "one"; "many"
+
diff --git a/src/Bundle/ChillTicketBundle/src/DependencyInjection/ChillTicketExtension.php b/src/Bundle/ChillTicketBundle/src/DependencyInjection/ChillTicketExtension.php
index f2222aa7a..596cb655a 100644
--- a/src/Bundle/ChillTicketBundle/src/DependencyInjection/ChillTicketExtension.php
+++ b/src/Bundle/ChillTicketBundle/src/DependencyInjection/ChillTicketExtension.php
@@ -24,6 +24,11 @@ class ChillTicketExtension extends Extension implements PrependExtensionInterfac
 {
     public function load(array $configs, ContainerBuilder $container)
     {
+        $configuration = $this->getConfiguration($configs, $container);
+        $config = $this->processConfiguration($configuration, $configs);
+
+        $container->setParameter('chill_ticket', $config);
+
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
         $loader->load('services.yaml');
     }
diff --git a/src/Bundle/ChillTicketBundle/src/DependencyInjection/Configuration.php b/src/Bundle/ChillTicketBundle/src/DependencyInjection/Configuration.php
new file mode 100644
index 000000000..19c107a09
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/DependencyInjection/Configuration.php
@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\DependencyInjection;
+
+use Symfony\Component\Config\Definition\Builder\ArrayNodeDefinition;
+use Symfony\Component\Config\Definition\Builder\TreeBuilder;
+use Symfony\Component\Config\Definition\ConfigurationInterface;
+
+class Configuration implements ConfigurationInterface
+{
+    public function getConfigTreeBuilder(): TreeBuilder
+    {
+        $treeBuilder = new TreeBuilder('chill_ticket');
+        /** @var ArrayNodeDefinition $rootNode */
+        $rootNode = $treeBuilder->getRootNode();
+
+        /** @var ArrayNodeDefinition $ticketArray */
+        $ticketArray = $rootNode
+            ->children()
+            ->arrayNode('ticket')
+            ->addDefaultsIfNotSet()
+        ;
+
+        $ticketArray
+            ->children()
+            ->enumNode('person_per_ticket')
+            ->values(['one', 'many'])
+            ->defaultValue('many')
+            ->end();
+
+        return $treeBuilder;
+    }
+}

From 42d6c9e672a09cf70062480d76437bf504691113 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 4 Jul 2025 15:04:04 +0200
Subject: [PATCH 131/283] Add SetPersonCommandConstraint and its validator with
 test coverage for ChillTicketBundle

---
 .../src/Action/Ticket/SetPersonsCommand.php   |  2 +
 .../Validator/SetPersonCommandConstraint.php  | 25 ++++++
 .../SetPersonCommandConstraintValidator.php   | 47 ++++++++++
 .../src/config/services.yaml                  |  3 +
 ...etPersonCommandConstraintValidatorTest.php | 90 +++++++++++++++++++
 5 files changed, 167 insertions(+)
 create mode 100644 src/Bundle/ChillTicketBundle/src/Validation/Validator/SetPersonCommandConstraint.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Validation/Validator/SetPersonCommandConstraintValidator.php
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Validation/Validator/SetPersonCommandConstraintValidatorTest.php

diff --git a/src/Bundle/ChillTicketBundle/src/Action/Ticket/SetPersonsCommand.php b/src/Bundle/ChillTicketBundle/src/Action/Ticket/SetPersonsCommand.php
index 69ba61977..aab0b968b 100644
--- a/src/Bundle/ChillTicketBundle/src/Action/Ticket/SetPersonsCommand.php
+++ b/src/Bundle/ChillTicketBundle/src/Action/Ticket/SetPersonsCommand.php
@@ -12,9 +12,11 @@ declare(strict_types=1);
 namespace Chill\TicketBundle\Action\Ticket;
 
 use Chill\PersonBundle\Entity\Person;
+use Chill\TicketBundle\Validation\Validator\SetPersonCommandConstraint;
 use Symfony\Component\Serializer\Annotation\Groups;
 use Symfony\Component\Validator\Constraints\GreaterThan;
 
+#[SetPersonCommandConstraint]
 class SetPersonsCommand
 {
     public function __construct(
diff --git a/src/Bundle/ChillTicketBundle/src/Validation/Validator/SetPersonCommandConstraint.php b/src/Bundle/ChillTicketBundle/src/Validation/Validator/SetPersonCommandConstraint.php
new file mode 100644
index 000000000..402a0d650
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Validation/Validator/SetPersonCommandConstraint.php
@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Validation\Validator;
+
+use Symfony\Component\Validator\Constraint;
+
+#[\Attribute]
+class SetPersonCommandConstraint extends Constraint
+{
+    public string $notMulti = 'ticket.set_persons.Only one person can be set.';
+
+    public function getTargets(): string
+    {
+        return Constraint::CLASS_CONSTRAINT;
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Validation/Validator/SetPersonCommandConstraintValidator.php b/src/Bundle/ChillTicketBundle/src/Validation/Validator/SetPersonCommandConstraintValidator.php
new file mode 100644
index 000000000..9c8b80c66
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Validation/Validator/SetPersonCommandConstraintValidator.php
@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Validation\Validator;
+
+use Chill\TicketBundle\Action\Ticket\SetPersonsCommand;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\ConstraintValidator;
+use Symfony\Component\Validator\Exception\UnexpectedValueException;
+
+class SetPersonCommandConstraintValidator extends ConstraintValidator
+{
+    private bool $isMulti;
+
+    public function __construct(ParameterBagInterface $parameterBag)
+    {
+        $this->isMulti = 'multi' === $parameterBag->get('chill_ticket')['ticket']['person_per_ticket'];
+    }
+
+    public function validate($value, Constraint $constraint)
+    {
+        if (!$value instanceof SetPersonsCommand) {
+            throw new UnexpectedValueException($value, SetPersonsCommand::class);
+        }
+
+        if (!$constraint instanceof SetPersonCommandConstraint) {
+            throw new UnexpectedValueException($constraint, SetPersonCommandConstraint::class);
+        }
+
+        if (!$this->isMulti) {
+            if (1 < count($value->persons)) {
+                $this->context->buildViolation($constraint->notMulti)
+                    ->atPath('persons')
+                    ->addViolation();
+            }
+        }
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/config/services.yaml b/src/Bundle/ChillTicketBundle/src/config/services.yaml
index e5618284a..7e3d6050b 100644
--- a/src/Bundle/ChillTicketBundle/src/config/services.yaml
+++ b/src/Bundle/ChillTicketBundle/src/config/services.yaml
@@ -23,5 +23,8 @@ services:
     Chill\TicketBundle\Menu\:
         resource: '../Menu/'
 
+    Chill\TicketBundle\Validation\:
+        resource: '../Validation/'
+
     Chill\TicketBundle\DataFixtures\:
         resource: '../DataFixtures/'
diff --git a/src/Bundle/ChillTicketBundle/tests/Validation/Validator/SetPersonCommandConstraintValidatorTest.php b/src/Bundle/ChillTicketBundle/tests/Validation/Validator/SetPersonCommandConstraintValidatorTest.php
new file mode 100644
index 000000000..fd164354a
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Validation/Validator/SetPersonCommandConstraintValidatorTest.php
@@ -0,0 +1,90 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Validation\Validator;
+
+use Chill\PersonBundle\Entity\Person;
+use Chill\TicketBundle\Action\Ticket\SetPersonsCommand;
+use Chill\TicketBundle\Validation\Validator\SetPersonCommandConstraint;
+use Chill\TicketBundle\Validation\Validator\SetPersonCommandConstraintValidator;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
+use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class SetPersonCommandConstraintValidatorTest extends ConstraintValidatorTestCase
+{
+    private string $personPerTicket = 'many';
+
+    protected function createValidator()
+    {
+        return new SetPersonCommandConstraintValidator(
+            new ParameterBag(['chill_ticket' => ['ticket' => ['person_per_ticket' => $this->personPerTicket]]])
+        );
+    }
+
+    /**
+     * Helper method to set the configuration and recreate the validator.
+     */
+    private function setPersonPerTicket(string $personPerTicket): void
+    {
+        $this->personPerTicket = $personPerTicket;
+        $this->validator = $this->createValidator();
+        $this->validator->initialize($this->context);
+    }
+
+    public function testValidatorWithManyPersonsPerTicket(): void
+    {
+        $this->setPersonPerTicket('multi');
+
+        $command = new SetPersonsCommand([new Person(), new Person()]);
+
+        $this->validator->validate($command, new SetPersonCommandConstraint());
+
+        $this->assertNoViolation();
+    }
+
+    public function testValidatorWithSinglePersonPerTicket(): void
+    {
+        $this->setPersonPerTicket('single');
+
+        $command = new SetPersonsCommand([new Person(), new Person()]);
+
+        $this->validator->validate($command, $command = new SetPersonCommandConstraint());
+
+        $this->buildViolation($command->notMulti)->atPath('property.path.persons')->assertRaised();
+    }
+
+    public function testValidatorWithSinglePersonPerTicketAndEmptyPersons(): void
+    {
+        $this->setPersonPerTicket('single');
+
+        $command = new SetPersonsCommand([]);
+
+        $this->validator->validate($command, new SetPersonCommandConstraint());
+
+        $this->assertNoViolation();
+    }
+
+    public function testValidatorWithSinglePersonPerTicketAndOnlyOnePerson(): void
+    {
+        $this->setPersonPerTicket('single');
+
+        $command = new SetPersonsCommand([new Person()]);
+
+        $this->validator->validate($command, new SetPersonCommandConstraint());
+
+        $this->assertNoViolation();
+    }
+}

From afa5edc1d8d866528a4d8a88c1fe8ea88af996ea Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 4 Jul 2025 15:32:31 +0200
Subject: [PATCH 132/283] Inject `personPerTicket` parameter into
 EditTicketController and expose it to the frontend via `edit.html.twig`.
 Refactor related type definitions.

---
 .../src/Controller/EditTicketController.php              | 9 ++++++++-
 .../ChillTicketBundle/src/Resources/public/types.ts      | 9 ++++-----
 .../src/Resources/public/vuejs/TicketApp/index.ts        | 1 +
 .../src/Resources/views/Ticket/edit.html.twig            | 1 +
 4 files changed, 14 insertions(+), 6 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Controller/EditTicketController.php b/src/Bundle/ChillTicketBundle/src/Controller/EditTicketController.php
index c9886759c..0510c49cf 100644
--- a/src/Bundle/ChillTicketBundle/src/Controller/EditTicketController.php
+++ b/src/Bundle/ChillTicketBundle/src/Controller/EditTicketController.php
@@ -12,15 +12,21 @@ declare(strict_types=1);
 namespace Chill\TicketBundle\Controller;
 
 use Chill\TicketBundle\Entity\Ticket;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\Routing\Annotation\Route;
 use Twig\Environment;
 
 class EditTicketController
 {
+    private string $personPerTicket;
+
     public function __construct(
         private readonly Environment $templating,
-    ) {}
+        ParameterBagInterface $parameterBag,
+    ) {
+        $this->personPerTicket = $parameterBag->get('chill_ticket')['ticket']['person_per_ticket'];
+    }
 
     #[Route('/{_locale}/ticket/ticket/{id}/edit', name: 'chill_ticket_ticket_edit')]
     public function __invoke(
@@ -31,6 +37,7 @@ class EditTicketController
                 '@ChillTicket/Ticket/edit.html.twig',
                 [
                     'ticket' => $ticket,
+                    'personPerTicket' => $this->personPerTicket,
                 ]
             )
         );
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
index 4a244e9a4..0b327fed9 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
@@ -111,7 +111,6 @@ export type EmergencyStateEvent = TicketHistory<
 >;
 export type CallerStateEvent = TicketHistory<"set_caller", CallerState>;
 
-// TODO : Remove add_person event from TicketHistoryLine
 export type TicketHistoryLine =
     | AddPersonEvent
     | CreateTicketEvent
@@ -125,11 +124,7 @@ export type TicketHistoryLine =
 
 interface BaseTicket<T extends "ticket_ticket:simple"|"ticket_ticket:extended" = "ticket_ticket:simple"> {
     type_extended: T;
-}
-
-export interface TicketSimple extends BaseTicket<"ticket_ticket:simple"> {
     type: "ticket_ticket";
-    type_extended: "ticket_ticket:simple";
     id: number;
     externalRef: string;
     currentAddressees: UserGroupOrUser[];
@@ -140,6 +135,10 @@ export interface TicketSimple extends BaseTicket<"ticket_ticket:simple"> {
     caller: Person | Thirdparty | null;
 }
 
+export interface TicketSimple extends BaseTicket<"ticket_ticket:simple"> {
+    type_extended: "ticket_ticket:simple";
+}
+
 export interface Ticket extends BaseTicket<"ticket_ticket:extended"> {
     type_extended: "ticket_ticket:extended";
     createdAt: DateTime | null;
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts
index df1074496..03696e52a 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts
@@ -9,6 +9,7 @@ import { store } from "./store";
 declare global {
     interface Window {
         initialTicket: string;
+        ticketPersonPerTicket: 'one'|'multi';
     }
 }
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/edit.html.twig b/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/edit.html.twig
index 2b067304e..48e620a74 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/edit.html.twig
+++ b/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/edit.html.twig
@@ -9,6 +9,7 @@
     {{ parent() }}
     <script type="text/javascript">
         window.initialTicket = "{{ ticket|serialize('json', {'groups': 'read'})|escape('js') }}";
+        window.ticketPersonPerTicket = "{{ personPerTicket|escape('js') }}";
     </script>
     {{ encore_entry_script_tags('vue_ticket_app') }}
 {% endblock %}

From 64a2f7c9ede8bdbc9fce8cd3ed75675781ae401c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 7 Jul 2025 14:03:29 +0200
Subject: [PATCH 133/283] Fix definition for Ticket and SimpleTicket

---
 .../ChillTicketBundle/src/Resources/public/types.ts       | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
index 0b327fed9..d5fa043e4 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
@@ -135,6 +135,9 @@ interface BaseTicket<T extends "ticket_ticket:simple"|"ticket_ticket:extended" =
     caller: Person | Thirdparty | null;
 }
 
+export interface SimpleTicket extends BaseTicket<"ticket_ticket:simple"> {
+}
+
 export interface TicketSimple extends BaseTicket<"ticket_ticket:simple"> {
     type_extended: "ticket_ticket:simple";
 }
@@ -142,9 +145,8 @@ export interface TicketSimple extends BaseTicket<"ticket_ticket:simple"> {
 export interface Ticket extends BaseTicket<"ticket_ticket:extended"> {
     type_extended: "ticket_ticket:extended";
     createdAt: DateTime | null;
-    createdBy: DateTime | null;
-    updatedBy: User | null;
+    createdBy: User | null;
     updatedAt: DateTime | null;
+    updatedBy: User | null;
     history: TicketHistoryLine[];
-    caller: Person | null;
 }

From dbf363a9e8a9c24f5c715ea9327e862811f46cbf Mon Sep 17 00:00:00 2001
From: borisw <boris.waaub@digitalternative.be>
Date: Mon, 7 Jul 2025 15:27:40 +0200
Subject: [PATCH 134/283] =?UTF-8?q?Ajouter=20le=20fichier=20de=20configura?=
 =?UTF-8?q?tion=20Prettier=20avec=20des=20param=C3=A8tres=20de=20formatage?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .prettierrc | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 .prettierrc

diff --git a/.prettierrc b/.prettierrc
new file mode 100644
index 000000000..222861c34
--- /dev/null
+++ b/.prettierrc
@@ -0,0 +1,4 @@
+{
+  "tabWidth": 2,
+  "useTabs": false
+}

From beb7c462da74d72d01537dcc0981dc68c77a7bd0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 7 Jul 2025 16:03:01 +0200
Subject: [PATCH 135/283] Remove unused `@symfony/ux-translator` dependency and
 adjust `specs-build` script.

---
 package.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package.json b/package.json
index f9232b832..fc50ba29c 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,6 @@
     "@hotwired/stimulus": "^3.0.0",
     "@luminateone/eslint-baseline": "^1.0.9",
     "@symfony/stimulus-bridge": "^3.2.0",
-    "@symfony/ux-translator": "file:vendor/symfony/ux-translator/assets",
     "@symfony/webpack-encore": "^4.1.0",
     "@tsconfig/node20": "^20.1.4",
     "@types/dompurify": "^3.0.5",
@@ -80,7 +79,7 @@
     "dev": "encore dev",
     "watch": "encore dev --watch",
     "build": "encore production --progress",
-    "specs-build": "yaml-merge src/Bundle/ChillMainBundle/chill.api.specs.yaml src/Bundle/ChillPersonBundle/chill.api.specs.yaml src/Bundle/ChillCalendarBundle/chill.api.specs.yaml src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml src/Bundle/ChillDocStoreBundle/chill.api.specs.yaml src/Bundle/ChillTicketBundle/chill.api.specs.yaml> templates/api/specs.yaml",
+    "specs-build": "yaml-merge src/Bundle/ChillMainBundle/chill.api.specs.yaml src/Bundle/ChillPersonBundle/chill.api.specs.yaml src/Bundle/ChillCalendarBundle/chill.api.specs.yaml src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml src/Bundle/ChillDocStoreBundle/chill.api.specs.yaml> templates/api/specs.yaml",
     "specs-validate": "swagger-cli validate templates/api/specs.yaml",
     "specs-create-dir": "mkdir -p templates/api",
     "specs": "yarn run specs-create-dir && yarn run specs-build && yarn run specs-validate",

From 6eeb717b1a137cf01e7f7d7d2ae8dd5130c5cb17 Mon Sep 17 00:00:00 2001
From: borisw <boris.waaub@digitalternative.be>
Date: Mon, 7 Jul 2025 16:35:31 +0200
Subject: [PATCH 136/283] Refactor third-party type imports and update related
 components

- Changed import path for ThirdParty type in TypeThirdParty.vue and updated its usage.
- Refactored PersonText.vue to import Person and AltName types from ChillPersonAssets.
- Updated types.ts in ChillThirdPartyBundle to include a new 'type' field in the Thirdparty interface.
- Modified TicketBundle types to accommodate Thirdparty type in CallerState.
- Adjusted AddresseeSelectorComponent.vue to use 'thirdparty' instead of 'third_party'.
- Refined BannerComponent.vue to improve readability and maintainability.
- Updated CallerSelectorComponent.vue to reflect changes in entity types.
- Enhanced TicketHistoryListComponent.vue to handle both Person and Thirdparty types.
- Refactored TicketHistoryPersonComponent.vue to accept both Person and Thirdparty entities.
---
 .../ChillMainBundle/Resources/public/types.ts | 332 +++++------
 .../vuejs/OnTheFly/components/OnTheFly.vue    | 545 +++++++++---------
 .../public/vuejs/PickEntity/PickEntity.vue    | 346 ++++++-----
 .../Resources/public/types.ts                 | 472 +++++++--------
 .../_components/AddPersons/TypePerson.vue     |  11 +-
 .../_components/AddPersons/TypeThirdParty.vue |   4 +-
 .../vuejs/_components/Entity/PersonText.vue   |  17 +-
 .../Resources/public/types.ts                 |  74 +--
 .../src/Resources/public/types.ts             | 175 +++---
 .../components/AddresseeSelectorComponent.vue | 113 ++--
 .../TicketApp/components/BannerComponent.vue  | 302 +++++-----
 .../components/CallerSelectorComponent.vue    |  86 +--
 .../components/TicketHistoryListComponent.vue | 212 ++++---
 .../TicketHistoryPersonComponent.vue          |  41 +-
 14 files changed, 1333 insertions(+), 1397 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/types.ts b/src/Bundle/ChillMainBundle/Resources/public/types.ts
index 5af22147b..f642eb95f 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/types.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/types.ts
@@ -1,287 +1,269 @@
 import { GenericDoc } from "ChillDocStoreAssets/types/generic_doc";
 
 export interface DateTime {
-    datetime: string;
-    datetime8601: string;
+  datetime: string;
+  datetime8601: string;
 }
 
 export interface Civility {
-    id: number;
-    // TODO
+  id: number;
+  // TODO
 }
 
 export interface Household {
-    type: "household";
-    id: number;
+  type: "household";
+  id: number;
 }
 
 export interface Job {
-    id: number;
-    type: "user_job";
-    label: {
-        fr: string; // could have other key. How to do that in ts ?
-    };
+  id: number;
+  type: "user_job";
+  label: {
+    fr: string; // could have other key. How to do that in ts ?
+  };
 }
 
 export interface Center {
-    id: number;
-    type: "center";
-    name: string;
+  id: number;
+  type: "center";
+  name: string;
 }
 
 export interface Scope {
-    id: number;
-    type: "scope";
-    name: {
-        fr: string;
-    };
+  id: number;
+  type: "scope";
+  name: {
+    fr: string;
+  };
 }
 
 export interface ResultItem<T> {
-    result: T;
-    relevance: number;
+  result: T;
+  relevance: number;
 }
 
 export interface User {
-    type: "user";
-    id: number;
-    username: string;
-    text: string;
-    text_without_absence: string;
-    email: string;
-    user_job: Job;
-    label: string;
-    // todo: mainCenter; mainJob; etc..
-}
-export interface ThirdParty {
-    type: "thirdparty";
-    id: number;
-    text: string;
-    firstname: string;
-    name: string;
-    email: string;
-    telephone: string;
-    telephone2: string;
-    address: {
-        address_id: number;
-        text: string;
-        postcode: {
-            name: string;
-        };
-        id: number;
-    };
+  type: "user";
+  id: number;
+  username: string;
+  text: string;
+  text_without_absence: string;
+  email: string;
+  user_job: Job;
+  label: string;
+  // todo: mainCenter; mainJob; etc..
 }
 
 export interface UserGroup {
-    type: "user_group";
-    id: number;
-    label: TranslatableString;
-    backgroundColor: string;
-    foregroundColor: string;
-    excludeKey: string;
-    text: string;
+  type: "user_group";
+  id: number;
+  label: TranslatableString;
+  backgroundColor: string;
+  foregroundColor: string;
+  excludeKey: string;
+  text: string;
 }
 
 export type UserGroupOrUser = User | UserGroup;
 
 export interface UserAssociatedInterface {
-    type: "user";
-    id: number;
+  type: "user";
+  id: number;
 }
 
 export type TranslatableString = Record<string, string>;
 
 export interface Postcode {
-    id: number;
-    name: string;
-    code: string;
-    center: Point;
+  id: number;
+  name: string;
+  code: string;
+  center: Point;
 }
 
 export interface Point {
-    type: "Point";
-    coordinates: [lat: number, lon: number];
+  type: "Point";
+  coordinates: [lat: number, lon: number];
 }
 
 export interface Country {
-    id: number;
-    name: TranslatableString;
-    code: string;
+  id: number;
+  name: TranslatableString;
+  code: string;
 }
 
 export type AddressRefStatus = "match" | "to_review" | "reviewed";
 
 export interface Address {
-    type: "address";
-    address_id: number;
-    text: string;
-    street: string;
-    streetNumber: string;
-    postcode: Postcode;
-    country: Country;
-    floor: string | null;
-    corridor: string | null;
-    steps: string | null;
-    flat: string | null;
-    buildingName: string | null;
-    distribution: string | null;
-    extra: string | null;
-    confidential: boolean;
-    lines: string[];
-    addressReference: AddressReference | null;
-    validFrom: DateTime;
-    validTo: DateTime | null;
-    point: Point | null;
-    refStatus: AddressRefStatus;
-    isNoAddress: boolean;
+  type: "address";
+  address_id: number;
+  text: string;
+  street: string;
+  streetNumber: string;
+  postcode: Postcode;
+  country: Country;
+  floor: string | null;
+  corridor: string | null;
+  steps: string | null;
+  flat: string | null;
+  buildingName: string | null;
+  distribution: string | null;
+  extra: string | null;
+  confidential: boolean;
+  lines: string[];
+  addressReference: AddressReference | null;
+  validFrom: DateTime;
+  validTo: DateTime | null;
+  point: Point | null;
+  refStatus: AddressRefStatus;
+  isNoAddress: boolean;
 }
 
 export interface AddressWithPoint extends Address {
-    point: Point;
+  point: Point;
 }
 
 export interface AddressReference {
-    id: number;
-    createdAt: DateTime | null;
-    deletedAt: DateTime | null;
-    municipalityCode: string;
-    point: Point;
-    postcode: Postcode;
-    refId: string;
-    source: string;
-    street: string;
-    streetNumber: string;
-    updatedAt: DateTime | null;
+  id: number;
+  createdAt: DateTime | null;
+  deletedAt: DateTime | null;
+  municipalityCode: string;
+  point: Point;
+  postcode: Postcode;
+  refId: string;
+  source: string;
+  street: string;
+  streetNumber: string;
+  updatedAt: DateTime | null;
 }
 
 export interface SimpleGeographicalUnit {
-    id: number;
-    layerId: number;
-    unitName: string;
-    unitRefId: string;
+  id: number;
+  layerId: number;
+  unitName: string;
+  unitRefId: string;
 }
 
 export interface GeographicalUnitLayer {
-    id: number;
-    name: TranslatableString;
-    refId: string;
+  id: number;
+  name: TranslatableString;
+  refId: string;
 }
 
 export interface Location {
-    type: "location";
-    id: number;
-    active: boolean;
-    address: Address | null;
-    availableForUsers: boolean;
-    createdAt: DateTime | null;
-    createdBy: User | null;
-    updatedAt: DateTime | null;
-    updatedBy: User | null;
-    email: string | null;
-    name: string;
-    phonenumber1: string | null;
-    phonenumber2: string | null;
-    locationType: LocationType;
+  type: "location";
+  id: number;
+  active: boolean;
+  address: Address | null;
+  availableForUsers: boolean;
+  createdAt: DateTime | null;
+  createdBy: User | null;
+  updatedAt: DateTime | null;
+  updatedBy: User | null;
+  email: string | null;
+  name: string;
+  phonenumber1: string | null;
+  phonenumber2: string | null;
+  locationType: LocationType;
 }
 
 export interface LocationAssociated {
-    type: "location";
-    id: number;
+  type: "location";
+  id: number;
 }
 
 export interface LocationType {
-    type: "location-type";
-    id: number;
-    active: boolean;
-    addressRequired: "optional" | "required";
-    availableForUsers: boolean;
-    editableByUsers: boolean;
-    contactData: "optional" | "required";
-    title: TranslatableString;
+  type: "location-type";
+  id: number;
+  active: boolean;
+  addressRequired: "optional" | "required";
+  availableForUsers: boolean;
+  editableByUsers: boolean;
+  contactData: "optional" | "required";
+  title: TranslatableString;
 }
 
 export interface NewsItemType {
-    id: number;
-    title: string;
-    content: string;
-    startDate: DateTime;
-    endDate: DateTime | null;
+  id: number;
+  title: string;
+  content: string;
+  startDate: DateTime;
+  endDate: DateTime | null;
 }
 
 export interface WorkflowAvailable {
-    name: string;
-    text: string;
+  name: string;
+  text: string;
 }
 
 export interface WorkflowAttachment {
-    id: number;
-    relatedGenericDocKey: string;
-    relatedGenericDocIdentifiers: object;
-    createdAt: DateTime | null;
-    createdBy: User | null;
-    updatedAt: DateTime | null;
-    updatedBy: User | null;
-    genericDoc: null | GenericDoc;
+  id: number;
+  relatedGenericDocKey: string;
+  relatedGenericDocIdentifiers: object;
+  createdAt: DateTime | null;
+  createdBy: User | null;
+  updatedAt: DateTime | null;
+  updatedBy: User | null;
+  genericDoc: null | GenericDoc;
 }
 
 export interface PrivateCommentEmbeddable {
-    comments: Record<number, string>;
+  comments: Record<number, string>;
 }
 
 // API Exception types
 export interface TransportExceptionInterface {
-    name: string;
+  name: string;
 }
 
 export interface ValidationExceptionInterface
-    extends TransportExceptionInterface {
-    name: "ValidationException";
-    error: object;
-    violations: string[];
-    titles: string[];
-    propertyPaths: string[];
+  extends TransportExceptionInterface {
+  name: "ValidationException";
+  error: object;
+  violations: string[];
+  titles: string[];
+  propertyPaths: string[];
 }
 
 export interface AccessExceptionInterface extends TransportExceptionInterface {
-    name: "AccessException";
-    violations: string[];
+  name: "AccessException";
+  violations: string[];
 }
 
 export interface NotFoundExceptionInterface
-    extends TransportExceptionInterface {
-    name: "NotFoundException";
+  extends TransportExceptionInterface {
+  name: "NotFoundException";
 }
 
 export interface ServerExceptionInterface extends TransportExceptionInterface {
-    name: "ServerException";
-    message: string;
-    code: number;
-    body: string;
+  name: "ServerException";
+  message: string;
+  code: number;
+  body: string;
 }
 
 export interface ConflictHttpExceptionInterface
-    extends TransportExceptionInterface {
-    name: "ConflictHttpException";
-    violations: string[];
+  extends TransportExceptionInterface {
+  name: "ConflictHttpException";
+  violations: string[];
 }
 
 export type ApiException =
-    | ValidationExceptionInterface
-    | AccessExceptionInterface
-    | NotFoundExceptionInterface
-    | ServerExceptionInterface
-    | ConflictHttpExceptionInterface;
+  | ValidationExceptionInterface
+  | AccessExceptionInterface
+  | NotFoundExceptionInterface
+  | ServerExceptionInterface
+  | ConflictHttpExceptionInterface;
 
 export interface Modal {
-    showModal: boolean;
-    modalDialogClass: string;
+  showModal: boolean;
+  modalDialogClass: string;
 }
 
 export interface Selected {
-    result: UserGroupOrUser;
+  result: UserGroupOrUser;
 }
 
 export interface addNewEntities {
-    selected: Selected[];
-    modal: Modal;
+  selected: Selected[];
+  modal: Modal;
 }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
index 700f71e48..dc66a0000 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
@@ -1,97 +1,97 @@
 <template>
-    <a v-if="isDisplayBadge" @click="openModal">
-        <span class="chill-entity" :class="badgeType">
-            {{ buttonText }}<span v-if="isDead"> (‡)</span>
-        </span>
-    </a>
-    <a
-        v-else
-        class="btn btn-sm"
-        target="_blank"
-        :class="classAction"
-        :title="trans(titleAction)"
-        @click="openModal"
+  <a v-if="isDisplayBadge" @click="openModal">
+    <span class="chill-entity" :class="badgeType">
+      {{ buttonText }}<span v-if="isDead"> (‡)</span>
+    </span>
+  </a>
+  <a
+    v-else
+    class="btn btn-sm"
+    target="_blank"
+    :class="classAction"
+    :title="trans(titleAction)"
+    @click="openModal"
+  >
+    {{ buttonText }}<span v-if="isDead"> (‡)</span>
+  </a>
+
+  <teleport to="body">
+    <modal
+      v-if="modal.showModal"
+      :modal-dialog-class="modal.modalDialogClass"
+      @close="modal.showModal = false"
     >
-        {{ buttonText }}<span v-if="isDead"> (‡)</span>
-    </a>
+      <template #header>
+        <h3 v-if="parent" class="modal-title">
+          {{ trans(titleModal, { q: parent.text }) }}
+        </h3>
+        <h3 v-else class="modal-title">
+          {{ trans(titleModal) }}
+        </h3>
+      </template>
 
-    <teleport to="body">
-        <modal
-            v-if="modal.showModal"
-            :modal-dialog-class="modal.modalDialogClass"
-            @close="modal.showModal = false"
-        >
-            <template #header>
-                <h3 v-if="parent" class="modal-title">
-                    {{ trans(titleModal, { q: parent.text }) }}
-                </h3>
-                <h3 v-else class="modal-title">
-                    {{ trans(titleModal) }}
-                </h3>
-            </template>
+      <template #body v-if="type === 'person'">
+        <on-the-fly-person
+          :id="id"
+          :type="type"
+          :action="action"
+          ref="castPerson"
+        />
+        <div v-if="hasResourceComment">
+          <h3>{{ trans(ONTHEFLY_RESOURCE_COMMENT_TITLE) }}</h3>
+          <blockquote class="chill-user-quote">
+            {{ parent.comment }}
+          </blockquote>
+        </div>
+      </template>
 
-            <template #body v-if="type === 'person'">
-                <on-the-fly-person
-                    :id="id"
-                    :type="type"
-                    :action="action"
-                    ref="castPerson"
-                />
-                <div v-if="hasResourceComment">
-                    <h3>{{ trans(ONTHEFLY_RESOURCE_COMMENT_TITLE) }}</h3>
-                    <blockquote class="chill-user-quote">
-                        {{ parent.comment }}
-                    </blockquote>
-                </div>
-            </template>
+      <template #body v-else-if="type === 'thirdparty'">
+        <on-the-fly-thirdparty
+          :id="id"
+          :type="type"
+          :action="action"
+          ref="castThirdparty"
+        />
+        <div v-if="hasResourceComment">
+          <h3>{{ trans(ONTHEFLY_RESOURCE_COMMENT_TITLE) }}</h3>
+          <blockquote class="chill-user-quote">
+            {{ parent.comment }}
+          </blockquote>
+        </div>
+      </template>
 
-            <template #body v-else-if="type === 'thirdparty'">
-                <on-the-fly-thirdparty
-                    :id="id"
-                    :type="type"
-                    :action="action"
-                    ref="castThirdparty"
-                />
-                <div v-if="hasResourceComment">
-                    <h3>{{ trans(ONTHEFLY_RESOURCE_COMMENT_TITLE) }}</h3>
-                    <blockquote class="chill-user-quote">
-                        {{ parent.comment }}
-                    </blockquote>
-                </div>
-            </template>
+      <template #body v-else-if="parent">
+        <on-the-fly-thirdparty
+          :parent="parent"
+          :action="action"
+          type="thirdparty"
+          ref="castThirdparty"
+        />
+      </template>
 
-            <template #body v-else-if="parent">
-                <on-the-fly-thirdparty
-                    :parent="parent"
-                    :action="action"
-                    type="thirdparty"
-                    ref="castThirdparty"
-                />
-            </template>
+      <template #body v-else>
+        <on-the-fly-create
+          :action="action"
+          :allowed-types="allowedTypes"
+          :query="query"
+          ref="castNew"
+        />
+      </template>
 
-            <template #body v-else>
-                <on-the-fly-create
-                    :action="action"
-                    :allowed-types="allowedTypes"
-                    :query="query"
-                    ref="castNew"
-                />
-            </template>
-
-            <template #footer>
-                <a
-                    v-if="action === 'show'"
-                    :href="buildLocation(id, type)"
-                    :title="trans(titleMessage)"
-                    class="btn btn-show"
-                    >{{ trans(buttonMessage) }}
-                </a>
-                <a v-else class="btn btn-save" @click="saveAction">
-                    {{ trans(ACTION_SAVE) }}
-                </a>
-            </template>
-        </modal>
-    </teleport>
+      <template #footer>
+        <a
+          v-if="action === 'show'"
+          :href="buildLocation(id, type)"
+          :title="trans(titleMessage)"
+          class="btn btn-show"
+          >{{ trans(buttonMessage) }}
+        </a>
+        <a v-else class="btn btn-save" @click="saveAction">
+          {{ trans(ACTION_SAVE) }}
+        </a>
+      </template>
+    </modal>
+  </teleport>
 </template>
 <script setup>
 import { ref, computed, defineEmits, defineProps } from "vue";
@@ -100,45 +100,45 @@ import OnTheFlyCreate from "./Create.vue";
 import OnTheFlyPerson from "ChillPersonAssets/vuejs/_components/OnTheFly/Person.vue";
 import OnTheFlyThirdparty from "ChillThirdPartyAssets/vuejs/_components/OnTheFly/ThirdParty.vue";
 import {
-    trans,
-    ACTION_SHOW,
-    ACTION_EDIT,
-    ACTION_CREATE,
-    ACTION_ADDCONTACT,
-    ONTHEFLY_CREATE_TITLE_DEFAULT,
-    ONTHEFLY_CREATE_TITLE_PERSON,
-    ONTHEFLY_CREATE_TITLE_THIRDPARTY,
-    ONTHEFLY_SHOW_PERSON,
-    ONTHEFLY_SHOW_THIRDPARTY,
-    ONTHEFLY_EDIT_PERSON,
-    ONTHEFLY_EDIT_THIRDPARTY,
-    ONTHEFLY_ADDCONTACT_TITLE,
-    ACTION_REDIRECT_PERSON,
-    ACTION_REDIRECT_THIRDPARTY,
-    ONTHEFLY_SHOW_FILE_PERSON,
-    ONTHEFLY_SHOW_FILE_THIRDPARTY,
-    ONTHEFLY_SHOW_FILE_DEFAULT,
-    ONTHEFLY_RESOURCE_COMMENT_TITLE,
-    ACTION_SAVE,
+  trans,
+  ACTION_SHOW,
+  ACTION_EDIT,
+  ACTION_CREATE,
+  ACTION_ADDCONTACT,
+  ONTHEFLY_CREATE_TITLE_DEFAULT,
+  ONTHEFLY_CREATE_TITLE_PERSON,
+  ONTHEFLY_CREATE_TITLE_THIRDPARTY,
+  ONTHEFLY_SHOW_PERSON,
+  ONTHEFLY_SHOW_THIRDPARTY,
+  ONTHEFLY_EDIT_PERSON,
+  ONTHEFLY_EDIT_THIRDPARTY,
+  ONTHEFLY_ADDCONTACT_TITLE,
+  ACTION_REDIRECT_PERSON,
+  ACTION_REDIRECT_THIRDPARTY,
+  ONTHEFLY_SHOW_FILE_PERSON,
+  ONTHEFLY_SHOW_FILE_THIRDPARTY,
+  ONTHEFLY_SHOW_FILE_DEFAULT,
+  ONTHEFLY_RESOURCE_COMMENT_TITLE,
+  ACTION_SAVE,
 } from "translator";
 
 const props = defineProps({
-    type: String,
-    id: [String, Number],
-    action: String,
-    buttonText: String,
-    displayBadge: Boolean,
-    isDead: Boolean,
-    parent: Object,
-    allowedTypes: Array,
-    query: String,
+  type: String,
+  id: [String, Number],
+  action: String,
+  buttonText: String,
+  displayBadge: Boolean,
+  isDead: Boolean,
+  parent: Object,
+  allowedTypes: Array,
+  query: String,
 });
 
 const emit = defineEmits(["saveFormOnTheFly"]);
 
 const modal = ref({
-    showModal: false,
-    modalDialogClass: "modal-dialog-scrollable modal-xl",
+  showModal: false,
+  modalDialogClass: "modal-dialog-scrollable modal-xl",
 });
 
 const castPerson = ref();
@@ -146,214 +146,209 @@ const castThirdparty = ref();
 const castNew = ref();
 
 const hasResourceComment = computed(() => {
-    return (
-        typeof props.parent !== "undefined" &&
-        props.parent !== null &&
-        props.action === "show" &&
-        props.parent.type === "accompanying_period_resource" &&
-        props.parent.comment !== null &&
-        props.parent.comment !== ""
-    );
+  return (
+    typeof props.parent !== "undefined" &&
+    props.parent !== null &&
+    props.action === "show" &&
+    props.parent.type === "accompanying_period_resource" &&
+    props.parent.comment !== null &&
+    props.parent.comment !== ""
+  );
 });
 
 const classAction = computed(() => {
-    switch (props.action) {
-        case "show":
-            return "btn-show";
-        case "edit":
-            return "btn-update";
-        case "create":
-            return "btn-create";
-        case "addContact":
-            return "btn-tpchild";
-        default:
-            return "";
-    }
+  switch (props.action) {
+    case "show":
+      return "btn-show";
+    case "edit":
+      return "btn-update";
+    case "create":
+      return "btn-create";
+    case "addContact":
+      return "btn-tpchild";
+    default:
+      return "";
+  }
 });
 
 const titleAction = computed(() => {
-    switch (props.action) {
-        case "show":
-            return ACTION_SHOW;
-        case "edit":
-            return ACTION_EDIT;
-        case "create":
-            return ACTION_CREATE;
-        case "addContact":
-            return ACTION_ADDCONTACT;
-        default:
-            return "";
-    }
+  switch (props.action) {
+    case "show":
+      return ACTION_SHOW;
+    case "edit":
+      return ACTION_EDIT;
+    case "create":
+      return ACTION_CREATE;
+    case "addContact":
+      return ACTION_ADDCONTACT;
+    default:
+      return "";
+  }
 });
 
 const titleCreate = computed(() => {
-    if (typeof props.allowedTypes === "undefined") {
-        return ONTHEFLY_CREATE_TITLE_DEFAULT;
-    }
-    return props.allowedTypes.every((t) => t === "person")
-        ? ONTHEFLY_CREATE_TITLE_PERSON
-        : props.allowedTypes.every((t) => t === "thirdparty")
-          ? ONTHEFLY_CREATE_TITLE_THIRDPARTY
-          : ONTHEFLY_CREATE_TITLE_DEFAULT;
+  if (typeof props.allowedTypes === "undefined") {
+    return ONTHEFLY_CREATE_TITLE_DEFAULT;
+  }
+  return props.allowedTypes.every((t) => t === "person")
+    ? ONTHEFLY_CREATE_TITLE_PERSON
+    : props.allowedTypes.every((t) => t === "thirdparty")
+      ? ONTHEFLY_CREATE_TITLE_THIRDPARTY
+      : ONTHEFLY_CREATE_TITLE_DEFAULT;
 });
 
 const titleModal = computed(() => {
-    switch (props.action) {
-        case "show":
-            if (props.type == "person") {
-                return ONTHEFLY_SHOW_PERSON;
-            } else if (props.type == "thirdparty") {
-                return ONTHEFLY_SHOW_THIRDPARTY;
-            }
-            break;
-        case "edit":
-            if (props.type == "person") {
-                return ONTHEFLY_EDIT_PERSON;
-            } else if (props.type == "thirdparty") {
-                return ONTHEFLY_EDIT_THIRDPARTY;
-            }
-            break;
-        case "create":
-            return titleCreate.value;
-        case "addContact":
-            return ONTHEFLY_ADDCONTACT_TITLE;
-        default:
-            break;
-    }
-    return "";
+  switch (props.action) {
+    case "show":
+      if (props.type == "person") {
+        return ONTHEFLY_SHOW_PERSON;
+      } else if (props.type == "thirdparty") {
+        return ONTHEFLY_SHOW_THIRDPARTY;
+      }
+      break;
+    case "edit":
+      if (props.type == "person") {
+        return ONTHEFLY_EDIT_PERSON;
+      } else if (props.type == "thirdparty") {
+        return ONTHEFLY_EDIT_THIRDPARTY;
+      }
+      break;
+    case "create":
+      return titleCreate.value;
+    case "addContact":
+      return ONTHEFLY_ADDCONTACT_TITLE;
+    default:
+      break;
+  }
+  return "";
 });
 
 const titleMessage = computed(() => {
-    switch (props.type) {
-        case "person":
-            return ACTION_REDIRECT_PERSON;
-        case "thirdparty":
-            return ACTION_REDIRECT_THIRDPARTY;
-        default:
-            return "";
-    }
+  switch (props.type) {
+    case "person":
+      return ACTION_REDIRECT_PERSON;
+    case "thirdparty":
+      return ACTION_REDIRECT_THIRDPARTY;
+    default:
+      return "";
+  }
 });
 
 const buttonMessage = computed(() => {
-    switch (props.type) {
-        case "person":
-            return ONTHEFLY_SHOW_FILE_PERSON;
-        case "thirdparty":
-            return ONTHEFLY_SHOW_FILE_THIRDPARTY;
-        default:
-            return ONTHEFLY_SHOW_FILE_DEFAULT;
-    }
+  switch (props.type) {
+    case "person":
+      return ONTHEFLY_SHOW_FILE_PERSON;
+    case "thirdparty":
+      return ONTHEFLY_SHOW_FILE_THIRDPARTY;
+    default:
+      return ONTHEFLY_SHOW_FILE_DEFAULT;
+  }
 });
 
 const isDisplayBadge = computed(() => {
-    return props.displayBadge === true && props.buttonText !== null;
+  return props.displayBadge === true && props.buttonText !== null;
 });
 
 const badgeType = computed(() => {
-    return "entity-" + props.type + " badge-" + props.type;
+  return "entity-" + props.type + " badge-" + props.type;
 });
 
 const getReturnPath = computed(() => {
-    return `?returnPath=${window.location.pathname}${window.location.search}${window.location.hash}`;
+  return `?returnPath=${window.location.pathname}${window.location.search}${window.location.hash}`;
 });
 
 function closeModal() {
-    modal.value.showModal = false;
+  modal.value.showModal = false;
 }
 
 function openModal() {
-    modal.value.showModal = true;
+  modal.value.showModal = true;
 }
 
 function changeActionTo(action) {
-    console.log(action);
-    // Not reactive in setup, but you can emit or use a ref if needed
+  console.log(action);
+  // Not reactive in setup, but you can emit or use a ref if needed
 }
 
 function saveAction() {
-    let type = props.type,
-        data = {};
-    switch (type) {
-        case "person":
-            data = castPerson.value?.$data.person;
-            break;
-        case "thirdparty":
-            data = castThirdparty.value?.$data.thirdparty;
-            break;
-        default:
-            if (typeof props.type === "undefined") {
-                if (props.action === "addContact") {
-                    type = "thirdparty";
-                    data = castThirdparty.value?.$data.thirdparty;
-                    data.parent = {
-                        type: "thirdparty",
-                        id: props.parent.id,
-                    };
-                    data.civility =
-                        data.civility !== null
-                            ? {
-                                  type: "chill_main_civility",
-                                  id: data.civility.id,
-                              }
-                            : null;
-                    data.profession =
-                        data.profession !== "" ? data.profession : "";
-                } else {
-                    type = castNew.value.radioType;
-                    data = castNew.value.castDataByType();
-                    if (
-                        typeof data.civility !== "undefined" &&
-                        null !== data.civility
-                    ) {
-                        data.civility =
-                            data.civility !== null
-                                ? {
-                                      type: "chill_main_civility",
-                                      id: data.civility.id,
-                                  }
-                                : null;
-                    }
-                    if (
-                        typeof data.profession !== "undefined" &&
-                        "" !== data.profession
-                    ) {
-                        data.profession =
-                            data.profession !== "" ? data.profession : "";
-                    }
+  let type = props.type,
+    data = {};
+  switch (type) {
+    case "person":
+      data = castPerson.value?.$data.person;
+      break;
+    case "thirdparty":
+      data = castThirdparty.value?.$data.thirdparty;
+      break;
+    default:
+      if (typeof props.type === "undefined") {
+        if (props.action === "addContact") {
+          type = "thirdparty";
+          data = castThirdparty.value?.$data.thirdparty;
+          data.parent = {
+            type: "thirdparty",
+            id: props.parent.id,
+          };
+          data.civility =
+            data.civility !== null
+              ? {
+                  type: "chill_main_civility",
+                  id: data.civility.id,
                 }
-            } else {
-                throw "error with object type";
-            }
-    }
-    emit("saveFormOnTheFly", { type: type, data: data });
+              : null;
+          data.profession = data.profession !== "" ? data.profession : "";
+        } else {
+          type = castNew.value.radioType;
+          data = castNew.value.castDataByType();
+          if (typeof data.civility !== "undefined" && null !== data.civility) {
+            data.civility =
+              data.civility !== null
+                ? {
+                    type: "chill_main_civility",
+                    id: data.civility.id,
+                  }
+                : null;
+          }
+          if (
+            typeof data.profession !== "undefined" &&
+            "" !== data.profession
+          ) {
+            data.profession = data.profession !== "" ? data.profession : "";
+          }
+        }
+      } else {
+        throw "error with object type";
+      }
+  }
+  emit("saveFormOnTheFly", { type: type, data: data });
 }
 
 function buildLocation(id, type) {
-    if (type === "person") {
-        return encodeURI(`/fr/person/${id}/general${getReturnPath.value}`);
-    } else if (type === "thirdparty") {
-        return encodeURI(`/fr/3party/3party/${id}/view${getReturnPath.value}`);
-    }
+  if (type === "person") {
+    return encodeURI(`/fr/person/${id}/general${getReturnPath.value}`);
+  } else if (type === "thirdparty") {
+    return encodeURI(`/fr/3party/3party/${id}/view${getReturnPath.value}`);
+  }
 }
 
 defineExpose({
-    openModal,
-    closeModal,
-    changeActionTo,
-    saveAction,
-    castPerson,
-    castThirdparty,
-    castNew,
-    hasResourceComment,
-    modal,
-    isDisplayBadge,
-    Modal,
+  openModal,
+  closeModal,
+  changeActionTo,
+  saveAction,
+  castPerson,
+  castThirdparty,
+  castNew,
+  hasResourceComment,
+  modal,
+  isDisplayBadge,
+  Modal,
 });
 </script>
 
 <style lang="css" scoped>
 a {
-    cursor: pointer;
+  cursor: pointer;
 }
 
 /* .btn-add-contact {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
index 1ddf054b6..c9b3deb05 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
@@ -1,41 +1,37 @@
 <template>
-    <div class="grey-card">
-        <ul :class="listClasses" v-if="picked.length && displayPicked">
-            <li
-                v-for="p in picked"
-                @click="removeEntity(p)"
-                :key="p.type + p.id"
-            >
-                <span
-                    :class="getBadgeClass(p)"
-                    class="chill_denomination"
-                    :style="getBadgeStyle(p)"
-                >
-                    {{ p.text }}
-                </span>
-            </li>
-        </ul>
-        <ul class="record_actions">
-            <li class="add-persons">
-                <add-persons
-                    :options="addPersonsOptions"
-                    :key="uniqid"
-                    :buttonTitle="translatedListOfTypes"
-                    :modalTitle="translatedListOfTypes"
-                    @addNewPersons="addNewEntity"
-                >
-                </add-persons>
-            </li>
-        </ul>
+  <div class="grey-card">
+    <ul :class="listClasses" v-if="picked.length && displayPicked">
+      <li v-for="p in picked" @click="removeEntity(p)" :key="p.type + p.id">
+        <span
+          :class="getBadgeClass(p)"
+          class="chill_denomination"
+          :style="getBadgeStyle(p)"
+        >
+          {{ p.text }}
+        </span>
+      </li>
+    </ul>
+    <ul class="record_actions">
+      <li class="add-persons">
+        <add-persons
+          :options="addPersonsOptions"
+          :key="uniqid"
+          :buttonTitle="translatedListOfTypes"
+          :modalTitle="translatedListOfTypes"
+          @addNewPersons="addNewEntity"
+        >
+        </add-persons>
+      </li>
+    </ul>
 
-        <ul class="badge-suggest add-items inline" style="float: right">
-            <li v-for="s in suggested" :key="s.id" @click="addNewSuggested(s)">
-                <span :class="getBadgeClass(s)" :style="getBadgeStyle(s)">
-                    {{ s.text }}
-                </span>
-            </li>
-        </ul>
-    </div>
+    <ul class="badge-suggest add-items inline" style="float: right">
+      <li v-for="s in suggested" :key="s.id" @click="addNewSuggested(s)">
+        <span :class="getBadgeClass(s)" :style="getBadgeStyle(s)">
+          {{ s.text }}
+        </span>
+      </li>
+    </ul>
+  </div>
 </template>
 
 <script lang="ts" setup>
@@ -43,135 +39,135 @@ import { ref, computed, defineProps, defineEmits, defineComponent } from "vue";
 import AddPersons from "ChillPersonAssets/vuejs/_components/AddPersons.vue";
 import { Entities, EntityType, SearchOptions } from "ChillPersonAssets/types";
 import {
-    PICK_ENTITY_MODAL_TITLE,
-    PICK_ENTITY_USER,
-    PICK_ENTITY_USER_GROUP,
-    PICK_ENTITY_PERSON,
-    PICK_ENTITY_THIRDPARTY,
-    trans,
+  PICK_ENTITY_MODAL_TITLE,
+  PICK_ENTITY_USER,
+  PICK_ENTITY_USER_GROUP,
+  PICK_ENTITY_PERSON,
+  PICK_ENTITY_THIRDPARTY,
+  trans,
 } from "translator";
 import { addNewEntities } from "ChillMainAssets/types";
 
 defineComponent({
-    components: {
-        AddPersons,
-    },
+  components: {
+    AddPersons,
+  },
 });
 const props = defineProps<{
-    multiple: boolean;
-    types: EntityType[];
-    picked: Entities[];
-    uniqid: string;
-    removableIfSet?: boolean;
-    displayPicked?: boolean;
-    suggested?: Entities[];
-    label?: string;
+  multiple: boolean;
+  types: EntityType[];
+  picked: Entities[];
+  uniqid: string;
+  removableIfSet?: boolean;
+  displayPicked?: boolean;
+  suggested?: Entities[];
+  label?: string;
 }>();
 
 const emits = defineEmits<{
-    (e: "addNewEntity", payload: { entity: Entities }): void;
-    (e: "removeEntity", payload: { entity: Entities }): void;
-    (e: "addNewEntityProcessEnded"): void;
+  (e: "addNewEntity", payload: { entity: Entities }): void;
+  (e: "removeEntity", payload: { entity: Entities }): void;
+  (e: "addNewEntityProcessEnded"): void;
 }>();
 
 const addPersons = ref();
 
 const addPersonsOptions = computed(
-    () =>
-        ({
-            uniq: !props.multiple,
-            type: props.types,
-            priority: null,
-            button: {
-                size: "btn-sm",
-                class: "btn-submit",
-            },
-        }) as SearchOptions,
+  () =>
+    ({
+      uniq: !props.multiple,
+      type: props.types,
+      priority: null,
+      button: {
+        size: "btn-sm",
+        class: "btn-submit",
+      },
+    }) as SearchOptions,
 );
 
 const translatedListOfTypes = computed(() => {
-    if (props.label !== undefined && props.label !== "") {
-        return props.label;
+  if (props.label !== undefined && props.label !== "") {
+    return props.label;
+  }
+
+  const translatedTypes = props.types.map((type: EntityType) => {
+    switch (type) {
+      case "user":
+        return trans(PICK_ENTITY_USER, {
+          count: props.multiple ? 2 : 1,
+        });
+      case "person":
+        return trans(PICK_ENTITY_PERSON, {
+          count: props.multiple ? 2 : 1,
+        });
+      case "thirdparty":
+        return trans(PICK_ENTITY_THIRDPARTY, {
+          count: props.multiple ? 2 : 1,
+        });
+      case "user_group":
+        return trans(PICK_ENTITY_USER_GROUP, {
+          count: props.multiple ? 2 : 1,
+        });
     }
+  });
 
-    const translatedTypes = props.types.map((type: EntityType) => {
-        switch (type) {
-            case "user":
-                return trans(PICK_ENTITY_USER, {
-                    count: props.multiple ? 2 : 1,
-                });
-            case "person":
-                return trans(PICK_ENTITY_PERSON, {
-                    count: props.multiple ? 2 : 1,
-                });
-            case "third_party":
-                return trans(PICK_ENTITY_THIRDPARTY, {
-                    count: props.multiple ? 2 : 1,
-                });
-            case "user_group":
-                return trans(PICK_ENTITY_USER_GROUP, {
-                    count: props.multiple ? 2 : 1,
-                });
-        }
-    });
-
-    return `${trans(PICK_ENTITY_MODAL_TITLE, {
-        count: props.multiple ? 2 : 1,
-    })} ${translatedTypes.join(", ")}`;
+  return `${trans(PICK_ENTITY_MODAL_TITLE, {
+    count: props.multiple ? 2 : 1,
+  })} ${translatedTypes.join(", ")}`;
 });
 
 const listClasses = computed(() => ({
-    "badge-suggest": true,
-    "remove-items": props.removableIfSet !== false,
-    inline: true,
+  "badge-suggest": true,
+  "remove-items": props.removableIfSet !== false,
+  inline: true,
 }));
 
 function addNewSuggested(entity: Entities) {
-    emits("addNewEntity", { entity });
+  emits("addNewEntity", { entity });
 }
 
 function addNewEntity({ selected }: addNewEntities) {
-    Object.values(selected).forEach((item) => {
-        emits("addNewEntity", { entity: item.result });
-    });
-    addPersons.value?.resetSearch();
+  Object.values(selected).forEach((item) => {
+    emits("addNewEntity", { entity: item.result });
+  });
+  addPersons.value?.resetSearch();
 
-    emits("addNewEntityProcessEnded");
+  emits("addNewEntityProcessEnded");
 }
 
 function removeEntity(entity: Entities) {
-    if (props.removableIfSet === false) {
-        return;
-    }
-    emits("removeEntity", { entity });
+  if (props.removableIfSet === false) {
+    return;
+  }
+  emits("removeEntity", { entity });
 }
 
 function getBadgeClass(entities: Entities) {
-    if (entities.type !== "user_group") {
-        return entities.type;
-    }
-    return "";
+  if (entities.type !== "user_group") {
+    return entities.type;
+  }
+  return "";
 }
 
 function getBadgeStyle(entities: Entities) {
-    if (entities.type === "user_group") {
-        return [
-            `ul.badge-suggest li > span {
+  if (entities.type === "user_group") {
+    return [
+      `ul.badge-suggest li > span {
                 color: ${entities.foregroundColor}!important;
                 border-bottom-color: ${entities.backgroundColor};
         }`,
-        ];
-    }
-    return [];
+    ];
+  }
+  return [];
 }
 </script>
 
 <style lang="scss" scoped>
 .grey-card {
-    background: #f8f9fa;
-    border-radius: 8px;
-    padding: 1.5rem;
-    min-height: 160px;
+  background: #f8f9fa;
+  border-radius: 8px;
+  padding: 1.5rem;
+  min-height: 160px;
 }
 
 .btn-check:checked + .btn,
@@ -179,94 +175,94 @@ function getBadgeStyle(entities: Entities) {
 .btn:first-child:active,
 .btn.active,
 .btn.show {
-    color: white;
-    box-shadow: 0 0 0 0.2rem var(--bs-chill-green);
-    outline: 0;
+  color: white;
+  box-shadow: 0 0 0 0.2rem var(--bs-chill-green);
+  outline: 0;
 }
 
 .as-user-group {
-    display: inline-block;
+  display: inline-block;
 }
 ul.badge-suggest {
-    list-style-type: none;
-    padding-left: 0;
-    margin-bottom: 0px;
+  list-style-type: none;
+  padding-left: 0;
+  margin-bottom: 0px;
 }
 ul.badge-suggest li > span {
-    white-space: normal;
-    text-align: start;
-    margin-bottom: 3px;
+  white-space: normal;
+  text-align: start;
+  margin-bottom: 3px;
 }
 
 ul.badge-suggest.inline li {
-    display: inline-block;
-    margin-right: 0.2em;
+  display: inline-block;
+  margin-right: 0.2em;
 }
 ul.badge-suggest.add-items li {
-    position: relative;
+  position: relative;
 }
 ul.badge-suggest.add-items li span {
-    cursor: pointer;
-    padding-left: 2rem;
+  cursor: pointer;
+  padding-left: 2rem;
 }
 ul.badge-suggest.add-items li span:hover {
-    color: #ced4da;
+  color: #ced4da;
 }
 ul.badge-suggest.add-items li > span:before {
-    font: normal normal normal 13px ForkAwesome;
-    margin-right: 1.8em;
-    content: "\f067";
-    color: var(--bs-success);
-    position: absolute;
-    display: block;
-    top: 50%;
-    left: 0.75rem;
-    -webkit-transform: translateY(-50%);
-    -moz-transform: translateY(-50%);
-    -ms-transform: translateY(-50%);
-    transform: translateY(-50%);
+  font: normal normal normal 13px ForkAwesome;
+  margin-right: 1.8em;
+  content: "\f067";
+  color: var(--bs-success);
+  position: absolute;
+  display: block;
+  top: 50%;
+  left: 0.75rem;
+  -webkit-transform: translateY(-50%);
+  -moz-transform: translateY(-50%);
+  -ms-transform: translateY(-50%);
+  transform: translateY(-50%);
 }
 ul.badge-suggest.remove-items li {
-    position: relative;
+  position: relative;
 }
 ul.badge-suggest.remove-items li span {
-    cursor: pointer;
-    padding-left: 2rem;
+  cursor: pointer;
+  padding-left: 2rem;
 }
 ul.badge-suggest.remove-items li span:hover {
-    color: #ced4da;
+  color: #ced4da;
 }
 ul.badge-suggest.remove-items li > span:before {
-    font: normal normal normal 13px ForkAwesome;
-    margin-right: 1.8em;
-    content: "\f1f8";
-    color: var(--bs-danger);
-    position: absolute;
-    display: block;
-    top: 50%;
-    left: 0.75rem;
-    -webkit-transform: translateY(-50%);
-    -moz-transform: translateY(-50%);
-    -ms-transform: translateY(-50%);
-    transform: translateY(-50%);
+  font: normal normal normal 13px ForkAwesome;
+  margin-right: 1.8em;
+  content: "\f1f8";
+  color: var(--bs-danger);
+  position: absolute;
+  display: block;
+  top: 50%;
+  left: 0.75rem;
+  -webkit-transform: translateY(-50%);
+  -moz-transform: translateY(-50%);
+  -ms-transform: translateY(-50%);
+  transform: translateY(-50%);
 }
 ul.badge-suggest li > span {
-    margin: 0.2rem 0.1rem;
-    display: inline-block;
-    padding: 0 1em 0 2.2em !important;
-    background-color: #fff;
-    border: 1px solid #dee2e6;
-    border-bottom-width: 3px;
-    border-bottom-style: solid;
-    border-radius: 6px;
-    font-size: 0.75em;
-    font-weight: 700;
+  margin: 0.2rem 0.1rem;
+  display: inline-block;
+  padding: 0 1em 0 2.2em !important;
+  background-color: #fff;
+  border: 1px solid #dee2e6;
+  border-bottom-width: 3px;
+  border-bottom-style: solid;
+  border-radius: 6px;
+  font-size: 0.75em;
+  font-weight: 700;
 }
 
 ul.badge-suggest li > span.person {
-    border-bottom-color: #43b29d;
+  border-bottom-color: #43b29d;
 }
 ul.badge-suggest li > span.thirdparty {
-    border-bottom-color: rgb(198.9, 72, 98.1);
+  border-bottom-color: rgb(198.9, 72, 98.1);
 }
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/types.ts b/src/Bundle/ChillPersonBundle/Resources/public/types.ts
index 18ce72046..1788e585f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/types.ts
+++ b/src/Bundle/ChillPersonBundle/Resources/public/types.ts
@@ -1,309 +1,315 @@
 import { StoredObject } from "ChillDocStoreAssets/types";
 import {
-    Address,
-    Center,
-    Civility,
-    DateTime,
-    User,
-    UserGroup,
-    Household,
-    ThirdParty,
-    WorkflowAvailable,
-    Scope,
-    Job,
-    PrivateCommentEmbeddable,
+  Address,
+  Center,
+  Civility,
+  DateTime,
+  User,
+  UserGroup,
+  Household,
+  WorkflowAvailable,
+  Scope,
+  Job,
+  PrivateCommentEmbeddable,
 } from "../../../ChillMainBundle/Resources/public/types";
 import { Thirdparty } from "../../../ChillThirdPartyBundle/Resources/public/types";
 import { Calendar } from "../../../ChillCalendarBundle/Resources/public/types";
 
+export interface AltName {
+  label: string;
+  key: string;
+}
+
 export interface Person {
-    id: number;
-    type: "person";
-    text: string;
-    textAge: string;
-    firstName: string;
-    lastName: string;
-    current_household_address: Address | null;
-    birthdate: DateTime | null;
-    deathdate: DateTime | null;
-    age: number;
-    phonenumber: string;
-    mobilenumber: string;
-    email: string;
-    gender: "woman" | "man" | "other";
-    centers: Center[];
-    civility: Civility | null;
-    current_household_id: number;
-    current_residential_addresses: Address[];
+  id: number;
+  type: "person";
+  text: string;
+  textAge: string;
+  firstName: string;
+  lastName: string;
+  altNames: AltName[];
+  suffixText: string;
+  current_household_address: Address | null;
+  birthdate: DateTime | null;
+  deathdate: DateTime | null;
+  age: number;
+  phonenumber: string;
+  mobilenumber: string;
+  email: string;
+  gender: "woman" | "man" | "other";
+  centers: Center[];
+  civility: Civility | null;
+  current_household_id: number;
+  current_residential_addresses: Address[];
 }
 
 export interface AccompanyingPeriod {
-    id: number;
-    addressLocation?: Address | null;
-    administrativeLocation?: Location | null;
-    calendars: Calendar[];
-    closingDate?: Date | null;
-    closingMotive?: ClosingMotive | null;
-    comments: Comment[];
-    confidential: boolean;
-    createdAt?: Date | null;
-    createdBy?: User | null;
-    emergency: boolean;
-    intensity?: "occasional" | "regular";
-    job?: Job | null;
-    locationHistories: AccompanyingPeriodLocationHistory[];
-    openingDate?: Date | null;
-    origin?: Origin | null;
-    participations: AccompanyingPeriodParticipation[];
-    personLocation?: Person | null;
-    pinnedComment?: Comment | null;
-    preventUserIsChangedNotification: boolean;
-    remark: string;
-    requestorAnonymous: boolean;
-    requestorPerson?: Person | null;
-    requestorThirdParty?: Thirdparty | null;
-    resources: AccompanyingPeriodResource[];
-    scopes: Scope[];
-    socialIssues: SocialIssue[];
-    step?:
-        | "CLOSED"
-        | "CONFIRMED"
-        | "CONFIRMED_INACTIVE_SHORT"
-        | "CONFIRMED_INACTIVE_LONG"
-        | "DRAFT";
+  id: number;
+  addressLocation?: Address | null;
+  administrativeLocation?: Location | null;
+  calendars: Calendar[];
+  closingDate?: Date | null;
+  closingMotive?: ClosingMotive | null;
+  comments: Comment[];
+  confidential: boolean;
+  createdAt?: Date | null;
+  createdBy?: User | null;
+  emergency: boolean;
+  intensity?: "occasional" | "regular";
+  job?: Job | null;
+  locationHistories: AccompanyingPeriodLocationHistory[];
+  openingDate?: Date | null;
+  origin?: Origin | null;
+  participations: AccompanyingPeriodParticipation[];
+  personLocation?: Person | null;
+  pinnedComment?: Comment | null;
+  preventUserIsChangedNotification: boolean;
+  remark: string;
+  requestorAnonymous: boolean;
+  requestorPerson?: Person | null;
+  requestorThirdParty?: Thirdparty | null;
+  resources: AccompanyingPeriodResource[];
+  scopes: Scope[];
+  socialIssues: SocialIssue[];
+  step?:
+    | "CLOSED"
+    | "CONFIRMED"
+    | "CONFIRMED_INACTIVE_SHORT"
+    | "CONFIRMED_INACTIVE_LONG"
+    | "DRAFT";
 }
 
 export interface AccompanyingPeriodWork {
-    id: number;
-    accompanyingPeriod?: AccompanyingPeriod;
-    accompanyingPeriodWorkEvaluations: AccompanyingPeriodWorkEvaluation[];
-    createdAt?: string;
-    createdAutomatically: boolean;
-    createdAutomaticallyReason: string;
-    createdBy: User;
-    endDate?: string;
-    goals: AccompanyingPeriodWorkGoal[];
-    handlingThierParty?: Thirdparty;
-    note: string;
-    persons: Person[];
-    privateComment: PrivateCommentEmbeddable;
-    referrersHistory: AccompanyingPeriodWorkReferrerHistory[];
-    results: Result[];
-    socialAction?: SocialAction;
-    startDate?: string;
-    thirdParties: Thirdparty[];
-    updatedAt?: string;
-    updatedBy: User;
-    version: number;
+  id: number;
+  accompanyingPeriod?: AccompanyingPeriod;
+  accompanyingPeriodWorkEvaluations: AccompanyingPeriodWorkEvaluation[];
+  createdAt?: string;
+  createdAutomatically: boolean;
+  createdAutomaticallyReason: string;
+  createdBy: User;
+  endDate?: string;
+  goals: AccompanyingPeriodWorkGoal[];
+  handlingThierParty?: Thirdparty;
+  note: string;
+  persons: Person[];
+  privateComment: PrivateCommentEmbeddable;
+  referrersHistory: AccompanyingPeriodWorkReferrerHistory[];
+  results: Result[];
+  socialAction?: SocialAction;
+  startDate?: string;
+  thirdParties: Thirdparty[];
+  updatedAt?: string;
+  updatedBy: User;
+  version: number;
 }
 
 export interface SocialAction {
-    id: number;
-    parent?: SocialAction | null;
-    children: SocialAction[];
-    issue?: SocialIssue | null;
-    ordering: number;
-    title: {
-        fr: string;
-    };
-    defaultNotificationDelay?: string | null;
-    desactivationDate?: string | null;
-    evaluations: Evaluation[];
-    goals: Goal[];
-    results: Result[];
+  id: number;
+  parent?: SocialAction | null;
+  children: SocialAction[];
+  issue?: SocialIssue | null;
+  ordering: number;
+  title: {
+    fr: string;
+  };
+  defaultNotificationDelay?: string | null;
+  desactivationDate?: string | null;
+  evaluations: Evaluation[];
+  goals: Goal[];
+  results: Result[];
 }
 
 export interface AccompanyingPeriodResource {
-    id: number;
-    accompanyingPeriod: AccompanyingPeriod;
-    comment?: string | null;
-    person?: Person | null;
-    thirdParty?: Thirdparty | null;
+  id: number;
+  accompanyingPeriod: AccompanyingPeriod;
+  comment?: string | null;
+  person?: Person | null;
+  thirdParty?: Thirdparty | null;
 }
 
 export interface Origin {
-    id: number;
-    label: {
-        fr: string;
-    };
-    noActiveAfter: DateTime;
+  id: number;
+  label: {
+    fr: string;
+  };
+  noActiveAfter: DateTime;
 }
 
 export interface ClosingMotive {
-    id: number;
-    active: boolean;
-    name: {
-        fr: string;
-    };
-    ordering: number;
-    isCanceledAccompanyingPeriod: boolean;
-    parent?: ClosingMotive | null;
-    children: ClosingMotive[];
+  id: number;
+  active: boolean;
+  name: {
+    fr: string;
+  };
+  ordering: number;
+  isCanceledAccompanyingPeriod: boolean;
+  parent?: ClosingMotive | null;
+  children: ClosingMotive[];
 }
 
 export interface AccompanyingPeriodParticipation {
-    id: number;
-    startDate: DateTime;
-    endDate?: DateTime | null;
-    accompanyingPeriod: AccompanyingPeriod;
-    person: Person;
+  id: number;
+  startDate: DateTime;
+  endDate?: DateTime | null;
+  accompanyingPeriod: AccompanyingPeriod;
+  person: Person;
 }
 
 export interface AccompanyingPeriodLocationHistory {
-    id: number;
-    startDate: DateTime;
-    endDate?: DateTime | null;
-    addressLocation?: Address | null;
-    period: AccompanyingPeriod;
-    personLocation?: Person | null;
+  id: number;
+  startDate: DateTime;
+  endDate?: DateTime | null;
+  addressLocation?: Address | null;
+  period: AccompanyingPeriod;
+  personLocation?: Person | null;
 }
 
 export interface SocialIssue {
-    id: number;
-    parent?: SocialIssue | null;
-    children: SocialIssue[];
-    socialActions?: SocialAction[] | null;
-    ordering: number;
-    title: {
-        fr: string;
-    };
-    desactivationDate?: string | null;
+  id: number;
+  parent?: SocialIssue | null;
+  children: SocialIssue[];
+  socialActions?: SocialAction[] | null;
+  ordering: number;
+  title: {
+    fr: string;
+  };
+  desactivationDate?: string | null;
 }
 
 export interface Goal {
-    id: number;
-    results: Result[];
-    socialActions?: SocialAction[] | null;
-    title: {
-        fr: string;
-    };
+  id: number;
+  results: Result[];
+  socialActions?: SocialAction[] | null;
+  title: {
+    fr: string;
+  };
 }
 
 export interface AccompanyingPeriodWorkGoal {
-    id: number;
-    accompanyingPeriodWork: AccompanyingPeriodWork;
-    goal: Goal;
-    note: string;
-    results: Result[];
+  id: number;
+  accompanyingPeriodWork: AccompanyingPeriodWork;
+  goal: Goal;
+  note: string;
+  results: Result[];
 }
 
 export interface AccompanyingPeriodWorkEvaluation {
-    accompanyingPeriodWork: AccompanyingPeriodWork | null;
-    comment: string;
-    createdAt: DateTime | null;
-    createdBy: User | null;
-    documents: AccompanyingPeriodWorkEvaluationDocument[];
-    endDate: DateTime | null;
-    evaluation: Evaluation | null;
-    id: number | null;
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    key: any;
-    maxDate: DateTime | null;
-    startDate: DateTime | null;
-    updatedAt: DateTime | null;
-    updatedBy: User | null;
-    warningInterval: string | null;
-    timeSpent: number | null;
+  accompanyingPeriodWork: AccompanyingPeriodWork | null;
+  comment: string;
+  createdAt: DateTime | null;
+  createdBy: User | null;
+  documents: AccompanyingPeriodWorkEvaluationDocument[];
+  endDate: DateTime | null;
+  evaluation: Evaluation | null;
+  id: number | null;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  key: any;
+  maxDate: DateTime | null;
+  startDate: DateTime | null;
+  updatedAt: DateTime | null;
+  updatedBy: User | null;
+  warningInterval: string | null;
+  timeSpent: number | null;
 }
 
 export interface Evaluation {
-    id: number;
-    url: string;
-    socialActions: SocialAction[];
-    title: {
-        fr: string;
-    };
-    active: boolean;
-    delay: string;
-    notificationDelay: string;
+  id: number;
+  url: string;
+  socialActions: SocialAction[];
+  title: {
+    fr: string;
+  };
+  active: boolean;
+  delay: string;
+  notificationDelay: string;
 }
 
 export interface AccompanyingPeriodWorkReferrerHistory {
-    id: number;
-    accompanyingPeriodWork: AccompanyingPeriodWork;
-    user: User;
-    startDate: DateTime;
-    endDate: DateTime | null;
-    createdAt: DateTime;
-    updatedAt: DateTime | null;
-    createdBy: User;
-    updatedBy: User | null;
+  id: number;
+  accompanyingPeriodWork: AccompanyingPeriodWork;
+  user: User;
+  startDate: DateTime;
+  endDate: DateTime | null;
+  createdAt: DateTime;
+  updatedAt: DateTime | null;
+  createdBy: User;
+  updatedBy: User | null;
 }
 
 export interface AccompanyingPeriodWorkEvaluationDocument {
-    id: number;
-    type: "accompanying_period_work_evaluation_document";
-    storedObject: StoredObject;
-    title: string;
-    createdAt: DateTime | null;
-    createdBy: User | null;
-    updatedAt: DateTime | null;
-    updatedBy: User | null;
-    workflows_availables: WorkflowAvailable[];
-    workflows: object[];
+  id: number;
+  type: "accompanying_period_work_evaluation_document";
+  storedObject: StoredObject;
+  title: string;
+  createdAt: DateTime | null;
+  createdBy: User | null;
+  updatedAt: DateTime | null;
+  updatedBy: User | null;
+  workflows_availables: WorkflowAvailable[];
+  workflows: object[];
 }
 
 export type EntityType =
-    | "user_group"
-    | "user"
-    | "person"
-    | "third_party"
-    | "household";
+  | "user_group"
+  | "user"
+  | "person"
+  | "thirdparty"
+  | "household";
 
-export type Entities = (UserGroup | User | Person | ThirdParty | Household) & {
-    address?: Address | null;
-    kind?: string;
-    text?: string;
-    profession?: string;
+export type Entities = (UserGroup | User | Person | Thirdparty | Household) & {
+  address?: Address | null;
+  kind?: string;
+  text?: string;
+  profession?: string;
 };
 
 export type Result = Entities & {
-    parent?: Entities | null;
+  parent?: Entities | null;
 };
 
 export interface Suggestion {
-    key: string;
-    relevance: number;
-    result: Result;
+  key: string;
+  relevance: number;
+  result: Result;
 }
 
 export interface SearchPagination {
-    first: number;
-    items_per_page: number;
-    next: number | null;
-    previous: number | null;
-    more: boolean;
+  first: number;
+  items_per_page: number;
+  next: number | null;
+  previous: number | null;
+  more: boolean;
 }
 
 export interface Search {
-    count: number;
-    pagination: SearchPagination;
-    results: Suggestion[];
+  count: number;
+  pagination: SearchPagination;
+  results: Suggestion[];
 }
 
 export interface SearchOptions {
-    uniq: boolean;
-    type: string[];
-    priority: number | null;
-    button: {
-        size: string;
-        class: string;
-        type: string;
-        display: string;
-    };
+  uniq: boolean;
+  type: string[];
+  priority: number | null;
+  button: {
+    size: string;
+    class: string;
+    type: string;
+    display: string;
+  };
 }
 
 export class MakeFetchException extends Error {
-    sta: number;
-    txt: string;
-    violations: unknown | null;
+  sta: number;
+  txt: string;
+  violations: unknown | null;
 
-    constructor(txt: string, sta: number, violations: unknown | null = null) {
-        super(txt);
-        this.name = "ValidationException";
-        this.sta = sta;
-        this.txt = txt;
-        this.violations = violations;
-        Object.setPrototypeOf(this, MakeFetchException.prototype);
-    }
+  constructor(txt: string, sta: number, violations: unknown | null = null) {
+    super(txt);
+    this.name = "ValidationException";
+    this.sta = sta;
+    this.txt = txt;
+    this.violations = violations;
+    Object.setPrototypeOf(this, MakeFetchException.prototype);
+  }
 }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypePerson.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypePerson.vue
index e9ef26d37..98119bd8e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypePerson.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypePerson.vue
@@ -23,6 +23,7 @@ import { computed, defineProps } from "vue";
 import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue";
 import BadgeEntity from "ChillMainAssets/vuejs/_components/BadgeEntity.vue";
 import PersonText from "ChillPersonAssets/vuejs/_components/Entity/PersonText.vue";
+import { Person } from "ChillPersonAssets/types";
 
 function formatDate(dateString: string | undefined, format: string) {
   if (!dateString) return "";
@@ -36,15 +37,7 @@ function formatDate(dateString: string | undefined, format: string) {
 
 const props = defineProps<{
   item: {
-    result: {
-      id: number | string;
-      birthdate: { datetime: string } | null;
-      current_household_address: {
-        text: string;
-        postcode: { name: string };
-      } | null;
-      // add other fields as needed
-    };
+    result: Person; // add other fields as needed
   };
 }>();
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue
index 3f99e5d11..28be7c119 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue
@@ -36,8 +36,8 @@ import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue";
 import BadgeEntity from "ChillMainAssets/vuejs/_components/BadgeEntity.vue";
 import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
 import { useToast } from "vue-toast-notification";
-import { ThirdParty } from "ChillMainAssets/types";
 import { Result, Suggestion } from "ChillPersonAssets/types";
+import { Thirdparty } from "src/Bundle/ChillThirdPartyBundle/Resources/public/types";
 
 interface TypeThirdPartyProps {
   item: Suggestion;
@@ -76,7 +76,7 @@ const getAddress = computed(() => {
   return null;
 });
 
-function saveFormOnTheFly({ data }: { data: ThirdParty }) {
+function saveFormOnTheFly({ data }: { data: Thirdparty }) {
   makeFetch("POST", "/api/1.0/thirdparty/thirdparty.json", data)
     .then((response: unknown) => {
       const result = response as Result;
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonText.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonText.vue
index 36be069b6..10302ee30 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonText.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonText.vue
@@ -23,22 +23,7 @@
 <script lang="ts" setup>
 import { computed, toRefs } from "vue";
 import { trans, RENDERBOX_YEARS_OLD } from "translator";
-
-interface AltName {
-  label: string;
-  key: string;
-}
-
-interface Person {
-  firstName: string;
-  lastName: string;
-  altNames: AltName[];
-  suffixText?: string;
-  birthdate: string | null;
-  deathdate: string | null;
-  age: number;
-  text: string;
-}
+import { AltName, Person } from "ChillPersonAssets/types";
 
 const props = defineProps<{
   person: Person;
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/types.ts b/src/Bundle/ChillThirdPartyBundle/Resources/public/types.ts
index 20ae3309b..2d2acc42b 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/types.ts
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/types.ts
@@ -1,47 +1,49 @@
 import {
-    Address,
-    Center,
-    Civility,
-    DateTime,
-    User,
+  Address,
+  Center,
+  Civility,
+  DateTime,
+  User,
 } from "ChillMainAssets/types";
 
 export interface Thirdparty {
-    acronym: string | null;
-    active: boolean;
-    address: Address | null;
-    canonicalized: string | null;
-    categories: ThirdpartyCategory[];
-    centers: Center[];
-    children: Thirdparty[];
-    civility: Civility | null;
-    comment: string | null;
-    contactDataAnonymous: boolean;
-    createdAt: DateTime;
-    createdBy: User | null;
-    email: string | null;
-    firstname: string | null;
-    id: number | null;
-    kind: string;
-    name: string;
-    nameCompany: string | null;
-    parent: Thirdparty | null;
-    profession: string;
-    telephone: string | null;
-    thirdPartyTypes: ThirdpartyType[] | null;
-    updatedAt: DateTime | null;
-    updatedBy: User | null;
+  type: "thirdparty";
+  text: string;
+  acronym: string | null;
+  active: boolean;
+  address: Address | null;
+  canonicalized: string | null;
+  categories: ThirdpartyCategory[];
+  centers: Center[];
+  children: Thirdparty[];
+  civility: Civility | null;
+  comment: string | null;
+  contactDataAnonymous: boolean;
+  createdAt: DateTime;
+  createdBy: User | null;
+  email: string | null;
+  firstname: string | null;
+  id: number | null;
+  kind: string;
+  name: string;
+  nameCompany: string | null;
+  parent: Thirdparty | null;
+  profession: string;
+  telephone: string | null;
+  thirdPartyTypes: ThirdpartyType[] | null;
+  updatedAt: DateTime | null;
+  updatedBy: User | null;
 }
 
 interface ThirdpartyType {
-    key: string;
-    value: string;
+  key: string;
+  value: string;
 }
 
 export interface ThirdpartyCategory {
-    id: number;
-    active: boolean;
-    name: {
-        fr: string;
-    };
+  id: number;
+  active: boolean;
+  name: {
+    fr: string;
+  };
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
index d5fa043e4..8287c59f7 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
@@ -1,17 +1,17 @@
 import {
-    DateTime,
-    TranslatableString,
-    User,
-    UserGroupOrUser,
+  DateTime,
+  TranslatableString,
+  User,
+  UserGroupOrUser,
 } from "ChillMainAssets/types";
 import { Person } from "ChillPersonAssets/types";
-import {Thirdparty} from "../../../../ChillThirdPartyBundle/Resources/public/types";
+import { Thirdparty } from "../../../../ChillThirdPartyBundle/Resources/public/types";
 
 export interface Motive {
-    type: "ticket_motive";
-    id: number;
-    active: boolean;
-    label: TranslatableString;
+  type: "ticket_motive";
+  id: number;
+  active: boolean;
+  label: TranslatableString;
 }
 
 export type TicketState = "open" | "closed";
@@ -19,134 +19,135 @@ export type TicketState = "open" | "closed";
 export type TicketEmergencyState = "yes" | "no";
 
 interface TicketHistory<T extends string, D extends object> {
-    event_type: T;
-    at: DateTime;
-    by: User;
-    data: D;
+  event_type: T;
+  at: DateTime;
+  by: User;
+  data: D;
 }
 
 export interface PersonHistory {
-    type: "ticket_person_history";
-    id: number;
-    startDate: DateTime;
-    endDate: null | DateTime;
-    person: Person;
-    removedBy: null;
-    createdBy: User | null;
-    createdAt: DateTime | null;
+  type: "ticket_person_history";
+  id: number;
+  startDate: DateTime;
+  endDate: null | DateTime;
+  person: Person;
+  removedBy: null;
+  createdBy: User | null;
+  createdAt: DateTime | null;
 }
 
 export interface MotiveHistory {
-    type: "ticket_motive_history";
-    id: number;
-    startDate: null;
-    endDate: null | DateTime;
-    motive: Motive;
-    createdBy: User | null;
-    createdAt: DateTime | null;
+  type: "ticket_motive_history";
+  id: number;
+  startDate: null;
+  endDate: null | DateTime;
+  motive: Motive;
+  createdBy: User | null;
+  createdAt: DateTime | null;
 }
 
 export interface Comment {
-    type: "ticket_comment";
-    id: number;
-    content: string;
-    createdBy: User | null;
-    createdAt: DateTime | null;
-    updatedBy: User | null;
-    updatedAt: DateTime | null;
+  type: "ticket_comment";
+  id: number;
+  content: string;
+  createdBy: User | null;
+  createdAt: DateTime | null;
+  updatedBy: User | null;
+  updatedAt: DateTime | null;
 }
 
 export interface AddresseeHistory {
-    type: "ticket_addressee_history";
-    id: number;
-    startDate: DateTime | null;
-    addressee: UserGroupOrUser;
-    endDate: DateTime | null;
-    removedBy: User | null;
-    createdBy: User | null;
-    createdAt: DateTime | null;
-    updatedBy: User | null;
-    updatedAt: DateTime | null;
+  type: "ticket_addressee_history";
+  id: number;
+  startDate: DateTime | null;
+  addressee: UserGroupOrUser;
+  endDate: DateTime | null;
+  removedBy: User | null;
+  createdBy: User | null;
+  createdAt: DateTime | null;
+  updatedBy: User | null;
+  updatedAt: DateTime | null;
 }
 
 export interface AddresseeState {
-    addressees: UserGroupOrUser[];
+  addressees: UserGroupOrUser[];
 }
 
 export interface PersonsState {
-    persons: Person[];
+  persons: Person[];
 }
 export interface CallerState {
-    new_caller: Person | null;
+  new_caller: Person | Thirdparty | null;
 }
 
 export interface StateChange {
-    new_state: TicketState;
+  new_state: TicketState;
 }
 
 export interface EmergencyChange {
-    new_emergency: TicketEmergencyState;
+  new_emergency: TicketEmergencyState;
 }
 
 export interface CreateTicketState {
-    by: User;
+  by: User;
 }
 
 export type AddCommentEvent = TicketHistory<"add_comment", Comment>;
 export type SetMotiveEvent = TicketHistory<"set_motive", MotiveHistory>;
 export type AddPersonEvent = TicketHistory<"add_person", PersonHistory>;
 export type AddresseesStateEvent = TicketHistory<
-    "addressees_state",
-    AddresseeState
+  "addressees_state",
+  AddresseeState
 >;
 export type CreateTicketEvent = TicketHistory<
-    "create_ticket",
-    CreateTicketState
+  "create_ticket",
+  CreateTicketState
 >;
 export type PersonStateEvent = TicketHistory<"persons_state", PersonsState>;
 export type ChangeStateEvent = TicketHistory<"state_change", StateChange>;
 export type EmergencyStateEvent = TicketHistory<
-    "emergency_change",
-    EmergencyChange
+  "emergency_change",
+  EmergencyChange
 >;
 export type CallerStateEvent = TicketHistory<"set_caller", CallerState>;
 
 export type TicketHistoryLine =
-    | AddPersonEvent
-    | CreateTicketEvent
-    | AddCommentEvent
-    | SetMotiveEvent
-    | AddresseesStateEvent
-    | PersonStateEvent
-    | ChangeStateEvent
-    | EmergencyStateEvent
-    | CallerStateEvent;
+  | AddPersonEvent
+  | CreateTicketEvent
+  | AddCommentEvent
+  | SetMotiveEvent
+  | AddresseesStateEvent
+  | PersonStateEvent
+  | ChangeStateEvent
+  | EmergencyStateEvent
+  | CallerStateEvent;
 
-interface BaseTicket<T extends "ticket_ticket:simple"|"ticket_ticket:extended" = "ticket_ticket:simple"> {
-    type_extended: T;
-    type: "ticket_ticket";
-    id: number;
-    externalRef: string;
-    currentAddressees: UserGroupOrUser[];
-    currentPersons: Person[];
-    currentMotive: null | Motive;
-    currentState: TicketState | null;
-    emergency: TicketEmergencyState | null;
-    caller: Person | Thirdparty | null;
-}
-
-export interface SimpleTicket extends BaseTicket<"ticket_ticket:simple"> {
+interface BaseTicket<
+  T extends
+    | "ticket_ticket:simple"
+    | "ticket_ticket:extended" = "ticket_ticket:simple",
+> {
+  type_extended: T;
+  type: "ticket_ticket";
+  id: number;
+  externalRef: string;
+  currentAddressees: UserGroupOrUser[];
+  currentPersons: Person[];
+  currentMotive: null | Motive;
+  currentState: TicketState | null;
+  emergency: TicketEmergencyState | null;
+  caller: Person | Thirdparty | null;
 }
 
 export interface TicketSimple extends BaseTicket<"ticket_ticket:simple"> {
-    type_extended: "ticket_ticket:simple";
+  type_extended: "ticket_ticket:simple";
 }
 
 export interface Ticket extends BaseTicket<"ticket_ticket:extended"> {
-    type_extended: "ticket_ticket:extended";
-    createdAt: DateTime | null;
-    createdBy: User | null;
-    updatedAt: DateTime | null;
-    updatedBy: User | null;
-    history: TicketHistoryLine[];
+  type_extended: "ticket_ticket:extended";
+  createdAt: DateTime | null;
+  createdBy: User | null;
+  updatedAt: DateTime | null;
+  updatedBy: User | null;
+  history: TicketHistoryLine[];
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue
index 8760c2855..69f3ff1ce 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue
@@ -1,20 +1,20 @@
 <template>
-    <div class="row">
-        <div class="col-12">
-            <pick-entity
-                uniqid="ticket-addressee-selector"
-                :types="['user', 'user_group', 'third_party']"
-                :picked="selectedEntities"
-                :suggested="suggestedValues"
-                :multiple="true"
-                :removable-if-set="true"
-                :display-picked="true"
-                :label="trans(CHILL_TICKET_TICKET_ADD_ADDRESSEE_USER_LABEL)"
-                @add-new-entity="addNewEntity"
-                @remove-entity="removeEntity"
-            />
-        </div>
+  <div class="row">
+    <div class="col-12">
+      <pick-entity
+        uniqid="ticket-addressee-selector"
+        :types="['user', 'user_group', 'thirdparty']"
+        :picked="selectedEntities"
+        :suggested="suggestedValues"
+        :multiple="true"
+        :removable-if-set="true"
+        :display-picked="true"
+        :label="trans(CHILL_TICKET_TICKET_ADD_ADDRESSEE_USER_LABEL)"
+        @add-new-entity="addNewEntity"
+        @remove-entity="removeEntity"
+      />
     </div>
+  </div>
 </template>
 
 <script lang="ts" setup>
@@ -28,13 +28,13 @@ import { Entities } from "ChillPersonAssets/types";
 
 // Translations
 import {
-    CHILL_TICKET_TICKET_ADD_ADDRESSEE_USER_LABEL,
-    trans,
+  CHILL_TICKET_TICKET_ADD_ADDRESSEE_USER_LABEL,
+  trans,
 } from "translator";
 
 const props = defineProps<{
-    modelValue: Entities[];
-    suggested: Entities[];
+  modelValue: Entities[];
+  suggested: Entities[];
 }>();
 
 const emit = defineEmits<(e: "update:modelValue", value: Entities[]) => void>();
@@ -42,53 +42,46 @@ const emit = defineEmits<(e: "update:modelValue", value: Entities[]) => void>();
 const selectedEntities = ref<Entities[]>([...props.modelValue]);
 const suggestedValues = ref<Entities[]>([...props.suggested]);
 watch(
-    () => [props.suggested, props.modelValue],
-    () => {
-        const modelValue = props.modelValue ?? [];
+  () => [props.suggested, props.modelValue],
+  () => {
+    const modelValue = props.modelValue ?? [];
 
-        suggestedValues.value = props.suggested.filter(
-            (suggested: Entities) => {
-                return !modelValue.some((selected: Entities) => {
-                    if (
-                        suggested.type == "user_group" &&
-                        selected.type == "user_group"
-                    ) {
-                        switch (selected.excludeKey) {
-                            case "level":
-                                return suggested.excludeKey === "level";
-                            case "":
-                                return (
-                                    suggested.excludeKey === "" &&
-                                    suggested.id === selected.id
-                                );
-                            default:
-                                return false;
-                        }
-                    } else {
-                        return (
-                            suggested.type === selected.type &&
-                            suggested.id === selected.id
-                        );
-                    }
-                });
-            },
-        );
-    },
-    { immediate: true, deep: true },
+    suggestedValues.value = props.suggested.filter((suggested: Entities) => {
+      return !modelValue.some((selected: Entities) => {
+        if (suggested.type == "user_group" && selected.type == "user_group") {
+          switch (selected.excludeKey) {
+            case "level":
+              return suggested.excludeKey === "level";
+            case "":
+              return (
+                suggested.excludeKey === "" && suggested.id === selected.id
+              );
+            default:
+              return false;
+          }
+        } else {
+          return (
+            suggested.type === selected.type && suggested.id === selected.id
+          );
+        }
+      });
+    });
+  },
+  { immediate: true, deep: true },
 );
 
 function addNewEntity({ entity }: { entity: Entities }) {
-    selectedEntities.value.push(entity);
-    emit("update:modelValue", selectedEntities.value);
+  selectedEntities.value.push(entity);
+  emit("update:modelValue", selectedEntities.value);
 }
 
 function removeEntity({ entity }: { entity: Entities }) {
-    const index = selectedEntities.value.findIndex(
-        (selectedEntity) => selectedEntity === entity,
-    );
-    if (index !== -1) {
-        selectedEntities.value.splice(index, 1);
-    }
-    emit("update:modelValue", selectedEntities.value);
+  const index = selectedEntities.value.findIndex(
+    (selectedEntity) => selectedEntity === entity,
+  );
+  if (index !== -1) {
+    selectedEntities.value.splice(index, 1);
+  }
+  emit("update:modelValue", selectedEntities.value);
 }
 </script>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
index 12489f91a..cb8c33201 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
@@ -1,109 +1,97 @@
 <template>
-    <Teleport to="#header-ticket-main">
-        <div class="container-xxl text-primary">
-            <div class="row">
-                <div class="col-md-6 col-sm-12 ps-md-5 ps-xxl-0">
-                    <h1 v-if="ticket.currentMotive">
-                        #{{ ticket.id }} {{ ticket.currentMotive.label.fr }}
-                    </h1>
-                    <p class="chill-no-data-statement" v-else>
-                        {{ trans(CHILL_TICKET_TICKET_BANNER_NO_MOTIVE) }}
-                    </p>
-                    <h2 v-if="ticket.currentPersons.length">
-                        {{
-                            ticket.currentPersons
-                                .map((person) => person.text)
-                                .join(", ")
-                        }}
-                    </h2>
-                </div>
-
-                <div class="col-md-6 col-sm-12">
-                    <div class="d-flex justify-content-end">
-                        <toggle-flags />
-
-                        <span
-                            class="badge text-bg-chill-green text-white"
-                            style="font-size: 1rem"
-                            v-if="isOpen"
-                        >
-                            {{ trans(CHILL_TICKET_TICKET_BANNER_OPEN) }}
-                        </span>
-                        <span
-                            class="badge text-bg-chill-red text-white"
-                            style="font-size: 1rem"
-                            v-else
-                        >
-                            {{ trans(CHILL_TICKET_TICKET_BANNER_CLOSED) }}
-                        </span>
-                    </div>
-                    <div class="d-flex justify-content-end">
-                        <p class="created-at-timespan" v-if="ticket.createdAt">
-                            {{
-                                trans(CHILL_TICKET_TICKET_BANNER_SINCE, {
-                                    time: since,
-                                })
-                            }}
-                        </p>
-                    </div>
-                </div>
-            </div>
+  <Teleport to="#header-ticket-main">
+    <div class="container-xxl text-primary">
+      <div class="row">
+        <div class="col-md-6 col-sm-12 ps-md-5 ps-xxl-0">
+          <h1 v-if="ticket.currentMotive">
+            #{{ ticket.id }} {{ ticket.currentMotive.label.fr }}
+          </h1>
+          <p class="chill-no-data-statement" v-else>
+            {{ trans(CHILL_TICKET_TICKET_BANNER_NO_MOTIVE) }}
+          </p>
+          <h2 v-if="ticket.currentPersons.length">
+            {{ ticket.currentPersons.map((person) => person.text).join(", ") }}
+          </h2>
         </div>
-    </Teleport>
-    <Teleport to="#header-ticket-details">
-        <div class="container-xxl">
-            <div class="row justify-content-between">
-                <div
-                    class="col-md-4 col-sm-12 d-flex flex-column align-items-start"
-                >
-                    <h3 class="text-primary">
-                        {{ trans(CHILL_TICKET_TICKET_BANNER_CALLER) }}
-                    </h3>
-                    <on-the-fly
-                        v-if="ticket.caller"
-                        :key="ticket.caller.id"
-                        :type="ticket.caller.type"
-                        :id="ticket.caller.id"
-                        :buttonText="ticket.caller.textAge"
-                        :displayBadge="'true' === 'true'"
-                        action="show"
-                    ></on-the-fly>
-                </div>
-                <div
-                    class="col-md-4 col-sm-12 d-flex flex-column align-items-start"
-                >
-                    <h3 class="text-primary">
-                        {{ trans(CHILL_TICKET_TICKET_BANNER_CONCERNED_USAGER) }}
-                    </h3>
-                    <on-the-fly
-                        v-for="person in ticket.currentPersons"
-                        :key="person.id"
-                        :type="person.type"
-                        :id="person.id"
-                        :buttonText="person.textAge"
-                        :displayBadge="'true' === 'true'"
-                        action="show"
-                    ></on-the-fly>
-                </div>
-                <div
-                    class="col-md-4 col-sm-12 d-flex flex-column align-items-start"
-                >
-                    <h3 class="text-primary">
-                        {{ trans(CHILL_TICKET_TICKET_BANNER_SPEAKER) }}
-                    </h3>
-                    <addressee-component
-                        :addressees="ticket.currentAddressees"
-                    />
-                </div>
-            </div>
+
+        <div class="col-md-6 col-sm-12">
+          <div class="d-flex justify-content-end">
+            <toggle-flags />
+
+            <span
+              class="badge text-bg-chill-green text-white"
+              style="font-size: 1rem"
+              v-if="isOpen"
+            >
+              {{ trans(CHILL_TICKET_TICKET_BANNER_OPEN) }}
+            </span>
+            <span
+              class="badge text-bg-chill-red text-white"
+              style="font-size: 1rem"
+              v-else
+            >
+              {{ trans(CHILL_TICKET_TICKET_BANNER_CLOSED) }}
+            </span>
+          </div>
+          <div class="d-flex justify-content-end">
+            <p class="created-at-timespan" v-if="ticket.createdAt">
+              {{
+                trans(CHILL_TICKET_TICKET_BANNER_SINCE, {
+                  time: since,
+                })
+              }}
+            </p>
+          </div>
         </div>
-    </Teleport>
+      </div>
+    </div>
+  </Teleport>
+  <Teleport to="#header-ticket-details">
+    <div class="container-xxl">
+      <div class="row justify-content-between">
+        <div class="col-md-4 col-sm-12 d-flex flex-column align-items-start">
+          <h3 class="text-primary">
+            {{ trans(CHILL_TICKET_TICKET_BANNER_CALLER) }}
+          </h3>
+          <on-the-fly
+            v-if="ticket.caller"
+            :key="ticket.caller.id"
+            :type="ticket.caller.type"
+            :id="ticket.caller.id"
+            :buttonText="ticket.caller.text"
+            :displayBadge="'true' === 'true'"
+            action="show"
+          ></on-the-fly>
+        </div>
+        <div class="col-md-4 col-sm-12 d-flex flex-column align-items-start">
+          <h3 class="text-primary">
+            {{ trans(CHILL_TICKET_TICKET_BANNER_CONCERNED_USAGER) }}
+          </h3>
+          <on-the-fly
+            v-for="person in ticket.currentPersons"
+            :key="person.id"
+            :type="person.type"
+            :id="person.id"
+            :buttonText="person.textAge"
+            :displayBadge="'true' === 'true'"
+            action="show"
+          ></on-the-fly>
+        </div>
+        <div class="col-md-4 col-sm-12 d-flex flex-column align-items-start">
+          <h3 class="text-primary">
+            {{ trans(CHILL_TICKET_TICKET_BANNER_SPEAKER) }}
+          </h3>
+          <addressee-component :addressees="ticket.currentAddressees" />
+        </div>
+      </div>
+    </div>
+  </Teleport>
 </template>
 
 <style lang="scss">
 .created-at-timespan {
-    font-weight: 600;
-    font-variant: all-petite-caps;
+  font-weight: 600;
+  font-variant: all-petite-caps;
 }
 </style>
 
@@ -121,26 +109,26 @@ import { ISOToDatetime } from "../../../../../../../ChillMainBundle/Resources/pu
 
 // Translations
 import {
-    trans,
-    CHILL_TICKET_TICKET_BANNER_NO_MOTIVE,
-    CHILL_TICKET_TICKET_BANNER_OPEN,
-    CHILL_TICKET_TICKET_BANNER_CLOSED,
-    CHILL_TICKET_TICKET_BANNER_SINCE,
-    CHILL_TICKET_TICKET_BANNER_CONCERNED_USAGER,
-    CHILL_TICKET_TICKET_BANNER_SPEAKER,
-    CHILL_TICKET_TICKET_BANNER_DAYS,
-    CHILL_TICKET_TICKET_BANNER_HOURS,
-    CHILL_TICKET_TICKET_BANNER_MINUTES,
-    CHILL_TICKET_TICKET_BANNER_SECONDS,
-    CHILL_TICKET_TICKET_BANNER_AND,
-    CHILL_TICKET_TICKET_BANNER_CALLER,
+  trans,
+  CHILL_TICKET_TICKET_BANNER_NO_MOTIVE,
+  CHILL_TICKET_TICKET_BANNER_OPEN,
+  CHILL_TICKET_TICKET_BANNER_CLOSED,
+  CHILL_TICKET_TICKET_BANNER_SINCE,
+  CHILL_TICKET_TICKET_BANNER_CONCERNED_USAGER,
+  CHILL_TICKET_TICKET_BANNER_SPEAKER,
+  CHILL_TICKET_TICKET_BANNER_DAYS,
+  CHILL_TICKET_TICKET_BANNER_HOURS,
+  CHILL_TICKET_TICKET_BANNER_MINUTES,
+  CHILL_TICKET_TICKET_BANNER_SECONDS,
+  CHILL_TICKET_TICKET_BANNER_AND,
+  CHILL_TICKET_TICKET_BANNER_CALLER,
 } from "translator";
 
 // Store
 import { useStore } from "vuex";
 
 const props = defineProps<{
-    ticket: Ticket;
+  ticket: Ticket;
 }>();
 
 const store = useStore();
@@ -148,59 +136,55 @@ const today = ref(new Date());
 const createdAt = ref(props.ticket.createdAt);
 
 setInterval(() => {
-    today.value = new Date();
+  today.value = new Date();
 }, 5000);
 
 const isOpen = computed(() => store.getters.isOpen);
 
 const since = computed(() => {
-    if (createdAt.value == null) {
-        return "";
-    }
-    const date = ISOToDatetime(createdAt.value.datetime);
+  if (createdAt.value == null) {
+    return "";
+  }
+  const date = ISOToDatetime(createdAt.value.datetime);
 
-    if (date == null) {
-        return "";
-    }
+  if (date == null) {
+    return "";
+  }
 
-    const timeDiff = Math.abs(today.value.getTime() - date.getTime());
-    const daysDiff = Math.floor(timeDiff / (1000 * 3600 * 24));
-    const hoursDiff = Math.floor(
-        (timeDiff % (1000 * 3600 * 24)) / (1000 * 3600),
+  const timeDiff = Math.abs(today.value.getTime() - date.getTime());
+  const daysDiff = Math.floor(timeDiff / (1000 * 3600 * 24));
+  const hoursDiff = Math.floor((timeDiff % (1000 * 3600 * 24)) / (1000 * 3600));
+  const minutesDiff = Math.floor((timeDiff % (1000 * 3600)) / (1000 * 60));
+  const secondsDiff = Math.floor((timeDiff % (1000 * 60)) / 1000);
+
+  // On construit la liste des parties à afficher
+  const parts: string[] = [];
+  if (daysDiff > 0) {
+    parts.push(trans(CHILL_TICKET_TICKET_BANNER_DAYS, { count: daysDiff }));
+  }
+  if (hoursDiff > 0 || daysDiff > 0) {
+    parts.push(trans(CHILL_TICKET_TICKET_BANNER_HOURS, { count: hoursDiff }));
+  }
+  if (minutesDiff > 0 || hoursDiff > 0 || daysDiff > 0) {
+    parts.push(
+      trans(CHILL_TICKET_TICKET_BANNER_MINUTES, { count: minutesDiff }),
     );
-    const minutesDiff = Math.floor((timeDiff % (1000 * 3600)) / (1000 * 60));
-    const secondsDiff = Math.floor((timeDiff % (1000 * 60)) / 1000);
-
-    // On construit la liste des parties à afficher
-    const parts: string[] = [];
-    if (daysDiff > 0) {
-        parts.push(trans(CHILL_TICKET_TICKET_BANNER_DAYS, { count: daysDiff }));
-    }
-    if (hoursDiff > 0 || daysDiff > 0) {
-        parts.push(
-            trans(CHILL_TICKET_TICKET_BANNER_HOURS, { count: hoursDiff }),
-        );
-    }
-    if (minutesDiff > 0 || hoursDiff > 0 || daysDiff > 0) {
-        parts.push(
-            trans(CHILL_TICKET_TICKET_BANNER_MINUTES, { count: minutesDiff }),
-        );
-    }
-    if (parts.length === 0) {
-        return trans(CHILL_TICKET_TICKET_BANNER_SECONDS, {
-            count: secondsDiff,
-        });
-    }
-    if (parts.length > 1) {
-        const last = parts.pop();
-        return (
-            parts.join(", ") +
-            " " +
-            trans(CHILL_TICKET_TICKET_BANNER_AND) +
-            " " +
-            last
-        );
-    }
-    return parts[0];
+  }
+  if (parts.length === 0) {
+    return trans(CHILL_TICKET_TICKET_BANNER_SECONDS, {
+      count: secondsDiff,
+    });
+  }
+  if (parts.length > 1) {
+    const last = parts.pop();
+    return (
+      parts.join(", ") +
+      " " +
+      trans(CHILL_TICKET_TICKET_BANNER_AND) +
+      " " +
+      last
+    );
+  }
+  return parts[0];
 });
 </script>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/CallerSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/CallerSelectorComponent.vue
index 1afa0691f..86655a05b 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/CallerSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/CallerSelectorComponent.vue
@@ -1,16 +1,16 @@
 <template>
-    <pick-entity
-        uniqid="ticket-person-selector"
-        :types="['person', 'third_party']"
-        :picked="selectedEntity ? [selectedEntity] : []"
-        :suggested="suggestedValues"
-        :multiple="false"
-        :removable-if-set="true"
-        :display-picked="true"
-        :label="trans(CHILL_TICKET_TICKET_SET_PERSONS_CALLER_LABEL)"
-        @add-new-entity="addNewEntity"
-        @remove-entity="removeEntity"
-    />
+  <pick-entity
+    uniqid="ticket-person-selector"
+    :types="['person', 'thirdparty']"
+    :picked="selectedEntity ? [selectedEntity] : []"
+    :suggested="suggestedValues"
+    :multiple="false"
+    :removable-if-set="true"
+    :display-picked="true"
+    :label="trans(CHILL_TICKET_TICKET_SET_PERSONS_CALLER_LABEL)"
+    @add-new-entity="addNewEntity"
+    @remove-entity="removeEntity"
+  />
 </template>
 
 <script setup lang="ts">
@@ -24,62 +24,62 @@ import { Entities } from "ChillPersonAssets/types";
 
 // Translations
 import {
-    trans,
-    CHILL_TICKET_TICKET_SET_PERSONS_CALLER_LABEL,
+  trans,
+  CHILL_TICKET_TICKET_SET_PERSONS_CALLER_LABEL,
 } from "translator";
 
 const props = defineProps<{
-    modelValue: Entities | null;
-    suggested: Entities[];
+  modelValue: Entities | null;
+  suggested: Entities[];
 }>();
 const emit =
-    defineEmits<(event: "update:modelValue", value: Entities | null) => void>();
+  defineEmits<(event: "update:modelValue", value: Entities | null) => void>();
 
 const selectedEntity = ref<Entities | null>(props.modelValue);
 const suggestedValues = ref<Entities[]>([...props.suggested]);
 
 watch(
-    () => [props.suggested, props.modelValue],
-    () => {
-        suggestedValues.value = props.suggested.filter(
-            (suggested: Entities) =>
-                suggested.id === selectedEntity.value?.id &&
-                suggested.type === selectedEntity.value?.type,
-        );
-    },
-    { immediate: true, deep: true },
+  () => [props.suggested, props.modelValue],
+  () => {
+    suggestedValues.value = props.suggested.filter(
+      (suggested: Entities) =>
+        suggested.id === selectedEntity.value?.id &&
+        suggested.type === selectedEntity.value?.type,
+    );
+  },
+  { immediate: true, deep: true },
 );
 
 function addNewEntity({ entity }: { entity: Entities }) {
-    selectedEntity.value = entity;
-    emit("update:modelValue", selectedEntity.value);
+  selectedEntity.value = entity;
+  emit("update:modelValue", selectedEntity.value);
 }
 
 function removeEntity() {
-    selectedEntity.value = null;
-    emit("update:modelValue", null);
+  selectedEntity.value = null;
+  emit("update:modelValue", null);
 }
 </script>
 <style scoped lang="scss">
 ul.person-list {
-    list-style-type: none;
+  list-style-type: none;
 
-    & > li {
-        display: inline-block;
-        border: 1px solid transparent;
-        border-radius: 6px;
+  & > li {
+    display: inline-block;
+    border: 1px solid transparent;
+    border-radius: 6px;
 
-        button.remove-person {
-            opacity: 10%;
-        }
+    button.remove-person {
+      opacity: 10%;
     }
+  }
 
-    & > li:hover {
-        border: 1px solid white;
+  & > li:hover {
+    border: 1px solid white;
 
-        button.remove-person {
-            opacity: 100%;
-        }
+    button.remove-person {
+      opacity: 100%;
     }
+  }
 }
 </style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
index 71761b7b3..9d32d36dd 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
@@ -1,79 +1,75 @@
 <template>
-    <div
-        class="card my-2 bg-light"
-        v-for="history_line in history.filter(
-            (line) => line.event_type != 'add_person',
-        )"
-        :key="history.indexOf(history_line)"
-    >
-        <div class="card-header">
-            <div
-                class="history-header d-flex align-items-center justify-content-between"
-            >
-                <div class="d-flex align-items-center fw-bold">
-                    <i
-                        :class="`${actionIcons[history_line.event_type]} me-1`"
-                    ></i>
-                    <span>{{ explainSentence(history_line) }}</span>
-                    <TicketHistoryStateComponent
-                        :new_state="history_line.data.new_state"
-                        v-if="history_line.event_type == 'state_change'"
-                    />
-                    <TicketHistoryEmergencyComponent
-                        v-if="history_line.event_type == 'emergency_change'"
-                        :new_emergency="history_line.data.new_emergency"
-                    />
-                </div>
-                <div>
-                    <span class="badge-user">
-                        <user-render-box-badge
-                            :user="history_line.by"
-                        ></user-render-box-badge>
-                    </span>
-                    <span class="fst-italic mx-2">
-                        {{ formatDate(history_line.at) }}
-                    </span>
-                </div>
-            </div>
+  <div
+    class="card my-2 bg-light"
+    v-for="history_line in history.filter(
+      (line) => line.event_type != 'add_person',
+    )"
+    :key="history.indexOf(history_line)"
+  >
+    <div class="card-header">
+      <div
+        class="history-header d-flex align-items-center justify-content-between"
+      >
+        <div class="d-flex align-items-center fw-bold">
+          <i :class="`${actionIcons[history_line.event_type]} me-1`"></i>
+          <span>{{ explainSentence(history_line) }}</span>
+          <TicketHistoryStateComponent
+            :new_state="history_line.data.new_state"
+            v-if="history_line.event_type == 'state_change'"
+          />
+          <TicketHistoryEmergencyComponent
+            v-if="history_line.event_type == 'emergency_change'"
+            :new_emergency="history_line.data.new_emergency"
+          />
         </div>
-        <div
-            class="card-body row"
-            v-if="
-                !['state_change', 'emergency_change'].includes(
-                    history_line.event_type,
-                )
-            "
-        >
-            <ticket-history-person-component
-                :persons="history_line.data.persons"
-                v-if="history_line.event_type == 'persons_state'"
-            />
-            <ticket-history-person-component
-                :persons="
-                    history_line.data.new_caller
-                        ? [history_line.data.new_caller]
-                        : []
-                "
-                v-if="history_line.event_type == 'set_caller'"
-            />
-            <ticket-history-motive-component
-                :motiveHistory="history_line.data"
-                v-else-if="history_line.event_type == 'set_motive'"
-            />
-            <ticket-history-comment-component
-                :commentHistory="history_line.data"
-                v-else-if="history_line.event_type == 'add_comment'"
-            />
-            <ticket-history-addressee-component
-                :addresseeState="history_line.data"
-                v-else-if="history_line.event_type == 'addressees_state'"
-            />
-            <ticket-history-create-component
-                :by="history_line.by"
-                v-else-if="history_line.event_type == 'create_ticket'"
-            />
+        <div>
+          <span class="badge-user">
+            <user-render-box-badge
+              :user="history_line.by"
+            ></user-render-box-badge>
+          </span>
+          <span class="fst-italic mx-2">
+            {{ formatDate(history_line.at) }}
+          </span>
         </div>
+      </div>
     </div>
+    <div
+      class="card-body row"
+      v-if="
+        !['state_change', 'emergency_change'].includes(history_line.event_type)
+      "
+    >
+      <ticket-history-person-component
+        :entities="history_line.data.persons"
+        v-if="history_line.event_type == 'persons_state'"
+      />
+      <ticket-history-person-component
+        :entities="
+          history_line.data.new_caller
+            ? ([history_line.data.new_caller] as Person[] | Thirdparty[])
+            : []
+        "
+        v-if="history_line.event_type == 'set_caller'"
+      />
+      <ticket-history-motive-component
+        :motiveHistory="history_line.data"
+        v-else-if="history_line.event_type == 'set_motive'"
+      />
+      <ticket-history-comment-component
+        :commentHistory="history_line.data"
+        v-else-if="history_line.event_type == 'add_comment'"
+      />
+      <ticket-history-addressee-component
+        :addresseeState="history_line.data"
+        v-else-if="history_line.event_type == 'addressees_state'"
+      />
+      <ticket-history-create-component
+        :by="history_line.by"
+        v-else-if="history_line.event_type == 'create_ticket'"
+      />
+    </div>
+  </div>
 </template>
 <script setup lang="ts">
 import { ref } from "vue";
@@ -82,6 +78,8 @@ import { useStore } from "vuex";
 // Types
 import { DateTime } from "../../../../../../../ChillMainBundle/Resources/public/types";
 import { TicketHistoryLine } from "../../../types";
+import { Person } from "ChillPersonAssets/types";
+import { Thirdparty } from "src/Bundle/ChillThirdPartyBundle/Resources/public/types";
 
 // Components
 import TicketHistoryPersonComponent from "./TicketHistoryPersonComponent.vue";
@@ -99,15 +97,15 @@ import { ISOToDatetime } from "../../../../../../../ChillMainBundle/Resources/pu
 
 // Translations
 import {
-    trans,
-    CHILL_TICKET_TICKET_HISTORY_ADD_COMMENT,
-    CHILL_TICKET_TICKET_HISTORY_ADDRESSEES_STATE,
-    CHILL_TICKET_TICKET_HISTORY_PERSONS_STATE,
-    CHILL_TICKET_TICKET_HISTORY_SET_MOTIVE,
-    CHILL_TICKET_TICKET_HISTORY_CREATE_TICKET,
-    CHILL_TICKET_TICKET_HISTORY_STATE_CHANGE,
-    CHILL_TICKET_TICKET_HISTORY_EMERGENCY_CHANGE,
-    CHILL_TICKET_TICKET_HISTORY_SET_CALLER,
+  trans,
+  CHILL_TICKET_TICKET_HISTORY_ADD_COMMENT,
+  CHILL_TICKET_TICKET_HISTORY_ADDRESSEES_STATE,
+  CHILL_TICKET_TICKET_HISTORY_PERSONS_STATE,
+  CHILL_TICKET_TICKET_HISTORY_SET_MOTIVE,
+  CHILL_TICKET_TICKET_HISTORY_CREATE_TICKET,
+  CHILL_TICKET_TICKET_HISTORY_STATE_CHANGE,
+  CHILL_TICKET_TICKET_HISTORY_EMERGENCY_CHANGE,
+  CHILL_TICKET_TICKET_HISTORY_SET_CALLER,
 } from "translator";
 defineProps<{ history: TicketHistoryLine[] }>();
 
@@ -116,36 +114,36 @@ const store = useStore();
 const actionIcons = ref(store.getters.getActionIcons);
 
 function explainSentence(history: TicketHistoryLine): string {
-    switch (history.event_type) {
-        case "add_comment":
-            return trans(CHILL_TICKET_TICKET_HISTORY_ADD_COMMENT);
-        case "addressees_state":
-            return trans(CHILL_TICKET_TICKET_HISTORY_ADDRESSEES_STATE);
-        case "persons_state":
-            return trans(CHILL_TICKET_TICKET_HISTORY_PERSONS_STATE);
-        case "set_motive":
-            return trans(CHILL_TICKET_TICKET_HISTORY_SET_MOTIVE);
-        case "create_ticket":
-            return trans(CHILL_TICKET_TICKET_HISTORY_CREATE_TICKET);
-        case "state_change":
-            return trans(CHILL_TICKET_TICKET_HISTORY_STATE_CHANGE);
-        case "emergency_change":
-            return trans(CHILL_TICKET_TICKET_HISTORY_EMERGENCY_CHANGE);
-        case "set_caller":
-            return trans(CHILL_TICKET_TICKET_HISTORY_SET_CALLER);
-        default:
-            return "";
-    }
+  switch (history.event_type) {
+    case "add_comment":
+      return trans(CHILL_TICKET_TICKET_HISTORY_ADD_COMMENT);
+    case "addressees_state":
+      return trans(CHILL_TICKET_TICKET_HISTORY_ADDRESSEES_STATE);
+    case "persons_state":
+      return trans(CHILL_TICKET_TICKET_HISTORY_PERSONS_STATE);
+    case "set_motive":
+      return trans(CHILL_TICKET_TICKET_HISTORY_SET_MOTIVE);
+    case "create_ticket":
+      return trans(CHILL_TICKET_TICKET_HISTORY_CREATE_TICKET);
+    case "state_change":
+      return trans(CHILL_TICKET_TICKET_HISTORY_STATE_CHANGE);
+    case "emergency_change":
+      return trans(CHILL_TICKET_TICKET_HISTORY_EMERGENCY_CHANGE);
+    case "set_caller":
+      return trans(CHILL_TICKET_TICKET_HISTORY_SET_CALLER);
+    default:
+      return "";
+  }
 }
 
 function formatDate(d: DateTime): string {
-    const date = ISOToDatetime(d.datetime);
+  const date = ISOToDatetime(d.datetime);
 
-    if (date === null) {
-        return "";
-    }
+  if (date === null) {
+    return "";
+  }
 
-    const month = date.toLocaleString("default", { month: "long" });
-    return `${date.getDate()} ${month} ${date.getFullYear()}, ${date.toLocaleTimeString()}`;
+  const month = date.toLocaleString("default", { month: "long" });
+  return `${date.getDate()} ${month} ${date.getFullYear()}, ${date.toLocaleTimeString()}`;
 }
 </script>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryPersonComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryPersonComponent.vue
index d8fc7fa94..c4b296eb4 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryPersonComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryPersonComponent.vue
@@ -1,18 +1,18 @@
 <template>
-    <div class="col-12">
-        <ul class="persons-list" v-if="persons.length > 0">
-            <li v-for="person in persons" :key="person.id">
-                <on-the-fly
-                    :type="person.type"
-                    :id="person.id"
-                    :buttonText="person.textAge"
-                    :displayBadge="true"
-                    action="show"
-                ></on-the-fly>
-            </li>
-        </ul>
-        <div v-else class="text-muted">Aucune personne concernée</div>
-    </div>
+  <div class="col-12">
+    <ul class="persons-list" v-if="entities.length > 0">
+      <li v-for="entity in entities" :key="entity.text">
+        <on-the-fly
+          :type="entity.type"
+          :id="entity.id"
+          :buttonText="entity.text"
+          :displayBadge="true"
+          action="show"
+        ></on-the-fly>
+      </li>
+    </ul>
+    <div v-else class="text-muted">Aucune personne concernée</div>
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -20,17 +20,18 @@ import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue";
 
 // Types
 import { Person } from "ChillPersonAssets/types";
+import { Thirdparty } from "src/Bundle/ChillThirdPartyBundle/Resources/public/types";
 
-defineProps<{ persons: Person[] }>();
+defineProps<{ entities: Person[] | Thirdparty[] }>();
 </script>
 
 <style lang="scss" scoped>
 ul.persons-list {
-    list-style-type: none;
+  list-style-type: none;
 
-    & > li {
-        display: inline-block;
-        margin: 0 0.15rem;
-    }
+  & > li {
+    display: inline-block;
+    margin: 0 0.15rem;
+  }
 }
 </style>

From c19481e40abd309a2915924b3373c9849f4b90e9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 7 Jul 2025 16:37:46 +0200
Subject: [PATCH 137/283] Fix incorrect alias in ThirdPartyRepository query
 builder expressions

---
 .../ChillThirdPartyBundle/Repository/ThirdPartyRepository.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php b/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php
index de9cdd270..3153713bb 100644
--- a/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php
+++ b/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php
@@ -147,8 +147,8 @@ class ThirdPartyRepository implements ObjectRepository
 
         $qb->where(
             $qb->expr()->orX(
-                $qb->expr()->eq('t.telephone', ':phonenumber'),
-                $qb->expr()->eq('t.telephone2', ':phonenumber')
+                $qb->expr()->eq('tp.telephone', ':phonenumber'),
+                $qb->expr()->eq('tp.telephone2', ':phonenumber')
             )
         );
 

From 74796d0fb0e32247273140b66632d9656aa380ec Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 7 Jul 2025 16:03:01 +0200
Subject: [PATCH 138/283] Remove unused `@symfony/ux-translator` dependency and
 adjust `specs-build` script.

---
 package.json | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/package.json b/package.json
index f9232b832..fc50ba29c 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,6 @@
     "@hotwired/stimulus": "^3.0.0",
     "@luminateone/eslint-baseline": "^1.0.9",
     "@symfony/stimulus-bridge": "^3.2.0",
-    "@symfony/ux-translator": "file:vendor/symfony/ux-translator/assets",
     "@symfony/webpack-encore": "^4.1.0",
     "@tsconfig/node20": "^20.1.4",
     "@types/dompurify": "^3.0.5",
@@ -80,7 +79,7 @@
     "dev": "encore dev",
     "watch": "encore dev --watch",
     "build": "encore production --progress",
-    "specs-build": "yaml-merge src/Bundle/ChillMainBundle/chill.api.specs.yaml src/Bundle/ChillPersonBundle/chill.api.specs.yaml src/Bundle/ChillCalendarBundle/chill.api.specs.yaml src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml src/Bundle/ChillDocStoreBundle/chill.api.specs.yaml src/Bundle/ChillTicketBundle/chill.api.specs.yaml> templates/api/specs.yaml",
+    "specs-build": "yaml-merge src/Bundle/ChillMainBundle/chill.api.specs.yaml src/Bundle/ChillPersonBundle/chill.api.specs.yaml src/Bundle/ChillCalendarBundle/chill.api.specs.yaml src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml src/Bundle/ChillDocStoreBundle/chill.api.specs.yaml> templates/api/specs.yaml",
     "specs-validate": "swagger-cli validate templates/api/specs.yaml",
     "specs-create-dir": "mkdir -p templates/api",
     "specs": "yarn run specs-create-dir && yarn run specs-build && yarn run specs-validate",

From a2263b3fa16756f58ba9555aecd911979aa0791d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 7 Jul 2025 16:37:46 +0200
Subject: [PATCH 139/283] Fix incorrect alias in ThirdPartyRepository query
 builder expressions

---
 .../ChillThirdPartyBundle/Repository/ThirdPartyRepository.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php b/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php
index de9cdd270..3153713bb 100644
--- a/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php
+++ b/src/Bundle/ChillThirdPartyBundle/Repository/ThirdPartyRepository.php
@@ -147,8 +147,8 @@ class ThirdPartyRepository implements ObjectRepository
 
         $qb->where(
             $qb->expr()->orX(
-                $qb->expr()->eq('t.telephone', ':phonenumber'),
-                $qb->expr()->eq('t.telephone2', ':phonenumber')
+                $qb->expr()->eq('tp.telephone', ':phonenumber'),
+                $qb->expr()->eq('tp.telephone2', ':phonenumber')
             )
         );
 

From 04438c09d333aea31b59e786778c3422c94c3367 Mon Sep 17 00:00:00 2001
From: borisw <boris.waaub@digitalternative.be>
Date: Mon, 7 Jul 2025 17:14:31 +0200
Subject: [PATCH 140/283] =?UTF-8?q?FIX:=201403=20-=20Ajout=20de=20la=20ges?=
 =?UTF-8?q?tion=20du=20pluriel=20pour=20l'=C3=A9tat=20des=20usagers=20dans?=
 =?UTF-8?q?=20l'historique=20des=20tickets=20et=20mise=20=C3=A0=20jour=20d?=
 =?UTF-8?q?es=20traductions=20associ=C3=A9es.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/TicketHistoryListComponent.vue |   4 +-
 .../src/translations/messages+intl-icu.fr.yml | 170 +++++++++---------
 2 files changed, 88 insertions(+), 86 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
index 9d32d36dd..0e5265807 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
@@ -120,7 +120,9 @@ function explainSentence(history: TicketHistoryLine): string {
     case "addressees_state":
       return trans(CHILL_TICKET_TICKET_HISTORY_ADDRESSEES_STATE);
     case "persons_state":
-      return trans(CHILL_TICKET_TICKET_HISTORY_PERSONS_STATE);
+      return trans(CHILL_TICKET_TICKET_HISTORY_PERSONS_STATE, {
+        count: history.data.persons.length,
+      });
     case "set_motive":
       return trans(CHILL_TICKET_TICKET_HISTORY_SET_MOTIVE);
     case "create_ticket":
diff --git a/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml b/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
index 86b7dd046..9386de9db 100644
--- a/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
+++ b/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
@@ -1,86 +1,86 @@
 chill_ticket:
-    list:
-        title: Tickets
-        filter:
-            to_me: Tickets qui me sont attribués
-            in_alert: Tickets en alerte (délai de résolution dépassé)
-            created_between: Créés entre
-    ticket:
-        history:
-            add_comment: "Nouveau commentaire"
-            addressees_state: "Attributions"
-            persons_state: "Usagé(s) concerné(s)"
-            set_caller: "Appelant Concerné"
-            set_motive: "Nouveau motifs"
-            create_ticket: "Ticket créé"
-            state_change: ""
-            emergency_change: ""
-        previous_tickets: "Précédents tickets"
-        actions_toolbar:
-            cancel: "Annuler"
-            save: "Enregistrer"
-            close: "Fermer"
-            close_success: "Ticket fermé"
-            close_error: "Erreur lors de la fermeture du ticket"
-            reopen: "Rouvrir"
-            reopen_success: "Rouverture du ticket réussie"
-            reopen_error: "Erreur lors de la rouverture du ticket"
-        add_comment:
-            title: "Commentaire"
-            label: "Ajouter un commentaire"
-            success: "Commentaire enregistré"
-            content: "Ajouter un commentaire"
-            error: "Aucun commentaire ajouté"
-        set_motive:
-            title: "Motif"
-            label: "Choisir un motif"
-            success: "Motif enregistré"
-            error: "Aucun motif sélectionné"
-        add_addressee:
-            title: "Attribuer"
-            user_group_label: "Attributer à un groupe"
-            user_label: "Attribuer à un ou plusieurs utilisateurs"
-            success: "Attribution effectuée"
-            error: "Aucun destinataire sélectionné"
-        set_persons:
-            title: "Appelant et usager(s)"
-            title_person: "Usager(s)"
-            title_caller: "Appelant"
-            user_label: "Ajouter un usager"
-            caller_label: "Ajouter un appelant"
-            success: "Appelants et usagers mis à jour"
-            error: "Aucun usager sélectionné"
-        banner:
-            concerned_usager: "Usagers concernés"
-            speaker: "Attribué à"
-            caller: "Appelant"
-            open: "Ouvert"
-            closed: "Fermé"
-            since: "Depuis {time}"
-            and: "et"
-            days: >-
-                {count, plural,
-                    =0    {aucun jour}
-                    =1    {1 jour}
-                    other {# jours}
-                }
-            hours: >-
-                {count, plural,
-                    =0    {aucune heure}
-                    =1    {1 heure}
-                    other {# heures}
-                }
-            minutes: >-
-                {count, plural,
-                    =0    {aucune minute}
-                    =1    {1 minute}
-                    other {# minutes}
-                }
-            seconds: >-
-                {count, plural,
-                    =0    {aucune seconde}
-                    =1    {1 seconde}
-                    other {# secondes}
-                }
-            no_motive: "Pas de motif"
-            emergency: "URGENT"
+  list:
+    title: Tickets
+    filter:
+      to_me: Tickets qui me sont attribués
+      in_alert: Tickets en alerte (délai de résolution dépassé)
+      created_between: Créés entre
+  ticket:
+    history:
+      add_comment: "Nouveau commentaire"
+      addressees_state: "Attributions"
+      persons_state: "{count, plural, =0 {Aucun usager concerné} =1 {Usager concerné} other {Usagers concernés}}"
+      set_caller: "Appelant"
+      set_motive: "Nouveau motifs"
+      create_ticket: "Ticket créé"
+      state_change: ""
+      emergency_change: ""
+    previous_tickets: "Précédents tickets"
+    actions_toolbar:
+      cancel: "Annuler"
+      save: "Enregistrer"
+      close: "Fermer"
+      close_success: "Ticket fermé"
+      close_error: "Erreur lors de la fermeture du ticket"
+      reopen: "Rouvrir"
+      reopen_success: "Rouverture du ticket réussie"
+      reopen_error: "Erreur lors de la rouverture du ticket"
+    add_comment:
+      title: "Commentaire"
+      label: "Ajouter un commentaire"
+      success: "Commentaire enregistré"
+      content: "Ajouter un commentaire"
+      error: "Aucun commentaire ajouté"
+    set_motive:
+      title: "Motif"
+      label: "Choisir un motif"
+      success: "Motif enregistré"
+      error: "Aucun motif sélectionné"
+    add_addressee:
+      title: "Attribuer"
+      user_group_label: "Attributer à un groupe"
+      user_label: "Attribuer à un ou plusieurs utilisateurs"
+      success: "Attribution effectuée"
+      error: "Aucun destinataire sélectionné"
+    set_persons:
+      title: "Appelant et usager(s)"
+      title_person: "Usager(s)"
+      title_caller: "Appelant"
+      user_label: "Ajouter un usager"
+      caller_label: "Ajouter un appelant"
+      success: "Appelants et usagers mis à jour"
+      error: "Aucun usager sélectionné"
+    banner:
+      concerned_usager: "Usagers concernés"
+      speaker: "Attribué à"
+      caller: "Appelant"
+      open: "Ouvert"
+      closed: "Fermé"
+      since: "Depuis {time}"
+      and: "et"
+      days: >-
+        {count, plural,
+            =0    {aucun jour}
+            =1    {1 jour}
+            other {# jours}
+        }
+      hours: >-
+        {count, plural,
+            =0    {aucune heure}
+            =1    {1 heure}
+            other {# heures}
+        }
+      minutes: >-
+        {count, plural,
+            =0    {aucune minute}
+            =1    {1 minute}
+            other {# minutes}
+        }
+      seconds: >-
+        {count, plural,
+            =0    {aucune seconde}
+            =1    {1 seconde}
+            other {# secondes}
+        }
+      no_motive: "Pas de motif"
+      emergency: "URGENT"

From 7506b918d713e71a7f7f2afcdac7e58916ab4ef2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 8 Jul 2025 13:48:43 +0000
Subject: [PATCH 141/283] Ajout du statut opening / closed pour la liste des
 tickets

---
 .../ChillTicketBundle/chill.api.specs.yaml    | 15 ++-
 .../src/Controller/EditTicketController.php   |  2 +-
 .../Controller/TicketListApiController.php    | 13 +++
 .../src/Entity/StateEnum.php                  |  9 ++
 .../Repository/TicketACLAwareRepository.php   | 16 ++++
 .../TicketACLAwareRepositoryInterface.php     |  3 +-
 .../SetPersonCommandConstraintValidator.php   |  2 +-
 .../TicketListApiControllerTest.php           | 93 ++++++++++++++++++-
 .../TicketACLAwareRepositoryTest.php          | 15 +++
 9 files changed, 162 insertions(+), 6 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/chill.api.specs.yaml b/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
index c9f1aacea..9b579fbcc 100644
--- a/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
@@ -67,6 +67,19 @@ paths:
                           type: integer
                           format: integer
                           minimum: 1
+                - name: byCurrentState
+                  in: query
+                  description: the current state of the ticket
+                  required: false
+                  style: form
+                  explode: false
+                  schema:
+                      type: array
+                      items:
+                          type: string
+                          enum:
+                              - open
+                              - closed
             responses:
                 200:
                     description: OK
@@ -80,7 +93,7 @@ paths:
                                           results:
                                               type: array
                                               items:
-                                                  $ref: '#component/schema/TicketSimple'
+                                                  $ref: '#components/schemas/TicketSimple'
 
 
     /1.0/ticket/motive.json:
diff --git a/src/Bundle/ChillTicketBundle/src/Controller/EditTicketController.php b/src/Bundle/ChillTicketBundle/src/Controller/EditTicketController.php
index 0510c49cf..a686208ad 100644
--- a/src/Bundle/ChillTicketBundle/src/Controller/EditTicketController.php
+++ b/src/Bundle/ChillTicketBundle/src/Controller/EditTicketController.php
@@ -19,7 +19,7 @@ use Twig\Environment;
 
 class EditTicketController
 {
-    private string $personPerTicket;
+    private readonly string $personPerTicket;
 
     public function __construct(
         private readonly Environment $templating,
diff --git a/src/Bundle/ChillTicketBundle/src/Controller/TicketListApiController.php b/src/Bundle/ChillTicketBundle/src/Controller/TicketListApiController.php
index 8c9a90ab5..5e1250b2f 100644
--- a/src/Bundle/ChillTicketBundle/src/Controller/TicketListApiController.php
+++ b/src/Bundle/ChillTicketBundle/src/Controller/TicketListApiController.php
@@ -15,10 +15,12 @@ use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
 use Chill\MainBundle\Serializer\Model\Collection;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use Chill\TicketBundle\Entity\StateEnum;
 use Chill\TicketBundle\Repository\TicketACLAwareRepositoryInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 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\Component\Serializer\SerializerInterface;
@@ -53,6 +55,17 @@ final readonly class TicketListApiController
             }
         }
 
+        if ($request->query->has('byCurrentState')) {
+            try {
+                $params['byCurrentState'] = array_map(
+                    fn (string $state): StateEnum => StateEnum::fromValue($state),
+                    explode(',', $request->query->get('byCurrentState'))
+                );
+            } catch (\InvalidArgumentException $e) {
+                throw new BadRequestHttpException($e->getMessage(), $e);
+            }
+        }
+
         $nb = $this->ticketRepository->countTickets($params);
         $paginator = $this->paginatorFactory->create($nb);
 
diff --git a/src/Bundle/ChillTicketBundle/src/Entity/StateEnum.php b/src/Bundle/ChillTicketBundle/src/Entity/StateEnum.php
index 0c59a1ad9..ba5d9a1ee 100644
--- a/src/Bundle/ChillTicketBundle/src/Entity/StateEnum.php
+++ b/src/Bundle/ChillTicketBundle/src/Entity/StateEnum.php
@@ -18,4 +18,13 @@ enum StateEnum: string
 {
     case OPEN = 'open';
     case CLOSED = 'closed';
+
+    public static function fromValue(string $value): self
+    {
+        return match ($value) {
+            'open' => self::OPEN,
+            'closed' => self::CLOSED,
+            default => throw new \InvalidArgumentException('Invalid state value'),
+        };
+    }
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepository.php b/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepository.php
index 634f55214..0592ea0c3 100644
--- a/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepository.php
+++ b/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepository.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\TicketBundle\Repository;
 
 use Chill\TicketBundle\Entity\PersonHistory;
+use Chill\TicketBundle\Entity\StateHistory;
 use Chill\TicketBundle\Entity\Ticket;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\QueryBuilder;
@@ -58,6 +59,21 @@ final readonly class TicketACLAwareRepository implements TicketACLAwareRepositor
             $qb->andWhere($or);
         }
 
+        if (array_key_exists('byCurrentState', $params)) {
+            $qb->andWhere(
+                $qb->expr()->exists(sprintf(
+                    'SELECT 1 FROM %s tp_state_%d WHERE tp_state_%d.ticket = t
+                    AND tp_state_%d.state IN (:currentState) AND tp_state_%d.endDate IS NULL',
+                    StateHistory::class,
+                    ++$i,
+                    $i,
+                    $i,
+                    $i,
+                ))
+            );
+            $qb->setParameter('currentState', $params['byCurrentState']);
+        }
+
         return $qb;
     }
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepositoryInterface.php b/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepositoryInterface.php
index e946c1ded..6fce13086 100644
--- a/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepositoryInterface.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\TicketBundle\Repository;
 
 use Chill\PersonBundle\Entity\Person;
+use Chill\TicketBundle\Entity\StateEnum;
 use Chill\TicketBundle\Entity\Ticket;
 
 /**
@@ -22,7 +23,7 @@ interface TicketACLAwareRepositoryInterface
     /**
      * Find tickets.
      *
-     * @param array{byPerson?: list<Person>} $params
+     * @param array{byPerson?: list<Person>, byCurrentState: list<StateEnum>} $params
      *
      * @return list<Ticket>
      */
diff --git a/src/Bundle/ChillTicketBundle/src/Validation/Validator/SetPersonCommandConstraintValidator.php b/src/Bundle/ChillTicketBundle/src/Validation/Validator/SetPersonCommandConstraintValidator.php
index 9c8b80c66..3b99a5188 100644
--- a/src/Bundle/ChillTicketBundle/src/Validation/Validator/SetPersonCommandConstraintValidator.php
+++ b/src/Bundle/ChillTicketBundle/src/Validation/Validator/SetPersonCommandConstraintValidator.php
@@ -19,7 +19,7 @@ use Symfony\Component\Validator\Exception\UnexpectedValueException;
 
 class SetPersonCommandConstraintValidator extends ConstraintValidator
 {
-    private bool $isMulti;
+    private readonly bool $isMulti;
 
     public function __construct(ParameterBagInterface $parameterBag)
     {
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerTest.php
index bcaf2336d..9582164fb 100644
--- a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerTest.php
@@ -18,6 +18,7 @@ use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Chill\TicketBundle\Controller\TicketListApiController;
+use Chill\TicketBundle\Entity\StateEnum;
 use Chill\TicketBundle\Entity\Ticket;
 use Chill\TicketBundle\Repository\TicketACLAwareRepositoryInterface;
 use PHPUnit\Framework\TestCase;
@@ -26,6 +27,7 @@ use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Serializer\SerializerInterface;
 
@@ -60,7 +62,7 @@ final class TicketListApiControllerTest extends TestCase
         $serializer->serialize(
             Argument::that(fn (Collection $collection) => $collection->getItems() === $tickets),
             'json',
-            ['groups' => 'read']
+            ['groups' => 'read:simple']
         )->willReturn('{"items":[{},{}],"pagination":{}}');
 
         $personRepository = $this->prophesize(PersonRepository::class);
@@ -114,7 +116,7 @@ final class TicketListApiControllerTest extends TestCase
         $serializer->serialize(
             Argument::that(fn (Collection $collection) => $collection->getItems() === $tickets),
             'json',
-            ['groups' => 'read']
+            ['groups' => 'read:simple']
         )->willReturn('{"items":[{},{}],"pagination":{}}');
 
         $personRepository = $this->prophesize(PersonRepository::class);
@@ -142,6 +144,93 @@ final class TicketListApiControllerTest extends TestCase
         $this->assertEquals('{"items":[{},{}],"pagination":{}}', $response->getContent());
     }
 
+    public function testListTicketWithCurrentStateFilter(): void
+    {
+        // Mock dependencies
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $ticketRepository = $this->prophesize(TicketACLAwareRepositoryInterface::class);
+        $tickets = [new Ticket(), new Ticket()];
+        $ticketRepository->countTickets(
+            Argument::that(fn ($params) => isset($params['byCurrentState']) && in_array(StateEnum::OPEN, $params['byCurrentState']))
+        )
+            ->willReturn(2);
+        $ticketRepository->findTickets(
+            Argument::that(fn ($params) => isset($params['byCurrentState']) && in_array(StateEnum::OPEN, $params['byCurrentState'])),
+            0,
+            10
+        )->willReturn($tickets);
+
+        $paginator = $this->prophesize(PaginatorInterface::class);
+        $paginator->getCurrentPageFirstItemNumber()->willReturn(0);
+        $paginator->getItemsPerPage()->willReturn(10);
+
+        $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
+        $paginatorFactory->create(2)->willReturn($paginator->reveal());
+
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $serializer->serialize(
+            Argument::that(fn (Collection $collection) => $collection->getItems() === $tickets),
+            'json',
+            ['groups' => 'read:simple']
+        )->willReturn('{"items":[{},{}],"pagination":{}}');
+
+        $personRepository = $this->prophesize(PersonRepository::class);
+
+        // Create controller
+        $controller = new TicketListApiController(
+            $security->reveal(),
+            $ticketRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $serializer->reveal(),
+            $personRepository->reveal()
+        );
+
+        // Create request with person filter
+        $request = new Request(
+            query: ['byCurrentState' => 'open,closed']
+        );
+
+        // Call controller method
+        $response = $controller->listTicket($request);
+
+        // Assert response
+        $this->assertInstanceOf(JsonResponse::class, $response);
+        $this->assertEquals('{"items":[{},{}],"pagination":{}}', $response->getContent());
+    }
+
+    public function testListTicketWithCurrentStateWithInvalidFilter(): void
+    {
+        self::expectException(BadRequestHttpException::class);
+
+        // Mock dependencies
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $ticketRepository = $this->prophesize(TicketACLAwareRepositoryInterface::class);
+        $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $personRepository = $this->prophesize(PersonRepository::class);
+
+        // Create controller
+        $controller = new TicketListApiController(
+            $security->reveal(),
+            $ticketRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $serializer->reveal(),
+            $personRepository->reveal()
+        );
+
+        // Create request with person filter
+        $request = new Request(
+            query: ['byCurrentState' => 'foo']
+        );
+
+        // Call controller method
+        $response = $controller->listTicket($request);
+    }
+
     public function testListTicketWithoutUserRole(): void
     {
         // Mock dependencies
diff --git a/src/Bundle/ChillTicketBundle/tests/Repository/TicketACLAwareRepositoryTest.php b/src/Bundle/ChillTicketBundle/tests/Repository/TicketACLAwareRepositoryTest.php
index 4dac71bb1..8a0035032 100644
--- a/src/Bundle/ChillTicketBundle/tests/Repository/TicketACLAwareRepositoryTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Repository/TicketACLAwareRepositoryTest.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\TicketBundle\Tests\Repository;
 
 use Chill\PersonBundle\DataFixtures\Helper\RandomPersonHelperTrait;
+use Chill\TicketBundle\Entity\StateEnum;
 use Chill\TicketBundle\Repository\TicketACLAwareRepository;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
@@ -63,4 +64,18 @@ class TicketACLAwareRepositoryTest extends KernelTestCase
 
         self::assertIsInt($result);
     }
+
+    public function testCountTicketByCurrentStateSingleState(): void
+    {
+        $result = $this->repository->countTickets(['byCurrentState' => [StateEnum::OPEN]]);
+
+        self::assertIsInt($result);
+    }
+
+    public function testFindTicketByCurrentStateMultipleState(): void
+    {
+        $result = $this->repository->countTickets(['byCurrentState' => [StateEnum::OPEN, StateEnum::CLOSED]]);
+
+        self::assertIsInt($result);
+    }
 }

From 0204bdd38dee0334fb86ce4942c0eda4fe57c8d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 9 Jul 2025 17:46:16 +0200
Subject: [PATCH 142/283] Restore features after merging

---
 .../public/vuejs/PickEntity/PickEntity.vue    | 142 ++--
 .../Resources/public/types.ts                 | 331 ++++----
 .../public/vuejs/_components/AddPersons.vue   | 720 +++++++++---------
 3 files changed, 605 insertions(+), 588 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
index 39268372b..639f3c59f 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
@@ -1,14 +1,18 @@
 <template>
   <div class="grey-card">
     <ul :class="listClasses" v-if="picked.length && displayPicked">
-      <li v-for="p in picked" @click="removeEntity(p)" :key="p.type + p.id">
-            <span
-                v-if="'me' === p"
-                class="chill_denomination current-user updatedBy"
-            >{{ trans(USER_CURRENT_USER) }}</span
-            >
+      <li
+        v-for="p in picked"
+        @click="removeEntity(p)"
+        :key="p === 'me' ? 'me' : p.type + p.id"
+      >
         <span
-            v-else
+          v-if="'me' === p"
+          class="chill_denomination current-user updatedBy"
+          >{{ trans(USER_CURRENT_USER) }}</span
+        >
+        <span
+          v-else
           :class="getBadgeClass(p)"
           class="chill_denomination"
           :style="getBadgeStyle(p)"
@@ -19,17 +23,17 @@
     </ul>
     <ul class="record_actions">
       <li v-if="isCurrentUserPicker" class="btn btn-sm btn-misc">
-            <label class="flex items-center gap-2">
-                <input
-                    :checked="picked.indexOf('me') >= 0 ? true : null"
-                    ref="itsMeCheckbox"
-                    :type="multiple ? 'checkbox' : 'radio'"
-                    @change="selectItsMe"
-                />
-                {{ trans(USER_CURRENT_USER) }}
-            </label>
-        </li>
-        <li class="add-persons">
+        <label class="flex items-center gap-2">
+          <input
+            :checked="isMePicked"
+            ref="itsMeCheckbox"
+            :type="multiple ? 'checkbox' : 'radio'"
+            @change="selectItsMe($event as InputEvent)"
+          />
+          {{ trans(USER_CURRENT_USER) }}
+        </label>
+      </li>
+      <li class="add-persons">
         <add-persons
           :options="addPersonsOptions"
           :key="uniqid"
@@ -42,7 +46,11 @@
     </ul>
 
     <ul class="badge-suggest add-items inline" style="float: right">
-      <li v-for="s in suggested" :key="s.id" @click="addNewSuggested(s)">
+      <li
+        v-for="s in suggested"
+        :key="s.type + s.id"
+        @click="addNewSuggested(s)"
+      >
         <span :class="getBadgeClass(s)" :style="getBadgeStyle(s)">
           {{ s.text }}
         </span>
@@ -52,16 +60,28 @@
 </template>
 
 <script lang="ts" setup>
-import { ref, computed, defineProps, defineEmits, defineComponent } from "vue";
+import {
+  ref,
+  computed,
+  defineProps,
+  defineEmits,
+  defineComponent,
+  withDefaults,
+} from "vue";
 import AddPersons from "ChillPersonAssets/vuejs/_components/AddPersons.vue";
-import { Entities, EntityType, SearchOptions } from "ChillPersonAssets/types";
+import {
+  Entities,
+  EntitiesOrMe,
+  EntityType,
+  SearchOptions,
+} from "ChillPersonAssets/types";
 import {
   PICK_ENTITY_MODAL_TITLE,
   PICK_ENTITY_USER,
   PICK_ENTITY_USER_GROUP,
   PICK_ENTITY_PERSON,
   PICK_ENTITY_THIRDPARTY,
-    USER_CURRENT_USER,
+  USER_CURRENT_USER,
   trans,
 } from "translator";
 import { addNewEntities } from "ChillMainAssets/types";
@@ -71,25 +91,28 @@ defineComponent({
     AddPersons,
   },
 });
-const props = defineProps<{
-  multiple: boolean;
-  types: EntityType[];
-  picked: Entities[];
-  uniqid: string;
-  removableIfSet?: boolean;
-  displayPicked?: boolean;
-  suggested?: Entities[];
-  label?: string;
-  isCurrentUserPicker: boolean // must default to false
-}>();
+const props = withDefaults(
+  defineProps<{
+    multiple: boolean;
+    types: EntityType[];
+    picked: EntitiesOrMe[];
+    uniqid: string;
+    removableIfSet?: boolean;
+    displayPicked?: boolean;
+    suggested?: Entities[];
+    label?: string;
+    isCurrentUserPicker?: boolean;
+  }>(),
+  { isCurrentUserPicker: false },
+);
 
 const emits = defineEmits<{
-  (e: "addNewEntity", payload: { entity: Entities }): void;
-  (e: "removeEntity", payload: { entity: Entities }): void;
+  (e: "addNewEntity", payload: { entity: EntitiesOrMe }): void;
+  (e: "removeEntity", payload: { entity: EntitiesOrMe }): void;
   (e: "addNewEntityProcessEnded"): void;
 }>();
 
-const itsMeCheckbox = ref(null);
+const itsMeCheckbox = ref<null | HTMLInputElement>(null);
 const addPersons = ref();
 
 const addPersonsOptions = computed(
@@ -105,6 +128,8 @@ const addPersonsOptions = computed(
     }) as SearchOptions,
 );
 
+const isMePicked = computed<boolean>(() => props.picked.indexOf("me") >= 0);
+
 const translatedListOfTypes = computed(() => {
   if (props.label !== undefined && props.label !== "") {
     return props.label;
@@ -142,10 +167,12 @@ const listClasses = computed(() => ({
   inline: true,
 }));
 
-const selectItsMe = (event) =>
-    event.target.checked ? addNewSuggested("me") : removeEntity("me");
+const selectItsMe = (event: InputEvent) => {
+  const target = event.target as HTMLInputElement;
+  target.checked ? addNewSuggested("me") : removeEntity("me");
+};
 
-function addNewSuggested(entity: Entities) {
+function addNewSuggested(entity: EntitiesOrMe) {
   emits("addNewEntity", { entity });
 }
 
@@ -158,32 +185,31 @@ function addNewEntity({ selected }: addNewEntities) {
   emits("addNewEntityProcessEnded");
 }
 
-
-const removeEntity = (entity) => {
-    if (!props.removableIfSet) return;
-    if (entity === "me" && itsMeCheckbox.value) {
-        itsMeCheckbox.value.checked = false;
-    }
-    emits("removeEntity", { entity });
+const removeEntity = (entity: EntitiesOrMe) => {
+  if (!props.removableIfSet) return;
+  if (entity === "me" && itsMeCheckbox.value) {
+    itsMeCheckbox.value.checked = false;
+  }
+  emits("removeEntity", { entity });
 };
 
 function getBadgeClass(entities: Entities) {
-    if (entities.type !== "user_group") {
-        return entities.type;
-    }
-    return "";
+  if (entities.type !== "user_group") {
+    return entities.type;
+  }
+  return "";
 }
 
 function getBadgeStyle(entities: Entities) {
-    if (entities.type === "user_group") {
-        return [
-            `ul.badge-suggest li > span {
+  if (entities.type === "user_group") {
+    return [
+      `ul.badge-suggest li > span {
                 color: ${entities.foregroundColor}!important;
                 border-bottom-color: ${entities.backgroundColor};
         }`,
-        ];
-    }
-    return [];
+    ];
+  }
+  return [];
 }
 </script>
 
@@ -291,7 +317,7 @@ ul.badge-suggest li > span.thirdparty {
   border-bottom-color: rgb(198.9, 72, 98.1);
 }
 .current-user {
-    color: var(--bs-body-color);
-    background-color: var(--bs-chill-l-gray) !important;
+  color: var(--bs-body-color);
+  background-color: var(--bs-chill-l-gray) !important;
 }
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/types.ts b/src/Bundle/ChillPersonBundle/Resources/public/types.ts
index 09e2ebb69..32dc24f73 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/types.ts
+++ b/src/Bundle/ChillPersonBundle/Resources/public/types.ts
@@ -1,4 +1,3 @@
-import { StoredObject } from "ChillDocStoreAssets/types";
 import {
   Address,
   Center,
@@ -9,8 +8,8 @@ import {
   Household,
   WorkflowAvailable,
   Scope,
-    Job,
-    PrivateCommentEmbeddable,
+  Job,
+  PrivateCommentEmbeddable,
 } from "ChillMainAssets/types";
 import { StoredObject } from "ChillDocStoreAssets/types";
 import { Thirdparty } from "../../../ChillThirdPartyBundle/Resources/public/types";
@@ -45,208 +44,208 @@ export interface Person {
 }
 
 export interface AccompanyingPeriod {
-    id: number;
-    addressLocation?: Address | null;
-    administrativeLocation?: Location | null;
-    calendars: Calendar[];
-    closingDate?: Date | null;
-    closingMotive?: ClosingMotive | null;
-    comments: Comment[];
-    confidential: boolean;
-    createdAt?: Date | null;
-    createdBy?: User | null;
-    emergency: boolean;
-    intensity?: "occasional" | "regular";
-    job?: Job | null;
-    locationHistories: AccompanyingPeriodLocationHistory[];
-    openingDate?: Date | null;
-    origin?: Origin | null;
-    participations: AccompanyingPeriodParticipation[];
-    personLocation?: Person | null;
-    pinnedComment?: Comment | null;
-    preventUserIsChangedNotification: boolean;
-    remark: string;
-    requestorAnonymous: boolean;
-    requestorPerson?: Person | null;
-    requestorThirdParty?: Thirdparty | null;
-    resources: AccompanyingPeriodResource[];
-    scopes: Scope[];
-    socialIssues: SocialIssue[];
-    step?:
-        | "CLOSED"
-        | "CONFIRMED"
-        | "CONFIRMED_INACTIVE_SHORT"
-        | "CONFIRMED_INACTIVE_LONG"
-        | "DRAFT";
+  id: number;
+  addressLocation?: Address | null;
+  administrativeLocation?: Location | null;
+  calendars: Calendar[];
+  closingDate?: Date | null;
+  closingMotive?: ClosingMotive | null;
+  comments: Comment[];
+  confidential: boolean;
+  createdAt?: Date | null;
+  createdBy?: User | null;
+  emergency: boolean;
+  intensity?: "occasional" | "regular";
+  job?: Job | null;
+  locationHistories: AccompanyingPeriodLocationHistory[];
+  openingDate?: Date | null;
+  origin?: Origin | null;
+  participations: AccompanyingPeriodParticipation[];
+  personLocation?: Person | null;
+  pinnedComment?: Comment | null;
+  preventUserIsChangedNotification: boolean;
+  remark: string;
+  requestorAnonymous: boolean;
+  requestorPerson?: Person | null;
+  requestorThirdParty?: Thirdparty | null;
+  resources: AccompanyingPeriodResource[];
+  scopes: Scope[];
+  socialIssues: SocialIssue[];
+  step?:
+    | "CLOSED"
+    | "CONFIRMED"
+    | "CONFIRMED_INACTIVE_SHORT"
+    | "CONFIRMED_INACTIVE_LONG"
+    | "DRAFT";
 }
 
 export interface AccompanyingPeriodWork {
-    id: number;
-    accompanyingPeriod?: AccompanyingPeriod;
-    accompanyingPeriodWorkEvaluations: AccompanyingPeriodWorkEvaluation[];
-    createdAt?: string;
-    createdAutomatically: boolean;
-    createdAutomaticallyReason: string;
-    createdBy: User;
-    endDate?: string;
-    goals: AccompanyingPeriodWorkGoal[];
-    handlingThierParty?: Thirdparty;
-    note: string;
-    persons: Person[];
-    privateComment: PrivateCommentEmbeddable;
-    referrersHistory: AccompanyingPeriodWorkReferrerHistory[];
-    results: Result[];
-    socialAction?: SocialAction;
-    startDate?: string;
-    thirdParties: Thirdparty[];
-    updatedAt?: string;
-    updatedBy: User;
-    version: number;
+  id: number;
+  accompanyingPeriod?: AccompanyingPeriod;
+  accompanyingPeriodWorkEvaluations: AccompanyingPeriodWorkEvaluation[];
+  createdAt?: string;
+  createdAutomatically: boolean;
+  createdAutomaticallyReason: string;
+  createdBy: User;
+  endDate?: string;
+  goals: AccompanyingPeriodWorkGoal[];
+  handlingThierParty?: Thirdparty;
+  note: string;
+  persons: Person[];
+  privateComment: PrivateCommentEmbeddable;
+  referrersHistory: AccompanyingPeriodWorkReferrerHistory[];
+  results: Result[];
+  socialAction?: SocialAction;
+  startDate?: string;
+  thirdParties: Thirdparty[];
+  updatedAt?: string;
+  updatedBy: User;
+  version: number;
 }
 
 export interface SocialAction {
-    id: number;
-    parent?: SocialAction | null;
-    children: SocialAction[];
-    issue?: SocialIssue | null;
-    ordering: number;
-    title: {
-        fr: string;
-    };
-    defaultNotificationDelay?: string | null;
-    desactivationDate?: string | null;
-    evaluations: Evaluation[];
-    goals: Goal[];
-    results: Result[];
+  id: number;
+  parent?: SocialAction | null;
+  children: SocialAction[];
+  issue?: SocialIssue | null;
+  ordering: number;
+  title: {
+    fr: string;
+  };
+  defaultNotificationDelay?: string | null;
+  desactivationDate?: string | null;
+  evaluations: Evaluation[];
+  goals: Goal[];
+  results: Result[];
 }
 
 export interface AccompanyingPeriodResource {
-    id: number;
-    accompanyingPeriod: AccompanyingPeriod;
-    comment?: string | null;
-    person?: Person | null;
-    thirdParty?: Thirdparty | null;
+  id: number;
+  accompanyingPeriod: AccompanyingPeriod;
+  comment?: string | null;
+  person?: Person | null;
+  thirdParty?: Thirdparty | null;
 }
 
 export interface Origin {
-    id: number;
-    label: {
-        fr: string;
-    };
-    noActiveAfter: DateTime;
+  id: number;
+  label: {
+    fr: string;
+  };
+  noActiveAfter: DateTime;
 }
 
 export interface ClosingMotive {
-    id: number;
-    active: boolean;
-    name: {
-        fr: string;
-    };
-    ordering: number;
-    isCanceledAccompanyingPeriod: boolean;
-    parent?: ClosingMotive | null;
-    children: ClosingMotive[];
+  id: number;
+  active: boolean;
+  name: {
+    fr: string;
+  };
+  ordering: number;
+  isCanceledAccompanyingPeriod: boolean;
+  parent?: ClosingMotive | null;
+  children: ClosingMotive[];
 }
 
 export interface AccompanyingPeriodParticipation {
-    id: number;
-    startDate: DateTime;
-    endDate?: DateTime | null;
-    accompanyingPeriod: AccompanyingPeriod;
-    person: Person;
+  id: number;
+  startDate: DateTime;
+  endDate?: DateTime | null;
+  accompanyingPeriod: AccompanyingPeriod;
+  person: Person;
 }
 
 export interface AccompanyingPeriodLocationHistory {
-    id: number;
-    startDate: DateTime;
-    endDate?: DateTime | null;
-    addressLocation?: Address | null;
-    period: AccompanyingPeriod;
-    personLocation?: Person | null;
+  id: number;
+  startDate: DateTime;
+  endDate?: DateTime | null;
+  addressLocation?: Address | null;
+  period: AccompanyingPeriod;
+  personLocation?: Person | null;
 }
 
 export interface SocialIssue {
-    id: number;
-    parent?: SocialIssue | null;
-    children: SocialIssue[];
-    socialActions?: SocialAction[] | null;
-    ordering: number;
-    title: {
-        fr: string;
-    };
-    desactivationDate?: string | null;
+  id: number;
+  parent?: SocialIssue | null;
+  children: SocialIssue[];
+  socialActions?: SocialAction[] | null;
+  ordering: number;
+  title: {
+    fr: string;
+  };
+  desactivationDate?: string | null;
 }
 
 export interface Goal {
-    id: number;
-    results: Result[];
-    socialActions?: SocialAction[] | null;
-    title: {
-        fr: string;
-    };
+  id: number;
+  results: Result[];
+  socialActions?: SocialAction[] | null;
+  title: {
+    fr: string;
+  };
 }
 
 export interface Result {
-    id: number;
-    accompanyingPeriodWorks: AccompanyingPeriodWork[];
-    accompanyingPeriodWorkGoals: AccompanyingPeriodWorkGoal[];
-    goals: Goal[];
-    socialActions: SocialAction[];
-    title: {
-        fr: string;
-    };
-    desactivationDate?: string | null;
+  id: number;
+  accompanyingPeriodWorks: AccompanyingPeriodWork[];
+  accompanyingPeriodWorkGoals: AccompanyingPeriodWorkGoal[];
+  goals: Goal[];
+  socialActions: SocialAction[];
+  title: {
+    fr: string;
+  };
+  desactivationDate?: string | null;
 }
 
 export interface AccompanyingPeriodWorkGoal {
-    id: number;
-    accompanyingPeriodWork: AccompanyingPeriodWork;
-    goal: Goal;
-    note: string;
-    results: Result[];
+  id: number;
+  accompanyingPeriodWork: AccompanyingPeriodWork;
+  goal: Goal;
+  note: string;
+  results: Result[];
 }
 
 export interface AccompanyingPeriodWorkEvaluation {
-    accompanyingPeriodWork: AccompanyingPeriodWork | null;
-    comment: string;
-    createdAt: DateTime | null;
-    createdBy: User | null;
-    documents: AccompanyingPeriodWorkEvaluationDocument[];
-    endDate: DateTime | null;
-    evaluation: Evaluation | null;
-    id: number | null;
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    key: any;
-    maxDate: DateTime | null;
-    startDate: DateTime | null;
-    updatedAt: DateTime | null;
-    updatedBy: User | null;
-    warningInterval: string | null;
-    timeSpent: number | null;
+  accompanyingPeriodWork: AccompanyingPeriodWork | null;
+  comment: string;
+  createdAt: DateTime | null;
+  createdBy: User | null;
+  documents: AccompanyingPeriodWorkEvaluationDocument[];
+  endDate: DateTime | null;
+  evaluation: Evaluation | null;
+  id: number | null;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  key: any;
+  maxDate: DateTime | null;
+  startDate: DateTime | null;
+  updatedAt: DateTime | null;
+  updatedBy: User | null;
+  warningInterval: string | null;
+  timeSpent: number | null;
 }
 
 export interface Evaluation {
-    id: number;
-    url: string;
-    socialActions: SocialAction[];
-    title: {
-        fr: string;
-    };
-    active: boolean;
-    delay: string;
-    notificationDelay: string;
+  id: number;
+  url: string;
+  socialActions: SocialAction[];
+  title: {
+    fr: string;
+  };
+  active: boolean;
+  delay: string;
+  notificationDelay: string;
 }
 
 export interface AccompanyingPeriodWorkReferrerHistory {
-    id: number;
-    accompanyingPeriodWork: AccompanyingPeriodWork;
-    user: User;
-    startDate: DateTime;
-    endDate: DateTime | null;
-    createdAt: DateTime;
-    updatedAt: DateTime | null;
-    createdBy: User;
-    updatedBy: User | null;
+  id: number;
+  accompanyingPeriodWork: AccompanyingPeriodWork;
+  user: User;
+  startDate: DateTime;
+  endDate: DateTime | null;
+  createdAt: DateTime;
+  updatedAt: DateTime | null;
+  createdBy: User;
+  updatedBy: User | null;
 }
 
 export interface AccompanyingPeriodWorkEvaluationDocument {
@@ -276,14 +275,16 @@ export type Entities = (UserGroup | User | Person | Thirdparty | Household) & {
   profession?: string;
 };
 
-export type Result = Entities & {
+export type EntitiesOrMe = "me" | Entities;
+
+export type AddPersonResult = Entities & {
   parent?: Entities | null;
 };
 
 export interface Suggestion {
   key: string;
   relevance: number;
-  result: Result;
+  result: AddPersonResult;
 }
 
 export interface SearchPagination {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
index c8383bf9c..24cdca24e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
@@ -1,131 +1,124 @@
 <template>
-    <a
-        class="btn"
-        :class="getClassButton"
-        :title="buttonTitle"
-        @click="openModal"
+  <a
+    class="btn"
+    :class="getClassButton"
+    :title="buttonTitle"
+    @click="openModal"
+  >
+    <span v-if="displayTextButton">{{ buttonTitle }}</span>
+  </a>
+
+  <teleport to="body">
+    <modal
+      v-if="showModal"
+      @close="closeModal"
+      :modal-dialog-class="modalDialogClass"
+      :show="showModal"
+      :hide-footer="false"
     >
-        <span v-if="displayTextButton">{{ buttonTitle }}</span>
-    </a>
+      <template #header>
+        <h3 class="modal-title">
+          {{ modalTitle }}
+        </h3>
+      </template>
 
-    <teleport to="body">
-        <modal
-            v-if="showModal"
-            @close="closeModal"
-            :modal-dialog-class="modalDialogClass"
-            :show="showModal"
-            :hide-footer="false"
+      <template #body-head>
+        <div class="modal-body">
+          <div class="search">
+            <label class="col-form-label" style="float: right">
+              {{
+                trans(ADD_PERSONS_SUGGESTED_COUNTER, {
+                  count: suggestedCounter,
+                })
+              }}
+            </label>
+
+            <input
+              id="search-persons"
+              name="query"
+              v-model="query"
+              :placeholder="trans(ADD_PERSONS_SEARCH_SOME_PERSONS)"
+              ref="searchRef"
+            />
+            <i class="fa fa-search fa-lg" />
+            <i
+              class="fa fa-times"
+              v-if="queryLength >= 3"
+              @click="resetSuggestion"
+            />
+          </div>
+        </div>
+        <div class="modal-body" v-if="checkUniq === 'checkbox'">
+          <div class="count">
+            <span>
+              <a v-if="suggestedCounter > 2" @click="selectAll">
+                {{ trans(ACTION_CHECK_ALL) }}
+              </a>
+              <a v-if="selectedCounter > 0" @click="resetSelection">
+                <i v-if="suggestedCounter > 2"> • </i>
+                {{ trans(ACTION_RESET) }}
+              </a>
+            </span>
+            <span v-if="selectedCounter > 0">
+              {{
+                trans(ADD_PERSONS_SELECTED_COUNTER, {
+                  count: selectedCounter,
+                })
+              }}
+            </span>
+          </div>
+        </div>
+      </template>
+
+      <template #body>
+        <div class="results">
+          <person-suggestion
+            v-for="item in selectedAndSuggested.slice().reverse()"
+            :key="itemKey(item)"
+            :item="item"
+            :search="search"
+            :type="checkUniq"
+            @save-form-on-the-fly="saveFormOnTheFly"
+            @new-prior-suggestion="newPriorSuggestion"
+            @update-selected="updateSelected"
+          />
+
+          <div class="create-button">
+            <on-the-fly
+              v-if="
+                queryLength >= 3 &&
+                (options.type.includes('person') ||
+                  options.type.includes('thirdparty'))
+              "
+              :button-text="trans(ONTHEFLY_CREATE_BUTTON, { q: query })"
+              :allowed-types="options.type"
+              :query="query"
+              action="create"
+              @save-form-on-the-fly="saveFormOnTheFly"
+              ref="onTheFly"
+            />
+          </div>
+        </div>
+      </template>
+
+      <template #footer>
+        <button
+          class="btn btn-create"
+          @click.prevent="
+            () => {
+              $emit('addNewPersons', {
+                selected: selectedComputed,
+              });
+              query = '';
+              closeModal();
+            }
+          "
         >
-            <template #header>
-                <h3 class="modal-title">
-                    {{ modalTitle }}
-                </h3>
-            </template>
-
-            <template #body-head>
-                <div class="modal-body">
-                    <div class="search">
-                        <label class="col-form-label" style="float: right">
-                            {{
-                                trans(ADD_PERSONS_SUGGESTED_COUNTER, {
-                                    count: suggestedCounter,
-                                })
-                            }}
-                        </label>
-
-                        <input
-                            id="search-persons"
-                            name="query"
-                            v-model="query"
-                            :placeholder="
-                                trans(ADD_PERSONS_SEARCH_SOME_PERSONS)
-                            "
-                            ref="searchRef"
-                        />
-                        <i class="fa fa-search fa-lg" />
-                        <i
-                            class="fa fa-times"
-                            v-if="queryLength >= 3"
-                            @click="resetSuggestion"
-                        />
-                    </div>
-                </div>
-                <div class="modal-body" v-if="checkUniq === 'checkbox'">
-                    <div class="count">
-                        <span>
-                            <a v-if="suggestedCounter > 2" @click="selectAll">
-                                {{ trans(ACTION_CHECK_ALL) }}
-                            </a>
-                            <a
-                                v-if="selectedCounter > 0"
-                                @click="resetSelection"
-                            >
-                                <i v-if="suggestedCounter > 2"> • </i>
-                                {{ trans(ACTION_RESET) }}
-                            </a>
-                        </span>
-                        <span v-if="selectedCounter > 0">
-                            {{
-                                trans(ADD_PERSONS_SELECTED_COUNTER, {
-                                    count: selectedCounter,
-                                })
-                            }}
-                        </span>
-                    </div>
-                </div>
-            </template>
-
-            <template #body>
-                <div class="results">
-                    <person-suggestion
-                        v-for="item in selectedAndSuggested.slice().reverse()"
-                        :key="itemKey(item)"
-                        :item="item"
-                        :search="search"
-                        :type="checkUniq"
-                        @save-form-on-the-fly="saveFormOnTheFly"
-                        @new-prior-suggestion="newPriorSuggestion"
-                        @update-selected="updateSelected"
-                    />
-
-                    <div class="create-button">
-                        <on-the-fly
-                            v-if="
-                                queryLength >= 3 &&
-                                (options.type.includes('person') ||
-                                    options.type.includes('thirdparty'))
-                            "
-                            :button-text="
-                                trans(ONTHEFLY_CREATE_BUTTON, { q: query })
-                            "
-                            :allowed-types="options.type"
-                            :query="query"
-                            action="create"
-                            @save-form-on-the-fly="saveFormOnTheFly"
-                            ref="onTheFly"
-                        />
-                    </div>
-                </div>
-            </template>
-
-            <template #footer>
-                <button
-                    class="btn btn-create"
-                    @click.prevent="
-                        () => {
-                            $emit('addNewPersons', {
-                                selected: selectedComputed,
-                            });
-                            query = '';
-                            closeModal();
-                        }
-                    "
-                >
-                    {{ trans(ACTION_ADD) }}
-                </button>
-            </template>
-        </modal>
-    </teleport>
+          {{ trans(ACTION_ADD) }}
+        </button>
+      </template>
+    </modal>
+  </teleport>
 </template>
 
 <script setup lang="ts">
@@ -139,31 +132,31 @@ import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue";
 import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
 
 import {
-    trans,
-    ADD_PERSONS_SUGGESTED_COUNTER,
-    ADD_PERSONS_SEARCH_SOME_PERSONS,
-    ADD_PERSONS_SELECTED_COUNTER,
-    ONTHEFLY_CREATE_BUTTON,
-    ACTION_CHECK_ALL,
-    ACTION_RESET,
-    ACTION_ADD,
+  trans,
+  ADD_PERSONS_SUGGESTED_COUNTER,
+  ADD_PERSONS_SEARCH_SOME_PERSONS,
+  ADD_PERSONS_SELECTED_COUNTER,
+  ONTHEFLY_CREATE_BUTTON,
+  ACTION_CHECK_ALL,
+  ACTION_RESET,
+  ACTION_ADD,
 } from "translator";
 import {
-    Suggestion,
-    Search,
-    Result as OriginalResult,
-    SearchOptions,
+  Suggestion,
+  Search,
+  AddPersonResult as OriginalResult,
+  SearchOptions,
 } from "ChillPersonAssets/types";
 
 // Extend Result type to include optional addressId
 type Result = OriginalResult & { addressId?: number };
 
 const props = defineProps({
-    suggested: { type: Array as () => Suggestion[], default: () => [] },
-    selected: { type: Array as () => Suggestion[], default: () => [] },
-    buttonTitle: { type: String, required: true },
-    modalTitle: { type: String, required: true },
-    options: { type: Object as () => SearchOptions, required: true },
+  suggested: { type: Array as () => Suggestion[], default: () => [] },
+  selected: { type: Array as () => Suggestion[], default: () => [] },
+  buttonTitle: { type: String, required: true },
+  modalTitle: { type: String, required: true },
+  options: { type: Object as () => SearchOptions, required: true },
 });
 
 defineEmits(["addNewPersons"]);
@@ -172,25 +165,25 @@ const showModal = ref(false);
 const modalDialogClass = ref("modal-dialog-scrollable modal-xl");
 
 const modal = shallowRef({
-    showModal: false,
-    modalDialogClass: "modal-dialog-scrollable modal-xl",
+  showModal: false,
+  modalDialogClass: "modal-dialog-scrollable modal-xl",
 });
 
 const search = reactive({
-    query: "" as string,
-    previousQuery: "" as string,
-    currentSearchQueryController: null as AbortController | null,
-    suggested: props.suggested as Suggestion[],
-    selected: props.selected as Suggestion[],
-    priorSuggestion: {} as Partial<Suggestion>,
+  query: "" as string,
+  previousQuery: "" as string,
+  currentSearchQueryController: null as AbortController | null,
+  suggested: props.suggested as Suggestion[],
+  selected: props.selected as Suggestion[],
+  priorSuggestion: {} as Partial<Suggestion>,
 });
 
 const searchRef = ref<HTMLInputElement | null>(null);
 const onTheFly = ref<InstanceType<typeof OnTheFly> | null>(null);
 
 const query = computed({
-    get: () => search.query,
-    set: (val) => setQuery(val),
+  get: () => search.query,
+  set: (val) => setQuery(val),
 });
 const queryLength = computed(() => search.query.length);
 const suggestedCounter = computed(() => search.suggested.length);
@@ -198,18 +191,18 @@ const selectedComputed = computed(() => search.selected);
 const selectedCounter = computed(() => search.selected.length);
 
 const getClassButton = computed(() => {
-    let size = props.options?.button?.size ?? "";
-    let type = props.options?.button?.type ?? "btn-create";
-    return size ? size + " " + type : type;
+  let size = props.options?.button?.size ?? "";
+  let type = props.options?.button?.type ?? "btn-create";
+  return size ? size + " " + type : type;
 });
 const displayTextButton = computed(() =>
-    props.options?.button?.display !== undefined
-        ? props.options.button.display
-        : true,
+  props.options?.button?.display !== undefined
+    ? props.options.button.display
+    : true,
 );
 
 const checkUniq = computed(() =>
-    props.options.uniq === true ? "radio" : "checkbox",
+  props.options.uniq === true ? "radio" : "checkbox",
 );
 
 const priorSuggestion = computed(() => search.priorSuggestion);
@@ -218,282 +211,279 @@ const hasPriorSuggestion = computed(() => !!search.priorSuggestion.key);
 const itemKey = (item: Suggestion) => item.result.type + item.result.id;
 
 function addPriorSuggestion() {
-    if (hasPriorSuggestion.value) {
-        // Type assertion is safe here due to the checks above
-        search.suggested.unshift(priorSuggestion.value as Suggestion);
-        search.selected.unshift(priorSuggestion.value as Suggestion);
-        newPriorSuggestion(null);
-    }
+  if (hasPriorSuggestion.value) {
+    // Type assertion is safe here due to the checks above
+    search.suggested.unshift(priorSuggestion.value as Suggestion);
+    search.selected.unshift(priorSuggestion.value as Suggestion);
+    newPriorSuggestion(null);
+  }
 }
 
 const selectedAndSuggested = computed(() => {
-    addPriorSuggestion();
-    const uniqBy = (a: Suggestion[], key: (item: Suggestion) => string) => [
-        ...new Map(a.map((x) => [key(x), x])).values(),
-    ];
-    let union = [
-        ...new Set([
-            ...search.suggested.slice().reverse(),
-            ...search.selected.slice().reverse(),
-        ]),
-    ];
-    return uniqBy(union, (k: Suggestion) => k.key);
+  addPriorSuggestion();
+  const uniqBy = (a: Suggestion[], key: (item: Suggestion) => string) => [
+    ...new Map(a.map((x) => [key(x), x])).values(),
+  ];
+  let union = [
+    ...new Set([
+      ...search.suggested.slice().reverse(),
+      ...search.selected.slice().reverse(),
+    ]),
+  ];
+  return uniqBy(union, (k: Suggestion) => k.key);
 });
 
 function openModal() {
-    showModal.value = true;
-    nextTick(() => {
-        if (searchRef.value) searchRef.value.focus();
-    });
+  showModal.value = true;
+  nextTick(() => {
+    if (searchRef.value) searchRef.value.focus();
+  });
 }
 function closeModal() {
-    showModal.value = false;
+  showModal.value = false;
 }
 
 function setQuery(q: string) {
-    search.query = q;
+  search.query = q;
 
-    // Clear previous search if any
-    if (search.currentSearchQueryController) {
-        search.currentSearchQueryController.abort();
-        search.currentSearchQueryController = null;
-    }
+  // Clear previous search if any
+  if (search.currentSearchQueryController) {
+    search.currentSearchQueryController.abort();
+    search.currentSearchQueryController = null;
+  }
 
-    if (q === "") {
-        loadSuggestions([]);
-        return;
-    }
+  if (q === "") {
+    loadSuggestions([]);
+    return;
+  }
 
-    // Debounce delay based on query length
-    const delay = q.length > 3 ? 300 : 700;
+  // Debounce delay based on query length
+  const delay = q.length > 3 ? 300 : 700;
 
-    setTimeout(() => {
-        // Only search if query hasn't changed in the meantime
-        if (q !== search.query) return;
+  setTimeout(() => {
+    // Only search if query hasn't changed in the meantime
+    if (q !== search.query) return;
 
-        search.currentSearchQueryController = new AbortController();
+    search.currentSearchQueryController = new AbortController();
 
-        searchEntities(
-            { query: q, options: props.options },
-            search.currentSearchQueryController.signal,
-        )
-            .then((suggested: Search) => {
-                loadSuggestions(suggested.results);
-            })
-            .catch((error: DOMException) => {
-                if (
-                    error instanceof DOMException &&
-                    error.name === "AbortError"
-                ) {
-                    // Request was aborted, ignore
-                    return;
-                }
-                throw error;
-            });
-    }, delay);
+    searchEntities(
+      { query: q, options: props.options },
+      search.currentSearchQueryController.signal,
+    )
+      .then((suggested: Search) => {
+        loadSuggestions(suggested.results);
+      })
+      .catch((error: DOMException) => {
+        if (error instanceof DOMException && error.name === "AbortError") {
+          // Request was aborted, ignore
+          return;
+        }
+        throw error;
+      });
+  }, delay);
 }
 
 function loadSuggestions(suggestedArr: Suggestion[]) {
-    search.suggested = suggestedArr;
-    search.suggested.forEach((item) => {
-        item.key = itemKey(item);
-    });
+  search.suggested = suggestedArr;
+  search.suggested.forEach((item) => {
+    item.key = itemKey(item);
+  });
 }
 
 function updateSelected(value: Suggestion[]) {
-    search.selected = value;
+  search.selected = value;
 }
 
 function resetSuggestion() {
-    search.query = "";
-    search.suggested = [];
+  search.query = "";
+  search.suggested = [];
 }
 
 function resetSelection() {
-    search.selected = [];
+  search.selected = [];
 }
 
 function resetSearch() {
-    resetSelection();
-    resetSuggestion();
+  resetSelection();
+  resetSuggestion();
 }
 
 function selectAll() {
-    search.suggested.forEach((item) => {
-        search.selected.push(item);
-    });
+  search.suggested.forEach((item) => {
+    search.selected.push(item);
+  });
 }
 
 function newPriorSuggestion(entity: Result | null) {
-    if (entity !== null) {
-        let suggestion = {
-            key: entity.type + entity.id,
-            relevance: 0.5,
-            result: entity,
-        };
-        search.priorSuggestion = suggestion;
-    } else {
-        search.priorSuggestion = {};
-    }
+  if (entity !== null) {
+    let suggestion = {
+      key: entity.type + entity.id,
+      relevance: 0.5,
+      result: entity,
+    };
+    search.priorSuggestion = suggestion;
+  } else {
+    search.priorSuggestion = {};
+  }
 }
 
 async function saveFormOnTheFly({
-    type,
-    data,
+  type,
+  data,
 }: {
-    type: string;
-    data: Result;
+  type: string;
+  data: Result;
 }) {
-    try {
-        if (type === "person") {
-            const responsePerson: Result = await makeFetch(
-                "POST",
-                "/api/1.0/person/person.json",
-                data,
-            );
-            newPriorSuggestion(responsePerson);
-            if (onTheFly.value) onTheFly.value.closeModal();
+  try {
+    if (type === "person") {
+      const responsePerson: Result = await makeFetch(
+        "POST",
+        "/api/1.0/person/person.json",
+        data,
+      );
+      newPriorSuggestion(responsePerson);
+      if (onTheFly.value) onTheFly.value.closeModal();
 
-            if (data.addressId != null) {
-                const household = { type: "household" };
-                const address = { id: data.addressId };
-                try {
-                    const responseHousehold: Result = await makeFetch(
-                        "POST",
-                        "/api/1.0/person/household.json",
-                        household,
-                    );
-                    const member = {
-                        concerned: [
-                            {
-                                person: {
-                                    type: "person",
-                                    id: responsePerson.id,
-                                },
-                                start_date: {
-                                    datetime: `${new Date().toISOString().split("T")[0]}T00:00:00+02:00`,
-                                },
-                                holder: false,
-                                comment: null,
-                            },
-                        ],
-                        destination: {
-                            type: "household",
-                            id: responseHousehold.id,
-                        },
-                        composition: null,
-                    };
-                    await makeFetch(
-                        "POST",
-                        "/api/1.0/person/household/members/move.json",
-                        member,
-                    );
-                    try {
-                        const _response = await makeFetch(
-                            "POST",
-                            `/api/1.0/person/household/${responseHousehold.id}/address.json`,
-                            address,
-                        );
-                        console.log(_response);
-                    } catch (error) {
-                        console.error(error);
-                    }
-                } catch (error) {
-                    console.error(error);
-                }
-            }
-        } else if (type === "thirdparty") {
-            const response: Result = await makeFetch(
-                "POST",
-                "/api/1.0/thirdparty/thirdparty.json",
-                data,
+      if (data.addressId != null) {
+        const household = { type: "household" };
+        const address = { id: data.addressId };
+        try {
+          const responseHousehold: Result = await makeFetch(
+            "POST",
+            "/api/1.0/person/household.json",
+            household,
+          );
+          const member = {
+            concerned: [
+              {
+                person: {
+                  type: "person",
+                  id: responsePerson.id,
+                },
+                start_date: {
+                  datetime: `${new Date().toISOString().split("T")[0]}T00:00:00+02:00`,
+                },
+                holder: false,
+                comment: null,
+              },
+            ],
+            destination: {
+              type: "household",
+              id: responseHousehold.id,
+            },
+            composition: null,
+          };
+          await makeFetch(
+            "POST",
+            "/api/1.0/person/household/members/move.json",
+            member,
+          );
+          try {
+            const _response = await makeFetch(
+              "POST",
+              `/api/1.0/person/household/${responseHousehold.id}/address.json`,
+              address,
             );
-            newPriorSuggestion(response);
-            if (onTheFly.value) onTheFly.value.closeModal();
+            console.log(_response);
+          } catch (error) {
+            console.error(error);
+          }
+        } catch (error) {
+          console.error(error);
         }
-    } catch (error) {
-        console.error(error);
+      }
+    } else if (type === "thirdparty") {
+      const response: Result = await makeFetch(
+        "POST",
+        "/api/1.0/thirdparty/thirdparty.json",
+        data,
+      );
+      newPriorSuggestion(response);
+      if (onTheFly.value) onTheFly.value.closeModal();
     }
+  } catch (error) {
+    console.error(error);
+  }
 }
 
 watch(
-    () => props.selected,
-    (newSelected) => {
-        search.selected = newSelected;
-    },
-    { deep: true },
+  () => props.selected,
+  (newSelected) => {
+    search.selected = newSelected;
+  },
+  { deep: true },
 );
 
 watch(
-    () => props.suggested,
-    (newSuggested) => {
-        search.suggested = newSuggested;
-    },
-    { deep: true },
+  () => props.suggested,
+  (newSuggested) => {
+    search.suggested = newSuggested;
+  },
+  { deep: true },
 );
 
 watch(
-    () => modal,
-    (val) => {
-        showModal.value = val.value.showModal;
-        modalDialogClass.value = val.value.modalDialogClass;
-    },
-    { deep: true },
+  () => modal,
+  (val) => {
+    showModal.value = val.value.showModal;
+    modalDialogClass.value = val.value.modalDialogClass;
+  },
+  { deep: true },
 );
 
 defineExpose({
-    resetSearch,
-    showModal,
+  resetSearch,
+  showModal,
 });
 </script>
 
 <style lang="scss">
 li.add-persons {
-    a {
-        cursor: pointer;
-    }
+  a {
+    cursor: pointer;
+  }
 }
 div.body-head {
-    overflow-y: unset;
-    div.modal-body:first-child {
-        margin: auto 4em;
-        div.search {
-            position: relative;
-            input {
-                width: 100%;
-                padding: 1.2em 1.5em 1.2em 2.5em;
-                //margin: 1em 0;
-            }
-            i {
-                position: absolute;
-                opacity: 0.5;
-                padding: 0.65em 0;
-                top: 50%;
-            }
-            i.fa-search {
-                left: 0.5em;
-            }
-            i.fa-times {
-                right: 1em;
-                padding: 0.75em 0;
-                cursor: pointer;
-            }
-        }
+  overflow-y: unset;
+  div.modal-body:first-child {
+    margin: auto 4em;
+    div.search {
+      position: relative;
+      input {
+        width: 100%;
+        padding: 1.2em 1.5em 1.2em 2.5em;
+        //margin: 1em 0;
+      }
+      i {
+        position: absolute;
+        opacity: 0.5;
+        padding: 0.65em 0;
+        top: 50%;
+      }
+      i.fa-search {
+        left: 0.5em;
+      }
+      i.fa-times {
+        right: 1em;
+        padding: 0.75em 0;
+        cursor: pointer;
+      }
     }
-    div.modal-body:last-child {
-        padding-bottom: 0;
-    }
-    div.count {
-        margin: -0.5em 0 0.7em;
-        display: flex;
-        justify-content: space-between;
-        a {
-            cursor: pointer;
-        }
+  }
+  div.modal-body:last-child {
+    padding-bottom: 0;
+  }
+  div.count {
+    margin: -0.5em 0 0.7em;
+    display: flex;
+    justify-content: space-between;
+    a {
+      cursor: pointer;
     }
+  }
 }
 .create-button > a {
-    margin-top: 0.5em;
-    margin-left: 2.6em;
+  margin-top: 0.5em;
+  margin-left: 2.6em;
 }
 </style>

From dcdfba5ccd9960d88c5556434a0eafdc6c8f0bc9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 9 Jul 2025 17:46:36 +0200
Subject: [PATCH 143/283] eslint fixes

---
 .../Resources/public/vuejs/Activity/App.vue   |   20 +-
 .../Activity/components/ConcernedGroups.vue   |  461 ++--
 .../ConcernedGroups/PersonBadge.vue           |   38 +-
 .../ConcernedGroups/PersonsBloc.vue           |   54 +-
 .../vuejs/Activity/components/Location.vue    |  154 +-
 .../components/Location/NewLocation.vue       |  664 +++---
 .../Activity/components/SocialIssuesAcc.vue   |  462 ++--
 .../SocialIssuesAcc/CheckSocialAction.vue     |   74 +-
 .../SocialIssuesAcc/CheckSocialIssue.vue      |   64 +-
 .../Resources/public/types.ts                 |   88 +-
 .../Resources/public/vuejs/Calendar/App.vue   |  675 +++---
 .../Calendar/Components/CalendarActive.vue    |  186 +-
 .../Resources/public/vuejs/Calendar/api.ts    |   42 +-
 .../Resources/public/vuejs/Calendar/const.ts  |   26 +-
 .../public/vuejs/Calendar/store/utils.ts      |  150 +-
 .../Resources/public/vuejs/Invite/Answer.vue  |  208 +-
 .../public/vuejs/MyCalendarRange/App2.vue     |  652 +++---
 .../Components/EditLocation.vue               |   86 +-
 .../public/vuejs/MyCalendarRange/i18n.ts      |   46 +-
 .../public/vuejs/MyCalendarRange/index2.ts    |   16 +-
 .../vuejs/MyCalendarRange/store/index.ts      |   60 +-
 .../store/modules/calendarLocals.ts           |  172 +-
 .../store/modules/calendarRanges.ts           |  667 +++---
 .../store/modules/calendarRemotes.ts          |  175 +-
 .../store/modules/fullcalendar.ts             |  132 +-
 .../MyCalendarRange/store/modules/location.ts |   98 +-
 .../vuejs/MyCalendarRange/store/modules/me.ts |   26 +-
 .../CalendarUserSelector.vue                  |  451 ++--
 .../public/vuejs/_components/PickTemplate.vue |  239 ++-
 .../public/js/async-upload/uploader.ts        |  104 +-
 .../Resources/public/js/generic-doc-api.ts    |    8 +-
 .../public/module/async_upload/index.ts       |  187 +-
 .../public/module/button_download/index.ts    |   42 +-
 .../document_action_buttons_group/index.ts    |  118 +-
 .../Resources/public/types/generic_doc.ts     |   54 +-
 .../Resources/public/types/index.ts           |  172 +-
 .../vuejs/DocumentActionButtonsGroup.vue      |  334 ++-
 .../public/vuejs/DocumentSignature/App.vue    | 1472 +++++++------
 .../public/vuejs/DocumentSignature/index.ts   |   54 +-
 .../public/vuejs/DropFileWidget/DropFile.vue  |  274 ++-
 .../vuejs/DropFileWidget/DropFileModal.vue    |  108 +-
 .../vuejs/DropFileWidget/DropFileWidget.vue   |  122 +-
 .../Resources/public/vuejs/FileIcon.vue       |   70 +-
 .../StoredObjectButton/ConvertButton.vue      |   56 +-
 .../StoredObjectButton/DesktopEditButton.vue  |  116 +-
 .../StoredObjectButton/DownloadButton.vue     |  175 +-
 .../StoredObjectButton/HistoryButton.vue      |   64 +-
 .../HistoryButton/HistoryButtonList.vue       |   70 +-
 .../HistoryButton/HistoryButtonListItem.vue   |  270 ++-
 .../HistoryButton/HistoryButtonModal.vue      |   50 +-
 .../HistoryButton/RestoreVersionButton.vue    |   28 +-
 .../StoredObjectButton/HistoryButton/api.ts   |   40 +-
 .../StoredObjectButton/WopiEditButton.vue     |   56 +-
 .../vuejs/StoredObjectButton/helpers.ts       |  414 ++--
 .../Resources/public/chill/js/date.ts         |  208 +-
 .../Resources/public/lib/api/address.ts       |   64 +-
 .../Resources/public/lib/api/apiMethods.ts    |  388 ++--
 .../Resources/public/lib/api/export.ts        |   20 +-
 .../Resources/public/lib/api/locations.ts     |    4 +-
 .../Resources/public/lib/api/return_path.ts   |    2 +-
 .../Resources/public/lib/api/user.ts          |   30 +-
 .../public/lib/entity-notification/api.ts     |   28 +-
 .../public/lib/entity-workflow/api.ts         |   22 +-
 .../localizationHelper/localizationHelper.ts  |   54 +-
 .../public/lib/workflow/attachments.ts        |   20 +-
 .../public/module/address-details/index.ts    |   76 +-
 .../public/module/ckeditor5/editor_config.ts  |   96 +-
 .../public/module/ckeditor5/index.ts          |   46 +-
 .../public/module/collection/index.ts         |  236 +--
 .../module/notification/toggle_read_all.ts    |   68 +-
 .../ChillMainBundle/Resources/public/types.ts |   14 +-
 .../Resources/public/vuejs/Address/App.vue    |  230 +-
 .../Address/components/ActionButtons.vue      |   48 +-
 .../vuejs/Address/components/AddAddress.vue   | 1722 ++++++++-------
 .../components/AddAddress/AddressMap.vue      |  191 +-
 .../components/AddAddress/AddressMore.vue     |  280 +--
 .../AddAddress/AddressSelection.vue           |  414 ++--
 .../components/AddAddress/CitySelection.vue   |  459 ++--
 .../AddAddress/CountrySelection.vue           |  140 +-
 .../vuejs/Address/components/DatePane.vue     |  332 ++-
 .../vuejs/Address/components/EditPane.vue     |  343 ++-
 .../vuejs/Address/components/ShowPane.vue     |  359 ++--
 .../vuejs/Address/components/SuggestPane.vue  |  155 +-
 .../public/vuejs/DownloadExport/App.vue       |  157 +-
 .../public/vuejs/DownloadExport/index.ts      |    4 +-
 .../public/vuejs/HomepageWidget/App.vue       |  252 ++-
 .../HomepageWidget/DashboardWidgets/News.vue  |   42 +-
 .../DashboardWidgets/NewsItem.vue             |  250 ++-
 .../HomepageWidget/MyAccompanyingCourses.vue  |  175 +-
 .../public/vuejs/HomepageWidget/MyCustoms.vue |  268 ++-
 .../vuejs/HomepageWidget/MyEvaluations.vue    |  227 +-
 .../vuejs/HomepageWidget/MyNotifications.vue  |  196 +-
 .../public/vuejs/HomepageWidget/MyTasks.vue   |  203 +-
 .../vuejs/HomepageWidget/MyWorkflows.vue      |   30 +-
 .../vuejs/HomepageWidget/MyWorkflowsTable.vue |  156 +-
 .../public/vuejs/HomepageWidget/MyWorks.vue   |  202 +-
 .../vuejs/HomepageWidget/TabCounter.vue       |   18 +-
 .../public/vuejs/HomepageWidget/TabTable.vue  |   24 +-
 .../Resources/public/vuejs/OnTheFly/App.vue   |   60 +-
 .../vuejs/OnTheFly/components/Create.vue      |  153 +-
 .../vuejs/PickPostalCode/PickPostalCode.vue   |  174 +-
 .../public/vuejs/SavedExportButtons/App.vue   |    8 +-
 .../Component/GenerateButton.vue              |  208 +-
 .../public/vuejs/SavedExportButtons/index.ts  |    6 +-
 .../public/vuejs/WorkflowAttachment/App.vue   |   72 +-
 .../Component/AttachmentList.vue              |   66 +-
 .../Component/GenericDocItemBox.vue           |   10 +-
 .../Component/PickGenericDoc.vue              |  420 ++--
 .../Component/PickGenericDocItem.vue          |  132 +-
 .../Component/PickGenericDocModal.vue         |  128 +-
 .../public/vuejs/WorkflowAttachment/index.ts  |  177 +-
 .../AddressDetails/AddressDetailsButton.vue   |   82 +-
 .../AddressDetails/AddressDetailsContent.vue  |   28 +-
 .../AddressDetails/AddressModal.vue           |   40 +-
 .../AddressDetailsGeographicalLayers.vue      |   60 +-
 .../Parts/AddressDetailsMap.vue               |  127 +-
 .../Parts/AddressDetailsRefMatching.vue       |  262 ++-
 .../public/vuejs/_components/BadgeEntity.vue  |   99 +-
 .../CommentEditor/CommentEditor.vue           |  136 +-
 .../public/vuejs/_components/Confidential.vue |   52 +-
 .../_components/Entity/AddressRenderBox.vue   |  218 +-
 .../Entity/GenderIconRenderBox.vue            |   34 +-
 .../_components/Entity/UserGroupRenderBox.vue |   16 +-
 .../_components/Entity/UserRenderBoxBadge.vue |   42 +-
 .../EntityWorkflowVueSubscriber.vue           |  126 +-
 .../EntityWorkflow/ListWorkflow.vue           |  209 +-
 .../EntityWorkflow/ListWorkflowModal.vue      |  142 +-
 .../EntityWorkflow/PickWorkflow.vue           |  277 ++-
 .../public/vuejs/_components/Modal.vue        |  135 +-
 .../NotificationReadAllToggle.vue             |   70 +-
 .../Notification/NotificationReadToggle.vue   |  184 +-
 .../Resources/public/vuejs/_js/i18n.ts        |  145 +-
 .../public/vuejs/i18n/datetimeFormats.ts      |   48 +-
 .../AccompanyingPeriodWorkSelector.ts         |   74 +-
 .../public/vuejs/AccompanyingCourse/App.vue   |  194 +-
 .../components/AdminLocation.vue              |  170 +-
 .../AccompanyingCourse/components/Banner.vue  |  257 +--
 .../components/Banner/PersonsAssociated.vue   |  210 +-
 .../components/Banner/SocialIssue.vue         |   14 +-
 .../components/Banner/ToggleFlags.vue         |  261 ++-
 .../components/ButtonLocation.vue             |  151 +-
 .../AccompanyingCourse/components/Comment.vue |  302 ++-
 .../AccompanyingCourse/components/Confirm.vue |  431 ++--
 .../components/CourseLocation.vue             |  482 +++--
 .../components/OriginDemand.vue               |  143 +-
 .../components/PersonsAssociated.vue          |  525 +++--
 .../PersonsAssociated/ParticipationItem.vue   |  431 ++--
 .../components/Referrer.vue                   |  439 ++--
 .../components/Requestor.vue                  |  869 ++++----
 .../components/Resources.vue                  |  321 ++-
 .../components/Resources/ResourceItem.vue     |  444 ++--
 .../components/Resources/WriteComment.vue     |  182 +-
 .../AccompanyingCourse/components/Scopes.vue  |   93 +-
 .../components/SocialIssue.vue                |  167 +-
 .../components/StartDate.vue                  |  137 +-
 .../components/StickyNav.vue                  |  350 ++--
 .../components/StickyNav/Item.vue             |   32 +-
 .../AccompanyingCourse/components/Test.vue    |  277 ++-
 .../AccompanyingCourseWorkCreate/App.vue      |  551 +++--
 .../vuejs/AccompanyingCourseWorkEdit/App.vue  | 1859 ++++++++---------
 .../components/AddEvaluation.vue              |  309 ++-
 .../components/AddResult.vue                  |  290 ++-
 .../components/FormEvaluation.vue             | 1292 ++++++------
 .../vuejs/ExportFormActionGoalResult/App.vue  |  834 ++++----
 .../vuejs/HouseholdMembersEditor/App.vue      |  320 +--
 .../components/Concerned.vue                  |  239 +--
 .../components/Confirmation.vue               |   46 +-
 .../components/CurrentHousehold.vue           |   80 +-
 .../components/Dates.vue                      |  277 ++-
 .../components/Household.vue                  |  482 +++--
 .../components/HouseholdAddress.vue           |  131 +-
 .../components/MemberDetails.vue              |  242 ++-
 .../components/PersonComment.vue              |   38 +-
 .../components/Positioning.vue                |  190 +-
 .../Resources/public/vuejs/VisGraph/App.vue   | 1287 ++++++------
 ...ccompanyingCourseWorkEvaluationDocument.ts |   10 +-
 .../AccompanyingPeriodWorkItem.vue            |   92 +-
 .../AccompanyingPeriodWorkList.vue            |   42 +-
 .../AccompanyingPeriodWorkSelectorModal.vue   |  140 +-
 .../Resources/public/vuejs/_js/i18n.ts        |  117 +-
 .../Entity/ThirdPartyRenderBox.vue            |  382 ++--
 .../_components/Entity/ThirdPartyText.vue     |   38 +-
 .../vuejs/_components/OnTheFly/ThirdParty.vue |  758 ++++---
 .../Resources/public/vuejs/TicketApp/App.vue  |   28 +-
 .../components/ActionToolbarComponent.vue     |  555 +++--
 .../components/AddCommentComponent.vue        |   14 +-
 .../components/AddresseeComponent.vue         |   85 +-
 .../components/MotiveSelectorComponent.vue    |   70 +-
 .../components/PersonsSelectorComponent.vue   |   97 +-
 .../TicketHistoryAddresseeComponent.vue       |    8 +-
 .../TicketHistoryCommentComponent.vue         |   44 +-
 .../TicketHistoryCreateComponent.vue          |    4 +-
 .../TicketHistoryEmergencyComponent.vue       |   22 +-
 .../TicketHistoryMotiveComponent.vue          |    6 +-
 .../TicketHistoryStateComponent.vue           |   36 +-
 .../components/TicketSelectorComponent.vue    |   36 +-
 .../TicketApp/components/ToggleFlags.vue      |   80 +-
 .../Resources/public/vuejs/TicketApp/index.ts |   21 +-
 .../public/vuejs/TicketApp/store/index.ts     |   24 +-
 .../TicketApp/store/modules/addressee.ts      |  138 +-
 .../vuejs/TicketApp/store/modules/comment.ts  |   48 +-
 .../vuejs/TicketApp/store/modules/motive.ts   |   96 +-
 .../vuejs/TicketApp/store/modules/persons.ts  |  140 +-
 .../vuejs/TicketApp/store/modules/ticket.ts   |  153 +-
 .../Resources/public/module/pending/index.ts  |   44 +-
 src/shims-vue.d.ts                            |    6 +-
 src/vue-multiselect.d.ts                      |   18 +-
 src/vuex.d.ts                                 |    8 +-
 208 files changed, 20402 insertions(+), 21424 deletions(-)

diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/App.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/App.vue
index f17e42842..6f33a8deb 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/App.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/App.vue
@@ -1,7 +1,7 @@
 <template>
-    <concerned-groups v-if="hasPerson" />
-    <social-issues-acc v-if="hasSocialIssues" />
-    <location v-if="hasLocation" />
+  <concerned-groups v-if="hasPerson" />
+  <social-issues-acc v-if="hasSocialIssues" />
+  <location v-if="hasLocation" />
 </template>
 
 <script>
@@ -10,12 +10,12 @@ import SocialIssuesAcc from "./components/SocialIssuesAcc.vue";
 import Location from "./components/Location.vue";
 
 export default {
-    name: "App",
-    props: ["hasSocialIssues", "hasLocation", "hasPerson"],
-    components: {
-        ConcernedGroups,
-        SocialIssuesAcc,
-        Location,
-    },
+  name: "App",
+  props: ["hasSocialIssues", "hasLocation", "hasPerson"],
+  components: {
+    ConcernedGroups,
+    SocialIssuesAcc,
+    Location,
+  },
 };
 </script>
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups.vue
index b99de220d..6b275b4b9 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups.vue
@@ -1,46 +1,43 @@
 <template>
-    <teleport to="#add-persons" v-if="isComponentVisible">
-        <div class="flex-bloc concerned-groups" :class="getContext">
-            <persons-bloc
-                v-for="bloc in contextPersonsBlocs"
-                :key="bloc.key"
-                :bloc="bloc"
-                :bloc-width="getBlocWidth"
-                :set-persons-in-bloc="setPersonsInBloc"
-            />
-        </div>
-        <div
-            v-if="
-                getContext === 'accompanyingCourse' &&
-                suggestedEntities.length > 0
-            "
+  <teleport to="#add-persons" v-if="isComponentVisible">
+    <div class="flex-bloc concerned-groups" :class="getContext">
+      <persons-bloc
+        v-for="bloc in contextPersonsBlocs"
+        :key="bloc.key"
+        :bloc="bloc"
+        :bloc-width="getBlocWidth"
+        :set-persons-in-bloc="setPersonsInBloc"
+      />
+    </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}`"
         >
-            <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" />
-                    <span v-else>{{ p.text }}</span>
-                </li>
-            </ul>
-        </div>
+          <person-text v-if="p.type === 'person'" :person="p" />
+          <span v-else>{{ p.text }}</span>
+        </li>
+      </ul>
+    </div>
 
-        <ul class="record_actions">
-            <li class="add-persons">
-                <add-persons
-                    :buttonTitle="trans(ACTIVITY_ADD_PERSONS)"
-                    :modalTitle="trans(ACTIVITY_ADD_PERSONS)"
-                    v-bind:key="addPersons.key"
-                    v-bind:options="addPersonsOptions"
-                    @addNewPersons="addNewPersons"
-                    ref="addPersons"
-                >
-                </add-persons>
-            </li>
-        </ul>
-    </teleport>
+    <ul class="record_actions">
+      <li class="add-persons">
+        <add-persons
+          :buttonTitle="trans(ACTIVITY_ADD_PERSONS)"
+          :modalTitle="trans(ACTIVITY_ADD_PERSONS)"
+          v-bind:key="addPersons.key"
+          v-bind:options="addPersonsOptions"
+          @addNewPersons="addNewPersons"
+          ref="addPersons"
+        >
+        </add-persons>
+      </li>
+    </ul>
+  </teleport>
 </template>
 
 <script>
@@ -49,208 +46,208 @@ import AddPersons from "ChillPersonAssets/vuejs/_components/AddPersons.vue";
 import PersonsBloc from "./ConcernedGroups/PersonsBloc.vue";
 import PersonText from "ChillPersonAssets/vuejs/_components/Entity/PersonText.vue";
 import {
-    ACTIVITY_BLOC_PERSONS,
-    ACTIVITY_BLOC_PERSONS_ASSOCIATED,
-    ACTIVITY_BLOC_THIRDPARTY,
-    ACTIVITY_BLOC_USERS,
-    ACTIVITY_ADD_PERSONS,
-    trans,
+  ACTIVITY_BLOC_PERSONS,
+  ACTIVITY_BLOC_PERSONS_ASSOCIATED,
+  ACTIVITY_BLOC_THIRDPARTY,
+  ACTIVITY_BLOC_USERS,
+  ACTIVITY_ADD_PERSONS,
+  trans,
 } from "translator";
 
 export default {
-    name: "ConcernedGroups",
-    components: {
-        AddPersons,
-        PersonsBloc,
-        PersonText,
+  name: "ConcernedGroups",
+  components: {
+    AddPersons,
+    PersonsBloc,
+    PersonText,
+  },
+  setup() {
+    return {
+      trans,
+      ACTIVITY_ADD_PERSONS,
+    };
+  },
+  data() {
+    return {
+      personsBlocs: [
+        {
+          key: "persons",
+          title: trans(ACTIVITY_BLOC_PERSONS),
+          persons: [],
+          included: false,
+        },
+        {
+          key: "personsAssociated",
+          title: trans(ACTIVITY_BLOC_PERSONS_ASSOCIATED),
+          persons: [],
+          included: window.activity
+            ? window.activity.activityType.personsVisible !== 0
+            : true,
+        },
+        {
+          key: "personsNotAssociated",
+          title: "activity.bloc_persons_not_associated",
+          persons: [],
+          included: window.activity
+            ? window.activity.activityType.personsVisible !== 0
+            : true,
+        },
+        {
+          key: "thirdparty",
+          title: trans(ACTIVITY_BLOC_THIRDPARTY),
+          persons: [],
+          included: window.activity
+            ? window.activity.activityType.thirdPartiesVisible !== 0
+            : true,
+        },
+        {
+          key: "users",
+          title: trans(ACTIVITY_BLOC_USERS),
+          persons: [],
+          included: window.activity
+            ? window.activity.activityType.usersVisible !== 0
+            : true,
+        },
+      ],
+      addPersons: {
+        key: "activity",
+      },
+    };
+  },
+  computed: {
+    isComponentVisible() {
+      return window.activity
+        ? window.activity.activityType.personsVisible !== 0 ||
+            window.activity.activityType.thirdPartiesVisible !== 0 ||
+            window.activity.activityType.usersVisible !== 0
+        : true;
     },
-    setup() {
-        return {
-            trans,
-            ACTIVITY_ADD_PERSONS,
-        };
+    ...mapState({
+      persons: (state) => state.activity.persons,
+      thirdParties: (state) => state.activity.thirdParties,
+      users: (state) => state.activity.users,
+      accompanyingCourse: (state) => state.activity.accompanyingPeriod,
+    }),
+    ...mapGetters(["suggestedEntities"]),
+    getContext() {
+      return this.accompanyingCourse ? "accompanyingCourse" : "person";
     },
-    data() {
-        return {
-            personsBlocs: [
-                {
-                    key: "persons",
-                    title: trans(ACTIVITY_BLOC_PERSONS),
-                    persons: [],
-                    included: false,
-                },
-                {
-                    key: "personsAssociated",
-                    title: trans(ACTIVITY_BLOC_PERSONS_ASSOCIATED),
-                    persons: [],
-                    included: window.activity
-                        ? window.activity.activityType.personsVisible !== 0
-                        : true,
-                },
-                {
-                    key: "personsNotAssociated",
-                    title: "activity.bloc_persons_not_associated",
-                    persons: [],
-                    included: window.activity
-                        ? window.activity.activityType.personsVisible !== 0
-                        : true,
-                },
-                {
-                    key: "thirdparty",
-                    title: trans(ACTIVITY_BLOC_THIRDPARTY),
-                    persons: [],
-                    included: window.activity
-                        ? window.activity.activityType.thirdPartiesVisible !== 0
-                        : true,
-                },
-                {
-                    key: "users",
-                    title: trans(ACTIVITY_BLOC_USERS),
-                    persons: [],
-                    included: window.activity
-                        ? window.activity.activityType.usersVisible !== 0
-                        : true,
-                },
-            ],
-            addPersons: {
-                key: "activity",
-            },
-        };
+    contextPersonsBlocs() {
+      return this.personsBlocs.filter((bloc) => bloc.included !== false);
     },
-    computed: {
-        isComponentVisible() {
-            return window.activity
-                ? window.activity.activityType.personsVisible !== 0 ||
-                      window.activity.activityType.thirdPartiesVisible !== 0 ||
-                      window.activity.activityType.usersVisible !== 0
-                : true;
-        },
-        ...mapState({
-            persons: (state) => state.activity.persons,
-            thirdParties: (state) => state.activity.thirdParties,
-            users: (state) => state.activity.users,
-            accompanyingCourse: (state) => state.activity.accompanyingPeriod,
-        }),
-        ...mapGetters(["suggestedEntities"]),
-        getContext() {
-            return this.accompanyingCourse ? "accompanyingCourse" : "person";
-        },
-        contextPersonsBlocs() {
-            return this.personsBlocs.filter((bloc) => bloc.included !== false);
-        },
-        addPersonsOptions() {
-            let optionsType = [];
-            if (window.activity) {
-                if (window.activity.activityType.personsVisible !== 0) {
-                    optionsType.push("person");
-                }
-                if (window.activity.activityType.thirdPartiesVisible !== 0) {
-                    optionsType.push("thirdparty");
-                }
-                if (window.activity.activityType.usersVisible !== 0) {
-                    optionsType.push("user");
-                }
-            } else {
-                optionsType = ["person", "thirdparty", "user"];
-            }
-            return {
-                type: optionsType,
-                priority: null,
-                uniq: false,
-                button: {
-                    size: "btn-sm",
-                },
-            };
-        },
-        getBlocWidth() {
-            return Math.round(100 / this.contextPersonsBlocs.length) + "%";
+    addPersonsOptions() {
+      let optionsType = [];
+      if (window.activity) {
+        if (window.activity.activityType.personsVisible !== 0) {
+          optionsType.push("person");
+        }
+        if (window.activity.activityType.thirdPartiesVisible !== 0) {
+          optionsType.push("thirdparty");
+        }
+        if (window.activity.activityType.usersVisible !== 0) {
+          optionsType.push("user");
+        }
+      } else {
+        optionsType = ["person", "thirdparty", "user"];
+      }
+      return {
+        type: optionsType,
+        priority: null,
+        uniq: false,
+        button: {
+          size: "btn-sm",
         },
+      };
     },
-    mounted() {
-        this.setPersonsInBloc();
+    getBlocWidth() {
+      return Math.round(100 / this.contextPersonsBlocs.length) + "%";
     },
-    methods: {
-        setPersonsInBloc() {
-            let groups;
-            if (this.accompanyingCourse) {
-                groups = this.splitPersonsInGroups();
-            }
-            this.personsBlocs.forEach((bloc) => {
-                if (this.accompanyingCourse) {
-                    switch (bloc.key) {
-                        case "personsAssociated":
-                            bloc.persons = groups.personsAssociated;
-                            bloc.included = true;
-                            break;
-                        case "personsNotAssociated":
-                            bloc.persons = groups.personsNotAssociated;
-                            bloc.included = true;
-                            break;
-                    }
-                } else {
-                    switch (bloc.key) {
-                        case "persons":
-                            bloc.persons = this.persons;
-                            bloc.included = true;
-                            break;
-                    }
-                }
-                switch (bloc.key) {
-                    case "thirdparty":
-                        bloc.persons = this.thirdParties;
-                        break;
-                    case "users":
-                        bloc.persons = this.users;
-                        break;
-                }
-            }, groups);
-        },
-        splitPersonsInGroups() {
-            let personsAssociated = [];
-            let personsNotAssociated = this.persons;
-            let participations = this.getCourseParticipations();
-            this.persons.forEach((person) => {
-                participations.forEach((participation) => {
-                    if (person.id === participation.id) {
-                        //console.log(person.id);
-                        personsAssociated.push(person);
-                        personsNotAssociated = personsNotAssociated.filter(
-                            (p) => p !== person,
-                        );
-                    }
-                });
-            });
-            return {
-                personsAssociated: personsAssociated,
-                personsNotAssociated: personsNotAssociated,
-            };
-        },
-        getCourseParticipations() {
-            let participations = [];
-            this.accompanyingCourse.participations.forEach((participation) => {
-                if (!participation.endDate) {
-                    participations.push(participation.person);
-                }
-            });
-            return participations;
-        },
-        addNewPersons({ selected, modal }) {
-            console.log("@@@ CLICK button addNewPersons", selected);
-            selected.forEach((item) => {
-                this.$store.dispatch("addPersonsInvolved", item);
-            }, this);
-            this.$refs.addPersons.resetSearch(); // to cast child method
-            modal.showModal = false;
-            this.setPersonsInBloc();
-        },
-        addSuggestedEntity(person) {
-            this.$store.dispatch("addPersonsInvolved", {
-                result: person,
-                type: "person",
-            });
-            this.setPersonsInBloc();
-        },
+  },
+  mounted() {
+    this.setPersonsInBloc();
+  },
+  methods: {
+    setPersonsInBloc() {
+      let groups;
+      if (this.accompanyingCourse) {
+        groups = this.splitPersonsInGroups();
+      }
+      this.personsBlocs.forEach((bloc) => {
+        if (this.accompanyingCourse) {
+          switch (bloc.key) {
+            case "personsAssociated":
+              bloc.persons = groups.personsAssociated;
+              bloc.included = true;
+              break;
+            case "personsNotAssociated":
+              bloc.persons = groups.personsNotAssociated;
+              bloc.included = true;
+              break;
+          }
+        } else {
+          switch (bloc.key) {
+            case "persons":
+              bloc.persons = this.persons;
+              bloc.included = true;
+              break;
+          }
+        }
+        switch (bloc.key) {
+          case "thirdparty":
+            bloc.persons = this.thirdParties;
+            break;
+          case "users":
+            bloc.persons = this.users;
+            break;
+        }
+      }, groups);
     },
+    splitPersonsInGroups() {
+      let personsAssociated = [];
+      let personsNotAssociated = this.persons;
+      let participations = this.getCourseParticipations();
+      this.persons.forEach((person) => {
+        participations.forEach((participation) => {
+          if (person.id === participation.id) {
+            //console.log(person.id);
+            personsAssociated.push(person);
+            personsNotAssociated = personsNotAssociated.filter(
+              (p) => p !== person,
+            );
+          }
+        });
+      });
+      return {
+        personsAssociated: personsAssociated,
+        personsNotAssociated: personsNotAssociated,
+      };
+    },
+    getCourseParticipations() {
+      let participations = [];
+      this.accompanyingCourse.participations.forEach((participation) => {
+        if (!participation.endDate) {
+          participations.push(participation.person);
+        }
+      });
+      return participations;
+    },
+    addNewPersons({ selected, modal }) {
+      console.log("@@@ CLICK button addNewPersons", selected);
+      selected.forEach((item) => {
+        this.$store.dispatch("addPersonsInvolved", item);
+      }, this);
+      this.$refs.addPersons.resetSearch(); // to cast child method
+      modal.showModal = false;
+      this.setPersonsInBloc();
+    },
+    addSuggestedEntity(person) {
+      this.$store.dispatch("addPersonsInvolved", {
+        result: person,
+        type: "person",
+      });
+      this.setPersonsInBloc();
+    },
+  },
 };
 </script>
 
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonBadge.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonBadge.vue
index 7e839168e..3dffb5aac 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonBadge.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonBadge.vue
@@ -1,29 +1,29 @@
 <template>
-    <li>
-        <span :title="person.text" @click.prevent="$emit('remove', person)">
-            <span class="chill_denomination">
-                <person-text :person="person" :is-cut="true" />
-            </span>
-        </span>
-    </li>
+  <li>
+    <span :title="person.text" @click.prevent="$emit('remove', person)">
+      <span class="chill_denomination">
+        <person-text :person="person" :is-cut="true" />
+      </span>
+    </span>
+  </li>
 </template>
 
 <script>
 import PersonText from "ChillPersonAssets/vuejs/_components/Entity/PersonText.vue";
 
 export default {
-    name: "PersonBadge",
-    props: ["person"],
-    components: {
-        PersonText,
-    },
-    // computed: {
-    //    textCutted() {
-    //       let more = (this.person.text.length > 15) ?'…' : '';
-    //       return this.person.text.slice(0,15) + more;
-    //    }
-    // },
-    emits: ["remove"],
+  name: "PersonBadge",
+  props: ["person"],
+  components: {
+    PersonText,
+  },
+  // computed: {
+  //    textCutted() {
+  //       let more = (this.person.text.length > 15) ?'…' : '';
+  //       return this.person.text.slice(0,15) + more;
+  //    }
+  // },
+  emits: ["remove"],
 };
 </script>
 
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonsBloc.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonsBloc.vue
index c09e122a9..3bb6a84aa 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonsBloc.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonsBloc.vue
@@ -1,38 +1,38 @@
 <template>
-    <div class="item-bloc" :style="{ 'flex-basis': blocWidth }">
-        <div class="item-row">
-            <div class="item-col">
-                <h4>{{ $t(bloc.title) }}</h4>
-            </div>
-            <div class="item-col">
-                <ul class="list-suggest remove-items">
-                    <person-badge
-                        v-for="person in bloc.persons"
-                        :key="person.id"
-                        :person="person"
-                        @remove="removePerson"
-                    />
-                </ul>
-            </div>
-        </div>
+  <div class="item-bloc" :style="{ 'flex-basis': blocWidth }">
+    <div class="item-row">
+      <div class="item-col">
+        <h4>{{ $t(bloc.title) }}</h4>
+      </div>
+      <div class="item-col">
+        <ul class="list-suggest remove-items">
+          <person-badge
+            v-for="person in bloc.persons"
+            :key="person.id"
+            :person="person"
+            @remove="removePerson"
+          />
+        </ul>
+      </div>
     </div>
+  </div>
 </template>
 
 <script>
 import PersonBadge from "./PersonBadge.vue";
 export default {
-    name: "PersonsBloc",
-    components: {
-        PersonBadge,
-    },
-    props: ["bloc", "setPersonsInBloc", "blocWidth"],
-    methods: {
-        removePerson(item) {
-            console.log("@@ CLICK remove person: item", item);
-            this.$store.dispatch("removePersonInvolved", item);
-            this.setPersonsInBloc();
-        },
+  name: "PersonsBloc",
+  components: {
+    PersonBadge,
+  },
+  props: ["bloc", "setPersonsInBloc", "blocWidth"],
+  methods: {
+    removePerson(item) {
+      console.log("@@ CLICK remove person: item", item);
+      this.$store.dispatch("removePersonInvolved", item);
+      this.setPersonsInBloc();
     },
+  },
 };
 </script>
 
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue
index 2496067b8..2c16ed472 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location.vue
@@ -1,32 +1,32 @@
 <template>
-    <teleport to="#location">
-        <div class="mb-3 row">
-            <label :class="locationClassList">
-                {{ trans(ACTIVITY_LOCATION) }}
-            </label>
-            <div class="col-sm-8">
-                <VueMultiselect
-                    name="selectLocation"
-                    id="selectLocation"
-                    label="name"
-                    track-by="id"
-                    open-direction="top"
-                    :multiple="false"
-                    :searchable="true"
-                    :placeholder="trans(ACTIVITY_CHOOSE_LOCATION)"
-                    :custom-label="customLabel"
-                    :select-label="trans(MULTISELECT_SELECT_LABEL)"
-                    :deselect-label="trans(MULTISELECT_DESELECT_LABEL)"
-                    :selected-label="trans(MULTISELECT_SELECTED_LABEL)"
-                    :options="availableLocations"
-                    group-values="locations"
-                    group-label="locationGroup"
-                    v-model="location"
-                />
-                <new-location v-bind:available-locations="availableLocations" />
-            </div>
-        </div>
-    </teleport>
+  <teleport to="#location">
+    <div class="mb-3 row">
+      <label :class="locationClassList">
+        {{ trans(ACTIVITY_LOCATION) }}
+      </label>
+      <div class="col-sm-8">
+        <VueMultiselect
+          name="selectLocation"
+          id="selectLocation"
+          label="name"
+          track-by="id"
+          open-direction="top"
+          :multiple="false"
+          :searchable="true"
+          :placeholder="trans(ACTIVITY_CHOOSE_LOCATION)"
+          :custom-label="customLabel"
+          :select-label="trans(MULTISELECT_SELECT_LABEL)"
+          :deselect-label="trans(MULTISELECT_DESELECT_LABEL)"
+          :selected-label="trans(MULTISELECT_SELECTED_LABEL)"
+          :options="availableLocations"
+          group-values="locations"
+          group-label="locationGroup"
+          v-model="location"
+        />
+        <new-location v-bind:available-locations="availableLocations" />
+      </div>
+    </div>
+  </teleport>
 </template>
 
 <script>
@@ -35,60 +35,60 @@ import VueMultiselect from "vue-multiselect";
 import NewLocation from "./Location/NewLocation.vue";
 import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
 import {
-    trans,
-    ACTIVITY_LOCATION,
-    ACTIVITY_CHOOSE_LOCATION,
-    MULTISELECT_SELECT_LABEL,
-    MULTISELECT_DESELECT_LABEL,
-    MULTISELECT_SELECTED_LABEL,
+  trans,
+  ACTIVITY_LOCATION,
+  ACTIVITY_CHOOSE_LOCATION,
+  MULTISELECT_SELECT_LABEL,
+  MULTISELECT_DESELECT_LABEL,
+  MULTISELECT_SELECTED_LABEL,
 } from "translator";
 
 export default {
-    name: "Location",
-    components: {
-        NewLocation,
-        VueMultiselect,
+  name: "Location",
+  components: {
+    NewLocation,
+    VueMultiselect,
+  },
+  setup() {
+    return {
+      trans,
+      ACTIVITY_LOCATION,
+      ACTIVITY_CHOOSE_LOCATION,
+      MULTISELECT_SELECT_LABEL,
+      MULTISELECT_DESELECT_LABEL,
+      MULTISELECT_SELECTED_LABEL,
+    };
+  },
+  data() {
+    return {
+      locationClassList: `col-form-label col-sm-4 ${document.querySelector("input#chill_activitybundle_activity_location").getAttribute("required") ? "required" : ""}`,
+    };
+  },
+  computed: {
+    ...mapState(["activity", "availableLocations"]),
+    ...mapGetters(["suggestedEntities"]),
+    location: {
+      get() {
+        return this.activity.location;
+      },
+      set(value) {
+        this.$store.dispatch("updateLocation", value);
+      },
     },
-    setup() {
-        return {
-            trans,
-            ACTIVITY_LOCATION,
-            ACTIVITY_CHOOSE_LOCATION,
-            MULTISELECT_SELECT_LABEL,
-            MULTISELECT_DESELECT_LABEL,
-            MULTISELECT_SELECTED_LABEL,
-        };
+  },
+  methods: {
+    labelAccompanyingCourseLocation(value) {
+      return `${value.address.text} (${localizeString(value.locationType.title)})`;
     },
-    data() {
-        return {
-            locationClassList: `col-form-label col-sm-4 ${document.querySelector("input#chill_activitybundle_activity_location").getAttribute("required") ? "required" : ""}`,
-        };
-    },
-    computed: {
-        ...mapState(["activity", "availableLocations"]),
-        ...mapGetters(["suggestedEntities"]),
-        location: {
-            get() {
-                return this.activity.location;
-            },
-            set(value) {
-                this.$store.dispatch("updateLocation", value);
-            },
-        },
-    },
-    methods: {
-        labelAccompanyingCourseLocation(value) {
-            return `${value.address.text} (${localizeString(value.locationType.title)})`;
-        },
-        customLabel(value) {
-            return value.locationType
-                ? value.name
-                    ? value.name === "__AccompanyingCourseLocation__"
-                        ? this.labelAccompanyingCourseLocation(value)
-                        : `${value.name} (${localizeString(value.locationType.title)})`
-                    : localizeString(value.locationType.title)
-                : "";
-        },
+    customLabel(value) {
+      return value.locationType
+        ? value.name
+          ? value.name === "__AccompanyingCourseLocation__"
+            ? this.labelAccompanyingCourseLocation(value)
+            : `${value.name} (${localizeString(value.locationType.title)})`
+          : localizeString(value.locationType.title)
+        : "";
     },
+  },
 };
 </script>
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue
index 1cc16ac95..c7dfbf778 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue
@@ -1,123 +1,114 @@
 <template>
-    <div>
-        <ul class="record_actions">
-            <li>
-                <a class="btn btn-sm btn-create" @click="openModal">
-                    {{ trans(ACTIVITY_CREATE_NEW_LOCATION) }}
-                </a>
-            </li>
-        </ul>
+  <div>
+    <ul class="record_actions">
+      <li>
+        <a class="btn btn-sm btn-create" @click="openModal">
+          {{ trans(ACTIVITY_CREATE_NEW_LOCATION) }}
+        </a>
+      </li>
+    </ul>
 
-        <teleport to="body">
-            <modal
-                v-if="modal.showModal"
-                :modalDialogClass="modal.modalDialogClass"
-                @close="modal.showModal = false"
-            >
-                <template #header>
-                    <h3 class="modal-title">
-                        {{ trans(ACTIVITY_CREATE_NEW_LOCATION) }}
-                    </h3>
-                </template>
-                <template #body>
-                    <form>
-                        <div class="alert alert-warning" v-if="errors.length">
-                            <ul>
-                                <li v-for="(e, i) in errors" :key="i">
-                                    {{ e }}
-                                </li>
-                            </ul>
-                        </div>
+    <teleport to="body">
+      <modal
+        v-if="modal.showModal"
+        :modalDialogClass="modal.modalDialogClass"
+        @close="modal.showModal = false"
+      >
+        <template #header>
+          <h3 class="modal-title">
+            {{ trans(ACTIVITY_CREATE_NEW_LOCATION) }}
+          </h3>
+        </template>
+        <template #body>
+          <form>
+            <div class="alert alert-warning" v-if="errors.length">
+              <ul>
+                <li v-for="(e, i) in errors" :key="i">
+                  {{ e }}
+                </li>
+              </ul>
+            </div>
 
-                        <div class="form-floating mb-3">
-                            <select
-                                class="form-select form-select-lg"
-                                id="type"
-                                required
-                                v-model="selectType"
-                            >
-                                <option selected disabled value="">
-                                    {{ trans(ACTIVITY_CHOOSE_LOCATION_TYPE) }}
-                                </option>
-                                <option
-                                    v-for="t in locationTypes"
-                                    :value="t"
-                                    :key="t.id"
-                                >
-                                    {{ localizeString(t.title) }}
-                                </option>
-                            </select>
-                            <label>{{
-                                trans(ACTIVITY_LOCATION_FIELDS_TYPE)
-                            }}</label>
-                        </div>
+            <div class="form-floating mb-3">
+              <select
+                class="form-select form-select-lg"
+                id="type"
+                required
+                v-model="selectType"
+              >
+                <option selected disabled value="">
+                  {{ trans(ACTIVITY_CHOOSE_LOCATION_TYPE) }}
+                </option>
+                <option v-for="t in locationTypes" :value="t" :key="t.id">
+                  {{ localizeString(t.title) }}
+                </option>
+              </select>
+              <label>{{ trans(ACTIVITY_LOCATION_FIELDS_TYPE) }}</label>
+            </div>
 
-                        <div class="form-floating mb-3">
-                            <input
-                                class="form-control form-control-lg"
-                                id="name"
-                                v-model="inputName"
-                                placeholder
-                            />
-                            <label for="name">{{
-                                trans(ACTIVITY_LOCATION_FIELDS_NAME)
-                            }}</label>
-                        </div>
+            <div class="form-floating mb-3">
+              <input
+                class="form-control form-control-lg"
+                id="name"
+                v-model="inputName"
+                placeholder
+              />
+              <label for="name">{{
+                trans(ACTIVITY_LOCATION_FIELDS_NAME)
+              }}</label>
+            </div>
 
-                        <add-address
-                            :context="addAddress.context"
-                            :options="addAddress.options"
-                            :addressChangedCallback="submitNewAddress"
-                            v-if="showAddAddress"
-                            ref="addAddress"
-                        />
+            <add-address
+              :context="addAddress.context"
+              :options="addAddress.options"
+              :addressChangedCallback="submitNewAddress"
+              v-if="showAddAddress"
+              ref="addAddress"
+            />
 
-                        <div class="form-floating mb-3" v-if="showContactData">
-                            <input
-                                class="form-control form-control-lg"
-                                id="phonenumber1"
-                                v-model="inputPhonenumber1"
-                                placeholder
-                            />
-                            <label for="phonenumber1">{{
-                                trans(ACTIVITY_LOCATION_FIELDS_PHONENUMBER1)
-                            }}</label>
-                        </div>
-                        <div class="form-floating mb-3" v-if="hasPhonenumber1">
-                            <input
-                                class="form-control form-control-lg"
-                                id="phonenumber2"
-                                v-model="inputPhonenumber2"
-                                placeholder
-                            />
-                            <label for="phonenumber2">{{
-                                trans(ACTIVITY_LOCATION_FIELDS_PHONENUMBER2)
-                            }}</label>
-                        </div>
-                        <div class="form-floating mb-3" v-if="showContactData">
-                            <input
-                                class="form-control form-control-lg"
-                                id="email"
-                                v-model="inputEmail"
-                                placeholder
-                            />
-                            <label for="email">{{
-                                trans(ACTIVITY_LOCATION_FIELDS_EMAIL)
-                            }}</label>
-                        </div>
-                    </form>
-                </template>
-                <template #footer>
-                    <button
-                        class="btn btn-save"
-                        @click.prevent="saveNewLocation"
-                    >
-                        {{ trans(SAVE) }}
-                    </button>
-                </template>
-            </modal>
-        </teleport>
-    </div>
+            <div class="form-floating mb-3" v-if="showContactData">
+              <input
+                class="form-control form-control-lg"
+                id="phonenumber1"
+                v-model="inputPhonenumber1"
+                placeholder
+              />
+              <label for="phonenumber1">{{
+                trans(ACTIVITY_LOCATION_FIELDS_PHONENUMBER1)
+              }}</label>
+            </div>
+            <div class="form-floating mb-3" v-if="hasPhonenumber1">
+              <input
+                class="form-control form-control-lg"
+                id="phonenumber2"
+                v-model="inputPhonenumber2"
+                placeholder
+              />
+              <label for="phonenumber2">{{
+                trans(ACTIVITY_LOCATION_FIELDS_PHONENUMBER2)
+              }}</label>
+            </div>
+            <div class="form-floating mb-3" v-if="showContactData">
+              <input
+                class="form-control form-control-lg"
+                id="email"
+                v-model="inputEmail"
+                placeholder
+              />
+              <label for="email">{{
+                trans(ACTIVITY_LOCATION_FIELDS_EMAIL)
+              }}</label>
+            </div>
+          </form>
+        </template>
+        <template #footer>
+          <button class="btn btn-save" @click.prevent="saveNewLocation">
+            {{ trans(SAVE) }}
+          </button>
+        </template>
+      </modal>
+    </teleport>
+  </div>
 </template>
 
 <script>
@@ -128,237 +119,236 @@ import { getLocationTypes } from "../../api";
 import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
 import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
 import {
-    SAVE,
-    ACTIVITY_LOCATION_FIELDS_EMAIL,
-    ACTIVITY_LOCATION_FIELDS_PHONENUMBER1,
-    ACTIVITY_LOCATION_FIELDS_PHONENUMBER2,
-    ACTIVITY_LOCATION_FIELDS_NAME,
-    ACTIVITY_LOCATION_FIELDS_TYPE,
-    ACTIVITY_CHOOSE_LOCATION_TYPE,
-    ACTIVITY_CREATE_NEW_LOCATION,
-    trans,
+  SAVE,
+  ACTIVITY_LOCATION_FIELDS_EMAIL,
+  ACTIVITY_LOCATION_FIELDS_PHONENUMBER1,
+  ACTIVITY_LOCATION_FIELDS_PHONENUMBER2,
+  ACTIVITY_LOCATION_FIELDS_NAME,
+  ACTIVITY_LOCATION_FIELDS_TYPE,
+  ACTIVITY_CHOOSE_LOCATION_TYPE,
+  ACTIVITY_CREATE_NEW_LOCATION,
+  trans,
 } from "translator";
 
 export default {
-    name: "NewLocation",
-    components: {
-        Modal,
-        AddAddress,
+  name: "NewLocation",
+  components: {
+    Modal,
+    AddAddress,
+  },
+  setup() {
+    return {
+      trans,
+      SAVE,
+      ACTIVITY_LOCATION_FIELDS_EMAIL,
+      ACTIVITY_LOCATION_FIELDS_PHONENUMBER1,
+      ACTIVITY_LOCATION_FIELDS_PHONENUMBER2,
+      ACTIVITY_LOCATION_FIELDS_NAME,
+      ACTIVITY_LOCATION_FIELDS_TYPE,
+      ACTIVITY_CHOOSE_LOCATION_TYPE,
+      ACTIVITY_CREATE_NEW_LOCATION,
+    };
+  },
+  props: ["availableLocations"],
+  data() {
+    return {
+      errors: [],
+      selected: {
+        type: null,
+        name: null,
+        addressId: null,
+        phonenumber1: null,
+        phonenumber2: null,
+        email: null,
+      },
+      locationTypes: [],
+      modal: {
+        showModal: false,
+        modalDialogClass: "modal-dialog-scrollable modal-xl",
+      },
+      addAddress: {
+        options: {
+          button: {
+            text: {
+              create: "activity.create_address",
+              edit: "activity.edit_address",
+            },
+            size: "btn-sm",
+          },
+          title: {
+            create: "activity.create_address",
+            edit: "activity.edit_address",
+          },
+        },
+        context: {
+          target: {
+            //name, id
+          },
+          edit: false,
+          addressId: null,
+          defaults: window.addaddress,
+        },
+      },
+    };
+  },
+  computed: {
+    ...mapState(["activity"]),
+    selectType: {
+      get() {
+        return this.selected.type;
+      },
+      set(value) {
+        this.selected.type = value;
+      },
     },
-    setup() {
-        return {
-            trans,
-            SAVE,
-            ACTIVITY_LOCATION_FIELDS_EMAIL,
-            ACTIVITY_LOCATION_FIELDS_PHONENUMBER1,
-            ACTIVITY_LOCATION_FIELDS_PHONENUMBER2,
-            ACTIVITY_LOCATION_FIELDS_NAME,
-            ACTIVITY_LOCATION_FIELDS_TYPE,
-            ACTIVITY_CHOOSE_LOCATION_TYPE,
-            ACTIVITY_CREATE_NEW_LOCATION,
+    inputName: {
+      get() {
+        return this.selected.name;
+      },
+      set(value) {
+        this.selected.name = value;
+      },
+    },
+    inputEmail: {
+      get() {
+        return this.selected.email;
+      },
+      set(value) {
+        this.selected.email = value;
+      },
+    },
+    inputPhonenumber1: {
+      get() {
+        return this.selected.phonenumber1;
+      },
+      set(value) {
+        this.selected.phonenumber1 = value;
+      },
+    },
+    inputPhonenumber2: {
+      get() {
+        return this.selected.phonenumber2;
+      },
+      set(value) {
+        this.selected.phonenumber2 = value;
+      },
+    },
+    hasPhonenumber1() {
+      return (
+        this.selected.phonenumber1 !== null && this.selected.phonenumber1 !== ""
+      );
+    },
+    showAddAddress() {
+      let cond = false;
+      if (this.selected.type) {
+        if (this.selected.type.addressRequired !== "never") {
+          cond = true;
+        }
+      }
+      return cond;
+    },
+    showContactData() {
+      let cond = false;
+      if (this.selected.type) {
+        if (this.selected.type.contactData !== "never") {
+          cond = true;
+        }
+      }
+      return cond;
+    },
+  },
+  mounted() {
+    this.getLocationTypesList();
+  },
+  methods: {
+    localizeString,
+    checkForm() {
+      let cond = true;
+      this.errors = [];
+      if (!this.selected.type) {
+        this.errors.push("Type de localisation requis");
+        cond = false;
+      } else {
+        if (
+          this.selected.type.addressRequired === "required" &&
+          !this.selected.addressId
+        ) {
+          this.errors.push("Adresse requise");
+          cond = false;
+        }
+        if (
+          this.selected.type.contactData === "required" &&
+          !this.selected.phonenumber1
+        ) {
+          this.errors.push("Numéro de téléphone requis");
+          cond = false;
+        }
+        if (
+          this.selected.type.contactData === "required" &&
+          !this.selected.email
+        ) {
+          this.errors.push("Adresse email requise");
+          cond = false;
+        }
+      }
+      return cond;
+    },
+    getLocationTypesList() {
+      getLocationTypes().then((results) => {
+        this.locationTypes = results.filter(
+          (t) => t.availableForUsers === true,
+        );
+      });
+    },
+    openModal() {
+      this.modal.showModal = true;
+    },
+    saveNewLocation() {
+      if (this.checkForm()) {
+        let body = {
+          type: "location",
+          name: this.selected.name,
+          locationType: {
+            id: this.selected.type.id,
+            type: "location-type",
+          },
+          phonenumber1: this.selected.phonenumber1,
+          phonenumber2: this.selected.phonenumber2,
+          email: this.selected.email,
         };
-    },
-    props: ["availableLocations"],
-    data() {
-        return {
-            errors: [],
-            selected: {
-                type: null,
-                name: null,
-                addressId: null,
-                phonenumber1: null,
-                phonenumber2: null,
-                email: null,
+        if (this.selected.addressId) {
+          body = Object.assign(body, {
+            address: {
+              id: this.selected.addressId,
             },
-            locationTypes: [],
-            modal: {
-                showModal: false,
-                modalDialogClass: "modal-dialog-scrollable modal-xl",
-            },
-            addAddress: {
-                options: {
-                    button: {
-                        text: {
-                            create: "activity.create_address",
-                            edit: "activity.edit_address",
-                        },
-                        size: "btn-sm",
-                    },
-                    title: {
-                        create: "activity.create_address",
-                        edit: "activity.edit_address",
-                    },
-                },
-                context: {
-                    target: {
-                        //name, id
-                    },
-                    edit: false,
-                    addressId: null,
-                    defaults: window.addaddress,
-                },
-            },
-        };
-    },
-    computed: {
-        ...mapState(["activity"]),
-        selectType: {
-            get() {
-                return this.selected.type;
-            },
-            set(value) {
-                this.selected.type = value;
-            },
-        },
-        inputName: {
-            get() {
-                return this.selected.name;
-            },
-            set(value) {
-                this.selected.name = value;
-            },
-        },
-        inputEmail: {
-            get() {
-                return this.selected.email;
-            },
-            set(value) {
-                this.selected.email = value;
-            },
-        },
-        inputPhonenumber1: {
-            get() {
-                return this.selected.phonenumber1;
-            },
-            set(value) {
-                this.selected.phonenumber1 = value;
-            },
-        },
-        inputPhonenumber2: {
-            get() {
-                return this.selected.phonenumber2;
-            },
-            set(value) {
-                this.selected.phonenumber2 = value;
-            },
-        },
-        hasPhonenumber1() {
-            return (
-                this.selected.phonenumber1 !== null &&
-                this.selected.phonenumber1 !== ""
-            );
-        },
-        showAddAddress() {
-            let cond = false;
-            if (this.selected.type) {
-                if (this.selected.type.addressRequired !== "never") {
-                    cond = true;
-                }
-            }
-            return cond;
-        },
-        showContactData() {
-            let cond = false;
-            if (this.selected.type) {
-                if (this.selected.type.contactData !== "never") {
-                    cond = true;
-                }
-            }
-            return cond;
-        },
-    },
-    mounted() {
-        this.getLocationTypesList();
-    },
-    methods: {
-        localizeString,
-        checkForm() {
-            let cond = true;
-            this.errors = [];
-            if (!this.selected.type) {
-                this.errors.push("Type de localisation requis");
-                cond = false;
-            } else {
-                if (
-                    this.selected.type.addressRequired === "required" &&
-                    !this.selected.addressId
-                ) {
-                    this.errors.push("Adresse requise");
-                    cond = false;
-                }
-                if (
-                    this.selected.type.contactData === "required" &&
-                    !this.selected.phonenumber1
-                ) {
-                    this.errors.push("Numéro de téléphone requis");
-                    cond = false;
-                }
-                if (
-                    this.selected.type.contactData === "required" &&
-                    !this.selected.email
-                ) {
-                    this.errors.push("Adresse email requise");
-                    cond = false;
-                }
-            }
-            return cond;
-        },
-        getLocationTypesList() {
-            getLocationTypes().then((results) => {
-                this.locationTypes = results.filter(
-                    (t) => t.availableForUsers === true,
-                );
-            });
-        },
-        openModal() {
-            this.modal.showModal = true;
-        },
-        saveNewLocation() {
-            if (this.checkForm()) {
-                let body = {
-                    type: "location",
-                    name: this.selected.name,
-                    locationType: {
-                        id: this.selected.type.id,
-                        type: "location-type",
-                    },
-                    phonenumber1: this.selected.phonenumber1,
-                    phonenumber2: this.selected.phonenumber2,
-                    email: this.selected.email,
-                };
-                if (this.selected.addressId) {
-                    body = Object.assign(body, {
-                        address: {
-                            id: this.selected.addressId,
-                        },
-                    });
-                }
+          });
+        }
 
-                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");
-                        }
-                    });
+        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) {
-            this.selected.addressId = payload.addressId;
-            this.addAddress.context.addressId = payload.addressId;
-            this.addAddress.context.edit = true;
-        },
+          });
+      }
     },
+    submitNewAddress(payload) {
+      this.selected.addressId = payload.addressId;
+      this.addAddress.context.addressId = payload.addressId;
+      this.addAddress.context.edit = true;
+    },
+  },
 };
 </script>
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue
index a45d93b2a..15bb9acd1 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue
@@ -1,103 +1,98 @@
 <template>
-    <teleport to="#social-issues-acc">
-        <div class="mb-3 row">
-            <div class="col-4">
-                <label :class="socialIssuesClassList">{{
-                    trans(ACTIVITY_SOCIAL_ISSUES)
-                }}</label>
-            </div>
-            <div class="col-8">
-                <check-social-issue
-                    v-for="issue in socialIssuesList"
-                    :key="issue.id"
-                    :issue="issue"
-                    :selection="socialIssuesSelected"
-                    @updateSelected="updateIssuesSelected"
-                >
-                </check-social-issue>
+  <teleport to="#social-issues-acc">
+    <div class="mb-3 row">
+      <div class="col-4">
+        <label :class="socialIssuesClassList">{{
+          trans(ACTIVITY_SOCIAL_ISSUES)
+        }}</label>
+      </div>
+      <div class="col-8">
+        <check-social-issue
+          v-for="issue in socialIssuesList"
+          :key="issue.id"
+          :issue="issue"
+          :selection="socialIssuesSelected"
+          @updateSelected="updateIssuesSelected"
+        >
+        </check-social-issue>
 
-                <div class="my-3">
-                    <VueMultiselect
-                        name="otherIssues"
-                        label="text"
-                        track-by="id"
-                        open-direction="bottom"
-                        :close-on-select="true"
-                        :preserve-search="false"
-                        :reset-after="true"
-                        :hide-selected="true"
-                        :taggable="false"
-                        :multiple="false"
-                        :searchable="true"
-                        :allow-empty="true"
-                        :show-labels="false"
-                        :loading="issueIsLoading"
-                        :placeholder="trans(ACTIVITY_CHOOSE_OTHER_SOCIAL_ISSUE)"
-                        :options="socialIssuesOther"
-                        @select="addIssueInList"
-                    >
-                    </VueMultiselect>
-                </div>
-            </div>
+        <div class="my-3">
+          <VueMultiselect
+            name="otherIssues"
+            label="text"
+            track-by="id"
+            open-direction="bottom"
+            :close-on-select="true"
+            :preserve-search="false"
+            :reset-after="true"
+            :hide-selected="true"
+            :taggable="false"
+            :multiple="false"
+            :searchable="true"
+            :allow-empty="true"
+            :show-labels="false"
+            :loading="issueIsLoading"
+            :placeholder="trans(ACTIVITY_CHOOSE_OTHER_SOCIAL_ISSUE)"
+            :options="socialIssuesOther"
+            @select="addIssueInList"
+          >
+          </VueMultiselect>
+        </div>
+      </div>
+    </div>
+
+    <div class="mb-3 row">
+      <div class="col-4">
+        <label :class="socialActionsClassList">{{
+          trans(ACTIVITY_SOCIAL_ACTIONS)
+        }}</label>
+      </div>
+      <div class="col-8">
+        <div v-if="actionIsLoading === true">
+          <i class="chill-green fa fa-circle-o-notch fa-spin fa-lg"></i>
         </div>
 
-        <div class="mb-3 row">
-            <div class="col-4">
-                <label :class="socialActionsClassList">{{
-                    trans(ACTIVITY_SOCIAL_ACTIONS)
-                }}</label>
-            </div>
-            <div class="col-8">
-                <div v-if="actionIsLoading === true">
-                    <i
-                        class="chill-green fa fa-circle-o-notch fa-spin fa-lg"
-                    ></i>
-                </div>
+        <span
+          v-else-if="socialIssuesSelected.length === 0"
+          class="inline-choice chill-no-data-statement mt-3"
+        >
+          {{ trans(ACTIVITY_SELECT_FIRST_A_SOCIAL_ISSUE) }}
+        </span>
 
-                <span
-                    v-else-if="socialIssuesSelected.length === 0"
-                    class="inline-choice chill-no-data-statement mt-3"
-                >
-                    {{ trans(ACTIVITY_SELECT_FIRST_A_SOCIAL_ISSUE) }}
-                </span>
+        <template
+          v-else-if="
+            socialActionsList.length > 0 &&
+            (socialIssuesSelected.length || socialActionsSelected.length)
+          "
+        >
+          <div
+            id="actionsList"
+            v-for="group in socialActionsList"
+            :key="group.issue"
+          >
+            <span class="badge bg-chill-l-gray text-dark">{{
+              group.issue
+            }}</span>
+            <check-social-action
+              v-for="action in group.actions"
+              :key="action.id"
+              :action="action"
+              :selection="socialActionsSelected"
+              @updateSelected="updateActionsSelected"
+            >
+            </check-social-action>
+          </div>
+        </template>
 
-                <template
-                    v-else-if="
-                        socialActionsList.length > 0 &&
-                        (socialIssuesSelected.length ||
-                            socialActionsSelected.length)
-                    "
-                >
-                    <div
-                        id="actionsList"
-                        v-for="group in socialActionsList"
-                        :key="group.issue"
-                    >
-                        <span class="badge bg-chill-l-gray text-dark">{{
-                            group.issue
-                        }}</span>
-                        <check-social-action
-                            v-for="action in group.actions"
-                            :key="action.id"
-                            :action="action"
-                            :selection="socialActionsSelected"
-                            @updateSelected="updateActionsSelected"
-                        >
-                        </check-social-action>
-                    </div>
-                </template>
-
-                <span
-                    v-else-if="
-                        actionAreLoaded && socialActionsList.length === 0
-                    "
-                    class="inline-choice chill-no-data-statement mt-3"
-                >
-                    {{ trans(ACTIVITY_SOCIAL_ACTION_LIST_EMPTY) }}
-                </span>
-            </div>
-        </div>
-    </teleport>
+        <span
+          v-else-if="actionAreLoaded && socialActionsList.length === 0"
+          class="inline-choice chill-no-data-statement mt-3"
+        >
+          {{ trans(ACTIVITY_SOCIAL_ACTION_LIST_EMPTY) }}
+        </span>
+      </div>
+    </div>
+  </teleport>
 </template>
 
 <script>
@@ -106,154 +101,153 @@ import CheckSocialIssue from "./SocialIssuesAcc/CheckSocialIssue.vue";
 import CheckSocialAction from "./SocialIssuesAcc/CheckSocialAction.vue";
 import { getSocialIssues, getSocialActionByIssue } from "../api.js";
 import {
-    ACTIVITY_SOCIAL_ACTION_LIST_EMPTY,
-    ACTIVITY_SELECT_FIRST_A_SOCIAL_ISSUE,
-    ACTIVITY_SOCIAL_ACTIONS,
-    ACTIVITY_SOCIAL_ISSUES,
-    ACTIVITY_CHOOSE_OTHER_SOCIAL_ISSUE,
-    trans,
+  ACTIVITY_SOCIAL_ACTION_LIST_EMPTY,
+  ACTIVITY_SELECT_FIRST_A_SOCIAL_ISSUE,
+  ACTIVITY_SOCIAL_ACTIONS,
+  ACTIVITY_SOCIAL_ISSUES,
+  ACTIVITY_CHOOSE_OTHER_SOCIAL_ISSUE,
+  trans,
 } from "translator";
 
 export default {
-    name: "SocialIssuesAcc",
-    components: {
-        CheckSocialIssue,
-        CheckSocialAction,
-        VueMultiselect,
+  name: "SocialIssuesAcc",
+  components: {
+    CheckSocialIssue,
+    CheckSocialAction,
+    VueMultiselect,
+  },
+  setup() {
+    return {
+      trans,
+      ACTIVITY_SOCIAL_ACTION_LIST_EMPTY,
+      ACTIVITY_SELECT_FIRST_A_SOCIAL_ISSUE,
+      ACTIVITY_SOCIAL_ACTIONS,
+      ACTIVITY_SOCIAL_ISSUES,
+      ACTIVITY_CHOOSE_OTHER_SOCIAL_ISSUE,
+    };
+  },
+  data() {
+    return {
+      issueIsLoading: false,
+      actionIsLoading: false,
+      actionAreLoaded: false,
+      socialIssuesClassList: `col-form-label ${document.querySelector("input#chill_activitybundle_activity_socialIssues").getAttribute("required") ? "required" : ""}`,
+      socialActionsClassList: `col-form-label ${document.querySelector("input#chill_activitybundle_activity_socialActions").getAttribute("required") ? "required" : ""}`,
+    };
+  },
+  computed: {
+    socialIssuesList() {
+      return this.$store.state.activity.accompanyingPeriod.socialIssues;
     },
-    setup() {
-        return {
-            trans,
-            ACTIVITY_SOCIAL_ACTION_LIST_EMPTY,
-            ACTIVITY_SELECT_FIRST_A_SOCIAL_ISSUE,
-            ACTIVITY_SOCIAL_ACTIONS,
-            ACTIVITY_SOCIAL_ISSUES,
-            ACTIVITY_CHOOSE_OTHER_SOCIAL_ISSUE,
-        };
+    socialIssuesSelected() {
+      return this.$store.state.activity.socialIssues;
     },
-    data() {
-        return {
-            issueIsLoading: false,
-            actionIsLoading: false,
-            actionAreLoaded: false,
-            socialIssuesClassList: `col-form-label ${document.querySelector("input#chill_activitybundle_activity_socialIssues").getAttribute("required") ? "required" : ""}`,
-            socialActionsClassList: `col-form-label ${document.querySelector("input#chill_activitybundle_activity_socialActions").getAttribute("required") ? "required" : ""}`,
-        };
+    socialIssuesOther() {
+      return this.$store.state.socialIssuesOther;
     },
-    computed: {
-        socialIssuesList() {
-            return this.$store.state.activity.accompanyingPeriod.socialIssues;
-        },
-        socialIssuesSelected() {
-            return this.$store.state.activity.socialIssues;
-        },
-        socialIssuesOther() {
-            return this.$store.state.socialIssuesOther;
-        },
-        socialActionsList() {
-            return this.$store.getters.socialActionsListSorted;
-        },
-        socialActionsSelected() {
-            return this.$store.state.activity.socialActions;
-        },
+    socialActionsList() {
+      return this.$store.getters.socialActionsListSorted;
     },
-    mounted() {
-        /* Load other issues in multiselect */
-        this.issueIsLoading = true;
-        this.actionAreLoaded = false;
-
-        getSocialIssues().then((response) => {
-            /* Add issues to the store */
-            this.$store.commit("updateIssuesOther", response);
-
-            /* Add in list the issues already associated (if not yet listed) */
-            this.socialIssuesSelected.forEach((issue) => {
-                if (
-                    this.socialIssuesList.filter((i) => i.id === issue.id)
-                        .length !== 1
-                ) {
-                    this.$store.commit("addIssueInList", issue);
-                }
-            });
-
-            /* Remove from multiselect the issues that are not yet in the checkbox list */
-            this.socialIssuesList.forEach((issue) => {
-                this.$store.commit("removeIssueInOther", issue);
-            });
-
-            /* Filter issues */
-            this.$store.commit("filterList", "issues");
-
-            /* Add in list the actions already associated (if not yet listed) */
-            this.socialActionsSelected.forEach((action) => {
-                this.$store.commit("addActionInList", action);
-            });
-
-            /* Filter actions */
-            this.$store.commit("filterList", "actions");
-
-            this.issueIsLoading = false;
-            this.actionAreLoaded = true;
-            this.updateActionsList();
-        });
+    socialActionsSelected() {
+      return this.$store.state.activity.socialActions;
     },
-    methods: {
-        /* When choosing an issue in multiselect, add it in checkboxes (as selected),
+  },
+  mounted() {
+    /* Load other issues in multiselect */
+    this.issueIsLoading = true;
+    this.actionAreLoaded = false;
+
+    getSocialIssues().then((response) => {
+      /* Add issues to the store */
+      this.$store.commit("updateIssuesOther", response);
+
+      /* Add in list the issues already associated (if not yet listed) */
+      this.socialIssuesSelected.forEach((issue) => {
+        if (
+          this.socialIssuesList.filter((i) => i.id === issue.id).length !== 1
+        ) {
+          this.$store.commit("addIssueInList", issue);
+        }
+      });
+
+      /* Remove from multiselect the issues that are not yet in the checkbox list */
+      this.socialIssuesList.forEach((issue) => {
+        this.$store.commit("removeIssueInOther", issue);
+      });
+
+      /* Filter issues */
+      this.$store.commit("filterList", "issues");
+
+      /* Add in list the actions already associated (if not yet listed) */
+      this.socialActionsSelected.forEach((action) => {
+        this.$store.commit("addActionInList", action);
+      });
+
+      /* Filter actions */
+      this.$store.commit("filterList", "actions");
+
+      this.issueIsLoading = false;
+      this.actionAreLoaded = true;
+      this.updateActionsList();
+    });
+  },
+  methods: {
+    /* When choosing an issue in multiselect, add it in checkboxes (as selected),
          remove it from multiselect, and add socialActions concerned
       */
-        addIssueInList(value) {
-            //console.log('addIssueInList', value);
-            this.$store.commit("addIssueInList", value);
-            this.$store.commit("removeIssueInOther", value);
-            this.$store.dispatch("addIssueSelected", value);
-            this.updateActionsList();
-        },
-        /* Update value for selected issues checkboxes
-         */
-        updateIssuesSelected(issues) {
-            //console.log('updateIssuesSelected', issues);
-            this.$store.dispatch("updateIssuesSelected", issues);
-            this.updateActionsList();
-        },
-        /* Update value for selected actions checkboxes
-         */
-        updateActionsSelected(actions) {
-            //console.log('updateActionsSelected', actions);
-            this.$store.dispatch("updateActionsSelected", actions);
-        },
-        /* Add socialActions concerned: after reset, loop on each issue selected
+    addIssueInList(value) {
+      //console.log('addIssueInList', value);
+      this.$store.commit("addIssueInList", value);
+      this.$store.commit("removeIssueInOther", value);
+      this.$store.dispatch("addIssueSelected", value);
+      this.updateActionsList();
+    },
+    /* Update value for selected issues checkboxes
+     */
+    updateIssuesSelected(issues) {
+      //console.log('updateIssuesSelected', issues);
+      this.$store.dispatch("updateIssuesSelected", issues);
+      this.updateActionsList();
+    },
+    /* Update value for selected actions checkboxes
+     */
+    updateActionsSelected(actions) {
+      //console.log('updateActionsSelected', actions);
+      this.$store.dispatch("updateActionsSelected", actions);
+    },
+    /* Add socialActions concerned: after reset, loop on each issue selected
          to get social actions concerned
       */
-        updateActionsList() {
-            this.resetActionsList();
-            this.socialIssuesSelected.forEach((item) => {
-                this.actionIsLoading = true;
-                getSocialActionByIssue(item.id).then(
-                    (actions) =>
-                        new Promise((resolve) => {
-                            actions.results.forEach((action) => {
-                                this.$store.commit("addActionInList", action);
-                            }, this);
+    updateActionsList() {
+      this.resetActionsList();
+      this.socialIssuesSelected.forEach((item) => {
+        this.actionIsLoading = true;
+        getSocialActionByIssue(item.id).then(
+          (actions) =>
+            new Promise((resolve) => {
+              actions.results.forEach((action) => {
+                this.$store.commit("addActionInList", action);
+              }, this);
 
-                            this.$store.commit("filterList", "actions");
+              this.$store.commit("filterList", "actions");
 
-                            this.actionIsLoading = false;
-                            this.actionAreLoaded = true;
-                            resolve();
-                        }),
-                );
-            }, this);
-        },
-        /* Reset socialActions List: flush list and restore selected actions
-         */
-        resetActionsList() {
-            this.$store.commit("resetActionsList");
-            this.actionAreLoaded = false;
-            this.socialActionsSelected.forEach((item) => {
-                this.$store.commit("addActionInList", item);
-            }, this);
-        },
+              this.actionIsLoading = false;
+              this.actionAreLoaded = true;
+              resolve();
+            }),
+        );
+      }, this);
     },
+    /* Reset socialActions List: flush list and restore selected actions
+     */
+    resetActionsList() {
+      this.$store.commit("resetActionsList");
+      this.actionAreLoaded = false;
+      this.socialActionsSelected.forEach((item) => {
+        this.$store.commit("addActionInList", item);
+      }, this);
+    },
+  },
 };
 </script>
 
@@ -263,18 +257,18 @@ export default {
 @import "ChillMainAssets/chill/scss/chill_variables";
 
 span.multiselect__single {
-    display: none !important;
+  display: none !important;
 }
 
 #actionsList {
-    border-radius: 0.5rem;
-    padding: 1rem;
-    margin: 0.5rem;
-    background-color: whitesmoke;
+  border-radius: 0.5rem;
+  padding: 1rem;
+  margin: 0.5rem;
+  background-color: whitesmoke;
 }
 
 span.badge {
-    margin-bottom: 0.5rem;
-    @include badge_social($social-issue-color);
+  margin-bottom: 0.5rem;
+  @include badge_social($social-issue-color);
 }
 </style>
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialAction.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialAction.vue
index 8172b2b6f..cc04a453e 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialAction.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialAction.vue
@@ -1,38 +1,38 @@
 <template>
-    <span class="inline-choice">
-        <div class="form-check">
-            <input
-                class="form-check-input"
-                type="checkbox"
-                v-model="selected"
-                name="action"
-                :id="action.id"
-                :value="action"
-            />
-            <label class="form-check-label" :for="action.id">
-                <span class="badge bg-light text-dark" :title="action.text">{{
-                    action.text
-                }}</span>
-            </label>
-        </div>
-    </span>
+  <span class="inline-choice">
+    <div class="form-check">
+      <input
+        class="form-check-input"
+        type="checkbox"
+        v-model="selected"
+        name="action"
+        :id="action.id"
+        :value="action"
+      />
+      <label class="form-check-label" :for="action.id">
+        <span class="badge bg-light text-dark" :title="action.text">{{
+          action.text
+        }}</span>
+      </label>
+    </div>
+  </span>
 </template>
 
 <script>
 export default {
-    name: "CheckSocialAction",
-    props: ["action", "selection"],
-    emits: ["updateSelected"],
-    computed: {
-        selected: {
-            set(value) {
-                this.$emit("updateSelected", value);
-            },
-            get() {
-                return this.selection;
-            },
-        },
+  name: "CheckSocialAction",
+  props: ["action", "selection"],
+  emits: ["updateSelected"],
+  computed: {
+    selected: {
+      set(value) {
+        this.$emit("updateSelected", value);
+      },
+      get() {
+        return this.selection;
+      },
     },
+  },
 };
 </script>
 
@@ -41,13 +41,13 @@ export default {
 @import "ChillPersonAssets/chill/scss/mixins";
 @import "ChillMainAssets/chill/scss/chill_variables";
 span.badge {
-    @include badge_social($social-action-color);
-    font-size: 95%;
-    margin-bottom: 5px;
-    margin-right: 1em;
-    max-width: 100%; /* Adjust as needed */
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
+  @include badge_social($social-action-color);
+  font-size: 95%;
+  margin-bottom: 5px;
+  margin-right: 1em;
+  max-width: 100%; /* Adjust as needed */
+  overflow: hidden;
+  text-overflow: ellipsis;
+  white-space: nowrap;
 }
 </style>
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialIssue.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialIssue.vue
index 9dbedf2ea..d6b5d3090 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialIssue.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialIssue.vue
@@ -1,38 +1,36 @@
 <template>
-    <span class="inline-choice">
-        <div class="form-check">
-            <input
-                class="form-check-input"
-                type="checkbox"
-                v-model="selected"
-                name="issue"
-                :id="issue.id"
-                :value="issue"
-            />
-            <label class="form-check-label" :for="issue.id">
-                <span class="badge bg-chill-l-gray text-dark">{{
-                    issue.text
-                }}</span>
-            </label>
-        </div>
-    </span>
+  <span class="inline-choice">
+    <div class="form-check">
+      <input
+        class="form-check-input"
+        type="checkbox"
+        v-model="selected"
+        name="issue"
+        :id="issue.id"
+        :value="issue"
+      />
+      <label class="form-check-label" :for="issue.id">
+        <span class="badge bg-chill-l-gray text-dark">{{ issue.text }}</span>
+      </label>
+    </div>
+  </span>
 </template>
 
 <script>
 export default {
-    name: "CheckSocialIssue",
-    props: ["issue", "selection"],
-    emits: ["updateSelected"],
-    computed: {
-        selected: {
-            set(value) {
-                this.$emit("updateSelected", value);
-            },
-            get() {
-                return this.selection;
-            },
-        },
+  name: "CheckSocialIssue",
+  props: ["issue", "selection"],
+  emits: ["updateSelected"],
+  computed: {
+    selected: {
+      set(value) {
+        this.$emit("updateSelected", value);
+      },
+      get() {
+        return this.selection;
+      },
     },
+  },
 };
 </script>
 
@@ -41,9 +39,9 @@ export default {
 @import "ChillPersonAssets/chill/scss/mixins";
 @import "ChillMainAssets/chill/scss/chill_variables";
 span.badge {
-    @include badge_social($social-issue-color);
-    font-size: 95%;
-    margin-bottom: 5px;
-    margin-right: 1em;
+  @include badge_social($social-issue-color);
+  font-size: 95%;
+  margin-bottom: 5px;
+  margin-right: 1em;
 }
 </style>
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/types.ts b/src/Bundle/ChillCalendarBundle/Resources/public/types.ts
index f0f16429a..542067901 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/types.ts
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/types.ts
@@ -1,76 +1,74 @@
 import { EventInput } from "@fullcalendar/core";
 import {
-    DateTime,
-    Location,
-    User,
-    UserAssociatedInterface,
+  DateTime,
+  Location,
+  User,
+  UserAssociatedInterface,
 } from "../../../ChillMainBundle/Resources/public/types";
 import { Person } from "../../../ChillPersonBundle/Resources/public/types";
 
 export interface CalendarRange {
-    id: number;
-    endDate: DateTime;
-    startDate: DateTime;
-    user: User;
-    location: Location;
-    createdAt: DateTime;
-    createdBy: User;
-    updatedAt: DateTime;
-    updatedBy: User;
+  id: number;
+  endDate: DateTime;
+  startDate: DateTime;
+  user: User;
+  location: Location;
+  createdAt: DateTime;
+  createdBy: User;
+  updatedAt: DateTime;
+  updatedBy: User;
 }
 
 export interface CalendarRangeCreate {
-    user: UserAssociatedInterface;
-    startDate: DateTime;
-    endDate: DateTime;
-    location: Location;
+  user: UserAssociatedInterface;
+  startDate: DateTime;
+  endDate: DateTime;
+  location: Location;
 }
 
 export interface CalendarRangeEdit {
-    startDate?: DateTime;
-    endDate?: DateTime;
-    location?: Location;
+  startDate?: DateTime;
+  endDate?: DateTime;
+  location?: Location;
 }
 
 export interface Calendar {
-    id: number;
+  id: number;
 }
 
 export interface CalendarLight {
-    id: number;
-    endDate: DateTime;
-    startDate: DateTime;
-    mainUser: User;
-    persons: Person[];
-    status: "valid" | "moved" | "canceled";
+  id: number;
+  endDate: DateTime;
+  startDate: DateTime;
+  mainUser: User;
+  persons: Person[];
+  status: "valid" | "moved" | "canceled";
 }
 
 export interface CalendarRemote {
-    id: number;
-    endDate: DateTime;
-    startDate: DateTime;
-    title: string;
-    isAllDay: boolean;
+  id: number;
+  endDate: DateTime;
+  startDate: DateTime;
+  title: string;
+  isAllDay: boolean;
 }
 
 export type EventInputCalendarRange = EventInput & {
-    id: string;
-    userId: number;
-    userLabel: string;
-    calendarRangeId: number;
-    locationId: number;
-    locationName: string;
-    start: string;
-    end: string;
-    is: "range";
+  id: string;
+  userId: number;
+  userLabel: string;
+  calendarRangeId: number;
+  locationId: number;
+  locationName: string;
+  start: string;
+  end: string;
+  is: "range";
 };
 
 export function isEventInputCalendarRange(
-    toBeDetermined: EventInputCalendarRange | EventInput,
+  toBeDetermined: EventInputCalendarRange | EventInput,
 ): toBeDetermined is EventInputCalendarRange {
-    return (
-        typeof toBeDetermined.is === "string" && toBeDetermined.is === "range"
-    );
+  return typeof toBeDetermined.is === "string" && toBeDetermined.is === "range";
 }
 
 export {};
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/App.vue b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/App.vue
index 794f05657..c37ea6b91 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/App.vue
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/App.vue
@@ -1,164 +1,146 @@
 <template>
-    <teleport to="#mainUser">
-        <h2 class="chill-red">Utilisateur principal</h2>
-        <div>
-            <div>
-                <div v-if="null !== this.$store.getters.getMainUser">
-                    <calendar-active :user="this.$store.getters.getMainUser" />
-                </div>
-                <pick-entity
-                    :multiple="false"
-                    :types="['user']"
-                    :uniqid="'main_user_calendar'"
-                    :picked="
-                        null !== this.$store.getters.getMainUser
-                            ? [this.$store.getters.getMainUser]
-                            : []
-                    "
-                    :removable-if-set="false"
-                    :display-picked="false"
-                    :suggested="this.suggestedUsers"
-                    :label="'main_user'"
-                    @add-new-entity="setMainUser"
-                />
-            </div>
+  <teleport to="#mainUser">
+    <h2 class="chill-red">Utilisateur principal</h2>
+    <div>
+      <div>
+        <div v-if="null !== this.$store.getters.getMainUser">
+          <calendar-active :user="this.$store.getters.getMainUser" />
         </div>
-    </teleport>
+        <pick-entity
+          :multiple="false"
+          :types="['user']"
+          :uniqid="'main_user_calendar'"
+          :picked="
+            null !== this.$store.getters.getMainUser
+              ? [this.$store.getters.getMainUser]
+              : []
+          "
+          :removable-if-set="false"
+          :display-picked="false"
+          :suggested="this.suggestedUsers"
+          :label="'main_user'"
+          @add-new-entity="setMainUser"
+        />
+      </div>
+    </div>
+  </teleport>
 
-    <concerned-groups />
+  <concerned-groups />
 
-    <teleport to="#schedule">
-        <div class="row mb-3" v-if="activity.startDate !== null">
-            <label class="col-form-label col-sm-4">Date</label>
-            <div class="col-sm-8">
-                {{ $d(activity.startDate, "long") }} -
-                {{ $d(activity.endDate, "hoursOnly") }}
-                <span v-if="activity.calendarRange === null"
-                    >(Pas de plage de disponibilité sélectionnée)</span
-                >
-                <span v-else>(Une plage de disponibilité sélectionnée)</span>
-            </div>
-        </div>
-    </teleport>
-
-    <location />
-
-    <teleport to="#fullCalendar">
-        <div class="calendar-actives">
-            <template v-for="u in getActiveUsers" :key="u.id">
-                <calendar-active
-                    :user="u"
-                    :invite="this.$store.getters.getInviteForUser(u)"
-                />
-            </template>
-        </div>
-        <div
-            class="display-options row justify-content-between"
-            style="margin-top: 1rem"
+  <teleport to="#schedule">
+    <div class="row mb-3" v-if="activity.startDate !== null">
+      <label class="col-form-label col-sm-4">Date</label>
+      <div class="col-sm-8">
+        {{ $d(activity.startDate, "long") }} -
+        {{ $d(activity.endDate, "hoursOnly") }}
+        <span v-if="activity.calendarRange === null"
+          >(Pas de plage de disponibilité sélectionnée)</span
         >
-            <div class="col-sm-9 col-xs-12">
-                <div class="input-group mb-3">
-                    <label class="input-group-text" for="slotDuration"
-                        >Durée des créneaux</label
-                    >
-                    <select
-                        v-model="slotDuration"
-                        id="slotDuration"
-                        class="form-select"
-                    >
-                        <option value="00:05:00">5 minutes</option>
-                        <option value="00:10:00">10 minutes</option>
-                        <option value="00:15:00">15 minutes</option>
-                        <option value="00:30:00">30 minutes</option>
-                    </select>
-                    <label class="input-group-text" for="slotMinTime">De</label>
-                    <select
-                        v-model="slotMinTime"
-                        id="slotMinTime"
-                        class="form-select"
-                    >
-                        <option value="00:00:00">0h</option>
-                        <option value="01:00:00">1h</option>
-                        <option value="02:00:00">2h</option>
-                        <option value="03:00:00">3h</option>
-                        <option value="04:00:00">4h</option>
-                        <option value="05:00:00">5h</option>
-                        <option value="06:00:00">6h</option>
-                        <option value="07:00:00">7h</option>
-                        <option value="08:00:00">8h</option>
-                        <option value="09:00:00">9h</option>
-                        <option value="10:00:00">10h</option>
-                        <option value="11:00:00">11h</option>
-                        <option value="12:00:00">12h</option>
-                    </select>
-                    <label class="input-group-text" for="slotMaxTime">À</label>
-                    <select
-                        v-model="slotMaxTime"
-                        id="slotMaxTime"
-                        class="form-select"
-                    >
-                        <option value="12:00:00">12h</option>
-                        <option value="13:00:00">13h</option>
-                        <option value="14:00:00">14h</option>
-                        <option value="15:00:00">15h</option>
-                        <option value="16:00:00">16h</option>
-                        <option value="17:00:00">17h</option>
-                        <option value="18:00:00">18h</option>
-                        <option value="19:00:00">19h</option>
-                        <option value="20:00:00">20h</option>
-                        <option value="21:00:00">21h</option>
-                        <option value="22:00:00">22h</option>
-                        <option value="23:00:00">23h</option>
-                        <option value="23:59:59">24h</option>
-                    </select>
-                </div>
-            </div>
-            <div class="col-sm-3 col-xs-12">
-                <div class="float-end">
-                    <div class="form-check input-group">
-                        <span class="input-group-text">
-                            <input
-                                id="showHideWE"
-                                class="mt-0"
-                                type="checkbox"
-                                v-model="hideWeekends"
-                            />
-                        </span>
-                        <label
-                            for="showHideWE"
-                            class="form-check-label input-group-text"
-                            >Week-ends</label
-                        >
-                    </div>
-                </div>
-            </div>
+        <span v-else>(Une plage de disponibilité sélectionnée)</span>
+      </div>
+    </div>
+  </teleport>
+
+  <location />
+
+  <teleport to="#fullCalendar">
+    <div class="calendar-actives">
+      <template v-for="u in getActiveUsers" :key="u.id">
+        <calendar-active
+          :user="u"
+          :invite="this.$store.getters.getInviteForUser(u)"
+        />
+      </template>
+    </div>
+    <div
+      class="display-options row justify-content-between"
+      style="margin-top: 1rem"
+    >
+      <div class="col-sm-9 col-xs-12">
+        <div class="input-group mb-3">
+          <label class="input-group-text" for="slotDuration"
+            >Durée des créneaux</label
+          >
+          <select v-model="slotDuration" id="slotDuration" class="form-select">
+            <option value="00:05:00">5 minutes</option>
+            <option value="00:10:00">10 minutes</option>
+            <option value="00:15:00">15 minutes</option>
+            <option value="00:30:00">30 minutes</option>
+          </select>
+          <label class="input-group-text" for="slotMinTime">De</label>
+          <select v-model="slotMinTime" id="slotMinTime" class="form-select">
+            <option value="00:00:00">0h</option>
+            <option value="01:00:00">1h</option>
+            <option value="02:00:00">2h</option>
+            <option value="03:00:00">3h</option>
+            <option value="04:00:00">4h</option>
+            <option value="05:00:00">5h</option>
+            <option value="06:00:00">6h</option>
+            <option value="07:00:00">7h</option>
+            <option value="08:00:00">8h</option>
+            <option value="09:00:00">9h</option>
+            <option value="10:00:00">10h</option>
+            <option value="11:00:00">11h</option>
+            <option value="12:00:00">12h</option>
+          </select>
+          <label class="input-group-text" for="slotMaxTime">À</label>
+          <select v-model="slotMaxTime" id="slotMaxTime" class="form-select">
+            <option value="12:00:00">12h</option>
+            <option value="13:00:00">13h</option>
+            <option value="14:00:00">14h</option>
+            <option value="15:00:00">15h</option>
+            <option value="16:00:00">16h</option>
+            <option value="17:00:00">17h</option>
+            <option value="18:00:00">18h</option>
+            <option value="19:00:00">19h</option>
+            <option value="20:00:00">20h</option>
+            <option value="21:00:00">21h</option>
+            <option value="22:00:00">22h</option>
+            <option value="23:00:00">23h</option>
+            <option value="23:59:59">24h</option>
+          </select>
         </div>
-        <FullCalendar ref="fullCalendar" :options="calendarOptions">
-            <template #eventContent="arg">
-                <span>
-                    <b v-if="arg.event.extendedProps.is === 'remote'">{{
-                        arg.event.title
-                    }}</b>
-                    <b v-else-if="arg.event.extendedProps.is === 'range'"
-                        >{{ arg.timeText }}
-                        {{ arg.event.extendedProps.locationName }}
-                        <small>{{
-                            arg.event.extendedProps.userLabel
-                        }}</small></b
-                    >
-                    <b v-else-if="arg.event.extendedProps.is === 'current'"
-                        >{{ arg.timeText }} {{ $t("current_selected") }}
-                    </b>
-                    <b v-else-if="arg.event.extendedProps.is === 'local'">{{
-                        arg.event.title
-                    }}</b>
-                    <b v-else
-                        >{{ arg.timeText }} {{ $t("current_selected") }}
-                    </b>
-                </span>
-            </template>
-        </FullCalendar>
-    </teleport>
+      </div>
+      <div class="col-sm-3 col-xs-12">
+        <div class="float-end">
+          <div class="form-check input-group">
+            <span class="input-group-text">
+              <input
+                id="showHideWE"
+                class="mt-0"
+                type="checkbox"
+                v-model="hideWeekends"
+              />
+            </span>
+            <label for="showHideWE" class="form-check-label input-group-text"
+              >Week-ends</label
+            >
+          </div>
+        </div>
+      </div>
+    </div>
+    <FullCalendar ref="fullCalendar" :options="calendarOptions">
+      <template #eventContent="arg">
+        <span>
+          <b v-if="arg.event.extendedProps.is === 'remote'">{{
+            arg.event.title
+          }}</b>
+          <b v-else-if="arg.event.extendedProps.is === 'range'"
+            >{{ arg.timeText }}
+            {{ arg.event.extendedProps.locationName }}
+            <small>{{ arg.event.extendedProps.userLabel }}</small></b
+          >
+          <b v-else-if="arg.event.extendedProps.is === 'current'"
+            >{{ arg.timeText }} {{ $t("current_selected") }}
+          </b>
+          <b v-else-if="arg.event.extendedProps.is === 'local'">{{
+            arg.event.title
+          }}</b>
+          <b v-else>{{ arg.timeText }} {{ $t("current_selected") }} </b>
+        </span>
+      </template>
+    </FullCalendar>
+  </teleport>
 </template>
 
 <script>
@@ -175,219 +157,210 @@ import PickEntity from "ChillMainAssets/vuejs/PickEntity/PickEntity.vue";
 import { mapGetters, mapState } from "vuex";
 
 export default {
-    name: "App",
-    components: {
-        ConcernedGroups,
-        Location,
-        FullCalendar,
-        CalendarActive,
-        PickEntity,
+  name: "App",
+  components: {
+    ConcernedGroups,
+    Location,
+    FullCalendar,
+    CalendarActive,
+    PickEntity,
+  },
+  data() {
+    return {
+      errorMsg: [],
+      showMyCalendar: false,
+      slotDuration: "00:05:00",
+      slotMinTime: "09:00:00",
+      slotMaxTime: "18:00:00",
+      hideWeekEnds: true,
+      previousUser: [],
+    };
+  },
+  computed: {
+    ...mapGetters(["getMainUser"]),
+    ...mapState(["activity"]),
+    events() {
+      return this.$store.getters.getEventSources;
     },
-    data() {
-        return {
-            errorMsg: [],
-            showMyCalendar: false,
-            slotDuration: "00:05:00",
-            slotMinTime: "09:00:00",
-            slotMaxTime: "18:00:00",
-            hideWeekEnds: true,
-            previousUser: [],
-        };
+    calendarOptions() {
+      return {
+        locale: frLocale,
+        plugins: [
+          dayGridPlugin,
+          interactionPlugin,
+          timeGridPlugin,
+          dayGridPlugin,
+          listPlugin,
+        ],
+        initialView: "timeGridWeek",
+        initialDate: this.$store.getters.getInitialDate,
+        eventSources: this.events,
+        selectable: true,
+        slotMinTime: this.slotMinTime,
+        slotMaxTime: this.slotMaxTime,
+        scrollTimeReset: false,
+        datesSet: this.onDatesSet,
+        select: this.onDateSelect,
+        eventChange: this.onEventChange,
+        eventClick: this.onEventClick,
+        selectMirror: true,
+        editable: true,
+        weekends: !this.hideWeekEnds,
+        headerToolbar: {
+          left: "prev,next today",
+          center: "title",
+          right: "timeGridWeek,timeGridDay,listWeek",
+        },
+        views: {
+          timeGrid: {
+            slotEventOverlap: false,
+            slotDuration: this.slotDuration,
+          },
+        },
+      };
     },
-    computed: {
-        ...mapGetters(["getMainUser"]),
-        ...mapState(["activity"]),
-        events() {
-            return this.$store.getters.getEventSources;
-        },
-        calendarOptions() {
-            return {
-                locale: frLocale,
-                plugins: [
-                    dayGridPlugin,
-                    interactionPlugin,
-                    timeGridPlugin,
-                    dayGridPlugin,
-                    listPlugin,
-                ],
-                initialView: "timeGridWeek",
-                initialDate: this.$store.getters.getInitialDate,
-                eventSources: this.events,
-                selectable: true,
-                slotMinTime: this.slotMinTime,
-                slotMaxTime: this.slotMaxTime,
-                scrollTimeReset: false,
-                datesSet: this.onDatesSet,
-                select: this.onDateSelect,
-                eventChange: this.onEventChange,
-                eventClick: this.onEventClick,
-                selectMirror: true,
-                editable: true,
-                weekends: !this.hideWeekEnds,
-                headerToolbar: {
-                    left: "prev,next today",
-                    center: "title",
-                    right: "timeGridWeek,timeGridDay,listWeek",
-                },
-                views: {
-                    timeGrid: {
-                        slotEventOverlap: false,
-                        slotDuration: this.slotDuration,
-                    },
-                },
-            };
-        },
-        getActiveUsers() {
-            const users = [];
-            for (const id of this.$store.state.currentView.users.keys()) {
-                users.push(this.$store.getters.getUserDataById(id).user);
-            }
-            return users;
-        },
-        suggestedUsers() {
-            const suggested = [];
-
-            this.$data.previousUser.forEach((u) => {
-                if (u.id !== this.$store.getters.getMainUser.id) {
-                    suggested.push(u);
-                }
-            });
-
-            return suggested;
-        },
+    getActiveUsers() {
+      const users = [];
+      for (const id of this.$store.state.currentView.users.keys()) {
+        users.push(this.$store.getters.getUserDataById(id).user);
+      }
+      return users;
     },
-    methods: {
-        setMainUser({ entity }) {
-            const user = entity;
-            console.log("setMainUser APP", entity);
+    suggestedUsers() {
+      const suggested = [];
 
-            if (
-                user.id !== this.$store.getters.getMainUser &&
-                (this.$store.state.activity.calendarRange !== null ||
-                    this.$store.state.activity.startDate !== null ||
-                    this.$store.state.activity.endDate !== null)
-            ) {
-                if (
-                    !window.confirm(
-                        this.$t("change_main_user_will_reset_event_data"),
-                    )
-                ) {
-                    return;
-                }
-            }
+      this.$data.previousUser.forEach((u) => {
+        if (u.id !== this.$store.getters.getMainUser.id) {
+          suggested.push(u);
+        }
+      });
 
-            // add the previous user, if any, in the previous user list (in use for suggestion)
-            if (null !== this.$store.getters.getMainUser) {
-                const suggestedUids = new Set(
-                    this.$data.previousUser.map((u) => u.id),
-                );
-                if (!suggestedUids.has(this.$store.getters.getMainUser.id)) {
-                    this.$data.previousUser.push(
-                        this.$store.getters.getMainUser,
-                    );
-                }
-            }
-
-            this.$store.dispatch("setMainUser", user);
-            this.$store.commit("showUserOnCalendar", {
-                user,
-                ranges: true,
-                remotes: true,
-            });
-        },
-        removeMainUser(user) {
-            console.log("removeMainUser APP", user);
-
-            window.alert(this.$t("main_user_is_mandatory"));
-            return;
-        },
-        onDatesSet(event) {
-            console.log("onDatesSet", event);
-            this.$store.dispatch("setCurrentDatesView", {
-                start: event.start,
-                end: event.end,
-            });
-        },
-        onDateSelect(payload) {
-            console.log("onDateSelect", payload);
-
-            // show an alert if changing mainUser
-            if (
-                (this.$store.getters.getMainUser !== null &&
-                    this.$store.state.me.id !==
-                        this.$store.getters.getMainUser.id) ||
-                this.$store.getters.getMainUser === null
-            ) {
-                if (!window.confirm(this.$t("will_change_main_user_for_me"))) {
-                    return;
-                } else {
-                    this.$store.commit("showUserOnCalendar", {
-                        user: this.$store.state.me,
-                        remotes: true,
-                        ranges: true,
-                    });
-                }
-            }
-
-            this.$store.dispatch("setEventTimes", {
-                start: payload.start,
-                end: payload.end,
-            });
-        },
-        onEventChange(payload) {
-            console.log("onEventChange", payload);
-            if (this.$store.state.activity.calendarRange !== null) {
-                throw new Error(
-                    "not allowed to edit a calendar associated with a calendar range",
-                );
-            }
-            this.$store.dispatch("setEventTimes", {
-                start: payload.event.start,
-                end: payload.event.end,
-            });
-        },
-        onEventClick(payload) {
-            if (payload.event.extendedProps.is !== "range") {
-                // do nothing when clicking on remote
-                return;
-            }
-
-            // show an alert if changing mainUser
-            if (
-                this.$store.getters.getMainUser !== null &&
-                payload.event.extendedProps.userId !==
-                    this.$store.getters.getMainUser.id
-            ) {
-                if (
-                    !window.confirm(
-                        this.$t("this_calendar_range_will_change_main_user"),
-                    )
-                ) {
-                    return;
-                }
-            }
-
-            this.$store.dispatch("associateCalendarToRange", {
-                range: payload.event,
-            });
-        },
+      return suggested;
     },
+  },
+  methods: {
+    setMainUser({ entity }) {
+      const user = entity;
+      console.log("setMainUser APP", entity);
+
+      if (
+        user.id !== this.$store.getters.getMainUser &&
+        (this.$store.state.activity.calendarRange !== null ||
+          this.$store.state.activity.startDate !== null ||
+          this.$store.state.activity.endDate !== null)
+      ) {
+        if (
+          !window.confirm(this.$t("change_main_user_will_reset_event_data"))
+        ) {
+          return;
+        }
+      }
+
+      // add the previous user, if any, in the previous user list (in use for suggestion)
+      if (null !== this.$store.getters.getMainUser) {
+        const suggestedUids = new Set(this.$data.previousUser.map((u) => u.id));
+        if (!suggestedUids.has(this.$store.getters.getMainUser.id)) {
+          this.$data.previousUser.push(this.$store.getters.getMainUser);
+        }
+      }
+
+      this.$store.dispatch("setMainUser", user);
+      this.$store.commit("showUserOnCalendar", {
+        user,
+        ranges: true,
+        remotes: true,
+      });
+    },
+    removeMainUser(user) {
+      console.log("removeMainUser APP", user);
+
+      window.alert(this.$t("main_user_is_mandatory"));
+      return;
+    },
+    onDatesSet(event) {
+      console.log("onDatesSet", event);
+      this.$store.dispatch("setCurrentDatesView", {
+        start: event.start,
+        end: event.end,
+      });
+    },
+    onDateSelect(payload) {
+      console.log("onDateSelect", payload);
+
+      // show an alert if changing mainUser
+      if (
+        (this.$store.getters.getMainUser !== null &&
+          this.$store.state.me.id !== this.$store.getters.getMainUser.id) ||
+        this.$store.getters.getMainUser === null
+      ) {
+        if (!window.confirm(this.$t("will_change_main_user_for_me"))) {
+          return;
+        } else {
+          this.$store.commit("showUserOnCalendar", {
+            user: this.$store.state.me,
+            remotes: true,
+            ranges: true,
+          });
+        }
+      }
+
+      this.$store.dispatch("setEventTimes", {
+        start: payload.start,
+        end: payload.end,
+      });
+    },
+    onEventChange(payload) {
+      console.log("onEventChange", payload);
+      if (this.$store.state.activity.calendarRange !== null) {
+        throw new Error(
+          "not allowed to edit a calendar associated with a calendar range",
+        );
+      }
+      this.$store.dispatch("setEventTimes", {
+        start: payload.event.start,
+        end: payload.event.end,
+      });
+    },
+    onEventClick(payload) {
+      if (payload.event.extendedProps.is !== "range") {
+        // do nothing when clicking on remote
+        return;
+      }
+
+      // show an alert if changing mainUser
+      if (
+        this.$store.getters.getMainUser !== null &&
+        payload.event.extendedProps.userId !==
+          this.$store.getters.getMainUser.id
+      ) {
+        if (
+          !window.confirm(this.$t("this_calendar_range_will_change_main_user"))
+        ) {
+          return;
+        }
+      }
+
+      this.$store.dispatch("associateCalendarToRange", {
+        range: payload.event,
+      });
+    },
+  },
 };
 </script>
 
 <style>
 .calendar-actives {
-    display: flex;
-    flex-direction: row;
-    flex-wrap: wrap;
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
 }
 
 .display-options {
-    margin-top: 1rem;
+  margin-top: 1rem;
 }
 
 /* for events which are range */
 .fc-event.isrange {
-    border-width: 3px;
+  border-width: 3px;
 }
 </style>
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/Components/CalendarActive.vue b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/Components/CalendarActive.vue
index a51e7dd7c..b90349025 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/Components/CalendarActive.vue
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/Components/CalendarActive.vue
@@ -1,119 +1,105 @@
 <template>
-    <div :style="style" class="calendar-active">
-        <span class="badge-user">
-            {{ user.text }}
-            <template v-if="invite !== null">
-                <i v-if="invite.status === 'accepted'" class="fa fa-check" />
-                <i
-                    v-else-if="invite.status === 'declined'"
-                    class="fa fa-times"
-                />
-                <i
-                    v-else-if="invite.status === 'pending'"
-                    class="fa fa-question-o"
-                />
-                <i
-                    v-else-if="invite.status === 'tentative'"
-                    class="fa fa-question"
-                />
-                <span v-else="">{{ invite.status }}</span>
-            </template>
-        </span>
-        <span class="form-check-inline form-switch">
-            <input
-                class="form-check-input"
-                type="checkbox"
-                id="flexSwitchCheckDefault"
-                v-model="rangeShow"
-            />
-            &nbsp;<label
-                class="form-check-label"
-                for="flexSwitchCheckDefault"
-                title="Disponibilités"
-                ><i class="fa fa-calendar-check-o"
-            /></label>
-        </span>
-        <span class="form-check-inline form-switch">
-            <input
-                class="form-check-input"
-                type="checkbox"
-                id="flexSwitchCheckDefault"
-                v-model="remoteShow"
-            />
-            &nbsp;<label
-                class="form-check-label"
-                for="flexSwitchCheckDefault"
-                title="Agenda"
-                ><i class="fa fa-calendar"
-            /></label>
-        </span>
-    </div>
+  <div :style="style" class="calendar-active">
+    <span class="badge-user">
+      {{ user.text }}
+      <template v-if="invite !== null">
+        <i v-if="invite.status === 'accepted'" class="fa fa-check" />
+        <i v-else-if="invite.status === 'declined'" class="fa fa-times" />
+        <i v-else-if="invite.status === 'pending'" class="fa fa-question-o" />
+        <i v-else-if="invite.status === 'tentative'" class="fa fa-question" />
+        <span v-else="">{{ invite.status }}</span>
+      </template>
+    </span>
+    <span class="form-check-inline form-switch">
+      <input
+        class="form-check-input"
+        type="checkbox"
+        id="flexSwitchCheckDefault"
+        v-model="rangeShow"
+      />
+      &nbsp;<label
+        class="form-check-label"
+        for="flexSwitchCheckDefault"
+        title="Disponibilités"
+        ><i class="fa fa-calendar-check-o"
+      /></label>
+    </span>
+    <span class="form-check-inline form-switch">
+      <input
+        class="form-check-input"
+        type="checkbox"
+        id="flexSwitchCheckDefault"
+        v-model="remoteShow"
+      />
+      &nbsp;<label
+        class="form-check-label"
+        for="flexSwitchCheckDefault"
+        title="Agenda"
+        ><i class="fa fa-calendar"
+      /></label>
+    </span>
+  </div>
 </template>
 
 <script>
 import { mapGetters } from "vuex";
 
 export default {
-    name: "CalendarActive",
-    props: {
-        user: {
-            type: Object,
-            required: true,
-        },
-        invite: {
-            type: Object,
-            required: false,
-            default: null,
-        },
+  name: "CalendarActive",
+  props: {
+    user: {
+      type: Object,
+      required: true,
     },
-    computed: {
-        style() {
-            return {
-                backgroundColor: this.$store.getters.getUserData(this.user)
-                    .mainColor,
-            };
-        },
-        rangeShow: {
-            set(value) {
-                this.$store.commit("showUserOnCalendar", {
-                    user: this.user,
-                    ranges: value,
-                });
-            },
-            get() {
-                return this.$store.getters.isRangeShownOnCalendarForUser(
-                    this.user,
-                );
-            },
-        },
-        remoteShow: {
-            set(value) {
-                this.$store.commit("showUserOnCalendar", {
-                    user: this.user,
-                    remotes: value,
-                });
-            },
-            get() {
-                return this.$store.getters.isRemoteShownOnCalendarForUser(
-                    this.user,
-                );
-            },
-        },
+    invite: {
+      type: Object,
+      required: false,
+      default: null,
     },
+  },
+  computed: {
+    style() {
+      return {
+        backgroundColor: this.$store.getters.getUserData(this.user).mainColor,
+      };
+    },
+    rangeShow: {
+      set(value) {
+        this.$store.commit("showUserOnCalendar", {
+          user: this.user,
+          ranges: value,
+        });
+      },
+      get() {
+        return this.$store.getters.isRangeShownOnCalendarForUser(this.user);
+      },
+    },
+    remoteShow: {
+      set(value) {
+        this.$store.commit("showUserOnCalendar", {
+          user: this.user,
+          remotes: value,
+        });
+      },
+      get() {
+        return this.$store.getters.isRemoteShownOnCalendarForUser(this.user);
+      },
+    },
+  },
 };
 </script>
 
 <style scoped lang="scss">
 .calendar-active {
-    margin: 0 0.25rem 0.25rem 0;
-    padding: 0.5rem;
+  margin: 0 0.25rem 0.25rem 0;
+  padding: 0.5rem;
 
-    border-radius: 0.5rem;
+  border-radius: 0.5rem;
 
-    color: var(--bs-blue);
+  color: var(--bs-blue);
 
-    & > .badge-user {
-        margin-right: 0.5rem;
-    }
+  & > .badge-user {
+    margin-right: 0.5rem;
+  }
 }
 </style>
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/api.ts b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/api.ts
index 135b3ef1a..d267d2606 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/api.ts
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/api.ts
@@ -14,37 +14,37 @@ export { whoami } from "../../../../../ChillMainBundle/Resources/public/lib/api/
  * @return Promise
  */
 export const fetchCalendarRangeForUser = (
-    user: User,
-    start: Date,
-    end: Date,
+  user: User,
+  start: Date,
+  end: Date,
 ): Promise<CalendarRange[]> => {
-    const uri = `/api/1.0/calendar/calendar-range-available/${user.id}.json`;
-    const dateFrom = datetimeToISO(start);
-    const dateTo = datetimeToISO(end);
+  const uri = `/api/1.0/calendar/calendar-range-available/${user.id}.json`;
+  const dateFrom = datetimeToISO(start);
+  const dateTo = datetimeToISO(end);
 
-    return fetchResults<CalendarRange>(uri, { dateFrom, dateTo });
+  return fetchResults<CalendarRange>(uri, { dateFrom, dateTo });
 };
 
 export const fetchCalendarRemoteForUser = (
-    user: User,
-    start: Date,
-    end: Date,
+  user: User,
+  start: Date,
+  end: Date,
 ): Promise<CalendarRemote[]> => {
-    const uri = `/api/1.0/calendar/proxy/calendar/by-user/${user.id}/events`;
-    const dateFrom = datetimeToISO(start);
-    const dateTo = datetimeToISO(end);
+  const uri = `/api/1.0/calendar/proxy/calendar/by-user/${user.id}/events`;
+  const dateFrom = datetimeToISO(start);
+  const dateTo = datetimeToISO(end);
 
-    return fetchResults<CalendarRemote>(uri, { dateFrom, dateTo });
+  return fetchResults<CalendarRemote>(uri, { dateFrom, dateTo });
 };
 
 export const fetchCalendarLocalForUser = (
-    user: User,
-    start: Date,
-    end: Date,
+  user: User,
+  start: Date,
+  end: Date,
 ): Promise<CalendarLight[]> => {
-    const uri = `/api/1.0/calendar/calendar/by-user/${user.id}.json`;
-    const dateFrom = datetimeToISO(start);
-    const dateTo = datetimeToISO(end);
+  const uri = `/api/1.0/calendar/calendar/by-user/${user.id}.json`;
+  const dateFrom = datetimeToISO(start);
+  const dateTo = datetimeToISO(end);
 
-    return fetchResults<CalendarLight>(uri, { dateFrom, dateTo });
+  return fetchResults<CalendarLight>(uri, { dateFrom, dateTo });
 };
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/const.ts b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/const.ts
index 7d7cfaf74..62be00685 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/const.ts
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/const.ts
@@ -1,17 +1,17 @@
 const COLORS = [
-    /* from https://colorbrewer2.org/#type=qualitative&scheme=Set3&n=12 */
-    "#8dd3c7",
-    "#ffffb3",
-    "#bebada",
-    "#fb8072",
-    "#80b1d3",
-    "#fdb462",
-    "#b3de69",
-    "#fccde5",
-    "#d9d9d9",
-    "#bc80bd",
-    "#ccebc5",
-    "#ffed6f",
+  /* from https://colorbrewer2.org/#type=qualitative&scheme=Set3&n=12 */
+  "#8dd3c7",
+  "#ffffb3",
+  "#bebada",
+  "#fb8072",
+  "#80b1d3",
+  "#fdb462",
+  "#b3de69",
+  "#fccde5",
+  "#d9d9d9",
+  "#bc80bd",
+  "#ccebc5",
+  "#ffed6f",
 ];
 
 export { COLORS };
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store/utils.ts b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store/utils.ts
index 4e8f97e33..ec312e6de 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store/utils.ts
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store/utils.ts
@@ -1,117 +1,117 @@
 import { COLORS } from "../const";
 import { ISOToDatetime } from "../../../../../../ChillMainBundle/Resources/public/chill/js/date";
 import {
-    DateTime,
-    User,
+  DateTime,
+  User,
 } from "../../../../../../ChillMainBundle/Resources/public/types";
 import { CalendarLight, CalendarRange, CalendarRemote } from "../../../types";
 import type { EventInputCalendarRange } from "../../../types";
 import { EventInput } from "@fullcalendar/core";
 
 export interface UserData {
-    user: User;
-    calendarRanges: CalendarRange[];
-    calendarRangesLoaded: {}[];
-    remotes: CalendarRemote[];
-    remotesLoaded: {}[];
-    locals: CalendarRemote[];
-    localsLoaded: {}[];
-    mainColor: string;
+  user: User;
+  calendarRanges: CalendarRange[];
+  calendarRangesLoaded: {}[];
+  remotes: CalendarRemote[];
+  remotesLoaded: {}[];
+  locals: CalendarRemote[];
+  localsLoaded: {}[];
+  mainColor: string;
 }
 
 export const addIdToValue = (string: string, id: number): string => {
-    const array = string ? string.split(",") : [];
-    array.push(id.toString());
-    const str = array.join();
-    return str;
+  const array = string ? string.split(",") : [];
+  array.push(id.toString());
+  const str = array.join();
+  return str;
 };
 
 export const removeIdFromValue = (string: string, id: number) => {
-    let array = string.split(",");
-    array = array.filter((el) => el !== id.toString());
-    const str = array.join();
-    return str;
+  let array = string.split(",");
+  array = array.filter((el) => el !== id.toString());
+  const str = array.join();
+  return str;
 };
 
 /*
  * Assign missing keys for the ConcernedGroups component
  */
 export const mapEntity = (entity: EventInput): EventInput => {
-    const calendar = { ...entity };
-    Object.assign(calendar, { thirdParties: entity.professionals });
+  const calendar = { ...entity };
+  Object.assign(calendar, { thirdParties: entity.professionals });
 
-    if (entity.startDate !== null) {
-        calendar.startDate = ISOToDatetime(entity.startDate.datetime);
-    }
-    if (entity.endDate !== null) {
-        calendar.endDate = ISOToDatetime(entity.endDate.datetime);
-    }
+  if (entity.startDate !== null) {
+    calendar.startDate = ISOToDatetime(entity.startDate.datetime);
+  }
+  if (entity.endDate !== null) {
+    calendar.endDate = ISOToDatetime(entity.endDate.datetime);
+  }
 
-    if (entity.calendarRange !== null) {
-        calendar.calendarRange.calendarRangeId = entity.calendarRange.id;
-        calendar.calendarRange.id = `range_${entity.calendarRange.id}`;
-    }
+  if (entity.calendarRange !== null) {
+    calendar.calendarRange.calendarRangeId = entity.calendarRange.id;
+    calendar.calendarRange.id = `range_${entity.calendarRange.id}`;
+  }
 
-    return calendar;
+  return calendar;
 };
 
 export const createUserData = (user: User, colorIndex: number): UserData => {
-    const colorId = colorIndex % COLORS.length;
+  const colorId = colorIndex % COLORS.length;
 
-    return {
-        user: user,
-        calendarRanges: [],
-        calendarRangesLoaded: [],
-        remotes: [],
-        remotesLoaded: [],
-        locals: [],
-        localsLoaded: [],
-        mainColor: COLORS[colorId],
-    };
+  return {
+    user: user,
+    calendarRanges: [],
+    calendarRangesLoaded: [],
+    remotes: [],
+    remotesLoaded: [],
+    locals: [],
+    localsLoaded: [],
+    mainColor: COLORS[colorId],
+  };
 };
 
 // TODO move this function to a more global namespace, as it is also in use in MyCalendarRange app
 export const calendarRangeToFullCalendarEvent = (
-    entity: CalendarRange,
+  entity: CalendarRange,
 ): EventInputCalendarRange => {
-    return {
-        id: `range_${entity.id}`,
-        title: "(" + entity.user.text + ")",
-        start: entity.startDate.datetime8601,
-        end: entity.endDate.datetime8601,
-        allDay: false,
-        userId: entity.user.id,
-        userLabel: entity.user.label,
-        calendarRangeId: entity.id,
-        locationId: entity.location.id,
-        locationName: entity.location.name,
-        is: "range",
-    };
+  return {
+    id: `range_${entity.id}`,
+    title: "(" + entity.user.text + ")",
+    start: entity.startDate.datetime8601,
+    end: entity.endDate.datetime8601,
+    allDay: false,
+    userId: entity.user.id,
+    userLabel: entity.user.label,
+    calendarRangeId: entity.id,
+    locationId: entity.location.id,
+    locationName: entity.location.name,
+    is: "range",
+  };
 };
 
 export const remoteToFullCalendarEvent = (
-    entity: CalendarRemote,
+  entity: CalendarRemote,
 ): EventInput & { id: string } => {
-    return {
-        id: `range_${entity.id}`,
-        title: entity.title,
-        start: entity.startDate.datetime8601,
-        end: entity.endDate.datetime8601,
-        allDay: entity.isAllDay,
-        is: "remote",
-    };
+  return {
+    id: `range_${entity.id}`,
+    title: entity.title,
+    start: entity.startDate.datetime8601,
+    end: entity.endDate.datetime8601,
+    allDay: entity.isAllDay,
+    is: "remote",
+  };
 };
 
 export const localsToFullCalendarEvent = (
-    entity: CalendarLight,
+  entity: CalendarLight,
 ): EventInput & { id: string; originId: number } => {
-    return {
-        id: `local_${entity.id}`,
-        title: entity.persons.map((p) => p.text).join(", "),
-        originId: entity.id,
-        start: entity.startDate.datetime8601,
-        end: entity.endDate.datetime8601,
-        allDay: false,
-        is: "local",
-    };
+  return {
+    id: `local_${entity.id}`,
+    title: entity.persons.map((p) => p.text).join(", "),
+    originId: entity.id,
+    start: entity.startDate.datetime8601,
+    end: entity.endDate.datetime8601,
+    allDay: false,
+    is: "local",
+  };
 };
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Invite/Answer.vue b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Invite/Answer.vue
index 34b5e3d77..34252ea1b 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Invite/Answer.vue
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Invite/Answer.vue
@@ -1,58 +1,50 @@
 <template>
-    <div class="btn-group" role="group">
-        <button
-            id="btnGroupDrop1"
-            type="button"
-            class="btn btn-misc dropdown-toggle"
-            data-bs-toggle="dropdown"
-            aria-expanded="false"
+  <div class="btn-group" role="group">
+    <button
+      id="btnGroupDrop1"
+      type="button"
+      class="btn btn-misc dropdown-toggle"
+      data-bs-toggle="dropdown"
+      aria-expanded="false"
+    >
+      <template v-if="status === Statuses.PENDING">
+        <span class="fa fa-hourglass"></span> {{ $t("Give_an_answer") }}
+      </template>
+      <template v-else-if="status === Statuses.ACCEPTED">
+        <span class="fa fa-check"></span> {{ $t("Accepted") }}
+      </template>
+      <template v-else-if="status === Statuses.DECLINED">
+        <span class="fa fa-times"></span> {{ $t("Declined") }}
+      </template>
+      <template v-else-if="status === Statuses.TENTATIVELY_ACCEPTED">
+        <span class="fa fa-question"></span> {{ $t("Tentative") }}
+      </template>
+    </button>
+    <ul class="dropdown-menu" aria-labelledby="btnGroupDrop1">
+      <li v-if="status !== Statuses.ACCEPTED">
+        <a class="dropdown-item" @click="changeStatus(Statuses.ACCEPTED)"
+          ><i class="fa fa-check" aria-hidden="true"></i> {{ $t("Accept") }}</a
         >
-            <template v-if="status === Statuses.PENDING">
-                <span class="fa fa-hourglass"></span> {{ $t("Give_an_answer") }}
-            </template>
-            <template v-else-if="status === Statuses.ACCEPTED">
-                <span class="fa fa-check"></span> {{ $t("Accepted") }}
-            </template>
-            <template v-else-if="status === Statuses.DECLINED">
-                <span class="fa fa-times"></span> {{ $t("Declined") }}
-            </template>
-            <template v-else-if="status === Statuses.TENTATIVELY_ACCEPTED">
-                <span class="fa fa-question"></span> {{ $t("Tentative") }}
-            </template>
-        </button>
-        <ul class="dropdown-menu" aria-labelledby="btnGroupDrop1">
-            <li v-if="status !== Statuses.ACCEPTED">
-                <a
-                    class="dropdown-item"
-                    @click="changeStatus(Statuses.ACCEPTED)"
-                    ><i class="fa fa-check" aria-hidden="true"></i>
-                    {{ $t("Accept") }}</a
-                >
-            </li>
-            <li v-if="status !== Statuses.DECLINED">
-                <a
-                    class="dropdown-item"
-                    @click="changeStatus(Statuses.DECLINED)"
-                    ><i class="fa fa-times" aria-hidden="true"></i>
-                    {{ $t("Decline") }}</a
-                >
-            </li>
-            <li v-if="status !== Statuses.TENTATIVELY_ACCEPTED">
-                <a
-                    class="dropdown-item"
-                    @click="changeStatus(Statuses.TENTATIVELY_ACCEPTED)"
-                    ><i class="fa fa-question"></i>
-                    {{ $t("Tentatively_accept") }}</a
-                >
-            </li>
-            <li v-if="status !== Statuses.PENDING">
-                <a class="dropdown-item" @click="changeStatus(Statuses.PENDING)"
-                    ><i class="fa fa-hourglass-o"></i>
-                    {{ $t("Set_pending") }}</a
-                >
-            </li>
-        </ul>
-    </div>
+      </li>
+      <li v-if="status !== Statuses.DECLINED">
+        <a class="dropdown-item" @click="changeStatus(Statuses.DECLINED)"
+          ><i class="fa fa-times" aria-hidden="true"></i> {{ $t("Decline") }}</a
+        >
+      </li>
+      <li v-if="status !== Statuses.TENTATIVELY_ACCEPTED">
+        <a
+          class="dropdown-item"
+          @click="changeStatus(Statuses.TENTATIVELY_ACCEPTED)"
+          ><i class="fa fa-question"></i> {{ $t("Tentatively_accept") }}</a
+        >
+      </li>
+      <li v-if="status !== Statuses.PENDING">
+        <a class="dropdown-item" @click="changeStatus(Statuses.PENDING)"
+          ><i class="fa fa-hourglass-o"></i> {{ $t("Set_pending") }}</a
+        >
+      </li>
+    </ul>
+  </div>
 </template>
 
 <script lang="ts">
@@ -64,69 +56,67 @@ const PENDING = "pending";
 const TENTATIVELY_ACCEPTED = "tentative";
 
 const i18n = {
-    messages: {
-        fr: {
-            Give_an_answer: "Répondre",
-            Accepted: "Accepté",
-            Declined: "Refusé",
-            Tentative: "Accepté provisoirement",
-            Accept: "Accepter",
-            Decline: "Refuser",
-            Tentatively_accept: "Accepter provisoirement",
-            Set_pending: "Ne pas répondre",
-        },
+  messages: {
+    fr: {
+      Give_an_answer: "Répondre",
+      Accepted: "Accepté",
+      Declined: "Refusé",
+      Tentative: "Accepté provisoirement",
+      Accept: "Accepter",
+      Decline: "Refuser",
+      Tentatively_accept: "Accepter provisoirement",
+      Set_pending: "Ne pas répondre",
     },
+  },
 };
 
 export default defineComponent({
-    name: "Answer",
-    i18n,
-    props: {
-        calendarId: { type: Number, required: true },
-        status: {
-            type: String as PropType<
-                "accepted" | "declined" | "pending" | "tentative"
-            >,
-            required: true,
-        },
+  name: "Answer",
+  i18n,
+  props: {
+    calendarId: { type: Number, required: true },
+    status: {
+      type: String as PropType<
+        "accepted" | "declined" | "pending" | "tentative"
+      >,
+      required: true,
     },
-    emits: {
-        statusChanged(
-            payload: "accepted" | "declined" | "pending" | "tentative",
-        ) {
-            return true;
-        },
+  },
+  emits: {
+    statusChanged(payload: "accepted" | "declined" | "pending" | "tentative") {
+      return true;
     },
-    data() {
-        return {
-            Statuses: {
-                ACCEPTED,
-                DECLINED,
-                PENDING,
-                TENTATIVELY_ACCEPTED,
-            },
-        };
-    },
-    methods: {
-        changeStatus: function (
-            newStatus: "accepted" | "declined" | "pending" | "tentative",
-        ) {
-            console.log("changeStatus", newStatus);
-            const url = `/api/1.0/calendar/calendar/${this.$props.calendarId}/answer/${newStatus}.json`;
-            window
-                .fetch(url, {
-                    method: "POST",
-                })
-                .then((r: Response) => {
-                    if (!r.ok) {
-                        console.error("could not confirm answer", newStatus);
-                        return;
-                    }
-                    console.log("answer sent", newStatus);
-                    this.$emit("statusChanged", newStatus);
-                });
-        },
+  },
+  data() {
+    return {
+      Statuses: {
+        ACCEPTED,
+        DECLINED,
+        PENDING,
+        TENTATIVELY_ACCEPTED,
+      },
+    };
+  },
+  methods: {
+    changeStatus: function (
+      newStatus: "accepted" | "declined" | "pending" | "tentative",
+    ) {
+      console.log("changeStatus", newStatus);
+      const url = `/api/1.0/calendar/calendar/${this.$props.calendarId}/answer/${newStatus}.json`;
+      window
+        .fetch(url, {
+          method: "POST",
+        })
+        .then((r: Response) => {
+          if (!r.ok) {
+            console.error("could not confirm answer", newStatus);
+            return;
+          }
+          console.log("answer sent", newStatus);
+          this.$emit("statusChanged", newStatus);
+        });
     },
+  },
 });
 </script>
 
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App2.vue b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App2.vue
index c1cbb7327..d9fcec012 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App2.vue
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App2.vue
@@ -1,225 +1,177 @@
 <template>
-    <div class="row">
-        <div class="col-sm">
-            <label class="form-label">{{ $t("created_availabilities") }}</label>
-            <vue-multiselect
-                v-model="pickedLocation"
-                :options="locations"
-                :label="'name'"
-                :track-by="'id'"
-                :selectLabel="'Presser \'Entrée\' pour choisir'"
-                :selectedLabel="'Choisir'"
-                :deselectLabel="'Presser \'Entrée\' pour enlever'"
-                :placeholder="'Choisir'"
-            ></vue-multiselect>
-        </div>
+  <div class="row">
+    <div class="col-sm">
+      <label class="form-label">{{ $t("created_availabilities") }}</label>
+      <vue-multiselect
+        v-model="pickedLocation"
+        :options="locations"
+        :label="'name'"
+        :track-by="'id'"
+        :selectLabel="'Presser \'Entrée\' pour choisir'"
+        :selectedLabel="'Choisir'"
+        :deselectLabel="'Presser \'Entrée\' pour enlever'"
+        :placeholder="'Choisir'"
+      ></vue-multiselect>
     </div>
-    <div
-        class="display-options row justify-content-between"
-        style="margin-top: 1rem"
-    >
-        <div class="col-sm-9 col-xs-12">
-            <div class="input-group mb-3">
-                <label class="input-group-text" for="slotDuration"
-                    >Durée des créneaux</label
-                >
-                <select
-                    v-model="slotDuration"
-                    id="slotDuration"
-                    class="form-select"
-                >
-                    <option value="00:05:00">5 minutes</option>
-                    <option value="00:10:00">10 minutes</option>
-                    <option value="00:15:00">15 minutes</option>
-                    <option value="00:30:00">30 minutes</option>
-                </select>
-                <label class="input-group-text" for="slotMinTime">De</label>
-                <select
-                    v-model="slotMinTime"
-                    id="slotMinTime"
-                    class="form-select"
-                >
-                    <option value="00:00:00">0h</option>
-                    <option value="01:00:00">1h</option>
-                    <option value="02:00:00">2h</option>
-                    <option value="03:00:00">3h</option>
-                    <option value="04:00:00">4h</option>
-                    <option value="05:00:00">5h</option>
-                    <option value="06:00:00">6h</option>
-                    <option value="07:00:00">7h</option>
-                    <option value="08:00:00">8h</option>
-                    <option value="09:00:00">9h</option>
-                    <option value="10:00:00">10h</option>
-                    <option value="11:00:00">11h</option>
-                    <option value="12:00:00">12h</option>
-                </select>
-                <label class="input-group-text" for="slotMaxTime">À</label>
-                <select
-                    v-model="slotMaxTime"
-                    id="slotMaxTime"
-                    class="form-select"
-                >
-                    <option value="12:00:00">12h</option>
-                    <option value="13:00:00">13h</option>
-                    <option value="14:00:00">14h</option>
-                    <option value="15:00:00">15h</option>
-                    <option value="16:00:00">16h</option>
-                    <option value="17:00:00">17h</option>
-                    <option value="18:00:00">18h</option>
-                    <option value="19:00:00">19h</option>
-                    <option value="20:00:00">20h</option>
-                    <option value="21:00:00">21h</option>
-                    <option value="22:00:00">22h</option>
-                    <option value="23:00:00">23h</option>
-                    <option value="23:59:59">24h</option>
-                </select>
-            </div>
-        </div>
-        <div class="col-xs-12 col-sm-3">
-            <div class="float-end">
-                <div class="form-check input-group">
-                    <span class="input-group-text">
-                        <input
-                            id="showHideWE"
-                            class="mt-0"
-                            type="checkbox"
-                            v-model="showWeekends"
-                        />
-                    </span>
-                    <label
-                        for="showHideWE"
-                        class="form-check-label input-group-text"
-                        >Week-ends</label
-                    >
-                </div>
-            </div>
-        </div>
+  </div>
+  <div
+    class="display-options row justify-content-between"
+    style="margin-top: 1rem"
+  >
+    <div class="col-sm-9 col-xs-12">
+      <div class="input-group mb-3">
+        <label class="input-group-text" for="slotDuration"
+          >Durée des créneaux</label
+        >
+        <select v-model="slotDuration" id="slotDuration" class="form-select">
+          <option value="00:05:00">5 minutes</option>
+          <option value="00:10:00">10 minutes</option>
+          <option value="00:15:00">15 minutes</option>
+          <option value="00:30:00">30 minutes</option>
+        </select>
+        <label class="input-group-text" for="slotMinTime">De</label>
+        <select v-model="slotMinTime" id="slotMinTime" class="form-select">
+          <option value="00:00:00">0h</option>
+          <option value="01:00:00">1h</option>
+          <option value="02:00:00">2h</option>
+          <option value="03:00:00">3h</option>
+          <option value="04:00:00">4h</option>
+          <option value="05:00:00">5h</option>
+          <option value="06:00:00">6h</option>
+          <option value="07:00:00">7h</option>
+          <option value="08:00:00">8h</option>
+          <option value="09:00:00">9h</option>
+          <option value="10:00:00">10h</option>
+          <option value="11:00:00">11h</option>
+          <option value="12:00:00">12h</option>
+        </select>
+        <label class="input-group-text" for="slotMaxTime">À</label>
+        <select v-model="slotMaxTime" id="slotMaxTime" class="form-select">
+          <option value="12:00:00">12h</option>
+          <option value="13:00:00">13h</option>
+          <option value="14:00:00">14h</option>
+          <option value="15:00:00">15h</option>
+          <option value="16:00:00">16h</option>
+          <option value="17:00:00">17h</option>
+          <option value="18:00:00">18h</option>
+          <option value="19:00:00">19h</option>
+          <option value="20:00:00">20h</option>
+          <option value="21:00:00">21h</option>
+          <option value="22:00:00">22h</option>
+          <option value="23:00:00">23h</option>
+          <option value="23:59:59">24h</option>
+        </select>
+      </div>
     </div>
-    <FullCalendar :options="calendarOptions" ref="calendarRef">
-        <template v-slot:eventContent="{ event }: { event: EventApi }">
-            <span :class="eventClasses">
-                <b v-if="event.extendedProps.is === 'remote'">{{
-                    event.title
-                }}</b>
-                <b v-else-if="event.extendedProps.is === 'range'"
-                    >{{ formatDate(event.startStr) }} -
-                    {{ event.extendedProps.locationName }}</b
-                >
-                <b v-else-if="event.extendedProps.is === 'local'">{{
-                    event.title
-                }}</b>
-                <b v-else>no 'is'</b>
-                <a
-                    v-if="event.extendedProps.is === 'range'"
-                    class="fa fa-fw fa-times delete"
-                    @click.prevent="onClickDelete(event)"
-                >
-                </a>
-            </span>
+    <div class="col-xs-12 col-sm-3">
+      <div class="float-end">
+        <div class="form-check input-group">
+          <span class="input-group-text">
+            <input
+              id="showHideWE"
+              class="mt-0"
+              type="checkbox"
+              v-model="showWeekends"
+            />
+          </span>
+          <label for="showHideWE" class="form-check-label input-group-text"
+            >Week-ends</label
+          >
+        </div>
+      </div>
+    </div>
+  </div>
+  <FullCalendar :options="calendarOptions" ref="calendarRef">
+    <template v-slot:eventContent="{ event }: { event: EventApi }">
+      <span :class="eventClasses">
+        <b v-if="event.extendedProps.is === 'remote'">{{ event.title }}</b>
+        <b v-else-if="event.extendedProps.is === 'range'"
+          >{{ formatDate(event.startStr) }} -
+          {{ event.extendedProps.locationName }}</b
+        >
+        <b v-else-if="event.extendedProps.is === 'local'">{{ event.title }}</b>
+        <b v-else>no 'is'</b>
+        <a
+          v-if="event.extendedProps.is === 'range'"
+          class="fa fa-fw fa-times delete"
+          @click.prevent="onClickDelete(event)"
+        >
+        </a>
+      </span>
+    </template>
+  </FullCalendar>
+
+  <div id="copy-widget">
+    <div class="container mt-2 mb-2">
+      <div class="row justify-content-between align-items-center mb-4">
+        <div class="col-xs-12 col-sm-3 col-md-2">
+          <h6 class="chill-red">{{ $t("copy_range_from_to") }}</h6>
+        </div>
+        <div class="col-xs-12 col-sm-9 col-md-2">
+          <select v-model="dayOrWeek" id="dayOrWeek" class="form-select">
+            <option value="day">{{ $t("from_day_to_day") }}</option>
+            <option value="week">
+              {{ $t("from_week_to_week") }}
+            </option>
+          </select>
+        </div>
+        <template v-if="dayOrWeek === 'day'">
+          <div class="col-xs-12 col-sm-3 col-md-3">
+            <input class="form-control" type="date" v-model="copyFrom" />
+          </div>
+          <div class="col-xs-12 col-sm-1 col-md-1 copy-chevron">
+            <i class="fa fa-angle-double-right"></i>
+          </div>
+          <div class="col-xs-12 col-sm-3 col-md-3">
+            <input class="form-control" type="date" v-model="copyTo" />
+          </div>
+          <div class="col-xs-12 col-sm-5 col-md-1">
+            <button class="btn btn-action float-end" @click="copyDay">
+              {{ $t("copy_range") }}
+            </button>
+          </div>
         </template>
-    </FullCalendar>
-
-    <div id="copy-widget">
-        <div class="container mt-2 mb-2">
-            <div class="row justify-content-between align-items-center mb-4">
-                <div class="col-xs-12 col-sm-3 col-md-2">
-                    <h6 class="chill-red">{{ $t("copy_range_from_to") }}</h6>
-                </div>
-                <div class="col-xs-12 col-sm-9 col-md-2">
-                    <select
-                        v-model="dayOrWeek"
-                        id="dayOrWeek"
-                        class="form-select"
-                    >
-                        <option value="day">{{ $t("from_day_to_day") }}</option>
-                        <option value="week">
-                            {{ $t("from_week_to_week") }}
-                        </option>
-                    </select>
-                </div>
-                <template v-if="dayOrWeek === 'day'">
-                    <div class="col-xs-12 col-sm-3 col-md-3">
-                        <input
-                            class="form-control"
-                            type="date"
-                            v-model="copyFrom"
-                        />
-                    </div>
-                    <div class="col-xs-12 col-sm-1 col-md-1 copy-chevron">
-                        <i class="fa fa-angle-double-right"></i>
-                    </div>
-                    <div class="col-xs-12 col-sm-3 col-md-3">
-                        <input
-                            class="form-control"
-                            type="date"
-                            v-model="copyTo"
-                        />
-                    </div>
-                    <div class="col-xs-12 col-sm-5 col-md-1">
-                        <button
-                            class="btn btn-action float-end"
-                            @click="copyDay"
-                        >
-                            {{ $t("copy_range") }}
-                        </button>
-                    </div>
-                </template>
-                <template v-else>
-                    <div class="col-xs-12 col-sm-3 col-md-3">
-                        <select
-                            v-model="copyFromWeek"
-                            id="copyFromWeek"
-                            class="form-select"
-                        >
-                            <option
-                                v-for="w in lastWeeks"
-                                :value="w.value"
-                                :key="w.value"
-                            >
-                                {{ w.text }}
-                            </option>
-                        </select>
-                    </div>
-                    <div class="col-xs-12 col-sm-1 col-md-1 copy-chevron">
-                        <i class="fa fa-angle-double-right"></i>
-                    </div>
-                    <div class="col-xs-12 col-sm-3 col-md-3">
-                        <select
-                            v-model="copyToWeek"
-                            id="copyToWeek"
-                            class="form-select"
-                        >
-                            <option
-                                v-for="w in nextWeeks"
-                                :value="w.value"
-                                :key="w.value"
-                            >
-                                {{ w.text }}
-                            </option>
-                        </select>
-                    </div>
-                    <div class="col-xs-12 col-sm-5 col-md-1">
-                        <button
-                            class="btn btn-action float-end"
-                            @click="copyWeek"
-                        >
-                            {{ $t("copy_range") }}
-                        </button>
-                    </div>
-                </template>
-            </div>
-        </div>
+        <template v-else>
+          <div class="col-xs-12 col-sm-3 col-md-3">
+            <select
+              v-model="copyFromWeek"
+              id="copyFromWeek"
+              class="form-select"
+            >
+              <option v-for="w in lastWeeks" :value="w.value" :key="w.value">
+                {{ w.text }}
+              </option>
+            </select>
+          </div>
+          <div class="col-xs-12 col-sm-1 col-md-1 copy-chevron">
+            <i class="fa fa-angle-double-right"></i>
+          </div>
+          <div class="col-xs-12 col-sm-3 col-md-3">
+            <select v-model="copyToWeek" id="copyToWeek" class="form-select">
+              <option v-for="w in nextWeeks" :value="w.value" :key="w.value">
+                {{ w.text }}
+              </option>
+            </select>
+          </div>
+          <div class="col-xs-12 col-sm-5 col-md-1">
+            <button class="btn btn-action float-end" @click="copyWeek">
+              {{ $t("copy_range") }}
+            </button>
+          </div>
+        </template>
+      </div>
     </div>
+  </div>
 
-    <!-- not directly seen, but include in a modal -->
-    <edit-location ref="editLocation"></edit-location>
+  <!-- not directly seen, but include in a modal -->
+  <edit-location ref="editLocation"></edit-location>
 </template>
 
 <script setup lang="ts">
 import type {
-    CalendarOptions,
-    DatesSetArg,
-    EventInput,
+  CalendarOptions,
+  DatesSetArg,
+  EventInput,
 } from "@fullcalendar/core";
 import { computed, ref, onMounted } from "vue";
 import { useStore } from "vuex";
@@ -227,14 +179,14 @@ import { key } from "./store";
 import FullCalendar from "@fullcalendar/vue3";
 import frLocale from "@fullcalendar/core/locales/fr";
 import interactionPlugin, {
-    EventResizeDoneArg,
+  EventResizeDoneArg,
 } from "@fullcalendar/interaction";
 import timeGridPlugin from "@fullcalendar/timegrid";
 import {
-    EventApi,
-    DateSelectArg,
-    EventDropArg,
-    EventClickArg,
+  EventApi,
+  DateSelectArg,
+  EventDropArg,
+  EventClickArg,
 } from "@fullcalendar/core";
 import { dateToISO, ISOToDate } from "ChillMainAssets/chill/js/date";
 import VueMultiselect from "vue-multiselect";
@@ -255,96 +207,96 @@ const copyFromWeek = ref<string | null>(null);
 const copyToWeek = ref<string | null>(null);
 
 interface Weeks {
-    value: string | null;
-    text: string;
+  value: string | null;
+  text: string;
 }
 
 const getMonday = (week: number): Date => {
-    const lastMonday = new Date();
-    lastMonday.setDate(
-        lastMonday.getDate() - ((lastMonday.getDay() + 6) % 7) + week * 7,
-    );
-    return lastMonday;
+  const lastMonday = new Date();
+  lastMonday.setDate(
+    lastMonday.getDate() - ((lastMonday.getDay() + 6) % 7) + week * 7,
+  );
+  return lastMonday;
 };
 
 const dateOptions: Intl.DateTimeFormatOptions = {
-    weekday: "long",
-    year: "numeric",
-    month: "long",
-    day: "numeric",
+  weekday: "long",
+  year: "numeric",
+  month: "long",
+  day: "numeric",
 };
 
 const lastWeeks = computed((): Weeks[] =>
-    Array.from(Array(30).keys()).map((w) => {
-        const lastMonday = getMonday(15 - w);
-        return {
-            value: dateToISO(lastMonday),
-            text: `Semaine du ${lastMonday.toLocaleDateString("fr-FR", dateOptions)}`,
-        };
-    }),
+  Array.from(Array(30).keys()).map((w) => {
+    const lastMonday = getMonday(15 - w);
+    return {
+      value: dateToISO(lastMonday),
+      text: `Semaine du ${lastMonday.toLocaleDateString("fr-FR", dateOptions)}`,
+    };
+  }),
 );
 
 const nextWeeks = computed((): Weeks[] =>
-    Array.from(Array(52).keys()).map((w) => {
-        const nextMonday = getMonday(w + 1);
-        return {
-            value: dateToISO(nextMonday),
-            text: `Semaine du ${nextMonday.toLocaleDateString("fr-FR", dateOptions)}`,
-        };
-    }),
+  Array.from(Array(52).keys()).map((w) => {
+    const nextMonday = getMonday(w + 1);
+    return {
+      value: dateToISO(nextMonday),
+      text: `Semaine du ${nextMonday.toLocaleDateString("fr-FR", dateOptions)}`,
+    };
+  }),
 );
 
 const formatDate = (datetime: string) => {
-    console.log(typeof datetime);
-    return ISOToDate(datetime);
+  console.log(typeof datetime);
+  return ISOToDate(datetime);
 };
 
 const baseOptions = ref<CalendarOptions>({
-    locale: frLocale,
-    plugins: [interactionPlugin, timeGridPlugin],
-    initialView: "timeGridWeek",
-    initialDate: new Date(),
-    scrollTimeReset: false,
-    selectable: true,
-    // when the dates are changes in the fullcalendar view OR when new events are added
-    datesSet: onDatesSet,
-    // when a date is selected
-    select: onDateSelect,
-    // when a event is resized
-    eventResize: onEventDropOrResize,
-    // when an event is moved
-    eventDrop: onEventDropOrResize,
-    // when an event si clicked
-    eventClick: onEventClick,
-    selectMirror: false,
-    editable: true,
-    headerToolbar: {
-        left: "prev,next today",
-        center: "title",
-        right: "timeGridWeek,timeGridDay",
-    },
+  locale: frLocale,
+  plugins: [interactionPlugin, timeGridPlugin],
+  initialView: "timeGridWeek",
+  initialDate: new Date(),
+  scrollTimeReset: false,
+  selectable: true,
+  // when the dates are changes in the fullcalendar view OR when new events are added
+  datesSet: onDatesSet,
+  // when a date is selected
+  select: onDateSelect,
+  // when a event is resized
+  eventResize: onEventDropOrResize,
+  // when an event is moved
+  eventDrop: onEventDropOrResize,
+  // when an event si clicked
+  eventClick: onEventClick,
+  selectMirror: false,
+  editable: true,
+  headerToolbar: {
+    left: "prev,next today",
+    center: "title",
+    right: "timeGridWeek,timeGridDay",
+  },
 });
 
 const ranges = computed<EventInput[]>(() => {
-    return store.state.calendarRanges.ranges;
+  return store.state.calendarRanges.ranges;
 });
 
 const locations = computed<Location[]>(() => {
-    return store.state.locations.locations;
+  return store.state.locations.locations;
 });
 
 const pickedLocation = computed<Location | null>({
-    get(): Location | null {
-        return (
-            store.state.locations.locationPicked ||
-            store.state.locations.currentLocation
-        );
-    },
-    set(newLocation: Location | null): void {
-        store.commit("locations/setLocationPicked", newLocation, {
-            root: true,
-        });
-    },
+  get(): Location | null {
+    return (
+      store.state.locations.locationPicked ||
+      store.state.locations.currentLocation
+    );
+  },
+  set(newLocation: Location | null): void {
+    store.commit("locations/setLocationPicked", newLocation, {
+      root: true,
+    });
+  },
 });
 
 /**
@@ -373,116 +325,116 @@ const sources = computed<EventSourceInput[]>(() => {
 */
 
 const calendarOptions = computed((): CalendarOptions => {
-    return {
-        ...baseOptions.value,
-        weekends: showWeekends.value,
-        slotDuration: slotDuration.value,
-        events: ranges.value,
-        slotMinTime: slotMinTime.value,
-        slotMaxTime: slotMaxTime.value,
-    };
+  return {
+    ...baseOptions.value,
+    weekends: showWeekends.value,
+    slotDuration: slotDuration.value,
+    events: ranges.value,
+    slotMinTime: slotMinTime.value,
+    slotMaxTime: slotMaxTime.value,
+  };
 });
 
 /**
  * launched when the calendar range date change
  */
 function onDatesSet(event: DatesSetArg): void {
-    store.dispatch("fullCalendar/setCurrentDatesView", {
-        start: event.start,
-        end: event.end,
-    });
+  store.dispatch("fullCalendar/setCurrentDatesView", {
+    start: event.start,
+    end: event.end,
+  });
 }
 
 function onDateSelect(event: DateSelectArg): void {
-    if (null === pickedLocation.value) {
-        window.alert(
-            "Indiquez une localisation avant de créer une période de disponibilité.",
-        );
-        return;
-    }
+  if (null === pickedLocation.value) {
+    window.alert(
+      "Indiquez une localisation avant de créer une période de disponibilité.",
+    );
+    return;
+  }
 
-    store.dispatch("calendarRanges/createRange", {
-        start: event.start,
-        end: event.end,
-        location: pickedLocation.value,
-    });
+  store.dispatch("calendarRanges/createRange", {
+    start: event.start,
+    end: event.end,
+    location: pickedLocation.value,
+  });
 }
 
 /**
  * When a calendar range is deleted
  */
 function onClickDelete(event: EventApi): void {
-    if (event.extendedProps.is !== "range") {
-        return;
-    }
+  if (event.extendedProps.is !== "range") {
+    return;
+  }
 
-    store.dispatch(
-        "calendarRanges/deleteRange",
-        event.extendedProps.calendarRangeId,
-    );
+  store.dispatch(
+    "calendarRanges/deleteRange",
+    event.extendedProps.calendarRangeId,
+  );
 }
 
 function onEventDropOrResize(payload: EventDropArg | EventResizeDoneArg) {
-    if (payload.event.extendedProps.is !== "range") {
-        return;
-    }
+  if (payload.event.extendedProps.is !== "range") {
+    return;
+  }
 
-    store.dispatch("calendarRanges/patchRangeTime", {
-        calendarRangeId: payload.event.extendedProps.calendarRangeId,
-        start: payload.event.start,
-        end: payload.event.end,
-    });
+  store.dispatch("calendarRanges/patchRangeTime", {
+    calendarRangeId: payload.event.extendedProps.calendarRangeId,
+    start: payload.event.start,
+    end: payload.event.end,
+  });
 }
 
 function onEventClick(payload: EventClickArg): void {
-    // @ts-ignore TS does not recognize the target. But it does exists.
-    if (payload.jsEvent.target.classList.contains("delete")) {
-        return;
-    }
-    if (payload.event.extendedProps.is !== "range") {
-        return;
-    }
+  // @ts-ignore TS does not recognize the target. But it does exists.
+  if (payload.jsEvent.target.classList.contains("delete")) {
+    return;
+  }
+  if (payload.event.extendedProps.is !== "range") {
+    return;
+  }
 
-    editLocation.value?.startEdit(payload.event);
+  editLocation.value?.startEdit(payload.event);
 }
 
 function copyDay() {
-    if (null === copyFrom.value || null === copyTo.value) {
-        return;
-    }
-    store.dispatch("calendarRanges/copyFromDayToAnotherDay", {
-        from: ISOToDate(copyFrom.value),
-        to: ISOToDate(copyTo.value),
-    });
+  if (null === copyFrom.value || null === copyTo.value) {
+    return;
+  }
+  store.dispatch("calendarRanges/copyFromDayToAnotherDay", {
+    from: ISOToDate(copyFrom.value),
+    to: ISOToDate(copyTo.value),
+  });
 }
 
 function copyWeek() {
-    if (null === copyFromWeek.value || null === copyToWeek.value) {
-        return;
-    }
-    store.dispatch("calendarRanges/copyFromWeekToAnotherWeek", {
-        fromMonday: ISOToDate(copyFromWeek.value),
-        toMonday: ISOToDate(copyToWeek.value),
-    });
+  if (null === copyFromWeek.value || null === copyToWeek.value) {
+    return;
+  }
+  store.dispatch("calendarRanges/copyFromWeekToAnotherWeek", {
+    fromMonday: ISOToDate(copyFromWeek.value),
+    toMonday: ISOToDate(copyToWeek.value),
+  });
 }
 
 onMounted(() => {
-    copyFromWeek.value = dateToISO(getMonday(0));
-    copyToWeek.value = dateToISO(getMonday(1));
+  copyFromWeek.value = dateToISO(getMonday(0));
+  copyToWeek.value = dateToISO(getMonday(1));
 });
 </script>
 
 <style scoped>
 #copy-widget {
-    position: sticky;
-    bottom: 0px;
-    background-color: white;
-    z-index: 9999999999;
-    padding: 0.25rem 0 0.25rem;
+  position: sticky;
+  bottom: 0px;
+  background-color: white;
+  z-index: 9999999999;
+  padding: 0.25rem 0 0.25rem;
 }
 div.copy-chevron {
-    text-align: center;
-    font-size: x-large;
-    width: 2rem;
+  text-align: center;
+  font-size: x-large;
+  width: 2rem;
 }
 </style>
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/Components/EditLocation.vue b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/Components/EditLocation.vue
index 86d4a6c5a..5f434052e 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/Components/EditLocation.vue
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/Components/EditLocation.vue
@@ -1,28 +1,28 @@
 <template>
-    <component :is="Teleport" to="body">
-        <modal v-if="showModal" @close="closeModal">
-            <template v-slot:header>
-                <h3>{{ "Modifier le lieu" }}</h3>
-            </template>
+  <component :is="Teleport" to="body">
+    <modal v-if="showModal" @close="closeModal">
+      <template v-slot:header>
+        <h3>{{ "Modifier le lieu" }}</h3>
+      </template>
 
-            <template v-slot:body>
-                <div></div>
-                <label>Localisation</label>
-                <vue-multiselect
-                    v-model="location"
-                    :options="locations"
-                    :label="'name'"
-                    :track-by="'id'"
-                ></vue-multiselect>
-            </template>
+      <template v-slot:body>
+        <div></div>
+        <label>Localisation</label>
+        <vue-multiselect
+          v-model="location"
+          :options="locations"
+          :label="'name'"
+          :track-by="'id'"
+        ></vue-multiselect>
+      </template>
 
-            <template v-slot:footer>
-                <button class="btn btn-save" @click="saveAndClose">
-                    {{ "Enregistrer" }}
-                </button>
-            </template>
-        </modal>
-    </component>
+      <template v-slot:footer>
+        <button class="btn btn-save" @click="saveAndClose">
+          {{ "Enregistrer" }}
+        </button>
+      </template>
+    </modal>
+  </component>
 </template>
 
 <script setup lang="ts">
@@ -39,7 +39,7 @@ import VueMultiselect from "vue-multiselect";
 import { Teleport as teleport_, TeleportProps, VNodeProps } from "vue";
 
 const Teleport = teleport_ as new () => {
-    $props: VNodeProps & TeleportProps;
+  $props: VNodeProps & TeleportProps;
 };
 
 const store = useStore(key);
@@ -50,37 +50,37 @@ const showModal = ref(false);
 //const tele = ref<InstanceType<typeof Teleport> | null>(null);
 
 const locations = computed<Location[]>(() => {
-    return store.state.locations.locations;
+  return store.state.locations.locations;
 });
 
 const startEdit = function (event: EventApi): void {
-    console.log("startEditing", event);
-    calendarRangeId.value = event.extendedProps.calendarRangeId;
-    location.value =
-        store.getters["locations/getLocationById"](
-            event.extendedProps.locationId,
-        ) || null;
+  console.log("startEditing", event);
+  calendarRangeId.value = event.extendedProps.calendarRangeId;
+  location.value =
+    store.getters["locations/getLocationById"](
+      event.extendedProps.locationId,
+    ) || null;
 
-    console.log("new location value", location.value);
-    console.log("calendar range id", calendarRangeId.value);
-    showModal.value = true;
+  console.log("new location value", location.value);
+  console.log("calendar range id", calendarRangeId.value);
+  showModal.value = true;
 };
 
 const saveAndClose = function (e: Event): void {
-    console.log("saveEditAndClose", e);
+  console.log("saveEditAndClose", e);
 
-    store
-        .dispatch("calendarRanges/patchRangeLocation", {
-            location: location.value,
-            calendarRangeId: calendarRangeId.value,
-        })
-        .then((_) => {
-            showModal.value = false;
-        });
+  store
+    .dispatch("calendarRanges/patchRangeLocation", {
+      location: location.value,
+      calendarRangeId: calendarRangeId.value,
+    })
+    .then((_) => {
+      showModal.value = false;
+    });
 };
 
 const closeModal = function (_: any): void {
-    showModal.value = false;
+  showModal.value = false;
 };
 
 defineExpose({ startEdit });
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/i18n.ts b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/i18n.ts
index e9e31dd25..18040cb75 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/i18n.ts
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/i18n.ts
@@ -1,27 +1,27 @@
 const appMessages = {
-    fr: {
-        created_availabilities: "Lieu des plages de disponibilités créées",
-        edit_your_calendar_range: "Planifiez vos plages de disponibilités",
-        show_my_calendar: "Afficher mon calendrier",
-        show_weekends: "Afficher les week-ends",
-        copy_range: "Copier",
-        copy_range_from_to: "Copier les plages",
-        from_day_to_day: "d'un jour à l'autre",
-        from_week_to_week: "d'une semaine à l'autre",
-        copy_range_how_to:
-            "Créez les plages de disponibilités durant une journée et copiez-les facilement au jour suivant avec ce bouton. Si les week-ends sont cachés, le jour suivant un vendredi sera le lundi.",
-        new_range_to_save: "Nouvelles plages à enregistrer",
-        update_range_to_save: "Plages à modifier",
-        delete_range_to_save: "Plages à supprimer",
-        by: "Par",
-        main_user_concerned: "Utilisateur concerné",
-        dateFrom: "De",
-        dateTo: "à",
-        day: "Jour",
-        week: "Semaine",
-        month: "Mois",
-        today: "Aujourd'hui",
-    },
+  fr: {
+    created_availabilities: "Lieu des plages de disponibilités créées",
+    edit_your_calendar_range: "Planifiez vos plages de disponibilités",
+    show_my_calendar: "Afficher mon calendrier",
+    show_weekends: "Afficher les week-ends",
+    copy_range: "Copier",
+    copy_range_from_to: "Copier les plages",
+    from_day_to_day: "d'un jour à l'autre",
+    from_week_to_week: "d'une semaine à l'autre",
+    copy_range_how_to:
+      "Créez les plages de disponibilités durant une journée et copiez-les facilement au jour suivant avec ce bouton. Si les week-ends sont cachés, le jour suivant un vendredi sera le lundi.",
+    new_range_to_save: "Nouvelles plages à enregistrer",
+    update_range_to_save: "Plages à modifier",
+    delete_range_to_save: "Plages à supprimer",
+    by: "Par",
+    main_user_concerned: "Utilisateur concerné",
+    dateFrom: "De",
+    dateTo: "à",
+    day: "Jour",
+    week: "Semaine",
+    month: "Mois",
+    today: "Aujourd'hui",
+  },
 };
 
 export { appMessages };
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/index2.ts b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/index2.ts
index cb87b0b67..c053d12bf 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/index2.ts
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/index2.ts
@@ -7,13 +7,13 @@ import App2 from "./App2.vue";
 import { useI18n } from "vue-i18n";
 
 futureStore().then((store) => {
-    const i18n = _createI18n(appMessages, false);
+  const i18n = _createI18n(appMessages, false);
 
-    const app = createApp({
-        template: `<app></app>`,
-    })
-        .use(store, key)
-        .use(i18n)
-        .component("app", App2)
-        .mount("#myCalendar");
+  const app = createApp({
+    template: `<app></app>`,
+  })
+    .use(store, key)
+    .use(i18n)
+    .component("app", App2)
+    .mount("#myCalendar");
 });
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/index.ts b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/index.ts
index e5a863245..d7332fa54 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/index.ts
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/index.ts
@@ -5,7 +5,7 @@ import me, { MeState } from "./modules/me";
 import fullCalendar, { FullCalendarState } from "./modules/fullcalendar";
 import calendarRanges, { CalendarRangesState } from "./modules/calendarRanges";
 import calendarRemotes, {
-    CalendarRemotesState,
+  CalendarRemotesState,
 } from "./modules/calendarRemotes";
 import { whoami } from "../../../../../../ChillMainBundle/Resources/public/lib/api/user";
 import { User } from "../../../../../../ChillMainBundle/Resources/public/types";
@@ -15,42 +15,40 @@ import calendarLocals, { CalendarLocalsState } from "./modules/calendarLocals";
 const debug = process.env.NODE_ENV !== "production";
 
 export interface State {
-    calendarRanges: CalendarRangesState;
-    calendarRemotes: CalendarRemotesState;
-    calendarLocals: CalendarLocalsState;
-    fullCalendar: FullCalendarState;
-    me: MeState;
-    locations: LocationState;
+  calendarRanges: CalendarRangesState;
+  calendarRemotes: CalendarRemotesState;
+  calendarLocals: CalendarLocalsState;
+  fullCalendar: FullCalendarState;
+  me: MeState;
+  locations: LocationState;
 }
 
 export const key: InjectionKey<Store<State>> = Symbol();
 
 const futureStore = function (): Promise<Store<State>> {
-    return whoami().then((user: User) => {
-        const store = createStore<State>({
-            strict: debug,
-            modules: {
-                me,
-                fullCalendar,
-                calendarRanges,
-                calendarRemotes,
-                calendarLocals,
-                locations,
-            },
-            mutations: {},
-        });
-
-        store.commit("me/setWhoAmi", user, { root: true });
-        store
-            .dispatch("locations/getLocations", null, { root: true })
-            .then((_) => {
-                return store.dispatch("locations/getCurrentLocation", null, {
-                    root: true,
-                });
-            });
-
-        return Promise.resolve(store);
+  return whoami().then((user: User) => {
+    const store = createStore<State>({
+      strict: debug,
+      modules: {
+        me,
+        fullCalendar,
+        calendarRanges,
+        calendarRemotes,
+        calendarLocals,
+        locations,
+      },
+      mutations: {},
     });
+
+    store.commit("me/setWhoAmi", user, { root: true });
+    store.dispatch("locations/getLocations", null, { root: true }).then((_) => {
+      return store.dispatch("locations/getCurrentLocation", null, {
+        root: true,
+      });
+    });
+
+    return Promise.resolve(store);
+  });
 };
 
 export default futureStore;
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/calendarLocals.ts b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/calendarLocals.ts
index 07ce477dd..bebeef0b5 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/calendarLocals.ts
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/calendarLocals.ts
@@ -8,109 +8,99 @@ import { TransportExceptionInterface } from "../../../../../../../ChillMainBundl
 import { COLORS } from "../../../Calendar/const";
 
 export interface CalendarLocalsState {
-    locals: EventInput[];
-    localsLoaded: { start: number; end: number }[];
-    localsIndex: Set<string>;
-    key: number;
+  locals: EventInput[];
+  localsLoaded: { start: number; end: number }[];
+  localsIndex: Set<string>;
+  key: number;
 }
 
 type Context = ActionContext<CalendarLocalsState, State>;
 
 export default {
-    namespaced: true,
-    state: (): CalendarLocalsState => ({
-        locals: [],
-        localsLoaded: [],
-        localsIndex: new Set<string>(),
-        key: 0,
-    }),
-    getters: {
-        isLocalsLoaded:
-            (state: CalendarLocalsState) =>
-            ({ start, end }: { start: Date; end: Date }): boolean => {
-                for (const range of state.localsLoaded) {
-                    if (
-                        start.getTime() === range.start &&
-                        end.getTime() === range.end
-                    ) {
-                        return true;
-                    }
-                }
+  namespaced: true,
+  state: (): CalendarLocalsState => ({
+    locals: [],
+    localsLoaded: [],
+    localsIndex: new Set<string>(),
+    key: 0,
+  }),
+  getters: {
+    isLocalsLoaded:
+      (state: CalendarLocalsState) =>
+      ({ start, end }: { start: Date; end: Date }): boolean => {
+        for (const range of state.localsLoaded) {
+          if (start.getTime() === range.start && end.getTime() === range.end) {
+            return true;
+          }
+        }
 
-                return false;
-            },
+        return false;
+      },
+  },
+  mutations: {
+    addLocals(state: CalendarLocalsState, ranges: CalendarLight[]) {
+      console.log("addLocals", ranges);
+
+      const toAdd = ranges
+        .map((cr) => localsToFullCalendarEvent(cr))
+        .filter((r) => !state.localsIndex.has(r.id));
+
+      toAdd.forEach((r) => {
+        state.localsIndex.add(r.id);
+        state.locals.push(r);
+      });
+      state.key = state.key + toAdd.length;
     },
-    mutations: {
-        addLocals(state: CalendarLocalsState, ranges: CalendarLight[]) {
-            console.log("addLocals", ranges);
-
-            const toAdd = ranges
-                .map((cr) => localsToFullCalendarEvent(cr))
-                .filter((r) => !state.localsIndex.has(r.id));
-
-            toAdd.forEach((r) => {
-                state.localsIndex.add(r.id);
-                state.locals.push(r);
-            });
-            state.key = state.key + toAdd.length;
-        },
-        addLoaded(
-            state: CalendarLocalsState,
-            payload: { start: Date; end: Date },
-        ) {
-            state.localsLoaded.push({
-                start: payload.start.getTime(),
-                end: payload.end.getTime(),
-            });
-        },
+    addLoaded(state: CalendarLocalsState, payload: { start: Date; end: Date }) {
+      state.localsLoaded.push({
+        start: payload.start.getTime(),
+        end: payload.end.getTime(),
+      });
     },
-    actions: {
-        fetchLocals(
-            ctx: Context,
-            payload: { start: Date; end: Date },
-        ): Promise<null> {
-            const start = payload.start;
-            const end = payload.end;
+  },
+  actions: {
+    fetchLocals(
+      ctx: Context,
+      payload: { start: Date; end: Date },
+    ): Promise<null> {
+      const start = payload.start;
+      const end = payload.end;
 
-            if (ctx.rootGetters["me/getMe"] === null) {
-                return Promise.resolve(null);
-            }
+      if (ctx.rootGetters["me/getMe"] === null) {
+        return Promise.resolve(null);
+      }
 
-            if (ctx.getters.isLocalsLoaded({ start, end })) {
-                return Promise.resolve(ctx.getters.getRangeSource);
-            }
+      if (ctx.getters.isLocalsLoaded({ start, end })) {
+        return Promise.resolve(ctx.getters.getRangeSource);
+      }
 
-            ctx.commit("addLoaded", {
-                start: start,
-                end: end,
-            });
+      ctx.commit("addLoaded", {
+        start: start,
+        end: end,
+      });
 
-            return fetchCalendarLocalForUser(
-                ctx.rootGetters["me/getMe"],
-                start,
-                end,
-            )
-                .then((remotes: CalendarLight[]) => {
-                    // to be add when reactivity problem will be solve ?
-                    //ctx.commit('addRemotes', remotes);
-                    const inputs = remotes
-                        .map((cr) => localsToFullCalendarEvent(cr))
-                        .map((cr) => ({
-                            ...cr,
-                            backgroundColor: COLORS[0],
-                            textColor: "black",
-                            editable: false,
-                        }));
-                    ctx.commit("calendarRanges/addExternals", inputs, {
-                        root: true,
-                    });
-                    return Promise.resolve(null);
-                })
-                .catch((e: TransportExceptionInterface) => {
-                    console.error(e);
+      return fetchCalendarLocalForUser(ctx.rootGetters["me/getMe"], start, end)
+        .then((remotes: CalendarLight[]) => {
+          // to be add when reactivity problem will be solve ?
+          //ctx.commit('addRemotes', remotes);
+          const inputs = remotes
+            .map((cr) => localsToFullCalendarEvent(cr))
+            .map((cr) => ({
+              ...cr,
+              backgroundColor: COLORS[0],
+              textColor: "black",
+              editable: false,
+            }));
+          ctx.commit("calendarRanges/addExternals", inputs, {
+            root: true,
+          });
+          return Promise.resolve(null);
+        })
+        .catch((e: TransportExceptionInterface) => {
+          console.error(e);
 
-                    return Promise.resolve(null);
-                });
-        },
+          return Promise.resolve(null);
+        });
     },
+  },
 } as Module<CalendarLocalsState, State>;
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/calendarRanges.ts b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/calendarRanges.ts
index 26984c051..facea746d 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/calendarRanges.ts
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/calendarRanges.ts
@@ -1,10 +1,10 @@
 import { State } from "./../index";
 import { ActionContext, Module } from "vuex";
 import {
-    CalendarRange,
-    CalendarRangeCreate,
-    CalendarRangeEdit,
-    isEventInputCalendarRange,
+  CalendarRange,
+  CalendarRangeCreate,
+  CalendarRangeEdit,
+  isEventInputCalendarRange,
 } from "../../../../types";
 import { Location } from "../../../../../../../ChillMainBundle/Resources/public/types";
 import { fetchCalendarRangeForUser } from "../../../Calendar/api";
@@ -12,369 +12,332 @@ import { calendarRangeToFullCalendarEvent } from "../../../Calendar/store/utils"
 import { EventInput } from "@fullcalendar/core";
 import { makeFetch } from "../../../../../../../ChillMainBundle/Resources/public/lib/api/apiMethods";
 import {
-    datetimeToISO,
-    dateToISO,
-    ISOToDatetime,
+  datetimeToISO,
+  dateToISO,
+  ISOToDatetime,
 } from "../../../../../../../ChillMainBundle/Resources/public/chill/js/date";
 import type { EventInputCalendarRange } from "../../../../types";
 
 export interface CalendarRangesState {
-    ranges: (EventInput | EventInputCalendarRange)[];
-    rangesLoaded: { start: number; end: number }[];
-    rangesIndex: Set<string>;
-    key: number;
+  ranges: (EventInput | EventInputCalendarRange)[];
+  rangesLoaded: { start: number; end: number }[];
+  rangesIndex: Set<string>;
+  key: number;
 }
 
 type Context = ActionContext<CalendarRangesState, State>;
 
 export default {
-    namespaced: true,
-    state: (): CalendarRangesState => ({
-        ranges: [],
-        rangesLoaded: [],
-        rangesIndex: new Set<string>(),
-        key: 0,
-    }),
-    getters: {
-        isRangeLoaded:
-            (state: CalendarRangesState) =>
-            ({ start, end }: { start: Date; end: Date }): boolean => {
-                for (const range of state.rangesLoaded) {
-                    if (
-                        start.getTime() === range.start &&
-                        end.getTime() === range.end
-                    ) {
-                        return true;
-                    }
-                }
+  namespaced: true,
+  state: (): CalendarRangesState => ({
+    ranges: [],
+    rangesLoaded: [],
+    rangesIndex: new Set<string>(),
+    key: 0,
+  }),
+  getters: {
+    isRangeLoaded:
+      (state: CalendarRangesState) =>
+      ({ start, end }: { start: Date; end: Date }): boolean => {
+        for (const range of state.rangesLoaded) {
+          if (start.getTime() === range.start && end.getTime() === range.end) {
+            return true;
+          }
+        }
 
-                return false;
-            },
-        getRangesOnDate:
-            (state: CalendarRangesState) =>
-            (date: Date): EventInputCalendarRange[] => {
-                const founds = [];
-                const dateStr = dateToISO(date) as string;
+        return false;
+      },
+    getRangesOnDate:
+      (state: CalendarRangesState) =>
+      (date: Date): EventInputCalendarRange[] => {
+        const founds = [];
+        const dateStr = dateToISO(date) as string;
 
-                for (const range of state.ranges) {
-                    if (
-                        isEventInputCalendarRange(range) &&
-                        range.start.startsWith(dateStr)
-                    ) {
-                        founds.push(range);
-                    }
-                }
+        for (const range of state.ranges) {
+          if (
+            isEventInputCalendarRange(range) &&
+            range.start.startsWith(dateStr)
+          ) {
+            founds.push(range);
+          }
+        }
 
-                return founds;
-            },
-        getRangesOnWeek:
-            (state: CalendarRangesState) =>
-            (mondayDate: Date): EventInputCalendarRange[] => {
-                const founds = [];
-                for (const d of Array.from(Array(7).keys())) {
-                    const dateOfWeek = new Date(mondayDate);
-                    dateOfWeek.setDate(mondayDate.getDate() + d);
-                    const dateStr = dateToISO(dateOfWeek) as string;
-                    for (const range of state.ranges) {
-                        if (
-                            isEventInputCalendarRange(range) &&
-                            range.start.startsWith(dateStr)
-                        ) {
-                            founds.push(range);
-                        }
-                    }
-                }
+        return founds;
+      },
+    getRangesOnWeek:
+      (state: CalendarRangesState) =>
+      (mondayDate: Date): EventInputCalendarRange[] => {
+        const founds = [];
+        for (const d of Array.from(Array(7).keys())) {
+          const dateOfWeek = new Date(mondayDate);
+          dateOfWeek.setDate(mondayDate.getDate() + d);
+          const dateStr = dateToISO(dateOfWeek) as string;
+          for (const range of state.ranges) {
+            if (
+              isEventInputCalendarRange(range) &&
+              range.start.startsWith(dateStr)
+            ) {
+              founds.push(range);
+            }
+          }
+        }
 
-                return founds;
-            },
+        return founds;
+      },
+  },
+  mutations: {
+    addRanges(state: CalendarRangesState, ranges: CalendarRange[]) {
+      const toAdd = ranges
+        .map((cr) => calendarRangeToFullCalendarEvent(cr))
+        .map((cr) => ({
+          ...cr,
+          backgroundColor: "white",
+          borderColor: "#3788d8",
+          textColor: "black",
+        }))
+        .filter((r) => !state.rangesIndex.has(r.id));
+
+      toAdd.forEach((r) => {
+        state.rangesIndex.add(r.id);
+        state.ranges.push(r);
+      });
+      state.key = state.key + toAdd.length;
     },
-    mutations: {
-        addRanges(state: CalendarRangesState, ranges: CalendarRange[]) {
-            const toAdd = ranges
-                .map((cr) => calendarRangeToFullCalendarEvent(cr))
-                .map((cr) => ({
-                    ...cr,
-                    backgroundColor: "white",
-                    borderColor: "#3788d8",
-                    textColor: "black",
-                }))
-                .filter((r) => !state.rangesIndex.has(r.id));
+    addExternals(
+      state: CalendarRangesState,
+      externalEvents: (EventInput & { id: string })[],
+    ) {
+      const toAdd = externalEvents.filter((r) => !state.rangesIndex.has(r.id));
 
-            toAdd.forEach((r) => {
-                state.rangesIndex.add(r.id);
-                state.ranges.push(r);
-            });
-            state.key = state.key + toAdd.length;
-        },
-        addExternals(
-            state: CalendarRangesState,
-            externalEvents: (EventInput & { id: string })[],
-        ) {
-            const toAdd = externalEvents.filter(
-                (r) => !state.rangesIndex.has(r.id),
-            );
-
-            toAdd.forEach((r) => {
-                state.rangesIndex.add(r.id);
-                state.ranges.push(r);
-            });
-            state.key = state.key + toAdd.length;
-        },
-        addLoaded(
-            state: CalendarRangesState,
-            payload: { start: Date; end: Date },
-        ) {
-            state.rangesLoaded.push({
-                start: payload.start.getTime(),
-                end: payload.end.getTime(),
-            });
-        },
-        addRange(state: CalendarRangesState, payload: CalendarRange) {
-            const asEvent = calendarRangeToFullCalendarEvent(payload);
-            state.ranges.push({
-                ...asEvent,
-                backgroundColor: "white",
-                borderColor: "#3788d8",
-                textColor: "black",
-            });
-            state.rangesIndex.add(asEvent.id);
-            state.key = state.key + 1;
-        },
-        removeRange(state: CalendarRangesState, calendarRangeId: number) {
-            const found = state.ranges.find(
-                (r) =>
-                    r.calendarRangeId === calendarRangeId && r.is === "range",
-            );
-
-            if (found !== undefined) {
-                state.ranges = state.ranges.filter(
-                    (r) =>
-                        !(
-                            r.calendarRangeId === calendarRangeId &&
-                            r.is === "range"
-                        ),
-                );
-
-                if (typeof found.id === "string") {
-                    // should always be true
-                    state.rangesIndex.delete(found.id);
-                }
-
-                state.key = state.key + 1;
-            }
-        },
-        updateRange(state: CalendarRangesState, range: CalendarRange) {
-            const found = state.ranges.find(
-                (r) => r.calendarRangeId === range.id && r.is === "range",
-            );
-            const newEvent = calendarRangeToFullCalendarEvent(range);
-
-            if (found !== undefined) {
-                found.start = newEvent.start;
-                found.end = newEvent.end;
-                found.locationId = range.location.id;
-                found.locationName = range.location.name;
-            }
-
-            state.key = state.key + 1;
-        },
+      toAdd.forEach((r) => {
+        state.rangesIndex.add(r.id);
+        state.ranges.push(r);
+      });
+      state.key = state.key + toAdd.length;
     },
-    actions: {
-        fetchRanges(
-            ctx: Context,
-            payload: { start: Date; end: Date },
-        ): Promise<null> {
-            const start = payload.start;
-            const end = payload.end;
-
-            if (ctx.rootGetters["me/getMe"] === null) {
-                return Promise.resolve(ctx.getters.getRangeSource);
-            }
-
-            if (ctx.getters.isRangeLoaded({ start, end })) {
-                return Promise.resolve(ctx.getters.getRangeSource);
-            }
-
-            ctx.commit("addLoaded", {
-                start: start,
-                end: end,
-            });
-
-            return fetchCalendarRangeForUser(
-                ctx.rootGetters["me/getMe"],
-                start,
-                end,
-            ).then((ranges: CalendarRange[]) => {
-                ctx.commit("addRanges", ranges);
-                return Promise.resolve(null);
-            });
-        },
-        createRange(
-            ctx: Context,
-            {
-                start,
-                end,
-                location,
-            }: { start: Date; end: Date; location: Location },
-        ): Promise<null> {
-            const url = `/api/1.0/calendar/calendar-range.json?`;
-
-            if (ctx.rootState.me.me === null) {
-                throw new Error("user is currently null");
-            }
-
-            const body = {
-                user: {
-                    id: ctx.rootState.me.me.id,
-                    type: "user",
-                },
-                startDate: {
-                    datetime: datetimeToISO(start),
-                },
-                endDate: {
-                    datetime: datetimeToISO(end),
-                },
-                location: {
-                    id: location.id,
-                    type: "location",
-                },
-            } as CalendarRangeCreate;
-
-            return makeFetch<CalendarRangeCreate, CalendarRange>(
-                "POST",
-                url,
-                body,
-            )
-                .then((newRange) => {
-                    ctx.commit("addRange", newRange);
-
-                    return Promise.resolve(null);
-                })
-                .catch((error) => {
-                    console.error(error);
-
-                    throw error;
-                });
-        },
-        deleteRange(ctx: Context, calendarRangeId: number) {
-            const url = `/api/1.0/calendar/calendar-range/${calendarRangeId}.json`;
-
-            makeFetch<undefined, never>("DELETE", url).then(() => {
-                ctx.commit("removeRange", calendarRangeId);
-            });
-        },
-        patchRangeTime(
-            ctx,
-            {
-                calendarRangeId,
-                start,
-                end,
-            }: { calendarRangeId: number; start: Date; end: Date },
-        ): Promise<null> {
-            const url = `/api/1.0/calendar/calendar-range/${calendarRangeId}.json`;
-            const body = {
-                startDate: {
-                    datetime: datetimeToISO(start),
-                },
-                endDate: {
-                    datetime: datetimeToISO(end),
-                },
-            } as CalendarRangeEdit;
-
-            return makeFetch<CalendarRangeEdit, CalendarRange>(
-                "PATCH",
-                url,
-                body,
-            )
-                .then((range) => {
-                    ctx.commit("updateRange", range);
-                    return Promise.resolve(null);
-                })
-                .catch((error) => {
-                    console.error(error);
-                    return Promise.resolve(null);
-                });
-        },
-        patchRangeLocation(
-            ctx,
-            {
-                location,
-                calendarRangeId,
-            }: { location: Location; calendarRangeId: number },
-        ): Promise<null> {
-            const url = `/api/1.0/calendar/calendar-range/${calendarRangeId}.json`;
-            const body = {
-                location: {
-                    id: location.id,
-                    type: "location",
-                },
-            } as CalendarRangeEdit;
-
-            return makeFetch<CalendarRangeEdit, CalendarRange>(
-                "PATCH",
-                url,
-                body,
-            )
-                .then((range) => {
-                    ctx.commit("updateRange", range);
-                    return Promise.resolve(null);
-                })
-                .catch((error) => {
-                    console.error(error);
-                    return Promise.resolve(null);
-                });
-        },
-        copyFromDayToAnotherDay(
-            ctx,
-            { from, to }: { from: Date; to: Date },
-        ): Promise<null> {
-            const rangesToCopy: EventInputCalendarRange[] =
-                ctx.getters["getRangesOnDate"](from);
-            const promises = [];
-
-            for (const r of rangesToCopy) {
-                const start = new Date(ISOToDatetime(r.start) as Date);
-                start.setFullYear(
-                    to.getFullYear(),
-                    to.getMonth(),
-                    to.getDate(),
-                );
-                const end = new Date(ISOToDatetime(r.end) as Date);
-                end.setFullYear(to.getFullYear(), to.getMonth(), to.getDate());
-                const location = ctx.rootGetters["locations/getLocationById"](
-                    r.locationId,
-                );
-
-                promises.push(
-                    ctx.dispatch("createRange", { start, end, location }),
-                );
-            }
-
-            return Promise.all(promises).then(() => Promise.resolve(null));
-        },
-        copyFromWeekToAnotherWeek(
-            ctx: Context,
-            { fromMonday, toMonday }: { fromMonday: Date; toMonday: Date },
-        ): Promise<null> {
-            const rangesToCopy: EventInputCalendarRange[] =
-                ctx.getters["getRangesOnWeek"](fromMonday);
-            const promises = [];
-            const diffTime = toMonday.getTime() - fromMonday.getTime();
-            for (const r of rangesToCopy) {
-                const start = new Date(ISOToDatetime(r.start) as Date);
-                const end = new Date(ISOToDatetime(r.end) as Date);
-                start.setTime(start.getTime() + diffTime);
-                end.setTime(end.getTime() + diffTime);
-                const location = ctx.rootGetters["locations/getLocationById"](
-                    r.locationId,
-                );
-
-                promises.push(
-                    ctx.dispatch("createRange", { start, end, location }),
-                );
-            }
-
-            return Promise.all(promises).then(() => Promise.resolve(null));
-        },
+    addLoaded(state: CalendarRangesState, payload: { start: Date; end: Date }) {
+      state.rangesLoaded.push({
+        start: payload.start.getTime(),
+        end: payload.end.getTime(),
+      });
     },
+    addRange(state: CalendarRangesState, payload: CalendarRange) {
+      const asEvent = calendarRangeToFullCalendarEvent(payload);
+      state.ranges.push({
+        ...asEvent,
+        backgroundColor: "white",
+        borderColor: "#3788d8",
+        textColor: "black",
+      });
+      state.rangesIndex.add(asEvent.id);
+      state.key = state.key + 1;
+    },
+    removeRange(state: CalendarRangesState, calendarRangeId: number) {
+      const found = state.ranges.find(
+        (r) => r.calendarRangeId === calendarRangeId && r.is === "range",
+      );
+
+      if (found !== undefined) {
+        state.ranges = state.ranges.filter(
+          (r) => !(r.calendarRangeId === calendarRangeId && r.is === "range"),
+        );
+
+        if (typeof found.id === "string") {
+          // should always be true
+          state.rangesIndex.delete(found.id);
+        }
+
+        state.key = state.key + 1;
+      }
+    },
+    updateRange(state: CalendarRangesState, range: CalendarRange) {
+      const found = state.ranges.find(
+        (r) => r.calendarRangeId === range.id && r.is === "range",
+      );
+      const newEvent = calendarRangeToFullCalendarEvent(range);
+
+      if (found !== undefined) {
+        found.start = newEvent.start;
+        found.end = newEvent.end;
+        found.locationId = range.location.id;
+        found.locationName = range.location.name;
+      }
+
+      state.key = state.key + 1;
+    },
+  },
+  actions: {
+    fetchRanges(
+      ctx: Context,
+      payload: { start: Date; end: Date },
+    ): Promise<null> {
+      const start = payload.start;
+      const end = payload.end;
+
+      if (ctx.rootGetters["me/getMe"] === null) {
+        return Promise.resolve(ctx.getters.getRangeSource);
+      }
+
+      if (ctx.getters.isRangeLoaded({ start, end })) {
+        return Promise.resolve(ctx.getters.getRangeSource);
+      }
+
+      ctx.commit("addLoaded", {
+        start: start,
+        end: end,
+      });
+
+      return fetchCalendarRangeForUser(
+        ctx.rootGetters["me/getMe"],
+        start,
+        end,
+      ).then((ranges: CalendarRange[]) => {
+        ctx.commit("addRanges", ranges);
+        return Promise.resolve(null);
+      });
+    },
+    createRange(
+      ctx: Context,
+      { start, end, location }: { start: Date; end: Date; location: Location },
+    ): Promise<null> {
+      const url = `/api/1.0/calendar/calendar-range.json?`;
+
+      if (ctx.rootState.me.me === null) {
+        throw new Error("user is currently null");
+      }
+
+      const body = {
+        user: {
+          id: ctx.rootState.me.me.id,
+          type: "user",
+        },
+        startDate: {
+          datetime: datetimeToISO(start),
+        },
+        endDate: {
+          datetime: datetimeToISO(end),
+        },
+        location: {
+          id: location.id,
+          type: "location",
+        },
+      } as CalendarRangeCreate;
+
+      return makeFetch<CalendarRangeCreate, CalendarRange>("POST", url, body)
+        .then((newRange) => {
+          ctx.commit("addRange", newRange);
+
+          return Promise.resolve(null);
+        })
+        .catch((error) => {
+          console.error(error);
+
+          throw error;
+        });
+    },
+    deleteRange(ctx: Context, calendarRangeId: number) {
+      const url = `/api/1.0/calendar/calendar-range/${calendarRangeId}.json`;
+
+      makeFetch<undefined, never>("DELETE", url).then(() => {
+        ctx.commit("removeRange", calendarRangeId);
+      });
+    },
+    patchRangeTime(
+      ctx,
+      {
+        calendarRangeId,
+        start,
+        end,
+      }: { calendarRangeId: number; start: Date; end: Date },
+    ): Promise<null> {
+      const url = `/api/1.0/calendar/calendar-range/${calendarRangeId}.json`;
+      const body = {
+        startDate: {
+          datetime: datetimeToISO(start),
+        },
+        endDate: {
+          datetime: datetimeToISO(end),
+        },
+      } as CalendarRangeEdit;
+
+      return makeFetch<CalendarRangeEdit, CalendarRange>("PATCH", url, body)
+        .then((range) => {
+          ctx.commit("updateRange", range);
+          return Promise.resolve(null);
+        })
+        .catch((error) => {
+          console.error(error);
+          return Promise.resolve(null);
+        });
+    },
+    patchRangeLocation(
+      ctx,
+      {
+        location,
+        calendarRangeId,
+      }: { location: Location; calendarRangeId: number },
+    ): Promise<null> {
+      const url = `/api/1.0/calendar/calendar-range/${calendarRangeId}.json`;
+      const body = {
+        location: {
+          id: location.id,
+          type: "location",
+        },
+      } as CalendarRangeEdit;
+
+      return makeFetch<CalendarRangeEdit, CalendarRange>("PATCH", url, body)
+        .then((range) => {
+          ctx.commit("updateRange", range);
+          return Promise.resolve(null);
+        })
+        .catch((error) => {
+          console.error(error);
+          return Promise.resolve(null);
+        });
+    },
+    copyFromDayToAnotherDay(
+      ctx,
+      { from, to }: { from: Date; to: Date },
+    ): Promise<null> {
+      const rangesToCopy: EventInputCalendarRange[] =
+        ctx.getters["getRangesOnDate"](from);
+      const promises = [];
+
+      for (const r of rangesToCopy) {
+        const start = new Date(ISOToDatetime(r.start) as Date);
+        start.setFullYear(to.getFullYear(), to.getMonth(), to.getDate());
+        const end = new Date(ISOToDatetime(r.end) as Date);
+        end.setFullYear(to.getFullYear(), to.getMonth(), to.getDate());
+        const location = ctx.rootGetters["locations/getLocationById"](
+          r.locationId,
+        );
+
+        promises.push(ctx.dispatch("createRange", { start, end, location }));
+      }
+
+      return Promise.all(promises).then(() => Promise.resolve(null));
+    },
+    copyFromWeekToAnotherWeek(
+      ctx: Context,
+      { fromMonday, toMonday }: { fromMonday: Date; toMonday: Date },
+    ): Promise<null> {
+      const rangesToCopy: EventInputCalendarRange[] =
+        ctx.getters["getRangesOnWeek"](fromMonday);
+      const promises = [];
+      const diffTime = toMonday.getTime() - fromMonday.getTime();
+      for (const r of rangesToCopy) {
+        const start = new Date(ISOToDatetime(r.start) as Date);
+        const end = new Date(ISOToDatetime(r.end) as Date);
+        start.setTime(start.getTime() + diffTime);
+        end.setTime(end.getTime() + diffTime);
+        const location = ctx.rootGetters["locations/getLocationById"](
+          r.locationId,
+        );
+
+        promises.push(ctx.dispatch("createRange", { start, end, location }));
+      }
+
+      return Promise.all(promises).then(() => Promise.resolve(null));
+    },
+  },
 } as Module<CalendarRangesState, State>;
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/calendarRemotes.ts b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/calendarRemotes.ts
index bd2bf20f8..88c0044f3 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/calendarRemotes.ts
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/calendarRemotes.ts
@@ -8,109 +8,102 @@ import { TransportExceptionInterface } from "../../../../../../../ChillMainBundl
 import { COLORS } from "../../../Calendar/const";
 
 export interface CalendarRemotesState {
-    remotes: EventInput[];
-    remotesLoaded: { start: number; end: number }[];
-    remotesIndex: Set<string>;
-    key: number;
+  remotes: EventInput[];
+  remotesLoaded: { start: number; end: number }[];
+  remotesIndex: Set<string>;
+  key: number;
 }
 
 type Context = ActionContext<CalendarRemotesState, State>;
 
 export default {
-    namespaced: true,
-    state: (): CalendarRemotesState => ({
-        remotes: [],
-        remotesLoaded: [],
-        remotesIndex: new Set<string>(),
-        key: 0,
-    }),
-    getters: {
-        isRemotesLoaded:
-            (state: CalendarRemotesState) =>
-            ({ start, end }: { start: Date; end: Date }): boolean => {
-                for (const range of state.remotesLoaded) {
-                    if (
-                        start.getTime() === range.start &&
-                        end.getTime() === range.end
-                    ) {
-                        return true;
-                    }
-                }
+  namespaced: true,
+  state: (): CalendarRemotesState => ({
+    remotes: [],
+    remotesLoaded: [],
+    remotesIndex: new Set<string>(),
+    key: 0,
+  }),
+  getters: {
+    isRemotesLoaded:
+      (state: CalendarRemotesState) =>
+      ({ start, end }: { start: Date; end: Date }): boolean => {
+        for (const range of state.remotesLoaded) {
+          if (start.getTime() === range.start && end.getTime() === range.end) {
+            return true;
+          }
+        }
 
-                return false;
-            },
+        return false;
+      },
+  },
+  mutations: {
+    addRemotes(state: CalendarRemotesState, ranges: CalendarRemote[]) {
+      console.log("addRemotes", ranges);
+
+      const toAdd = ranges
+        .map((cr) => remoteToFullCalendarEvent(cr))
+        .filter((r) => !state.remotesIndex.has(r.id));
+
+      toAdd.forEach((r) => {
+        state.remotesIndex.add(r.id);
+        state.remotes.push(r);
+      });
+      state.key = state.key + toAdd.length;
     },
-    mutations: {
-        addRemotes(state: CalendarRemotesState, ranges: CalendarRemote[]) {
-            console.log("addRemotes", ranges);
-
-            const toAdd = ranges
-                .map((cr) => remoteToFullCalendarEvent(cr))
-                .filter((r) => !state.remotesIndex.has(r.id));
-
-            toAdd.forEach((r) => {
-                state.remotesIndex.add(r.id);
-                state.remotes.push(r);
-            });
-            state.key = state.key + toAdd.length;
-        },
-        addLoaded(
-            state: CalendarRemotesState,
-            payload: { start: Date; end: Date },
-        ) {
-            state.remotesLoaded.push({
-                start: payload.start.getTime(),
-                end: payload.end.getTime(),
-            });
-        },
+    addLoaded(
+      state: CalendarRemotesState,
+      payload: { start: Date; end: Date },
+    ) {
+      state.remotesLoaded.push({
+        start: payload.start.getTime(),
+        end: payload.end.getTime(),
+      });
     },
-    actions: {
-        fetchRemotes(
-            ctx: Context,
-            payload: { start: Date; end: Date },
-        ): Promise<null> {
-            const start = payload.start;
-            const end = payload.end;
+  },
+  actions: {
+    fetchRemotes(
+      ctx: Context,
+      payload: { start: Date; end: Date },
+    ): Promise<null> {
+      const start = payload.start;
+      const end = payload.end;
 
-            if (ctx.rootGetters["me/getMe"] === null) {
-                return Promise.resolve(null);
-            }
+      if (ctx.rootGetters["me/getMe"] === null) {
+        return Promise.resolve(null);
+      }
 
-            if (ctx.getters.isRemotesLoaded({ start, end })) {
-                return Promise.resolve(ctx.getters.getRangeSource);
-            }
+      if (ctx.getters.isRemotesLoaded({ start, end })) {
+        return Promise.resolve(ctx.getters.getRangeSource);
+      }
 
-            ctx.commit("addLoaded", {
-                start: start,
-                end: end,
-            });
+      ctx.commit("addLoaded", {
+        start: start,
+        end: end,
+      });
 
-            return fetchCalendarRemoteForUser(
-                ctx.rootGetters["me/getMe"],
-                start,
-                end,
-            )
-                .then((remotes: CalendarRemote[]) => {
-                    // to be add when reactivity problem will be solve ?
-                    //ctx.commit('addRemotes', remotes);
-                    const inputs = remotes
-                        .map((cr) => remoteToFullCalendarEvent(cr))
-                        .map((cr) => ({
-                            ...cr,
-                            backgroundColor: COLORS[0],
-                            textColor: "black",
-                            editable: false,
-                        }));
-                    ctx.commit("calendarRanges/addExternals", inputs, {
-                        root: true,
-                    });
-                    return Promise.resolve(null);
-                })
-                .catch((e: TransportExceptionInterface) => {
-                    console.error(e);
+      return fetchCalendarRemoteForUser(ctx.rootGetters["me/getMe"], start, end)
+        .then((remotes: CalendarRemote[]) => {
+          // to be add when reactivity problem will be solve ?
+          //ctx.commit('addRemotes', remotes);
+          const inputs = remotes
+            .map((cr) => remoteToFullCalendarEvent(cr))
+            .map((cr) => ({
+              ...cr,
+              backgroundColor: COLORS[0],
+              textColor: "black",
+              editable: false,
+            }));
+          ctx.commit("calendarRanges/addExternals", inputs, {
+            root: true,
+          });
+          return Promise.resolve(null);
+        })
+        .catch((e: TransportExceptionInterface) => {
+          console.error(e);
 
-                    return Promise.resolve(null);
-                });
-        },
+          return Promise.resolve(null);
+        });
     },
+  },
 } as Module<CalendarRemotesState, State>;
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/fullcalendar.ts b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/fullcalendar.ts
index 27ef8b8d5..3b53a1718 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/fullcalendar.ts
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/fullcalendar.ts
@@ -2,77 +2,77 @@ import { State } from "./../index";
 import { ActionContext } from "vuex";
 
 export interface FullCalendarState {
-    currentView: {
-        start: Date | null;
-        end: Date | null;
-    };
-    key: number;
+  currentView: {
+    start: Date | null;
+    end: Date | null;
+  };
+  key: number;
 }
 
 type Context = ActionContext<FullCalendarState, State>;
 
 export default {
-    namespaced: true,
-    state: (): FullCalendarState => ({
-        currentView: {
-            start: null,
-            end: null,
-        },
-        key: 0,
-    }),
-    mutations: {
-        setCurrentDatesView: function (
-            state: FullCalendarState,
-            payload: { start: Date; end: Date },
-        ): void {
-            state.currentView.start = payload.start;
-            state.currentView.end = payload.end;
-        },
-        increaseKey: function (state: FullCalendarState): void {
-            state.key = state.key + 1;
-        },
+  namespaced: true,
+  state: (): FullCalendarState => ({
+    currentView: {
+      start: null,
+      end: null,
     },
-    actions: {
-        setCurrentDatesView(
-            ctx: Context,
-            { start, end }: { start: Date | null; end: Date | null },
-        ): Promise<null> {
-            console.log("dispatch setCurrentDatesView", { start, end });
-
-            if (
-                ctx.state.currentView.start !== start ||
-                ctx.state.currentView.end !== end
-            ) {
-                ctx.commit("setCurrentDatesView", { start, end });
-            }
-
-            if (start !== null && end !== null) {
-                return Promise.all([
-                    ctx
-                        .dispatch(
-                            "calendarRanges/fetchRanges",
-                            { start, end },
-                            { root: true },
-                        )
-                        .then((_) => Promise.resolve(null)),
-                    ctx
-                        .dispatch(
-                            "calendarRemotes/fetchRemotes",
-                            { start, end },
-                            { root: true },
-                        )
-                        .then((_) => Promise.resolve(null)),
-                    ctx
-                        .dispatch(
-                            "calendarLocals/fetchLocals",
-                            { start, end },
-                            { root: true },
-                        )
-                        .then((_) => Promise.resolve(null)),
-                ]).then((_) => Promise.resolve(null));
-            } else {
-                return Promise.resolve(null);
-            }
-        },
+    key: 0,
+  }),
+  mutations: {
+    setCurrentDatesView: function (
+      state: FullCalendarState,
+      payload: { start: Date; end: Date },
+    ): void {
+      state.currentView.start = payload.start;
+      state.currentView.end = payload.end;
     },
+    increaseKey: function (state: FullCalendarState): void {
+      state.key = state.key + 1;
+    },
+  },
+  actions: {
+    setCurrentDatesView(
+      ctx: Context,
+      { start, end }: { start: Date | null; end: Date | null },
+    ): Promise<null> {
+      console.log("dispatch setCurrentDatesView", { start, end });
+
+      if (
+        ctx.state.currentView.start !== start ||
+        ctx.state.currentView.end !== end
+      ) {
+        ctx.commit("setCurrentDatesView", { start, end });
+      }
+
+      if (start !== null && end !== null) {
+        return Promise.all([
+          ctx
+            .dispatch(
+              "calendarRanges/fetchRanges",
+              { start, end },
+              { root: true },
+            )
+            .then((_) => Promise.resolve(null)),
+          ctx
+            .dispatch(
+              "calendarRemotes/fetchRemotes",
+              { start, end },
+              { root: true },
+            )
+            .then((_) => Promise.resolve(null)),
+          ctx
+            .dispatch(
+              "calendarLocals/fetchLocals",
+              { start, end },
+              { root: true },
+            )
+            .then((_) => Promise.resolve(null)),
+        ]).then((_) => Promise.resolve(null));
+      } else {
+        return Promise.resolve(null);
+      }
+    },
+  },
 };
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/location.ts b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/location.ts
index 91c435810..094640608 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/location.ts
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/location.ts
@@ -5,61 +5,61 @@ import { getLocations } from "../../../../../../../ChillMainBundle/Resources/pub
 import { whereami } from "../../../../../../../ChillMainBundle/Resources/public/lib/api/user";
 
 export interface LocationState {
-    locations: Location[];
-    locationPicked: Location | null;
-    currentLocation: Location | null;
+  locations: Location[];
+  locationPicked: Location | null;
+  currentLocation: Location | null;
 }
 
 export default {
-    namespaced: true,
-    state: (): LocationState => {
-        return {
-            locations: [],
-            locationPicked: null,
-            currentLocation: null,
-        };
+  namespaced: true,
+  state: (): LocationState => {
+    return {
+      locations: [],
+      locationPicked: null,
+      currentLocation: null,
+    };
+  },
+  getters: {
+    getLocationById:
+      (state) =>
+      (id: number): Location | undefined => {
+        return state.locations.find((l) => l.id === id);
+      },
+  },
+  mutations: {
+    setLocations(state, locations): void {
+      state.locations = locations;
     },
-    getters: {
-        getLocationById:
-            (state) =>
-            (id: number): Location | undefined => {
-                return state.locations.find((l) => l.id === id);
-            },
-    },
-    mutations: {
-        setLocations(state, locations): void {
-            state.locations = locations;
-        },
-        setLocationPicked(state, location: Location | null): void {
-            if (null === location) {
-                state.locationPicked = null;
-                return;
-            }
+    setLocationPicked(state, location: Location | null): void {
+      if (null === location) {
+        state.locationPicked = null;
+        return;
+      }
 
-            state.locationPicked =
-                state.locations.find((l) => l.id === location.id) || null;
-        },
-        setCurrentLocation(state, location: Location | null): void {
-            if (null === location) {
-                state.currentLocation = null;
-                return;
-            }
+      state.locationPicked =
+        state.locations.find((l) => l.id === location.id) || null;
+    },
+    setCurrentLocation(state, location: Location | null): void {
+      if (null === location) {
+        state.currentLocation = null;
+        return;
+      }
 
-            state.currentLocation =
-                state.locations.find((l) => l.id === location.id) || null;
-        },
+      state.currentLocation =
+        state.locations.find((l) => l.id === location.id) || null;
     },
-    actions: {
-        getLocations(ctx): Promise<void> {
-            return getLocations().then((locations) => {
-                ctx.commit("setLocations", locations);
-                return Promise.resolve();
-            });
-        },
-        getCurrentLocation(ctx): Promise<void> {
-            return whereami().then((location) => {
-                ctx.commit("setCurrentLocation", location);
-            });
-        },
+  },
+  actions: {
+    getLocations(ctx): Promise<void> {
+      return getLocations().then((locations) => {
+        ctx.commit("setLocations", locations);
+        return Promise.resolve();
+      });
     },
+    getCurrentLocation(ctx): Promise<void> {
+      return whereami().then((location) => {
+        ctx.commit("setCurrentLocation", location);
+      });
+    },
+  },
 } as Module<LocationState, State>;
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/me.ts b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/me.ts
index 4f83d0185..0f8ca590e 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/me.ts
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/me.ts
@@ -3,24 +3,24 @@ import { User } from "../../../../../../../ChillMainBundle/Resources/public/type
 import { ActionContext } from "vuex";
 
 export interface MeState {
-    me: User | null;
+  me: User | null;
 }
 
 type Context = ActionContext<MeState, State>;
 
 export default {
-    namespaced: true,
-    state: (): MeState => ({
-        me: null,
-    }),
-    getters: {
-        getMe: function (state: MeState): User | null {
-            return state.me;
-        },
+  namespaced: true,
+  state: (): MeState => ({
+    me: null,
+  }),
+  getters: {
+    getMe: function (state: MeState): User | null {
+      return state.me;
     },
-    mutations: {
-        setWhoAmi(state: MeState, me: User) {
-            state.me = me;
-        },
+  },
+  mutations: {
+    setWhoAmi(state: MeState, me: User) {
+      state.me = me;
     },
+  },
 };
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue
index 97d4c6f53..ddf0cc0bd 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue
@@ -1,51 +1,51 @@
 <template>
-    <div>
-        <h2 class="chill-red">
-            {{ $t("choose_your_calendar_user") }}
-        </h2>
-        <VueMultiselect
-            name="field"
-            id="calendarUserSelector"
-            v-model="value"
-            track-by="id"
-            label="value"
-            :custom-label="transName"
-            :placeholder="$t('select_user')"
-            :multiple="true"
-            :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"
-            :options="options"
-        />
-    </div>
-    <div class="form-check">
-        <input
-            type="checkbox"
-            id="myCalendar"
-            class="form-check-input"
-            v-model="showMyCalendarWidget"
-        />
-        <label class="form-check-label" for="myCalendar">{{
-            $t("show_my_calendar")
-        }}</label>
-    </div>
-    <div class="form-check">
-        <input
-            type="checkbox"
-            id="weekends"
-            class="form-check-input"
-            @click="toggleWeekends"
-        />
-        <label class="form-check-label" for="weekends">{{
-            $t("show_weekends")
-        }}</label>
-    </div>
+  <div>
+    <h2 class="chill-red">
+      {{ $t("choose_your_calendar_user") }}
+    </h2>
+    <VueMultiselect
+      name="field"
+      id="calendarUserSelector"
+      v-model="value"
+      track-by="id"
+      label="value"
+      :custom-label="transName"
+      :placeholder="$t('select_user')"
+      :multiple="true"
+      :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"
+      :options="options"
+    />
+  </div>
+  <div class="form-check">
+    <input
+      type="checkbox"
+      id="myCalendar"
+      class="form-check-input"
+      v-model="showMyCalendarWidget"
+    />
+    <label class="form-check-label" for="myCalendar">{{
+      $t("show_my_calendar")
+    }}</label>
+  </div>
+  <div class="form-check">
+    <input
+      type="checkbox"
+      id="weekends"
+      class="form-check-input"
+      @click="toggleWeekends"
+    />
+    <label class="form-check-label" for="weekends">{{
+      $t("show_weekends")
+    }}</label>
+  </div>
 </template>
 <script>
 import { fetchCalendarRanges, fetchCalendar } from "../../_api/api";
@@ -53,206 +53,183 @@ import VueMultiselect from "vue-multiselect";
 import { whoami } from "ChillPersonAssets/vuejs/AccompanyingCourse/api";
 
 const COLORS = [
-    /* from https://colorbrewer2.org/#type=qualitative&scheme=Set3&n=12 */
-    "#8dd3c7",
-    "#ffffb3",
-    "#bebada",
-    "#fb8072",
-    "#80b1d3",
-    "#fdb462",
-    "#b3de69",
-    "#fccde5",
-    "#d9d9d9",
-    "#bc80bd",
-    "#ccebc5",
-    "#ffed6f",
+  /* from https://colorbrewer2.org/#type=qualitative&scheme=Set3&n=12 */
+  "#8dd3c7",
+  "#ffffb3",
+  "#bebada",
+  "#fb8072",
+  "#80b1d3",
+  "#fdb462",
+  "#b3de69",
+  "#fccde5",
+  "#d9d9d9",
+  "#bc80bd",
+  "#ccebc5",
+  "#ffed6f",
 ];
 
 export default {
-    name: "CalendarUserSelector",
-    components: { VueMultiselect },
-    props: [
-        "users",
-        "updateEventsSource",
-        "calendarEvents",
-        "showMyCalendar",
-        "toggleMyCalendar",
-        "toggleWeekends",
-    ],
-    data() {
-        return {
-            errorMsg: [],
-            value: [],
-            options: [],
-        };
+  name: "CalendarUserSelector",
+  components: { VueMultiselect },
+  props: [
+    "users",
+    "updateEventsSource",
+    "calendarEvents",
+    "showMyCalendar",
+    "toggleMyCalendar",
+    "toggleWeekends",
+  ],
+  data() {
+    return {
+      errorMsg: [],
+      value: [],
+      options: [],
+    };
+  },
+  computed: {
+    showMyCalendarWidget: {
+      set(value) {
+        this.toggleMyCalendar(value);
+        this.updateEventsSource();
+      },
+      get() {
+        return this.showMyCalendar;
+      },
     },
-    computed: {
-        showMyCalendarWidget: {
-            set(value) {
-                this.toggleMyCalendar(value);
-                this.updateEventsSource();
-            },
-            get() {
-                return this.showMyCalendar;
-            },
-        },
+  },
+  methods: {
+    init() {
+      this.fetchData();
     },
-    methods: {
-        init() {
-            this.fetchData();
-        },
-        fetchData() {
-            fetchCalendarRanges()
-                .then(
-                    (calendarRanges) =>
-                        new Promise((resolve, reject) => {
-                            let results = calendarRanges.results;
+    fetchData() {
+      fetchCalendarRanges()
+        .then(
+          (calendarRanges) =>
+            new Promise((resolve, reject) => {
+              let results = calendarRanges.results;
 
-                            let users = [];
+              let users = [];
 
-                            results.forEach((i) => {
-                                if (!users.some((j) => i.user.id === j.id)) {
-                                    let ratio = Math.floor(
-                                        users.length / COLORS.length,
-                                    );
-                                    let colorIndex =
-                                        users.length - ratio * COLORS.length;
-                                    users.push({
-                                        id: i.user.id,
-                                        username: i.user.username,
-                                        color: COLORS[colorIndex],
-                                    });
-                                }
-                            });
-
-                            let calendarEvents = [];
-                            users.forEach((u) => {
-                                let arr = results
-                                    .filter((i) => i.user.id === u.id)
-                                    .map((i) => ({
-                                        start: i.startDate.datetime,
-                                        end: i.endDate.datetime,
-                                        calendarRangeId: i.id,
-                                        sourceColor: u.color,
-                                        //display: 'background' // can be an option for the disponibility
-                                    }));
-                                calendarEvents.push({
-                                    events: arr,
-                                    color: u.color,
-                                    textColor: "#444444",
-                                    editable: false,
-                                    id: u.id,
-                                });
-                            });
-
-                            this.users.loaded = users;
-                            this.options = users;
-
-                            this.calendarEvents.loaded = calendarEvents;
-                            whoami().then(
-                                (me) =>
-                                    new Promise((resolve, reject) => {
-                                        this.users.logged = me;
-                                        let currentUser = users.find(
-                                            (u) => u.id === me.id,
-                                        );
-                                        this.value = currentUser;
-
-                                        fetchCalendar(currentUser.id).then(
-                                            (calendar) =>
-                                                new Promise(
-                                                    (resolve, reject) => {
-                                                        let results =
-                                                            calendar.results;
-                                                        let events =
-                                                            results.map(
-                                                                (i) => ({
-                                                                    start: i
-                                                                        .startDate
-                                                                        .datetime,
-                                                                    end: i
-                                                                        .endDate
-                                                                        .datetime,
-                                                                }),
-                                                            );
-                                                        let calendarEventsCurrentUser =
-                                                            {
-                                                                events: events,
-                                                                color: "darkblue",
-                                                                id: 1000,
-                                                                editable: false,
-                                                            };
-                                                        this.calendarEvents.user =
-                                                            calendarEventsCurrentUser;
-
-                                                        this.selectUsers(
-                                                            currentUser,
-                                                        );
-
-                                                        resolve();
-                                                    },
-                                                ),
-                                        );
-
-                                        resolve();
-                                    }),
-                            );
-
-                            resolve();
-                        }),
-                )
-                .catch((error) => {
-                    this.errorMsg.push(error.message);
-                });
-        },
-        transName(value) {
-            return `${value.username}`;
-        },
-        coloriseSelectedValues() {
-            let tags = document.querySelectorAll(
-                "div.multiselect__tags-wrap",
-            )[0];
-
-            if (tags.hasChildNodes()) {
-                let children = tags.childNodes;
-                for (let i = 0; i < children.length; i++) {
-                    let child = children[i];
-                    if (child.nodeType === Node.ELEMENT_NODE) {
-                        this.users.selected.forEach((u) => {
-                            if (child.hasChildNodes()) {
-                                if (child.firstChild.innerText == u.username) {
-                                    child.style.background = u.color;
-                                    child.firstChild.style.color = "#444444";
-                                }
-                            }
-                        });
-                    }
+              results.forEach((i) => {
+                if (!users.some((j) => i.user.id === j.id)) {
+                  let ratio = Math.floor(users.length / COLORS.length);
+                  let colorIndex = users.length - ratio * COLORS.length;
+                  users.push({
+                    id: i.user.id,
+                    username: i.user.username,
+                    color: COLORS[colorIndex],
+                  });
                 }
-            }
-        },
-        selectEvents() {
-            let selectedUsersId = this.users.selected.map((a) => a.id);
-            this.calendarEvents.selected = this.calendarEvents.loaded.filter(
-                (a) => selectedUsersId.includes(a.id),
-            );
-        },
-        selectUsers(value) {
-            this.users.selected.push(value);
-            this.coloriseSelectedValues();
-            this.selectEvents();
-            this.updateEventsSource();
-        },
-        unSelectUsers(value) {
-            this.users.selected = this.users.selected.filter(
-                (a) => a.id != value.id,
-            );
-            this.selectEvents();
-            this.updateEventsSource();
-        },
+              });
+
+              let calendarEvents = [];
+              users.forEach((u) => {
+                let arr = results
+                  .filter((i) => i.user.id === u.id)
+                  .map((i) => ({
+                    start: i.startDate.datetime,
+                    end: i.endDate.datetime,
+                    calendarRangeId: i.id,
+                    sourceColor: u.color,
+                    //display: 'background' // can be an option for the disponibility
+                  }));
+                calendarEvents.push({
+                  events: arr,
+                  color: u.color,
+                  textColor: "#444444",
+                  editable: false,
+                  id: u.id,
+                });
+              });
+
+              this.users.loaded = users;
+              this.options = users;
+
+              this.calendarEvents.loaded = calendarEvents;
+              whoami().then(
+                (me) =>
+                  new Promise((resolve, reject) => {
+                    this.users.logged = me;
+                    let currentUser = users.find((u) => u.id === me.id);
+                    this.value = currentUser;
+
+                    fetchCalendar(currentUser.id).then(
+                      (calendar) =>
+                        new Promise((resolve, reject) => {
+                          let results = calendar.results;
+                          let events = results.map((i) => ({
+                            start: i.startDate.datetime,
+                            end: i.endDate.datetime,
+                          }));
+                          let calendarEventsCurrentUser = {
+                            events: events,
+                            color: "darkblue",
+                            id: 1000,
+                            editable: false,
+                          };
+                          this.calendarEvents.user = calendarEventsCurrentUser;
+
+                          this.selectUsers(currentUser);
+
+                          resolve();
+                        }),
+                    );
+
+                    resolve();
+                  }),
+              );
+
+              resolve();
+            }),
+        )
+        .catch((error) => {
+          this.errorMsg.push(error.message);
+        });
     },
-    mounted() {
-        this.init();
+    transName(value) {
+      return `${value.username}`;
     },
+    coloriseSelectedValues() {
+      let tags = document.querySelectorAll("div.multiselect__tags-wrap")[0];
+
+      if (tags.hasChildNodes()) {
+        let children = tags.childNodes;
+        for (let i = 0; i < children.length; i++) {
+          let child = children[i];
+          if (child.nodeType === Node.ELEMENT_NODE) {
+            this.users.selected.forEach((u) => {
+              if (child.hasChildNodes()) {
+                if (child.firstChild.innerText == u.username) {
+                  child.style.background = u.color;
+                  child.firstChild.style.color = "#444444";
+                }
+              }
+            });
+          }
+        }
+      }
+    },
+    selectEvents() {
+      let selectedUsersId = this.users.selected.map((a) => a.id);
+      this.calendarEvents.selected = this.calendarEvents.loaded.filter((a) =>
+        selectedUsersId.includes(a.id),
+      );
+    },
+    selectUsers(value) {
+      this.users.selected.push(value);
+      this.coloriseSelectedValues();
+      this.selectEvents();
+      this.updateEventsSource();
+    },
+    unSelectUsers(value) {
+      this.users.selected = this.users.selected.filter((a) => a.id != value.id);
+      this.selectEvents();
+      this.updateEventsSource();
+    },
+  },
+  mounted() {
+    this.init();
+  },
 };
 </script>
 
diff --git a/src/Bundle/ChillDocGeneratorBundle/Resources/public/vuejs/_components/PickTemplate.vue b/src/Bundle/ChillDocGeneratorBundle/Resources/public/vuejs/_components/PickTemplate.vue
index 1bcc95fd0..3a2f4fd59 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Resources/public/vuejs/_components/PickTemplate.vue
+++ b/src/Bundle/ChillDocGeneratorBundle/Resources/public/vuejs/_components/PickTemplate.vue
@@ -1,59 +1,54 @@
 <template>
-    <div>
-        <template v-if="templates.length > 0">
-            <slot name="title">
-                <h2>{{ $t("generate_document") }}</h2>
-            </slot>
+  <div>
+    <template v-if="templates.length > 0">
+      <slot name="title">
+        <h2>{{ $t("generate_document") }}</h2>
+      </slot>
 
-            <div class="container">
-                <div class="row">
-                    <div class="col-md-4">
-                        <slot name="label">
-                            <label>{{ $t("select_a_template") }}</label>
-                        </slot>
-                    </div>
-                    <div class="col-md-8">
-                        <div class="input-group mb-3">
-                            <select class="form-select" v-model="template">
-                                <option disabled selected value="">
-                                    {{ $t("choose_a_template") }}
-                                </option>
-                                <template v-for="t in templates" :key="t.id">
-                                    <option :value="t.id">
-                                        {{
-                                            localizeString(t.name) ||
-                                            "Aucun nom défini"
-                                        }}
-                                    </option>
-                                </template>
-                            </select>
-                            <a
-                                v-if="canGenerate"
-                                class="btn btn-update btn-sm change-icon"
-                                :href="buildUrlGenerate"
-                                @click.prevent="
-                                    clickGenerate($event, buildUrlGenerate)
-                                "
-                                ><i class="fa fa-fw fa-cog"
-                            /></a>
-                            <a
-                                v-else
-                                class="btn btn-update btn-sm change-icon"
-                                href="#"
-                                disabled
-                                ><i class="fa fa-fw fa-cog"
-                            /></a>
-                        </div>
-                    </div>
-                </div>
-                <div class="row" v-if="hasDescription">
-                    <div class="col-md-8 align-self-end">
-                        <p>{{ getDescription }}</p>
-                    </div>
-                </div>
+      <div class="container">
+        <div class="row">
+          <div class="col-md-4">
+            <slot name="label">
+              <label>{{ $t("select_a_template") }}</label>
+            </slot>
+          </div>
+          <div class="col-md-8">
+            <div class="input-group mb-3">
+              <select class="form-select" v-model="template">
+                <option disabled selected value="">
+                  {{ $t("choose_a_template") }}
+                </option>
+                <template v-for="t in templates" :key="t.id">
+                  <option :value="t.id">
+                    {{ localizeString(t.name) || "Aucun nom défini" }}
+                  </option>
+                </template>
+              </select>
+              <a
+                v-if="canGenerate"
+                class="btn btn-update btn-sm change-icon"
+                :href="buildUrlGenerate"
+                @click.prevent="clickGenerate($event, buildUrlGenerate)"
+                ><i class="fa fa-fw fa-cog"
+              /></a>
+              <a
+                v-else
+                class="btn btn-update btn-sm change-icon"
+                href="#"
+                disabled
+                ><i class="fa fa-fw fa-cog"
+              /></a>
             </div>
-        </template>
-    </div>
+          </div>
+        </div>
+        <div class="row" v-if="hasDescription">
+          <div class="col-md-8 align-self-end">
+            <p>{{ getDescription }}</p>
+          </div>
+        </div>
+      </div>
+    </template>
+  </div>
 </template>
 
 <script>
@@ -61,83 +56,83 @@ import { buildLink } from "ChillDocGeneratorAssets/lib/document-generator";
 import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
 
 export default {
-    name: "PickTemplate",
-    props: {
-        entityId: [String, Number],
-        entityClass: {
-            type: String,
-            required: false,
-        },
-        templates: {
-            type: Array,
-            required: true,
-        },
-        preventDefaultMoveToGenerate: {
-            type: Boolean,
-            required: false,
-            default: false,
-        },
+  name: "PickTemplate",
+  props: {
+    entityId: [String, Number],
+    entityClass: {
+      type: String,
+      required: false,
     },
-    emits: ["goToGenerateDocument"],
-    data() {
-        return {
-            template: null,
-        };
+    templates: {
+      type: Array,
+      required: true,
     },
-    computed: {
-        canGenerate() {
-            return this.template != null;
-        },
-        hasDescription() {
-            if (this.template == null) {
-                return false;
-            }
+    preventDefaultMoveToGenerate: {
+      type: Boolean,
+      required: false,
+      default: false,
+    },
+  },
+  emits: ["goToGenerateDocument"],
+  data() {
+    return {
+      template: null,
+    };
+  },
+  computed: {
+    canGenerate() {
+      return this.template != null;
+    },
+    hasDescription() {
+      if (this.template == null) {
+        return false;
+      }
 
-            return true;
-        },
-        getDescription() {
-            if (null === this.template) {
-                return "";
-            }
-            let desc = this.templates.find((t) => t.id === this.template);
-            if (null === desc) {
-                return "";
-            }
-            return desc.description || "";
-        },
-        buildUrlGenerate() {
-            if (null === this.template) {
-                return "#";
-            }
+      return true;
+    },
+    getDescription() {
+      if (null === this.template) {
+        return "";
+      }
+      let desc = this.templates.find((t) => t.id === this.template);
+      if (null === desc) {
+        return "";
+      }
+      return desc.description || "";
+    },
+    buildUrlGenerate() {
+      if (null === this.template) {
+        return "#";
+      }
 
-            return buildLink(this.template, this.entityId, this.entityClass);
-        },
+      return buildLink(this.template, this.entityId, this.entityClass);
     },
-    methods: {
-        localizeString(str) {
-            return localizeString(str);
-        },
-        clickGenerate(event, link) {
-            if (!this.preventDefaultMoveToGenerate) {
-                window.location.assign(link);
-            }
+  },
+  methods: {
+    localizeString(str) {
+      return localizeString(str);
+    },
+    clickGenerate(event, link) {
+      if (!this.preventDefaultMoveToGenerate) {
+        window.location.assign(link);
+      }
 
-            this.$emit("goToGenerateDocument", {
-                event,
-                link,
-                template: this.template,
-            });
-        },
+      this.$emit("goToGenerateDocument", {
+        event,
+        link,
+        template: this.template,
+      });
     },
-    i18n: {
-        messages: {
-            fr: {
-                generate_document: "Générer un document",
-                select_a_template: "Choisir un modèle",
-                choose_a_template: "Choisir",
-            },
-        },
+  },
+  i18n: {
+    messages: {
+      fr: {
+        generate_document: "Générer un document",
+        select_a_template: "Choisir un modèle",
+        choose_a_template: "Choisir",
+      },
     },
+  },
 };
 </script>
 
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/js/async-upload/uploader.ts b/src/Bundle/ChillDocStoreBundle/Resources/public/js/async-upload/uploader.ts
index a09c4a5f6..367ab0829 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/js/async-upload/uploader.ts
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/js/async-upload/uploader.ts
@@ -6,20 +6,20 @@ const algo = "AES-CBC";
 const URL_POST = "/asyncupload/temp_url/generate/post";
 
 const keyDefinition = {
-    name: algo,
-    length: 256,
+  name: algo,
+  length: 256,
 };
 
 const createFilename = (): string => {
-    let text = "";
-    const possible =
-        "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+  let text = "";
+  const possible =
+    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
 
-    for (let i = 0; i < 7; i++) {
-        text += possible.charAt(Math.floor(Math.random() * possible.length));
-    }
+  for (let i = 0; i < 7; i++) {
+    text += possible.charAt(Math.floor(Math.random() * possible.length));
+  }
 
-    return text;
+  return text;
 };
 
 /**
@@ -30,59 +30,59 @@ const createFilename = (): string => {
  * @returns {Promise<StoredObject>} A Promise that resolves to the newly created StoredObject.
  */
 export const fetchNewStoredObject = async (): Promise<StoredObject> => {
-    return makeFetch("POST", "/api/1.0/doc-store/stored-object/create", null);
+  return makeFetch("POST", "/api/1.0/doc-store/stored-object/create", null);
 };
 
 export const uploadVersion = async (
-    uploadFile: ArrayBuffer,
-    storedObject: StoredObject,
+  uploadFile: ArrayBuffer,
+  storedObject: StoredObject,
 ): Promise<string> => {
-    const params = new URLSearchParams();
-    params.append("expires_delay", "180");
-    params.append("submit_delay", "180");
-    const asyncData: PostStoreObjectSignature = await makeFetch(
-        "GET",
-        `/api/1.0/doc-store/async-upload/temp_url/${storedObject.uuid}/generate/post` +
-            "?" +
-            params.toString(),
-    );
-    const suffix = createFilename();
-    const filename = asyncData.prefix + suffix;
-    const formData = new FormData();
-    formData.append("redirect", asyncData.redirect);
-    formData.append("max_file_size", asyncData.max_file_size.toString());
-    formData.append("max_file_count", asyncData.max_file_count.toString());
-    formData.append("expires", asyncData.expires.toString());
-    formData.append("signature", asyncData.signature);
-    formData.append(filename, new Blob([uploadFile]), suffix);
+  const params = new URLSearchParams();
+  params.append("expires_delay", "180");
+  params.append("submit_delay", "180");
+  const asyncData: PostStoreObjectSignature = await makeFetch(
+    "GET",
+    `/api/1.0/doc-store/async-upload/temp_url/${storedObject.uuid}/generate/post` +
+      "?" +
+      params.toString(),
+  );
+  const suffix = createFilename();
+  const filename = asyncData.prefix + suffix;
+  const formData = new FormData();
+  formData.append("redirect", asyncData.redirect);
+  formData.append("max_file_size", asyncData.max_file_size.toString());
+  formData.append("max_file_count", asyncData.max_file_count.toString());
+  formData.append("expires", asyncData.expires.toString());
+  formData.append("signature", asyncData.signature);
+  formData.append(filename, new Blob([uploadFile]), suffix);
 
-    const response = await window.fetch(asyncData.url, {
-        method: "POST",
-        body: formData,
-    });
+  const response = await window.fetch(asyncData.url, {
+    method: "POST",
+    body: formData,
+  });
 
-    if (!response.ok) {
-        console.error("Error while sending file to store", response);
-        throw new Error(response.statusText);
-    }
+  if (!response.ok) {
+    console.error("Error while sending file to store", response);
+    throw new Error(response.statusText);
+  }
 
-    return Promise.resolve(filename);
+  return Promise.resolve(filename);
 };
 
 export const encryptFile = async (
-    originalFile: ArrayBuffer,
+  originalFile: ArrayBuffer,
 ): Promise<[ArrayBuffer, Uint8Array, JsonWebKey]> => {
-    const iv = crypto.getRandomValues(new Uint8Array(16));
-    const key = await window.crypto.subtle.generateKey(keyDefinition, true, [
-        "encrypt",
-        "decrypt",
-    ]);
-    const exportedKey = await window.crypto.subtle.exportKey("jwk", key);
-    const encrypted = await window.crypto.subtle.encrypt(
-        { name: algo, iv: iv },
-        key,
-        originalFile,
-    );
+  const iv = crypto.getRandomValues(new Uint8Array(16));
+  const key = await window.crypto.subtle.generateKey(keyDefinition, true, [
+    "encrypt",
+    "decrypt",
+  ]);
+  const exportedKey = await window.crypto.subtle.exportKey("jwk", key);
+  const encrypted = await window.crypto.subtle.encrypt(
+    { name: algo, iv: iv },
+    key,
+    originalFile,
+  );
 
-    return Promise.resolve([encrypted, iv, exportedKey]);
+  return Promise.resolve([encrypted, iv, exportedKey]);
 };
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/js/generic-doc-api.ts b/src/Bundle/ChillDocStoreBundle/Resources/public/js/generic-doc-api.ts
index c15eff711..aaff2a331 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/js/generic-doc-api.ts
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/js/generic-doc-api.ts
@@ -2,9 +2,9 @@ import { fetchResults } from "ChillMainAssets/lib/api/apiMethods";
 import { GenericDocForAccompanyingPeriod } from "ChillDocStoreAssets/types/generic_doc";
 
 export function fetch_generic_docs_by_accompanying_period(
-    periodId: number,
+  periodId: number,
 ): Promise<GenericDocForAccompanyingPeriod[]> {
-    return fetchResults(
-        `/api/1.0/doc-store/generic-doc/by-period/${periodId}/index`,
-    );
+  return fetchResults(
+    `/api/1.0/doc-store/generic-doc/by-period/${periodId}/index`,
+  );
 }
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/module/async_upload/index.ts b/src/Bundle/ChillDocStoreBundle/Resources/public/module/async_upload/index.ts
index 30fe2b26a..97e0d3aa3 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/module/async_upload/index.ts
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/module/async_upload/index.ts
@@ -6,117 +6,116 @@ import { _createI18n } from "../../../../../ChillMainBundle/Resources/public/vue
 const i18n = _createI18n({});
 
 const startApp = (
-    divElement: HTMLDivElement,
-    collectionEntry: null | HTMLLIElement,
+  divElement: HTMLDivElement,
+  collectionEntry: null | HTMLLIElement,
 ): void => {
-    console.log("app started", divElement);
+  console.log("app started", divElement);
 
-    const inputTitle = collectionEntry?.querySelector("input[type='text']");
+  const inputTitle = collectionEntry?.querySelector("input[type='text']");
 
-    const input_stored_object: HTMLInputElement | null =
-        divElement.querySelector("input[data-stored-object]");
-    if (null === input_stored_object) {
-        throw new Error("input to stored object not found");
-    }
+  const input_stored_object: HTMLInputElement | null = divElement.querySelector(
+    "input[data-stored-object]",
+  );
+  if (null === input_stored_object) {
+    throw new Error("input to stored object not found");
+  }
 
-    let existingDoc: StoredObject | null = null;
-    if (input_stored_object.value !== "") {
-        existingDoc = JSON.parse(input_stored_object.value);
-    }
-    const app_container = document.createElement("div");
-    divElement.appendChild(app_container);
+  let existingDoc: StoredObject | null = null;
+  if (input_stored_object.value !== "") {
+    existingDoc = JSON.parse(input_stored_object.value);
+  }
+  const app_container = document.createElement("div");
+  divElement.appendChild(app_container);
 
-    const app = createApp({
-        template:
-            '<drop-file-widget :existingDoc="this.$data.existingDoc" :allowRemove="true" @addDocument="this.addDocument" @removeDocument="removeDocument"></drop-file-widget>',
-        data() {
-            return {
-                existingDoc: existingDoc,
-                inputTitle: inputTitle,
-            };
-        },
-        components: {
-            DropFileWidget,
-        },
-        methods: {
-            addDocument: function ({
-                stored_object,
-                stored_object_version,
-                file_name,
-            }: {
-                stored_object: StoredObject;
-                stored_object_version: StoredObjectVersion;
-                file_name: string;
-            }): void {
-                stored_object.title = file_name;
-                console.log("object added", stored_object);
-                console.log("version added", stored_object_version);
-                this.$data.existingDoc = stored_object;
-                this.$data.existingDoc.currentVersion = stored_object_version;
-                input_stored_object.value = JSON.stringify(
-                    this.$data.existingDoc,
-                );
-                if (this.$data.inputTitle) {
-                    if (!this.$data.inputTitle?.value) {
-                        this.$data.inputTitle.value = file_name;
-                    }
-                }
-            },
-            removeDocument: function (object: StoredObject): void {
-                console.log("catch remove document", object);
-                input_stored_object.value = "";
-                this.$data.existingDoc = undefined;
-                console.log("collectionEntry", collectionEntry);
+  const app = createApp({
+    template:
+      '<drop-file-widget :existingDoc="this.$data.existingDoc" :allowRemove="true" @addDocument="this.addDocument" @removeDocument="removeDocument"></drop-file-widget>',
+    data() {
+      return {
+        existingDoc: existingDoc,
+        inputTitle: inputTitle,
+      };
+    },
+    components: {
+      DropFileWidget,
+    },
+    methods: {
+      addDocument: function ({
+        stored_object,
+        stored_object_version,
+        file_name,
+      }: {
+        stored_object: StoredObject;
+        stored_object_version: StoredObjectVersion;
+        file_name: string;
+      }): void {
+        stored_object.title = file_name;
+        console.log("object added", stored_object);
+        console.log("version added", stored_object_version);
+        this.$data.existingDoc = stored_object;
+        this.$data.existingDoc.currentVersion = stored_object_version;
+        input_stored_object.value = JSON.stringify(this.$data.existingDoc);
+        if (this.$data.inputTitle) {
+          if (!this.$data.inputTitle?.value) {
+            this.$data.inputTitle.value = file_name;
+          }
+        }
+      },
+      removeDocument: function (object: StoredObject): void {
+        console.log("catch remove document", object);
+        input_stored_object.value = "";
+        this.$data.existingDoc = undefined;
+        console.log("collectionEntry", collectionEntry);
 
-                if (null !== collectionEntry) {
-                    console.log("will remove collection");
-                    collectionEntry.remove();
-                }
-            },
-        },
-    });
+        if (null !== collectionEntry) {
+          console.log("will remove collection");
+          collectionEntry.remove();
+        }
+      },
+    },
+  });
 
-    app.use(i18n).mount(app_container);
+  app.use(i18n).mount(app_container);
 };
 window.addEventListener("collection-add-entry", ((
-    e: CustomEvent<CollectionEventPayload>,
+  e: CustomEvent<CollectionEventPayload>,
 ) => {
-    const detail = e.detail;
-    const divElement: null | HTMLDivElement = detail.entry.querySelector(
-        "div[data-stored-object]",
-    );
+  const detail = e.detail;
+  const divElement: null | HTMLDivElement = detail.entry.querySelector(
+    "div[data-stored-object]",
+  );
 
-    if (null === divElement) {
-        throw new Error("div[data-stored-object] not found");
-    }
+  if (null === divElement) {
+    throw new Error("div[data-stored-object] not found");
+  }
 
-    startApp(divElement, detail.entry);
+  startApp(divElement, detail.entry);
 }) as EventListener);
 
 window.addEventListener("DOMContentLoaded", () => {
-    const upload_inputs: NodeListOf<HTMLDivElement> = document.querySelectorAll(
-        "div[data-stored-object]",
-    );
+  const upload_inputs: NodeListOf<HTMLDivElement> = document.querySelectorAll(
+    "div[data-stored-object]",
+  );
 
-    upload_inputs.forEach((input: HTMLDivElement): void => {
-        // test for a parent to check if this is a collection entry
-        let collectionEntry: null | HTMLLIElement = null;
-        const parent = input.parentElement;
-        console.log("parent", parent);
-        if (null !== parent) {
-            const grandParent = parent.parentElement;
-            console.log("grandParent", grandParent);
-            if (null !== grandParent) {
-                if (
-                    grandParent.tagName.toLowerCase() === "li" &&
-                    grandParent.classList.contains("entry")
-                ) {
-                    collectionEntry = grandParent as HTMLLIElement;
-                }
-            }
+  upload_inputs.forEach((input: HTMLDivElement): void => {
+    // test for a parent to check if this is a collection entry
+    let collectionEntry: null | HTMLLIElement = null;
+    const parent = input.parentElement;
+    console.log("parent", parent);
+    if (null !== parent) {
+      const grandParent = parent.parentElement;
+      console.log("grandParent", grandParent);
+      if (null !== grandParent) {
+        if (
+          grandParent.tagName.toLowerCase() === "li" &&
+          grandParent.classList.contains("entry")
+        ) {
+          collectionEntry = grandParent as HTMLLIElement;
         }
-        startApp(input, collectionEntry);
-    });
+      }
+    }
+    startApp(input, collectionEntry);
+  });
 });
 
 export {};
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/module/button_download/index.ts b/src/Bundle/ChillDocStoreBundle/Resources/public/module/button_download/index.ts
index 30b9e29d1..4ab819ddf 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/module/button_download/index.ts
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/module/button_download/index.ts
@@ -9,26 +9,26 @@ import ToastPlugin from "vue-toast-notification";
 const i18n = _createI18n({});
 
 window.addEventListener("DOMContentLoaded", function (e) {
-    document
-        .querySelectorAll<HTMLDivElement>("div[data-download-button-single]")
-        .forEach((el) => {
-            const storedObject = JSON.parse(
-                el.dataset.storedObject as string,
-            ) as StoredObject;
-            const title = el.dataset.title as string;
-            const app = createApp({
-                components: { DownloadButton },
-                data() {
-                    return {
-                        storedObject,
-                        title,
-                        classes: { btn: true, "btn-outline-primary": true },
-                    };
-                },
-                template:
-                    '<download-button :stored-object="storedObject" :at-version="storedObject.currentVersion" :classes="classes" :filename="title" :direct-download="true"></download-button>',
-            });
+  document
+    .querySelectorAll<HTMLDivElement>("div[data-download-button-single]")
+    .forEach((el) => {
+      const storedObject = JSON.parse(
+        el.dataset.storedObject as string,
+      ) as StoredObject;
+      const title = el.dataset.title as string;
+      const app = createApp({
+        components: { DownloadButton },
+        data() {
+          return {
+            storedObject,
+            title,
+            classes: { btn: true, "btn-outline-primary": true },
+          };
+        },
+        template:
+          '<download-button :stored-object="storedObject" :at-version="storedObject.currentVersion" :classes="classes" :filename="title" :direct-download="true"></download-button>',
+      });
 
-            app.use(i18n).use(ToastPlugin).mount(el);
-        });
+      app.use(i18n).use(ToastPlugin).mount(el);
+    });
 });
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/module/document_action_buttons_group/index.ts b/src/Bundle/ChillDocStoreBundle/Resources/public/module/document_action_buttons_group/index.ts
index 5874e88fe..080f63c66 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/module/document_action_buttons_group/index.ts
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/module/document_action_buttons_group/index.ts
@@ -8,66 +8,66 @@ import ToastPlugin from "vue-toast-notification";
 const i18n = _createI18n({});
 
 window.addEventListener("DOMContentLoaded", function (e) {
-    document
-        .querySelectorAll<HTMLDivElement>("div[data-download-buttons]")
-        .forEach((el) => {
-            const app = createApp({
-                components: { DocumentActionButtonsGroup },
-                data() {
-                    const datasets = el.dataset as {
-                        filename: string;
-                        canEdit: string;
-                        storedObject: string;
-                        buttonSmall: string;
-                        davLink: string;
-                        davLinkExpiration: string;
-                    };
+  document
+    .querySelectorAll<HTMLDivElement>("div[data-download-buttons]")
+    .forEach((el) => {
+      const app = createApp({
+        components: { DocumentActionButtonsGroup },
+        data() {
+          const datasets = el.dataset as {
+            filename: string;
+            canEdit: string;
+            storedObject: string;
+            buttonSmall: string;
+            davLink: string;
+            davLinkExpiration: string;
+          };
 
-                    const storedObject = JSON.parse(
-                            datasets.storedObject,
-                        ) as StoredObject,
-                        filename = datasets.filename,
-                        canEdit = datasets.canEdit === "1",
-                        small = datasets.buttonSmall === "1",
-                        davLink =
-                            "davLink" in datasets && datasets.davLink !== ""
-                                ? datasets.davLink
-                                : null,
-                        davLinkExpiration =
-                            "davLinkExpiration" in datasets
-                                ? Number.parseInt(datasets.davLinkExpiration)
-                                : null;
-                    return {
-                        storedObject,
-                        filename,
-                        canEdit,
-                        small,
-                        davLink,
-                        davLinkExpiration,
-                    };
-                },
-                template:
-                    '<document-action-buttons-group :can-edit="canEdit" :filename="filename" :stored-object="storedObject" :small="small" :dav-link="davLink" :dav-link-expiration="davLinkExpiration" @on-stored-object-status-change="onStoredObjectStatusChange"></document-action-buttons-group>',
-                methods: {
-                    onStoredObjectStatusChange: function (
-                        newStatus: StoredObjectStatusChange,
-                    ): void {
-                        this.$data.storedObject.status = newStatus.status;
-                        this.$data.storedObject.filename = newStatus.filename;
-                        this.$data.storedObject.type = newStatus.type;
+          const storedObject = JSON.parse(
+              datasets.storedObject,
+            ) as StoredObject,
+            filename = datasets.filename,
+            canEdit = datasets.canEdit === "1",
+            small = datasets.buttonSmall === "1",
+            davLink =
+              "davLink" in datasets && datasets.davLink !== ""
+                ? datasets.davLink
+                : null,
+            davLinkExpiration =
+              "davLinkExpiration" in datasets
+                ? Number.parseInt(datasets.davLinkExpiration)
+                : null;
+          return {
+            storedObject,
+            filename,
+            canEdit,
+            small,
+            davLink,
+            davLinkExpiration,
+          };
+        },
+        template:
+          '<document-action-buttons-group :can-edit="canEdit" :filename="filename" :stored-object="storedObject" :small="small" :dav-link="davLink" :dav-link-expiration="davLinkExpiration" @on-stored-object-status-change="onStoredObjectStatusChange"></document-action-buttons-group>',
+        methods: {
+          onStoredObjectStatusChange: function (
+            newStatus: StoredObjectStatusChange,
+          ): void {
+            this.$data.storedObject.status = newStatus.status;
+            this.$data.storedObject.filename = newStatus.filename;
+            this.$data.storedObject.type = newStatus.type;
 
-                        // remove eventual div which inform pending status
-                        document
-                            .querySelectorAll(
-                                `[data-docgen-is-pending="${this.$data.storedObject.id}"]`,
-                            )
-                            .forEach(function (el) {
-                                el.remove();
-                            });
-                    },
-                },
-            });
+            // remove eventual div which inform pending status
+            document
+              .querySelectorAll(
+                `[data-docgen-is-pending="${this.$data.storedObject.id}"]`,
+              )
+              .forEach(function (el) {
+                el.remove();
+              });
+          },
+        },
+      });
 
-            app.use(i18n).use(ToastPlugin).mount(el);
-        });
+      app.use(i18n).use(ToastPlugin).mount(el);
+    });
 });
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/types/generic_doc.ts b/src/Bundle/ChillDocStoreBundle/Resources/public/types/generic_doc.ts
index facc55e58..9cda25cad 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/types/generic_doc.ts
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/types/generic_doc.ts
@@ -2,7 +2,7 @@ import { DateTime } from "ChillMainAssets/types";
 import { StoredObject } from "ChillDocStoreAssets/types/index";
 
 export interface GenericDocMetadata {
-    isPresent: boolean;
+  isPresent: boolean;
 }
 
 /**
@@ -15,57 +15,57 @@ export interface EmptyMetadata extends GenericDocMetadata {}
  * Minimal Metadata for a GenericDoc with a normalizer
  */
 export interface BaseMetadata extends GenericDocMetadata {
-    title: string;
+  title: string;
 }
 
 /**
  * A generic doc is a document attached to a Person or an AccompanyingPeriod.
  */
 export interface GenericDoc {
-    type: "doc_store_generic_doc";
-    uniqueKey: string;
-    key: string;
-    identifiers: object;
-    context: "person" | "accompanying-period";
-    doc_date: DateTime;
-    metadata: GenericDocMetadata;
-    storedObject: StoredObject | null;
+  type: "doc_store_generic_doc";
+  uniqueKey: string;
+  key: string;
+  identifiers: object;
+  context: "person" | "accompanying-period";
+  doc_date: DateTime;
+  metadata: GenericDocMetadata;
+  storedObject: StoredObject | null;
 }
 
 export interface GenericDocForAccompanyingPeriod extends GenericDoc {
-    context: "accompanying-period";
+  context: "accompanying-period";
 }
 
 interface BaseMetadataWithHtml extends BaseMetadata {
-    html: string;
+  html: string;
 }
 
 export interface GenericDocForAccompanyingCourseDocument
-    extends GenericDocForAccompanyingPeriod {
-    key: "accompanying_course_document";
-    metadata: BaseMetadataWithHtml;
+  extends GenericDocForAccompanyingPeriod {
+  key: "accompanying_course_document";
+  metadata: BaseMetadataWithHtml;
 }
 
 export interface GenericDocForAccompanyingCourseActivityDocument
-    extends GenericDocForAccompanyingPeriod {
-    key: "accompanying_course_activity_document";
-    metadata: BaseMetadataWithHtml;
+  extends GenericDocForAccompanyingPeriod {
+  key: "accompanying_course_activity_document";
+  metadata: BaseMetadataWithHtml;
 }
 
 export interface GenericDocForAccompanyingCourseCalendarDocument
-    extends GenericDocForAccompanyingPeriod {
-    key: "accompanying_course_calendar_document";
-    metadata: BaseMetadataWithHtml;
+  extends GenericDocForAccompanyingPeriod {
+  key: "accompanying_course_calendar_document";
+  metadata: BaseMetadataWithHtml;
 }
 
 export interface GenericDocForAccompanyingCoursePersonDocument
-    extends GenericDocForAccompanyingPeriod {
-    key: "person_document";
-    metadata: BaseMetadataWithHtml;
+  extends GenericDocForAccompanyingPeriod {
+  key: "person_document";
+  metadata: BaseMetadataWithHtml;
 }
 
 export interface GenericDocForAccompanyingCourseWorkEvaluationDocument
-    extends GenericDocForAccompanyingPeriod {
-    key: "accompanying_period_work_evaluation_document";
-    metadata: BaseMetadataWithHtml;
+  extends GenericDocForAccompanyingPeriod {
+  key: "accompanying_period_work_evaluation_document";
+  metadata: BaseMetadataWithHtml;
 }
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/types/index.ts b/src/Bundle/ChillDocStoreBundle/Resources/public/types/index.ts
index 5b34b8f73..f71ed0350 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/types/index.ts
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/types/index.ts
@@ -4,73 +4,73 @@ import { SignedUrlGet } from "ChillDocStoreAssets/vuejs/StoredObjectButton/helpe
 export type StoredObjectStatus = "empty" | "ready" | "failure" | "pending";
 
 export interface StoredObject {
-    id: number;
-    title: string | null;
-    uuid: string;
-    prefix: string;
-    status: StoredObjectStatus;
-    currentVersion:
-        | null
-        | StoredObjectVersionCreated
-        | StoredObjectVersionPersisted;
-    totalVersions: number;
-    datas: object;
-    /** @deprecated */
-    creationDate: DateTime;
-    createdAt: DateTime | null;
-    createdBy: User | null;
-    _permissions: {
-        canEdit: boolean;
-        canSee: boolean;
-    };
-    _links?: {
-        dav_link?: {
-            href: string;
-            expiration: number;
-        };
-        downloadLink?: SignedUrlGet;
+  id: number;
+  title: string | null;
+  uuid: string;
+  prefix: string;
+  status: StoredObjectStatus;
+  currentVersion:
+    | null
+    | StoredObjectVersionCreated
+    | StoredObjectVersionPersisted;
+  totalVersions: number;
+  datas: object;
+  /** @deprecated */
+  creationDate: DateTime;
+  createdAt: DateTime | null;
+  createdBy: User | null;
+  _permissions: {
+    canEdit: boolean;
+    canSee: boolean;
+  };
+  _links?: {
+    dav_link?: {
+      href: string;
+      expiration: number;
     };
+    downloadLink?: SignedUrlGet;
+  };
 }
 
 export interface StoredObjectVersion {
-    /**
-     * filename of the object in the object storage
-     */
-    filename: string;
-    iv: number[];
-    keyInfos: JsonWebKey;
-    type: string;
+  /**
+   * filename of the object in the object storage
+   */
+  filename: string;
+  iv: number[];
+  keyInfos: JsonWebKey;
+  type: string;
 }
 
 export interface StoredObjectVersionCreated extends StoredObjectVersion {
-    persisted: false;
+  persisted: false;
 }
 
 export interface StoredObjectVersionPersisted
-    extends StoredObjectVersionCreated {
-    version: number;
-    id: number;
-    createdAt: DateTime | null;
-    createdBy: User | null;
+  extends StoredObjectVersionCreated {
+  version: number;
+  id: number;
+  createdAt: DateTime | null;
+  createdBy: User | null;
 }
 
 export interface StoredObjectStatusChange {
-    id: number;
-    filename: string;
-    status: StoredObjectStatus;
-    type: string;
+  id: number;
+  filename: string;
+  status: StoredObjectStatus;
+  type: string;
 }
 
 export interface StoredObjectVersionWithPointInTime
-    extends StoredObjectVersionPersisted {
-    "point-in-times": StoredObjectPointInTime[];
-    "from-restored": StoredObjectVersionPersisted | null;
+  extends StoredObjectVersionPersisted {
+  "point-in-times": StoredObjectPointInTime[];
+  "from-restored": StoredObjectVersionPersisted | null;
 }
 
 export interface StoredObjectPointInTime {
-    id: number;
-    byUser: User | null;
-    reason: "keep-before-conversion" | "keep-by-user";
+  id: number;
+  byUser: User | null;
+  reason: "keep-before-conversion" | "keep-by-user";
 }
 
 /**
@@ -82,63 +82,63 @@ export type WopiEditButtonExecutableBeforeLeaveFunction = () => Promise<void>;
  * Object containing information for performering a POST request to a swift object store
  */
 export interface PostStoreObjectSignature {
-    method: "POST";
-    max_file_size: number;
-    max_file_count: 1;
-    expires: number;
-    submit_delay: 180;
-    redirect: string;
-    prefix: string;
-    url: string;
-    signature: string;
+  method: "POST";
+  max_file_size: number;
+  max_file_count: 1;
+  expires: number;
+  submit_delay: 180;
+  redirect: string;
+  prefix: string;
+  url: string;
+  signature: string;
 }
 
 export interface PDFPage {
-    index: number;
-    width: number;
-    height: number;
+  index: number;
+  width: number;
+  height: number;
 }
 export interface SignatureZone {
-    index: number | null;
-    x: number;
-    y: number;
-    width: number;
-    height: number;
-    PDFPage: PDFPage;
+  index: number | null;
+  x: number;
+  y: number;
+  width: number;
+  height: number;
+  PDFPage: PDFPage;
 }
 
 export interface Signature {
-    id: number;
-    storedObject: StoredObject;
-    zones: SignatureZone[];
+  id: number;
+  storedObject: StoredObject;
+  zones: SignatureZone[];
 }
 
 export type SignedState =
-    | "pending"
-    | "signed"
-    | "rejected"
-    | "canceled"
-    | "error";
+  | "pending"
+  | "signed"
+  | "rejected"
+  | "canceled"
+  | "error";
 
 export interface CheckSignature {
-    state: SignedState;
-    storedObject: StoredObject;
+  state: SignedState;
+  storedObject: StoredObject;
 }
 
 export type CanvasEvent = "select" | "add";
 
 export interface ZoomLevel {
-    id: number;
-    zoom: number;
-    label: {
-        fr?: string;
-        nl?: string;
-    };
+  id: number;
+  zoom: number;
+  label: {
+    fr?: string;
+    nl?: string;
+  };
 }
 
 export interface GenericDoc {
-    type: "doc_store_generic_doc";
-    key: string;
-    context: "person" | "accompanying-period";
-    doc_date: DateTime;
+  type: "doc_store_generic_doc";
+  key: string;
+  context: "person" | "accompanying-period";
+  doc_date: DateTime;
 }
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentActionButtonsGroup.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentActionButtonsGroup.vue
index 85548f6d3..8fd348807 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentActionButtonsGroup.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentActionButtonsGroup.vue
@@ -1,67 +1,65 @@
 <template>
-    <div v-if="isButtonGroupDisplayable" class="btn-group">
-        <button
-            :class="
-                Object.assign({
-                    btn: true,
-                    'btn-outline-primary': true,
-                    'dropdown-toggle': true,
-                    'btn-sm': props.small,
-                })
-            "
-            type="button"
-            data-bs-toggle="dropdown"
-            aria-expanded="false"
-        >
-            Actions
-        </button>
-        <ul class="dropdown-menu">
-            <li v-if="isEditableOnline">
-                <wopi-edit-button
-                    :stored-object="props.storedObject"
-                    :classes="{ 'dropdown-item': true }"
-                    :execute-before-leave="props.executeBeforeLeave"
-                ></wopi-edit-button>
-            </li>
-            <li v-if="isEditableOnDesktop">
-                <desktop-edit-button
-                    :classes="{ 'dropdown-item': true }"
-                    :edit-link="props.davLink"
-                    :expiration-link="props.davLinkExpiration"
-                ></desktop-edit-button>
-            </li>
-            <li v-if="isConvertibleToPdf">
-                <convert-button
-                    :stored-object="props.storedObject"
-                    :filename="filename"
-                    :classes="{ 'dropdown-item': true }"
-                ></convert-button>
-            </li>
-            <li v-if="isDownloadable">
-                <download-button
-                    :stored-object="props.storedObject"
-                    :at-version="props.storedObject.currentVersion"
-                    :filename="filename"
-                    :classes="{ 'dropdown-item': true }"
-                    :display-action-string-in-button="true"
-                ></download-button>
-            </li>
-            <li v-if="isHistoryViewable">
-                <history-button
-                    :stored-object="props.storedObject"
-                    :can-edit="
-                        canEdit && props.storedObject._permissions.canEdit
-                    "
-                ></history-button>
-            </li>
-        </ul>
-    </div>
-    <div v-else-if="'pending' === props.storedObject.status">
-        <div class="btn btn-outline-info">Génération en cours</div>
-    </div>
-    <div v-else-if="'failure' === props.storedObject.status">
-        <div class="btn btn-outline-danger">La génération a échoué</div>
-    </div>
+  <div v-if="isButtonGroupDisplayable" class="btn-group">
+    <button
+      :class="
+        Object.assign({
+          btn: true,
+          'btn-outline-primary': true,
+          'dropdown-toggle': true,
+          'btn-sm': props.small,
+        })
+      "
+      type="button"
+      data-bs-toggle="dropdown"
+      aria-expanded="false"
+    >
+      Actions
+    </button>
+    <ul class="dropdown-menu">
+      <li v-if="isEditableOnline">
+        <wopi-edit-button
+          :stored-object="props.storedObject"
+          :classes="{ 'dropdown-item': true }"
+          :execute-before-leave="props.executeBeforeLeave"
+        ></wopi-edit-button>
+      </li>
+      <li v-if="isEditableOnDesktop">
+        <desktop-edit-button
+          :classes="{ 'dropdown-item': true }"
+          :edit-link="props.davLink"
+          :expiration-link="props.davLinkExpiration"
+        ></desktop-edit-button>
+      </li>
+      <li v-if="isConvertibleToPdf">
+        <convert-button
+          :stored-object="props.storedObject"
+          :filename="filename"
+          :classes="{ 'dropdown-item': true }"
+        ></convert-button>
+      </li>
+      <li v-if="isDownloadable">
+        <download-button
+          :stored-object="props.storedObject"
+          :at-version="props.storedObject.currentVersion"
+          :filename="filename"
+          :classes="{ 'dropdown-item': true }"
+          :display-action-string-in-button="true"
+        ></download-button>
+      </li>
+      <li v-if="isHistoryViewable">
+        <history-button
+          :stored-object="props.storedObject"
+          :can-edit="canEdit && props.storedObject._permissions.canEdit"
+        ></history-button>
+      </li>
+    </ul>
+  </div>
+  <div v-else-if="'pending' === props.storedObject.status">
+    <div class="btn btn-outline-info">Génération en cours</div>
+  </div>
+  <div v-else-if="'failure' === props.storedObject.status">
+    <div class="btn btn-outline-danger">La génération a échoué</div>
+  </div>
 </template>
 
 <script lang="ts" setup>
@@ -70,68 +68,66 @@ import ConvertButton from "./StoredObjectButton/ConvertButton.vue";
 import DownloadButton from "./StoredObjectButton/DownloadButton.vue";
 import WopiEditButton from "./StoredObjectButton/WopiEditButton.vue";
 import {
-    is_extension_editable,
-    is_extension_viewable,
-    is_object_ready,
+  is_extension_editable,
+  is_extension_viewable,
+  is_object_ready,
 } from "./StoredObjectButton/helpers";
 import {
-    StoredObject,
-    StoredObjectStatusChange,
-    StoredObjectVersion,
-    WopiEditButtonExecutableBeforeLeaveFunction,
+  StoredObject,
+  StoredObjectStatusChange,
+  StoredObjectVersion,
+  WopiEditButtonExecutableBeforeLeaveFunction,
 } from "../types";
 import DesktopEditButton from "ChillDocStoreAssets/vuejs/StoredObjectButton/DesktopEditButton.vue";
 import HistoryButton from "ChillDocStoreAssets/vuejs/StoredObjectButton/HistoryButton.vue";
 
 interface DocumentActionButtonsGroupConfig {
-    storedObject: StoredObject;
-    small?: boolean;
-    canEdit?: boolean;
-    canDownload?: boolean;
-    canConvertPdf?: boolean;
-    returnPath?: string;
+  storedObject: StoredObject;
+  small?: boolean;
+  canEdit?: boolean;
+  canDownload?: boolean;
+  canConvertPdf?: boolean;
+  returnPath?: string;
 
-    /**
-     * Will be the filename displayed to the user when he·she download the document
-     * (the document will be saved on his disk with this name)
-     *
-     * If not set, 'document' will be used.
-     */
-    filename?: string;
+  /**
+   * Will be the filename displayed to the user when he·she download the document
+   * (the document will be saved on his disk with this name)
+   *
+   * If not set, 'document' will be used.
+   */
+  filename?: string;
 
-    /**
-     * If set, will execute this function before leaving to the editor
-     */
-    executeBeforeLeave?: WopiEditButtonExecutableBeforeLeaveFunction;
+  /**
+   * If set, will execute this function before leaving to the editor
+   */
+  executeBeforeLeave?: WopiEditButtonExecutableBeforeLeaveFunction;
 
-    /**
-     * a link to download and edit file using webdav
-     */
-    davLink?: string;
+  /**
+   * a link to download and edit file using webdav
+   */
+  davLink?: string;
 
-    /**
-     * the expiration date of the download, as a unix timestamp
-     */
-    davLinkExpiration?: number;
+  /**
+   * the expiration date of the download, as a unix timestamp
+   */
+  davLinkExpiration?: number;
 }
 
 const emit =
-    defineEmits<
-        (
-            e: "onStoredObjectStatusChange",
-            newStatus: StoredObjectStatusChange,
-        ) => void
-    >();
+  defineEmits<
+    (
+      e: "onStoredObjectStatusChange",
+      newStatus: StoredObjectStatusChange,
+    ) => void
+  >();
 
 const props = withDefaults(defineProps<DocumentActionButtonsGroupConfig>(), {
-    small: false,
-    canEdit: true,
-    canDownload: true,
-    canConvertPdf: true,
-    returnPath:
-        window.location.pathname +
-        window.location.search +
-        window.location.hash,
+  small: false,
+  canEdit: true,
+  canDownload: true,
+  canConvertPdf: true,
+  returnPath:
+    window.location.pathname + window.location.search + window.location.hash,
 });
 
 /**
@@ -145,93 +141,93 @@ let tryiesForReady = 0;
 const maxTryiesForReady = 120;
 
 const isButtonGroupDisplayable = computed<boolean>(() => {
-    return (
-        isDownloadable.value ||
-        isEditableOnline.value ||
-        isEditableOnDesktop.value ||
-        isConvertibleToPdf.value
-    );
+  return (
+    isDownloadable.value ||
+    isEditableOnline.value ||
+    isEditableOnDesktop.value ||
+    isConvertibleToPdf.value
+  );
 });
 
 const isDownloadable = computed<boolean>(() => {
-    return (
-        props.storedObject.status === "ready" ||
-        // happens when the stored object version is just added, but not persisted
-        (props.storedObject.currentVersion !== null &&
-            props.storedObject.status === "empty")
-    );
+  return (
+    props.storedObject.status === "ready" ||
+    // happens when the stored object version is just added, but not persisted
+    (props.storedObject.currentVersion !== null &&
+      props.storedObject.status === "empty")
+  );
 });
 
 const isEditableOnline = computed<boolean>(() => {
-    return (
-        props.storedObject.status === "ready" &&
-        props.storedObject._permissions.canEdit &&
-        props.canEdit &&
-        props.storedObject.currentVersion !== null &&
-        is_extension_editable(props.storedObject.currentVersion.type) &&
-        props.storedObject.currentVersion.persisted !== false
-    );
+  return (
+    props.storedObject.status === "ready" &&
+    props.storedObject._permissions.canEdit &&
+    props.canEdit &&
+    props.storedObject.currentVersion !== null &&
+    is_extension_editable(props.storedObject.currentVersion.type) &&
+    props.storedObject.currentVersion.persisted !== false
+  );
 });
 
 const isEditableOnDesktop = computed<boolean>(() => {
-    return isEditableOnline.value;
+  return isEditableOnline.value;
 });
 
 const isConvertibleToPdf = computed<boolean>(() => {
-    return (
-        props.storedObject.status === "ready" &&
-        props.storedObject._permissions.canSee &&
-        props.canConvertPdf &&
-        props.storedObject.currentVersion !== null &&
-        is_extension_viewable(props.storedObject.currentVersion.type) &&
-        props.storedObject.currentVersion.type !== "application/pdf" &&
-        props.storedObject.currentVersion.persisted !== false
-    );
+  return (
+    props.storedObject.status === "ready" &&
+    props.storedObject._permissions.canSee &&
+    props.canConvertPdf &&
+    props.storedObject.currentVersion !== null &&
+    is_extension_viewable(props.storedObject.currentVersion.type) &&
+    props.storedObject.currentVersion.type !== "application/pdf" &&
+    props.storedObject.currentVersion.persisted !== false
+  );
 });
 
 const isHistoryViewable = computed<boolean>(() => {
-    return props.storedObject.status === "ready";
+  return props.storedObject.status === "ready";
 });
 
 const checkForReady = function (): void {
-    if (
-        "ready" === props.storedObject.status ||
-        "empty" === props.storedObject.status ||
-        "failure" === props.storedObject.status ||
-        // stop reloading if the page stays opened for a long time
-        tryiesForReady > maxTryiesForReady
-    ) {
-        return;
-    }
+  if (
+    "ready" === props.storedObject.status ||
+    "empty" === props.storedObject.status ||
+    "failure" === props.storedObject.status ||
+    // stop reloading if the page stays opened for a long time
+    tryiesForReady > maxTryiesForReady
+  ) {
+    return;
+  }
 
-    tryiesForReady = tryiesForReady + 1;
+  tryiesForReady = tryiesForReady + 1;
 
-    setTimeout(onObjectNewStatusCallback, 5000);
+  setTimeout(onObjectNewStatusCallback, 5000);
 };
 
 const onObjectNewStatusCallback = async function (): Promise<void> {
-    if (props.storedObject.status === "stored_object_created") {
-        return Promise.resolve();
-    }
-
-    const new_status = await is_object_ready(props.storedObject);
-    if (props.storedObject.status !== new_status.status) {
-        emit("onStoredObjectStatusChange", new_status);
-        return Promise.resolve();
-    } else if ("failure" === new_status.status) {
-        return Promise.resolve();
-    }
-
-    if ("ready" !== new_status.status) {
-        // we check for new status, unless it is ready
-        checkForReady();
-    }
-
+  if (props.storedObject.status === "stored_object_created") {
     return Promise.resolve();
+  }
+
+  const new_status = await is_object_ready(props.storedObject);
+  if (props.storedObject.status !== new_status.status) {
+    emit("onStoredObjectStatusChange", new_status);
+    return Promise.resolve();
+  } else if ("failure" === new_status.status) {
+    return Promise.resolve();
+  }
+
+  if ("ready" !== new_status.status) {
+    // we check for new status, unless it is ready
+    checkForReady();
+  }
+
+  return Promise.resolve();
 };
 
 onMounted(() => {
-    checkForReady();
+  checkForReady();
 });
 </script>
 
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue
index ea195da4b..3021de36e 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue
@@ -1,355 +1,338 @@
 <template>
-    <teleport to="body">
-        <modal v-if="modalOpen" @close="modalOpen = false">
-            <template v-slot:header>
-                <h2>{{ trans(SIGNATURES_SIGNATURE_CONFIRMATION) }}</h2>
-            </template>
-            <template v-slot:body>
-                <div class="signature-modal-body text-center" v-if="loading">
-                    <p>
-                        {{ trans(SIGNATURES_ELECTRONIC_SIGNATURE_IN_PROGRESS) }}
-                    </p>
-                    <div class="loading">
-                        <i
-                            class="fa fa-circle-o-notch fa-spin fa-3x"
-                            :title="trans(SIGNATURES_LOADING)"
-                        ></i>
-                    </div>
-                </div>
-                <div class="signature-modal-body text-center" v-else>
-                    <p>{{ trans(SIGNATURES_YOU_ARE_GOING_TO_SIGN) }}</p>
-                    <p>{{ trans(SIGNATURES_ARE_YOU_SURE) }}</p>
-                </div>
-            </template>
-            <template v-slot:footer>
-                <button class="btn btn-action" @click.prevent="confirmSign">
-                    {{ trans(SIGNATURES_YES) }}
-                </button>
-            </template>
-        </modal>
-    </teleport>
-    <div class="col-12 m-auto sticky-top">
-        <div
-            class="row justify-content-center border-bottom pdf-tools d-md-none"
-        >
-            <div class="col-5 text-center turn-page">
-                <select
-                    class="form-select form-select-sm"
-                    id="zoomSelect"
-                    v-model="zoomLevel"
-                    @change="setZoomLevel(zoomLevel)"
-                >
-                    <option value="" selected disabled>Zoom</option>
-                    <option v-for="z in zoomLevels" :value="z.zoom" :key="z.id">
-                        {{ localizeString(z.label) }}
-                    </option>
-                </select>
-                <template v-if="pageCount > 1">
-                    <button
-                        class="btn btn-light btn-xs p-1"
-                        :disabled="page <= 1"
-                        @click="turnPage(-1)"
-                    >
-                        ❮
-                    </button>
-                    <span>{{ page }}/{{ pageCount }}</span>
-                    <button
-                        class="btn btn-light btn-xs p-1"
-                        :disabled="page >= pageCount"
-                        @click="turnPage(1)"
-                    >
-                        ❯
-                    </button>
-                </template>
-                <template v-if="pageCount > 1">
-                    <button
-                        class="btn btn-light btn-xs p-1"
-                        :disabled="page <= 1"
-                        @click="turnPage(-1)"
-                    >
-                        ❮
-                    </button>
-                    <span>{{ page }}/{{ pageCount }}</span>
-                    <button
-                        class="btn btn-light btn-xs p-1"
-                        :disabled="page >= pageCount"
-                        @click="turnPage(1)"
-                    >
-                        ❯
-                    </button>
-                    <input
-                        type="checkbox"
-                        id="checkboxMulti"
-                        v-model="multiPage"
-                        @change="toggleMultiPage"
-                    />
-                    <label class="form-check-label" for="checkboxMulti">
-                        {{ trans(SIGNATURES_ALL_PAGES) }}
-                    </label>
-                </template>
-            </div>
-            <div
-                v-if="signature.zones.length === 1 && signedState !== 'signed'"
-                class="col-5 p-0 text-center turnSignature"
-            >
-                <button
-                    class="btn btn-light btn-sm"
-                    @click="goToSignatureZoneUnique"
-                >
-                    {{ trans(SIGNATURES_GO_TO_SIGNATURE_UNIQUE) }}
-                </button>
-            </div>
-            <div
-                v-if="signature.zones.length > 1"
-                class="col-5 p-0 text-center turnSignature"
-            >
-                <button
-                    :disabled="isFirstSignatureZone()"
-                    class="btn btn-light btn-sm"
-                    @click="turnSignature(-1)"
-                >
-                    {{ trans(SIGNATURES_LAST_ZONE) }}
-                </button>
-                <span>|</span>
-                <button
-                    :disabled="isLastSignatureZone()"
-                    class="btn btn-light btn-sm"
-                    @click="turnSignature(1)"
-                >
-                    {{ trans(SIGNATURES_NEXT_ZONE) }}
-                </button>
-            </div>
-            <div class="col text-end" v-if="signedState !== 'signed'">
-                <button
-                    class="btn btn-misc btn-sm"
-                    :hidden="!userSignatureZone"
-                    @click="undoSign"
-                    v-if="signature.zones.length > 1"
-                    :title="trans(SIGNATURES_CHOOSE_ANOTHER_SIGNATURE)"
-                >
-                    {{ trans(SIGNATURES_ANOTHER_ZONE) }}
-                </button>
-                <button
-                    class="btn btn-misc btn-sm"
-                    :hidden="!userSignatureZone"
-                    @click="undoSign"
-                    v-else
-                >
-                    {{ trans(SIGNATURES_CANCEL) }}
-                </button>
-                <button
-                    v-if="userSignatureZone === null"
-                    :class="{
-                        btn: true,
-                        'btn-sm': true,
-                        'btn-create': canvasEvent !== 'add',
-                        'btn-chill-green': canvasEvent === 'add',
-                        active: canvasEvent === 'add',
-                    }"
-                    @click="toggleAddZone()"
-                    :title="trans(SIGNATURES_ADD_SIGN_ZONE)"
-                >
-                    <template v-if="canvasEvent === 'add'">
-                        <div
-                            class="spinner-border spinner-border-sm"
-                            role="status"
-                        >
-                            <span class="visually-hidden">Loading...</span>
-                        </div>
-                    </template>
-                </button>
-            </div>
+  <teleport to="body">
+    <modal v-if="modalOpen" @close="modalOpen = false">
+      <template v-slot:header>
+        <h2>{{ trans(SIGNATURES_SIGNATURE_CONFIRMATION) }}</h2>
+      </template>
+      <template v-slot:body>
+        <div class="signature-modal-body text-center" v-if="loading">
+          <p>
+            {{ trans(SIGNATURES_ELECTRONIC_SIGNATURE_IN_PROGRESS) }}
+          </p>
+          <div class="loading">
+            <i
+              class="fa fa-circle-o-notch fa-spin fa-3x"
+              :title="trans(SIGNATURES_LOADING)"
+            ></i>
+          </div>
         </div>
+        <div class="signature-modal-body text-center" v-else>
+          <p>{{ trans(SIGNATURES_YOU_ARE_GOING_TO_SIGN) }}</p>
+          <p>{{ trans(SIGNATURES_ARE_YOU_SURE) }}</p>
+        </div>
+      </template>
+      <template v-slot:footer>
+        <button class="btn btn-action" @click.prevent="confirmSign">
+          {{ trans(SIGNATURES_YES) }}
+        </button>
+      </template>
+    </modal>
+  </teleport>
+  <div class="col-12 m-auto sticky-top">
+    <div class="row justify-content-center border-bottom pdf-tools d-md-none">
+      <div class="col-5 text-center turn-page">
+        <select
+          class="form-select form-select-sm"
+          id="zoomSelect"
+          v-model="zoomLevel"
+          @change="setZoomLevel(zoomLevel)"
+        >
+          <option value="" selected disabled>Zoom</option>
+          <option v-for="z in zoomLevels" :value="z.zoom" :key="z.id">
+            {{ localizeString(z.label) }}
+          </option>
+        </select>
+        <template v-if="pageCount > 1">
+          <button
+            class="btn btn-light btn-xs p-1"
+            :disabled="page <= 1"
+            @click="turnPage(-1)"
+          >
+            ❮
+          </button>
+          <span>{{ page }}/{{ pageCount }}</span>
+          <button
+            class="btn btn-light btn-xs p-1"
+            :disabled="page >= pageCount"
+            @click="turnPage(1)"
+          >
+            ❯
+          </button>
+        </template>
+        <template v-if="pageCount > 1">
+          <button
+            class="btn btn-light btn-xs p-1"
+            :disabled="page <= 1"
+            @click="turnPage(-1)"
+          >
+            ❮
+          </button>
+          <span>{{ page }}/{{ pageCount }}</span>
+          <button
+            class="btn btn-light btn-xs p-1"
+            :disabled="page >= pageCount"
+            @click="turnPage(1)"
+          >
+            ❯
+          </button>
+          <input
+            type="checkbox"
+            id="checkboxMulti"
+            v-model="multiPage"
+            @change="toggleMultiPage"
+          />
+          <label class="form-check-label" for="checkboxMulti">
+            {{ trans(SIGNATURES_ALL_PAGES) }}
+          </label>
+        </template>
+      </div>
+      <div
+        v-if="signature.zones.length === 1 && signedState !== 'signed'"
+        class="col-5 p-0 text-center turnSignature"
+      >
+        <button class="btn btn-light btn-sm" @click="goToSignatureZoneUnique">
+          {{ trans(SIGNATURES_GO_TO_SIGNATURE_UNIQUE) }}
+        </button>
+      </div>
+      <div
+        v-if="signature.zones.length > 1"
+        class="col-5 p-0 text-center turnSignature"
+      >
+        <button
+          :disabled="isFirstSignatureZone()"
+          class="btn btn-light btn-sm"
+          @click="turnSignature(-1)"
+        >
+          {{ trans(SIGNATURES_LAST_ZONE) }}
+        </button>
+        <span>|</span>
+        <button
+          :disabled="isLastSignatureZone()"
+          class="btn btn-light btn-sm"
+          @click="turnSignature(1)"
+        >
+          {{ trans(SIGNATURES_NEXT_ZONE) }}
+        </button>
+      </div>
+      <div class="col text-end" v-if="signedState !== 'signed'">
+        <button
+          class="btn btn-misc btn-sm"
+          :hidden="!userSignatureZone"
+          @click="undoSign"
+          v-if="signature.zones.length > 1"
+          :title="trans(SIGNATURES_CHOOSE_ANOTHER_SIGNATURE)"
+        >
+          {{ trans(SIGNATURES_ANOTHER_ZONE) }}
+        </button>
+        <button
+          class="btn btn-misc btn-sm"
+          :hidden="!userSignatureZone"
+          @click="undoSign"
+          v-else
+        >
+          {{ trans(SIGNATURES_CANCEL) }}
+        </button>
+        <button
+          v-if="userSignatureZone === null"
+          :class="{
+            btn: true,
+            'btn-sm': true,
+            'btn-create': canvasEvent !== 'add',
+            'btn-chill-green': canvasEvent === 'add',
+            active: canvasEvent === 'add',
+          }"
+          @click="toggleAddZone()"
+          :title="trans(SIGNATURES_ADD_SIGN_ZONE)"
+        >
+          <template v-if="canvasEvent === 'add'">
+            <div class="spinner-border spinner-border-sm" role="status">
+              <span class="visually-hidden">Loading...</span>
+            </div>
+          </template>
+        </button>
+      </div>
+    </div>
 
-        <div
-            class="row justify-content-center border-bottom pdf-tools d-none d-md-flex"
+    <div
+      class="row justify-content-center border-bottom pdf-tools d-none d-md-flex"
+    >
+      <div class="col-5 text-center turn-page ps-3">
+        <select
+          class="form-select form-select-sm"
+          id="zoomSelect"
+          v-model="zoomLevel"
+          @change="setZoomLevel(zoomLevel)"
         >
-            <div class="col-5 text-center turn-page ps-3">
-                <select
-                    class="form-select form-select-sm"
-                    id="zoomSelect"
-                    v-model="zoomLevel"
-                    @change="setZoomLevel(zoomLevel)"
-                >
-                    <option value="" selected disabled>Zoom</option>
-                    <option v-for="z in zoomLevels" :value="z.zoom" :key="z.id">
-                        {{ localizeString(z.label) }}
-                    </option>
-                </select>
-                <template v-if="pageCount > 1">
-                    <button
-                        class="btn btn-light btn-xs p-1"
-                        :disabled="page <= 1"
-                        @click="turnPage(-1)"
-                    >
-                        ❮
-                    </button>
-                    <span>{{ page }} / {{ pageCount }}</span>
-                    <button
-                        class="btn btn-light btn-xs p-1"
-                        :disabled="page >= pageCount"
-                        @click="turnPage(1)"
-                    >
-                        ❯
-                    </button>
-                    <input
-                        type="checkbox"
-                        id="checkboxMulti"
-                        v-model="multiPage"
-                        @change="toggleMultiPage"
-                    />
-                    <label class="form-check-label" for="checkboxMulti">
-                        {{ trans(SIGNATURES_SEE_ALL_PAGES) }}
-                    </label>
-                </template>
+          <option value="" selected disabled>Zoom</option>
+          <option v-for="z in zoomLevels" :value="z.zoom" :key="z.id">
+            {{ localizeString(z.label) }}
+          </option>
+        </select>
+        <template v-if="pageCount > 1">
+          <button
+            class="btn btn-light btn-xs p-1"
+            :disabled="page <= 1"
+            @click="turnPage(-1)"
+          >
+            ❮
+          </button>
+          <span>{{ page }} / {{ pageCount }}</span>
+          <button
+            class="btn btn-light btn-xs p-1"
+            :disabled="page >= pageCount"
+            @click="turnPage(1)"
+          >
+            ❯
+          </button>
+          <input
+            type="checkbox"
+            id="checkboxMulti"
+            v-model="multiPage"
+            @change="toggleMultiPage"
+          />
+          <label class="form-check-label" for="checkboxMulti">
+            {{ trans(SIGNATURES_SEE_ALL_PAGES) }}
+          </label>
+        </template>
+      </div>
+      <div
+        v-if="signature.zones.length === 1 && signedState !== 'signed'"
+        class="col-4 d-xl-none text-center turnSignature p-0"
+      >
+        <button class="btn btn-light btn-sm" @click="goToSignatureZoneUnique">
+          {{ trans(SIGNATURES_GO_TO_SIGNATURE_UNIQUE) }}
+        </button>
+      </div>
+      <div
+        v-if="signature.zones.length > 1 && signedState !== 'signed'"
+        class="col-4 d-xl-none text-center turnSignature p-0"
+      >
+        <button
+          :disabled="isFirstSignatureZone()"
+          class="btn btn-light btn-sm"
+          @click="turnSignature(-1)"
+        >
+          {{ trans(SIGNATURES_LAST_ZONE) }}
+        </button>
+        <span>|</span>
+        <button
+          :disabled="isLastSignatureZone()"
+          class="btn btn-light btn-sm"
+          @click="turnSignature(1)"
+        >
+          {{ trans(SIGNATURES_NEXT_ZONE) }}
+        </button>
+      </div>
+      <div
+        v-if="signature.zones.length === 1 && signedState !== 'signed'"
+        class="col-4 d-none d-xl-flex p-0 text-center turnSignature"
+      >
+        <button class="btn btn-light btn-sm" @click="goToSignatureZoneUnique">
+          {{ trans(SIGNATURES_GO_TO_SIGNATURE_UNIQUE) }}
+        </button>
+      </div>
+      <div
+        v-if="signature.zones.length > 1 && signedState !== 'signed'"
+        class="col-4 d-none d-xl-flex p-0 text-center turnSignature"
+      >
+        <button
+          :disabled="isFirstSignatureZone()"
+          class="btn btn-light btn-sm"
+          @click="turnSignature(-1)"
+        >
+          {{ trans(SIGNATURES_LAST_SIGN_ZONE) }}
+        </button>
+        <span>|</span>
+        <button
+          :disabled="isLastSignatureZone()"
+          class="btn btn-light btn-sm"
+          @click="turnSignature(1)"
+        >
+          {{ trans(SIGNATURES_NEXT_SIGN_ZONE) }}
+        </button>
+      </div>
+      <div class="col text-end" v-if="signedState !== 'signed'">
+        <button
+          class="btn btn-misc btn-sm"
+          :hidden="!userSignatureZone"
+          @click="undoSign"
+          v-if="signature.zones.length > 1"
+        >
+          {{ trans(SIGNATURES_CHOOSE_ANOTHER_SIGNATURE) }}
+        </button>
+        <button
+          class="btn btn-misc btn-sm"
+          :hidden="!userSignatureZone"
+          @click="undoSign"
+          v-else
+        >
+          {{ trans(SIGNATURES_CANCEL) }}
+        </button>
+        <button
+          v-if="userSignatureZone === null"
+          :class="{
+            btn: true,
+            'btn-sm': true,
+            'btn-create': canvasEvent !== 'add',
+            'btn-chill-green': canvasEvent === 'add',
+            active: canvasEvent === 'add',
+          }"
+          @click="toggleAddZone()"
+          :title="trans(SIGNATURES_ADD_SIGN_ZONE)"
+        >
+          <template v-if="canvasEvent !== 'add'">
+            {{ trans(SIGNATURES_ADD_ZONE) }}
+          </template>
+          <template v-else>
+            {{ trans(SIGNATURES_CLICK_ON_DOCUMENT) }}
+            <div class="spinner-border spinner-border-sm" role="status">
+              <span class="visually-hidden">Loading...</span>
             </div>
-            <div
-                v-if="signature.zones.length === 1 && signedState !== 'signed'"
-                class="col-4 d-xl-none text-center turnSignature p-0"
-            >
-                <button
-                    class="btn btn-light btn-sm"
-                    @click="goToSignatureZoneUnique"
-                >
-                    {{ trans(SIGNATURES_GO_TO_SIGNATURE_UNIQUE) }}
-                </button>
-            </div>
-            <div
-                v-if="signature.zones.length > 1 && signedState !== 'signed'"
-                class="col-4 d-xl-none text-center turnSignature p-0"
-            >
-                <button
-                    :disabled="isFirstSignatureZone()"
-                    class="btn btn-light btn-sm"
-                    @click="turnSignature(-1)"
-                >
-                    {{ trans(SIGNATURES_LAST_ZONE) }}
-                </button>
-                <span>|</span>
-                <button
-                    :disabled="isLastSignatureZone()"
-                    class="btn btn-light btn-sm"
-                    @click="turnSignature(1)"
-                >
-                    {{ trans(SIGNATURES_NEXT_ZONE) }}
-                </button>
-            </div>
-            <div
-                v-if="signature.zones.length === 1 && signedState !== 'signed'"
-                class="col-4 d-none d-xl-flex p-0 text-center turnSignature"
-            >
-                <button
-                    class="btn btn-light btn-sm"
-                    @click="goToSignatureZoneUnique"
-                >
-                    {{ trans(SIGNATURES_GO_TO_SIGNATURE_UNIQUE) }}
-                </button>
-            </div>
-            <div
-                v-if="signature.zones.length > 1 && signedState !== 'signed'"
-                class="col-4 d-none d-xl-flex p-0 text-center turnSignature"
-            >
-                <button
-                    :disabled="isFirstSignatureZone()"
-                    class="btn btn-light btn-sm"
-                    @click="turnSignature(-1)"
-                >
-                    {{ trans(SIGNATURES_LAST_SIGN_ZONE) }}
-                </button>
-                <span>|</span>
-                <button
-                    :disabled="isLastSignatureZone()"
-                    class="btn btn-light btn-sm"
-                    @click="turnSignature(1)"
-                >
-                    {{ trans(SIGNATURES_NEXT_SIGN_ZONE) }}
-                </button>
-            </div>
-            <div class="col text-end" v-if="signedState !== 'signed'">
-                <button
-                    class="btn btn-misc btn-sm"
-                    :hidden="!userSignatureZone"
-                    @click="undoSign"
-                    v-if="signature.zones.length > 1"
-                >
-                    {{ trans(SIGNATURES_CHOOSE_ANOTHER_SIGNATURE) }}
-                </button>
-                <button
-                    class="btn btn-misc btn-sm"
-                    :hidden="!userSignatureZone"
-                    @click="undoSign"
-                    v-else
-                >
-                    {{ trans(SIGNATURES_CANCEL) }}
-                </button>
-                <button
-                    v-if="userSignatureZone === null"
-                    :class="{
-                        btn: true,
-                        'btn-sm': true,
-                        'btn-create': canvasEvent !== 'add',
-                        'btn-chill-green': canvasEvent === 'add',
-                        active: canvasEvent === 'add',
-                    }"
-                    @click="toggleAddZone()"
-                    :title="trans(SIGNATURES_ADD_SIGN_ZONE)"
-                >
-                    <template v-if="canvasEvent !== 'add'">
-                        {{ trans(SIGNATURES_ADD_ZONE) }}
-                    </template>
-                    <template v-else>
-                        {{ trans(SIGNATURES_CLICK_ON_DOCUMENT) }}
-                        <div
-                            class="spinner-border spinner-border-sm"
-                            role="status"
-                        >
-                            <span class="visually-hidden">Loading...</span>
-                        </div>
-                    </template>
-                </button>
-            </div>
-        </div>
+          </template>
+        </button>
+      </div>
     </div>
-    <div
-        v-if="multiPage"
-        class="col-xs-12 col-md-12 col-lg-9 m-auto my-5 text-center d-flex flex-column"
-        :class="{ onAddZone: canvasEvent === 'add' }"
-    >
-        <canvas v-for="p in pageCount" :key="p" :id="`canvas-${p}`"></canvas>
-    </div>
-    <div
-        v-else
-        class="col-xs-12 col-md-12 col-lg-9 m-auto my-5 text-center"
-        :class="{ onAddZone: canvasEvent === 'add' }"
-    >
-        <canvas class="m-auto" id="canvas"></canvas>
-    </div>
-    <div class="col-xs-12 col-md-12 col-lg-9 m-auto p-4" id="action-buttons">
-        <div class="row">
-            <div class="col d-flex">
-                <a
-                    class="btn btn-cancel"
-                    v-if="signedState !== 'signed'"
-                    :href="getReturnPath()"
-                >
-                    {{ trans(SIGNATURES_CANCEL) }}
-                </a>
-                <a class="btn btn-misc" v-else :href="getReturnPath()">
-                    {{ trans(SIGNATURES_RETURN) }}
-                </a>
-            </div>
-            <div class="col text-end" v-if="signedState !== 'signed'">
-                <button
-                    class="btn btn-action me-2"
-                    :disabled="!userSignatureZone"
-                    @click="sign"
-                >
-                    {{ trans(SIGNATURES_SIGN) }}
-                </button>
-            </div>
-            <div class="col-4" v-else></div>
-        </div>
+  </div>
+  <div
+    v-if="multiPage"
+    class="col-xs-12 col-md-12 col-lg-9 m-auto my-5 text-center d-flex flex-column"
+    :class="{ onAddZone: canvasEvent === 'add' }"
+  >
+    <canvas v-for="p in pageCount" :key="p" :id="`canvas-${p}`"></canvas>
+  </div>
+  <div
+    v-else
+    class="col-xs-12 col-md-12 col-lg-9 m-auto my-5 text-center"
+    :class="{ onAddZone: canvasEvent === 'add' }"
+  >
+    <canvas class="m-auto" id="canvas"></canvas>
+  </div>
+  <div class="col-xs-12 col-md-12 col-lg-9 m-auto p-4" id="action-buttons">
+    <div class="row">
+      <div class="col d-flex">
+        <a
+          class="btn btn-cancel"
+          v-if="signedState !== 'signed'"
+          :href="getReturnPath()"
+        >
+          {{ trans(SIGNATURES_CANCEL) }}
+        </a>
+        <a class="btn btn-misc" v-else :href="getReturnPath()">
+          {{ trans(SIGNATURES_RETURN) }}
+        </a>
+      </div>
+      <div class="col text-end" v-if="signedState !== 'signed'">
+        <button
+          class="btn btn-action me-2"
+          :disabled="!userSignatureZone"
+          @click="sign"
+        >
+          {{ trans(SIGNATURES_SIGN) }}
+        </button>
+      </div>
+      <div class="col-4" v-else></div>
     </div>
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -357,43 +340,43 @@ import { ref, Ref } from "vue";
 import { useToast } from "vue-toast-notification";
 import "vue-toast-notification/dist/theme-sugar.css";
 import {
-    CanvasEvent,
-    CheckSignature,
-    Signature,
-    SignatureZone,
-    SignedState,
-    ZoomLevel,
+  CanvasEvent,
+  CheckSignature,
+  Signature,
+  SignatureZone,
+  SignedState,
+  ZoomLevel,
 } from "../../types";
 import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
 import * as pdfjsLib from "pdfjs-dist";
 import {
-    PDFDocumentProxy,
-    PDFPageProxy,
+  PDFDocumentProxy,
+  PDFPageProxy,
 } from "pdfjs-dist/types/src/display/api";
 
 import {
-    SIGNATURES_YES,
-    SIGNATURES_ARE_YOU_SURE,
-    SIGNATURES_YOU_ARE_GOING_TO_SIGN,
-    SIGNATURES_SIGNATURE_CONFIRMATION,
-    SIGNATURES_SIGN,
-    SIGNATURES_CHOOSE_ANOTHER_SIGNATURE,
-    SIGNATURES_CANCEL,
-    SIGNATURES_LAST_SIGN_ZONE,
-    SIGNATURES_NEXT_SIGN_ZONE,
-    SIGNATURES_ADD_SIGN_ZONE,
-    SIGNATURES_CLICK_ON_DOCUMENT,
-    SIGNATURES_LAST_ZONE,
-    SIGNATURES_NEXT_ZONE,
-    SIGNATURES_ADD_ZONE,
-    SIGNATURES_ANOTHER_ZONE,
-    SIGNATURES_ELECTRONIC_SIGNATURE_IN_PROGRESS,
-    SIGNATURES_LOADING,
-    SIGNATURES_RETURN,
-    SIGNATURES_SEE_ALL_PAGES,
-    SIGNATURES_ALL_PAGES,
-    SIGNATURES_GO_TO_SIGNATURE_UNIQUE,
-    trans,
+  SIGNATURES_YES,
+  SIGNATURES_ARE_YOU_SURE,
+  SIGNATURES_YOU_ARE_GOING_TO_SIGN,
+  SIGNATURES_SIGNATURE_CONFIRMATION,
+  SIGNATURES_SIGN,
+  SIGNATURES_CHOOSE_ANOTHER_SIGNATURE,
+  SIGNATURES_CANCEL,
+  SIGNATURES_LAST_SIGN_ZONE,
+  SIGNATURES_NEXT_SIGN_ZONE,
+  SIGNATURES_ADD_SIGN_ZONE,
+  SIGNATURES_CLICK_ON_DOCUMENT,
+  SIGNATURES_LAST_ZONE,
+  SIGNATURES_NEXT_ZONE,
+  SIGNATURES_ADD_ZONE,
+  SIGNATURES_ANOTHER_ZONE,
+  SIGNATURES_ELECTRONIC_SIGNATURE_IN_PROGRESS,
+  SIGNATURES_LOADING,
+  SIGNATURES_RETURN,
+  SIGNATURES_SEE_ALL_PAGES,
+  SIGNATURES_ALL_PAGES,
+  SIGNATURES_GO_TO_SIGNATURE_UNIQUE,
+  trans,
 } from "translator";
 import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
 
@@ -420,56 +403,56 @@ const pageCount: Ref<number> = ref(0);
 const zoom: Ref<number> = ref(1);
 let zoomLevel = "";
 const zoomLevels: Ref<ZoomLevel[]> = ref([
-    {
-        id: 0,
-        zoom: 0.75,
-        label: {
-            fr: "75%",
-        },
+  {
+    id: 0,
+    zoom: 0.75,
+    label: {
+      fr: "75%",
     },
-    {
-        id: 1,
-        zoom: zoom.value,
-        label: {
-            fr: "100%",
-        },
+  },
+  {
+    id: 1,
+    zoom: zoom.value,
+    label: {
+      fr: "100%",
     },
-    {
-        id: 2,
-        zoom: 1.25,
-        label: {
-            fr: "125%",
-        },
+  },
+  {
+    id: 2,
+    zoom: 1.25,
+    label: {
+      fr: "125%",
     },
-    {
-        id: 3,
-        zoom: 1.5,
-        label: {
-            fr: "150%",
-        },
+  },
+  {
+    id: 3,
+    zoom: 1.5,
+    label: {
+      fr: "150%",
     },
-    {
-        id: 4,
-        zoom: 2,
-        label: {
-            fr: "200%",
-        },
+  },
+  {
+    id: 4,
+    zoom: 2,
+    label: {
+      fr: "200%",
     },
-    {
-        id: 5,
-        zoom: 3,
-        label: {
-            fr: "300%",
-        },
+  },
+  {
+    id: 5,
+    zoom: 3,
+    label: {
+      fr: "300%",
     },
+  },
 ]);
 let userSignatureZone: Ref<null | SignatureZone> = ref(null);
 let pdf = {} as PDFDocumentProxy;
 
 declare global {
-    interface Window {
-        signature: Signature;
-    }
+  interface Window {
+    signature: Signature;
+  }
 }
 
 const $toast = useToast();
@@ -477,462 +460,451 @@ const $toast = useToast();
 const signature = window.signature;
 
 const isFirstSignatureZone = () =>
-    userSignatureZone.value?.index != null
-        ? userSignatureZone.value.index < 1
-        : false;
+  userSignatureZone.value?.index != null
+    ? userSignatureZone.value.index < 1
+    : false;
 
 const isLastSignatureZone = () =>
-    userSignatureZone.value?.index
-        ? userSignatureZone.value.index >= signature.zones.length - 1
-        : false;
+  userSignatureZone.value?.index
+    ? userSignatureZone.value.index >= signature.zones.length - 1
+    : false;
 
 const setZoomLevel = async (zoomLevel: string) => {
-    zoom.value = Number.parseFloat(zoomLevel);
-    await resetPages();
-    setTimeout(drawAllZones, 200);
+  zoom.value = Number.parseFloat(zoomLevel);
+  await resetPages();
+  setTimeout(drawAllZones, 200);
 };
 
 const mountPdf = async (doc: ArrayBuffer) => {
-    const loadingTask = pdfjsLib.getDocument(doc);
-    pdf = await loadingTask.promise;
-    pageCount.value = pdf.numPages;
-    if (multiPage.value) {
-        await setAllPages();
-    } else {
-        await setPage(1);
-    }
+  const loadingTask = pdfjsLib.getDocument(doc);
+  pdf = await loadingTask.promise;
+  pageCount.value = pdf.numPages;
+  if (multiPage.value) {
+    await setAllPages();
+  } else {
+    await setPage(1);
+  }
 };
 
 const getCanvas = (page: number) =>
-    multiPage.value
-        ? (document.getElementById(`canvas-${page}`) as HTMLCanvasElement)
-        : (document.querySelectorAll("canvas")[0] as HTMLCanvasElement);
+  multiPage.value
+    ? (document.getElementById(`canvas-${page}`) as HTMLCanvasElement)
+    : (document.querySelectorAll("canvas")[0] as HTMLCanvasElement);
 
 const getCanvasId = (canvas: HTMLCanvasElement) => {
-    const number = canvas.id.split("-").pop();
-    return number ? parseInt(number) : 0;
+  const number = canvas.id.split("-").pop();
+  return number ? parseInt(number) : 0;
 };
 
 const getRenderContext = (pdfPage: PDFPageProxy) => {
-    const scale = 1 * zoom.value;
-    const viewport = pdfPage.getViewport({ scale });
-    const canvas = getCanvas(pdfPage.pageNumber);
-    const context = canvas.getContext("2d") as CanvasRenderingContext2D;
-    canvas.height = viewport.height;
-    canvas.width = viewport.width;
+  const scale = 1 * zoom.value;
+  const viewport = pdfPage.getViewport({ scale });
+  const canvas = getCanvas(pdfPage.pageNumber);
+  const context = canvas.getContext("2d") as CanvasRenderingContext2D;
+  canvas.height = viewport.height;
+  canvas.width = viewport.width;
 
-    return {
-        canvasContext: context,
-        viewport: viewport,
-    };
+  return {
+    canvasContext: context,
+    viewport: viewport,
+  };
 };
 
 const setAllPages = async () =>
-    Array.from(Array(pageCount.value).keys()).map((p) => setPage(p + 1));
+  Array.from(Array(pageCount.value).keys()).map((p) => setPage(p + 1));
 
 const setPage = async (page: number) => {
-    const pdfPage = await pdf.getPage(page);
-    const renderContext = getRenderContext(pdfPage);
-    await pdfPage.render(renderContext);
+  const pdfPage = await pdf.getPage(page);
+  const renderContext = getRenderContext(pdfPage);
+  await pdfPage.render(renderContext);
 };
 
 const init = () => downloadAndOpen().then(initPdf);
 
 async function downloadAndOpen(): Promise<Blob> {
-    let raw;
-    try {
-        raw = await download_doc_as_pdf(signature.storedObject);
-    } catch (e) {
-        console.error("error while downloading and decrypting document", e);
-        throw e;
-    }
-    const doc = await raw.arrayBuffer();
-    await mountPdf(doc);
-    return raw;
+  let raw;
+  try {
+    raw = await download_doc_as_pdf(signature.storedObject);
+  } catch (e) {
+    console.error("error while downloading and decrypting document", e);
+    throw e;
+  }
+  const doc = await raw.arrayBuffer();
+  await mountPdf(doc);
+  return raw;
 }
 
 const addCanvasEvents = () => {
-    if (multiPage.value) {
-        Array.from(Array(pageCount.value).keys()).map((p) => {
-            const canvas = getCanvas(p + 1);
-            canvas.addEventListener(
-                "pointerup",
-                (e) => canvasClick(e, canvas),
-                false,
-            );
-        });
-    } else {
-        const canvas = document.querySelectorAll(
-            "canvas",
-        )[0] as HTMLCanvasElement;
-        canvas.addEventListener(
-            "pointerup",
-            (e) => canvasClick(e, canvas),
-            false,
-        );
-    }
+  if (multiPage.value) {
+    Array.from(Array(pageCount.value).keys()).map((p) => {
+      const canvas = getCanvas(p + 1);
+      canvas.addEventListener(
+        "pointerup",
+        (e) => canvasClick(e, canvas),
+        false,
+      );
+    });
+  } else {
+    const canvas = document.querySelectorAll("canvas")[0] as HTMLCanvasElement;
+    canvas.addEventListener("pointerup", (e) => canvasClick(e, canvas), false);
+  }
 };
 
 const initPdf = () => {
-    addCanvasEvents();
-    setTimeout(drawAllZones, 800);
+  addCanvasEvents();
+  setTimeout(drawAllZones, 800);
 };
 
 const resetPages = () =>
-    multiPage.value ? setAllPages() : setPage(page.value);
+  multiPage.value ? setAllPages() : setPage(page.value);
 
 const toggleMultiPage = async () => {
-    await resetPages();
-    setTimeout(drawAllZones, 200);
-    addCanvasEvents();
+  await resetPages();
+  setTimeout(drawAllZones, 200);
+  addCanvasEvents();
 };
 
 const scaleXToCanvas = (x: number, canvasWidth: number, PDFWidth: number) =>
-    Math.round((x * canvasWidth) / PDFWidth);
+  Math.round((x * canvasWidth) / PDFWidth);
 
 const scaleYToCanvas = (h: number, canvasHeight: number, PDFHeight: number) =>
-    Math.round((h * canvasHeight) / PDFHeight);
+  Math.round((h * canvasHeight) / PDFHeight);
 
 const hitSignature = (
-    zone: SignatureZone,
-    xy: number[],
-    canvas: HTMLCanvasElement,
+  zone: SignatureZone,
+  xy: number[],
+  canvas: HTMLCanvasElement,
 ) =>
-    scaleXToCanvas(zone.x, canvas.width, zone.PDFPage.width) < xy[0] &&
-    xy[0] <
-        scaleXToCanvas(zone.x + zone.width, canvas.width, zone.PDFPage.width) &&
-    zone.PDFPage.height * zoom.value -
-        scaleYToCanvas(zone.y, canvas.height, zone.PDFPage.height) <
-        xy[1] &&
-    xy[1] <
-        scaleYToCanvas(
-            zone.height - zone.y,
-            canvas.height,
-            zone.PDFPage.height,
-        ) +
-            zone.PDFPage.height * zoom.value;
+  scaleXToCanvas(zone.x, canvas.width, zone.PDFPage.width) < xy[0] &&
+  xy[0] <
+    scaleXToCanvas(zone.x + zone.width, canvas.width, zone.PDFPage.width) &&
+  zone.PDFPage.height * zoom.value -
+    scaleYToCanvas(zone.y, canvas.height, zone.PDFPage.height) <
+    xy[1] &&
+  xy[1] <
+    scaleYToCanvas(zone.height - zone.y, canvas.height, zone.PDFPage.height) +
+      zone.PDFPage.height * zoom.value;
 
 const selectZone = async (z: SignatureZone, canvas: HTMLCanvasElement) => {
-    userSignatureZone.value = z;
-    const ctx = canvas.getContext("2d");
-    if (ctx) {
-        await resetPages();
-        setTimeout(drawAllZones, 200);
-    }
+  userSignatureZone.value = z;
+  const ctx = canvas.getContext("2d");
+  if (ctx) {
+    await resetPages();
+    setTimeout(drawAllZones, 200);
+  }
 };
 
 const selectZoneEvent = (e: PointerEvent, canvas: HTMLCanvasElement) =>
-    signature.zones
-        .filter(
-            (z) =>
-                (z.PDFPage.index + 1 === getCanvasId(canvas) &&
-                    multiPage.value) ||
-                (z.PDFPage.index + 1 === page.value && !multiPage.value),
-        )
-        .map((z) => {
-            if (hitSignature(z, [e.offsetX, e.offsetY], canvas)) {
-                if (userSignatureZone.value === null) {
-                    selectZone(z, canvas);
-                } else {
-                    if (userSignatureZone.value.index === z.index) {
-                        sign();
-                    }
-                }
-            }
-        });
+  signature.zones
+    .filter(
+      (z) =>
+        (z.PDFPage.index + 1 === getCanvasId(canvas) && multiPage.value) ||
+        (z.PDFPage.index + 1 === page.value && !multiPage.value),
+    )
+    .map((z) => {
+      if (hitSignature(z, [e.offsetX, e.offsetY], canvas)) {
+        if (userSignatureZone.value === null) {
+          selectZone(z, canvas);
+        } else {
+          if (userSignatureZone.value.index === z.index) {
+            sign();
+          }
+        }
+      }
+    });
 
 const canvasClick = (e: PointerEvent, canvas: HTMLCanvasElement) =>
-    canvasEvent.value === "select"
-        ? selectZoneEvent(e, canvas)
-        : addZoneEvent(e, canvas);
+  canvasEvent.value === "select"
+    ? selectZoneEvent(e, canvas)
+    : addZoneEvent(e, canvas);
 
 const turnPage = async (upOrDown: number) => {
-    page.value = page.value + upOrDown;
-    if (multiPage.value) {
-        const canvas = getCanvas(page.value);
-        canvas.scrollIntoView();
-    } else {
-        await setPage(page.value);
-        setTimeout(drawAllZones, 200);
-    }
+  page.value = page.value + upOrDown;
+  if (multiPage.value) {
+    const canvas = getCanvas(page.value);
+    canvas.scrollIntoView();
+  } else {
+    await setPage(page.value);
+    setTimeout(drawAllZones, 200);
+  }
 };
 
 const selectZoneInCanvas = (signatureZone: SignatureZone) => {
-    page.value = signatureZone.PDFPage.index + 1;
-    const canvas = getCanvas(signatureZone.PDFPage.index + 1);
-    selectZone(signatureZone, canvas);
-    canvas.scrollIntoView();
+  page.value = signatureZone.PDFPage.index + 1;
+  const canvas = getCanvas(signatureZone.PDFPage.index + 1);
+  selectZone(signatureZone, canvas);
+  canvas.scrollIntoView();
 };
 
 const goToSignatureZoneUnique = () => selectZoneInCanvas(signature.zones[0]);
 
 const turnSignature = async (upOrDown: number) => {
-    let zoneIndex = userSignatureZone.value?.index ?? -1;
-    if (zoneIndex < -1) {
-        zoneIndex = -1;
-    }
-    if (zoneIndex < signature.zones.length) {
-        zoneIndex = zoneIndex + upOrDown;
-    } else {
-        zoneIndex = 0;
-    }
-    let currentZone = signature.zones[zoneIndex];
-    if (currentZone) {
-        selectZoneInCanvas(currentZone);
-    }
+  let zoneIndex = userSignatureZone.value?.index ?? -1;
+  if (zoneIndex < -1) {
+    zoneIndex = -1;
+  }
+  if (zoneIndex < signature.zones.length) {
+    zoneIndex = zoneIndex + upOrDown;
+  } else {
+    zoneIndex = 0;
+  }
+  let currentZone = signature.zones[zoneIndex];
+  if (currentZone) {
+    selectZoneInCanvas(currentZone);
+  }
 };
 
 const drawZone = (
-    zone: SignatureZone,
-    ctx: CanvasRenderingContext2D,
-    canvasWidth: number,
-    canvasHeight: number,
+  zone: SignatureZone,
+  ctx: CanvasRenderingContext2D,
+  canvasWidth: number,
+  canvasHeight: number,
 ) => {
-    const unselectedBlue = "#007bff";
-    const selectedBlue = "#034286";
-    ctx.strokeStyle =
-        userSignatureZone.value?.index === zone.index
-            ? selectedBlue
-            : unselectedBlue;
-    ctx.lineWidth = 2;
-    ctx.lineJoin = "bevel";
-    ctx.strokeRect(
-        scaleXToCanvas(zone.x, canvasWidth, zone.PDFPage.width),
-        zone.PDFPage.height * zoom.value -
-            scaleYToCanvas(zone.y, canvasHeight, zone.PDFPage.height),
-        scaleXToCanvas(zone.width, canvasWidth, zone.PDFPage.width),
-        scaleYToCanvas(zone.height, canvasHeight, zone.PDFPage.height),
-    );
-    ctx.font = `bold ${16 * zoom.value}px serif`;
-    ctx.textAlign = "center";
-    ctx.fillStyle = "black";
-    const xText =
-        scaleXToCanvas(zone.x, canvasWidth, zone.PDFPage.width) +
-        scaleXToCanvas(zone.width, canvasWidth, zone.PDFPage.width) / 2;
-    const yText =
-        zone.PDFPage.height * zoom.value -
-        scaleYToCanvas(zone.y, canvasHeight, zone.PDFPage.height) +
-        scaleYToCanvas(zone.height, canvasHeight, zone.PDFPage.height) / 2;
-    if (userSignatureZone.value?.index === zone.index) {
-        ctx.fillStyle = selectedBlue;
-        ctx.fillText("Signer ici", xText, yText);
-    } else {
-        ctx.fillStyle = unselectedBlue;
-        ctx.fillText("Choisir cette", xText, yText - 12 * zoom.value);
-        ctx.fillText("zone de signature", xText, yText + 12 * zoom.value);
-    }
+  const unselectedBlue = "#007bff";
+  const selectedBlue = "#034286";
+  ctx.strokeStyle =
+    userSignatureZone.value?.index === zone.index
+      ? selectedBlue
+      : unselectedBlue;
+  ctx.lineWidth = 2;
+  ctx.lineJoin = "bevel";
+  ctx.strokeRect(
+    scaleXToCanvas(zone.x, canvasWidth, zone.PDFPage.width),
+    zone.PDFPage.height * zoom.value -
+      scaleYToCanvas(zone.y, canvasHeight, zone.PDFPage.height),
+    scaleXToCanvas(zone.width, canvasWidth, zone.PDFPage.width),
+    scaleYToCanvas(zone.height, canvasHeight, zone.PDFPage.height),
+  );
+  ctx.font = `bold ${16 * zoom.value}px serif`;
+  ctx.textAlign = "center";
+  ctx.fillStyle = "black";
+  const xText =
+    scaleXToCanvas(zone.x, canvasWidth, zone.PDFPage.width) +
+    scaleXToCanvas(zone.width, canvasWidth, zone.PDFPage.width) / 2;
+  const yText =
+    zone.PDFPage.height * zoom.value -
+    scaleYToCanvas(zone.y, canvasHeight, zone.PDFPage.height) +
+    scaleYToCanvas(zone.height, canvasHeight, zone.PDFPage.height) / 2;
+  if (userSignatureZone.value?.index === zone.index) {
+    ctx.fillStyle = selectedBlue;
+    ctx.fillText("Signer ici", xText, yText);
+  } else {
+    ctx.fillStyle = unselectedBlue;
+    ctx.fillText("Choisir cette", xText, yText - 12 * zoom.value);
+    ctx.fillText("zone de signature", xText, yText + 12 * zoom.value);
+  }
 };
 
 const drawAllZones = () => {
-    if (signedState.value !== "signed") {
-        signature.zones
-            .filter(
-                (z) =>
-                    multiPage.value ||
-                    (z.PDFPage.index + 1 === page.value && !multiPage.value),
-            )
-            .map((z) => {
-                const canvas = getCanvas(z.PDFPage.index + 1);
-                const ctx = canvas.getContext("2d");
-                if (ctx) {
-                    if (userSignatureZone.value) {
-                        if (userSignatureZone.value?.index === z.index) {
-                            drawZone(z, ctx, canvas.width, canvas.height);
-                        }
-                    } else {
-                        drawZone(z, ctx, canvas.width, canvas.height);
-                    }
-                }
-            });
-    }
+  if (signedState.value !== "signed") {
+    signature.zones
+      .filter(
+        (z) =>
+          multiPage.value ||
+          (z.PDFPage.index + 1 === page.value && !multiPage.value),
+      )
+      .map((z) => {
+        const canvas = getCanvas(z.PDFPage.index + 1);
+        const ctx = canvas.getContext("2d");
+        if (ctx) {
+          if (userSignatureZone.value) {
+            if (userSignatureZone.value?.index === z.index) {
+              drawZone(z, ctx, canvas.width, canvas.height);
+            }
+          } else {
+            drawZone(z, ctx, canvas.width, canvas.height);
+          }
+        }
+      });
+  }
 };
 
 const checkSignature = () => {
-    const url = `/api/1.0/document/workflow/${signature.id}/check-signature`;
-    return makeFetch<null, CheckSignature>("GET", url)
-        .then((r) => {
-            signedState.value = r.state;
-            signature.storedObject = r.storedObject;
-            checkForReady();
-        })
-        .catch((error) => {
-            signedState.value = "error";
-            console.log("Error while checking the signature", error);
-            $toast.error(
-                `Erreur lors de la vérification de la signature: ${error.txt}`,
-            );
-        });
+  const url = `/api/1.0/document/workflow/${signature.id}/check-signature`;
+  return makeFetch<null, CheckSignature>("GET", url)
+    .then((r) => {
+      signedState.value = r.state;
+      signature.storedObject = r.storedObject;
+      checkForReady();
+    })
+    .catch((error) => {
+      signedState.value = "error";
+      console.log("Error while checking the signature", error);
+      $toast.error(
+        `Erreur lors de la vérification de la signature: ${error.txt}`,
+      );
+    });
 };
 
 const maxTryForReady = 60; //2 minutes for trying to sign
 let tryForReady = 0;
 
 const stopTrySigning = () => {
-    loading.value = false;
-    modalOpen.value = false;
+  loading.value = false;
+  modalOpen.value = false;
 };
 
 const checkForReady = () => {
-    if (tryForReady > maxTryForReady) {
-        stopTrySigning();
-        tryForReady = 0;
-        console.log("Reached the maximum number of tentative to try signing");
-        $toast.error(
-            "Le nombre maximum de tentatives pour essayer de signer est atteint",
-        );
-    }
-    if (signedState.value === "rejected") {
-        stopTrySigning();
-        console.log("Signature rejected by the server");
-        $toast.error("Signature rejetée par le serveur");
-    }
-    if (signedState.value === "canceled") {
-        stopTrySigning();
-        console.log("Signature canceled");
-        $toast.error("Signature annulée");
-    }
-    if (signedState.value === "pending") {
-        tryForReady = tryForReady + 1;
-        setTimeout(() => checkSignature(), 2000);
-    } else {
-        stopTrySigning();
-        if (signedState.value === "signed") {
-            userSignatureZone.value = null;
-            downloadAndOpen();
-        }
+  if (tryForReady > maxTryForReady) {
+    stopTrySigning();
+    tryForReady = 0;
+    console.log("Reached the maximum number of tentative to try signing");
+    $toast.error(
+      "Le nombre maximum de tentatives pour essayer de signer est atteint",
+    );
+  }
+  if (signedState.value === "rejected") {
+    stopTrySigning();
+    console.log("Signature rejected by the server");
+    $toast.error("Signature rejetée par le serveur");
+  }
+  if (signedState.value === "canceled") {
+    stopTrySigning();
+    console.log("Signature canceled");
+    $toast.error("Signature annulée");
+  }
+  if (signedState.value === "pending") {
+    tryForReady = tryForReady + 1;
+    setTimeout(() => checkSignature(), 2000);
+  } else {
+    stopTrySigning();
+    if (signedState.value === "signed") {
+      userSignatureZone.value = null;
+      downloadAndOpen();
     }
+  }
 };
 
 const sign = () => (modalOpen.value = true);
 
 const confirmSign = () => {
-    loading.value = true;
-    const url = `/api/1.0/document/workflow/${signature.id}/signature-request`;
-    const body = {
-        storedObject: signature.storedObject,
-        zone: userSignatureZone.value,
-    };
-    makeFetch("POST", url, body)
-        .then(() => {
-            checkForReady();
-        })
-        .catch((error) => {
-            console.log("Error while posting the signature", error);
-            stopTrySigning();
-            $toast.error(
-                `Erreur lors de la soumission de la signature: ${error.txt}`,
-            );
-        });
+  loading.value = true;
+  const url = `/api/1.0/document/workflow/${signature.id}/signature-request`;
+  const body = {
+    storedObject: signature.storedObject,
+    zone: userSignatureZone.value,
+  };
+  makeFetch("POST", url, body)
+    .then(() => {
+      checkForReady();
+    })
+    .catch((error) => {
+      console.log("Error while posting the signature", error);
+      stopTrySigning();
+      $toast.error(
+        `Erreur lors de la soumission de la signature: ${error.txt}`,
+      );
+    });
 };
 
 const undoSign = async () => {
-    signature.zones = signature.zones.filter((z) => z.index !== null);
-    await resetPages();
-    setTimeout(drawAllZones, 200);
-    userSignatureZone.value = null;
-    adding.value = false;
-    canvasEvent.value = "select";
+  signature.zones = signature.zones.filter((z) => z.index !== null);
+  await resetPages();
+  setTimeout(drawAllZones, 200);
+  userSignatureZone.value = null;
+  adding.value = false;
+  canvasEvent.value = "select";
 };
 
 const toggleAddZone = () => {
-    canvasEvent.value = canvasEvent.value === "select" ? "add" : "select";
+  canvasEvent.value = canvasEvent.value === "select" ? "add" : "select";
 };
 
 const addZoneEvent = async (e: PointerEvent, canvas: HTMLCanvasElement) => {
-    const BOX_WIDTH = 180;
-    const BOX_HEIGHT = 90;
-    const PDFPageHeight = canvas.height;
-    const PDFPageWidth = canvas.width;
+  const BOX_WIDTH = 180;
+  const BOX_HEIGHT = 90;
+  const PDFPageHeight = canvas.height;
+  const PDFPageWidth = canvas.width;
 
-    const x = e.offsetX;
-    const y = e.offsetY;
-    const newZone: SignatureZone = {
-        index: null,
-        x:
-            scaleXToCanvas(x, canvas.width, PDFPageWidth) -
-            scaleXToCanvas(BOX_WIDTH / 2, canvas.width, PDFPageWidth),
-        y:
-            PDFPageHeight * zoom.value -
-            scaleYToCanvas(y, canvas.height, PDFPageHeight) +
-            scaleYToCanvas(BOX_HEIGHT / 2, canvas.height, PDFPageHeight),
-        width: BOX_WIDTH * zoom.value,
-        height: BOX_HEIGHT * zoom.value,
-        PDFPage: {
-            index: multiPage.value ? getCanvasId(canvas) - 1 : page.value - 1,
-            width: PDFPageWidth,
-            height: PDFPageHeight,
-        },
-    };
-    signature.zones.push(newZone);
-    userSignatureZone.value = newZone;
+  const x = e.offsetX;
+  const y = e.offsetY;
+  const newZone: SignatureZone = {
+    index: null,
+    x:
+      scaleXToCanvas(x, canvas.width, PDFPageWidth) -
+      scaleXToCanvas(BOX_WIDTH / 2, canvas.width, PDFPageWidth),
+    y:
+      PDFPageHeight * zoom.value -
+      scaleYToCanvas(y, canvas.height, PDFPageHeight) +
+      scaleYToCanvas(BOX_HEIGHT / 2, canvas.height, PDFPageHeight),
+    width: BOX_WIDTH * zoom.value,
+    height: BOX_HEIGHT * zoom.value,
+    PDFPage: {
+      index: multiPage.value ? getCanvasId(canvas) - 1 : page.value - 1,
+      width: PDFPageWidth,
+      height: PDFPageHeight,
+    },
+  };
+  signature.zones.push(newZone);
+  userSignatureZone.value = newZone;
 
-    await resetPages();
-    setTimeout(drawAllZones, 200);
-    canvasEvent.value = "select";
-    adding.value = true;
+  await resetPages();
+  setTimeout(drawAllZones, 200);
+  canvasEvent.value = "select";
+  adding.value = true;
 };
 
 const getReturnPath = () =>
-    window.location.search
-        ? (window.location.search.split("?returnPath=")[1] ??
-          window.location.pathname)
-        : window.location.pathname;
+  window.location.search
+    ? (window.location.search.split("?returnPath=")[1] ??
+      window.location.pathname)
+    : window.location.pathname;
 
 init();
 </script>
 
 <style scoped lang="scss">
 canvas {
-    box-shadow: 0 20px 20px rgba(0, 0, 0, 0.2);
-    margin: 1rem auto;
+  box-shadow: 0 20px 20px rgba(0, 0, 0, 0.2);
+  margin: 1rem auto;
 }
 
 .onAddZone {
-    cursor: not-allowed;
+  cursor: not-allowed;
 
-    canvas {
-        cursor: copy;
-    }
+  canvas {
+    cursor: copy;
+  }
 }
 
 div#action-buttons {
-    position: sticky;
-    bottom: 0px;
-    background-color: white;
-    z-index: 100;
+  position: sticky;
+  bottom: 0px;
+  background-color: white;
+  z-index: 100;
 }
 div.pdf-tools {
-    background-color: #f3f3f3;
-    font-size: 0.6rem;
-    label {
-        font-size: 0.75rem !important;
-        margin: auto 0 auto 0.3rem;
-    }
-    button {
-        font-size: 0.75rem !important;
-    }
-    div.turnSignature {
-        span {
-            font-size: 1rem;
-        }
-    }
-    @media (min-width: 1400px) {
-        // background: none;
-        // border: none !important;
+  background-color: #f3f3f3;
+  font-size: 0.6rem;
+  label {
+    font-size: 0.75rem !important;
+    margin: auto 0 auto 0.3rem;
+  }
+  button {
+    font-size: 0.75rem !important;
+  }
+  div.turnSignature {
+    span {
+      font-size: 1rem;
     }
+  }
+  @media (min-width: 1400px) {
+    // background: none;
+    // border: none !important;
+  }
 }
 div.turn-page {
-    display: flex;
-    span {
-        font-size: 0.75rem;
-        margin: auto 0.4rem;
-    }
-    select {
-        width: 5rem;
-        font-size: 0.75rem;
-    }
+  display: flex;
+  span {
+    font-size: 0.75rem;
+    margin: auto 0.4rem;
+  }
+  select {
+    width: 5rem;
+    font-size: 0.75rem;
+  }
 }
 div.signature-modal-body {
-    height: 8rem;
+  height: 8rem;
 }
 </style>
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/index.ts b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/index.ts
index a46257b5e..e3ace5b40 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/index.ts
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/index.ts
@@ -4,36 +4,36 @@ import { _createI18n } from "ChillMainAssets/vuejs/_js/i18n";
 import App from "./App.vue";
 
 const appMessages = {
-    fr: {
-        yes: "Oui",
-        are_you_sure: "Êtes-vous sûr·e?",
-        you_are_going_to_sign: "Vous allez signer le document",
-        signature_confirmation: "Confirmation de la signature",
-        sign: "Signer",
-        choose_another_signature: "Choisir une autre zone",
-        cancel: "Annuler",
-        last_sign_zone: "Zone de signature précédente",
-        next_sign_zone: "Zone de signature suivante",
-        add_sign_zone: "Ajouter une zone de signature",
-        click_on_document: "Cliquer sur le document",
-        last_zone: "Zone précédente",
-        next_zone: "Zone suivante",
-        add_zone: "Ajouter une zone",
-        another_zone: "Autre zone",
-        electronic_signature_in_progress: "Signature électronique en cours...",
-        loading: "Chargement...",
-        remove_sign_zone: "Enlever la zone",
-        return: "Retour",
-        see_all_pages: "Voir toutes les pages",
-        all_pages: "Toutes les pages",
-    },
+  fr: {
+    yes: "Oui",
+    are_you_sure: "Êtes-vous sûr·e?",
+    you_are_going_to_sign: "Vous allez signer le document",
+    signature_confirmation: "Confirmation de la signature",
+    sign: "Signer",
+    choose_another_signature: "Choisir une autre zone",
+    cancel: "Annuler",
+    last_sign_zone: "Zone de signature précédente",
+    next_sign_zone: "Zone de signature suivante",
+    add_sign_zone: "Ajouter une zone de signature",
+    click_on_document: "Cliquer sur le document",
+    last_zone: "Zone précédente",
+    next_zone: "Zone suivante",
+    add_zone: "Ajouter une zone",
+    another_zone: "Autre zone",
+    electronic_signature_in_progress: "Signature électronique en cours...",
+    loading: "Chargement...",
+    remove_sign_zone: "Enlever la zone",
+    return: "Retour",
+    see_all_pages: "Voir toutes les pages",
+    all_pages: "Toutes les pages",
+  },
 };
 
 const i18n = _createI18n(appMessages);
 
 const app = createApp({
-    template: `<app></app>`,
+  template: `<app></app>`,
 })
-    .use(i18n)
-    .component("app", App)
-    .mount("#document-signature");
+  .use(i18n)
+  .component("app", App)
+  .mount("#document-signature");
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DropFileWidget/DropFile.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DropFileWidget/DropFile.vue
index 017629ee4..c731ef19f 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DropFileWidget/DropFile.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DropFileWidget/DropFile.vue
@@ -1,208 +1,206 @@
 <script setup lang="ts">
 import { StoredObject, StoredObjectVersionCreated } from "../../types";
 import {
-    encryptFile,
-    fetchNewStoredObject,
-    uploadVersion,
+  encryptFile,
+  fetchNewStoredObject,
+  uploadVersion,
 } from "../../js/async-upload/uploader";
 import { computed, ref, Ref } from "vue";
 import FileIcon from "ChillDocStoreAssets/vuejs/FileIcon.vue";
 
 interface DropFileConfig {
-    existingDoc?: StoredObject;
+  existingDoc?: StoredObject;
 }
 
 const props = withDefaults(defineProps<DropFileConfig>(), {
-    existingDoc: null,
+  existingDoc: null,
 });
 
 const emit =
-    defineEmits<
-        (
-            e: "addDocument",
-            {
-                stored_object_version: StoredObjectVersionCreated,
-                stored_object: StoredObject,
-                file_name: string,
-            },
-        ) => void
-    >();
+  defineEmits<
+    (
+      e: "addDocument",
+      {
+        stored_object_version: StoredObjectVersionCreated,
+        stored_object: StoredObject,
+        file_name: string,
+      },
+    ) => void
+  >();
 
 const is_dragging: Ref<boolean> = ref(false);
 const uploading: Ref<boolean> = ref(false);
 const display_filename: Ref<string | null> = ref(null);
 
 const has_existing_doc = computed<boolean>(() => {
-    return props.existingDoc !== undefined && props.existingDoc !== null;
+  return props.existingDoc !== undefined && props.existingDoc !== null;
 });
 
 const onDragOver = (e: Event) => {
-    e.preventDefault();
+  e.preventDefault();
 
-    is_dragging.value = true;
+  is_dragging.value = true;
 };
 
 const onDragLeave = (e: Event) => {
-    e.preventDefault();
+  e.preventDefault();
 
-    is_dragging.value = false;
+  is_dragging.value = false;
 };
 
 const onDrop = (e: DragEvent) => {
-    e.preventDefault();
+  e.preventDefault();
 
-    const files = e.dataTransfer?.files;
+  const files = e.dataTransfer?.files;
 
-    if (null === files || undefined === files) {
-        console.error("no files transferred", e.dataTransfer);
-        return;
-    }
-    if (files.length === 0) {
-        console.error("no files given");
-        return;
-    }
+  if (null === files || undefined === files) {
+    console.error("no files transferred", e.dataTransfer);
+    return;
+  }
+  if (files.length === 0) {
+    console.error("no files given");
+    return;
+  }
 
-    handleFile(files[0]);
+  handleFile(files[0]);
 };
 
 const onZoneClick = (e: Event) => {
-    e.stopPropagation();
-    e.preventDefault();
+  e.stopPropagation();
+  e.preventDefault();
 
-    const input = document.createElement("input");
-    input.type = "file";
-    input.addEventListener("change", onFileChange);
+  const input = document.createElement("input");
+  input.type = "file";
+  input.addEventListener("change", onFileChange);
 
-    input.click();
+  input.click();
 };
 
 const onFileChange = async (event: Event): Promise<void> => {
-    const input = event.target as HTMLInputElement;
+  const input = event.target as HTMLInputElement;
 
-    if (input.files && input.files[0]) {
-        console.log("file added", input.files[0]);
-        const file = input.files[0];
-        await handleFile(file);
+  if (input.files && input.files[0]) {
+    console.log("file added", input.files[0]);
+    const file = input.files[0];
+    await handleFile(file);
 
-        return Promise.resolve();
-    }
+    return Promise.resolve();
+  }
 
-    throw "No file given";
+  throw "No file given";
 };
 
 const handleFile = async (file: File): Promise<void> => {
-    uploading.value = true;
-    display_filename.value = file.name;
-    const type = file.type;
+  uploading.value = true;
+  display_filename.value = file.name;
+  const type = file.type;
 
-    // create a stored_object if not exists
-    let stored_object;
-    if (null === props.existingDoc) {
-        stored_object = await fetchNewStoredObject();
-    } else {
-        stored_object = props.existingDoc;
-    }
+  // create a stored_object if not exists
+  let stored_object;
+  if (null === props.existingDoc) {
+    stored_object = await fetchNewStoredObject();
+  } else {
+    stored_object = props.existingDoc;
+  }
 
-    const buffer = await file.arrayBuffer();
-    const [encrypted, iv, jsonWebKey] = await encryptFile(buffer);
-    const filename = await uploadVersion(encrypted, stored_object);
+  const buffer = await file.arrayBuffer();
+  const [encrypted, iv, jsonWebKey] = await encryptFile(buffer);
+  const filename = await uploadVersion(encrypted, stored_object);
 
-    const stored_object_version: StoredObjectVersionCreated = {
-        filename: filename,
-        iv: Array.from(iv),
-        keyInfos: jsonWebKey,
-        type: type,
-        persisted: false,
-    };
+  const stored_object_version: StoredObjectVersionCreated = {
+    filename: filename,
+    iv: Array.from(iv),
+    keyInfos: jsonWebKey,
+    type: type,
+    persisted: false,
+  };
 
-    const fileName = file.name;
-    let file_name = "Nouveau document";
-    const file_name_split = fileName.split(".");
-    if (file_name_split.length > 1) {
-        const extension = file_name_split
-            ? file_name_split[file_name_split.length - 1]
-            : "";
-        file_name = fileName.replace(extension, "").slice(0, -1);
-    }
+  const fileName = file.name;
+  let file_name = "Nouveau document";
+  const file_name_split = fileName.split(".");
+  if (file_name_split.length > 1) {
+    const extension = file_name_split
+      ? file_name_split[file_name_split.length - 1]
+      : "";
+    file_name = fileName.replace(extension, "").slice(0, -1);
+  }
 
-    emit("addDocument", {
-        stored_object,
-        stored_object_version,
-        file_name: file_name,
-    });
-    uploading.value = false;
+  emit("addDocument", {
+    stored_object,
+    stored_object_version,
+    file_name: file_name,
+  });
+  uploading.value = false;
 };
 </script>
 
 <template>
-    <div class="drop-file">
-        <div
-            v-if="!uploading"
-            :class="{ area: true, dragging: is_dragging }"
-            @click="onZoneClick"
-            @dragover="onDragOver"
-            @dragleave="onDragLeave"
-            @drop="onDrop"
-        >
-            <p v-if="has_existing_doc" class="file-icon">
-                <file-icon :type="props.existingDoc?.type"></file-icon>
-            </p>
+  <div class="drop-file">
+    <div
+      v-if="!uploading"
+      :class="{ area: true, dragging: is_dragging }"
+      @click="onZoneClick"
+      @dragover="onDragOver"
+      @dragleave="onDragLeave"
+      @drop="onDrop"
+    >
+      <p v-if="has_existing_doc" class="file-icon">
+        <file-icon :type="props.existingDoc?.type"></file-icon>
+      </p>
 
-            <p v-if="display_filename !== null" class="display-filename">
-                {{ display_filename }}
-            </p>
-            <!-- todo i18n -->
-            <p v-if="has_existing_doc">
-                Déposez un document ou cliquez ici pour remplacer le document
-                existant
-            </p>
-            <p v-else>
-                Déposez un document ou cliquez ici pour ouvrir le navigateur de
-                fichier
-            </p>
-        </div>
-        <div v-else class="waiting">
-            <i class="fa fa-cog fa-spin fa-3x fa-fw"></i>
-            <span class="sr-only">Loading...</span>
-        </div>
+      <p v-if="display_filename !== null" class="display-filename">
+        {{ display_filename }}
+      </p>
+      <!-- todo i18n -->
+      <p v-if="has_existing_doc">
+        Déposez un document ou cliquez ici pour remplacer le document existant
+      </p>
+      <p v-else>
+        Déposez un document ou cliquez ici pour ouvrir le navigateur de fichier
+      </p>
     </div>
+    <div v-else class="waiting">
+      <i class="fa fa-cog fa-spin fa-3x fa-fw"></i>
+      <span class="sr-only">Loading...</span>
+    </div>
+  </div>
 </template>
 
 <style scoped lang="scss">
 .drop-file {
+  width: 100%;
+
+  .file-icon {
+    font-size: xx-large;
+  }
+
+  .display-filename {
+    font-variant: small-caps;
+    font-weight: 200;
+  }
+
+  & > .area,
+  & > .waiting {
     width: 100%;
+    height: 10rem;
 
-    .file-icon {
-        font-size: xx-large;
+    display: flex;
+    flex-direction: column;
+    justify-content: center;
+    align-items: center;
+
+    p {
+      // require for display in DropFileModal
+      text-align: center;
     }
+  }
 
-    .display-filename {
-        font-variant: small-caps;
-        font-weight: 200;
-    }
-
-    & > .area,
-    & > .waiting {
-        width: 100%;
-        height: 10rem;
-
-        display: flex;
-        flex-direction: column;
-        justify-content: center;
-        align-items: center;
-
-        p {
-            // require for display in DropFileModal
-            text-align: center;
-        }
-    }
-
-    & > .area {
-        border: 4px dashed #ccc;
-
-        &.dragging {
-            border: 4px dashed blue;
-        }
+  & > .area {
+    border: 4px dashed #ccc;
+
+    &.dragging {
+      border: 4px dashed blue;
     }
+  }
 }
 </style>
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DropFileWidget/DropFileModal.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DropFileWidget/DropFileModal.vue
index 956b3e859..bde094487 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DropFileWidget/DropFileModal.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DropFileWidget/DropFileModal.vue
@@ -6,24 +6,24 @@ import { computed, reactive } from "vue";
 import { useToast } from "vue-toast-notification";
 
 interface DropFileConfig {
-    allowRemove: boolean;
-    existingDoc?: StoredObject;
+  allowRemove: boolean;
+  existingDoc?: StoredObject;
 }
 
 const props = withDefaults(defineProps<DropFileConfig>(), {
-    allowRemove: false,
+  allowRemove: false,
 });
 
 const emit = defineEmits<{
-    (
-        e: "addDocument",
-        {
-            stored_object: StoredObject,
-            stored_object_version: StoredObjectVersion,
-            file_name: string,
-        },
-    ): void;
-    (e: "removeDocument"): void;
+  (
+    e: "addDocument",
+    {
+      stored_object: StoredObject,
+      stored_object_version: StoredObjectVersion,
+      file_name: string,
+    },
+  ): void;
+  (e: "removeDocument"): void;
 }>();
 
 const $toast = useToast();
@@ -33,67 +33,67 @@ const state = reactive({ showModal: false });
 const modalClasses = { "modal-dialog-centered": true, "modal-md": true };
 
 const buttonState = computed<"add" | "replace">(() => {
-    if (props.existingDoc === undefined || props.existingDoc === null) {
-        return "add";
-    }
+  if (props.existingDoc === undefined || props.existingDoc === null) {
+    return "add";
+  }
 
-    return "replace";
+  return "replace";
 });
 
 function onAddDocument({
-    stored_object,
-    stored_object_version,
-    file_name,
+  stored_object,
+  stored_object_version,
+  file_name,
 }: {
-    stored_object: StoredObject;
-    stored_object_version: StoredObjectVersion;
-    file_name: string;
+  stored_object: StoredObject;
+  stored_object_version: StoredObjectVersion;
+  file_name: string;
 }): void {
-    const message =
-        buttonState.value === "add" ? "Document ajouté" : "Document remplacé";
-    $toast.success(message);
-    emit("addDocument", { stored_object_version, stored_object, file_name });
-    state.showModal = false;
+  const message =
+    buttonState.value === "add" ? "Document ajouté" : "Document remplacé";
+  $toast.success(message);
+  emit("addDocument", { stored_object_version, stored_object, file_name });
+  state.showModal = false;
 }
 
 function onRemoveDocument(): void {
-    emit("removeDocument");
+  emit("removeDocument");
 }
 
 function openModal(): void {
-    state.showModal = true;
+  state.showModal = true;
 }
 
 function closeModal(): void {
-    state.showModal = false;
+  state.showModal = false;
 }
 </script>
 
 <template>
-    <button
-        v-if="buttonState === 'add'"
-        @click="openModal"
-        class="btn btn-create"
-    >
-        Ajouter un document
-    </button>
-    <button v-else @click="openModal" class="btn btn-edit">
-        Remplacer le document
-    </button>
-    <modal
-        v-if="state.showModal"
-        :modal-dialog-class="modalClasses"
-        @close="closeModal"
-    >
-        <template v-slot:body>
-            <drop-file-widget
-                :existing-doc="existingDoc"
-                :allow-remove="allowRemove"
-                @add-document="onAddDocument"
-                @remove-document="onRemoveDocument"
-            ></drop-file-widget>
-        </template>
-    </modal>
+  <button
+    v-if="buttonState === 'add'"
+    @click="openModal"
+    class="btn btn-create"
+  >
+    Ajouter un document
+  </button>
+  <button v-else @click="openModal" class="btn btn-edit">
+    Remplacer le document
+  </button>
+  <modal
+    v-if="state.showModal"
+    :modal-dialog-class="modalClasses"
+    @close="closeModal"
+  >
+    <template v-slot:body>
+      <drop-file-widget
+        :existing-doc="existingDoc"
+        :allow-remove="allowRemove"
+        @add-document="onAddDocument"
+        @remove-document="onRemoveDocument"
+      ></drop-file-widget>
+    </template>
+  </modal>
 </template>
 
 <style scoped lang="scss"></style>
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DropFileWidget/DropFileWidget.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DropFileWidget/DropFileWidget.vue
index 54f8ddf0c..8ead08b45 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DropFileWidget/DropFileWidget.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DropFileWidget/DropFileWidget.vue
@@ -5,97 +5,97 @@ import DropFile from "ChillDocStoreAssets/vuejs/DropFileWidget/DropFile.vue";
 import DocumentActionButtonsGroup from "ChillDocStoreAssets/vuejs/DocumentActionButtonsGroup.vue";
 
 interface DropFileConfig {
-    allowRemove: boolean;
-    existingDoc?: StoredObject;
+  allowRemove: boolean;
+  existingDoc?: StoredObject;
 }
 
 const props = withDefaults(defineProps<DropFileConfig>(), {
-    allowRemove: false,
+  allowRemove: false,
 });
 
 const emit = defineEmits<{
-    (
-        e: "addDocument",
-        {
-            stored_object: StoredObject,
-            stored_object_version: StoredObjectVersion,
-            file_name: string,
-        },
-    ): void;
-    (e: "removeDocument"): void;
+  (
+    e: "addDocument",
+    {
+      stored_object: StoredObject,
+      stored_object_version: StoredObjectVersion,
+      file_name: string,
+    },
+  ): void;
+  (e: "removeDocument"): void;
 }>();
 
 const has_existing_doc = computed<boolean>(() => {
-    return props.existingDoc !== undefined && props.existingDoc !== null;
+  return props.existingDoc !== undefined && props.existingDoc !== null;
 });
 
 const dav_link_expiration = computed<number | undefined>(() => {
-    if (props.existingDoc === undefined || props.existingDoc === null) {
-        return undefined;
-    }
-    if (props.existingDoc.status !== "ready") {
-        return undefined;
-    }
+  if (props.existingDoc === undefined || props.existingDoc === null) {
+    return undefined;
+  }
+  if (props.existingDoc.status !== "ready") {
+    return undefined;
+  }
 
-    return props.existingDoc._links?.dav_link?.expiration;
+  return props.existingDoc._links?.dav_link?.expiration;
 });
 
 const dav_link_href = computed<string | undefined>(() => {
-    if (props.existingDoc === undefined || props.existingDoc === null) {
-        return undefined;
-    }
-    if (props.existingDoc.status !== "ready") {
-        return undefined;
-    }
+  if (props.existingDoc === undefined || props.existingDoc === null) {
+    return undefined;
+  }
+  if (props.existingDoc.status !== "ready") {
+    return undefined;
+  }
 
-    return props.existingDoc._links?.dav_link?.href;
+  return props.existingDoc._links?.dav_link?.href;
 });
 
 const onAddDocument = ({
-    stored_object,
-    stored_object_version,
-    file_name,
+  stored_object,
+  stored_object_version,
+  file_name,
 }: {
-    stored_object: StoredObject;
-    stored_object_version: StoredObjectVersion;
-    file_name: string;
+  stored_object: StoredObject;
+  stored_object_version: StoredObjectVersion;
+  file_name: string;
 }): void => {
-    emit("addDocument", { stored_object, stored_object_version, file_name });
+  emit("addDocument", { stored_object, stored_object_version, file_name });
 };
 
 const onRemoveDocument = (e: Event): void => {
-    e.stopPropagation();
-    e.preventDefault();
-    emit("removeDocument");
+  e.stopPropagation();
+  e.preventDefault();
+  emit("removeDocument");
 };
 </script>
 
 <template>
-    <div>
-        <drop-file
-            :existingDoc="props.existingDoc"
-            @addDocument="onAddDocument"
-        ></drop-file>
+  <div>
+    <drop-file
+      :existingDoc="props.existingDoc"
+      @addDocument="onAddDocument"
+    ></drop-file>
 
-        <ul class="record_actions">
-            <li v-if="has_existing_doc">
-                <document-action-buttons-group
-                    :stored-object="props.existingDoc"
-                    :can-edit="props.existingDoc?.status === 'ready'"
-                    :can-download="true"
-                    :dav-link="dav_link_href"
-                    :dav-link-expiration="dav_link_expiration"
-                />
-            </li>
-            <li>
-                <button
-                    v-if="allowRemove"
-                    class="btn btn-delete"
-                    @click="onRemoveDocument($event)"
-                ></button>
-            </li>
-        </ul>
-    </div>
+    <ul class="record_actions">
+      <li v-if="has_existing_doc">
+        <document-action-buttons-group
+          :stored-object="props.existingDoc"
+          :can-edit="props.existingDoc?.status === 'ready'"
+          :can-download="true"
+          :dav-link="dav_link_href"
+          :dav-link-expiration="dav_link_expiration"
+        />
+      </li>
+      <li>
+        <button
+          v-if="allowRemove"
+          class="btn btn-delete"
+          @click="onRemoveDocument($event)"
+        ></button>
+      </li>
+    </ul>
+  </div>
 </template>
 
 <style scoped lang="scss"></style>
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/FileIcon.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/FileIcon.vue
index 5260095fa..ba2c44f6a 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/FileIcon.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/FileIcon.vue
@@ -1,46 +1,46 @@
 <script setup lang="ts">
 interface FileIconConfig {
-    type: string;
+  type: string;
 }
 
 const props = defineProps<FileIconConfig>();
 </script>
 
 <template>
-    <i class="fa fa-file-pdf-o" v-if="props.type === 'application/pdf'"></i>
-    <i
-        class="fa fa-file-word-o"
-        v-else-if="props.type === 'application/vnd.oasis.opendocument.text'"
-    ></i>
-    <i
-        class="fa fa-file-word-o"
-        v-else-if="
-            props.type ===
-            'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
-        "
-    ></i>
-    <i
-        class="fa fa-file-word-o"
-        v-else-if="props.type === 'application/msword'"
-    ></i>
-    <i
-        class="fa fa-file-excel-o"
-        v-else-if="
-            props.type ===
-            'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
-        "
-    ></i>
-    <i
-        class="fa fa-file-excel-o"
-        v-else-if="props.type === 'application/vnd.ms-excel'"
-    ></i>
-    <i class="fa fa-file-image-o" v-else-if="props.type === 'image/jpeg'"></i>
-    <i class="fa fa-file-image-o" v-else-if="props.type === 'image/png'"></i>
-    <i
-        class="fa fa-file-archive-o"
-        v-else-if="props.type === 'application/x-zip-compressed'"
-    ></i>
-    <i class="fa fa-file-code-o" v-else></i>
+  <i class="fa fa-file-pdf-o" v-if="props.type === 'application/pdf'"></i>
+  <i
+    class="fa fa-file-word-o"
+    v-else-if="props.type === 'application/vnd.oasis.opendocument.text'"
+  ></i>
+  <i
+    class="fa fa-file-word-o"
+    v-else-if="
+      props.type ===
+      'application/vnd.openxmlformats-officedocument.wordprocessingml.document'
+    "
+  ></i>
+  <i
+    class="fa fa-file-word-o"
+    v-else-if="props.type === 'application/msword'"
+  ></i>
+  <i
+    class="fa fa-file-excel-o"
+    v-else-if="
+      props.type ===
+      'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet'
+    "
+  ></i>
+  <i
+    class="fa fa-file-excel-o"
+    v-else-if="props.type === 'application/vnd.ms-excel'"
+  ></i>
+  <i class="fa fa-file-image-o" v-else-if="props.type === 'image/jpeg'"></i>
+  <i class="fa fa-file-image-o" v-else-if="props.type === 'image/png'"></i>
+  <i
+    class="fa fa-file-archive-o"
+    v-else-if="props.type === 'application/x-zip-compressed'"
+  ></i>
+  <i class="fa fa-file-code-o" v-else></i>
 </template>
 
 <style scoped lang="scss"></style>
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/ConvertButton.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/ConvertButton.vue
index b6c6a496f..8cb60bc12 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/ConvertButton.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/ConvertButton.vue
@@ -1,28 +1,28 @@
 <template>
-    <a :class="props.classes" @click="download_and_open($event)" ref="btn">
-        <i class="fa fa-file-pdf-o"></i>
-        Télécharger en pdf
-    </a>
+  <a :class="props.classes" @click="download_and_open($event)" ref="btn">
+    <i class="fa fa-file-pdf-o"></i>
+    Télécharger en pdf
+  </a>
 </template>
 
 <script lang="ts" setup>
 import {
-    build_convert_link,
-    download_and_decrypt_doc,
-    download_doc,
+  build_convert_link,
+  download_and_decrypt_doc,
+  download_doc,
 } from "./helpers";
 import mime from "mime";
 import { reactive, ref } from "vue";
 import { StoredObject } from "../../types";
 
 interface ConvertButtonConfig {
-    storedObject: StoredObject;
-    classes: Record<string, boolean>;
-    filename?: string;
+  storedObject: StoredObject;
+  classes: Record<string, boolean>;
+  filename?: string;
 }
 
 interface DownloadButtonState {
-    content: null | string;
+  content: null | string;
 }
 
 const props = defineProps<ConvertButtonConfig>();
@@ -30,36 +30,34 @@ const state: DownloadButtonState = reactive({ content: null });
 const btn = ref<HTMLAnchorElement | null>(null);
 
 async function download_and_open(event: Event): Promise<void> {
-    const button = event.target as HTMLAnchorElement;
+  const button = event.target as HTMLAnchorElement;
 
-    if (null === state.content) {
-        event.preventDefault();
+  if (null === state.content) {
+    event.preventDefault();
 
-        const raw = await download_doc(
-            build_convert_link(props.storedObject.uuid),
-        );
-        state.content = window.URL.createObjectURL(raw);
+    const raw = await download_doc(build_convert_link(props.storedObject.uuid));
+    state.content = window.URL.createObjectURL(raw);
 
-        button.href = window.URL.createObjectURL(raw);
-        button.type = "application/pdf";
+    button.href = window.URL.createObjectURL(raw);
+    button.type = "application/pdf";
 
-        button.download = props.filename + ".pdf" || "document.pdf";
-    }
+    button.download = props.filename + ".pdf" || "document.pdf";
+  }
 
-    button.click();
-    const reset_pending = setTimeout(reset_state, 45000);
+  button.click();
+  const reset_pending = setTimeout(reset_state, 45000);
 }
 
 function reset_state(): void {
-    state.content = null;
-    btn.value?.removeAttribute("download");
-    btn.value?.removeAttribute("href");
-    btn.value?.removeAttribute("type");
+  state.content = null;
+  btn.value?.removeAttribute("download");
+  btn.value?.removeAttribute("href");
+  btn.value?.removeAttribute("type");
 }
 </script>
 
 <style scoped lang="scss">
 i.fa::before {
-    color: var(--bs-dropdown-link-hover-color);
+  color: var(--bs-dropdown-link-hover-color);
 }
 </style>
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/DesktopEditButton.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/DesktopEditButton.vue
index 2b74f76bd..f00889a8e 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/DesktopEditButton.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/DesktopEditButton.vue
@@ -3,13 +3,13 @@ import Modal from "ChillMainAssets/vuejs/_components/Modal.vue";
 import { computed, reactive } from "vue";
 
 export interface DesktopEditButtonConfig {
-    editLink: null;
-    classes: Record<string, boolean>;
-    expirationLink: number | Date;
+  editLink: null;
+  classes: Record<string, boolean>;
+  expirationLink: number | Date;
 }
 
 interface DesktopEditButtonState {
-    modalOpened: boolean;
+  modalOpened: boolean;
 }
 
 const state: DesktopEditButtonState = reactive({ modalOpened: false });
@@ -17,80 +17,76 @@ const state: DesktopEditButtonState = reactive({ modalOpened: false });
 const props = defineProps<DesktopEditButtonConfig>();
 
 const buildCommand = computed<string>(
-    () => "vnd.libreoffice.command:ofe|u|" + props.editLink,
+  () => "vnd.libreoffice.command:ofe|u|" + props.editLink,
 );
 
 const editionUntilFormatted = computed<string>(() => {
-    let d;
+  let d;
 
-    if (props.expirationLink instanceof Date) {
-        d = props.expirationLink;
-    } else {
-        d = new Date(props.expirationLink * 1000);
-    }
-    console.log(props.expirationLink);
+  if (props.expirationLink instanceof Date) {
+    d = props.expirationLink;
+  } else {
+    d = new Date(props.expirationLink * 1000);
+  }
+  console.log(props.expirationLink);
 
-    return new Intl.DateTimeFormat(undefined, {
-        dateStyle: "long",
-        timeStyle: "medium",
-    }).format(d);
+  return new Intl.DateTimeFormat(undefined, {
+    dateStyle: "long",
+    timeStyle: "medium",
+  }).format(d);
 });
 </script>
 
 <template>
-    <teleport to="body">
-        <modal v-if="state.modalOpened" @close="state.modalOpened = false">
-            <template v-slot:body>
-                <div class="desktop-edit">
-                    <p class="center">
-                        Veuillez enregistrer vos modifications avant le
-                    </p>
-                    <p>
-                        <strong>{{ editionUntilFormatted }}</strong>
-                    </p>
+  <teleport to="body">
+    <modal v-if="state.modalOpened" @close="state.modalOpened = false">
+      <template v-slot:body>
+        <div class="desktop-edit">
+          <p class="center">Veuillez enregistrer vos modifications avant le</p>
+          <p>
+            <strong>{{ editionUntilFormatted }}</strong>
+          </p>
 
-                    <p>
-                        <a class="btn btn-primary" :href="buildCommand"
-                            >Ouvrir le document pour édition</a
-                        >
-                    </p>
+          <p>
+            <a class="btn btn-primary" :href="buildCommand"
+              >Ouvrir le document pour édition</a
+            >
+          </p>
 
-                    <p>
-                        <small
-                            >Le document peut être édité uniquement en utilisant
-                            Libre Office.</small
-                        >
-                    </p>
+          <p>
+            <small
+              >Le document peut être édité uniquement en utilisant Libre
+              Office.</small
+            >
+          </p>
 
-                    <p>
-                        <small
-                            >En cas d'échec lors de l'enregistrement, sauver le
-                            document sur le poste de travail avant de le déposer
-                            à nouveau ici.</small
-                        >
-                    </p>
+          <p>
+            <small
+              >En cas d'échec lors de l'enregistrement, sauver le document sur
+              le poste de travail avant de le déposer à nouveau ici.</small
+            >
+          </p>
 
-                    <p>
-                        <small
-                            >Vous pouvez naviguez sur d'autres pages pendant
-                            l'édition.</small
-                        >
-                    </p>
-                </div>
-            </template>
-        </modal>
-    </teleport>
-    <a :class="props.classes" @click="state.modalOpened = true">
-        <i class="fa fa-desktop"></i>
-        Éditer sur le bureau
-    </a>
+          <p>
+            <small
+              >Vous pouvez naviguez sur d'autres pages pendant l'édition.</small
+            >
+          </p>
+        </div>
+      </template>
+    </modal>
+  </teleport>
+  <a :class="props.classes" @click="state.modalOpened = true">
+    <i class="fa fa-desktop"></i>
+    Éditer sur le bureau
+  </a>
 </template>
 
 <style scoped lang="scss">
 .desktop-edit {
-    text-align: center;
+  text-align: center;
 }
 i.fa::before {
-    color: var(--bs-dropdown-link-hover-color);
+  color: var(--bs-dropdown-link-hover-color);
 }
 </style>
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/DownloadButton.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/DownloadButton.vue
index d28b49cdf..8316229ce 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/DownloadButton.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/DownloadButton.vue
@@ -1,26 +1,26 @@
 <template>
-    <a
-        v-if="!state.is_ready"
-        :class="props.classes"
-        @click="download_and_open()"
-        title="T&#233;l&#233;charger"
-    >
-        <i class="fa fa-download"></i>
-        <template v-if="displayActionStringInButton">Télécharger</template>
-    </a>
-    <a
-        v-else
-        :class="props.classes"
-        target="_blank"
-        :type="props.atVersion.type"
-        :download="buildDocumentName()"
-        :href="state.href_url"
-        ref="open_button"
-        title="Ouvrir"
-    >
-        <i class="fa fa-external-link"></i>
-        <template v-if="displayActionStringInButton">Ouvrir</template>
-    </a>
+  <a
+    v-if="!state.is_ready"
+    :class="props.classes"
+    @click="download_and_open()"
+    title="T&#233;l&#233;charger"
+  >
+    <i class="fa fa-download"></i>
+    <template v-if="displayActionStringInButton">Télécharger</template>
+  </a>
+  <a
+    v-else
+    :class="props.classes"
+    target="_blank"
+    :type="props.atVersion.type"
+    :download="buildDocumentName()"
+    :href="state.href_url"
+    ref="open_button"
+    title="Ouvrir"
+  >
+    <i class="fa fa-external-link"></i>
+    <template v-if="displayActionStringInButton">Ouvrir</template>
+  </a>
 </template>
 
 <script lang="ts" setup>
@@ -30,112 +30,109 @@ import mime from "mime";
 import { StoredObject, StoredObjectVersion } from "../../types";
 
 interface DownloadButtonConfig {
-    storedObject: StoredObject;
-    atVersion: StoredObjectVersion;
-    classes: Record<string, boolean>;
-    filename?: string;
-    /**
-     * if true, display the action string into the button. If false, displays only
-     * the icon
-     */
-    displayActionStringInButton?: boolean;
-    /**
-     * if true, will download directly the file on load
-     */
-    directDownload?: boolean;
+  storedObject: StoredObject;
+  atVersion: StoredObjectVersion;
+  classes: Record<string, boolean>;
+  filename?: string;
+  /**
+   * if true, display the action string into the button. If false, displays only
+   * the icon
+   */
+  displayActionStringInButton?: boolean;
+  /**
+   * if true, will download directly the file on load
+   */
+  directDownload?: boolean;
 }
 
 interface DownloadButtonState {
-    is_ready: boolean;
-    is_running: boolean;
-    href_url: string;
+  is_ready: boolean;
+  is_running: boolean;
+  href_url: string;
 }
 
 const props = withDefaults(defineProps<DownloadButtonConfig>(), {
-    displayActionStringInButton: true,
-    directDownload: false,
+  displayActionStringInButton: true,
+  directDownload: false,
 });
 const state: DownloadButtonState = reactive({
-    is_ready: false,
-    is_running: false,
-    href_url: "#",
+  is_ready: false,
+  is_running: false,
+  href_url: "#",
 });
 
 const open_button = ref<HTMLAnchorElement | null>(null);
 
 function buildDocumentName(): string {
-    let document_name = props.filename ?? props.storedObject.title;
+  let document_name = props.filename ?? props.storedObject.title;
 
-    if ("" === document_name || null === document_name) {
-        document_name = "document";
-    }
+  if ("" === document_name || null === document_name) {
+    document_name = "document";
+  }
 
-    const ext = mime.getExtension(props.atVersion.type);
+  const ext = mime.getExtension(props.atVersion.type);
 
-    if (null !== ext) {
-        return document_name + "." + ext;
-    }
+  if (null !== ext) {
+    return document_name + "." + ext;
+  }
 
-    return document_name;
+  return document_name;
 }
 
 async function download_and_open(): Promise<void> {
-    if (state.is_running) {
-        console.log("state is running, aborting");
-        return;
-    }
+  if (state.is_running) {
+    console.log("state is running, aborting");
+    return;
+  }
 
-    state.is_running = true;
+  state.is_running = true;
 
-    if (state.is_ready) {
-        console.log("state is ready. This should not happens");
-        return;
-    }
+  if (state.is_ready) {
+    console.log("state is ready. This should not happens");
+    return;
+  }
 
-    let raw;
+  let raw;
 
-    try {
-        raw = await download_and_decrypt_doc(
-            props.storedObject,
-            props.atVersion,
-        );
-    } catch (e) {
-        console.error("error while downloading and decrypting document");
-        console.error(e);
-        throw e;
-    }
+  try {
+    raw = await download_and_decrypt_doc(props.storedObject, props.atVersion);
+  } catch (e) {
+    console.error("error while downloading and decrypting document");
+    console.error(e);
+    throw e;
+  }
 
-    state.href_url = window.URL.createObjectURL(raw);
-    state.is_running = false;
-    state.is_ready = true;
+  state.href_url = window.URL.createObjectURL(raw);
+  state.is_running = false;
+  state.is_ready = true;
 
-    if (!props.directDownload) {
-        await nextTick();
-        open_button.value?.click();
+  if (!props.directDownload) {
+    await nextTick();
+    open_button.value?.click();
 
-        console.log("open button should have been clicked");
-        setTimeout(reset_state, 45000);
-    }
+    console.log("open button should have been clicked");
+    setTimeout(reset_state, 45000);
+  }
 }
 
 function reset_state(): void {
-    state.href_url = "#";
-    state.is_ready = false;
-    state.is_running = false;
+  state.href_url = "#";
+  state.is_ready = false;
+  state.is_running = false;
 }
 
 onMounted(() => {
-    if (props.directDownload) {
-        download_and_open();
-    }
+  if (props.directDownload) {
+    download_and_open();
+  }
 });
 </script>
 
 <style scoped lang="scss">
 i.fa::before {
-    color: var(--bs-dropdown-link-hover-color);
+  color: var(--bs-dropdown-link-hover-color);
 }
 i.fa {
-    margin-right: 0.5rem;
+  margin-right: 0.5rem;
 }
 </style>
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton.vue
index 71a8d42ea..f8c1c4ead 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton.vue
@@ -1,20 +1,20 @@
 <script setup lang="ts">
 import HistoryButtonModal from "ChillDocStoreAssets/vuejs/StoredObjectButton/HistoryButton/HistoryButtonModal.vue";
 import {
-    StoredObject,
-    StoredObjectVersionWithPointInTime,
+  StoredObject,
+  StoredObjectVersionWithPointInTime,
 } from "./../../types";
 import { computed, reactive, ref, useTemplateRef } from "vue";
 import { get_versions } from "./HistoryButton/api";
 
 interface HistoryButtonConfig {
-    storedObject: StoredObject;
-    canEdit: boolean;
+  storedObject: StoredObject;
+  canEdit: boolean;
 }
 
 interface HistoryButtonState {
-    versions: StoredObjectVersionWithPointInTime[];
-    loaded: boolean;
+  versions: StoredObjectVersionWithPointInTime[];
+  loaded: boolean;
 }
 
 const props = defineProps<HistoryButtonConfig>();
@@ -22,47 +22,47 @@ const state = reactive<HistoryButtonState>({ versions: [], loaded: false });
 const modal = useTemplateRef<typeof HistoryButtonModal>("modal");
 
 const download_version_and_open_modal = async function (): Promise<void> {
-    if (null !== modal.value) {
-        modal.value.open();
-    } else {
-        console.log("modal is null");
-    }
+  if (null !== modal.value) {
+    modal.value.open();
+  } else {
+    console.log("modal is null");
+  }
 
-    if (!state.loaded) {
-        const versions = await get_versions(props.storedObject);
+  if (!state.loaded) {
+    const versions = await get_versions(props.storedObject);
 
-        for (const version of versions) {
-            state.versions.push(version);
-        }
-        state.loaded = true;
+    for (const version of versions) {
+      state.versions.push(version);
     }
+    state.loaded = true;
+  }
 };
 
 const onRestoreVersion = ({
-    newVersion,
+  newVersion,
 }: {
-    newVersion: StoredObjectVersionWithPointInTime;
+  newVersion: StoredObjectVersionWithPointInTime;
 }) => {
-    state.versions.unshift(newVersion);
+  state.versions.unshift(newVersion);
 };
 </script>
 
 <template>
-    <a @click="download_version_and_open_modal" class="dropdown-item">
-        <history-button-modal
-            ref="modal"
-            :versions="state.versions"
-            :stored-object="storedObject"
-            :can-edit="canEdit"
-            @restore-version="onRestoreVersion"
-        ></history-button-modal>
-        <i class="fa fa-history"></i>
-        Historique
-    </a>
+  <a @click="download_version_and_open_modal" class="dropdown-item">
+    <history-button-modal
+      ref="modal"
+      :versions="state.versions"
+      :stored-object="storedObject"
+      :can-edit="canEdit"
+      @restore-version="onRestoreVersion"
+    ></history-button-modal>
+    <i class="fa fa-history"></i>
+    Historique
+  </a>
 </template>
 
 <style scoped lang="scss">
 i.fa::before {
-    color: var(--bs-dropdown-link-hover-color);
+  color: var(--bs-dropdown-link-hover-color);
 }
 </style>
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton/HistoryButtonList.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton/HistoryButtonList.vue
index ac4bf4591..cf70e3db3 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton/HistoryButtonList.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton/HistoryButtonList.vue
@@ -1,26 +1,26 @@
 <script setup lang="ts">
 import {
-    StoredObject,
-    StoredObjectVersionWithPointInTime,
+  StoredObject,
+  StoredObjectVersionWithPointInTime,
 } from "./../../../types";
 import HistoryButtonListItem from "ChillDocStoreAssets/vuejs/StoredObjectButton/HistoryButton/HistoryButtonListItem.vue";
 import { computed, reactive } from "vue";
 
 interface HistoryButtonListConfig {
-    versions: StoredObjectVersionWithPointInTime[];
-    storedObject: StoredObject;
-    canEdit: boolean;
+  versions: StoredObjectVersionWithPointInTime[];
+  storedObject: StoredObject;
+  canEdit: boolean;
 }
 
 const emit = defineEmits<{
-    restoreVersion: [newVersion: StoredObjectVersionWithPointInTime];
+  restoreVersion: [newVersion: StoredObjectVersionWithPointInTime];
 }>();
 
 interface HistoryButtonListState {
-    /**
-     * Contains the number of the newly created version when a version is restored.
-     */
-    restored: number;
+  /**
+   * Contains the number of the newly created version when a version is restored.
+   */
+  restored: number;
 }
 
 const props = defineProps<HistoryButtonListConfig>();
@@ -28,11 +28,11 @@ const props = defineProps<HistoryButtonListConfig>();
 const state = reactive<HistoryButtonListState>({ restored: -1 });
 
 const higher_version = computed<number>(() =>
-    props.versions.reduce(
-        (accumulator: number, version: StoredObjectVersionWithPointInTime) =>
-            Math.max(accumulator, version.version),
-        -1,
-    ),
+  props.versions.reduce(
+    (accumulator: number, version: StoredObjectVersionWithPointInTime) =>
+      Math.max(accumulator, version.version),
+    -1,
+  ),
 );
 
 /**
@@ -41,32 +41,32 @@ const higher_version = computed<number>(() =>
  * internally, keep track of the newly restored version
  */
 const onRestored = ({
-    newVersion,
+  newVersion,
 }: {
-    newVersion: StoredObjectVersionWithPointInTime;
+  newVersion: StoredObjectVersionWithPointInTime;
 }) => {
-    state.restored = newVersion.version;
-    emit("restoreVersion", { newVersion });
+  state.restored = newVersion.version;
+  emit("restoreVersion", { newVersion });
 };
 </script>
 
 <template>
-    <template v-if="props.versions.length > 0">
-        <div class="container">
-            <template v-for="v in props.versions" :key="v.id">
-                <history-button-list-item
-                    :version="v"
-                    :can-edit="canEdit"
-                    :is-current="higher_version === v.version"
-                    :stored-object="storedObject"
-                    @restore-version="onRestored"
-                ></history-button-list-item>
-            </template>
-        </div>
-    </template>
-    <template v-else>
-        <p>Chargement des versions</p>
-    </template>
+  <template v-if="props.versions.length > 0">
+    <div class="container">
+      <template v-for="v in props.versions" :key="v.id">
+        <history-button-list-item
+          :version="v"
+          :can-edit="canEdit"
+          :is-current="higher_version === v.version"
+          :stored-object="storedObject"
+          @restore-version="onRestored"
+        ></history-button-list-item>
+      </template>
+    </div>
+  </template>
+  <template v-else>
+    <p>Chargement des versions</p>
+  </template>
 </template>
 
 <style scoped lang="scss"></style>
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton/HistoryButtonListItem.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton/HistoryButtonListItem.vue
index bf5e3fffb..2a563d853 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton/HistoryButtonListItem.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton/HistoryButtonListItem.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import {
-    StoredObject,
-    StoredObjectPointInTime,
-    StoredObjectVersionWithPointInTime,
+  StoredObject,
+  StoredObjectPointInTime,
+  StoredObjectVersionWithPointInTime,
 } from "./../../../types";
 import UserRenderBoxBadge from "ChillMainAssets/vuejs/_components/Entity/UserRenderBoxBadge.vue";
 import { ISOToDatetime } from "./../../../../../../ChillMainBundle/Resources/public/chill/js/date";
@@ -12,185 +12,173 @@ import DownloadButton from "ChillDocStoreAssets/vuejs/StoredObjectButton/Downloa
 import { computed } from "vue";
 
 interface HistoryButtonListItemConfig {
-    version: StoredObjectVersionWithPointInTime;
-    storedObject: StoredObject;
-    canEdit: boolean;
-    isCurrent: boolean;
+  version: StoredObjectVersionWithPointInTime;
+  storedObject: StoredObject;
+  canEdit: boolean;
+  isCurrent: boolean;
 }
 
 const emit = defineEmits<{
-    restoreVersion: [newVersion: StoredObjectVersionWithPointInTime];
+  restoreVersion: [newVersion: StoredObjectVersionWithPointInTime];
 }>();
 
 const props = defineProps<HistoryButtonListItemConfig>();
 
 const onRestore = ({
-    newVersion,
+  newVersion,
 }: {
-    newVersion: StoredObjectVersionWithPointInTime;
+  newVersion: StoredObjectVersionWithPointInTime;
 }) => {
-    emit("restoreVersion", { newVersion });
+  emit("restoreVersion", { newVersion });
 };
 
 const isKeptBeforeConversion = computed<boolean>(() => {
-    if ("point-in-times" in props.version) {
-        return props.version["point-in-times"].reduce(
-            (accumulator: boolean, pit: StoredObjectPointInTime) =>
-                accumulator || "keep-before-conversion" === pit.reason,
-            false,
-        );
-    } else {
-        return false;
-    }
+  if ("point-in-times" in props.version) {
+    return props.version["point-in-times"].reduce(
+      (accumulator: boolean, pit: StoredObjectPointInTime) =>
+        accumulator || "keep-before-conversion" === pit.reason,
+      false,
+    );
+  } else {
+    return false;
+  }
 });
 
 const isRestored = computed<boolean>(
-    () => props.version.version > 0 && null !== props.version["from-restored"],
+  () => props.version.version > 0 && null !== props.version["from-restored"],
 );
 
 const isDuplicated = computed<boolean>(
-    () =>
-        props.version.version === 0 && null !== props.version["from-restored"],
+  () => props.version.version === 0 && null !== props.version["from-restored"],
 );
 
 const classes = computed<{
-    row: true;
-    "row-hover": true;
-    "blinking-1": boolean;
-    "blinking-2": boolean;
+  row: true;
+  "row-hover": true;
+  "blinking-1": boolean;
+  "blinking-2": boolean;
 }>(() => ({
-    row: true,
-    "row-hover": true,
-    "blinking-1": props.isRestored && 0 === props.version.version % 2,
-    "blinking-2": props.isRestored && 1 === props.version.version % 2,
+  row: true,
+  "row-hover": true,
+  "blinking-1": props.isRestored && 0 === props.version.version % 2,
+  "blinking-2": props.isRestored && 1 === props.version.version % 2,
 }));
 </script>
 
 <template>
-    <div :class="classes">
-        <div
-            class="col-12 tags"
-            v-if="
-                isCurrent ||
-                isKeptBeforeConversion ||
-                isRestored ||
-                isDuplicated
-            "
-        >
-            <span class="badge bg-success" v-if="isCurrent"
-                >Version actuelle</span
-            >
-            <span class="badge bg-info" v-if="isKeptBeforeConversion"
-                >Conservée avant conversion dans un autre format</span
-            >
-            <span class="badge bg-info" v-if="isRestored"
-                >Restaurée depuis la version
-                {{ version["from-restored"]?.version + 1 }}</span
-            >
-            <span class="badge bg-info" v-if="isDuplicated"
-                >Dupliqué depuis un autre document</span
-            >
-        </div>
-        <div class="col-12">
-            <file-icon :type="version.type"></file-icon>
-            <span
-                ><strong>&nbsp;#{{ version.version + 1 }}&nbsp;</strong></span
-            >
-            <template
-                v-if="version.createdBy !== null && version.createdAt !== null"
-                ><strong v-if="version.version == 0">créé par</strong
-                ><strong v-else>modifié par</strong>
-                <span class="badge-user"
-                    ><UserRenderBoxBadge
-                        :user="version.createdBy"
-                    ></UserRenderBoxBadge
-                ></span>
-                <strong>à</strong>
-                {{
-                    $d(ISOToDatetime(version.createdAt.datetime8601), "long")
-                }}</template
-            ><template
-                v-if="version.createdBy === null && version.createdAt !== null"
-                ><strong v-if="version.version == 0">Créé le</strong
-                ><strong v-else>modifié le</strong>
-                {{
-                    $d(ISOToDatetime(version.createdAt.datetime8601), "long")
-                }}</template
-            >
-        </div>
-        <div class="col-12">
-            <ul class="record_actions small slim on-version-actions">
-                <li v-if="canEdit && !isCurrent">
-                    <restore-version-button
-                        :stored-object-version="props.version"
-                        @restore-version="onRestore"
-                    ></restore-version-button>
-                </li>
-                <li>
-                    <download-button
-                        :stored-object="storedObject"
-                        :at-version="version"
-                        :classes="{
-                            btn: true,
-                            'btn-outline-primary': true,
-                            'btn-sm': true,
-                        }"
-                        :display-action-string-in-button="false"
-                    ></download-button>
-                </li>
-            </ul>
-        </div>
+  <div :class="classes">
+    <div
+      class="col-12 tags"
+      v-if="isCurrent || isKeptBeforeConversion || isRestored || isDuplicated"
+    >
+      <span class="badge bg-success" v-if="isCurrent">Version actuelle</span>
+      <span class="badge bg-info" v-if="isKeptBeforeConversion"
+        >Conservée avant conversion dans un autre format</span
+      >
+      <span class="badge bg-info" v-if="isRestored"
+        >Restaurée depuis la version
+        {{ version["from-restored"]?.version + 1 }}</span
+      >
+      <span class="badge bg-info" v-if="isDuplicated"
+        >Dupliqué depuis un autre document</span
+      >
     </div>
+    <div class="col-12">
+      <file-icon :type="version.type"></file-icon>
+      <span
+        ><strong>&nbsp;#{{ version.version + 1 }}&nbsp;</strong></span
+      >
+      <template v-if="version.createdBy !== null && version.createdAt !== null"
+        ><strong v-if="version.version == 0">créé par</strong
+        ><strong v-else>modifié par</strong>
+        <span class="badge-user"
+          ><UserRenderBoxBadge :user="version.createdBy"></UserRenderBoxBadge
+        ></span>
+        <strong>à</strong>
+        {{
+          $d(ISOToDatetime(version.createdAt.datetime8601), "long")
+        }}</template
+      ><template v-if="version.createdBy === null && version.createdAt !== null"
+        ><strong v-if="version.version == 0">Créé le</strong
+        ><strong v-else>modifié le</strong>
+        {{
+          $d(ISOToDatetime(version.createdAt.datetime8601), "long")
+        }}</template
+      >
+    </div>
+    <div class="col-12">
+      <ul class="record_actions small slim on-version-actions">
+        <li v-if="canEdit && !isCurrent">
+          <restore-version-button
+            :stored-object-version="props.version"
+            @restore-version="onRestore"
+          ></restore-version-button>
+        </li>
+        <li>
+          <download-button
+            :stored-object="storedObject"
+            :at-version="version"
+            :classes="{
+              btn: true,
+              'btn-outline-primary': true,
+              'btn-sm': true,
+            }"
+            :display-action-string-in-button="false"
+          ></download-button>
+        </li>
+      </ul>
+    </div>
+  </div>
 </template>
 
 <style scoped lang="scss">
 div.tags {
-    span.badge:not(:last-child) {
-        margin-right: 0.5rem;
-    }
+  span.badge:not(:last-child) {
+    margin-right: 0.5rem;
+  }
 }
 // to make the animation restart, we have the same animation twice,
 // and alternate between both
 .blinking-1 {
-    animation-name: backgroundColorPalette-1;
-    animation-duration: 8s;
-    animation-iteration-count: 1;
-    animation-direction: normal;
-    animation-timing-function: linear;
+  animation-name: backgroundColorPalette-1;
+  animation-duration: 8s;
+  animation-iteration-count: 1;
+  animation-direction: normal;
+  animation-timing-function: linear;
 }
 @keyframes backgroundColorPalette-1 {
-    0% {
-        background: var(--bs-chill-green-dark);
-    }
-    25% {
-        background: var(--bs-chill-green);
-    }
-    65% {
-        background: var(--bs-chill-beige);
-    }
-    100% {
-        background: unset;
-    }
+  0% {
+    background: var(--bs-chill-green-dark);
+  }
+  25% {
+    background: var(--bs-chill-green);
+  }
+  65% {
+    background: var(--bs-chill-beige);
+  }
+  100% {
+    background: unset;
+  }
 }
 .blinking-2 {
-    animation-name: backgroundColorPalette-2;
-    animation-duration: 8s;
-    animation-iteration-count: 1;
-    animation-direction: normal;
-    animation-timing-function: linear;
+  animation-name: backgroundColorPalette-2;
+  animation-duration: 8s;
+  animation-iteration-count: 1;
+  animation-direction: normal;
+  animation-timing-function: linear;
 }
 @keyframes backgroundColorPalette-2 {
-    0% {
-        background: var(--bs-chill-green-dark);
-    }
-    25% {
-        background: var(--bs-chill-green);
-    }
-    65% {
-        background: var(--bs-chill-beige);
-    }
-    100% {
-        background: unset;
-    }
+  0% {
+    background: var(--bs-chill-green-dark);
+  }
+  25% {
+    background: var(--bs-chill-green);
+  }
+  65% {
+    background: var(--bs-chill-beige);
+  }
+  100% {
+    background: unset;
+  }
 }
 </style>
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton/HistoryButtonModal.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton/HistoryButtonModal.vue
index b9535ca2e..0d9a951e5 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton/HistoryButtonModal.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton/HistoryButtonModal.vue
@@ -3,54 +3,54 @@ import Modal from "ChillMainAssets/vuejs/_components/Modal.vue";
 import { reactive } from "vue";
 import HistoryButtonList from "ChillDocStoreAssets/vuejs/StoredObjectButton/HistoryButton/HistoryButtonList.vue";
 import {
-    StoredObject,
-    StoredObjectVersionWithPointInTime,
+  StoredObject,
+  StoredObjectVersionWithPointInTime,
 } from "./../../../types";
 
 interface HistoryButtonListConfig {
-    versions: StoredObjectVersionWithPointInTime[];
-    storedObject: StoredObject;
-    canEdit: boolean;
+  versions: StoredObjectVersionWithPointInTime[];
+  storedObject: StoredObject;
+  canEdit: boolean;
 }
 
 const emit = defineEmits<{
-    restoreVersion: [newVersion: StoredObjectVersionWithPointInTime];
+  restoreVersion: [newVersion: StoredObjectVersionWithPointInTime];
 }>();
 
 interface HistoryButtonModalState {
-    opened: boolean;
+  opened: boolean;
 }
 
 const props = defineProps<HistoryButtonListConfig>();
 const state = reactive<HistoryButtonModalState>({ opened: false });
 
 const open = () => {
-    state.opened = true;
+  state.opened = true;
 };
 
 const onRestoreVersion = (payload: {
-    newVersion: StoredObjectVersionWithPointInTime;
+  newVersion: StoredObjectVersionWithPointInTime;
 }) => emit("restoreVersion", payload);
 
 defineExpose({ open });
 </script>
 <template>
-    <Teleport to="body">
-        <modal v-if="state.opened" @close="state.opened = false">
-            <template v-slot:header>
-                <h3>Historique des versions du document</h3>
-            </template>
-            <template v-slot:body>
-                <p>Les versions sont conservées pendant 90 jours.</p>
-                <history-button-list
-                    :versions="props.versions"
-                    :can-edit="canEdit"
-                    :stored-object="storedObject"
-                    @restore-version="onRestoreVersion"
-                ></history-button-list>
-            </template>
-        </modal>
-    </Teleport>
+  <Teleport to="body">
+    <modal v-if="state.opened" @close="state.opened = false">
+      <template v-slot:header>
+        <h3>Historique des versions du document</h3>
+      </template>
+      <template v-slot:body>
+        <p>Les versions sont conservées pendant 90 jours.</p>
+        <history-button-list
+          :versions="props.versions"
+          :can-edit="canEdit"
+          :stored-object="storedObject"
+          @restore-version="onRestoreVersion"
+        ></history-button-list>
+      </template>
+    </modal>
+  </Teleport>
 </template>
 
 <style scoped lang="scss"></style>
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton/RestoreVersionButton.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton/RestoreVersionButton.vue
index 41ae8e978..595d3781a 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton/RestoreVersionButton.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton/RestoreVersionButton.vue
@@ -1,17 +1,17 @@
 <script setup lang="ts">
 import {
-    StoredObjectVersionPersisted,
-    StoredObjectVersionWithPointInTime,
+  StoredObjectVersionPersisted,
+  StoredObjectVersionWithPointInTime,
 } from "../../../types";
 import { useToast } from "vue-toast-notification";
 import { restore_version } from "./api";
 
 interface RestoreVersionButtonProps {
-    storedObjectVersion: StoredObjectVersionPersisted;
+  storedObjectVersion: StoredObjectVersionPersisted;
 }
 
 const emit = defineEmits<{
-    restoreVersion: [newVersion: StoredObjectVersionWithPointInTime];
+  restoreVersion: [newVersion: StoredObjectVersionWithPointInTime];
 }>();
 
 const props = defineProps<RestoreVersionButtonProps>();
@@ -19,21 +19,21 @@ const props = defineProps<RestoreVersionButtonProps>();
 const $toast = useToast();
 
 const restore_version_fn = async () => {
-    const newVersion = await restore_version(props.storedObjectVersion);
+  const newVersion = await restore_version(props.storedObjectVersion);
 
-    $toast.success("Version restaurée");
-    emit("restoreVersion", { newVersion });
+  $toast.success("Version restaurée");
+  emit("restoreVersion", { newVersion });
 };
 </script>
 
 <template>
-    <button
-        class="btn btn-outline-action"
-        @click="restore_version_fn"
-        title="Restaurer"
-    >
-        <i class="fa fa-rotate-left"></i> Restaurer
-    </button>
+  <button
+    class="btn btn-outline-action"
+    @click="restore_version_fn"
+    title="Restaurer"
+  >
+    <i class="fa fa-rotate-left"></i> Restaurer
+  </button>
 </template>
 
 <style scoped lang="scss"></style>
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton/api.ts b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton/api.ts
index cb7581eab..b003e26b7 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton/api.ts
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton/api.ts
@@ -1,33 +1,33 @@
 import {
-    StoredObject,
-    StoredObjectVersionPersisted,
-    StoredObjectVersionWithPointInTime,
+  StoredObject,
+  StoredObjectVersionPersisted,
+  StoredObjectVersionWithPointInTime,
 } from "../../../types";
 import {
-    fetchResults,
-    makeFetch,
+  fetchResults,
+  makeFetch,
 } from "../../../../../../ChillMainBundle/Resources/public/lib/api/apiMethods";
 
 export const get_versions = async (
-    storedObject: StoredObject,
+  storedObject: StoredObject,
 ): Promise<StoredObjectVersionWithPointInTime[]> => {
-    const versions = await fetchResults<StoredObjectVersionWithPointInTime>(
-        `/api/1.0/doc-store/stored-object/${storedObject.uuid}/versions`,
-    );
+  const versions = await fetchResults<StoredObjectVersionWithPointInTime>(
+    `/api/1.0/doc-store/stored-object/${storedObject.uuid}/versions`,
+  );
 
-    return versions.sort(
-        (
-            a: StoredObjectVersionWithPointInTime,
-            b: StoredObjectVersionWithPointInTime,
-        ) => b.version - a.version,
-    );
+  return versions.sort(
+    (
+      a: StoredObjectVersionWithPointInTime,
+      b: StoredObjectVersionWithPointInTime,
+    ) => b.version - a.version,
+  );
 };
 
 export const restore_version = async (
-    version: StoredObjectVersionPersisted,
+  version: StoredObjectVersionPersisted,
 ): Promise<StoredObjectVersionWithPointInTime> => {
-    return await makeFetch<null, StoredObjectVersionWithPointInTime>(
-        "POST",
-        `/api/1.0/doc-store/stored-object/restore-from-version/${version.id}`,
-    );
+  return await makeFetch<null, StoredObjectVersionWithPointInTime>(
+    "POST",
+    `/api/1.0/doc-store/stored-object/restore-from-version/${version.id}`,
+  );
 };
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/WopiEditButton.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/WopiEditButton.vue
index b57c1f188..97073e4e1 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/WopiEditButton.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/WopiEditButton.vue
@@ -1,29 +1,27 @@
 <template>
-    <a
-        :class="Object.assign(props.classes, { btn: true })"
-        @click="beforeLeave($event)"
-        :href="
-            build_wopi_editor_link(props.storedObject.uuid, props.returnPath)
-        "
-    >
-        <i class="fa fa-paragraph"></i>
-        Editer en ligne
-    </a>
+  <a
+    :class="Object.assign(props.classes, { btn: true })"
+    @click="beforeLeave($event)"
+    :href="build_wopi_editor_link(props.storedObject.uuid, props.returnPath)"
+  >
+    <i class="fa fa-paragraph"></i>
+    Editer en ligne
+  </a>
 </template>
 
 <script lang="ts" setup>
 import WopiEditButton from "./WopiEditButton.vue";
 import { build_wopi_editor_link } from "./helpers";
 import {
-    StoredObject,
-    WopiEditButtonExecutableBeforeLeaveFunction,
+  StoredObject,
+  WopiEditButtonExecutableBeforeLeaveFunction,
 } from "../../types";
 
 interface WopiEditButtonConfig {
-    storedObject: StoredObject;
-    returnPath?: string;
-    classes: Record<string, boolean>;
-    executeBeforeLeave?: WopiEditButtonExecutableBeforeLeaveFunction;
+  storedObject: StoredObject;
+  returnPath?: string;
+  classes: Record<string, boolean>;
+  executeBeforeLeave?: WopiEditButtonExecutableBeforeLeaveFunction;
 }
 
 const props = defineProps<WopiEditButtonConfig>();
@@ -31,24 +29,24 @@ const props = defineProps<WopiEditButtonConfig>();
 let executed = false;
 
 async function beforeLeave(event: Event): Promise<true> {
-    if (props.executeBeforeLeave === undefined || executed === true) {
-        return Promise.resolve(true);
-    }
-
-    event.preventDefault();
-
-    await props.executeBeforeLeave();
-    executed = true;
-
-    const link = event.target as HTMLAnchorElement;
-    link.click();
-
+  if (props.executeBeforeLeave === undefined || executed === true) {
     return Promise.resolve(true);
+  }
+
+  event.preventDefault();
+
+  await props.executeBeforeLeave();
+  executed = true;
+
+  const link = event.target as HTMLAnchorElement;
+  link.click();
+
+  return Promise.resolve(true);
 }
 </script>
 
 <style scoped lang="scss">
 i.fa::before {
-    color: var(--bs-dropdown-link-hover-color);
+  color: var(--bs-dropdown-link-hover-color);
 }
 </style>
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/helpers.ts b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/helpers.ts
index ff1e6219d..aceaa038b 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/helpers.ts
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/helpers.ts
@@ -1,235 +1,230 @@
 import {
-    StoredObject,
-    StoredObjectStatus,
-    StoredObjectStatusChange,
-    StoredObjectVersion,
+  StoredObject,
+  StoredObjectStatus,
+  StoredObjectStatusChange,
+  StoredObjectVersion,
 } from "../../types";
 import { makeFetch } from "../../../../../ChillMainBundle/Resources/public/lib/api/apiMethods";
 
 const MIMES_EDIT = new Set([
-    "application/vnd.ms-powerpoint",
-    "application/vnd.ms-excel",
-    "application/vnd.oasis.opendocument.text",
-    "application/vnd.oasis.opendocument.text-flat-xml",
-    "application/vnd.oasis.opendocument.spreadsheet",
-    "application/vnd.oasis.opendocument.spreadsheet-flat-xml",
-    "application/vnd.oasis.opendocument.presentation",
-    "application/vnd.oasis.opendocument.presentation-flat-xml",
-    "application/vnd.oasis.opendocument.graphics",
-    "application/vnd.oasis.opendocument.graphics-flat-xml",
-    "application/vnd.oasis.opendocument.chart",
-    "application/msword",
-    "application/vnd.ms-excel",
-    "application/vnd.ms-powerpoint",
-    "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
-    "application/vnd.ms-word.document.macroEnabled.12",
-    "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
-    "application/vnd.ms-excel.sheet.binary.macroEnabled.12",
-    "application/vnd.ms-excel.sheet.macroEnabled.12",
-    "application/vnd.openxmlformats-officedocument.presentationml.presentation",
-    "application/vnd.ms-powerpoint.presentation.macroEnabled.12",
-    "application/x-dif-document",
-    "text/spreadsheet",
-    "text/csv",
-    "application/x-dbase",
-    "text/rtf",
-    "text/plain",
-    "application/vnd.openxmlformats-officedocument.presentationml.slideshow",
+  "application/vnd.ms-powerpoint",
+  "application/vnd.ms-excel",
+  "application/vnd.oasis.opendocument.text",
+  "application/vnd.oasis.opendocument.text-flat-xml",
+  "application/vnd.oasis.opendocument.spreadsheet",
+  "application/vnd.oasis.opendocument.spreadsheet-flat-xml",
+  "application/vnd.oasis.opendocument.presentation",
+  "application/vnd.oasis.opendocument.presentation-flat-xml",
+  "application/vnd.oasis.opendocument.graphics",
+  "application/vnd.oasis.opendocument.graphics-flat-xml",
+  "application/vnd.oasis.opendocument.chart",
+  "application/msword",
+  "application/vnd.ms-excel",
+  "application/vnd.ms-powerpoint",
+  "application/vnd.openxmlformats-officedocument.wordprocessingml.document",
+  "application/vnd.ms-word.document.macroEnabled.12",
+  "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+  "application/vnd.ms-excel.sheet.binary.macroEnabled.12",
+  "application/vnd.ms-excel.sheet.macroEnabled.12",
+  "application/vnd.openxmlformats-officedocument.presentationml.presentation",
+  "application/vnd.ms-powerpoint.presentation.macroEnabled.12",
+  "application/x-dif-document",
+  "text/spreadsheet",
+  "text/csv",
+  "application/x-dbase",
+  "text/rtf",
+  "text/plain",
+  "application/vnd.openxmlformats-officedocument.presentationml.slideshow",
 ]);
 
 const MIMES_VIEW = new Set([
-    ...MIMES_EDIT,
-    [
-        "image/svg+xml",
-        "application/vnd.sun.xml.writer",
-        "application/vnd.sun.xml.calc",
-        "application/vnd.sun.xml.impress",
-        "application/vnd.sun.xml.draw",
-        "application/vnd.sun.xml.writer.global",
-        "application/vnd.sun.xml.writer.template",
-        "application/vnd.sun.xml.calc.template",
-        "application/vnd.sun.xml.impress.template",
-        "application/vnd.sun.xml.draw.template",
-        "application/vnd.oasis.opendocument.text-master",
-        "application/vnd.oasis.opendocument.text-template",
-        "application/vnd.oasis.opendocument.text-master-template",
-        "application/vnd.oasis.opendocument.spreadsheet-template",
-        "application/vnd.oasis.opendocument.presentation-template",
-        "application/vnd.oasis.opendocument.graphics-template",
-        "application/vnd.ms-word.template.macroEnabled.12",
-        "application/vnd.openxmlformats-officedocument.spreadsheetml.template",
-        "application/vnd.ms-excel.template.macroEnabled.12",
-        "application/vnd.openxmlformats-officedocument.presentationml.template",
-        "application/vnd.ms-powerpoint.template.macroEnabled.12",
-        "application/vnd.wordperfect",
-        "application/x-aportisdoc",
-        "application/x-hwp",
-        "application/vnd.ms-works",
-        "application/x-mswrite",
-        "application/vnd.lotus-1-2-3",
-        "image/cgm",
-        "image/vnd.dxf",
-        "image/x-emf",
-        "image/x-wmf",
-        "application/coreldraw",
-        "application/vnd.visio2013",
-        "application/vnd.visio",
-        "application/vnd.ms-visio.drawing",
-        "application/x-mspublisher",
-        "application/x-sony-bbeb",
-        "application/x-gnumeric",
-        "application/macwriteii",
-        "application/x-iwork-numbers-sffnumbers",
-        "application/vnd.oasis.opendocument.text-web",
-        "application/x-pagemaker",
-        "application/x-fictionbook+xml",
-        "application/clarisworks",
-        "image/x-wpg",
-        "application/x-iwork-pages-sffpages",
-        "application/x-iwork-keynote-sffkey",
-        "application/x-abiword",
-        "image/x-freehand",
-        "application/vnd.sun.xml.chart",
-        "application/x-t602",
-        "image/bmp",
-        "image/png",
-        "image/gif",
-        "image/tiff",
-        "image/jpg",
-        "image/jpeg",
-        "application/pdf",
-    ],
+  ...MIMES_EDIT,
+  [
+    "image/svg+xml",
+    "application/vnd.sun.xml.writer",
+    "application/vnd.sun.xml.calc",
+    "application/vnd.sun.xml.impress",
+    "application/vnd.sun.xml.draw",
+    "application/vnd.sun.xml.writer.global",
+    "application/vnd.sun.xml.writer.template",
+    "application/vnd.sun.xml.calc.template",
+    "application/vnd.sun.xml.impress.template",
+    "application/vnd.sun.xml.draw.template",
+    "application/vnd.oasis.opendocument.text-master",
+    "application/vnd.oasis.opendocument.text-template",
+    "application/vnd.oasis.opendocument.text-master-template",
+    "application/vnd.oasis.opendocument.spreadsheet-template",
+    "application/vnd.oasis.opendocument.presentation-template",
+    "application/vnd.oasis.opendocument.graphics-template",
+    "application/vnd.ms-word.template.macroEnabled.12",
+    "application/vnd.openxmlformats-officedocument.spreadsheetml.template",
+    "application/vnd.ms-excel.template.macroEnabled.12",
+    "application/vnd.openxmlformats-officedocument.presentationml.template",
+    "application/vnd.ms-powerpoint.template.macroEnabled.12",
+    "application/vnd.wordperfect",
+    "application/x-aportisdoc",
+    "application/x-hwp",
+    "application/vnd.ms-works",
+    "application/x-mswrite",
+    "application/vnd.lotus-1-2-3",
+    "image/cgm",
+    "image/vnd.dxf",
+    "image/x-emf",
+    "image/x-wmf",
+    "application/coreldraw",
+    "application/vnd.visio2013",
+    "application/vnd.visio",
+    "application/vnd.ms-visio.drawing",
+    "application/x-mspublisher",
+    "application/x-sony-bbeb",
+    "application/x-gnumeric",
+    "application/macwriteii",
+    "application/x-iwork-numbers-sffnumbers",
+    "application/vnd.oasis.opendocument.text-web",
+    "application/x-pagemaker",
+    "application/x-fictionbook+xml",
+    "application/clarisworks",
+    "image/x-wpg",
+    "application/x-iwork-pages-sffpages",
+    "application/x-iwork-keynote-sffkey",
+    "application/x-abiword",
+    "image/x-freehand",
+    "application/vnd.sun.xml.chart",
+    "application/x-t602",
+    "image/bmp",
+    "image/png",
+    "image/gif",
+    "image/tiff",
+    "image/jpg",
+    "image/jpeg",
+    "application/pdf",
+  ],
 ]);
 
 export interface SignedUrlGet {
-    method: "GET" | "HEAD";
-    url: string;
-    expires: number;
-    object_name: string;
+  method: "GET" | "HEAD";
+  url: string;
+  expires: number;
+  object_name: string;
 }
 
 function is_extension_editable(mimeType: string): boolean {
-    return MIMES_EDIT.has(mimeType);
+  return MIMES_EDIT.has(mimeType);
 }
 
 function is_extension_viewable(mimeType: string): boolean {
-    return MIMES_VIEW.has(mimeType);
+  return MIMES_VIEW.has(mimeType);
 }
 
 function build_convert_link(uuid: string) {
-    return `/chill/wopi/convert/${uuid}`;
+  return `/chill/wopi/convert/${uuid}`;
 }
 
 function build_download_info_link(
-    storedObject: StoredObject,
-    atVersion: null | StoredObjectVersion,
+  storedObject: StoredObject,
+  atVersion: null | StoredObjectVersion,
 ): string {
-    const url = `/api/1.0/doc-store/async-upload/temp_url/${storedObject.uuid}/generate/get`;
+  const url = `/api/1.0/doc-store/async-upload/temp_url/${storedObject.uuid}/generate/get`;
 
-    if (null !== atVersion) {
-        const params = new URLSearchParams({ version: atVersion.filename });
+  if (null !== atVersion) {
+    const params = new URLSearchParams({ version: atVersion.filename });
 
-        return url + "?" + params.toString();
-    }
+    return url + "?" + params.toString();
+  }
 
-    return url;
+  return url;
 }
 
 async function download_info_link(
-    storedObject: StoredObject,
-    atVersion: null | StoredObjectVersion,
+  storedObject: StoredObject,
+  atVersion: null | StoredObjectVersion,
 ): Promise<SignedUrlGet> {
-    return makeFetch("GET", build_download_info_link(storedObject, atVersion));
+  return makeFetch("GET", build_download_info_link(storedObject, atVersion));
 }
 
 function build_wopi_editor_link(uuid: string, returnPath?: string) {
-    if (returnPath === undefined) {
-        returnPath =
-            window.location.pathname +
-            window.location.search +
-            window.location.hash;
-    }
+  if (returnPath === undefined) {
+    returnPath =
+      window.location.pathname + window.location.search + window.location.hash;
+  }
 
-    return (
-        `/chill/wopi/edit/${uuid}?returnPath=` + encodeURIComponent(returnPath)
-    );
+  return (
+    `/chill/wopi/edit/${uuid}?returnPath=` + encodeURIComponent(returnPath)
+  );
 }
 
 function download_doc(url: string): Promise<Blob> {
-    return window.fetch(url).then((r) => {
-        if (r.ok) {
-            return r.blob();
-        }
+  return window.fetch(url).then((r) => {
+    if (r.ok) {
+      return r.blob();
+    }
 
-        throw new Error("Could not download document");
-    });
+    throw new Error("Could not download document");
+  });
 }
 
 async function download_and_decrypt_doc(
-    storedObject: StoredObject,
-    atVersion: null | StoredObjectVersion,
+  storedObject: StoredObject,
+  atVersion: null | StoredObjectVersion,
 ): Promise<Blob> {
-    const algo = "AES-CBC";
+  const algo = "AES-CBC";
 
-    const atVersionToDownload = atVersion ?? storedObject.currentVersion;
+  const atVersionToDownload = atVersion ?? storedObject.currentVersion;
 
-    if (null === atVersionToDownload) {
-        throw new Error("no version associated to stored object");
-    }
+  if (null === atVersionToDownload) {
+    throw new Error("no version associated to stored object");
+  }
 
-    // sometimes, the downloadInfo may be embedded into the storedObject
-    console.log("storedObject", storedObject);
-    let downloadInfo;
-    if (
-        typeof storedObject._links !== "undefined" &&
-        typeof storedObject._links.downloadLink !== "undefined"
-    ) {
-        downloadInfo = storedObject._links.downloadLink;
-    } else {
-        downloadInfo = await download_info_link(
-            storedObject,
-            atVersionToDownload,
-        );
-    }
+  // sometimes, the downloadInfo may be embedded into the storedObject
+  console.log("storedObject", storedObject);
+  let downloadInfo;
+  if (
+    typeof storedObject._links !== "undefined" &&
+    typeof storedObject._links.downloadLink !== "undefined"
+  ) {
+    downloadInfo = storedObject._links.downloadLink;
+  } else {
+    downloadInfo = await download_info_link(storedObject, atVersionToDownload);
+  }
 
-    const rawResponse = await window.fetch(downloadInfo.url);
+  const rawResponse = await window.fetch(downloadInfo.url);
 
-    if (!rawResponse.ok) {
-        throw new Error(
-            "error while downloading raw file " +
-                rawResponse.status +
-                " " +
-                rawResponse.statusText,
-        );
-    }
+  if (!rawResponse.ok) {
+    throw new Error(
+      "error while downloading raw file " +
+        rawResponse.status +
+        " " +
+        rawResponse.statusText,
+    );
+  }
 
-    if (atVersionToDownload.iv.length === 0) {
-        return rawResponse.blob();
-    }
+  if (atVersionToDownload.iv.length === 0) {
+    return rawResponse.blob();
+  }
 
-    const rawBuffer = await rawResponse.arrayBuffer();
-    try {
-        const key = await window.crypto.subtle.importKey(
-            "jwk",
-            atVersionToDownload.keyInfos,
-            { name: algo },
-            false,
-            ["decrypt"],
-        );
-        const iv = Uint8Array.from(atVersionToDownload.iv);
-        const decrypted = await window.crypto.subtle.decrypt(
-            { name: algo, iv: iv },
-            key,
-            rawBuffer,
-        );
+  const rawBuffer = await rawResponse.arrayBuffer();
+  try {
+    const key = await window.crypto.subtle.importKey(
+      "jwk",
+      atVersionToDownload.keyInfos,
+      { name: algo },
+      false,
+      ["decrypt"],
+    );
+    const iv = Uint8Array.from(atVersionToDownload.iv);
+    const decrypted = await window.crypto.subtle.decrypt(
+      { name: algo, iv: iv },
+      key,
+      rawBuffer,
+    );
 
-        return Promise.resolve(new Blob([decrypted]));
-    } catch (e) {
-        console.error("encounter error while keys and decrypt operations");
-        console.error(e);
+    return Promise.resolve(new Blob([decrypted]));
+  } catch (e) {
+    console.error("encounter error while keys and decrypt operations");
+    console.error(e);
 
-        throw e;
-    }
+    throw e;
+  }
 }
 
 /**
@@ -239,48 +234,45 @@ async function download_and_decrypt_doc(
  * storage.
  */
 async function download_doc_as_pdf(storedObject: StoredObject): Promise<Blob> {
-    if (null === storedObject.currentVersion) {
-        throw new Error("the stored object does not count any version");
-    }
+  if (null === storedObject.currentVersion) {
+    throw new Error("the stored object does not count any version");
+  }
 
-    if (storedObject.currentVersion?.type === "application/pdf") {
-        return download_and_decrypt_doc(
-            storedObject,
-            storedObject.currentVersion,
-        );
-    }
+  if (storedObject.currentVersion?.type === "application/pdf") {
+    return download_and_decrypt_doc(storedObject, storedObject.currentVersion);
+  }
 
-    const convertLink = build_convert_link(storedObject.uuid);
-    const response = await fetch(convertLink);
+  const convertLink = build_convert_link(storedObject.uuid);
+  const response = await fetch(convertLink);
 
-    if (!response.ok) {
-        throw new Error("Could not convert the document: " + response.status);
-    }
+  if (!response.ok) {
+    throw new Error("Could not convert the document: " + response.status);
+  }
 
-    return response.blob();
+  return response.blob();
 }
 
 async function is_object_ready(
-    storedObject: StoredObject,
+  storedObject: StoredObject,
 ): Promise<StoredObjectStatusChange> {
-    const new_status_response = await window.fetch(
-        `/api/1.0/doc-store/stored-object/${storedObject.uuid}/is-ready`,
-    );
+  const new_status_response = await window.fetch(
+    `/api/1.0/doc-store/stored-object/${storedObject.uuid}/is-ready`,
+  );
 
-    if (!new_status_response.ok) {
-        throw new Error("could not fetch the new status");
-    }
+  if (!new_status_response.ok) {
+    throw new Error("could not fetch the new status");
+  }
 
-    return await new_status_response.json();
+  return await new_status_response.json();
 }
 
 export {
-    build_convert_link,
-    build_wopi_editor_link,
-    download_and_decrypt_doc,
-    download_doc,
-    download_doc_as_pdf,
-    is_extension_editable,
-    is_extension_viewable,
-    is_object_ready,
+  build_convert_link,
+  build_wopi_editor_link,
+  download_and_decrypt_doc,
+  download_doc,
+  download_doc_as_pdf,
+  is_extension_editable,
+  is_extension_viewable,
+  is_object_ready,
 };
diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/js/date.ts b/src/Bundle/ChillMainBundle/Resources/public/chill/js/date.ts
index 8a0d7cce0..233d802a0 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/js/date.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/js/date.ts
@@ -13,15 +13,15 @@
  *
  */
 export const dateToISO = (date: Date | null): string | null => {
-    if (null === date) {
-        return null;
-    }
+  if (null === date) {
+    return null;
+  }
 
-    return [
-        date.getFullYear(),
-        (date.getMonth() + 1).toString().padStart(2, "0"),
-        date.getDate().toString().padStart(2, "0"),
-    ].join("-");
+  return [
+    date.getFullYear(),
+    (date.getMonth() + 1).toString().padStart(2, "0"),
+    date.getDate().toString().padStart(2, "0"),
+  ].join("-");
 };
 
 /**
@@ -30,16 +30,16 @@ export const dateToISO = (date: Date | null): string | null => {
  * **Experimental**
  */
 export const ISOToDate = (str: string | null): Date | null => {
-    if (null === str) {
-        return null;
-    }
-    if ("" === str.trim()) {
-        return null;
-    }
+  if (null === str) {
+    return null;
+  }
+  if ("" === str.trim()) {
+    return null;
+  }
 
-    const [year, month, day] = str.split("-").map((p) => parseInt(p));
+  const [year, month, day] = str.split("-").map((p) => parseInt(p));
 
-    return new Date(year, month - 1, day, 0, 0, 0, 0);
+  return new Date(year, month - 1, day, 0, 0, 0, 0);
 };
 
 /**
@@ -47,21 +47,19 @@ export const ISOToDate = (str: string | null): Date | null => {
  *
  */
 export const ISOToDatetime = (str: string | null): Date | null => {
-    if (null === str) {
-        return null;
-    }
+  if (null === str) {
+    return null;
+  }
 
-    const [cal, times] = str.split("T"),
-        [year, month, date] = cal.split("-").map((s) => parseInt(s)),
-        [time, timezone] = times.split(times.charAt(8)),
-        [hours, minutes, seconds] = time.split(":").map((s) => parseInt(s));
-    if ("0000" === timezone) {
-        return new Date(
-            Date.UTC(year, month - 1, date, hours, minutes, seconds),
-        );
-    }
+  const [cal, times] = str.split("T"),
+    [year, month, date] = cal.split("-").map((s) => parseInt(s)),
+    [time, timezone] = times.split(times.charAt(8)),
+    [hours, minutes, seconds] = time.split(":").map((s) => parseInt(s));
+  if ("0000" === timezone) {
+    return new Date(Date.UTC(year, month - 1, date, hours, minutes, seconds));
+  }
 
-    return new Date(year, month - 1, date, hours, minutes, seconds);
+  return new Date(year, month - 1, date, hours, minutes, seconds);
 };
 
 /**
@@ -69,96 +67,94 @@ export const ISOToDatetime = (str: string | null): Date | null => {
  *
  */
 export const datetimeToISO = (date: Date): string => {
-    let cal, time, offset;
-    cal = [
-        date.getFullYear(),
-        (date.getMonth() + 1).toString().padStart(2, "0"),
-        date.getDate().toString().padStart(2, "0"),
-    ].join("-");
+  let cal, time, offset;
+  cal = [
+    date.getFullYear(),
+    (date.getMonth() + 1).toString().padStart(2, "0"),
+    date.getDate().toString().padStart(2, "0"),
+  ].join("-");
 
-    time = [
-        date.getHours().toString().padStart(2, "0"),
-        date.getMinutes().toString().padStart(2, "0"),
-        date.getSeconds().toString().padStart(2, "0"),
-    ].join(":");
+  time = [
+    date.getHours().toString().padStart(2, "0"),
+    date.getMinutes().toString().padStart(2, "0"),
+    date.getSeconds().toString().padStart(2, "0"),
+  ].join(":");
 
-    offset = [
-        date.getTimezoneOffset() <= 0 ? "+" : "-",
-        Math.abs(Math.floor(date.getTimezoneOffset() / 60))
-            .toString()
-            .padStart(2, "0"),
-        ":",
-        Math.abs(date.getTimezoneOffset() % 60)
-            .toString()
-            .padStart(2, "0"),
-    ].join("");
+  offset = [
+    date.getTimezoneOffset() <= 0 ? "+" : "-",
+    Math.abs(Math.floor(date.getTimezoneOffset() / 60))
+      .toString()
+      .padStart(2, "0"),
+    ":",
+    Math.abs(date.getTimezoneOffset() % 60)
+      .toString()
+      .padStart(2, "0"),
+  ].join("");
 
-    const x = cal + "T" + time + offset;
+  const x = cal + "T" + time + offset;
 
-    return x;
+  return x;
 };
 
 export const intervalDaysToISO = (days: number | string | null): string => {
-    if (null === days) {
-        return "P0D";
-    }
+  if (null === days) {
+    return "P0D";
+  }
 
-    return `P${days}D`;
+  return `P${days}D`;
 };
 
 export const intervalISOToDays = (str: string | null): number | null => {
-    if (null === str) {
-        return null;
-    }
+  if (null === str) {
+    return null;
+  }
 
-    if ("" === str.trim()) {
-        return null;
-    }
+  if ("" === str.trim()) {
+    return null;
+  }
 
-    let days = 0;
-    let isDate = true;
-    let vstring = "";
-    for (let i = 0; i < str.length; i = i + 1) {
-        if (!isDate) {
-            continue;
-        }
-        switch (str.charAt(i)) {
-            case "P":
-                isDate = true;
-                break;
-            case "T":
-                isDate = false;
-                break;
-            case "0":
-            case "1":
-            case "2":
-            case "3":
-            case "4":
-            case "5":
-            case "6":
-            case "7":
-            case "8":
-            case "9":
-                vstring = vstring + str.charAt(i);
-                break;
-            case "Y":
-                days = days + Number.parseInt(vstring) * 365;
-                vstring = "";
-                break;
-            case "M":
-                days = days + Number.parseInt(vstring) * 30;
-                vstring = "";
-                break;
-            case "D":
-                days = days + Number.parseInt(vstring);
-                vstring = "";
-                break;
-            default:
-                throw Error(
-                    "this character should not appears: " + str.charAt(i),
-                );
-        }
+  let days = 0;
+  let isDate = true;
+  let vstring = "";
+  for (let i = 0; i < str.length; i = i + 1) {
+    if (!isDate) {
+      continue;
     }
+    switch (str.charAt(i)) {
+      case "P":
+        isDate = true;
+        break;
+      case "T":
+        isDate = false;
+        break;
+      case "0":
+      case "1":
+      case "2":
+      case "3":
+      case "4":
+      case "5":
+      case "6":
+      case "7":
+      case "8":
+      case "9":
+        vstring = vstring + str.charAt(i);
+        break;
+      case "Y":
+        days = days + Number.parseInt(vstring) * 365;
+        vstring = "";
+        break;
+      case "M":
+        days = days + Number.parseInt(vstring) * 30;
+        vstring = "";
+        break;
+      case "D":
+        days = days + Number.parseInt(vstring);
+        vstring = "";
+        break;
+      default:
+        throw Error("this character should not appears: " + str.charAt(i));
+    }
+  }
 
-    return days;
+  return days;
 };
diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/api/address.ts b/src/Bundle/ChillMainBundle/Resources/public/lib/api/address.ts
index 896cbd323..864f6cd52 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/lib/api/address.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/api/address.ts
@@ -1,61 +1,61 @@
 import {
-    Address,
-    GeographicalUnitLayer,
-    SimpleGeographicalUnit,
+  Address,
+  GeographicalUnitLayer,
+  SimpleGeographicalUnit,
 } from "../../types";
 import { fetchResults, makeFetch } from "./apiMethods";
 
 export const getAddressById = async (address_id: number): Promise<Address> => {
-    const url = `/api/1.0/main/address/${address_id}.json`;
+  const url = `/api/1.0/main/address/${address_id}.json`;
 
-    const response = await fetch(url);
+  const response = await fetch(url);
 
-    if (response.ok) {
-        return response.json();
-    }
+  if (response.ok) {
+    return response.json();
+  }
 
-    throw Error("Error with request resource response");
+  throw Error("Error with request resource response");
 };
 
 export const getGeographicalUnitsByAddress = async (
-    address: Address,
+  address: Address,
 ): Promise<SimpleGeographicalUnit[]> => {
-    return fetchResults<SimpleGeographicalUnit>(
-        `/api/1.0/main/geographical-unit/by-address/${address.address_id}.json`,
-    );
+  return fetchResults<SimpleGeographicalUnit>(
+    `/api/1.0/main/geographical-unit/by-address/${address.address_id}.json`,
+  );
 };
 
 export const getAllGeographicalUnitLayers = async (): Promise<
-    GeographicalUnitLayer[]
+  GeographicalUnitLayer[]
 > => {
-    return fetchResults<GeographicalUnitLayer>(
-        `/api/1.0/main/geographical-unit-layer.json`,
-    );
+  return fetchResults<GeographicalUnitLayer>(
+    `/api/1.0/main/geographical-unit-layer.json`,
+  );
 };
 
 export const syncAddressWithReference = async (
-    address: Address,
+  address: Address,
 ): Promise<Address> => {
-    return makeFetch<null, Address>(
-        "POST",
-        `/api/1.0/main/address/reference-match/${address.address_id}/sync-with-reference`,
-    );
+  return makeFetch<null, Address>(
+    "POST",
+    `/api/1.0/main/address/reference-match/${address.address_id}/sync-with-reference`,
+  );
 };
 
 export const markAddressReviewed = async (
-    address: Address,
+  address: Address,
 ): Promise<Address> => {
-    return makeFetch<null, Address>(
-        "POST",
-        `/api/1.0/main/address/reference-match/${address.address_id}/set/reviewed`,
-    );
+  return makeFetch<null, Address>(
+    "POST",
+    `/api/1.0/main/address/reference-match/${address.address_id}/set/reviewed`,
+  );
 };
 
 export const markAddressToReview = async (
-    address: Address,
+  address: Address,
 ): Promise<Address> => {
-    return makeFetch<null, Address>(
-        "POST",
-        `/api/1.0/main/address/reference-match/${address.address_id}/set/to_review`,
-    );
+  return makeFetch<null, Address>(
+    "POST",
+    `/api/1.0/main/address/reference-match/${address.address_id}/set/to_review`,
+  );
 };
diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.ts b/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.ts
index e8256b348..9bfb952b5 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.ts
@@ -6,57 +6,57 @@ export type fetchOption = Record<string, boolean | string | number | null>;
 export type Params = Record<string, number | string>;
 
 export interface PaginationResponse<T> {
-    pagination: {
-        more: boolean;
-        items_per_page: number;
-    };
-    results: T[];
-    count: number;
+  pagination: {
+    more: boolean;
+    items_per_page: number;
+  };
+  results: T[];
+  count: number;
 }
 
 export type FetchParams = Record<string, string | number | null>;
 
 export interface TransportExceptionInterface {
-    name: string;
+  name: string;
 }
 
 export interface ValidationExceptionInterface
-    extends TransportExceptionInterface {
-    name: "ValidationException";
-    error: object;
-    violations: string[];
-    titles: string[];
-    propertyPaths: string[];
+  extends TransportExceptionInterface {
+  name: "ValidationException";
+  error: object;
+  violations: string[];
+  titles: string[];
+  propertyPaths: string[];
 }
 
 export interface ValidationErrorResponse extends TransportExceptionInterface {
-    violations: {
-        title: string;
-        propertyPath: string;
-    }[];
+  violations: {
+    title: string;
+    propertyPath: string;
+  }[];
 }
 
 export interface AccessExceptionInterface extends TransportExceptionInterface {
-    name: "AccessException";
-    violations: string[];
+  name: "AccessException";
+  violations: string[];
 }
 
 export interface NotFoundExceptionInterface
-    extends TransportExceptionInterface {
-    name: "NotFoundException";
+  extends TransportExceptionInterface {
+  name: "NotFoundException";
 }
 
 export interface ServerExceptionInterface extends TransportExceptionInterface {
-    name: "ServerException";
-    message: string;
-    code: number;
-    body: string;
+  name: "ServerException";
+  message: string;
+  code: number;
+  body: string;
 }
 
 export interface ConflictHttpExceptionInterface
-    extends TransportExceptionInterface {
-    name: "ConflictHttpException";
-    violations: string[];
+  extends TransportExceptionInterface {
+  name: "ConflictHttpException";
+  violations: string[];
 }
 
 /**
@@ -66,223 +66,223 @@ export interface ConflictHttpExceptionInterface
  * and use of the @link{fetchResults} method.
  */
 export const makeFetch = <Input, Output>(
-    method: "POST" | "GET" | "PUT" | "PATCH" | "DELETE",
-    url: string,
-    body?: body | Input | null,
-    options?: FetchParams,
+  method: "POST" | "GET" | "PUT" | "PATCH" | "DELETE",
+  url: string,
+  body?: body | Input | null,
+  options?: FetchParams,
 ): Promise<Output> => {
-    let opts = {
-        method: method,
-        headers: {
-            "Content-Type": "application/json;charset=utf-8",
-        },
+  let opts = {
+    method: method,
+    headers: {
+      "Content-Type": "application/json;charset=utf-8",
+    },
+  };
+
+  if (body !== null && typeof body !== "undefined") {
+    Object.assign(opts, { body: JSON.stringify(body) });
+  }
+
+  if (typeof options !== "undefined") {
+    opts = Object.assign(opts, options);
+  }
+  return fetch(url, opts).then((response) => {
+    if (response.status === 204) {
+      return Promise.resolve();
+    }
+
+    if (response.ok) {
+      return response.json();
+    }
+
+    if (response.status === 422) {
+      return response.json().then((response) => {
+        throw ValidationException(response);
+      });
+    }
+
+    if (response.status === 403) {
+      throw AccessException(response);
+    }
+
+    if (response.status === 409) {
+      throw ConflictHttpException(response);
+    }
+
+    throw {
+      name: "Exception",
+      sta: response.status,
+      txt: response.statusText,
+      err: new Error(),
+      violations: response.body,
     };
-
-    if (body !== null && typeof body !== "undefined") {
-        Object.assign(opts, { body: JSON.stringify(body) });
-    }
-
-    if (typeof options !== "undefined") {
-        opts = Object.assign(opts, options);
-    }
-    return fetch(url, opts).then((response) => {
-        if (response.status === 204) {
-            return Promise.resolve();
-        }
-
-        if (response.ok) {
-            return response.json();
-        }
-
-        if (response.status === 422) {
-            return response.json().then((response) => {
-                throw ValidationException(response);
-            });
-        }
-
-        if (response.status === 403) {
-            throw AccessException(response);
-        }
-
-        if (response.status === 409) {
-            throw ConflictHttpException(response);
-        }
-
-        throw {
-            name: "Exception",
-            sta: response.status,
-            txt: response.statusText,
-            err: new Error(),
-            violations: response.body,
-        };
-    });
+  });
 };
 
 /**
  * Fetch results with certain parameters
  */
 function _fetchAction<T>(
-    page: number,
-    uri: string,
-    params?: FetchParams,
+  page: number,
+  uri: string,
+  params?: FetchParams,
 ): Promise<PaginationResponse<T>> {
-    const item_per_page = 50;
+  const item_per_page = 50;
 
-    const searchParams = new URLSearchParams();
-    searchParams.append("item_per_page", item_per_page.toString());
-    searchParams.append("page", page.toString());
+  const searchParams = new URLSearchParams();
+  searchParams.append("item_per_page", item_per_page.toString());
+  searchParams.append("page", page.toString());
 
-    if (params !== undefined) {
-        Object.keys(params).forEach((key) => {
-            const v = params[key];
-            if (typeof v === "string") {
-                searchParams.append(key, v);
-            } else if (typeof v === "number") {
-                searchParams.append(key, v.toString());
-            } else if (v === null) {
-                searchParams.append(key, "");
-            }
+  if (params !== undefined) {
+    Object.keys(params).forEach((key) => {
+      const v = params[key];
+      if (typeof v === "string") {
+        searchParams.append(key, v);
+      } else if (typeof v === "number") {
+        searchParams.append(key, v.toString());
+      } else if (v === null) {
+        searchParams.append(key, "");
+      }
+    });
+  }
+
+  const url = uri + "?" + searchParams.toString();
+
+  return fetch(url, {
+    method: "GET",
+    headers: {
+      "Content-Type": "application/json;charset=utf-8",
+    },
+  })
+    .then((response) => {
+      if (response.ok) {
+        return response.json();
+      }
+
+      if (response.status === 404) {
+        throw NotFoundException(response);
+      }
+
+      if (response.status === 422) {
+        return response.json().then((response) => {
+          throw ValidationException(response);
         });
-    }
+      }
 
-    const url = uri + "?" + searchParams.toString();
+      if (response.status === 403) {
+        throw AccessException(response);
+      }
 
-    return fetch(url, {
-        method: "GET",
-        headers: {
-            "Content-Type": "application/json;charset=utf-8",
-        },
+      if (response.status >= 500) {
+        return response.text().then((body) => {
+          throw ServerException(response.status, body);
+        });
+      }
+
+      throw new Error("other network error");
     })
-        .then((response) => {
-            if (response.ok) {
-                return response.json();
-            }
-
-            if (response.status === 404) {
-                throw NotFoundException(response);
-            }
-
-            if (response.status === 422) {
-                return response.json().then((response) => {
-                    throw ValidationException(response);
-                });
-            }
-
-            if (response.status === 403) {
-                throw AccessException(response);
-            }
-
-            if (response.status >= 500) {
-                return response.text().then((body) => {
-                    throw ServerException(response.status, body);
-                });
-            }
-
-            throw new Error("other network error");
-        })
-        .catch(
-            (
-                reason:
-                    | NotFoundExceptionInterface
-                    | ServerExceptionInterface
-                    | ValidationExceptionInterface
-                    | TransportExceptionInterface,
-            ) => {
-                console.error(reason);
-                throw reason;
-            },
-        );
+    .catch(
+      (
+        reason:
+          | NotFoundExceptionInterface
+          | ServerExceptionInterface
+          | ValidationExceptionInterface
+          | TransportExceptionInterface,
+      ) => {
+        console.error(reason);
+        throw reason;
+      },
+    );
 }
 
 export const fetchResults = async <T>(
-    uri: string,
-    params?: FetchParams,
+  uri: string,
+  params?: FetchParams,
 ): Promise<T[]> => {
-    const promises: Promise<T[]>[] = [];
-    let page = 1;
-    const firstData: PaginationResponse<T> = (await _fetchAction(
-        page,
-        uri,
-        params,
-    )) as PaginationResponse<T>;
+  const promises: Promise<T[]>[] = [];
+  let page = 1;
+  const firstData: PaginationResponse<T> = (await _fetchAction(
+    page,
+    uri,
+    params,
+  )) as PaginationResponse<T>;
 
-    promises.push(Promise.resolve(firstData.results));
+  promises.push(Promise.resolve(firstData.results));
 
-    if (firstData.pagination.more) {
-        do {
-            page = ++page;
-            promises.push(
-                _fetchAction<T>(page, uri, params).then((r) =>
-                    Promise.resolve(r.results),
-                ),
-            );
-        } while (page * firstData.pagination.items_per_page < firstData.count);
-    }
+  if (firstData.pagination.more) {
+    do {
+      page = ++page;
+      promises.push(
+        _fetchAction<T>(page, uri, params).then((r) =>
+          Promise.resolve(r.results),
+        ),
+      );
+    } while (page * firstData.pagination.items_per_page < firstData.count);
+  }
 
-    return Promise.all(promises).then((values) => values.flat());
+  return Promise.all(promises).then((values) => values.flat());
 };
 
 export const fetchScopes = (): Promise<Scope[]> => {
-    return fetchResults("/api/1.0/main/scope.json");
+  return fetchResults("/api/1.0/main/scope.json");
 };
 
 /**
  * Error objects to be thrown
  */
 const ValidationException = (
-    response: ValidationErrorResponse,
+  response: ValidationErrorResponse,
 ): ValidationExceptionInterface => {
-    const error = {} as ValidationExceptionInterface;
-    error.name = "ValidationException";
-    error.violations = response.violations.map(
-        (violation) => `${violation.title}: ${violation.propertyPath}`,
-    );
-    error.titles = response.violations.map((violation) => violation.title);
-    error.propertyPaths = response.violations.map(
-        (violation) => violation.propertyPath,
-    );
-    return error;
+  const error = {} as ValidationExceptionInterface;
+  error.name = "ValidationException";
+  error.violations = response.violations.map(
+    (violation) => `${violation.title}: ${violation.propertyPath}`,
+  );
+  error.titles = response.violations.map((violation) => violation.title);
+  error.propertyPaths = response.violations.map(
+    (violation) => violation.propertyPath,
+  );
+  return error;
 };
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const AccessException = (response: Response): AccessExceptionInterface => {
-    const error = {} as AccessExceptionInterface;
-    error.name = "AccessException";
-    error.violations = ["You are not allowed to perform this action"];
+  const error = {} as AccessExceptionInterface;
+  error.name = "AccessException";
+  error.violations = ["You are not allowed to perform this action"];
 
-    return error;
+  return error;
 };
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const NotFoundException = (response: Response): NotFoundExceptionInterface => {
-    const error = {} as NotFoundExceptionInterface;
-    error.name = "NotFoundException";
+  const error = {} as NotFoundExceptionInterface;
+  error.name = "NotFoundException";
 
-    return error;
+  return error;
 };
 
 const ServerException = (
-    code: number,
-    body: string,
+  code: number,
+  body: string,
 ): ServerExceptionInterface => {
-    const error = {} as ServerExceptionInterface;
-    error.name = "ServerException";
-    error.code = code;
-    error.body = body;
+  const error = {} as ServerExceptionInterface;
+  error.name = "ServerException";
+  error.code = code;
+  error.body = body;
 
-    return error;
+  return error;
 };
 
 const ConflictHttpException = (
-    // eslint-disable-next-line @typescript-eslint/no-unused-vars
-    response: Response,
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  response: Response,
 ): ConflictHttpExceptionInterface => {
-    const error = {} as ConflictHttpExceptionInterface;
+  const error = {} as ConflictHttpExceptionInterface;
 
-    error.name = "ConflictHttpException";
-    error.violations = [
-        "Sorry, but someone else has already changed this entity. Please refresh the page and apply the changes again",
-    ];
+  error.name = "ConflictHttpException";
+  error.violations = [
+    "Sorry, but someone else has already changed this entity. Please refresh the page and apply the changes again",
+  ];
 
-    return error;
+  return error;
 };
diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/api/export.ts b/src/Bundle/ChillMainBundle/Resources/public/lib/api/export.ts
index 7e350b102..6e66122e7 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/lib/api/export.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/api/export.ts
@@ -2,17 +2,17 @@ import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
 import { ExportGeneration } from "ChillMainAssets/types";
 
 export const fetchExportGenerationStatus = async (
-    exportGenerationId: string,
+  exportGenerationId: string,
 ): Promise<ExportGeneration> =>
-    makeFetch(
-        "GET",
-        `/api/1.0/main/export-generation/${exportGenerationId}/object`,
-    );
+  makeFetch(
+    "GET",
+    `/api/1.0/main/export-generation/${exportGenerationId}/object`,
+  );
 
 export const generateFromSavedExport = async (
-    savedExportUuid: string,
+  savedExportUuid: string,
 ): Promise<ExportGeneration> =>
-    makeFetch(
-        "POST",
-        `/api/1.0/main/export/export-generation/create-from-saved-export/${savedExportUuid}`,
-    );
+  makeFetch(
+    "POST",
+    `/api/1.0/main/export/export-generation/create-from-saved-export/${savedExportUuid}`,
+  );
diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/api/locations.ts b/src/Bundle/ChillMainBundle/Resources/public/lib/api/locations.ts
index 3c326ba78..375881924 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/lib/api/locations.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/api/locations.ts
@@ -2,7 +2,7 @@ import { fetchResults } from "./apiMethods";
 import { Location, LocationType } from "../../types";
 
 export const getLocations = (): Promise<Location[]> =>
-    fetchResults("/api/1.0/main/location.json");
+  fetchResults("/api/1.0/main/location.json");
 
 export const getLocationTypes = (): Promise<LocationType[]> =>
-    fetchResults("/api/1.0/main/location-type.json");
+  fetchResults("/api/1.0/main/location-type.json");
diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/api/return_path.ts b/src/Bundle/ChillMainBundle/Resources/public/lib/api/return_path.ts
index e444aa2e5..54a12c030 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/lib/api/return_path.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/api/return_path.ts
@@ -1,3 +1,3 @@
 export function buildReturnPath(location: Location): string {
-    return location.pathname + location.search;
+  return location.pathname + location.search;
 }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/api/user.ts b/src/Bundle/ChillMainBundle/Resources/public/lib/api/user.ts
index 62703b740..e51d09abb 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/lib/api/user.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/api/user.ts
@@ -2,23 +2,23 @@ import { User } from "../../types";
 import { makeFetch } from "./apiMethods";
 
 export const whoami = (): Promise<User> => {
-    const url = `/api/1.0/main/whoami.json`;
-    return fetch(url).then((response) => {
-        if (response.ok) {
-            return response.json();
-        }
-        throw {
-            msg: "Error while getting whoami.",
-            sta: response.status,
-            txt: response.statusText,
-            err: new Error(),
-            body: response.body,
-        };
-    });
+  const url = `/api/1.0/main/whoami.json`;
+  return fetch(url).then((response) => {
+    if (response.ok) {
+      return response.json();
+    }
+    throw {
+      msg: "Error while getting whoami.",
+      sta: response.status,
+      txt: response.statusText,
+      err: new Error(),
+      body: response.body,
+    };
+  });
 };
 
 export const whereami = (): Promise<Location | null> => {
-    const url = `/api/1.0/main/user-current-location.json`;
+  const url = `/api/1.0/main/user-current-location.json`;
 
-    return makeFetch<null, Location | null>("GET", url);
+  return makeFetch<null, Location | null>("GET", url);
 };
diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/entity-notification/api.ts b/src/Bundle/ChillMainBundle/Resources/public/lib/entity-notification/api.ts
index 47cf9b1e9..97ba98d75 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/lib/entity-notification/api.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/entity-notification/api.ts
@@ -1,22 +1,22 @@
 const buildLinkCreate = function (
-    relatedEntityClass: string,
-    relatedEntityId: number,
-    to: number | null,
-    returnPath: string | null,
+  relatedEntityClass: string,
+  relatedEntityId: number,
+  to: number | null,
+  returnPath: string | null,
 ): string {
-    const params = new URLSearchParams();
-    params.append("entityClass", relatedEntityClass);
-    params.append("entityId", relatedEntityId.toString());
+  const params = new URLSearchParams();
+  params.append("entityClass", relatedEntityClass);
+  params.append("entityId", relatedEntityId.toString());
 
-    if (null !== to) {
-        params.append("tos[0]", to.toString());
-    }
+  if (null !== to) {
+    params.append("tos[0]", to.toString());
+  }
 
-    if (null !== returnPath) {
-        params.append("returnPath", returnPath);
-    }
+  if (null !== returnPath) {
+    params.append("returnPath", returnPath);
+  }
 
-    return `/fr/notification/create?${params.toString()}`;
+  return `/fr/notification/create?${params.toString()}`;
 };
 
 export { buildLinkCreate };
diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/entity-workflow/api.ts b/src/Bundle/ChillMainBundle/Resources/public/lib/entity-workflow/api.ts
index a9955f31b..4f9dea715 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/lib/entity-workflow/api.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/entity-workflow/api.ts
@@ -10,17 +10,17 @@
  * @throws {Error} If the related entity ID is undefined.
  */
 export const buildLinkCreate = (
-    workflowName: string,
-    relatedEntityClass: string,
-    relatedEntityId: number | undefined,
+  workflowName: string,
+  relatedEntityClass: string,
+  relatedEntityId: number | undefined,
 ): string => {
-    if (typeof relatedEntityId === "undefined") {
-        throw new Error("the related entity id is not set");
-    }
-    const params = new URLSearchParams();
-    params.set("entityClass", relatedEntityClass);
-    params.set("entityId", relatedEntityId.toString(10));
-    params.set("workflow", workflowName);
+  if (typeof relatedEntityId === "undefined") {
+    throw new Error("the related entity id is not set");
+  }
+  const params = new URLSearchParams();
+  params.set("entityClass", relatedEntityClass);
+  params.set("entityId", relatedEntityId.toString(10));
+  params.set("workflow", workflowName);
 
-    return `/fr/main/workflow/create?` + params.toString();
+  return `/fr/main/workflow/create?` + params.toString();
 };
diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/localizationHelper/localizationHelper.ts b/src/Bundle/ChillMainBundle/Resources/public/lib/localizationHelper/localizationHelper.ts
index 9cd1dcb51..b2fa260d2 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/lib/localizationHelper/localizationHelper.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/localizationHelper/localizationHelper.ts
@@ -9,33 +9,33 @@ import { TranslatableString } from "ChillMainAssets/types";
  * @returns The localized string or null if no translation is available
  */
 export function localizeString(
-    translatableString: TranslatableString | null | undefined,
-    locale?: string,
+  translatableString: TranslatableString | null | undefined,
+  locale?: string,
 ): string {
-    if (!translatableString || Object.keys(translatableString).length === 0) {
-        return "";
-    }
-
-    const currentLocale = locale || navigator.language.split("-")[0] || "fr";
-
-    if (translatableString[currentLocale]) {
-        return translatableString[currentLocale];
-    }
-
-    // Define fallback locales
-    const fallbackLocales: string[] = ["fr", "en"];
-
-    for (const fallbackLocale of fallbackLocales) {
-        if (translatableString[fallbackLocale]) {
-            return translatableString[fallbackLocale];
-        }
-    }
-
-    // No fallback translation found, use the first available
-    const availableLocales = Object.keys(translatableString);
-    if (availableLocales.length > 0) {
-        return translatableString[availableLocales[0]];
-    }
-
+  if (!translatableString || Object.keys(translatableString).length === 0) {
     return "";
+  }
+
+  const currentLocale = locale || navigator.language.split("-")[0] || "fr";
+
+  if (translatableString[currentLocale]) {
+    return translatableString[currentLocale];
+  }
+
+  // Define fallback locales
+  const fallbackLocales: string[] = ["fr", "en"];
+
+  for (const fallbackLocale of fallbackLocales) {
+    if (translatableString[fallbackLocale]) {
+      return translatableString[fallbackLocale];
+    }
+  }
+
+  // No fallback translation found, use the first available
+  const availableLocales = Object.keys(translatableString);
+  if (availableLocales.length > 0) {
+    return translatableString[availableLocales[0]];
+  }
+
+  return "";
 }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/workflow/attachments.ts b/src/Bundle/ChillMainBundle/Resources/public/lib/workflow/attachments.ts
index 7e2f23f57..05c745099 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/lib/workflow/attachments.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/workflow/attachments.ts
@@ -3,20 +3,20 @@ import { GenericDocForAccompanyingPeriod } from "ChillDocStoreAssets/types/gener
 import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
 
 export const find_attachments_by_workflow = async (
-    workflowId: number,
+  workflowId: number,
 ): Promise<WorkflowAttachment[]> =>
-    makeFetch("GET", `/api/1.0/main/workflow/${workflowId}/attachment`);
+  makeFetch("GET", `/api/1.0/main/workflow/${workflowId}/attachment`);
 
 export const create_attachment = async (
-    workflowId: number,
-    genericDoc: GenericDocForAccompanyingPeriod,
+  workflowId: number,
+  genericDoc: GenericDocForAccompanyingPeriod,
 ): Promise<WorkflowAttachment> =>
-    makeFetch("POST", `/api/1.0/main/workflow/${workflowId}/attachment`, {
-        relatedGenericDocKey: genericDoc.key,
-        relatedGenericDocIdentifiers: genericDoc.identifiers,
-    });
+  makeFetch("POST", `/api/1.0/main/workflow/${workflowId}/attachment`, {
+    relatedGenericDocKey: genericDoc.key,
+    relatedGenericDocIdentifiers: genericDoc.identifiers,
+  });
 
 export const delete_attachment = async (
-    attachment: WorkflowAttachment,
+  attachment: WorkflowAttachment,
 ): Promise<void> =>
-    makeFetch("DELETE", `/api/1.0/main/workflow/attachment/${attachment.id}`);
+  makeFetch("DELETE", `/api/1.0/main/workflow/attachment/${attachment.id}`);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/address-details/index.ts b/src/Bundle/ChillMainBundle/Resources/public/module/address-details/index.ts
index abe516934..d41a70499 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/module/address-details/index.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/address-details/index.ts
@@ -7,43 +7,43 @@ import { Address } from "../../types";
 const i18n = _createI18n({});
 
 document
-    .querySelectorAll<HTMLSpanElement>("span[data-address-details]")
-    .forEach((el) => {
-        const dataset = el.dataset as {
-            addressId: string;
-            addressRefStatus: string;
+  .querySelectorAll<HTMLSpanElement>("span[data-address-details]")
+  .forEach((el) => {
+    const dataset = el.dataset as {
+      addressId: string;
+      addressRefStatus: string;
+    };
+
+    const app = createApp({
+      components: { AddressDetailsButton },
+      data() {
+        return {
+          addressId: Number.parseInt(dataset.addressId),
+          addressRefStatus: dataset.addressRefStatus,
         };
-
-        const app = createApp({
-            components: { AddressDetailsButton },
-            data() {
-                return {
-                    addressId: Number.parseInt(dataset.addressId),
-                    addressRefStatus: dataset.addressRefStatus,
-                };
-            },
-            template:
-                '<address-details-button :address_id="addressId" :address_ref_status="addressRefStatus" @update-address="onUpdateAddress"></address-details-button>',
-            methods: {
-                onUpdateAddress: (address: Address): void => {
-                    if (
-                        address.refStatus === "to_review" ||
-                        address.refStatus === "reviewed"
-                    ) {
-                        // in this two case, the address content do not change
-                        return;
-                    }
-                    if (
-                        window.confirm(
-                            "L'adresse a été modifiée. Vous pouvez continuer votre travail. Cependant, pour afficher les données immédiatement, veuillez recharger la page. \n\n Voulez-vous recharger la page immédiatement ?",
-                        )
-                    ) {
-                        window.location.reload();
-                    }
-                },
-            },
-        });
-
-        app.use(i18n);
-        app.mount(el);
+      },
+      template:
+        '<address-details-button :address_id="addressId" :address_ref_status="addressRefStatus" @update-address="onUpdateAddress"></address-details-button>',
+      methods: {
+        onUpdateAddress: (address: Address): void => {
+          if (
+            address.refStatus === "to_review" ||
+            address.refStatus === "reviewed"
+          ) {
+            // in this two case, the address content do not change
+            return;
+          }
+          if (
+            window.confirm(
+              "L'adresse a été modifiée. Vous pouvez continuer votre travail. Cependant, pour afficher les données immédiatement, veuillez recharger la page. \n\n Voulez-vous recharger la page immédiatement ?",
+            )
+          ) {
+            window.location.reload();
+          }
+        },
+      },
     });
+
+    app.use(i18n);
+    app.mount(el);
+  });
diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/ckeditor5/editor_config.ts b/src/Bundle/ChillMainBundle/Resources/public/module/ckeditor5/editor_config.ts
index a396da295..fbbbb5881 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/module/ckeditor5/editor_config.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/ckeditor5/editor_config.ts
@@ -1,16 +1,16 @@
 import {
-    Essentials,
-    Bold,
-    Italic,
-    Paragraph,
-    Markdown,
-    BlockQuote,
-    Heading,
-    Link,
-    List,
-    Emoji,
-    Mention,
-    Fullscreen,
+  Essentials,
+  Bold,
+  Italic,
+  Paragraph,
+  Markdown,
+  BlockQuote,
+  Heading,
+  Link,
+  List,
+  Emoji,
+  Mention,
+  Fullscreen,
 } from "ckeditor5";
 import coreTranslations from "ckeditor5/translations/fr.js";
 
@@ -19,41 +19,41 @@ import "ckeditor5/ckeditor5.css";
 import "./index.scss";
 
 export default {
-    plugins: [
-        Essentials,
-        Markdown,
-        Bold,
-        Italic,
-        BlockQuote,
-        Heading,
-        Link,
-        List,
-        Paragraph,
-        // both Emoji and Mention are required for Emoji feature
-        Emoji,
-        Mention,
-        // to enable fullscreen
-        Fullscreen,
+  plugins: [
+    Essentials,
+    Markdown,
+    Bold,
+    Italic,
+    BlockQuote,
+    Heading,
+    Link,
+    List,
+    Paragraph,
+    // both Emoji and Mention are required for Emoji feature
+    Emoji,
+    Mention,
+    // to enable fullscreen
+    Fullscreen,
+  ],
+  toolbar: {
+    items: [
+      "heading",
+      "|",
+      "bold",
+      "italic",
+      "link",
+      "bulletedList",
+      "numberedList",
+      "blockQuote",
+      "|",
+      "emoji",
+      "|",
+      "undo",
+      "redo",
+      "|",
+      "fullscreen",
     ],
-    toolbar: {
-        items: [
-            "heading",
-            "|",
-            "bold",
-            "italic",
-            "link",
-            "bulletedList",
-            "numberedList",
-            "blockQuote",
-            "|",
-            "emoji",
-            "|",
-            "undo",
-            "redo",
-            "|",
-            "fullscreen",
-        ],
-    },
-    translations: [coreTranslations],
-    licenseKey: "GPL",
+  },
+  translations: [coreTranslations],
+  licenseKey: "GPL",
 };
diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/ckeditor5/index.ts b/src/Bundle/ChillMainBundle/Resources/public/module/ckeditor5/index.ts
index 783c0acfa..f8e0cb48b 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/module/ckeditor5/index.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/ckeditor5/index.ts
@@ -2,31 +2,31 @@ import { createApp } from "vue";
 import CommentEditor from "ChillMainAssets/vuejs/_components/CommentEditor/CommentEditor.vue";
 
 const ckeditorFields: NodeListOf<HTMLTextAreaElement> =
-    document.querySelectorAll("textarea[ckeditor]");
+  document.querySelectorAll("textarea[ckeditor]");
 ckeditorFields.forEach((field: HTMLTextAreaElement): void => {
-    const content = field.value;
-    const div = document.createElement("div");
+  const content = field.value;
+  const div = document.createElement("div");
 
-    if (field.parentNode !== null) {
-        field.parentNode.insertBefore(div, field);
-    } else {
-        throw "parent is null";
-    }
+  if (field.parentNode !== null) {
+    field.parentNode.insertBefore(div, field);
+  } else {
+    throw "parent is null";
+  }
 
-    createApp({
-        components: { CommentEditor },
-        template: `<comment-editor v-model="content" @update:modelValue="handleInput"></comment-editor>`,
-        data() {
-            return {
-                content,
-            };
-        },
-        methods: {
-            handleInput() {
-                field.value = this.content;
-            },
-        },
-    }).mount(div);
+  createApp({
+    components: { CommentEditor },
+    template: `<comment-editor v-model="content" @update:modelValue="handleInput"></comment-editor>`,
+    data() {
+      return {
+        content,
+      };
+    },
+    methods: {
+      handleInput() {
+        field.value = this.content;
+      },
+    },
+  }).mount(div);
 
-    field.style.display = "none";
+  field.style.display = "none";
 });
diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/collection/index.ts b/src/Bundle/ChillMainBundle/Resources/public/module/collection/index.ts
index 77ff044ec..1c45f468d 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/module/collection/index.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/collection/index.ts
@@ -31,157 +31,157 @@
 import "./collection.scss";
 
 declare global {
-    interface GlobalEventHandlersEventMap {
-        "show-hide-show": CustomEvent<{
-            id: number;
-            froms: HTMLElement[];
-            container: HTMLElement;
-        }>;
-    }
+  interface GlobalEventHandlersEventMap {
+    "show-hide-show": CustomEvent<{
+      id: number;
+      froms: HTMLElement[];
+      container: HTMLElement;
+    }>;
+  }
 }
 
 export class CollectionEventPayload {
-    collection: HTMLUListElement;
-    entry: HTMLLIElement;
+  collection: HTMLUListElement;
+  entry: HTMLLIElement;
 
-    constructor(collection: HTMLUListElement, entry: HTMLLIElement) {
-        this.collection = collection;
-        this.entry = entry;
-    }
+  constructor(collection: HTMLUListElement, entry: HTMLLIElement) {
+    this.collection = collection;
+    this.entry = entry;
+  }
 }
 
 export const handleAdd = (button: any): void => {
-    const form_name = button.dataset.collectionAddTarget,
-        prototype = button.dataset.formPrototype,
-        collection: HTMLUListElement | null = document.querySelector(
-            'ul[data-collection-name="' + form_name + '"]',
-        );
+  const form_name = button.dataset.collectionAddTarget,
+    prototype = button.dataset.formPrototype,
+    collection: HTMLUListElement | null = document.querySelector(
+      'ul[data-collection-name="' + form_name + '"]',
+    );
 
-    if (collection === null) {
-        return;
+  if (collection === null) {
+    return;
+  }
+
+  const empty_explain: HTMLLIElement | null = collection.querySelector(
+      "li[data-collection-empty-explain]",
+    ),
+    entry = document.createElement("li"),
+    counter = collection.querySelectorAll("li.entry").length, // Updated counter logic
+    content = prototype.replace(/__name__/g, counter.toString()),
+    event = new CustomEvent("collection-add-entry", {
+      detail: new CollectionEventPayload(collection, entry),
+    });
+
+  console.log(counter);
+  console.log(content);
+
+  entry.innerHTML = content;
+  entry.classList.add("entry");
+
+  if ("collectionRegular" in collection.dataset) {
+    initializeRemove(collection, entry);
+    if (empty_explain !== null) {
+      empty_explain.remove();
     }
+  }
 
-    const empty_explain: HTMLLIElement | null = collection.querySelector(
-            "li[data-collection-empty-explain]",
-        ),
-        entry = document.createElement("li"),
-        counter = collection.querySelectorAll("li.entry").length, // Updated counter logic
-        content = prototype.replace(/__name__/g, counter.toString()),
-        event = new CustomEvent("collection-add-entry", {
-            detail: new CollectionEventPayload(collection, entry),
-        });
-
-    console.log(counter);
-    console.log(content);
-
-    entry.innerHTML = content;
-    entry.classList.add("entry");
-
-    if ("collectionRegular" in collection.dataset) {
-        initializeRemove(collection, entry);
-        if (empty_explain !== null) {
-            empty_explain.remove();
-        }
-    }
-
-    collection.appendChild(entry);
-    collection.dispatchEvent(event);
-    window.dispatchEvent(event);
+  collection.appendChild(entry);
+  collection.dispatchEvent(event);
+  window.dispatchEvent(event);
 };
 
 const initializeRemove = (
-    collection: HTMLUListElement,
-    entry: HTMLLIElement,
+  collection: HTMLUListElement,
+  entry: HTMLLIElement,
 ): void => {
-    const button = buildRemoveButton(collection, entry);
-    if (null === button) {
-        return;
-    }
-    entry.appendChild(button);
+  const button = buildRemoveButton(collection, entry);
+  if (null === button) {
+    return;
+  }
+  entry.appendChild(button);
 };
 
 export const buildRemoveButton = (
-    collection: HTMLUListElement,
-    entry: HTMLLIElement,
+  collection: HTMLUListElement,
+  entry: HTMLLIElement,
 ): HTMLButtonElement | null => {
-    const button = document.createElement("button"),
-        isPersisted = entry.dataset.collectionIsPersisted || "",
-        content = collection.dataset.collectionButtonRemoveLabel || "",
-        allowDelete = collection.dataset.collectionAllowDelete || "",
-        event = new CustomEvent("collection-remove-entry", {
-            detail: new CollectionEventPayload(collection, entry),
-        });
-
-    if (allowDelete === "0" && isPersisted === "1") {
-        return null;
-    }
-    button.classList.add("btn", "btn-delete", "remove-entry");
-    button.textContent = content;
-    button.addEventListener("click", (e: Event) => {
-        e.preventDefault();
-        entry.remove();
-        collection.dispatchEvent(event);
-        window.dispatchEvent(event);
+  const button = document.createElement("button"),
+    isPersisted = entry.dataset.collectionIsPersisted || "",
+    content = collection.dataset.collectionButtonRemoveLabel || "",
+    allowDelete = collection.dataset.collectionAllowDelete || "",
+    event = new CustomEvent("collection-remove-entry", {
+      detail: new CollectionEventPayload(collection, entry),
     });
 
-    return button;
+  if (allowDelete === "0" && isPersisted === "1") {
+    return null;
+  }
+  button.classList.add("btn", "btn-delete", "remove-entry");
+  button.textContent = content;
+  button.addEventListener("click", (e: Event) => {
+    e.preventDefault();
+    entry.remove();
+    collection.dispatchEvent(event);
+    window.dispatchEvent(event);
+  });
+
+  return button;
 };
 
 const collectionsInit = new Set<string>();
 const buttonsInit = new Set<string>();
 
 const initialize = function (target: Document | Element): void {
-    const addButtons: NodeListOf<HTMLButtonElement> = document.querySelectorAll(
-            "button[data-collection-add-target]",
-        ),
-        collections: NodeListOf<HTMLUListElement> = document.querySelectorAll(
-            "ul[data-collection-regular]",
-        );
+  const addButtons: NodeListOf<HTMLButtonElement> = document.querySelectorAll(
+      "button[data-collection-add-target]",
+    ),
+    collections: NodeListOf<HTMLUListElement> = document.querySelectorAll(
+      "ul[data-collection-regular]",
+    );
 
-    for (let i = 0; i < addButtons.length; i++) {
-        const addButton = addButtons[i];
-        const uniqid = addButton.dataset.uniqid as string;
-        if (buttonsInit.has(uniqid)) {
-            continue;
-        }
-        buttonsInit.add(uniqid);
-        addButton.addEventListener("click", (e: Event) => {
-            e.preventDefault();
-            handleAdd(e.target);
-        });
+  for (let i = 0; i < addButtons.length; i++) {
+    const addButton = addButtons[i];
+    const uniqid = addButton.dataset.uniqid as string;
+    if (buttonsInit.has(uniqid)) {
+      continue;
     }
-    for (let i = 0; i < collections.length; i++) {
-        const collection = collections[i];
-        const uniqid = collection.dataset.uniqid as string;
-        if (collectionsInit.has(uniqid)) {
-            continue;
-        }
-        collectionsInit.add(uniqid);
-        const entries: NodeListOf<HTMLLIElement> =
-            collection.querySelectorAll(":scope > li");
-        for (let j = 0; j < entries.length; j++) {
-            if (entries[j].dataset.collectionEmptyExplain === "1") {
-                continue;
-            }
-            initializeRemove(collections[i], entries[j]);
-        }
+    buttonsInit.add(uniqid);
+    addButton.addEventListener("click", (e: Event) => {
+      e.preventDefault();
+      handleAdd(e.target);
+    });
+  }
+  for (let i = 0; i < collections.length; i++) {
+    const collection = collections[i];
+    const uniqid = collection.dataset.uniqid as string;
+    if (collectionsInit.has(uniqid)) {
+      continue;
     }
+    collectionsInit.add(uniqid);
+    const entries: NodeListOf<HTMLLIElement> =
+      collection.querySelectorAll(":scope > li");
+    for (let j = 0; j < entries.length; j++) {
+      if (entries[j].dataset.collectionEmptyExplain === "1") {
+        continue;
+      }
+      initializeRemove(collections[i], entries[j]);
+    }
+  }
 };
 
 window.addEventListener("DOMContentLoaded", () => {
-    initialize(document);
+  initialize(document);
 });
 
 window.addEventListener(
-    "show-hide-show",
-    (
-        event: CustomEvent<{
-            id: number;
-            container: HTMLElement;
-            froms: HTMLElement[];
-        }>,
-    ) => {
-        const container = event.detail.container as HTMLElement;
-        initialize(container);
-    },
+  "show-hide-show",
+  (
+    event: CustomEvent<{
+      id: number;
+      container: HTMLElement;
+      froms: HTMLElement[];
+    }>,
+  ) => {
+    const container = event.detail.container as HTMLElement;
+    initialize(container);
+  },
 );
diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/notification/toggle_read_all.ts b/src/Bundle/ChillMainBundle/Resources/public/module/notification/toggle_read_all.ts
index 97697fca5..d07a7e815 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/module/notification/toggle_read_all.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/notification/toggle_read_all.ts
@@ -5,39 +5,39 @@ import NotificationReadAllToggle from "../../vuejs/_components/Notification/Noti
 const i18n = _createI18n({});
 
 document.addEventListener("DOMContentLoaded", function () {
-    const elements = document.querySelectorAll(".notification_all_read");
+  const elements = document.querySelectorAll(".notification_all_read");
 
-    elements.forEach((element) => {
-        console.log("launch");
-        createApp({
-            template: `<notification-read-all-toggle @markAsRead="markAsRead" @markAsUnRead="markAsUnread"></notification-read-all-toggle>`,
-            components: {
-                NotificationReadAllToggle,
-            },
-            methods: {
-                markAsRead(id: number) {
-                    const el = document.querySelector<HTMLDivElement>(
-                        `div.notification-status[data-notification-id="${id}"]`,
-                    );
-                    if (el === null) {
-                        return;
-                    }
-                    el.classList.add("read");
-                    el.classList.remove("unread");
-                },
-                markAsUnread(id: number) {
-                    const el = document.querySelector<HTMLDivElement>(
-                        `div.notification-status[data-notification-id="${id}"]`,
-                    );
-                    if (el === null) {
-                        return;
-                    }
-                    el.classList.remove("read");
-                    el.classList.add("unread");
-                },
-            },
-        })
-            .use(i18n)
-            .mount(element);
-    });
+  elements.forEach((element) => {
+    console.log("launch");
+    createApp({
+      template: `<notification-read-all-toggle @markAsRead="markAsRead" @markAsUnRead="markAsUnread"></notification-read-all-toggle>`,
+      components: {
+        NotificationReadAllToggle,
+      },
+      methods: {
+        markAsRead(id: number) {
+          const el = document.querySelector<HTMLDivElement>(
+            `div.notification-status[data-notification-id="${id}"]`,
+          );
+          if (el === null) {
+            return;
+          }
+          el.classList.add("read");
+          el.classList.remove("unread");
+        },
+        markAsUnread(id: number) {
+          const el = document.querySelector<HTMLDivElement>(
+            `div.notification-status[data-notification-id="${id}"]`,
+          );
+          if (el === null) {
+            return;
+          }
+          el.classList.remove("read");
+          el.classList.add("unread");
+        },
+      },
+    })
+      .use(i18n)
+      .mount(element);
+  });
 });
diff --git a/src/Bundle/ChillMainBundle/Resources/public/types.ts b/src/Bundle/ChillMainBundle/Resources/public/types.ts
index 40a645ce6..fecb9a578 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/types.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/types.ts
@@ -208,13 +208,13 @@ export interface WorkflowAttachment {
 }
 
 export interface ExportGeneration {
-    id: string;
-    type: "export_generation";
-    exportAlias: string;
-    createdBy: User | null;
-    createdAt: DateTime | null;
-    status: StoredObjectStatus;
-    storedObject: StoredObject;
+  id: string;
+  type: "export_generation";
+  exportAlias: string;
+  createdBy: User | null;
+  createdAt: DateTime | null;
+  status: StoredObjectStatus;
+  storedObject: StoredObject;
 }
 
 export interface PrivateCommentEmbeddable {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
index 075bf6d65..d259d0cae 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue
@@ -1,130 +1,130 @@
 <template>
-    <add-address
-        :key="key"
-        :context="context"
-        :options="options"
-        :address-changed-callback="submitAddress"
-        ref="addAddress"
-    />
+  <add-address
+    :key="key"
+    :context="context"
+    :options="options"
+    :address-changed-callback="submitAddress"
+    ref="addAddress"
+  />
 </template>
 
 <script>
 import AddAddress from "./components/AddAddress.vue";
 import {
-    postAddressToHousehold,
-    postAddressToPerson,
+  postAddressToHousehold,
+  postAddressToPerson,
 } from "ChillPersonAssets/vuejs/_api/AddAddress";
 
 export default {
-    name: "App",
-    components: {
-        AddAddress,
+  name: "App",
+  components: {
+    AddAddress,
+  },
+  props: ["addAddress", "callback"],
+  emits: ["addressEdited", "addressCreated"],
+  computed: {
+    context() {
+      return this.addAddress.context;
     },
-    props: ["addAddress", "callback"],
-    emits: ["addressEdited", "addressCreated"],
-    computed: {
-        context() {
-            return this.addAddress.context;
-        },
-        options() {
-            return this.addAddress.options;
-        },
-        key() {
-            return this.context.edit
-                ? "address_" + this.context.addressId
-                : this.context.target.name + "_" + this.context.target.id;
-        },
+    options() {
+      return this.addAddress.options;
     },
-    mounted() {
-        //console.log('AddAddress: data context', this.context);
-        //console.log('AddAddress: data options', this.options);
+    key() {
+      return this.context.edit
+        ? "address_" + this.context.addressId
+        : this.context.target.name + "_" + this.context.target.id;
     },
-    methods: {
-        displayErrors() {
-            return this.$refs.addAddress.errorMsg;
-        },
-        submitAddress(payload) {
-            console.log("@@@ click on Submit Address Button", payload);
-
-            // Existing address
-            if (this.context.edit) {
-                // address is already linked, just finish !
-                this.$refs.addAddress.afterLastPaneAction({});
-                this.$emit("addressEdited", payload);
-
-                // New created address
-            } else {
-                this.postAddressTo(payload);
-            }
-        },
-
-        /*
-         *  Post new created address to targetEntity
-         */
-        postAddressTo(payload) {
-            this.$emit("addressCreated", payload);
-
-            console.log(
-                "postAddress",
-                payload.addressId,
-                "To",
-                payload.target,
-                payload.targetId,
-            );
-            switch (payload.target) {
-                case "household":
-                    postAddressToHousehold(payload.targetId, payload.addressId)
-                        .then(
-                            (address) =>
-                                new Promise((resolve, reject) => {
-                                    console.log("..household address", address);
-                                    this.$refs.addAddress.flag.loading = false;
-                                    this.$refs.addAddress.flag.success = true;
-
-                                    // finish
-                                    this.$refs.addAddress.afterLastPaneAction({
-                                        addressId: address.address_id,
-                                    });
-
-                                    resolve();
-                                }),
-                        )
-                        .catch((error) => {
-                            this.$refs.addAddress.errorMsg.push(error);
-                            this.$refs.addAddress.flag.loading = false;
-                        });
-                    break;
-                case "person":
-                    postAddressToPerson(payload.targetId, payload.addressId)
-                        .then(
-                            (address) =>
-                                new Promise((resolve, reject) => {
-                                    console.log("..person address", address);
-                                    this.$refs.addAddress.flag.loading = false;
-                                    this.$refs.addAddress.flag.success = true;
-
-                                    // finish
-                                    this.$refs.addAddress.afterLastPaneAction({
-                                        addressId: address.address_id,
-                                    });
-
-                                    resolve();
-                                }),
-                        )
-                        .catch((error) => {
-                            this.$refs.addAddress.errorMsg.push(error);
-                            this.$refs.addAddress.flag.loading = false;
-                        });
-                    break;
-                case "thirdparty":
-                    console.log("TODO write postAddressToThirdparty");
-                    break;
-                default:
-                    this.$refs.addAddress.errorMsg.push(
-                        "That entity is not managed by address !",
-                    );
-            }
-        },
+  },
+  mounted() {
+    //console.log('AddAddress: data context', this.context);
+    //console.log('AddAddress: data options', this.options);
+  },
+  methods: {
+    displayErrors() {
+      return this.$refs.addAddress.errorMsg;
     },
+    submitAddress(payload) {
+      console.log("@@@ click on Submit Address Button", payload);
+
+      // Existing address
+      if (this.context.edit) {
+        // address is already linked, just finish !
+        this.$refs.addAddress.afterLastPaneAction({});
+        this.$emit("addressEdited", payload);
+
+        // New created address
+      } else {
+        this.postAddressTo(payload);
+      }
+    },
+
+    /*
+     *  Post new created address to targetEntity
+     */
+    postAddressTo(payload) {
+      this.$emit("addressCreated", payload);
+
+      console.log(
+        "postAddress",
+        payload.addressId,
+        "To",
+        payload.target,
+        payload.targetId,
+      );
+      switch (payload.target) {
+        case "household":
+          postAddressToHousehold(payload.targetId, payload.addressId)
+            .then(
+              (address) =>
+                new Promise((resolve, reject) => {
+                  console.log("..household address", address);
+                  this.$refs.addAddress.flag.loading = false;
+                  this.$refs.addAddress.flag.success = true;
+
+                  // finish
+                  this.$refs.addAddress.afterLastPaneAction({
+                    addressId: address.address_id,
+                  });
+
+                  resolve();
+                }),
+            )
+            .catch((error) => {
+              this.$refs.addAddress.errorMsg.push(error);
+              this.$refs.addAddress.flag.loading = false;
+            });
+          break;
+        case "person":
+          postAddressToPerson(payload.targetId, payload.addressId)
+            .then(
+              (address) =>
+                new Promise((resolve, reject) => {
+                  console.log("..person address", address);
+                  this.$refs.addAddress.flag.loading = false;
+                  this.$refs.addAddress.flag.success = true;
+
+                  // finish
+                  this.$refs.addAddress.afterLastPaneAction({
+                    addressId: address.address_id,
+                  });
+
+                  resolve();
+                }),
+            )
+            .catch((error) => {
+              this.$refs.addAddress.errorMsg.push(error);
+              this.$refs.addAddress.flag.loading = false;
+            });
+          break;
+        case "thirdparty":
+          console.log("TODO write postAddressToThirdparty");
+          break;
+        default:
+          this.$refs.addAddress.errorMsg.push(
+            "That entity is not managed by address !",
+          );
+      }
+    },
+  },
 };
 </script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ActionButtons.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ActionButtons.vue
index 5d90bf818..fda84c817 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ActionButtons.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ActionButtons.vue
@@ -1,32 +1,32 @@
 <template>
-    <ul
-        class="record_actions"
-        v-if="!options.onlyButton"
-        :class="{ 'sticky-form-buttons': isStickyForm }"
-    >
-        <li v-if="isStickyForm" class="cancel">
-            <slot name="before" />
-        </li>
-        <li>
-            <slot name="action" />
-        </li>
-        <li v-if="isStickyForm">
-            <slot name="after" />
-        </li>
-    </ul>
-    <slot v-else name="action" />
+  <ul
+    class="record_actions"
+    v-if="!options.onlyButton"
+    :class="{ 'sticky-form-buttons': isStickyForm }"
+  >
+    <li v-if="isStickyForm" class="cancel">
+      <slot name="before" />
+    </li>
+    <li>
+      <slot name="action" />
+    </li>
+    <li v-if="isStickyForm">
+      <slot name="after" />
+    </li>
+  </ul>
+  <slot v-else name="action" />
 </template>
 
 <script>
 export default {
-    name: "ActionButtons",
-    props: ["options", "defaultz"],
-    computed: {
-        isStickyForm() {
-            return typeof this.options.stickyActions !== "undefined"
-                ? this.options.stickyActions
-                : this.defaultz.stickyActions;
-        },
+  name: "ActionButtons",
+  props: ["options", "defaultz"],
+  computed: {
+    isStickyForm() {
+      return typeof this.options.stickyActions !== "undefined"
+        ? this.options.stickyActions
+        : this.defaultz.stickyActions;
     },
+  },
 };
 </script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
index 103849e3a..ede1b3778 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -1,251 +1,248 @@
 <template>
-    <!-- step0 -->
-    <show-pane
-        v-if="flag.showPane"
+  <!-- step0 -->
+  <show-pane
+    v-if="flag.showPane"
+    :context="this.context"
+    :options="this.options"
+    :defaultz="this.defaultz"
+    :entity="this.entity"
+    :flag="this.flag"
+    :use-date-pane="this.useDatePane"
+    @open-edit-pane="openEditPane"
+    ref="showAddress"
+  />
+
+  <!-- step 1 -->
+  <teleport to="body" v-if="inModal">
+    <modal
+      v-if="flag.suggestPane"
+      modal-dialog-class="modal-dialog-scrollable modal-xl"
+      @close="resetPane"
+    >
+      <template #header>
+        <h2 class="modal-title">
+          {{ $t(getTextTitle) }}
+          <span v-if="flag.loading" class="loading">
+            <i class="fa fa-circle-o-notch fa-spin fa-fw" />
+            <span class="sr-only">{{ $t("loading") }}</span>
+          </span>
+        </h2>
+      </template>
+
+      <template #body>
+        <suggest-pane
+          :context="this.context"
+          :options="this.options"
+          :defaultz="this.defaultz"
+          :entity="this.entity"
+          :flag="this.flag"
+          @pick-address="this.pickAddress"
+          ref="suggestAddress"
+        />
+      </template>
+
+      <template #footer>
+        <button @click="openEditPane" class="btn btn-create">
+          {{ $t("create_a_new_address") }}
+        </button>
+      </template>
+    </modal>
+  </teleport>
+  <template v-else>
+    <div v-if="flag.suggestPane" class="mt-4 flex-grow-1">
+      <suggest-pane
         :context="this.context"
         :options="this.options"
         :defaultz="this.defaultz"
         :entity="this.entity"
         :flag="this.flag"
-        :use-date-pane="this.useDatePane"
-        @open-edit-pane="openEditPane"
-        ref="showAddress"
-    />
+        :inside-modal="false"
+        @pick-address="this.pickAddress"
+        ref="suggestAddress"
+      >
+        <template #before v-if="!bypassFirstStep">
+          <a class="btn btn-cancel" @click="resetPane">
+            {{ $t("action.cancel") }}
+          </a>
+        </template>
+        <template #action>
+          <li>
+            <button @click="openEditPane" class="btn btn-create">
+              {{ $t("create_a_new_address") }}
+            </button>
+          </li>
+        </template>
+      </suggest-pane>
+    </div>
+  </template>
 
-    <!-- step 1 -->
-    <teleport to="body" v-if="inModal">
-        <modal
-            v-if="flag.suggestPane"
-            modal-dialog-class="modal-dialog-scrollable modal-xl"
-            @close="resetPane"
+  <!-- step 2 -->
+  <teleport to="body" v-if="inModal">
+    <modal
+      v-if="flag.editPane"
+      modal-dialog-class="modal-dialog-scrollable modal-xl"
+      @close="resetPane"
+    >
+      <template #header>
+        <h2 class="modal-title">
+          {{ $t(getTextTitle) }}
+          <span v-if="flag.loading" class="loading">
+            <i class="fa fa-circle-o-notch fa-spin fa-fw" />
+            <span class="sr-only">{{ $t("loading") }}</span>
+          </span>
+        </h2>
+      </template>
+
+      <template #body>
+        <edit-pane
+          :context="this.context"
+          :options="this.options"
+          :defaultz="this.defaultz"
+          :entity="this.entity"
+          :flag="this.flag"
+          :errors="this.errors"
+          :check-errors="this.checkErrors"
+          @get-cities="getCities"
+          @get-reference-addresses="getReferenceAddresses"
+        />
+      </template>
+
+      <template #footer>
+        <!--<button class="btn btn-cancel change-icon" @click="resetPane">{{ $t('action.cancel') }}</button>-->
+        <button
+          v-if="!this.context.edit && this.useDatePane"
+          class="btn btn-update change-icon"
+          @click="closeEditPane"
         >
-            <template #header>
-                <h2 class="modal-title">
-                    {{ $t(getTextTitle) }}
-                    <span v-if="flag.loading" class="loading">
-                        <i class="fa fa-circle-o-notch fa-spin fa-fw" />
-                        <span class="sr-only">{{ $t("loading") }}</span>
-                    </span>
-                </h2>
-            </template>
+          {{ $t("nav.next") }}
+          <i class="fa fa-fw fa-arrow-right" />
+        </button>
+        <button v-else class="btn btn-save" @click="closeEditPane">
+          {{ $t("action.save") }}
+        </button>
+      </template>
+    </modal>
+  </teleport>
+  <template v-else>
+    <div v-if="flag.editPane" class="mt-4 flex-grow-1">
+      <edit-pane
+        :context="this.context"
+        :options="this.options"
+        :defaultz="this.defaultz"
+        :entity="this.entity"
+        :flag="this.flag"
+        :errors="this.errors"
+        :check-errors="this.checkErrors"
+        :inside-modal="false"
+        @get-cities="getCities"
+        @get-reference-addresses="getReferenceAddresses"
+      >
+        <template #before>
+          <a class="btn btn-cancel" @click="resetPane">
+            {{ $t("action.cancel") }}
+          </a>
+        </template>
+        <template #action>
+          <li v-if="!this.context.edit && this.useDatePane">
+            <button class="btn btn-update change-icon" @click="closeEditPane">
+              {{ $t("nav.next") }}
+              <i class="fa fa-fw fa-arrow-right" />
+            </button>
+          </li>
+          <li v-else>
+            <button class="btn btn-save" @click="closeEditPane">
+              {{ $t("action.save") }}
+            </button>
+          </li>
+        </template>
+      </edit-pane>
+    </div>
+  </template>
 
-            <template #body>
-                <suggest-pane
-                    :context="this.context"
-                    :options="this.options"
-                    :defaultz="this.defaultz"
-                    :entity="this.entity"
-                    :flag="this.flag"
-                    @pick-address="this.pickAddress"
-                    ref="suggestAddress"
-                />
-            </template>
+  <!-- step 3 -->
+  <teleport to="body" v-if="inModal">
+    <modal
+      v-if="flag.datePane"
+      modal-dialog-class="modal-dialog-scrollable modal-xl"
+      @close="resetPane"
+    >
+      <template #header>
+        <h2 class="modal-title">
+          {{ $t(getTextTitle) }}
+          <span v-if="flag.loading" class="loading">
+            <i class="fa fa-circle-o-notch fa-spin fa-fw" />
+            <span class="sr-only">{{ $t("loading") }}</span>
+          </span>
+        </h2>
+      </template>
 
-            <template #footer>
-                <button @click="openEditPane" class="btn btn-create">
-                    {{ $t("create_a_new_address") }}
-                </button>
-            </template>
-        </modal>
-    </teleport>
-    <template v-else>
-        <div v-if="flag.suggestPane" class="mt-4 flex-grow-1">
-            <suggest-pane
-                :context="this.context"
-                :options="this.options"
-                :defaultz="this.defaultz"
-                :entity="this.entity"
-                :flag="this.flag"
-                :inside-modal="false"
-                @pick-address="this.pickAddress"
-                ref="suggestAddress"
-            >
-                <template #before v-if="!bypassFirstStep">
-                    <a class="btn btn-cancel" @click="resetPane">
-                        {{ $t("action.cancel") }}
-                    </a>
-                </template>
-                <template #action>
-                    <li>
-                        <button @click="openEditPane" class="btn btn-create">
-                            {{ $t("create_a_new_address") }}
-                        </button>
-                    </li>
-                </template>
-            </suggest-pane>
-        </div>
-    </template>
+      <template #body>
+        <date-pane
+          :context="this.context"
+          :options="this.options"
+          :defaultz="this.defaultz"
+          :entity="this.entity"
+          :flag="this.flag"
+          ref="dateAddress"
+        />
+      </template>
 
-    <!-- step 2 -->
-    <teleport to="body" v-if="inModal">
-        <modal
-            v-if="flag.editPane"
-            modal-dialog-class="modal-dialog-scrollable modal-xl"
-            @close="resetPane"
-        >
-            <template #header>
-                <h2 class="modal-title">
-                    {{ $t(getTextTitle) }}
-                    <span v-if="flag.loading" class="loading">
-                        <i class="fa fa-circle-o-notch fa-spin fa-fw" />
-                        <span class="sr-only">{{ $t("loading") }}</span>
-                    </span>
-                </h2>
-            </template>
-
-            <template #body>
-                <edit-pane
-                    :context="this.context"
-                    :options="this.options"
-                    :defaultz="this.defaultz"
-                    :entity="this.entity"
-                    :flag="this.flag"
-                    :errors="this.errors"
-                    :check-errors="this.checkErrors"
-                    @get-cities="getCities"
-                    @get-reference-addresses="getReferenceAddresses"
-                />
-            </template>
-
-            <template #footer>
-                <!--<button class="btn btn-cancel change-icon" @click="resetPane">{{ $t('action.cancel') }}</button>-->
-                <button
-                    v-if="!this.context.edit && this.useDatePane"
-                    class="btn btn-update change-icon"
-                    @click="closeEditPane"
-                >
-                    {{ $t("nav.next") }}
-                    <i class="fa fa-fw fa-arrow-right" />
-                </button>
-                <button v-else class="btn btn-save" @click="closeEditPane">
-                    {{ $t("action.save") }}
-                </button>
-            </template>
-        </modal>
-    </teleport>
-    <template v-else>
-        <div v-if="flag.editPane" class="mt-4 flex-grow-1">
-            <edit-pane
-                :context="this.context"
-                :options="this.options"
-                :defaultz="this.defaultz"
-                :entity="this.entity"
-                :flag="this.flag"
-                :errors="this.errors"
-                :check-errors="this.checkErrors"
-                :inside-modal="false"
-                @get-cities="getCities"
-                @get-reference-addresses="getReferenceAddresses"
-            >
-                <template #before>
-                    <a class="btn btn-cancel" @click="resetPane">
-                        {{ $t("action.cancel") }}
-                    </a>
-                </template>
-                <template #action>
-                    <li v-if="!this.context.edit && this.useDatePane">
-                        <button
-                            class="btn btn-update change-icon"
-                            @click="closeEditPane"
-                        >
-                            {{ $t("nav.next") }}
-                            <i class="fa fa-fw fa-arrow-right" />
-                        </button>
-                    </li>
-                    <li v-else>
-                        <button class="btn btn-save" @click="closeEditPane">
-                            {{ $t("action.save") }}
-                        </button>
-                    </li>
-                </template>
-            </edit-pane>
-        </div>
-    </template>
-
-    <!-- step 3 -->
-    <teleport to="body" v-if="inModal">
-        <modal
-            v-if="flag.datePane"
-            modal-dialog-class="modal-dialog-scrollable modal-xl"
-            @close="resetPane"
-        >
-            <template #header>
-                <h2 class="modal-title">
-                    {{ $t(getTextTitle) }}
-                    <span v-if="flag.loading" class="loading">
-                        <i class="fa fa-circle-o-notch fa-spin fa-fw" />
-                        <span class="sr-only">{{ $t("loading") }}</span>
-                    </span>
-                </h2>
-            </template>
-
-            <template #body>
-                <date-pane
-                    :context="this.context"
-                    :options="this.options"
-                    :defaultz="this.defaultz"
-                    :entity="this.entity"
-                    :flag="this.flag"
-                    ref="dateAddress"
-                />
-            </template>
-
-            <template #footer>
-                <button class="btn btn-misc" @click="openEditPane">
-                    <i class="fa fa-fw fa-arrow-left" />
-                    {{ $t("nav.previous") }}
-                </button>
-                <button class="btn btn-save" @click="closeDatePane">
-                    {{ $t("action.save") }}
-                </button>
-                <!-- -->
-            </template>
-        </modal>
-    </teleport>
-    <template v-else>
-        <div v-if="flag.datePane" class="mt-4 flex-grow-1">
-            <date-pane
-                :context="this.context"
-                :options="this.options"
-                :defaultz="this.defaultz"
-                :entity="this.entity"
-                :flag="this.flag"
-                :inside-modal="false"
-                ref="dateAddress"
-            >
-                <template #before>
-                    <button class="btn btn-misc" @click="openEditPane">
-                        <i class="fa fa-fw fa-arrow-left" />
-                        {{ $t("nav.previous") }}
-                    </button>
-                </template>
-                <template #action>
-                    <li>
-                        <button class="btn btn-save" @click="closeDatePane">
-                            {{ $t("action.save") }}
-                        </button>
-                    </li>
-                </template>
-            </date-pane>
-        </div>
-    </template>
+      <template #footer>
+        <button class="btn btn-misc" @click="openEditPane">
+          <i class="fa fa-fw fa-arrow-left" />
+          {{ $t("nav.previous") }}
+        </button>
+        <button class="btn btn-save" @click="closeDatePane">
+          {{ $t("action.save") }}
+        </button>
+        <!-- -->
+      </template>
+    </modal>
+  </teleport>
+  <template v-else>
+    <div v-if="flag.datePane" class="mt-4 flex-grow-1">
+      <date-pane
+        :context="this.context"
+        :options="this.options"
+        :defaultz="this.defaultz"
+        :entity="this.entity"
+        :flag="this.flag"
+        :inside-modal="false"
+        ref="dateAddress"
+      >
+        <template #before>
+          <button class="btn btn-misc" @click="openEditPane">
+            <i class="fa fa-fw fa-arrow-left" />
+            {{ $t("nav.previous") }}
+          </button>
+        </template>
+        <template #action>
+          <li>
+            <button class="btn btn-save" @click="closeDatePane">
+              {{ $t("action.save") }}
+            </button>
+          </li>
+        </template>
+      </date-pane>
+    </div>
+  </template>
 </template>
 
 <script>
 import Modal from "ChillMainAssets/vuejs/_components/Modal";
 import {
-    duplicateAddress,
-    fetchCountries,
-    fetchCities,
-    fetchReferenceAddresses,
-    getAddress,
-    patchAddress,
-    postAddress,
-    postPostalCode,
+  duplicateAddress,
+  fetchCountries,
+  fetchCities,
+  fetchReferenceAddresses,
+  getAddress,
+  patchAddress,
+  postAddress,
+  postPostalCode,
 } from "../api";
 import {
-    postAddressToPerson,
-    postAddressToHousehold,
+  postAddressToPerson,
+  postAddressToHousehold,
 } from "ChillPersonAssets/vuejs/_api/AddAddress.js";
 import ShowPane from "./ShowPane.vue";
 import SuggestPane from "./SuggestPane.vue";
@@ -253,661 +250,648 @@ import EditPane from "./EditPane.vue";
 import DatePane from "./DatePane.vue";
 
 export default {
-    name: "AddAddress",
-    props: ["context", "options", "addressChangedCallback"],
-    components: {
-        Modal,
-        ShowPane,
-        SuggestPane,
-        EditPane,
-        DatePane,
+  name: "AddAddress",
+  props: ["context", "options", "addressChangedCallback"],
+  components: {
+    Modal,
+    ShowPane,
+    SuggestPane,
+    EditPane,
+    DatePane,
+  },
+  emits: {
+    pickAddress: null,
+  },
+  data() {
+    return {
+      flag: {
+        showPane: true, // begin with showPane
+        suggestPane: false,
+        editPane: false,
+        datePane: false,
+        loading: false,
+        success: false,
+      },
+      errors: [],
+      defaultz: {
+        button: {
+          text: {
+            create: "add_an_address_title",
+            edit: "edit_address",
+          },
+          type: { create: "btn-create", edit: "btn-update" },
+          displayText: true,
+        },
+        title: { create: "add_an_address_title", edit: "edit_address" },
+        openPanesInModal: true,
+        stickyActions: false,
+        // show a message when no address.
+        // if set to undefined, the value will be equivalent to false if stickyActions is false, true otherwise.
+        showMessageWhenNoAddress: undefined,
+        useDate: {
+          validFrom: false,
+          validTo: false,
+        },
+        onlyButton: false,
+      },
+      entity: {
+        address: {}, // <== loaded and returned
+        loaded: {
+          countries: [],
+          cities: [],
+          addresses: [],
+        },
+        selected: {
+          // <== make temporary changes
+          isNoAddress: false,
+          country: {},
+          city: {},
+          postcode: {
+            code: null,
+            name: null,
+          },
+          address: {},
+          writeNew: {
+            address: false,
+            postcode: false,
+          },
+          valid: {
+            from: new Date(),
+            to: null,
+          },
+        },
+        addressMap: {
+          // Note: LeafletJs demands [lat, lon]
+          // cfr https://macwright.com/lonlat/
+          center: [
+            this.context.defaults.map_center.x,
+            this.context.defaults.map_center.y,
+          ],
+          zoom: this.context.defaults.map_center.z,
+        },
+      },
+      errorMsg: [],
+    };
+  },
+  computed: {
+    inModal() {
+      return typeof this.options.openPanesInModal !== "undefined"
+        ? this.options.openPanesInModal
+        : this.defaultz.openPanesInModal;
     },
-    emits: {
-        pickAddress: null,
+    validFrom() {
+      return typeof this.options.useDate !== "undefined" &&
+        typeof this.options.useDate.validFrom !== "undefined"
+        ? this.options.useDate.validFrom
+        : this.defaultz.useDate.validFrom;
     },
-    data() {
-        return {
-            flag: {
-                showPane: true, // begin with showPane
-                suggestPane: false,
-                editPane: false,
-                datePane: false,
-                loading: false,
-                success: false,
-            },
-            errors: [],
-            defaultz: {
-                button: {
-                    text: {
-                        create: "add_an_address_title",
-                        edit: "edit_address",
-                    },
-                    type: { create: "btn-create", edit: "btn-update" },
-                    displayText: true,
-                },
-                title: { create: "add_an_address_title", edit: "edit_address" },
-                openPanesInModal: true,
-                stickyActions: false,
-                // show a message when no address.
-                // if set to undefined, the value will be equivalent to false if stickyActions is false, true otherwise.
-                showMessageWhenNoAddress: undefined,
-                useDate: {
-                    validFrom: false,
-                    validTo: false,
-                },
-                onlyButton: false,
-            },
-            entity: {
-                address: {}, // <== loaded and returned
-                loaded: {
-                    countries: [],
-                    cities: [],
-                    addresses: [],
-                },
-                selected: {
-                    // <== make temporary changes
-                    isNoAddress: false,
-                    country: {},
-                    city: {},
-                    postcode: {
-                        code: null,
-                        name: null,
-                    },
-                    address: {},
-                    writeNew: {
-                        address: false,
-                        postcode: false,
-                    },
-                    valid: {
-                        from: new Date(),
-                        to: null,
-                    },
-                },
-                addressMap: {
-                    // Note: LeafletJs demands [lat, lon]
-                    // cfr https://macwright.com/lonlat/
-                    center: [
-                        this.context.defaults.map_center.x,
-                        this.context.defaults.map_center.y,
-                    ],
-                    zoom: this.context.defaults.map_center.z,
-                },
-            },
-            errorMsg: [],
-        };
+    validTo() {
+      return typeof this.options.useDate !== "undefined" &&
+        typeof this.options.useDate.validTo !== "undefined"
+        ? this.options.useDate.validTo
+        : this.defaultz.useDate.validTo;
     },
-    computed: {
-        inModal() {
-            return typeof this.options.openPanesInModal !== "undefined"
-                ? this.options.openPanesInModal
-                : this.defaultz.openPanesInModal;
-        },
-        validFrom() {
-            return typeof this.options.useDate !== "undefined" &&
-                typeof this.options.useDate.validFrom !== "undefined"
-                ? this.options.useDate.validFrom
-                : this.defaultz.useDate.validFrom;
-        },
-        validTo() {
-            return typeof this.options.useDate !== "undefined" &&
-                typeof this.options.useDate.validTo !== "undefined"
-                ? this.options.useDate.validTo
-                : this.defaultz.useDate.validTo;
-        },
-        useDatePane() {
-            return this.validFrom || this.validTo ? true : false;
-        },
-        hasSuggestions() {
-            if (typeof this.context.suggestions !== "undefined") {
-                console.log("hasSuggestions", this.context.suggestions);
-                return this.context.suggestions.length > 0;
-            }
-            return false;
-        },
-        displaySuggestions() {
-            return !this.context.edit && this.hasSuggestions;
-        },
-        getTextTitle() {
-            if (
-                typeof this.options.title !== "undefined" &&
-                (this.options.title.edit !== null ||
-                    this.options.title.create !== null)
-            ) {
-                return this.context.edit
-                    ? this.options.title.edit
-                    : this.options.title.create;
-            }
-            return this.context.edit
-                ? this.defaultz.title.edit
-                : this.defaultz.title.create;
-        },
-        bypassFirstStep() {
-            // exception: passing step0 if new address and pane are not in modal
-            return !this.context.edit && !this.inModal;
-        },
-        forceRedirect() {
-            return !(
-                this.context.backUrl === null ||
-                typeof this.context.backUrl === "undefined"
-            );
-        },
+    useDatePane() {
+      return this.validFrom || this.validTo ? true : false;
     },
-    mounted() {
-        //console.log('validFrom', this.validFrom);
-        //console.log('validTo', this.validTo);
-        //console.log('useDatePane', this.useDatePane);
-        //console.log('Mounted now !');
+    hasSuggestions() {
+      if (typeof this.context.suggestions !== "undefined") {
+        console.log("hasSuggestions", this.context.suggestions);
+        return this.context.suggestions.length > 0;
+      }
+      return false;
+    },
+    displaySuggestions() {
+      return !this.context.edit && this.hasSuggestions;
+    },
+    getTextTitle() {
+      if (
+        typeof this.options.title !== "undefined" &&
+        (this.options.title.edit !== null || this.options.title.create !== null)
+      ) {
+        return this.context.edit
+          ? this.options.title.edit
+          : this.options.title.create;
+      }
+      return this.context.edit
+        ? this.defaultz.title.edit
+        : this.defaultz.title.create;
+    },
+    bypassFirstStep() {
+      // exception: passing step0 if new address and pane are not in modal
+      return !this.context.edit && !this.inModal;
+    },
+    forceRedirect() {
+      return !(
+        this.context.backUrl === null ||
+        typeof this.context.backUrl === "undefined"
+      );
+    },
+  },
+  mounted() {
+    //console.log('validFrom', this.validFrom);
+    //console.log('validTo', this.validTo);
+    //console.log('useDatePane', this.useDatePane);
+    //console.log('Mounted now !');
 
-        if (this.context.edit) {
-            console.log("getInitialAddress", this.context.addressId);
-            this.getInitialAddress(this.context.addressId);
+    if (this.context.edit) {
+      console.log("getInitialAddress", this.context.addressId);
+      this.getInitialAddress(this.context.addressId);
+    }
+    this.openShowPane();
+  },
+  methods: {
+    /*
+     *  Opening and closing Panes when interacting with buttons
+     */
+    openShowPane() {
+      if (this.flag.editPane === false && this.bypassFirstStep) {
+        console.log("bypassFirstStep");
+        this.closeShowPane();
+        this.openEditPane();
+      } else {
+        this.flag.showPane = true;
+        //console.log('step0: open the Show Panel');
+      }
+    },
+    closeShowPane() {
+      // Show pane can be closed only when openPanesInModal is false
+      if (!this.inModal) {
+        this.flag.showPane = false;
+        console.log("step0: close the Show Panel");
+      }
+    },
+    openSuggestPane() {
+      this.flag.suggestPane = true;
+      console.log("step1: open the Suggestion Panel");
+    },
+    closeSuggestPane() {
+      this.flag.suggestPane = false;
+      console.log("step1: close the Suggestion Panel");
+    },
+    openEditPane() {
+      if (this.flag.suggestPane === false && this.displaySuggestions) {
+        console.log("displaySuggestions");
+        this.openSuggestPane();
+      } else {
+        if (this.flag.datePane === false) {
+          this.initForm(); // reset form except if we come back from datePane
         }
-        this.openShowPane();
+        this.getCountries(); // will open editPane when resolve promise
+      }
     },
-    methods: {
-        /*
-         *  Opening and closing Panes when interacting with buttons
-         */
-        openShowPane() {
-            if (this.flag.editPane === false && this.bypassFirstStep) {
-                console.log("bypassFirstStep");
+    closeEditPane() {
+      this.flag.editPane = false;
+      console.log("step2: close the Edit Panel");
+      if (!this.context.edit && this.useDatePane) {
+        this.openDatePane();
+      } else {
+        this.applyChanges();
+        if (!this.forceRedirect) {
+          this.openShowPane();
+        }
+      }
+    },
+    openDatePane() {
+      this.flag.datePane = true;
+      console.log("step3: open the Date Panel");
+    },
+    closeDatePane() {
+      this.applyChanges();
+      this.flag.datePane = false;
+      console.log("step3: close the Date Panel");
+    },
+    resetPane() {
+      console.log("resetPane");
+      this.flag.suggestPane = false;
+      this.flag.editPane = false;
+      this.flag.datePane = false;
+      this.openShowPane();
+    },
+
+    /*
+     *  What happens when submitting last Pane:
+     *  - redirect or reset pane,
+     *  - change context to editing
+     */
+    afterLastPaneAction(params) {
+      this.initForm();
+      if (this.forceRedirect) {
+        console.log("redirect to backUrl");
+        window.location.assign(this.context.backUrl);
+      } else {
+        console.log("don't redirect");
+        this.resetPane();
+        if (!this.context.edit) {
+          this.context.edit = true;
+          this.context.addressId = params.addressId;
+          console.log("context is now edit, with address", params.addressId);
+        }
+      }
+    },
+
+    /*
+     *  Async Fetch datas
+     */
+    getInitialAddress(id) {
+      this.flag.loading = true;
+      getAddress(id)
+        .then(
+          (address) =>
+            new Promise((resolve, reject) => {
+              this.entity.address = address;
+              this.flag.loading = false;
+              resolve();
+            }),
+        )
+        .catch((error) => {
+          this.errorMsg.push(error.message);
+          this.flag.loading = false;
+        });
+    },
+
+    getCountries() {
+      this.flag.loading = true;
+      fetchCountries()
+        .then(
+          (countries) =>
+            new Promise((resolve, reject) => {
+              this.entity.loaded.countries = countries.results;
+              if (this.flag.showPane === true) {
                 this.closeShowPane();
-                this.openEditPane();
-            } else {
-                this.flag.showPane = true;
-                //console.log('step0: open the Show Panel');
-            }
-        },
-        closeShowPane() {
-            // Show pane can be closed only when openPanesInModal is false
-            if (!this.inModal) {
-                this.flag.showPane = false;
-                console.log("step0: close the Show Panel");
-            }
-        },
-        openSuggestPane() {
-            this.flag.suggestPane = true;
-            console.log("step1: open the Suggestion Panel");
-        },
-        closeSuggestPane() {
-            this.flag.suggestPane = false;
-            console.log("step1: close the Suggestion Panel");
-        },
-        openEditPane() {
-            if (this.flag.suggestPane === false && this.displaySuggestions) {
-                console.log("displaySuggestions");
-                this.openSuggestPane();
-            } else {
-                if (this.flag.datePane === false) {
-                    this.initForm(); // reset form except if we come back from datePane
-                }
-                this.getCountries(); // will open editPane when resolve promise
-            }
-        },
-        closeEditPane() {
-            this.flag.editPane = false;
-            console.log("step2: close the Edit Panel");
-            if (!this.context.edit && this.useDatePane) {
-                this.openDatePane();
-            } else {
-                this.applyChanges();
-                if (!this.forceRedirect) {
-                    this.openShowPane();
-                }
-            }
-        },
-        openDatePane() {
-            this.flag.datePane = true;
-            console.log("step3: open the Date Panel");
-        },
-        closeDatePane() {
-            this.applyChanges();
-            this.flag.datePane = false;
-            console.log("step3: close the Date Panel");
-        },
-        resetPane() {
-            console.log("resetPane");
-            this.flag.suggestPane = false;
-            this.flag.editPane = false;
-            this.flag.datePane = false;
-            this.openShowPane();
-        },
-
-        /*
-         *  What happens when submitting last Pane:
-         *  - redirect or reset pane,
-         *  - change context to editing
-         */
-        afterLastPaneAction(params) {
-            this.initForm();
-            if (this.forceRedirect) {
-                console.log("redirect to backUrl");
-                window.location.assign(this.context.backUrl);
-            } else {
-                console.log("don't redirect");
-                this.resetPane();
-                if (!this.context.edit) {
-                    this.context.edit = true;
-                    this.context.addressId = params.addressId;
-                    console.log(
-                        "context is now edit, with address",
-                        params.addressId,
-                    );
-                }
-            }
-        },
-
-        /*
-         *  Async Fetch datas
-         */
-        getInitialAddress(id) {
-            this.flag.loading = true;
-            getAddress(id)
-                .then(
-                    (address) =>
-                        new Promise((resolve, reject) => {
-                            this.entity.address = address;
-                            this.flag.loading = false;
-                            resolve();
-                        }),
-                )
-                .catch((error) => {
-                    this.errorMsg.push(error.message);
-                    this.flag.loading = false;
-                });
-        },
-
-        getCountries() {
-            this.flag.loading = true;
-            fetchCountries()
-                .then(
-                    (countries) =>
-                        new Promise((resolve, reject) => {
-                            this.entity.loaded.countries = countries.results;
-                            if (this.flag.showPane === true) {
-                                this.closeShowPane();
-                            }
-                            if (this.flag.suggestPane === true) {
-                                this.closeSuggestPane();
-                            }
-                            if (this.flag.datePane === true) {
-                                this.flag.datePane = false;
-                            }
-                            console.log("step2: open the Edit panel");
-                            this.flag.editPane = true;
-                            this.flag.loading = false;
-                            resolve();
-                        }),
-                )
-                .catch((error) => {
-                    this.errorMsg.push(error.message);
-                    this.flag.loading = false;
-                });
-        },
-
-        getCities(country) {
-            this.flag.loading = true;
-            fetchCities(country)
-                .then(
-                    (cities) =>
-                        new Promise((resolve, reject) => {
-                            this.entity.loaded.cities = cities.results.filter(
-                                (c) => c.origin !== 3,
-                            ); // filter out user-defined cities
-                            this.flag.loading = false;
-                            resolve();
-                        }),
-                )
-                .catch((error) => {
-                    this.errorMsg.push(error.message);
-                    this.flag.loading = false;
-                });
-        },
-
-        getReferenceAddresses(city) {
-            this.flag.loading = true;
-            fetchReferenceAddresses(city)
-                .then(
-                    (addresses) =>
-                        new Promise((resolve, reject) => {
-                            this.entity.loaded.addresses = addresses.results;
-                            this.flag.loading = false;
-                            resolve();
-                        }),
-                )
-                .catch((error) => {
-                    this.errorMsg.push(error.message);
-                    this.flag.loading = false;
-                });
-        },
-
-        checkErrors() {
-            this.errors = [];
-            if (this.entity.selected.country === null) {
-                this.errors.push("Un pays doit être sélectionné.");
-            }
-            if (this.entity.selected.city === null) {
-                this.errors.push("Une ville doit être sélectionnée.");
-            } else {
-                if (Object.keys(this.entity.selected.city).length === 0) {
-                    this.errors.push("Une ville doit être sélectionnée.");
-                }
-            }
-            if (!this.entity.selected.isNoAddress) {
-                if (
-                    this.entity.selected.address.street === null ||
-                    this.entity.selected.address.street === "" ||
-                    this.entity.selected.address.streetNumber === null ||
-                    this.entity.selected.address.streetNumber === ""
-                ) {
-                    this.errors.push("Une adresse doit être sélectionnée.");
-                }
-            }
-        },
-
-        /*
-         *   Make form ready for new changes
-         */
-        initForm() {
-            console.log("init form");
-
-            this.entity.loaded.addresses = [];
-            this.entity.loaded.cities = [];
-            this.entity.loaded.countries = [];
-
-            this.entity.selected.confidential = this.context.edit
-                ? this.entity.address.confidential
-                : false;
-            this.entity.selected.isNoAddress =
-                this.context.edit && this.entity.address.text === ""
-                    ? true
-                    : false;
-
-            this.entity.selected.country = this.context.edit
-                ? this.entity.address.country
-                : {};
-            this.entity.selected.postcode = this.context.edit
-                ? this.entity.address.postcode
-                : {};
-            this.entity.selected.city = this.context.edit
-                ? this.entity.address.postcode
-                : {};
-
-            this.entity.selected.address = {};
-            this.entity.selected.address.street = this.context.edit
-                ? this.entity.address.street
-                : "";
-            this.entity.selected.address.streetNumber = this.context.edit
-                ? this.entity.address.streetNumber
-                : "";
-            this.entity.selected.address.floor = this.context.edit
-                ? this.entity.address.floor
-                : "";
-            this.entity.selected.address.corridor = this.context.edit
-                ? this.entity.address.corridor
-                : "";
-            this.entity.selected.address.steps = this.context.edit
-                ? this.entity.address.steps
-                : "";
-            this.entity.selected.address.flat = this.context.edit
-                ? this.entity.address.flat
-                : "";
-            this.entity.selected.address.buildingName = this.context.edit
-                ? this.entity.address.buildingName
-                : "";
-            this.entity.selected.address.distribution = this.context.edit
-                ? this.entity.address.distribution
-                : "";
-            this.entity.selected.address.extra = this.context.edit
-                ? this.entity.address.extra
-                : "";
-
-            this.entity.selected.writeNew.address =
-                this.context.edit &&
-                this.entity.address.addressReference === null &&
-                this.entity.address.street.length > 0;
-            this.entity.selected.writeNew.postcode = false; // NB: this used to be this.context.edit, but think it was erroneous;
-            console.log(
-                "!! just set writeNew.postcode to",
-                this.entity.selected.writeNew.postcode,
-            );
-
-            this.checkErrors();
-        },
-
-        /*
-         *  When changes are validated (get out step2 edit pane, button valid),
-         *  apply some transformations before asyncing with backend
-         *  from entity.selected to entity.address
-         */
-        applyChanges() {
-            console.log("apply changes");
-            let newAddress = {
-                confidential: this.entity.selected.confidential,
-                isNoAddress: this.entity.selected.isNoAddress,
-                street: this.entity.selected.isNoAddress
-                    ? ""
-                    : this.entity.selected.address.street,
-                streetNumber: this.entity.selected.isNoAddress
-                    ? ""
-                    : this.entity.selected.address.streetNumber,
-                postcode: { id: this.entity.selected.city.id },
-                floor: this.entity.selected.address.floor,
-                corridor: this.entity.selected.address.corridor,
-                steps: this.entity.selected.address.steps,
-                flat: this.entity.selected.address.flat,
-                buildingName: this.entity.selected.address.buildingName,
-                distribution: this.entity.selected.address.distribution,
-                extra: this.entity.selected.address.extra,
-            };
-
-            if (this.entity.selected.address.point !== undefined) {
-                newAddress = Object.assign(newAddress, {
-                    point: this.entity.selected.address.point.coordinates,
-                });
-            } else {
-                if (this.entity.selected.postcode.coordinates) {
-                    newAddress = Object.assign(newAddress, {
-                        point: this.entity.selected.postcode.coordinates,
-                    });
-                }
-            }
-
-            // add the address reference, if any
-            if (this.entity.selected.address.addressReference !== undefined) {
-                newAddress = Object.assign(newAddress, {
-                    addressReference:
-                        this.entity.selected.address.addressReference,
-                });
-            } else {
-                newAddress = Object.assign(newAddress, {
-                    addressReference: null,
-                });
-            }
-
-            if (this.validFrom) {
-                console.log(
-                    "add validFrom in fetch body",
-                    this.entity.selected.valid.from,
-                );
-                newAddress = Object.assign(newAddress, {
-                    validFrom: {
-                        datetime: `${this.entity.selected.valid.from.toISOString().split("T")[0]}T00:00:00+0100`,
-                    },
-                });
-            }
-            if (this.validTo && null !== this.entity.selected.valid.to) {
-                console.log(
-                    "add validTo in fetch body",
-                    this.entity.selected.valid.to,
-                );
-                newAddress = Object.assign(newAddress, {
-                    validTo: {
-                        datetime: `${this.entity.selected.valid.to.toISOString().split("T")[0]}T00:00:00+0100`,
-                    },
-                });
-            }
-            if (this.entity.selected.writeNew.postcode) {
-                let newPostcode = this.entity.selected.postcode;
-                newPostcode = Object.assign(newPostcode, {
-                    country: { id: this.entity.selected.country.id },
-                }); //TODO why not assign postcodeBody here = Object.assign(postcodeBody, {'origin': 3}); ?
-                console.log(
-                    "writeNew postcode is true! newPostcode: ",
-                    newPostcode,
-                );
-                newAddress = Object.assign(newAddress, {
-                    newPostcode: newPostcode,
-                });
-            }
-
-            if (!this.context.edit) {
-                this.addNewAddress(newAddress).then((payload) =>
-                    this.addressChangedCallback(payload),
-                );
-            } else {
-                this.updateAddress({
-                    addressId: this.context.addressId,
-                    newAddress: newAddress,
-                }).then((payload) => this.addressChangedCallback(payload));
-            }
-        },
-
-        /*
-         *  Async POST transactions,
-         *  creating new address, and receive backend datas when promise is resolved
-         */
-        addNewAddress(payload) {
-            console.log("addNewAddress", payload);
-            this.flag.loading = true;
-
-            if ("newPostcode" in payload) {
-                let postcodeBody = payload.newPostcode;
-                postcodeBody = Object.assign(postcodeBody, { origin: 3 });
-                console.log("juste before post new postcode", postcodeBody);
-                return postPostalCode(postcodeBody).then((postalCode) => {
-                    console.log("new postcode created", postalCode.id);
-                    payload.postcode = { id: postalCode.id };
-                    return this.postNewAddress(payload);
-                });
-            } else {
-                return this.postNewAddress(payload);
-            }
-        },
-
-        postNewAddress(payload) {
-            console.log("postNewAddress", payload);
-            return postAddress(payload)
-                .then(
-                    (address) =>
-                        new Promise((resolve, reject) => {
-                            this.entity.address = address;
-                            this.flag.loading = false;
-                            this.flag.success = true;
-                            resolve({
-                                address,
-                                targetOrigin: this.context.target,
-                                // for "legacy" use:
-                                target: this.context.target.name,
-                                targetId: this.context.target.id,
-                                addressId: this.entity.address.address_id,
-                            });
-                        }),
-                )
-                .catch((error) => {
-                    this.errorMsg.push(error);
-                    this.flag.loading = false;
-                });
-        },
-
-        /*
-         *  Async PATCH transactions,
-         *  then update existing address with backend datas when promise is resolved
-         */
-        updateAddress(payload) {
-            this.flag.loading = true;
-
-            // TODO change the condition because it writes new postal code in edit mode now: !writeNewPostalCode
-            // BUG réécrit un postcode à chaque édition !
-            if ("newPostcode" in payload.newAddress) {
-                let postcodeBody = payload.newAddress.newPostcode;
-                postcodeBody = Object.assign(postcodeBody, { origin: 3 });
-
-                console.log("juste before post new postcode", postcodeBody);
-                return postPostalCode(postcodeBody).then((postalCode) => {
-                    console.log("new postcode created", postalCode.id);
-                    payload.newAddress.postcode = { id: postalCode.id };
-                    return this.patchExistingAddress(payload);
-                });
-            } else {
-                return this.patchExistingAddress(payload);
-            }
-        },
-
-        patchExistingAddress(payload) {
-            console.log("patchExistingAddress", payload);
-            return patchAddress(payload.addressId, payload.newAddress)
-                .then(
-                    (address) =>
-                        new Promise((resolve, reject) => {
-                            this.entity.address = address;
-                            this.flag.loading = false;
-                            this.flag.success = true;
-                            return resolve({
-                                address,
-                                targetOrigin: this.context.target,
-                                // for "legacy" use:
-                                target: this.context.target.name,
-                                targetId: this.context.target.id,
-                                addressId: this.entity.address.address_id,
-                            });
-                        }),
-                )
-                .catch((error) => {
-                    this.errorMsg.push(error);
-                    this.flag.loading = false;
-                });
-        },
-
-        /**
-         *
-         * Called when the event pick-address is emitted, which is, by the way,
-         * called when an address suggestion is picked.
-         *
-         * @param address the address selected
-         */
-        pickAddress(address) {
-            console.log("pickAddress", address);
-            duplicateAddress(address).then((newAddress) => {
-                this.entity.address = newAddress;
-                this.flag.loading = false;
-                this.flag.success = true;
-                let payload = {
-                    address: newAddress,
-                    targetOrigin: this.context.target,
-                    // for "legacy" use:
-                    target: this.context.target.name,
-                    targetId: this.context.target.id,
-                    addressId: this.entity.address.address_id,
-                };
-                this.addressChangedCallback(payload);
+              }
+              if (this.flag.suggestPane === true) {
                 this.closeSuggestPane();
-            });
-        },
+              }
+              if (this.flag.datePane === true) {
+                this.flag.datePane = false;
+              }
+              console.log("step2: open the Edit panel");
+              this.flag.editPane = true;
+              this.flag.loading = false;
+              resolve();
+            }),
+        )
+        .catch((error) => {
+          this.errorMsg.push(error.message);
+          this.flag.loading = false;
+        });
     },
+
+    getCities(country) {
+      this.flag.loading = true;
+      fetchCities(country)
+        .then(
+          (cities) =>
+            new Promise((resolve, reject) => {
+              this.entity.loaded.cities = cities.results.filter(
+                (c) => c.origin !== 3,
+              ); // filter out user-defined cities
+              this.flag.loading = false;
+              resolve();
+            }),
+        )
+        .catch((error) => {
+          this.errorMsg.push(error.message);
+          this.flag.loading = false;
+        });
+    },
+
+    getReferenceAddresses(city) {
+      this.flag.loading = true;
+      fetchReferenceAddresses(city)
+        .then(
+          (addresses) =>
+            new Promise((resolve, reject) => {
+              this.entity.loaded.addresses = addresses.results;
+              this.flag.loading = false;
+              resolve();
+            }),
+        )
+        .catch((error) => {
+          this.errorMsg.push(error.message);
+          this.flag.loading = false;
+        });
+    },
+
+    checkErrors() {
+      this.errors = [];
+      if (this.entity.selected.country === null) {
+        this.errors.push("Un pays doit être sélectionné.");
+      }
+      if (this.entity.selected.city === null) {
+        this.errors.push("Une ville doit être sélectionnée.");
+      } else {
+        if (Object.keys(this.entity.selected.city).length === 0) {
+          this.errors.push("Une ville doit être sélectionnée.");
+        }
+      }
+      if (!this.entity.selected.isNoAddress) {
+        if (
+          this.entity.selected.address.street === null ||
+          this.entity.selected.address.street === "" ||
+          this.entity.selected.address.streetNumber === null ||
+          this.entity.selected.address.streetNumber === ""
+        ) {
+          this.errors.push("Une adresse doit être sélectionnée.");
+        }
+      }
+    },
+
+    /*
+     *   Make form ready for new changes
+     */
+    initForm() {
+      console.log("init form");
+
+      this.entity.loaded.addresses = [];
+      this.entity.loaded.cities = [];
+      this.entity.loaded.countries = [];
+
+      this.entity.selected.confidential = this.context.edit
+        ? this.entity.address.confidential
+        : false;
+      this.entity.selected.isNoAddress =
+        this.context.edit && this.entity.address.text === "" ? true : false;
+
+      this.entity.selected.country = this.context.edit
+        ? this.entity.address.country
+        : {};
+      this.entity.selected.postcode = this.context.edit
+        ? this.entity.address.postcode
+        : {};
+      this.entity.selected.city = this.context.edit
+        ? this.entity.address.postcode
+        : {};
+
+      this.entity.selected.address = {};
+      this.entity.selected.address.street = this.context.edit
+        ? this.entity.address.street
+        : "";
+      this.entity.selected.address.streetNumber = this.context.edit
+        ? this.entity.address.streetNumber
+        : "";
+      this.entity.selected.address.floor = this.context.edit
+        ? this.entity.address.floor
+        : "";
+      this.entity.selected.address.corridor = this.context.edit
+        ? this.entity.address.corridor
+        : "";
+      this.entity.selected.address.steps = this.context.edit
+        ? this.entity.address.steps
+        : "";
+      this.entity.selected.address.flat = this.context.edit
+        ? this.entity.address.flat
+        : "";
+      this.entity.selected.address.buildingName = this.context.edit
+        ? this.entity.address.buildingName
+        : "";
+      this.entity.selected.address.distribution = this.context.edit
+        ? this.entity.address.distribution
+        : "";
+      this.entity.selected.address.extra = this.context.edit
+        ? this.entity.address.extra
+        : "";
+
+      this.entity.selected.writeNew.address =
+        this.context.edit &&
+        this.entity.address.addressReference === null &&
+        this.entity.address.street.length > 0;
+      this.entity.selected.writeNew.postcode = false; // NB: this used to be this.context.edit, but think it was erroneous;
+      console.log(
+        "!! just set writeNew.postcode to",
+        this.entity.selected.writeNew.postcode,
+      );
+
+      this.checkErrors();
+    },
+
+    /*
+     *  When changes are validated (get out step2 edit pane, button valid),
+     *  apply some transformations before asyncing with backend
+     *  from entity.selected to entity.address
+     */
+    applyChanges() {
+      console.log("apply changes");
+      let newAddress = {
+        confidential: this.entity.selected.confidential,
+        isNoAddress: this.entity.selected.isNoAddress,
+        street: this.entity.selected.isNoAddress
+          ? ""
+          : this.entity.selected.address.street,
+        streetNumber: this.entity.selected.isNoAddress
+          ? ""
+          : this.entity.selected.address.streetNumber,
+        postcode: { id: this.entity.selected.city.id },
+        floor: this.entity.selected.address.floor,
+        corridor: this.entity.selected.address.corridor,
+        steps: this.entity.selected.address.steps,
+        flat: this.entity.selected.address.flat,
+        buildingName: this.entity.selected.address.buildingName,
+        distribution: this.entity.selected.address.distribution,
+        extra: this.entity.selected.address.extra,
+      };
+
+      if (this.entity.selected.address.point !== undefined) {
+        newAddress = Object.assign(newAddress, {
+          point: this.entity.selected.address.point.coordinates,
+        });
+      } else {
+        if (this.entity.selected.postcode.coordinates) {
+          newAddress = Object.assign(newAddress, {
+            point: this.entity.selected.postcode.coordinates,
+          });
+        }
+      }
+
+      // add the address reference, if any
+      if (this.entity.selected.address.addressReference !== undefined) {
+        newAddress = Object.assign(newAddress, {
+          addressReference: this.entity.selected.address.addressReference,
+        });
+      } else {
+        newAddress = Object.assign(newAddress, {
+          addressReference: null,
+        });
+      }
+
+      if (this.validFrom) {
+        console.log(
+          "add validFrom in fetch body",
+          this.entity.selected.valid.from,
+        );
+        newAddress = Object.assign(newAddress, {
+          validFrom: {
+            datetime: `${this.entity.selected.valid.from.toISOString().split("T")[0]}T00:00:00+0100`,
+          },
+        });
+      }
+      if (this.validTo && null !== this.entity.selected.valid.to) {
+        console.log("add validTo in fetch body", this.entity.selected.valid.to);
+        newAddress = Object.assign(newAddress, {
+          validTo: {
+            datetime: `${this.entity.selected.valid.to.toISOString().split("T")[0]}T00:00:00+0100`,
+          },
+        });
+      }
+      if (this.entity.selected.writeNew.postcode) {
+        let newPostcode = this.entity.selected.postcode;
+        newPostcode = Object.assign(newPostcode, {
+          country: { id: this.entity.selected.country.id },
+        }); //TODO why not assign postcodeBody here = Object.assign(postcodeBody, {'origin': 3}); ?
+        console.log("writeNew postcode is true! newPostcode: ", newPostcode);
+        newAddress = Object.assign(newAddress, {
+          newPostcode: newPostcode,
+        });
+      }
+
+      if (!this.context.edit) {
+        this.addNewAddress(newAddress).then((payload) =>
+          this.addressChangedCallback(payload),
+        );
+      } else {
+        this.updateAddress({
+          addressId: this.context.addressId,
+          newAddress: newAddress,
+        }).then((payload) => this.addressChangedCallback(payload));
+      }
+    },
+
+    /*
+     *  Async POST transactions,
+     *  creating new address, and receive backend datas when promise is resolved
+     */
+    addNewAddress(payload) {
+      console.log("addNewAddress", payload);
+      this.flag.loading = true;
+
+      if ("newPostcode" in payload) {
+        let postcodeBody = payload.newPostcode;
+        postcodeBody = Object.assign(postcodeBody, { origin: 3 });
+        console.log("juste before post new postcode", postcodeBody);
+        return postPostalCode(postcodeBody).then((postalCode) => {
+          console.log("new postcode created", postalCode.id);
+          payload.postcode = { id: postalCode.id };
+          return this.postNewAddress(payload);
+        });
+      } else {
+        return this.postNewAddress(payload);
+      }
+    },
+
+    postNewAddress(payload) {
+      console.log("postNewAddress", payload);
+      return postAddress(payload)
+        .then(
+          (address) =>
+            new Promise((resolve, reject) => {
+              this.entity.address = address;
+              this.flag.loading = false;
+              this.flag.success = true;
+              resolve({
+                address,
+                targetOrigin: this.context.target,
+                // for "legacy" use:
+                target: this.context.target.name,
+                targetId: this.context.target.id,
+                addressId: this.entity.address.address_id,
+              });
+            }),
+        )
+        .catch((error) => {
+          this.errorMsg.push(error);
+          this.flag.loading = false;
+        });
+    },
+
+    /*
+     *  Async PATCH transactions,
+     *  then update existing address with backend datas when promise is resolved
+     */
+    updateAddress(payload) {
+      this.flag.loading = true;
+
+      // TODO change the condition because it writes new postal code in edit mode now: !writeNewPostalCode
+      // BUG réécrit un postcode à chaque édition !
+      if ("newPostcode" in payload.newAddress) {
+        let postcodeBody = payload.newAddress.newPostcode;
+        postcodeBody = Object.assign(postcodeBody, { origin: 3 });
+
+        console.log("juste before post new postcode", postcodeBody);
+        return postPostalCode(postcodeBody).then((postalCode) => {
+          console.log("new postcode created", postalCode.id);
+          payload.newAddress.postcode = { id: postalCode.id };
+          return this.patchExistingAddress(payload);
+        });
+      } else {
+        return this.patchExistingAddress(payload);
+      }
+    },
+
+    patchExistingAddress(payload) {
+      console.log("patchExistingAddress", payload);
+      return patchAddress(payload.addressId, payload.newAddress)
+        .then(
+          (address) =>
+            new Promise((resolve, reject) => {
+              this.entity.address = address;
+              this.flag.loading = false;
+              this.flag.success = true;
+              return resolve({
+                address,
+                targetOrigin: this.context.target,
+                // for "legacy" use:
+                target: this.context.target.name,
+                targetId: this.context.target.id,
+                addressId: this.entity.address.address_id,
+              });
+            }),
+        )
+        .catch((error) => {
+          this.errorMsg.push(error);
+          this.flag.loading = false;
+        });
+    },
+
+    /**
+     *
+     * Called when the event pick-address is emitted, which is, by the way,
+     * called when an address suggestion is picked.
+     *
+     * @param address the address selected
+     */
+    pickAddress(address) {
+      console.log("pickAddress", address);
+      duplicateAddress(address).then((newAddress) => {
+        this.entity.address = newAddress;
+        this.flag.loading = false;
+        this.flag.success = true;
+        let payload = {
+          address: newAddress,
+          targetOrigin: this.context.target,
+          // for "legacy" use:
+          target: this.context.target.name,
+          targetId: this.context.target.id,
+          addressId: this.entity.address.address_id,
+        };
+        this.addressChangedCallback(payload);
+        this.closeSuggestPane();
+      });
+    },
+  },
 };
 </script>
 
 <style lang="scss">
 div.entity-address {
-    position: relative;
-    div.loading {
-        position: absolute;
-        right: 0;
-        top: -55px;
-    }
+  position: relative;
+  div.loading {
+    position: absolute;
+    right: 0;
+    top: -55px;
+  }
 }
 h4.h3 {
-    font-weight: bold;
+  font-weight: bold;
 }
 </style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMap.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMap.vue
index 167b3b981..4aa44f4a6 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMap.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMap.vue
@@ -1,5 +1,5 @@
 <template>
-    <div id="address_map" />
+  <div id="address_map" />
 </template>
 
 <script>
@@ -8,112 +8,107 @@ import markerIconPng from "leaflet/dist/images/marker-icon.png";
 import "leaflet/dist/leaflet.css";
 
 const lonLatForLeaflet = (coordinates) => {
-    return [coordinates[1], coordinates[0]];
+  return [coordinates[1], coordinates[0]];
 };
 
 export default {
-    name: "AddressMap",
-    props: ["entity"],
-    data() {
-        return {
-            map: null,
-            marker: null,
-        };
+  name: "AddressMap",
+  props: ["entity"],
+  data() {
+    return {
+      map: null,
+      marker: null,
+    };
+  },
+  computed: {
+    center() {
+      return this.entity.addressMap.center;
     },
-    computed: {
-        center() {
-            return this.entity.addressMap.center;
-        },
-        hasAddressPoint() {
-            if (Object.keys(this.entity.address).length === 0) {
-                return false;
-            }
-            if (null !== this.entity.address.addressReference) {
-                return true;
-            }
-            if (
-                null !== this.entity.address.postcode &&
-                null !== this.entity.address.postcode.center
-            ) {
-                return true;
-            }
-            return false;
-        },
-        /**
-         *
-         * @returns {coordinates: [float, float], type: "Point"}
-         */
-        addressPoint() {
-            if (Object.keys(this.entity.address).length === 0) {
-                return null;
-            }
-
-            if (null !== this.entity.address.addressReference) {
-                return this.entity.address.addressReference.point;
-            }
-
-            if (
-                null !== this.entity.address.postcode &&
-                null !== this.entity.address.postcode.center
-            ) {
-                return this.entity.address.postcode.center;
-            }
-
-            return null;
-        },
+    hasAddressPoint() {
+      if (Object.keys(this.entity.address).length === 0) {
+        return false;
+      }
+      if (null !== this.entity.address.addressReference) {
+        return true;
+      }
+      if (
+        null !== this.entity.address.postcode &&
+        null !== this.entity.address.postcode.center
+      ) {
+        return true;
+      }
+      return false;
     },
-    methods: {
-        init() {
-            this.map = L.map("address_map");
+    /**
+     *
+     * @returns {coordinates: [float, float], type: "Point"}
+     */
+    addressPoint() {
+      if (Object.keys(this.entity.address).length === 0) {
+        return null;
+      }
 
-            if (!this.hasAddressPoint) {
-                this.map.setView(
-                    lonLatForLeaflet(this.entity.addressMap.center),
-                    this.entity.addressMap.zoom,
-                );
-            } else {
-                this.map.setView(
-                    lonLatForLeaflet(this.addressPoint.coordinates),
-                    15,
-                );
-            }
+      if (null !== this.entity.address.addressReference) {
+        return this.entity.address.addressReference.point;
+      }
 
-            this.map.scrollWheelZoom.disable();
+      if (
+        null !== this.entity.address.postcode &&
+        null !== this.entity.address.postcode.center
+      ) {
+        return this.entity.address.postcode.center;
+      }
 
-            L.tileLayer("https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", {
-                attribution:
-                    '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
-            }).addTo(this.map);
-
-            const markerIcon = L.icon({
-                iconUrl: markerIconPng,
-                iconAnchor: [12, 41],
-            });
-
-            if (!this.hasAddressPoint) {
-                this.marker = L.marker(
-                    lonLatForLeaflet(this.entity.addressMap.center),
-                    { icon: markerIcon },
-                );
-            } else {
-                this.marker = L.marker(
-                    lonLatForLeaflet(this.addressPoint.coordinates),
-                    { icon: markerIcon },
-                );
-            }
-            this.marker.addTo(this.map);
-        },
-        update() {
-            if (this.marker && this.entity.addressMap.center) {
-                this.marker.setLatLng(
-                    lonLatForLeaflet(this.entity.addressMap.center),
-                );
-                this.map.panTo(lonLatForLeaflet(this.entity.addressMap.center));
-            }
-        },
+      return null;
     },
-    mounted() {
-        this.init();
+  },
+  methods: {
+    init() {
+      this.map = L.map("address_map");
+
+      if (!this.hasAddressPoint) {
+        this.map.setView(
+          lonLatForLeaflet(this.entity.addressMap.center),
+          this.entity.addressMap.zoom,
+        );
+      } else {
+        this.map.setView(lonLatForLeaflet(this.addressPoint.coordinates), 15);
+      }
+
+      this.map.scrollWheelZoom.disable();
+
+      L.tileLayer("https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", {
+        attribution:
+          '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
+      }).addTo(this.map);
+
+      const markerIcon = L.icon({
+        iconUrl: markerIconPng,
+        iconAnchor: [12, 41],
+      });
+
+      if (!this.hasAddressPoint) {
+        this.marker = L.marker(
+          lonLatForLeaflet(this.entity.addressMap.center),
+          { icon: markerIcon },
+        );
+      } else {
+        this.marker = L.marker(
+          lonLatForLeaflet(this.addressPoint.coordinates),
+          { icon: markerIcon },
+        );
+      }
+      this.marker.addTo(this.map);
     },
+    update() {
+      if (this.marker && this.entity.addressMap.center) {
+        this.marker.setLatLng(lonLatForLeaflet(this.entity.addressMap.center));
+        this.map.panTo(lonLatForLeaflet(this.entity.addressMap.center));
+      }
+    },
+  },
+  mounted() {
+    this.init();
+  },
 };
 </script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue
index 4b59efbc6..3e9da5da4 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue
@@ -1,149 +1,149 @@
 <template>
-    <h4 class="h3">
-        {{ $t("fill_an_address") }}
-    </h4>
-    <div class="row my-3">
-        <div class="col-lg-6" v-if="!isNoAddress">
-            <div class="form-floating my-1">
-                <input
-                    class="form-control"
-                    type="text"
-                    name="floor"
-                    :placeholder="$t('floor')"
-                    v-model="floor"
-                />
-                <label for="floor">{{ $t("floor") }}</label>
-            </div>
-            <div class="form-floating my-1">
-                <input
-                    class="form-control"
-                    type="text"
-                    name="corridor"
-                    :placeholder="$t('corridor')"
-                    v-model="corridor"
-                />
-                <label for="corridor">{{ $t("corridor") }}</label>
-            </div>
-            <div class="form-floating my-1">
-                <input
-                    class="form-control"
-                    type="text"
-                    name="steps"
-                    :placeholder="$t('steps')"
-                    v-model="steps"
-                />
-                <label for="steps">{{ $t("steps") }}</label>
-            </div>
-            <div class="form-floating my-1">
-                <input
-                    class="form-control"
-                    type="text"
-                    name="flat"
-                    :placeholder="$t('flat')"
-                    v-model="flat"
-                />
-                <label for="flat">{{ $t("flat") }}</label>
-            </div>
-        </div>
-        <div :class="isNoAddress ? 'col-lg-12' : 'col-lg-6'">
-            <div class="form-floating my-1" v-if="!isNoAddress">
-                <input
-                    class="form-control"
-                    type="text"
-                    name="buildingName"
-                    maxlength="255"
-                    :placeholder="$t('buildingName')"
-                    v-model="buildingName"
-                />
-                <label for="buildingName">{{ $t("buildingName") }}</label>
-            </div>
-            <div class="form-floating my-1">
-                <input
-                    class="form-control"
-                    type="text"
-                    name="extra"
-                    maxlength="255"
-                    :placeholder="$t('extra')"
-                    v-model="extra"
-                />
-                <label for="extra">{{ $t("extra") }}</label>
-            </div>
-            <div class="form-floating my-1" v-if="!isNoAddress">
-                <input
-                    class="form-control"
-                    type="text"
-                    name="distribution"
-                    maxlength="255"
-                    :placeholder="$t('distribution')"
-                    v-model="distribution"
-                />
-                <label for="distribution">{{ $t("distribution") }}</label>
-            </div>
-        </div>
+  <h4 class="h3">
+    {{ $t("fill_an_address") }}
+  </h4>
+  <div class="row my-3">
+    <div class="col-lg-6" v-if="!isNoAddress">
+      <div class="form-floating my-1">
+        <input
+          class="form-control"
+          type="text"
+          name="floor"
+          :placeholder="$t('floor')"
+          v-model="floor"
+        />
+        <label for="floor">{{ $t("floor") }}</label>
+      </div>
+      <div class="form-floating my-1">
+        <input
+          class="form-control"
+          type="text"
+          name="corridor"
+          :placeholder="$t('corridor')"
+          v-model="corridor"
+        />
+        <label for="corridor">{{ $t("corridor") }}</label>
+      </div>
+      <div class="form-floating my-1">
+        <input
+          class="form-control"
+          type="text"
+          name="steps"
+          :placeholder="$t('steps')"
+          v-model="steps"
+        />
+        <label for="steps">{{ $t("steps") }}</label>
+      </div>
+      <div class="form-floating my-1">
+        <input
+          class="form-control"
+          type="text"
+          name="flat"
+          :placeholder="$t('flat')"
+          v-model="flat"
+        />
+        <label for="flat">{{ $t("flat") }}</label>
+      </div>
     </div>
+    <div :class="isNoAddress ? 'col-lg-12' : 'col-lg-6'">
+      <div class="form-floating my-1" v-if="!isNoAddress">
+        <input
+          class="form-control"
+          type="text"
+          name="buildingName"
+          maxlength="255"
+          :placeholder="$t('buildingName')"
+          v-model="buildingName"
+        />
+        <label for="buildingName">{{ $t("buildingName") }}</label>
+      </div>
+      <div class="form-floating my-1">
+        <input
+          class="form-control"
+          type="text"
+          name="extra"
+          maxlength="255"
+          :placeholder="$t('extra')"
+          v-model="extra"
+        />
+        <label for="extra">{{ $t("extra") }}</label>
+      </div>
+      <div class="form-floating my-1" v-if="!isNoAddress">
+        <input
+          class="form-control"
+          type="text"
+          name="distribution"
+          maxlength="255"
+          :placeholder="$t('distribution')"
+          v-model="distribution"
+        />
+        <label for="distribution">{{ $t("distribution") }}</label>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
 export default {
-    name: "AddressMore",
-    props: ["entity", "isNoAddress"],
-    computed: {
-        floor: {
-            set(value) {
-                this.entity.selected.address.floor = value;
-            },
-            get() {
-                return this.entity.selected.address.floor;
-            },
-        },
-        corridor: {
-            set(value) {
-                this.entity.selected.address.corridor = value;
-            },
-            get() {
-                return this.entity.selected.address.corridor;
-            },
-        },
-        steps: {
-            set(value) {
-                this.entity.selected.address.steps = value;
-            },
-            get() {
-                return this.entity.selected.address.steps;
-            },
-        },
-        flat: {
-            set(value) {
-                this.entity.selected.address.flat = value;
-            },
-            get() {
-                return this.entity.selected.address.flat;
-            },
-        },
-        buildingName: {
-            set(value) {
-                this.entity.selected.address.buildingName = value;
-            },
-            get() {
-                return this.entity.selected.address.buildingName;
-            },
-        },
-        extra: {
-            set(value) {
-                this.entity.selected.address.extra = value;
-            },
-            get() {
-                return this.entity.selected.address.extra;
-            },
-        },
-        distribution: {
-            set(value) {
-                this.entity.selected.address.distribution = value;
-            },
-            get() {
-                return this.entity.selected.address.distribution;
-            },
-        },
+  name: "AddressMore",
+  props: ["entity", "isNoAddress"],
+  computed: {
+    floor: {
+      set(value) {
+        this.entity.selected.address.floor = value;
+      },
+      get() {
+        return this.entity.selected.address.floor;
+      },
     },
+    corridor: {
+      set(value) {
+        this.entity.selected.address.corridor = value;
+      },
+      get() {
+        return this.entity.selected.address.corridor;
+      },
+    },
+    steps: {
+      set(value) {
+        this.entity.selected.address.steps = value;
+      },
+      get() {
+        return this.entity.selected.address.steps;
+      },
+    },
+    flat: {
+      set(value) {
+        this.entity.selected.address.flat = value;
+      },
+      get() {
+        return this.entity.selected.address.flat;
+      },
+    },
+    buildingName: {
+      set(value) {
+        this.entity.selected.address.buildingName = value;
+      },
+      get() {
+        return this.entity.selected.address.buildingName;
+      },
+    },
+    extra: {
+      set(value) {
+        this.entity.selected.address.extra = value;
+      },
+      get() {
+        return this.entity.selected.address.extra;
+      },
+    },
+    distribution: {
+      set(value) {
+        this.entity.selected.address.distribution = value;
+      },
+      get() {
+        return this.entity.selected.address.distribution;
+      },
+    },
+  },
 };
 </script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue
index fd1740a40..6ad8965b4 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue
@@ -1,227 +1,223 @@
 <template>
-    <div class="my-1">
-        <label class="col-form-label" for="addressSelector">{{
-            $t("address")
-        }}</label>
-        <VueMultiselect
-            id="addressSelector"
-            v-model="value"
-            :placeholder="$t('select_address')"
-            :tag-placeholder="$t('create_address')"
-            :select-label="$t('multiselect.select_label')"
-            :deselect-label="$t('create_address')"
-            :selected-label="$t('multiselect.selected_label')"
-            @search-change="listenInputSearch"
-            :internal-search="false"
-            ref="addressSelector"
-            @select="selectAddress"
-            @remove="remove"
-            name="field"
-            track-by="id"
-            label="value"
-            :custom-label="transName"
-            :taggable="true"
-            :multiple="false"
-            @tag="addAddress"
-            :loading="isLoading"
-            :options="addresses"
-        />
-    </div>
+  <div class="my-1">
+    <label class="col-form-label" for="addressSelector">{{
+      $t("address")
+    }}</label>
+    <VueMultiselect
+      id="addressSelector"
+      v-model="value"
+      :placeholder="$t('select_address')"
+      :tag-placeholder="$t('create_address')"
+      :select-label="$t('multiselect.select_label')"
+      :deselect-label="$t('create_address')"
+      :selected-label="$t('multiselect.selected_label')"
+      @search-change="listenInputSearch"
+      :internal-search="false"
+      ref="addressSelector"
+      @select="selectAddress"
+      @remove="remove"
+      name="field"
+      track-by="id"
+      label="value"
+      :custom-label="transName"
+      :taggable="true"
+      :multiple="false"
+      @tag="addAddress"
+      :loading="isLoading"
+      :options="addresses"
+    />
+  </div>
 
-    <div
-        class="custom-address row g-1"
-        v-if="
-            writeNewAddress ||
-            writeNewPostalCode ||
-            (isEnteredCustomAddress && !isAddressSelectorOpen)
-        "
-    >
-        <div class="col-10">
-            <div class="form-floating">
-                <input
-                    class="form-control"
-                    type="text"
-                    name="street"
-                    :placeholder="$t('street')"
-                    v-model="street"
-                />
-                <label for="street">{{ $t("street") }}</label>
-            </div>
-        </div>
-        <div class="col-2">
-            <div class="form-floating">
-                <input
-                    class="form-control"
-                    type="text"
-                    name="streetNumber"
-                    :placeholder="$t('streetNumber')"
-                    v-model="streetNumber"
-                />
-                <label for="streetNumber">{{ $t("streetNumber") }}</label>
-            </div>
-        </div>
+  <div
+    class="custom-address row g-1"
+    v-if="
+      writeNewAddress ||
+      writeNewPostalCode ||
+      (isEnteredCustomAddress && !isAddressSelectorOpen)
+    "
+  >
+    <div class="col-10">
+      <div class="form-floating">
+        <input
+          class="form-control"
+          type="text"
+          name="street"
+          :placeholder="$t('street')"
+          v-model="street"
+        />
+        <label for="street">{{ $t("street") }}</label>
+      </div>
     </div>
+    <div class="col-2">
+      <div class="form-floating">
+        <input
+          class="form-control"
+          type="text"
+          name="streetNumber"
+          :placeholder="$t('streetNumber')"
+          v-model="streetNumber"
+        />
+        <label for="streetNumber">{{ $t("streetNumber") }}</label>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
 import VueMultiselect from "vue-multiselect";
 import {
-    searchReferenceAddresses,
-    fetchReferenceAddresses,
+  searchReferenceAddresses,
+  fetchReferenceAddresses,
 } from "../../api.js";
 
 export default {
-    name: "AddressSelection",
-    components: { VueMultiselect },
-    props: ["entity", "context", "updateMapCenter", "flag", "checkErrors"],
-    data() {
-        return {
-            value: this.context.edit
-                ? this.entity.address.addressReference
-                : null,
-            isLoading: false,
-        };
+  name: "AddressSelection",
+  components: { VueMultiselect },
+  props: ["entity", "context", "updateMapCenter", "flag", "checkErrors"],
+  data() {
+    return {
+      value: this.context.edit ? this.entity.address.addressReference : null,
+      isLoading: false,
+    };
+  },
+  computed: {
+    writeNewAddress() {
+      return this.entity.selected.writeNew.address;
     },
-    computed: {
-        writeNewAddress() {
-            return this.entity.selected.writeNew.address;
-        },
-        writeNewPostalCode() {
-            return this.entity.selected.writeNew.postCode;
-        },
-        isAddressSelectorOpen() {
-            return this.$refs.addressSelector.$data.isOpen;
-        },
-        isEnteredCustomAddress() {
-            return (
-                this.$data.value !== null &&
-                typeof this.$data.value.text !== "undefined"
-            );
-        },
-        addresses() {
-            return this.entity.loaded.addresses;
-        },
-        street: {
-            set(value) {
-                this.entity.selected.address.street = value;
-            },
-            get() {
-                return this.entity.selected.address.street;
-            },
-        },
-        streetNumber: {
-            set(value) {
-                this.entity.selected.address.streetNumber = value;
-            },
-            get() {
-                return this.entity.selected.address.streetNumber;
-            },
-        },
+    writeNewPostalCode() {
+      return this.entity.selected.writeNew.postCode;
     },
-    methods: {
-        transName(value) {
-            return value.streetNumber === undefined
-                ? value.street
-                : `${value.streetNumber}, ${value.street}`;
-        },
-        selectAddress(value) {
-            this.entity.selected.address = value;
-            this.entity.selected.address.addressReference = {
-                id: value.id,
-            };
-            this.entity.selected.address.street = value.street;
-            this.entity.selected.address.streetNumber = value.streetNumber;
-            this.entity.selected.writeNew.address = false;
-            this.updateMapCenter(value.point);
-            this.checkErrors();
-        },
-        remove() {
-            this.entity.selected.address = {};
-            this.checkErrors();
-        },
-        listenInputSearch(query) {
-            //console.log('listenInputSearch', query, this.isAddressSelectorOpen);
-            if (
-                !this.entity.selected.writeNew.postcode &&
-                "id" in this.entity.selected.city
-            ) {
-                if (query.length > 2) {
-                    this.isLoading = true;
-                    searchReferenceAddresses(query, this.entity.selected.city)
-                        .then(
-                            (addresses) =>
-                                new Promise((resolve, reject) => {
-                                    this.entity.loaded.addresses =
-                                        addresses.results;
-                                    this.isLoading = false;
-                                    resolve();
-                                }),
-                        )
-                        .catch((error) => {
-                            console.log(error); //TODO better error handling
-                            this.isLoading = false;
-                        });
-                } else {
-                    if (query.length === 0) {
-                        // Fetch all cities when suppressing the query
-                        this.isLoading = true;
-                        fetchReferenceAddresses(this.entity.selected.city)
-                            .then(
-                                (addresses) =>
-                                    new Promise((resolve, reject) => {
-                                        this.entity.loaded.addresses =
-                                            addresses.results;
-                                        this.isLoading = false;
-                                        resolve();
-                                    }),
-                            )
-                            .catch((error) => {
-                                console.log(error);
-                                this.isLoading = false;
-                            });
-                    }
-                }
-            }
-
-            if (this.isAddressSelectorOpen) {
-                this.$data.value = { text: query };
-            } else if (this.isEnteredCustomAddress) {
-                let addr = this.splitAddress(this.$data.value.text);
-                this.entity.selected.address.street = addr.street;
-                this.entity.selected.address.streetNumber = addr.number;
-                this.entity.selected.writeNew.address = true;
-                this.checkErrors();
-            }
-        },
-        splitAddress(address) {
-            let substr = address.split(",").map((s) => s.trim());
-            if (substr.length === 1) {
-                substr = address.split(" ");
-            }
-            let decimal = [];
-            substr.forEach((s, i) => {
-                decimal[i] = /^\d+$/.test(s);
+    isAddressSelectorOpen() {
+      return this.$refs.addressSelector.$data.isOpen;
+    },
+    isEnteredCustomAddress() {
+      return (
+        this.$data.value !== null &&
+        typeof this.$data.value.text !== "undefined"
+      );
+    },
+    addresses() {
+      return this.entity.loaded.addresses;
+    },
+    street: {
+      set(value) {
+        this.entity.selected.address.street = value;
+      },
+      get() {
+        return this.entity.selected.address.street;
+      },
+    },
+    streetNumber: {
+      set(value) {
+        this.entity.selected.address.streetNumber = value;
+      },
+      get() {
+        return this.entity.selected.address.streetNumber;
+      },
+    },
+  },
+  methods: {
+    transName(value) {
+      return value.streetNumber === undefined
+        ? value.street
+        : `${value.streetNumber}, ${value.street}`;
+    },
+    selectAddress(value) {
+      this.entity.selected.address = value;
+      this.entity.selected.address.addressReference = {
+        id: value.id,
+      };
+      this.entity.selected.address.street = value.street;
+      this.entity.selected.address.streetNumber = value.streetNumber;
+      this.entity.selected.writeNew.address = false;
+      this.updateMapCenter(value.point);
+      this.checkErrors();
+    },
+    remove() {
+      this.entity.selected.address = {};
+      this.checkErrors();
+    },
+    listenInputSearch(query) {
+      //console.log('listenInputSearch', query, this.isAddressSelectorOpen);
+      if (
+        !this.entity.selected.writeNew.postcode &&
+        "id" in this.entity.selected.city
+      ) {
+        if (query.length > 2) {
+          this.isLoading = true;
+          searchReferenceAddresses(query, this.entity.selected.city)
+            .then(
+              (addresses) =>
+                new Promise((resolve, reject) => {
+                  this.entity.loaded.addresses = addresses.results;
+                  this.isLoading = false;
+                  resolve();
+                }),
+            )
+            .catch((error) => {
+              console.log(error); //TODO better error handling
+              this.isLoading = false;
             });
-            if (decimal[0] === true) {
-                return {
-                    number: substr.shift(),
-                    street: substr.join(" "),
-                };
-            } else if (decimal[decimal.length - 1] === true) {
-                return {
-                    number: substr.pop(),
-                    street: substr.join(" "),
-                };
-            }
-            return {
-                number: "",
-                street: substr.join(" "),
-            };
-        },
-        addAddress() {
-            this.entity.selected.writeNew.address = true;
-        },
+        } else {
+          if (query.length === 0) {
+            // Fetch all cities when suppressing the query
+            this.isLoading = true;
+            fetchReferenceAddresses(this.entity.selected.city)
+              .then(
+                (addresses) =>
+                  new Promise((resolve, reject) => {
+                    this.entity.loaded.addresses = addresses.results;
+                    this.isLoading = false;
+                    resolve();
+                  }),
+              )
+              .catch((error) => {
+                console.log(error);
+                this.isLoading = false;
+              });
+          }
+        }
+      }
+
+      if (this.isAddressSelectorOpen) {
+        this.$data.value = { text: query };
+      } else if (this.isEnteredCustomAddress) {
+        let addr = this.splitAddress(this.$data.value.text);
+        this.entity.selected.address.street = addr.street;
+        this.entity.selected.address.streetNumber = addr.number;
+        this.entity.selected.writeNew.address = true;
+        this.checkErrors();
+      }
     },
+    splitAddress(address) {
+      let substr = address.split(",").map((s) => s.trim());
+      if (substr.length === 1) {
+        substr = address.split(" ");
+      }
+      let decimal = [];
+      substr.forEach((s, i) => {
+        decimal[i] = /^\d+$/.test(s);
+      });
+      if (decimal[0] === true) {
+        return {
+          number: substr.shift(),
+          street: substr.join(" "),
+        };
+      } else if (decimal[decimal.length - 1] === true) {
+        return {
+          number: substr.pop(),
+          street: substr.join(" "),
+        };
+      }
+      return {
+        number: "",
+        street: substr.join(" "),
+      };
+    },
+    addAddress() {
+      this.entity.selected.writeNew.address = true;
+    },
+  },
 };
 </script>
 
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue
index 0d85c69f9..74520310e 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue
@@ -1,60 +1,60 @@
 <template>
-    <div class="my-1">
-        <label class="col-form-label">{{ $t("city") }}</label>
-        <VueMultiselect
-            id="citySelector"
-            v-model="value"
-            @search-change="listenInputSearch"
-            ref="citySelector"
-            @select="selectCity"
-            @remove="remove"
-            name="field"
-            track-by="id"
-            label="value"
-            :custom-label="transName"
-            :placeholder="$t('select_city')"
-            :select-label="$t('multiselect.select_label')"
-            :deselect-label="$t('create_postal_code')"
-            :selected-label="$t('multiselect.selected_label')"
-            :taggable="true"
-            :multiple="false"
-            :internal-search="false"
-            @tag="addPostcode"
-            :tag-placeholder="$t('create_postal_code')"
-            :loading="isLoading"
-            :options="cities"
-        />
-    </div>
+  <div class="my-1">
+    <label class="col-form-label">{{ $t("city") }}</label>
+    <VueMultiselect
+      id="citySelector"
+      v-model="value"
+      @search-change="listenInputSearch"
+      ref="citySelector"
+      @select="selectCity"
+      @remove="remove"
+      name="field"
+      track-by="id"
+      label="value"
+      :custom-label="transName"
+      :placeholder="$t('select_city')"
+      :select-label="$t('multiselect.select_label')"
+      :deselect-label="$t('create_postal_code')"
+      :selected-label="$t('multiselect.selected_label')"
+      :taggable="true"
+      :multiple="false"
+      :internal-search="false"
+      @tag="addPostcode"
+      :tag-placeholder="$t('create_postal_code')"
+      :loading="isLoading"
+      :options="cities"
+    />
+  </div>
 
-    <div
-        class="custom-postcode row g-1"
-        v-if="writeNewPostcode || (isEnteredCustomCity && !isCitySelectorOpen)"
-    >
-        <div class="col-4">
-            <div class="form-floating">
-                <input
-                    class="form-control"
-                    type="text"
-                    id="code"
-                    :placeholder="$t('postalCode_code')"
-                    v-model="code"
-                />
-                <label for="code">{{ $t("postalCode_code") }}</label>
-            </div>
-        </div>
-        <div class="col-8">
-            <div class="form-floating">
-                <input
-                    class="form-control"
-                    type="text"
-                    id="name"
-                    :placeholder="$t('postalCode_name')"
-                    v-model="name"
-                />
-                <label for="name">{{ $t("postalCode_name") }}</label>
-            </div>
-        </div>
+  <div
+    class="custom-postcode row g-1"
+    v-if="writeNewPostcode || (isEnteredCustomCity && !isCitySelectorOpen)"
+  >
+    <div class="col-4">
+      <div class="form-floating">
+        <input
+          class="form-control"
+          type="text"
+          id="code"
+          :placeholder="$t('postalCode_code')"
+          v-model="code"
+        />
+        <label for="code">{{ $t("postalCode_code") }}</label>
+      </div>
     </div>
+    <div class="col-8">
+      <div class="form-floating">
+        <input
+          class="form-control"
+          type="text"
+          id="name"
+          :placeholder="$t('postalCode_name')"
+          v-model="name"
+        />
+        <label for="name">{{ $t("postalCode_name") }}</label>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
@@ -62,190 +62,185 @@ import VueMultiselect from "vue-multiselect";
 import { searchCities, fetchCities } from "../../api.js";
 
 export default {
-    name: "CitySelection",
-    components: { VueMultiselect },
-    props: [
-        "entity",
-        "context",
-        "focusOnAddress",
-        "updateMapCenter",
-        "flag",
-        "checkErrors",
-    ],
-    emits: ["getReferenceAddresses"],
-    data() {
-        return {
-            value: this.context.edit ? this.entity.address.postcode : null,
-            isLoading: false,
-        };
+  name: "CitySelection",
+  components: { VueMultiselect },
+  props: [
+    "entity",
+    "context",
+    "focusOnAddress",
+    "updateMapCenter",
+    "flag",
+    "checkErrors",
+  ],
+  emits: ["getReferenceAddresses"],
+  data() {
+    return {
+      value: this.context.edit ? this.entity.address.postcode : null,
+      isLoading: false,
+    };
+  },
+  computed: {
+    writeNewPostcode() {
+      return this.entity.selected.writeNew.postcode;
     },
-    computed: {
-        writeNewPostcode() {
-            return this.entity.selected.writeNew.postcode;
-        },
-        isCitySelectorOpen() {
-            return this.$refs.citySelector.$data.isOpen;
-        },
-        isEnteredCustomCity() {
-            return (
-                this.$data.value !== null &&
-                typeof this.$data.value.text !== "undefined"
-            );
-        },
-        cities() {
-            return this.entity.loaded.cities.sort(
-                (a, b) => Number(a.code) - Number(b.code) || a.name > b.name,
-            );
-        },
-        name: {
-            set(value) {
-                this.entity.selected.postcode.name = value;
-            },
-            get() {
-                return this.entity.selected.postcode.name;
-            },
-        },
-        code: {
-            set(value) {
-                this.entity.selected.postcode.code = value;
-            },
-            get() {
-                return this.entity.selected.postcode.code;
-            },
-        },
+    isCitySelectorOpen() {
+      return this.$refs.citySelector.$data.isOpen;
     },
-    mounted() {
-        console.log(
-            "writeNew.postcode",
-            this.entity.selected.writeNew.postcode,
-            "in mounted",
-        );
-        if (this.context.edit) {
-            this.entity.selected.city = this.value;
-            this.entity.selected.postcode.name = this.value.name;
-            this.entity.selected.postcode.code = this.value.code;
-            this.$emit("getReferenceAddresses", this.value);
-            if (typeof this.value.center !== "undefined") {
-                this.updateMapCenter(this.value.center);
-                if (this.value.center.coordinates) {
-                    this.entity.selected.postcode.coordinates =
-                        this.value.center.coordinates;
-                }
-            }
+    isEnteredCustomCity() {
+      return (
+        this.$data.value !== null &&
+        typeof this.$data.value.text !== "undefined"
+      );
+    },
+    cities() {
+      return this.entity.loaded.cities.sort(
+        (a, b) => Number(a.code) - Number(b.code) || a.name > b.name,
+      );
+    },
+    name: {
+      set(value) {
+        this.entity.selected.postcode.name = value;
+      },
+      get() {
+        return this.entity.selected.postcode.name;
+      },
+    },
+    code: {
+      set(value) {
+        this.entity.selected.postcode.code = value;
+      },
+      get() {
+        return this.entity.selected.postcode.code;
+      },
+    },
+  },
+  mounted() {
+    console.log(
+      "writeNew.postcode",
+      this.entity.selected.writeNew.postcode,
+      "in mounted",
+    );
+    if (this.context.edit) {
+      this.entity.selected.city = this.value;
+      this.entity.selected.postcode.name = this.value.name;
+      this.entity.selected.postcode.code = this.value.code;
+      this.$emit("getReferenceAddresses", this.value);
+      if (typeof this.value.center !== "undefined") {
+        this.updateMapCenter(this.value.center);
+        if (this.value.center.coordinates) {
+          this.entity.selected.postcode.coordinates =
+            this.value.center.coordinates;
         }
+      }
+    }
+  },
+  methods: {
+    transName(value) {
+      return value.code && value.name ? `${value.name} (${value.code})` : "";
     },
-    methods: {
-        transName(value) {
-            return value.code && value.name
-                ? `${value.name} (${value.code})`
-                : "";
-        },
-        selectCity(value) {
-            console.log(value);
-            this.entity.selected.city = value;
-            this.entity.selected.postcode.name = value.name;
-            this.entity.selected.postcode.code = value.code;
-            if (value.center) {
-                this.entity.selected.postcode.coordinates =
-                    value.center.coordinates;
-            }
-            this.entity.selected.writeNew.postcode = false;
-            this.$emit("getReferenceAddresses", value);
-            this.focusOnAddress();
-            if (value.center) {
-                this.updateMapCenter(value.center);
-            }
-            this.checkErrors();
-        },
-        remove() {
-            this.entity.selected.city = {};
-            this.checkErrors();
-        },
-        listenInputSearch(query) {
-            if (query.length > 2) {
-                this.isLoading = true;
-                searchCities(query, this.entity.selected.country)
-                    .then(
-                        (cities) =>
-                            new Promise((resolve, reject) => {
-                                this.entity.loaded.cities =
-                                    cities.results.filter(
-                                        (c) => c.origin !== 3,
-                                    ); // filter out user-defined cities
-                                this.isLoading = false;
-                                resolve();
-                            }),
-                    )
-                    .catch((error) => {
-                        console.log(error); //TODO better error handling
-                        this.isLoading = false;
-                    });
-            } else {
-                if (query.length === 0) {
-                    // Fetch all cities when suppressing the query
-                    this.isLoading = true;
-                    fetchCities(this.entity.selected.country)
-                        .then(
-                            (cities) =>
-                                new Promise((resolve, reject) => {
-                                    this.entity.loaded.cities =
-                                        cities.results.filter(
-                                            (c) => c.origin !== 3,
-                                        ); // filter out user-defined cities
-                                    this.isLoading = false;
-                                    resolve();
-                                }),
-                        )
-                        .catch((error) => {
-                            console.log(error);
-                            this.isLoading = false;
-                        });
-                }
-            }
-            if (this.isCitySelectorOpen) {
-                this.$data.value = { text: query };
-            } else if (this.isEnteredCustomCity) {
-                let city = this.splitCity(this.$data.value.text);
-                this.$refs.citySelector.currentOptionLabel = "";
-                this.entity.selected.city = city;
-                this.entity.selected.postcode.name = city.name;
-                this.entity.selected.postcode.code = city.code;
-                this.entity.selected.writeNew.postcode = true;
-                console.log("writeNew.postcode true, in listenInputSearch");
-            }
-        },
-        splitCity(city) {
-            let substr = city.split("-").map((s) => s.trim());
-            if (substr.length === 1) {
-                substr = city.split(" ");
-            }
-            //console.log('substr', substr);
-            let decimal = [];
-            substr.forEach((s, i) => {
-                decimal[i] = /^\d+$/.test(s);
+    selectCity(value) {
+      console.log(value);
+      this.entity.selected.city = value;
+      this.entity.selected.postcode.name = value.name;
+      this.entity.selected.postcode.code = value.code;
+      if (value.center) {
+        this.entity.selected.postcode.coordinates = value.center.coordinates;
+      }
+      this.entity.selected.writeNew.postcode = false;
+      this.$emit("getReferenceAddresses", value);
+      this.focusOnAddress();
+      if (value.center) {
+        this.updateMapCenter(value.center);
+      }
+      this.checkErrors();
+    },
+    remove() {
+      this.entity.selected.city = {};
+      this.checkErrors();
+    },
+    listenInputSearch(query) {
+      if (query.length > 2) {
+        this.isLoading = true;
+        searchCities(query, this.entity.selected.country)
+          .then(
+            (cities) =>
+              new Promise((resolve, reject) => {
+                this.entity.loaded.cities = cities.results.filter(
+                  (c) => c.origin !== 3,
+                ); // filter out user-defined cities
+                this.isLoading = false;
+                resolve();
+              }),
+          )
+          .catch((error) => {
+            console.log(error); //TODO better error handling
+            this.isLoading = false;
+          });
+      } else {
+        if (query.length === 0) {
+          // Fetch all cities when suppressing the query
+          this.isLoading = true;
+          fetchCities(this.entity.selected.country)
+            .then(
+              (cities) =>
+                new Promise((resolve, reject) => {
+                  this.entity.loaded.cities = cities.results.filter(
+                    (c) => c.origin !== 3,
+                  ); // filter out user-defined cities
+                  this.isLoading = false;
+                  resolve();
+                }),
+            )
+            .catch((error) => {
+              console.log(error);
+              this.isLoading = false;
             });
-            if (decimal[0] === true) {
-                return {
-                    code: substr.shift(),
-                    name: substr.join(" "),
-                };
-            } else if (decimal[decimal.length - 1] === true) {
-                return {
-                    code: substr.pop(),
-                    name: substr.join(" "),
-                };
-            }
-            return {
-                code: "",
-                name: substr.join(" "),
-            };
-        },
-        addPostcode() {
-            console.log("addPostcode: pass here ?? never, it seems");
-            this.entity.selected.writeNew.postcode = true;
-            console.log("writeNew.postcode true, in addPostcode");
-        },
+        }
+      }
+      if (this.isCitySelectorOpen) {
+        this.$data.value = { text: query };
+      } else if (this.isEnteredCustomCity) {
+        let city = this.splitCity(this.$data.value.text);
+        this.$refs.citySelector.currentOptionLabel = "";
+        this.entity.selected.city = city;
+        this.entity.selected.postcode.name = city.name;
+        this.entity.selected.postcode.code = city.code;
+        this.entity.selected.writeNew.postcode = true;
+        console.log("writeNew.postcode true, in listenInputSearch");
+      }
     },
+    splitCity(city) {
+      let substr = city.split("-").map((s) => s.trim());
+      if (substr.length === 1) {
+        substr = city.split(" ");
+      }
+      //console.log('substr', substr);
+      let decimal = [];
+      substr.forEach((s, i) => {
+        decimal[i] = /^\d+$/.test(s);
+      });
+      if (decimal[0] === true) {
+        return {
+          code: substr.shift(),
+          name: substr.join(" "),
+        };
+      } else if (decimal[decimal.length - 1] === true) {
+        return {
+          code: substr.pop(),
+          name: substr.join(" "),
+        };
+      }
+      return {
+        code: "",
+        name: substr.join(" "),
+      };
+    },
+    addPostcode() {
+      console.log("addPostcode: pass here ?? never, it seems");
+      this.entity.selected.writeNew.postcode = true;
+      console.log("writeNew.postcode true, in addPostcode");
+    },
+  },
 };
 </script>
 
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CountrySelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CountrySelection.vue
index 37decf15e..47feab563 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CountrySelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CountrySelection.vue
@@ -1,23 +1,23 @@
 <template>
-    <div class="my-1">
-        <label class="col-form-label" for="countrySelect">{{
-            $t("country")
-        }}</label>
-        <VueMultiselect
-            id="countrySelect"
-            label="name"
-            track-by="id"
-            :custom-label="transName"
-            :placeholder="$t('select_country')"
-            :options="sortedCountries"
-            v-model="value"
-            :select-label="$t('multiselect.select_label')"
-            :deselect-label="$t('multiselect.deselect_label')"
-            :selected-label="$t('multiselect.selected_label')"
-            @select="selectCountry"
-            @remove="remove"
-        />
-    </div>
+  <div class="my-1">
+    <label class="col-form-label" for="countrySelect">{{
+      $t("country")
+    }}</label>
+    <VueMultiselect
+      id="countrySelect"
+      label="name"
+      track-by="id"
+      :custom-label="transName"
+      :placeholder="$t('select_country')"
+      :options="sortedCountries"
+      v-model="value"
+      :select-label="$t('multiselect.select_label')"
+      :deselect-label="$t('multiselect.deselect_label')"
+      :selected-label="$t('multiselect.selected_label')"
+      @select="selectCountry"
+      @remove="remove"
+    />
+  </div>
 </template>
 
 <script>
@@ -25,63 +25,59 @@ import VueMultiselect from "vue-multiselect";
 import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
 
 export default {
-    name: "CountrySelection",
-    components: { VueMultiselect },
-    props: ["context", "entity", "flag", "checkErrors"],
-    emits: ["getCities"],
-    data() {
-        return {
-            value: this.selectCountryByCode(
-                this.context.edit
-                    ? this.entity.selected.country.code
-                    : this.context.defaults.default_country,
-            ),
-        };
+  name: "CountrySelection",
+  components: { VueMultiselect },
+  props: ["context", "entity", "flag", "checkErrors"],
+  emits: ["getCities"],
+  data() {
+    return {
+      value: this.selectCountryByCode(
+        this.context.edit
+          ? this.entity.selected.country.code
+          : this.context.defaults.default_country,
+      ),
+    };
+  },
+  computed: {
+    sortedCountries() {
+      const countries = this.entity.loaded.countries;
+      let sortedCountries = [];
+      sortedCountries.push(...countries.filter((c) => c.countryCode === "FR"));
+      sortedCountries.push(...countries.filter((c) => c.countryCode === "BE"));
+      sortedCountries.push(
+        ...countries
+          .filter((c) => c.countryCode !== "FR")
+          .filter((c) => c.countryCode !== "BE"),
+      );
+      return sortedCountries;
     },
-    computed: {
-        sortedCountries() {
-            const countries = this.entity.loaded.countries;
-            let sortedCountries = [];
-            sortedCountries.push(
-                ...countries.filter((c) => c.countryCode === "FR"),
-            );
-            sortedCountries.push(
-                ...countries.filter((c) => c.countryCode === "BE"),
-            );
-            sortedCountries.push(
-                ...countries
-                    .filter((c) => c.countryCode !== "FR")
-                    .filter((c) => c.countryCode !== "BE"),
-            );
-            return sortedCountries;
-        },
+  },
+  mounted() {
+    console.log("country selection mounted", this.value);
+    if (this.value !== undefined) {
+      this.selectCountry(this.value);
+    }
+  },
+  methods: {
+    selectCountryByCode(countryCode) {
+      return this.entity.loaded.countries.filter(
+        (c) => c.countryCode === countryCode,
+      )[0];
     },
-    mounted() {
-        console.log("country selection mounted", this.value);
-        if (this.value !== undefined) {
-            this.selectCountry(this.value);
-        }
+    transName({ name }) {
+      return localizeString(name);
     },
-    methods: {
-        selectCountryByCode(countryCode) {
-            return this.entity.loaded.countries.filter(
-                (c) => c.countryCode === countryCode,
-            )[0];
-        },
-        transName({ name }) {
-            return localizeString(name);
-        },
-        selectCountry(value) {
-            //console.log('select country', value);
-            this.entity.selected.country = value;
-            this.$emit("getCities", value);
-            this.checkErrors();
-        },
-        remove() {
-            this.entity.selected.country = null;
-            this.checkErrors();
-        },
+    selectCountry(value) {
+      //console.log('select country', value);
+      this.entity.selected.country = value;
+      this.$emit("getCities", value);
+      this.checkErrors();
     },
+    remove() {
+      this.entity.selected.country = null;
+      this.checkErrors();
+    },
+  },
 };
 </script>
 
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue
index 96e67f952..3e8e1f4bb 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue
@@ -1,69 +1,66 @@
 <template>
-    <div v-if="insideModal === false" class="loading">
-        <i
-            v-if="flag.loading"
-            class="fa fa-circle-o-notch fa-spin fa-2x fa-fw"
+  <div v-if="insideModal === false" class="loading">
+    <i v-if="flag.loading" class="fa fa-circle-o-notch fa-spin fa-2x fa-fw" />
+    <span class="sr-only">{{ $t("loading") }}</span>
+  </div>
+
+  <div v-if="errorMsg && errorMsg.length > 0" class="alert alert-danger">
+    {{ errorMsg }}
+  </div>
+
+  <address-render-box :address="selectedAddress" />
+
+  <div class="row">
+    <div v-if="showDateFrom" class="col-lg-6 address-valid date-since">
+      <h3>{{ $t(getValidFromDateText) }}</h3>
+      <div class="input-group mb-3">
+        <span class="input-group-text" id="validFrom"
+          ><i class="fa fa-fw fa-calendar"
+        /></span>
+        <input
+          type="date"
+          class="form-control form-control-lg"
+          name="validFrom"
+          :placeholder="$t(getValidFromDateText)"
+          v-model="validFrom"
+          aria-describedby="validFrom"
         />
-        <span class="sr-only">{{ $t("loading") }}</span>
+      </div>
     </div>
 
-    <div v-if="errorMsg && errorMsg.length > 0" class="alert alert-danger">
-        {{ errorMsg }}
+    <div v-if="showDateTo" class="col-lg-6 address-valid date-until">
+      <h3>{{ $t(getValidToDateText) }}</h3>
+      <div class="input-group mb-3">
+        <span class="input-group-text" id="validTo"
+          ><i class="fa fa-fw fa-calendar"
+        /></span>
+        <input
+          type="date"
+          class="form-control form-control-lg"
+          name="validTo"
+          :placeholder="$t(getValidToDateText)"
+          v-model="validTo"
+          aria-describedby="validTo"
+        />
+      </div>
     </div>
+  </div>
 
-    <address-render-box :address="selectedAddress" />
-
-    <div class="row">
-        <div v-if="showDateFrom" class="col-lg-6 address-valid date-since">
-            <h3>{{ $t(getValidFromDateText) }}</h3>
-            <div class="input-group mb-3">
-                <span class="input-group-text" id="validFrom"
-                    ><i class="fa fa-fw fa-calendar"
-                /></span>
-                <input
-                    type="date"
-                    class="form-control form-control-lg"
-                    name="validFrom"
-                    :placeholder="$t(getValidFromDateText)"
-                    v-model="validFrom"
-                    aria-describedby="validFrom"
-                />
-            </div>
-        </div>
-
-        <div v-if="showDateTo" class="col-lg-6 address-valid date-until">
-            <h3>{{ $t(getValidToDateText) }}</h3>
-            <div class="input-group mb-3">
-                <span class="input-group-text" id="validTo"
-                    ><i class="fa fa-fw fa-calendar"
-                /></span>
-                <input
-                    type="date"
-                    class="form-control form-control-lg"
-                    name="validTo"
-                    :placeholder="$t(getValidToDateText)"
-                    v-model="validTo"
-                    aria-describedby="validTo"
-                />
-            </div>
-        </div>
-    </div>
-
-    <action-buttons
-        v-if="insideModal === false"
-        :options="this.options"
-        :defaultz="this.defaultz"
-    >
-        <template #before>
-            <slot name="before" />
-        </template>
-        <template #action>
-            <slot name="action" />
-        </template>
-        <template #after>
-            <slot name="after" />
-        </template>
-    </action-buttons>
+  <action-buttons
+    v-if="insideModal === false"
+    :options="this.options"
+    :defaultz="this.defaultz"
+  >
+    <template #before>
+      <slot name="before" />
+    </template>
+    <template #action>
+      <slot name="action" />
+    </template>
+    <template #after>
+      <slot name="after" />
+    </template>
+  </action-buttons>
 </template>
 
 <script>
@@ -72,116 +69,113 @@ import AddressRenderBox from "ChillMainAssets/vuejs/_components/Entity/AddressRe
 import ActionButtons from "./ActionButtons.vue";
 
 export default {
-    name: "DatePane",
-    components: {
-        AddressRenderBox,
-        ActionButtons,
+  name: "DatePane",
+  components: {
+    AddressRenderBox,
+    ActionButtons,
+  },
+  props: [
+    "context",
+    "options",
+    "defaultz",
+    "flag",
+    "entity",
+    "errorMsg",
+    "insideModal",
+  ],
+  computed: {
+    address() {
+      return this.entity.address;
     },
-    props: [
-        "context",
-        "options",
-        "defaultz",
-        "flag",
-        "entity",
-        "errorMsg",
-        "insideModal",
-    ],
-    computed: {
-        address() {
-            return this.entity.address;
-        },
-        validFrom: {
-            set(value) {
-                this.entity.selected.valid.from = ISOToDate(value);
-            },
-            get() {
-                return dateToISO(this.entity.selected.valid.from);
-            },
-        },
-        validTo: {
-            set(value) {
-                this.entity.selected.valid.to = ISOToDate(value);
-            },
-            get() {
-                return dateToISO(this.entity.selected.valid.to);
-            },
-        },
-        getValidFromDateText() {
-            return this.context.target.name === "household"
-                ? "move_date"
-                : "validFrom";
-        },
-        getValidToDateText() {
-            return "validTo";
-        },
-        showDateFrom() {
-            return !this.context.edit && this.options.useDate.validFrom;
-        },
-        showDateTo() {
-            return !this.context.edit && this.options.useDate.validTo;
-        },
-        selectedAddress() {
-            let address = {};
-
-            address["country"] = this.entity.selected.country
-                ? this.entity.selected.country
-                : null;
-            address["postcode"] = this.entity.selected.postcode
-                ? this.entity.selected.postcode
-                : null;
-
-            if (this.entity.selected.address) {
-                let number = this.entity.selected.address.streetNumber
-                    ? this.entity.selected.address.streetNumber
-                    : null;
-                let street = this.entity.selected.address.street
-                    ? this.entity.selected.address.street
-                    : null;
-                address["text"] = number + ", " + street;
-
-                address["street"] = this.entity.selected.address.street
-                    ? this.entity.selected.address.street
-                    : null;
-                address["streetNumber"] = this.entity.selected.address
-                    .streetNumber
-                    ? this.entity.selected.address.streetNumber
-                    : null;
-                address["floor"] = this.entity.selected.address.floor
-                    ? this.entity.selected.address.floor
-                    : null;
-                address["corridor"] = this.entity.selected.address.corridor
-                    ? this.entity.selected.address.corridor
-                    : null;
-                address["steps"] = this.entity.selected.address.steps
-                    ? this.entity.selected.address.steps
-                    : null;
-                address["flat"] = this.entity.selected.address.flat
-                    ? this.entity.selected.address.flat
-                    : null;
-                address["buildingName"] = this.entity.selected.address
-                    .buildingName
-                    ? this.entity.selected.address.buildingName
-                    : null;
-                address["distribution"] = this.entity.selected.address
-                    .distribution
-                    ? this.entity.selected.address.distribution
-                    : null;
-                address["extra"] = this.entity.selected.address.extra
-                    ? this.entity.selected.address.extra
-                    : null;
-            }
-
-            if (this.entity.selected.valid) {
-                address["validFrom"] = this.entity.selected.valid.from
-                    ? dateToISO(this.entity.selected.valid.from)
-                    : null;
-                address["validTo"] = this.entity.selected.valid.to
-                    ? dateToISO(this.entity.selected.valid.to)
-                    : null;
-            }
-
-            return address;
-        },
+    validFrom: {
+      set(value) {
+        this.entity.selected.valid.from = ISOToDate(value);
+      },
+      get() {
+        return dateToISO(this.entity.selected.valid.from);
+      },
     },
+    validTo: {
+      set(value) {
+        this.entity.selected.valid.to = ISOToDate(value);
+      },
+      get() {
+        return dateToISO(this.entity.selected.valid.to);
+      },
+    },
+    getValidFromDateText() {
+      return this.context.target.name === "household"
+        ? "move_date"
+        : "validFrom";
+    },
+    getValidToDateText() {
+      return "validTo";
+    },
+    showDateFrom() {
+      return !this.context.edit && this.options.useDate.validFrom;
+    },
+    showDateTo() {
+      return !this.context.edit && this.options.useDate.validTo;
+    },
+    selectedAddress() {
+      let address = {};
+
+      address["country"] = this.entity.selected.country
+        ? this.entity.selected.country
+        : null;
+      address["postcode"] = this.entity.selected.postcode
+        ? this.entity.selected.postcode
+        : null;
+
+      if (this.entity.selected.address) {
+        let number = this.entity.selected.address.streetNumber
+          ? this.entity.selected.address.streetNumber
+          : null;
+        let street = this.entity.selected.address.street
+          ? this.entity.selected.address.street
+          : null;
+        address["text"] = number + ", " + street;
+
+        address["street"] = this.entity.selected.address.street
+          ? this.entity.selected.address.street
+          : null;
+        address["streetNumber"] = this.entity.selected.address.streetNumber
+          ? this.entity.selected.address.streetNumber
+          : null;
+        address["floor"] = this.entity.selected.address.floor
+          ? this.entity.selected.address.floor
+          : null;
+        address["corridor"] = this.entity.selected.address.corridor
+          ? this.entity.selected.address.corridor
+          : null;
+        address["steps"] = this.entity.selected.address.steps
+          ? this.entity.selected.address.steps
+          : null;
+        address["flat"] = this.entity.selected.address.flat
+          ? this.entity.selected.address.flat
+          : null;
+        address["buildingName"] = this.entity.selected.address.buildingName
+          ? this.entity.selected.address.buildingName
+          : null;
+        address["distribution"] = this.entity.selected.address.distribution
+          ? this.entity.selected.address.distribution
+          : null;
+        address["extra"] = this.entity.selected.address.extra
+          ? this.entity.selected.address.extra
+          : null;
+      }
+
+      if (this.entity.selected.valid) {
+        address["validFrom"] = this.entity.selected.valid.from
+          ? dateToISO(this.entity.selected.valid.from)
+          : null;
+        address["validTo"] = this.entity.selected.valid.to
+          ? dateToISO(this.entity.selected.valid.to)
+          : null;
+      }
+
+      return address;
+    },
+  },
 };
 </script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
index df5ea56dc..cf808ed2a 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
@@ -1,104 +1,101 @@
 <template>
-    <div class="address-form">
-        <!-- Not display in modal -->
-        <div v-if="insideModal === false" class="loading">
-            <i
-                v-if="flag.loading"
-                class="fa fa-circle-o-notch fa-spin fa-2x fa-fw"
-            />
-            <span class="sr-only">Loading...</span>
-        </div>
-
-        <div v-if="errors.length" class="alert alert-warning">
-            <ul>
-                <li v-for="(e, i) in errors" :key="i">
-                    {{ e }}
-                </li>
-            </ul>
-        </div>
-
-        <h4 class="h3">
-            {{ $t("select_an_address_title") }}
-        </h4>
-        <div class="row my-3">
-            <div class="col-lg-6">
-                <div class="form-check">
-                    <input
-                        type="checkbox"
-                        class="form-check-input"
-                        id="isConfidential"
-                        v-model="isConfidential"
-                        :value="valueConfidential"
-                    />
-                    <label class="form-check-label" for="isConfidential">
-                        {{ $t("isConfidential") }}
-                    </label>
-                </div>
-                <div class="form-check">
-                    <input
-                        type="checkbox"
-                        class="form-check-input"
-                        id="isNoAddress"
-                        v-model="isNoAddress"
-                        :value="value"
-                    />
-                    <label class="form-check-label" for="isNoAddress">
-                        {{ $t("isNoAddress") }}
-                    </label>
-                </div>
-
-                <country-selection
-                    :context="context"
-                    :entity="entity"
-                    :flag="flag"
-                    :check-errors="checkErrors"
-                    @get-cities="$emit('getCities', selected.country)"
-                />
-
-                <city-selection
-                    :entity="entity"
-                    :context="context"
-                    :focus-on-address="focusOnAddress"
-                    :update-map-center="updateMapCenter"
-                    :flag="flag"
-                    :check-errors="checkErrors"
-                    @get-reference-addresses="
-                        $emit('getReferenceAddresses', selected.city)
-                    "
-                />
-
-                <address-selection
-                    v-if="!isNoAddress"
-                    :entity="entity"
-                    :context="context"
-                    :update-map-center="updateMapCenter"
-                    :flag="flag"
-                    :check-errors="checkErrors"
-                />
-            </div>
-            <div class="col-lg-6 mt-3 mt-lg-0">
-                <address-map :entity="entity" ref="addressMap" />
-            </div>
-        </div>
-
-        <address-more :entity="entity" :is-no-address="isNoAddress" />
-
-        <action-buttons
-            v-if="insideModal === false"
-            :options="this.options"
-            :defaultz="this.defaultz"
-        >
-            <template #before>
-                <slot name="before" />
-            </template>
-            <template #action>
-                <slot name="action" />
-            </template>
-            <template #after>
-                <slot name="after" />
-            </template>
-        </action-buttons>
+  <div class="address-form">
+    <!-- Not display in modal -->
+    <div v-if="insideModal === false" class="loading">
+      <i v-if="flag.loading" class="fa fa-circle-o-notch fa-spin fa-2x fa-fw" />
+      <span class="sr-only">Loading...</span>
     </div>
+
+    <div v-if="errors.length" class="alert alert-warning">
+      <ul>
+        <li v-for="(e, i) in errors" :key="i">
+          {{ e }}
+        </li>
+      </ul>
+    </div>
+
+    <h4 class="h3">
+      {{ $t("select_an_address_title") }}
+    </h4>
+    <div class="row my-3">
+      <div class="col-lg-6">
+        <div class="form-check">
+          <input
+            type="checkbox"
+            class="form-check-input"
+            id="isConfidential"
+            v-model="isConfidential"
+            :value="valueConfidential"
+          />
+          <label class="form-check-label" for="isConfidential">
+            {{ $t("isConfidential") }}
+          </label>
+        </div>
+        <div class="form-check">
+          <input
+            type="checkbox"
+            class="form-check-input"
+            id="isNoAddress"
+            v-model="isNoAddress"
+            :value="value"
+          />
+          <label class="form-check-label" for="isNoAddress">
+            {{ $t("isNoAddress") }}
+          </label>
+        </div>
+
+        <country-selection
+          :context="context"
+          :entity="entity"
+          :flag="flag"
+          :check-errors="checkErrors"
+          @get-cities="$emit('getCities', selected.country)"
+        />
+
+        <city-selection
+          :entity="entity"
+          :context="context"
+          :focus-on-address="focusOnAddress"
+          :update-map-center="updateMapCenter"
+          :flag="flag"
+          :check-errors="checkErrors"
+          @get-reference-addresses="
+            $emit('getReferenceAddresses', selected.city)
+          "
+        />
+
+        <address-selection
+          v-if="!isNoAddress"
+          :entity="entity"
+          :context="context"
+          :update-map-center="updateMapCenter"
+          :flag="flag"
+          :check-errors="checkErrors"
+        />
+      </div>
+      <div class="col-lg-6 mt-3 mt-lg-0">
+        <address-map :entity="entity" ref="addressMap" />
+      </div>
+    </div>
+
+    <address-more :entity="entity" :is-no-address="isNoAddress" />
+
+    <action-buttons
+      v-if="insideModal === false"
+      :options="this.options"
+      :defaultz="this.defaultz"
+    >
+      <template #before>
+        <slot name="before" />
+      </template>
+      <template #action>
+        <slot name="action" />
+      </template>
+      <template #after>
+        <slot name="after" />
+      </template>
+    </action-buttons>
+  </div>
 </template>
 
 <script>
@@ -110,88 +107,88 @@ import AddressMore from "./AddAddress/AddressMore";
 import ActionButtons from "./ActionButtons.vue";
 
 export default {
-    name: "EditPane",
-    components: {
-        CountrySelection,
-        CitySelection,
-        AddressSelection,
-        AddressMap,
-        AddressMore,
-        ActionButtons,
+  name: "EditPane",
+  components: {
+    CountrySelection,
+    CitySelection,
+    AddressSelection,
+    AddressMap,
+    AddressMore,
+    ActionButtons,
+  },
+  props: [
+    "context",
+    "options",
+    "defaultz",
+    "flag",
+    "entity",
+    "errorMsg",
+    "insideModal",
+    "errors",
+    "checkErrors",
+  ],
+  emits: ["getCities", "getReferenceAddresses"],
+  data() {
+    return {
+      value: false,
+      valueConfidential: false,
+    };
+  },
+  computed: {
+    address() {
+      return this.entity.address;
     },
-    props: [
-        "context",
-        "options",
-        "defaultz",
-        "flag",
-        "entity",
-        "errorMsg",
-        "insideModal",
-        "errors",
-        "checkErrors",
-    ],
-    emits: ["getCities", "getReferenceAddresses"],
-    data() {
-        return {
-            value: false,
-            valueConfidential: false,
-        };
+    loaded() {
+      return this.entity.loaded;
     },
-    computed: {
-        address() {
-            return this.entity.address;
-        },
-        loaded() {
-            return this.entity.loaded;
-        },
-        selected() {
-            return this.entity.selected;
-        },
-        addressMap() {
-            return this.entity.addressMap;
-        },
-        isConfidential: {
-            set(value) {
-                this.entity.selected.confidential = value;
-            },
-            get() {
-                return this.entity.selected.confidential;
-            },
-        },
-        isNoAddress: {
-            set(value) {
-                console.log("isNoAddress value", value);
-                this.entity.selected.isNoAddress = value;
-                this.checkErrors();
-            },
-            get() {
-                return this.entity.selected.isNoAddress;
-            },
-        },
+    selected() {
+      return this.entity.selected;
     },
-    methods: {
-        focusOnAddress() {
-            const addressSelector = document.getElementById("addressSelector");
-            if (addressSelector !== null) {
-                addressSelector.focus();
-            }
-        },
-        updateMapCenter(point) {
-            console.log("point", point);
-            this.addressMap.center[0] = point.coordinates[0];
-            this.addressMap.center[1] = point.coordinates[1];
-            this.$refs.addressMap.update(); // cast child methods
-        },
+    addressMap() {
+      return this.entity.addressMap;
     },
+    isConfidential: {
+      set(value) {
+        this.entity.selected.confidential = value;
+      },
+      get() {
+        return this.entity.selected.confidential;
+      },
+    },
+    isNoAddress: {
+      set(value) {
+        console.log("isNoAddress value", value);
+        this.entity.selected.isNoAddress = value;
+        this.checkErrors();
+      },
+      get() {
+        return this.entity.selected.isNoAddress;
+      },
+    },
+  },
+  methods: {
+    focusOnAddress() {
+      const addressSelector = document.getElementById("addressSelector");
+      if (addressSelector !== null) {
+        addressSelector.focus();
+      }
+    },
+    updateMapCenter(point) {
+      console.log("point", point);
+      this.addressMap.center[0] = point.coordinates[0];
+      this.addressMap.center[1] = point.coordinates[1];
+      this.$refs.addressMap.update(); // cast child methods
+    },
+  },
 };
 </script>
 
 <style lang="scss">
 div.address-form {
-    div#address_map {
-        height: 400px;
-        width: 100%;
-        z-index: 1;
-    }
+  div#address_map {
+    height: 400px;
+    width: 100%;
+    z-index: 1;
+  }
 }
 </style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
index a17ce719d..d0796bc0d 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
@@ -1,109 +1,98 @@
 <template>
-    <div v-if="!onlyButton" class="mt-4 flex-grow-1">
-        <div class="loading">
-            <i
-                v-if="flag.loading"
-                class="fa fa-circle-o-notch fa-spin fa-2x fa-fw"
-            />
-            <span class="sr-only">{{ $t("loading") }}</span>
-        </div>
-
-        <div v-if="errorMsg && errorMsg.length > 0" class="alert alert-danger">
-            {{ errorMsg }}
-        </div>
-
-        <div v-if="flag.success" class="alert alert-success">
-            {{ $t(getSuccessText) }}
-            <span v-if="forceRedirect">{{ $t("wait_redirection") }}</span>
-        </div>
-
-        <div
-            v-if="
-                !this.context.edit &&
-                !this.flag.success &&
-                this.context.target.name !== 'household'
-            "
-            class="mt-5"
-        >
-            <div class="no-address-yet">
-                <i class="fa fa-map-marker" aria-hidden="true" />
-                <p class="chill-no-data-statement">
-                    {{ $t("not_yet_address") }}
-                </p>
-
-                <action-buttons
-                    :options="this.options"
-                    :defaultz="this.defaultz"
-                    class="add-address-btn"
-                >
-                    <template #action>
-                        <button
-                            @click.prevent="$emit('openEditPane')"
-                            class="btn"
-                            :class="getClassButton"
-                            type="button"
-                            name="button"
-                            :title="$t(getTextButton)"
-                        >
-                            <span v-if="displayTextButton">{{
-                                $t(getTextButton)
-                            }}</span>
-                        </button>
-                    </template>
-                </action-buttons>
-            </div>
-        </div>
-
-        <address-render-box
-            :address="address"
-            :is-multiline="false"
-            :use-date-pane="useDatePane"
-        />
-
-        <div
-            v-if="this.context.target.name === 'household' || this.context.edit"
-        >
-            <action-buttons :options="this.options" :defaultz="this.defaultz">
-                <template #action>
-                    <button
-                        @click.prevent="$emit('openEditPane')"
-                        class="btn"
-                        :class="getClassButton"
-                        type="button"
-                        name="button"
-                        :title="$t(getTextButton)"
-                    >
-                        <span v-if="displayTextButton">{{
-                            $t(getTextButton)
-                        }}</span>
-                    </button>
-                </template>
-            </action-buttons>
-        </div>
+  <div v-if="!onlyButton" class="mt-4 flex-grow-1">
+    <div class="loading">
+      <i v-if="flag.loading" class="fa fa-circle-o-notch fa-spin fa-2x fa-fw" />
+      <span class="sr-only">{{ $t("loading") }}</span>
     </div>
 
-    <div v-if="onlyButton">
+    <div v-if="errorMsg && errorMsg.length > 0" class="alert alert-danger">
+      {{ errorMsg }}
+    </div>
+
+    <div v-if="flag.success" class="alert alert-success">
+      {{ $t(getSuccessText) }}
+      <span v-if="forceRedirect">{{ $t("wait_redirection") }}</span>
+    </div>
+
+    <div
+      v-if="
+        !this.context.edit &&
+        !this.flag.success &&
+        this.context.target.name !== 'household'
+      "
+      class="mt-5"
+    >
+      <div class="no-address-yet">
+        <i class="fa fa-map-marker" aria-hidden="true" />
+        <p class="chill-no-data-statement">
+          {{ $t("not_yet_address") }}
+        </p>
+
         <action-buttons
-            :options="this.options"
-            :defaultz="this.defaultz"
-            class="add-address-btn"
+          :options="this.options"
+          :defaultz="this.defaultz"
+          class="add-address-btn"
         >
-            <template #action>
-                <button
-                    @click.prevent="$emit('openEditPane')"
-                    class="btn"
-                    :class="getClassButton"
-                    type="button"
-                    name="button"
-                    :title="$t(getTextButton)"
-                >
-                    <span v-if="displayTextButton">{{
-                        $t(getTextButton)
-                    }}</span>
-                </button>
-            </template>
+          <template #action>
+            <button
+              @click.prevent="$emit('openEditPane')"
+              class="btn"
+              :class="getClassButton"
+              type="button"
+              name="button"
+              :title="$t(getTextButton)"
+            >
+              <span v-if="displayTextButton">{{ $t(getTextButton) }}</span>
+            </button>
+          </template>
         </action-buttons>
+      </div>
     </div>
+
+    <address-render-box
+      :address="address"
+      :is-multiline="false"
+      :use-date-pane="useDatePane"
+    />
+
+    <div v-if="this.context.target.name === 'household' || this.context.edit">
+      <action-buttons :options="this.options" :defaultz="this.defaultz">
+        <template #action>
+          <button
+            @click.prevent="$emit('openEditPane')"
+            class="btn"
+            :class="getClassButton"
+            type="button"
+            name="button"
+            :title="$t(getTextButton)"
+          >
+            <span v-if="displayTextButton">{{ $t(getTextButton) }}</span>
+          </button>
+        </template>
+      </action-buttons>
+    </div>
+  </div>
+
+  <div v-if="onlyButton">
+    <action-buttons
+      :options="this.options"
+      :defaultz="this.defaultz"
+      class="add-address-btn"
+    >
+      <template #action>
+        <button
+          @click.prevent="$emit('openEditPane')"
+          class="btn"
+          :class="getClassButton"
+          type="button"
+          name="button"
+          :title="$t(getTextButton)"
+        >
+          <span v-if="displayTextButton">{{ $t(getTextButton) }}</span>
+        </button>
+      </template>
+    </action-buttons>
+  </div>
 </template>
 
 <script>
@@ -111,103 +100,101 @@ import AddressRenderBox from "ChillMainAssets/vuejs/_components/Entity/AddressRe
 import ActionButtons from "./ActionButtons.vue";
 
 export default {
-    name: "ShowPane",
-    components: {
-        AddressRenderBox,
-        ActionButtons,
+  name: "ShowPane",
+  components: {
+    AddressRenderBox,
+    ActionButtons,
+  },
+  props: [
+    "context",
+    "defaultz",
+    "options",
+    "flag",
+    "entity",
+    "errorMsg",
+    "useDatePane",
+  ],
+  emits: ["openEditPane"],
+  mounted() {
+    //console.log('context', this.context)
+  },
+  computed: {
+    address() {
+      return this.entity.address;
     },
-    props: [
-        "context",
-        "defaultz",
-        "options",
-        "flag",
-        "entity",
-        "errorMsg",
-        "useDatePane",
-    ],
-    emits: ["openEditPane"],
-    mounted() {
-        //console.log('context', this.context)
+    displayTextButton() {
+      return typeof this.options.button !== "undefined" &&
+        typeof this.options.button.displayText !== "undefined"
+        ? this.options.button.displayText
+        : this.defaultz.button.displayText;
     },
-    computed: {
-        address() {
-            return this.entity.address;
-        },
-        displayTextButton() {
-            return typeof this.options.button !== "undefined" &&
-                typeof this.options.button.displayText !== "undefined"
-                ? this.options.button.displayText
-                : this.defaultz.button.displayText;
-        },
-        getClassButton() {
-            let type = this.context.edit
-                ? this.defaultz.button.type.edit
-                : this.defaultz.button.type.create;
-            let size =
-                typeof this.options.button !== "undefined" &&
-                this.options.button.size !== null
-                    ? `${this.options.button.size} `
-                    : "";
-            return `${size}${type}`;
-        },
-        getTextButton() {
-            if (
-                typeof this.options.button.text !== "undefined" &&
-                (this.options.button.text.edit !== null ||
-                    this.options.button.text.create !== null)
-            ) {
-                return this.context.edit
-                    ? this.options.button.text.edit
-                    : this.options.button.text.create;
-            }
-            return this.context.edit
-                ? this.defaultz.button.text.edit
-                : this.defaultz.button.text.create;
-        },
-        getSuccessText() {
-            return this.context.edit
-                ? "address_edit_success"
-                : "address_new_success";
-        },
-        onlyButton() {
-            return typeof this.options.onlyButton !== "undefined"
-                ? this.options.onlyButton
-                : this.defaultz.onlyButton;
-        },
-        forceRedirect() {
-            return !(
-                this.context.backUrl === null ||
-                typeof this.context.backUrl === "undefined"
-            );
-        },
-        // showMessageWhenNoAddress() {
-        //     let showMessageWhenNoAddress = this.options.showMessageWhenNoAddress === undefined ? this.defaultz.showMessageWhenNoAddress : this.options.showMessageWhenNoAddress;
-        //     if (showMessageWhenNoAddress === true || showMessageWhenNoAddress === false) {
-        //         return !this.context.edit && !this.address.id && showMessageWhenNoAddress;
-        //     }
-        //    return !this.context.edit && !this.address.id && this.options.stickyActions;
-        // }
+    getClassButton() {
+      let type = this.context.edit
+        ? this.defaultz.button.type.edit
+        : this.defaultz.button.type.create;
+      let size =
+        typeof this.options.button !== "undefined" &&
+        this.options.button.size !== null
+          ? `${this.options.button.size} `
+          : "";
+      return `${size}${type}`;
     },
+    getTextButton() {
+      if (
+        typeof this.options.button.text !== "undefined" &&
+        (this.options.button.text.edit !== null ||
+          this.options.button.text.create !== null)
+      ) {
+        return this.context.edit
+          ? this.options.button.text.edit
+          : this.options.button.text.create;
+      }
+      return this.context.edit
+        ? this.defaultz.button.text.edit
+        : this.defaultz.button.text.create;
+    },
+    getSuccessText() {
+      return this.context.edit ? "address_edit_success" : "address_new_success";
+    },
+    onlyButton() {
+      return typeof this.options.onlyButton !== "undefined"
+        ? this.options.onlyButton
+        : this.defaultz.onlyButton;
+    },
+    forceRedirect() {
+      return !(
+        this.context.backUrl === null ||
+        typeof this.context.backUrl === "undefined"
+      );
+    },
+    // showMessageWhenNoAddress() {
+    //     let showMessageWhenNoAddress = this.options.showMessageWhenNoAddress === undefined ? this.defaultz.showMessageWhenNoAddress : this.options.showMessageWhenNoAddress;
+    //     if (showMessageWhenNoAddress === true || showMessageWhenNoAddress === false) {
+    //         return !this.context.edit && !this.address.id && showMessageWhenNoAddress;
+    //     }
+    //    return !this.context.edit && !this.address.id && this.options.stickyActions;
+    // }
+  },
 };
 </script>
 
 <style lang="scss">
 .address-container {
-    display: flex;
-    justify-content: flex-end;
-    border-radius: 5px;
+  display: flex;
+  justify-content: flex-end;
+  border-radius: 5px;
 }
 .no-address-yet {
-    text-align: center;
-    box-shadow: rgba(0, 0, 0, 0.24) 0px 3px 8px;
-    padding: 1.5rem;
+  text-align: center;
+  box-shadow: rgba(0, 0, 0, 0.24) 0px 3px 8px;
+  padding: 1.5rem;
+  margin-bottom: 2rem;
+  i {
+    font-size: 2rem;
     margin-bottom: 2rem;
-    i {
-        font-size: 2rem;
-        margin-bottom: 2rem;
-    }
-    .add-address-btn {
-        display: block;
-    }
+  }
+  .add-address-btn {
+    display: block;
+  }
 }
 </style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue
index ddaed6219..2e62b5963 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/SuggestPane.vue
@@ -1,67 +1,64 @@
 <template>
-    <div v-if="insideModal === false" class="loading">
-        <i
-            v-if="flag.loading"
-            class="fa fa-circle-o-notch fa-spin fa-2x fa-fw"
-        />
-        <span class="sr-only">{{ $t("loading") }}</span>
-    </div>
+  <div v-if="insideModal === false" class="loading">
+    <i v-if="flag.loading" class="fa fa-circle-o-notch fa-spin fa-2x fa-fw" />
+    <span class="sr-only">{{ $t("loading") }}</span>
+  </div>
 
-    <div v-if="errorMsg && errorMsg.length > 0" class="alert alert-danger">
-        {{ errorMsg }}
-    </div>
+  <div v-if="errorMsg && errorMsg.length > 0" class="alert alert-danger">
+    {{ errorMsg }}
+  </div>
 
-    <h4 class="h3">
-        {{ $t("address_suggestions") }}
-    </h4>
+  <h4 class="h3">
+    {{ $t("address_suggestions") }}
+  </h4>
 
-    <div class="flex-table AddressSuggestionList">
-        <div
-            v-for="(a, i) in context.suggestions"
-            class="item-bloc"
-            :key="`suggestions-${i}`"
-        >
-            <div class="float-button bottom">
-                <div class="box">
-                    <div class="action">
-                        <!-- QUESTION normal que ça vienne avant l'adresse ? pourquoi pas après avoir affiché le address-render-box ? -->
-                        <ul class="record_actions">
-                            <li>
-                                <button
-                                    class="btn btn-sm btn-choose"
-                                    @click="this.pickAddress(a)"
-                                >
-                                    {{ $t("use_this_address") }}
-                                </button>
-                            </li>
-                        </ul>
-                    </div>
-                    <ul class="list-content fa-ul">
-                        <li>
-                            <i class="fa fa-li fa-map-marker" />
-                            <address-render-box :address="a" />
-                        </li>
-                    </ul>
-                </div>
-            </div>
-        </div>
-    </div>
-
-    <action-buttons
-        v-if="insideModal === false"
-        :options="this.options"
-        :defaultz="this.defaultz"
+  <div class="flex-table AddressSuggestionList">
+    <div
+      v-for="(a, i) in context.suggestions"
+      class="item-bloc"
+      :key="`suggestions-${i}`"
     >
-        <template #before>
-            <slot name="before" />
-        </template>
-        <template #action>
-            <slot name="action" />
-        </template>
-        <template #after>
-            <slot name="after" />
-        </template>
-    </action-buttons>
+      <div class="float-button bottom">
+        <div class="box">
+          <div class="action">
+            <!-- QUESTION normal que ça vienne avant l'adresse ? pourquoi pas après avoir affiché le address-render-box ? -->
+            <ul class="record_actions">
+              <li>
+                <button
+                  class="btn btn-sm btn-choose"
+                  @click="this.pickAddress(a)"
+                >
+                  {{ $t("use_this_address") }}
+                </button>
+              </li>
+            </ul>
+          </div>
+          <ul class="list-content fa-ul">
+            <li>
+              <i class="fa fa-li fa-map-marker" />
+              <address-render-box :address="a" />
+            </li>
+          </ul>
+        </div>
+      </div>
+    </div>
+  </div>
+
+  <action-buttons
+    v-if="insideModal === false"
+    :options="this.options"
+    :defaultz="this.defaultz"
+  >
+    <template #before>
+      <slot name="before" />
+    </template>
+    <template #action>
+      <slot name="action" />
+    </template>
+    <template #after>
+      <slot name="after" />
+    </template>
+  </action-buttons>
 </template>
 
 <script>
@@ -69,26 +66,26 @@ import AddressRenderBox from "ChillMainAssets/vuejs/_components/Entity/AddressRe
 import ActionButtons from "./ActionButtons.vue";
 
 export default {
-    name: "SuggestPane",
-    components: {
-        AddressRenderBox,
-        ActionButtons,
-    },
-    props: [
-        "context",
-        "options",
-        "defaultz",
-        "flag",
-        "entity",
-        "errorMsg",
-        "insideModal",
-    ],
-    computed: {},
-    methods: {
-        pickAddress(address) {
-            console.log("pickAddress in suggest pane", address);
-            this.$emit("pickAddress", address);
-        },
+  name: "SuggestPane",
+  components: {
+    AddressRenderBox,
+    ActionButtons,
+  },
+  props: [
+    "context",
+    "options",
+    "defaultz",
+    "flag",
+    "entity",
+    "errorMsg",
+    "insideModal",
+  ],
+  computed: {},
+  methods: {
+    pickAddress(address) {
+      console.log("pickAddress in suggest pane", address);
+      this.$emit("pickAddress", address);
     },
+  },
 };
 </script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/DownloadExport/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/DownloadExport/App.vue
index 033eb6cac..d1389a748 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/DownloadExport/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/DownloadExport/App.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
 import {
-    trans,
-    EXPORT_GENERATION_EXPORT_GENERATION_IS_PENDING,
-    EXPORT_GENERATION_TOO_MANY_RETRIES,
-    EXPORT_GENERATION_ERROR_WHILE_GENERATING_EXPORT,
-    EXPORT_GENERATION_EXPORT_READY,
+  trans,
+  EXPORT_GENERATION_EXPORT_GENERATION_IS_PENDING,
+  EXPORT_GENERATION_TOO_MANY_RETRIES,
+  EXPORT_GENERATION_ERROR_WHILE_GENERATING_EXPORT,
+  EXPORT_GENERATION_EXPORT_READY,
 } from "translator";
 import { computed, onMounted, ref } from "vue";
 import { StoredObject, StoredObjectStatus } from "ChillDocStoreAssets/types";
@@ -13,9 +13,9 @@ import DocumentActionButtonsGroup from "ChillDocStoreAssets/vuejs/DocumentAction
 import { ExportGeneration } from "ChillMainAssets/types";
 
 interface AppProps {
-    exportGenerationId: string;
-    title: string;
-    createdDate: string;
+  exportGenerationId: string;
+  title: string;
+  createdDate: string;
 }
 
 const props = defineProps<AppProps>();
@@ -23,19 +23,19 @@ const props = defineProps<AppProps>();
 const exportGeneration = ref<ExportGeneration | null>(null);
 
 const status = computed<StoredObjectStatus>(
-    () => exportGeneration.value?.status ?? "pending",
+  () => exportGeneration.value?.status ?? "pending",
 );
 const storedObject = computed<null | StoredObject>(() => {
-    if (exportGeneration.value === null) {
-        return null;
-    }
+  if (exportGeneration.value === null) {
+    return null;
+  }
 
-    return exportGeneration.value?.storedObject;
+  return exportGeneration.value?.storedObject;
 });
 
 const isPending = computed<boolean>(() => status.value === "pending");
 const isFetching = computed<boolean>(
-    () => tryiesForReady.value < maxTryiesForReady,
+  () => tryiesForReady.value < maxTryiesForReady,
 );
 const isReady = computed<boolean>(() => status.value === "ready");
 const isFailure = computed<boolean>(() => status.value === "failure");
@@ -52,90 +52,87 @@ let tryiesForReady = ref<number>(0);
 const maxTryiesForReady = 120;
 
 const checkForReady = function (): void {
-    if (
-        "ready" === status.value ||
-        "empty" === status.value ||
-        "failure" === status.value ||
-        // stop reloading if the page stays opened for a long time
-        tryiesForReady.value > maxTryiesForReady
-    ) {
-        return;
-    }
+  if (
+    "ready" === status.value ||
+    "empty" === status.value ||
+    "failure" === status.value ||
+    // stop reloading if the page stays opened for a long time
+    tryiesForReady.value > maxTryiesForReady
+  ) {
+    return;
+  }
 
-    tryiesForReady.value = tryiesForReady.value + 1;
-    setTimeout(onObjectNewStatusCallback, 5000);
+  tryiesForReady.value = tryiesForReady.value + 1;
+  setTimeout(onObjectNewStatusCallback, 5000);
 };
 
 const onObjectNewStatusCallback = async function (): Promise<void> {
-    exportGeneration.value = await fetchExportGenerationStatus(
-        props.exportGenerationId,
-    );
-
-    if (isPending.value) {
-        checkForReady();
-        return Promise.resolve();
-    }
+  exportGeneration.value = await fetchExportGenerationStatus(
+    props.exportGenerationId,
+  );
 
+  if (isPending.value) {
+    checkForReady();
     return Promise.resolve();
+  }
+
+  return Promise.resolve();
 };
 
 onMounted(() => {
-    onObjectNewStatusCallback();
+  onObjectNewStatusCallback();
 });
 </script>
 
 <template>
-    <div id="waiting-screen">
-        <div
-            v-if="isPending && isFetching"
-            class="alert alert-danger text-center"
-        >
-            <div>
-                <p>
-                    {{ trans(EXPORT_GENERATION_EXPORT_GENERATION_IS_PENDING) }}
-                </p>
-            </div>
+  <div id="waiting-screen">
+    <div v-if="isPending && isFetching" class="alert alert-danger text-center">
+      <div>
+        <p>
+          {{ trans(EXPORT_GENERATION_EXPORT_GENERATION_IS_PENDING) }}
+        </p>
+      </div>
 
-            <div>
-                <i class="fa fa-cog fa-spin fa-3x fa-fw"></i>
-                <span class="sr-only">Loading...</span>
-            </div>
-        </div>
-        <div v-if="isPending && !isFetching" class="alert alert-info">
-            <div>
-                <p>
-                    {{ trans(EXPORT_GENERATION_TOO_MANY_RETRIES) }}
-                </p>
-            </div>
-        </div>
-        <div v-if="isFailure" class="alert alert-danger text-center">
-            <div>
-                <p>
-                    {{ trans(EXPORT_GENERATION_ERROR_WHILE_GENERATING_EXPORT) }}
-                </p>
-            </div>
-        </div>
-        <div v-if="isReady" class="alert alert-success text-center">
-            <div>
-                <p>
-                    {{ trans(EXPORT_GENERATION_EXPORT_READY) }}
-                </p>
-
-                <p v-if="storedObject !== null">
-                    <document-action-buttons-group
-                        :stored-object="storedObject"
-                        :filename="filename"
-                    ></document-action-buttons-group>
-                </p>
-            </div>
-        </div>
+      <div>
+        <i class="fa fa-cog fa-spin fa-3x fa-fw"></i>
+        <span class="sr-only">Loading...</span>
+      </div>
     </div>
+    <div v-if="isPending && !isFetching" class="alert alert-info">
+      <div>
+        <p>
+          {{ trans(EXPORT_GENERATION_TOO_MANY_RETRIES) }}
+        </p>
+      </div>
+    </div>
+    <div v-if="isFailure" class="alert alert-danger text-center">
+      <div>
+        <p>
+          {{ trans(EXPORT_GENERATION_ERROR_WHILE_GENERATING_EXPORT) }}
+        </p>
+      </div>
+    </div>
+    <div v-if="isReady" class="alert alert-success text-center">
+      <div>
+        <p>
+          {{ trans(EXPORT_GENERATION_EXPORT_READY) }}
+        </p>
+
+        <p v-if="storedObject !== null">
+          <document-action-buttons-group
+            :stored-object="storedObject"
+            :filename="filename"
+          ></document-action-buttons-group>
+        </p>
+      </div>
+    </div>
+  </div>
 </template>
 
 <style scoped lang="scss">
 #waiting-screen {
-    > .alert {
-        min-height: 350px;
-    }
+  > .alert {
+    min-height: 350px;
+  }
 }
 </style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/DownloadExport/index.ts b/src/Bundle/ChillMainBundle/Resources/public/vuejs/DownloadExport/index.ts
index e970e51b9..ae77fbb08 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/DownloadExport/index.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/DownloadExport/index.ts
@@ -4,8 +4,8 @@ import App from "./App.vue";
 const el = document.getElementById("app");
 
 if (null === el) {
-    console.error("div element app was not found");
-    throw new Error("div element app was not found");
+  console.error("div element app was not found");
+  throw new Error("div element app was not found");
 }
 
 const exportGenerationId = el?.dataset.exportGenerationId as string;
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue
index 8686b59a7..c550d1c0d 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue
@@ -1,36 +1,36 @@
 <template>
-    <h2>{{ $t("main_title") }}</h2>
+  <h2>{{ $t("main_title") }}</h2>
 
-    <ul class="nav nav-tabs">
-        <li class="nav-item">
-            <a
-                class="nav-link"
-                :class="{ active: activeTab === 'MyCustoms' }"
-                @click="selectTab('MyCustoms')"
-            >
-                <i class="fa fa-dashboard" />
-            </a>
-        </li>
-        <li class="nav-item">
-            <a
-                class="nav-link"
-                :class="{ active: activeTab === 'MyNotifications' }"
-                @click="selectTab('MyNotifications')"
-            >
-                {{ $t("my_notifications.tab") }}
-                <tab-counter :count="state.notifications.count" />
-            </a>
-        </li>
-        <li class="nav-item">
-            <a
-                class="nav-link"
-                :class="{ active: activeTab === 'MyAccompanyingCourses' }"
-                @click="selectTab('MyAccompanyingCourses')"
-            >
-                {{ $t("my_accompanying_courses.tab") }}
-            </a>
-        </li>
-        <!-- <li class="nav-item">
+  <ul class="nav nav-tabs">
+    <li class="nav-item">
+      <a
+        class="nav-link"
+        :class="{ active: activeTab === 'MyCustoms' }"
+        @click="selectTab('MyCustoms')"
+      >
+        <i class="fa fa-dashboard" />
+      </a>
+    </li>
+    <li class="nav-item">
+      <a
+        class="nav-link"
+        :class="{ active: activeTab === 'MyNotifications' }"
+        @click="selectTab('MyNotifications')"
+      >
+        {{ $t("my_notifications.tab") }}
+        <tab-counter :count="state.notifications.count" />
+      </a>
+    </li>
+    <li class="nav-item">
+      <a
+        class="nav-link"
+        :class="{ active: activeTab === 'MyAccompanyingCourses' }"
+        @click="selectTab('MyAccompanyingCourses')"
+      >
+        {{ $t("my_accompanying_courses.tab") }}
+      </a>
+    </li>
+    <!-- <li class="nav-item">
          <a class="nav-link"
             :class="{'active': activeTab === 'MyWorks'}"
             @click="selectTab('MyWorks')">
@@ -38,59 +38,57 @@
             <tab-counter :count="state.works.count"></tab-counter>
          </a>
       </li> -->
-        <li class="nav-item">
-            <a
-                class="nav-link"
-                :class="{ active: activeTab === 'MyEvaluations' }"
-                @click="selectTab('MyEvaluations')"
-            >
-                {{ $t("my_evaluations.tab") }}
-                <tab-counter :count="state.evaluations.count" />
-            </a>
-        </li>
-        <li class="nav-item">
-            <a
-                class="nav-link"
-                :class="{ active: activeTab === 'MyTasks' }"
-                @click="selectTab('MyTasks')"
-            >
-                {{ $t("my_tasks.tab") }}
-                <tab-counter
-                    :count="state.tasks.warning.count + state.tasks.alert.count"
-                />
-            </a>
-        </li>
-        <li class="nav-item">
-            <a
-                class="nav-link"
-                :class="{ active: activeTab === 'MyWorkflows' }"
-                @click="selectTab('MyWorkflows')"
-            >
-                {{ $t("my_workflows.tab") }}
-                <tab-counter
-                    :count="state.workflows.count + state.workflowsCc.count"
-                />
-            </a>
-        </li>
-        <li class="nav-item loading ms-auto py-2" v-if="loading">
-            <i
-                class="fa fa-circle-o-notch fa-spin fa-lg text-chill-gray"
-                :title="$t('loading')"
-            />
-        </li>
-    </ul>
-
-    <div class="my-4">
-        <my-customs v-if="activeTab === 'MyCustoms'" />
-        <my-works v-else-if="activeTab === 'MyWorks'" />
-        <my-evaluations v-else-if="activeTab === 'MyEvaluations'" />
-        <my-tasks v-else-if="activeTab === 'MyTasks'" />
-        <my-accompanying-courses
-            v-else-if="activeTab === 'MyAccompanyingCourses'"
+    <li class="nav-item">
+      <a
+        class="nav-link"
+        :class="{ active: activeTab === 'MyEvaluations' }"
+        @click="selectTab('MyEvaluations')"
+      >
+        {{ $t("my_evaluations.tab") }}
+        <tab-counter :count="state.evaluations.count" />
+      </a>
+    </li>
+    <li class="nav-item">
+      <a
+        class="nav-link"
+        :class="{ active: activeTab === 'MyTasks' }"
+        @click="selectTab('MyTasks')"
+      >
+        {{ $t("my_tasks.tab") }}
+        <tab-counter
+          :count="state.tasks.warning.count + state.tasks.alert.count"
         />
-        <my-notifications v-else-if="activeTab === 'MyNotifications'" />
-        <my-workflows v-else-if="activeTab === 'MyWorkflows'" />
-    </div>
+      </a>
+    </li>
+    <li class="nav-item">
+      <a
+        class="nav-link"
+        :class="{ active: activeTab === 'MyWorkflows' }"
+        @click="selectTab('MyWorkflows')"
+      >
+        {{ $t("my_workflows.tab") }}
+        <tab-counter :count="state.workflows.count + state.workflowsCc.count" />
+      </a>
+    </li>
+    <li class="nav-item loading ms-auto py-2" v-if="loading">
+      <i
+        class="fa fa-circle-o-notch fa-spin fa-lg text-chill-gray"
+        :title="$t('loading')"
+      />
+    </li>
+  </ul>
+
+  <div class="my-4">
+    <my-customs v-if="activeTab === 'MyCustoms'" />
+    <my-works v-else-if="activeTab === 'MyWorks'" />
+    <my-evaluations v-else-if="activeTab === 'MyEvaluations'" />
+    <my-tasks v-else-if="activeTab === 'MyTasks'" />
+    <my-accompanying-courses
+      v-else-if="activeTab === 'MyAccompanyingCourses'"
+    />
+    <my-notifications v-else-if="activeTab === 'MyNotifications'" />
+    <my-workflows v-else-if="activeTab === 'MyWorkflows'" />
+  </div>
 </template>
 
 <script>
@@ -105,55 +103,55 @@ import TabCounter from "./TabCounter";
 import { mapState } from "vuex";
 
 export default {
-    name: "App",
-    components: {
-        MyCustoms,
-        MyWorks,
-        MyEvaluations,
-        MyTasks,
-        MyWorkflows,
-        MyAccompanyingCourses,
-        MyNotifications,
-        TabCounter,
-    },
-    data() {
-        return {
-            activeTab: "MyCustoms",
-        };
-    },
-    computed: {
-        ...mapState(["loading"]),
-        // just to see all in devtool :
-        ...mapState({
-            state: (state) => state,
-        }),
-    },
-    methods: {
-        selectTab(tab) {
-            if (tab !== "MyCustoms") {
-                this.$store.dispatch("getByTab", { tab: tab });
-            }
-            this.activeTab = tab;
-            console.log(this.activeTab);
-        },
-    },
-    mounted() {
-        for (const m of [
-            "MyNotifications",
-            "MyAccompanyingCourses",
-            // 'MyWorks',
-            "MyEvaluations",
-            "MyTasks",
-            "MyWorkflows",
-        ]) {
-            this.$store.dispatch("getByTab", { tab: m, param: "countOnly=1" });
-        }
+  name: "App",
+  components: {
+    MyCustoms,
+    MyWorks,
+    MyEvaluations,
+    MyTasks,
+    MyWorkflows,
+    MyAccompanyingCourses,
+    MyNotifications,
+    TabCounter,
+  },
+  data() {
+    return {
+      activeTab: "MyCustoms",
+    };
+  },
+  computed: {
+    ...mapState(["loading"]),
+    // just to see all in devtool :
+    ...mapState({
+      state: (state) => state,
+    }),
+  },
+  methods: {
+    selectTab(tab) {
+      if (tab !== "MyCustoms") {
+        this.$store.dispatch("getByTab", { tab: tab });
+      }
+      this.activeTab = tab;
+      console.log(this.activeTab);
     },
+  },
+  mounted() {
+    for (const m of [
+      "MyNotifications",
+      "MyAccompanyingCourses",
+      // 'MyWorks',
+      "MyEvaluations",
+      "MyTasks",
+      "MyWorkflows",
+    ]) {
+      this.$store.dispatch("getByTab", { tab: m, param: "countOnly=1" });
+    }
+  },
 };
 </script>
 
 <style scoped>
 a.nav-link {
-    cursor: pointer;
+  cursor: pointer;
 }
 </style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/DashboardWidgets/News.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/DashboardWidgets/News.vue
index 5633d3133..4f664d6a5 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/DashboardWidgets/News.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/DashboardWidgets/News.vue
@@ -1,13 +1,13 @@
 <template>
-    <div>
-        <h1>{{ $t("widget.news.title") }}</h1>
-        <ul v-if="newsItems.length > 0" class="scrollable">
-            <NewsItem v-for="item in newsItems" :item="item" :key="item.id" />
-        </ul>
-        <p v-if="newsItems.length === 0" class="chill-no-data-statement">
-            {{ $t("widget.news.none") }}
-        </p>
-    </div>
+  <div>
+    <h1>{{ $t("widget.news.title") }}</h1>
+    <ul v-if="newsItems.length > 0" class="scrollable">
+      <NewsItem v-for="item in newsItems" :item="item" :key="item.id" />
+    </ul>
+    <p v-if="newsItems.length === 0" class="chill-no-data-statement">
+      {{ $t("widget.news.none") }}
+    </p>
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -19,26 +19,26 @@ import NewsItem from "./NewsItem.vue";
 const newsItems = ref<NewsItemType[]>([]);
 
 onMounted(() => {
-    fetchResults<NewsItemType>("/api/1.0/main/news/current.json")
-        .then((news): Promise<void> => {
-            // console.log('news articles', response.results)
-            newsItems.value = news;
+  fetchResults<NewsItemType>("/api/1.0/main/news/current.json")
+    .then((news): Promise<void> => {
+      // console.log('news articles', response.results)
+      newsItems.value = news;
 
-            return Promise.resolve();
-        })
-        .catch((error: string) => {
-            console.error("Error fetching news items", error);
-        });
+      return Promise.resolve();
+    })
+    .catch((error: string) => {
+      console.error("Error fetching news items", error);
+    });
 });
 </script>
 
 <style scoped>
 ul {
-    list-style: none;
-    padding: 0;
+  list-style: none;
+  padding: 0;
 }
 
 h1 {
-    text-align: center;
+  text-align: center;
 }
 </style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/DashboardWidgets/NewsItem.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/DashboardWidgets/NewsItem.vue
index 997eae58b..5cbd33712 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/DashboardWidgets/NewsItem.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/DashboardWidgets/NewsItem.vue
@@ -1,40 +1,38 @@
 <template>
-    <li>
-        <h2>{{ props.item.title }}</h2>
-        <time class="createdBy" datetime="{{item.startDate.datetime}}">{{
-            $d(newsItemStartDate(), "text")
-        }}</time>
-        <div class="content" v-if="shouldTruncate(item.content)">
-            <div v-html="prepareContent(item.content)"></div>
-            <div class="float-end">
-                <button
-                    class="btn btn-sm btn-show read-more"
-                    @click="() => openModal(item)"
-                >
-                    {{ $t("widget.news.readMore") }}
-                </button>
-            </div>
-        </div>
-        <div class="content" v-else>
-            <div v-html="convertMarkdownToHtml(item.content)"></div>
-        </div>
+  <li>
+    <h2>{{ props.item.title }}</h2>
+    <time class="createdBy" datetime="{{item.startDate.datetime}}">{{
+      $d(newsItemStartDate(), "text")
+    }}</time>
+    <div class="content" v-if="shouldTruncate(item.content)">
+      <div v-html="prepareContent(item.content)"></div>
+      <div class="float-end">
+        <button
+          class="btn btn-sm btn-show read-more"
+          @click="() => openModal(item)"
+        >
+          {{ $t("widget.news.readMore") }}
+        </button>
+      </div>
+    </div>
+    <div class="content" v-else>
+      <div v-html="convertMarkdownToHtml(item.content)"></div>
+    </div>
 
-        <modal v-if="showModal" @close="closeModal">
-            <template #header>
-                <p class="news-title">{{ item.title }}</p>
-            </template>
-            <template #body>
-                <p class="news-date">
-                    <time
-                        class="createdBy"
-                        datetime="{{item.startDate.datetime}}"
-                        >{{ $d(newsItemStartDate(), "text") }}</time
-                    >
-                </p>
-                <div v-html="convertMarkdownToHtml(item.content)"></div>
-            </template>
-        </modal>
-    </li>
+    <modal v-if="showModal" @close="closeModal">
+      <template #header>
+        <p class="news-title">{{ item.title }}</p>
+      </template>
+      <template #body>
+        <p class="news-date">
+          <time class="createdBy" datetime="{{item.startDate.datetime}}">{{
+            $d(newsItemStartDate(), "text")
+          }}</time>
+        </p>
+        <div v-html="convertMarkdownToHtml(item.content)"></div>
+      </template>
+    </modal>
+  </li>
 </template>
 
 <script setup lang="ts">
@@ -47,151 +45,147 @@ import { ref } from "vue";
 import { ISOToDatetime } from "../../../chill/js/date";
 
 const props = defineProps({
-    item: {
-        type: Object as PropType<NewsItemType>,
-        required: true,
-    },
-    maxLength: {
-        type: Number,
-        required: false,
-        default: 350,
-    },
-    maxLines: {
-        type: Number,
-        required: false,
-        default: 3,
-    },
+  item: {
+    type: Object as PropType<NewsItemType>,
+    required: true,
+  },
+  maxLength: {
+    type: Number,
+    required: false,
+    default: 350,
+  },
+  maxLines: {
+    type: Number,
+    required: false,
+    default: 3,
+  },
 });
 
 const selectedArticle = ref<NewsItemType | null>(null);
 const showModal = ref(false);
 
 const openModal = (item: NewsItemType) => {
-    selectedArticle.value = item;
-    showModal.value = true;
+  selectedArticle.value = item;
+  showModal.value = true;
 };
 
 const closeModal = () => {
-    selectedArticle.value = null;
-    showModal.value = false;
+  selectedArticle.value = null;
+  showModal.value = false;
 };
 
 const shouldTruncate = (content: string): boolean => {
-    const lines = content.split("\n");
+  const lines = content.split("\n");
 
-    // Check if any line exceeds the maximum length
-    const tooManyLines = lines.length > props.maxLines;
+  // Check if any line exceeds the maximum length
+  const tooManyLines = lines.length > props.maxLines;
 
-    return content.length > props.maxLength || tooManyLines;
+  return content.length > props.maxLength || tooManyLines;
 };
 
 const truncateContent = (content: string): string => {
-    let truncatedContent = content.slice(0, props.maxLength);
-    let linkDepth = 0;
-    let linkStartIndex = -1;
-    const lines = content.split("\n");
+  let truncatedContent = content.slice(0, props.maxLength);
+  let linkDepth = 0;
+  let linkStartIndex = -1;
+  const lines = content.split("\n");
 
-    // Truncate if amount of lines are too many
-    if (lines.length > props.maxLines && content.length < props.maxLength) {
-        const truncatedContent = lines
-            .slice(0, props.maxLines)
-            .join("\n")
-            .trim();
-        return truncatedContent + "...";
+  // Truncate if amount of lines are too many
+  if (lines.length > props.maxLines && content.length < props.maxLength) {
+    const truncatedContent = lines.slice(0, props.maxLines).join("\n").trim();
+    return truncatedContent + "...";
+  }
+
+  for (let i = 0; i < truncatedContent.length; i++) {
+    const char = truncatedContent[i];
+
+    if (char === "[") {
+      linkDepth++;
+      if (linkDepth === 1) {
+        linkStartIndex = i;
+      }
+    } else if (char === "]") {
+      linkDepth = Math.max(0, linkDepth - 1);
+    } else if (char === "(" && linkDepth === 0) {
+      truncatedContent = truncatedContent.slice(0, i);
+      break;
     }
+  }
 
-    for (let i = 0; i < truncatedContent.length; i++) {
-        const char = truncatedContent[i];
+  while (linkDepth > 0) {
+    truncatedContent += "]";
+    linkDepth--;
+  }
 
-        if (char === "[") {
-            linkDepth++;
-            if (linkDepth === 1) {
-                linkStartIndex = i;
-            }
-        } else if (char === "]") {
-            linkDepth = Math.max(0, linkDepth - 1);
-        } else if (char === "(" && linkDepth === 0) {
-            truncatedContent = truncatedContent.slice(0, i);
-            break;
-        }
-    }
+  // If a link was found, append the URL inside the parentheses
+  if (linkStartIndex !== -1) {
+    const linkEndIndex = content.indexOf(")", linkStartIndex);
+    const url = content.slice(linkStartIndex + 1, linkEndIndex);
+    truncatedContent = truncatedContent.slice(0, linkStartIndex) + `(${url})`;
+  }
 
-    while (linkDepth > 0) {
-        truncatedContent += "]";
-        linkDepth--;
-    }
+  truncatedContent += "...";
 
-    // If a link was found, append the URL inside the parentheses
-    if (linkStartIndex !== -1) {
-        const linkEndIndex = content.indexOf(")", linkStartIndex);
-        const url = content.slice(linkStartIndex + 1, linkEndIndex);
-        truncatedContent =
-            truncatedContent.slice(0, linkStartIndex) + `(${url})`;
-    }
-
-    truncatedContent += "...";
-
-    return truncatedContent;
+  return truncatedContent;
 };
 
 const preprocess = (markdown: string): string => {
-    return markdown;
+  return markdown;
 };
 
 const postprocess = (html: string): string => {
-    DOMPurify.addHook("afterSanitizeAttributes", (node: any) => {
-        if ("target" in node) {
-            node.setAttribute("target", "_blank");
-            node.setAttribute("rel", "noopener noreferrer");
-        }
-        if (
-            !node.hasAttribute("target") &&
-            (node.hasAttribute("xlink:href") || node.hasAttribute("href"))
-        ) {
-            node.setAttribute("xlink:show", "new");
-        }
-    });
+  DOMPurify.addHook("afterSanitizeAttributes", (node: any) => {
+    if ("target" in node) {
+      node.setAttribute("target", "_blank");
+      node.setAttribute("rel", "noopener noreferrer");
+    }
+    if (
+      !node.hasAttribute("target") &&
+      (node.hasAttribute("xlink:href") || node.hasAttribute("href"))
+    ) {
+      node.setAttribute("xlink:show", "new");
+    }
+  });
 
-    return DOMPurify.sanitize(html);
+  return DOMPurify.sanitize(html);
 };
 
 const convertMarkdownToHtml = (markdown: string): string => {
-    marked.use({ hooks: { postprocess, preprocess }, async: false });
-    const rawHtml = marked(markdown) as string;
-    return rawHtml;
+  marked.use({ hooks: { postprocess, preprocess }, async: false });
+  const rawHtml = marked(markdown) as string;
+  return rawHtml;
 };
 
 const prepareContent = (content: string): string => {
-    const htmlContent = convertMarkdownToHtml(content);
-    return truncateContent(htmlContent);
+  const htmlContent = convertMarkdownToHtml(content);
+  return truncateContent(htmlContent);
 };
 
 const newsItemStartDate = (): null | Date => {
-    return ISOToDatetime(props.item?.startDate.datetime);
+  return ISOToDatetime(props.item?.startDate.datetime);
 };
 </script>
 
 <style scoped>
 li {
-    margin-bottom: 20px;
-    overflow: hidden;
-    padding: 0.8rem;
-    background-color: #fbfbfb;
-    border-radius: 4px;
+  margin-bottom: 20px;
+  overflow: hidden;
+  padding: 0.8rem;
+  background-color: #fbfbfb;
+  border-radius: 4px;
 }
 
 h2 {
-    font-size: 1rem !important;
-    text-transform: uppercase;
+  font-size: 1rem !important;
+  text-transform: uppercase;
 }
 
 .content {
-    overflow: hidden;
-    font-size: 0.9rem;
-    position: relative;
+  overflow: hidden;
+  font-size: 0.9rem;
+  position: relative;
 }
 
 .news-title {
-    font-weight: bold;
+  font-weight: bold;
 }
 </style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyAccompanyingCourses.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyAccompanyingCourses.vue
index 9f7edf8e7..bd3b5cdf8 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyAccompanyingCourses.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyAccompanyingCourses.vue
@@ -1,76 +1,65 @@
 <template>
-    <div class="alert alert-light">
-        {{ $t("my_accompanying_courses.description") }}
-    </div>
-    <span v-if="noResults" class="chill-no-data-statement">{{
-        $t("no_data")
-    }}</span>
-    <tab-table v-else>
-        <template #thead>
-            <th scope="col">
-                {{ $t("opening_date") }}
-            </th>
-            <th scope="col">
-                {{ $t("social_issues") }}
-            </th>
-            <th scope="col">
-                {{ $t("concerned_persons") }}
-            </th>
-            <th scope="col" />
-            <th scope="col" />
-        </template>
-        <template #tbody>
-            <tr
-                v-for="(c, i) in accompanyingCourses.results"
-                :key="`course-${i}`"
-            >
-                <td>{{ $d(c.openingDate.datetime, "short") }}</td>
-                <td>
-                    <span
-                        v-for="(i, index) in c.socialIssues"
-                        :key="index"
-                        class="chill-entity entity-social-issue"
-                    >
-                        <span class="badge bg-chill-l-gray text-dark">
-                            {{ localizeString(i.title) }}
-                        </span>
-                    </span>
-                </td>
-                <td>
-                    <span
-                        v-for="p in c.participations"
-                        class="me-1"
-                        :key="p.person.id"
-                    >
-                        <on-the-fly
-                            :type="p.person.type"
-                            :id="p.person.id"
-                            :button-text="p.person.textAge"
-                            :display-badge="'true' === 'true'"
-                            action="show"
-                        />
-                    </span>
-                </td>
-                <td>
-                    <span
-                        v-if="c.emergency"
-                        class="badge rounded-pill bg-danger me-1"
-                        >{{ $t("emergency") }}</span
-                    >
-                    <span
-                        v-if="c.confidential"
-                        class="badge rounded-pill bg-danger"
-                        >{{ $t("confidential") }}</span
-                    >
-                </td>
-                <td>
-                    <a class="btn btn-sm btn-show" :href="getUrl(c)">
-                        {{ $t("show_entity", { entity: $t("the_course") }) }}
-                    </a>
-                </td>
-            </tr>
-        </template>
-    </tab-table>
+  <div class="alert alert-light">
+    {{ $t("my_accompanying_courses.description") }}
+  </div>
+  <span v-if="noResults" class="chill-no-data-statement">{{
+    $t("no_data")
+  }}</span>
+  <tab-table v-else>
+    <template #thead>
+      <th scope="col">
+        {{ $t("opening_date") }}
+      </th>
+      <th scope="col">
+        {{ $t("social_issues") }}
+      </th>
+      <th scope="col">
+        {{ $t("concerned_persons") }}
+      </th>
+      <th scope="col" />
+      <th scope="col" />
+    </template>
+    <template #tbody>
+      <tr v-for="(c, i) in accompanyingCourses.results" :key="`course-${i}`">
+        <td>{{ $d(c.openingDate.datetime, "short") }}</td>
+        <td>
+          <span
+            v-for="(i, index) in c.socialIssues"
+            :key="index"
+            class="chill-entity entity-social-issue"
+          >
+            <span class="badge bg-chill-l-gray text-dark">
+              {{ localizeString(i.title) }}
+            </span>
+          </span>
+        </td>
+        <td>
+          <span v-for="p in c.participations" class="me-1" :key="p.person.id">
+            <on-the-fly
+              :type="p.person.type"
+              :id="p.person.id"
+              :button-text="p.person.textAge"
+              :display-badge="'true' === 'true'"
+              action="show"
+            />
+          </span>
+        </td>
+        <td>
+          <span v-if="c.emergency" class="badge rounded-pill bg-danger me-1">{{
+            $t("emergency")
+          }}</span>
+          <span v-if="c.confidential" class="badge rounded-pill bg-danger">{{
+            $t("confidential")
+          }}</span>
+        </td>
+        <td>
+          <a class="btn btn-sm btn-show" :href="getUrl(c)">
+            {{ $t("show_entity", { entity: $t("the_course") }) }}
+          </a>
+        </td>
+      </tr>
+    </template>
+  </tab-table>
 </template>
 
 <script>
@@ -80,33 +69,33 @@ import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly";
 import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
 
 export default {
-    name: "MyAccompanyingCourses",
-    components: {
-        TabTable,
-        OnTheFly,
+  name: "MyAccompanyingCourses",
+  components: {
+    TabTable,
+    OnTheFly,
+  },
+  computed: {
+    ...mapState(["accompanyingCourses"]),
+    ...mapGetters(["isAccompanyingCoursesLoaded"]),
+    noResults() {
+      if (!this.isAccompanyingCoursesLoaded) {
+        return false;
+      } else {
+        return this.accompanyingCourses.count === 0;
+      }
     },
-    computed: {
-        ...mapState(["accompanyingCourses"]),
-        ...mapGetters(["isAccompanyingCoursesLoaded"]),
-        noResults() {
-            if (!this.isAccompanyingCoursesLoaded) {
-                return false;
-            } else {
-                return this.accompanyingCourses.count === 0;
-            }
-        },
-    },
-    methods: {
-        localizeString,
-        getUrl(c) {
-            return `/fr/parcours/${c.id}`;
-        },
+  },
+  methods: {
+    localizeString,
+    getUrl(c) {
+      return `/fr/parcours/${c.id}`;
     },
+  },
 };
 </script>
 
 <style scoped>
 span.badge.rounded-pill.bg-danger {
-    text-transform: uppercase;
+  text-transform: uppercase;
 }
 </style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyCustoms.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyCustoms.vue
index 1f76a5a0a..5b10dc89c 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyCustoms.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyCustoms.vue
@@ -1,105 +1,103 @@
 <template>
-    <span v-if="noResults" class="chill-no-data-statement">{{
-        $t("no_dashboard")
-    }}</span>
-    <div v-else id="dashboards" class="container g-3">
-        <div class="row">
-            <div class="mbloc col-xs-12 col-sm-4">
-                <div class="custom1">
-                    <ul class="list-unstyled">
-                        <li v-if="counter.notifications > 0">
-                            <i18n-t
-                                keypath="counter.unread_notifications"
-                                tag="span"
-                                :class="counterClass"
-                                :plural="counter.notifications"
-                            >
-                                <template #n>
-                                    <span>{{ counter.notifications }}</span>
-                                </template>
-                            </i18n-t>
-                        </li>
-                        <li v-if="counter.accompanyingCourses > 0">
-                            <i18n-t
-                                keypath="counter.assignated_courses"
-                                tag="span"
-                                :class="counterClass"
-                                :plural="counter.accompanyingCourses"
-                            >
-                                <template #n>
-                                    <span>{{
-                                        counter.accompanyingCourses
-                                    }}</span>
-                                </template>
-                            </i18n-t>
-                        </li>
-                        <li v-if="counter.works > 0">
-                            <i18n-t
-                                keypath="counter.assignated_actions"
-                                tag="span"
-                                :class="counterClass"
-                                :plural="counter.works"
-                            >
-                                <template #n>
-                                    <span>{{ counter.works }}</span>
-                                </template>
-                            </i18n-t>
-                        </li>
-                        <li v-if="counter.evaluations > 0">
-                            <i18n-t
-                                keypath="counter.assignated_evaluations"
-                                tag="span"
-                                :class="counterClass"
-                                :plural="counter.evaluations"
-                            >
-                                <template #n>
-                                    <span>{{ counter.evaluations }}</span>
-                                </template>
-                            </i18n-t>
-                        </li>
-                        <li v-if="counter.tasksAlert > 0">
-                            <i18n-t
-                                keypath="counter.alert_tasks"
-                                tag="span"
-                                :class="counterClass"
-                                :plural="counter.tasksAlert"
-                            >
-                                <template #n>
-                                    <span>{{ counter.tasksAlert }}</span>
-                                </template>
-                            </i18n-t>
-                        </li>
-                        <li v-if="counter.tasksWarning > 0">
-                            <i18n-t
-                                keypath="counter.warning_tasks"
-                                tag="span"
-                                :class="counterClass"
-                                :plural="counter.tasksWarning"
-                            >
-                                <template #n>
-                                    <span>{{ counter.tasksWarning }}</span>
-                                </template>
-                            </i18n-t>
-                        </li>
-                    </ul>
-                </div>
-            </div>
-
-            <template v-if="this.hasDashboardItems">
-                <template
-                    v-for="(dashboardItem, index) in this.dashboardItems"
-                    :key="index"
-                >
-                    <div
-                        class="mbloc col-xs-12 col-sm-8 news"
-                        v-if="dashboardItem.type === 'news'"
-                    >
-                        <News />
-                    </div>
+  <span v-if="noResults" class="chill-no-data-statement">{{
+    $t("no_dashboard")
+  }}</span>
+  <div v-else id="dashboards" class="container g-3">
+    <div class="row">
+      <div class="mbloc col-xs-12 col-sm-4">
+        <div class="custom1">
+          <ul class="list-unstyled">
+            <li v-if="counter.notifications > 0">
+              <i18n-t
+                keypath="counter.unread_notifications"
+                tag="span"
+                :class="counterClass"
+                :plural="counter.notifications"
+              >
+                <template #n>
+                  <span>{{ counter.notifications }}</span>
                 </template>
-            </template>
+              </i18n-t>
+            </li>
+            <li v-if="counter.accompanyingCourses > 0">
+              <i18n-t
+                keypath="counter.assignated_courses"
+                tag="span"
+                :class="counterClass"
+                :plural="counter.accompanyingCourses"
+              >
+                <template #n>
+                  <span>{{ counter.accompanyingCourses }}</span>
+                </template>
+              </i18n-t>
+            </li>
+            <li v-if="counter.works > 0">
+              <i18n-t
+                keypath="counter.assignated_actions"
+                tag="span"
+                :class="counterClass"
+                :plural="counter.works"
+              >
+                <template #n>
+                  <span>{{ counter.works }}</span>
+                </template>
+              </i18n-t>
+            </li>
+            <li v-if="counter.evaluations > 0">
+              <i18n-t
+                keypath="counter.assignated_evaluations"
+                tag="span"
+                :class="counterClass"
+                :plural="counter.evaluations"
+              >
+                <template #n>
+                  <span>{{ counter.evaluations }}</span>
+                </template>
+              </i18n-t>
+            </li>
+            <li v-if="counter.tasksAlert > 0">
+              <i18n-t
+                keypath="counter.alert_tasks"
+                tag="span"
+                :class="counterClass"
+                :plural="counter.tasksAlert"
+              >
+                <template #n>
+                  <span>{{ counter.tasksAlert }}</span>
+                </template>
+              </i18n-t>
+            </li>
+            <li v-if="counter.tasksWarning > 0">
+              <i18n-t
+                keypath="counter.warning_tasks"
+                tag="span"
+                :class="counterClass"
+                :plural="counter.tasksWarning"
+              >
+                <template #n>
+                  <span>{{ counter.tasksWarning }}</span>
+                </template>
+              </i18n-t>
+            </li>
+          </ul>
         </div>
+      </div>
+
+      <template v-if="this.hasDashboardItems">
+        <template
+          v-for="(dashboardItem, index) in this.dashboardItems"
+          :key="index"
+        >
+          <div
+            class="mbloc col-xs-12 col-sm-8 news"
+            v-if="dashboardItem.type === 'news'"
+          >
+            <News />
+          </div>
+        </template>
+      </template>
     </div>
+  </div>
 </template>
 
 <script>
@@ -108,37 +106,37 @@ import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
 import News from "./DashboardWidgets/News.vue";
 
 export default {
-    name: "MyCustoms",
-    components: {
-        News,
+  name: "MyCustoms",
+  components: {
+    News,
+  },
+  data() {
+    return {
+      counterClass: {
+        counter: true, //hack to pass class 'counter' in i18n-t
+      },
+      dashboardItems: [],
+      masonry: null,
+    };
+  },
+  computed: {
+    ...mapGetters(["counter"]),
+    noResults() {
+      return false;
     },
-    data() {
-        return {
-            counterClass: {
-                counter: true, //hack to pass class 'counter' in i18n-t
-            },
-            dashboardItems: [],
-            masonry: null,
-        };
-    },
-    computed: {
-        ...mapGetters(["counter"]),
-        noResults() {
-            return false;
-        },
-        hasDashboardItems() {
-            return this.dashboardItems.length > 0;
-        },
-    },
-    mounted() {
-        makeFetch("GET", "/api/1.0/main/dashboard-config-item.json")
-            .then((response) => {
-                this.dashboardItems = response;
-            })
-            .catch((error) => {
-                throw error;
-            });
+    hasDashboardItems() {
+      return this.dashboardItems.length > 0;
     },
+  },
+  mounted() {
+    makeFetch("GET", "/api/1.0/main/dashboard-config-item.json")
+      .then((response) => {
+        this.dashboardItems = response;
+      })
+      .catch((error) => {
+        throw error;
+      });
+  },
 };
 </script>
 
@@ -146,18 +144,18 @@ export default {
 div.custom4,
 div.custom3,
 div.custom2 {
-    font-style: italic;
-    color: var(--bs-chill-gray);
+  font-style: italic;
+  color: var(--bs-chill-gray);
 }
 span.counter {
-    & > span {
-        background-color: unset;
-    }
+  & > span {
+    background-color: unset;
+  }
 }
 
 div.news {
-    max-height: 22rem;
-    overflow: hidden;
-    overflow-y: scroll;
+  max-height: 22rem;
+  overflow: hidden;
+  overflow-y: scroll;
 }
 </style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyEvaluations.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyEvaluations.vue
index 71bf654e7..b7db53a53 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyEvaluations.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyEvaluations.vue
@@ -1,96 +1,81 @@
 <template>
-    <div class="accompanying-course-work">
-        <div class="alert alert-light">
-            {{ $t("my_evaluations.description") }}
-        </div>
-        <span v-if="noResults" class="chill-no-data-statement">{{
-            $t("no_data")
-        }}</span>
-        <tab-table v-else>
-            <template #thead>
-                <th scope="col">
-                    {{ $t("max_date") }}
-                </th>
-                <th scope="col">
-                    {{ $t("evaluation") }}
-                </th>
-                <th scope="col">
-                    {{ $t("SocialAction") }}
-                </th>
-                <th scope="col" />
-            </template>
-            <template #tbody>
-                <tr
-                    v-for="(e, i) in evaluations.results"
-                    :key="`evaluation-${i}`"
-                >
-                    <td>{{ $d(e.maxDate.datetime, "short") }}</td>
-                    <td>
-                        {{ localizeString(e.evaluation.title) }}
-                    </td>
-                    <td>
-                        <span class="chill-entity entity-social-issue">
-                            <span class="badge bg-chill-l-gray text-dark">
-                                {{
-                                    e.accompanyingPeriodWork.socialAction.issue
-                                        .text
-                                }}
-                            </span>
-                        </span>
-                        <h4 class="badge-title">
-                            <span class="title_label" />
-                            <span class="title_action">
-                                {{ e.accompanyingPeriodWork.socialAction.text }}
-                            </span>
-                        </h4>
-                        <span
-                            v-for="person in e.accompanyingPeriodWork.persons"
-                            class="me-1"
-                            :key="person.id"
-                        >
-                            <on-the-fly
-                                :type="person.type"
-                                :id="person.id"
-                                :button-text="person.textAge"
-                                :display-badge="'true' === 'true'"
-                                action="show"
-                            />
-                        </span>
-                    </td>
-                    <td>
-                        <div
-                            class="btn-group-vertical"
-                            role="group"
-                            aria-label="Actions"
-                        >
-                            <a class="btn btn-sm btn-show" :href="getUrl(e)">
-                                {{
-                                    $t("show_entity", {
-                                        entity: $t("the_evaluation"),
-                                    })
-                                }}
-                            </a>
-                            <a
-                                class="btn btn-sm btn-show"
-                                :href="
-                                    getUrl(
-                                        e.accompanyingPeriodWork
-                                            .accompanyingPeriod,
-                                    )
-                                "
-                            >
-                                {{
-                                    $t("show_entity", {
-                                        entity: $t("the_course"),
-                                    })
-                                }}
-                            </a>
-                        </div>
-                    </td>
-                </tr>
-            </template>
-        </tab-table>
+  <div class="accompanying-course-work">
+    <div class="alert alert-light">
+      {{ $t("my_evaluations.description") }}
     </div>
+    <span v-if="noResults" class="chill-no-data-statement">{{
+      $t("no_data")
+    }}</span>
+    <tab-table v-else>
+      <template #thead>
+        <th scope="col">
+          {{ $t("max_date") }}
+        </th>
+        <th scope="col">
+          {{ $t("evaluation") }}
+        </th>
+        <th scope="col">
+          {{ $t("SocialAction") }}
+        </th>
+        <th scope="col" />
+      </template>
+      <template #tbody>
+        <tr v-for="(e, i) in evaluations.results" :key="`evaluation-${i}`">
+          <td>{{ $d(e.maxDate.datetime, "short") }}</td>
+          <td>
+            {{ localizeString(e.evaluation.title) }}
+          </td>
+          <td>
+            <span class="chill-entity entity-social-issue">
+              <span class="badge bg-chill-l-gray text-dark">
+                {{ e.accompanyingPeriodWork.socialAction.issue.text }}
+              </span>
+            </span>
+            <h4 class="badge-title">
+              <span class="title_label" />
+              <span class="title_action">
+                {{ e.accompanyingPeriodWork.socialAction.text }}
+              </span>
+            </h4>
+            <span
+              v-for="person in e.accompanyingPeriodWork.persons"
+              class="me-1"
+              :key="person.id"
+            >
+              <on-the-fly
+                :type="person.type"
+                :id="person.id"
+                :button-text="person.textAge"
+                :display-badge="'true' === 'true'"
+                action="show"
+              />
+            </span>
+          </td>
+          <td>
+            <div class="btn-group-vertical" role="group" aria-label="Actions">
+              <a class="btn btn-sm btn-show" :href="getUrl(e)">
+                {{
+                  $t("show_entity", {
+                    entity: $t("the_evaluation"),
+                  })
+                }}
+              </a>
+              <a
+                class="btn btn-sm btn-show"
+                :href="getUrl(e.accompanyingPeriodWork.accompanyingPeriod)"
+              >
+                {{
+                  $t("show_entity", {
+                    entity: $t("the_course"),
+                  })
+                }}
+              </a>
+            </div>
+          </td>
+        </tr>
+      </template>
+    </tab-table>
+  </div>
 </template>
 
 <script>
@@ -100,38 +85,38 @@ import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly";
 import { localizeString } from "../../lib/localizationHelper/localizationHelper";
 
 export default {
-    name: "MyEvaluations",
-    components: {
-        TabTable,
-        OnTheFly,
+  name: "MyEvaluations",
+  components: {
+    TabTable,
+    OnTheFly,
+  },
+  computed: {
+    ...mapState(["evaluations"]),
+    ...mapGetters(["isEvaluationsLoaded"]),
+    noResults() {
+      if (!this.isEvaluationsLoaded) {
+        return false;
+      } else {
+        return this.evaluations.count === 0;
+      }
     },
-    computed: {
-        ...mapState(["evaluations"]),
-        ...mapGetters(["isEvaluationsLoaded"]),
-        noResults() {
-            if (!this.isEvaluationsLoaded) {
-                return false;
-            } else {
-                return this.evaluations.count === 0;
-            }
-        },
-    },
-    methods: {
-        localizeString,
-        getUrl(e) {
-            switch (e.type) {
-                case "accompanying_period_work_evaluation":
-                    let anchor = "#evaluations";
-                    return `/fr/person/accompanying-period/work/${e.accompanyingPeriodWork.id}/edit${anchor}`;
-                case "accompanying_period_work":
-                    return `/fr/person/accompanying-period/work/${e.id}/edit`;
-                case "accompanying_period":
-                    return `/fr/parcours/${e.id}`;
-                default:
-                    throw "entity type unknown";
-            }
-        },
+  },
+  methods: {
+    localizeString,
+    getUrl(e) {
+      switch (e.type) {
+        case "accompanying_period_work_evaluation":
+          let anchor = "#evaluations";
+          return `/fr/person/accompanying-period/work/${e.accompanyingPeriodWork.id}/edit${anchor}`;
+        case "accompanying_period_work":
+          return `/fr/person/accompanying-period/work/${e.id}/edit`;
+        case "accompanying_period":
+          return `/fr/parcours/${e.id}`;
+        default:
+          throw "entity type unknown";
+      }
     },
+  },
 };
 </script>
 
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyNotifications.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyNotifications.vue
index 377903c01..21fd1a9b7 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyNotifications.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyNotifications.vue
@@ -1,46 +1,46 @@
 <template>
-    <div class="alert alert-light">
-        {{ $t("my_notifications.description") }}
-    </div>
-    <span v-if="noResults" class="chill-no-data-statement">{{
-        $t("no_data")
-    }}</span>
-    <tab-table v-else>
-        <template #thead>
-            <th scope="col">
-                {{ $t("Date") }}
-            </th>
-            <th scope="col">
-                {{ $t("Subject") }}
-            </th>
-            <th scope="col">
-                {{ $t("From") }}
-            </th>
-            <th scope="col" />
-        </template>
-        <template #tbody>
-            <tr v-for="(n, i) in notifications.results" :key="`notify-${i}`">
-                <td>{{ $d(n.date.datetime, "long") }}</td>
-                <td>
-                    <span class="unread">
-                        <i class="fa fa-envelope-o" />
-                        <a :href="getNotificationUrl(n)">{{ n.title }}</a>
-                    </span>
-                </td>
-                <td v-if="n.sender != null">
-                    {{ n.sender.text }}
-                </td>
-                <td v-else>
-                    {{ $t("automatic_notification") }}
-                </td>
-                <td>
-                    <a class="btn btn-sm btn-show" :href="getEntityUrl(n)">
-                        {{ $t("show_entity", { entity: getEntityName(n) }) }}
-                    </a>
-                </td>
-            </tr>
-        </template>
-    </tab-table>
+  <div class="alert alert-light">
+    {{ $t("my_notifications.description") }}
+  </div>
+  <span v-if="noResults" class="chill-no-data-statement">{{
+    $t("no_data")
+  }}</span>
+  <tab-table v-else>
+    <template #thead>
+      <th scope="col">
+        {{ $t("Date") }}
+      </th>
+      <th scope="col">
+        {{ $t("Subject") }}
+      </th>
+      <th scope="col">
+        {{ $t("From") }}
+      </th>
+      <th scope="col" />
+    </template>
+    <template #tbody>
+      <tr v-for="(n, i) in notifications.results" :key="`notify-${i}`">
+        <td>{{ $d(n.date.datetime, "long") }}</td>
+        <td>
+          <span class="unread">
+            <i class="fa fa-envelope-o" />
+            <a :href="getNotificationUrl(n)">{{ n.title }}</a>
+          </span>
+        </td>
+        <td v-if="n.sender != null">
+          {{ n.sender.text }}
+        </td>
+        <td v-else>
+          {{ $t("automatic_notification") }}
+        </td>
+        <td>
+          <a class="btn btn-sm btn-show" :href="getEntityUrl(n)">
+            {{ $t("show_entity", { entity: getEntityName(n) }) }}
+          </a>
+        </td>
+      </tr>
+    </template>
+  </tab-table>
 </template>
 
 <script>
@@ -49,69 +49,69 @@ import TabTable from "./TabTable";
 import { appMessages } from "ChillMainAssets/vuejs/HomepageWidget/js/i18n";
 
 export default {
-    name: "MyNotifications",
-    components: {
-        TabTable,
+  name: "MyNotifications",
+  components: {
+    TabTable,
+  },
+  computed: {
+    ...mapState(["notifications"]),
+    ...mapGetters(["isNotificationsLoaded"]),
+    noResults() {
+      if (!this.isNotificationsLoaded) {
+        return false;
+      } else {
+        return this.notifications.count === 0;
+      }
     },
-    computed: {
-        ...mapState(["notifications"]),
-        ...mapGetters(["isNotificationsLoaded"]),
-        noResults() {
-            if (!this.isNotificationsLoaded) {
-                return false;
-            } else {
-                return this.notifications.count === 0;
-            }
-        },
+  },
+  methods: {
+    getNotificationUrl(n) {
+      return `/fr/notification/${n.id}/show`;
     },
-    methods: {
-        getNotificationUrl(n) {
-            return `/fr/notification/${n.id}/show`;
-        },
-        getEntityName(n) {
-            switch (n.relatedEntityClass) {
-                case "Chill\\ActivityBundle\\Entity\\Activity":
-                    return appMessages.fr.the_activity;
-                case "Chill\\PersonBundle\\Entity\\AccompanyingPeriod":
-                    return appMessages.fr.the_course;
-                case "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork":
-                    return appMessages.fr.the_action;
-                case "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument":
-                    return appMessages.fr.the_evaluation_document;
-                case "Chill\\MainBundle\\Entity\\Workflow\\EntityWorkflow":
-                    return appMessages.fr.the_workflow;
-                default:
-                    throw "notification type unknown";
-            }
-        },
-        getEntityUrl(n) {
-            switch (n.relatedEntityClass) {
-                case "Chill\\ActivityBundle\\Entity\\Activity":
-                    return `/fr/activity/${n.relatedEntityId}/show`;
-                case "Chill\\PersonBundle\\Entity\\AccompanyingPeriod":
-                    return `/fr/parcours/${n.relatedEntityId}`;
-                case "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork":
-                    return `/fr/person/accompanying-period/work/${n.relatedEntityId}/show`;
-                case "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument":
-                    return `/fr/person/accompanying-period/work/evaluation/document/${n.relatedEntityId}/show`;
-                case "Chill\\MainBundle\\Entity\\Workflow\\EntityWorkflow":
-                    return `/fr/main/workflow/${n.relatedEntityId}/show`;
-                default:
-                    throw "notification type unknown";
-            }
-        },
+    getEntityName(n) {
+      switch (n.relatedEntityClass) {
+        case "Chill\\ActivityBundle\\Entity\\Activity":
+          return appMessages.fr.the_activity;
+        case "Chill\\PersonBundle\\Entity\\AccompanyingPeriod":
+          return appMessages.fr.the_course;
+        case "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork":
+          return appMessages.fr.the_action;
+        case "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument":
+          return appMessages.fr.the_evaluation_document;
+        case "Chill\\MainBundle\\Entity\\Workflow\\EntityWorkflow":
+          return appMessages.fr.the_workflow;
+        default:
+          throw "notification type unknown";
+      }
     },
+    getEntityUrl(n) {
+      switch (n.relatedEntityClass) {
+        case "Chill\\ActivityBundle\\Entity\\Activity":
+          return `/fr/activity/${n.relatedEntityId}/show`;
+        case "Chill\\PersonBundle\\Entity\\AccompanyingPeriod":
+          return `/fr/parcours/${n.relatedEntityId}`;
+        case "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork":
+          return `/fr/person/accompanying-period/work/${n.relatedEntityId}/show`;
+        case "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument":
+          return `/fr/person/accompanying-period/work/evaluation/document/${n.relatedEntityId}/show`;
+        case "Chill\\MainBundle\\Entity\\Workflow\\EntityWorkflow":
+          return `/fr/main/workflow/${n.relatedEntityId}/show`;
+        default:
+          throw "notification type unknown";
+      }
+    },
+  },
 };
 </script>
 
 <style lang="scss" scoped>
 span.unread {
-    font-weight: bold;
-    i {
-        margin-right: 0.5em;
-    }
-    a {
-        text-decoration: unset;
-    }
+  font-weight: bold;
+  i {
+    margin-right: 0.5em;
+  }
+  a {
+    text-decoration: unset;
+  }
 }
 </style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyTasks.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyTasks.vue
index ca30197a8..cc043461e 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyTasks.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyTasks.vue
@@ -1,83 +1,78 @@
 <template>
-    <div class="alert alert-light">
-        {{ $t("my_tasks.description_warning") }}
-    </div>
-    <span v-if="noResultsAlert" class="chill-no-data-statement">{{
-        $t("no_data")
-    }}</span>
-    <tab-table v-else>
-        <template #thead>
-            <th scope="col">
-                {{ $t("warning_date") }}
-            </th>
-            <th scope="col">
-                {{ $t("max_date") }}
-            </th>
-            <th scope="col">
-                {{ $t("task") }}
-            </th>
-            <th scope="col" />
-        </template>
-        <template #tbody>
-            <tr v-for="(t, i) in tasks.alert.results" :key="`task-alert-${i}`">
-                <td v-if="null !== t.warningDate">
-                    {{ $d(t.warningDate.datetime, "short") }}
-                </td>
-                <td v-else />
-                <td>
-                    <span class="outdated">{{
-                        $d(t.endDate.datetime, "short")
-                    }}</span>
-                </td>
-                <td>{{ t.title }}</td>
-                <td>
-                    <a class="btn btn-sm btn-show" :href="getUrl(t)">
-                        {{ $t("show_entity", { entity: $t("the_task") }) }}
-                    </a>
-                </td>
-            </tr>
-        </template>
-    </tab-table>
+  <div class="alert alert-light">
+    {{ $t("my_tasks.description_warning") }}
+  </div>
+  <span v-if="noResultsAlert" class="chill-no-data-statement">{{
+    $t("no_data")
+  }}</span>
+  <tab-table v-else>
+    <template #thead>
+      <th scope="col">
+        {{ $t("warning_date") }}
+      </th>
+      <th scope="col">
+        {{ $t("max_date") }}
+      </th>
+      <th scope="col">
+        {{ $t("task") }}
+      </th>
+      <th scope="col" />
+    </template>
+    <template #tbody>
+      <tr v-for="(t, i) in tasks.alert.results" :key="`task-alert-${i}`">
+        <td v-if="null !== t.warningDate">
+          {{ $d(t.warningDate.datetime, "short") }}
+        </td>
+        <td v-else />
+        <td>
+          <span class="outdated">{{ $d(t.endDate.datetime, "short") }}</span>
+        </td>
+        <td>{{ t.title }}</td>
+        <td>
+          <a class="btn btn-sm btn-show" :href="getUrl(t)">
+            {{ $t("show_entity", { entity: $t("the_task") }) }}
+          </a>
+        </td>
+      </tr>
+    </template>
+  </tab-table>
 
-    <div class="alert alert-light">
-        {{ $t("my_tasks.description_alert") }}
-    </div>
-    <span v-if="noResultsWarning" class="chill-no-data-statement">{{
-        $t("no_data")
-    }}</span>
-    <tab-table v-else>
-        <template #thead>
-            <th scope="col">
-                {{ $t("warning_date") }}
-            </th>
-            <th scope="col">
-                {{ $t("max_date") }}
-            </th>
-            <th scope="col">
-                {{ $t("task") }}
-            </th>
-            <th scope="col" />
-        </template>
-        <template #tbody>
-            <tr
-                v-for="(t, i) in tasks.warning.results"
-                :key="`task-warning-${i}`"
-            >
-                <td>
-                    <span class="outdated">{{
-                        $d(t.warningDate.datetime, "short")
-                    }}</span>
-                </td>
-                <td>{{ $d(t.endDate.datetime, "short") }}</td>
-                <td>{{ t.title }}</td>
-                <td>
-                    <a class="btn btn-sm btn-show" :href="getUrl(t)">
-                        {{ $t("show_entity", { entity: $t("the_task") }) }}
-                    </a>
-                </td>
-            </tr>
-        </template>
-    </tab-table>
+  <div class="alert alert-light">
+    {{ $t("my_tasks.description_alert") }}
+  </div>
+  <span v-if="noResultsWarning" class="chill-no-data-statement">{{
+    $t("no_data")
+  }}</span>
+  <tab-table v-else>
+    <template #thead>
+      <th scope="col">
+        {{ $t("warning_date") }}
+      </th>
+      <th scope="col">
+        {{ $t("max_date") }}
+      </th>
+      <th scope="col">
+        {{ $t("task") }}
+      </th>
+      <th scope="col" />
+    </template>
+    <template #tbody>
+      <tr v-for="(t, i) in tasks.warning.results" :key="`task-warning-${i}`">
+        <td>
+          <span class="outdated">{{
+            $d(t.warningDate.datetime, "short")
+          }}</span>
+        </td>
+        <td>{{ $d(t.endDate.datetime, "short") }}</td>
+        <td>{{ t.title }}</td>
+        <td>
+          <a class="btn btn-sm btn-show" :href="getUrl(t)">
+            {{ $t("show_entity", { entity: $t("the_task") }) }}
+          </a>
+        </td>
+      </tr>
+    </template>
+  </tab-table>
 </template>
 
 <script>
@@ -85,39 +80,39 @@ import { mapState, mapGetters } from "vuex";
 import TabTable from "./TabTable";
 
 export default {
-    name: "MyTasks",
-    components: {
-        TabTable,
+  name: "MyTasks",
+  components: {
+    TabTable,
+  },
+  computed: {
+    ...mapState(["tasks"]),
+    ...mapGetters(["isTasksWarningLoaded", "isTasksAlertLoaded"]),
+    noResultsAlert() {
+      if (!this.isTasksAlertLoaded) {
+        return false;
+      } else {
+        return this.tasks.alert.count === 0;
+      }
     },
-    computed: {
-        ...mapState(["tasks"]),
-        ...mapGetters(["isTasksWarningLoaded", "isTasksAlertLoaded"]),
-        noResultsAlert() {
-            if (!this.isTasksAlertLoaded) {
-                return false;
-            } else {
-                return this.tasks.alert.count === 0;
-            }
-        },
-        noResultsWarning() {
-            if (!this.isTasksWarningLoaded) {
-                return false;
-            } else {
-                return this.tasks.warning.count === 0;
-            }
-        },
+    noResultsWarning() {
+      if (!this.isTasksWarningLoaded) {
+        return false;
+      } else {
+        return this.tasks.warning.count === 0;
+      }
     },
-    methods: {
-        getUrl(t) {
-            return `/fr/task/single-task/${t.id}/show`;
-        },
+  },
+  methods: {
+    getUrl(t) {
+      return `/fr/task/single-task/${t.id}/show`;
     },
+  },
 };
 </script>
 
 <style scoped>
 span.outdated {
-    font-weight: bold;
-    color: var(--bs-warning);
+  font-weight: bold;
+  color: var(--bs-warning);
 }
 </style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorkflows.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorkflows.vue
index 68ac0bc1e..453ed19b4 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorkflows.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorkflows.vue
@@ -1,13 +1,13 @@
 <template>
-    <div class="alert alert-light">
-        {{ $t("my_workflows.description") }}
-    </div>
-    <my-workflows-table :workflows="workflows" />
+  <div class="alert alert-light">
+    {{ $t("my_workflows.description") }}
+  </div>
+  <my-workflows-table :workflows="workflows" />
 
-    <div class="alert alert-light">
-        {{ $t("my_workflows.description_cc") }}
-    </div>
-    <my-workflows-table :workflows="workflowsCc" />
+  <div class="alert alert-light">
+    {{ $t("my_workflows.description_cc") }}
+  </div>
+  <my-workflows-table :workflows="workflowsCc" />
 </template>
 
 <script>
@@ -15,12 +15,12 @@ import { mapState } from "vuex";
 import MyWorkflowsTable from "./MyWorkflowsTable.vue";
 
 export default {
-    name: "MyWorkflows",
-    components: {
-        MyWorkflowsTable,
-    },
-    computed: {
-        ...mapState(["workflows", "workflowsCc"]),
-    },
+  name: "MyWorkflows",
+  components: {
+    MyWorkflowsTable,
+  },
+  computed: {
+    ...mapState(["workflows", "workflowsCc"]),
+  },
 };
 </script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorkflowsTable.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorkflowsTable.vue
index 61dfa420d..b10cbacfe 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorkflowsTable.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorkflowsTable.vue
@@ -1,59 +1,57 @@
 <template>
-    <span v-if="hasNoResults(workflows)" class="chill-no-data-statement">{{
-        $t("no_data")
-    }}</span>
-    <tab-table v-else>
-        <template #thead>
-            <th scope="col">
-                {{ $t("Object_workflow") }}
-            </th>
-            <th scope="col">
-                {{ $t("Step") }}
-            </th>
-            <th scope="col">
-                {{ $t("concerned_users") }}
-            </th>
-            <th scope="col" />
-        </template>
-        <template #tbody>
-            <tr v-for="(w, i) in workflows.results" :key="`workflow-${i}`">
-                <td>
-                    {{ w.title }}
-                </td>
-                <td>
-                    <div class="workflow">
-                        <div class="breadcrumb">
-                            <i
-                                class="fa fa-circle me-1 text-chill-yellow mx-2"
-                            />
-                            <span class="mx-2">{{ getStep(w) }}</span>
-                        </div>
-                        <span
-                            v-if="w.isOnHoldAtCurrentStep"
-                            class="badge bg-success rounded-pill"
-                            >{{ $t("on_hold") }}</span
-                        >
-                    </div>
-                </td>
-                <td v-if="w.datas.persons !== null">
-                    <span v-for="p in w.datas.persons" class="me-1" :key="p.id">
-                        <on-the-fly
-                            :type="p.type"
-                            :id="p.id"
-                            :button-text="p.textAge"
-                            :display-badge="'true' === 'true'"
-                            action="show"
-                        />
-                    </span>
-                </td>
-                <td>
-                    <a class="btn btn-sm btn-show" :href="getUrl(w)">
-                        {{ $t("show_entity", { entity: $t("the_workflow") }) }}
-                    </a>
-                </td>
-            </tr>
-        </template>
-    </tab-table>
+  <span v-if="hasNoResults(workflows)" class="chill-no-data-statement">{{
+    $t("no_data")
+  }}</span>
+  <tab-table v-else>
+    <template #thead>
+      <th scope="col">
+        {{ $t("Object_workflow") }}
+      </th>
+      <th scope="col">
+        {{ $t("Step") }}
+      </th>
+      <th scope="col">
+        {{ $t("concerned_users") }}
+      </th>
+      <th scope="col" />
+    </template>
+    <template #tbody>
+      <tr v-for="(w, i) in workflows.results" :key="`workflow-${i}`">
+        <td>
+          {{ w.title }}
+        </td>
+        <td>
+          <div class="workflow">
+            <div class="breadcrumb">
+              <i class="fa fa-circle me-1 text-chill-yellow mx-2" />
+              <span class="mx-2">{{ getStep(w) }}</span>
+            </div>
+            <span
+              v-if="w.isOnHoldAtCurrentStep"
+              class="badge bg-success rounded-pill"
+              >{{ $t("on_hold") }}</span
+            >
+          </div>
+        </td>
+        <td v-if="w.datas.persons !== null">
+          <span v-for="p in w.datas.persons" class="me-1" :key="p.id">
+            <on-the-fly
+              :type="p.type"
+              :id="p.id"
+              :button-text="p.textAge"
+              :display-badge="'true' === 'true'"
+              action="show"
+            />
+          </span>
+        </td>
+        <td>
+          <a class="btn btn-sm btn-show" :href="getUrl(w)">
+            {{ $t("show_entity", { entity: $t("the_workflow") }) }}
+          </a>
+        </td>
+      </tr>
+    </template>
+  </tab-table>
 </template>
 
 <script>
@@ -62,37 +60,37 @@ import TabTable from "./TabTable";
 import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly";
 
 export default {
-    name: "MyWorkflows",
-    components: {
-        TabTable,
-        OnTheFly,
+  name: "MyWorkflows",
+  components: {
+    TabTable,
+    OnTheFly,
+  },
+  props: ["workflows"],
+  computed: {
+    ...mapGetters(["isWorkflowsLoaded"]),
+  },
+  methods: {
+    hasNoResults(workflows) {
+      if (!this.isWorkflowsLoaded) {
+        return false;
+      } else {
+        return workflows.count === 0;
+      }
     },
-    props: ["workflows"],
-    computed: {
-        ...mapGetters(["isWorkflowsLoaded"]),
+    getUrl(w) {
+      return `/fr/main/workflow/${w.id}/show`;
     },
-    methods: {
-        hasNoResults(workflows) {
-            if (!this.isWorkflowsLoaded) {
-                return false;
-            } else {
-                return workflows.count === 0;
-            }
-        },
-        getUrl(w) {
-            return `/fr/main/workflow/${w.id}/show`;
-        },
-        getStep(w) {
-            const lastStep = w.steps.length - 1;
-            return w.steps[lastStep].currentStep.text;
-        },
+    getStep(w) {
+      const lastStep = w.steps.length - 1;
+      return w.steps[lastStep].currentStep.text;
     },
+  },
 };
 </script>
 
 <style scoped>
 span.outdated {
-    font-weight: bold;
-    color: var(--bs-warning);
+  font-weight: bold;
+  color: var(--bs-warning);
 }
 </style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorks.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorks.vue
index 8f7dea7ef..84400dfc2 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorks.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorks.vue
@@ -1,85 +1,77 @@
 // CURRENTLY NOT IN USE
 <template>
-    <div class="accompanying-course-work">
-        <div class="alert alert-light">
-            {{ $t("my_works.description") }}
-        </div>
-        <span v-if="noResults" class="chill-no-data-statement">{{
-            $t("no_data")
-        }}</span>
-        <tab-table v-else>
-            <template #thead>
-                <th scope="col">
-                    {{ $t("StartDate") }}
-                </th>
-                <th scope="col">
-                    {{ $t("SocialAction") }}
-                </th>
-                <th scope="col">
-                    {{ $t("concerned_persons") }}
-                </th>
-                <th scope="col" />
-            </template>
-            <template #tbody>
-                <tr v-for="(w, i) in works.results" :key="`works-${i}`">
-                    <td>{{ $d(w.startDate.datetime, "short") }}</td>
-                    <td>
-                        <span class="chill-entity entity-social-issue">
-                            <span class="badge bg-chill-l-gray text-dark">
-                                {{ w.socialAction.issue.text }}
-                            </span>
-                        </span>
-                        <h4 class="badge-title">
-                            <span class="title_label" />
-                            <span class="title_action">
-                                {{ w.socialAction.text }}
-                            </span>
-                        </h4>
-                    </td>
-                    <td>
-                        <span
-                            v-for="person in w.persons"
-                            class="me-1"
-                            :key="person.id"
-                        >
-                            <on-the-fly
-                                :type="person.type"
-                                :id="person.id"
-                                :button-text="person.textAge"
-                                :display-badge="'true' === 'true'"
-                                action="show"
-                            />
-                        </span>
-                    </td>
-                    <td>
-                        <div
-                            class="btn-group-vertical"
-                            role="group"
-                            aria-label="Actions"
-                        >
-                            <a class="btn btn-sm btn-update" :href="getUrl(w)">
-                                {{
-                                    $t("show_entity", {
-                                        entity: $t("the_action"),
-                                    })
-                                }}
-                            </a>
-                            <a
-                                class="btn btn-sm btn-show"
-                                :href="getUrl(w.accompanyingPeriod)"
-                            >
-                                {{
-                                    $t("show_entity", {
-                                        entity: $t("the_course"),
-                                    })
-                                }}
-                            </a>
-                        </div>
-                    </td>
-                </tr>
-            </template>
-        </tab-table>
+  <div class="accompanying-course-work">
+    <div class="alert alert-light">
+      {{ $t("my_works.description") }}
     </div>
+    <span v-if="noResults" class="chill-no-data-statement">{{
+      $t("no_data")
+    }}</span>
+    <tab-table v-else>
+      <template #thead>
+        <th scope="col">
+          {{ $t("StartDate") }}
+        </th>
+        <th scope="col">
+          {{ $t("SocialAction") }}
+        </th>
+        <th scope="col">
+          {{ $t("concerned_persons") }}
+        </th>
+        <th scope="col" />
+      </template>
+      <template #tbody>
+        <tr v-for="(w, i) in works.results" :key="`works-${i}`">
+          <td>{{ $d(w.startDate.datetime, "short") }}</td>
+          <td>
+            <span class="chill-entity entity-social-issue">
+              <span class="badge bg-chill-l-gray text-dark">
+                {{ w.socialAction.issue.text }}
+              </span>
+            </span>
+            <h4 class="badge-title">
+              <span class="title_label" />
+              <span class="title_action">
+                {{ w.socialAction.text }}
+              </span>
+            </h4>
+          </td>
+          <td>
+            <span v-for="person in w.persons" class="me-1" :key="person.id">
+              <on-the-fly
+                :type="person.type"
+                :id="person.id"
+                :button-text="person.textAge"
+                :display-badge="'true' === 'true'"
+                action="show"
+              />
+            </span>
+          </td>
+          <td>
+            <div class="btn-group-vertical" role="group" aria-label="Actions">
+              <a class="btn btn-sm btn-update" :href="getUrl(w)">
+                {{
+                  $t("show_entity", {
+                    entity: $t("the_action"),
+                  })
+                }}
+              </a>
+              <a
+                class="btn btn-sm btn-show"
+                :href="getUrl(w.accompanyingPeriod)"
+              >
+                {{
+                  $t("show_entity", {
+                    entity: $t("the_course"),
+                  })
+                }}
+              </a>
+            </div>
+          </td>
+        </tr>
+      </template>
+    </tab-table>
+  </div>
 </template>
 
 <script>
@@ -88,34 +80,34 @@ import TabTable from "./TabTable";
 import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly";
 
 export default {
-    name: "MyWorks",
-    components: {
-        TabTable,
-        OnTheFly,
+  name: "MyWorks",
+  components: {
+    TabTable,
+    OnTheFly,
+  },
+  computed: {
+    ...mapState(["works"]),
+    ...mapGetters(["isWorksLoaded"]),
+    noResults() {
+      if (!this.isWorksLoaded) {
+        return false;
+      } else {
+        return this.works.count === 0;
+      }
     },
-    computed: {
-        ...mapState(["works"]),
-        ...mapGetters(["isWorksLoaded"]),
-        noResults() {
-            if (!this.isWorksLoaded) {
-                return false;
-            } else {
-                return this.works.count === 0;
-            }
-        },
-    },
-    methods: {
-        getUrl(e) {
-            switch (e.type) {
-                case "accompanying_period_work":
-                    return `/fr/person/accompanying-period/work/${e.id}/edit`;
-                case "accompanying_period":
-                    return `/fr/parcours/${e.id}`;
-                default:
-                    throw "entity type unknown";
-            }
-        },
+  },
+  methods: {
+    getUrl(e) {
+      switch (e.type) {
+        case "accompanying_period_work":
+          return `/fr/person/accompanying-period/work/${e.id}/edit`;
+        case "accompanying_period":
+          return `/fr/parcours/${e.id}`;
+        default:
+          throw "entity type unknown";
+      }
     },
+  },
 };
 </script>
 
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/TabCounter.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/TabCounter.vue
index daec6db4a..231d101bf 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/TabCounter.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/TabCounter.vue
@@ -1,17 +1,17 @@
 <template>
-    <span v-if="isCounterAvailable" class="badge rounded-pill bg-danger">
-        {{ count }}
-    </span>
+  <span v-if="isCounterAvailable" class="badge rounded-pill bg-danger">
+    {{ count }}
+  </span>
 </template>
 
 <script>
 export default {
-    name: "TabCounter",
-    props: ["count"],
-    computed: {
-        isCounterAvailable() {
-            return typeof this.count !== "undefined" && this.count > 0;
-        },
+  name: "TabCounter",
+  props: ["count"],
+  computed: {
+    isCounterAvailable() {
+      return typeof this.count !== "undefined" && this.count > 0;
     },
+  },
 };
 </script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/TabTable.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/TabTable.vue
index c8899aa86..d96f88dc5 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/TabTable.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/TabTable.vue
@@ -1,20 +1,20 @@
 <template>
-    <table class="table table-striped table-hover">
-        <thead>
-            <tr>
-                <slot name="thead" />
-            </tr>
-        </thead>
-        <tbody>
-            <slot name="tbody" />
-        </tbody>
-    </table>
+  <table class="table table-striped table-hover">
+    <thead>
+      <tr>
+        <slot name="thead" />
+      </tr>
+    </thead>
+    <tbody>
+      <slot name="tbody" />
+    </tbody>
+  </table>
 </template>
 
 <script>
 export default {
-    name: "TabTable",
-    props: [],
+  name: "TabTable",
+  props: [],
 };
 </script>
 
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/App.vue
index 24c5421a8..ca60c23c7 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/App.vue
@@ -1,42 +1,42 @@
 <template>
-    <on-the-fly
-        :type="context.type"
-        :id="context.id"
-        :action="context.action"
-        :button-text="options.buttonText"
-        :display-badge="options.displayBadge === 'true'"
-        :is-dead="options.isDead"
-        :parent="options.parent"
-        @save-form-on-the-fly="saveFormOnTheFly"
-    />
+  <on-the-fly
+    :type="context.type"
+    :id="context.id"
+    :action="context.action"
+    :button-text="options.buttonText"
+    :display-badge="options.displayBadge === 'true'"
+    :is-dead="options.isDead"
+    :parent="options.parent"
+    @save-form-on-the-fly="saveFormOnTheFly"
+  />
 </template>
 
 <script>
 import OnTheFly from "./components/OnTheFly.vue";
 
 export default {
-    name: "App",
-    components: {
-        OnTheFly,
+  name: "App",
+  components: {
+    OnTheFly,
+  },
+  props: ["onTheFly"],
+  computed: {
+    context() {
+      return this.onTheFly.context;
     },
-    props: ["onTheFly"],
-    computed: {
-        context() {
-            return this.onTheFly.context;
-        },
-        options() {
-            return this.onTheFly.options;
-        },
+    options() {
+      return this.onTheFly.options;
     },
-    mounted() {
-        //console.log('OnTheFly mounted');
-        //console.log('OnTheFly: data context', this.context);
-        //console.log('OnTheFly: data options', this.options);
-    },
-    methods: {
-        saveFormOnTheFly(payload) {
-            console.log("saveFormOnTheFly", payload);
-        },
+  },
+  mounted() {
+    //console.log('OnTheFly mounted');
+    //console.log('OnTheFly: data context', this.context);
+    //console.log('OnTheFly: data options', this.options);
+  },
+  methods: {
+    saveFormOnTheFly(payload) {
+      console.log("saveFormOnTheFly", payload);
     },
+  },
 };
 </script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/Create.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/Create.vue
index f05080fba..b4f972b2c 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/Create.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/Create.vue
@@ -1,116 +1,115 @@
 <template>
-    <ul class="nav nav-tabs">
-        <li v-if="allowedTypes.includes('person')" class="nav-item">
-            <a class="nav-link" :class="{ active: isActive('person') }">
-                <label for="person">
-                    <input
-                        type="radio"
-                        name="person"
-                        id="person"
-                        v-model="radioType"
-                        value="person"
-                    />
-                    {{ trans(ONTHEFLY_CREATE_PERSON) }}
-                </label>
-            </a>
-        </li>
-        <li v-if="allowedTypes.includes('thirdparty')" class="nav-item">
-            <a class="nav-link" :class="{ active: isActive('thirdparty') }">
-                <label for="thirdparty">
-                    <input
-                        type="radio"
-                        name="thirdparty"
-                        id="thirdparty"
-                        v-model="radioType"
-                        value="thirdparty"
-                    />
-                    {{ trans(ONTHEFLY_CREATE_THIRDPARTY) }}
-                </label>
-            </a>
-        </li>
-    </ul>
+  <ul class="nav nav-tabs">
+    <li v-if="allowedTypes.includes('person')" class="nav-item">
+      <a class="nav-link" :class="{ active: isActive('person') }">
+        <label for="person">
+          <input
+            type="radio"
+            name="person"
+            id="person"
+            v-model="radioType"
+            value="person"
+          />
+          {{ trans(ONTHEFLY_CREATE_PERSON) }}
+        </label>
+      </a>
+    </li>
+    <li v-if="allowedTypes.includes('thirdparty')" class="nav-item">
+      <a class="nav-link" :class="{ active: isActive('thirdparty') }">
+        <label for="thirdparty">
+          <input
+            type="radio"
+            name="thirdparty"
+            id="thirdparty"
+            v-model="radioType"
+            value="thirdparty"
+          />
+          {{ trans(ONTHEFLY_CREATE_THIRDPARTY) }}
+        </label>
+      </a>
+    </li>
+  </ul>
 
-    <div class="my-4">
-        <on-the-fly-person
-            v-if="type === 'person'"
-            :action="action"
-            :query="query"
-            ref="castPerson"
-        />
+  <div class="my-4">
+    <on-the-fly-person
+      v-if="type === 'person'"
+      :action="action"
+      :query="query"
+      ref="castPerson"
+    />
 
-        <on-the-fly-thirdparty
-            v-if="type === 'thirdparty'"
-            :action="action"
-            :query="query"
-            ref="castThirdparty"
-        />
-    </div>
+    <on-the-fly-thirdparty
+      v-if="type === 'thirdparty'"
+      :action="action"
+      :query="query"
+      ref="castThirdparty"
+    />
+  </div>
 </template>
 <script setup>
 import { ref, computed, onMounted } from "vue";
 import OnTheFlyPerson from "ChillPersonAssets/vuejs/_components/OnTheFly/Person.vue";
 import OnTheFlyThirdparty from "ChillThirdPartyAssets/vuejs/_components/OnTheFly/ThirdParty.vue";
 import {
-    trans,
-    ONTHEFLY_CREATE_PERSON,
-    ONTHEFLY_CREATE_THIRDPARTY,
+  trans,
+  ONTHEFLY_CREATE_PERSON,
+  ONTHEFLY_CREATE_THIRDPARTY,
 } from "translator";
 
 const props = defineProps({
-    action: String,
-    allowedTypes: Array,
-    query: String,
+  action: String,
+  allowedTypes: Array,
+  query: String,
 });
 
 const type = ref(null);
 
 const radioType = computed({
-    get: () => type.value,
-    set: (val) => {
-        type.value = val;
-        console.log("## type:", val, ", action:", props.action);
-    },
+  get: () => type.value,
+  set: (val) => {
+    type.value = val;
+    console.log("## type:", val, ", action:", props.action);
+  },
 });
 
 const castPerson = ref(null);
 const castThirdparty = ref(null);
 
 onMounted(() => {
-    type.value =
-        props.allowedTypes.length === 1 &&
-        props.allowedTypes.includes("thirdparty")
-            ? "thirdparty"
-            : "person";
+  type.value =
+    props.allowedTypes.length === 1 && props.allowedTypes.includes("thirdparty")
+      ? "thirdparty"
+      : "person";
 });
 
 function isActive(tab) {
-    return type.value === tab;
+  return type.value === tab;
 }
 
 function castDataByType() {
-    switch (radioType.value) {
-        case "person":
-            return castPerson.value.$data.person;
-        case "thirdparty":
-            let data = castThirdparty.value.$data.thirdparty;
-            if (data.address !== undefined && data.address !== null) {
-                data.address = { id: data.address.address_id };
-            } else {
-                data.address = null;
-            }
-            return data;
-        default:
-            throw Error("Invalid type of entity");
-    }
+  switch (radioType.value) {
+    case "person":
+      return castPerson.value.$data.person;
+    case "thirdparty":
+      let data = castThirdparty.value.$data.thirdparty;
+      if (data.address !== undefined && data.address !== null) {
+        data.address = { id: data.address.address_id };
+      } else {
+        data.address = null;
+      }
+      return data;
+    default:
+      throw Error("Invalid type of entity");
+  }
 }
 
 defineExpose({
-    castDataByType,
+  castDataByType,
 });
 </script>
 
 <style lang="css" scoped>
 label {
-    cursor: pointer;
+  cursor: pointer;
 }
 </style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickPostalCode/PickPostalCode.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickPostalCode/PickPostalCode.vue
index 191bafc76..fe5fcbe17 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickPostalCode/PickPostalCode.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickPostalCode/PickPostalCode.vue
@@ -1,27 +1,27 @@
 <template>
-    <div class="PickPostalCode">
-        <vue-multiselect
-            id="citySelector"
-            @search-change="listenInputSearch"
-            ref="citySelector"
-            v-model="internalPicked"
-            @select="selectCity"
-            @remove="remove"
-            name=""
-            track-by="id"
-            label="value"
-            :custom-label="transName"
-            :placeholder="$t('select_city')"
-            :select-label="$t('multiselect.select_label')"
-            :deselect-label="$t('multiselect.deselect_label')"
-            :selected-label="$t('multiselect.selected_label')"
-            :taggable="true"
-            :multiple="false"
-            :internal-search="false"
-            :loading="isLoading"
-            :options="cities"
-        />
-    </div>
+  <div class="PickPostalCode">
+    <vue-multiselect
+      id="citySelector"
+      @search-change="listenInputSearch"
+      ref="citySelector"
+      v-model="internalPicked"
+      @select="selectCity"
+      @remove="remove"
+      name=""
+      track-by="id"
+      label="value"
+      :custom-label="transName"
+      :placeholder="$t('select_city')"
+      :select-label="$t('multiselect.select_label')"
+      :deselect-label="$t('multiselect.deselect_label')"
+      :selected-label="$t('multiselect.selected_label')"
+      :taggable="true"
+      :multiple="false"
+      :internal-search="false"
+      :loading="isLoading"
+      :options="cities"
+    />
+  </div>
 </template>
 
 <script lang="js">
@@ -29,81 +29,77 @@ import VueMultiselect from "vue-multiselect";
 import { searchCities } from "./api";
 
 export default {
-    components: {
-        VueMultiselect,
+  components: {
+    VueMultiselect,
+  },
+  data() {
+    return {
+      cities: [],
+      internalPicked: null,
+      isLoading: false,
+      abortControllers: [],
+    };
+  },
+  emits: ["pickCity", "removeCity"],
+  props: {
+    picked: {
+      type: Object,
+      required: false,
+      default: null,
     },
-    data() {
-        return {
-            cities: [],
-            internalPicked: null,
-            isLoading: false,
-            abortControllers: [],
-        };
+    country: {
+      type: Object,
+      required: false,
+      default: null,
     },
-    emits: ["pickCity", "removeCity"],
-    props: {
-        picked: {
-            type: Object,
-            required: false,
-            default: null,
-        },
-        country: {
-            type: Object,
-            required: false,
-            default: null,
-        },
+  },
+  mounted() {
+    if (this.picked !== null) {
+      this.internalPicked = this.picked;
+      this.cities.push(this.picked);
+    }
+  },
+  methods: {
+    transName(value) {
+      return value.code && value.name ? `${value.name} (${value.code})` : "";
     },
-    mounted() {
-        if (this.picked !== null) {
-            this.internalPicked = this.picked;
-            this.cities.push(this.picked);
-        }
+    selectCity(city) {
+      this.$emit("selectCity", city);
     },
-    methods: {
-        transName(value) {
-            return value.code && value.name
-                ? `${value.name} (${value.code})`
-                : "";
-        },
-        selectCity(city) {
-            this.$emit("selectCity", city);
-        },
-        listenInputSearch(query) {
-            if (query.length <= 2) {
-                return;
-            }
+    listenInputSearch(query) {
+      if (query.length <= 2) {
+        return;
+      }
 
-            let c = this.abortControllers.pop();
+      let c = this.abortControllers.pop();
 
-            while (typeof c !== "undefined") {
-                c.abort();
-                c = this.abortControllers.pop();
-            }
+      while (typeof c !== "undefined") {
+        c.abort();
+        c = this.abortControllers.pop();
+      }
 
-            this.isLoading = true;
-            let controller = new AbortController();
-            this.abortControllers.push(controller);
+      this.isLoading = true;
+      let controller = new AbortController();
+      this.abortControllers.push(controller);
 
-            searchCities(query, this.country, controller)
-                .then((newCities) => {
-                    this.cities = this.cities.filter(
-                        (city) => city.id === this.picked,
-                    );
-                    newCities.forEach((item) => {
-                        this.cities.push(item);
-                    });
-                    this.isLoading = false;
+      searchCities(query, this.country, controller)
+        .then((newCities) => {
+          this.cities = this.cities.filter((city) => city.id === this.picked);
+          newCities.forEach((item) => {
+            this.cities.push(item);
+          });
+          this.isLoading = false;
 
-                    return Promise.resolve();
-                })
-                .catch((error) => {
-                    console.log(error); //TODO better error handling
-                    this.isLoading = false;
-                });
-        },
-        remove(item) {
-            this.$emit("removeCity", item);
-        },
+          return Promise.resolve();
+        })
+        .catch((error) => {
+          console.log(error); //TODO better error handling
+          this.isLoading = false;
+        });
     },
+    remove(item) {
+      this.$emit("removeCity", item);
+    },
+  },
 };
 </script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/SavedExportButtons/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/SavedExportButtons/App.vue
index 6f021ac80..bef3028dc 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/SavedExportButtons/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/SavedExportButtons/App.vue
@@ -2,17 +2,15 @@
 import GenerateButton from "ChillMainAssets/vuejs/SavedExportButtons/Component/GenerateButton.vue";
 
 interface SavedExportButtonsConfig {
-    savedExportUuid: string;
-    savedExportAlias: string;
+  savedExportUuid: string;
+  savedExportAlias: string;
 }
 
 const props = defineProps<SavedExportButtonsConfig>();
 </script>
 
 <template>
-    <generate-button
-        :saved-export-uuid="props.savedExportUuid"
-    ></generate-button>
+  <generate-button :saved-export-uuid="props.savedExportUuid"></generate-button>
 </template>
 
 <style scoped lang="scss"></style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/SavedExportButtons/Component/GenerateButton.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/SavedExportButtons/Component/GenerateButton.vue
index f4dafd006..99fa852c9 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/SavedExportButtons/Component/GenerateButton.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/SavedExportButtons/Component/GenerateButton.vue
@@ -1,15 +1,15 @@
 <script setup lang="ts">
 import {
-    trans,
-    SAVED_EXPORT_EXECUTE,
-    EXPORT_GENERATION_EXPORT_GENERATION_IS_PENDING_SHORT,
-    EXPORT_GENERATION_TOO_MANY_RETRIES,
-    EXPORT_GENERATION_ERROR_WHILE_GENERATING_EXPORT,
-    EXPORT_GENERATION_EXPORT_READY,
+  trans,
+  SAVED_EXPORT_EXECUTE,
+  EXPORT_GENERATION_EXPORT_GENERATION_IS_PENDING_SHORT,
+  EXPORT_GENERATION_TOO_MANY_RETRIES,
+  EXPORT_GENERATION_ERROR_WHILE_GENERATING_EXPORT,
+  EXPORT_GENERATION_EXPORT_READY,
 } from "translator";
 import {
-    fetchExportGenerationStatus,
-    generateFromSavedExport,
+  fetchExportGenerationStatus,
+  generateFromSavedExport,
 } from "ChillMainAssets/lib/api/export";
 import { computed, ref } from "vue";
 import { ExportGeneration } from "ChillMainAssets/types";
@@ -19,50 +19,50 @@ import { useToast } from "vue-toast-notification";
 import "vue-toast-notification/dist/theme-sugar.css";
 
 interface SavedExportButtonGenerateConfig {
-    savedExportUuid: string;
+  savedExportUuid: string;
 }
 
 const props = defineProps<SavedExportButtonGenerateConfig>();
 const emits = defineEmits<{
-    (e: "generate");
+  (e: "generate");
 }>();
 
 const toast = useToast();
 const exportGeneration = ref<ExportGeneration | null>(null);
 
 const status = computed<StoredObjectStatus | "inactive">(
-    () => exportGeneration.value?.status ?? "inactive",
+  () => exportGeneration.value?.status ?? "inactive",
 );
 const storedObject = computed<null | StoredObject>(() => {
-    if (exportGeneration.value === null) {
-        return null;
-    }
+  if (exportGeneration.value === null) {
+    return null;
+  }
 
-    return exportGeneration.value?.storedObject;
+  return exportGeneration.value?.storedObject;
 });
 
 const isInactive = computed<boolean>(() => status.value === "inactive");
 const isPending = computed<boolean>(() => status.value === "pending");
 const isFetching = computed<boolean>(
-    () => tryiesForReady.value < maxTryiesForReady,
+  () => tryiesForReady.value < maxTryiesForReady,
 );
 const isReady = computed<boolean>(() => status.value === "ready");
 const isFailure = computed<boolean>(() => status.value === "failure");
 const filename = computed<string>(() => {
-    if (null === exportGeneration.value) {
-        return "";
-    }
+  if (null === exportGeneration.value) {
+    return "";
+  }
 
-    return `${exportGeneration.value?.storedObject.title}-${exportGeneration.value?.createdAt?.datetime8601}`;
+  return `${exportGeneration.value?.storedObject.title}-${exportGeneration.value?.createdAt?.datetime8601}`;
 });
 const externalDownloadLink = computed<string>(
-    () => `/fr/main/export-generation/${exportGeneration.value?.id}/wait`,
+  () => `/fr/main/export-generation/${exportGeneration.value?.id}/wait`,
 );
 const classes = computed<Record<string, boolean>>(() => {
-    return {};
+  return {};
 });
 const buttonClasses = computed<Record<string, boolean>>(() => {
-    return { btn: true, "btn-outline-primary": true };
+  return { btn: true, "btn-outline-primary": true };
 });
 
 /**
@@ -76,111 +76,109 @@ let tryiesForReady = ref<number>(0);
 const maxTryiesForReady = 120;
 
 const checkForReady = function (): void {
-    if (
-        "ready" === status.value ||
-        "empty" === status.value ||
-        "failure" === status.value ||
-        // stop reloading if the page stays opened for a long time
-        tryiesForReady.value > maxTryiesForReady
-    ) {
-        return;
-    }
+  if (
+    "ready" === status.value ||
+    "empty" === status.value ||
+    "failure" === status.value ||
+    // stop reloading if the page stays opened for a long time
+    tryiesForReady.value > maxTryiesForReady
+  ) {
+    return;
+  }
 
-    tryiesForReady.value = tryiesForReady.value + 1;
-    setTimeout(
-        onObjectNewStatusCallback,
-        tryiesForReady.value < 10 ? 1500 : 5000,
-    );
+  tryiesForReady.value = tryiesForReady.value + 1;
+  setTimeout(
+    onObjectNewStatusCallback,
+    tryiesForReady.value < 10 ? 1500 : 5000,
+  );
 };
 
 const onExportGenerationSuccess = function (): void {
-    toast.success(trans(EXPORT_GENERATION_EXPORT_READY));
+  toast.success(trans(EXPORT_GENERATION_EXPORT_READY));
 };
 
 const onObjectNewStatusCallback = async function (): Promise<void> {
-    if (null === exportGeneration.value) {
-        checkForReady();
-        return Promise.resolve();
-    }
-
-    const newExportGeneration = await fetchExportGenerationStatus(
-        exportGeneration.value?.id,
-    );
-
-    if (newExportGeneration.status !== exportGeneration.value.status) {
-        if (newExportGeneration.status === "ready") {
-            onExportGenerationSuccess();
-        }
-    }
-
-    exportGeneration.value = newExportGeneration;
-
-    if (isPending.value) {
-        checkForReady();
-        return Promise.resolve();
-    }
-
+  if (null === exportGeneration.value) {
+    checkForReady();
     return Promise.resolve();
+  }
+
+  const newExportGeneration = await fetchExportGenerationStatus(
+    exportGeneration.value?.id,
+  );
+
+  if (newExportGeneration.status !== exportGeneration.value.status) {
+    if (newExportGeneration.status === "ready") {
+      onExportGenerationSuccess();
+    }
+  }
+
+  exportGeneration.value = newExportGeneration;
+
+  if (isPending.value) {
+    checkForReady();
+    return Promise.resolve();
+  }
+
+  return Promise.resolve();
 };
 
 const onClickGenerate = async (): Promise<void> => {
-    emits("generate");
-    exportGeneration.value = await generateFromSavedExport(
-        props.savedExportUuid,
-    );
+  emits("generate");
+  exportGeneration.value = await generateFromSavedExport(props.savedExportUuid);
 
-    onObjectNewStatusCallback();
+  onObjectNewStatusCallback();
 
-    return Promise.resolve();
+  return Promise.resolve();
 };
 </script>
 
 <template>
-    <button
-        v-if="isInactive"
-        :class="buttonClasses"
-        type="button"
-        @click="onClickGenerate"
-    >
-        <i class="fa fa-cog"></i> {{ trans(SAVED_EXPORT_EXECUTE) }}
-    </button>
-    <template v-if="isPending && isFetching">
-        <span class="btn">
-            <i class="fa fa-cog fa-spin fa-fw"></i>
-            <span class="pending-message">{{
-                trans(EXPORT_GENERATION_EXPORT_GENERATION_IS_PENDING_SHORT)
-            }}</span>
-            <a :href="externalDownloadLink" class="externalDownloadLink">
-                <i class="bi bi-box-arrow-up-right"></i>
-            </a>
-        </span>
-    </template>
-    <div v-if="isPending && !isFetching" :class="buttonClasses">
-        <span>{{ trans(EXPORT_GENERATION_TOO_MANY_RETRIES) }}</span>
-    </div>
-    <download-button
-        v-else-if="isReady && storedObject?.currentVersion !== null"
-        :classes="buttonClasses"
-        :stored-object="storedObject"
-        :at-version="storedObject?.currentVersion"
-        :filename="filename"
-    ></download-button>
-    <div v-else-if="isFailure" :class="classes">
-        <span class="btn">
-            <i class="bi bi-exclamation-triangle"></i>
-            <span class="pending-message">{{
-                trans(EXPORT_GENERATION_ERROR_WHILE_GENERATING_EXPORT)
-            }}</span>
-        </span>
-    </div>
+  <button
+    v-if="isInactive"
+    :class="buttonClasses"
+    type="button"
+    @click="onClickGenerate"
+  >
+    <i class="fa fa-cog"></i> {{ trans(SAVED_EXPORT_EXECUTE) }}
+  </button>
+  <template v-if="isPending && isFetching">
+    <span class="btn">
+      <i class="fa fa-cog fa-spin fa-fw"></i>
+      <span class="pending-message">{{
+        trans(EXPORT_GENERATION_EXPORT_GENERATION_IS_PENDING_SHORT)
+      }}</span>
+      <a :href="externalDownloadLink" class="externalDownloadLink">
+        <i class="bi bi-box-arrow-up-right"></i>
+      </a>
+    </span>
+  </template>
+  <div v-if="isPending && !isFetching" :class="buttonClasses">
+    <span>{{ trans(EXPORT_GENERATION_TOO_MANY_RETRIES) }}</span>
+  </div>
+  <download-button
+    v-else-if="isReady && storedObject?.currentVersion !== null"
+    :classes="buttonClasses"
+    :stored-object="storedObject"
+    :at-version="storedObject?.currentVersion"
+    :filename="filename"
+  ></download-button>
+  <div v-else-if="isFailure" :class="classes">
+    <span class="btn">
+      <i class="bi bi-exclamation-triangle"></i>
+      <span class="pending-message">{{
+        trans(EXPORT_GENERATION_ERROR_WHILE_GENERATING_EXPORT)
+      }}</span>
+    </span>
+  </div>
 </template>
 
 <style scoped lang="scss">
 .pending-message {
-    font-style: italic;
+  font-style: italic;
 }
 
 .externalDownloadLink {
-    margin-left: 1rem;
+  margin-left: 1rem;
 }
 </style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/SavedExportButtons/index.ts b/src/Bundle/ChillMainBundle/Resources/public/vuejs/SavedExportButtons/index.ts
index 518746dea..a7d0105e8 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/SavedExportButtons/index.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/SavedExportButtons/index.ts
@@ -3,11 +3,11 @@ import { createApp } from "vue";
 import App from "./App.vue";
 
 const buttons = document.querySelectorAll<HTMLDivElement>(
-    "[data-generate-export-button]",
+  "[data-generate-export-button]",
 );
 
 buttons.forEach((button) => {
-    const savedExportUuid = button.dataset.savedExportUuid as string;
+  const savedExportUuid = button.dataset.savedExportUuid as string;
 
-    createApp(App, { savedExportUuid, savedExportAlias: "" }).mount(button);
+  createApp(App, { savedExportUuid, savedExportAlias: "" }).mount(button);
 });
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/App.vue
index 9164e134b..ac061782a 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/App.vue
@@ -7,17 +7,17 @@ import AttachmentList from "ChillMainAssets/vuejs/WorkflowAttachment/Component/A
 import { GenericDoc } from "ChillDocStoreAssets/types";
 
 interface AppConfig {
-    workflowId: number;
-    accompanyingPeriodId: number;
-    attachments: WorkflowAttachment[];
+  workflowId: number;
+  accompanyingPeriodId: number;
+  attachments: WorkflowAttachment[];
 }
 
 const emit = defineEmits<{
-    (
-        e: "pickGenericDoc",
-        payload: { genericDoc: GenericDocForAccompanyingPeriod },
-    ): void;
-    (e: "removeAttachment", payload: { attachment: WorkflowAttachment }): void;
+  (
+    e: "pickGenericDoc",
+    payload: { genericDoc: GenericDocForAccompanyingPeriod },
+  ): void;
+  (e: "removeAttachment", payload: { attachment: WorkflowAttachment }): void;
 }>();
 
 type PickGenericModalType = InstanceType<typeof PickGenericDocModal>;
@@ -26,49 +26,49 @@ const pickDocModal = useTemplateRef<PickGenericModalType>("pickDocModal");
 const props = defineProps<AppConfig>();
 
 const attachedGenericDoc = computed<GenericDocForAccompanyingPeriod[]>(
-    () =>
-        props.attachments
-            .map((a: WorkflowAttachment) => a.genericDoc)
-            .filter(
-                (g: GenericDoc | null) => g !== null,
-            ) as GenericDocForAccompanyingPeriod[],
+  () =>
+    props.attachments
+      .map((a: WorkflowAttachment) => a.genericDoc)
+      .filter(
+        (g: GenericDoc | null) => g !== null,
+      ) as GenericDocForAccompanyingPeriod[],
 );
 
 const openModal = function () {
-    pickDocModal.value?.openModal();
+  pickDocModal.value?.openModal();
 };
 
 const onPickGenericDoc = ({
-    genericDoc,
+  genericDoc,
 }: {
-    genericDoc: GenericDocForAccompanyingPeriod;
+  genericDoc: GenericDocForAccompanyingPeriod;
 }) => {
-    emit("pickGenericDoc", { genericDoc });
+  emit("pickGenericDoc", { genericDoc });
 };
 
 const onRemoveAttachment = (payload: { attachment: WorkflowAttachment }) => {
-    emit("removeAttachment", payload);
+  emit("removeAttachment", payload);
 };
 </script>
 
 <template>
-    <pick-generic-doc-modal
-        :accompanying-period-id="props.accompanyingPeriodId"
-        :to-remove="attachedGenericDoc"
-        ref="pickDocModal"
-        @pickGenericDoc="onPickGenericDoc"
-    ></pick-generic-doc-modal>
-    <attachment-list
-        :attachments="props.attachments"
-        @removeAttachment="onRemoveAttachment"
-    ></attachment-list>
-    <ul class="record_actions">
-        <li>
-            <button type="button" class="btn btn-create" @click="openModal">
-                Ajouter une pièce jointe
-            </button>
-        </li>
-    </ul>
+  <pick-generic-doc-modal
+    :accompanying-period-id="props.accompanyingPeriodId"
+    :to-remove="attachedGenericDoc"
+    ref="pickDocModal"
+    @pickGenericDoc="onPickGenericDoc"
+  ></pick-generic-doc-modal>
+  <attachment-list
+    :attachments="props.attachments"
+    @removeAttachment="onRemoveAttachment"
+  ></attachment-list>
+  <ul class="record_actions">
+    <li>
+      <button type="button" class="btn btn-create" @click="openModal">
+        Ajouter une pièce jointe
+      </button>
+    </li>
+  </ul>
 </template>
 
 <style scoped lang="scss"></style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/AttachmentList.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/AttachmentList.vue
index 06e6ca6f4..59705642a 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/AttachmentList.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/AttachmentList.vue
@@ -4,49 +4,49 @@ import GenericDocItemBox from "ChillMainAssets/vuejs/WorkflowAttachment/Componen
 import DocumentActionButtonsGroup from "ChillDocStoreAssets/vuejs/DocumentActionButtonsGroup.vue";
 
 interface AttachmentListProps {
-    attachments: WorkflowAttachment[];
+  attachments: WorkflowAttachment[];
 }
 
 const emit = defineEmits<{
-    // eslint-disable-next-line @typescript-eslint/prefer-function-type
-    (e: "removeAttachment", payload: { attachment: WorkflowAttachment }): void;
+  // eslint-disable-next-line @typescript-eslint/prefer-function-type
+  (e: "removeAttachment", payload: { attachment: WorkflowAttachment }): void;
 }>();
 
 const props = defineProps<AttachmentListProps>();
 </script>
 
 <template>
-    <p
-        v-if="props.attachments.length === 0"
-        class="chill-no-data-statement text-center"
-    >
-        Aucune pièce jointe
-    </p>
-    <!-- TODO translate -->
-    <div else class="flex-table">
-        <div v-for="a in props.attachments" :key="a.id" class="item-bloc">
-            <generic-doc-item-box
-                v-if="a.genericDoc !== null"
-                :generic-doc="a.genericDoc"
-            ></generic-doc-item-box>
-            <div class="item-row separator">
-                <ul class="record_actions">
-                    <li v-if="a.genericDoc?.storedObject !== null">
-                        <document-action-buttons-group
-                            :stored-object="a.genericDoc.storedObject"
-                        ></document-action-buttons-group>
-                    </li>
-                    <li>
-                        <button
-                            type="button"
-                            class="btn btn-delete"
-                            @click="emit('removeAttachment', { attachment: a })"
-                        ></button>
-                    </li>
-                </ul>
-            </div>
-        </div>
+  <p
+    v-if="props.attachments.length === 0"
+    class="chill-no-data-statement text-center"
+  >
+    Aucune pièce jointe
+  </p>
+  <!-- TODO translate -->
+  <div else class="flex-table">
+    <div v-for="a in props.attachments" :key="a.id" class="item-bloc">
+      <generic-doc-item-box
+        v-if="a.genericDoc !== null"
+        :generic-doc="a.genericDoc"
+      ></generic-doc-item-box>
+      <div class="item-row separator">
+        <ul class="record_actions">
+          <li v-if="a.genericDoc?.storedObject !== null">
+            <document-action-buttons-group
+              :stored-object="a.genericDoc.storedObject"
+            ></document-action-buttons-group>
+          </li>
+          <li>
+            <button
+              type="button"
+              class="btn btn-delete"
+              @click="emit('removeAttachment', { attachment: a })"
+            ></button>
+          </li>
+        </ul>
+      </div>
     </div>
+  </div>
 </template>
 
 <style scoped lang="scss"></style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/GenericDocItemBox.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/GenericDocItemBox.vue
index 8b96b4eea..32b76bdcd 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/GenericDocItemBox.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/GenericDocItemBox.vue
@@ -2,17 +2,17 @@
 import { GenericDocForAccompanyingPeriod } from "ChillDocStoreAssets/types/generic_doc";
 
 interface GenericDocItemBoxProps {
-    genericDoc: GenericDocForAccompanyingPeriod;
+  genericDoc: GenericDocForAccompanyingPeriod;
 }
 
 const props = defineProps<GenericDocItemBoxProps>();
 </script>
 
 <template>
-    <div
-        v-if="'html' in props.genericDoc.metadata"
-        v-html="props.genericDoc.metadata.html"
-    ></div>
+  <div
+    v-if="'html' in props.genericDoc.metadata"
+    v-html="props.genericDoc.metadata.html"
+  ></div>
 </template>
 
 <style scoped lang="scss"></style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/PickGenericDoc.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/PickGenericDoc.vue
index 01e9c3a0e..f2a587cd1 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/PickGenericDoc.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/PickGenericDoc.vue
@@ -1,45 +1,45 @@
 <script setup lang="ts">
 import {
-    GenericDoc,
-    GenericDocForAccompanyingPeriod,
+  GenericDoc,
+  GenericDocForAccompanyingPeriod,
 } from "ChillDocStoreAssets/types/generic_doc";
 import PickGenericDocItem from "ChillMainAssets/vuejs/WorkflowAttachment/Component/PickGenericDocItem.vue";
 import { fetch_generic_docs_by_accompanying_period } from "ChillDocStoreAssets/js/generic-doc-api";
 import { computed, onMounted, ref } from "vue";
 
 interface PickGenericDocProps {
-    accompanyingPeriodId: number;
-    pickedList: GenericDocForAccompanyingPeriod[];
-    toRemove: GenericDocForAccompanyingPeriod[];
+  accompanyingPeriodId: number;
+  pickedList: GenericDocForAccompanyingPeriod[];
+  toRemove: GenericDocForAccompanyingPeriod[];
 }
 
 const props = defineProps<PickGenericDocProps>();
 const emit = defineEmits<{
-    (
-        e: "pickGenericDoc",
-        payload: { genericDoc: GenericDocForAccompanyingPeriod },
-    ): void;
+  (
+    e: "pickGenericDoc",
+    payload: { genericDoc: GenericDocForAccompanyingPeriod },
+  ): void;
 
-    (
-        e: "removeGenericDoc",
-        payload: { genericDoc: GenericDocForAccompanyingPeriod },
-    ): void;
+  (
+    e: "removeGenericDoc",
+    payload: { genericDoc: GenericDocForAccompanyingPeriod },
+  ): void;
 }>();
 
 const genericDocs = ref<GenericDocForAccompanyingPeriod[]>([]);
 const loaded = ref(false);
 
 const isPicked = (genericDoc: GenericDocForAccompanyingPeriod): boolean =>
-    props.pickedList.findIndex(
-        (element: GenericDocForAccompanyingPeriod) =>
-            element.uniqueKey === genericDoc.uniqueKey,
-    ) !== -1;
+  props.pickedList.findIndex(
+    (element: GenericDocForAccompanyingPeriod) =>
+      element.uniqueKey === genericDoc.uniqueKey,
+  ) !== -1;
 
 onMounted(async () => {
-    genericDocs.value = await fetch_generic_docs_by_accompanying_period(
-        props.accompanyingPeriodId,
-    );
-    loaded.value = true;
+  genericDocs.value = await fetch_generic_docs_by_accompanying_period(
+    props.accompanyingPeriodId,
+  );
+  loaded.value = true;
 });
 
 const textFilter = ref<string>("");
@@ -48,229 +48,213 @@ const dateToFilter = ref<string | null>(null);
 const placesFilter = ref<string[]>([]);
 
 const availablePlaces = computed<string[]>(() => {
-    const places = new Set<string>(
-        genericDocs.value.map((genericDoc: GenericDoc) => genericDoc.key),
-    );
+  const places = new Set<string>(
+    genericDocs.value.map((genericDoc: GenericDoc) => genericDoc.key),
+  );
 
-    return Array.from(places).sort((a, b) => (a < b ? -1 : a === b ? 0 : 1));
+  return Array.from(places).sort((a, b) => (a < b ? -1 : a === b ? 0 : 1));
 });
 
 const placeTrans = (str: string): string => {
-    switch (str) {
-        case "accompanying_course_document":
-            return "Documents du parcours";
-        case "person_document":
-            return "Documents de l'usager";
-        case "accompanying_period_calendar_document":
-            return "Document des rendez-vous des parcours";
-        case "accompanying_period_activity_document":
-            return "Document des échanges des parcours";
-        case "accompanying_period_work_evaluation_document":
-            return "Document des actions d'accompagnement";
-        default:
-            return str;
-    }
+  switch (str) {
+    case "accompanying_course_document":
+      return "Documents du parcours";
+    case "person_document":
+      return "Documents de l'usager";
+    case "accompanying_period_calendar_document":
+      return "Document des rendez-vous des parcours";
+    case "accompanying_period_activity_document":
+      return "Document des échanges des parcours";
+    case "accompanying_period_work_evaluation_document":
+      return "Document des actions d'accompagnement";
+    default:
+      return str;
+  }
 };
 
 const onPickDocument = (payload: {
-    genericDoc: GenericDocForAccompanyingPeriod;
+  genericDoc: GenericDocForAccompanyingPeriod;
 }) => emit("pickGenericDoc", payload);
 
 const onRemoveGenericDoc = (payload: {
-    genericDoc: GenericDocForAccompanyingPeriod;
+  genericDoc: GenericDocForAccompanyingPeriod;
 }) => emit("removeGenericDoc", payload);
 
 const filteredDocuments = computed<GenericDocForAccompanyingPeriod[]>(() => {
-    if (false === loaded.value) {
-        return [];
-    }
+  if (false === loaded.value) {
+    return [];
+  }
 
-    return genericDocs.value
-        .filter(
-            (genericDoc: GenericDocForAccompanyingPeriod) =>
-                !props.toRemove
-                    .map((g: GenericDocForAccompanyingPeriod) => g.uniqueKey)
-                    .includes(genericDoc.uniqueKey),
-        )
-        .filter((genericDoc: GenericDocForAccompanyingPeriod) => {
-            if (textFilter.value === "") {
-                return true;
-            }
+  return genericDocs.value
+    .filter(
+      (genericDoc: GenericDocForAccompanyingPeriod) =>
+        !props.toRemove
+          .map((g: GenericDocForAccompanyingPeriod) => g.uniqueKey)
+          .includes(genericDoc.uniqueKey),
+    )
+    .filter((genericDoc: GenericDocForAccompanyingPeriod) => {
+      if (textFilter.value === "") {
+        return true;
+      }
 
-            const needles = textFilter.value
-                .trim()
-                .split(" ")
-                .map((str: string) => str.trim().toLowerCase())
-                .filter((str: string) => str.length > 0);
-            const title: string =
-                "title" in genericDoc.metadata
-                    ? (genericDoc.metadata.title as string)
-                    : "";
-            if (title === "") {
-                return false;
-            }
+      const needles = textFilter.value
+        .trim()
+        .split(" ")
+        .map((str: string) => str.trim().toLowerCase())
+        .filter((str: string) => str.length > 0);
+      const title: string =
+        "title" in genericDoc.metadata
+          ? (genericDoc.metadata.title as string)
+          : "";
+      if (title === "") {
+        return false;
+      }
 
-            return needles.every((n: string) =>
-                title.toLowerCase().includes(n),
-            );
-        })
-        .filter((genericDoc: GenericDocForAccompanyingPeriod) => {
-            if (placesFilter.value.length === 0) {
-                return true;
-            }
+      return needles.every((n: string) => title.toLowerCase().includes(n));
+    })
+    .filter((genericDoc: GenericDocForAccompanyingPeriod) => {
+      if (placesFilter.value.length === 0) {
+        return true;
+      }
 
-            return placesFilter.value.includes(genericDoc.key);
-        })
-        .filter((genericDoc: GenericDocForAccompanyingPeriod) => {
-            if (dateToFilter.value === null) {
-                return true;
-            }
+      return placesFilter.value.includes(genericDoc.key);
+    })
+    .filter((genericDoc: GenericDocForAccompanyingPeriod) => {
+      if (dateToFilter.value === null) {
+        return true;
+      }
 
-            return genericDoc.doc_date.datetime8601 < dateToFilter.value;
-        })
-        .filter((genericDoc: GenericDocForAccompanyingPeriod) => {
-            if (dateFromFilter.value === null) {
-                return true;
-            }
+      return genericDoc.doc_date.datetime8601 < dateToFilter.value;
+    })
+    .filter((genericDoc: GenericDocForAccompanyingPeriod) => {
+      if (dateFromFilter.value === null) {
+        return true;
+      }
 
-            return genericDoc.doc_date.datetime8601 > dateFromFilter.value;
-        });
+      return genericDoc.doc_date.datetime8601 > dateFromFilter.value;
+    });
 });
 </script>
 
 <template>
-    <div v-if="loaded">
-        <div>
-            <form name="f" method="get">
-                <div class="accordion my-3" id="filterOrderAccordion">
-                    <h2 class="accordion-header" id="filterOrderHeading">
-                        <button
-                            class="accordion-button"
-                            type="button"
-                            data-bs-toggle="collapse"
-                            data-bs-target="#filterOrderCollapse"
-                            aria-expanded="true"
-                            aria-controls="filterOrderCollapse"
-                        >
-                            <strong
-                                ><i class="fa fa-fw fa-filter"></i>Filtrer la
-                                liste</strong
-                            >
-                        </button>
-                    </h2>
-                    <div
-                        class="accordion-collapse collapse"
-                        id="filterOrderCollapse"
-                        aria-labelledby="filterOrderHeading"
-                        data-bs-parent="#filterOrderAccordion"
-                        style=""
-                    >
-                        <div
-                            class="accordion-body chill_filter_order container-xxl p-5 py-2"
-                        >
-                            <div class="row my-2">
-                                <div class="col-sm-12">
-                                    <div class="input-group">
-                                        <input
-                                            v-model="textFilter"
-                                            type="search"
-                                            id="f_q"
-                                            name="f[q]"
-                                            placeholder="Chercher dans la liste"
-                                            class="form-control"
-                                        />
-                                        <button
-                                            type="submit"
-                                            class="btn btn-misc"
-                                        >
-                                            <i class="fa fa-search"></i>
-                                        </button>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <div class="row my-2">
-                                <legend
-                                    class="col-form-label col-sm-4 required"
-                                >
-                                    Date du document
-                                </legend>
-                                <div class="col-sm-8 pt-1">
-                                    <div class="input-group">
-                                        <span class="input-group-text">Du</span>
-                                        <input
-                                            v-model="dateFromFilter"
-                                            type="date"
-                                            id="f_dateRanges_dateRange_from"
-                                            name="f[dateRanges][dateRange][from]"
-                                            class="form-control"
-                                        />
-                                        <span class="input-group-text">Au</span>
-                                        <input
-                                            v-model="dateToFilter"
-                                            type="date"
-                                            id="f_dateRanges_dateRange_to"
-                                            name="f[dateRanges][dateRange][to]"
-                                            class="form-control"
-                                        />
-                                    </div>
-                                </div>
-                            </div>
-
-                            <div class="row my-2">
-                                <div class="col-sm-4 col-form-label">
-                                    Filtrer par
-                                </div>
-                                <div class="col-sm-8 pt-2">
-                                    <div
-                                        class="form-check"
-                                        v-for="p in availablePlaces"
-                                        :key="p"
-                                    >
-                                        <input
-                                            type="checkbox"
-                                            v-model="placesFilter"
-                                            name="f[checkboxes][places][]"
-                                            class="form-check-input"
-                                            :value="p"
-                                        />
-                                        <label class="form-check-label">{{
-                                            placeTrans(p)
-                                        }}</label>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </form>
-        </div>
-
-        <div v-if="genericDocs.length > 0" class="flex-table chill-task-list">
-            <pick-generic-doc-item
-                v-for="g in filteredDocuments"
-                :key="g.uniqueKey"
-                :accompanying-period-id="accompanyingPeriodId"
-                :genericDoc="g"
-                :is-picked="isPicked(g)"
-                @pickGenericDoc="onPickDocument"
-                @removeGenericDoc="onRemoveGenericDoc"
-            ></pick-generic-doc-item>
-        </div>
-        <div v-else class="text-center chill-no-data-statement">
-            Aucun document dans ce parcours
-        </div>
-    </div>
-    <div v-else>
-        <div class="d-flex align-items-center">
-            <strong>Chargement…</strong>
+  <div v-if="loaded">
+    <div>
+      <form name="f" method="get">
+        <div class="accordion my-3" id="filterOrderAccordion">
+          <h2 class="accordion-header" id="filterOrderHeading">
+            <button
+              class="accordion-button"
+              type="button"
+              data-bs-toggle="collapse"
+              data-bs-target="#filterOrderCollapse"
+              aria-expanded="true"
+              aria-controls="filterOrderCollapse"
+            >
+              <strong
+                ><i class="fa fa-fw fa-filter"></i>Filtrer la liste</strong
+              >
+            </button>
+          </h2>
+          <div
+            class="accordion-collapse collapse"
+            id="filterOrderCollapse"
+            aria-labelledby="filterOrderHeading"
+            data-bs-parent="#filterOrderAccordion"
+            style=""
+          >
             <div
-                class="spinner-border ms-auto"
-                role="status"
-                aria-hidden="true"
-            ></div>
+              class="accordion-body chill_filter_order container-xxl p-5 py-2"
+            >
+              <div class="row my-2">
+                <div class="col-sm-12">
+                  <div class="input-group">
+                    <input
+                      v-model="textFilter"
+                      type="search"
+                      id="f_q"
+                      name="f[q]"
+                      placeholder="Chercher dans la liste"
+                      class="form-control"
+                    />
+                    <button type="submit" class="btn btn-misc">
+                      <i class="fa fa-search"></i>
+                    </button>
+                  </div>
+                </div>
+              </div>
+
+              <div class="row my-2">
+                <legend class="col-form-label col-sm-4 required">
+                  Date du document
+                </legend>
+                <div class="col-sm-8 pt-1">
+                  <div class="input-group">
+                    <span class="input-group-text">Du</span>
+                    <input
+                      v-model="dateFromFilter"
+                      type="date"
+                      id="f_dateRanges_dateRange_from"
+                      name="f[dateRanges][dateRange][from]"
+                      class="form-control"
+                    />
+                    <span class="input-group-text">Au</span>
+                    <input
+                      v-model="dateToFilter"
+                      type="date"
+                      id="f_dateRanges_dateRange_to"
+                      name="f[dateRanges][dateRange][to]"
+                      class="form-control"
+                    />
+                  </div>
+                </div>
+              </div>
+
+              <div class="row my-2">
+                <div class="col-sm-4 col-form-label">Filtrer par</div>
+                <div class="col-sm-8 pt-2">
+                  <div class="form-check" v-for="p in availablePlaces" :key="p">
+                    <input
+                      type="checkbox"
+                      v-model="placesFilter"
+                      name="f[checkboxes][places][]"
+                      class="form-check-input"
+                      :value="p"
+                    />
+                    <label class="form-check-label">{{ placeTrans(p) }}</label>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
         </div>
+      </form>
     </div>
+
+    <div v-if="genericDocs.length > 0" class="flex-table chill-task-list">
+      <pick-generic-doc-item
+        v-for="g in filteredDocuments"
+        :key="g.uniqueKey"
+        :accompanying-period-id="accompanyingPeriodId"
+        :genericDoc="g"
+        :is-picked="isPicked(g)"
+        @pickGenericDoc="onPickDocument"
+        @removeGenericDoc="onRemoveGenericDoc"
+      ></pick-generic-doc-item>
+    </div>
+    <div v-else class="text-center chill-no-data-statement">
+      Aucun document dans ce parcours
+    </div>
+  </div>
+  <div v-else>
+    <div class="d-flex align-items-center">
+      <strong>Chargement…</strong>
+      <div
+        class="spinner-border ms-auto"
+        role="status"
+        aria-hidden="true"
+      ></div>
+    </div>
+  </div>
 </template>
 
 <style scoped lang="scss"></style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/PickGenericDocItem.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/PickGenericDocItem.vue
index 2e1cf6d04..51c7dbc4b 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/PickGenericDocItem.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/PickGenericDocItem.vue
@@ -4,93 +4,85 @@ import GenericDocItemBox from "ChillMainAssets/vuejs/WorkflowAttachment/Componen
 import DocumentActionButtonsGroup from "ChillDocStoreAssets/vuejs/DocumentActionButtonsGroup.vue";
 
 interface PickGenericDocItemProps {
-    genericDoc: GenericDocForAccompanyingPeriod;
-    accompanyingPeriodId: number;
-    isPicked: boolean;
+  genericDoc: GenericDocForAccompanyingPeriod;
+  accompanyingPeriodId: number;
+  isPicked: boolean;
 }
 
 const props = defineProps<PickGenericDocItemProps>();
 const emit = defineEmits<{
-    (
-        e: "pickGenericDoc",
-        payload: { genericDoc: GenericDocForAccompanyingPeriod },
-    ): void;
+  (
+    e: "pickGenericDoc",
+    payload: { genericDoc: GenericDocForAccompanyingPeriod },
+  ): void;
 
-    (
-        e: "removeGenericDoc",
-        payload: { genericDoc: GenericDocForAccompanyingPeriod },
-    ): void;
+  (
+    e: "removeGenericDoc",
+    payload: { genericDoc: GenericDocForAccompanyingPeriod },
+  ): void;
 }>();
 
 const clickOnAddButton = () => {
-    emit("pickGenericDoc", { genericDoc: props.genericDoc });
+  emit("pickGenericDoc", { genericDoc: props.genericDoc });
 };
 </script>
 
 <template>
-    <div class="item-bloc" :class="{ isPicked: isPicked }">
-        <generic-doc-item-box
-            :generic-doc="props.genericDoc"
-        ></generic-doc-item-box>
+  <div class="item-bloc" :class="{ isPicked: isPicked }">
+    <generic-doc-item-box
+      :generic-doc="props.genericDoc"
+    ></generic-doc-item-box>
 
-        <div class="item-row separator">
-            <ul class="record_actions">
-                <li v-if="props.genericDoc.storedObject !== null">
-                    <document-action-buttons-group
-                        :stored-object="props.genericDoc.storedObject"
-                    ></document-action-buttons-group>
-                </li>
-                <li>
-                    <button
-                        v-if="!isPicked"
-                        type="button"
-                        class="btn btn-chill-green text-white"
-                        @click="clickOnAddButton"
-                    >
-                        <i class="bi bi-cart-plus"></i>
-                    </button>
-                    <button
-                        v-else
-                        type="button"
-                        class="btn btn-chill-red text-white"
-                        @click="
-                            emit('removeGenericDoc', {
-                                genericDoc: props.genericDoc,
-                            })
-                        "
-                    >
-                        <i class="bi bi-cart-dash"></i>
-                    </button>
-                </li>
-            </ul>
-        </div>
+    <div class="item-row separator">
+      <ul class="record_actions">
+        <li v-if="props.genericDoc.storedObject !== null">
+          <document-action-buttons-group
+            :stored-object="props.genericDoc.storedObject"
+          ></document-action-buttons-group>
+        </li>
+        <li>
+          <button
+            v-if="!isPicked"
+            type="button"
+            class="btn btn-chill-green text-white"
+            @click="clickOnAddButton"
+          >
+            <i class="bi bi-cart-plus"></i>
+          </button>
+          <button
+            v-else
+            type="button"
+            class="btn btn-chill-red text-white"
+            @click="
+              emit('removeGenericDoc', {
+                genericDoc: props.genericDoc,
+              })
+            "
+          >
+            <i class="bi bi-cart-dash"></i>
+          </button>
+        </li>
+      </ul>
     </div>
+  </div>
 </template>
 
 <style scoped lang="scss">
 .item-bloc {
-    &.isPicked {
-        background:
-            linear-gradient(
-                180deg,
-                rgba(25, 135, 84, 1) 0px,
-                rgba(25, 135, 84, 0) 9px
-            ),
-            linear-gradient(
-                270deg,
-                rgba(25, 135, 84, 1) 0px,
-                rgba(25, 135, 84, 0) 9px
-            ),
-            linear-gradient(
-                0deg,
-                rgba(25, 135, 84, 1) 0px,
-                rgba(25, 135, 84, 0) 9px
-            ),
-            linear-gradient(
-                90deg,
-                rgba(25, 135, 84, 1) 0px,
-                rgba(25, 135, 84, 0) 9px
-            );
-    }
+  &.isPicked {
+    background:
+      linear-gradient(
+        180deg,
+        rgba(25, 135, 84, 1) 0px,
+        rgba(25, 135, 84, 0) 9px
+      ),
+      linear-gradient(
+        270deg,
+        rgba(25, 135, 84, 1) 0px,
+        rgba(25, 135, 84, 0) 9px
+      ),
+      linear-gradient(0deg, rgba(25, 135, 84, 1) 0px, rgba(25, 135, 84, 0) 9px),
+      linear-gradient(90deg, rgba(25, 135, 84, 1) 0px, rgba(25, 135, 84, 0) 9px);
+  }
 }
 </style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/PickGenericDocModal.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/PickGenericDocModal.vue
index cd3e9253d..cb3c8df00 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/PickGenericDocModal.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/PickGenericDocModal.vue
@@ -5,19 +5,19 @@ import PickGenericDoc from "ChillMainAssets/vuejs/WorkflowAttachment/Component/P
 import { GenericDocForAccompanyingPeriod } from "ChillDocStoreAssets/types/generic_doc";
 
 interface PickGenericDocModalProps {
-    accompanyingPeriodId: number;
-    toRemove: GenericDocForAccompanyingPeriod[];
+  accompanyingPeriodId: number;
+  toRemove: GenericDocForAccompanyingPeriod[];
 }
 
 type PickGenericDocType = InstanceType<typeof PickGenericDoc>;
 
 const props = defineProps<PickGenericDocModalProps>();
 const emit = defineEmits<{
-    // eslint-disable-next-line @typescript-eslint/prefer-function-type
-    (
-        e: "pickGenericDoc",
-        payload: { genericDoc: GenericDocForAccompanyingPeriod },
-    ): void;
+  // eslint-disable-next-line @typescript-eslint/prefer-function-type
+  (
+    e: "pickGenericDoc",
+    payload: { genericDoc: GenericDocForAccompanyingPeriod },
+  ): void;
 }>();
 const picker = useTemplateRef<PickGenericDocType>("picker");
 const modalOpened = ref<boolean>(false);
@@ -27,87 +27,87 @@ const modalClasses = { "modal-xl": true, "modal-dialog-scrollable": true };
 const numberOfPicked = computed<number>(() => pickeds.value.length);
 
 const onPicked = ({
-    genericDoc,
+  genericDoc,
 }: {
-    genericDoc: GenericDocForAccompanyingPeriod;
+  genericDoc: GenericDocForAccompanyingPeriod;
 }) => {
-    pickeds.value.push(genericDoc);
+  pickeds.value.push(genericDoc);
 };
 
 const onRemove = ({
-    genericDoc,
+  genericDoc,
 }: {
-    genericDoc: GenericDocForAccompanyingPeriod;
+  genericDoc: GenericDocForAccompanyingPeriod;
 }) => {
-    const index = pickeds.value.findIndex(
-        (item) => item.uniqueKey === genericDoc.uniqueKey,
-    );
+  const index = pickeds.value.findIndex(
+    (item) => item.uniqueKey === genericDoc.uniqueKey,
+  );
 
-    if (index === -1) {
-        throw new Error("Remove generic doc that doesn't exist");
-    }
+  if (index === -1) {
+    throw new Error("Remove generic doc that doesn't exist");
+  }
 
-    pickeds.value.splice(index, 1);
+  pickeds.value.splice(index, 1);
 };
 
 const onConfirm = () => {
-    for (let genericDoc of pickeds.value) {
-        emit("pickGenericDoc", { genericDoc });
-    }
-    pickeds.value = [];
-    closeModal();
+  for (let genericDoc of pickeds.value) {
+    emit("pickGenericDoc", { genericDoc });
+  }
+  pickeds.value = [];
+  closeModal();
 };
 
 const closeModal = function () {
-    modalOpened.value = false;
+  modalOpened.value = false;
 };
 
 const openModal = function () {
-    modalOpened.value = true;
+  modalOpened.value = true;
 };
 
 defineExpose({ openModal, closeModal });
 </script>
 
 <template>
-    <modal
-        v-if="modalOpened"
-        @close="closeModal"
-        :modal-dialog-class="modalClasses"
-    >
-        <template v-slot:header>
-            <h2 class="modal-title">Ajouter une pièce jointe</h2>
-        </template>
-        <template v-slot:body>
-            <pick-generic-doc
-                :accompanying-period-id="props.accompanyingPeriodId"
-                :to-remove="props.toRemove"
-                :picked-list="pickeds"
-                ref="picker"
-                @pickGenericDoc="onPicked"
-                @removeGenericDoc="onRemove"
-            ></pick-generic-doc>
-        </template>
-        <template v-slot:footer>
-            <ul v-if="numberOfPicked > 0" class="record_actions">
-                <li>
-                    <button
-                        type="button"
-                        class="btn btn-chill-green text-white"
-                        @click="onConfirm"
-                    >
-                        <template v-if="numberOfPicked > 1">
-                            <i class="fa fa-plus"></i> Ajouter
-                            {{ numberOfPicked }} pièces jointes
-                        </template>
-                        <template v-else>
-                            <i class="fa fa-plus"></i> Ajouter une pièce jointe
-                        </template>
-                    </button>
-                </li>
-            </ul>
-        </template>
-    </modal>
+  <modal
+    v-if="modalOpened"
+    @close="closeModal"
+    :modal-dialog-class="modalClasses"
+  >
+    <template v-slot:header>
+      <h2 class="modal-title">Ajouter une pièce jointe</h2>
+    </template>
+    <template v-slot:body>
+      <pick-generic-doc
+        :accompanying-period-id="props.accompanyingPeriodId"
+        :to-remove="props.toRemove"
+        :picked-list="pickeds"
+        ref="picker"
+        @pickGenericDoc="onPicked"
+        @removeGenericDoc="onRemove"
+      ></pick-generic-doc>
+    </template>
+    <template v-slot:footer>
+      <ul v-if="numberOfPicked > 0" class="record_actions">
+        <li>
+          <button
+            type="button"
+            class="btn btn-chill-green text-white"
+            @click="onConfirm"
+          >
+            <template v-if="numberOfPicked > 1">
+              <i class="fa fa-plus"></i> Ajouter {{ numberOfPicked }} pièces
+              jointes
+            </template>
+            <template v-else>
+              <i class="fa fa-plus"></i> Ajouter une pièce jointe
+            </template>
+          </button>
+        </li>
+      </ul>
+    </template>
+  </modal>
 </template>
 
 <style scoped lang="scss"></style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/index.ts b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/index.ts
index 872e6c251..de3d2e3ef 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/index.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/index.ts
@@ -3,107 +3,102 @@ import App from "./App.vue";
 import { _createI18n } from "../_js/i18n";
 import { WorkflowAttachment } from "ChillMainAssets/types";
 import {
-    create_attachment,
-    delete_attachment,
-    find_attachments_by_workflow,
+  create_attachment,
+  delete_attachment,
+  find_attachments_by_workflow,
 } from "ChillMainAssets/lib/workflow/attachments";
 import { GenericDocForAccompanyingPeriod } from "ChillDocStoreAssets/types/generic_doc";
 import ToastPlugin from "vue-toast-notification";
 import "vue-toast-notification/dist/theme-bootstrap.css";
 
 window.addEventListener("DOMContentLoaded", () => {
-    const attachments = document.querySelectorAll<HTMLDivElement>(
-        'div[data-app="workflow_attachments"]',
+  const attachments = document.querySelectorAll<HTMLDivElement>(
+    'div[data-app="workflow_attachments"]',
+  );
+
+  attachments.forEach(async (el) => {
+    const workflowId = parseInt(el.dataset.entityWorkflowId || "");
+    const accompanyingPeriodId = parseInt(
+      el.dataset.relatedAccompanyingPeriodId || "",
     );
+    const attachments = await find_attachments_by_workflow(workflowId);
 
-    attachments.forEach(async (el) => {
-        const workflowId = parseInt(el.dataset.entityWorkflowId || "");
-        const accompanyingPeriodId = parseInt(
-            el.dataset.relatedAccompanyingPeriodId || "",
-        );
-        const attachments = await find_attachments_by_workflow(workflowId);
+    const app = createApp({
+      template:
+        '<app :workflowId="workflowId" :accompanyingPeriodId="accompanyingPeriodId" :attachments="attachments" @pickGenericDoc="onPickGenericDoc" @removeAttachment="onRemoveAttachment"></app>',
+      components: { App },
+      data: function () {
+        return { workflowId, accompanyingPeriodId, attachments };
+      },
+      methods: {
+        onRemoveAttachment: async function ({
+          attachment,
+        }: {
+          attachment: WorkflowAttachment;
+        }): Promise<void> {
+          const index = this.$data.attachments.findIndex(
+            (el: WorkflowAttachment) => el.id === attachment.id,
+          );
+          if (-1 === index) {
+            console.warn(
+              "this attachment is not associated with the workflow",
+              attachment,
+            );
+            this.$toast.error(
+              "This attachment is not associated with the workflow",
+            );
+            return;
+          }
 
-        const app = createApp({
-            template:
-                '<app :workflowId="workflowId" :accompanyingPeriodId="accompanyingPeriodId" :attachments="attachments" @pickGenericDoc="onPickGenericDoc" @removeAttachment="onRemoveAttachment"></app>',
-            components: { App },
-            data: function () {
-                return { workflowId, accompanyingPeriodId, attachments };
-            },
-            methods: {
-                onRemoveAttachment: async function ({
-                    attachment,
-                }: {
-                    attachment: WorkflowAttachment;
-                }): Promise<void> {
-                    const index = this.$data.attachments.findIndex(
-                        (el: WorkflowAttachment) => el.id === attachment.id,
-                    );
-                    if (-1 === index) {
-                        console.warn(
-                            "this attachment is not associated with the workflow",
-                            attachment,
-                        );
-                        this.$toast.error(
-                            "This attachment is not associated with the workflow",
-                        );
-                        return;
-                    }
+          try {
+            await delete_attachment(attachment);
+          } catch (error) {
+            console.error(error);
+            this.$toast.error("Error while removing element");
+            throw error;
+          }
+          this.$data.attachments.splice(index, 1);
+          this.$toast.success("Pièce jointe supprimée");
+        },
+        onPickGenericDoc: async function ({
+          genericDoc,
+        }: {
+          genericDoc: GenericDocForAccompanyingPeriod;
+        }): Promise<void> {
+          console.log("picked generic doc", genericDoc);
 
-                    try {
-                        await delete_attachment(attachment);
-                    } catch (error) {
-                        console.error(error);
-                        this.$toast.error("Error while removing element");
-                        throw error;
-                    }
-                    this.$data.attachments.splice(index, 1);
-                    this.$toast.success("Pièce jointe supprimée");
-                },
-                onPickGenericDoc: async function ({
-                    genericDoc,
-                }: {
-                    genericDoc: GenericDocForAccompanyingPeriod;
-                }): Promise<void> {
-                    console.log("picked generic doc", genericDoc);
+          // prevent to create double attachment:
+          if (
+            -1 !==
+            this.$data.attachments.findIndex(
+              (el: WorkflowAttachment) =>
+                el.genericDoc?.key === genericDoc.key &&
+                JSON.stringify(el.genericDoc?.identifiers) ==
+                  JSON.stringify(genericDoc.identifiers),
+            )
+          ) {
+            console.warn(
+              "this document is already attached to the workflow",
+              genericDoc,
+            );
+            this.$toast.error("Ce document est déjà attaché au workflow");
+            return;
+          }
 
-                    // prevent to create double attachment:
-                    if (
-                        -1 !==
-                        this.$data.attachments.findIndex(
-                            (el: WorkflowAttachment) =>
-                                el.genericDoc?.key === genericDoc.key &&
-                                JSON.stringify(el.genericDoc?.identifiers) ==
-                                    JSON.stringify(genericDoc.identifiers),
-                        )
-                    ) {
-                        console.warn(
-                            "this document is already attached to the workflow",
-                            genericDoc,
-                        );
-                        this.$toast.error(
-                            "Ce document est déjà attaché au workflow",
-                        );
-                        return;
-                    }
-
-                    try {
-                        const attachment = await create_attachment(
-                            workflowId,
-                            genericDoc,
-                        );
-                        this.$data.attachments.push(attachment);
-                    } catch (error) {
-                        console.error(error);
-                        throw error;
-                    }
-                },
-            },
-        });
-        const i18n = _createI18n({});
-        app.use(i18n);
-        app.use(ToastPlugin);
-
-        app.mount(el);
+          try {
+            const attachment = await create_attachment(workflowId, genericDoc);
+            this.$data.attachments.push(attachment);
+          } catch (error) {
+            console.error(error);
+            throw error;
+          }
+        },
+      },
     });
+    const i18n = _createI18n({});
+    app.use(i18n);
+    app.use(ToastPlugin);
+
+    app.mount(el);
+  });
 });
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/AddressDetailsButton.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/AddressDetailsButton.vue
index e5838089e..eb26ff738 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/AddressDetailsButton.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/AddressDetailsButton.vue
@@ -1,23 +1,23 @@
 <template>
-    <span
-        v-if="data.working_ref_status === 'to_review'"
-        class="badge bg-danger address-details-button-warning"
-        >L'adresse de référence a été modifiée</span
-    >
-    <a
-        v-if="data.loading === false"
-        @click.prevent="clickOrOpen"
-        class="btn btn-sm address-details-button"
-        title="Plus de détails"
-    >
-        <span class="fa fa-map-o"></span>
-    </a>
-    <span v-if="data.loading" class="fa fa-spin fa-spinner"></span>
-    <AddressModal
-        :address="data.working_address"
-        @update-address="onUpdateAddress"
-        ref="address_modal"
-    ></AddressModal>
+  <span
+    v-if="data.working_ref_status === 'to_review'"
+    class="badge bg-danger address-details-button-warning"
+    >L'adresse de référence a été modifiée</span
+  >
+  <a
+    v-if="data.loading === false"
+    @click.prevent="clickOrOpen"
+    class="btn btn-sm address-details-button"
+    title="Plus de détails"
+  >
+    <span class="fa fa-map-o"></span>
+  </a>
+  <span v-if="data.loading" class="fa fa-spin fa-spinner"></span>
+  <AddressModal
+    :address="data.working_address"
+    @update-address="onUpdateAddress"
+    ref="address_modal"
+  ></AddressModal>
 </template>
 
 <script lang="ts" setup>
@@ -27,20 +27,20 @@ import { getAddressById } from "../../../lib/api/address";
 import AddressModal from "./AddressModal.vue";
 
 export interface AddressModalContentProps {
-    address_id: number;
-    address_ref_status: AddressRefStatus;
+  address_id: number;
+  address_ref_status: AddressRefStatus;
 }
 
 interface AddressModalData {
-    loading: boolean;
-    working_address: Address | null;
-    working_ref_status: AddressRefStatus | null;
+  loading: boolean;
+  working_address: Address | null;
+  working_ref_status: AddressRefStatus | null;
 }
 
 const data: AddressModalData = reactive({
-    loading: false,
-    working_address: null,
-    working_ref_status: null,
+  loading: false,
+  working_address: null,
+  working_ref_status: null,
 } as AddressModalData);
 
 const props = defineProps<AddressModalContentProps>();
@@ -50,31 +50,31 @@ const emit = defineEmits<(e: "update-address", value: Address) => void>();
 const address_modal = ref<InstanceType<typeof AddressModal> | null>(null);
 
 onMounted(() => {
-    data.working_ref_status = props.address_ref_status;
+  data.working_ref_status = props.address_ref_status;
 });
 
 async function clickOrOpen(): Promise<void> {
-    if (data.working_address === null) {
-        data.loading = true;
-        data.working_address = await getAddressById(props.address_id);
-        data.working_ref_status = data.working_address.refStatus;
-        data.loading = false;
-    }
+  if (data.working_address === null) {
+    data.loading = true;
+    data.working_address = await getAddressById(props.address_id);
+    data.working_ref_status = data.working_address.refStatus;
+    data.loading = false;
+  }
 
-    // open the modal
-    address_modal.value?.open();
+  // open the modal
+  address_modal.value?.open();
 }
 
 const onUpdateAddress = (address: Address): void => {
-    data.working_address = address;
-    data.working_ref_status = address.refStatus;
-    emit("update-address", address);
+  data.working_address = address;
+  data.working_ref_status = address.refStatus;
+  emit("update-address", address);
 };
 </script>
 
 <style scoped lang="scss">
 .address-details-button-warning {
-    display: inline-block;
-    margin-right: 0.3rem;
+  display: inline-block;
+  margin-right: 0.3rem;
 }
 </style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/AddressDetailsContent.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/AddressDetailsContent.vue
index 41bb00025..46ec986aa 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/AddressDetailsContent.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/AddressDetailsContent.vue
@@ -1,16 +1,16 @@
 <template>
-    <address-render-box
-        :address="props.address"
-        :show-button-details="false"
-    ></address-render-box>
-    <address-details-ref-matching
-        :address="props.address"
-        @update-address="onUpdateAddress"
-    ></address-details-ref-matching>
-    <address-details-map :address="props.address"></address-details-map>
-    <address-details-geographical-layers
-        :address="props.address"
-    ></address-details-geographical-layers>
+  <address-render-box
+    :address="props.address"
+    :show-button-details="false"
+  ></address-render-box>
+  <address-details-ref-matching
+    :address="props.address"
+    @update-address="onUpdateAddress"
+  ></address-details-ref-matching>
+  <address-details-map :address="props.address"></address-details-map>
+  <address-details-geographical-layers
+    :address="props.address"
+  ></address-details-geographical-layers>
 </template>
 
 <script lang="ts" setup>
@@ -21,7 +21,7 @@ import AddressDetailsGeographicalLayers from "./Parts/AddressDetailsGeographical
 import AddressDetailsRefMatching from "./Parts/AddressDetailsRefMatching.vue";
 
 interface AddressModalContentProps {
-    address: Address;
+  address: Address;
 }
 
 const props = defineProps<AddressModalContentProps>();
@@ -29,7 +29,7 @@ const props = defineProps<AddressModalContentProps>();
 const emit = defineEmits<(e: "update-address", value: Address) => void>();
 
 const onUpdateAddress = (address: Address): void => {
-    emit("update-address", address);
+  emit("update-address", address);
 };
 </script>
 
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/AddressModal.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/AddressModal.vue
index 7c00066be..96e32ba04 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/AddressModal.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/AddressModal.vue
@@ -1,17 +1,17 @@
 <template>
-    <teleport to="body">
-        <modal v-if="state.show_modal" @close="close">
-            <template v-slot:header>
-                <h2>Détails d'une adresse</h2>
-            </template>
-            <template v-slot:body>
-                <address-details-content
-                    :address="props.address"
-                    @update-address="onUpdateAddress"
-                ></address-details-content>
-            </template>
-        </modal>
-    </teleport>
+  <teleport to="body">
+    <modal v-if="state.show_modal" @close="close">
+      <template v-slot:header>
+        <h2>Détails d'une adresse</h2>
+      </template>
+      <template v-slot:body>
+        <address-details-content
+          :address="props.address"
+          @update-address="onUpdateAddress"
+        ></address-details-content>
+      </template>
+    </modal>
+  </teleport>
 </template>
 
 <script lang="ts" setup>
@@ -21,11 +21,11 @@ import { Address } from "../../../types";
 import AddressDetailsContent from "./AddressDetailsContent.vue";
 
 interface AddressModalProps {
-    address: Address;
+  address: Address;
 }
 
 interface AddressModalState {
-    show_modal: boolean;
+  show_modal: boolean;
 }
 
 const props = defineProps<AddressModalProps>();
@@ -35,20 +35,20 @@ const emit = defineEmits<(e: "update-address", value: Address) => void>();
 const state: AddressModalState = reactive({ show_modal: false });
 
 const open = (): void => {
-    state.show_modal = true;
+  state.show_modal = true;
 };
 
 const close = (): void => {
-    state.show_modal = false;
+  state.show_modal = false;
 };
 
 const onUpdateAddress = (address: Address): void => {
-    emit("update-address", address);
+  emit("update-address", address);
 };
 
 defineExpose({
-    close,
-    open,
+  close,
+  open,
 });
 </script>
 
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/Parts/AddressDetailsGeographicalLayers.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/Parts/AddressDetailsGeographicalLayers.vue
index c104df1dc..e740cce17 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/Parts/AddressDetailsGeographicalLayers.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/Parts/AddressDetailsGeographicalLayers.vue
@@ -1,59 +1,59 @@
 <template>
-    <template v-for="(container, index) in data.containers" :key="index">
-        <h4>{{ localizeString(container.layer.name) }}</h4>
-        <ul>
-            <li v-for="(unit, index) in container.units" :key="index">
-                {{ unit.unitName }} ({{ unit.unitRefId }})
-            </li>
-        </ul>
-    </template>
+  <template v-for="(container, index) in data.containers" :key="index">
+    <h4>{{ localizeString(container.layer.name) }}</h4>
+    <ul>
+      <li v-for="(unit, index) in container.units" :key="index">
+        {{ unit.unitName }} ({{ unit.unitRefId }})
+      </li>
+    </ul>
+  </template>
 </template>
 
 <script lang="ts" setup>
 import {
-    Address,
-    GeographicalUnitLayer,
-    SimpleGeographicalUnit,
+  Address,
+  GeographicalUnitLayer,
+  SimpleGeographicalUnit,
 } from "../../../../types";
 import {
-    getGeographicalUnitsByAddress,
-    getAllGeographicalUnitLayers,
+  getGeographicalUnitsByAddress,
+  getAllGeographicalUnitLayers,
 } from "../../../../lib/api/address";
 import { onMounted, reactive } from "vue";
 import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
 
 export interface AddressDetailsGeographicalLayersProp {
-    address: Address;
+  address: Address;
 }
 
 interface GeographicalUnitContainer {
-    layer: GeographicalUnitLayer;
-    units: SimpleGeographicalUnit[];
+  layer: GeographicalUnitLayer;
+  units: SimpleGeographicalUnit[];
 }
 
 const props = defineProps<AddressDetailsGeographicalLayersProp>();
 
 const data: {
-    containers: GeographicalUnitContainer[];
+  containers: GeographicalUnitContainer[];
 } = reactive({
-    containers: [],
+  containers: [],
 });
 
 onMounted(async () => {
-    const [units, layers] = (await Promise.all([
-        getGeographicalUnitsByAddress(props.address),
-        getAllGeographicalUnitLayers(),
-    ])) as [SimpleGeographicalUnit[], GeographicalUnitLayer[]];
+  const [units, layers] = (await Promise.all([
+    getGeographicalUnitsByAddress(props.address),
+    getAllGeographicalUnitLayers(),
+  ])) as [SimpleGeographicalUnit[], GeographicalUnitLayer[]];
 
-    for (let layer of layers) {
-        let us = units.filter((u) => u.layerId === layer.id);
-        if (us.length > 0) {
-            data.containers.push({
-                layer,
-                units: us,
-            });
-        }
+  for (let layer of layers) {
+    let us = units.filter((u) => u.layerId === layer.id);
+    if (us.length > 0) {
+      data.containers.push({
+        layer,
+        units: us,
+      });
     }
+  }
 });
 </script>
 
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/Parts/AddressDetailsMap.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/Parts/AddressDetailsMap.vue
index 3fe075fcc..e3503c9e4 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/Parts/AddressDetailsMap.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/Parts/AddressDetailsMap.vue
@@ -1,20 +1,17 @@
 <template>
-    <div v-if="props.address.isNoAddress" class="alert alert-info">
-        Cette adresse est incomplète. La position géographique est
-        approximative.
-    </div>
-    <div
-        v-if="props.address.point !== null"
-        class="address_details_map"
-        ref="map_div"
-    ></div>
-    <p>
-        Voir sur
-        <a :href="makeUrlGoogleMap(props.address)" target="_blank"
-            >Google Maps</a
-        >
-        <a :href="makeUrlOsm(props.address)" target="_blank">OSM</a>
-    </p>
+  <div v-if="props.address.isNoAddress" class="alert alert-info">
+    Cette adresse est incomplète. La position géographique est approximative.
+  </div>
+  <div
+    v-if="props.address.point !== null"
+    class="address_details_map"
+    ref="map_div"
+  ></div>
+  <p>
+    Voir sur
+    <a :href="makeUrlGoogleMap(props.address)" target="_blank">Google Maps</a>
+    <a :href="makeUrlOsm(props.address)" target="_blank">OSM</a>
+  </p>
 </template>
 
 <script lang="ts" setup>
@@ -25,11 +22,11 @@ import L, { LatLngExpression, LatLngTuple } from "leaflet";
 import { Address, Point } from "../../../../types";
 
 const lonLatForLeaflet = (point: Point): LatLngTuple => {
-    return [point.coordinates[1], point.coordinates[0]];
+  return [point.coordinates[1], point.coordinates[0]];
 };
 
 export interface MapProps {
-    address: Address;
+  address: Address;
 }
 
 const props = defineProps<MapProps>();
@@ -39,70 +36,70 @@ let map: L.Map | null = null;
 let marker: L.Marker | null = null;
 
 onMounted(() => {
-    if (map_div.value === null) {
-        // there is no map div when the address does not have any Point
-        return;
-    }
+  if (map_div.value === null) {
+    // there is no map div when the address does not have any Point
+    return;
+  }
 
-    if (props.address.point !== null) {
-        map = L.map(map_div.value);
-        map.setView(lonLatForLeaflet(props.address.point), 18);
+  if (props.address.point !== null) {
+    map = L.map(map_div.value);
+    map.setView(lonLatForLeaflet(props.address.point), 18);
 
-        L.tileLayer("https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", {
-            attribution:
-                '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
-        }).addTo(map);
+    L.tileLayer("https://{s}.tile.openstreetmap.org/{z}/{x}/{y}.png", {
+      attribution:
+        '&copy; <a href="https://www.openstreetmap.org/copyright">OpenStreetMap</a> contributors',
+    }).addTo(map);
 
-        const markerIcon = L.icon({
-            iconUrl: markerIconPng,
-            iconAnchor: [12, 41],
-        });
+    const markerIcon = L.icon({
+      iconUrl: markerIconPng,
+      iconAnchor: [12, 41],
+    });
 
-        marker = L.marker(lonLatForLeaflet(props.address.point), {
-            icon: markerIcon,
-        });
-        marker.addTo(map);
-    }
+    marker = L.marker(lonLatForLeaflet(props.address.point), {
+      icon: markerIcon,
+    });
+    marker.addTo(map);
+  }
 });
 
 const makeUrlGoogleMap = (address: Address): string => {
-    const params = new URLSearchParams();
-    params.append("api", "1");
-    if (address.point !== null && address.addressReference !== null) {
-        params.append(
-            "query",
-            `${address.point.coordinates[1]} ${address.point.coordinates[0]}`,
-        );
-    } else {
-        params.append("query", address.lines.join(", "));
-    }
+  const params = new URLSearchParams();
+  params.append("api", "1");
+  if (address.point !== null && address.addressReference !== null) {
+    params.append(
+      "query",
+      `${address.point.coordinates[1]} ${address.point.coordinates[0]}`,
+    );
+  } else {
+    params.append("query", address.lines.join(", "));
+  }
 
-    return `https://www.google.com/maps/search/?${params.toString()}`;
+  return `https://www.google.com/maps/search/?${params.toString()}`;
 };
 
 const makeUrlOsm = (address: Address): string => {
-    if (address.point !== null && address.addressReference !== null) {
-        const params = new URLSearchParams();
-        params.append("mlat", `${address.point.coordinates[1]}`);
-        params.append("mlon", `${address.point.coordinates[0]}`);
-        const hashParams = new URLSearchParams();
-        hashParams.append(
-            "map",
-            `18/${address.point.coordinates[1]}/${address.point.coordinates[0]}`,
-        );
-
-        return `https://www.openstreetmap.org/?${params.toString()}#${hashParams.toString()}`;
-    }
-
+  if (address.point !== null && address.addressReference !== null) {
     const params = new URLSearchParams();
-    params.append("query", address.lines.join(", "));
+    params.append("mlat", `${address.point.coordinates[1]}`);
+    params.append("mlon", `${address.point.coordinates[0]}`);
+    const hashParams = new URLSearchParams();
+    hashParams.append(
+      "map",
+      `18/${address.point.coordinates[1]}/${address.point.coordinates[0]}`,
+    );
 
-    return `https://www.openstreetmap.org/search?${params.toString()}`;
+    return `https://www.openstreetmap.org/?${params.toString()}#${hashParams.toString()}`;
+  }
+
+  const params = new URLSearchParams();
+  params.append("query", address.lines.join(", "));
+
+  return `https://www.openstreetmap.org/search?${params.toString()}`;
 };
 </script>
 
 <style scoped>
 div.address_details_map {
-    height: 250px;
+  height: 250px;
 }
 </style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/Parts/AddressDetailsRefMatching.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/Parts/AddressDetailsRefMatching.vue
index c3d421411..43dea5d4b 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/Parts/AddressDetailsRefMatching.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/Parts/AddressDetailsRefMatching.vue
@@ -1,140 +1,124 @@
 <template>
-    <template v-if="props.address.refStatus !== 'match'">
-        <div
-            v-if="
-                props.address.refStatus === 'to_review' ||
-                props.address.refStatus === 'reviewed'
-            "
-            :class="{
-                alert: true,
-                'alert-danger': props.address.refStatus === 'to_review',
-                'alert-warning': props.address.refStatus === 'reviewed',
-            }"
-        >
-            <p v-if="props.address.refStatus === 'to_review'">
-                <i class="fa fa-warning"></i> L'adresse de référence a été
-                modifiée.
-            </p>
-            <p v-if="props.address.refStatus === 'reviewed'">
-                L'adresse est conservée, mais diffère de l'adresse de référence.
-            </p>
+  <template v-if="props.address.refStatus !== 'match'">
+    <div
+      v-if="
+        props.address.refStatus === 'to_review' ||
+        props.address.refStatus === 'reviewed'
+      "
+      :class="{
+        alert: true,
+        'alert-danger': props.address.refStatus === 'to_review',
+        'alert-warning': props.address.refStatus === 'reviewed',
+      }"
+    >
+      <p v-if="props.address.refStatus === 'to_review'">
+        <i class="fa fa-warning"></i> L'adresse de référence a été modifiée.
+      </p>
+      <p v-if="props.address.refStatus === 'reviewed'">
+        L'adresse est conservée, mais diffère de l'adresse de référence.
+      </p>
 
-            <template
-                v-if="
-                    props.address.addressReference.street !==
-                        props.address.street ||
-                    props.address.addressReference.streetNumber !==
-                        props.address.streetNumber
-                "
+      <template
+        v-if="
+          props.address.addressReference.street !== props.address.street ||
+          props.address.addressReference.streetNumber !==
+            props.address.streetNumber
+        "
+      >
+        <template v-if="props.address.country.code === 'BE'">
+          <div class="difference">
+            <span class="old"
+              >{{ props.address.street }} {{ props.address.streetNumber }}</span
             >
-                <template v-if="props.address.country.code === 'BE'">
-                    <div class="difference">
-                        <span class="old"
-                            >{{ props.address.street }}
-                            {{ props.address.streetNumber }}</span
-                        >
-                        <span class="new"
-                            >{{ props.address.addressReference.street }}
-                            {{
-                                props.address.addressReference.streetNumber
-                            }}</span
-                        >
-                    </div>
-                </template>
-                <template v-else>
-                    <div class="difference">
-                        <span class="old"
-                            >{{ props.address.streetNumber }}
-                            {{ props.address.street }}</span
-                        >
-                        <span class="new"
-                            >{{ props.address.addressReference.streetNumber }}
-                            {{ props.address.addressReference.street }}</span
-                        >
-                    </div>
-                </template>
-            </template>
-
-            <template
-                v-if="
-                    props.address.addressReference.postcode.id !==
-                    props.address.postcode.id
-                "
+            <span class="new"
+              >{{ props.address.addressReference.street }}
+              {{ props.address.addressReference.streetNumber }}</span
             >
-                <div class="difference">
-                    <span class="old"
-                        >{{ props.address.postcode.code }}
-                        {{ props.address.postcode.name }}</span
-                    >
-                    <span class="new"
-                        >{{ props.address.addressReference.postcode.code }}
-                        {{ props.address.addressReference.postcode.name }}</span
-                    >
-                </div>
-            </template>
-
-            <template
-                v-if="
-                    props.address.point !== null &&
-                    (props.address.point.coordinates[0] !==
-                        props.address.addressReference.point.coordinates[0] ||
-                        props.address.point.coordinates[1] !==
-                            props.address.addressReference.point.coordinates[1])
-                "
+          </div>
+        </template>
+        <template v-else>
+          <div class="difference">
+            <span class="old"
+              >{{ props.address.streetNumber }} {{ props.address.street }}</span
             >
-                <div class="difference">
-                    <span class="old"
-                        >{{ props.address.point.coordinates[0] }}
-                        {{ props.address.point.coordinates[1] }}</span
-                    >
-                    <span class="new"
-                        >{{
-                            props.address.addressReference.point.coordinates[0]
-                        }}
-                        {{
-                            props.address.addressReference.point.coordinates[1]
-                        }}</span
-                    >
-                </div>
-            </template>
+            <span class="new"
+              >{{ props.address.addressReference.streetNumber }}
+              {{ props.address.addressReference.street }}</span
+            >
+          </div>
+        </template>
+      </template>
 
-            <ul class="record_actions">
-                <li v-if="props.address.refStatus === 'to_review'">
-                    <button class="btn btn-sm btn-update" @click="applyUpdate">
-                        Appliquer les modifications
-                    </button>
-                </li>
-                <li v-if="props.address.refStatus === 'to_review'">
-                    <button
-                        class="btn btn-sm btn-primary"
-                        @click="keepCurrentAddress"
-                    >
-                        Conserver
-                    </button>
-                </li>
-                <li v-if="props.address.refStatus === 'reviewed'">
-                    <button
-                        class="btn btn-sm btn-primary"
-                        @click="backToReview"
-                    >
-                        Ré-examiner
-                    </button>
-                </li>
-            </ul>
+      <template
+        v-if="
+          props.address.addressReference.postcode.id !==
+          props.address.postcode.id
+        "
+      >
+        <div class="difference">
+          <span class="old"
+            >{{ props.address.postcode.code }}
+            {{ props.address.postcode.name }}</span
+          >
+          <span class="new"
+            >{{ props.address.addressReference.postcode.code }}
+            {{ props.address.addressReference.postcode.name }}</span
+          >
         </div>
-    </template>
+      </template>
+
+      <template
+        v-if="
+          props.address.point !== null &&
+          (props.address.point.coordinates[0] !==
+            props.address.addressReference.point.coordinates[0] ||
+            props.address.point.coordinates[1] !==
+              props.address.addressReference.point.coordinates[1])
+        "
+      >
+        <div class="difference">
+          <span class="old"
+            >{{ props.address.point.coordinates[0] }}
+            {{ props.address.point.coordinates[1] }}</span
+          >
+          <span class="new"
+            >{{ props.address.addressReference.point.coordinates[0] }}
+            {{ props.address.addressReference.point.coordinates[1] }}</span
+          >
+        </div>
+      </template>
+
+      <ul class="record_actions">
+        <li v-if="props.address.refStatus === 'to_review'">
+          <button class="btn btn-sm btn-update" @click="applyUpdate">
+            Appliquer les modifications
+          </button>
+        </li>
+        <li v-if="props.address.refStatus === 'to_review'">
+          <button class="btn btn-sm btn-primary" @click="keepCurrentAddress">
+            Conserver
+          </button>
+        </li>
+        <li v-if="props.address.refStatus === 'reviewed'">
+          <button class="btn btn-sm btn-primary" @click="backToReview">
+            Ré-examiner
+          </button>
+        </li>
+      </ul>
+    </div>
+  </template>
 </template>
 
 <script lang="ts" setup>
 import { Address } from "../../../../types";
 import {
-    markAddressReviewed,
-    markAddressToReview,
-    syncAddressWithReference,
+  markAddressReviewed,
+  markAddressToReview,
+  syncAddressWithReference,
 } from "../../../../lib/api/address";
 
 export interface AddressDetailsRefMatchingProps {
-    address: Address;
+  address: Address;
 }
 
 const props = defineProps<AddressDetailsRefMatchingProps>();
@@ -142,38 +126,38 @@ const props = defineProps<AddressDetailsRefMatchingProps>();
 const emit = defineEmits<(e: "update-address", value: Address) => void>();
 
 const applyUpdate = async () => {
-    const new_address = await syncAddressWithReference(props.address);
+  const new_address = await syncAddressWithReference(props.address);
 
-    emit("update-address", new_address);
+  emit("update-address", new_address);
 };
 
 const keepCurrentAddress = async () => {
-    const new_address = await markAddressReviewed(props.address);
+  const new_address = await markAddressReviewed(props.address);
 
-    emit("update-address", new_address);
+  emit("update-address", new_address);
 };
 
 const backToReview = async () => {
-    const new_address = await markAddressToReview(props.address);
+  const new_address = await markAddressToReview(props.address);
 
-    emit("update-address", new_address);
+  emit("update-address", new_address);
 };
 </script>
 
 <style scoped lang="scss">
 .difference {
-    margin-bottom: 0.5rem;
+  margin-bottom: 0.5rem;
 
-    span {
-        display: block;
-    }
+  span {
+    display: block;
+  }
 
-    .old {
-        text-decoration: red line-through;
-    }
-    .new {
-        font-weight: bold;
-        color: green;
-    }
+  .old {
+    text-decoration: red line-through;
+  }
+  .new {
+    font-weight: bold;
+    color: green;
+  }
 }
 </style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/BadgeEntity.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/BadgeEntity.vue
index 1c5d2b6da..b74b64054 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/BadgeEntity.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/BadgeEntity.vue
@@ -1,66 +1,63 @@
 <template>
-    <span
-        v-if="props.entity.type === 'person'"
-        class="badge rounded-pill bg-person"
-    >
-        {{ trans(PERSON) }}
-    </span>
+  <span
+    v-if="props.entity.type === 'person'"
+    class="badge rounded-pill bg-person"
+  >
+    {{ trans(PERSON) }}
+  </span>
 
-    <span
-        v-if="props.entity.type === 'thirdparty'"
-        class="badge rounded-pill bg-thirdparty"
-    >
-        <template v-if="props.options.displayLong !== true">
-            {{ trans(THIRDPARTY) }}
-        </template>
+  <span
+    v-if="props.entity.type === 'thirdparty'"
+    class="badge rounded-pill bg-thirdparty"
+  >
+    <template v-if="props.options.displayLong !== true">
+      {{ trans(THIRDPARTY) }}
+    </template>
 
-        <i class="fa fa-fw fa-user" v-if="props.entity.kind === 'child'" />
-        <i
-            class="fa fa-fw fa-hospital-o"
-            v-else-if="props.entity.kind === 'company'"
-        />
-        <i class="fa fa-fw fa-user-md" v-else />
+    <i class="fa fa-fw fa-user" v-if="props.entity.kind === 'child'" />
+    <i
+      class="fa fa-fw fa-hospital-o"
+      v-else-if="props.entity.kind === 'company'"
+    />
+    <i class="fa fa-fw fa-user-md" v-else />
 
-        <template v-if="props.options.displayLong === true">
-            <span v-if="props.entity.kind === 'child'">{{
-                trans(THIRDPARTY_CONTACT_OF)
-            }}</span>
-            <span v-else-if="props.entity.kind === 'company'">{{
-                trans(THIRDPARTY_A_COMPANY)
-            }}</span>
-            <span v-else>{{ trans(THIRDPARTY_A_CONTACT) }}</span>
-        </template>
-    </span>
+    <template v-if="props.options.displayLong === true">
+      <span v-if="props.entity.kind === 'child'">{{
+        trans(THIRDPARTY_CONTACT_OF)
+      }}</span>
+      <span v-else-if="props.entity.kind === 'company'">{{
+        trans(THIRDPARTY_A_COMPANY)
+      }}</span>
+      <span v-else>{{ trans(THIRDPARTY_A_CONTACT) }}</span>
+    </template>
+  </span>
 
-    <span
-        v-if="props.entity.type === 'user'"
-        class="badge rounded-pill bg-user"
-    >
-        {{ trans(ACCEPTED_USERS) }}
-    </span>
+  <span v-if="props.entity.type === 'user'" class="badge rounded-pill bg-user">
+    {{ trans(ACCEPTED_USERS) }}
+  </span>
 
-    <span
-        v-if="props.entity.type === 'household'"
-        class="badge rounded-pill bg-user"
-    >
-        {{ trans(HOUSEHOLD) }}
-    </span>
+  <span
+    v-if="props.entity.type === 'household'"
+    class="badge rounded-pill bg-user"
+  >
+    {{ trans(HOUSEHOLD) }}
+  </span>
 </template>
 
 <script setup>
 import {
-    trans,
-    HOUSEHOLD,
-    ACCEPTED_USERS,
-    THIRDPARTY_A_CONTACT,
-    THIRDPARTY_CONTACT_OF,
-    THIRDPARTY_A_COMPANY,
-    PERSON,
-    THIRDPARTY,
+  trans,
+  HOUSEHOLD,
+  ACCEPTED_USERS,
+  THIRDPARTY_A_CONTACT,
+  THIRDPARTY_CONTACT_OF,
+  THIRDPARTY_A_COMPANY,
+  PERSON,
+  THIRDPARTY,
 } from "translator";
 
 const props = defineProps({
-    options: Object,
-    entity: Object,
+  options: Object,
+  entity: Object,
 });
 </script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/CommentEditor/CommentEditor.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/CommentEditor/CommentEditor.vue
index d6019fabe..97242ffa2 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/CommentEditor/CommentEditor.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/CommentEditor/CommentEditor.vue
@@ -4,9 +4,9 @@ import { Ckeditor } from "@ckeditor/ckeditor5-vue";
 import { ClassicEditor } from "ckeditor5";
 import classicEditorConfig from "ChillMainAssets/module/ckeditor5/editor_config";
 import {
-    trans,
-    EDITOR_SWITCH_TO_SIMPLE,
-    EDITOR_SWITCH_TO_COMPLEX,
+  trans,
+  EDITOR_SWITCH_TO_SIMPLE,
+  EDITOR_SWITCH_TO_COMPLEX,
 } from "translator";
 
 const EDITOR_MODE_KEY = "editorMode";
@@ -16,107 +16,101 @@ const value = defineModel({ required: true });
 const isSimple = computed(() => kind.value === "simple");
 
 const toggleButtonClass = computed(() => {
-    return {
-        ["toggle-button"]: true,
-        onEditor: !isSimple.value,
-        onSimple: isSimple.value,
-    };
+  return {
+    ["toggle-button"]: true,
+    onEditor: !isSimple.value,
+    onSimple: isSimple.value,
+  };
 });
 
 const toggleEditor = () => {
-    let newValue;
+  let newValue;
 
-    newValue = kind.value === "simple" ? "rich" : "simple";
-    kind.value = "rich";
-    window.localStorage.setItem(EDITOR_MODE_KEY, newValue);
+  newValue = kind.value === "simple" ? "rich" : "simple";
+  kind.value = "rich";
+  window.localStorage.setItem(EDITOR_MODE_KEY, newValue);
 
-    window.dispatchEvent(new Event("toggleEditorKind"));
+  window.dispatchEvent(new Event("toggleEditorKind"));
 };
 
 const onKindChange = function (/* event: StorageEvent | Event */) {
-    const newValue = window.localStorage.getItem(EDITOR_MODE_KEY);
+  const newValue = window.localStorage.getItem(EDITOR_MODE_KEY);
 
-    if (null === newValue || !(newValue === "rich" || newValue === "simple")) {
-        throw "invalid new value: " + newValue;
-    }
+  if (null === newValue || !(newValue === "rich" || newValue === "simple")) {
+    throw "invalid new value: " + newValue;
+  }
 
-    if (kind.value !== newValue) {
-        kind.value = newValue;
-    }
+  if (kind.value !== newValue) {
+    kind.value = newValue;
+  }
 };
 
 onMounted(function () {
-    const storage = window.localStorage;
-    const savedKind = storage.getItem(EDITOR_MODE_KEY);
+  const storage = window.localStorage;
+  const savedKind = storage.getItem(EDITOR_MODE_KEY);
 
-    if (
-        null !== kind.value &&
-        (savedKind === "simple" || savedKind === "rich")
-    ) {
-        kind.value = savedKind;
-    }
+  if (null !== kind.value && (savedKind === "simple" || savedKind === "rich")) {
+    kind.value = savedKind;
+  }
 
-    window.addEventListener("storage", onKindChange);
-    window.addEventListener("toggleEditorKind", onKindChange);
+  window.addEventListener("storage", onKindChange);
+  window.addEventListener("toggleEditorKind", onKindChange);
 });
 
 onUnmounted(function () {
-    window.removeEventListener("storage", onKindChange);
-    window.removeEventListener("toggleEditorKind", onKindChange);
+  window.removeEventListener("storage", onKindChange);
+  window.removeEventListener("toggleEditorKind", onKindChange);
 });
 </script>
 
 <template>
-    <div>
-        <div v-if="'rich' === kind">
-            <Ckeditor
-                :editor="ClassicEditor"
-                :config="classicEditorConfig"
-                v-model="value"
-            />
-        </div>
-        <div v-else>
-            <textarea
-                v-model="value"
-                class="form-control simple-editor"
-            ></textarea>
-        </div>
-
-        <button :class="toggleButtonClass" type="button" @click="toggleEditor">
-            {{
-                isSimple
-                    ? trans(EDITOR_SWITCH_TO_COMPLEX)
-                    : trans(EDITOR_SWITCH_TO_SIMPLE)
-            }}
-        </button>
+  <div>
+    <div v-if="'rich' === kind">
+      <Ckeditor
+        :editor="ClassicEditor"
+        :config="classicEditorConfig"
+        v-model="value"
+      />
     </div>
+    <div v-else>
+      <textarea v-model="value" class="form-control simple-editor"></textarea>
+    </div>
+
+    <button :class="toggleButtonClass" type="button" @click="toggleEditor">
+      {{
+        isSimple
+          ? trans(EDITOR_SWITCH_TO_COMPLEX)
+          : trans(EDITOR_SWITCH_TO_SIMPLE)
+      }}
+    </button>
+  </div>
 </template>
 
 <style scoped lang="scss">
 @import "ChillMainAssets/module/bootstrap/bootstrap";
 
 .toggle-button {
-    background: white;
-    border: none;
-    padding: 0.15rem;
-    color: #069;
-    cursor: pointer;
+  background: white;
+  border: none;
+  padding: 0.15rem;
+  color: #069;
+  cursor: pointer;
 
-    @include media-breakpoint-up(md) {
-        &.onEditor {
-            position: relative;
-            left: 1rem;
-            top: -1.5rem;
-        }
-        &.onSimple {
-            position: relative;
-            top: -0.75rem;
-            left: 1rem;
-        }
+  @include media-breakpoint-up(md) {
+    &.onEditor {
+      position: relative;
+      left: 1rem;
+      top: -1.5rem;
     }
+    &.onSimple {
+      position: relative;
+      top: -0.75rem;
+      left: 1rem;
+    }
+  }
 }
 
 .simple-editor {
-    min-height: 190px;
+  min-height: 190px;
 }
 </style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
index 13459b390..9c010e8d1 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Confidential.vue
@@ -1,40 +1,40 @@
 <template>
-    <div class="confidential">
-        <div :class="{ blur: isBlurred }">
-            <slot name="confidential-content" />
-        </div>
-        <div class="toggle-container">
-            <i
-                class="fa toggle"
-                :class="toggleIcon"
-                aria-hidden="true"
-                @click="toggleBlur"
-            />
-        </div>
+  <div class="confidential">
+    <div :class="{ blur: isBlurred }">
+      <slot name="confidential-content" />
     </div>
+    <div class="toggle-container">
+      <i
+        class="fa toggle"
+        :class="toggleIcon"
+        aria-hidden="true"
+        @click="toggleBlur"
+      />
+    </div>
+  </div>
 </template>
 
 <script>
 export default {
-    name: "Confidential",
-    data() {
-        return {
-            isBlurred: true,
-            toggleIcon: "fa-eye",
-        };
-    },
-    methods: {
-        toggleBlur() {
-            console.log(this.positionBtnFar);
-            this.isBlurred = !this.isBlurred;
-            this.toggleIcon = this.isBlurred ? "fa-eye" : "fa-eye-slash";
-        },
+  name: "Confidential",
+  data() {
+    return {
+      isBlurred: true,
+      toggleIcon: "fa-eye",
+    };
+  },
+  methods: {
+    toggleBlur() {
+      console.log(this.positionBtnFar);
+      this.isBlurred = !this.isBlurred;
+      this.toggleIcon = this.isBlurred ? "fa-eye" : "fa-eye-slash";
     },
+  },
 };
 </script>
 
 <style scoped lang="scss">
 .confidential {
-    align-content: center;
+  align-content: center;
 }
 </style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue
index 86f4155b6..7085b3b18 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/AddressRenderBox.vue
@@ -1,83 +1,77 @@
 <template>
-    <component :is="component" class="chill-entity entity-address">
-        <component :is="component" class="address" :class="multiline">
-            <div v-if="isConfidential">
-                <confidential :position-btn-far="true">
-                    <template #confidential-content>
-                        <div v-if="isMultiline === true">
-                            <p
-                                v-for="(l, i) in address.lines"
-                                :key="`line-${i}`"
-                            >
-                                {{ l }}
-                            </p>
-                            <p v-if="showButtonDetails">
-                                <address-details-button
-                                    :address_id="address.address_id"
-                                    :address_ref_status="address.refStatus"
-                                />
-                            </p>
-                        </div>
-                        <div v-else>
-                            <p v-if="'' !== address.text" class="street">
-                                {{ address.text }}
-                            </p>
-                            <p
-                                v-if="null !== address.postcode"
-                                class="postcode"
-                            >
-                                {{ address.postcode.code }}
-                                {{ address.postcode.name }}
-                            </p>
-                            <p v-if="null !== address.country" class="country">
-                                {{ localizeString(address.country.name) }}
-                            </p>
-                        </div>
-                    </template>
-                </confidential>
+  <component :is="component" class="chill-entity entity-address">
+    <component :is="component" class="address" :class="multiline">
+      <div v-if="isConfidential">
+        <confidential :position-btn-far="true">
+          <template #confidential-content>
+            <div v-if="isMultiline === true">
+              <p v-for="(l, i) in address.lines" :key="`line-${i}`">
+                {{ l }}
+              </p>
+              <p v-if="showButtonDetails">
+                <address-details-button
+                  :address_id="address.address_id"
+                  :address_ref_status="address.refStatus"
+                />
+              </p>
             </div>
+            <div v-else>
+              <p v-if="'' !== address.text" class="street">
+                {{ address.text }}
+              </p>
+              <p v-if="null !== address.postcode" class="postcode">
+                {{ address.postcode.code }}
+                {{ address.postcode.name }}
+              </p>
+              <p v-if="null !== address.country" class="country">
+                {{ localizeString(address.country.name) }}
+              </p>
+            </div>
+          </template>
+        </confidential>
+      </div>
 
-            <div v-if="!isConfidential">
-                <div v-if="isMultiline === true">
-                    <p v-for="(l, i) in address.lines" :key="`line-${i}`">
-                        {{ l }}
-                    </p>
-                    <p v-if="showButtonDetails">
-                        <address-details-button
-                            :address_id="address.address_id"
-                            :address_ref_status="address.refStatus"
-                        />
-                    </p>
-                </div>
-                <div v-else>
-                    <p v-if="address.text" class="street">
-                        {{ address.text }}
-                        <template v-if="showButtonDetails">
-                            <address-details-button
-                                :address_id="address.address_id"
-                                :address_ref_status="address.refStatus"
-                            />
-                        </template>
-                    </p>
-                </div>
-            </div>
-        </component>
-
-        <div v-if="useDatePane === true" class="address-more">
-            <div v-if="address.validFrom">
-                <span class="validFrom">
-                    <b>{{ trans(ADDRESS_VALID_FROM) }}</b
-                    >: {{ $d(address.validFrom.date) }}
-                </span>
-            </div>
-            <div v-if="address.validTo">
-                <span class="validTo">
-                    <b>{{ trans(ADDRESS_VALID_TO) }}</b
-                    >: {{ $d(address.validTo.date) }}
-                </span>
-            </div>
+      <div v-if="!isConfidential">
+        <div v-if="isMultiline === true">
+          <p v-for="(l, i) in address.lines" :key="`line-${i}`">
+            {{ l }}
+          </p>
+          <p v-if="showButtonDetails">
+            <address-details-button
+              :address_id="address.address_id"
+              :address_ref_status="address.refStatus"
+            />
+          </p>
         </div>
+        <div v-else>
+          <p v-if="address.text" class="street">
+            {{ address.text }}
+            <template v-if="showButtonDetails">
+              <address-details-button
+                :address_id="address.address_id"
+                :address_ref_status="address.refStatus"
+              />
+            </template>
+          </p>
+        </div>
+      </div>
     </component>
+
+    <div v-if="useDatePane === true" class="address-more">
+      <div v-if="address.validFrom">
+        <span class="validFrom">
+          <b>{{ trans(ADDRESS_VALID_FROM) }}</b
+          >: {{ $d(address.validFrom.date) }}
+        </span>
+      </div>
+      <div v-if="address.validTo">
+        <span class="validTo">
+          <b>{{ trans(ADDRESS_VALID_TO) }}</b
+          >: {{ $d(address.validTo.date) }}
+        </span>
+      </div>
+    </div>
+  </component>
 </template>
 
 <script>
@@ -87,51 +81,51 @@ import { trans, ADDRESS_VALID_FROM, ADDRESS_VALID_TO } from "translator";
 import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
 
 export default {
-    name: "AddressRenderBox",
-    methods: { localizeString },
-    components: {
-        Confidential,
-        AddressDetailsButton,
+  name: "AddressRenderBox",
+  methods: { localizeString },
+  components: {
+    Confidential,
+    AddressDetailsButton,
+  },
+  props: {
+    address: {
+      type: Object,
     },
-    props: {
-        address: {
-            type: Object,
-        },
-        isMultiline: {
-            default: true,
-            type: Boolean,
-        },
-        useDatePane: {
-            default: false,
-            type: Boolean,
-        },
-        showButtonDetails: {
-            default: true,
-            type: Boolean,
-        },
+    isMultiline: {
+      default: true,
+      type: Boolean,
     },
-    setup() {
-        return { trans, ADDRESS_VALID_FROM, ADDRESS_VALID_TO };
+    useDatePane: {
+      default: false,
+      type: Boolean,
     },
-    computed: {
-        component() {
-            return this.isMultiline === true ? "div" : "span";
-        },
-        multiline() {
-            return this.isMultiline === true ? "multiline" : "";
-        },
-        isConfidential() {
-            return this.address.confidential;
-        },
+    showButtonDetails: {
+      default: true,
+      type: Boolean,
     },
+  },
+  setup() {
+    return { trans, ADDRESS_VALID_FROM, ADDRESS_VALID_TO };
+  },
+  computed: {
+    component() {
+      return this.isMultiline === true ? "div" : "span";
+    },
+    multiline() {
+      return this.isMultiline === true ? "multiline" : "";
+    },
+    isConfidential() {
+      return this.address.confidential;
+    },
+  },
 };
 </script>
 
 <style lang="scss" scoped>
 p {
-    &:after {
-        content: " ";
-        margin-right: 0.3em;
-    }
+  &:after {
+    content: " ";
+    margin-right: 0.3em;
+  }
 }
 </style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/GenderIconRenderBox.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/GenderIconRenderBox.vue
index 0579b4c5f..794771014 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/GenderIconRenderBox.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/GenderIconRenderBox.vue
@@ -1,28 +1,28 @@
 <template>
-    <i :class="['fa', genderClass, 'px-1']" />
+  <i :class="['fa', genderClass, 'px-1']" />
 </template>
 
 <script setup>
 import { computed } from "vue";
 const props = defineProps({
-    gender: {
-        type: Object,
-        required: true,
-    },
+  gender: {
+    type: Object,
+    required: true,
+  },
 });
 
 const genderClass = computed(() => {
-    switch (props.gender.genderTranslation) {
-        case "woman":
-            return "fa-venus";
-        case "man":
-            return "fa-mars";
-        case "both":
-            return "fa-neuter";
-        case "unknown":
-            return "fa-genderless";
-        default:
-            return "fa-genderless";
-    }
+  switch (props.gender.genderTranslation) {
+    case "woman":
+      return "fa-venus";
+    case "man":
+      return "fa-mars";
+    case "both":
+      return "fa-neuter";
+    case "unknown":
+      return "fa-genderless";
+    default:
+      return "fa-genderless";
+  }
 });
 </script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/UserGroupRenderBox.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/UserGroupRenderBox.vue
index 7c37e98a9..81f836c62 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/UserGroupRenderBox.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/UserGroupRenderBox.vue
@@ -4,23 +4,23 @@ import { computed } from "vue";
 import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
 
 interface UserGroupRenderBoxProps {
-    userGroup: UserGroup;
+  userGroup: UserGroup;
 }
 
 const props = defineProps<UserGroupRenderBoxProps>();
 
 const styles = computed<{ color: string; "background-color": string }>(() => {
-    return {
-        color: props.userGroup.foregroundColor,
-        "background-color": props.userGroup.backgroundColor,
-    };
+  return {
+    color: props.userGroup.foregroundColor,
+    "background-color": props.userGroup.backgroundColor,
+  };
 });
 </script>
 
 <template>
-    <span class="badge-user-group" :style="styles">{{
-        localizeString(userGroup.label)
-    }}</span>
+  <span class="badge-user-group" :style="styles">{{
+    localizeString(userGroup.label)
+  }}</span>
 </template>
 
 <style scoped lang="scss"></style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/UserRenderBoxBadge.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/UserRenderBoxBadge.vue
index 63c43c37f..4bae3b541 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/UserRenderBoxBadge.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/UserRenderBoxBadge.vue
@@ -1,31 +1,31 @@
 <template>
-    <span class="chill-entity entity-user">
-        {{ user.label }}
-        <span class="user-job" v-if="user.user_job !== null">
-            ({{ localizeString(user.user_job.label) }})</span
-        >
-        <span class="main-scope" v-if="user.main_scope !== null">
-            ({{ localizeString(user.main_scope.name) }})</span
-        >
-        <span
-            v-if="user.isAbsent"
-            class="badge bg-danger rounded-pill"
-            :title="Absent"
-            >A</span
-        >
-    </span>
+  <span class="chill-entity entity-user">
+    {{ user.label }}
+    <span class="user-job" v-if="user.user_job !== null">
+      ({{ localizeString(user.user_job.label) }})</span
+    >
+    <span class="main-scope" v-if="user.main_scope !== null">
+      ({{ localizeString(user.main_scope.name) }})</span
+    >
+    <span
+      v-if="user.isAbsent"
+      class="badge bg-danger rounded-pill"
+      :title="Absent"
+      >A</span
+    >
+  </span>
 </template>
 
 <script>
 import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
 
 export default {
-    name: "UserRenderBoxBadge",
-    methods: {
-        localizeString(label) {
-            return localizeString(label);
-        },
+  name: "UserRenderBoxBadge",
+  methods: {
+    localizeString(label) {
+      return localizeString(label);
     },
-    props: ["user"],
+  },
+  props: ["user"],
 };
 </script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/EntityWorkflowVueSubscriber.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/EntityWorkflowVueSubscriber.vue
index 332849ef5..4d817a2f9 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/EntityWorkflowVueSubscriber.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/EntityWorkflowVueSubscriber.vue
@@ -1,83 +1,83 @@
 <template>
-    <div class="d-grid gap-2 my-3">
-        <button
-            class="btn btn-misc"
-            type="button"
-            v-if="!subscriberFinal"
-            @click="subscribeTo('subscribe', 'final')"
-        >
-            <i class="fa fa-check fa-fw"></i>
-            {{ trans(WORKFLOW_SUBSCRIBE_FINAL) }}
-        </button>
-        <button
-            class="btn btn-misc"
-            type="button"
-            v-if="subscriberFinal"
-            @click="subscribeTo('unsubscribe', 'final')"
-        >
-            <i class="fa fa-times fa-fw"></i>
-            {{ trans(WORKFLOW_UNSUBSCRIBE_FINAL) }}
-        </button>
-        <button
-            class="btn btn-misc"
-            type="button"
-            v-if="!subscriberStep"
-            @click="subscribeTo('subscribe', 'step')"
-        >
-            <i class="fa fa-check fa-fw"></i>
-            {{ trans(WORKFLOW_SUBSCRIBE_ALL_STEPS) }}
-        </button>
-        <button
-            class="btn btn-misc"
-            type="button"
-            v-if="subscriberStep"
-            @click="subscribeTo('unsubscribe', 'step')"
-        >
-            <i class="fa fa-times fa-fw"></i>
-            {{ trans(WORKFLOW_UNSUBSCRIBE_ALL_STEPS) }}
-        </button>
-    </div>
+  <div class="d-grid gap-2 my-3">
+    <button
+      class="btn btn-misc"
+      type="button"
+      v-if="!subscriberFinal"
+      @click="subscribeTo('subscribe', 'final')"
+    >
+      <i class="fa fa-check fa-fw"></i>
+      {{ trans(WORKFLOW_SUBSCRIBE_FINAL) }}
+    </button>
+    <button
+      class="btn btn-misc"
+      type="button"
+      v-if="subscriberFinal"
+      @click="subscribeTo('unsubscribe', 'final')"
+    >
+      <i class="fa fa-times fa-fw"></i>
+      {{ trans(WORKFLOW_UNSUBSCRIBE_FINAL) }}
+    </button>
+    <button
+      class="btn btn-misc"
+      type="button"
+      v-if="!subscriberStep"
+      @click="subscribeTo('subscribe', 'step')"
+    >
+      <i class="fa fa-check fa-fw"></i>
+      {{ trans(WORKFLOW_SUBSCRIBE_ALL_STEPS) }}
+    </button>
+    <button
+      class="btn btn-misc"
+      type="button"
+      v-if="subscriberStep"
+      @click="subscribeTo('unsubscribe', 'step')"
+    >
+      <i class="fa fa-times fa-fw"></i>
+      {{ trans(WORKFLOW_UNSUBSCRIBE_ALL_STEPS) }}
+    </button>
+  </div>
 </template>
 
 <script setup>
 import { makeFetch } from "ChillMainAssets/lib/api/apiMethods.ts";
 import { defineProps, defineEmits } from "vue";
 import {
-    trans,
-    WORKFLOW_SUBSCRIBE_FINAL,
-    WORKFLOW_UNSUBSCRIBE_FINAL,
-    WORKFLOW_SUBSCRIBE_ALL_STEPS,
-    WORKFLOW_UNSUBSCRIBE_ALL_STEPS,
+  trans,
+  WORKFLOW_SUBSCRIBE_FINAL,
+  WORKFLOW_UNSUBSCRIBE_FINAL,
+  WORKFLOW_SUBSCRIBE_ALL_STEPS,
+  WORKFLOW_UNSUBSCRIBE_ALL_STEPS,
 } from "translator";
 
 // props
 const props = defineProps({
-    entityWorkflowId: {
-        type: Number,
-        required: true,
-    },
-    subscriberStep: {
-        type: Boolean,
-        required: true,
-    },
-    subscriberFinal: {
-        type: Boolean,
-        required: true,
-    },
+  entityWorkflowId: {
+    type: Number,
+    required: true,
+  },
+  subscriberStep: {
+    type: Boolean,
+    required: true,
+  },
+  subscriberFinal: {
+    type: Boolean,
+    required: true,
+  },
 });
 
 //methods
 const subscribeTo = (step, to) => {
-    let params = new URLSearchParams();
-    params.set("subscribe", to);
+  let params = new URLSearchParams();
+  params.set("subscribe", to);
 
-    const url =
-        `/api/1.0/main/workflow/${props.entityWorkflowId}/${step}?` +
-        params.toString();
+  const url =
+    `/api/1.0/main/workflow/${props.entityWorkflowId}/${step}?` +
+    params.toString();
 
-    makeFetch("POST", url).then((response) => {
-        emit("subscriptionUpdated", response);
-    });
+  makeFetch("POST", url).then((response) => {
+    emit("subscriptionUpdated", response);
+  });
 };
 
 // emit
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflow.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflow.vue
index ebcc5128c..30b2a81da 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflow.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflow.vue
@@ -1,143 +1,138 @@
 <template>
-    <div class="flex-table workflow" id="workflow-list">
-        <div
-            v-for="(w, i) in props.workflows"
-            :key="`workflow-${i}`"
-            class="item-bloc"
-        >
-            <div>
-                <div class="item-row col">
-                    <h2>{{ w.title }}</h2>
-                    <div class="flex-grow-1 ms-3 h3">
-                        <div class="visually-hidden">
-                            {{ w.relatedEntityClass }}
-                            {{ w.relatedEntityId }}
-                        </div>
-                    </div>
-                </div>
-
-                <div class="breadcrumb">
-                    <template v-for="(step, j) in w.steps" :key="`step-${j}`">
-                        <span
-                            class="mx-2"
-                            tabindex="0"
-                            data-bs-trigger="focus hover"
-                            data-bs-toggle="popover"
-                            data-bs-placement="bottom"
-                            data-bs-custom-class="workflow-transition"
-                            :title="getPopTitle(step)"
-                            :data-bs-content="getPopContent(step)"
-                        >
-                            <i
-                                v-if="step.currentStep.name === 'initial'"
-                                class="fa fa-circle me-1 text-chill-yellow"
-                            >
-                            </i>
-                            <i
-                                v-if="step.isFreezed"
-                                class="fa fa-snowflake-o fa-sm me-1"
-                            >
-                            </i>
-                            {{ step.currentStep.text }}
-                        </span>
-                        <span v-if="j !== Object.keys(w.steps).length - 1">
-                            →
-                        </span>
-                    </template>
-                </div>
-                <span
-                    v-if="w.isOnHoldAtCurrentStep"
-                    class="badge bg-success rounded-pill"
-                    >{{ trans(WORKFLOW_ON_HOLD) }}</span
-                >
-            </div>
-
-            <div class="item-row">
-                <div class="item-col flex-grow-1">
-                    <p v-if="isUserSubscribedToStep(w)">
-                        <i class="fa fa-check fa-fw"></i>
-                        {{ trans(WORKFLOW_YOU_SUBSCRIBED_TO_ALL_STEPS) }}
-                    </p>
-                    <p v-if="isUserSubscribedToFinal(w)">
-                        <i class="fa fa-check fa-fw"></i>
-                        {{ trans(WORKFLOW_YOU_SUBSCRIBED_TO_FINAL_STEP) }}
-                    </p>
-                </div>
-                <div class="item-col">
-                    <ul class="record_actions">
-                        <li>
-                            <a
-                                :href="goToUrl(w)"
-                                class="btn btn-sm btn-show"
-                                :title="trans(SEE)"
-                            ></a>
-                        </li>
-                    </ul>
-                </div>
+  <div class="flex-table workflow" id="workflow-list">
+    <div
+      v-for="(w, i) in props.workflows"
+      :key="`workflow-${i}`"
+      class="item-bloc"
+    >
+      <div>
+        <div class="item-row col">
+          <h2>{{ w.title }}</h2>
+          <div class="flex-grow-1 ms-3 h3">
+            <div class="visually-hidden">
+              {{ w.relatedEntityClass }}
+              {{ w.relatedEntityId }}
             </div>
+          </div>
         </div>
+
+        <div class="breadcrumb">
+          <template v-for="(step, j) in w.steps" :key="`step-${j}`">
+            <span
+              class="mx-2"
+              tabindex="0"
+              data-bs-trigger="focus hover"
+              data-bs-toggle="popover"
+              data-bs-placement="bottom"
+              data-bs-custom-class="workflow-transition"
+              :title="getPopTitle(step)"
+              :data-bs-content="getPopContent(step)"
+            >
+              <i
+                v-if="step.currentStep.name === 'initial'"
+                class="fa fa-circle me-1 text-chill-yellow"
+              >
+              </i>
+              <i v-if="step.isFreezed" class="fa fa-snowflake-o fa-sm me-1">
+              </i>
+              {{ step.currentStep.text }}
+            </span>
+            <span v-if="j !== Object.keys(w.steps).length - 1"> → </span>
+          </template>
+        </div>
+        <span
+          v-if="w.isOnHoldAtCurrentStep"
+          class="badge bg-success rounded-pill"
+          >{{ trans(WORKFLOW_ON_HOLD) }}</span
+        >
+      </div>
+
+      <div class="item-row">
+        <div class="item-col flex-grow-1">
+          <p v-if="isUserSubscribedToStep(w)">
+            <i class="fa fa-check fa-fw"></i>
+            {{ trans(WORKFLOW_YOU_SUBSCRIBED_TO_ALL_STEPS) }}
+          </p>
+          <p v-if="isUserSubscribedToFinal(w)">
+            <i class="fa fa-check fa-fw"></i>
+            {{ trans(WORKFLOW_YOU_SUBSCRIBED_TO_FINAL_STEP) }}
+          </p>
+        </div>
+        <div class="item-col">
+          <ul class="record_actions">
+            <li>
+              <a
+                :href="goToUrl(w)"
+                class="btn btn-sm btn-show"
+                :title="trans(SEE)"
+              ></a>
+            </li>
+          </ul>
+        </div>
+      </div>
     </div>
+  </div>
 </template>
 
 <script setup>
 import Popover from "bootstrap/js/src/popover";
 import { onMounted } from "vue";
 import {
-    trans,
-    BY_USER,
-    SEE,
-    WORKFLOW_YOU_SUBSCRIBED_TO_ALL_STEPS,
-    WORKFLOW_YOU_SUBSCRIBED_TO_FINAL_STEP,
-    WORKFLOW_ON_HOLD,
-    WORKFLOW_AT,
+  trans,
+  BY_USER,
+  SEE,
+  WORKFLOW_YOU_SUBSCRIBED_TO_ALL_STEPS,
+  WORKFLOW_YOU_SUBSCRIBED_TO_FINAL_STEP,
+  WORKFLOW_ON_HOLD,
+  WORKFLOW_AT,
 } from "translator";
 
 // props
 const props = defineProps({
-    workflows: {
-        type: Array,
-        required: true,
-    },
+  workflows: {
+    type: Array,
+    required: true,
+  },
 });
 
 // methods
 const goToUrl = (w) => `/fr/main/workflow/${w.id}/show`;
 const getPopTitle = (step) => {
-    if (step.transitionPrevious != null) {
-        //console.log(step.transitionPrevious.text);
-        let freezed = step.isFreezed
-            ? `<i class="fa fa-snowflake-o fa-sm me-1"></i>`
-            : ``;
-        return `${freezed}${step.transitionPrevious.text}`;
-    }
+  if (step.transitionPrevious != null) {
+    //console.log(step.transitionPrevious.text);
+    let freezed = step.isFreezed
+      ? `<i class="fa fa-snowflake-o fa-sm me-1"></i>`
+      : ``;
+    return `${freezed}${step.transitionPrevious.text}`;
+  }
 };
 const getPopContent = (step) => {
-    if (step.transitionPrevious != null) {
-        if (step.transitionPreviousBy !== null) {
-            return `<ul class="small_in_title">
+  if (step.transitionPrevious != null) {
+    if (step.transitionPreviousBy !== null) {
+      return `<ul class="small_in_title">
               <li><span class="item-key">${trans(BY_USER)} : </span><b>${step.transitionPreviousBy.text}</b></li>
               <li><span class="item-key">${trans(WORKFLOW_AT)} : </span><b>${formatDate(step.transitionPreviousAt.datetime)}</b></li>
               </ul>`;
-        } else {
-            return `<ul class="small_in_title">
+    } else {
+      return `<ul class="small_in_title">
                       <li><span class="item-key">${trans(WORKFLOW_AT)} : </span><b>${formatDate(step.transitionPreviousAt.datetime)}</b></li>
                   </ul>`;
-        }
     }
+  }
 };
 const formatDate = (datetime) =>
-    datetime.split("T")[0] + " " + datetime.split("T")[1].substring(0, 5);
+  datetime.split("T")[0] + " " + datetime.split("T")[1].substring(0, 5);
 const isUserSubscribedToStep = () => false;
 const isUserSubscribedToFinal = () => false;
 
 onMounted(() => {
-    const triggerList = [].slice.call(
-        document.querySelectorAll('[data-bs-toggle="popover"]'),
-    );
-    triggerList.map(function (el) {
-        return new Popover(el, {
-            html: true,
-        });
+  const triggerList = [].slice.call(
+    document.querySelectorAll('[data-bs-toggle="popover"]'),
+  );
+  triggerList.map(function (el) {
+    return new Popover(el, {
+      html: true,
     });
+  });
 });
 </script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflowModal.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflowModal.vue
index 59dcd80f4..658c0f9e9 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflowModal.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/ListWorkflowModal.vue
@@ -1,49 +1,45 @@
 <template>
-    <Pick-workflow
-        :relatedEntityClass="props.relatedEntityClass"
-        :relatedEntityId="props.relatedEntityId"
-        :workflowsAvailables="props.workflowsAvailables"
-        :preventDefaultMoveToGenerate="props.preventDefaultMoveToGenerate"
-        :goToGenerateWorkflowPayload="props.goToGenerateWorkflowPayload"
-        :countExistingWorkflows="countWorkflows"
-        :embedded-within-list-modal="false"
-        @go-to-generate-workflow="goToGenerateWorkflow"
-        @click-open-list="openModal"
-    ></Pick-workflow>
+  <Pick-workflow
+    :relatedEntityClass="props.relatedEntityClass"
+    :relatedEntityId="props.relatedEntityId"
+    :workflowsAvailables="props.workflowsAvailables"
+    :preventDefaultMoveToGenerate="props.preventDefaultMoveToGenerate"
+    :goToGenerateWorkflowPayload="props.goToGenerateWorkflowPayload"
+    :countExistingWorkflows="countWorkflows"
+    :embedded-within-list-modal="false"
+    @go-to-generate-workflow="goToGenerateWorkflow"
+    @click-open-list="openModal"
+  ></Pick-workflow>
 
-    <teleport to="body">
-        <Modal
-            v-if="modal.showModal"
-            :modalDialogClass="modal.modalDialogClass"
-            @close="modal.showModal = false"
-        >
-            <template v-slot:header>
-                <h2 class="modal-title">{{ trans(WORKFLOW_LIST) }}</h2>
-            </template>
+  <teleport to="body">
+    <Modal
+      v-if="modal.showModal"
+      :modalDialogClass="modal.modalDialogClass"
+      @close="modal.showModal = false"
+    >
+      <template v-slot:header>
+        <h2 class="modal-title">{{ trans(WORKFLOW_LIST) }}</h2>
+      </template>
 
-            <template v-slot:body>
-                <list-workflow-vue :workflows="workflows"></list-workflow-vue>
-            </template>
+      <template v-slot:body>
+        <list-workflow-vue :workflows="workflows"></list-workflow-vue>
+      </template>
 
-            <template v-slot:footer>
-                <pick-workflow
-                    v-if="allowCreate"
-                    :relatedEntityClass="props.relatedEntityClass"
-                    :relatedEntityId="props.relatedEntityId"
-                    :workflowsAvailables="props.workflowsAvailables"
-                    :preventDefaultMoveToGenerate="
-                        props.preventDefaultMoveToGenerate
-                    "
-                    :goToGenerateWorkflowPayload="
-                        props.goToGenerateWorkflowPayload
-                    "
-                    :countExistingWorkflows="countWorkflows"
-                    :embedded-within-list-modal="true"
-                    @go-to-generate-workflow="goToGenerateWorkflow"
-                ></pick-workflow>
-            </template>
-        </Modal>
-    </teleport>
+      <template v-slot:footer>
+        <pick-workflow
+          v-if="allowCreate"
+          :relatedEntityClass="props.relatedEntityClass"
+          :relatedEntityId="props.relatedEntityId"
+          :workflowsAvailables="props.workflowsAvailables"
+          :preventDefaultMoveToGenerate="props.preventDefaultMoveToGenerate"
+          :goToGenerateWorkflowPayload="props.goToGenerateWorkflowPayload"
+          :countExistingWorkflows="countWorkflows"
+          :embedded-within-list-modal="true"
+          @go-to-generate-workflow="goToGenerateWorkflow"
+        ></pick-workflow>
+      </template>
+    </Modal>
+  </teleport>
 </template>
 
 <script setup>
@@ -55,35 +51,35 @@ import { trans, WORKFLOW_LIST } from "translator";
 
 // Define props
 const props = defineProps({
-    workflows: {
-        type: Array,
-        required: true,
-    },
-    allowCreate: {
-        type: Boolean,
-        required: true,
-    },
-    relatedEntityClass: {
-        type: String,
-        required: true,
-    },
-    relatedEntityId: {
-        type: Number,
-        required: false,
-    },
-    workflowsAvailables: {
-        type: Array,
-        required: true,
-    },
-    preventDefaultMoveToGenerate: {
-        type: Boolean,
-        required: false,
-        default: false,
-    },
-    goToGenerateWorkflowPayload: {
-        required: false,
-        default: () => ({}),
-    },
+  workflows: {
+    type: Array,
+    required: true,
+  },
+  allowCreate: {
+    type: Boolean,
+    required: true,
+  },
+  relatedEntityClass: {
+    type: String,
+    required: true,
+  },
+  relatedEntityId: {
+    type: Number,
+    required: false,
+  },
+  workflowsAvailables: {
+    type: Array,
+    required: true,
+  },
+  preventDefaultMoveToGenerate: {
+    type: Boolean,
+    required: false,
+    default: false,
+  },
+  goToGenerateWorkflowPayload: {
+    required: false,
+    default: () => ({}),
+  },
 });
 
 // Define emits
@@ -91,8 +87,8 @@ const emit = defineEmits(["goToGenerateWorkflow"]);
 
 // Reactive data
 const modal = ref({
-    showModal: false,
-    modalDialogClass: "modal-dialog-scrollable modal-xl",
+  showModal: false,
+  modalDialogClass: "modal-dialog-scrollable modal-xl",
 });
 
 // Computed properties
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/PickWorkflow.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/PickWorkflow.vue
index f82a6fd33..7f26ab40b 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/PickWorkflow.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/PickWorkflow.vue
@@ -1,89 +1,82 @@
 <template>
-    <template v-if="props.workflowsAvailables.length >= 1">
-        <div
-            v-if="countExistingWorkflows == 0 || embeddedWithinListModal"
-            class="dropdown d-grid gap-2"
+  <template v-if="props.workflowsAvailables.length >= 1">
+    <div
+      v-if="countExistingWorkflows == 0 || embeddedWithinListModal"
+      class="dropdown d-grid gap-2"
+    >
+      <button
+        class="btn btn-primary dropdown-toggle"
+        type="button"
+        id="createWorkflowButton"
+        data-bs-toggle="dropdown"
+        aria-expanded="false"
+      >
+        Créer un workflow
+      </button>
+      <ul class="dropdown-menu" aria-labelledby="createWorkflowButton">
+        <li v-for="w in props.workflowsAvailables" :key="w.name">
+          <button
+            class="dropdown-item"
+            type="button"
+            @click.prevent="goToGenerateWorkflow($event, w.name)"
+          >
+            {{ w.text }}
+          </button>
+        </li>
+      </ul>
+    </div>
+    <div v-else>
+      <div class="btn-group">
+        <button @click="emit('clickOpenList')" class="btn btn-primary">
+          <template v-if="countExistingWorkflows === 1">
+            1 workflow associé
+          </template>
+          <template v-else>
+            {{ countExistingWorkflows }} workflows associés
+          </template>
+        </button>
+        <button
+          class="btn btn-primary dropdown-toggle dropdown-toggle-split"
+          type="button"
+          id="createWorkflowButton"
+          data-bs-toggle="dropdown"
+          aria-expanded="false"
         >
+          <span class="visually-hidden">Liste des workflows disponibles</span>
+        </button>
+        <ul class="dropdown-menu" aria-labelledby="createWorkflowButton">
+          <li v-for="w in props.workflowsAvailables" :key="w.name">
             <button
-                class="btn btn-primary dropdown-toggle"
-                type="button"
-                id="createWorkflowButton"
-                data-bs-toggle="dropdown"
-                aria-expanded="false"
+              class="dropdown-item"
+              type="button"
+              @click.prevent="goToGenerateWorkflow($event, w.name)"
             >
-                Créer un workflow
+              {{ w.text }}
             </button>
-            <ul class="dropdown-menu" aria-labelledby="createWorkflowButton">
-                <li v-for="w in props.workflowsAvailables" :key="w.name">
-                    <button
-                        class="dropdown-item"
-                        type="button"
-                        @click.prevent="goToGenerateWorkflow($event, w.name)"
-                    >
-                        {{ w.text }}
-                    </button>
-                </li>
-            </ul>
-        </div>
-        <div v-else>
-            <div class="btn-group">
-                <button @click="emit('clickOpenList')" class="btn btn-primary">
-                    <template v-if="countExistingWorkflows === 1">
-                        1 workflow associé
-                    </template>
-                    <template v-else>
-                        {{ countExistingWorkflows }} workflows associés
-                    </template>
-                </button>
-                <button
-                    class="btn btn-primary dropdown-toggle dropdown-toggle-split"
-                    type="button"
-                    id="createWorkflowButton"
-                    data-bs-toggle="dropdown"
-                    aria-expanded="false"
-                >
-                    <span class="visually-hidden"
-                        >Liste des workflows disponibles</span
-                    >
-                </button>
-                <ul
-                    class="dropdown-menu"
-                    aria-labelledby="createWorkflowButton"
-                >
-                    <li v-for="w in props.workflowsAvailables" :key="w.name">
-                        <button
-                            class="dropdown-item"
-                            type="button"
-                            @click.prevent="
-                                goToGenerateWorkflow($event, w.name)
-                            "
-                        >
-                            {{ w.text }}
-                        </button>
-                    </li>
-                </ul>
-            </div>
-        </div>
-    </template>
-    <template v-else>
-        <div v-if="countExistingWorkflows > 0" class="dropdown d-grid gap-2">
-            <button
-                @click="emit('clickOpenList')"
-                class="btn btn-primary"
-                type="button"
-                id="createWorkflowButton"
-                data-bs-toggle="dropdown"
-                aria-expanded="false"
-            >
-                <template v-if="countExistingWorkflows === 1">
-                    1 workflow associé
-                </template>
-                <template v-else>
-                    {{ countExistingWorkflows }} workflows associés
-                </template>
-            </button>
-        </div>
-    </template>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </template>
+  <template v-else>
+    <div v-if="countExistingWorkflows > 0" class="dropdown d-grid gap-2">
+      <button
+        @click="emit('clickOpenList')"
+        class="btn btn-primary"
+        type="button"
+        id="createWorkflowButton"
+        data-bs-toggle="dropdown"
+        aria-expanded="false"
+      >
+        <template v-if="countExistingWorkflows === 1">
+          1 workflow associé
+        </template>
+        <template v-else>
+          {{ countExistingWorkflows }} workflows associés
+        </template>
+      </button>
+    </div>
+  </template>
 </template>
 
 <script setup lang="ts">
@@ -91,85 +84,85 @@ import { buildLinkCreate } from "../../../lib/entity-workflow/api";
 import { WorkflowAvailable } from "../../../types";
 
 interface PickWorkflowConfig {
-    relatedEntityClass: string;
-    /**
-     * Represents the identifier of a related entity.
-     * This variable can store either a numerical value representing the entity's ID or an undefined value
-     * if the related entity is not specified or available, for instance when the entity is created within
-     * the interface and the id will be available later
-     */
-    relatedEntityId: number | undefined;
-    workflowsAvailables: WorkflowAvailable[];
-    preventDefaultMoveToGenerate: boolean;
-    goToGenerateWorkflowPayload: object;
-    countExistingWorkflows: number;
-    /**
-     * if true, this button will not present a splitted button
-     */
-    embeddedWithinListModal: boolean;
+  relatedEntityClass: string;
+  /**
+   * Represents the identifier of a related entity.
+   * This variable can store either a numerical value representing the entity's ID or an undefined value
+   * if the related entity is not specified or available, for instance when the entity is created within
+   * the interface and the id will be available later
+   */
+  relatedEntityId: number | undefined;
+  workflowsAvailables: WorkflowAvailable[];
+  preventDefaultMoveToGenerate: boolean;
+  goToGenerateWorkflowPayload: object;
+  countExistingWorkflows: number;
+  /**
+   * if true, this button will not present a splitted button
+   */
+  embeddedWithinListModal: boolean;
 }
 
 const props = withDefaults(defineProps<PickWorkflowConfig>(), {
-    preventDefaultMoveToGenerate: false,
-    goToGenerateWorkflowPayload: {},
-    allowCreateWorkflow: false,
+  preventDefaultMoveToGenerate: false,
+  goToGenerateWorkflowPayload: {},
+  allowCreateWorkflow: false,
 });
 
 const emit = defineEmits<{
-    (
-        e: "goToGenerateWorkflow",
-        {
-            event: MouseEvent,
-            workflowName: string,
-            isLinkValid: boolean,
-            link: string,
-            payload: object,
-        },
-    ): void;
-    (e: "clickOpenList"): void;
+  (
+    e: "goToGenerateWorkflow",
+    {
+      event: MouseEvent,
+      workflowName: string,
+      isLinkValid: boolean,
+      link: string,
+      payload: object,
+    },
+  ): void;
+  (e: "clickOpenList"): void;
 }>();
 
 const makeLink = (workflowName: string): string =>
-    buildLinkCreate(
-        workflowName,
-        props.relatedEntityClass,
-        props.relatedEntityId,
-    );
+  buildLinkCreate(
+    workflowName,
+    props.relatedEntityClass,
+    props.relatedEntityId,
+  );
 
 const goToGenerateWorkflow = (
-    event: MouseEvent,
-    workflowName: string,
+  event: MouseEvent,
+  workflowName: string,
 ): void => {
-    console.log("goToGenerateWorkflow", event, workflowName);
-    let link = "";
-    let isLinkValid = false;
+  console.log("goToGenerateWorkflow", event, workflowName);
+  let link = "";
+  let isLinkValid = false;
 
-    try {
-        link = makeLink(workflowName);
-        isLinkValid = true;
-    } catch (e) {
-        console.info(
-            "could not generate link to create workflow, maybe the relatedEntityId is not yet known",
-            e,
-        );
-    }
+  try {
+    link = makeLink(workflowName);
+    isLinkValid = true;
+  } catch (e) {
+    console.info(
+      "could not generate link to create workflow, maybe the relatedEntityId is not yet known",
+      e,
+    );
+  }
 
-    if (!props.preventDefaultMoveToGenerate) {
-        window.location.assign(link);
-    }
+  if (!props.preventDefaultMoveToGenerate) {
+    window.location.assign(link);
+  }
 
-    emit("goToGenerateWorkflow", {
-        event,
-        workflowName,
-        link,
-        isLinkValid,
-        payload: props.goToGenerateWorkflowPayload,
-    });
+  emit("goToGenerateWorkflow", {
+    event,
+    workflowName,
+    link,
+    isLinkValid,
+    payload: props.goToGenerateWorkflowPayload,
+  });
 };
 
 const goToDuplicateRelatedEntity = (
-    event: MouseEvent,
-    workflowName: string,
+  event: MouseEvent,
+  workflowName: string,
 ): void => {};
 </script>
 
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
index 9350fc897..4808e2bda 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
@@ -1,42 +1,39 @@
 <template>
-    <transition name="modal">
-        <div class="modal-mask" v-if="show">
-            <!-- :: styles bootstrap :: -->
-            <div
-                class="modal fade show"
-                style="display: block"
-                aria-modal="true"
-                role="dialog"
-            >
-                <div class="modal-dialog" :class="modalDialogClass || {}">
-                    <div class="modal-content">
-                        <div class="modal-header">
-                            <slot name="header"></slot>
-                            <button class="close btn" @click="emits('close')">
-                                <i class="fa fa-times" aria-hidden="true"></i>
-                            </button>
-                        </div>
-                        <div class="modal-body">
-                            <div class="body-head">
-                                <slot name="body-head"></slot>
-                            </div>
-                            <slot name="body"></slot>
-                        </div>
-                        <div class="modal-footer" v-if="!hideFooter">
-                            <button
-                                class="btn btn-cancel"
-                                @click="emits('close')"
-                            >
-                                {{ trans(MODAL_ACTION_CLOSE) }}
-                            </button>
-                            <slot name="footer"></slot>
-                        </div>
-                    </div>
-                </div>
+  <transition name="modal">
+    <div class="modal-mask" v-if="show">
+      <!-- :: styles bootstrap :: -->
+      <div
+        class="modal fade show"
+        style="display: block"
+        aria-modal="true"
+        role="dialog"
+      >
+        <div class="modal-dialog" :class="modalDialogClass || {}">
+          <div class="modal-content">
+            <div class="modal-header">
+              <slot name="header"></slot>
+              <button class="close btn" @click="emits('close')">
+                <i class="fa fa-times" aria-hidden="true"></i>
+              </button>
             </div>
-            <!-- :: end styles bootstrap :: -->
+            <div class="modal-body">
+              <div class="body-head">
+                <slot name="body-head"></slot>
+              </div>
+              <slot name="body"></slot>
+            </div>
+            <div class="modal-footer" v-if="!hideFooter">
+              <button class="btn btn-cancel" @click="emits('close')">
+                {{ trans(MODAL_ACTION_CLOSE) }}
+              </button>
+              <slot name="footer"></slot>
+            </div>
+          </div>
         </div>
-    </transition>
+      </div>
+      <!-- :: end styles bootstrap :: -->
+    </div>
+  </transition>
 </template>
 
 <script lang="ts" setup>
@@ -53,27 +50,27 @@ import { trans, MODAL_ACTION_CLOSE } from "translator";
 import { defineProps } from "vue";
 
 export interface ModalProps {
-    modalDialogClass: string;
-    hideFooter: boolean;
+  modalDialogClass: string;
+  hideFooter: boolean;
 }
 
 defineProps({
-    modalDialogClass: {
-        type: String,
-        default: "",
-    },
-    hideFooter: {
-        type: Boolean,
-        default: false,
-    },
-    show: {
-        type: Boolean,
-        default: true,
-    },
+  modalDialogClass: {
+    type: String,
+    default: "",
+  },
+  hideFooter: {
+    type: Boolean,
+    default: false,
+  },
+  show: {
+    type: Boolean,
+    default: true,
+  },
 });
 
 const emits = defineEmits<{
-    close: [];
+  close: [];
 }>();
 </script>
 
@@ -82,17 +79,17 @@ const emits = defineEmits<{
     * This is a mask behind the modal.
     */
 .modal-mask {
-    position: fixed;
-    z-index: 9998;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    background-color: rgba(0, 0, 0, 0.75);
-    transition: opacity 0.3s ease;
+  position: fixed;
+  z-index: 9998;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(0, 0, 0, 0.75);
+  transition: opacity 0.3s ease;
 }
 .modal-header .close {
-    border-top-right-radius: 0.3rem;
+  border-top-right-radius: 0.3rem;
 }
 /*
    * The following styles are auto-applied to elements with
@@ -103,23 +100,23 @@ const emits = defineEmits<{
    * these styles.
    */
 .modal-enter {
-    opacity: 0;
+  opacity: 0;
 }
 .modal-leave-active {
-    opacity: 0;
+  opacity: 0;
 }
 .modal-enter .modal-container,
 .modal-leave-active .modal-container {
-    -webkit-transform: scale(1.1);
-    transform: scale(1.1);
+  -webkit-transform: scale(1.1);
+  transform: scale(1.1);
 }
 h3.modal-title {
-    font-size: 1.5rem;
-    font-weight: bold;
+  font-size: 1.5rem;
+  font-weight: bold;
 }
 div.modal-footer {
-    button:first-child {
-        margin-right: auto;
-    }
+  button:first-child {
+    margin-right: auto;
+  }
 }
 </style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Notification/NotificationReadAllToggle.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Notification/NotificationReadAllToggle.vue
index 57f7fd7f8..bb7a43c92 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Notification/NotificationReadAllToggle.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Notification/NotificationReadAllToggle.vue
@@ -1,17 +1,17 @@
 <template>
-    <div>
-        <button
-            v-if="idsMarkedAsRead.length === 0"
-            class="btn btn-primary"
-            type="button"
-            @click="markAllRead"
-        >
-            <i class="fa fa-sm fa-envelope-open-o"></i> Marquer tout comme lu
-        </button>
-        <button v-else class="btn btn-primary" type="button" @click="undo">
-            <i class="fa fa-sm fa-envelope-open-o"></i> Annuler
-        </button>
-    </div>
+  <div>
+    <button
+      v-if="idsMarkedAsRead.length === 0"
+      class="btn btn-primary"
+      type="button"
+      @click="markAllRead"
+    >
+      <i class="fa fa-sm fa-envelope-open-o"></i> Marquer tout comme lu
+    </button>
+    <button v-else class="btn btn-primary" type="button" @click="undo">
+      <i class="fa fa-sm fa-envelope-open-o"></i> Annuler
+    </button>
+  </div>
 </template>
 
 <script lang="ts" setup>
@@ -19,36 +19,36 @@ import { makeFetch } from "../../../lib/api/apiMethods";
 import { ref } from "vue";
 
 const emit = defineEmits<{
-    (e: "markAsRead", id: number): void;
-    (e: "markAsUnRead", id: number): void;
+  (e: "markAsRead", id: number): void;
+  (e: "markAsUnRead", id: number): void;
 }>();
 
 const idsMarkedAsRead = ref([] as number[]);
 
 async function markAllRead() {
-    const ids: number[] = await makeFetch(
-        "POST",
-        `/api/1.0/main/notification/mark/allread`,
-        null,
-    );
-    for (let i of ids) {
-        idsMarkedAsRead.value.push(i);
-        emit("markAsRead", i);
-    }
+  const ids: number[] = await makeFetch(
+    "POST",
+    `/api/1.0/main/notification/mark/allread`,
+    null,
+  );
+  for (let i of ids) {
+    idsMarkedAsRead.value.push(i);
+    emit("markAsRead", i);
+  }
 }
 
 async function undo() {
-    const touched: number[] = await makeFetch(
-        "POST",
-        `/api/1.0/main/notification/mark/undoallread`,
-        idsMarkedAsRead.value,
-    );
-    while (idsMarkedAsRead.value.length > 0) {
-        idsMarkedAsRead.value.pop();
-    }
-    for (let t of touched) {
-        emit("markAsUnRead", t);
-    }
+  const touched: number[] = await makeFetch(
+    "POST",
+    `/api/1.0/main/notification/mark/undoallread`,
+    idsMarkedAsRead.value,
+  );
+  while (idsMarkedAsRead.value.length > 0) {
+    idsMarkedAsRead.value.pop();
+  }
+  for (let t of touched) {
+    emit("markAsUnRead", t);
+  }
 }
 </script>
 
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Notification/NotificationReadToggle.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Notification/NotificationReadToggle.vue
index cc64d4835..fb94af80f 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Notification/NotificationReadToggle.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Notification/NotificationReadToggle.vue
@@ -1,96 +1,96 @@
 <template>
-    <div
-        :class="{ 'btn-group btn-group-sm float-end': isButtonGroup }"
-        role="group"
-        aria-label="Notification actions"
+  <div
+    :class="{ 'btn-group btn-group-sm float-end': isButtonGroup }"
+    role="group"
+    aria-label="Notification actions"
+  >
+    <button
+      v-if="isRead"
+      class="btn"
+      :class="overrideClass"
+      type="button"
+      :title="trans(NOTIFICATION_MARK_AS_UNREAD)"
+      @click="markAsUnread"
     >
-        <button
-            v-if="isRead"
-            class="btn"
-            :class="overrideClass"
-            type="button"
-            :title="trans(NOTIFICATION_MARK_AS_UNREAD)"
-            @click="markAsUnread"
-        >
-            <i class="fa fa-sm fa-envelope-o"></i>
-            <span v-if="!props.buttonNoText" class="ps-2">
-                {{ trans(NOTIFICATION_MARK_AS_UNREAD) }}
-            </span>
-        </button>
+      <i class="fa fa-sm fa-envelope-o"></i>
+      <span v-if="!props.buttonNoText" class="ps-2">
+        {{ trans(NOTIFICATION_MARK_AS_UNREAD) }}
+      </span>
+    </button>
 
-        <button
-            v-if="!isRead"
-            class="btn"
-            :class="overrideClass"
-            type="button"
-            :title="trans(NOTIFICATION_MARK_AS_READ)"
-            @click="markAsRead"
-        >
-            <i class="fa fa-sm fa-envelope-open-o"></i>
-            <span v-if="!buttonNoText" class="ps-2">
-                {{ trans(NOTIFICATION_MARK_AS_READ) }}
-            </span>
-        </button>
+    <button
+      v-if="!isRead"
+      class="btn"
+      :class="overrideClass"
+      type="button"
+      :title="trans(NOTIFICATION_MARK_AS_READ)"
+      @click="markAsRead"
+    >
+      <i class="fa fa-sm fa-envelope-open-o"></i>
+      <span v-if="!buttonNoText" class="ps-2">
+        {{ trans(NOTIFICATION_MARK_AS_READ) }}
+      </span>
+    </button>
 
-        <a
-            v-if="isButtonGroup"
-            type="button"
-            class="btn btn-outline-primary"
-            :href="showUrl"
-            :title="trans(SEE)"
-        >
-            <i class="fa fa-sm fa-comment-o"></i>
-        </a>
+    <a
+      v-if="isButtonGroup"
+      type="button"
+      class="btn btn-outline-primary"
+      :href="showUrl"
+      :title="trans(SEE)"
+    >
+      <i class="fa fa-sm fa-comment-o"></i>
+    </a>
 
-        <!-- "Mark All Read" button -->
-        <button
-            v-if="showMarkAllButton"
-            class="btn"
-            :class="overrideClass"
-            type="button"
-            :title="$t('markAllRead')"
-            @click="markAllRead"
-        >
-            <i class="fa fa-sm fa-envelope-o"></i>
-            <span v-if="!buttonNoText" class="ps-2">
-                {{ $t("markAllRead") }}
-            </span>
-        </button>
-    </div>
+    <!-- "Mark All Read" button -->
+    <button
+      v-if="showMarkAllButton"
+      class="btn"
+      :class="overrideClass"
+      type="button"
+      :title="$t('markAllRead')"
+      @click="markAllRead"
+    >
+      <i class="fa fa-sm fa-envelope-o"></i>
+      <span v-if="!buttonNoText" class="ps-2">
+        {{ $t("markAllRead") }}
+      </span>
+    </button>
+  </div>
 </template>
 
 <script setup>
 import { computed } from "vue";
 import { makeFetch } from "ChillMainAssets/lib/api/apiMethods.ts";
 import {
-    trans,
-    NOTIFICATION_MARK_AS_READ,
-    NOTIFICATION_MARK_AS_UNREAD,
-    SEE,
+  trans,
+  NOTIFICATION_MARK_AS_READ,
+  NOTIFICATION_MARK_AS_UNREAD,
+  SEE,
 } from "translator";
 
 // Props
 const props = defineProps({
-    isRead: {
-        type: Boolean,
-        required: true,
-    },
-    notificationId: {
-        type: Number,
-        required: true,
-    },
-    buttonClass: {
-        type: String,
-        required: false,
-    },
-    buttonNoText: {
-        type: Boolean,
-        required: false,
-    },
-    showUrl: {
-        type: String,
-        required: false,
-    },
+  isRead: {
+    type: Boolean,
+    required: true,
+  },
+  notificationId: {
+    type: Number,
+    required: true,
+  },
+  buttonClass: {
+    type: String,
+    required: false,
+  },
+  buttonNoText: {
+    type: Boolean,
+    required: false,
+  },
+  showUrl: {
+    type: String,
+    required: false,
+  },
 });
 
 // Emits
@@ -102,23 +102,23 @@ const isButtonGroup = computed(() => props.showUrl);
 
 // Methods
 const markAsUnread = () => {
-    makeFetch(
-        "POST",
-        `/api/1.0/main/notification/${props.notificationId}/mark/unread`,
-        [],
-    ).then(() => {
-        emit("markRead", { notificationId: props.notificationId });
-    });
+  makeFetch(
+    "POST",
+    `/api/1.0/main/notification/${props.notificationId}/mark/unread`,
+    [],
+  ).then(() => {
+    emit("markRead", { notificationId: props.notificationId });
+  });
 };
 
 const markAsRead = () => {
-    makeFetch(
-        "POST",
-        `/api/1.0/main/notification/${props.notificationId}/mark/read`,
-        [],
-    ).then(() => {
-        emit("markUnread", { notificationId: props.notificationId });
-    });
+  makeFetch(
+    "POST",
+    `/api/1.0/main/notification/${props.notificationId}/mark/read`,
+    [],
+  ).then(() => {
+    emit("markUnread", { notificationId: props.notificationId });
+  });
 };
 </script>
 
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.ts b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.ts
index db9a37104..cbee6bf25 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.ts
@@ -2,87 +2,86 @@ import { createI18n } from "vue-i18n";
 import datetimeFormats from "../i18n/datetimeFormats";
 
 const messages = {
-    fr: {
-        action: {
-            actions: "Actions",
-            show: "Voir",
-            edit: "Modifier",
-            create: "Créer",
-            remove: "Enlever",
-            delete: "Supprimer",
-            save: "Enregistrer",
-            valid: "Valider",
-            valid_and_see: "Valider et voir",
-            add: "Ajouter",
-            show_modal: "Ouvrir une modale",
-            ok: "OK",
-            cancel: "Annuler",
-            close: "Fermer",
-            back: "Retour",
-            check_all: "cocher tout",
-            reset: "réinitialiser",
-            redirect: {
-                person: "Quitter la page et ouvrir la fiche de l'usager",
-                thirdparty: "Quitter la page et voir le tiers",
-            },
-            refresh: "Rafraîchir",
-            addContact: "Ajouter un contact",
-        },
-        nav: {
-            next: "Suivant",
-            previous: "Précédent",
-            top: "Haut",
-            bottom: "Bas",
-        },
-        renderbox: {
-            person: "Usager",
-            birthday: {
-                man: "Né le",
-                woman: "Née le",
-                neutral: "Né·e le",
-                unknown: "Né·e le",
-            },
-            deathdate: "Date de décès",
-            household_without_address: "Le ménage de l'usager est sans adresse",
-            no_data: "Aucune information renseignée",
-            type: {
-                thirdparty: "Tiers",
-                person: "Usager",
-            },
-            holder: "Titulaire",
-            years_old: "1 an | {n} an | {n} ans",
-            residential_address: "Adresse de résidence",
-            located_at: "réside chez",
-        },
+  fr: {
+    action: {
+      actions: "Actions",
+      show: "Voir",
+      edit: "Modifier",
+      create: "Créer",
+      remove: "Enlever",
+      delete: "Supprimer",
+      save: "Enregistrer",
+      valid: "Valider",
+      valid_and_see: "Valider et voir",
+      add: "Ajouter",
+      show_modal: "Ouvrir une modale",
+      ok: "OK",
+      cancel: "Annuler",
+      close: "Fermer",
+      back: "Retour",
+      check_all: "cocher tout",
+      reset: "réinitialiser",
+      redirect: {
+        person: "Quitter la page et ouvrir la fiche de l'usager",
+        thirdparty: "Quitter la page et voir le tiers",
+      },
+      refresh: "Rafraîchir",
+      addContact: "Ajouter un contact",
     },
+    nav: {
+      next: "Suivant",
+      previous: "Précédent",
+      top: "Haut",
+      bottom: "Bas",
+    },
+    renderbox: {
+      person: "Usager",
+      birthday: {
+        man: "Né le",
+        woman: "Née le",
+        neutral: "Né·e le",
+        unknown: "Né·e le",
+      },
+      deathdate: "Date de décès",
+      household_without_address: "Le ménage de l'usager est sans adresse",
+      no_data: "Aucune information renseignée",
+      type: {
+        thirdparty: "Tiers",
+        person: "Usager",
+      },
+      holder: "Titulaire",
+      years_old: "1 an | {n} an | {n} ans",
+      residential_address: "Adresse de résidence",
+      located_at: "réside chez",
+    },
+  },
 };
 
 const _createI18n = (appMessages: any, legacy?: boolean) => {
-    Object.assign(messages.fr, appMessages.fr);
-    return createI18n({
-        legacy: typeof legacy === undefined ? true : legacy,
-        locale: "fr",
-        fallbackLocale: "fr",
-        // @ts-ignore
-        datetimeFormats,
-        messages,
-    });
+  Object.assign(messages.fr, appMessages.fr);
+  return createI18n({
+    legacy: typeof legacy === undefined ? true : legacy,
+    locale: "fr",
+    fallbackLocale: "fr",
+    // @ts-ignore
+    datetimeFormats,
+    messages,
+  });
 };
 
 export { _createI18n };
 
 export const multiSelectMessages = {
-    fr: {
-        multiselect: {
-            placeholder: "Choisir",
-            tag_placeholder: "Créer un nouvel élément",
-            select_label: '"Entrée" ou cliquez pour sélectionner',
-            deselect_label: '"Entrée" ou cliquez pour désélectionner',
-            select_group_label:
-                'Appuyer sur "Entrée" pour sélectionner ce groupe',
-            deselect_group_label:
-                'Appuyer sur "Entrée" pour désélectionner ce groupe',
-            selected_label: "Sélectionné",
-        },
+  fr: {
+    multiselect: {
+      placeholder: "Choisir",
+      tag_placeholder: "Créer un nouvel élément",
+      select_label: '"Entrée" ou cliquez pour sélectionner',
+      deselect_label: '"Entrée" ou cliquez pour désélectionner',
+      select_group_label: 'Appuyer sur "Entrée" pour sélectionner ce groupe',
+      deselect_group_label:
+        'Appuyer sur "Entrée" pour désélectionner ce groupe',
+      selected_label: "Sélectionné",
     },
+  },
 };
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/i18n/datetimeFormats.ts b/src/Bundle/ChillMainBundle/Resources/public/vuejs/i18n/datetimeFormats.ts
index fe20cb217..aca1328ac 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/i18n/datetimeFormats.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/i18n/datetimeFormats.ts
@@ -1,27 +1,27 @@
 export default {
-    fr: {
-        short: {
-            year: "numeric",
-            month: "numeric",
-            day: "numeric",
-        },
-        text: {
-            year: "numeric",
-            month: "long",
-            day: "numeric",
-        },
-        long: {
-            year: "numeric",
-            month: "numeric",
-            day: "numeric",
-            hour: "numeric",
-            minute: "numeric",
-            hour12: false,
-        },
-        hoursOnly: {
-            hour: "numeric",
-            minute: "numeric",
-            hour12: false,
-        },
+  fr: {
+    short: {
+      year: "numeric",
+      month: "numeric",
+      day: "numeric",
     },
+    text: {
+      year: "numeric",
+      month: "long",
+      day: "numeric",
+    },
+    long: {
+      year: "numeric",
+      month: "numeric",
+      day: "numeric",
+      hour: "numeric",
+      minute: "numeric",
+      hour12: false,
+    },
+    hoursOnly: {
+      hour: "numeric",
+      minute: "numeric",
+      hour12: false,
+    },
+  },
 };
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/mod/DuplicateSelector/AccompanyingPeriodWorkSelector.ts b/src/Bundle/ChillPersonBundle/Resources/public/mod/DuplicateSelector/AccompanyingPeriodWorkSelector.ts
index 8f117d6ef..6ceb64b98 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/mod/DuplicateSelector/AccompanyingPeriodWorkSelector.ts
+++ b/src/Bundle/ChillPersonBundle/Resources/public/mod/DuplicateSelector/AccompanyingPeriodWorkSelector.ts
@@ -3,49 +3,47 @@ import AccompanyingPeriodWorkSelectorModal from "../../vuejs/_components/Accompa
 import { AccompanyingPeriodWork } from "../../types";
 
 document.addEventListener("DOMContentLoaded", () => {
-    const elements = document.querySelectorAll<HTMLDivElement>(
-        'div[data-pick-entities-type="acpw"]',
+  const elements = document.querySelectorAll<HTMLDivElement>(
+    'div[data-pick-entities-type="acpw"]',
+  );
+  elements.forEach((el) => {
+    const uniqid = el.dataset.inputUniqid;
+
+    if (undefined === uniqid) {
+      throw "Uniqid not found on this element";
+    }
+
+    const input = document.querySelector<HTMLInputElement>(
+      `input[data-input-uniqid="${uniqid}"]`,
     );
-    elements.forEach((el) => {
-        const uniqid = el.dataset.inputUniqid;
 
-        if (undefined === uniqid) {
-            throw "Uniqid not found on this element";
-        }
+    if (null === input) {
+      throw "Element with uniqid not found: " + uniqid;
+    }
 
-        const input = document.querySelector<HTMLInputElement>(
-            `input[data-input-uniqid="${uniqid}"]`,
-        );
+    const accompanyingPeriodIdAsString = input.dataset.accompanyingPeriodId;
 
-        if (null === input) {
-            throw "Element with uniqid not found: " + uniqid;
-        }
+    if (undefined === accompanyingPeriodIdAsString) {
+      throw "accompanying period id not found";
+    }
 
-        const accompanyingPeriodIdAsString = input.dataset.accompanyingPeriodId;
+    const accompanyingPeriodId = Number.parseInt(accompanyingPeriodIdAsString);
 
-        if (undefined === accompanyingPeriodIdAsString) {
-            throw "accompanying period id not found";
-        }
-
-        const accompanyingPeriodId = Number.parseInt(
-            accompanyingPeriodIdAsString,
-        );
-
-        const app = createApp({
-            template:
-                '<accompanying-period-work-selector-modal :accompanying-period-id="accompanyingPeriodId" @pickWork="pickWork"></accompanying-period-work-selector-modal>',
-            components: { AccompanyingPeriodWorkSelectorModal },
-            data() {
-                return { accompanyingPeriodId };
-            },
-            methods: {
-                pickWork: function (payload: { work: AccompanyingPeriodWork }) {
-                    console.log("payload", payload);
-                    input.value = payload.work.id.toString();
-                },
-            },
-        });
-
-        app.mount(el);
+    const app = createApp({
+      template:
+        '<accompanying-period-work-selector-modal :accompanying-period-id="accompanyingPeriodId" @pickWork="pickWork"></accompanying-period-work-selector-modal>',
+      components: { AccompanyingPeriodWorkSelectorModal },
+      data() {
+        return { accompanyingPeriodId };
+      },
+      methods: {
+        pickWork: function (payload: { work: AccompanyingPeriodWork }) {
+          console.log("payload", payload);
+          input.value = payload.work.id.toString();
+        },
+      },
     });
+
+    app.mount(el);
+  });
 });
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue
index 85f031a64..e81949711 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/App.vue
@@ -1,28 +1,28 @@
 <template>
-    <banner />
-    <sticky-nav />
+  <banner />
+  <sticky-nav />
 
-    <h1 v-if="accompanyingCourse.step === 'DRAFT'">
-        {{ $t("course.title.draft") }}
-    </h1>
-    <h1 v-else>
-        {{ $t("course.title.active") }}
-    </h1>
+  <h1 v-if="accompanyingCourse.step === 'DRAFT'">
+    {{ $t("course.title.draft") }}
+  </h1>
+  <h1 v-else>
+    {{ $t("course.title.active") }}
+  </h1>
 
-    <persons-associated />
-    <course-location />
-    <origin-demand />
-    <admin-location />
-    <requestor :is-anonymous="accompanyingCourse.requestorAnonymous" />
-    <social-issue />
-    <scopes />
-    <referrer />
-    <resources />
-    <start-date v-if="accompanyingCourse.step.startsWith('CONFIRMED')" />
-    <comment v-if="accompanyingCourse.step === 'DRAFT'" />
-    <confirm v-if="accompanyingCourse.step === 'DRAFT'" />
+  <persons-associated />
+  <course-location />
+  <origin-demand />
+  <admin-location />
+  <requestor :is-anonymous="accompanyingCourse.requestorAnonymous" />
+  <social-issue />
+  <scopes />
+  <referrer />
+  <resources />
+  <start-date v-if="accompanyingCourse.step.startsWith('CONFIRMED')" />
+  <comment v-if="accompanyingCourse.step === 'DRAFT'" />
+  <confirm v-if="accompanyingCourse.step === 'DRAFT'" />
 
-    <!-- <div v-for="error in errorMsg" v-bind:key="error.id" class="vue-component errors alert alert-danger">
+  <!-- <div v-for="error in errorMsg" v-bind:key="error.id" class="vue-component errors alert alert-danger">
        <p>
           <span>{{ error.sta }} {{ error.txt }}</span><br>
           <span>{{ $t(error.msg) }}</span>
@@ -47,26 +47,26 @@ import Confirm from "./components/Confirm.vue";
 import StartDate from "./components/StartDate.vue";
 
 export default {
-    name: "App",
-    components: {
-        Banner,
-        StickyNav,
-        OriginDemand,
-        AdminLocation,
-        PersonsAssociated,
-        Requestor,
-        SocialIssue,
-        CourseLocation,
-        Scopes,
-        Referrer,
-        Resources,
-        Comment,
-        Confirm,
-        StartDate,
-    },
-    computed: {
-        ...mapState(["accompanyingCourse", "addressContext"]),
-    },
+  name: "App",
+  components: {
+    Banner,
+    StickyNav,
+    OriginDemand,
+    AdminLocation,
+    PersonsAssociated,
+    Requestor,
+    SocialIssue,
+    CourseLocation,
+    Scopes,
+    Referrer,
+    Resources,
+    Comment,
+    Confirm,
+    StartDate,
+  },
+  computed: {
+    ...mapState(["accompanyingCourse", "addressContext"]),
+  },
 };
 </script>
 
@@ -75,62 +75,62 @@ export default {
 $chill-accourse-context: #718596;
 
 div#accompanying-course {
-    div.vue-component {
-        h2 {
-            margin: 1em 0.7em;
-            position: relative;
-            &:before {
-                position: absolute;
-                content: "\f142"; //ellipsis-v
-                font-family: "ForkAwesome";
-                color: tint-color($chill-accourse-context, 10%);
-                left: -22px;
-                top: 4px;
-            }
-            a[id^="section"] {
-                position: absolute;
-                top: -2.5em; // reference for stickNav
-            }
-        }
-        padding: 0em 0em;
-        margin: 1em 0;
-        border-radius: 5px;
-        border: 1px dotted tint-color($chill-accourse-context, 10%);
-        border-left: 1px dotted tint-color($chill-accourse-context, 10%);
-        border-right: 1px dotted tint-color($chill-accourse-context, 10%);
-        dd {
-            margin-left: 1em;
-        }
-        & > div {
-            margin: 1em 3em 0;
-
-            &.flex-table,
-            &.flex-bloc {
-                margin: 1em 0 0;
-            }
-            &.alert.to-confirm {
-                margin: 1em 0 0;
-                padding: 1em 3em;
-            }
-        }
-
-        div.flex-table {
-            div.item-row {
-                div.item-col:first-child {
-                    flex-basis: 33%;
-                }
-            }
-        }
-
-        &.errors {
-            //display: flex;
-            //position: sticky;
-            //bottom: 0.3em;
-            //z-index: 1000;
-            margin: 1em 0;
-            padding: 1em;
-            border-radius: 0;
-        }
+  div.vue-component {
+    h2 {
+      margin: 1em 0.7em;
+      position: relative;
+      &:before {
+        position: absolute;
+        content: "\f142"; //ellipsis-v
+        font-family: "ForkAwesome";
+        color: tint-color($chill-accourse-context, 10%);
+        left: -22px;
+        top: 4px;
+      }
+      a[id^="section"] {
+        position: absolute;
+        top: -2.5em; // reference for stickNav
+      }
     }
+    padding: 0em 0em;
+    margin: 1em 0;
+    border-radius: 5px;
+    border: 1px dotted tint-color($chill-accourse-context, 10%);
+    border-left: 1px dotted tint-color($chill-accourse-context, 10%);
+    border-right: 1px dotted tint-color($chill-accourse-context, 10%);
+    dd {
+      margin-left: 1em;
+    }
+    & > div {
+      margin: 1em 3em 0;
+
+      &.flex-table,
+      &.flex-bloc {
+        margin: 1em 0 0;
+      }
+      &.alert.to-confirm {
+        margin: 1em 0 0;
+        padding: 1em 3em;
+      }
+    }
+
+    div.flex-table {
+      div.item-row {
+        div.item-col:first-child {
+          flex-basis: 33%;
+        }
+      }
+    }
+
+    &.errors {
+      //display: flex;
+      //position: sticky;
+      //bottom: 0.3em;
+      //z-index: 1000;
+      margin: 1em 0;
+      padding: 1em;
+      border-radius: 0;
+    }
+  }
 }
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/AdminLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/AdminLocation.vue
index 9b1bc632e..a91cd1488 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/AdminLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/AdminLocation.vue
@@ -1,38 +1,35 @@
 <template>
-    <div class="vue-component">
-        <h2><a id="section-40" />{{ $t("admin_location.title") }}</h2>
+  <div class="vue-component">
+    <h2><a id="section-40" />{{ $t("admin_location.title") }}</h2>
 
-        <div class="mb-4">
-            <label for="selectAdminLocation">
-                {{ $t("admin_location.title") }}
-            </label>
+    <div class="mb-4">
+      <label for="selectAdminLocation">
+        {{ $t("admin_location.title") }}
+      </label>
 
-            <VueMultiselect
-                name="selectAdminLocation"
-                label="text"
-                :custom-label="customLabel"
-                track-by="id"
-                :multiple="false"
-                :searchable="true"
-                :placeholder="$t('admin_location.placeholder')"
-                v-model="value"
-                :options="options"
-                group-values="locations"
-                group-label="locationCategories"
-                :select-label="$t('multiselect.select_label')"
-                :deselect-label="$t('multiselect.deselect_label')"
-                :selected-label="$t('multiselect.selected_label')"
-                @select="updateAdminLocation"
-            />
-        </div>
-
-        <div
-            v-if="!isAdminLocationValid"
-            class="alert alert-warning to-confirm"
-        >
-            {{ $t("admin_location.not_valid") }}
-        </div>
+      <VueMultiselect
+        name="selectAdminLocation"
+        label="text"
+        :custom-label="customLabel"
+        track-by="id"
+        :multiple="false"
+        :searchable="true"
+        :placeholder="$t('admin_location.placeholder')"
+        v-model="value"
+        :options="options"
+        group-values="locations"
+        group-label="locationCategories"
+        :select-label="$t('multiselect.select_label')"
+        :deselect-label="$t('multiselect.deselect_label')"
+        :selected-label="$t('multiselect.selected_label')"
+        @select="updateAdminLocation"
+      />
     </div>
+
+    <div v-if="!isAdminLocationValid" class="alert alert-warning to-confirm">
+      {{ $t("admin_location.not_valid") }}
+    </div>
+  </div>
 </template>
 
 <script>
@@ -41,72 +38,67 @@ import { fetchResults } from "ChillMainAssets/lib/api/apiMethods";
 import { mapState, mapGetters } from "vuex";
 
 export default {
-    name: "AdminLocation",
-    components: { VueMultiselect },
-    data() {
-        return {
-            options: [],
-        };
+  name: "AdminLocation",
+  components: { VueMultiselect },
+  data() {
+    return {
+      options: [],
+    };
+  },
+  computed: {
+    ...mapState({
+      value: (state) => state.accompanyingCourse.administrativeLocation,
+    }),
+    ...mapGetters(["isAdminLocationValid"]),
+  },
+  mounted() {
+    this.getOptions();
+  },
+  methods: {
+    getOptions() {
+      fetchResults(`/api/1.0/main/location.json`).then((response) => {
+        let uniqueLocationTypeId = [
+          ...new Set(response.map((o) => o.locationType.id)),
+        ];
+        let results = [];
+        for (let id of uniqueLocationTypeId) {
+          results.push({
+            locationCategories: response.filter(
+              (o) => o.locationType.id === id,
+            )[0].locationType.title.fr,
+            locations: response.filter((o) => o.locationType.id === id),
+          });
+        }
+        this.options = results;
+      });
     },
-    computed: {
-        ...mapState({
-            value: (state) => state.accompanyingCourse.administrativeLocation,
-        }),
-        ...mapGetters(["isAdminLocationValid"]),
+    updateAdminLocation(value) {
+      this.$store
+        .dispatch("updateAdminLocation", value)
+        .catch(({ name, violations }) => {
+          if (name === "ValidationException" || name === "AccessException") {
+            violations.forEach((violation) =>
+              this.$toast.open({ message: violation }),
+            );
+          } else {
+            this.$toast.open({ message: "An error occurred" });
+          }
+        });
     },
-    mounted() {
-        this.getOptions();
-    },
-    methods: {
-        getOptions() {
-            fetchResults(`/api/1.0/main/location.json`).then((response) => {
-                let uniqueLocationTypeId = [
-                    ...new Set(response.map((o) => o.locationType.id)),
-                ];
-                let results = [];
-                for (let id of uniqueLocationTypeId) {
-                    results.push({
-                        locationCategories: response.filter(
-                            (o) => o.locationType.id === id,
-                        )[0].locationType.title.fr,
-                        locations: response.filter(
-                            (o) => o.locationType.id === id,
-                        ),
-                    });
-                }
-                this.options = results;
-            });
-        },
-        updateAdminLocation(value) {
-            this.$store
-                .dispatch("updateAdminLocation", value)
-                .catch(({ name, violations }) => {
-                    if (
-                        name === "ValidationException" ||
-                        name === "AccessException"
-                    ) {
-                        violations.forEach((violation) =>
-                            this.$toast.open({ message: violation }),
-                        );
-                    } else {
-                        this.$toast.open({ message: "An error occurred" });
-                    }
-                });
-        },
-        customLabel(value) {
-            return value.locationType
-                ? value.name
-                    ? `${value.name} (${value.locationType.title.fr})`
-                    : value.locationType.title.fr
-                : "";
-        },
+    customLabel(value) {
+      return value.locationType
+        ? value.name
+          ? `${value.name} (${value.locationType.title.fr})`
+          : value.locationType.title.fr
+        : "";
     },
+  },
 };
 </script>
 
 <style src="vue-multiselect/dist/vue-multiselect.css"></style>
 <style lang="css" scoped>
 label {
-    display: none;
+  display: none;
 }
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue
index 47a586e7d..7cf697f3c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner.vue
@@ -1,132 +1,107 @@
 <template>
-    <teleport to="#header-accompanying_course-name #banner-flags">
-        <toggle-flags />
-    </teleport>
+  <teleport to="#header-accompanying_course-name #banner-flags">
+    <toggle-flags />
+  </teleport>
 
-    <teleport to="#header-accompanying_course-name #banner-status">
-        <span
-            v-if="accompanyingCourse.step === 'DRAFT'"
-            class="text-md-end d-md-block"
-        >
-            <span class="badge bg-secondary">
-                {{ $t("course.step.draft") }}
-            </span>
-        </span>
-        <span
-            v-else-if="
-                accompanyingCourse.step === 'CONFIRMED' ||
-                accompanyingCourse.step === 'CONFIRMED_INACTIVE_SHORT' ||
-                accompanyingCourse.step === 'CONFIRMED_INACTIVE_LONG'
-            "
-            class="text-md-end"
-        >
-            <span
-                v-if="accompanyingCourse.step === 'CONFIRMED'"
-                class="d-md-block mb-md-3"
-            >
-                <span class="badge bg-primary">
-                    {{ $t("course.step.active") }}
-                </span>
-            </span>
-            <span
-                v-else-if="
-                    accompanyingCourse.step === 'CONFIRMED_INACTIVE_SHORT'
-                "
-                class="d-md-block mb-md-3"
-            >
-                <span class="badge bg-chill-yellow text-primary">
-                    {{ $t("course.step.inactive_short") }}
-                </span>
-            </span>
-            <span
-                v-else-if="
-                    accompanyingCourse.step === 'CONFIRMED_INACTIVE_LONG'
-                "
-                class="d-md-block mb-md-3"
-            >
-                <span class="badge bg-chill-pink">
-                    {{ $t("course.step.inactive_long") }}
-                </span>
-            </span>
-            <span class="d-md-block">
-                <span class="d-md-block ms-3 ms-md-0">
-                    <i
-                        >{{ $t("course.open_at")
-                        }}{{
-                            $d(accompanyingCourse.openingDate.datetime, "text")
-                        }}</i
-                    >
-                </span>
-                <span
-                    v-if="accompanyingCourse.user"
-                    class="d-md-block ms-3 ms-md-0"
-                >
-                    <span class="item-key">{{ $t("course.referrer") }}:</span
-                    >&nbsp;
-                    <b>{{ accompanyingCourse.user.text }}</b>
-                    <template v-if="accompanyingCourse.user.isAbsent">
-                        &nbsp;
-                        <span
-                            class="badge bg-danger rounded-pill"
-                            title="Absent"
-                            >A</span
-                        >
-                    </template>
-                </span>
-            </span>
-        </span>
-        <span v-else class="text-md-end d-md-block">
-            <span class="badge bg-danger">
-                {{ $t("course.step.closed") }}
-            </span>
-            <span class="d-md-block">
-                <span class="d-md-block ms-3 ms-md-0">
-                    <i
-                        >{{
-                            $d(accompanyingCourse.openingDate.datetime, "text")
-                        }}
-                        -
-                        {{
-                            $d(accompanyingCourse.closingDate.datetime, "text")
-                        }}</i
-                    >
-                </span>
-                <span
-                    v-if="accompanyingCourse.user"
-                    class="d-md-block ms-3 ms-md-0"
-                >
-                    <span class="item-key">{{ $t("course.referrer") }}:</span>
-                    <b>{{ accompanyingCourse.user.text }}</b>
-                </span>
-            </span>
-        </span>
-    </teleport>
-
-    <teleport
-        to="#header-accompanying_course-name #persons-associated-shortlist"
+  <teleport to="#header-accompanying_course-name #banner-status">
+    <span
+      v-if="accompanyingCourse.step === 'DRAFT'"
+      class="text-md-end d-md-block"
     >
-        <persons-associated
-            :accompanyingCourse="accompanyingCourse"
-            :shortlist="true"
-        ></persons-associated>
-    </teleport>
-
-    <teleport to="#header-accompanying_course-details #banner-social-issues">
-        <social-issue
-            v-for="issue in accompanyingCourse.socialIssues"
-            :key="issue.id"
-            :issue="issue"
-        />
-    </teleport>
-
-    <teleport
-        to="#header-accompanying_course-details #banner-persons-associated"
+      <span class="badge bg-secondary">
+        {{ $t("course.step.draft") }}
+      </span>
+    </span>
+    <span
+      v-else-if="
+        accompanyingCourse.step === 'CONFIRMED' ||
+        accompanyingCourse.step === 'CONFIRMED_INACTIVE_SHORT' ||
+        accompanyingCourse.step === 'CONFIRMED_INACTIVE_LONG'
+      "
+      class="text-md-end"
     >
-        <persons-associated
-            :accompanying-course="accompanyingCourse"
-            :shortlist="false"
-        />
-    </teleport>
+      <span
+        v-if="accompanyingCourse.step === 'CONFIRMED'"
+        class="d-md-block mb-md-3"
+      >
+        <span class="badge bg-primary">
+          {{ $t("course.step.active") }}
+        </span>
+      </span>
+      <span
+        v-else-if="accompanyingCourse.step === 'CONFIRMED_INACTIVE_SHORT'"
+        class="d-md-block mb-md-3"
+      >
+        <span class="badge bg-chill-yellow text-primary">
+          {{ $t("course.step.inactive_short") }}
+        </span>
+      </span>
+      <span
+        v-else-if="accompanyingCourse.step === 'CONFIRMED_INACTIVE_LONG'"
+        class="d-md-block mb-md-3"
+      >
+        <span class="badge bg-chill-pink">
+          {{ $t("course.step.inactive_long") }}
+        </span>
+      </span>
+      <span class="d-md-block">
+        <span class="d-md-block ms-3 ms-md-0">
+          <i
+            >{{ $t("course.open_at")
+            }}{{ $d(accompanyingCourse.openingDate.datetime, "text") }}</i
+          >
+        </span>
+        <span v-if="accompanyingCourse.user" class="d-md-block ms-3 ms-md-0">
+          <span class="item-key">{{ $t("course.referrer") }}:</span>&nbsp;
+          <b>{{ accompanyingCourse.user.text }}</b>
+          <template v-if="accompanyingCourse.user.isAbsent">
+            &nbsp;
+            <span class="badge bg-danger rounded-pill" title="Absent">A</span>
+          </template>
+        </span>
+      </span>
+    </span>
+    <span v-else class="text-md-end d-md-block">
+      <span class="badge bg-danger">
+        {{ $t("course.step.closed") }}
+      </span>
+      <span class="d-md-block">
+        <span class="d-md-block ms-3 ms-md-0">
+          <i
+            >{{ $d(accompanyingCourse.openingDate.datetime, "text") }}
+            -
+            {{ $d(accompanyingCourse.closingDate.datetime, "text") }}</i
+          >
+        </span>
+        <span v-if="accompanyingCourse.user" class="d-md-block ms-3 ms-md-0">
+          <span class="item-key">{{ $t("course.referrer") }}:</span>
+          <b>{{ accompanyingCourse.user.text }}</b>
+        </span>
+      </span>
+    </span>
+  </teleport>
+
+  <teleport to="#header-accompanying_course-name #persons-associated-shortlist">
+    <persons-associated
+      :accompanyingCourse="accompanyingCourse"
+      :shortlist="true"
+    ></persons-associated>
+  </teleport>
+
+  <teleport to="#header-accompanying_course-details #banner-social-issues">
+    <social-issue
+      v-for="issue in accompanyingCourse.socialIssues"
+      :key="issue.id"
+      :issue="issue"
+    />
+  </teleport>
+
+  <teleport to="#header-accompanying_course-details #banner-persons-associated">
+    <persons-associated
+      :accompanying-course="accompanyingCourse"
+      :shortlist="false"
+    />
+  </teleport>
 </template>
 
 <script>
@@ -135,30 +110,30 @@ import SocialIssue from "./Banner/SocialIssue.vue";
 import PersonsAssociated from "./Banner/PersonsAssociated.vue";
 
 export default {
-    name: "Banner",
-    components: {
-        ToggleFlags,
-        SocialIssue,
-        PersonsAssociated,
-    },
-    computed: {
-        accompanyingCourse() {
-            return this.$store.state.accompanyingCourse;
-        },
+  name: "Banner",
+  components: {
+    ToggleFlags,
+    SocialIssue,
+    PersonsAssociated,
+  },
+  computed: {
+    accompanyingCourse() {
+      return this.$store.state.accompanyingCourse;
     },
+  },
 };
 </script>
 
 <style lang="scss">
 div#banner-flags,
 div#banner-status {
-    .badge {
-        text-transform: uppercase;
-    }
+  .badge {
+    text-transform: uppercase;
+  }
 }
 div#banner-status {
-    span.badge {
-        font-size: 90%;
-    }
+  span.badge {
+    font-size: 90%;
+  }
 }
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner/PersonsAssociated.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner/PersonsAssociated.vue
index 048dbd1df..a1837effd 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner/PersonsAssociated.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner/PersonsAssociated.vue
@@ -1,129 +1,127 @@
 <template>
-    <span v-if="shortlist">
-        <span v-for="person in firstPersons" class="me-1" :key="person.id">
-            <on-the-fly
-                :type="person.type"
-                :id="person.id"
-                :buttonText="person.textAge"
-                :displayBadge="'true' === 'true'"
-                action="show"
-            ></on-the-fly>
-        </span>
-        <span v-if="hasMoreThanShortListPerson">
-            <a
-                class="showMore carousel-control"
-                role="button"
-                data-bs-target="#ACHeaderSlider"
-                data-bs-slide="next"
-                >{{ $t("more_x", { x: countMoreThanShortListPerson }) }}</a
-            >
-        </span>
+  <span v-if="shortlist">
+    <span v-for="person in firstPersons" class="me-1" :key="person.id">
+      <on-the-fly
+        :type="person.type"
+        :id="person.id"
+        :buttonText="person.textAge"
+        :displayBadge="'true' === 'true'"
+        action="show"
+      ></on-the-fly>
     </span>
-    <span v-else>
-        <span
-            v-for="([pk, persons], h) in personsByHousehold"
-            :class="{ household: pk > -1, 'no-household': pk === -1 }"
-            :key="h.id"
-        >
-            <a v-if="pk !== -1" :href="householdLink(pk)">
-                <i
-                    class="fa fa-home fa-fw text-light"
-                    :title="
-                        $t('persons_associated.show_household_number', {
-                            id: pk,
-                        })
-                    "
-                ></i>
-            </a>
-            <span v-for="person in persons" class="me-1" :key="person.id">
-                <on-the-fly
-                    :type="person.type"
-                    :id="person.id"
-                    :buttonText="person.textAge"
-                    :displayBadge="true"
-                    action="show"
-                ></on-the-fly>
-            </span>
-        </span>
+    <span v-if="hasMoreThanShortListPerson">
+      <a
+        class="showMore carousel-control"
+        role="button"
+        data-bs-target="#ACHeaderSlider"
+        data-bs-slide="next"
+        >{{ $t("more_x", { x: countMoreThanShortListPerson }) }}</a
+      >
     </span>
+  </span>
+  <span v-else>
+    <span
+      v-for="([pk, persons], h) in personsByHousehold"
+      :class="{ household: pk > -1, 'no-household': pk === -1 }"
+      :key="h.id"
+    >
+      <a v-if="pk !== -1" :href="householdLink(pk)">
+        <i
+          class="fa fa-home fa-fw text-light"
+          :title="
+            $t('persons_associated.show_household_number', {
+              id: pk,
+            })
+          "
+        ></i>
+      </a>
+      <span v-for="person in persons" class="me-1" :key="person.id">
+        <on-the-fly
+          :type="person.type"
+          :id="person.id"
+          :buttonText="person.textAge"
+          :displayBadge="true"
+          action="show"
+        ></on-the-fly>
+      </span>
+    </span>
+  </span>
 </template>
 
 <script>
 import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly";
 
 export default {
-    name: "PersonsAssociated",
-    components: {
-        OnTheFly,
+  name: "PersonsAssociated",
+  components: {
+    OnTheFly,
+  },
+  props: ["accompanyingCourse", "shortlist"],
+  data() {
+    return {
+      showAllPersons: false,
+      maxTotalPersons: 2,
+      nbShortList: 3,
+    };
+  },
+  computed: {
+    participations() {
+      return this.accompanyingCourse.participations.filter(
+        (p) => p.endDate === null,
+      );
     },
-    props: ["accompanyingCourse", "shortlist"],
-    data() {
-        return {
-            showAllPersons: false,
-            maxTotalPersons: 2,
-            nbShortList: 3,
-        };
+    persons() {
+      return this.participations.map((p) => p.person);
     },
-    computed: {
-        participations() {
-            return this.accompanyingCourse.participations.filter(
-                (p) => p.endDate === null,
-            );
-        },
-        persons() {
-            return this.participations.map((p) => p.person);
-        },
-        firstPersons() {
-            return this.participations.slice(0, 3).map((p) => p.person);
-        },
-        hasMoreThanShortListPerson() {
-            return this.participations.length > 3;
-        },
-        countMoreThanShortListPerson() {
-            return this.participations.length - 3;
-        },
-        resources() {
-            return this.accompanyingCourse.resources;
-        },
-        requestor() {
-            return this.accompanyingCourse.requestor;
-        },
-        personsByHousehold() {
-            const households = new Map();
-            this.accompanyingCourse.participations
-                .filter((part) => part.endDate === null)
-                .map((part) => part.person)
-                .forEach((person) => {
-                    if (!households.has(person.current_household_id || -1)) {
-                        households.set(person.current_household_id || -1, []);
-                    }
-                    households
-                        .get(person.current_household_id || -1)
-                        .push(person);
-                });
+    firstPersons() {
+      return this.participations.slice(0, 3).map((p) => p.person);
+    },
+    hasMoreThanShortListPerson() {
+      return this.participations.length > 3;
+    },
+    countMoreThanShortListPerson() {
+      return this.participations.length - 3;
+    },
+    resources() {
+      return this.accompanyingCourse.resources;
+    },
+    requestor() {
+      return this.accompanyingCourse.requestor;
+    },
+    personsByHousehold() {
+      const households = new Map();
+      this.accompanyingCourse.participations
+        .filter((part) => part.endDate === null)
+        .map((part) => part.person)
+        .forEach((person) => {
+          if (!households.has(person.current_household_id || -1)) {
+            households.set(person.current_household_id || -1, []);
+          }
+          households.get(person.current_household_id || -1).push(person);
+        });
 
-            return households;
-        },
+      return households;
     },
-    methods: {
-        householdLink(id) {
-            return `/fr/person/household/${id}/summary`;
-        },
+  },
+  methods: {
+    householdLink(id) {
+      return `/fr/person/household/${id}/summary`;
     },
+  },
 };
 </script>
 
 <style lang="scss" scoped>
 .showMore {
-    cursor: pointer;
-    color: white;
+  cursor: pointer;
+  color: white;
 }
 span.household {
-    display: inline-block;
-    border-top: 1px solid rgba(255, 255, 255, 0.3);
-    background-color: rgba(255, 255, 255, 0.1);
-    border-radius: 10px;
-    margin-right: 0.3em;
-    padding: 5px;
+  display: inline-block;
+  border-top: 1px solid rgba(255, 255, 255, 0.3);
+  background-color: rgba(255, 255, 255, 0.1);
+  border-radius: 10px;
+  margin-right: 0.3em;
+  padding: 5px;
 }
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner/SocialIssue.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner/SocialIssue.vue
index 9bbe4e513..2d3c7d031 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner/SocialIssue.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner/SocialIssue.vue
@@ -1,11 +1,11 @@
 <template>
-    <span class="badge bg-chill-l-gray text-dark">{{ issue.text }}</span>
+  <span class="badge bg-chill-l-gray text-dark">{{ issue.text }}</span>
 </template>
 
 <script>
 export default {
-    name: "SocialIssues",
-    props: ["issue"],
+  name: "SocialIssues",
+  props: ["issue"],
 };
 </script>
 
@@ -14,9 +14,9 @@ export default {
 @import "ChillPersonAssets/chill/scss/mixins";
 @import "ChillMainAssets/chill/scss/chill_variables";
 span.badge {
-    @include badge_social($social-issue-color);
-    font-size: 95%;
-    margin-bottom: 5px;
-    margin-right: 1em;
+  @include badge_social($social-issue-color);
+  font-size: 95%;
+  margin-bottom: 5px;
+  margin-right: 1em;
 }
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner/ToggleFlags.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner/ToggleFlags.vue
index b759dccd2..555b0b2cd 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner/ToggleFlags.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Banner/ToggleFlags.vue
@@ -1,158 +1,145 @@
 <template>
-    <div class="text-md-end">
-        <span class="d-block d-sm-inline-block mb-md-2">
-            <a @click="toggleIntensity" class="flag-toggle">
-                <span :class="{ on: !isRegular }">{{
-                    $t("course.occasional")
-                }}</span>
-                <i
-                    class="fa"
-                    :class="{
-                        'fa-toggle-on': isRegular,
-                        'fa-toggle-on fa-flip-horizontal': !isRegular,
-                    }"
-                />
-                <span :class="{ on: isRegular }">{{
-                    $t("course.regular")
-                }}</span>
-            </a>
-        </span>
+  <div class="text-md-end">
+    <span class="d-block d-sm-inline-block mb-md-2">
+      <a @click="toggleIntensity" class="flag-toggle">
+        <span :class="{ on: !isRegular }">{{ $t("course.occasional") }}</span>
+        <i
+          class="fa"
+          :class="{
+            'fa-toggle-on': isRegular,
+            'fa-toggle-on fa-flip-horizontal': !isRegular,
+          }"
+        />
+        <span :class="{ on: isRegular }">{{ $t("course.regular") }}</span>
+      </a>
+    </span>
 
-        <span class="d-block d-sm-inline-block ms-sm-3 ms-md-0">
-            <button
-                class="badge rounded-pill me-1"
-                :class="{
-                    'bg-danger': isEmergency,
-                    'bg-secondary': !isEmergency,
-                }"
-                @click="toggleEmergency"
-            >
-                {{ $t("course.emergency") }}
-            </button>
-            <button
-                class="badge rounded-pill"
-                :class="{
-                    'bg-danger': isConfidential,
-                    'bg-secondary': !isConfidential,
-                }"
-                @click="toggleConfidential"
-            >
-                {{ $t("course.confidential") }}
-            </button>
-        </span>
-    </div>
+    <span class="d-block d-sm-inline-block ms-sm-3 ms-md-0">
+      <button
+        class="badge rounded-pill me-1"
+        :class="{
+          'bg-danger': isEmergency,
+          'bg-secondary': !isEmergency,
+        }"
+        @click="toggleEmergency"
+      >
+        {{ $t("course.emergency") }}
+      </button>
+      <button
+        class="badge rounded-pill"
+        :class="{
+          'bg-danger': isConfidential,
+          'bg-secondary': !isConfidential,
+        }"
+        @click="toggleConfidential"
+      >
+        {{ $t("course.confidential") }}
+      </button>
+    </span>
+  </div>
 </template>
 
 <script>
 import { mapState } from "vuex";
 
 export default {
-    name: "ToggleFlags",
-    computed: {
-        ...mapState({
-            intensity: (state) => state.accompanyingCourse.intensity,
-            emergency: (state) => state.accompanyingCourse.emergency,
-            confidential: (state) => state.accompanyingCourse.confidential,
-            permissions: (state) => state.permissions,
-        }),
-        isRegular() {
-            return this.intensity === "regular" ? true : false;
-        },
-        isEmergency() {
-            return this.emergency ? true : false;
-        },
-        isConfidential() {
-            return this.confidential ? true : false;
-        },
+  name: "ToggleFlags",
+  computed: {
+    ...mapState({
+      intensity: (state) => state.accompanyingCourse.intensity,
+      emergency: (state) => state.accompanyingCourse.emergency,
+      confidential: (state) => state.accompanyingCourse.confidential,
+      permissions: (state) => state.permissions,
+    }),
+    isRegular() {
+      return this.intensity === "regular" ? true : false;
     },
-    methods: {
-        toggleIntensity() {
-            let value;
-            switch (this.intensity) {
-                case "occasional":
-                    value = "regular";
-                    break;
-                case "regular":
-                    value = "occasional";
-                    break;
-                default:
-                    //temporaire (modif backend)
-                    value = "occasional";
-            }
-            this.$store.dispatch("toggleIntensity", value).catch(({ name }) => {
-                if (
-                    name === "ValidationException" ||
-                    name === "AccessException"
-                ) {
-                    this.$toast.open({
-                        message: this.$t(
-                            "Only the referrer can toggle the intensity of an accompanying course",
-                        ),
-                    });
-                } else {
-                    this.$toast.open({ message: "An error occurred" });
-                }
-            });
-        },
-        toggleEmergency() {
-            this.$store
-                .dispatch("toggleEmergency", !this.isEmergency)
-                .catch(({ name, violations }) => {
-                    if (
-                        name === "ValidationException" ||
-                        name === "AccessException"
-                    ) {
-                        violations.forEach((violation) =>
-                            this.$toast.open({ message: violation }),
-                        );
-                    } else {
-                        this.$toast.open({ message: "An error occurred" });
-                    }
-                });
-        },
-        toggleConfidential() {
-            this.$store.dispatch("toggleConfidential").catch(({ name }) => {
-                console.log(name);
-                if (
-                    name === "ValidationException" ||
-                    name === "AccessException"
-                ) {
-                    this.$toast.open({
-                        message: this.$t(
-                            "Only the referrer can toggle the confidentiality of an accompanying course",
-                        ),
-                    });
-                } else {
-                    this.$toast.open({ message: "An error occurred" });
-                }
-            });
-        },
+    isEmergency() {
+      return this.emergency ? true : false;
     },
+    isConfidential() {
+      return this.confidential ? true : false;
+    },
+  },
+  methods: {
+    toggleIntensity() {
+      let value;
+      switch (this.intensity) {
+        case "occasional":
+          value = "regular";
+          break;
+        case "regular":
+          value = "occasional";
+          break;
+        default:
+          //temporaire (modif backend)
+          value = "occasional";
+      }
+      this.$store.dispatch("toggleIntensity", value).catch(({ name }) => {
+        if (name === "ValidationException" || name === "AccessException") {
+          this.$toast.open({
+            message: this.$t(
+              "Only the referrer can toggle the intensity of an accompanying course",
+            ),
+          });
+        } else {
+          this.$toast.open({ message: "An error occurred" });
+        }
+      });
+    },
+    toggleEmergency() {
+      this.$store
+        .dispatch("toggleEmergency", !this.isEmergency)
+        .catch(({ name, violations }) => {
+          if (name === "ValidationException" || name === "AccessException") {
+            violations.forEach((violation) =>
+              this.$toast.open({ message: violation }),
+            );
+          } else {
+            this.$toast.open({ message: "An error occurred" });
+          }
+        });
+    },
+    toggleConfidential() {
+      this.$store.dispatch("toggleConfidential").catch(({ name }) => {
+        console.log(name);
+        if (name === "ValidationException" || name === "AccessException") {
+          this.$toast.open({
+            message: this.$t(
+              "Only the referrer can toggle the confidentiality of an accompanying course",
+            ),
+          });
+        } else {
+          this.$toast.open({ message: "An error occurred" });
+        }
+      });
+    },
+  },
 };
 </script>
 
 <style lang="scss" scoped>
 a.flag-toggle {
+  color: white;
+  cursor: pointer;
+  &:hover {
     color: white;
-    cursor: pointer;
-    &:hover {
-        color: white;
-        text-decoration: underline;
-        border-radius: 20px;
-    }
-    i {
-        margin: auto 0.4em;
-    }
-    span.on {
-        font-weight: bolder;
-    }
+    text-decoration: underline;
+    border-radius: 20px;
+  }
+  i {
+    margin: auto 0.4em;
+  }
+  span.on {
+    font-weight: bolder;
+  }
 }
 button.badge {
-    &.bg-secondary {
-        opacity: 0.5;
-        &:hover {
-            opacity: 0.7;
-        }
+  &.bg-secondary {
+    opacity: 0.5;
+    &:hover {
+      opacity: 0.7;
     }
+  }
 }
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue
index e84d5a9f2..1e17a1cd2 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue
@@ -1,38 +1,36 @@
 <template>
-    <li>
-        <button
-            class="btn btn-sm btn-secondary"
-            @click="modal.showModal = true"
-            :title="$t('courselocation.assign_course_address')"
-        >
-            <i class="fa fa-map-marker" />
-        </button>
-    </li>
+  <li>
+    <button
+      class="btn btn-sm btn-secondary"
+      @click="modal.showModal = true"
+      :title="$t('courselocation.assign_course_address')"
+    >
+      <i class="fa fa-map-marker" />
+    </button>
+  </li>
 
-    <teleport to="body">
-        <modal
-            v-if="modal.showModal"
-            :modal-dialog-class="modal.modalDialogClass"
-            @close="modal.showModal = false"
-        >
-            <template #header>
-                <h2 class="modal-title">
-                    {{ $t("courselocation.sure") }}
-                </h2>
-            </template>
-            <template #body>
-                <address-render-box
-                    :address="person.current_household_address"
-                />
-                <p>{{ $t("courselocation.sure_description") }}</p>
-            </template>
-            <template #footer>
-                <button class="btn btn-danger" @click="assignAddress">
-                    {{ $t("courselocation.ok") }}
-                </button>
-            </template>
-        </modal>
-    </teleport>
+  <teleport to="body">
+    <modal
+      v-if="modal.showModal"
+      :modal-dialog-class="modal.modalDialogClass"
+      @close="modal.showModal = false"
+    >
+      <template #header>
+        <h2 class="modal-title">
+          {{ $t("courselocation.sure") }}
+        </h2>
+      </template>
+      <template #body>
+        <address-render-box :address="person.current_household_address" />
+        <p>{{ $t("courselocation.sure_description") }}</p>
+      </template>
+      <template #footer>
+        <button class="btn btn-danger" @click="assignAddress">
+          {{ $t("courselocation.ok") }}
+        </button>
+      </template>
+    </modal>
+  </teleport>
 </template>
 
 <script>
@@ -41,52 +39,49 @@ import Modal from "ChillMainAssets/vuejs/_components/Modal";
 import AddressRenderBox from "ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue";
 
 export default {
-    name: "ButtonLocation",
-    components: {
-        AddressRenderBox,
-        Modal,
-    },
-    props: ["person"],
-    data() {
-        return {
-            modal: {
-                showModal: false,
-                modalDialogClass: "modal-dialog-centered modal-md",
-            },
-        };
-    },
-    computed: {
-        ...mapState({
-            context: (state) => state.addressContext,
-        }),
-    },
-    methods: {
-        assignAddress() {
-            //console.log('assignAddress id', this.person.current_household_address);
-            let payload = {
-                target: this.context.target.name,
-                targetId: this.context.target.id,
-                locationStatusTo: "person",
-                personId: this.person.id,
-            };
-            this.$store
-                .dispatch("updateLocation", payload)
-                .catch(({ name, violations }) => {
-                    if (
-                        name === "ValidationException" ||
-                        name === "AccessException"
-                    ) {
-                        violations.forEach((violation) =>
-                            this.$toast.open({ message: violation }),
-                        );
-                    } else {
-                        this.$toast.open({ message: "An error occurred" });
-                    }
-                });
+  name: "ButtonLocation",
+  components: {
+    AddressRenderBox,
+    Modal,
+  },
+  props: ["person"],
+  data() {
+    return {
+      modal: {
+        showModal: false,
+        modalDialogClass: "modal-dialog-centered modal-md",
+      },
+    };
+  },
+  computed: {
+    ...mapState({
+      context: (state) => state.addressContext,
+    }),
+  },
+  methods: {
+    assignAddress() {
+      //console.log('assignAddress id', this.person.current_household_address);
+      let payload = {
+        target: this.context.target.name,
+        targetId: this.context.target.id,
+        locationStatusTo: "person",
+        personId: this.person.id,
+      };
+      this.$store
+        .dispatch("updateLocation", payload)
+        .catch(({ name, violations }) => {
+          if (name === "ValidationException" || name === "AccessException") {
+            violations.forEach((violation) =>
+              this.$toast.open({ message: violation }),
+            );
+          } else {
+            this.$toast.open({ message: "An error occurred" });
+          }
+        });
 
-            window.location.assign("#section-20");
-            this.modal.showModal = false;
-        },
+      window.location.assign("#section-20");
+      this.modal.showModal = false;
     },
+  },
 };
 </script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
index b5b2a4466..56f8eb458 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Comment.vue
@@ -1,56 +1,56 @@
 <template>
-    <div class="vue-component">
-        <h2><a id="section-100" />{{ $t("comment.title") }}</h2>
+  <div class="vue-component">
+    <h2><a id="section-100" />{{ $t("comment.title") }}</h2>
 
-        <!--div class="error flash_message" v-if="errors.length > 0">
+    <!--div class="error flash_message" v-if="errors.length > 0">
          {{ errors[0] }}
          TODO fix errors flashbag for app component
       </div-->
 
-        <div>
-            <form @submit.prevent="submitform">
-                <label class="col-form-label" for="content">{{
-                    $t("comment.label")
-                }}</label>
+    <div>
+      <form @submit.prevent="submitform">
+        <label class="col-form-label" for="content">{{
+          $t("comment.label")
+        }}</label>
 
-                <comment-editor v-model="content" />
+        <comment-editor v-model="content" />
 
-                <div class="sub-comment">
-                    <div
-                        v-if="
-                            pinnedComment !== null &&
-                            typeof pinnedComment.creator !== 'undefined'
-                        "
-                        class="metadata"
-                    >
-                        {{
-                            $t("comment.created_by", [
-                                pinnedComment.creator.text,
-                                $d(pinnedComment.updatedAt.datetime, "long"),
-                            ])
-                        }}
-                    </div>
-                    <div class="loading">
-                        <i
-                            v-if="loading"
-                            class="fa fa-circle-o-notch fa-spin"
-                            :title="$t('loading')"
-                        />
-                    </div>
-                </div>
-
-                <div>
-                    <ul class="record_actions">
-                        <li v-if="pinnedComment !== null">
-                            <a class="btn btn-delete" @click="removeComment">
-                                {{ $t("action.delete") }}
-                            </a>
-                        </li>
-                    </ul>
-                </div>
-            </form>
+        <div class="sub-comment">
+          <div
+            v-if="
+              pinnedComment !== null &&
+              typeof pinnedComment.creator !== 'undefined'
+            "
+            class="metadata"
+          >
+            {{
+              $t("comment.created_by", [
+                pinnedComment.creator.text,
+                $d(pinnedComment.updatedAt.datetime, "long"),
+              ])
+            }}
+          </div>
+          <div class="loading">
+            <i
+              v-if="loading"
+              class="fa fa-circle-o-notch fa-spin"
+              :title="$t('loading')"
+            />
+          </div>
         </div>
+
+        <div>
+          <ul class="record_actions">
+            <li v-if="pinnedComment !== null">
+              <a class="btn btn-delete" @click="removeComment">
+                {{ $t("action.delete") }}
+              </a>
+            </li>
+          </ul>
+        </div>
+      </form>
     </div>
+  </div>
 </template>
 
 <script>
@@ -58,127 +58,121 @@ import CommentEditor from "ChillMainAssets/vuejs/_components/CommentEditor/Comme
 import { mapState } from "vuex";
 
 export default {
-    name: "Comment",
-    components: {
-        CommentEditor,
-    },
-    data() {
-        return {
-            loading: false,
-            lastRecordedContent: null,
-        };
-    },
-    computed: {
-        ...mapState({
-            pinnedComment: (state) => state.accompanyingCourse.pinnedComment,
-        }),
-        classicEditor: () => ClassicEditor,
-        editorConfig: () => classicEditorConfig,
-        content: {
-            set(value) {
-                console.log("new comment value", value);
-                console.log("previous value", this.lastRecordedContent);
-                this.lastRecordedContent = value;
+  name: "Comment",
+  components: {
+    CommentEditor,
+  },
+  data() {
+    return {
+      loading: false,
+      lastRecordedContent: null,
+    };
+  },
+  computed: {
+    ...mapState({
+      pinnedComment: (state) => state.accompanyingCourse.pinnedComment,
+    }),
+    classicEditor: () => ClassicEditor,
+    editorConfig: () => classicEditorConfig,
+    content: {
+      set(value) {
+        console.log("new comment value", value);
+        console.log("previous value", this.lastRecordedContent);
+        this.lastRecordedContent = value;
 
-                setTimeout(() => {
-                    console.log("performing test on ", value);
-                    if (this.lastRecordedContent === value) {
-                        this.loading = true;
-                        if (value !== "") {
-                            this.$store
-                                .dispatch("updatePinnedComment", value)
-                                .then(() => {
-                                    this.loading = false;
-                                })
-                                .catch(({ name, violations }) => {
-                                    if (
-                                        name === "ValidationException" ||
-                                        name === "AccessException"
-                                    ) {
-                                        violations.forEach((violation) =>
-                                            this.$toast.open({
-                                                message: violation,
-                                            }),
-                                        );
-                                    } else {
-                                        this.$toast.open({
-                                            message: "An error occurred",
-                                        });
-                                    }
-                                });
-                        } else {
-                            if (
-                                this.$store.state.accompanyingCourse
-                                    .pinnedComment !== null
-                            ) {
-                                this.$store
-                                    .dispatch("removePinnedComment", {
-                                        id: this.pinnedComment.id,
-                                    })
-                                    .then(() => {
-                                        this.loading = false;
-                                        this.lastRecoredContent = null;
-                                    })
-                                    .catch(({ name, violations }) => {
-                                        if (
-                                            name === "ValidationException" ||
-                                            name === "AccessException"
-                                        ) {
-                                            violations.forEach((violation) =>
-                                                this.$toast.open({
-                                                    message: violation,
-                                                }),
-                                            );
-                                        } else {
-                                            this.$toast.open({
-                                                message: "An error occurred",
-                                            });
-                                        }
-                                    });
-                            }
-                        }
-                    }
-                }, 3000);
-            },
-            get() {
-                return this.pinnedComment ? this.pinnedComment.content : "";
-            },
-        },
-        errors() {
-            return this.$store.state.errorMsg;
-        },
-    },
-    methods: {
-        removeComment() {
-            this.$store
-                .dispatch("removePinnedComment", { id: this.pinnedComment.id })
+        setTimeout(() => {
+          console.log("performing test on ", value);
+          if (this.lastRecordedContent === value) {
+            this.loading = true;
+            if (value !== "") {
+              this.$store
+                .dispatch("updatePinnedComment", value)
+                .then(() => {
+                  this.loading = false;
+                })
                 .catch(({ name, violations }) => {
-                    if (
-                        name === "ValidationException" ||
-                        name === "AccessException"
-                    ) {
-                        violations.forEach((violation) =>
-                            this.$toast.open({ message: violation }),
-                        );
-                    } else {
-                        this.$toast.open({ message: "An error occurred" });
-                    }
+                  if (
+                    name === "ValidationException" ||
+                    name === "AccessException"
+                  ) {
+                    violations.forEach((violation) =>
+                      this.$toast.open({
+                        message: violation,
+                      }),
+                    );
+                  } else {
+                    this.$toast.open({
+                      message: "An error occurred",
+                    });
+                  }
                 });
-        },
+            } else {
+              if (this.$store.state.accompanyingCourse.pinnedComment !== null) {
+                this.$store
+                  .dispatch("removePinnedComment", {
+                    id: this.pinnedComment.id,
+                  })
+                  .then(() => {
+                    this.loading = false;
+                    this.lastRecoredContent = null;
+                  })
+                  .catch(({ name, violations }) => {
+                    if (
+                      name === "ValidationException" ||
+                      name === "AccessException"
+                    ) {
+                      violations.forEach((violation) =>
+                        this.$toast.open({
+                          message: violation,
+                        }),
+                      );
+                    } else {
+                      this.$toast.open({
+                        message: "An error occurred",
+                      });
+                    }
+                  });
+              }
+            }
+          }
+        }, 3000);
+      },
+      get() {
+        return this.pinnedComment ? this.pinnedComment.content : "";
+      },
     },
+    errors() {
+      return this.$store.state.errorMsg;
+    },
+  },
+  methods: {
+    removeComment() {
+      this.$store
+        .dispatch("removePinnedComment", { id: this.pinnedComment.id })
+        .catch(({ name, violations }) => {
+          if (name === "ValidationException" || name === "AccessException") {
+            violations.forEach((violation) =>
+              this.$toast.open({ message: violation }),
+            );
+          } else {
+            this.$toast.open({ message: "An error occurred" });
+          }
+        });
+    },
+  },
 };
 </script>
 
 <style lang="scss">
 div.ck-editor.ck-reset {
-    margin: 0.6em 0;
+  margin: 0.6em 0;
 }
 div.sub-comment {
-    display: flex;
-    justify-content: space-between;
-    div.loading {
-        margin-right: 6px;
-        margin-left: 6px;
-    }
+  display: flex;
+  justify-content: space-between;
+  div.loading {
+    margin-right: 6px;
+    margin-left: 6px;
+  }
 }
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue
index 408852711..3ce902daa 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue
@@ -1,127 +1,120 @@
 <template>
-    <div class="vue-component">
-        <h2>
-            <a id="section-110" />
-            {{ $t("confirm.title") }}
-        </h2>
-        <div>
-            <p v-html="$t('confirm.text_draft', [$t('course.step.draft')])" />
+  <div class="vue-component">
+    <h2>
+      <a id="section-110" />
+      {{ $t("confirm.title") }}
+    </h2>
+    <div>
+      <p v-html="$t('confirm.text_draft', [$t('course.step.draft')])" />
 
-            <div v-if="!isValidToBeConfirmed">
-                <div class="alert alert-warning">
-                    {{ $t("confirm.alert_validation") }}
-                    <ul class="mt-2">
-                        <li v-for="k in validationKeys" :key="k">
-                            {{ $t(notValidMessages[k].msg) }}
-                            <a :href="notValidMessages[k].anchor">
-                                <i class="fa fa-level-up fa-fw" />
-                            </a>
-                        </li>
-                    </ul>
-                </div>
-                <ul class="record_actions">
-                    <li>
-                        <button class="btn btn-save" disabled>
-                            {{ $t("confirm.ok") }}
-                        </button>
-                    </li>
-                    <li>
-                        <a class="btn btn-delete" :href="deleteLink">
-                            {{ $t("confirm.delete") }}
-                        </a>
-                    </li>
-                </ul>
-            </div>
-
-            <div v-else>
-                <p
-                    v-html="
-                        $t('confirm.text_active', [$t('course.step.active')])
-                    "
-                />
-                <ul class="record_actions">
-                    <li>
-                        <button
-                            class="btn btn-save"
-                            @click="modal.showModal = true"
-                        >
-                            {{ $t("confirm.ok") }}
-                        </button>
-                    </li>
-                    <li>
-                        <a class="btn btn-delete" :href="deleteLink">
-                            {{ $t("confirm.delete") }}
-                        </a>
-                    </li>
-                </ul>
-            </div>
+      <div v-if="!isValidToBeConfirmed">
+        <div class="alert alert-warning">
+          {{ $t("confirm.alert_validation") }}
+          <ul class="mt-2">
+            <li v-for="k in validationKeys" :key="k">
+              {{ $t(notValidMessages[k].msg) }}
+              <a :href="notValidMessages[k].anchor">
+                <i class="fa fa-level-up fa-fw" />
+              </a>
+            </li>
+          </ul>
         </div>
+        <ul class="record_actions">
+          <li>
+            <button class="btn btn-save" disabled>
+              {{ $t("confirm.ok") }}
+            </button>
+          </li>
+          <li>
+            <a class="btn btn-delete" :href="deleteLink">
+              {{ $t("confirm.delete") }}
+            </a>
+          </li>
+        </ul>
+      </div>
 
-        <teleport to="body">
-            <modal
-                v-if="modal.showModal"
-                :modal-dialog-class="modal.modalDialogClass"
-                @close="modal.showModal = false"
-            >
-                <template #header>
-                    <h2 class="modal-title">
-                        {{ $t("confirm.sure") }}
-                    </h2>
-                </template>
-                <template #body>
-                    <p>{{ $t("confirm.sure_description") }}</p>
-                    <div v-if="accompanyingCourse.user === null">
-                        <div v-if="usersSuggestedFilteredByJob.length === 0">
-                            <p class="alert alert-warning">
-                                {{ $t("confirm.no_suggested_referrer") }}
-                            </p>
-                        </div>
-                        <div
-                            v-if="usersSuggestedFilteredByJob.length === 1"
-                            class="alert alert-info"
-                        >
-                            <p>{{ $t("confirm.one_suggested_referrer") }}:</p>
-                            <ul class="list-suggest add-items inline">
-                                <li>
-                                    <user-render-box-badge
-                                        :user="usersSuggestedFilteredByJob[0]"
-                                    />
-                                </li>
-                            </ul>
-                            <p>{{ $t("confirm.choose_suggested_referrer") }}</p>
-                            <ul class="record_actions">
-                                <li>
-                                    <button
-                                        class="btn btn-save mr-5"
-                                        @click="chooseSuggestedReferrer"
-                                    >
-                                        {{ $t("confirm.choose_button") }}
-                                    </button>
-                                </li>
-                                <li>
-                                    <button
-                                        class="btn btn-secondary"
-                                        @click="doNotChooseSuggestedReferrer"
-                                    >
-                                        {{ $t("confirm.do_not_choose_button") }}
-                                    </button>
-                                </li>
-                            </ul>
-                        </div>
-                    </div>
-                </template>
-                <template #footer>
-                    <button
-                        class="btn btn-danger"
-                        :disabled="disableConfirm"
-                        @click="confirmCourse"
-                    >
-                        {{ $t("confirm.ok") }}
-                    </button>
-                </template>
-            </modal>
-        </teleport>
+      <div v-else>
+        <p v-html="$t('confirm.text_active', [$t('course.step.active')])" />
+        <ul class="record_actions">
+          <li>
+            <button class="btn btn-save" @click="modal.showModal = true">
+              {{ $t("confirm.ok") }}
+            </button>
+          </li>
+          <li>
+            <a class="btn btn-delete" :href="deleteLink">
+              {{ $t("confirm.delete") }}
+            </a>
+          </li>
+        </ul>
+      </div>
     </div>
+
+    <teleport to="body">
+      <modal
+        v-if="modal.showModal"
+        :modal-dialog-class="modal.modalDialogClass"
+        @close="modal.showModal = false"
+      >
+        <template #header>
+          <h2 class="modal-title">
+            {{ $t("confirm.sure") }}
+          </h2>
+        </template>
+        <template #body>
+          <p>{{ $t("confirm.sure_description") }}</p>
+          <div v-if="accompanyingCourse.user === null">
+            <div v-if="usersSuggestedFilteredByJob.length === 0">
+              <p class="alert alert-warning">
+                {{ $t("confirm.no_suggested_referrer") }}
+              </p>
+            </div>
+            <div
+              v-if="usersSuggestedFilteredByJob.length === 1"
+              class="alert alert-info"
+            >
+              <p>{{ $t("confirm.one_suggested_referrer") }}:</p>
+              <ul class="list-suggest add-items inline">
+                <li>
+                  <user-render-box-badge
+                    :user="usersSuggestedFilteredByJob[0]"
+                  />
+                </li>
+              </ul>
+              <p>{{ $t("confirm.choose_suggested_referrer") }}</p>
+              <ul class="record_actions">
+                <li>
+                  <button
+                    class="btn btn-save mr-5"
+                    @click="chooseSuggestedReferrer"
+                  >
+                    {{ $t("confirm.choose_button") }}
+                  </button>
+                </li>
+                <li>
+                  <button
+                    class="btn btn-secondary"
+                    @click="doNotChooseSuggestedReferrer"
+                  >
+                    {{ $t("confirm.do_not_choose_button") }}
+                  </button>
+                </li>
+              </ul>
+            </div>
+          </div>
+        </template>
+        <template #footer>
+          <button
+            class="btn btn-danger"
+            :disabled="disableConfirm"
+            @click="confirmCourse"
+          >
+            {{ $t("confirm.ok") }}
+          </button>
+        </template>
+      </modal>
+    </teleport>
+  </div>
 </template>
 
 <script>
@@ -130,112 +123,106 @@ import Modal from "ChillMainAssets/vuejs/_components/Modal";
 import UserRenderBoxBadge from "ChillMainAssets/vuejs/_components/Entity/UserRenderBoxBadge";
 
 export default {
-    name: "Confirm",
-    components: {
-        Modal,
-        UserRenderBoxBadge,
-    },
-    data() {
-        return {
-            modal: {
-                showModal: false,
-                modalDialogClass: "modal-dialog-centered modal-md",
-            },
-            notValidMessages: {
-                participation: {
-                    msg: "confirm.participation_not_valid",
-                    anchor: "#section-10",
-                },
-                location: {
-                    msg: "confirm.location_not_valid",
-                    anchor: "#section-20",
-                },
-                origin: {
-                    msg: "confirm.origin_not_valid",
-                    anchor: "#section-30",
-                },
-                adminLocation: {
-                    msg: "confirm.adminLocation_not_valid",
-                    anchor: "#section-40",
-                },
-                socialIssue: {
-                    msg: "confirm.socialIssue_not_valid",
-                    anchor: "#section-60",
-                },
-                scopes: {
-                    msg: "confirm.set_a_scope",
-                    anchor: "#section-70",
-                },
-                job: {
-                    msg: "confirm.job_not_valid",
-                    anchor: "#section-80",
-                },
-            },
-            clickedDoNotChooseReferrer: false,
-        };
-    },
-    computed: {
-        ...mapState({
-            accompanyingCourse: (state) => state.accompanyingCourse,
-        }),
-        ...mapGetters([
-            "isParticipationValid",
-            "isSocialIssueValid",
-            "isOriginValid",
-            "isAdminLocationValid",
-            "isLocationValid",
-            "isJobValid",
-            "validationKeys",
-            "isValidToBeConfirmed",
-            "usersSuggestedFilteredByJob",
-        ]),
-        deleteLink() {
-            return `/fr/parcours/${this.accompanyingCourse.id}/delete`; //TODO locale
+  name: "Confirm",
+  components: {
+    Modal,
+    UserRenderBoxBadge,
+  },
+  data() {
+    return {
+      modal: {
+        showModal: false,
+        modalDialogClass: "modal-dialog-centered modal-md",
+      },
+      notValidMessages: {
+        participation: {
+          msg: "confirm.participation_not_valid",
+          anchor: "#section-10",
         },
-        disableConfirm() {
-            return (
-                this.accompanyingCourse.user === null &&
-                this.usersSuggestedFilteredByJob.length === 1 &&
-                this.clickedDoNotChooseReferrer === false
+        location: {
+          msg: "confirm.location_not_valid",
+          anchor: "#section-20",
+        },
+        origin: {
+          msg: "confirm.origin_not_valid",
+          anchor: "#section-30",
+        },
+        adminLocation: {
+          msg: "confirm.adminLocation_not_valid",
+          anchor: "#section-40",
+        },
+        socialIssue: {
+          msg: "confirm.socialIssue_not_valid",
+          anchor: "#section-60",
+        },
+        scopes: {
+          msg: "confirm.set_a_scope",
+          anchor: "#section-70",
+        },
+        job: {
+          msg: "confirm.job_not_valid",
+          anchor: "#section-80",
+        },
+      },
+      clickedDoNotChooseReferrer: false,
+    };
+  },
+  computed: {
+    ...mapState({
+      accompanyingCourse: (state) => state.accompanyingCourse,
+    }),
+    ...mapGetters([
+      "isParticipationValid",
+      "isSocialIssueValid",
+      "isOriginValid",
+      "isAdminLocationValid",
+      "isLocationValid",
+      "isJobValid",
+      "validationKeys",
+      "isValidToBeConfirmed",
+      "usersSuggestedFilteredByJob",
+    ]),
+    deleteLink() {
+      return `/fr/parcours/${this.accompanyingCourse.id}/delete`; //TODO locale
+    },
+    disableConfirm() {
+      return (
+        this.accompanyingCourse.user === null &&
+        this.usersSuggestedFilteredByJob.length === 1 &&
+        this.clickedDoNotChooseReferrer === false
+      );
+    },
+  },
+  methods: {
+    confirmCourse() {
+      this.$store
+        .dispatch("confirmAccompanyingCourse")
+        .catch(({ name, violations }) => {
+          if (name === "ValidationException" || name === "AccessException") {
+            violations.forEach((violation) =>
+              this.$toast.open({ message: violation }),
             );
-        },
+          } else {
+            this.$toast.open({ message: "An error occurred" });
+          }
+        });
     },
-    methods: {
-        confirmCourse() {
-            this.$store
-                .dispatch("confirmAccompanyingCourse")
-                .catch(({ name, violations }) => {
-                    if (
-                        name === "ValidationException" ||
-                        name === "AccessException"
-                    ) {
-                        violations.forEach((violation) =>
-                            this.$toast.open({ message: violation }),
-                        );
-                    } else {
-                        this.$toast.open({ message: "An error occurred" });
-                    }
-                });
-        },
-        chooseSuggestedReferrer() {
-            this.$store
-                .dispatch("updateReferrer", this.usersSuggestedFilteredByJob[0])
-                .catch(({ name, violations }) => {
-                    if (
-                        name === "ValidationException" ||
-                        name === "AccessException"
-                    ) {
-                        violations.forEach((violation) =>
-                            this.$toast.open({ message: violation }),
-                        );
-                    } else {
-                        this.$toast.open({ message: "An error occurred" });
-                    }
-                });
-        },
-        doNotChooseSuggestedReferrer() {
-            this.clickedDoNotChooseReferrer = true;
-        },
+    chooseSuggestedReferrer() {
+      this.$store
+        .dispatch("updateReferrer", this.usersSuggestedFilteredByJob[0])
+        .catch(({ name, violations }) => {
+          if (name === "ValidationException" || name === "AccessException") {
+            violations.forEach((violation) =>
+              this.$toast.open({ message: violation }),
+            );
+          } else {
+            this.$toast.open({ message: "An error occurred" });
+          }
+        });
     },
+    doNotChooseSuggestedReferrer() {
+      this.clickedDoNotChooseReferrer = true;
+    },
+  },
 };
 </script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
index f781eca0b..af985e502 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/CourseLocation.vue
@@ -1,95 +1,85 @@
 <template>
-    <div class="vue-component">
-        <h2>
-            <a id="section-20" />
-            {{ $t("courselocation.title") }}
-        </h2>
+  <div class="vue-component">
+    <h2>
+      <a id="section-20" />
+      {{ $t("courselocation.title") }}
+    </h2>
 
-        <div
-            v-for="error in displayErrors"
-            class="alert alert-danger my-2"
-            :key="error"
-        >
-            {{ error }}
-        </div>
-
-        <div v-if="hasNoLocation">
-            <label class="chill-no-data-statement">
-                {{ $t("courselocation.no_address") }}
-            </label>
-        </div>
-
-        <div class="flex-table" v-if="accompanyingCourse.location">
-            <div class="item-bloc">
-                <address-render-box :address="accompanyingCourse.location" />
-
-                <div
-                    v-if="isPersonLocation"
-                    class="alert alert-secondary separator"
-                >
-                    <label class="col-form-label">
-                        {{
-                            $t("courselocation.person_locator", [
-                                accompanyingCourse.personLocation.text,
-                            ])
-                        }}
-                    </label>
-                </div>
-
-                <div
-                    v-if="isTemporaryAddress"
-                    class="alert alert-warning separator"
-                >
-                    <p>
-                        {{
-                            $t(
-                                "courselocation.temporary_address_must_be_changed",
-                            )
-                        }}
-                        <i class="fa fa-fw fa-map-marker" />
-                    </p>
-                </div>
-            </div>
-        </div>
-
-        <div
-            v-if="hasNoPersonLocation"
-            class="alert alert-danger no-person-location"
-        >
-            <i class="fa fa-warning fa-2x" />
-            <div>
-                <p>
-                    {{
-                        $t(
-                            "courselocation.associate_at_least_one_person_with_one_household_with_address",
-                        )
-                    }}
-                    <a href="#section-10">
-                        <i class="fa fa-level-up fa-fw" />
-                    </a>
-                </p>
-            </div>
-        </div>
-
-        <div>
-            <ul class="record_actions">
-                <li>
-                    <add-address
-                        v-if="!isPersonLocation"
-                        :key="key"
-                        :context="context"
-                        :options="options"
-                        :address-changed-callback="submitTemporaryAddress"
-                        ref="addAddress"
-                    />
-                </li>
-            </ul>
-        </div>
-
-        <div v-if="!isLocationValid" class="alert alert-warning to-confirm">
-            {{ $t("courselocation.not_valid") }}
-        </div>
+    <div
+      v-for="error in displayErrors"
+      class="alert alert-danger my-2"
+      :key="error"
+    >
+      {{ error }}
     </div>
+
+    <div v-if="hasNoLocation">
+      <label class="chill-no-data-statement">
+        {{ $t("courselocation.no_address") }}
+      </label>
+    </div>
+
+    <div class="flex-table" v-if="accompanyingCourse.location">
+      <div class="item-bloc">
+        <address-render-box :address="accompanyingCourse.location" />
+
+        <div v-if="isPersonLocation" class="alert alert-secondary separator">
+          <label class="col-form-label">
+            {{
+              $t("courselocation.person_locator", [
+                accompanyingCourse.personLocation.text,
+              ])
+            }}
+          </label>
+        </div>
+
+        <div v-if="isTemporaryAddress" class="alert alert-warning separator">
+          <p>
+            {{ $t("courselocation.temporary_address_must_be_changed") }}
+            <i class="fa fa-fw fa-map-marker" />
+          </p>
+        </div>
+      </div>
+    </div>
+
+    <div
+      v-if="hasNoPersonLocation"
+      class="alert alert-danger no-person-location"
+    >
+      <i class="fa fa-warning fa-2x" />
+      <div>
+        <p>
+          {{
+            $t(
+              "courselocation.associate_at_least_one_person_with_one_household_with_address",
+            )
+          }}
+          <a href="#section-10">
+            <i class="fa fa-level-up fa-fw" />
+          </a>
+        </p>
+      </div>
+    </div>
+
+    <div>
+      <ul class="record_actions">
+        <li>
+          <add-address
+            v-if="!isPersonLocation"
+            :key="key"
+            :context="context"
+            :options="options"
+            :address-changed-callback="submitTemporaryAddress"
+            ref="addAddress"
+          />
+        </li>
+      </ul>
+    </div>
+
+    <div v-if="!isLocationValid" class="alert alert-warning to-confirm">
+      {{ $t("courselocation.not_valid") }}
+    </div>
+  </div>
 </template>
 
 <script>
@@ -98,177 +88,171 @@ import AddAddress from "ChillMainAssets/vuejs/Address/components/AddAddress.vue"
 import AddressRenderBox from "ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue";
 
 export default {
-    name: "CourseLocation",
-    components: {
-        AddAddress,
-        AddressRenderBox,
-    },
-    data() {
-        return {
-            addAddress: {
-                options: {
-                    button: {
-                        text: {
-                            create: "courselocation.add_temporary_address",
-                            edit: "courselocation.edit_temporary_address",
-                        },
-                    },
-                    title: {
-                        create: "courselocation.add_temporary_address",
-                        edit: "courselocation.edit_temporary_address",
-                    },
-                    onlyButton: true,
-                },
+  name: "CourseLocation",
+  components: {
+    AddAddress,
+    AddressRenderBox,
+  },
+  data() {
+    return {
+      addAddress: {
+        options: {
+          button: {
+            text: {
+              create: "courselocation.add_temporary_address",
+              edit: "courselocation.edit_temporary_address",
             },
-        };
+          },
+          title: {
+            create: "courselocation.add_temporary_address",
+            edit: "courselocation.edit_temporary_address",
+          },
+          onlyButton: true,
+        },
+      },
+    };
+  },
+  computed: {
+    ...mapState({
+      accompanyingCourse: (state) => state.accompanyingCourse,
+      context: (state) => state.addressContext,
+    }),
+    ...mapGetters(["isLocationValid"]),
+    options() {
+      return this.addAddress.options;
     },
-    computed: {
-        ...mapState({
-            accompanyingCourse: (state) => state.accompanyingCourse,
-            context: (state) => state.addressContext,
-        }),
-        ...mapGetters(["isLocationValid"]),
-        options() {
-            return this.addAddress.options;
+    key() {
+      return this.context.edit
+        ? "address_" + this.context.addressId
+        : this.accompanyingCourse.type + "_" + this.accompanyingCourse.id;
+    },
+    isTemporaryAddress() {
+      return this.accompanyingCourse.locationStatus === "address";
+    },
+    isPersonLocation() {
+      return this.accompanyingCourse.locationStatus === "person";
+    },
+    hasNoLocation() {
+      return this.accompanyingCourse.locationStatus === "none";
+    },
+    currentParticipations() {
+      return this.accompanyingCourse.participations.filter(
+        (p) => p.enddate !== null,
+      );
+    },
+    hasNoPersonLocation() {
+      let addressInParticipations_ = [];
+      this.currentParticipations.forEach((p) => {
+        addressInParticipations_.push(
+          this.checkHouseholdAddressForParticipation(p),
+        );
+      });
+
+      const booleanReducer = (previousValue, currentValue) =>
+        previousValue || currentValue;
+
+      let addressInParticipations =
+        addressInParticipations_.length > 0
+          ? addressInParticipations_.reduce(booleanReducer)
+          : false;
+
+      //console.log(addressInParticipations_, addressInParticipations);
+      return (
+        this.accompanyingCourse.step !== "DRAFT" &&
+        this.isTemporaryAddress &&
+        !addressInParticipations
+      );
+    },
+    isContextEdit() {
+      return this.context.edit;
+    },
+  },
+  methods: {
+    checkHouseholdAddressForParticipation(participation) {
+      if (participation.person.current_household_id === null) {
+        return false;
+      }
+      return participation.person.current_household_address !== null;
+    },
+    initAddressContext() {
+      let context = {
+        target: {
+          name: this.accompanyingCourse.type,
+          id: this.accompanyingCourse.id,
         },
-        key() {
-            return this.context.edit
-                ? "address_" + this.context.addressId
-                : this.accompanyingCourse.type +
-                      "_" +
-                      this.accompanyingCourse.id;
-        },
-        isTemporaryAddress() {
-            return this.accompanyingCourse.locationStatus === "address";
-        },
-        isPersonLocation() {
-            return this.accompanyingCourse.locationStatus === "person";
-        },
-        hasNoLocation() {
-            return this.accompanyingCourse.locationStatus === "none";
-        },
-        currentParticipations() {
-            return this.accompanyingCourse.participations.filter(
-                (p) => p.enddate !== null,
+        edit: false,
+        addressId: null,
+        defaults: window.addaddress,
+      };
+      if (this.accompanyingCourse.location) {
+        context["edit"] = true;
+        context["addressId"] = this.accompanyingCourse.location.address_id;
+      }
+      this.$store.commit("setAddressContext", context);
+    },
+    displayErrors() {
+      return this.$refs.addAddress.errorMsg;
+    },
+    submitTemporaryAddress(payload) {
+      //console.log('@@@ click on Submit Temporary Address Button', payload);
+      payload["locationStatusTo"] = "address"; // <== temporary, not none, not person
+      this.$store
+        .dispatch("updateLocation", payload)
+        .catch(({ name, violations }) => {
+          if (name === "ValidationException" || name === "AccessException") {
+            violations.forEach((violation) =>
+              this.$toast.open({ message: violation }),
             );
-        },
-        hasNoPersonLocation() {
-            let addressInParticipations_ = [];
-            this.currentParticipations.forEach((p) => {
-                addressInParticipations_.push(
-                    this.checkHouseholdAddressForParticipation(p),
-                );
-            });
+          } else {
+            this.$toast.open({ message: "An error occurred" });
+          }
+        });
 
-            const booleanReducer = (previousValue, currentValue) =>
-                previousValue || currentValue;
-
-            let addressInParticipations =
-                addressInParticipations_.length > 0
-                    ? addressInParticipations_.reduce(booleanReducer)
-                    : false;
-
-            //console.log(addressInParticipations_, addressInParticipations);
-            return (
-                this.accompanyingCourse.step !== "DRAFT" &&
-                this.isTemporaryAddress &&
-                !addressInParticipations
-            );
-        },
-        isContextEdit() {
-            return this.context.edit;
-        },
+      this.$store.commit("setEditContextTrue", payload);
     },
-    methods: {
-        checkHouseholdAddressForParticipation(participation) {
-            if (participation.person.current_household_id === null) {
-                return false;
-            }
-            return participation.person.current_household_address !== null;
-        },
-        initAddressContext() {
-            let context = {
-                target: {
-                    name: this.accompanyingCourse.type,
-                    id: this.accompanyingCourse.id,
-                },
-                edit: false,
-                addressId: null,
-                defaults: window.addaddress,
-            };
-            if (this.accompanyingCourse.location) {
-                context["edit"] = true;
-                context["addressId"] =
-                    this.accompanyingCourse.location.address_id;
-            }
-            this.$store.commit("setAddressContext", context);
-        },
-        displayErrors() {
-            return this.$refs.addAddress.errorMsg;
-        },
-        submitTemporaryAddress(payload) {
-            //console.log('@@@ click on Submit Temporary Address Button', payload);
-            payload["locationStatusTo"] = "address"; // <== temporary, not none, not person
-            this.$store
-                .dispatch("updateLocation", payload)
-                .catch(({ name, violations }) => {
-                    if (
-                        name === "ValidationException" ||
-                        name === "AccessException"
-                    ) {
-                        violations.forEach((violation) =>
-                            this.$toast.open({ message: violation }),
-                        );
-                    } else {
-                        this.$toast.open({ message: "An error occurred" });
-                    }
-                });
+  },
+  created() {
+    this.initAddressContext();
 
-            this.$store.commit("setEditContextTrue", payload);
-        },
-    },
-    created() {
-        this.initAddressContext();
-
-        //console.log('ac.locationStatus', this.accompanyingCourse.locationStatus);
-        //console.log('ac.location (temporary location)', this.accompanyingCourse.location);
-        //console.log('ac.personLocation', this.accompanyingCourse.personLocation);
-    },
+    //console.log('ac.locationStatus', this.accompanyingCourse.locationStatus);
+    //console.log('ac.location (temporary location)', this.accompanyingCourse.location);
+    //console.log('ac.personLocation', this.accompanyingCourse.personLocation);
+  },
 };
 </script>
 <style lang="scss" scoped>
 div#accompanying-course {
-    div.vue-component {
-        & > div.alert.no-person-location {
-            margin: 1px 0 0;
-        }
-        div.no-person-location {
-            padding-top: 1.5em;
-            display: flex;
-            flex-direction: row;
-            & > i {
-                flex-basis: 1.5em;
-                flex-grow: 0;
-                flex-shrink: 0;
-                padding-top: 0.2em;
-                opacity: 0.75;
-            }
-            & > div {
-                flex-basis: auto;
-                div.action {
-                    button.btn-update {
-                        margin-right: 2em;
-                    }
-                }
-            }
-        }
-        div.flex-table {
-            div.item-bloc {
-                div.alert {
-                    margin: 0 -0.9em -1em;
-                }
-            }
-        }
+  div.vue-component {
+    & > div.alert.no-person-location {
+      margin: 1px 0 0;
     }
+    div.no-person-location {
+      padding-top: 1.5em;
+      display: flex;
+      flex-direction: row;
+      & > i {
+        flex-basis: 1.5em;
+        flex-grow: 0;
+        flex-shrink: 0;
+        padding-top: 0.2em;
+        opacity: 0.75;
+      }
+      & > div {
+        flex-basis: auto;
+        div.action {
+          button.btn-update {
+            margin-right: 2em;
+          }
+        }
+      }
+    }
+    div.flex-table {
+      div.item-bloc {
+        div.alert {
+          margin: 0 -0.9em -1em;
+        }
+      }
+    }
+  }
 }
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/OriginDemand.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/OriginDemand.vue
index 641c9ef37..053eb058f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/OriginDemand.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/OriginDemand.vue
@@ -1,33 +1,33 @@
 <template>
-    <div class="vue-component">
-        <h2><a id="section-30" />{{ $t("origin.title") }}</h2>
+  <div class="vue-component">
+    <h2><a id="section-30" />{{ $t("origin.title") }}</h2>
 
-        <div class="mb-4">
-            <label for="selectOrigin">
-                {{ $t("origin.title") }}
-            </label>
+    <div class="mb-4">
+      <label for="selectOrigin">
+        {{ $t("origin.title") }}
+      </label>
 
-            <VueMultiselect
-                name="selectOrigin"
-                label="text"
-                :custom-label="transText"
-                track-by="id"
-                :multiple="false"
-                :searchable="true"
-                :placeholder="$t('origin.placeholder')"
-                v-model="value"
-                :options="options"
-                :select-label="$t('multiselect.select_label')"
-                :deselect-label="$t('multiselect.deselect_label')"
-                :selected-label="$t('multiselect.selected_label')"
-                @select="updateOrigin"
-            />
-        </div>
-
-        <div v-if="!isOriginValid" class="alert alert-warning to-confirm">
-            {{ $t("origin.not_valid") }}
-        </div>
+      <VueMultiselect
+        name="selectOrigin"
+        label="text"
+        :custom-label="transText"
+        track-by="id"
+        :multiple="false"
+        :searchable="true"
+        :placeholder="$t('origin.placeholder')"
+        v-model="value"
+        :options="options"
+        :select-label="$t('multiselect.select_label')"
+        :deselect-label="$t('multiselect.deselect_label')"
+        :selected-label="$t('multiselect.selected_label')"
+        @select="updateOrigin"
+      />
     </div>
+
+    <div v-if="!isOriginValid" class="alert alert-warning to-confirm">
+      {{ $t("origin.not_valid") }}
+    </div>
+  </div>
 </template>
 
 <script>
@@ -36,61 +36,58 @@ import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
 import { mapState, mapGetters } from "vuex";
 
 export default {
-    name: "OriginDemand",
-    components: { VueMultiselect },
-    data() {
-        return {
-            options: [],
-        };
+  name: "OriginDemand",
+  components: { VueMultiselect },
+  data() {
+    return {
+      options: [],
+    };
+  },
+  computed: {
+    ...mapState({
+      value: (state) => state.accompanyingCourse.origin,
+    }),
+    ...mapGetters(["isOriginValid"]),
+  },
+  mounted() {
+    this.getOptions();
+  },
+  methods: {
+    getOptions() {
+      const url = `/api/1.0/person/accompanying-period/origin.json`;
+      makeFetch("GET", url)
+        .then((response) => {
+          this.options = response.results;
+          return response;
+        })
+        .catch((error) => {
+          commit("catchError", error);
+          this.$toast.open({ message: error.txt });
+        });
     },
-    computed: {
-        ...mapState({
-            value: (state) => state.accompanyingCourse.origin,
-        }),
-        ...mapGetters(["isOriginValid"]),
+    updateOrigin(value) {
+      this.$store
+        .dispatch("updateOrigin", value)
+        .catch(({ name, violations }) => {
+          if (name === "ValidationException" || name === "AccessException") {
+            violations.forEach((violation) =>
+              this.$toast.open({ message: violation }),
+            );
+          } else {
+            this.$toast.open({ message: "An error occurred" });
+          }
+        });
     },
-    mounted() {
-        this.getOptions();
-    },
-    methods: {
-        getOptions() {
-            const url = `/api/1.0/person/accompanying-period/origin.json`;
-            makeFetch("GET", url)
-                .then((response) => {
-                    this.options = response.results;
-                    return response;
-                })
-                .catch((error) => {
-                    commit("catchError", error);
-                    this.$toast.open({ message: error.txt });
-                });
-        },
-        updateOrigin(value) {
-            this.$store
-                .dispatch("updateOrigin", value)
-                .catch(({ name, violations }) => {
-                    if (
-                        name === "ValidationException" ||
-                        name === "AccessException"
-                    ) {
-                        violations.forEach((violation) =>
-                            this.$toast.open({ message: violation }),
-                        );
-                    } else {
-                        this.$toast.open({ message: "An error occurred" });
-                    }
-                });
-        },
-        transText({ text }) {
-            return text.fr;
-        },
+    transText({ text }) {
+      return text.fr;
     },
+  },
 };
 </script>
 
 <style src="vue-multiselect/dist/vue-multiselect.css"></style>
 <style lang="css" scoped>
 label {
-    display: none;
+  display: none;
 }
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
index d6979928b..b4e0e70b8 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
@@ -1,121 +1,106 @@
 <template>
-    <div class="vue-component">
-        <h2><a id="section-10" />{{ $t("persons_associated.title") }}</h2>
+  <div class="vue-component">
+    <h2><a id="section-10" />{{ $t("persons_associated.title") }}</h2>
 
-        <div v-if="currentParticipations.length > 0">
-            <label class="col-form-label">{{
-                $tc("persons_associated.counter", counter)
-            }}</label>
-        </div>
-        <div v-else>
-            <label class="chill-no-data-statement">{{
-                $tc("persons_associated.counter", counter)
-            }}</label>
-        </div>
-
-        <div
-            v-if="participationWithoutHousehold.length > 0"
-            class="alert alert-warning no-household"
-        >
-            <i class="fa fa-warning fa-2x" />
-            <form method="GET" action="/fr/person/household/members/editor">
-                <div class="float-button bottom">
-                    <div class="box">
-                        <div class="action">
-                            <button class="btn btn-update" type="submit">
-                                {{ $t("persons_associated.update_household") }}
-                            </button>
-                        </div>
-                        <p class="mb-3">
-                            {{
-                                $t(
-                                    "persons_associated.person_without_household_warning",
-                                )
-                            }}
-                        </p>
-                        <div
-                            class="form-check"
-                            v-for="p in participationWithoutHousehold"
-                            :key="p.id"
-                        >
-                            <input
-                                type="checkbox"
-                                class="form-check-input"
-                                name="persons[]"
-                                checked="checked"
-                                :id="p.person.id"
-                                :value="p.person.id"
-                            />
-                            <label class="form-check-label">
-                                <person-text :person="p.person" />
-                            </label>
-                        </div>
-                        <input
-                            type="hidden"
-                            name="expand_suggestions"
-                            value="true"
-                        />
-                        <input
-                            type="hidden"
-                            name="returnPath"
-                            :value="getReturnPath"
-                        />
-                        <input
-                            type="hidden"
-                            name="accompanying_period_id"
-                            :value="courseId"
-                        />
-                    </div>
-                </div>
-            </form>
-        </div>
-
-        <div class="flex-table mb-3">
-            <participation-item
-                v-for="participation in currentParticipations"
-                :participation="participation"
-                :key="participation.id"
-                @remove="removeParticipation"
-                @close="closeParticipation"
-            />
-        </div>
-
-        <div v-if="suggestedPersons.length > 0">
-            <ul class="list-suggest add-items inline">
-                <li
-                    v-for="p in suggestedPersons"
-                    :key="p.id"
-                    @click="addSuggestedPerson(p)"
-                >
-                    <person-text :person="p" />
-                </li>
-            </ul>
-        </div>
-
-        <div>
-            <ul class="record_actions">
-                <li class="add-persons">
-                    <add-persons
-                        button-title="persons_associated.add_persons"
-                        modal-title="add_persons.title"
-                        :key="addPersons.key"
-                        :options="addPersons.options"
-                        @add-new-persons="addNewPersons"
-                        ref="addPersons"
-                    >
-                        <!-- to cast child method -->
-                    </add-persons>
-                </li>
-            </ul>
-        </div>
-
-        <div
-            v-if="!isParticipationValid"
-            class="alert alert-warning to-confirm"
-        >
-            {{ $t("persons_associated.participation_not_valid") }}
-        </div>
+    <div v-if="currentParticipations.length > 0">
+      <label class="col-form-label">{{
+        $tc("persons_associated.counter", counter)
+      }}</label>
     </div>
+    <div v-else>
+      <label class="chill-no-data-statement">{{
+        $tc("persons_associated.counter", counter)
+      }}</label>
+    </div>
+
+    <div
+      v-if="participationWithoutHousehold.length > 0"
+      class="alert alert-warning no-household"
+    >
+      <i class="fa fa-warning fa-2x" />
+      <form method="GET" action="/fr/person/household/members/editor">
+        <div class="float-button bottom">
+          <div class="box">
+            <div class="action">
+              <button class="btn btn-update" type="submit">
+                {{ $t("persons_associated.update_household") }}
+              </button>
+            </div>
+            <p class="mb-3">
+              {{ $t("persons_associated.person_without_household_warning") }}
+            </p>
+            <div
+              class="form-check"
+              v-for="p in participationWithoutHousehold"
+              :key="p.id"
+            >
+              <input
+                type="checkbox"
+                class="form-check-input"
+                name="persons[]"
+                checked="checked"
+                :id="p.person.id"
+                :value="p.person.id"
+              />
+              <label class="form-check-label">
+                <person-text :person="p.person" />
+              </label>
+            </div>
+            <input type="hidden" name="expand_suggestions" value="true" />
+            <input type="hidden" name="returnPath" :value="getReturnPath" />
+            <input
+              type="hidden"
+              name="accompanying_period_id"
+              :value="courseId"
+            />
+          </div>
+        </div>
+      </form>
+    </div>
+
+    <div class="flex-table mb-3">
+      <participation-item
+        v-for="participation in currentParticipations"
+        :participation="participation"
+        :key="participation.id"
+        @remove="removeParticipation"
+        @close="closeParticipation"
+      />
+    </div>
+
+    <div v-if="suggestedPersons.length > 0">
+      <ul class="list-suggest add-items inline">
+        <li
+          v-for="p in suggestedPersons"
+          :key="p.id"
+          @click="addSuggestedPerson(p)"
+        >
+          <person-text :person="p" />
+        </li>
+      </ul>
+    </div>
+
+    <div>
+      <ul class="record_actions">
+        <li class="add-persons">
+          <add-persons
+            button-title="persons_associated.add_persons"
+            modal-title="add_persons.title"
+            :key="addPersons.key"
+            :options="addPersons.options"
+            @add-new-persons="addNewPersons"
+            ref="addPersons"
+          >
+            <!-- to cast child method -->
+          </add-persons>
+        </li>
+      </ul>
+    </div>
+
+    <div v-if="!isParticipationValid" class="alert alert-warning to-confirm">
+      {{ $t("persons_associated.participation_not_valid") }}
+    </div>
+  </div>
 </template>
 
 <script>
@@ -125,176 +110,160 @@ import AddPersons from "ChillPersonAssets/vuejs/_components/AddPersons.vue";
 import PersonText from "ChillPersonAssets/vuejs/_components/Entity/PersonText.vue";
 
 export default {
-    name: "PersonsAssociated",
-    components: {
-        ParticipationItem,
-        AddPersons,
-        PersonText,
-    },
-    data() {
-        return {
-            addPersons: {
-                key: "persons_associated",
-                options: {
-                    type: ["person"],
-                    priority: null,
-                    uniq: false,
-                },
-            },
-        };
-    },
-    computed: {
-        ...mapState({
-            courseId: (state) => state.accompanyingCourse.id,
-            participations: (state) => state.accompanyingCourse.participations,
-            suggestedPersons: (state) =>
-                [
-                    state.accompanyingCourse.requestor,
-                    ...state.accompanyingCourse.resources.map(
-                        (r) => r.resource,
-                    ),
-                ]
-                    .filter((e) => e !== null)
-                    .filter((e) => e.type === "person")
-                    .filter(
-                        (p) =>
-                            !state.accompanyingCourse.participations
-                                .filter((pa) => pa.endDate === null)
-                                .map((pa) => pa.person.id)
-                                .includes(p.id),
-                    )
-                    // filter persons appearing twice in requestor and resources
-                    .filter((e, index, suggested) => {
-                        for (let i = 0; i < suggested.length; i = i + 1) {
-                            if (i < index && e.id === suggested[i].id) {
-                                return false;
-                            }
-                        }
+  name: "PersonsAssociated",
+  components: {
+    ParticipationItem,
+    AddPersons,
+    PersonText,
+  },
+  data() {
+    return {
+      addPersons: {
+        key: "persons_associated",
+        options: {
+          type: ["person"],
+          priority: null,
+          uniq: false,
+        },
+      },
+    };
+  },
+  computed: {
+    ...mapState({
+      courseId: (state) => state.accompanyingCourse.id,
+      participations: (state) => state.accompanyingCourse.participations,
+      suggestedPersons: (state) =>
+        [
+          state.accompanyingCourse.requestor,
+          ...state.accompanyingCourse.resources.map((r) => r.resource),
+        ]
+          .filter((e) => e !== null)
+          .filter((e) => e.type === "person")
+          .filter(
+            (p) =>
+              !state.accompanyingCourse.participations
+                .filter((pa) => pa.endDate === null)
+                .map((pa) => pa.person.id)
+                .includes(p.id),
+          )
+          // filter persons appearing twice in requestor and resources
+          .filter((e, index, suggested) => {
+            for (let i = 0; i < suggested.length; i = i + 1) {
+              if (i < index && e.id === suggested[i].id) {
+                return false;
+              }
+            }
 
-                        return true;
-                    }),
-        }),
-        ...mapGetters(["isParticipationValid"]),
-        currentParticipations() {
-            return this.participations.filter((p) => p.endDate === null);
-        },
-        counter() {
-            return this.currentParticipations.length;
-        },
-        participationWithoutHousehold() {
-            return this.currentParticipations.filter(
-                (p) => p.person.current_household_id === null,
-            );
-        },
-        getReturnPath() {
-            return (
-                window.location.pathname +
-                window.location.search +
-                window.location.hash
-            );
-        },
+            return true;
+          }),
+    }),
+    ...mapGetters(["isParticipationValid"]),
+    currentParticipations() {
+      return this.participations.filter((p) => p.endDate === null);
     },
-    methods: {
-        removeParticipation(item) {
-            this.$store
-                .dispatch("removeParticipation", item)
-                .catch(({ name, violations }) => {
-                    if (
-                        name === "ValidationException" ||
-                        name === "AccessException"
-                    ) {
-                        violations.forEach((violation) =>
-                            this.$toast.open({ message: violation }),
-                        );
-                    } else {
-                        this.$toast.open({ message: "An error occurred" });
-                    }
-                });
-        },
-        closeParticipation(item) {
-            this.$store
-                .dispatch("closeParticipation", item)
-                .catch(({ name, violations }) => {
-                    if (
-                        name === "ValidationException" ||
-                        name === "AccessException"
-                    ) {
-                        violations.forEach((violation) =>
-                            this.$toast.open({ message: violation }),
-                        );
-                    } else {
-                        this.$toast.open({ message: "An error occurred" });
-                    }
-                });
-        },
-        addNewPersons({ selected, modal }) {
-            selected.forEach(function (item) {
-                this.$store
-                    .dispatch("addParticipation", item)
-                    .catch(({ name, violations }) => {
-                        if (
-                            name === "ValidationException" ||
-                            name === "AccessException"
-                        ) {
-                            violations.forEach((violation) =>
-                                this.$toast.open({ message: violation }),
-                            );
-                        } else {
-                            this.$toast.open({ message: "An error occurred" });
-                        }
-                    });
-            }, this);
-            this.$refs.addPersons.resetSearch(); // to cast child method
-            modal.showModal = false;
-        },
-        addSuggestedPerson(person) {
-            this.$store
-                .dispatch("addParticipation", {
-                    result: person,
-                    type: "person",
-                })
-                .catch(({ name, violations }) => {
-                    if (
-                        name === "ValidationException" ||
-                        name === "AccessException"
-                    ) {
-                        violations.forEach((violation) =>
-                            this.$toast.open({ message: violation }),
-                        );
-                    } else {
-                        this.$toast.open({ message: "An error occurred" });
-                    }
-                });
-        },
+    counter() {
+      return this.currentParticipations.length;
     },
+    participationWithoutHousehold() {
+      return this.currentParticipations.filter(
+        (p) => p.person.current_household_id === null,
+      );
+    },
+    getReturnPath() {
+      return (
+        window.location.pathname + window.location.search + window.location.hash
+      );
+    },
+  },
+  methods: {
+    removeParticipation(item) {
+      this.$store
+        .dispatch("removeParticipation", item)
+        .catch(({ name, violations }) => {
+          if (name === "ValidationException" || name === "AccessException") {
+            violations.forEach((violation) =>
+              this.$toast.open({ message: violation }),
+            );
+          } else {
+            this.$toast.open({ message: "An error occurred" });
+          }
+        });
+    },
+    closeParticipation(item) {
+      this.$store
+        .dispatch("closeParticipation", item)
+        .catch(({ name, violations }) => {
+          if (name === "ValidationException" || name === "AccessException") {
+            violations.forEach((violation) =>
+              this.$toast.open({ message: violation }),
+            );
+          } else {
+            this.$toast.open({ message: "An error occurred" });
+          }
+        });
+    },
+    addNewPersons({ selected, modal }) {
+      selected.forEach(function (item) {
+        this.$store
+          .dispatch("addParticipation", item)
+          .catch(({ name, violations }) => {
+            if (name === "ValidationException" || name === "AccessException") {
+              violations.forEach((violation) =>
+                this.$toast.open({ message: violation }),
+              );
+            } else {
+              this.$toast.open({ message: "An error occurred" });
+            }
+          });
+      }, this);
+      this.$refs.addPersons.resetSearch(); // to cast child method
+      modal.showModal = false;
+    },
+    addSuggestedPerson(person) {
+      this.$store
+        .dispatch("addParticipation", {
+          result: person,
+          type: "person",
+        })
+        .catch(({ name, violations }) => {
+          if (name === "ValidationException" || name === "AccessException") {
+            violations.forEach((violation) =>
+              this.$toast.open({ message: violation }),
+            );
+          } else {
+            this.$toast.open({ message: "An error occurred" });
+          }
+        });
+    },
+  },
 };
 </script>
 <style lang="scss" scoped>
 div#accompanying-course {
-    div.vue-component {
-        & > div.alert.no-household {
-            margin: 0 0 -1em;
-        }
-        div.no-household {
-            padding-bottom: 1.5em;
-            display: flex;
-            flex-direction: row;
-            & > i {
-                flex-basis: 1.5em;
-                flex-grow: 0;
-                flex-shrink: 0;
-                padding-top: 0.2em;
-                opacity: 0.75;
-            }
-            & > form {
-                flex-basis: auto;
-                div.action {
-                    button.btn-update {
-                        margin-right: 2em;
-                    }
-                }
-            }
-        }
+  div.vue-component {
+    & > div.alert.no-household {
+      margin: 0 0 -1em;
     }
+    div.no-household {
+      padding-bottom: 1.5em;
+      display: flex;
+      flex-direction: row;
+      & > i {
+        flex-basis: 1.5em;
+        flex-grow: 0;
+        flex-shrink: 0;
+        padding-top: 0.2em;
+        opacity: 0.75;
+      }
+      & > form {
+        flex-basis: auto;
+        div.action {
+          button.btn-update {
+            margin-right: 2em;
+          }
+        }
+      }
+    }
+  }
 }
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
index 61a9d2571..c2dbd6e0c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated/ParticipationItem.vue
@@ -1,98 +1,97 @@
 <template>
-    <person-render-box
-        render="bloc"
-        :options="{
-            addInfo: true,
-            addId: false,
-            addEntity: false,
-            addLink: false,
-            addHouseholdLink: false,
-            addAltNames: true,
-            addAge: true,
-            hLevel: 3,
-            isConfidential: false,
-            isMultiline: true,
-        }"
-        :person="participation.person"
-        :return-path="getAccompanyingCourseReturnPath"
-    >
-        <template #end-bloc>
-            <div class="item-row separator">
-                <ul class="record_actions">
-                    <button-location
-                        v-if="
-                            hasCurrentHouseholdAddress &&
-                            !isPersonLocatingCourse(participation.person)
-                        "
-                        :person="participation.person"
-                    />
-                    <li v-if="participation.person.current_household_id">
-                        <a
-                            class="btn btn-sm btn-chill-beige"
-                            :href="getCurrentHouseholdUrl"
-                            :title="
-                                $t('persons_associated.show_household_number', {
-                                    id: participation.person
-                                        .current_household_id,
-                                })
-                            "
-                        >
-                            <i class="fa fa-fw fa-home" />
-                        </a>
-                    </li>
-                    <li>
-                        <on-the-fly
-                            :type="participation.person.type"
-                            :id="participation.person.id"
-                            action="show"
-                        />
-                    </li>
-                    <li>
-                        <on-the-fly
-                            :type="participation.person.type"
-                            :id="participation.person.id"
-                            action="edit"
-                            @save-form-on-the-fly="saveFormOnTheFly"
-                            ref="onTheFly"
-                        />
-                    </li>
-                    <li>
-                        <button
-                            v-if="!participation.endDate"
-                            class="btn btn-sm btn-remove"
-                            :title="$t('persons_associated.leave_course')"
-                            @click="modal.showModal = true"
-                        />
-                    </li>
-                </ul>
-            </div>
-        </template>
-    </person-render-box>
+  <person-render-box
+    render="bloc"
+    :options="{
+      addInfo: true,
+      addId: false,
+      addEntity: false,
+      addLink: false,
+      addHouseholdLink: false,
+      addAltNames: true,
+      addAge: true,
+      hLevel: 3,
+      isConfidential: false,
+      isMultiline: true,
+    }"
+    :person="participation.person"
+    :return-path="getAccompanyingCourseReturnPath"
+  >
+    <template #end-bloc>
+      <div class="item-row separator">
+        <ul class="record_actions">
+          <button-location
+            v-if="
+              hasCurrentHouseholdAddress &&
+              !isPersonLocatingCourse(participation.person)
+            "
+            :person="participation.person"
+          />
+          <li v-if="participation.person.current_household_id">
+            <a
+              class="btn btn-sm btn-chill-beige"
+              :href="getCurrentHouseholdUrl"
+              :title="
+                $t('persons_associated.show_household_number', {
+                  id: participation.person.current_household_id,
+                })
+              "
+            >
+              <i class="fa fa-fw fa-home" />
+            </a>
+          </li>
+          <li>
+            <on-the-fly
+              :type="participation.person.type"
+              :id="participation.person.id"
+              action="show"
+            />
+          </li>
+          <li>
+            <on-the-fly
+              :type="participation.person.type"
+              :id="participation.person.id"
+              action="edit"
+              @save-form-on-the-fly="saveFormOnTheFly"
+              ref="onTheFly"
+            />
+          </li>
+          <li>
+            <button
+              v-if="!participation.endDate"
+              class="btn btn-sm btn-remove"
+              :title="$t('persons_associated.leave_course')"
+              @click="modal.showModal = true"
+            />
+          </li>
+        </ul>
+      </div>
+    </template>
+  </person-render-box>
 
-    <teleport to="body">
-        <modal
-            v-if="modal.showModal"
-            :modal-dialog-class="modal.modalDialogClass"
-            @close="modal.showModal = false"
+  <teleport to="body">
+    <modal
+      v-if="modal.showModal"
+      :modal-dialog-class="modal.modalDialogClass"
+      @close="modal.showModal = false"
+    >
+      <template #header>
+        <h2 class="modal-title">
+          {{ $t("persons_associated.sure") }}
+        </h2>
+      </template>
+      <template #body>
+        <p>{{ $t("persons_associated.sure_description") }}</p>
+      </template>
+      <template #footer>
+        <button
+          class="btn btn-danger"
+          @click.prevent="$emit('close', participation)"
         >
-            <template #header>
-                <h2 class="modal-title">
-                    {{ $t("persons_associated.sure") }}
-                </h2>
-            </template>
-            <template #body>
-                <p>{{ $t("persons_associated.sure_description") }}</p>
-            </template>
-            <template #footer>
-                <button
-                    class="btn btn-danger"
-                    @click.prevent="$emit('close', participation)"
-                >
-                    {{ $t("persons_associated.ok") }}
-                </button>
-            </template>
-        </modal>
-    </teleport>
+          {{ $t("persons_associated.ok") }}
+        </button>
+      </template>
+    </modal>
+  </teleport>
 </template>
 
 <script>
@@ -103,135 +102,135 @@ import Modal from "ChillMainAssets/vuejs/_components/Modal";
 import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
 
 export default {
-    name: "ParticipationItem",
-    components: {
-        OnTheFly,
-        ButtonLocation,
-        PersonRenderBox,
-        Modal,
+  name: "ParticipationItem",
+  components: {
+    OnTheFly,
+    ButtonLocation,
+    PersonRenderBox,
+    Modal,
+  },
+  props: ["participation"],
+  emits: ["remove", "close"],
+  data() {
+    return {
+      modal: {
+        showModal: false,
+        modalDialogClass: "modal-dialog-centered modal-md",
+      },
+      PersonRenderBox: {
+        participation: "participation",
+        options: {
+          addInfo: false,
+          addId: true,
+          addAge: false,
+          hLevel: 1,
+        },
+      },
+    };
+  },
+  computed: {
+    hasCurrentHouseholdAddress() {
+      if (
+        !this.participation.endDate &&
+        this.participation.person.current_household_address !== null
+      ) {
+        return true;
+      }
+      return false;
     },
-    props: ["participation"],
-    emits: ["remove", "close"],
-    data() {
-        return {
-            modal: {
-                showModal: false,
-                modalDialogClass: "modal-dialog-centered modal-md",
-            },
-            PersonRenderBox: {
-                participation: "participation",
-                options: {
-                    addInfo: false,
-                    addId: true,
-                    addAge: false,
-                    hLevel: 1,
-                },
-            },
+    getAccompanyingCourseReturnPath() {
+      return `fr/parcours/${this.$store.state.accompanyingCourse.id}/edit#section-10`;
+    },
+    getCurrentHouseholdUrl() {
+      return `/fr/person/household/${this.participation.person.current_household_id}/summary?returnPath=${this.getAccompanyingCourseReturnPath}`;
+    },
+  },
+  methods: {
+    isPersonLocatingCourse(person) {
+      return this.$store.getters.isPersonLocatingCourse(person);
+    },
+    saveFormOnTheFly(payload) {
+      console.log(
+        "saveFormOnTheFly: type",
+        payload.type,
+        ", data",
+        payload.data,
+      );
+      payload.target = "participation";
+
+      let body = { type: payload.type };
+      if (payload.type === "person") {
+        body.firstName = payload.data.firstName;
+        body.lastName = payload.data.lastName;
+        if (payload.data.birthdate !== null) {
+          body.birthdate = payload.data.birthdate;
+        }
+        body.phonenumber = payload.data.phonenumber;
+        body.mobilenumber = payload.data.mobilenumber;
+        body.email = payload.data.email;
+        body.altNames = payload.data.altNames;
+        body.gender = {
+          id: payload.data.gender.id,
+          type: payload.data.gender.type,
         };
-    },
-    computed: {
-        hasCurrentHouseholdAddress() {
-            if (
-                !this.participation.endDate &&
-                this.participation.person.current_household_address !== null
-            ) {
-                return true;
+        if (payload.data.civility !== null) {
+          body.civility = {
+            id: payload.data.civility.id,
+            type: payload.data.civility.type,
+          };
+        }
+
+        makeFetch(
+          "PATCH",
+          `/api/1.0/person/person/${payload.data.id}.json`,
+          body,
+        )
+          .then((response) => {
+            this.$store.dispatch("addPerson", {
+              target: payload.target,
+              body: response,
+            });
+            this.$refs.onTheFly.closeModal();
+          })
+          .catch((error) => {
+            if (error.name === "ValidationException") {
+              for (let v of error.violations) {
+                this.$toast.open({ message: v });
+              }
+            } else {
+              this.$toast.open({ message: "An error occurred" });
             }
-            return false;
-        },
-        getAccompanyingCourseReturnPath() {
-            return `fr/parcours/${this.$store.state.accompanyingCourse.id}/edit#section-10`;
-        },
-        getCurrentHouseholdUrl() {
-            return `/fr/person/household/${this.participation.person.current_household_id}/summary?returnPath=${this.getAccompanyingCourseReturnPath}`;
-        },
-    },
-    methods: {
-        isPersonLocatingCourse(person) {
-            return this.$store.getters.isPersonLocatingCourse(person);
-        },
-        saveFormOnTheFly(payload) {
-            console.log(
-                "saveFormOnTheFly: type",
-                payload.type,
-                ", data",
-                payload.data,
-            );
-            payload.target = "participation";
+          });
+      } else if (payload.type === "thirdparty") {
+        body.name = payload.data.text;
+        body.email = payload.data.email;
+        body.telephone = payload.data.telephone;
+        body.telephone2 = payload.data.telephone2;
+        body.address = { id: payload.data.address.address_id };
 
-            let body = { type: payload.type };
-            if (payload.type === "person") {
-                body.firstName = payload.data.firstName;
-                body.lastName = payload.data.lastName;
-                if (payload.data.birthdate !== null) {
-                    body.birthdate = payload.data.birthdate;
-                }
-                body.phonenumber = payload.data.phonenumber;
-                body.mobilenumber = payload.data.mobilenumber;
-                body.email = payload.data.email;
-                body.altNames = payload.data.altNames;
-                body.gender = {
-                    id: payload.data.gender.id,
-                    type: payload.data.gender.type,
-                };
-                if (payload.data.civility !== null) {
-                    body.civility = {
-                        id: payload.data.civility.id,
-                        type: payload.data.civility.type,
-                    };
-                }
-
-                makeFetch(
-                    "PATCH",
-                    `/api/1.0/person/person/${payload.data.id}.json`,
-                    body,
-                )
-                    .then((response) => {
-                        this.$store.dispatch("addPerson", {
-                            target: payload.target,
-                            body: response,
-                        });
-                        this.$refs.onTheFly.closeModal();
-                    })
-                    .catch((error) => {
-                        if (error.name === "ValidationException") {
-                            for (let v of error.violations) {
-                                this.$toast.open({ message: v });
-                            }
-                        } else {
-                            this.$toast.open({ message: "An error occurred" });
-                        }
-                    });
-            } else if (payload.type === "thirdparty") {
-                body.name = payload.data.text;
-                body.email = payload.data.email;
-                body.telephone = payload.data.telephone;
-                body.telephone2 = payload.data.telephone2;
-                body.address = { id: payload.data.address.address_id };
-
-                makeFetch(
-                    "PATCH",
-                    `/api/1.0/thirdparty/thirdparty/${payload.data.id}.json`,
-                    body,
-                )
-                    .then((response) => {
-                        this.$store.dispatch("addThirdparty", {
-                            target: payload.target,
-                            body: response,
-                        });
-                        this.$refs.onTheFly.closeModal();
-                    })
-                    .catch((error) => {
-                        if (error.name === "ValidationException") {
-                            for (let v of error.violations) {
-                                this.$toast.open({ message: v });
-                            }
-                        } else {
-                            this.$toast.open({ message: "An error occurred" });
-                        }
-                    });
+        makeFetch(
+          "PATCH",
+          `/api/1.0/thirdparty/thirdparty/${payload.data.id}.json`,
+          body,
+        )
+          .then((response) => {
+            this.$store.dispatch("addThirdparty", {
+              target: payload.target,
+              body: response,
+            });
+            this.$refs.onTheFly.closeModal();
+          })
+          .catch((error) => {
+            if (error.name === "ValidationException") {
+              for (let v of error.violations) {
+                this.$toast.open({ message: v });
+              }
+            } else {
+              this.$toast.open({ message: "An error occurred" });
             }
-        },
+          });
+      }
     },
+  },
 };
 </script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue
index dbb21fa40..963ff65b5 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Referrer.vue
@@ -1,116 +1,113 @@
 <template>
-    <div class="vue-component">
-        <h2><a id="section-80" />{{ $t("referrer.title") }}</h2>
+  <div class="vue-component">
+    <h2><a id="section-80" />{{ $t("referrer.title") }}</h2>
 
-        <teleport to="body">
-            <modal
-                v-if="modal.showModal"
-                :modal-dialog-class="modal.modalDialogClass"
-                @close="cancelChange"
-            >
-                <template #header>
-                    <h3 class="modal-title">
-                        {{ $t("confirm.title") }}
-                    </h3>
-                </template>
+    <teleport to="body">
+      <modal
+        v-if="modal.showModal"
+        :modal-dialog-class="modal.modalDialogClass"
+        @close="cancelChange"
+      >
+        <template #header>
+          <h3 class="modal-title">
+            {{ $t("confirm.title") }}
+          </h3>
+        </template>
 
-                <template #body-head>
-                    <div class="modal-body">
-                        <p
-                            v-html="
-                                $t('confirm.sure_referrer', {
-                                    referrer: this.value.text,
-                                })
-                            "
-                        />
-                    </div>
-                </template>
-
-                <template #footer>
-                    <button
-                        class="btn btn-save"
-                        @click.prevent="this.confirmReferrer"
-                    >
-                        {{ $t("confirm.ok_referrer") }}
-                    </button>
-                </template>
-            </modal>
-        </teleport>
-
-        <div>
-            <label class="col-form-label" for="selectJob">
-                {{ $t("job.label") }}
-            </label>
-
-            <VueMultiselect
-                name="selectJob"
-                label="text"
-                :custom-label="customJobLabel"
-                track-by="id"
-                :multiple="false"
-                :searchable="true"
-                :placeholder="$t('job.placeholder')"
-                v-model="valueJob"
-                :options="jobs"
-                :select-label="$t('multiselect.select_label')"
-                :deselect-label="$t('multiselect.deselect_label')"
-                :selected-label="$t('multiselect.selected_label')"
+        <template #body-head>
+          <div class="modal-body">
+            <p
+              v-html="
+                $t('confirm.sure_referrer', {
+                  referrer: this.value.text,
+                })
+              "
             />
+          </div>
+        </template>
 
-            <label class="col-form-label" for="selectReferrer">
-                {{ $t("referrer.label") }}
-            </label>
+        <template #footer>
+          <button class="btn btn-save" @click.prevent="this.confirmReferrer">
+            {{ $t("confirm.ok_referrer") }}
+          </button>
+        </template>
+      </modal>
+    </teleport>
 
-            <VueMultiselect
-                name="selectReferrer"
-                label="text"
-                track-by="id"
-                :multiple="false"
-                :searchable="true"
-                :placeholder="$t('referrer.placeholder')"
-                v-model="value"
-                @select="updateReferrer"
-                @remove="removeReferrer"
-                :options="users"
-                :select-label="$t('multiselect.select_label')"
-                :deselect-label="$t('multiselect.deselect_label')"
-                :selected-label="$t('multiselect.selected_label')"
-            />
+    <div>
+      <label class="col-form-label" for="selectJob">
+        {{ $t("job.label") }}
+      </label>
 
-            <template v-if="usersSuggestedFilteredByJob.length > 0">
-                <ul class="list-suggest add-items inline">
-                    <li
-                        v-for="(u, i) in usersSuggestedFilteredByJob"
-                        @click="updateReferrer(u)"
-                        :key="`referrer-${i}`"
-                    >
-                        <span>
-                            <user-render-box-badge :user="u" />
-                        </span>
-                    </li>
-                </ul>
-            </template>
-        </div>
+      <VueMultiselect
+        name="selectJob"
+        label="text"
+        :custom-label="customJobLabel"
+        track-by="id"
+        :multiple="false"
+        :searchable="true"
+        :placeholder="$t('job.placeholder')"
+        v-model="valueJob"
+        :options="jobs"
+        :select-label="$t('multiselect.select_label')"
+        :deselect-label="$t('multiselect.deselect_label')"
+        :selected-label="$t('multiselect.selected_label')"
+      />
 
-        <div>
-            <ul class="record_actions">
-                <li>
-                    <button
-                        class="btn btn-create"
-                        type="button"
-                        name="button"
-                        @click="assignMe"
-                    >
-                        {{ $t("referrer.assign_me") }}
-                    </button>
-                </li>
-            </ul>
-        </div>
+      <label class="col-form-label" for="selectReferrer">
+        {{ $t("referrer.label") }}
+      </label>
 
-        <div v-if="!isJobValid" class="alert alert-warning to-confirm">
-            {{ $t("job.not_valid") }}
-        </div>
+      <VueMultiselect
+        name="selectReferrer"
+        label="text"
+        track-by="id"
+        :multiple="false"
+        :searchable="true"
+        :placeholder="$t('referrer.placeholder')"
+        v-model="value"
+        @select="updateReferrer"
+        @remove="removeReferrer"
+        :options="users"
+        :select-label="$t('multiselect.select_label')"
+        :deselect-label="$t('multiselect.deselect_label')"
+        :selected-label="$t('multiselect.selected_label')"
+      />
+
+      <template v-if="usersSuggestedFilteredByJob.length > 0">
+        <ul class="list-suggest add-items inline">
+          <li
+            v-for="(u, i) in usersSuggestedFilteredByJob"
+            @click="updateReferrer(u)"
+            :key="`referrer-${i}`"
+          >
+            <span>
+              <user-render-box-badge :user="u" />
+            </span>
+          </li>
+        </ul>
+      </template>
     </div>
+
+    <div>
+      <ul class="record_actions">
+        <li>
+          <button
+            class="btn btn-create"
+            type="button"
+            name="button"
+            @click="assignMe"
+          >
+            {{ $t("referrer.assign_me") }}
+          </button>
+        </li>
+      </ul>
+    </div>
+
+    <div v-if="!isJobValid" class="alert alert-warning to-confirm">
+      {{ $t("job.not_valid") }}
+    </div>
+  </div>
 </template>
 
 <script>
@@ -121,134 +118,124 @@ import UserRenderBoxBadge from "ChillMainAssets/vuejs/_components/Entity/UserRen
 import Modal from "ChillMainAssets/vuejs/_components/Modal";
 
 export default {
-    name: "Referrer",
-    components: {
-        UserRenderBoxBadge,
-        VueMultiselect,
-        Modal,
+  name: "Referrer",
+  components: {
+    UserRenderBoxBadge,
+    VueMultiselect,
+    Modal,
+  },
+  data() {
+    return {
+      jobs: [],
+      modal: {
+        showModal: false,
+        modalDialogClass: "modal-dialog-scrollable modal-xl",
+      },
+      value: this.$store.state.accompanyingCourse.user,
+      confirmed: false,
+    };
+  },
+  computed: {
+    ...mapState({
+      valueJob: (state) => state.accompanyingCourse.job,
+    }),
+    ...mapGetters(["isJobValid", "usersSuggestedFilteredByJob"]),
+    users: function () {
+      let users = this.$store.getters.usersFilteredByJob;
+      // ensure that the selected user is in the list. add it if necessary
+      if (
+        this.$store.state.accompanyingCourse.user !== null &&
+        users.find(
+          (u) => this.$store.state.accompanyingCourse.user.id === u.id,
+        ) === undefined
+      ) {
+        users.push(this.$store.state.accompanyingCourse.user);
+      }
+      return users;
     },
-    data() {
-        return {
-            jobs: [],
-            modal: {
-                showModal: false,
-                modalDialogClass: "modal-dialog-scrollable modal-xl",
-            },
-            value: this.$store.state.accompanyingCourse.user,
-            confirmed: false,
-        };
-    },
-    computed: {
-        ...mapState({
-            valueJob: (state) => state.accompanyingCourse.job,
-        }),
-        ...mapGetters(["isJobValid", "usersSuggestedFilteredByJob"]),
-        users: function () {
-            let users = this.$store.getters.usersFilteredByJob;
-            // ensure that the selected user is in the list. add it if necessary
-            if (
-                this.$store.state.accompanyingCourse.user !== null &&
-                users.find(
-                    (u) =>
-                        this.$store.state.accompanyingCourse.user.id === u.id,
-                ) === undefined
-            ) {
-                users.push(this.$store.state.accompanyingCourse.user);
+    valueJob: {
+      get() {
+        return this.$store.state.accompanyingCourse.job;
+      },
+      set(value) {
+        this.$store
+          .dispatch("updateJob", value)
+          .catch(({ name, violations }) => {
+            if (name === "ValidationException" || name === "AccessException") {
+              violations.forEach((violation) =>
+                this.$toast.open({ message: violation }),
+              );
+            } else {
+              this.$toast.open({ message: "An error occurred" });
             }
-            return users;
-        },
-        valueJob: {
-            get() {
-                return this.$store.state.accompanyingCourse.job;
-            },
-            set(value) {
-                this.$store
-                    .dispatch("updateJob", value)
-                    .catch(({ name, violations }) => {
-                        if (
-                            name === "ValidationException" ||
-                            name === "AccessException"
-                        ) {
-                            violations.forEach((violation) =>
-                                this.$toast.open({ message: violation }),
-                            );
-                        } else {
-                            this.$toast.open({ message: "An error occurred" });
-                        }
-                    });
-            },
-        },
+          });
+      },
     },
-    mounted() {
-        this.getJobs();
+  },
+  mounted() {
+    this.getJobs();
+  },
+  methods: {
+    updateReferrer(value) {
+      this.value = value;
+      this.toggleModal();
     },
-    methods: {
-        updateReferrer(value) {
-            this.value = value;
-            this.toggleModal();
-        },
-        getJobs() {
-            const url = "/api/1.0/main/user-job.json";
-            makeFetch("GET", url)
-                .then((response) => {
-                    this.jobs = response.results;
-                })
-                .catch((error) => {
-                    this.$toast.open({ message: error.txt });
-                });
-        },
-        customJobLabel(value) {
-            return value.label.fr;
-        },
-        assignMe() {
-            const url = `/api/1.0/main/whoami.json`;
-            makeFetch("GET", url).then((user) => {
-                // this.value = user
-                this.updateReferrer(user);
-            });
-        },
-        toggleModal() {
-            this.modal.showModal = !this.modal.showModal;
-        },
-        confirmReferrer() {
-            this.$store
-                .dispatch("updateReferrer", this.value)
-                .catch(({ name, violations }) => {
-                    if (
-                        name === "ValidationException" ||
-                        name === "AccessException"
-                    ) {
-                        violations.forEach((violation) =>
-                            this.$toast.open({ message: violation }),
-                        );
-                    } else {
-                        this.$toast.open({ message: "An error occurred" });
-                    }
-                });
-            this.toggleModal();
-        },
-        removeReferrer() {
-            console.log("remove option");
-            this.$store
-                .dispatch("updateReferrer", null)
-                .catch(({ name, violations }) => {
-                    if (
-                        name === "ValidationException" ||
-                        name === "AccessException"
-                    ) {
-                        violations.forEach((violation) =>
-                            this.$toast.open({ message: violation }),
-                        );
-                    } else {
-                        this.$toast.open({ message: "An error occurred" });
-                    }
-                });
-        },
-        cancelChange() {
-            this.value = this.$store.state.accompanyingCourse.user;
-            this.toggleModal();
-        },
+    getJobs() {
+      const url = "/api/1.0/main/user-job.json";
+      makeFetch("GET", url)
+        .then((response) => {
+          this.jobs = response.results;
+        })
+        .catch((error) => {
+          this.$toast.open({ message: error.txt });
+        });
     },
+    customJobLabel(value) {
+      return value.label.fr;
+    },
+    assignMe() {
+      const url = `/api/1.0/main/whoami.json`;
+      makeFetch("GET", url).then((user) => {
+        // this.value = user
+        this.updateReferrer(user);
+      });
+    },
+    toggleModal() {
+      this.modal.showModal = !this.modal.showModal;
+    },
+    confirmReferrer() {
+      this.$store
+        .dispatch("updateReferrer", this.value)
+        .catch(({ name, violations }) => {
+          if (name === "ValidationException" || name === "AccessException") {
+            violations.forEach((violation) =>
+              this.$toast.open({ message: violation }),
+            );
+          } else {
+            this.$toast.open({ message: "An error occurred" });
+          }
+        });
+      this.toggleModal();
+    },
+    removeReferrer() {
+      console.log("remove option");
+      this.$store
+        .dispatch("updateReferrer", null)
+        .catch(({ name, violations }) => {
+          if (name === "ValidationException" || name === "AccessException") {
+            violations.forEach((violation) =>
+              this.$toast.open({ message: violation }),
+            );
+          } else {
+            this.$toast.open({ message: "An error occurred" });
+          }
+        });
+    },
+    cancelChange() {
+      this.value = this.$store.state.accompanyingCourse.user;
+      this.toggleModal();
+    },
+  },
 };
 </script>
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
index c2b9acfc4..5858cdb00 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
@@ -1,263 +1,239 @@
 <template>
-    <div class="vue-component">
-        <h2><a id="section-50" />{{ $t("requestor.title") }}</h2>
+  <div class="vue-component">
+    <h2><a id="section-50" />{{ $t("requestor.title") }}</h2>
 
-        <div
-            v-if="accompanyingCourse.requestor && isAnonymous"
-            class="flex-table"
-        >
-            <label>
-                <input
-                    type="checkbox"
-                    v-model="requestorIsAnonymous"
-                    class="me-2"
-                />
-                {{ $t("requestor.is_anonymous") }}
-            </label>
-            <confidential
-                v-if="accompanyingCourse.requestor.type === 'thirdparty'"
-            >
-                <template #confidential-content>
-                    <third-party-render-box
-                        :thirdparty="accompanyingCourse.requestor"
-                        :options="{
-                            addLink: false,
-                            addId: false,
-                            addEntity: true,
-                            addInfo: false,
-                            hLevel: 3,
-                            isMultiline: true,
-                            isConfidential: true,
-                        }"
-                    >
-                        <template #record-actions>
-                            <ul class="record_actions">
-                                <li>
-                                    <on-the-fly
-                                        :type="
-                                            accompanyingCourse.requestor.type
-                                        "
-                                        :id="accompanyingCourse.requestor.id"
-                                        action="show"
-                                    />
-                                </li>
-                                <li>
-                                    <on-the-fly
-                                        :type="
-                                            accompanyingCourse.requestor.type
-                                        "
-                                        :id="accompanyingCourse.requestor.id"
-                                        action="edit"
-                                        @save-form-on-the-fly="saveFormOnTheFly"
-                                        ref="onTheFly"
-                                    />
-                                </li>
-                            </ul>
-                        </template>
-                    </third-party-render-box>
-                </template>
-            </confidential>
-
-            <confidential
-                v-else-if="accompanyingCourse.requestor.type === 'person'"
-            >
-                <template #confidential-content>
-                    <person-render-box
-                        render="bloc"
-                        :person="accompanyingCourse.requestor"
-                        :options="{
-                            addLink: false,
-                            addId: false,
-                            addAltNames: false,
-                            addEntity: true,
-                            addInfo: true,
-                            hLevel: 3,
-                            isMultiline: true,
-                            isConfidential: false,
-                            addAge: true,
-                        }"
-                    >
-                        <template #record-actions>
-                            <ul class="record_actions">
-                                <li>
-                                    <on-the-fly
-                                        :type="
-                                            accompanyingCourse.requestor.type
-                                        "
-                                        :id="accompanyingCourse.requestor.id"
-                                        action="show"
-                                    />
-                                </li>
-                                <li>
-                                    <on-the-fly
-                                        :type="
-                                            accompanyingCourse.requestor.type
-                                        "
-                                        :id="accompanyingCourse.requestor.id"
-                                        action="edit"
-                                        @save-form-on-the-fly="saveFormOnTheFly"
-                                        ref="onTheFly"
-                                    />
-                                </li>
-                            </ul>
-                        </template>
-                    </person-render-box>
-                </template>
-            </confidential>
-
-            <ul class="record_actions">
+    <div v-if="accompanyingCourse.requestor && isAnonymous" class="flex-table">
+      <label>
+        <input type="checkbox" v-model="requestorIsAnonymous" class="me-2" />
+        {{ $t("requestor.is_anonymous") }}
+      </label>
+      <confidential v-if="accompanyingCourse.requestor.type === 'thirdparty'">
+        <template #confidential-content>
+          <third-party-render-box
+            :thirdparty="accompanyingCourse.requestor"
+            :options="{
+              addLink: false,
+              addId: false,
+              addEntity: true,
+              addInfo: false,
+              hLevel: 3,
+              isMultiline: true,
+              isConfidential: true,
+            }"
+          >
+            <template #record-actions>
+              <ul class="record_actions">
                 <li>
-                    <button
-                        class="btn btn-remove"
-                        :title="$t('action.remove')"
-                        @click="removeRequestor"
-                    >
-                        {{ $t("action.remove") }}
-                    </button>
+                  <on-the-fly
+                    :type="accompanyingCourse.requestor.type"
+                    :id="accompanyingCourse.requestor.id"
+                    action="show"
+                  />
                 </li>
-            </ul>
-        </div>
-
-        <div
-            v-else-if="accompanyingCourse.requestor && !isAnonymous"
-            class="flex-table"
-        >
-            <label>
-                <input
-                    type="checkbox"
-                    v-model="requestorIsAnonymous"
-                    class="me-2"
-                />
-                {{ $t("requestor.is_anonymous") }}
-            </label>
-
-            <third-party-render-box
-                v-if="accompanyingCourse.requestor.type === 'thirdparty'"
-                :thirdparty="accompanyingCourse.requestor"
-                :options="{
-                    addLink: false,
-                    addId: false,
-                    addEntity: true,
-                    addInfo: false,
-                    hLevel: 3,
-                    isMultiline: true,
-                    isConfidential: true,
-                }"
-            >
-                <template #record-actions>
-                    <ul class="record_actions">
-                        <li>
-                            <on-the-fly
-                                :type="accompanyingCourse.requestor.type"
-                                :id="accompanyingCourse.requestor.id"
-                                action="show"
-                            />
-                        </li>
-                        <li>
-                            <on-the-fly
-                                :type="accompanyingCourse.requestor.type"
-                                :id="accompanyingCourse.requestor.id"
-                                action="edit"
-                                @save-form-on-the-fly="saveFormOnTheFly"
-                                ref="onTheFly"
-                            />
-                        </li>
-                    </ul>
-                </template>
-            </third-party-render-box>
-
-            <person-render-box
-                render="bloc"
-                v-if="accompanyingCourse.requestor.type === 'person'"
-                :person="accompanyingCourse.requestor"
-                :options="{
-                    addLink: false,
-                    addId: false,
-                    addAltNames: false,
-                    addEntity: true,
-                    addInfo: true,
-                    hLevel: 3,
-                    isMultiline: true,
-                    isConfidential: false,
-                }"
-            >
-                <template #record-actions>
-                    <ul class="record_actions">
-                        <li>
-                            <on-the-fly
-                                :type="accompanyingCourse.requestor.type"
-                                :id="accompanyingCourse.requestor.id"
-                                action="show"
-                            />
-                        </li>
-                        <li>
-                            <on-the-fly
-                                :type="accompanyingCourse.requestor.type"
-                                :id="accompanyingCourse.requestor.id"
-                                action="edit"
-                                @save-form-on-the-fly="saveFormOnTheFly"
-                                ref="onTheFly"
-                            />
-                        </li>
-                    </ul>
-                </template>
-            </person-render-box>
-
-            <ul class="record_actions">
                 <li>
-                    <button
-                        class="btn btn-remove"
-                        :title="$t('action.remove')"
-                        @click="removeRequestor"
-                    >
-                        {{ $t("action.remove") }}
-                    </button>
+                  <on-the-fly
+                    :type="accompanyingCourse.requestor.type"
+                    :id="accompanyingCourse.requestor.id"
+                    action="edit"
+                    @save-form-on-the-fly="saveFormOnTheFly"
+                    ref="onTheFly"
+                  />
                 </li>
-            </ul>
-        </div>
+              </ul>
+            </template>
+          </third-party-render-box>
+        </template>
+      </confidential>
 
-        <div v-else>
-            <label class="chill-no-data-statement">{{
-                $t("requestor.counter")
-            }}</label>
-        </div>
-
-        <div
-            v-if="
-                accompanyingCourse.requestor === null &&
-                suggestedEntities.length > 0
-            "
-        >
-            <ul class="list-suggest add-items inline">
-                <li
-                    v-for="p in suggestedEntities"
-                    :key="uniqueId(p)"
-                    @click="addSuggestedEntity(p)"
-                >
-                    <person-text v-if="p.type === 'person'" :person="p" />
-                    <span v-else>{{ p.text }}</span>
+      <confidential v-else-if="accompanyingCourse.requestor.type === 'person'">
+        <template #confidential-content>
+          <person-render-box
+            render="bloc"
+            :person="accompanyingCourse.requestor"
+            :options="{
+              addLink: false,
+              addId: false,
+              addAltNames: false,
+              addEntity: true,
+              addInfo: true,
+              hLevel: 3,
+              isMultiline: true,
+              isConfidential: false,
+              addAge: true,
+            }"
+          >
+            <template #record-actions>
+              <ul class="record_actions">
+                <li>
+                  <on-the-fly
+                    :type="accompanyingCourse.requestor.type"
+                    :id="accompanyingCourse.requestor.id"
+                    action="show"
+                  />
                 </li>
-            </ul>
-        </div>
-
-        <div>
-            <ul class="record_actions">
-                <li class="add-persons">
-                    <add-persons
-                        v-if="accompanyingCourse.requestor === null"
-                        button-title="requestor.add_requestor"
-                        modal-title="requestor.add_requestor"
-                        :key="addPersons.key"
-                        :options="addPersons.options"
-                        @add-new-persons="addNewPersons"
-                        ref="addPersons"
-                    >
-                        <!-- to cast child method -->
-                    </add-persons>
+                <li>
+                  <on-the-fly
+                    :type="accompanyingCourse.requestor.type"
+                    :id="accompanyingCourse.requestor.id"
+                    action="edit"
+                    @save-form-on-the-fly="saveFormOnTheFly"
+                    ref="onTheFly"
+                  />
                 </li>
-            </ul>
-        </div>
+              </ul>
+            </template>
+          </person-render-box>
+        </template>
+      </confidential>
+
+      <ul class="record_actions">
+        <li>
+          <button
+            class="btn btn-remove"
+            :title="$t('action.remove')"
+            @click="removeRequestor"
+          >
+            {{ $t("action.remove") }}
+          </button>
+        </li>
+      </ul>
     </div>
+
+    <div
+      v-else-if="accompanyingCourse.requestor && !isAnonymous"
+      class="flex-table"
+    >
+      <label>
+        <input type="checkbox" v-model="requestorIsAnonymous" class="me-2" />
+        {{ $t("requestor.is_anonymous") }}
+      </label>
+
+      <third-party-render-box
+        v-if="accompanyingCourse.requestor.type === 'thirdparty'"
+        :thirdparty="accompanyingCourse.requestor"
+        :options="{
+          addLink: false,
+          addId: false,
+          addEntity: true,
+          addInfo: false,
+          hLevel: 3,
+          isMultiline: true,
+          isConfidential: true,
+        }"
+      >
+        <template #record-actions>
+          <ul class="record_actions">
+            <li>
+              <on-the-fly
+                :type="accompanyingCourse.requestor.type"
+                :id="accompanyingCourse.requestor.id"
+                action="show"
+              />
+            </li>
+            <li>
+              <on-the-fly
+                :type="accompanyingCourse.requestor.type"
+                :id="accompanyingCourse.requestor.id"
+                action="edit"
+                @save-form-on-the-fly="saveFormOnTheFly"
+                ref="onTheFly"
+              />
+            </li>
+          </ul>
+        </template>
+      </third-party-render-box>
+
+      <person-render-box
+        render="bloc"
+        v-if="accompanyingCourse.requestor.type === 'person'"
+        :person="accompanyingCourse.requestor"
+        :options="{
+          addLink: false,
+          addId: false,
+          addAltNames: false,
+          addEntity: true,
+          addInfo: true,
+          hLevel: 3,
+          isMultiline: true,
+          isConfidential: false,
+        }"
+      >
+        <template #record-actions>
+          <ul class="record_actions">
+            <li>
+              <on-the-fly
+                :type="accompanyingCourse.requestor.type"
+                :id="accompanyingCourse.requestor.id"
+                action="show"
+              />
+            </li>
+            <li>
+              <on-the-fly
+                :type="accompanyingCourse.requestor.type"
+                :id="accompanyingCourse.requestor.id"
+                action="edit"
+                @save-form-on-the-fly="saveFormOnTheFly"
+                ref="onTheFly"
+              />
+            </li>
+          </ul>
+        </template>
+      </person-render-box>
+
+      <ul class="record_actions">
+        <li>
+          <button
+            class="btn btn-remove"
+            :title="$t('action.remove')"
+            @click="removeRequestor"
+          >
+            {{ $t("action.remove") }}
+          </button>
+        </li>
+      </ul>
+    </div>
+
+    <div v-else>
+      <label class="chill-no-data-statement">{{
+        $t("requestor.counter")
+      }}</label>
+    </div>
+
+    <div
+      v-if="
+        accompanyingCourse.requestor === null && suggestedEntities.length > 0
+      "
+    >
+      <ul class="list-suggest add-items inline">
+        <li
+          v-for="p in suggestedEntities"
+          :key="uniqueId(p)"
+          @click="addSuggestedEntity(p)"
+        >
+          <person-text v-if="p.type === 'person'" :person="p" />
+          <span v-else>{{ p.text }}</span>
+        </li>
+      </ul>
+    </div>
+
+    <div>
+      <ul class="record_actions">
+        <li class="add-persons">
+          <add-persons
+            v-if="accompanyingCourse.requestor === null"
+            button-title="requestor.add_requestor"
+            modal-title="requestor.add_requestor"
+            :key="addPersons.key"
+            :options="addPersons.options"
+            @add-new-persons="addNewPersons"
+            ref="addPersons"
+          >
+            <!-- to cast child method -->
+          </add-persons>
+        </li>
+      </ul>
+    </div>
+  </div>
 </template>
 
 <script>
@@ -271,221 +247,208 @@ import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
 import PersonText from "ChillPersonAssets/vuejs/_components/Entity/PersonText.vue";
 
 export default {
-    name: "Requestor",
-    components: {
-        AddPersons,
-        OnTheFly,
-        PersonRenderBox,
-        ThirdPartyRenderBox,
-        Confidential,
-        PersonText,
-    },
-    props: ["isAnonymous"],
-    data() {
-        return {
-            addPersons: {
-                key: "requestor",
-                options: {
-                    type: ["person", "thirdparty"],
-                    priority: null,
-                    uniq: true,
-                },
-            },
-        };
-    },
-    computed: {
-        ...mapState({
-            suggestedEntities: (state) => {
-                return (
-                    [
-                        ...state.accompanyingCourse.participations
-                            .filter((p) => p.endDate === null)
-                            .map((p) => p.person),
-                        ...state.accompanyingCourse.resources.map(
-                            (r) => r.resource,
-                        ),
-                    ]
-                        .filter((e) => e !== null)
-                        // filter for same entity appearing twice
-                        .filter((e, index, suggested) => {
-                            for (let i = 0; i < suggested.length; i = i + 1) {
-                                if (
-                                    i < index &&
-                                    e.id === suggested[i].id &&
-                                    e.type === suggested[i].type
-                                ) {
-                                    return false;
-                                }
-                            }
+  name: "Requestor",
+  components: {
+    AddPersons,
+    OnTheFly,
+    PersonRenderBox,
+    ThirdPartyRenderBox,
+    Confidential,
+    PersonText,
+  },
+  props: ["isAnonymous"],
+  data() {
+    return {
+      addPersons: {
+        key: "requestor",
+        options: {
+          type: ["person", "thirdparty"],
+          priority: null,
+          uniq: true,
+        },
+      },
+    };
+  },
+  computed: {
+    ...mapState({
+      suggestedEntities: (state) => {
+        return (
+          [
+            ...state.accompanyingCourse.participations
+              .filter((p) => p.endDate === null)
+              .map((p) => p.person),
+            ...state.accompanyingCourse.resources.map((r) => r.resource),
+          ]
+            .filter((e) => e !== null)
+            // filter for same entity appearing twice
+            .filter((e, index, suggested) => {
+              for (let i = 0; i < suggested.length; i = i + 1) {
+                if (
+                  i < index &&
+                  e.id === suggested[i].id &&
+                  e.type === suggested[i].type
+                ) {
+                  return false;
+                }
+              }
 
-                            return true;
-                        })
-                );
-            },
-        }),
-        accompanyingCourse() {
-            return this.$store.state.accompanyingCourse;
-        },
-        requestorIsAnonymous: {
-            set(value) {
-                this.$store.dispatch("requestorIsAnonymous", value);
-            },
-            get() {
-                return this.$store.state.accompanyingCourse.requestorAnonymous;
-            },
-        },
+              return true;
+            })
+        );
+      },
+    }),
+    accompanyingCourse() {
+      return this.$store.state.accompanyingCourse;
     },
-    methods: {
-        removeRequestor() {
-            //console.log('@@ CLICK remove requestor: item');
-            this.$store
-                .dispatch("removeRequestor")
-                .catch(({ name, violations }) => {
-                    if (
-                        name === "ValidationException" ||
-                        name === "AccessException"
-                    ) {
-                        violations.forEach((violation) =>
-                            this.$toast.open({ message: violation }),
-                        );
-                    } else {
-                        this.$toast.open({ message: "An error occurred" });
-                    }
-                });
-        },
-        addNewPersons({ selected, modal }) {
-            //console.log('@@@ CLICK button addNewPersons', selected);
-            this.$store
-                .dispatch("addRequestor", selected.shift())
-                .catch(({ name, violations }) => {
-                    if (
-                        name === "ValidationException" ||
-                        name === "AccessException"
-                    ) {
-                        violations.forEach((violation) =>
-                            this.$toast.open({ message: violation }),
-                        );
-                    } else {
-                        this.$toast.open({ message: "An error occurred" });
-                    }
-                });
-
-            this.$refs.addPersons.resetSearch(); // to cast child method
-            modal.showModal = false;
-        },
-        saveFormOnTheFly(payload) {
-            console.log(
-                "saveFormOnTheFly: type",
-                payload.type,
-                ", data",
-                payload.data,
+    requestorIsAnonymous: {
+      set(value) {
+        this.$store.dispatch("requestorIsAnonymous", value);
+      },
+      get() {
+        return this.$store.state.accompanyingCourse.requestorAnonymous;
+      },
+    },
+  },
+  methods: {
+    removeRequestor() {
+      //console.log('@@ CLICK remove requestor: item');
+      this.$store.dispatch("removeRequestor").catch(({ name, violations }) => {
+        if (name === "ValidationException" || name === "AccessException") {
+          violations.forEach((violation) =>
+            this.$toast.open({ message: violation }),
+          );
+        } else {
+          this.$toast.open({ message: "An error occurred" });
+        }
+      });
+    },
+    addNewPersons({ selected, modal }) {
+      //console.log('@@@ CLICK button addNewPersons', selected);
+      this.$store
+        .dispatch("addRequestor", selected.shift())
+        .catch(({ name, violations }) => {
+          if (name === "ValidationException" || name === "AccessException") {
+            violations.forEach((violation) =>
+              this.$toast.open({ message: violation }),
             );
-            payload.target = "requestor";
+          } else {
+            this.$toast.open({ message: "An error occurred" });
+          }
+        });
 
-            let body = { type: payload.type };
-            if (payload.type === "person") {
-                body.firstName = payload.data.firstName;
-                body.lastName = payload.data.lastName;
-                if (payload.data.birthdate !== null) {
-                    body.birthdate = payload.data.birthdate;
-                }
-                body.phonenumber = payload.data.phonenumber;
-                body.mobilenumber = payload.data.mobilenumber;
-                body.email = payload.data.email;
-                body.altNames = payload.data.altNames;
-                body.gender = payload.data.gender;
-
-                makeFetch(
-                    "PATCH",
-                    `/api/1.0/person/person/${payload.data.id}.json`,
-                    body,
-                )
-                    .then((response) => {
-                        this.$store.dispatch("addPerson", {
-                            target: payload.target,
-                            body: response,
-                        });
-                        this.$refs.onTheFly.closeModal();
-                    })
-                    .catch((error) => {
-                        if (error.name === "ValidationException") {
-                            for (let v of error.violations) {
-                                this.$toast.open({ message: v });
-                            }
-                        } else {
-                            this.$toast.open({ message: "An error occurred" });
-                        }
-                    });
-            } else if (payload.type === "thirdparty") {
-                body.name = payload.data.text;
-                body.email = payload.data.email;
-                body.telephone = payload.data.telephone;
-                body.telephone2 = payload.data.telephone2;
-                if (payload.data.address) {
-                    body.address = { id: payload.data.address.address_id };
-                }
-
-                makeFetch(
-                    "PATCH",
-                    `/api/1.0/thirdparty/thirdparty/${payload.data.id}.json`,
-                    body,
-                )
-                    .then((response) => {
-                        this.$store.dispatch("addThirdparty", {
-                            target: payload.target,
-                            body: response,
-                        });
-                        this.$refs.onTheFly.closeModal();
-                    })
-                    .catch((error) => {
-                        if (error.name === "ValidationException") {
-                            for (let v of error.violations) {
-                                this.$toast.open({ message: v });
-                            }
-                        } else {
-                            this.$toast.open({ message: "An error occurred" });
-                        }
-                    });
-            }
-        },
-        addSuggestedEntity(e) {
-            this.$store
-                .dispatch("addRequestor", { result: e, type: e.type })
-                .catch(({ name, violations }) => {
-                    if (
-                        name === "ValidationException" ||
-                        name === "AccessException"
-                    ) {
-                        violations.forEach((violation) =>
-                            this.$toast.open({ message: violation }),
-                        );
-                    } else {
-                        this.$toast.open({ message: "An error occurred" });
-                    }
-                });
-        },
-        uniqueId(e) {
-            return `${e.type}-${e.id}`;
-        },
+      this.$refs.addPersons.resetSearch(); // to cast child method
+      modal.showModal = false;
     },
+    saveFormOnTheFly(payload) {
+      console.log(
+        "saveFormOnTheFly: type",
+        payload.type,
+        ", data",
+        payload.data,
+      );
+      payload.target = "requestor";
+
+      let body = { type: payload.type };
+      if (payload.type === "person") {
+        body.firstName = payload.data.firstName;
+        body.lastName = payload.data.lastName;
+        if (payload.data.birthdate !== null) {
+          body.birthdate = payload.data.birthdate;
+        }
+        body.phonenumber = payload.data.phonenumber;
+        body.mobilenumber = payload.data.mobilenumber;
+        body.email = payload.data.email;
+        body.altNames = payload.data.altNames;
+        body.gender = payload.data.gender;
+
+        makeFetch(
+          "PATCH",
+          `/api/1.0/person/person/${payload.data.id}.json`,
+          body,
+        )
+          .then((response) => {
+            this.$store.dispatch("addPerson", {
+              target: payload.target,
+              body: response,
+            });
+            this.$refs.onTheFly.closeModal();
+          })
+          .catch((error) => {
+            if (error.name === "ValidationException") {
+              for (let v of error.violations) {
+                this.$toast.open({ message: v });
+              }
+            } else {
+              this.$toast.open({ message: "An error occurred" });
+            }
+          });
+      } else if (payload.type === "thirdparty") {
+        body.name = payload.data.text;
+        body.email = payload.data.email;
+        body.telephone = payload.data.telephone;
+        body.telephone2 = payload.data.telephone2;
+        if (payload.data.address) {
+          body.address = { id: payload.data.address.address_id };
+        }
+
+        makeFetch(
+          "PATCH",
+          `/api/1.0/thirdparty/thirdparty/${payload.data.id}.json`,
+          body,
+        )
+          .then((response) => {
+            this.$store.dispatch("addThirdparty", {
+              target: payload.target,
+              body: response,
+            });
+            this.$refs.onTheFly.closeModal();
+          })
+          .catch((error) => {
+            if (error.name === "ValidationException") {
+              for (let v of error.violations) {
+                this.$toast.open({ message: v });
+              }
+            } else {
+              this.$toast.open({ message: "An error occurred" });
+            }
+          });
+      }
+    },
+    addSuggestedEntity(e) {
+      this.$store
+        .dispatch("addRequestor", { result: e, type: e.type })
+        .catch(({ name, violations }) => {
+          if (name === "ValidationException" || name === "AccessException") {
+            violations.forEach((violation) =>
+              this.$toast.open({ message: violation }),
+            );
+          } else {
+            this.$toast.open({ message: "An error occurred" });
+          }
+        });
+    },
+    uniqueId(e) {
+      return `${e.type}-${e.id}`;
+    },
+  },
 };
 </script>
 
 <style lang="scss" scoped>
 div.flex-table {
-    margin: 1em 0 0 !important;
-    & > label,
-    & > ul.record_actions {
-        margin: 1em 3em 0 !important;
-    }
-    div.item-bloc {
-        background-color: white !important;
-        margin-top: 1em;
-    }
+  margin: 1em 0 0 !important;
+  & > label,
+  & > ul.record_actions {
+    margin: 1em 3em 0 !important;
+  }
+  div.item-bloc {
+    background-color: white !important;
+    margin-top: 1em;
+  }
 }
 
 .confidential {
-    display: block;
-    margin-right: 0px !important;
+  display: block;
+  margin-right: 0px !important;
 }
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
index 1ef9bfe45..fa600bfdd 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
@@ -1,57 +1,57 @@
 <template>
-    <div class="vue-component">
-        <h2><a id="section-90" />{{ $t("resources.title") }}</h2>
+  <div class="vue-component">
+    <h2><a id="section-90" />{{ $t("resources.title") }}</h2>
 
-        <div v-if="resources.length > 0">
-            <label class="col-form-label">{{
-                $tc("resources.counter", counter)
-            }}</label>
-        </div>
-        <div v-else>
-            <label class="chill-no-data-statement">{{
-                $tc("resources.counter", counter)
-            }}</label>
-        </div>
-
-        <div class="flex-table mb-3">
-            <resource-item
-                v-for="resource in resources"
-                :resource="resource"
-                :key="resource.id"
-                @remove="removeResource"
-            />
-        </div>
-
-        <div v-if="suggestedEntities.length > 0">
-            <ul class="list-suggest add-items inline">
-                <li
-                    v-for="p in suggestedEntities"
-                    :key="uniqueId(p)"
-                    @click="addSuggestedEntity(p)"
-                >
-                    <person-text v-if="p.type === 'person'" :person="p" />
-                    <span v-else>{{ p.text }}</span>
-                </li>
-            </ul>
-        </div>
-
-        <div>
-            <ul class="record_actions">
-                <li class="add-persons">
-                    <add-persons
-                        button-title="resources.add_resources"
-                        modal-title="resources.add_resources"
-                        :key="addPersons.key"
-                        :options="addPersons.options"
-                        @add-new-persons="addNewPersons"
-                        ref="addPersons"
-                    >
-                        <!-- to cast child method -->
-                    </add-persons>
-                </li>
-            </ul>
-        </div>
+    <div v-if="resources.length > 0">
+      <label class="col-form-label">{{
+        $tc("resources.counter", counter)
+      }}</label>
     </div>
+    <div v-else>
+      <label class="chill-no-data-statement">{{
+        $tc("resources.counter", counter)
+      }}</label>
+    </div>
+
+    <div class="flex-table mb-3">
+      <resource-item
+        v-for="resource in resources"
+        :resource="resource"
+        :key="resource.id"
+        @remove="removeResource"
+      />
+    </div>
+
+    <div v-if="suggestedEntities.length > 0">
+      <ul class="list-suggest add-items inline">
+        <li
+          v-for="p in suggestedEntities"
+          :key="uniqueId(p)"
+          @click="addSuggestedEntity(p)"
+        >
+          <person-text v-if="p.type === 'person'" :person="p" />
+          <span v-else>{{ p.text }}</span>
+        </li>
+      </ul>
+    </div>
+
+    <div>
+      <ul class="record_actions">
+        <li class="add-persons">
+          <add-persons
+            button-title="resources.add_resources"
+            modal-title="resources.add_resources"
+            :key="addPersons.key"
+            :options="addPersons.options"
+            @add-new-persons="addNewPersons"
+            ref="addPersons"
+          >
+            <!-- to cast child method -->
+          </add-persons>
+        </li>
+      </ul>
+    </div>
+  </div>
 </template>
 
 <script>
@@ -61,126 +61,117 @@ import ResourceItem from "./Resources/ResourceItem.vue";
 import PersonText from "ChillPersonAssets/vuejs/_components/Entity/PersonText.vue";
 
 export default {
-    name: "Resources",
-    components: {
-        AddPersons,
-        ResourceItem,
-        PersonText,
-    },
-    data() {
-        return {
-            addPersons: {
-                key: "resources",
-                options: {
-                    type: ["person", "thirdparty"],
-                    priority: null,
-                    uniq: false,
-                },
-            },
-        };
-    },
-    computed: mapState({
-        resources: (state) => state.accompanyingCourse.resources,
-        counter: (state) => state.accompanyingCourse.resources.length,
-        suggestedEntities: (state) =>
-            [
-                state.accompanyingCourse.requestor,
-                ...state.accompanyingCourse.participations
-                    .filter((p) => p.endDate === null)
-                    .map((p) => p.person),
-            ]
-                .filter((e) => e !== null)
-                .filter((e) => {
-                    if (e.type === "person") {
-                        return !state.accompanyingCourse.resources
-                            .filter((r) => r.resource.type === "person")
-                            .map((r) => r.resource.id)
-                            .includes(e.id);
-                    }
-                    if (e.type === "thirdparty") {
-                        return !state.accompanyingCourse.resources
-                            .filter((r) => r.resource.type === "thirdparty")
-                            .map((r) => r.resource.id)
-                            .includes(e.id);
-                    }
-                })
-                // filter persons appearing twice in requestor and resources
-                .filter((e, index, suggested) => {
-                    for (let i = 0; i < suggested.length; i = i + 1) {
-                        if (i < index && e.id === suggested[i].id) {
-                            return false;
-                        }
-                    }
+  name: "Resources",
+  components: {
+    AddPersons,
+    ResourceItem,
+    PersonText,
+  },
+  data() {
+    return {
+      addPersons: {
+        key: "resources",
+        options: {
+          type: ["person", "thirdparty"],
+          priority: null,
+          uniq: false,
+        },
+      },
+    };
+  },
+  computed: mapState({
+    resources: (state) => state.accompanyingCourse.resources,
+    counter: (state) => state.accompanyingCourse.resources.length,
+    suggestedEntities: (state) =>
+      [
+        state.accompanyingCourse.requestor,
+        ...state.accompanyingCourse.participations
+          .filter((p) => p.endDate === null)
+          .map((p) => p.person),
+      ]
+        .filter((e) => e !== null)
+        .filter((e) => {
+          if (e.type === "person") {
+            return !state.accompanyingCourse.resources
+              .filter((r) => r.resource.type === "person")
+              .map((r) => r.resource.id)
+              .includes(e.id);
+          }
+          if (e.type === "thirdparty") {
+            return !state.accompanyingCourse.resources
+              .filter((r) => r.resource.type === "thirdparty")
+              .map((r) => r.resource.id)
+              .includes(e.id);
+          }
+        })
+        // filter persons appearing twice in requestor and resources
+        .filter((e, index, suggested) => {
+          for (let i = 0; i < suggested.length; i = i + 1) {
+            if (i < index && e.id === suggested[i].id) {
+              return false;
+            }
+          }
 
-                    return true;
-                }),
-    }),
-    methods: {
-        removeResource(item) {
-            //console.log('@@ CLICK remove resource: item', item);
-            this.$store
-                .dispatch("removeResource", item)
-                .catch(({ name, violations }) => {
-                    if (
-                        name === "ValidationException" ||
-                        name === "AccessException"
-                    ) {
-                        violations.forEach((violation) =>
-                            this.$toast.open({ message: violation }),
-                        );
-                    } else {
-                        this.$toast.open({ message: "An error occurred" });
-                    }
-                });
-        },
-        addNewPersons({ selected, modal }) {
-            //console.log('@@@ CLICK button addNewPersons', selected);
-            selected.forEach(function (item) {
-                this.$store
-                    .dispatch("addResource", item)
-                    .catch(({ name, violations }) => {
-                        if (
-                            name === "ValidationException" ||
-                            name === "AccessException"
-                        ) {
-                            violations.forEach((violation) =>
-                                this.$toast.open({ message: violation }),
-                            );
-                        } else {
-                            this.$toast.open({ message: violations });
-                        }
-                    });
-            }, this);
-            this.$refs.addPersons.resetSearch(); // to cast child method
-            modal.showModal = false;
-        },
-        addSuggestedEntity(e) {
-            this.$store
-                .dispatch("addResource", { result: e, type: e.type })
-                .catch(({ name, violations }) => {
-                    if (
-                        name === "ValidationException" ||
-                        name === "AccessException"
-                    ) {
-                        violations.forEach((violation) =>
-                            this.$toast.open({ message: violation }),
-                        );
-                    } else {
-                        this.$toast.open({ message: "An error occurred" });
-                    }
-                });
-        },
-        uniqueId(e) {
-            return `${e.type}-${e.id}`;
-        },
+          return true;
+        }),
+  }),
+  methods: {
+    removeResource(item) {
+      //console.log('@@ CLICK remove resource: item', item);
+      this.$store
+        .dispatch("removeResource", item)
+        .catch(({ name, violations }) => {
+          if (name === "ValidationException" || name === "AccessException") {
+            violations.forEach((violation) =>
+              this.$toast.open({ message: violation }),
+            );
+          } else {
+            this.$toast.open({ message: "An error occurred" });
+          }
+        });
     },
+    addNewPersons({ selected, modal }) {
+      //console.log('@@@ CLICK button addNewPersons', selected);
+      selected.forEach(function (item) {
+        this.$store
+          .dispatch("addResource", item)
+          .catch(({ name, violations }) => {
+            if (name === "ValidationException" || name === "AccessException") {
+              violations.forEach((violation) =>
+                this.$toast.open({ message: violation }),
+              );
+            } else {
+              this.$toast.open({ message: violations });
+            }
+          });
+      }, this);
+      this.$refs.addPersons.resetSearch(); // to cast child method
+      modal.showModal = false;
+    },
+    addSuggestedEntity(e) {
+      this.$store
+        .dispatch("addResource", { result: e, type: e.type })
+        .catch(({ name, violations }) => {
+          if (name === "ValidationException" || name === "AccessException") {
+            violations.forEach((violation) =>
+              this.$toast.open({ message: violation }),
+            );
+          } else {
+            this.$toast.open({ message: "An error occurred" });
+          }
+        });
+    },
+    uniqueId(e) {
+      return `${e.type}-${e.id}`;
+    },
+  },
 };
 </script>
 
 <style lang="scss">
 div.flex-bloc {
-    div.item-bloc {
-        flex-basis: 50%;
-    }
+  div.item-bloc {
+    flex-basis: 50%;
+  }
 }
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
index 8a52748d4..87daacf47 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/ResourceItem.vue
@@ -1,107 +1,107 @@
 <template>
-    <person-render-box
-        render="bloc"
-        v-if="resource.resource.type === 'person'"
-        :person="resource.resource"
-        :options="{
-            addInfo: true,
-            addId: false,
-            addEntity: true,
-            addLink: false,
-            addAltNames: true,
-            addAge: false,
-            hLevel: 3,
-            isConfidential: true,
-        }"
-    >
-        <template #end-bloc>
-            <div class="item-row separator">
-                <ul class="record_actions">
-                    <li>
-                        <write-comment
-                            :resource="resource"
-                            @update-comment="updateComment"
-                        />
-                    </li>
-                    <li>
-                        <on-the-fly
-                            :parent="parent"
-                            :type="resource.resource.type"
-                            :id="resource.resource.id"
-                            action="show"
-                        />
-                    </li>
-                    <li>
-                        <on-the-fly
-                            :parent="parent"
-                            :type="resource.resource.type"
-                            :id="resource.resource.id"
-                            action="edit"
-                            @save-form-on-the-fly="saveFormOnTheFly"
-                            ref="onTheFly"
-                        />
-                    </li>
-                    <li>
-                        <button
-                            class="btn btn-sm btn-remove"
-                            :title="$t('action.remove')"
-                            @click.prevent="$emit('remove', resource)"
-                        />
-                    </li>
-                </ul>
-            </div>
-        </template>
-    </person-render-box>
+  <person-render-box
+    render="bloc"
+    v-if="resource.resource.type === 'person'"
+    :person="resource.resource"
+    :options="{
+      addInfo: true,
+      addId: false,
+      addEntity: true,
+      addLink: false,
+      addAltNames: true,
+      addAge: false,
+      hLevel: 3,
+      isConfidential: true,
+    }"
+  >
+    <template #end-bloc>
+      <div class="item-row separator">
+        <ul class="record_actions">
+          <li>
+            <write-comment
+              :resource="resource"
+              @update-comment="updateComment"
+            />
+          </li>
+          <li>
+            <on-the-fly
+              :parent="parent"
+              :type="resource.resource.type"
+              :id="resource.resource.id"
+              action="show"
+            />
+          </li>
+          <li>
+            <on-the-fly
+              :parent="parent"
+              :type="resource.resource.type"
+              :id="resource.resource.id"
+              action="edit"
+              @save-form-on-the-fly="saveFormOnTheFly"
+              ref="onTheFly"
+            />
+          </li>
+          <li>
+            <button
+              class="btn btn-sm btn-remove"
+              :title="$t('action.remove')"
+              @click.prevent="$emit('remove', resource)"
+            />
+          </li>
+        </ul>
+      </div>
+    </template>
+  </person-render-box>
 
-    <third-party-render-box
-        v-if="resource.resource.type === 'thirdparty'"
-        :thirdparty="resource.resource"
-        :options="{
-            addLink: false,
-            addId: false,
-            addEntity: true,
-            addInfo: false,
-            hLevel: 3,
-        }"
-    >
-        <template #end-bloc>
-            <div class="item-row separator">
-                <ul class="record_actions">
-                    <li>
-                        <write-comment
-                            :resource="resource"
-                            @update-comment="updateComment"
-                        />
-                    </li>
-                    <li>
-                        <on-the-fly
-                            :parent="parent"
-                            :type="resource.resource.type"
-                            :id="resource.resource.id"
-                            action="show"
-                        />
-                    </li>
-                    <li>
-                        <on-the-fly
-                            :parent="parent"
-                            :type="resource.resource.type"
-                            :id="resource.resource.id"
-                            action="edit"
-                            @save-form-on-the-fly="saveFormOnTheFly"
-                            ref="onTheFly"
-                        />
-                    </li>
-                    <li>
-                        <button
-                            class="btn btn-sm btn-remove"
-                            :title="$t('action.remove')"
-                            @click.prevent="$emit('remove', resource)"
-                        />
-                    </li>
-                </ul>
-            </div>
-        </template>
-    </third-party-render-box>
+  <third-party-render-box
+    v-if="resource.resource.type === 'thirdparty'"
+    :thirdparty="resource.resource"
+    :options="{
+      addLink: false,
+      addId: false,
+      addEntity: true,
+      addInfo: false,
+      hLevel: 3,
+    }"
+  >
+    <template #end-bloc>
+      <div class="item-row separator">
+        <ul class="record_actions">
+          <li>
+            <write-comment
+              :resource="resource"
+              @update-comment="updateComment"
+            />
+          </li>
+          <li>
+            <on-the-fly
+              :parent="parent"
+              :type="resource.resource.type"
+              :id="resource.resource.id"
+              action="show"
+            />
+          </li>
+          <li>
+            <on-the-fly
+              :parent="parent"
+              :type="resource.resource.type"
+              :id="resource.resource.id"
+              action="edit"
+              @save-form-on-the-fly="saveFormOnTheFly"
+              ref="onTheFly"
+            />
+          </li>
+          <li>
+            <button
+              class="btn btn-sm btn-remove"
+              :title="$t('action.remove')"
+              @click.prevent="$emit('remove', resource)"
+            />
+          </li>
+        </ul>
+      </div>
+    </template>
+  </third-party-render-box>
 </template>
 
 <script>
@@ -112,130 +112,130 @@ import WriteComment from "./WriteComment";
 import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
 
 export default {
-    name: "ResourceItem",
-    components: {
-        OnTheFly,
-        PersonRenderBox,
-        ThirdPartyRenderBox,
-        WriteComment,
-    },
-    props: ["resource"],
-    emits: ["remove"],
-    computed: {
-        parent() {
-            return {
-                type: this.resource.type,
-                id: this.resource.id,
-                comment: this.resource.comment,
-                parent: {
-                    type: this.$store.state.accompanyingCourse.type,
-                    id: this.$store.state.accompanyingCourse.id,
-                },
-            };
+  name: "ResourceItem",
+  components: {
+    OnTheFly,
+    PersonRenderBox,
+    ThirdPartyRenderBox,
+    WriteComment,
+  },
+  props: ["resource"],
+  emits: ["remove"],
+  computed: {
+    parent() {
+      return {
+        type: this.resource.type,
+        id: this.resource.id,
+        comment: this.resource.comment,
+        parent: {
+          type: this.$store.state.accompanyingCourse.type,
+          id: this.$store.state.accompanyingCourse.id,
         },
-        hasCurrentHouseholdAddress() {
-            if (this.resource.resource.current_household_address !== null) {
-                return true;
+      };
+    },
+    hasCurrentHouseholdAddress() {
+      if (this.resource.resource.current_household_address !== null) {
+        return true;
+      }
+      return false;
+    },
+  },
+  methods: {
+    saveFormOnTheFly(payload) {
+      // console.log('saveFormOnTheFly: type', payload.type, ', data', payload.data);
+      payload.target = "resource";
+
+      let body = { type: payload.type };
+      if (payload.type === "person") {
+        body.firstName = payload.data.firstName;
+        body.lastName = payload.data.lastName;
+        if (payload.data.birthdate !== null) {
+          body.birthdate = payload.data.birthdate;
+        }
+        body.phonenumber = payload.data.phonenumber;
+        body.mobilenumber = payload.data.mobilenumber;
+        body.email = payload.data.email;
+        body.altNames = payload.data.altNames;
+        body.gender = {
+          id: payload.data.gender.id,
+          type: payload.data.gender.type,
+        };
+        if (payload.data.civility !== null) {
+          body.civility = {
+            id: payload.data.civility.id,
+            type: payload.data.civility.type,
+          };
+        }
+
+        makeFetch(
+          "PATCH",
+          `/api/1.0/person/person/${payload.data.id}.json`,
+          body,
+        )
+          .then((response) => {
+            this.$store.dispatch("addPerson", {
+              target: payload.target,
+              body: response,
+            });
+            this.$refs.onTheFly.closeModal();
+          })
+          .catch((error) => {
+            if (error.name === "ValidationException") {
+              for (let v of error.violations) {
+                this.$toast.open({ message: v });
+              }
+            } else {
+              this.$toast.open({ message: "An error occurred" });
             }
-            return false;
-        },
-    },
-    methods: {
-        saveFormOnTheFly(payload) {
-            // console.log('saveFormOnTheFly: type', payload.type, ', data', payload.data);
-            payload.target = "resource";
+          });
+      } else if (payload.type === "thirdparty") {
+        // console.log('data', payload.data)
+        body.firstname = payload.data.firstname;
+        body.name = payload.data.name;
+        body.email = payload.data.email;
+        body.telephone = payload.data.telephone;
+        body.telephone2 = payload.data.telephone2;
+        body.address = payload.data.address
+          ? { id: payload.data.address.address_id }
+          : null;
+        if (null !== payload.data.civility) {
+          body.civility = {
+            type: "chill_main_civility",
+            id: payload.data.civility.id,
+          };
+        }
+        if (null !== payload.data.profession) {
+          body.profession = payload.data.profession;
+        }
+        // console.log('body', body);
 
-            let body = { type: payload.type };
-            if (payload.type === "person") {
-                body.firstName = payload.data.firstName;
-                body.lastName = payload.data.lastName;
-                if (payload.data.birthdate !== null) {
-                    body.birthdate = payload.data.birthdate;
-                }
-                body.phonenumber = payload.data.phonenumber;
-                body.mobilenumber = payload.data.mobilenumber;
-                body.email = payload.data.email;
-                body.altNames = payload.data.altNames;
-                body.gender = {
-                    id: payload.data.gender.id,
-                    type: payload.data.gender.type,
-                };
-                if (payload.data.civility !== null) {
-                    body.civility = {
-                        id: payload.data.civility.id,
-                        type: payload.data.civility.type,
-                    };
-                }
-
-                makeFetch(
-                    "PATCH",
-                    `/api/1.0/person/person/${payload.data.id}.json`,
-                    body,
-                )
-                    .then((response) => {
-                        this.$store.dispatch("addPerson", {
-                            target: payload.target,
-                            body: response,
-                        });
-                        this.$refs.onTheFly.closeModal();
-                    })
-                    .catch((error) => {
-                        if (error.name === "ValidationException") {
-                            for (let v of error.violations) {
-                                this.$toast.open({ message: v });
-                            }
-                        } else {
-                            this.$toast.open({ message: "An error occurred" });
-                        }
-                    });
-            } else if (payload.type === "thirdparty") {
-                // console.log('data', payload.data)
-                body.firstname = payload.data.firstname;
-                body.name = payload.data.name;
-                body.email = payload.data.email;
-                body.telephone = payload.data.telephone;
-                body.telephone2 = payload.data.telephone2;
-                body.address = payload.data.address
-                    ? { id: payload.data.address.address_id }
-                    : null;
-                if (null !== payload.data.civility) {
-                    body.civility = {
-                        type: "chill_main_civility",
-                        id: payload.data.civility.id,
-                    };
-                }
-                if (null !== payload.data.profession) {
-                    body.profession = payload.data.profession;
-                }
-                // console.log('body', body);
-
-                makeFetch(
-                    "PATCH",
-                    `/api/1.0/thirdparty/thirdparty/${payload.data.id}.json`,
-                    body,
-                )
-                    .then((response) => {
-                        this.$store.dispatch("addThirdparty", {
-                            target: payload.target,
-                            body: response,
-                        });
-                        this.$refs.onTheFly.closeModal();
-                    })
-                    .catch((error) => {
-                        if (error.name === "ValidationException") {
-                            for (let v of error.violations) {
-                                this.$toast.open({ message: v });
-                            }
-                        } else {
-                            this.$toast.open({ message: "An error occurred" });
-                        }
-                    });
+        makeFetch(
+          "PATCH",
+          `/api/1.0/thirdparty/thirdparty/${payload.data.id}.json`,
+          body,
+        )
+          .then((response) => {
+            this.$store.dispatch("addThirdparty", {
+              target: payload.target,
+              body: response,
+            });
+            this.$refs.onTheFly.closeModal();
+          })
+          .catch((error) => {
+            if (error.name === "ValidationException") {
+              for (let v of error.violations) {
+                this.$toast.open({ message: v });
+              }
+            } else {
+              this.$toast.open({ message: "An error occurred" });
             }
-        },
-        updateComment(resource) {
-            console.log("updateComment", resource);
-            this.$store.commit("updateResource", resource);
-        },
+          });
+      }
     },
+    updateComment(resource) {
+      console.log("updateComment", resource);
+      this.$store.commit("updateResource", resource);
+    },
+  },
 };
 </script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/WriteComment.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/WriteComment.vue
index 26b561c5d..416c6085c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/WriteComment.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources/WriteComment.vue
@@ -1,34 +1,32 @@
 <template>
-    <a
-        class="btn btn-sm btn-misc change-icon"
-        :title="$t('write_comment')"
-        @click="openModal"
-        ><i class="fa fa-pencil-square-o" />
-    </a>
+  <a
+    class="btn btn-sm btn-misc change-icon"
+    :title="$t('write_comment')"
+    @click="openModal"
+    ><i class="fa fa-pencil-square-o" />
+  </a>
 
-    <teleport to="body">
-        <modal
-            v-if="modal.showModal"
-            :modal-dialog-class="modal.modalDialogClass"
-            @close="modal.showModal = false"
-        >
-            <template #header>
-                <h3 class="modal-title">
-                    {{
-                        $t("write_comment_about", { r: resource.resource.text })
-                    }}
-                </h3>
-            </template>
-            <template #body>
-                <comment-editor v-model="content" />
-            </template>
-            <template #footer>
-                <a class="btn btn-save" @click="saveAction">
-                    {{ $t("action.save") }}
-                </a>
-            </template>
-        </modal>
-    </teleport>
+  <teleport to="body">
+    <modal
+      v-if="modal.showModal"
+      :modal-dialog-class="modal.modalDialogClass"
+      @close="modal.showModal = false"
+    >
+      <template #header>
+        <h3 class="modal-title">
+          {{ $t("write_comment_about", { r: resource.resource.text }) }}
+        </h3>
+      </template>
+      <template #body>
+        <comment-editor v-model="content" />
+      </template>
+      <template #footer>
+        <a class="btn btn-save" @click="saveAction">
+          {{ $t("action.save") }}
+        </a>
+      </template>
+    </modal>
+  </teleport>
 </template>
 
 <script>
@@ -37,71 +35,71 @@ import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
 import CommentEditor from "ChillMainAssets/vuejs/_components/CommentEditor/CommentEditor.vue";
 
 export default {
-    name: "WriteComment",
-    components: {
-        Modal,
-        CommentEditor,
+  name: "WriteComment",
+  components: {
+    Modal,
+    CommentEditor,
+  },
+  props: ["resource"],
+  emits: ["updateComment"],
+  data() {
+    return {
+      modal: {
+        showModal: false,
+        modalDialogClass: "modal-dialog-scrollable modal-xl",
+      },
+      formdata: {
+        content: this.resource.comment,
+      },
+    };
+  },
+  i18n: {
+    messages: {
+      fr: {
+        write_comment: "Écrire un commentaire",
+        write_comment_about: "Écrire un commentaire à propos de {r}",
+        comment_placeholder: "Commencez à écrire...",
+      },
     },
-    props: ["resource"],
-    emits: ["updateComment"],
-    data() {
-        return {
-            modal: {
-                showModal: false,
-                modalDialogClass: "modal-dialog-scrollable modal-xl",
-            },
-            formdata: {
-                content: this.resource.comment,
-            },
+  },
+  computed: {
+    editor: () => ClassicEditor,
+    editorConfig: () => classicEditorConfig,
+    content: {
+      set(value) {
+        this.formdata.content = value;
+      },
+      get() {
+        return this.formdata.content;
+      },
+    },
+  },
+  methods: {
+    openModal() {
+      //console.log('write comment for', this.resource.resource.type, this.resource.resource.id);
+      this.modal.showModal = true;
+    },
+    saveAction() {
+      //console.log('save comment', this.resource.id, this.formdata.content);
+      this.patchResource(this.resource.id, this.formdata.content);
+    },
+    patchResource(id, comment) {
+      let url = `/api/1.0/person/accompanying-period/resource/${id}.json`,
+        body = {
+          type: "accompanying_period_resource",
+          comment: comment,
         };
+      makeFetch("PATCH", url, body).then((r) => {
+        let resource = {
+          type: "accompanying_period_resource",
+          id: r.id,
+          comment: r.comment,
+          resource: r.resource,
+        };
+        this.$emit("updateComment", resource);
+        this.modal.showModal = false;
+      });
     },
-    i18n: {
-        messages: {
-            fr: {
-                write_comment: "Écrire un commentaire",
-                write_comment_about: "Écrire un commentaire à propos de {r}",
-                comment_placeholder: "Commencez à écrire...",
-            },
-        },
-    },
-    computed: {
-        editor: () => ClassicEditor,
-        editorConfig: () => classicEditorConfig,
-        content: {
-            set(value) {
-                this.formdata.content = value;
-            },
-            get() {
-                return this.formdata.content;
-            },
-        },
-    },
-    methods: {
-        openModal() {
-            //console.log('write comment for', this.resource.resource.type, this.resource.resource.id);
-            this.modal.showModal = true;
-        },
-        saveAction() {
-            //console.log('save comment', this.resource.id, this.formdata.content);
-            this.patchResource(this.resource.id, this.formdata.content);
-        },
-        patchResource(id, comment) {
-            let url = `/api/1.0/person/accompanying-period/resource/${id}.json`,
-                body = {
-                    type: "accompanying_period_resource",
-                    comment: comment,
-                };
-            makeFetch("PATCH", url, body).then((r) => {
-                let resource = {
-                    type: "accompanying_period_resource",
-                    id: r.id,
-                    comment: r.comment,
-                    resource: r.resource,
-                };
-                this.$emit("updateComment", resource);
-                this.modal.showModal = false;
-            });
-        },
-    },
+  },
 };
 </script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Scopes.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Scopes.vue
index 1d05e0bbe..fee6a89ad 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Scopes.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Scopes.vue
@@ -1,25 +1,25 @@
 <template>
-    <div class="vue-component">
-        <h2><a id="section-70" />{{ $t("scopes.title") }}</h2>
+  <div class="vue-component">
+    <h2><a id="section-70" />{{ $t("scopes.title") }}</h2>
 
-        <div class="mb-4">
-            <div class="form-check" v-for="s in scopes" :key="s.id">
-                <input
-                    class="form-check-input"
-                    type="checkbox"
-                    v-model="checkedScopes"
-                    :value="s"
-                />
-                <label class="form-check-label">
-                    {{ localizeString(s.name) }}
-                </label>
-            </div>
-        </div>
-
-        <div v-if="!isScopeValid" class="alert alert-warning to-confirm">
-            {{ $t("scopes.add_at_least_one") }}
-        </div>
+    <div class="mb-4">
+      <div class="form-check" v-for="s in scopes" :key="s.id">
+        <input
+          class="form-check-input"
+          type="checkbox"
+          v-model="checkedScopes"
+          :value="s"
+        />
+        <label class="form-check-label">
+          {{ localizeString(s.name) }}
+        </label>
+      </div>
     </div>
+
+    <div v-if="!isScopeValid" class="alert alert-warning to-confirm">
+      {{ $t("scopes.add_at_least_one") }}
+    </div>
+  </div>
 </template>
 
 <script>
@@ -27,38 +27,33 @@ import { mapState, mapGetters } from "vuex";
 import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
 
 export default {
-    name: "Scopes",
-    computed: {
-        ...mapState(["scopes", "scopesAtStart"]),
-        ...mapGetters(["isScopeValid"]),
-        checkedScopes: {
-            get: function () {
-                return this.$store.state.accompanyingCourse.scopes;
-            },
-            set: function (v) {
-                this.$store
-                    .dispatch("setScopes", v)
-                    .catch(({ name, violations }) => {
-                        if (
-                            name === "ValidationException" ||
-                            name === "AccessException"
-                        ) {
-                            violations.forEach((violation) =>
-                                this.$toast.open({ message: violation }),
-                            );
-                        } else {
-                            this.$toast.open({ message: "An error occurred" });
-                        }
-                    });
-            },
-        },
+  name: "Scopes",
+  computed: {
+    ...mapState(["scopes", "scopesAtStart"]),
+    ...mapGetters(["isScopeValid"]),
+    checkedScopes: {
+      get: function () {
+        return this.$store.state.accompanyingCourse.scopes;
+      },
+      set: function (v) {
+        this.$store.dispatch("setScopes", v).catch(({ name, violations }) => {
+          if (name === "ValidationException" || name === "AccessException") {
+            violations.forEach((violation) =>
+              this.$toast.open({ message: violation }),
+            );
+          } else {
+            this.$toast.open({ message: "An error occurred" });
+          }
+        });
+      },
     },
-    methods: {
-        localizeString,
-        restore() {
-            console.log("restore");
-        },
+  },
+  methods: {
+    localizeString,
+    restore() {
+      console.log("restore");
     },
+  },
 };
 </script>
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/SocialIssue.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/SocialIssue.vue
index 02d3b0c84..21c290f48 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/SocialIssue.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/SocialIssue.vue
@@ -1,30 +1,30 @@
 <template>
-    <div class="vue-component">
-        <h2><a id="section-60" />{{ $t("social_issue.title") }}</h2>
+  <div class="vue-component">
+    <h2><a id="section-60" />{{ $t("social_issue.title") }}</h2>
 
-        <div class="my-4">
-            <!--label for="field">{{ $t('social_issue.label') }}</label
+    <div class="my-4">
+      <!--label for="field">{{ $t('social_issue.label') }}</label
         -->
-            <VueMultiselect
-                name="field"
-                :close-on-select="true"
-                :allow-empty="true"
-                :show-labels="false"
-                track-by="id"
-                label="text"
-                :multiple="true"
-                :searchable="true"
-                :placeholder="$t('social_issue.label')"
-                @update:model-value="updateSocialIssues"
-                :model-value="value"
-                :options="options"
-            />
-        </div>
-
-        <div v-if="!isSocialIssueValid" class="alert alert-warning to-confirm">
-            {{ $t("social_issue.not_valid") }}
-        </div>
+      <VueMultiselect
+        name="field"
+        :close-on-select="true"
+        :allow-empty="true"
+        :show-labels="false"
+        track-by="id"
+        label="text"
+        :multiple="true"
+        :searchable="true"
+        :placeholder="$t('social_issue.label')"
+        @update:model-value="updateSocialIssues"
+        :model-value="value"
+        :options="options"
+      />
     </div>
+
+    <div v-if="!isSocialIssueValid" class="alert alert-warning to-confirm">
+      {{ $t("social_issue.not_valid") }}
+    </div>
+  </div>
 </template>
 
 <script>
@@ -33,59 +33,54 @@ import { fetchResults } from "ChillMainAssets/lib/api/apiMethods";
 import { mapGetters, mapState } from "vuex";
 
 export default {
-    name: "SocialIssue",
-    components: { VueMultiselect },
-    data() {
-        return {
-            options: [],
-        };
+  name: "SocialIssue",
+  components: { VueMultiselect },
+  data() {
+    return {
+      options: [],
+    };
+  },
+  computed: {
+    ...mapState({
+      value: (state) => state.accompanyingCourse.socialIssues,
+    }),
+    ...mapGetters(["isSocialIssueValid"]),
+  },
+  mounted() {
+    this.getOptions();
+  },
+  methods: {
+    getOptions() {
+      fetchResults(`/api/1.0/person/social-work/social-issue.json`).then(
+        (response) => {
+          this.options = response;
+        },
+      );
     },
-    computed: {
-        ...mapState({
-            value: (state) => state.accompanyingCourse.socialIssues,
-        }),
-        ...mapGetters(["isSocialIssueValid"]),
-    },
-    mounted() {
-        this.getOptions();
-    },
-    methods: {
-        getOptions() {
-            fetchResults(`/api/1.0/person/social-work/social-issue.json`).then(
-                (response) => {
-                    this.options = response;
-                },
+    updateSocialIssues(value) {
+      this.$store
+        .dispatch("updateSocialIssues", this.transformValue(value))
+        .catch(({ name, violations }) => {
+          if (name === "ValidationException" || name === "AccessException") {
+            violations.forEach((violation) =>
+              this.$toast.open({ message: violation }),
             );
-        },
-        updateSocialIssues(value) {
-            this.$store
-                .dispatch("updateSocialIssues", this.transformValue(value))
-                .catch(({ name, violations }) => {
-                    if (
-                        name === "ValidationException" ||
-                        name === "AccessException"
-                    ) {
-                        violations.forEach((violation) =>
-                            this.$toast.open({ message: violation }),
-                        );
-                    } else {
-                        this.$toast.open({ message: "An error occurred" });
-                    }
-                });
-        },
-        transformValue(updated) {
-            let stored = this.value;
-            let added = updated.filter((x) => stored.indexOf(x) === -1).shift();
-            let removed = stored
-                .filter((x) => updated.indexOf(x) === -1)
-                .shift();
-            let method = typeof removed === "undefined" ? "POST" : "DELETE";
-            let changed = typeof removed === "undefined" ? added : removed;
-            let body = { type: "social_issue", id: changed.id };
-            let payload = updated;
-            return { payload, body, method };
-        },
+          } else {
+            this.$toast.open({ message: "An error occurred" });
+          }
+        });
     },
+    transformValue(updated) {
+      let stored = this.value;
+      let added = updated.filter((x) => stored.indexOf(x) === -1).shift();
+      let removed = stored.filter((x) => updated.indexOf(x) === -1).shift();
+      let method = typeof removed === "undefined" ? "POST" : "DELETE";
+      let changed = typeof removed === "undefined" ? added : removed;
+      let body = { type: "social_issue", id: changed.id };
+      let payload = updated;
+      return { payload, body, method };
+    },
+  },
 };
 </script>
 
@@ -96,20 +91,20 @@ export default {
 @import "ChillPersonAssets/chill/scss/mixins";
 @import "ChillMainAssets/chill/scss/chill_variables";
 div#accompanying-course {
-    span.multiselect__tag {
-        @include badge_social($social-issue-color);
-        background: $chill-l-gray;
-        color: $dark;
+  span.multiselect__tag {
+    @include badge_social($social-issue-color);
+    background: $chill-l-gray;
+    color: $dark;
+  }
+  span.multiselect__option--highlight {
+    &::after {
+      background: $green;
     }
-    span.multiselect__option--highlight {
-        &::after {
-            background: $green;
-        }
-        &.multiselect__option--selected {
-            &::after {
-                background: $red;
-            }
-        }
+    &.multiselect__option--selected {
+      &::after {
+        background: $red;
+      }
     }
+  }
 }
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StartDate.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StartDate.vue
index 0bfd87b18..d3e9ae97a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StartDate.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StartDate.vue
@@ -1,22 +1,22 @@
 <template>
-    <div class="vue-component">
-        <h2>
-            <a id="section-110" />
-            {{ $t("startdate.change") }}
-        </h2>
-        <div>
-            <div class="mb-3 row">
-                <div class="col-sm-12 date-update">
-                    <input
-                        class="form-control"
-                        type="date"
-                        id="startDate"
-                        v-model="startDateInput"
-                    />
-                </div>
-            </div>
+  <div class="vue-component">
+    <h2>
+      <a id="section-110" />
+      {{ $t("startdate.change") }}
+    </h2>
+    <div>
+      <div class="mb-3 row">
+        <div class="col-sm-12 date-update">
+          <input
+            class="form-control"
+            type="date"
+            id="startDate"
+            v-model="startDateInput"
+          />
         </div>
+      </div>
     </div>
+  </div>
 </template>
 
 <script>
@@ -24,69 +24,60 @@ import { dateToISO, ISOToDatetime } from "ChillMainAssets/chill/js/date";
 import { mapState } from "vuex";
 
 export default {
-    name: "StartDate",
-    data() {
-        return {
-            lastRecordedDate: null,
-        };
-    },
-    computed: {
-        ...mapState({
-            startDate: (state) =>
-                dateToISO(
-                    ISOToDatetime(
-                        state.accompanyingCourse.openingDate.datetime,
-                    ),
-                ),
-        }),
-        startDateInput: {
-            get() {
-                return this.startDate;
-            },
-            set(value) {
-                this.lastRecordedDate = value;
+  name: "StartDate",
+  data() {
+    return {
+      lastRecordedDate: null,
+    };
+  },
+  computed: {
+    ...mapState({
+      startDate: (state) =>
+        dateToISO(ISOToDatetime(state.accompanyingCourse.openingDate.datetime)),
+    }),
+    startDateInput: {
+      get() {
+        return this.startDate;
+      },
+      set(value) {
+        this.lastRecordedDate = value;
 
-                setTimeout(() => {
-                    console.log("timeout finished");
-                    if (this.lastRecordedDate === value) {
-                        console.log(
-                            "last recorded",
-                            this.lastRecordedDate,
-                            "value",
-                            value,
-                        );
-                        this.$store
-                            .dispatch("updateStartDate", value)
-                            .catch(({ name, violations }) => {
-                                if (
-                                    name === "ValidationException" ||
-                                    name === "AccessException"
-                                ) {
-                                    violations.forEach((violation) =>
-                                        this.$toast.open({
-                                            message: violation,
-                                        }),
-                                    );
-                                } else {
-                                    this.$toast.open({
-                                        message: "An error occurred",
-                                    });
-                                }
-                            });
-                    }
-                }, 3000);
-            },
-        },
+        setTimeout(() => {
+          console.log("timeout finished");
+          if (this.lastRecordedDate === value) {
+            console.log("last recorded", this.lastRecordedDate, "value", value);
+            this.$store
+              .dispatch("updateStartDate", value)
+              .catch(({ name, violations }) => {
+                if (
+                  name === "ValidationException" ||
+                  name === "AccessException"
+                ) {
+                  violations.forEach((violation) =>
+                    this.$toast.open({
+                      message: violation,
+                    }),
+                  );
+                } else {
+                  this.$toast.open({
+                    message: "An error occurred",
+                  });
+                }
+              });
+          }
+        }, 3000);
+      },
     },
+  },
 };
 </script>
 
 <style lang="scss" scoped>
 .date-update {
-    display: flex;
-    justify-content: space-between;
-    &-btn {
-        margin-left: 1rem;
-    }
+  display: flex;
+  justify-content: space-between;
+  &-btn {
+    margin-left: 1rem;
+  }
 }
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StickyNav.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StickyNav.vue
index 890aa5153..3ff18f03a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StickyNav.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StickyNav.vue
@@ -1,207 +1,195 @@
 <template>
-    <teleport to="#content">
-        <div id="navmap">
-            <nav>
-                <a class="top" href="#top">
-                    <i class="fa fa-fw fa-square" />
-                    <span>{{ $t("nav.top") }}</span>
-                </a>
-                <item
-                    v-for="item of items"
-                    :key="item.key"
-                    :item="item"
-                    :step="step"
-                />
-            </nav>
-        </div>
-    </teleport>
+  <teleport to="#content">
+    <div id="navmap">
+      <nav>
+        <a class="top" href="#top">
+          <i class="fa fa-fw fa-square" />
+          <span>{{ $t("nav.top") }}</span>
+        </a>
+        <item v-for="item of items" :key="item.key" :item="item" :step="step" />
+      </nav>
+    </div>
+  </teleport>
 </template>
 
 <script>
 import Item from "./StickyNav/Item.vue";
 
 export default {
-    name: "StickyNav",
-    components: {
-        Item,
+  name: "StickyNav",
+  components: {
+    Item,
+  },
+  data() {
+    return {
+      header: document.querySelector("header nav.navbar"),
+      bannerName: document.querySelector("#header-accompanying_course-name"),
+      bannerDetails: document.querySelector(
+        "#header-accompanying_course-details",
+      ),
+      container: null,
+      heightSum: null,
+      stickyNav: null,
+      limit: 25,
+      anchors: null,
+      items: [],
+    };
+  },
+  computed: {
+    accompanyingCourse() {
+      return this.$store.state.accompanyingCourse;
     },
-    data() {
-        return {
-            header: document.querySelector("header nav.navbar"),
-            bannerName: document.querySelector(
-                "#header-accompanying_course-name",
-            ),
-            bannerDetails: document.querySelector(
-                "#header-accompanying_course-details",
-            ),
-            container: null,
-            heightSum: null,
-            stickyNav: null,
-            limit: 25,
-            anchors: null,
-            items: [],
-        };
+    step() {
+      return this.accompanyingCourse.step;
     },
-    computed: {
-        accompanyingCourse() {
-            return this.$store.state.accompanyingCourse;
-        },
-        step() {
-            return this.accompanyingCourse.step;
-        },
-        top() {
-            return parseInt(
-                window
-                    .getComputedStyle(this.stickyNav)
-                    .getPropertyValue("top")
-                    .slice(0, -2),
-            );
-        },
+    top() {
+      return parseInt(
+        window
+          .getComputedStyle(this.stickyNav)
+          .getPropertyValue("top")
+          .slice(0, -2),
+      );
     },
-    mounted() {
-        this.ready();
-        window.addEventListener("scroll", this.handleScroll);
+  },
+  mounted() {
+    this.ready();
+    window.addEventListener("scroll", this.handleScroll);
+  },
+  unmounted() {
+    window.removeEventListener("scroll", this.handleScroll);
+  },
+  methods: {
+    ready() {
+      // load datas DOM when mounted ready
+      this.container = document.querySelector("#content");
+      this.stickyNav = document.querySelector("#navmap");
+      this.anchors = document.querySelectorAll("h2 a[id^='section']");
+      this.initItemsMap();
+
+      // TODO resizeObserver not supports IE !
+      // Listen when elements change size, then recalculate heightSum and initItemsMap
+      const resizeObserver = new ResizeObserver(() => {
+        this.refreshPos();
+      });
+
+      resizeObserver.observe(this.header);
+      resizeObserver.observe(this.bannerName);
+      resizeObserver.observe(this.bannerDetails);
+      resizeObserver.observe(this.container);
     },
-    unmounted() {
-        window.removeEventListener("scroll", this.handleScroll);
+    initItemsMap() {
+      this.anchors.forEach((anchor) => {
+        this.items.push({
+          pos: null,
+          active: false,
+          key: parseInt(anchor.id.slice(8).slice(0, -1)),
+          id: "#" + anchor.id,
+        });
+      });
     },
-    methods: {
-        ready() {
-            // load datas DOM when mounted ready
-            this.container = document.querySelector("#content");
-            this.stickyNav = document.querySelector("#navmap");
-            this.anchors = document.querySelectorAll("h2 a[id^='section']");
-            this.initItemsMap();
+    refreshPos() {
+      //console.log('refreshPos');
+      this.heightSum =
+        this.header.offsetHeight +
+        this.bannerName.offsetHeight +
+        this.bannerDetails.offsetHeight;
 
-            // TODO resizeObserver not supports IE !
-            // Listen when elements change size, then recalculate heightSum and initItemsMap
-            const resizeObserver = new ResizeObserver(() => {
-                this.refreshPos();
-            });
-
-            resizeObserver.observe(this.header);
-            resizeObserver.observe(this.bannerName);
-            resizeObserver.observe(this.bannerDetails);
-            resizeObserver.observe(this.container);
-        },
-        initItemsMap() {
-            this.anchors.forEach((anchor) => {
-                this.items.push({
-                    pos: null,
-                    active: false,
-                    key: parseInt(anchor.id.slice(8).slice(0, -1)),
-                    id: "#" + anchor.id,
-                });
-            });
-        },
-        refreshPos() {
-            //console.log('refreshPos');
-            this.heightSum =
-                this.header.offsetHeight +
-                this.bannerName.offsetHeight +
-                this.bannerDetails.offsetHeight;
-
-            this.anchors.forEach((anchor, i) => {
-                this.items[i].pos = this.findPos(anchor)["y"];
-            });
-        },
-        findPos(element) {
-            let posX = 0,
-                posY = 0;
-            do {
-                posX += element.offsetLeft;
-                posY += element.offsetTop;
-                element = element.offsetParent;
-            } while (element != null);
-
-            let pos = [];
-            pos["x"] = posX;
-            pos["y"] = posY;
-
-            return pos;
-        },
-        handleScroll() {
-            let pos = this.findPos(this.stickyNav);
-            let top = this.heightSum + this.top - window.scrollY;
-            //console.log(window.scrollY);
-
-            if (top > this.limit) {
-                this.stickyNav.style.position = "absolute";
-                this.stickyNav.style.left = "10px";
-            } else {
-                this.stickyNav.style.position = "fixed";
-                this.stickyNav.style.left = pos["x"] + "px";
-            }
-
-            this.switchActive();
-        },
-        switchActive() {
-            this.items.forEach((item, i) => {
-                let next = this.items[i + 1] ? this.items[i + 1].pos : "100000";
-                item.active =
-                    (window.scrollY >= item.pos) & (window.scrollY < next)
-                        ? true
-                        : false;
-            }, this);
-
-            // last item never switch active because scroll reach bottom of page
-            if (
-                document.body.scrollHeight ==
-                window.scrollY + window.innerHeight
-            ) {
-                this.items[this.items.length - 1].active = true;
-                this.items[this.items.length - 2].active = false;
-            } else {
-                this.items[this.items.length - 1].active = false;
-            }
-        },
+      this.anchors.forEach((anchor, i) => {
+        this.items[i].pos = this.findPos(anchor)["y"];
+      });
     },
+    findPos(element) {
+      let posX = 0,
+        posY = 0;
+      do {
+        posX += element.offsetLeft;
+        posY += element.offsetTop;
+        element = element.offsetParent;
+      } while (element != null);
+
+      let pos = [];
+      pos["x"] = posX;
+      pos["y"] = posY;
+
+      return pos;
+    },
+    handleScroll() {
+      let pos = this.findPos(this.stickyNav);
+      let top = this.heightSum + this.top - window.scrollY;
+      //console.log(window.scrollY);
+
+      if (top > this.limit) {
+        this.stickyNav.style.position = "absolute";
+        this.stickyNav.style.left = "10px";
+      } else {
+        this.stickyNav.style.position = "fixed";
+        this.stickyNav.style.left = pos["x"] + "px";
+      }
+
+      this.switchActive();
+    },
+    switchActive() {
+      this.items.forEach((item, i) => {
+        let next = this.items[i + 1] ? this.items[i + 1].pos : "100000";
+        item.active =
+          (window.scrollY >= item.pos) & (window.scrollY < next) ? true : false;
+      }, this);
+
+      // last item never switch active because scroll reach bottom of page
+      if (document.body.scrollHeight == window.scrollY + window.innerHeight) {
+        this.items[this.items.length - 1].active = true;
+        this.items[this.items.length - 2].active = false;
+      } else {
+        this.items[this.items.length - 1].active = false;
+      }
+    },
+  },
 };
 </script>
 
 <style lang="scss">
 div#content {
-    position: relative;
+  position: relative;
 
-    div#navmap {
-        position: absolute;
-        top: 30px;
-        left: 10px; //-10%;
-        nav {
-            font-size: small;
-            a {
-                display: block;
-                box-sizing: border-box;
-                margin-bottom: -3px;
-                color: #71859669;
-                text-decoration: none;
-                &.top {
-                    color: #718596;
-                }
-                span {
-                    display: none;
-                }
-                &:hover,
-                &.active {
-                    span {
-                        display: inline;
-                        padding-left: 8px;
-                    }
-                }
-                &:hover {
-                    color: #718596b5;
-                }
-                &.active {
-                    color: #e2793d; //orange
-                    //color: #eec84a; //jaune
-                }
-            }
+  div#navmap {
+    position: absolute;
+    top: 30px;
+    left: 10px; //-10%;
+    nav {
+      font-size: small;
+      a {
+        display: block;
+        box-sizing: border-box;
+        margin-bottom: -3px;
+        color: #71859669;
+        text-decoration: none;
+        &.top {
+          color: #718596;
         }
+        span {
+          display: none;
+        }
+        &:hover,
+        &.active {
+          span {
+            display: inline;
+            padding-left: 8px;
+          }
+        }
+        &:hover {
+          color: #718596b5;
+        }
+        &.active {
+          color: #e2793d; //orange
+          //color: #eec84a; //jaune
+        }
+      }
     }
+  }
 }
 @media only screen and (max-width: 768px) {
-    div#navmap {
-        display: none;
-    }
+  div#navmap {
+    display: none;
+  }
 }
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StickyNav/Item.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StickyNav/Item.vue
index 8e175f72b..ecdf3026c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StickyNav/Item.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StickyNav/Item.vue
@@ -1,26 +1,22 @@
 <template>
-    <a v-if="item.key <= 8" :href="item.id" :class="{ active: isActive }">
-        <i class="fa fa-fw fa-square" />
-        <span>{{ item.key }}</span>
-    </a>
-    <a
-        v-else-if="step === 'DRAFT'"
-        :href="item.id"
-        :class="{ active: isActive }"
-    >
-        <i class="fa fa-fw fa-square" />
-        <span>{{ item.key }}</span>
-    </a>
+  <a v-if="item.key <= 8" :href="item.id" :class="{ active: isActive }">
+    <i class="fa fa-fw fa-square" />
+    <span>{{ item.key }}</span>
+  </a>
+  <a v-else-if="step === 'DRAFT'" :href="item.id" :class="{ active: isActive }">
+    <i class="fa fa-fw fa-square" />
+    <span>{{ item.key }}</span>
+  </a>
 </template>
 
 <script>
 export default {
-    name: "Item",
-    props: ["item", "step"],
-    computed: {
-        isActive() {
-            return this.item.active;
-        },
+  name: "Item",
+  props: ["item", "step"],
+  computed: {
+    isActive() {
+      return this.item.active;
     },
+  },
 };
 </script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Test.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Test.vue
index 904d4ff42..929b4edd8 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Test.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Test.vue
@@ -1,155 +1,146 @@
 <template>
-    <div class="vue-component">
-        <h2>Tests</h2>
+  <div class="vue-component">
+    <h2>Tests</h2>
 
-        <!-- Modal -->
-        <ul class="record_actions">
-            <li>
-                <button class="btn btn-create" @click="modal1.showModal = true">
-                    {{ $t("action.show_modal") }}
-                </button>
-            </li>
-            <li>
-                <button class="btn btn-create" @click="modal2.showModal = true">
-                    Ouvrir une seconde modale
-                </button>
-            </li>
-        </ul>
+    <!-- Modal -->
+    <ul class="record_actions">
+      <li>
+        <button class="btn btn-create" @click="modal1.showModal = true">
+          {{ $t("action.show_modal") }}
+        </button>
+      </li>
+      <li>
+        <button class="btn btn-create" @click="modal2.showModal = true">
+          Ouvrir une seconde modale
+        </button>
+      </li>
+    </ul>
 
-        <teleport to="body">
-            <modal
-                v-if="modal1.showModal"
-                :modal-dialog-class="modal1.modalDialogClass"
-                @close="modal1.showModal = false"
-            >
-                <template #header>
-                    <h2 class="modal-title">Le titre de ma modale</h2>
-                </template>
-                <template #body>
-                    <p>
-                        Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-                        Phasellus luctus facilisis suscipit. Cras pulvinar,
-                        purus sagittis pulvinar porta, enim ex posuere lacus, in
-                        pulvinar lectus magna in odio. Nullam iaculis congue
-                        lorem ac suscipit. Proin ut rutrum augue. Ut vehicula
-                        risus nec hendrerit ullamcorper. Ut volutpat eu mi eget
-                        viverra. Morbi dictum placerat suscipit.
-                    </p>
-                    <p>
-                        Quisque non erat tincidunt, lacinia justo ut, pulvinar
-                        nisl. Nunc id enim ut sem pretium interdum consectetur
-                        eu quam. Vestibulum ante ipsum primis in faucibus orci
-                        luctus et ultrices posuere cubilia curae; Etiam posuere
-                        erat eget augue finibus luctus. Maecenas auctor, tortor
-                        non luctus ultrices, neque neque porttitor ex, nec
-                        lacinia lorem ligula et elit. Sed tempor nulla vitae
-                        lorem sollicitudin dictum. Vestibulum nec arcu eget elit
-                        pulvinar pretium. Phasellus facilisis metus sed diam
-                        luctus, feugiat scelerisque velit dignissim.
-                    </p>
-                    <p>
-                        Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-                        Phasellus luctus facilisis suscipit. Cras pulvinar,
-                        purus sagittis pulvinar porta, enim ex posuere lacus, in
-                        pulvinar lectus magna in odio. Nullam iaculis congue
-                        lorem ac suscipit. Proin ut rutrum augue. Ut vehicula
-                        risus nec hendrerit ullamcorper. Ut volutpat eu mi eget
-                        viverra. Morbi dictum placerat suscipit.
-                    </p>
-                    <p>
-                        Quisque non erat tincidunt, lacinia justo ut, pulvinar
-                        nisl. Nunc id enim ut sem pretium interdum consectetur
-                        eu quam. Vestibulum ante ipsum primis in faucibus orci
-                        luctus et ultrices posuere cubilia curae; Etiam posuere
-                        erat eget augue finibus luctus. Maecenas auctor, tortor
-                        non luctus ultrices, neque neque porttitor ex, nec
-                        lacinia lorem ligula et elit. Sed tempor nulla vitae
-                        lorem sollicitudin dictum. Vestibulum nec arcu eget elit
-                        pulvinar pretium. Phasellus facilisis metus sed diam
-                        luctus, feugiat scelerisque velit dignissim.
-                    </p>
-                    <p>
-                        Lorem ipsum dolor sit amet, consectetur adipiscing elit.
-                        Phasellus luctus facilisis suscipit. Cras pulvinar,
-                        purus sagittis pulvinar porta, enim ex posuere lacus, in
-                        pulvinar lectus magna in odio. Nullam iaculis congue
-                        lorem ac suscipit. Proin ut rutrum augue. Ut vehicula
-                        risus nec hendrerit ullamcorper. Ut volutpat eu mi eget
-                        viverra. Morbi dictum placerat suscipit.
-                    </p>
-                    <p>
-                        Quisque non erat tincidunt, lacinia justo ut, pulvinar
-                        nisl. Nunc id enim ut sem pretium interdum consectetur
-                        eu quam. Vestibulum ante ipsum primis in faucibus orci
-                        luctus et ultrices posuere cubilia curae; Etiam posuere
-                        erat eget augue finibus luctus. Maecenas auctor, tortor
-                        non luctus ultrices, neque neque porttitor ex, nec
-                        lacinia lorem ligula et elit. Sed tempor nulla vitae
-                        lorem sollicitudin dictum. Vestibulum nec arcu eget elit
-                        pulvinar pretium. Phasellus facilisis metus sed diam
-                        luctus, feugiat scelerisque velit dignissim.
-                    </p>
-                </template>
-                <template #footer>
-                    <button
-                        class="btn btn-create"
-                        @click="
-                            modal1.showModal = false;
-                            modal2.showModal = true;
-                        "
-                    >
-                        {{ $t("action.next") }}
-                    </button>
-                </template>
-            </modal>
-        </teleport>
+    <teleport to="body">
+      <modal
+        v-if="modal1.showModal"
+        :modal-dialog-class="modal1.modalDialogClass"
+        @close="modal1.showModal = false"
+      >
+        <template #header>
+          <h2 class="modal-title">Le titre de ma modale</h2>
+        </template>
+        <template #body>
+          <p>
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus
+            luctus facilisis suscipit. Cras pulvinar, purus sagittis pulvinar
+            porta, enim ex posuere lacus, in pulvinar lectus magna in odio.
+            Nullam iaculis congue lorem ac suscipit. Proin ut rutrum augue. Ut
+            vehicula risus nec hendrerit ullamcorper. Ut volutpat eu mi eget
+            viverra. Morbi dictum placerat suscipit.
+          </p>
+          <p>
+            Quisque non erat tincidunt, lacinia justo ut, pulvinar nisl. Nunc id
+            enim ut sem pretium interdum consectetur eu quam. Vestibulum ante
+            ipsum primis in faucibus orci luctus et ultrices posuere cubilia
+            curae; Etiam posuere erat eget augue finibus luctus. Maecenas
+            auctor, tortor non luctus ultrices, neque neque porttitor ex, nec
+            lacinia lorem ligula et elit. Sed tempor nulla vitae lorem
+            sollicitudin dictum. Vestibulum nec arcu eget elit pulvinar pretium.
+            Phasellus facilisis metus sed diam luctus, feugiat scelerisque velit
+            dignissim.
+          </p>
+          <p>
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus
+            luctus facilisis suscipit. Cras pulvinar, purus sagittis pulvinar
+            porta, enim ex posuere lacus, in pulvinar lectus magna in odio.
+            Nullam iaculis congue lorem ac suscipit. Proin ut rutrum augue. Ut
+            vehicula risus nec hendrerit ullamcorper. Ut volutpat eu mi eget
+            viverra. Morbi dictum placerat suscipit.
+          </p>
+          <p>
+            Quisque non erat tincidunt, lacinia justo ut, pulvinar nisl. Nunc id
+            enim ut sem pretium interdum consectetur eu quam. Vestibulum ante
+            ipsum primis in faucibus orci luctus et ultrices posuere cubilia
+            curae; Etiam posuere erat eget augue finibus luctus. Maecenas
+            auctor, tortor non luctus ultrices, neque neque porttitor ex, nec
+            lacinia lorem ligula et elit. Sed tempor nulla vitae lorem
+            sollicitudin dictum. Vestibulum nec arcu eget elit pulvinar pretium.
+            Phasellus facilisis metus sed diam luctus, feugiat scelerisque velit
+            dignissim.
+          </p>
+          <p>
+            Lorem ipsum dolor sit amet, consectetur adipiscing elit. Phasellus
+            luctus facilisis suscipit. Cras pulvinar, purus sagittis pulvinar
+            porta, enim ex posuere lacus, in pulvinar lectus magna in odio.
+            Nullam iaculis congue lorem ac suscipit. Proin ut rutrum augue. Ut
+            vehicula risus nec hendrerit ullamcorper. Ut volutpat eu mi eget
+            viverra. Morbi dictum placerat suscipit.
+          </p>
+          <p>
+            Quisque non erat tincidunt, lacinia justo ut, pulvinar nisl. Nunc id
+            enim ut sem pretium interdum consectetur eu quam. Vestibulum ante
+            ipsum primis in faucibus orci luctus et ultrices posuere cubilia
+            curae; Etiam posuere erat eget augue finibus luctus. Maecenas
+            auctor, tortor non luctus ultrices, neque neque porttitor ex, nec
+            lacinia lorem ligula et elit. Sed tempor nulla vitae lorem
+            sollicitudin dictum. Vestibulum nec arcu eget elit pulvinar pretium.
+            Phasellus facilisis metus sed diam luctus, feugiat scelerisque velit
+            dignissim.
+          </p>
+        </template>
+        <template #footer>
+          <button
+            class="btn btn-create"
+            @click="
+              modal1.showModal = false;
+              modal2.showModal = true;
+            "
+          >
+            {{ $t("action.next") }}
+          </button>
+        </template>
+      </modal>
+    </teleport>
 
-        <teleport to="body">
-            <modal
-                v-if="modal2.showModal"
-                :modal-dialog-class="modal2.modalDialogClass"
-                @close="modal2.showModal = false"
-            >
-                <template #header>
-                    <h2 class="modal-title">Une autre modale</h2>
-                </template>
-                <template #body>
-                    <p>modal 2</p>
-                </template>
-                <template #footer>
-                    <button
-                        class="btn btn-create"
-                        @click="modal2.showModal = false"
-                    >
-                        {{ $t("action.save") }}
-                    </button>
-                </template>
-            </modal>
-        </teleport>
-        <!-- END Modal -->
-    </div>
+    <teleport to="body">
+      <modal
+        v-if="modal2.showModal"
+        :modal-dialog-class="modal2.modalDialogClass"
+        @close="modal2.showModal = false"
+      >
+        <template #header>
+          <h2 class="modal-title">Une autre modale</h2>
+        </template>
+        <template #body>
+          <p>modal 2</p>
+        </template>
+        <template #footer>
+          <button class="btn btn-create" @click="modal2.showModal = false">
+            {{ $t("action.save") }}
+          </button>
+        </template>
+      </modal>
+    </teleport>
+    <!-- END Modal -->
+  </div>
 </template>
 
 <script>
 import Modal from "ChillMainAssets/vuejs/_components/Modal";
 
 export default {
-    name: "Test",
-    components: {
-        Modal,
-    },
-    data() {
-        return {
-            modal1: {
-                showModal: false,
-                modalDialogClass: "modal-dialog-scrollable modal-xl", // modal-lg modal-md modal-sm
-            },
-            modal2: {
-                showModal: false,
-                modalDialogClass: "modal-dialog-centered modal-sm", // modal-lg modal-md modal-sm
-            },
-        };
-    },
-    computed: {},
+  name: "Test",
+  components: {
+    Modal,
+  },
+  data() {
+    return {
+      modal1: {
+        showModal: false,
+        modalDialogClass: "modal-dialog-scrollable modal-xl", // modal-lg modal-md modal-sm
+      },
+      modal2: {
+        showModal: false,
+        modalDialogClass: "modal-dialog-centered modal-sm", // modal-lg modal-md modal-sm
+      },
+    };
+  },
+  computed: {},
 };
 </script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue
index 745317211..f8b5389f4 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkCreate/App.vue
@@ -1,152 +1,135 @@
 <template>
-    <h2>{{ $t("pick_social_issue") }}</h2>
+  <h2>{{ $t("pick_social_issue") }}</h2>
 
-    <div id="awc_create_form">
-        <div id="picking" class="">
-            <p>{{ $t("pick_social_issue_linked_with_action") }}</p>
-            <div v-for="si in socialIssues" :key="si.id">
-                <input
-                    type="radio"
-                    :value="si.id"
-                    name="socialIssue"
-                    v-model="socialIssuePicked"
-                /><span class="badge bg-chill-l-gray text-dark">{{
-                    si.text
-                }}</span>
-            </div>
-            <div class="my-3">
-                <div class="col-11">
-                    <vue-multiselect
-                        name="otherIssues"
-                        label="text"
-                        track-by="id"
-                        open-direction="bottom"
-                        :close-on-select="true"
-                        :preserve-search="false"
-                        :reset-after="true"
-                        :hide-selected="true"
-                        :taggable="false"
-                        :multiple="false"
-                        :searchable="true"
-                        :allow-empty="true"
-                        :show-labels="false"
-                        :loading="issueIsLoading"
-                        :placeholder="$t('choose_other_social_issue')"
-                        :options="socialIssuesOther"
-                        @select="addIssueInList"
-                    />
-                </div>
-            </div>
-            <div v-if="hasSocialIssuePicked" class="mb-3">
-                <h2>{{ $t("pick_an_action") }}</h2>
-                <div class="col-11">
-                    <vue-multiselect
-                        v-model="socialActionPicked"
-                        label="text"
-                        :options="socialActionsReachables"
-                        :searchable="true"
-                        :close-on-select="true"
-                        :show-labels="true"
-                        track-by="id"
-                    />
-                </div>
-            </div>
-
-            <div v-if="isLoadingSocialActions">
-                <i class="fa fa-circle-o-notch fa-spin fa-fw" />
-            </div>
-
-            <div v-if="hasSocialActionPicked" id="persons" class="mb-5">
-                <h2>{{ $t("persons_involved") }}</h2>
-
-                <ul>
-                    <li v-for="p in personsReachables" :key="p.id">
-                        <div class="form-check">
-                            <input
-                                type="checkbox"
-                                :value="p.id"
-                                v-model="personsPicked"
-                                class="form-check-input"
-                                :id="'person_check' + p.id"
-                            />
-                            <label
-                                class="form-check-label"
-                                :for="'person_check' + p.id"
-                            >
-                                <person-text :person="p" />
-                            </label>
-                        </div>
-                    </li>
-                </ul>
-            </div>
+  <div id="awc_create_form">
+    <div id="picking" class="">
+      <p>{{ $t("pick_social_issue_linked_with_action") }}</p>
+      <div v-for="si in socialIssues" :key="si.id">
+        <input
+          type="radio"
+          :value="si.id"
+          name="socialIssue"
+          v-model="socialIssuePicked"
+        /><span class="badge bg-chill-l-gray text-dark">{{ si.text }}</span>
+      </div>
+      <div class="my-3">
+        <div class="col-11">
+          <vue-multiselect
+            name="otherIssues"
+            label="text"
+            track-by="id"
+            open-direction="bottom"
+            :close-on-select="true"
+            :preserve-search="false"
+            :reset-after="true"
+            :hide-selected="true"
+            :taggable="false"
+            :multiple="false"
+            :searchable="true"
+            :allow-empty="true"
+            :show-labels="false"
+            :loading="issueIsLoading"
+            :placeholder="$t('choose_other_social_issue')"
+            :options="socialIssuesOther"
+            @select="addIssueInList"
+          />
         </div>
-        <!-- <div v-if="hasSocialActionPicked" id="start_date">
+      </div>
+      <div v-if="hasSocialIssuePicked" class="mb-3">
+        <h2>{{ $t("pick_an_action") }}</h2>
+        <div class="col-11">
+          <vue-multiselect
+            v-model="socialActionPicked"
+            label="text"
+            :options="socialActionsReachables"
+            :searchable="true"
+            :close-on-select="true"
+            :show-labels="true"
+            track-by="id"
+          />
+        </div>
+      </div>
+
+      <div v-if="isLoadingSocialActions">
+        <i class="fa fa-circle-o-notch fa-spin fa-fw" />
+      </div>
+
+      <div v-if="hasSocialActionPicked" id="persons" class="mb-5">
+        <h2>{{ $t("persons_involved") }}</h2>
+
+        <ul>
+          <li v-for="p in personsReachables" :key="p.id">
+            <div class="form-check">
+              <input
+                type="checkbox"
+                :value="p.id"
+                v-model="personsPicked"
+                class="form-check-input"
+                :id="'person_check' + p.id"
+              />
+              <label class="form-check-label" :for="'person_check' + p.id">
+                <person-text :person="p" />
+              </label>
+            </div>
+          </li>
+        </ul>
+      </div>
+    </div>
+    <!-- <div v-if="hasSocialActionPicked" id="start_date">
       <p><label>{{ $t('startDate') }}</label> <input type="date" v-model="startDate" /></p>
     </div> -->
-        <div class="row">
-            <div v-if="hasSocialActionPicked" id="start_date" class="mb-3 row">
-                <label class="col-form-label col-sm-4">{{
-                    $t("startDate")
-                }}</label>
-                <div class="col-sm-8">
-                    <input
-                        class="form-control"
-                        type="date"
-                        v-model="startDate"
-                    />
-                </div>
-            </div>
+    <div class="row">
+      <div v-if="hasSocialActionPicked" id="start_date" class="mb-3 row">
+        <label class="col-form-label col-sm-4">{{ $t("startDate") }}</label>
+        <div class="col-sm-8">
+          <input class="form-control" type="date" v-model="startDate" />
+        </div>
+      </div>
 
-            <!-- <div v-if="hasSocialActionPicked" id="end_date">
+      <!-- <div v-if="hasSocialActionPicked" id="end_date">
       <p><label>{{ $t('endDate') }}</label> <input type="date" v-model="endDate" /></p>
     </div> -->
-            <div v-if="hasSocialActionPicked" id="end_date" class="mb-3 row">
-                <label class="col-form-label col-sm-4">{{
-                    $t("endDate")
-                }}</label>
-                <div class="col-sm-8">
-                    <input class="form-control" type="date" v-model="endDate" />
-                </div>
-            </div>
-        </div>
-        <div id="confirm">
-            <div v-if="hasErrors">
-                <p>{{ $t("form_has_errors") }}</p>
-
-                <ul>
-                    <li v-for="e in errors" :key="e.id">
-                        {{ e }}
-                    </li>
-                </ul>
-            </div>
-
-            <div>
-                <ul class="record_actions">
-                    <li class="cancel">
-                        <button class="btn btn-cancel" @click="goToPrevious">
-                            {{ $t("action.cancel") }}
-                        </button>
-                    </li>
-                    <li v-if="hasSocialActionPicked">
-                        <button
-                            class="btn btn-save"
-                            v-show="!isPostingWork"
-                            @click="submit"
-                        >
-                            {{ $t("action.save") }}
-                        </button>
-                        <button
-                            class="btn btn-save"
-                            v-show="isPostingWork"
-                            disabled
-                        >
-                            {{ $t("action.save") }}
-                        </button>
-                    </li>
-                </ul>
-            </div>
+      <div v-if="hasSocialActionPicked" id="end_date" class="mb-3 row">
+        <label class="col-form-label col-sm-4">{{ $t("endDate") }}</label>
+        <div class="col-sm-8">
+          <input class="form-control" type="date" v-model="endDate" />
         </div>
+      </div>
     </div>
+    <div id="confirm">
+      <div v-if="hasErrors">
+        <p>{{ $t("form_has_errors") }}</p>
+
+        <ul>
+          <li v-for="e in errors" :key="e.id">
+            {{ e }}
+          </li>
+        </ul>
+      </div>
+
+      <div>
+        <ul class="record_actions">
+          <li class="cancel">
+            <button class="btn btn-cancel" @click="goToPrevious">
+              {{ $t("action.cancel") }}
+            </button>
+          </li>
+          <li v-if="hasSocialActionPicked">
+            <button
+              class="btn btn-save"
+              v-show="!isPostingWork"
+              @click="submit"
+            >
+              {{ $t("action.save") }}
+            </button>
+            <button class="btn btn-save" v-show="isPostingWork" disabled>
+              {{ $t("action.save") }}
+            </button>
+          </li>
+        </ul>
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
@@ -155,131 +138,127 @@ import VueMultiselect from "vue-multiselect";
 import PersonText from "ChillPersonAssets/vuejs/_components/Entity/PersonText.vue";
 
 const i18n = {
-    messages: {
-        fr: {
-            startDate: "Date de début",
-            endDate: "Date de fin",
-            form_has_errors: "Le formulaire comporte des erreurs",
-            pick_social_issue: "Choisir une problématique sociale",
-            pick_other_social_issue: "Veuillez choisir un autre problématique",
-            pick_an_action: "Choisir une action d'accompagnement",
-            pick_social_issue_linked_with_action:
-                "Indiquez la problématique sociale liée à l'action d'accompagnement",
-            persons_involved: "Usagers concernés",
-            choose_other_social_issue:
-                "Veuillez choisir un autre problématique",
-        },
+  messages: {
+    fr: {
+      startDate: "Date de début",
+      endDate: "Date de fin",
+      form_has_errors: "Le formulaire comporte des erreurs",
+      pick_social_issue: "Choisir une problématique sociale",
+      pick_other_social_issue: "Veuillez choisir un autre problématique",
+      pick_an_action: "Choisir une action d'accompagnement",
+      pick_social_issue_linked_with_action:
+        "Indiquez la problématique sociale liée à l'action d'accompagnement",
+      persons_involved: "Usagers concernés",
+      choose_other_social_issue: "Veuillez choisir un autre problématique",
     },
+  },
 };
 
 export default {
-    name: "App",
-    components: {
-        VueMultiselect,
-        PersonText,
+  name: "App",
+  components: {
+    VueMultiselect,
+    PersonText,
+  },
+  methods: {
+    submit() {
+      this.$store.dispatch("submit").catch(({ name, violations }) => {
+        if (name === "ValidationException" || name === "AccessException") {
+          violations.forEach((violation) =>
+            this.$toast.open({ message: violation }),
+          );
+        } else {
+          this.$toast.open({ message: "An error occurred" });
+        }
+      });
     },
-    methods: {
-        submit() {
-            this.$store.dispatch("submit").catch(({ name, violations }) => {
-                if (
-                    name === "ValidationException" ||
-                    name === "AccessException"
-                ) {
-                    violations.forEach((violation) =>
-                        this.$toast.open({ message: violation }),
-                    );
-                } else {
-                    this.$toast.open({ message: "An error occurred" });
-                }
-            });
-        },
-        addIssueInList(value) {
-            this.$store.commit("addIssueInList", value);
-            this.$store.commit("removeIssueInOther", value);
-            this.$store.dispatch("pickSocialIssue", value.id);
-        },
-        goToPrevious() {
-            let params = new URLSearchParams(window.location.search);
-            if (params.has("returnPath")) {
-                window.location.replace(params.get("returnPath"));
-            } else {
-                return;
-            }
-        },
+    addIssueInList(value) {
+      this.$store.commit("addIssueInList", value);
+      this.$store.commit("removeIssueInOther", value);
+      this.$store.dispatch("pickSocialIssue", value.id);
     },
-    i18n,
-    computed: {
-        ...mapState([
-            "socialIssues",
-            "socialIssuesOther",
-            "socialActionsReachables",
-            "errors",
-            "personsReachables",
-        ]),
-        ...mapGetters([
-            "hasSocialIssuePicked",
-            "hasSocialActionPicked",
-            "isLoadingSocialActions",
-            "isPostingWork",
-            "hasErrors",
-        ]),
-        personsPicked: {
-            get() {
-                let s = this.$store.state.personsPicked.map((p) => p.id);
-
-                return s;
-            },
-            set(v) {
-                this.$store.commit("setPersonsPickedIds", v);
-            },
-        },
-        socialIssuePicked: {
-            get() {
-                let s = this.$store.state.socialIssuePicked;
-
-                if (s === null) {
-                    return null;
-                }
-
-                return s.id;
-            },
-            set(value) {
-                this.$store.dispatch("pickSocialIssue", value);
-            },
-        },
-        socialActionPicked: {
-            get() {
-                return this.$store.state.socialActionPicked;
-            },
-            set(value) {
-                this.$store.commit("setSocialAction", value);
-            },
-        },
-        startDate: {
-            get() {
-                return this.$store.state.startDate;
-            },
-            set(value) {
-                this.$store.commit("setStartDate", value);
-            },
-        },
-        endDate: {
-            get() {
-                return this.$store.state.endDate;
-            },
-            set(value) {
-                this.$store.commit("setEndDate", value);
-            },
-        },
-        setSocialIssue: {
-            set() {
-                this.$store.dispatch(
-                    "setSocialIssue",
-                    socialIssues[socialIssues.length - 1],
-                );
-            },
-        },
+    goToPrevious() {
+      let params = new URLSearchParams(window.location.search);
+      if (params.has("returnPath")) {
+        window.location.replace(params.get("returnPath"));
+      } else {
+        return;
+      }
     },
+  },
+  i18n,
+  computed: {
+    ...mapState([
+      "socialIssues",
+      "socialIssuesOther",
+      "socialActionsReachables",
+      "errors",
+      "personsReachables",
+    ]),
+    ...mapGetters([
+      "hasSocialIssuePicked",
+      "hasSocialActionPicked",
+      "isLoadingSocialActions",
+      "isPostingWork",
+      "hasErrors",
+    ]),
+    personsPicked: {
+      get() {
+        let s = this.$store.state.personsPicked.map((p) => p.id);
+
+        return s;
+      },
+      set(v) {
+        this.$store.commit("setPersonsPickedIds", v);
+      },
+    },
+    socialIssuePicked: {
+      get() {
+        let s = this.$store.state.socialIssuePicked;
+
+        if (s === null) {
+          return null;
+        }
+
+        return s.id;
+      },
+      set(value) {
+        this.$store.dispatch("pickSocialIssue", value);
+      },
+    },
+    socialActionPicked: {
+      get() {
+        return this.$store.state.socialActionPicked;
+      },
+      set(value) {
+        this.$store.commit("setSocialAction", value);
+      },
+    },
+    startDate: {
+      get() {
+        return this.$store.state.startDate;
+      },
+      set(value) {
+        this.$store.commit("setStartDate", value);
+      },
+    },
+    endDate: {
+      get() {
+        return this.$store.state.endDate;
+      },
+      set(value) {
+        this.$store.commit("setEndDate", value);
+      },
+    },
+    setSocialIssue: {
+      set() {
+        this.$store.dispatch(
+          "setSocialIssue",
+          socialIssues[socialIssues.length - 1],
+        );
+      },
+    },
+  },
 };
 </script>
 
@@ -288,46 +267,46 @@ export default {
 @import "ChillPersonAssets/chill/scss/mixins";
 @import "ChillMainAssets/chill/scss/chill_variables";
 span.badge {
-    @include badge_social($social-issue-color);
-    font-size: 95%;
-    margin-bottom: 5px;
-    margin-right: 1em;
-    margin-left: 1em;
+  @include badge_social($social-issue-color);
+  font-size: 95%;
+  margin-bottom: 5px;
+  margin-right: 1em;
+  margin-left: 1em;
 }
 </style>
 
 <style lang="scss">
 #awc_create_form {
-    display: grid;
-    grid-template-areas:
-        "picking picking"
-        "start_date end_date"
-        "confirm confirm";
-    grid-template-columns: 50% 50%;
-    column-gap: 1.5rem;
+  display: grid;
+  grid-template-areas:
+    "picking picking"
+    "start_date end_date"
+    "confirm confirm";
+  grid-template-columns: 50% 50%;
+  column-gap: 1.5rem;
 
-    #picking {
-        grid-area: picking;
+  #picking {
+    grid-area: picking;
 
-        #persons {
-            ul {
-                padding: 0;
+    #persons {
+      ul {
+        padding: 0;
 
-                list-style-type: none;
-            }
-        }
+        list-style-type: none;
+      }
     }
+  }
 
-    #start_date {
-        grid-area: start_date;
-    }
+  #start_date {
+    grid-area: start_date;
+  }
 
-    #end_date {
-        grid-area: end_date;
-    }
+  #end_date {
+    grid-area: end_date;
+  }
 
-    #confirm {
-        grid-area: confirm;
-    }
+  #confirm {
+    grid-area: confirm;
+  }
 }
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index f3404e2de..bd87224b2 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -1,482 +1,453 @@
 <template>
-    <div id="workEditor" class="my-4">
-        <div id="title" class="action-row">
-            <div>
-                <p class="wl-item social-issues">
-                    <span class="chill-entity entity-social-issue">
-                        <span class="badge bg-chill-l-gray text-dark">{{
-                            work.socialAction.issue.text
-                        }}</span>
-                    </span>
-                </p>
-            </div>
-            <h2 class="badge-title">
-                <span class="title_label"></span>
-                <span class="title_action">{{ work.socialAction.text }}</span>
-            </h2>
-        </div>
-
-        <div id="startDate" class="action-row">
-            <label class="col-form-label">{{ $t("startDate") }}</label>
-            <input
-                v-model="startDate"
-                type="date"
-                required="true"
-                class="form-control"
-                v-once
-            />
-        </div>
-
-        <div id="endDate" class="action-row">
-            <label class="col-form-label">{{ $t("endDate") }}</label>
-            <input v-model="endDate" type="date" class="form-control" />
-        </div>
-
-        <div id="privateComment" class="action-row">
-            <label class="col-form-label">{{ $t("private_comment") }}</label>
-            <comment-editor v-model="privateComment"></comment-editor>
-        </div>
-
-        <div id="comment" class="action-row">
-            <label class="col-form-label">{{ $t("comments") }}</label>
-            <comment-editor v-model="note"></comment-editor>
-        </div>
-
-        <div id="objectives" class="action-row">
-            <div aria="hidden" class="title">
-                <div>
-                    <h3>{{ $t("goals_title") }}</h3>
-                </div>
-                <div>
-                    <h3>{{ $t("results_title") }}</h3>
-                </div>
-            </div>
-
-            <!-- results which are not attached to an objective -->
-            <div v-if="hasResultsForAction">
-                <div class="results_without_objective">
-                    {{ $t("results_without_objective") }}
-                </div>
-                <div>
-                    <add-result
-                        :availableResults="resultsForAction"
-                        destination="action"
-                    ></add-result>
-                </div>
-            </div>
-
-            <!-- results which **are** attached to an objective -->
-            <div v-for="g in goalsPicked" :key="g.goal.id">
-                <div class="item-title" @click="removeGoal(g)">
-                    <span class="removable">{{
-                        localizeString(g.goal.title)
-                    }}</span>
-                </div>
-                <div>
-                    <add-result :goal="g.goal" destination="goal"></add-result>
-                </div>
-            </div>
-            <div class="accordion" id="expandedSuggestions">
-                <div
-                    v-if="availableForCheckGoal.length > 0"
-                    class="accordion-item"
-                >
-                    <h2
-                        class="accordion-header"
-                        id="heading_expanded_suggestions"
-                    >
-                        <button
-                            v-if="isExpanded"
-                            class="accordion-button"
-                            type="button"
-                            data-bs-toggle="collapse"
-                            aria-expanded="true"
-                            @click="toggleSelect"
-                        >
-                            Masquer
-                        </button>
-
-                        <button
-                            v-else
-                            class="accordion-button collapsed"
-                            type="button"
-                            data-bs-toggle="collapse"
-                            aria-expanded="false"
-                            @click="toggleSelect"
-                        >
-                            Motifs, objectifs et dispositfs disponibles
-                        </button>
-                    </h2>
-                    <div
-                        class="accordion-collapse"
-                        id="collapse_expanded_suggestions"
-                        aria-labelledby="heading_expanded_suggestions"
-                        data-bs-parent="#expandedSuggestions"
-                    >
-                        <template v-if="isExpanded">
-                            <ul class="list-suggest add-items">
-                                <li
-                                    v-for="g in availableForCheckGoal"
-                                    @click="addGoal(g)"
-                                    :key="g.id"
-                                >
-                                    <span>{{ localizeString(g.title) }}</span>
-                                </li>
-                            </ul>
-                        </template>
-                    </div>
-                    <p
-                        v-if="goalsPicked.length === 0"
-                        class="chill-no-data-statement"
-                    >
-                        Aucun objectif associé
-                    </p>
-                </div>
-                <div v-else>
-                    <span class="chill-no-data-statement">{{
-                        $t("no_goals_available")
-                    }}</span>
-                </div>
-            </div>
-        </div>
-
-        <div id="evaluations" class="action-row">
-            <div aria="hidden" class="title">
-                <div>
-                    <h3>
-                        {{ $t("Evaluations") }} - {{ $t("Forms") }} -
-                        {{ $t("Post") }}
-                    </h3>
-                </div>
-            </div>
-
-            <!-- list evaluations -->
-            <add-evaluation
-                v-for="e in pickedEvaluations"
-                v-bind:key="e.key"
-                v-bind:evaluation="e"
-                v-bind:docAnchorId="this.docAnchorId"
-            >
-            </add-evaluation>
-
-            <!-- box to add new evaluation -->
-            <div class="add_evaluation">
-                <div v-if="showAddEvaluation">
-                    <p>{{ $t("available_evaluations_text") }}</p>
-                    <ul class="list-suggest add-items">
-                        <li
-                            v-for="e in evaluationsForAction"
-                            @click="addEvaluation(e)"
-                            :key="e.id"
-                        >
-                            <span>{{ localizeString(e.title) }}</span>
-                        </li>
-                    </ul>
-                </div>
-                <ul
-                    class="record_actions"
-                    v-if="evaluationsForAction.length > 0"
-                >
-                    <li>
-                        <button
-                            :title="$t('add_an_evaluation')"
-                            class="btn btn-create"
-                            @click="toggleAddEvaluation"
-                        >
-                            {{ $t("add_an_evaluation") }}
-                        </button>
-                    </li>
-                </ul>
-                <div v-else>
-                    <span class="chill-no-data-statement">{{
-                        $t("no_evaluations_available")
-                    }}</span>
-                </div>
-            </div>
-        </div>
-
-        <div id="persons" class="action-row">
-            <h3 class="mb-3">{{ $t("persons_involved") }}</h3>
-
-            <ul class="list-unstyled">
-                <li v-for="p in personsReachables" :key="p.id">
-                    <div class="form-check">
-                        <input
-                            v-model="personsPicked"
-                            :value="p.id"
-                            type="checkbox"
-                            class="me-2 form-check-input"
-                            :id="'person_check' + p.id"
-                        />
-                        <label
-                            :for="'person_check' + p.id"
-                            class="form-check-label"
-                        >
-                            <person-text :person="p"></person-text>
-                        </label>
-                    </div>
-                </li>
-                <li
-                    v-for="p in getPreviousPersons"
-                    :key="p.id"
-                    class="alert alert-danger"
-                >
-                    <div class="form-check">
-                        <input
-                            v-model="personsPicked"
-                            :value="p.id"
-                            type="checkbox"
-                            class="me-2 form-check-input"
-                            :id="'person_check' + p.id"
-                        />
-                        <label
-                            :for="'person_check' + p.id"
-                            class="form-check-label"
-                        >
-                            <person-text :person="p"></person-text>
-                        </label>
-                    </div>
-                    <span
-                        ><i class="fa fa-warning"></i>&nbsp;{{
-                            $t("warning_previous_persons")
-                        }}</span
-                    >
-                </li>
-            </ul>
-        </div>
-
-        <div id="referrers" class="action-row">
-            <h3>{{ $t("referrers") }}</h3>
-
-            <div v-if="!hasReferrers">
-                <p class="chill-no-data-statement">{{ $t("no_referrers") }}</p>
-            </div>
-
-            <div v-else>
-                <ul class="list-suggest remove-items inline">
-                    <li
-                        v-for="u in referrers"
-                        :key="u.id"
-                        :title="$t('remove_referrer')"
-                        @click="removeReferrer(u)"
-                    >
-                        <span>
-                            {{ u.text }}
-                        </span>
-                    </li>
-                </ul>
-            </div>
-
-            <ul class="record_actions">
-                <li class="add-persons">
-                    <add-persons
-                        ref="referrerPicker"
-                        :key="referrerPicker.key"
-                        :buttonTitle="$t('add_referrers')"
-                        :modalTitle="$t('choose_referrers')"
-                        :options="referrerPicker.options"
-                        @addNewPersons="addReferrers"
-                    >
-                    </add-persons>
-                </li>
-            </ul>
-        </div>
-
-        <div id="handlingThirdParty" class="action-row">
-            <h3>{{ $t("handling_thirdparty") }}</h3>
-
-            <div v-if="!hasHandlingThirdParty">
-                <p class="chill-no-data-statement">
-                    {{ $t("no_handling_thirdparty") }}
-                </p>
-
-                <ul class="record_actions">
-                    <li class="add-persons">
-                        <add-persons
-                            ref="handlingThirdPartyPicker"
-                            v-bind:key="handlingThirdPartyPicker.key"
-                            v-bind:buttonTitle="
-                                $t('precise_handling_thirdparty')
-                            "
-                            v-bind:modalTitle="$t('choose_a_thirdparty')"
-                            v-bind:options="handlingThirdPartyPicker.options"
-                            @addNewPersons="setHandlingThirdParty"
-                        >
-                            <!-- to cast child method -->
-                        </add-persons>
-                    </li>
-                </ul>
-            </div>
-            <div v-else class="flex-table">
-                <third-party-render-box
-                    :thirdparty="handlingThirdParty"
-                    :options="{
-                        addLink: false,
-                        addId: false,
-                        addEntity: true,
-                        addInfo: false,
-                        hLevel: 3,
-                        isMultiline: true,
-                        isConfidential: false,
-                    }"
-                ></third-party-render-box>
-                <ul class="record_actions">
-                    <li>
-                        <button
-                            :title="$t('remove_handling_thirdparty')"
-                            class="btn btn-remove"
-                            @click="removeHandlingThirdParty"
-                        />
-                    </li>
-                </ul>
-            </div>
-        </div>
-
-        <div id="thirdParties" class="action-row">
-            <h3>{{ $t("thirdparty_intervener") }}</h3>
-
-            <div v-if="!hasThirdParties">
-                <p class="chill-no-data-statement">
-                    {{ $t("no_thirdparty_intervener") }}
-                </p>
-            </div>
-
-            <div v-else>
-                <div class="flex-bloc mb-3">
-                    <third-party-render-box
-                        v-for="thirdparty in thirdParties"
-                        :key="thirdparty.id"
-                        :thirdparty="thirdparty"
-                        :options="{
-                            addLink: false,
-                            addId: false,
-                            addEntity: true,
-                            addInfo: false,
-                            hLevel: 3,
-                        }"
-                    >
-                        <template v-slot:record-actions>
-                            <ul class="record_actions">
-                                <li>
-                                    <on-the-fly
-                                        :type="thirdparty.type"
-                                        :id="thirdparty.id"
-                                        action="show"
-                                    ></on-the-fly>
-                                </li>
-                                <li>
-                                    <on-the-fly
-                                        :type="thirdparty.type"
-                                        :id="thirdparty.id"
-                                        action="edit"
-                                        @saveFormOnTheFly="saveFormOnTheFly"
-                                        ref="onTheFly"
-                                    ></on-the-fly>
-                                </li>
-                                <li>
-                                    <button
-                                        :title="$t('remove_thirdparty')"
-                                        class="btn btn-sm btn-remove"
-                                        @click="removeThirdParty(thirdparty)"
-                                    />
-                                </li>
-                            </ul>
-                        </template>
-                    </third-party-render-box>
-                </div>
-            </div>
-
-            <ul class="record_actions">
-                <li class="add-persons">
-                    <add-persons
-                        ref="thirdPartyPicker"
-                        v-bind:key="thirdPartyPicker.key"
-                        v-bind:buttonTitle="$t('add_thirdparties')"
-                        v-bind:modalTitle="$t('choose_thirdparties')"
-                        v-bind:options="thirdPartyPicker.options"
-                        @addNewPersons="addThirdParties"
-                    >
-                        <!-- to cast child method -->
-                    </add-persons>
-                </li>
-            </ul>
-        </div>
-
-        <div
-            v-if="errors.length > 0"
-            id="errors"
-            class="alert alert-danger flashbag"
-        >
-            <p>{{ $t("fix_these_errors") }}</p>
-            <ul>
-                <li v-for="e in errors" :key="e.id">{{ e }}</li>
-            </ul>
-        </div>
+  <div id="workEditor" class="my-4">
+    <div id="title" class="action-row">
+      <div>
+        <p class="wl-item social-issues">
+          <span class="chill-entity entity-social-issue">
+            <span class="badge bg-chill-l-gray text-dark">{{
+              work.socialAction.issue.text
+            }}</span>
+          </span>
+        </p>
+      </div>
+      <h2 class="badge-title">
+        <span class="title_label"></span>
+        <span class="title_action">{{ work.socialAction.text }}</span>
+      </h2>
     </div>
-    <ul class="record_actions sticky-form-buttons">
-        <li>
-            <list-workflow-modal
-                :workflows="this.work.workflows"
-                :allowCreate="true"
-                relatedEntityClass="Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork"
-                :relatedEntityId="this.work.id"
-                :workflowsAvailables="this.work.workflows_availables"
-                :preventDefaultMoveToGenerate="true"
-                @go-to-generate-workflow="goToGenerateWorkflow"
-            ></list-workflow-modal>
-        </li>
 
-        <li>
+    <div id="startDate" class="action-row">
+      <label class="col-form-label">{{ $t("startDate") }}</label>
+      <input
+        v-model="startDate"
+        type="date"
+        required="true"
+        class="form-control"
+        v-once
+      />
+    </div>
+
+    <div id="endDate" class="action-row">
+      <label class="col-form-label">{{ $t("endDate") }}</label>
+      <input v-model="endDate" type="date" class="form-control" />
+    </div>
+
+    <div id="privateComment" class="action-row">
+      <label class="col-form-label">{{ $t("private_comment") }}</label>
+      <comment-editor v-model="privateComment"></comment-editor>
+    </div>
+
+    <div id="comment" class="action-row">
+      <label class="col-form-label">{{ $t("comments") }}</label>
+      <comment-editor v-model="note"></comment-editor>
+    </div>
+
+    <div id="objectives" class="action-row">
+      <div aria="hidden" class="title">
+        <div>
+          <h3>{{ $t("goals_title") }}</h3>
+        </div>
+        <div>
+          <h3>{{ $t("results_title") }}</h3>
+        </div>
+      </div>
+
+      <!-- results which are not attached to an objective -->
+      <div v-if="hasResultsForAction">
+        <div class="results_without_objective">
+          {{ $t("results_without_objective") }}
+        </div>
+        <div>
+          <add-result
+            :availableResults="resultsForAction"
+            destination="action"
+          ></add-result>
+        </div>
+      </div>
+
+      <!-- results which **are** attached to an objective -->
+      <div v-for="g in goalsPicked" :key="g.goal.id">
+        <div class="item-title" @click="removeGoal(g)">
+          <span class="removable">{{ localizeString(g.goal.title) }}</span>
+        </div>
+        <div>
+          <add-result :goal="g.goal" destination="goal"></add-result>
+        </div>
+      </div>
+      <div class="accordion" id="expandedSuggestions">
+        <div v-if="availableForCheckGoal.length > 0" class="accordion-item">
+          <h2 class="accordion-header" id="heading_expanded_suggestions">
             <button
-                v-if="AmIRefferer"
-                class="btn btn-notify"
-                @click="goToGenerateNotification(false)"
-            ></button>
-            <template v-else>
-                <button
-                    id="btnGroupNotifyButtons"
-                    type="button"
-                    class="btn btn-notify dropdown-toggle"
-                    :title="$t('notification_send')"
-                    data-bs-toggle="dropdown"
-                    aria-expanded="false"
+              v-if="isExpanded"
+              class="accordion-button"
+              type="button"
+              data-bs-toggle="collapse"
+              aria-expanded="true"
+              @click="toggleSelect"
+            >
+              Masquer
+            </button>
+
+            <button
+              v-else
+              class="accordion-button collapsed"
+              type="button"
+              data-bs-toggle="collapse"
+              aria-expanded="false"
+              @click="toggleSelect"
+            >
+              Motifs, objectifs et dispositfs disponibles
+            </button>
+          </h2>
+          <div
+            class="accordion-collapse"
+            id="collapse_expanded_suggestions"
+            aria-labelledby="heading_expanded_suggestions"
+            data-bs-parent="#expandedSuggestions"
+          >
+            <template v-if="isExpanded">
+              <ul class="list-suggest add-items">
+                <li
+                  v-for="g in availableForCheckGoal"
+                  @click="addGoal(g)"
+                  :key="g.id"
                 >
-                    &nbsp;
-                </button>
-                <ul
-                    class="dropdown-menu"
-                    aria-labelledby="btnGroupNotifyButtons"
-                >
-                    <li>
-                        <a
-                            class="dropdown-item"
-                            @click="goToGenerateNotification(true)"
-                            >{{ $t("notification_notify_referrer") }}</a
-                        >
-                    </li>
-                    <li>
-                        <a
-                            class="dropdown-item"
-                            @click="goToGenerateNotification(false)"
-                            >{{ $t("notification_notify_any") }}</a
-                        >
-                    </li>
-                </ul>
+                  <span>{{ localizeString(g.title) }}</span>
+                </li>
+              </ul>
             </template>
-        </li>
+          </div>
+          <p v-if="goalsPicked.length === 0" class="chill-no-data-statement">
+            Aucun objectif associé
+          </p>
+        </div>
+        <div v-else>
+          <span class="chill-no-data-statement">{{
+            $t("no_goals_available")
+          }}</span>
+        </div>
+      </div>
+    </div>
 
-        <li v-if="!isPosting">
-            <button class="btn btn-save" @click="submit">
-                {{ $t("action.save") }}
-            </button>
-        </li>
+    <div id="evaluations" class="action-row">
+      <div aria="hidden" class="title">
+        <div>
+          <h3>
+            {{ $t("Evaluations") }} - {{ $t("Forms") }} -
+            {{ $t("Post") }}
+          </h3>
+        </div>
+      </div>
 
-        <li v-if="isPosting">
-            <button class="btn btn-save" disabled>
-                {{ $t("action.save") }}
+      <!-- list evaluations -->
+      <add-evaluation
+        v-for="e in pickedEvaluations"
+        v-bind:key="e.key"
+        v-bind:evaluation="e"
+        v-bind:docAnchorId="this.docAnchorId"
+      >
+      </add-evaluation>
+
+      <!-- box to add new evaluation -->
+      <div class="add_evaluation">
+        <div v-if="showAddEvaluation">
+          <p>{{ $t("available_evaluations_text") }}</p>
+          <ul class="list-suggest add-items">
+            <li
+              v-for="e in evaluationsForAction"
+              @click="addEvaluation(e)"
+              :key="e.id"
+            >
+              <span>{{ localizeString(e.title) }}</span>
+            </li>
+          </ul>
+        </div>
+        <ul class="record_actions" v-if="evaluationsForAction.length > 0">
+          <li>
+            <button
+              :title="$t('add_an_evaluation')"
+              class="btn btn-create"
+              @click="toggleAddEvaluation"
+            >
+              {{ $t("add_an_evaluation") }}
             </button>
+          </li>
+        </ul>
+        <div v-else>
+          <span class="chill-no-data-statement">{{
+            $t("no_evaluations_available")
+          }}</span>
+        </div>
+      </div>
+    </div>
+
+    <div id="persons" class="action-row">
+      <h3 class="mb-3">{{ $t("persons_involved") }}</h3>
+
+      <ul class="list-unstyled">
+        <li v-for="p in personsReachables" :key="p.id">
+          <div class="form-check">
+            <input
+              v-model="personsPicked"
+              :value="p.id"
+              type="checkbox"
+              class="me-2 form-check-input"
+              :id="'person_check' + p.id"
+            />
+            <label :for="'person_check' + p.id" class="form-check-label">
+              <person-text :person="p"></person-text>
+            </label>
+          </div>
         </li>
-    </ul>
+        <li
+          v-for="p in getPreviousPersons"
+          :key="p.id"
+          class="alert alert-danger"
+        >
+          <div class="form-check">
+            <input
+              v-model="personsPicked"
+              :value="p.id"
+              type="checkbox"
+              class="me-2 form-check-input"
+              :id="'person_check' + p.id"
+            />
+            <label :for="'person_check' + p.id" class="form-check-label">
+              <person-text :person="p"></person-text>
+            </label>
+          </div>
+          <span
+            ><i class="fa fa-warning"></i>&nbsp;{{
+              $t("warning_previous_persons")
+            }}</span
+          >
+        </li>
+      </ul>
+    </div>
+
+    <div id="referrers" class="action-row">
+      <h3>{{ $t("referrers") }}</h3>
+
+      <div v-if="!hasReferrers">
+        <p class="chill-no-data-statement">{{ $t("no_referrers") }}</p>
+      </div>
+
+      <div v-else>
+        <ul class="list-suggest remove-items inline">
+          <li
+            v-for="u in referrers"
+            :key="u.id"
+            :title="$t('remove_referrer')"
+            @click="removeReferrer(u)"
+          >
+            <span>
+              {{ u.text }}
+            </span>
+          </li>
+        </ul>
+      </div>
+
+      <ul class="record_actions">
+        <li class="add-persons">
+          <add-persons
+            ref="referrerPicker"
+            :key="referrerPicker.key"
+            :buttonTitle="$t('add_referrers')"
+            :modalTitle="$t('choose_referrers')"
+            :options="referrerPicker.options"
+            @addNewPersons="addReferrers"
+          >
+          </add-persons>
+        </li>
+      </ul>
+    </div>
+
+    <div id="handlingThirdParty" class="action-row">
+      <h3>{{ $t("handling_thirdparty") }}</h3>
+
+      <div v-if="!hasHandlingThirdParty">
+        <p class="chill-no-data-statement">
+          {{ $t("no_handling_thirdparty") }}
+        </p>
+
+        <ul class="record_actions">
+          <li class="add-persons">
+            <add-persons
+              ref="handlingThirdPartyPicker"
+              v-bind:key="handlingThirdPartyPicker.key"
+              v-bind:buttonTitle="$t('precise_handling_thirdparty')"
+              v-bind:modalTitle="$t('choose_a_thirdparty')"
+              v-bind:options="handlingThirdPartyPicker.options"
+              @addNewPersons="setHandlingThirdParty"
+            >
+              <!-- to cast child method -->
+            </add-persons>
+          </li>
+        </ul>
+      </div>
+      <div v-else class="flex-table">
+        <third-party-render-box
+          :thirdparty="handlingThirdParty"
+          :options="{
+            addLink: false,
+            addId: false,
+            addEntity: true,
+            addInfo: false,
+            hLevel: 3,
+            isMultiline: true,
+            isConfidential: false,
+          }"
+        ></third-party-render-box>
+        <ul class="record_actions">
+          <li>
+            <button
+              :title="$t('remove_handling_thirdparty')"
+              class="btn btn-remove"
+              @click="removeHandlingThirdParty"
+            />
+          </li>
+        </ul>
+      </div>
+    </div>
+
+    <div id="thirdParties" class="action-row">
+      <h3>{{ $t("thirdparty_intervener") }}</h3>
+
+      <div v-if="!hasThirdParties">
+        <p class="chill-no-data-statement">
+          {{ $t("no_thirdparty_intervener") }}
+        </p>
+      </div>
+
+      <div v-else>
+        <div class="flex-bloc mb-3">
+          <third-party-render-box
+            v-for="thirdparty in thirdParties"
+            :key="thirdparty.id"
+            :thirdparty="thirdparty"
+            :options="{
+              addLink: false,
+              addId: false,
+              addEntity: true,
+              addInfo: false,
+              hLevel: 3,
+            }"
+          >
+            <template v-slot:record-actions>
+              <ul class="record_actions">
+                <li>
+                  <on-the-fly
+                    :type="thirdparty.type"
+                    :id="thirdparty.id"
+                    action="show"
+                  ></on-the-fly>
+                </li>
+                <li>
+                  <on-the-fly
+                    :type="thirdparty.type"
+                    :id="thirdparty.id"
+                    action="edit"
+                    @saveFormOnTheFly="saveFormOnTheFly"
+                    ref="onTheFly"
+                  ></on-the-fly>
+                </li>
+                <li>
+                  <button
+                    :title="$t('remove_thirdparty')"
+                    class="btn btn-sm btn-remove"
+                    @click="removeThirdParty(thirdparty)"
+                  />
+                </li>
+              </ul>
+            </template>
+          </third-party-render-box>
+        </div>
+      </div>
+
+      <ul class="record_actions">
+        <li class="add-persons">
+          <add-persons
+            ref="thirdPartyPicker"
+            v-bind:key="thirdPartyPicker.key"
+            v-bind:buttonTitle="$t('add_thirdparties')"
+            v-bind:modalTitle="$t('choose_thirdparties')"
+            v-bind:options="thirdPartyPicker.options"
+            @addNewPersons="addThirdParties"
+          >
+            <!-- to cast child method -->
+          </add-persons>
+        </li>
+      </ul>
+    </div>
+
+    <div
+      v-if="errors.length > 0"
+      id="errors"
+      class="alert alert-danger flashbag"
+    >
+      <p>{{ $t("fix_these_errors") }}</p>
+      <ul>
+        <li v-for="e in errors" :key="e.id">{{ e }}</li>
+      </ul>
+    </div>
+  </div>
+  <ul class="record_actions sticky-form-buttons">
+    <li>
+      <list-workflow-modal
+        :workflows="this.work.workflows"
+        :allowCreate="true"
+        relatedEntityClass="Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork"
+        :relatedEntityId="this.work.id"
+        :workflowsAvailables="this.work.workflows_availables"
+        :preventDefaultMoveToGenerate="true"
+        @go-to-generate-workflow="goToGenerateWorkflow"
+      ></list-workflow-modal>
+    </li>
+
+    <li>
+      <button
+        v-if="AmIRefferer"
+        class="btn btn-notify"
+        @click="goToGenerateNotification(false)"
+      ></button>
+      <template v-else>
+        <button
+          id="btnGroupNotifyButtons"
+          type="button"
+          class="btn btn-notify dropdown-toggle"
+          :title="$t('notification_send')"
+          data-bs-toggle="dropdown"
+          aria-expanded="false"
+        >
+          &nbsp;
+        </button>
+        <ul class="dropdown-menu" aria-labelledby="btnGroupNotifyButtons">
+          <li>
+            <a class="dropdown-item" @click="goToGenerateNotification(true)">{{
+              $t("notification_notify_referrer")
+            }}</a>
+          </li>
+          <li>
+            <a class="dropdown-item" @click="goToGenerateNotification(false)">{{
+              $t("notification_notify_any")
+            }}</a>
+          </li>
+        </ul>
+      </template>
+    </li>
+
+    <li v-if="!isPosting">
+      <button class="btn btn-save" @click="submit">
+        {{ $t("action.save") }}
+      </button>
+    </li>
+
+    <li v-if="isPosting">
+      <button class="btn btn-save" disabled>
+        {{ $t("action.save") }}
+      </button>
+    </li>
+  </ul>
 </template>
 
 <script>
@@ -493,346 +464,340 @@ import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
 import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
 
 const i18n = {
-    messages: {
-        fr: {
-            action: {
-                save: "Enregistrer",
-            },
-            conflict_on_save:
-                "Désolé, cette action d'accompagnement a été modifiée dans une autre fenêtre ou par un autre utilisateur. Rechargez la page pour voir ses changements.",
-            action_title: "Action d'accompagnement",
-            comments: "Commentaire",
-            startDate: "Date de début",
-            endDate: "Date de fin",
-            goals_title: "Motifs - objectifs - dispositifs",
-            available_goals_text:
-                "Motifs, objectifs et dispositifs disponibles pour ajout :",
-            results_title: "Orientations - résultats",
-            results_without_objective:
-                "Résultats - orientations sans objectifs",
-            add_objectif: "Ajouter un motif - objectif - dispositif",
-            add_an_objective: "Ajouter un objectif",
-            Evaluations: "Évaluations",
-            Forms: "Formulaires",
-            Post: "Courriers",
-            add_an_evaluation: "Ajouter une évaluation",
-            persons_involved: "Usagers concernés",
-            handling_thirdparty: "Tiers traitant",
-            no_handling_thirdparty: "Aucun tiers traitant",
-            precise_handling_thirdparty: "Indiquer un tiers traitant",
-            choose_a_thirdparty: "Choisir un tiers",
-            remove_thirdparty: "Enlever le tiers",
-            remove_handling_thirdparty: "Enlever le tiers traitant",
-            thirdparty_intervener: "Tiers intervenants",
-            no_thirdparty_intervener: "Aucun tiers intervenant",
-            add_thirdparties: "Ajouter des tiers",
-            choose_thirdparties: "Choisir des tiers",
-            fix_these_errors: "Veuillez corriger les erreurs suivantes :",
-            available_evaluations_text: "Documents disponibles pour ajout :",
-            no_evaluations_available: "Aucune évaluation disponible",
-            no_goals_available: "Aucun objectif disponible",
-            referrers: "Agents traitants",
-            add_referrers: "Ajouter des agents traitants",
-            no_referrers: "Aucun agent traitant",
-            choose_referrers: "Choisir des agents traitants",
-            remove_referrer: "Enlever l'agent",
-            private_comment: "Commentaire privé",
-            notification_notify_referrer: "Notifier le référent",
-            notification_notify_any: "Notifier d'autres utilisateurs",
-            notification_send: "Envoyer une notification",
-            warning_previous_persons:
-                "Cet usager n'est désormais plus concerné par le parcours, bien qu'il ait été associé à l'action par le passé.",
-        },
+  messages: {
+    fr: {
+      action: {
+        save: "Enregistrer",
+      },
+      conflict_on_save:
+        "Désolé, cette action d'accompagnement a été modifiée dans une autre fenêtre ou par un autre utilisateur. Rechargez la page pour voir ses changements.",
+      action_title: "Action d'accompagnement",
+      comments: "Commentaire",
+      startDate: "Date de début",
+      endDate: "Date de fin",
+      goals_title: "Motifs - objectifs - dispositifs",
+      available_goals_text:
+        "Motifs, objectifs et dispositifs disponibles pour ajout :",
+      results_title: "Orientations - résultats",
+      results_without_objective: "Résultats - orientations sans objectifs",
+      add_objectif: "Ajouter un motif - objectif - dispositif",
+      add_an_objective: "Ajouter un objectif",
+      Evaluations: "Évaluations",
+      Forms: "Formulaires",
+      Post: "Courriers",
+      add_an_evaluation: "Ajouter une évaluation",
+      persons_involved: "Usagers concernés",
+      handling_thirdparty: "Tiers traitant",
+      no_handling_thirdparty: "Aucun tiers traitant",
+      precise_handling_thirdparty: "Indiquer un tiers traitant",
+      choose_a_thirdparty: "Choisir un tiers",
+      remove_thirdparty: "Enlever le tiers",
+      remove_handling_thirdparty: "Enlever le tiers traitant",
+      thirdparty_intervener: "Tiers intervenants",
+      no_thirdparty_intervener: "Aucun tiers intervenant",
+      add_thirdparties: "Ajouter des tiers",
+      choose_thirdparties: "Choisir des tiers",
+      fix_these_errors: "Veuillez corriger les erreurs suivantes :",
+      available_evaluations_text: "Documents disponibles pour ajout :",
+      no_evaluations_available: "Aucune évaluation disponible",
+      no_goals_available: "Aucun objectif disponible",
+      referrers: "Agents traitants",
+      add_referrers: "Ajouter des agents traitants",
+      no_referrers: "Aucun agent traitant",
+      choose_referrers: "Choisir des agents traitants",
+      remove_referrer: "Enlever l'agent",
+      private_comment: "Commentaire privé",
+      notification_notify_referrer: "Notifier le référent",
+      notification_notify_any: "Notifier d'autres utilisateurs",
+      notification_send: "Envoyer une notification",
+      warning_previous_persons:
+        "Cet usager n'est désormais plus concerné par le parcours, bien qu'il ait été associé à l'action par le passé.",
     },
+  },
 };
 
 export default {
-    name: "App",
-    components: {
-        CommentEditor,
-        AddResult,
-        AddEvaluation,
-        AddPersons,
-        ThirdPartyRenderBox,
-        ListWorkflowModal,
-        OnTheFly,
-        PersonText,
+  name: "App",
+  components: {
+    CommentEditor,
+    AddResult,
+    AddEvaluation,
+    AddPersons,
+    ThirdPartyRenderBox,
+    ListWorkflowModal,
+    OnTheFly,
+    PersonText,
+  },
+  i18n,
+  data() {
+    return {
+      docAnchorId: null,
+      isExpanded: false,
+      showAddObjective: false,
+      showAddEvaluation: false,
+      handlingThirdPartyPicker: {
+        key: "handling-third-party",
+        options: {
+          type: ["thirdparty"],
+          priority: null,
+          uniq: true,
+          button: {
+            display: false,
+          },
+        },
+      },
+      thirdPartyPicker: {
+        key: "third-party",
+        options: {
+          type: ["thirdparty"],
+          priority: null,
+          uniq: false,
+          button: {
+            display: false,
+          },
+        },
+      },
+      referrerPicker: {
+        key: "referrer",
+        options: {
+          type: ["user"],
+          priority: null,
+          uniq: false,
+          button: {
+            display: false,
+          },
+        },
+      },
+    };
+  },
+  beforeMount() {
+    const urlParams = new URLSearchParams(window.location.search);
+    this.docAnchorId = urlParams.get("doc_id");
+  },
+  mounted() {
+    this.scrollToElement(this.docAnchorId);
+  },
+  computed: {
+    ...mapState([
+      "work",
+      "resultsForAction",
+      "evaluationsForAction",
+      "goalsPicked",
+      "personsReachables",
+      "handlingThirdParty",
+      "thirdParties",
+      "referrers",
+      "isPosting",
+      "errors",
+      "templatesAvailablesForAction",
+      "me",
+      "version",
+    ]),
+    ...mapGetters([
+      "hasResultsForAction",
+      "hasHandlingThirdParty",
+      "hasThirdParties",
+      "hasReferrers",
+      "getPreviousPersons",
+    ]),
+    classicEditor: () => ClassicEditor,
+    editorConfig: () => classicEditorConfig,
+    startDate: {
+      get() {
+        return this.$store.state.startDate;
+      },
+      set(v) {
+        this.$store.commit("setStartDate", v);
+      },
     },
-    i18n,
-    data() {
-        return {
-            docAnchorId: null,
-            isExpanded: false,
-            showAddObjective: false,
-            showAddEvaluation: false,
-            handlingThirdPartyPicker: {
-                key: "handling-third-party",
-                options: {
-                    type: ["thirdparty"],
-                    priority: null,
-                    uniq: true,
-                    button: {
-                        display: false,
-                    },
-                },
-            },
-            thirdPartyPicker: {
-                key: "third-party",
-                options: {
-                    type: ["thirdparty"],
-                    priority: null,
-                    uniq: false,
-                    button: {
-                        display: false,
-                    },
-                },
-            },
-            referrerPicker: {
-                key: "referrer",
-                options: {
-                    type: ["user"],
-                    priority: null,
-                    uniq: false,
-                    button: {
-                        display: false,
-                    },
-                },
-            },
-        };
+    endDate: {
+      get() {
+        return this.$store.state.endDate;
+      },
+      set(v) {
+        this.$store.commit("setEndDate", v);
+      },
     },
-    beforeMount() {
-        const urlParams = new URLSearchParams(window.location.search);
-        this.docAnchorId = urlParams.get("doc_id");
+    note: {
+      get() {
+        return this.$store.state.note;
+      },
+      set(v) {
+        this.$store.commit("setNote", v);
+      },
     },
-    mounted() {
-        this.scrollToElement(this.docAnchorId);
+    privateComment: {
+      get() {
+        return this.$store.state.privateComment;
+      },
+      set(v) {
+        this.$store.commit("setPrivateComment", v);
+      },
     },
-    computed: {
-        ...mapState([
-            "work",
-            "resultsForAction",
-            "evaluationsForAction",
-            "goalsPicked",
-            "personsReachables",
-            "handlingThirdParty",
-            "thirdParties",
-            "referrers",
-            "isPosting",
-            "errors",
-            "templatesAvailablesForAction",
-            "me",
-            "version",
-        ]),
-        ...mapGetters([
-            "hasResultsForAction",
-            "hasHandlingThirdParty",
-            "hasThirdParties",
-            "hasReferrers",
-            "getPreviousPersons",
-        ]),
-        classicEditor: () => ClassicEditor,
-        editorConfig: () => classicEditorConfig,
-        startDate: {
-            get() {
-                return this.$store.state.startDate;
-            },
-            set(v) {
-                this.$store.commit("setStartDate", v);
-            },
-        },
-        endDate: {
-            get() {
-                return this.$store.state.endDate;
-            },
-            set(v) {
-                this.$store.commit("setEndDate", v);
-            },
-        },
-        note: {
-            get() {
-                return this.$store.state.note;
-            },
-            set(v) {
-                this.$store.commit("setNote", v);
-            },
-        },
-        privateComment: {
-            get() {
-                return this.$store.state.privateComment;
-            },
-            set(v) {
-                this.$store.commit("setPrivateComment", v);
-            },
-        },
-        availableForCheckGoal() {
-            let pickedIds = this.$store.state.goalsPicked.map((g) => g.goal.id);
+    availableForCheckGoal() {
+      let pickedIds = this.$store.state.goalsPicked.map((g) => g.goal.id);
 
-            return this.$store.state.goalsForAction.filter(
-                (g) => !pickedIds.includes(g.id),
-            );
-        },
-        pickedEvaluations() {
-            return this.$store.state.evaluationsPicked;
-        },
-        personsPicked: {
-            get() {
-                let s = this.$store.state.personsPicked.map((p) => p.id);
-
-                return s;
-            },
-            set(v) {
-                this.$store.commit("setPersonsPickedIds", v);
-            },
-        },
-        AmIRefferer() {
-            return !(
-                this.work.accompanyingPeriod.user &&
-                this.me &&
-                this.work.accompanyingPeriod.user.id !== this.me.id
-            );
-        },
+      return this.$store.state.goalsForAction.filter(
+        (g) => !pickedIds.includes(g.id),
+      );
     },
-    methods: {
-        localizeString,
-        toggleSelect() {
-            this.isExpanded = !this.isExpanded;
-        },
-        addGoal(g) {
-            this.$store.commit("addGoal", g);
-        },
-        removeGoal(g) {
-            this.$store.commit("removeGoal", g);
-        },
-        addEvaluation(e) {
-            this.$store.dispatch("addEvaluation", e);
-        },
-        toggleAddEvaluation() {
-            this.showAddEvaluation = !this.showAddEvaluation;
-        },
-        setHandlingThirdParty({ selected, modal }) {
-            this.$store.commit(
-                "setHandlingThirdParty",
-                selected.shift().result,
-            );
-            this.$refs.handlingThirdPartyPicker.resetSearch();
-            modal.showModal = false;
-        },
-        removeHandlingThirdParty() {
-            this.$store.commit("setHandlingThirdParty", null);
-        },
-        addThirdParties({ selected, modal }) {
-            this.$store.commit(
-                "addThirdParties",
-                selected.map((r) => r.result),
-            );
-            this.$refs.thirdPartyPicker.resetSearch();
-            modal.showModal = false;
-        },
-        removeThirdParty(t) {
-            this.$store.commit("removeThirdParty", t);
-        },
-        addReferrers({ selected, modal }) {
-            this.$store.commit(
-                "addReferrers",
-                selected.map((r) => r.result),
-            );
-            this.$refs.referrerPicker.resetSearch();
-            modal.showModal = false;
-        },
-        removeReferrer(u) {
-            this.$store.commit("removeReferrer", u);
-        },
-        goToGenerateWorkflow({ link }) {
-            // console.log('save before leave to generate workflow')
-            const callback = () => {
-                window.location.assign(link);
-            };
+    pickedEvaluations() {
+      return this.$store.state.evaluationsPicked;
+    },
+    personsPicked: {
+      get() {
+        let s = this.$store.state.personsPicked.map((p) => p.id);
 
-            return this.$store.dispatch("submit", callback).catch((e) => {
-                console.log(e);
-                throw e;
-            });
-        },
-        goToGenerateNotification(tos) {
-            console.log("save before leave to notification");
-            const callback = () => {
-                if (tos === true) {
-                    window.location.assign(
-                        `/fr/notification/create?entityClass=Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork&entityId=${this.work.id}&tos[0]=${this.work.accompanyingPeriod.user.id}&returnPath=/fr/person/accompanying-period/${this.work.accompanyingPeriod.id}/work`,
-                    );
-                } else {
-                    window.location.assign(
-                        `/fr/notification/create?entityClass=Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork&entityId=${this.work.id}&returnPath=/fr/person/accompanying-period/${this.work.accompanyingPeriod.id}/work`,
-                    );
-                }
-            };
+        return s;
+      },
+      set(v) {
+        this.$store.commit("setPersonsPickedIds", v);
+      },
+    },
+    AmIRefferer() {
+      return !(
+        this.work.accompanyingPeriod.user &&
+        this.me &&
+        this.work.accompanyingPeriod.user.id !== this.me.id
+      );
+    },
+  },
+  methods: {
+    localizeString,
+    toggleSelect() {
+      this.isExpanded = !this.isExpanded;
+    },
+    addGoal(g) {
+      this.$store.commit("addGoal", g);
+    },
+    removeGoal(g) {
+      this.$store.commit("removeGoal", g);
+    },
+    addEvaluation(e) {
+      this.$store.dispatch("addEvaluation", e);
+    },
+    toggleAddEvaluation() {
+      this.showAddEvaluation = !this.showAddEvaluation;
+    },
+    setHandlingThirdParty({ selected, modal }) {
+      this.$store.commit("setHandlingThirdParty", selected.shift().result);
+      this.$refs.handlingThirdPartyPicker.resetSearch();
+      modal.showModal = false;
+    },
+    removeHandlingThirdParty() {
+      this.$store.commit("setHandlingThirdParty", null);
+    },
+    addThirdParties({ selected, modal }) {
+      this.$store.commit(
+        "addThirdParties",
+        selected.map((r) => r.result),
+      );
+      this.$refs.thirdPartyPicker.resetSearch();
+      modal.showModal = false;
+    },
+    removeThirdParty(t) {
+      this.$store.commit("removeThirdParty", t);
+    },
+    addReferrers({ selected, modal }) {
+      this.$store.commit(
+        "addReferrers",
+        selected.map((r) => r.result),
+      );
+      this.$refs.referrerPicker.resetSearch();
+      modal.showModal = false;
+    },
+    removeReferrer(u) {
+      this.$store.commit("removeReferrer", u);
+    },
+    goToGenerateWorkflow({ link }) {
+      // console.log('save before leave to generate workflow')
+      const callback = () => {
+        window.location.assign(link);
+      };
 
-            return this.$store.dispatch("submit", callback).catch((e) => {
-                console.log(e);
-                throw e;
-            });
-        },
-        submit() {
-            this.$store.dispatch("submit").catch((error) => {
-                if (
-                    error.name === "ValidationException" ||
-                    error.name === "AccessException"
-                ) {
-                    error.violations.forEach((violation) =>
-                        this.$toast.open({ message: violation }),
-                    );
-                } else if (error.name === "ConflictHttpException") {
-                    this.$toast.open({ message: this.$t("conflict_on_save") });
-                } else {
-                    this.$toast.open({ message: "An error occurred" });
-                    throw error;
-                }
-            });
-        },
-        saveFormOnTheFly(payload) {
-            // console.log('saveFormOnTheFly: type', payload.type, ', data', payload.data);
+      return this.$store.dispatch("submit", callback).catch((e) => {
+        console.log(e);
+        throw e;
+      });
+    },
+    goToGenerateNotification(tos) {
+      console.log("save before leave to notification");
+      const callback = () => {
+        if (tos === true) {
+          window.location.assign(
+            `/fr/notification/create?entityClass=Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork&entityId=${this.work.id}&tos[0]=${this.work.accompanyingPeriod.user.id}&returnPath=/fr/person/accompanying-period/${this.work.accompanyingPeriod.id}/work`,
+          );
+        } else {
+          window.location.assign(
+            `/fr/notification/create?entityClass=Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork&entityId=${this.work.id}&returnPath=/fr/person/accompanying-period/${this.work.accompanyingPeriod.id}/work`,
+          );
+        }
+      };
 
-            let body = { type: payload.type };
-            body.name = payload.data.text;
-            body.email = payload.data.email;
-            body.telephone = payload.data.telephone;
-            body.telephone2 = payload.data.telephone2;
-            body.address = { id: payload.data.address.address_id };
+      return this.$store.dispatch("submit", callback).catch((e) => {
+        console.log(e);
+        throw e;
+      });
+    },
+    submit() {
+      this.$store.dispatch("submit").catch((error) => {
+        if (
+          error.name === "ValidationException" ||
+          error.name === "AccessException"
+        ) {
+          error.violations.forEach((violation) =>
+            this.$toast.open({ message: violation }),
+          );
+        } else if (error.name === "ConflictHttpException") {
+          this.$toast.open({ message: this.$t("conflict_on_save") });
+        } else {
+          this.$toast.open({ message: "An error occurred" });
+          throw error;
+        }
+      });
+    },
+    saveFormOnTheFly(payload) {
+      // console.log('saveFormOnTheFly: type', payload.type, ', data', payload.data);
 
-            makeFetch(
-                "PATCH",
-                `/api/1.0/thirdparty/thirdparty/${payload.data.id}.json`,
-                body,
-            )
-                .then((response) => {
-                    this.$store.dispatch("updateThirdParty", response);
-                    for (let otf of this.$refs.onTheFly) {
-                        otf.closeModal();
-                    }
-                })
-                .catch((error) => {
-                    if (error.name === "ValidationException") {
-                        for (let v of error.violations) {
-                            this.$toast.open({ message: v });
-                        }
-                    } else if (error.name === "ConflictHttpException") {
-                        this.$toast.open({
-                            message: this.$t("conflict_on_save"),
-                        });
-                    } else {
-                        this.$toast.open({ message: "An error occurred" });
-                    }
-                });
-        },
-        scrollToElement(docAnchorId) {
-            const documentEl = document.getElementById(
-                `document_${docAnchorId}`,
-            );
-            if (documentEl) {
-                documentEl.scrollIntoView({ behavior: "smooth" });
+      let body = { type: payload.type };
+      body.name = payload.data.text;
+      body.email = payload.data.email;
+      body.telephone = payload.data.telephone;
+      body.telephone2 = payload.data.telephone2;
+      body.address = { id: payload.data.address.address_id };
+
+      makeFetch(
+        "PATCH",
+        `/api/1.0/thirdparty/thirdparty/${payload.data.id}.json`,
+        body,
+      )
+        .then((response) => {
+          this.$store.dispatch("updateThirdParty", response);
+          for (let otf of this.$refs.onTheFly) {
+            otf.closeModal();
+          }
+        })
+        .catch((error) => {
+          if (error.name === "ValidationException") {
+            for (let v of error.violations) {
+              this.$toast.open({ message: v });
             }
-        },
+          } else if (error.name === "ConflictHttpException") {
+            this.$toast.open({
+              message: this.$t("conflict_on_save"),
+            });
+          } else {
+            this.$toast.open({ message: "An error occurred" });
+          }
+        });
     },
+    scrollToElement(docAnchorId) {
+      const documentEl = document.getElementById(`document_${docAnchorId}`);
+      if (documentEl) {
+        documentEl.scrollIntoView({ behavior: "smooth" });
+      }
+    },
+  },
 };
 </script>
 
@@ -841,172 +806,172 @@ export default {
 @import "~ChillMainAssets/chill/scss/mixins";
 
 div#workEditor {
-    display: grid;
-    grid-template-columns: 50%;
-    column-gap: 0rem;
-    grid-template-areas:
-        "title title"
-        "startDate endDate"
-        "comment comment"
-        "privateComment privateComment"
-        "objectives objectives"
-        "evaluations evaluations"
-        "persons persons"
-        "referrers referrers"
-        "handling handling"
-        "tparties tparties"
-        "errors errors";
+  display: grid;
+  grid-template-columns: 50%;
+  column-gap: 0rem;
+  grid-template-areas:
+    "title title"
+    "startDate endDate"
+    "comment comment"
+    "privateComment privateComment"
+    "objectives objectives"
+    "evaluations evaluations"
+    "persons persons"
+    "referrers referrers"
+    "handling handling"
+    "tparties tparties"
+    "errors errors";
 
-    #title {
-        grid-area: title;
-    }
-    #startDate {
-        grid-area: startDate;
-    }
-    #endDate {
-        grid-area: endDate;
-    }
-    #comment {
-        grid-area: comment;
-    }
-    #privateComment {
-        grid-area: privateComment;
-    }
-    #objectives {
-        grid-area: objectives;
-    }
-    #evaluations {
-        grid-area: evaluations;
-    }
-    #persons {
-        grid-area: persons;
-    }
-    #handlingThirdParty {
-        grid-area: handling;
-    }
-    #thirdParties {
-        grid-area: tparties;
-    }
-    #referrers {
-        grid-area: referrers;
-    }
-    #errors {
-        grid-area: errors;
+  #title {
+    grid-area: title;
+  }
+  #startDate {
+    grid-area: startDate;
+  }
+  #endDate {
+    grid-area: endDate;
+  }
+  #comment {
+    grid-area: comment;
+  }
+  #privateComment {
+    grid-area: privateComment;
+  }
+  #objectives {
+    grid-area: objectives;
+  }
+  #evaluations {
+    grid-area: evaluations;
+  }
+  #persons {
+    grid-area: persons;
+  }
+  #handlingThirdParty {
+    grid-area: handling;
+  }
+  #thirdParties {
+    grid-area: tparties;
+  }
+  #referrers {
+    grid-area: referrers;
+  }
+  #errors {
+    grid-area: errors;
+  }
+
+  div.action-row {
+    @include border-collapse;
+    padding: 1em;
+
+    &#title {
+      label {
+        margin-bottom: 0;
+      }
+      p {
+        margin-top: 0;
+        font-weight: bold;
+        font-size: 1rem;
+      }
     }
 
-    div.action-row {
+    &#objectives {
+      & > div {
+        display: grid;
+        grid-template-columns: 50%;
+        column-gap: 0rem;
+        grid-template-areas: "obj res";
+
+        & > div {
+          @include border-collapse;
+          padding: 1em;
+
+          &:nth-child(1) {
+            grid-area: obj;
+          }
+
+          &:nth-child(2) {
+            grid-area: res;
+          }
+        }
+
+        & > div.results_without_objective {
+          background: repeating-linear-gradient(
+            45deg,
+            $gray-200,
+            $gray-200 10px,
+            $gray-100 10px,
+            $gray-100 20px
+          );
+          text-align: center;
+          font-weight: 700;
+          padding-top: 1.5rem;
+        }
+      }
+    }
+
+    &#evaluations {
+      & > div {
         @include border-collapse;
         padding: 1em;
-
-        &#title {
-            label {
-                margin-bottom: 0;
-            }
-            p {
-                margin-top: 0;
-                font-weight: bold;
-                font-size: 1rem;
-            }
-        }
-
-        &#objectives {
-            & > div {
-                display: grid;
-                grid-template-columns: 50%;
-                column-gap: 0rem;
-                grid-template-areas: "obj res";
-
-                & > div {
-                    @include border-collapse;
-                    padding: 1em;
-
-                    &:nth-child(1) {
-                        grid-area: obj;
-                    }
-
-                    &:nth-child(2) {
-                        grid-area: res;
-                    }
-                }
-
-                & > div.results_without_objective {
-                    background: repeating-linear-gradient(
-                        45deg,
-                        $gray-200,
-                        $gray-200 10px,
-                        $gray-100 10px,
-                        $gray-100 20px
-                    );
-                    text-align: center;
-                    font-weight: 700;
-                    padding-top: 1.5rem;
-                }
-            }
-        }
-
-        &#evaluations {
-            & > div {
-                @include border-collapse;
-                padding: 1em;
-            }
-        }
-
-        &#objectives,
-        &#evaluations {
-            padding: 0;
-
-            & > div.title {
-                background-color: $gray-200;
-                color: $gray-700;
-
-                h3 {
-                    text-align: center;
-                }
-            }
-
-            .item-title {
-                font-weight: bold;
-            }
-            .item-details {
-                margin: 1em 2em;
-                font-size: 85%;
-            }
-
-            i.fa {
-                padding: 0.25rem;
-                color: $white;
-
-                &.fa-times {
-                    color: $red;
-                }
-            }
-        }
-
-        &#persons {
-            margin-top: 1.5em;
-        }
-
-        ul.record_actions {
-            margin-bottom: 0;
-        }
+      }
     }
 
-    div#errors {
-        &.alert {
-            margin-top: 2em;
+    &#objectives,
+    &#evaluations {
+      padding: 0;
+
+      & > div.title {
+        background-color: $gray-200;
+        color: $gray-700;
+
+        h3 {
+          text-align: center;
         }
+      }
+
+      .item-title {
+        font-weight: bold;
+      }
+      .item-details {
+        margin: 1em 2em;
+        font-size: 85%;
+      }
+
+      i.fa {
+        padding: 0.25rem;
+        color: $white;
+
+        &.fa-times {
+          color: $red;
+        }
+      }
     }
+
+    &#persons {
+      margin-top: 1.5em;
+    }
+
+    ul.record_actions {
+      margin-bottom: 0;
+    }
+  }
+
+  div#errors {
+    &.alert {
+      margin-top: 2em;
+    }
+  }
 }
 
 .accordion-item:first-of-type,
 .accordion-item:last-of-type {
-    border-radius: 0rem;
-    border: 0px;
-    .accordion-button {
-        padding: 0.25rem;
-        border: 1px solid rgba(17, 17, 17, 0.125);
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
+  border-radius: 0rem;
+  border: 0px;
+  .accordion-button {
+    padding: 0.25rem;
+    border: 1px solid rgba(17, 17, 17, 0.125);
+    margin-top: 20px;
+    margin-bottom: 20px;
+  }
 }
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue
index 77b6810bb..ee8cca532 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddEvaluation.vue
@@ -1,70 +1,67 @@
 <template>
-    <div>
-        <a id="evaluations"></a>
-        <div class="item-title" :title="evaluation.id || 'no id yet'">
-            <span>{{ localizeString(evaluation.evaluation.title) }}</span>
-        </div>
-
-        <div class="item-url mt-3 mb-4" v-if="evaluation.evaluation.url">
-            <i class="fa fa-link fa-lg"></i>
-            <a :href="evaluation.evaluation.url" target="_blank">{{
-                evaluation.evaluation.url
-            }}</a>
-        </div>
-
-        <div>
-            <form-evaluation
-                ref="FormEvaluation"
-                :key="evaluation.key"
-                :evaluation="evaluation"
-                :docAnchorId="docAnchorId"
-            ></form-evaluation>
-
-            <ul class="record_actions">
-                <li v-if="evaluation.workflows_availables.length > 0">
-                    <list-workflow-modal
-                        :workflows="evaluation.workflows"
-                        :allowCreate="true"
-                        relatedEntityClass="Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation"
-                        :relatedEntityId="evaluation.id"
-                        :workflowsAvailables="evaluation.workflows_availables"
-                        @go-to-generate-workflow="goToGenerateWorkflow"
-                    ></list-workflow-modal>
-                </li>
-                <li v-if="canDelete">
-                    <a
-                        class="btn btn-delete"
-                        @click="modal.showModal = true"
-                        :title="$t('action.delete')"
-                        >{{ $t("delete_evaluation") }}</a
-                    >
-                </li>
-            </ul>
-        </div>
-
-        <teleport to="body">
-            <modal
-                v-if="modal.showModal"
-                :modalDialogClass="modal.modalDialogClass"
-                @close="modal.showModal = false"
-            >
-                <template v-slot:header>
-                    <h2 class="modal-title">{{ $t("delete.sure") }}</h2>
-                </template>
-                <template v-slot:body>
-                    <p>{{ $t("delete.sure_description") }}</p>
-                </template>
-                <template v-slot:footer>
-                    <button
-                        class="btn btn-danger"
-                        @click="removeEvaluation(evaluation)"
-                    >
-                        {{ $t("delete.ok") }}
-                    </button>
-                </template>
-            </modal>
-        </teleport>
+  <div>
+    <a id="evaluations"></a>
+    <div class="item-title" :title="evaluation.id || 'no id yet'">
+      <span>{{ localizeString(evaluation.evaluation.title) }}</span>
     </div>
+
+    <div class="item-url mt-3 mb-4" v-if="evaluation.evaluation.url">
+      <i class="fa fa-link fa-lg"></i>
+      <a :href="evaluation.evaluation.url" target="_blank">{{
+        evaluation.evaluation.url
+      }}</a>
+    </div>
+
+    <div>
+      <form-evaluation
+        ref="FormEvaluation"
+        :key="evaluation.key"
+        :evaluation="evaluation"
+        :docAnchorId="docAnchorId"
+      ></form-evaluation>
+
+      <ul class="record_actions">
+        <li v-if="evaluation.workflows_availables.length > 0">
+          <list-workflow-modal
+            :workflows="evaluation.workflows"
+            :allowCreate="true"
+            relatedEntityClass="Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation"
+            :relatedEntityId="evaluation.id"
+            :workflowsAvailables="evaluation.workflows_availables"
+            @go-to-generate-workflow="goToGenerateWorkflow"
+          ></list-workflow-modal>
+        </li>
+        <li v-if="canDelete">
+          <a
+            class="btn btn-delete"
+            @click="modal.showModal = true"
+            :title="$t('action.delete')"
+            >{{ $t("delete_evaluation") }}</a
+          >
+        </li>
+      </ul>
+    </div>
+
+    <teleport to="body">
+      <modal
+        v-if="modal.showModal"
+        :modalDialogClass="modal.modalDialogClass"
+        @close="modal.showModal = false"
+      >
+        <template v-slot:header>
+          <h2 class="modal-title">{{ $t("delete.sure") }}</h2>
+        </template>
+        <template v-slot:body>
+          <p>{{ $t("delete.sure_description") }}</p>
+        </template>
+        <template v-slot:footer>
+          <button class="btn btn-danger" @click="removeEvaluation(evaluation)">
+            {{ $t("delete.ok") }}
+          </button>
+        </template>
+      </modal>
+    </teleport>
+  </div>
 </template>
 
 <script>
@@ -75,114 +72,114 @@ import { buildLinkCreate } from "ChillMainAssets/lib/entity-workflow/api";
 import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
 
 const i18n = {
-    messages: {
-        fr: {
-            no_evaluation_associated: "Aucune évaluation associée",
-            add_an_evaluation: "Évaluations disponibles",
-            evaluation_has_no_evaluation: "Aucune évaluation disponible",
-            startDate: "Date d'ouverture",
-            endDate: "Date de fin",
-            maxDate: "Date d'échéance",
-            warningInterval: "Rappel (jours)",
-            comment: "Note publique",
-            documents: "Documents",
-            delete: {
-                sure: "Êtes-vous sûr?",
-                sure_description:
-                    "Cette évaluation sera supprimée de cette action d'accompagnement",
-                ok: "Supprimer",
-            },
-            delete_evaluation: "Supprimer l'évaluation",
-        },
+  messages: {
+    fr: {
+      no_evaluation_associated: "Aucune évaluation associée",
+      add_an_evaluation: "Évaluations disponibles",
+      evaluation_has_no_evaluation: "Aucune évaluation disponible",
+      startDate: "Date d'ouverture",
+      endDate: "Date de fin",
+      maxDate: "Date d'échéance",
+      warningInterval: "Rappel (jours)",
+      comment: "Note publique",
+      documents: "Documents",
+      delete: {
+        sure: "Êtes-vous sûr?",
+        sure_description:
+          "Cette évaluation sera supprimée de cette action d'accompagnement",
+        ok: "Supprimer",
+      },
+      delete_evaluation: "Supprimer l'évaluation",
     },
+  },
 };
 
 export default {
-    name: "AddEvaluation",
-    components: {
-        FormEvaluation,
-        Modal,
-        ListWorkflowModal,
+  name: "AddEvaluation",
+  components: {
+    FormEvaluation,
+    Modal,
+    ListWorkflowModal,
+  },
+  props: ["evaluation", "docAnchorId"],
+  i18n,
+  data() {
+    return {
+      modal: {
+        showModal: false,
+        modalDialogClass: "modal-dialog-centered modal-md",
+      },
+    };
+  },
+  computed: {
+    pickedEvaluations() {
+      return this.$store.state.evaluationsPicked;
     },
-    props: ["evaluation", "docAnchorId"],
-    i18n,
-    data() {
-        return {
-            modal: {
-                showModal: false,
-                modalDialogClass: "modal-dialog-centered modal-md",
-            },
-        };
-    },
-    computed: {
-        pickedEvaluations() {
-            return this.$store.state.evaluationsPicked;
-        },
-        canDelete() {
-            if (this.evaluation.workflows.length > 0) {
-                return false;
-            }
+    canDelete() {
+      if (this.evaluation.workflows.length > 0) {
+        return false;
+      }
 
-            for (let doc of this.evaluation.documents) {
-                if (doc.workflows.length > 0) {
-                    return false;
-                }
-            }
+      for (let doc of this.evaluation.documents) {
+        if (doc.workflows.length > 0) {
+          return false;
+        }
+      }
 
-            return true;
-        },
+      return true;
     },
-    methods: {
-        localizeString,
-        removeEvaluation(e) {
-            this.$store.commit("removeEvaluation", e);
-            return;
-        },
-        toggleEditEvaluation() {
-            this.$store.commit("toggleEvaluationEdit", {
-                key: this.evaluation.key,
-            });
-        },
-        submitForm() {
-            this.toggleEditEvaluation();
-        },
-        goToGenerateWorkflow({ workflowName }) {
-            const callback = (data) => {
-                let evaluationId = data.accompanyingPeriodWorkEvaluations.find(
-                    (e) => e.key === this.evaluation.key,
-                ).id;
-                window.location.assign(
-                    buildLinkCreate(
-                        workflowName,
-                        "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluation",
-                        evaluationId,
-                    ),
-                );
-            };
+  },
+  methods: {
+    localizeString,
+    removeEvaluation(e) {
+      this.$store.commit("removeEvaluation", e);
+      return;
+    },
+    toggleEditEvaluation() {
+      this.$store.commit("toggleEvaluationEdit", {
+        key: this.evaluation.key,
+      });
+    },
+    submitForm() {
+      this.toggleEditEvaluation();
+    },
+    goToGenerateWorkflow({ workflowName }) {
+      const callback = (data) => {
+        let evaluationId = data.accompanyingPeriodWorkEvaluations.find(
+          (e) => e.key === this.evaluation.key,
+        ).id;
+        window.location.assign(
+          buildLinkCreate(
+            workflowName,
+            "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluation",
+            evaluationId,
+          ),
+        );
+      };
 
-            return this.$store.dispatch("submit", callback).catch((e) => {
-                console.log(e);
-                throw e;
-            });
-        },
+      return this.$store.dispatch("submit", callback).catch((e) => {
+        console.log(e);
+        throw e;
+      });
     },
+  },
 };
 </script>
 
 <style lang="scss" scoped>
 div.item-title {
-    .evaluation-title {
-        cursor: default;
-        &::before {
-            content: "";
-        }
+  .evaluation-title {
+    cursor: default;
+    &::before {
+      content: "";
     }
+  }
 }
 div.item-url {
-    i {
-        color: unset !important;
-        margin-left: 1rem;
-        margin-right: 0.5rem;
-    }
+  i {
+    color: unset !important;
+    margin-left: 1rem;
+    margin-right: 0.5rem;
+  }
 }
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddResult.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddResult.vue
index aa8948a4e..f25de72c8 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddResult.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/AddResult.vue
@@ -1,179 +1,167 @@
 <template>
-    <div v-if="hasResult" class="addResult">
-        <p v-if="pickedResults.length === 0" class="chill-no-data-statement">
-            Aucun résultat associé
-        </p>
+  <div v-if="hasResult" class="addResult">
+    <p v-if="pickedResults.length === 0" class="chill-no-data-statement">
+      Aucun résultat associé
+    </p>
 
-        <ul class="list-suggest remove-items">
-            <li v-for="r in pickedResults" @click="removeResult(r)" :key="r.id">
-                <span>
-                    {{ localizeString(r.title) }}
-                </span>
-            </li>
-        </ul>
+    <ul class="list-suggest remove-items">
+      <li v-for="r in pickedResults" @click="removeResult(r)" :key="r.id">
+        <span>
+          {{ localizeString(r.title) }}
+        </span>
+      </li>
+    </ul>
 
-        <div class="accordion" id="expandedSuggestions">
-            <div class="accordion-item">
-                <h2 class="accordion-header" id="heading_expanded_suggestions">
-                    <button
-                        v-if="isExpanded"
-                        class="accordion-button"
-                        type="button"
-                        data-bs-toggle="collapse"
-                        aria-expanded="true"
-                        @click="toggleSelect"
-                    >
-                        Masquer
-                    </button>
+    <div class="accordion" id="expandedSuggestions">
+      <div class="accordion-item">
+        <h2 class="accordion-header" id="heading_expanded_suggestions">
+          <button
+            v-if="isExpanded"
+            class="accordion-button"
+            type="button"
+            data-bs-toggle="collapse"
+            aria-expanded="true"
+            @click="toggleSelect"
+          >
+            Masquer
+          </button>
 
-                    <button
-                        v-else
-                        class="accordion-button collapsed"
-                        type="button"
-                        data-bs-toggle="collapse"
-                        aria-expanded="false"
-                        @click="toggleSelect"
-                    >
-                        Résultats et orientations disponibles
-                    </button>
-                </h2>
-                <div
-                    class="accordion-collapse"
-                    id="collapse_expanded_suggestions"
-                    aria-labelledby="heading_expanded_suggestions"
-                    data-bs-parent="#expandedSuggestions"
-                >
-                    <template v-if="isExpanded">
-                        <ul class="list-suggest add-items">
-                            <li
-                                v-for="r in availableForCheckResults"
-                                @click="addResult(r)"
-                                :key="r.id"
-                            >
-                                <span>{{ localizeString(r.title) }}</span>
-                            </li>
-                        </ul>
-                    </template>
-                </div>
-            </div>
+          <button
+            v-else
+            class="accordion-button collapsed"
+            type="button"
+            data-bs-toggle="collapse"
+            aria-expanded="false"
+            @click="toggleSelect"
+          >
+            Résultats et orientations disponibles
+          </button>
+        </h2>
+        <div
+          class="accordion-collapse"
+          id="collapse_expanded_suggestions"
+          aria-labelledby="heading_expanded_suggestions"
+          data-bs-parent="#expandedSuggestions"
+        >
+          <template v-if="isExpanded">
+            <ul class="list-suggest add-items">
+              <li
+                v-for="r in availableForCheckResults"
+                @click="addResult(r)"
+                :key="r.id"
+              >
+                <span>{{ localizeString(r.title) }}</span>
+              </li>
+            </ul>
+          </template>
         </div>
+      </div>
     </div>
-    <div v-if="!hasResult" class="noResult">
-        <div class="chill-no-data-statement">
-            {{ $t("goal_has_no_result") }}
-        </div>
+  </div>
+  <div v-if="!hasResult" class="noResult">
+    <div class="chill-no-data-statement">
+      {{ $t("goal_has_no_result") }}
     </div>
+  </div>
 </template>
 
 <script>
 import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
 
 const i18n = {
-    messages: {
-        fr: {
-            add_a_result: "Résultat - orientation disponibles",
-            goal_has_no_result: "Aucun résultat - orientation disponible",
-        },
+  messages: {
+    fr: {
+      add_a_result: "Résultat - orientation disponibles",
+      goal_has_no_result: "Aucun résultat - orientation disponible",
     },
+  },
 };
 
 export default {
-    name: "AddResult",
-    props: ["destination", "goal", "availableResults"],
-    i18n,
-    data() {
-        return {
-            isExpanded: false,
-        };
+  name: "AddResult",
+  props: ["destination", "goal", "availableResults"],
+  i18n,
+  data() {
+    return {
+      isExpanded: false,
+    };
+  },
+  computed: {
+    hasResult() {
+      if (this.destination === "action") {
+        return this.$store.state.resultsForAction.length > 0;
+      } else if (this.destination === "goal") {
+        return this.$store.getters.resultsForGoal(this.goal).length > 0;
+      }
+
+      throw Error(`this.destination is not implemented: ${this.destination}`);
     },
-    computed: {
-        hasResult() {
-            if (this.destination === "action") {
-                return this.$store.state.resultsForAction.length > 0;
-            } else if (this.destination === "goal") {
-                return this.$store.getters.resultsForGoal(this.goal).length > 0;
-            }
+    pickedResults() {
+      if (this.destination === "action") {
+        return this.$store.state.resultsPicked;
+      } else if (this.destination === "goal") {
+        return this.$store.getters.resultsPickedForGoal(this.goal);
+      }
 
-            throw Error(
-                `this.destination is not implemented: ${this.destination}`,
-            );
-        },
-        pickedResults() {
-            if (this.destination === "action") {
-                return this.$store.state.resultsPicked;
-            } else if (this.destination === "goal") {
-                return this.$store.getters.resultsPickedForGoal(this.goal);
-            }
-
-            throw Error(
-                `this.destination is not implemented: ${this.destination}`,
-            );
-        },
-        availableForCheckResults() {
-            if (this.destination === "action") {
-                let pickedIds = this.$store.state.resultsPicked.map(
-                    (r) => r.id,
-                );
-
-                return this.$store.state.resultsForAction.filter(
-                    (r) => !pickedIds.includes(r.id),
-                );
-            } else if (this.destination === "goal") {
-                let pickedIds = this.$store.getters
-                    .resultsPickedForGoal(this.goal)
-                    .map((r) => r.id);
-
-                return this.$store.getters
-                    .resultsForGoal(this.goal)
-                    .filter((r) => !pickedIds.includes(r.id));
-            }
-
-            throw Error(
-                `this.destination is not implemented: ${this.destination}`,
-            );
-        },
+      throw Error(`this.destination is not implemented: ${this.destination}`);
     },
-    methods: {
-        localizeString,
-        toggleSelect() {
-            this.isExpanded = !this.isExpanded;
-        },
-        addResult(r) {
-            if (this.destination === "action") {
-                this.$store.commit("addResultPicked", r);
-                return;
-            } else if (this.destination === "goal") {
-                this.$store.commit("addResultForGoalPicked", {
-                    goal: this.goal,
-                    result: r,
-                });
-                return;
-            }
-            throw Error(
-                `this.destination is not implemented: ${this.destination}`,
-            );
-        },
-        removeResult(r) {
-            if (this.destination === "action") {
-                this.$store.commit("removeResultPicked", r);
-                return;
-            } else if (this.destination === "goal") {
-                this.$store.commit("removeResultForGoalPicked", {
-                    goal: this.goal,
-                    result: r,
-                });
-                return;
-            }
-            throw Error(
-                `this.destination is not implemented: ${this.destination}`,
-            );
-        },
+    availableForCheckResults() {
+      if (this.destination === "action") {
+        let pickedIds = this.$store.state.resultsPicked.map((r) => r.id);
+
+        return this.$store.state.resultsForAction.filter(
+          (r) => !pickedIds.includes(r.id),
+        );
+      } else if (this.destination === "goal") {
+        let pickedIds = this.$store.getters
+          .resultsPickedForGoal(this.goal)
+          .map((r) => r.id);
+
+        return this.$store.getters
+          .resultsForGoal(this.goal)
+          .filter((r) => !pickedIds.includes(r.id));
+      }
+
+      throw Error(`this.destination is not implemented: ${this.destination}`);
     },
+  },
+  methods: {
+    localizeString,
+    toggleSelect() {
+      this.isExpanded = !this.isExpanded;
+    },
+    addResult(r) {
+      if (this.destination === "action") {
+        this.$store.commit("addResultPicked", r);
+        return;
+      } else if (this.destination === "goal") {
+        this.$store.commit("addResultForGoalPicked", {
+          goal: this.goal,
+          result: r,
+        });
+        return;
+      }
+      throw Error(`this.destination is not implemented: ${this.destination}`);
+    },
+    removeResult(r) {
+      if (this.destination === "action") {
+        this.$store.commit("removeResultPicked", r);
+        return;
+      } else if (this.destination === "goal") {
+        this.$store.commit("removeResultForGoalPicked", {
+          goal: this.goal,
+          result: r,
+        });
+        return;
+      }
+      throw Error(`this.destination is not implemented: ${this.destination}`);
+    },
+  },
 };
 </script>
 
 <style lang="scss" scoped>
 .accordion-button {
-    padding: 0.25rem;
+  padding: 0.25rem;
 }
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
index b54baf09a..30bb2a2dd 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
@@ -1,11 +1,11 @@
 <template>
-    <div>
-        <!--h2>
+  <div>
+    <!--h2>
       {{ $t('evaluation_title') }}
    </h2-->
 
-        <div class="m-md-3">
-            <!--div class="row mb-3">
+    <div class="m-md-3">
+      <!--div class="row mb-3">
          <label class="col-sm-4 col-form-label">{{ $t('evaluation_status') }}</label>
          <div class="col-sm-8">
             <select class="form-select form-select-sm" v-model="status">
@@ -17,311 +17,261 @@
          </div>
       </div-->
 
-            <div class="row mb-3">
-                <label class="col-4 col-sm-2 col-md-4 col-lg-2 col-form-label">
-                    {{ $t("evaluation_startdate") }}
-                </label>
-                <div class="col-8 col-sm-4 col-md-8 col-lg-4">
-                    <input
-                        class="form-control form-control-sm"
-                        type="date"
-                        v-model="startDate"
-                    />
-                </div>
-
-                <label class="col-4 col-sm-2 col-md-4 col-lg-2 col-form-label">
-                    {{ $t("evaluation_enddate") }}
-                </label>
-                <div class="col-8 col-sm-4 col-md-8 col-lg-4">
-                    <input
-                        class="form-control form-control-sm"
-                        type="date"
-                        v-model="endDate"
-                    />
-                </div>
-            </div>
-
-            <div class="row mb-3">
-                <label class="col-4 col-sm-2 col-md-4 col-lg-2 col-form-label">
-                    {{ $t("evaluation_maxdate") }}
-                </label>
-                <div class="col-8 col-sm-4 col-md-8 col-lg-4">
-                    <input
-                        class="form-control form-control-sm"
-                        type="date"
-                        v-model="maxDate"
-                    />
-                </div>
-
-                <label class="col-4 col-sm-2 col-md-4 col-lg-2 col-form-label">
-                    {{ $t("evaluation_warning_interval") }}
-                </label>
-                <div class="col-8 col-sm-4 col-md-8 col-lg-4">
-                    <input
-                        class="form-control form-control-sm"
-                        type="number"
-                        v-model.number="warningInterval"
-                    />
-                </div>
-            </div>
-
-            <div class="row mb-3">
-                <label class="col-4 col-sm-2 col-md-4 col-lg-2 col-form-label">
-                    {{ $t("evaluation_time_spent") }}
-                </label>
-                <div class="col-8 col-sm-4 col-md-8 col-lg-4">
-                    <select
-                        class="form-control form-control-sm"
-                        type="time"
-                        v-model="timeSpent"
-                    >
-                        <option disabled value="">
-                            {{ $t("select_time_spent") }}
-                        </option>
-                        <option
-                            v-for="(time, i) in timeSpentChoices"
-                            :value="time.value"
-                            :key="i"
-                        >
-                            {{ time.text }}
-                        </option>
-                    </select>
-                </div>
-            </div>
-
-            <div class="row mb-3">
-                <label class="col-sm-4 col-form-label visually-hidden">{{
-                    $t("evaluation_public_comment")
-                }}</label>
-                <div class="col-sm-12">
-                    <comment-editor v-model:value="comment"></comment-editor>
-                </div>
-            </div>
-
-            <div v-if="evaluation.documents.length > 0" class="row mb-3">
-                <h5>{{ $t("Documents") }} :</h5>
-
-                <div class="flex-table">
-                    <div
-                        class="item-bloc"
-                        v-for="(d, i) in evaluation.documents"
-                        :key="d.id"
-                        :class="[
-                            parseInt(this.docAnchorId) === d.id
-                                ? 'bg-blink'
-                                : 'nothing',
-                        ]"
-                    >
-                        <div :id="`document_${d.id}`" class="item-row">
-                            <div class="input-group input-group-lg mb-3 row">
-                                <label class="col-sm-3 col-form-label"
-                                    >Titre du document:</label
-                                >
-                                <div class="col-sm-9">
-                                    <input
-                                        class="form-control document-title"
-                                        type="text"
-                                        :value="d.title"
-                                        :id="d.id"
-                                        :data-key="i"
-                                        @input="onInputDocumentTitle"
-                                    />
-                                </div>
-                            </div>
-                        </div>
-                        <div class="item-row">
-                            <div class="item-col item-meta">
-                                <p v-if="d.createdBy" class="createdBy">
-                                    Créé par {{ d.createdBy.text }}<br />
-                                    Le
-                                    {{
-                                        $d(
-                                            ISOToDatetime(d.createdAt.datetime),
-                                            "long",
-                                        )
-                                    }}
-                                </p>
-                            </div>
-                        </div>
-                        <div class="item-row">
-                            <div class="item-col">
-                                <ul class="record_actions">
-                                    <li
-                                        v-if="
-                                            d.workflows_availables.length > 0 ||
-                                            d.workflows.length > 0
-                                        "
-                                    >
-                                        <list-workflow-modal
-                                            :workflows="d.workflows"
-                                            :allowCreate="true"
-                                            relatedEntityClass="Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument"
-                                            :relatedEntityId="d.id"
-                                            :workflowsAvailables="
-                                                d.workflows_availables
-                                            "
-                                            :preventDefaultMoveToGenerate="true"
-                                            :goToGenerateWorkflowPayload="{
-                                                doc: d,
-                                            }"
-                                            @go-to-generate-workflow="
-                                                goToGenerateWorkflowEvaluationDocument
-                                            "
-                                        ></list-workflow-modal>
-                                    </li>
-                                    <li>
-                                        <button
-                                            v-if="AmIRefferer"
-                                            class="btn btn-notify"
-                                            @click="
-                                                goToGenerateDocumentNotification(
-                                                    d,
-                                                    false,
-                                                )
-                                            "
-                                        ></button>
-                                        <template v-else>
-                                            <button
-                                                id="btnGroupNotifyButtons"
-                                                type="button"
-                                                class="btn btn-notify dropdown-toggle"
-                                                :title="$t('notification_send')"
-                                                data-bs-toggle="dropdown"
-                                                aria-expanded="false"
-                                            >
-                                                &nbsp;
-                                            </button>
-                                            <ul
-                                                class="dropdown-menu"
-                                                aria-labelledby="btnGroupNotifyButtons"
-                                            >
-                                                <li>
-                                                    <a
-                                                        class="dropdown-item"
-                                                        @click="
-                                                            goToGenerateDocumentNotification(
-                                                                d,
-                                                                true,
-                                                            )
-                                                        "
-                                                        >{{
-                                                            $t(
-                                                                "notification_notify_referrer",
-                                                            )
-                                                        }}</a
-                                                    >
-                                                </li>
-                                                <li>
-                                                    <a
-                                                        class="dropdown-item"
-                                                        @click="
-                                                            goToGenerateDocumentNotification(
-                                                                d,
-                                                                false,
-                                                            )
-                                                        "
-                                                        >{{
-                                                            $t(
-                                                                "notification_notify_any",
-                                                            )
-                                                        }}</a
-                                                    >
-                                                </li>
-                                            </ul>
-                                        </template>
-                                    </li>
-                                    <li>
-                                        <document-action-buttons-group
-                                            :stored-object="d.storedObject"
-                                            :filename="d.title"
-                                            :can-edit="true"
-                                            :execute-before-leave="
-                                                submitBeforeLeaveToEditor
-                                            "
-                                            :davLink="
-                                                d.storedObject._links?.dav_link
-                                                    .href
-                                            "
-                                            :davLinkExpiration="
-                                                d.storedObject._links?.dav_link
-                                                    .expiration
-                                            "
-                                            @on-stored-object-status-change="
-                                                onStatusDocumentChanged
-                                            "
-                                        ></document-action-buttons-group>
-                                    </li>
-                                    <li
-                                        v-if="
-                                            d.storedObject._permissions.canEdit
-                                        "
-                                    >
-                                        <drop-file-modal
-                                            :existing-doc="d.storedObject"
-                                            :allow-remove="false"
-                                            @add-document="
-                                                (arg) =>
-                                                    replaceDocument(
-                                                        d,
-                                                        arg.stored_object,
-                                                        arg.stored_object_version,
-                                                    )
-                                            "
-                                        ></drop-file-modal>
-                                    </li>
-                                    <li v-if="d.workflows.length === 0">
-                                        <a
-                                            class="btn btn-delete"
-                                            @click="removeDocument(d)"
-                                        >
-                                        </a>
-                                    </li>
-                                    <li v-if="Number.isInteger(d.id)">
-                                        <button
-                                            type="button"
-                                            @click="duplicateDocument(d)"
-                                            class="btn btn-duplicate"
-                                            title="Dupliquer"
-                                        ></button>
-                                    </li>
-                                </ul>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </div>
-
-            <div class="row mb-3">
-                <h6>{{ $t("document_add") }} :</h6>
-                <pick-template
-                    entityClass="Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation"
-                    :id="evaluation.id"
-                    :templates="getTemplatesAvailables"
-                    :preventDefaultMoveToGenerate="true"
-                    @go-to-generate-document="submitBeforeGenerate"
-                >
-                    <template v-slot:title>
-                        <label class="col-form-label">{{
-                            $t("evaluation_generate_a_document")
-                        }}</label>
-                    </template>
-                </pick-template>
-                <div>
-                    <label class="col-form-label">{{
-                        $t("document_upload")
-                    }}</label>
-                    <ul class="record_actions document-upload">
-                        <li>
-                            <drop-file-modal
-                                :allow-remove="false"
-                                @add-document="addDocument"
-                            ></drop-file-modal>
-                        </li>
-                    </ul>
-                </div>
-            </div>
+      <div class="row mb-3">
+        <label class="col-4 col-sm-2 col-md-4 col-lg-2 col-form-label">
+          {{ $t("evaluation_startdate") }}
+        </label>
+        <div class="col-8 col-sm-4 col-md-8 col-lg-4">
+          <input
+            class="form-control form-control-sm"
+            type="date"
+            v-model="startDate"
+          />
         </div>
+
+        <label class="col-4 col-sm-2 col-md-4 col-lg-2 col-form-label">
+          {{ $t("evaluation_enddate") }}
+        </label>
+        <div class="col-8 col-sm-4 col-md-8 col-lg-4">
+          <input
+            class="form-control form-control-sm"
+            type="date"
+            v-model="endDate"
+          />
+        </div>
+      </div>
+
+      <div class="row mb-3">
+        <label class="col-4 col-sm-2 col-md-4 col-lg-2 col-form-label">
+          {{ $t("evaluation_maxdate") }}
+        </label>
+        <div class="col-8 col-sm-4 col-md-8 col-lg-4">
+          <input
+            class="form-control form-control-sm"
+            type="date"
+            v-model="maxDate"
+          />
+        </div>
+
+        <label class="col-4 col-sm-2 col-md-4 col-lg-2 col-form-label">
+          {{ $t("evaluation_warning_interval") }}
+        </label>
+        <div class="col-8 col-sm-4 col-md-8 col-lg-4">
+          <input
+            class="form-control form-control-sm"
+            type="number"
+            v-model.number="warningInterval"
+          />
+        </div>
+      </div>
+
+      <div class="row mb-3">
+        <label class="col-4 col-sm-2 col-md-4 col-lg-2 col-form-label">
+          {{ $t("evaluation_time_spent") }}
+        </label>
+        <div class="col-8 col-sm-4 col-md-8 col-lg-4">
+          <select
+            class="form-control form-control-sm"
+            type="time"
+            v-model="timeSpent"
+          >
+            <option disabled value="">
+              {{ $t("select_time_spent") }}
+            </option>
+            <option
+              v-for="(time, i) in timeSpentChoices"
+              :value="time.value"
+              :key="i"
+            >
+              {{ time.text }}
+            </option>
+          </select>
+        </div>
+      </div>
+
+      <div class="row mb-3">
+        <label class="col-sm-4 col-form-label visually-hidden">{{
+          $t("evaluation_public_comment")
+        }}</label>
+        <div class="col-sm-12">
+          <comment-editor v-model:value="comment"></comment-editor>
+        </div>
+      </div>
+
+      <div v-if="evaluation.documents.length > 0" class="row mb-3">
+        <h5>{{ $t("Documents") }} :</h5>
+
+        <div class="flex-table">
+          <div
+            class="item-bloc"
+            v-for="(d, i) in evaluation.documents"
+            :key="d.id"
+            :class="[
+              parseInt(this.docAnchorId) === d.id ? 'bg-blink' : 'nothing',
+            ]"
+          >
+            <div :id="`document_${d.id}`" class="item-row">
+              <div class="input-group input-group-lg mb-3 row">
+                <label class="col-sm-3 col-form-label"
+                  >Titre du document:</label
+                >
+                <div class="col-sm-9">
+                  <input
+                    class="form-control document-title"
+                    type="text"
+                    :value="d.title"
+                    :id="d.id"
+                    :data-key="i"
+                    @input="onInputDocumentTitle"
+                  />
+                </div>
+              </div>
+            </div>
+            <div class="item-row">
+              <div class="item-col item-meta">
+                <p v-if="d.createdBy" class="createdBy">
+                  Créé par {{ d.createdBy.text }}<br />
+                  Le
+                  {{ $d(ISOToDatetime(d.createdAt.datetime), "long") }}
+                </p>
+              </div>
+            </div>
+            <div class="item-row">
+              <div class="item-col">
+                <ul class="record_actions">
+                  <li
+                    v-if="
+                      d.workflows_availables.length > 0 ||
+                      d.workflows.length > 0
+                    "
+                  >
+                    <list-workflow-modal
+                      :workflows="d.workflows"
+                      :allowCreate="true"
+                      relatedEntityClass="Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument"
+                      :relatedEntityId="d.id"
+                      :workflowsAvailables="d.workflows_availables"
+                      :preventDefaultMoveToGenerate="true"
+                      :goToGenerateWorkflowPayload="{
+                        doc: d,
+                      }"
+                      @go-to-generate-workflow="
+                        goToGenerateWorkflowEvaluationDocument
+                      "
+                    ></list-workflow-modal>
+                  </li>
+                  <li>
+                    <button
+                      v-if="AmIRefferer"
+                      class="btn btn-notify"
+                      @click="goToGenerateDocumentNotification(d, false)"
+                    ></button>
+                    <template v-else>
+                      <button
+                        id="btnGroupNotifyButtons"
+                        type="button"
+                        class="btn btn-notify dropdown-toggle"
+                        :title="$t('notification_send')"
+                        data-bs-toggle="dropdown"
+                        aria-expanded="false"
+                      >
+                        &nbsp;
+                      </button>
+                      <ul
+                        class="dropdown-menu"
+                        aria-labelledby="btnGroupNotifyButtons"
+                      >
+                        <li>
+                          <a
+                            class="dropdown-item"
+                            @click="goToGenerateDocumentNotification(d, true)"
+                            >{{ $t("notification_notify_referrer") }}</a
+                          >
+                        </li>
+                        <li>
+                          <a
+                            class="dropdown-item"
+                            @click="goToGenerateDocumentNotification(d, false)"
+                            >{{ $t("notification_notify_any") }}</a
+                          >
+                        </li>
+                      </ul>
+                    </template>
+                  </li>
+                  <li>
+                    <document-action-buttons-group
+                      :stored-object="d.storedObject"
+                      :filename="d.title"
+                      :can-edit="true"
+                      :execute-before-leave="submitBeforeLeaveToEditor"
+                      :davLink="d.storedObject._links?.dav_link.href"
+                      :davLinkExpiration="
+                        d.storedObject._links?.dav_link.expiration
+                      "
+                      @on-stored-object-status-change="onStatusDocumentChanged"
+                    ></document-action-buttons-group>
+                  </li>
+                  <li v-if="d.storedObject._permissions.canEdit">
+                    <drop-file-modal
+                      :existing-doc="d.storedObject"
+                      :allow-remove="false"
+                      @add-document="
+                        (arg) =>
+                          replaceDocument(
+                            d,
+                            arg.stored_object,
+                            arg.stored_object_version,
+                          )
+                      "
+                    ></drop-file-modal>
+                  </li>
+                  <li v-if="d.workflows.length === 0">
+                    <a class="btn btn-delete" @click="removeDocument(d)"> </a>
+                  </li>
+                  <li v-if="Number.isInteger(d.id)">
+                    <button
+                      type="button"
+                      @click="duplicateDocument(d)"
+                      class="btn btn-duplicate"
+                      title="Dupliquer"
+                    ></button>
+                  </li>
+                </ul>
+              </div>
+            </div>
+          </div>
+        </div>
+      </div>
+
+      <div class="row mb-3">
+        <h6>{{ $t("document_add") }} :</h6>
+        <pick-template
+          entityClass="Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation"
+          :id="evaluation.id"
+          :templates="getTemplatesAvailables"
+          :preventDefaultMoveToGenerate="true"
+          @go-to-generate-document="submitBeforeGenerate"
+        >
+          <template v-slot:title>
+            <label class="col-form-label">{{
+              $t("evaluation_generate_a_document")
+            }}</label>
+          </template>
+        </pick-template>
+        <div>
+          <label class="col-form-label">{{ $t("document_upload") }}</label>
+          <ul class="record_actions document-upload">
+            <li>
+              <drop-file-modal
+                :allow-remove="false"
+                @add-document="addDocument"
+              ></drop-file-modal>
+            </li>
+          </ul>
+        </div>
+      </div>
     </div>
+  </div>
 </template>
 
 <script>
@@ -337,392 +287,392 @@ import DropFileModal from "ChillDocStoreAssets/vuejs/DropFileWidget/DropFileModa
 import CommentEditor from "ChillMainAssets/vuejs/_components/CommentEditor/CommentEditor.vue";
 
 const i18n = {
-    messages: {
-        fr: {
-            evaluation_title: "Ecrire une évaluation",
-            evaluation_status: "Statut",
-            evaluation_choose_a_status: "Choisir un statut",
-            evaluation_startdate: "Date d'ouverture",
-            evaluation_enddate: "Date de fin",
-            evaluation_maxdate: "Date d'échéance",
-            evaluation_warning_interval: "Rappel (jours)",
-            evaluation_public_comment: "Note publique",
-            evaluation_comment_placeholder: "Commencez à écrire ...",
-            evaluation_generate_a_document: "Générer un document",
-            evaluation_choose_a_template: "Choisir un modèle",
-            evaluation_add_a_document: "Ajouter un document",
-            evaluation_add: "Ajouter une évaluation",
-            evaluation_time_spent: "Temps de rédaction",
-            select_time_spent: "Indiquez le temps de rédaction",
-            Documents: "Documents",
-            document_add: "Générer ou téléverser un document",
-            document_upload: "Téléverser un document",
-            document_title: "Titre du document",
-            template_title: "Nom du template",
-            browse: "Ajouter un document",
-            replace: "Remplacer",
-            download: "Télécharger le fichier existant",
-            notification_notify_referrer: "Notifier le référent",
-            notification_notify_any: "Notifier d'autres utilisateurs",
-            notification_send: "Envoyer une notification",
-        },
+  messages: {
+    fr: {
+      evaluation_title: "Ecrire une évaluation",
+      evaluation_status: "Statut",
+      evaluation_choose_a_status: "Choisir un statut",
+      evaluation_startdate: "Date d'ouverture",
+      evaluation_enddate: "Date de fin",
+      evaluation_maxdate: "Date d'échéance",
+      evaluation_warning_interval: "Rappel (jours)",
+      evaluation_public_comment: "Note publique",
+      evaluation_comment_placeholder: "Commencez à écrire ...",
+      evaluation_generate_a_document: "Générer un document",
+      evaluation_choose_a_template: "Choisir un modèle",
+      evaluation_add_a_document: "Ajouter un document",
+      evaluation_add: "Ajouter une évaluation",
+      evaluation_time_spent: "Temps de rédaction",
+      select_time_spent: "Indiquez le temps de rédaction",
+      Documents: "Documents",
+      document_add: "Générer ou téléverser un document",
+      document_upload: "Téléverser un document",
+      document_title: "Titre du document",
+      template_title: "Nom du template",
+      browse: "Ajouter un document",
+      replace: "Remplacer",
+      download: "Télécharger le fichier existant",
+      notification_notify_referrer: "Notifier le référent",
+      notification_notify_any: "Notifier d'autres utilisateurs",
+      notification_send: "Envoyer une notification",
     },
+  },
 };
 
 export default {
-    name: "FormEvaluation",
-    props: ["evaluation", "docAnchorId"],
-    components: {
-        CommentEditor,
-        DropFileModal,
-        PickTemplate,
-        ListWorkflowModal,
-        DocumentActionButtonsGroup,
+  name: "FormEvaluation",
+  props: ["evaluation", "docAnchorId"],
+  components: {
+    CommentEditor,
+    DropFileModal,
+    PickTemplate,
+    ListWorkflowModal,
+    DocumentActionButtonsGroup,
+  },
+  i18n,
+  data() {
+    return {
+      template: null,
+      asyncUploadOptions: {
+        maxFiles: 1,
+        maxPostSize: 15000000,
+        required: false,
+      },
+      timeSpentChoices: [
+        { text: "1 minute", value: 60 },
+        { text: "2 minutes", value: 120 },
+        { text: "3 minutes", value: 180 },
+        { text: "4 minutes", value: 240 },
+        { text: "5 minutes", value: 300 },
+        { text: "10 minutes", value: 600 },
+        { text: "15 minutes", value: 900 },
+        { text: "20 minutes", value: 1200 },
+        { text: "25 minutes", value: 1500 },
+        { text: "30 minutes", value: 1800 },
+        { text: "45 minutes", value: 2700 },
+        { text: "1 hour", value: 3600 },
+        { text: "1 hour 15 minutes", value: 4500 },
+        { text: "1 hour 30 minutes", value: 5400 },
+        { text: "1 hour 45 minutes", value: 6300 },
+        { text: "2 hours", value: 7200 },
+        { text: "2 hours 30 minutes", value: 9000 },
+        { text: "3 hours", value: 10800 },
+        { text: "3 hours 30 minutes", value: 12600 },
+        { text: "4 hours", value: 14400 },
+        { text: "4 hours 30 minutes", value: 16200 },
+        { text: "5 hours", value: 18000 },
+        { text: "5 hours 30 minutes", value: 19800 },
+        { text: "6 hours", value: 21600 },
+        { text: "6 hours 30 minutes", value: 23400 },
+        { text: "7 hours", value: 25200 },
+        { text: "7 hours 30 minutes", value: 27000 },
+        { text: "8 hours", value: 28800 },
+      ],
+    };
+  },
+  computed: {
+    ...mapState(["isPosting", "work", "me"]),
+    AmIRefferer() {
+      return !(
+        this.$store.state.work.accompanyingPeriod.user &&
+        this.$store.state.me &&
+        this.$store.state.work.accompanyingPeriod.user.id !==
+          this.$store.state.me.id
+      );
     },
-    i18n,
-    data() {
-        return {
-            template: null,
-            asyncUploadOptions: {
-                maxFiles: 1,
-                maxPostSize: 15000000,
-                required: false,
-            },
-            timeSpentChoices: [
-                { text: "1 minute", value: 60 },
-                { text: "2 minutes", value: 120 },
-                { text: "3 minutes", value: 180 },
-                { text: "4 minutes", value: 240 },
-                { text: "5 minutes", value: 300 },
-                { text: "10 minutes", value: 600 },
-                { text: "15 minutes", value: 900 },
-                { text: "20 minutes", value: 1200 },
-                { text: "25 minutes", value: 1500 },
-                { text: "30 minutes", value: 1800 },
-                { text: "45 minutes", value: 2700 },
-                { text: "1 hour", value: 3600 },
-                { text: "1 hour 15 minutes", value: 4500 },
-                { text: "1 hour 30 minutes", value: 5400 },
-                { text: "1 hour 45 minutes", value: 6300 },
-                { text: "2 hours", value: 7200 },
-                { text: "2 hours 30 minutes", value: 9000 },
-                { text: "3 hours", value: 10800 },
-                { text: "3 hours 30 minutes", value: 12600 },
-                { text: "4 hours", value: 14400 },
-                { text: "4 hours 30 minutes", value: 16200 },
-                { text: "5 hours", value: 18000 },
-                { text: "5 hours 30 minutes", value: 19800 },
-                { text: "6 hours", value: 21600 },
-                { text: "6 hours 30 minutes", value: 23400 },
-                { text: "7 hours", value: 25200 },
-                { text: "7 hours 30 minutes", value: 27000 },
-                { text: "8 hours", value: 28800 },
-            ],
-        };
+    getTemplatesAvailables() {
+      return this.$store.getters.getTemplatesAvailablesForEvaluation(
+        this.evaluation.evaluation,
+      );
     },
-    computed: {
-        ...mapState(["isPosting", "work", "me"]),
-        AmIRefferer() {
-            return !(
-                this.$store.state.work.accompanyingPeriod.user &&
-                this.$store.state.me &&
-                this.$store.state.work.accompanyingPeriod.user.id !==
-                    this.$store.state.me.id
-            );
-        },
-        getTemplatesAvailables() {
-            return this.$store.getters.getTemplatesAvailablesForEvaluation(
-                this.evaluation.evaluation,
-            );
-        },
-        canGenerate() {
-            return !this.$store.state.isPosting && this.template !== null;
-        },
-        startDate: {
-            get() {
-                console.log("evaluation", this.evaluation);
-                return this.evaluation.startDate;
-            },
-            set(v) {
-                this.$store.commit("setEvaluationStartDate", {
-                    key: this.evaluation.key,
-                    date: v,
-                });
-            },
-        },
-        endDate: {
-            get() {
-                return this.evaluation.endDate;
-            },
-            set(v) {
-                this.$store.commit("setEvaluationEndDate", {
-                    key: this.evaluation.key,
-                    date: v,
-                });
-            },
-        },
-        maxDate: {
-            get() {
-                return this.evaluation.maxDate;
-            },
-            set(v) {
-                this.$store.commit("setEvaluationMaxDate", {
-                    key: this.evaluation.key,
-                    date: v,
-                });
-            },
-        },
-        warningInterval: {
-            get() {
-                return this.evaluation.warningInterval;
-            },
-            set(v) {
-                this.$store.commit("setEvaluationWarningInterval", {
-                    key: this.evaluation.key,
-                    days: v,
-                });
-            },
-        },
-        timeSpent: {
-            get() {
-                return this.evaluation.timeSpent;
-            },
-            set(v) {
-                this.$store.commit("setEvaluationTimeSpent", {
-                    key: this.evaluation.key,
-                    time: v,
-                });
-            },
-        },
-        comment: {
-            get() {
-                return this.evaluation.comment;
-            },
-            set(v) {
-                this.$store.commit("setEvaluationComment", {
-                    key: this.evaluation.key,
-                    comment: v,
-                });
-            },
-        },
+    canGenerate() {
+      return !this.$store.state.isPosting && this.template !== null;
     },
-    methods: {
-        ISOToDatetime,
-        listAllStatus() {
-            console.log("load all status");
-            let url = `/api/`;
-            fetch(url).then((response) => {
-                if (response.ok) {
-                    return response.json();
-                }
-                throw { m: "yeeah", s: response.status, b: response.body };
-            });
-        },
-        buildEditLink(document) {
-            return (
-                `/chill/wopi/edit/${document.storedObject.uuid}?returnPath=` +
-                encodeURIComponent(
-                    window.location.pathname +
-                        window.location.search +
-                        window.location.hash,
-                )
-            );
-        },
-        submitBeforeLeaveToEditor() {
-            console.log("submit beore edit 2");
-            // empty callback
-            const callback = () => null;
-            return this.$store.dispatch("submit", callback).catch((e) => {
-                console.log(e);
-                throw e;
-            });
-        },
-        submitBeforeEdit(storedObject) {
-            const callback = (data) => {
-                let evaluation = data.accompanyingPeriodWorkEvaluations.find(
-                    (e) => e.key === this.evaluation.key,
-                );
-                let document = evaluation.documents.find(
-                    (d) => d.storedObject.id === storedObject.id,
-                );
-                //console.log('=> document', document);
-                window.location.assign(this.buildEditLink(document));
-            };
-            return this.$store.dispatch("submit", callback).catch((e) => {
-                console.log(e);
-                throw e;
-            });
-        },
-        submitBeforeGenerate({ template }) {
-            const callback = (data) => {
-                let evaluationId = data.accompanyingPeriodWorkEvaluations.find(
-                    (e) => e.key === this.evaluation.key,
-                ).id;
+    startDate: {
+      get() {
+        console.log("evaluation", this.evaluation);
+        return this.evaluation.startDate;
+      },
+      set(v) {
+        this.$store.commit("setEvaluationStartDate", {
+          key: this.evaluation.key,
+          date: v,
+        });
+      },
+    },
+    endDate: {
+      get() {
+        return this.evaluation.endDate;
+      },
+      set(v) {
+        this.$store.commit("setEvaluationEndDate", {
+          key: this.evaluation.key,
+          date: v,
+        });
+      },
+    },
+    maxDate: {
+      get() {
+        return this.evaluation.maxDate;
+      },
+      set(v) {
+        this.$store.commit("setEvaluationMaxDate", {
+          key: this.evaluation.key,
+          date: v,
+        });
+      },
+    },
+    warningInterval: {
+      get() {
+        return this.evaluation.warningInterval;
+      },
+      set(v) {
+        this.$store.commit("setEvaluationWarningInterval", {
+          key: this.evaluation.key,
+          days: v,
+        });
+      },
+    },
+    timeSpent: {
+      get() {
+        return this.evaluation.timeSpent;
+      },
+      set(v) {
+        this.$store.commit("setEvaluationTimeSpent", {
+          key: this.evaluation.key,
+          time: v,
+        });
+      },
+    },
+    comment: {
+      get() {
+        return this.evaluation.comment;
+      },
+      set(v) {
+        this.$store.commit("setEvaluationComment", {
+          key: this.evaluation.key,
+          comment: v,
+        });
+      },
+    },
+  },
+  methods: {
+    ISOToDatetime,
+    listAllStatus() {
+      console.log("load all status");
+      let url = `/api/`;
+      fetch(url).then((response) => {
+        if (response.ok) {
+          return response.json();
+        }
+        throw { m: "yeeah", s: response.status, b: response.body };
+      });
+    },
+    buildEditLink(document) {
+      return (
+        `/chill/wopi/edit/${document.storedObject.uuid}?returnPath=` +
+        encodeURIComponent(
+          window.location.pathname +
+            window.location.search +
+            window.location.hash,
+        )
+      );
+    },
+    submitBeforeLeaveToEditor() {
+      console.log("submit beore edit 2");
+      // empty callback
+      const callback = () => null;
+      return this.$store.dispatch("submit", callback).catch((e) => {
+        console.log(e);
+        throw e;
+      });
+    },
+    submitBeforeEdit(storedObject) {
+      const callback = (data) => {
+        let evaluation = data.accompanyingPeriodWorkEvaluations.find(
+          (e) => e.key === this.evaluation.key,
+        );
+        let document = evaluation.documents.find(
+          (d) => d.storedObject.id === storedObject.id,
+        );
+        //console.log('=> document', document);
+        window.location.assign(this.buildEditLink(document));
+      };
+      return this.$store.dispatch("submit", callback).catch((e) => {
+        console.log(e);
+        throw e;
+      });
+    },
+    submitBeforeGenerate({ template }) {
+      const callback = (data) => {
+        let evaluationId = data.accompanyingPeriodWorkEvaluations.find(
+          (e) => e.key === this.evaluation.key,
+        ).id;
 
-                window.location.assign(
-                    buildLink(
-                        template,
-                        evaluationId,
-                        "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluation",
-                    ),
-                );
-            };
+        window.location.assign(
+          buildLink(
+            template,
+            evaluationId,
+            "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluation",
+          ),
+        );
+      };
 
-            return this.$store.dispatch("submit", callback).catch((e) => {
-                console.log(e);
-                throw e;
-            });
-        },
-        onInputDocumentTitle(event) {
-            const id = Number(event.target.id);
-            const key = Number(event.target.dataset.key) + 1;
-            const title = event.target.value;
-            this.$store.commit("updateDocumentTitle", {
-                id: id,
-                key: key,
-                evaluationKey: this.evaluation.key,
-                title: title,
-            });
-        },
-        addDocument({ stored_object, stored_object_version, file_name }) {
-            let document = {
-                type: "accompanying_period_work_evaluation_document",
-                storedObject: stored_object,
-                title: file_name,
-            };
-            this.$store.commit("addDocument", {
-                key: this.evaluation.key,
-                document,
-                stored_object_version,
-            });
-        },
-        /**
-         * Replaces a document in the store with a new document.
-         *
-         * @param {Object} oldDocument - The document to be replaced.
-         * @param {StoredObject} storedObject - The stored object of the new document.
-         * @param {StoredObjectVersion} storedObjectVersion - The new version of the document
-         * @return {void}
-         */
-        replaceDocument(oldDocument, storedObject, storedObjectVersion) {
-            let document = {
-                type: "accompanying_period_work_evaluation_document",
-                storedObject: storedObject,
-                title: oldDocument.title,
-            };
-            this.$store.commit("replaceDocument", {
-                key: this.evaluation.key,
-                document,
-                oldDocument: oldDocument,
-                stored_object_version: storedObjectVersion,
-            });
-        },
-        removeDocument(document) {
-            if (
-                window.confirm(
-                    'Êtes-vous sûr·e de vouloir supprimer le document qui a pour titre "' +
-                        document.title +
-                        '" ?',
-                )
-            ) {
-                this.$store.commit("removeDocument", {
-                    key: this.evaluation.key,
-                    document: document,
-                });
-            }
-        },
-        duplicateDocument(document) {
-            this.$store.dispatch("duplicateDocument", {
-                evaluation_key: this.evaluation.key,
-                document: document,
-            });
-        },
-        onStatusDocumentChanged(newStatus) {
-            console.log("onStatusDocumentChanged", newStatus);
-            this.$store.commit("statusDocumentChanged", {
-                key: this.evaluation.key,
-                newStatus: newStatus,
-            });
-        },
-        goToGenerateWorkflowEvaluationDocument({ workflowName, payload }) {
-            const callback = (data) => {
-                let evaluation = data.accompanyingPeriodWorkEvaluations.find(
-                    (e) => e.key === this.evaluation.key,
-                );
-                let updatedDocument = evaluation.documents.find(
-                    (d) => d.key === payload.doc.key,
-                );
-                window.location.assign(
-                    buildLinkCreate(
-                        workflowName,
-                        "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument",
-                        updatedDocument.id,
-                    ),
-                );
-            };
-
-            return this.$store.dispatch("submit", callback).catch((e) => {
-                console.log(e);
-                throw e;
-            });
-        },
-        goToGenerateDocumentNotification(document, tos) {
-            const callback = (data) => {
-                let evaluation = data.accompanyingPeriodWorkEvaluations.find(
-                    (e) => e.key === this.evaluation.key,
-                );
-                let updatedDocument = evaluation.documents.find(
-                    (d) => d.key === document.key,
-                );
-                window.location.assign(
-                    buildLinkCreateNotification(
-                        "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument",
-                        updatedDocument.id,
-                        tos === true
-                            ? this.$store.state.work.accompanyingPeriod.user.id
-                            : null,
-                        window.location.pathname +
-                            window.location.search +
-                            window.location.hash,
-                    ),
-                );
-            };
-            return this.$store.dispatch("submit", callback).catch((e) => {
-                console.log(e);
-                throw e;
-            });
-        },
+      return this.$store.dispatch("submit", callback).catch((e) => {
+        console.log(e);
+        throw e;
+      });
     },
+    onInputDocumentTitle(event) {
+      const id = Number(event.target.id);
+      const key = Number(event.target.dataset.key) + 1;
+      const title = event.target.value;
+      this.$store.commit("updateDocumentTitle", {
+        id: id,
+        key: key,
+        evaluationKey: this.evaluation.key,
+        title: title,
+      });
+    },
+    addDocument({ stored_object, stored_object_version, file_name }) {
+      let document = {
+        type: "accompanying_period_work_evaluation_document",
+        storedObject: stored_object,
+        title: file_name,
+      };
+      this.$store.commit("addDocument", {
+        key: this.evaluation.key,
+        document,
+        stored_object_version,
+      });
+    },
+    /**
+     * Replaces a document in the store with a new document.
+     *
+     * @param {Object} oldDocument - The document to be replaced.
+     * @param {StoredObject} storedObject - The stored object of the new document.
+     * @param {StoredObjectVersion} storedObjectVersion - The new version of the document
+     * @return {void}
+     */
+    replaceDocument(oldDocument, storedObject, storedObjectVersion) {
+      let document = {
+        type: "accompanying_period_work_evaluation_document",
+        storedObject: storedObject,
+        title: oldDocument.title,
+      };
+      this.$store.commit("replaceDocument", {
+        key: this.evaluation.key,
+        document,
+        oldDocument: oldDocument,
+        stored_object_version: storedObjectVersion,
+      });
+    },
+    removeDocument(document) {
+      if (
+        window.confirm(
+          'Êtes-vous sûr·e de vouloir supprimer le document qui a pour titre "' +
+            document.title +
+            '" ?',
+        )
+      ) {
+        this.$store.commit("removeDocument", {
+          key: this.evaluation.key,
+          document: document,
+        });
+      }
+    },
+    duplicateDocument(document) {
+      this.$store.dispatch("duplicateDocument", {
+        evaluation_key: this.evaluation.key,
+        document: document,
+      });
+    },
+    onStatusDocumentChanged(newStatus) {
+      console.log("onStatusDocumentChanged", newStatus);
+      this.$store.commit("statusDocumentChanged", {
+        key: this.evaluation.key,
+        newStatus: newStatus,
+      });
+    },
+    goToGenerateWorkflowEvaluationDocument({ workflowName, payload }) {
+      const callback = (data) => {
+        let evaluation = data.accompanyingPeriodWorkEvaluations.find(
+          (e) => e.key === this.evaluation.key,
+        );
+        let updatedDocument = evaluation.documents.find(
+          (d) => d.key === payload.doc.key,
+        );
+        window.location.assign(
+          buildLinkCreate(
+            workflowName,
+            "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument",
+            updatedDocument.id,
+          ),
+        );
+      };
+
+      return this.$store.dispatch("submit", callback).catch((e) => {
+        console.log(e);
+        throw e;
+      });
+    },
+    goToGenerateDocumentNotification(document, tos) {
+      const callback = (data) => {
+        let evaluation = data.accompanyingPeriodWorkEvaluations.find(
+          (e) => e.key === this.evaluation.key,
+        );
+        let updatedDocument = evaluation.documents.find(
+          (d) => d.key === document.key,
+        );
+        window.location.assign(
+          buildLinkCreateNotification(
+            "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument",
+            updatedDocument.id,
+            tos === true
+              ? this.$store.state.work.accompanyingPeriod.user.id
+              : null,
+            window.location.pathname +
+              window.location.search +
+              window.location.hash,
+          ),
+        );
+      };
+      return this.$store.dispatch("submit", callback).catch((e) => {
+        console.log(e);
+        throw e;
+      });
+    },
+  },
 };
 </script>
 
 <style lang="scss" scoped>
 input.document-title {
-    font-weight: bold;
-    font-size: 1rem;
+  font-weight: bold;
+  font-size: 1rem;
 }
 ul.document-upload {
-    justify-content: flex-start;
+  justify-content: flex-start;
 }
 
 .bg-blink {
-    color: #050000;
-    padding: 10px;
-    display: inline-block;
-    border-radius: 5px;
-    animation: blinkingBackground 2.2s infinite;
-    animation-iteration-count: 2;
+  color: #050000;
+  padding: 10px;
+  display: inline-block;
+  border-radius: 5px;
+  animation: blinkingBackground 2.2s infinite;
+  animation-iteration-count: 2;
 }
 
 @keyframes blinkingBackground {
-    0% {
-        background-color: #ed776d;
-    }
-    50% {
-        background-color: #ffffff;
-    }
-    100% {
-        background-color: #ed776d;
-    }
+  0% {
+    background-color: #ed776d;
+  }
+  50% {
+    background-color: #ffffff;
+  }
+  100% {
+    background-color: #ed776d;
+  }
 }
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/ExportFormActionGoalResult/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/ExportFormActionGoalResult/App.vue
index 29b707842..7922362ca 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/ExportFormActionGoalResult/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/ExportFormActionGoalResult/App.vue
@@ -1,445 +1,447 @@
 <template>
-    <fieldset class="mb-3" id="actionType">
-        <div class="row">
-            <legend class="col-sm-4 col-form-label">
-                {{ $t("action.label") }}
-            </legend>
-            <div class="col-sm-8">
-                <VueMultiselect
-                    v-model="action"
-                    :options="actions.options"
-                    @select="selectAction"
-                    @remove="unselectAction"
-                    :multiple="true"
-                    :close-on-select="false"
-                    :placeholder="$t('action.placeholder')"
-                    :custom-label="formatSocialAction"
-                    track-by="id"
-                    :searchable="true"
-                />
-            </div>
-        </div>
-    </fieldset>
+  <fieldset class="mb-3" id="actionType">
+    <div class="row">
+      <legend class="col-sm-4 col-form-label">
+        {{ $t("action.label") }}
+      </legend>
+      <div class="col-sm-8">
+        <VueMultiselect
+          v-model="action"
+          :options="actions.options"
+          @select="selectAction"
+          @remove="unselectAction"
+          :multiple="true"
+          :close-on-select="false"
+          :placeholder="$t('action.placeholder')"
+          :custom-label="formatSocialAction"
+          track-by="id"
+          :searchable="true"
+        />
+      </div>
+    </div>
+  </fieldset>
 
-    <fieldset class="mb-3" id="goal">
-        <div class="row">
-            <legend class="col-sm-4 col-form-label">
-                {{ $t("goal.label") }}
-            </legend>
-            <div class="col-sm-8">
-                <VueMultiselect
-                    v-model="goal"
-                    :options="goals.options"
-                    @select="selectGoal"
-                    @remove="unselectGoal"
-                    :multiple="true"
-                    :close-on-select="false"
-                    :placeholder="$t('goal.placeholder')"
-                    label="title"
-                    :custom-label="transTitle"
-                    track-by="id"
-                    :searchable="true"
-                />
-            </div>
-        </div>
-    </fieldset>
+  <fieldset class="mb-3" id="goal">
+    <div class="row">
+      <legend class="col-sm-4 col-form-label">
+        {{ $t("goal.label") }}
+      </legend>
+      <div class="col-sm-8">
+        <VueMultiselect
+          v-model="goal"
+          :options="goals.options"
+          @select="selectGoal"
+          @remove="unselectGoal"
+          :multiple="true"
+          :close-on-select="false"
+          :placeholder="$t('goal.placeholder')"
+          label="title"
+          :custom-label="transTitle"
+          track-by="id"
+          :searchable="true"
+        />
+      </div>
+    </div>
+  </fieldset>
 
-    <fieldset class="mb-3" id="result">
-        <div class="row">
-            <legend class="col-sm-4 col-form-label">
-                {{ $t("result.label") }}
-            </legend>
-            <div class="col-sm-8">
-                <VueMultiselect
-                    v-model="result"
-                    :options="results.options"
-                    @select="selectResult"
-                    @remove="unselectResult"
-                    :multiple="true"
-                    :close-on-select="false"
-                    :placeholder="$t('result.placeholder')"
-                    label="title"
-                    :custom-label="transTitle"
-                    track-by="id"
-                    :searchable="true"
-                />
-            </div>
-        </div>
-    </fieldset>
+  <fieldset class="mb-3" id="result">
+    <div class="row">
+      <legend class="col-sm-4 col-form-label">
+        {{ $t("result.label") }}
+      </legend>
+      <div class="col-sm-8">
+        <VueMultiselect
+          v-model="result"
+          :options="results.options"
+          @select="selectResult"
+          @remove="unselectResult"
+          :multiple="true"
+          :close-on-select="false"
+          :placeholder="$t('result.placeholder')"
+          label="title"
+          :custom-label="transTitle"
+          track-by="id"
+          :searchable="true"
+        />
+      </div>
+    </div>
+  </fieldset>
 </template>
 
 <script>
 import VueMultiselect from "vue-multiselect";
 import {
-    getSocialActions,
-    getGoalByAction,
-    getResultByAction,
-    getResultByGoal,
+  getSocialActions,
+  getGoalByAction,
+  getResultByAction,
+  getResultByGoal,
 } from "./api";
 
 export default {
-    name: "App",
-    components: {
-        VueMultiselect,
-    },
-    i18n: {
-        messages: {
-            fr: {
-                action: {
-                    label: "Types d'actions",
-                    placeholder: "Choisissez une ou plusieurs actions",
-                },
-                goal: {
-                    label: "Objectifs",
-                    placeholder: "Choisissez un ou plusieurs objectifs",
-                },
-                result: {
-                    label: "Résultats",
-                    placeholder: "Choisissez un ou plusieurs résultats",
-                },
-            },
-        },
-    },
-    data() {
-        return {
-            actions: {
-                options: [], // array with multiselect options
-                value: [], // array with selected values
-                hiddenField: document.getElementById(
-                    "export_filters_social_work_type_filter_form_actionType",
-                ),
-            },
-            goals: {
-                options: [],
-                value: [],
-                hiddenField: document.getElementById(
-                    "export_filters_social_work_type_filter_form_goal",
-                ),
-            },
-            results: {
-                options: [],
-                value: [],
-                hiddenField: document.getElementById(
-                    "export_filters_social_work_type_filter_form_result",
-                ),
-            },
-        };
-    },
-    computed: {
+  name: "App",
+  components: {
+    VueMultiselect,
+  },
+  i18n: {
+    messages: {
+      fr: {
         action: {
-            get() {
-                return this.actions.value;
-            },
-            set(value) {
-                this.actions.value = value;
-                this.rebuildHiddenFieldValues("actions");
-            },
+          label: "Types d'actions",
+          placeholder: "Choisissez une ou plusieurs actions",
         },
         goal: {
-            get() {
-                return this.goals.value;
-            },
-            set(value) {
-                this.goals.value = value;
-                this.rebuildHiddenFieldValues("goals");
-            },
+          label: "Objectifs",
+          placeholder: "Choisissez un ou plusieurs objectifs",
         },
         result: {
-            get() {
-                return this.results.value;
-            },
-            set(value) {
-                this.results.value = value;
-                this.rebuildHiddenFieldValues("results");
-            },
+          label: "Résultats",
+          placeholder: "Choisissez un ou plusieurs résultats",
         },
+      },
     },
-    async mounted() {
-        await this.getSocialActionsList();
-
-        if ("" !== this.actions.hiddenField.value) {
-            const actionIds = this.actions.hiddenField.value.split(",");
-            for (const aid of actionIds) {
-                let action = this.actions.options.find(
-                    (a) => Number.parseInt(aid) === a.id,
-                );
-                if (undefined !== action) {
-                    this.action.push(action);
-                    await this.selectAction(action);
-                }
-            }
-        }
-
-        if ("" !== this.goals.hiddenField.value) {
-            const goalsIds = this.goals.hiddenField.value
-                .split(",")
-                .map((s) => Number.parseInt(s));
-            for (const gid of goalsIds) {
-                let goal = this.goals.options.find((g) => gid === g.id);
-                if (undefined !== goal) {
-                    this.goal.push(goal);
-                    await this.selectGoal(goal);
-                }
-            }
-        }
-
-        if ("" !== this.results.hiddenField.value) {
-            const resultsIds = this.results.hiddenField.value
-                .split(",")
-                .map((s) => Number.parseInt(s));
-            for (const rid of resultsIds) {
-                let result = this.results.options.find((r) => rid === r.id);
-                if (undefined !== result) {
-                    this.result.push(result);
-                }
-            }
-        }
+  },
+  data() {
+    return {
+      actions: {
+        options: [], // array with multiselect options
+        value: [], // array with selected values
+        hiddenField: document.getElementById(
+          "export_filters_social_work_type_filter_form_actionType",
+        ),
+      },
+      goals: {
+        options: [],
+        value: [],
+        hiddenField: document.getElementById(
+          "export_filters_social_work_type_filter_form_goal",
+        ),
+      },
+      results: {
+        options: [],
+        value: [],
+        hiddenField: document.getElementById(
+          "export_filters_social_work_type_filter_form_result",
+        ),
+      },
+    };
+  },
+  computed: {
+    action: {
+      get() {
+        return this.actions.value;
+      },
+      set(value) {
+        this.actions.value = value;
+        this.rebuildHiddenFieldValues("actions");
+      },
     },
-    methods: {
-        async getSocialActionsList() {
-            let actions = await getSocialActions();
-            this.actions.options = actions.toSorted(function (a, b) {
-                if (a.issue.ordering === b.issue.ordering) {
-                    if (a.ordering === b.ordering) {
-                        return 0;
-                    }
-                    if (a.ordering < b.ordering) {
-                        return -1;
-                    }
-                    return 1;
-                }
+    goal: {
+      get() {
+        return this.goals.value;
+      },
+      set(value) {
+        this.goals.value = value;
+        this.rebuildHiddenFieldValues("goals");
+      },
+    },
+    result: {
+      get() {
+        return this.results.value;
+      },
+      set(value) {
+        this.results.value = value;
+        this.rebuildHiddenFieldValues("results");
+      },
+    },
+  },
+  async mounted() {
+    await this.getSocialActionsList();
 
-                if (a.issue.ordering < b.issue.ordering) {
-                    return -1;
-                }
+    if ("" !== this.actions.hiddenField.value) {
+      const actionIds = this.actions.hiddenField.value.split(",");
+      for (const aid of actionIds) {
+        let action = this.actions.options.find(
+          (a) => Number.parseInt(aid) === a.id,
+        );
+        if (undefined !== action) {
+          this.action.push(action);
+          await this.selectAction(action);
+        }
+      }
+    }
 
-                return 1;
-            });
+    if ("" !== this.goals.hiddenField.value) {
+      const goalsIds = this.goals.hiddenField.value
+        .split(",")
+        .map((s) => Number.parseInt(s));
+      for (const gid of goalsIds) {
+        let goal = this.goals.options.find((g) => gid === g.id);
+        if (undefined !== goal) {
+          this.goal.push(goal);
+          await this.selectGoal(goal);
+        }
+      }
+    }
 
+    if ("" !== this.results.hiddenField.value) {
+      const resultsIds = this.results.hiddenField.value
+        .split(",")
+        .map((s) => Number.parseInt(s));
+      for (const rid of resultsIds) {
+        let result = this.results.options.find((r) => rid === r.id);
+        if (undefined !== result) {
+          this.result.push(result);
+        }
+      }
+    }
+  },
+  methods: {
+    async getSocialActionsList() {
+      let actions = await getSocialActions();
+      this.actions.options = actions.toSorted(function (a, b) {
+        if (a.issue.ordering === b.issue.ordering) {
+          if (a.ordering === b.ordering) {
+            return 0;
+          }
+          if (a.ordering < b.ordering) {
+            return -1;
+          }
+          return 1;
+        }
+
+        if (a.issue.ordering < b.issue.ordering) {
+          return -1;
+        }
+
+        return 1;
+      });
+
+      return Promise.resolve();
+    },
+
+    formatSocialAction({ text, issue }) {
+      return text + " (" + issue.text + ")";
+    },
+
+    /**
+     * Select/unselect in Action Multiselect
+     * @param value
+     */
+    async selectAction(value) {
+      //console.log('----'); console.log('select action', value.id);
+      let children = this.getChildrensFromParent(value);
+      this.addSelectedElement("actions", children);
+
+      let parentAndChildren = [...[value], ...children];
+      const promises = [];
+      parentAndChildren.forEach((elem) => {
+        promises.push(
+          getGoalByAction(elem.id).then((goals) => {
+            this.addElementInData("goals", goals);
             return Promise.resolve();
-        },
-
-        formatSocialAction({ text, issue }) {
-            return text + " (" + issue.text + ")";
-        },
-
-        /**
-         * Select/unselect in Action Multiselect
-         * @param value
-         */
-        async selectAction(value) {
-            //console.log('----'); console.log('select action', value.id);
-            let children = this.getChildrensFromParent(value);
-            this.addSelectedElement("actions", children);
-
-            let parentAndChildren = [...[value], ...children];
-            const promises = [];
-            parentAndChildren.forEach((elem) => {
-                promises.push(
-                    getGoalByAction(elem.id).then((goals) => {
-                        this.addElementInData("goals", goals);
-                        return Promise.resolve();
-                    }),
-                );
-                promises.push(
-                    getResultByAction(elem.id).then((results) => {
-                        this.addElementInData("results", results);
-                        return Promise.resolve();
-                    }),
-                );
-            });
-
-            await Promise.all(promises);
+          }),
+        );
+        promises.push(
+          getResultByAction(elem.id).then((results) => {
+            this.addElementInData("results", results);
             return Promise.resolve();
-        },
+          }),
+        );
+      });
 
-        unselectAction(value) {
-            getGoalByAction(value.id).then((goals) => {
-                [this.results.options, this.results.value] =
-                    this.removeElementInData("goals", goals);
-            });
-            getResultByAction(value.id).then((results) => {
-                [this.results.options, this.results.value] =
-                    this.removeElementInData("results", results);
-            });
-        },
-
-        /**
-         * Select/unselect in Goal Multiselect
-         * @param value
-         */
-        async selectGoal(value) {
-            return getResultByGoal(value.id).then((results) => {
-                this.addElementInData("results", results);
-            });
-        },
-
-        unselectGoal(value) {
-            getResultByGoal(value.id).then(
-                (results) =>
-                    ([this.results.options, this.results.value] =
-                        this.removeElementInData("results", results)),
-            );
-        },
-
-        // selectResult(value) {
-        //console.log('----'); console.log('select result', value.id);
-        // },
-
-        // unselectResult(value) {
-        //console.log('----'); console.log('unselect result', value.id);
-        // },
-
-        /**
-         * Choose parent action will involve retaining the "children" actions.
-         * @param value
-         * @return array
-         */
-        getChildrensFromParent(value) {
-            if (null === value.parent) {
-                let excludeParent = this.actions.options.filter(
-                    (o) => o.parent !== null,
-                );
-                let children = excludeParent.filter(
-                    (o) => o.parent.id === value.id,
-                );
-                //console.log("get childrens", children.map(e => e.id));
-                return children;
-            }
-            return [];
-        },
-
-        /**
-         * Add response elements in data target
-         * @param target string -> 'actions', 'goals' or 'results'
-         * @param response array of objects with fetch results
-         */
-        addElementInData(target, response) {
-            let data = this[target];
-            let dump = [];
-            response.forEach((elem) => {
-                let found = data.options.some((e) => e.id === elem.id);
-                if (!found) {
-                    data.options.push(elem);
-                    dump.push(elem.id);
-                }
-            });
-            if (dump.length > 0) {
-                //console.log('push ' + dump.length + ' elems in', target, dump);
-            }
-            data.options.sort();
-        },
-
-        /**
-         * Remove response elements from data target
-         * @param target string -> 'actions', 'goals' or 'results'
-         * @param response array of objects with fetch results
-         * @returns data.<target>.options
-         */
-        removeElementInData(target, response) {
-            let data = this[target];
-            let dump = [];
-            response.forEach((elem) => {
-                let found = data.options.some((e) => e.id === elem.id);
-                if (found) {
-                    data.options = data.options.filter((e) => e.id !== elem.id);
-                    dump.push(elem.id);
-
-                    this.removeSelectedElement(target, elem);
-                }
-            });
-            if (dump.length > 0) {
-                //console.log('remove ' + dump.length + ' elems from ' + target + ' options', dump);
-            }
-            return [data.options, data.value];
-        },
-
-        /**
-         *
-         * @param target
-         * @param elements
-         */
-        addSelectedElement(target, elements) {
-            let data = this[target];
-            let dump = [];
-            elements.forEach((elem) => {
-                let selected = data.value.some((e) => e.id === elem.id);
-                if (!selected) {
-                    data.value.push(elem);
-                    dump.push(elem.id);
-
-                    // add in hiddenField
-                    this.rebuildHiddenFieldValues(target);
-                }
-            });
-            if (dump.length > 0) {
-                //console.log('add ' + dump.length + ' selected elems in', target, dump);
-            }
-        },
-
-        /**
-         * Remove element from selected and from hiddenField
-         * @param target
-         * @param elem
-         */
-        removeSelectedElement(target, elem) {
-            let data = this[target];
-            let selected = data.value.some((e) => e.id === elem.id);
-            if (selected) {
-                // remove from selected
-                data.value = data.value.filter((e) => e.id !== elem.id);
-                //console.log('remove ' + elem.id + ' from selected ' + target);
-
-                // remove from hiddenField
-                this.rebuildHiddenFieldValues(target);
-
-                // in any cases, remove should be recursive
-                this.unselectToNextField(target, elem);
-            }
-        },
-
-        /**
-         * When unselect Action, it could remove elements in goals multiselect.
-         * In that case, we have to unselect Goal to remove elements in results too.
-         * @param target
-         * @param elem
-         */
-        unselectToNextField(target, elem) {
-            if (target === "goals") {
-                //console.log('!!!! target is goal: unselect goal', elem.id);
-                this.unselectGoal(elem);
-                //console.log('!!!! done');
-            }
-        },
-
-        /**
-         * Rebuild values serie (string) in target HiddenField
-         * @param target
-         */
-        rebuildHiddenFieldValues(target) {
-            let data = this[target];
-            //console.log('rebuild hiddenFields ' + target + ' values :');
-            data.hiddenField.value = ""; // reset
-            data.value.forEach((elem) => {
-                data.hiddenField.value = this.addIdToValue(
-                    data.hiddenField.value,
-                    elem.id,
-                );
-            });
-            //console.log(data.hiddenField);
-        },
-
-        addIdToValue(string, id) {
-            let array = string ? string.split(",") : [];
-            array.push(id.toString());
-            let str = array.join();
-            return str;
-        },
-
-        transTitle({ title }) {
-            return title.fr; //TODO multilang
-        },
+      await Promise.all(promises);
+      return Promise.resolve();
     },
+
+    unselectAction(value) {
+      getGoalByAction(value.id).then((goals) => {
+        [this.results.options, this.results.value] = this.removeElementInData(
+          "goals",
+          goals,
+        );
+      });
+      getResultByAction(value.id).then((results) => {
+        [this.results.options, this.results.value] = this.removeElementInData(
+          "results",
+          results,
+        );
+      });
+    },
+
+    /**
+     * Select/unselect in Goal Multiselect
+     * @param value
+     */
+    async selectGoal(value) {
+      return getResultByGoal(value.id).then((results) => {
+        this.addElementInData("results", results);
+      });
+    },
+
+    unselectGoal(value) {
+      getResultByGoal(value.id).then(
+        (results) =>
+          ([this.results.options, this.results.value] =
+            this.removeElementInData("results", results)),
+      );
+    },
+
+    // selectResult(value) {
+    //console.log('----'); console.log('select result', value.id);
+    // },
+
+    // unselectResult(value) {
+    //console.log('----'); console.log('unselect result', value.id);
+    // },
+
+    /**
+     * Choose parent action will involve retaining the "children" actions.
+     * @param value
+     * @return array
+     */
+    getChildrensFromParent(value) {
+      if (null === value.parent) {
+        let excludeParent = this.actions.options.filter(
+          (o) => o.parent !== null,
+        );
+        let children = excludeParent.filter((o) => o.parent.id === value.id);
+        //console.log("get childrens", children.map(e => e.id));
+        return children;
+      }
+      return [];
+    },
+
+    /**
+     * Add response elements in data target
+     * @param target string -> 'actions', 'goals' or 'results'
+     * @param response array of objects with fetch results
+     */
+    addElementInData(target, response) {
+      let data = this[target];
+      let dump = [];
+      response.forEach((elem) => {
+        let found = data.options.some((e) => e.id === elem.id);
+        if (!found) {
+          data.options.push(elem);
+          dump.push(elem.id);
+        }
+      });
+      if (dump.length > 0) {
+        //console.log('push ' + dump.length + ' elems in', target, dump);
+      }
+      data.options.sort();
+    },
+
+    /**
+     * Remove response elements from data target
+     * @param target string -> 'actions', 'goals' or 'results'
+     * @param response array of objects with fetch results
+     * @returns data.<target>.options
+     */
+    removeElementInData(target, response) {
+      let data = this[target];
+      let dump = [];
+      response.forEach((elem) => {
+        let found = data.options.some((e) => e.id === elem.id);
+        if (found) {
+          data.options = data.options.filter((e) => e.id !== elem.id);
+          dump.push(elem.id);
+
+          this.removeSelectedElement(target, elem);
+        }
+      });
+      if (dump.length > 0) {
+        //console.log('remove ' + dump.length + ' elems from ' + target + ' options', dump);
+      }
+      return [data.options, data.value];
+    },
+
+    /**
+     *
+     * @param target
+     * @param elements
+     */
+    addSelectedElement(target, elements) {
+      let data = this[target];
+      let dump = [];
+      elements.forEach((elem) => {
+        let selected = data.value.some((e) => e.id === elem.id);
+        if (!selected) {
+          data.value.push(elem);
+          dump.push(elem.id);
+
+          // add in hiddenField
+          this.rebuildHiddenFieldValues(target);
+        }
+      });
+      if (dump.length > 0) {
+        //console.log('add ' + dump.length + ' selected elems in', target, dump);
+      }
+    },
+
+    /**
+     * Remove element from selected and from hiddenField
+     * @param target
+     * @param elem
+     */
+    removeSelectedElement(target, elem) {
+      let data = this[target];
+      let selected = data.value.some((e) => e.id === elem.id);
+      if (selected) {
+        // remove from selected
+        data.value = data.value.filter((e) => e.id !== elem.id);
+        //console.log('remove ' + elem.id + ' from selected ' + target);
+
+        // remove from hiddenField
+        this.rebuildHiddenFieldValues(target);
+
+        // in any cases, remove should be recursive
+        this.unselectToNextField(target, elem);
+      }
+    },
+
+    /**
+     * When unselect Action, it could remove elements in goals multiselect.
+     * In that case, we have to unselect Goal to remove elements in results too.
+     * @param target
+     * @param elem
+     */
+    unselectToNextField(target, elem) {
+      if (target === "goals") {
+        //console.log('!!!! target is goal: unselect goal', elem.id);
+        this.unselectGoal(elem);
+        //console.log('!!!! done');
+      }
+    },
+
+    /**
+     * Rebuild values serie (string) in target HiddenField
+     * @param target
+     */
+    rebuildHiddenFieldValues(target) {
+      let data = this[target];
+      //console.log('rebuild hiddenFields ' + target + ' values :');
+      data.hiddenField.value = ""; // reset
+      data.value.forEach((elem) => {
+        data.hiddenField.value = this.addIdToValue(
+          data.hiddenField.value,
+          elem.id,
+        );
+      });
+      //console.log(data.hiddenField);
+    },
+
+    addIdToValue(string, id) {
+      let array = string ? string.split(",") : [];
+      array.push(id.toString());
+      let str = array.join();
+      return str;
+    },
+
+    transTitle({ title }) {
+      return title.fr; //TODO multilang
+    },
+  },
 };
 </script>
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/App.vue
index b8e8ee8c4..a58b8a98a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/App.vue
@@ -1,53 +1,53 @@
 <template>
-    <ol class="breadcrumb">
-        <li
-            v-for="s in steps"
-            :key="s"
-            class="breadcrumb-item"
-            :class="{ active: step === s }"
-        >
-            {{ $t("household_members_editor.app.steps." + s) }}
-        </li>
-    </ol>
-    <concerned v-if="step === 'concerned'" />
-    <household v-if="step === 'household'" @ready-to-go="goToNext" />
-    <household-address v-if="step === 'household_address'" />
-    <positioning v-if="step === 'positioning'" />
-    <dates v-if="step === 'confirm'" />
-    <confirmation v-if="step === 'confirm'" />
+  <ol class="breadcrumb">
+    <li
+      v-for="s in steps"
+      :key="s"
+      class="breadcrumb-item"
+      :class="{ active: step === s }"
+    >
+      {{ $t("household_members_editor.app.steps." + s) }}
+    </li>
+  </ol>
+  <concerned v-if="step === 'concerned'" />
+  <household v-if="step === 'household'" @ready-to-go="goToNext" />
+  <household-address v-if="step === 'household_address'" />
+  <positioning v-if="step === 'positioning'" />
+  <dates v-if="step === 'confirm'" />
+  <confirmation v-if="step === 'confirm'" />
 
-    <ul class="record_actions sticky-form-buttons">
-        <li class="cancel" v-if="step !== 'concerned'">
-            <button class="btn btn-cancel" @click="goToPrevious">
-                {{ $t("household_members_editor.app.previous") }}
-            </button>
-        </li>
-        <li class="cancel" v-else-if="hasReturnPath">
-            <button class="btn btn-cancel" @click="goToPrevious">
-                {{ $t("household_members_editor.app.cancel") }}
-            </button>
-        </li>
-        <li v-if="step !== 'confirm'">
-            <button
-                class="btn btn-action"
-                @click="goToNext"
-                :disabled="!isNextAllowed"
-            >
-                {{ $t("household_members_editor.app.next") }}&nbsp;<i
-                    class="fa fa-arrow-right"
-                />
-            </button>
-        </li>
-        <li v-else>
-            <button
-                class="btn btn-save"
-                @click="confirm"
-                :disabled="hasWarnings || !lastStepIsSaveAllowed"
-            >
-                {{ $t("household_members_editor.app.save") }}
-            </button>
-        </li>
-    </ul>
+  <ul class="record_actions sticky-form-buttons">
+    <li class="cancel" v-if="step !== 'concerned'">
+      <button class="btn btn-cancel" @click="goToPrevious">
+        {{ $t("household_members_editor.app.previous") }}
+      </button>
+    </li>
+    <li class="cancel" v-else-if="hasReturnPath">
+      <button class="btn btn-cancel" @click="goToPrevious">
+        {{ $t("household_members_editor.app.cancel") }}
+      </button>
+    </li>
+    <li v-if="step !== 'confirm'">
+      <button
+        class="btn btn-action"
+        @click="goToNext"
+        :disabled="!isNextAllowed"
+      >
+        {{ $t("household_members_editor.app.next") }}&nbsp;<i
+          class="fa fa-arrow-right"
+        />
+      </button>
+    </li>
+    <li v-else>
+      <button
+        class="btn btn-save"
+        @click="confirm"
+        :disabled="hasWarnings || !lastStepIsSaveAllowed"
+      >
+        {{ $t("household_members_editor.app.save") }}
+      </button>
+    </li>
+  </ul>
 </template>
 
 <script>
@@ -60,123 +60,123 @@ import Confirmation from "./components/Confirmation.vue";
 import Positioning from "./components/Positioning";
 
 export default {
-    name: "App",
-    components: {
-        Positioning,
-        Concerned,
-        Household,
-        HouseholdAddress,
-        Dates,
-        Confirmation,
+  name: "App",
+  components: {
+    Positioning,
+    Concerned,
+    Household,
+    HouseholdAddress,
+    Dates,
+    Confirmation,
+  },
+  data() {
+    return {
+      step: "concerned",
+    };
+  },
+  computed: {
+    ...mapState({
+      hasWarnings: (state) =>
+        state.warnings.length > 0 || state.errors.length > 0,
+    }),
+    steps() {
+      let s = ["concerned", "household"];
+
+      if (this.$store.getters.isHouseholdNew) {
+        s.push("household_address");
+      }
+
+      if (!this.$store.getters.isModeLeave) {
+        s.push("positioning");
+      }
+
+      s.push("confirm");
+
+      return s;
     },
-    data() {
-        return {
-            step: "concerned",
-        };
+    hasReturnPath() {
+      let params = new URLSearchParams(window.location.search);
+
+      return params.has("returnPath");
     },
-    computed: {
-        ...mapState({
-            hasWarnings: (state) =>
-                state.warnings.length > 0 || state.errors.length > 0,
-        }),
-        steps() {
-            let s = ["concerned", "household"];
+    // return true if the next step is allowed
+    isNextAllowed() {
+      switch (this.$data.step) {
+        case "concerned":
+          return this.$store.state.concerned.length > 0;
+        case "household":
+          return this.$store.state.mode !== null;
+        case "household_address":
+          return (
+            this.$store.getters.hasHouseholdAddress ||
+            this.$store.getters.isHouseholdForceNoAddress
+          );
+        case "positioning":
+          return (
+            this.$store.getters.hasHouseholdOrLeave &&
+            this.$store.getters.hasPersonsWellPositionnated
+          );
+      }
 
-            if (this.$store.getters.isHouseholdNew) {
-                s.push("household_address");
-            }
-
-            if (!this.$store.getters.isModeLeave) {
-                s.push("positioning");
-            }
-
-            s.push("confirm");
-
-            return s;
-        },
-        hasReturnPath() {
-            let params = new URLSearchParams(window.location.search);
-
-            return params.has("returnPath");
-        },
-        // return true if the next step is allowed
-        isNextAllowed() {
-            switch (this.$data.step) {
-                case "concerned":
-                    return this.$store.state.concerned.length > 0;
-                case "household":
-                    return this.$store.state.mode !== null;
-                case "household_address":
-                    return (
-                        this.$store.getters.hasHouseholdAddress ||
-                        this.$store.getters.isHouseholdForceNoAddress
-                    );
-                case "positioning":
-                    return (
-                        this.$store.getters.hasHouseholdOrLeave &&
-                        this.$store.getters.hasPersonsWellPositionnated
-                    );
-            }
-
-            return false;
-        },
-        lastStepIsSaveAllowed() {
-            let r =
-                !this.$store.getters.isHouseholdNew ||
-                (this.$store.state.numberOfChildren !== null &&
-                    this.$store.state.householdCompositionType !== null);
-            console.log("is saved allowed ?", r);
-
-            return r;
-        },
+      return false;
     },
-    methods: {
-        goToNext() {
-            console.log("go to next");
-            switch (this.$data.step) {
-                case "concerned":
-                    this.$data.step = "household";
-                    break;
-                case "household":
-                    if (this.$store.getters.isHouseholdNew) {
-                        this.$data.step = "household_address";
-                        break;
-                    } else if (this.$store.getters.isModeLeave) {
-                        this.$data.step = "confirm";
-                        break;
-                    } else {
-                        this.$data.step = "positioning";
-                        break;
-                    }
-                case "household_address":
-                    this.$data.step = "positioning";
-                    break;
-                case "positioning":
-                    this.$data.step = "confirm";
-                    break;
-            }
-        },
-        goToPrevious() {
-            if (this.$data.step === "concerned") {
-                let params = new URLSearchParams(window.location.search);
-                if (params.has("returnPath")) {
-                    window.location.replace(params.get("returnPath"));
-                } else {
-                    return;
-                }
-            }
+    lastStepIsSaveAllowed() {
+      let r =
+        !this.$store.getters.isHouseholdNew ||
+        (this.$store.state.numberOfChildren !== null &&
+          this.$store.state.householdCompositionType !== null);
+      console.log("is saved allowed ?", r);
 
-            let s = this.steps;
-            let index = s.indexOf(this.$data.step);
-            if (s[index - 1] === undefined) {
-                throw Error("step not found");
-            }
-
-            this.$data.step = s[index - 1];
-        },
-        confirm() {
-            this.$store.dispatch("confirm");
-        },
+      return r;
     },
+  },
+  methods: {
+    goToNext() {
+      console.log("go to next");
+      switch (this.$data.step) {
+        case "concerned":
+          this.$data.step = "household";
+          break;
+        case "household":
+          if (this.$store.getters.isHouseholdNew) {
+            this.$data.step = "household_address";
+            break;
+          } else if (this.$store.getters.isModeLeave) {
+            this.$data.step = "confirm";
+            break;
+          } else {
+            this.$data.step = "positioning";
+            break;
+          }
+        case "household_address":
+          this.$data.step = "positioning";
+          break;
+        case "positioning":
+          this.$data.step = "confirm";
+          break;
+      }
+    },
+    goToPrevious() {
+      if (this.$data.step === "concerned") {
+        let params = new URLSearchParams(window.location.search);
+        if (params.has("returnPath")) {
+          window.location.replace(params.get("returnPath"));
+        } else {
+          return;
+        }
+      }
+
+      let s = this.steps;
+      let index = s.indexOf(this.$data.step);
+      if (s[index - 1] === undefined) {
+        throw Error("step not found");
+      }
+
+      this.$data.step = s[index - 1];
+    },
+    confirm() {
+      this.$store.dispatch("confirm");
+    },
+  },
 };
 </script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue
index d4bacd855..ae422f150 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Concerned.vue
@@ -1,88 +1,74 @@
 <template>
-    <h2 class="mt-4">
-        {{ $t("household_members_editor.concerned.title") }}
-    </h2>
+  <h2 class="mt-4">
+    {{ $t("household_members_editor.concerned.title") }}
+  </h2>
 
-    <div v-if="noPerson">
-        <div class="alert alert-info">
-            {{
-                $t("household_members_editor.concerned.add_at_least_onePerson")
-            }}
-        </div>
+  <div v-if="noPerson">
+    <div class="alert alert-info">
+      {{ $t("household_members_editor.concerned.add_at_least_onePerson") }}
     </div>
-    <div v-else>
-        <p>
-            {{
-                $t("household_members_editor.concerned.persons_will_be_moved")
-            }}&nbsp;:
-        </p>
+  </div>
+  <div v-else>
+    <p>
+      {{
+        $t("household_members_editor.concerned.persons_will_be_moved")
+      }}&nbsp;:
+    </p>
 
-        <ul class="list-suggest remove-items inline">
-            <li
-                v-for="c in concerned"
-                :key="c.person.id"
-                @click="removeConcerned(c)"
-            >
-                <span><person-text :person="c.person" /></span>
-            </li>
-        </ul>
-
-        <div
-            class="alert alert-info"
-            v-if="concernedPersonsWithHouseholds.length > 0"
-        >
-            <p>
-                {{
-                    $t(
-                        "household_members_editor.concerned.persons_with_household",
-                    )
-                }}
-            </p>
-            <ul v-for="c in concernedPersonsWithHouseholds" :key="c.person.id">
-                <li>
-                    {{ c.person.text }}
-                    {{
-                        $t(
-                            "household_members_editor.concerned.already_belongs_to_household",
-                        )
-                    }}
-                    <a
-                        target="_blank"
-                        :href="
-                            this.makeHouseholdLink(
-                                c.person.current_household_id,
-                            )
-                        "
-                        >{{ c.person.current_household_id }}</a
-                    >.
-                </li>
-            </ul>
-        </div>
-    </div>
-
-    <ul class="record_actions">
-        <li class="add-persons">
-            <add-persons
-                button-title="household_members_editor.concerned.add_persons"
-                modal-title="household_members_editor.concerned.search"
-                :key="addPersons.key"
-                :options="addPersons.options"
-                @add-new-persons="addNewPersons"
-                ref="addPersons"
-            >
-                <!-- to cast child method -->
-            </add-persons>
-        </li>
+    <ul class="list-suggest remove-items inline">
+      <li v-for="c in concerned" :key="c.person.id" @click="removeConcerned(c)">
+        <span><person-text :person="c.person" /></span>
+      </li>
     </ul>
+
+    <div
+      class="alert alert-info"
+      v-if="concernedPersonsWithHouseholds.length > 0"
+    >
+      <p>
+        {{ $t("household_members_editor.concerned.persons_with_household") }}
+      </p>
+      <ul v-for="c in concernedPersonsWithHouseholds" :key="c.person.id">
+        <li>
+          {{ c.person.text }}
+          {{
+            $t(
+              "household_members_editor.concerned.already_belongs_to_household",
+            )
+          }}
+          <a
+            target="_blank"
+            :href="this.makeHouseholdLink(c.person.current_household_id)"
+            >{{ c.person.current_household_id }}</a
+          >.
+        </li>
+      </ul>
+    </div>
+  </div>
+
+  <ul class="record_actions">
+    <li class="add-persons">
+      <add-persons
+        button-title="household_members_editor.concerned.add_persons"
+        modal-title="household_members_editor.concerned.search"
+        :key="addPersons.key"
+        :options="addPersons.options"
+        @add-new-persons="addNewPersons"
+        ref="addPersons"
+      >
+        <!-- to cast child method -->
+      </add-persons>
+    </li>
+  </ul>
 </template>
 
 <style lang="scss">
 .move_to {
-    .move_hint {
-        text-align: center;
-        display: inline-block;
-        padding: 0.4rem 0.5rem;
-    }
+  .move_hint {
+    text-align: center;
+    display: inline-block;
+    padding: 0.4rem 0.5rem;
+  }
 }
 </style>
 
@@ -92,62 +78,61 @@ import AddPersons from "ChillPersonAssets/vuejs/_components/AddPersons.vue";
 import PersonText from "ChillPersonAssets/vuejs/_components/Entity/PersonText.vue";
 
 export default {
-    name: "Concerned",
-    components: {
-        AddPersons,
-        PersonText,
+  name: "Concerned",
+  components: {
+    AddPersons,
+    PersonText,
+  },
+  computed: {
+    ...mapState(["concerned", "household"]),
+    ...mapGetters(["persons"]),
+    noPerson() {
+      return this.$store.getters.persons.length === 0;
     },
-    computed: {
-        ...mapState(["concerned", "household"]),
-        ...mapGetters(["persons"]),
-        noPerson() {
-            return this.$store.getters.persons.length === 0;
-        },
-        concernedPersonsWithHouseholds() {
-            if (this.$store.state.household) {
-                return this.$store.state.concerned.filter(
-                    (c) =>
-                        c.person.current_household_id !== null &&
-                        c.person.current_household_id !==
-                            this.$store.state.household.id,
-                );
-            } else {
-                return [];
-            }
-        },
+    concernedPersonsWithHouseholds() {
+      if (this.$store.state.household) {
+        return this.$store.state.concerned.filter(
+          (c) =>
+            c.person.current_household_id !== null &&
+            c.person.current_household_id !== this.$store.state.household.id,
+        );
+      } else {
+        return [];
+      }
     },
-    data() {
-        return {
-            addPersons: {
-                key: "household_members_editor_concerned",
-                options: {
-                    type: ["person"],
-                    priority: null,
-                    uniq: false,
-                },
-            },
-        };
-    },
-    methods: {
-        addNewPersons({ selected, modal }) {
-            selected.forEach(function (item) {
-                this.$store.dispatch("addConcerned", item.result);
-            }, this);
-            this.$refs.addPersons.resetSearch(); // to cast child method
-            modal.showModal = false;
+  },
+  data() {
+    return {
+      addPersons: {
+        key: "household_members_editor_concerned",
+        options: {
+          type: ["person"],
+          priority: null,
+          uniq: false,
         },
-        removeConcerned(concerned) {
-            console.log("removedconcerned", concerned);
+      },
+    };
+  },
+  methods: {
+    addNewPersons({ selected, modal }) {
+      selected.forEach(function (item) {
+        this.$store.dispatch("addConcerned", item.result);
+      }, this);
+      this.$refs.addPersons.resetSearch(); // to cast child method
+      modal.showModal = false;
+    },
+    removeConcerned(concerned) {
+      console.log("removedconcerned", concerned);
 
-            if (!concerned.allowRemove) {
-                return;
-            }
+      if (!concerned.allowRemove) {
+        return;
+      }
 
-            this.$store.dispatch("removePerson", concerned.person);
-        },
-        makeHouseholdLink(id) {
-            return `/fr/person/household/${id}/summary`;
-        },
+      this.$store.dispatch("removePerson", concerned.person);
     },
+    makeHouseholdLink(id) {
+      return `/fr/person/household/${id}/summary`;
+    },
+  },
 };
 </script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Confirmation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Confirmation.vue
index 902e95648..5441bc1af 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Confirmation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Confirmation.vue
@@ -1,20 +1,20 @@
 <template>
-    <div v-if="hasWarning" class="alert alert-warning">
-        {{ $t("household_members_editor.confirmation.there_are_warnings") }}
-    </div>
+  <div v-if="hasWarning" class="alert alert-warning">
+    {{ $t("household_members_editor.confirmation.there_are_warnings") }}
+  </div>
 
-    <p v-if="hasWarning">
-        {{ $t("household_members_editor.confirmation.check_those_items") }}
-    </p>
+  <p v-if="hasWarning">
+    {{ $t("household_members_editor.confirmation.check_those_items") }}
+  </p>
 
-    <ul>
-        <li v-for="(msg, i) in warnings" class="warning" :key="i">
-            {{ $t(msg.m, msg.a) }}
-        </li>
-        <li v-for="(msg, i) in errors" class="error" :key="i">
-            {{ msg }}
-        </li>
-    </ul>
+  <ul>
+    <li v-for="(msg, i) in warnings" class="warning" :key="i">
+      {{ $t(msg.m, msg.a) }}
+    </li>
+    <li v-for="(msg, i) in errors" class="error" :key="i">
+      {{ msg }}
+    </li>
+  </ul>
 </template>
 
 <style scoped lang="scss"></style>
@@ -23,14 +23,14 @@
 import { mapState } from "vuex";
 
 export default {
-    name: "Confirmation",
-    computed: {
-        ...mapState({
-            hasWarnings: (state) =>
-                state.warnings.length > 0 || state.errors.length > 0,
-            warnings: (state) => state.warnings,
-            errors: (state) => state.errors,
-        }),
-    },
+  name: "Confirmation",
+  computed: {
+    ...mapState({
+      hasWarnings: (state) =>
+        state.warnings.length > 0 || state.errors.length > 0,
+      warnings: (state) => state.warnings,
+      errors: (state) => state.errors,
+    }),
+  },
 };
 </script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/CurrentHousehold.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/CurrentHousehold.vue
index 34002972c..3ae8c1ab6 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/CurrentHousehold.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/CurrentHousehold.vue
@@ -1,37 +1,35 @@
 <template>
-    <div class="flex-table mb-5" v-if="hasHousehold">
-        <div class="item-bloc">
-            <household-render-box :household="fakeHouseholdWithConcerned" />
-        </div>
+  <div class="flex-table mb-5" v-if="hasHousehold">
+    <div class="item-bloc">
+      <household-render-box :household="fakeHouseholdWithConcerned" />
     </div>
-    <div class="flex-table" v-if="isModeLeave">
-        <div class="item-bloc">
-            <section>
-                <div class="item-row">
-                    <div class="item-col">
-                        <div class="h4">
-                            <span class="fa-stack fa-lg">
-                                <i class="fa fa-home fa-stack-1x" />
-                                <i class="fa fa-ban fa-stack-2x text-danger" />
-                            </span>
-                            {{
-                                $t(
-                                    "household_members_editor.household.leave_without_household",
-                                )
-                            }}
-                        </div>
-                    </div>
-                </div>
-                <div class="item-row">
-                    {{
-                        $t(
-                            "household_members_editor.household.will_leave_any_household_explanation",
-                        )
-                    }}
-                </div>
-            </section>
+  </div>
+  <div class="flex-table" v-if="isModeLeave">
+    <div class="item-bloc">
+      <section>
+        <div class="item-row">
+          <div class="item-col">
+            <div class="h4">
+              <span class="fa-stack fa-lg">
+                <i class="fa fa-home fa-stack-1x" />
+                <i class="fa fa-ban fa-stack-2x text-danger" />
+              </span>
+              {{
+                $t("household_members_editor.household.leave_without_household")
+              }}
+            </div>
+          </div>
         </div>
+        <div class="item-row">
+          {{
+            $t(
+              "household_members_editor.household.will_leave_any_household_explanation",
+            )
+          }}
+        </div>
+      </section>
     </div>
+  </div>
 </template>
 
 <script>
@@ -39,17 +37,17 @@ import { mapGetters } from "vuex";
 import HouseholdRenderBox from "ChillPersonAssets/vuejs/_components/Entity/HouseholdRenderBox.vue";
 
 export default {
-    name: "CurrentHousehold",
-    components: {
-        HouseholdRenderBox,
-    },
-    computed: {
-        ...mapGetters([
-            "hasHousehold",
-            "fakeHouseholdWithConcerned",
-            "isModeLeave",
-        ]),
-    },
+  name: "CurrentHousehold",
+  components: {
+    HouseholdRenderBox,
+  },
+  computed: {
+    ...mapGetters([
+      "hasHousehold",
+      "fakeHouseholdWithConcerned",
+      "isModeLeave",
+    ]),
+  },
 };
 </script>
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Dates.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Dates.vue
index 8757f23bc..1139d2fe9 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Dates.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Dates.vue
@@ -1,83 +1,83 @@
 <template>
-    <current-household />
+  <current-household />
 
-    <h2>{{ $t("household_members_editor.dates.dates_title") }}</h2>
+  <h2>{{ $t("household_members_editor.dates.dates_title") }}</h2>
 
+  <div class="mb-3 row">
+    <label for="start_date" class="col-form-label col-sm-4 required">
+      {{ $t("household_members_editor.dates.start_date") }}
+    </label>
+    <div class="col-sm-8">
+      <input type="date" v-model="startDate" class="form-control" />
+    </div>
+  </div>
+
+  <div v-if="this.isHouseholdNew">
+    <h2>{{ $t("household_members_editor.composition.composition") }}</h2>
     <div class="mb-3 row">
-        <label for="start_date" class="col-form-label col-sm-4 required">
-            {{ $t("household_members_editor.dates.start_date") }}
-        </label>
-        <div class="col-sm-8">
-            <input type="date" v-model="startDate" class="form-control" />
-        </div>
+      <label class="col-form-label col-sm-4 required">{{
+        $t("household_members_editor.composition.household_composition")
+      }}</label>
+      <div class="col-sm-8">
+        <select
+          v-model="householdCompositionType"
+          class="form-select form-control"
+        >
+          <option
+            v-for="t in householdCompositionTypes"
+            :key="t.id"
+            :value="t.id"
+          >
+            {{ localizeString(t.label) }}
+          </option>
+        </select>
+      </div>
     </div>
-
-    <div v-if="this.isHouseholdNew">
-        <h2>{{ $t("household_members_editor.composition.composition") }}</h2>
-        <div class="mb-3 row">
-            <label class="col-form-label col-sm-4 required">{{
-                $t("household_members_editor.composition.household_composition")
-            }}</label>
-            <div class="col-sm-8">
-                <select
-                    v-model="householdCompositionType"
-                    class="form-select form-control"
-                >
-                    <option
-                        v-for="t in householdCompositionTypes"
-                        :key="t.id"
-                        :value="t.id"
-                    >
-                        {{ localizeString(t.label) }}
-                    </option>
-                </select>
-            </div>
-        </div>
-        <div class="mb-3 row">
-            <label class="col-form-label col-sm-4 required">{{
-                $t("household_members_editor.composition.number_of_children")
-            }}</label>
-            <div class="col-sm-8">
-                <input
-                    type="number"
-                    v-model="numberOfChildren"
-                    min="0"
-                    max="30"
-                    class="form-control"
-                />
-            </div>
-        </div>
-        <div v-if="this.displayDependents" class="mb-3 row">
-            <label class="col-form-label col-sm-4 required">{{
-                $t("household_members_editor.composition.number_of_dependents")
-            }}</label>
-            <div class="col-sm-8">
-                <input
-                    type="number"
-                    v-model="numberOfDependents"
-                    min="0"
-                    max="30"
-                    class="form-control"
-                />
-            </div>
-        </div>
-        <div v-if="this.displayDependents" class="mb-3 row">
-            <label class="col-form-label col-sm-4 required">{{
-                $t(
-                    "household_members_editor.composition.number_of_dependents_with_disabilities",
-                )
-            }}</label>
-            <div class="col-sm-8">
-                <input
-                    type="number"
-                    v-model="numberOfDependentsWithDisabilities"
-                    min="0"
-                    max="30"
-                    class="form-control"
-                />
-            </div>
-        </div>
+    <div class="mb-3 row">
+      <label class="col-form-label col-sm-4 required">{{
+        $t("household_members_editor.composition.number_of_children")
+      }}</label>
+      <div class="col-sm-8">
+        <input
+          type="number"
+          v-model="numberOfChildren"
+          min="0"
+          max="30"
+          class="form-control"
+        />
+      </div>
     </div>
+    <div v-if="this.displayDependents" class="mb-3 row">
+      <label class="col-form-label col-sm-4 required">{{
+        $t("household_members_editor.composition.number_of_dependents")
+      }}</label>
+      <div class="col-sm-8">
+        <input
+          type="number"
+          v-model="numberOfDependents"
+          min="0"
+          max="30"
+          class="form-control"
+        />
+      </div>
+    </div>
+    <div v-if="this.displayDependents" class="mb-3 row">
+      <label class="col-form-label col-sm-4 required">{{
+        $t(
+          "household_members_editor.composition.number_of_dependents_with_disabilities",
+        )
+      }}</label>
+      <div class="col-sm-8">
+        <input
+          type="number"
+          v-model="numberOfDependentsWithDisabilities"
+          min="0"
+          max="30"
+          class="form-control"
+        />
+      </div>
+    </div>
+  </div>
 </template>
 
 <script>
@@ -86,74 +86,71 @@ import { mapGetters, mapState } from "vuex";
 import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
 
 export default {
-    name: "Dates",
-    methods: { localizeString },
-    components: {
-        CurrentHousehold,
+  name: "Dates",
+  methods: { localizeString },
+  components: {
+    CurrentHousehold,
+  },
+  computed: {
+    ...mapState(["householdCompositionTypes"]),
+    ...mapGetters(["isHouseholdNew"]),
+    displayDependents: {
+      get() {
+        return window.household_members_editor_data.displayDependents;
+      },
     },
-    computed: {
-        ...mapState(["householdCompositionTypes"]),
-        ...mapGetters(["isHouseholdNew"]),
-        displayDependents: {
-            get() {
-                return window.household_members_editor_data.displayDependents;
-            },
-        },
-        householdCompositionType: {
-            get() {
-                if (this.$store.state.householdCompositionType !== null) {
-                    return this.$store.state.householdCompositionType.id;
-                }
-                return null;
-            },
-            set(value) {
-                this.$store.dispatch("setHouseholdCompositionType", value);
-            },
-        },
-        numberOfChildren: {
-            get() {
-                return this.$store.state.numberOfChildren;
-            },
-            set(value) {
-                this.$store.commit("setNumberOfChildren", value);
-            },
-        },
-        numberOfDependents: {
-            get() {
-                return this.$store.state.numberOfDependents;
-            },
-            set(value) {
-                this.$store.commit("setNumberOfDependents", value);
-            },
-        },
-        numberOfDependentsWithDisabilities: {
-            get() {
-                return this.$store.state.numberOfDependentsWithDisabilities;
-            },
-            set(value) {
-                this.$store.commit(
-                    "setNumberOfDependentsWithDisabilities",
-                    value,
-                );
-            },
-        },
-        startDate: {
-            get() {
-                return this.$store.state.startDate;
-                // return [
-                //   this.$store.state.startDate.getFullYear(),
-                //   (this.$store.state.startDate.getMonth() + 1).toString().padStart(2, '0'),
-                //   this.$store.state.startDate.getDate().toString().padStart(2, '0')
-                // ].join('-');
-            },
-            set(value) {
-                // let
-                //   [year, month, day] = value.split('-'),
-                //     dValue = new Date(year, month-1, day);
+    householdCompositionType: {
+      get() {
+        if (this.$store.state.householdCompositionType !== null) {
+          return this.$store.state.householdCompositionType.id;
+        }
+        return null;
+      },
+      set(value) {
+        this.$store.dispatch("setHouseholdCompositionType", value);
+      },
+    },
+    numberOfChildren: {
+      get() {
+        return this.$store.state.numberOfChildren;
+      },
+      set(value) {
+        this.$store.commit("setNumberOfChildren", value);
+      },
+    },
+    numberOfDependents: {
+      get() {
+        return this.$store.state.numberOfDependents;
+      },
+      set(value) {
+        this.$store.commit("setNumberOfDependents", value);
+      },
+    },
+    numberOfDependentsWithDisabilities: {
+      get() {
+        return this.$store.state.numberOfDependentsWithDisabilities;
+      },
+      set(value) {
+        this.$store.commit("setNumberOfDependentsWithDisabilities", value);
+      },
+    },
+    startDate: {
+      get() {
+        return this.$store.state.startDate;
+        // return [
+        //   this.$store.state.startDate.getFullYear(),
+        //   (this.$store.state.startDate.getMonth() + 1).toString().padStart(2, '0'),
+        //   this.$store.state.startDate.getDate().toString().padStart(2, '0')
+        // ].join('-');
+      },
+      set(value) {
+        // let
+        //   [year, month, day] = value.split('-'),
+        //     dValue = new Date(year, month-1, day);
 
-                this.$store.dispatch("setStartDate", value);
-            },
-        },
+        this.$store.dispatch("setStartDate", value);
+      },
     },
+  },
 };
 </script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
index 9773d178e..56798341a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Household.vue
@@ -1,130 +1,116 @@
 <template>
-    <h2 class="mt-4">
-        {{ $t("household_members_editor.household_part") }}
-    </h2>
+  <h2 class="mt-4">
+    {{ $t("household_members_editor.household_part") }}
+  </h2>
 
-    <div class="alert alert-info" v-if="!hasHousehold">
-        {{ $t("household_members_editor.household.no_household_choose_one") }}
-    </div>
-    <template v-else>
-        <current-household />
-    </template>
+  <div class="alert alert-info" v-if="!hasHousehold">
+    {{ $t("household_members_editor.household.no_household_choose_one") }}
+  </div>
+  <template v-else>
+    <current-household />
+  </template>
 
-    <div v-if="hasHouseholdSuggestion" class="householdSuggestions my-5">
-        <h4 class="mb-3">
-            {{ $t("household_members_editor.household.household_suggested") }}
-        </h4>
-        <p>
+  <div v-if="hasHouseholdSuggestion" class="householdSuggestions my-5">
+    <h4 class="mb-3">
+      {{ $t("household_members_editor.household.household_suggested") }}
+    </h4>
+    <p>
+      {{
+        $t("household_members_editor.household.household_suggested_explanation")
+      }}
+    </p>
+    <div class="accordion" id="householdSuggestions">
+      <div class="accordion-item">
+        <h2 class="accordion-header" id="heading_household_suggestions">
+          <button
+            v-if="!showHouseholdSuggestion"
+            class="accordion-button collapsed"
+            type="button"
+            data-bs-toggle="collapse"
+            aria-expanded="false"
+            @click="toggleHouseholdSuggestion"
+          >
             {{
-                $t(
-                    "household_members_editor.household.household_suggested_explanation",
-                )
+              $tc(
+                "household_members_editor.show_household_suggestion",
+                countHouseholdSuggestion,
+              )
             }}
-        </p>
-        <div class="accordion" id="householdSuggestions">
-            <div class="accordion-item">
-                <h2 class="accordion-header" id="heading_household_suggestions">
+          </button>
+          <button
+            v-if="showHouseholdSuggestion"
+            class="accordion-button"
+            type="button"
+            data-bs-toggle="collapse"
+            aria-expanded="true"
+            @click="toggleHouseholdSuggestion"
+          >
+            {{ $t("household_members_editor.hide_household_suggestion") }}
+          </button>
+          <!-- disabled bootstrap behaviour:  data-bs-target="#collapse_household_suggestions" aria-controls="collapse_household_suggestions" -->
+        </h2>
+        <div
+          class="accordion-collapse"
+          id="collapse_household_suggestions"
+          aria-labelledby="heading_household_suggestions"
+          data-bs-parent="#householdSuggestions"
+        >
+          <div v-if="showHouseholdSuggestion">
+            <div class="flex-table householdSuggestionList">
+              <div
+                v-for="(s, i) in getSuggestions"
+                class="item-bloc"
+                :key="`householdSuggestions-${i}`"
+              >
+                <household-render-box :household="s.household" />
+                <ul class="record_actions">
+                  <li>
                     <button
-                        v-if="!showHouseholdSuggestion"
-                        class="accordion-button collapsed"
-                        type="button"
-                        data-bs-toggle="collapse"
-                        aria-expanded="false"
-                        @click="toggleHouseholdSuggestion"
+                      class="btn btn-sm btn-choose"
+                      @click="selectHousehold(s.household)"
                     >
-                        {{
-                            $tc(
-                                "household_members_editor.show_household_suggestion",
-                                countHouseholdSuggestion,
-                            )
-                        }}
+                      {{ $t("household_members_editor.select_household") }}
                     </button>
-                    <button
-                        v-if="showHouseholdSuggestion"
-                        class="accordion-button"
-                        type="button"
-                        data-bs-toggle="collapse"
-                        aria-expanded="true"
-                        @click="toggleHouseholdSuggestion"
-                    >
-                        {{
-                            $t(
-                                "household_members_editor.hide_household_suggestion",
-                            )
-                        }}
-                    </button>
-                    <!-- disabled bootstrap behaviour:  data-bs-target="#collapse_household_suggestions" aria-controls="collapse_household_suggestions" -->
-                </h2>
-                <div
-                    class="accordion-collapse"
-                    id="collapse_household_suggestions"
-                    aria-labelledby="heading_household_suggestions"
-                    data-bs-parent="#householdSuggestions"
-                >
-                    <div v-if="showHouseholdSuggestion">
-                        <div class="flex-table householdSuggestionList">
-                            <div
-                                v-for="(s, i) in getSuggestions"
-                                class="item-bloc"
-                                :key="`householdSuggestions-${i}`"
-                            >
-                                <household-render-box
-                                    :household="s.household"
-                                />
-                                <ul class="record_actions">
-                                    <li>
-                                        <button
-                                            class="btn btn-sm btn-choose"
-                                            @click="
-                                                selectHousehold(s.household)
-                                            "
-                                        >
-                                            {{
-                                                $t(
-                                                    "household_members_editor.select_household",
-                                                )
-                                            }}
-                                        </button>
-                                    </li>
-                                </ul>
-                            </div>
-                        </div>
-                    </div>
-                </div>
+                  </li>
+                </ul>
+              </div>
             </div>
+          </div>
         </div>
+      </div>
     </div>
+  </div>
 
-    <ul class="record_actions">
-        <li v-if="hasHousehold">
-            <button @click="resetMode" class="btn btn-sm btn-misc">
-                {{ $t("household_members_editor.household.reset_mode") }}
-            </button>
-        </li>
-        <li v-if="!hasHousehold" class="add-persons">
-            <add-persons
-                modal-title="Chercher un ménage existant"
-                button-title="Chercher un ménage existant"
-                :key="addPersons.key"
-                :options="addPersons.options"
-                @add-new-persons="pickHouseholdFound"
-                ref="pickHousehold"
-            >
-                <!-- to cast child method -->
-            </add-persons>
-        </li>
-        <li v-if="!hasHousehold">
-            <button @click="setModeNew" class="btn btn-sm btn-create">
-                {{ $t("household_members_editor.household.create_household") }}
-            </button>
-        </li>
-        <li v-if="isModeLeaveAllowed && !hasHousehold">
-            <button @click="setModeLeave" class="btn btn-sm btn-misc">
-                <i class="fa fa-sign-out" />
-                {{ $t("household_members_editor.household.leave") }}
-            </button>
-        </li>
-    </ul>
+  <ul class="record_actions">
+    <li v-if="hasHousehold">
+      <button @click="resetMode" class="btn btn-sm btn-misc">
+        {{ $t("household_members_editor.household.reset_mode") }}
+      </button>
+    </li>
+    <li v-if="!hasHousehold" class="add-persons">
+      <add-persons
+        modal-title="Chercher un ménage existant"
+        button-title="Chercher un ménage existant"
+        :key="addPersons.key"
+        :options="addPersons.options"
+        @add-new-persons="pickHouseholdFound"
+        ref="pickHousehold"
+      >
+        <!-- to cast child method -->
+      </add-persons>
+    </li>
+    <li v-if="!hasHousehold">
+      <button @click="setModeNew" class="btn btn-sm btn-create">
+        {{ $t("household_members_editor.household.create_household") }}
+      </button>
+    </li>
+    <li v-if="isModeLeaveAllowed && !hasHousehold">
+      <button @click="setModeLeave" class="btn btn-sm btn-misc">
+        <i class="fa fa-sign-out" />
+        {{ $t("household_members_editor.household.leave") }}
+      </button>
+    </li>
+  </ul>
 </template>
 
 <script>
@@ -134,156 +120,154 @@ import CurrentHousehold from "./CurrentHousehold";
 import AddPersons from "ChillPersonAssets/vuejs/_components/AddPersons";
 
 export default {
-    name: "Household",
-    components: {
-        AddPersons,
-        CurrentHousehold,
-        HouseholdRenderBox,
-    },
-    emits: ["readyToGo"],
-    data() {
-        return {
-            addPersons: {
-                key: "household_find",
-                options: {
-                    type: ["household"],
-                    priority: null,
-                    uniq: true,
-                    button: {
-                        size: "btn-sm",
-                        type: "btn-search",
-                    },
-                },
+  name: "Household",
+  components: {
+    AddPersons,
+    CurrentHousehold,
+    HouseholdRenderBox,
+  },
+  emits: ["readyToGo"],
+  data() {
+    return {
+      addPersons: {
+        key: "household_find",
+        options: {
+          type: ["household"],
+          priority: null,
+          uniq: true,
+          button: {
+            size: "btn-sm",
+            type: "btn-search",
+          },
+        },
+      },
+      addAddress: {
+        key: "household_new",
+        options: {
+          useDate: {
+            validFrom: false,
+            validTo: false,
+          },
+          onlyButton: true,
+          button: {
+            text: {
+              create: "household_members_editor.household.set_address",
+              edit: "household_members_editor.household.update_address",
             },
-            addAddress: {
-                key: "household_new",
-                options: {
-                    useDate: {
-                        validFrom: false,
-                        validTo: false,
-                    },
-                    onlyButton: true,
-                    button: {
-                        text: {
-                            create: "household_members_editor.household.set_address",
-                            edit: "household_members_editor.household.update_address",
-                        },
-                    },
-                    title: {
-                        create: "household_members_editor.household.create_new_address",
-                        edit: "household_members_editor.household.update_address_title",
-                    },
-                },
-            },
-        };
+          },
+          title: {
+            create: "household_members_editor.household.create_new_address",
+            edit: "household_members_editor.household.update_address_title",
+          },
+        },
+      },
+    };
+  },
+  computed: {
+    ...mapGetters([
+      "isModeNewAllowed",
+      "isModeLeaveAllowed",
+      "getSuggestions",
+      "hasHousehold",
+      "isHouseholdNew",
+      "hasHouseholdSuggestion",
+      "countHouseholdSuggestion",
+      "filterHouseholdSuggestionByAccompanyingPeriod",
+      "hasAddressSuggestion",
+      "countAddressSuggestion",
+      "filterAddressesSuggestion",
+      "hasHouseholdAddress",
+      "isModeLeave",
+      "getAddressContext",
+    ]),
+    ...mapState([
+      "household",
+      "showHouseholdSuggestion",
+      "showAddressSuggestion",
+      "mode",
+    ]),
+    household() {
+      return this.$store.state.household;
     },
-    computed: {
-        ...mapGetters([
-            "isModeNewAllowed",
-            "isModeLeaveAllowed",
-            "getSuggestions",
-            "hasHousehold",
-            "isHouseholdNew",
-            "hasHouseholdSuggestion",
-            "countHouseholdSuggestion",
-            "filterHouseholdSuggestionByAccompanyingPeriod",
-            "hasAddressSuggestion",
-            "countAddressSuggestion",
-            "filterAddressesSuggestion",
-            "hasHouseholdAddress",
-            "isModeLeave",
-            "getAddressContext",
-        ]),
-        ...mapState([
-            "household",
-            "showHouseholdSuggestion",
-            "showAddressSuggestion",
-            "mode",
-        ]),
-        household() {
-            return this.$store.state.household;
-        },
-        allowHouseholdSearch() {
-            return false;
-            return (
-                this.$store.state.allowHouseholdSearch &&
-                !this.$store.getters.hasHousehold
-            );
-        },
-        isHouseholdNewDesactivated() {
-            return (
-                this.$store.state.mode !== null &&
-                !this.$store.getters.isHouseholdNew
-            );
-        },
-        isHouseholdLeaveDesactivated() {
-            return (
-                this.$store.state.mode !== null &&
-                this.$store.state.mode !== "leave"
-            );
-        },
+    allowHouseholdSearch() {
+      return false;
+      return (
+        this.$store.state.allowHouseholdSearch &&
+        !this.$store.getters.hasHousehold
+      );
     },
-    methods: {
-        setModeNew() {
-            this.$store.dispatch("createHousehold");
-            this.$emit("readyToGo");
-        },
-        setModeLeave() {
-            this.$store.dispatch("forceLeaveWithoutHousehold");
-            this.$emit("readyToGo");
-        },
-        resetMode() {
-            this.$store.commit("resetMode");
-        },
-        addressChanged(payload) {
-            console.log("addressChanged", payload);
-            this.$store.dispatch("setHouseholdNewAddress", payload.address);
-        },
-        selectHousehold(h) {
-            this.$store.dispatch("selectHousehold", h);
-            this.$emit("readyToGo");
-        },
-        pickHouseholdFound({ selected, modal }) {
-            selected.forEach(function (item) {
-                this.selectHousehold(item.result);
-            }, this);
-            this.$refs.pickHousehold.resetSearch(); // to cast child method
-            modal.showModal = false;
-        },
-        removeHouseholdAddress() {
-            this.$store.commit("removeHouseholdAddress");
-        },
-        toggleHouseholdSuggestion() {
-            this.$store.commit("toggleHouseholdSuggestion");
-        },
+    isHouseholdNewDesactivated() {
+      return (
+        this.$store.state.mode !== null && !this.$store.getters.isHouseholdNew
+      );
     },
+    isHouseholdLeaveDesactivated() {
+      return (
+        this.$store.state.mode !== null && this.$store.state.mode !== "leave"
+      );
+    },
+  },
+  methods: {
+    setModeNew() {
+      this.$store.dispatch("createHousehold");
+      this.$emit("readyToGo");
+    },
+    setModeLeave() {
+      this.$store.dispatch("forceLeaveWithoutHousehold");
+      this.$emit("readyToGo");
+    },
+    resetMode() {
+      this.$store.commit("resetMode");
+    },
+    addressChanged(payload) {
+      console.log("addressChanged", payload);
+      this.$store.dispatch("setHouseholdNewAddress", payload.address);
+    },
+    selectHousehold(h) {
+      this.$store.dispatch("selectHousehold", h);
+      this.$emit("readyToGo");
+    },
+    pickHouseholdFound({ selected, modal }) {
+      selected.forEach(function (item) {
+        this.selectHousehold(item.result);
+      }, this);
+      this.$refs.pickHousehold.resetSearch(); // to cast child method
+      modal.showModal = false;
+    },
+    removeHouseholdAddress() {
+      this.$store.commit("removeHouseholdAddress");
+    },
+    toggleHouseholdSuggestion() {
+      this.$store.commit("toggleHouseholdSuggestion");
+    },
+  },
 };
 </script>
 
 <style lang="scss" scoped>
 .filtered {
-    filter: grayscale(1) opacity(0.6);
+  filter: grayscale(1) opacity(0.6);
 }
 
 .filteredButActive {
-    filter: grayscale(1) opacity(0.6);
-    &:hover {
-        filter: unset;
-    }
+  filter: grayscale(1) opacity(0.6);
+  &:hover {
+    filter: unset;
+  }
 }
 
 div#household_members_editor div,
 div.householdSuggestionList {
-    &.flex-table {
-        margin: 0;
-        div.item-bloc div.item-row div.item-col {
-            &:first-child {
-                width: 25%;
-            }
-            &:last-child {
-                display: initial;
-            }
-        }
+  &.flex-table {
+    margin: 0;
+    div.item-bloc div.item-row div.item-col {
+      &:first-child {
+        width: 25%;
+      }
+      &:last-child {
+        display: initial;
+      }
     }
+  }
 }
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/HouseholdAddress.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/HouseholdAddress.vue
index af6f00d84..c7d9d8aac 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/HouseholdAddress.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/HouseholdAddress.vue
@@ -1,30 +1,26 @@
 <template>
-    <current-household />
+  <current-household />
 
-    <ul class="record_actions">
-        <!-- <li v-if="!hasHouseholdAddress && !isHouseholdForceAddress">
+  <ul class="record_actions">
+    <!-- <li v-if="!hasHouseholdAddress && !isHouseholdForceAddress">
       <button class="btn btn-misc" @click="markNoAddress">
         {{ $t('household_members_editor.household_address.mark_no_address') }}
       </button>
     </li> -->
-        <li v-if="!hasHouseholdAddress">
-            <add-address
-                :context="getAddressContext"
-                :key="addAddress.key"
-                :options="addAddress.options"
-                :address-changed-callback="addressChanged"
-            />
-        </li>
-        <li v-if="hasHouseholdAddress">
-            <button class="btn btn-remove" @click="removeHouseholdAddress">
-                {{
-                    $t(
-                        "household_members_editor.household_address.remove_address",
-                    )
-                }}
-            </button>
-        </li>
-    </ul>
+    <li v-if="!hasHouseholdAddress">
+      <add-address
+        :context="getAddressContext"
+        :key="addAddress.key"
+        :options="addAddress.options"
+        :address-changed-callback="addressChanged"
+      />
+    </li>
+    <li v-if="hasHouseholdAddress">
+      <button class="btn btn-remove" @click="removeHouseholdAddress">
+        {{ $t("household_members_editor.household_address.remove_address") }}
+      </button>
+    </li>
+  </ul>
 </template>
 
 <script>
@@ -33,55 +29,56 @@ import CurrentHousehold from "./CurrentHousehold";
 import { mapGetters } from "vuex";
 
 export default {
-    name: "HouseholdAddress.vue",
-    components: {
-        CurrentHousehold,
-        AddAddress,
-    },
-    data() {
-        return {
-            addAddress: {
-                key: "household_new",
-                options: {
-                    useDate: {
-                        validFrom: false,
-                        validTo: false,
-                    },
-                    onlyButton: true,
-                    button: {
-                        text: {
-                            create: "household_members_editor.household_address.set_address",
-                            edit: "household_members_editor.household_address.update_address",
-                        },
-                    },
-                    title: {
-                        create: "household_members_editor.household_address.create_new_address",
-                        edit: "household_members_editor.household_address.update_address_title",
-                    },
-                },
+  name: "HouseholdAddress.vue",
+  components: {
+    CurrentHousehold,
+    AddAddress,
+  },
+  data() {
+    return {
+      addAddress: {
+        key: "household_new",
+        options: {
+          useDate: {
+            validFrom: false,
+            validTo: false,
+          },
+          onlyButton: true,
+          button: {
+            text: {
+              create: "household_members_editor.household_address.set_address",
+              edit: "household_members_editor.household_address.update_address",
             },
-        };
-    },
-    computed: {
-        ...mapGetters([
-            "isHouseholdNew",
-            "hasHouseholdAddress",
-            "getAddressContext",
-            "isHouseholdForceNoAddress",
-        ]),
-    },
-    methods: {
-        addressChanged(payload) {
-            console.log("addressChanged", payload);
-            this.$store.dispatch("setHouseholdNewAddress", payload.address);
-        },
-        markNoAddress() {
-            this.$store.commit("markHouseholdNoAddress");
-        },
-        removeHouseholdAddress() {
-            this.$store.commit("removeHouseholdAddress");
+          },
+          title: {
+            create:
+              "household_members_editor.household_address.create_new_address",
+            edit: "household_members_editor.household_address.update_address_title",
+          },
         },
+      },
+    };
+  },
+  computed: {
+    ...mapGetters([
+      "isHouseholdNew",
+      "hasHouseholdAddress",
+      "getAddressContext",
+      "isHouseholdForceNoAddress",
+    ]),
+  },
+  methods: {
+    addressChanged(payload) {
+      console.log("addressChanged", payload);
+      this.$store.dispatch("setHouseholdNewAddress", payload.address);
     },
+    markNoAddress() {
+      this.$store.commit("markHouseholdNoAddress");
+    },
+    removeHouseholdAddress() {
+      this.$store.commit("removeHouseholdAddress");
+    },
+  },
 };
 </script>
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/MemberDetails.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/MemberDetails.vue
index 13515efec..3bdfb9d03 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/MemberDetails.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/MemberDetails.vue
@@ -1,104 +1,102 @@
 <template>
-    <div class="item-bloc">
-        <div class="item-row">
-            <div class="item-col">
-                <div>
-                    <person-render-box
-                        render="badge"
-                        :options="{}"
-                        :person="conc.person"
-                    />
-                    <span v-if="isHolder" class="badge bg-primary holder">
-                        {{ $t("household_members_editor.holder") }}
-                    </span>
-                </div>
-                <div v-if="conc.person.birthdate !== null">
-                    {{
-                        $t("person.born", {
-                            gender: conc.person.gender.genderTranslation,
-                        })
-                    }}
-                </div>
-            </div>
-            <div class="item-col">
-                <ul class="list-content fa-ul">
-                    <li>
-                        <i class="fa fa-li fa-map-marker" />
-                        <span class="chill-no-data-statement"
-                            >Sans adresse</span
-                        >
-                    </li>
-                </ul>
-            </div>
+  <div class="item-bloc">
+    <div class="item-row">
+      <div class="item-col">
+        <div>
+          <person-render-box
+            render="badge"
+            :options="{}"
+            :person="conc.person"
+          />
+          <span v-if="isHolder" class="badge bg-primary holder">
+            {{ $t("household_members_editor.holder") }}
+          </span>
         </div>
-
-        <div class="item-row comment">
-            <comment-editor v-model="comment" />
-        </div>
-
-        <div class="item-row participation-details">
-            <div v-if="conc.position.allowHolder" class="action">
-                <button
-                    class="btn"
-                    :class="{
-                        'btn-primary': isHolder,
-                        'btn-secondary': !isHolder,
-                    }"
-                    @click="toggleHolder"
-                >
-                    {{
-                        $t(
-                            isHolder
-                                ? "household_members_editor.is_holder"
-                                : "household_members_editor.is_not_holder",
-                        )
-                    }}
-                </button>
-            </div>
-
-            <div>
-                <button @click="removePosition" class="btn btn-outline-primary">
-                    {{
-                        $t("household_members_editor.remove_position", {
-                            position: conc.position.label.fr,
-                        })
-                    }}
-                </button>
-            </div>
-
-            <div>
-                <button
-                    v-if="conc.allowRemove"
-                    @click="removeConcerned"
-                    class="btn btn-primary"
-                >
-                    {{ $t("household_members_editor.remove_concerned") }}
-                </button>
-            </div>
+        <div v-if="conc.person.birthdate !== null">
+          {{
+            $t("person.born", {
+              gender: conc.person.gender.genderTranslation,
+            })
+          }}
         </div>
+      </div>
+      <div class="item-col">
+        <ul class="list-content fa-ul">
+          <li>
+            <i class="fa fa-li fa-map-marker" />
+            <span class="chill-no-data-statement">Sans adresse</span>
+          </li>
+        </ul>
+      </div>
     </div>
+
+    <div class="item-row comment">
+      <comment-editor v-model="comment" />
+    </div>
+
+    <div class="item-row participation-details">
+      <div v-if="conc.position.allowHolder" class="action">
+        <button
+          class="btn"
+          :class="{
+            'btn-primary': isHolder,
+            'btn-secondary': !isHolder,
+          }"
+          @click="toggleHolder"
+        >
+          {{
+            $t(
+              isHolder
+                ? "household_members_editor.is_holder"
+                : "household_members_editor.is_not_holder",
+            )
+          }}
+        </button>
+      </div>
+
+      <div>
+        <button @click="removePosition" class="btn btn-outline-primary">
+          {{
+            $t("household_members_editor.remove_position", {
+              position: conc.position.label.fr,
+            })
+          }}
+        </button>
+      </div>
+
+      <div>
+        <button
+          v-if="conc.allowRemove"
+          @click="removeConcerned"
+          class="btn btn-primary"
+        >
+          {{ $t("household_members_editor.remove_concerned") }}
+        </button>
+      </div>
+    </div>
+  </div>
 </template>
 
 <style scoped lang="scss">
 .drag-icon {
-    height: 1.1em;
-    margin-right: 0.5em;
+  height: 1.1em;
+  margin-right: 0.5em;
 }
 div.participation-details {
-    display: flex;
-    flex-direction: row !important;
-    justify-content: flex-end;
+  display: flex;
+  flex-direction: row !important;
+  justify-content: flex-end;
 
-    .action {
-        align-self: flex-start;
-        margin-right: auto;
-    }
+  .action {
+    align-self: flex-start;
+    margin-right: auto;
+  }
 }
 
 .holder {
-    display: inline;
-    vertical-align: super;
-    font-size: 0.6em;
+  display: inline;
+  vertical-align: super;
+  font-size: 0.6em;
 }
 </style>
 
@@ -108,44 +106,44 @@ import PersonRenderBox from "ChillPersonAssets/vuejs/_components/Entity/PersonRe
 import CommentEditor from "ChillMainAssets/vuejs/_components/CommentEditor/CommentEditor.vue";
 
 export default {
-    name: "MemberDetails",
-    components: {
-        PersonRenderBox,
-        CommentEditor,
+  name: "MemberDetails",
+  components: {
+    PersonRenderBox,
+    CommentEditor,
+  },
+  props: ["conc"],
+  computed: {
+    ...mapGetters(["concByPersonId"]),
+    classicEditor: () => ClassicEditor,
+    editorConfig: () => classicEditorConfig,
+    isHolder() {
+      return this.conc.holder;
     },
-    props: ["conc"],
-    computed: {
-        ...mapGetters(["concByPersonId"]),
-        classicEditor: () => ClassicEditor,
-        editorConfig: () => classicEditorConfig,
-        isHolder() {
-            return this.conc.holder;
-        },
-        comment: {
-            get() {
-                return this.conc.comment;
-            },
-            set(text) {
-                console.log("set comment");
-                console.log("comment", text);
+    comment: {
+      get() {
+        return this.conc.comment;
+      },
+      set(text) {
+        console.log("set comment");
+        console.log("comment", text);
 
-                this.$store.dispatch("setComment", {
-                    conc: this.conc,
-                    comment: text,
-                });
-            },
-        },
+        this.$store.dispatch("setComment", {
+          conc: this.conc,
+          comment: text,
+        });
+      },
     },
-    methods: {
-        toggleHolder() {
-            this.$store.dispatch("toggleHolder", this.conc);
-        },
-        removePosition() {
-            this.$store.dispatch("removePosition", this.conc);
-        },
-        removeConcerned() {
-            this.$store.dispatch("removeConcerned", this.conc);
-        },
+  },
+  methods: {
+    toggleHolder() {
+      this.$store.dispatch("toggleHolder", this.conc);
     },
+    removePosition() {
+      this.$store.dispatch("removePosition", this.conc);
+    },
+    removeConcerned() {
+      this.$store.dispatch("removeConcerned", this.conc);
+    },
+  },
 };
 </script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/PersonComment.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/PersonComment.vue
index 6630a72f1..99fb3ebfa 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/PersonComment.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/PersonComment.vue
@@ -1,30 +1,30 @@
 <template>
-    <comment-editor v-model="content" />
+  <comment-editor v-model="content" />
 </template>
 
 <script>
 import CommentEditor from "ChillMainAssets/vuejs/_components/CommentEditor/CommentEditor.vue";
 
 export default {
-    name: "PersonComment.vue",
-    components: {
-        CommentEditor,
-    },
-    props: ["conc"],
-    computed: {
-        content: {
-            get() {
-                return this.$props.conc.comment || "";
-            },
-            set(value) {
-                console.log("set content", value);
-                this.$store.commit("setComment", {
-                    conc: this.$props.conc,
-                    comment: value,
-                });
-            },
-        },
+  name: "PersonComment.vue",
+  components: {
+    CommentEditor,
+  },
+  props: ["conc"],
+  computed: {
+    content: {
+      get() {
+        return this.$props.conc.comment || "";
+      },
+      set(value) {
+        console.log("set content", value);
+        this.$store.commit("setComment", {
+          conc: this.$props.conc,
+          comment: value,
+        });
+      },
     },
+  },
 };
 </script>
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Positioning.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Positioning.vue
index a19d80c7a..26ab0058e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Positioning.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/HouseholdMembersEditor/components/Positioning.vue
@@ -1,57 +1,57 @@
 <template>
-    <current-household />
+  <current-household />
 
-    <h2>
-        {{ $t("household_members_editor.positioning.persons_to_positionnate") }}
-    </h2>
+  <h2>
+    {{ $t("household_members_editor.positioning.persons_to_positionnate") }}
+  </h2>
 
-    <div class="list-household-members flex-table">
-        <div v-for="conc in concerned" class="item-bloc" :key="conc.person.id">
-            <div class="pick-position item-row">
-                <div class="person">
-                    <!-- <h3>{{ conc.person.text }}</h3> -->
-                    <h3><person-text :person="conc.person" /></h3>
-                </div>
-                <div class="holder">
-                    <button
-                        class="btn"
-                        :disabled="!allowHolderForConcerned(conc)"
-                        :class="{
-                            'btn-outline-chill-green': !conc.holder,
-                            'btn-chill-green': conc.holder,
-                        }"
-                        @click="toggleHolder(conc)"
-                    >
-                        {{ $t("household_members_editor.positioning.holder") }}
-                    </button>
-                </div>
-                <div
-                    v-for="(position, i) in positions"
-                    :key="`position-${i}`"
-                    class="position"
-                >
-                    <button
-                        class="btn"
-                        :class="{
-                            'btn-primary': conc.position === position,
-                            'btn-outline-primary': conc.position !== position,
-                        }"
-                        @click="moveToPosition(conc.person.id, position.id)"
-                    >
-                        {{ localizeString(position.label) }}
-                    </button>
-                </div>
-            </div>
-            <div class="item-row">
-                <div class="col-12">
-                    <h6>
-                        {{ $t("household_members_editor.positioning.comment") }}
-                    </h6>
-                    <person-comment :conc="conc" />
-                </div>
-            </div>
+  <div class="list-household-members flex-table">
+    <div v-for="conc in concerned" class="item-bloc" :key="conc.person.id">
+      <div class="pick-position item-row">
+        <div class="person">
+          <!-- <h3>{{ conc.person.text }}</h3> -->
+          <h3><person-text :person="conc.person" /></h3>
         </div>
+        <div class="holder">
+          <button
+            class="btn"
+            :disabled="!allowHolderForConcerned(conc)"
+            :class="{
+              'btn-outline-chill-green': !conc.holder,
+              'btn-chill-green': conc.holder,
+            }"
+            @click="toggleHolder(conc)"
+          >
+            {{ $t("household_members_editor.positioning.holder") }}
+          </button>
+        </div>
+        <div
+          v-for="(position, i) in positions"
+          :key="`position-${i}`"
+          class="position"
+        >
+          <button
+            class="btn"
+            :class="{
+              'btn-primary': conc.position === position,
+              'btn-outline-primary': conc.position !== position,
+            }"
+            @click="moveToPosition(conc.person.id, position.id)"
+          >
+            {{ localizeString(position.label) }}
+          </button>
+        </div>
+      </div>
+      <div class="item-row">
+        <div class="col-12">
+          <h6>
+            {{ $t("household_members_editor.positioning.comment") }}
+          </h6>
+          <person-comment :conc="conc" />
+        </div>
+      </div>
     </div>
+  </div>
 </template>
 
 <script>
@@ -62,61 +62,61 @@ import PersonText from "../../_components/Entity/PersonText.vue";
 import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
 
 export default {
-    name: "Positioning",
-    components: {
-        CurrentHousehold,
-        PersonComment,
-        PersonText,
+  name: "Positioning",
+  components: {
+    CurrentHousehold,
+    PersonComment,
+    PersonText,
+  },
+  computed: {
+    ...mapState(["concerned"]),
+    ...mapGetters([
+      "persons",
+      "concUnpositionned",
+      "positions",
+      "concByPosition",
+    ]),
+    allPersonsPositionnated() {
+      return (
+        this.$store.getters.persons.length > 0 &&
+        this.$store.getters.concUnpositionned.length === 0
+      );
     },
-    computed: {
-        ...mapState(["concerned"]),
-        ...mapGetters([
-            "persons",
-            "concUnpositionned",
-            "positions",
-            "concByPosition",
-        ]),
-        allPersonsPositionnated() {
-            return (
-                this.$store.getters.persons.length > 0 &&
-                this.$store.getters.concUnpositionned.length === 0
-            );
-        },
-        allowHolderForConcerned: () => (conc) => {
-            console.log("allow holder for concerned", conc);
-            if (conc.position === null) {
-                return false;
-            }
+    allowHolderForConcerned: () => (conc) => {
+      console.log("allow holder for concerned", conc);
+      if (conc.position === null) {
+        return false;
+      }
 
-            return conc.position.allowHolder;
-        },
+      return conc.position.allowHolder;
     },
-    methods: {
-        localizeString,
-        moveToPosition(person_id, position_id) {
-            this.$store.dispatch("markPosition", { person_id, position_id });
-        },
-        toggleHolder(conc) {
-            console.log("toggle holder", conc);
-            this.$store.dispatch("toggleHolder", conc);
-        },
+  },
+  methods: {
+    localizeString,
+    moveToPosition(person_id, position_id) {
+      this.$store.dispatch("markPosition", { person_id, position_id });
     },
+    toggleHolder(conc) {
+      console.log("toggle holder", conc);
+      this.$store.dispatch("toggleHolder", conc);
+    },
+  },
 };
 </script>
 
 <style lang="scss" scoped>
 .pick-position {
-    margin: 0;
-    padding: 0;
-    display: flex;
-    justify-content: flex-end;
-    align-items: center;
+  margin: 0;
+  padding: 0;
+  display: flex;
+  justify-content: flex-end;
+  align-items: center;
 
-    .person {
-        margin-right: auto;
-    }
-    .holder {
-        margin-right: 1.2rem;
-    }
+  .person {
+    margin-right: auto;
+  }
+  .holder {
+    margin-right: 1.2rem;
+  }
 }
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue
index 401f41be5..e9ee85164 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue
@@ -1,211 +1,181 @@
 <template>
-    <div id="visgraph" />
+  <div id="visgraph" />
 
-    <teleport to="#visgraph-legend">
-        <div class="post-menu">
-            <div class="list-group mt-4">
-                <button
-                    type="button"
-                    class="list-group-item list-group-item-action btn btn-misc"
-                    @click="createRelationship"
-                >
-                    <i class="fa fa-plus" /> {{ $t("visgraph.add_link") }}
-                </button>
-                <a
-                    type="button"
-                    class="list-group-item list-group-item-action btn btn-misc"
-                    id="exportCanvasBtn"
-                    @click="exportCanvasAsImage"
-                >
-                    <i class="fa fa-camera fa-fw" />
-                    {{ $t("visgraph.screenshot") }}
-                </a>
-            </div>
-
-            <div v-if="displayHelpMessage" class="alert alert-info mt-3">
-                {{ $t("visgraph.create_link_help") }}
-            </div>
-
-            <div class="my-4 legend">
-                <h3>{{ $t("visgraph.Legend") }}</h3>
-                <div class="list-group">
-                    <label
-                        class="list-group-item"
-                        v-for="(layer, i) in legendLayers"
-                        :key="`layer-${i}`"
-                    >
-                        <input
-                            class="form-check-input me-1"
-                            type="checkbox"
-                            :value="layer.id"
-                            v-model="checkedLayers"
-                            @change="toggleLayer"
-                        />
-                        {{ layer.label }}
-                    </label>
-                </div>
-            </div>
-        </div>
-    </teleport>
-
-    <teleport to="body">
-        <modal
-            v-if="modal.showModal"
-            :modal-dialog-class="modal.modalDialogClass"
-            @close="modal.showModal = false"
+  <teleport to="#visgraph-legend">
+    <div class="post-menu">
+      <div class="list-group mt-4">
+        <button
+          type="button"
+          class="list-group-item list-group-item-action btn btn-misc"
+          @click="createRelationship"
         >
-            <template #header>
-                <h2 class="modal-title">
-                    {{ $t(modal.title) }}
-                </h2>
-                <!-- {{ modal.data.id }} -->
-            </template>
-            <template #body>
-                <div v-if="modal.action === 'delete'">
-                    <p>{{ $t("visgraph.delete_confirmation_text") }}</p>
-                </div>
-                <div v-else>
-                    <form>
-                        <div class="row">
-                            <div class="col-12 text-center">
-                                {{ $t("visgraph.between") }}<br />{{
-                                    $t("visgraph.and")
-                                }}
-                            </div>
-                            <div class="col">
-                                <small>{{
-                                    getPersonAge(modal.data.from)
-                                }}</small>
-                                <h4>{{ getPerson(modal.data.from).text }}</h4>
-                                <p
-                                    class="text-start"
-                                    v-if="relation && relation.title"
-                                >
-                                    <span v-if="reverse">
-                                        {{
-                                            $t(
-                                                "visgraph.relation_from_to_like",
-                                                [
-                                                    getPerson(modal.data.from)
-                                                        .text,
-                                                    getPerson(modal.data.to)
-                                                        .text,
-                                                    relation.reverseTitle.fr.toLowerCase(),
-                                                ],
-                                            )
-                                        }}
-                                    </span>
-                                    <span v-else>
-                                        {{
-                                            $t(
-                                                "visgraph.relation_from_to_like",
-                                                [
-                                                    getPerson(modal.data.from)
-                                                        .text,
-                                                    getPerson(modal.data.to)
-                                                        .text,
-                                                    relation.title.fr.toLowerCase(),
-                                                ],
-                                            )
-                                        }}
-                                    </span>
-                                </p>
-                            </div>
-                            <div class="col text-end">
-                                <small>{{ getPersonAge(modal.data.to) }}</small>
-                                <h4>{{ getPerson(modal.data.to).text }}</h4>
-                                <p
-                                    class="text-end"
-                                    v-if="relation && relation.title"
-                                >
-                                    <span v-if="reverse">
-                                        {{
-                                            $t(
-                                                "visgraph.relation_from_to_like",
-                                                [
-                                                    getPerson(modal.data.to)
-                                                        .text,
-                                                    getPerson(modal.data.from)
-                                                        .text,
-                                                    relation.title.fr.toLowerCase(),
-                                                ],
-                                            )
-                                        }}
-                                    </span>
-                                    <span v-else>
-                                        {{
-                                            $t(
-                                                "visgraph.relation_from_to_like",
-                                                [
-                                                    getPerson(modal.data.to)
-                                                        .text,
-                                                    getPerson(modal.data.from)
-                                                        .text,
-                                                    relation.reverseTitle.fr.toLowerCase(),
-                                                ],
-                                            )
-                                        }}
-                                    </span>
-                                </p>
-                            </div>
-                        </div>
-                        <div class="my-3">
-                            <VueMultiselect
-                                id="relation"
-                                label="title"
-                                track-by="id"
-                                :custom-label="customLabel"
-                                :placeholder="$t('visgraph.choose_relation')"
-                                :close-on-select="true"
-                                :multiple="false"
-                                :searchable="true"
-                                :options="relations"
-                                v-model="relation"
-                                :value="relation"
-                            />
-                        </div>
-                        <div class="form-check form-switch">
-                            <input
-                                class="form-check-input"
-                                type="checkbox"
-                                id="reverse"
-                                v-model="reverse"
-                            />
-                            <label class="form-check-label" for="reverse">{{
-                                $t("visgraph.reverse_relation")
-                            }}</label>
-                        </div>
-                    </form>
-                </div>
-            </template>
-            <template #footer>
-                <button
-                    class="btn"
-                    :class="modal.button.class"
-                    @click="submitRelationship"
-                >
-                    {{ $t(modal.button.text) }}
-                </button>
-                <button
-                    class="btn btn-delete"
-                    v-if="modal.action === 'edit'"
-                    @click="dropRelationship"
-                />
-            </template>
-        </modal>
-    </teleport>
-    <ul class="record_actions sticky-form-buttons">
-        <li>
-            <add-persons
-                button-title="visgraph.add_person"
-                modal-title="visgraph.add_person"
-                :key="addPersons.key"
-                :options="addPersons.options"
-                @add-new-persons="addNewPersons"
-                ref="addPersons"
+          <i class="fa fa-plus" /> {{ $t("visgraph.add_link") }}
+        </button>
+        <a
+          type="button"
+          class="list-group-item list-group-item-action btn btn-misc"
+          id="exportCanvasBtn"
+          @click="exportCanvasAsImage"
+        >
+          <i class="fa fa-camera fa-fw" />
+          {{ $t("visgraph.screenshot") }}
+        </a>
+      </div>
+
+      <div v-if="displayHelpMessage" class="alert alert-info mt-3">
+        {{ $t("visgraph.create_link_help") }}
+      </div>
+
+      <div class="my-4 legend">
+        <h3>{{ $t("visgraph.Legend") }}</h3>
+        <div class="list-group">
+          <label
+            class="list-group-item"
+            v-for="(layer, i) in legendLayers"
+            :key="`layer-${i}`"
+          >
+            <input
+              class="form-check-input me-1"
+              type="checkbox"
+              :value="layer.id"
+              v-model="checkedLayers"
+              @change="toggleLayer"
             />
-        </li>
-    </ul>
+            {{ layer.label }}
+          </label>
+        </div>
+      </div>
+    </div>
+  </teleport>
+
+  <teleport to="body">
+    <modal
+      v-if="modal.showModal"
+      :modal-dialog-class="modal.modalDialogClass"
+      @close="modal.showModal = false"
+    >
+      <template #header>
+        <h2 class="modal-title">
+          {{ $t(modal.title) }}
+        </h2>
+        <!-- {{ modal.data.id }} -->
+      </template>
+      <template #body>
+        <div v-if="modal.action === 'delete'">
+          <p>{{ $t("visgraph.delete_confirmation_text") }}</p>
+        </div>
+        <div v-else>
+          <form>
+            <div class="row">
+              <div class="col-12 text-center">
+                {{ $t("visgraph.between") }}<br />{{ $t("visgraph.and") }}
+              </div>
+              <div class="col">
+                <small>{{ getPersonAge(modal.data.from) }}</small>
+                <h4>{{ getPerson(modal.data.from).text }}</h4>
+                <p class="text-start" v-if="relation && relation.title">
+                  <span v-if="reverse">
+                    {{
+                      $t("visgraph.relation_from_to_like", [
+                        getPerson(modal.data.from).text,
+                        getPerson(modal.data.to).text,
+                        relation.reverseTitle.fr.toLowerCase(),
+                      ])
+                    }}
+                  </span>
+                  <span v-else>
+                    {{
+                      $t("visgraph.relation_from_to_like", [
+                        getPerson(modal.data.from).text,
+                        getPerson(modal.data.to).text,
+                        relation.title.fr.toLowerCase(),
+                      ])
+                    }}
+                  </span>
+                </p>
+              </div>
+              <div class="col text-end">
+                <small>{{ getPersonAge(modal.data.to) }}</small>
+                <h4>{{ getPerson(modal.data.to).text }}</h4>
+                <p class="text-end" v-if="relation && relation.title">
+                  <span v-if="reverse">
+                    {{
+                      $t("visgraph.relation_from_to_like", [
+                        getPerson(modal.data.to).text,
+                        getPerson(modal.data.from).text,
+                        relation.title.fr.toLowerCase(),
+                      ])
+                    }}
+                  </span>
+                  <span v-else>
+                    {{
+                      $t("visgraph.relation_from_to_like", [
+                        getPerson(modal.data.to).text,
+                        getPerson(modal.data.from).text,
+                        relation.reverseTitle.fr.toLowerCase(),
+                      ])
+                    }}
+                  </span>
+                </p>
+              </div>
+            </div>
+            <div class="my-3">
+              <VueMultiselect
+                id="relation"
+                label="title"
+                track-by="id"
+                :custom-label="customLabel"
+                :placeholder="$t('visgraph.choose_relation')"
+                :close-on-select="true"
+                :multiple="false"
+                :searchable="true"
+                :options="relations"
+                v-model="relation"
+                :value="relation"
+              />
+            </div>
+            <div class="form-check form-switch">
+              <input
+                class="form-check-input"
+                type="checkbox"
+                id="reverse"
+                v-model="reverse"
+              />
+              <label class="form-check-label" for="reverse">{{
+                $t("visgraph.reverse_relation")
+              }}</label>
+            </div>
+          </form>
+        </div>
+      </template>
+      <template #footer>
+        <button
+          class="btn"
+          :class="modal.button.class"
+          @click="submitRelationship"
+        >
+          {{ $t(modal.button.text) }}
+        </button>
+        <button
+          class="btn btn-delete"
+          v-if="modal.action === 'edit'"
+          @click="dropRelationship"
+        />
+      </template>
+    </modal>
+  </teleport>
+  <ul class="record_actions sticky-form-buttons">
+    <li>
+      <add-persons
+        button-title="visgraph.add_person"
+        modal-title="visgraph.add_person"
+        :key="addPersons.key"
+        :options="addPersons.options"
+        @add-new-persons="addNewPersons"
+        ref="addPersons"
+      />
+    </li>
+  </ul>
 </template>
 
 <script>
@@ -214,478 +184,459 @@ import { mapState, mapGetters } from "vuex";
 import Modal from "ChillMainAssets/vuejs/_components/Modal";
 import VueMultiselect from "vue-multiselect";
 import {
-    getRelationsList,
-    postRelationship,
-    patchRelationship,
-    deleteRelationship,
+  getRelationsList,
+  postRelationship,
+  patchRelationship,
+  deleteRelationship,
 } from "./api";
 import { splitId, getAge } from "./vis-network";
 import { visMessages } from "./i18n";
 import AddPersons from "ChillPersonAssets/vuejs/_components/AddPersons.vue";
 
 export default {
-    name: "App",
-    components: {
-        Modal,
-        VueMultiselect,
-        AddPersons,
+  name: "App",
+  components: {
+    Modal,
+    VueMultiselect,
+    AddPersons,
+  },
+  props: ["household_id"],
+  data() {
+    return {
+      container: "",
+      checkedLayers: [],
+      relations: [],
+      displayHelpMessage: false,
+      listenPersonFlag: "normal",
+      newEdgeData: {},
+      modal: {
+        showModal: false,
+        modalDialogClass: "modal-md",
+        title: null,
+        action: null,
+        data: {
+          type: "relationship",
+          from: null,
+          to: null,
+          relation: null,
+          reverse: false,
+        },
+        button: {
+          class: null,
+          text: null,
+        },
+      },
+      canvas: null,
+      link: null,
+      addPersons: {
+        key: "filiation",
+        options: {
+          type: ["person"],
+          priority: null,
+          uniq: false,
+        },
+      },
+    };
+  },
+  computed: {
+    ...mapGetters([
+      "nodes",
+      "edges",
+      // not used 'isInWhitelist', 'isHouseholdLoading', 'isCourseLoaded', 'isRelationshipLoaded', 'isPersonLoaded', 'isExcludedNode', 'countLinksByNode', 'getParticipationsByCourse', 'getMembersByHousehold', 'getPersonsGroup',
+    ]),
+    ...mapState([
+      "persons",
+      "households",
+      "courses",
+      "excludedNodesIds",
+      "updateHack",
+      // not used 'links', 'relationships', 'whitelistIds', 'personLoadedIds', 'householdLoadingIds', 'courseLoadedIds', 'relationshipLoadedIds',
+    ]),
+
+    visgraph_data() {
+      //console.log('::: visgraph_data :::', this.nodes.length, 'nodes,', this.edges.length, 'edges')
+      return {
+        nodes: this.nodes,
+        edges: this.edges,
+      };
     },
-    props: ["household_id"],
-    data() {
-        return {
-            container: "",
-            checkedLayers: [],
-            relations: [],
-            displayHelpMessage: false,
-            listenPersonFlag: "normal",
-            newEdgeData: {},
-            modal: {
-                showModal: false,
-                modalDialogClass: "modal-md",
-                title: null,
-                action: null,
-                data: {
-                    type: "relationship",
-                    from: null,
-                    to: null,
-                    relation: null,
-                    reverse: false,
-                },
-                button: {
-                    class: null,
-                    text: null,
-                },
-            },
-            canvas: null,
-            link: null,
-            addPersons: {
-                key: "filiation",
-                options: {
-                    type: ["person"],
-                    priority: null,
-                    uniq: false,
-                },
-            },
-        };
+
+    refreshNetwork() {
+      //console.log('--- refresh network')
+      window.network.setData(this.visgraph_data);
+
+      return 1;
     },
-    computed: {
-        ...mapGetters([
-            "nodes",
-            "edges",
-            // not used 'isInWhitelist', 'isHouseholdLoading', 'isCourseLoaded', 'isRelationshipLoaded', 'isPersonLoaded', 'isExcludedNode', 'countLinksByNode', 'getParticipationsByCourse', 'getMembersByHousehold', 'getPersonsGroup',
-        ]),
-        ...mapState([
-            "persons",
-            "households",
-            "courses",
-            "excludedNodesIds",
-            "updateHack",
-            // not used 'links', 'relationships', 'whitelistIds', 'personLoadedIds', 'householdLoadingIds', 'courseLoadedIds', 'relationshipLoadedIds',
-        ]),
 
-        visgraph_data() {
-            //console.log('::: visgraph_data :::', this.nodes.length, 'nodes,', this.edges.length, 'edges')
-            return {
-                nodes: this.nodes,
-                edges: this.edges,
-            };
-        },
-
-        refreshNetwork() {
-            //console.log('--- refresh network')
-            window.network.setData(this.visgraph_data);
-
-            return 1;
-        },
-
-        legendLayers() {
-            //console.log('--- refresh legend and rebuild checked Layers')
-            // eslint-disable-next-line vue/no-side-effects-in-computed-properties
-            this.checkedLayers = [];
-            let layersDisplayed = [
-                ...this.nodes.filter((n) => n.id.startsWith("household")),
-                ...this.nodes.filter((n) => n.id.startsWith("accompanying")),
-            ];
-            layersDisplayed.forEach((layer) => {
-                this.checkedLayers.push(layer.id);
-            });
-            return [...this.households, ...this.courses];
-        },
-
-        // eslint-disable-next-line vue/no-dupe-keys
-        checkedLayers() {
-            // required to refresh data checkedLayers
-            //console.log('--- checkedLayers')
-            return this.checkedLayers;
-        },
-
-        relation: {
-            get() {
-                return this.modal.data.relation;
-            },
-            set(value) {
-                this.modal.data.relation = value;
-            },
-        },
-
-        reverse: {
-            get() {
-                return this.modal.data.reverse;
-            },
-            set(value) {
-                this.modal.data.reverse = value;
-            },
-        },
+    legendLayers() {
+      //console.log('--- refresh legend and rebuild checked Layers')
+      // eslint-disable-next-line vue/no-side-effects-in-computed-properties
+      this.checkedLayers = [];
+      let layersDisplayed = [
+        ...this.nodes.filter((n) => n.id.startsWith("household")),
+        ...this.nodes.filter((n) => n.id.startsWith("accompanying")),
+      ];
+      layersDisplayed.forEach((layer) => {
+        this.checkedLayers.push(layer.id);
+      });
+      return [...this.households, ...this.courses];
     },
-    watch: {
-        updateHack(newValue, oldValue) {
-            //console.log(`--- updateHack ${oldValue} <> ${newValue}`)
-            if (oldValue !== newValue) {
-                this.forceUpdateComponent();
-            }
-        },
+
+    // eslint-disable-next-line vue/no-dupe-keys
+    checkedLayers() {
+      // required to refresh data checkedLayers
+      //console.log('--- checkedLayers')
+      return this.checkedLayers;
     },
-    mounted() {
-        //console.log('=== mounted: init graph')
-        this.initGraph();
-        this.listenOnGraph();
-        this.getRelationsList();
-        console.log(this.persons);
 
-        this.canvas = document
-            .getElementById("visgraph")
-            .querySelector("canvas");
-        this.link = document.getElementById("exportCanvasBtn");
+    relation: {
+      get() {
+        return this.modal.data.relation;
+      },
+      set(value) {
+        this.modal.data.relation = value;
+      },
     },
-    methods: {
-        addNewPersons({ selected, modal }) {
-            // console.log('@@@ CLICK button addNewPersons', selected);
-            selected.forEach(function (item) {
-                this.$store
-                    .dispatch("addMorePerson", item.result)
-                    .catch(({ name, violations }) => {
-                        if (
-                            name === "ValidationException" ||
-                            name === "AccessException"
-                        ) {
-                            violations.forEach((violation) =>
-                                this.$toast.open({ message: violation }),
-                            );
-                        } else {
-                            this.$toast.open({ message: violations });
-                        }
-                    });
-            }, this);
-            this.$refs.addPersons.resetSearch(); // to cast child method
-            modal.showModal = false;
-        },
-        initGraph() {
-            this.container = document.getElementById("visgraph");
-            // Instanciate vis objects in separate window variables, see vis-network.js
-            window.network = new vis.Network(
-                this.container,
-                this.visgraph_data,
-                window.options,
-            );
-        },
-        forceUpdateComponent() {
-            //console.log('!! forceUpdateComponent !!')
-            // eslint-disable-next-line @typescript-eslint/no-unused-expressions
-            this.refreshNetwork;
-            this.$forceUpdate();
-        },
 
-        // events
-        listenOnGraph() {
-            window.network.on("selectNode", (data) => {
-                if (data.nodes.length > 1) {
-                    throw "Multi selection is not allowed. Disable it in options.interaction !";
-                }
-                let node = data.nodes[0];
-                let nodeType = splitId(node, "type");
-                switch (nodeType) {
-                    case "person":
-                        let person = this.nodes.filter((n) => n.id === node)[0];
-                        //console.log('@@@@@@ event on selected Node', person.id)
-                        if (this.listenPersonFlag === "normal") {
-                            if (person.folded === true) {
-                                //console.log('   @@> expand mode event')
-                                this.$store.commit("unfoldPerson", person);
-                                this.$store.dispatch(
-                                    "fetchInfoForPerson",
-                                    person,
-                                );
-                            }
-                        } else {
-                            //console.log('   @@> create link mode event')
-                            this.listenStepsToAddRelationship(person);
-                        }
-                        break;
+    reverse: {
+      get() {
+        return this.modal.data.reverse;
+      },
+      set(value) {
+        this.modal.data.reverse = value;
+      },
+    },
+  },
+  watch: {
+    updateHack(newValue, oldValue) {
+      //console.log(`--- updateHack ${oldValue} <> ${newValue}`)
+      if (oldValue !== newValue) {
+        this.forceUpdateComponent();
+      }
+    },
+  },
+  mounted() {
+    //console.log('=== mounted: init graph')
+    this.initGraph();
+    this.listenOnGraph();
+    this.getRelationsList();
+    console.log(this.persons);
 
-                    case "household":
-                        let household = this.nodes.filter(
-                            (n) => n.id === node,
-                        )[0];
-                        //console.log('@@@@@@ event on selected Node', household.id)
-                        this.$store.dispatch(
-                            "unfoldPersonsByHousehold",
-                            household,
-                        );
-                        break;
-
-                    case "accompanying_period":
-                        let course = this.nodes.filter((n) => n.id === node)[0];
-                        //console.log('@@@@@@ event on selected Node', course.id)
-                        this.$store.dispatch("unfoldPersonsByCourse", course);
-                        break;
-
-                    default:
-                        throw "event is undefined for this type of node";
-                }
-                this.forceUpdateComponent();
-            });
-            window.network.on("selectEdge", (data) => {
-                if (data.nodes.length !== 0 || data.edges.length !== 1) {
-                    return false; //we don't want to trigger nodeEdge or multiselect !
-                }
-                let link = data.edges[0];
-                let linkType = splitId(link, "link");
-                //console.log('@@@@@ event on selected Edge', data.edges.length, linkType, data)
-
-                if (linkType.startsWith("relationship")) {
-                    //console.log('linkType relationship')
-
-                    let relationships = this.edges.filter((l) => l.id === link);
-                    if (relationships.length > 1) {
-                        throw "error: only one link is allowed between two person!";
-                    }
-
-                    let relationship = relationships[0];
-                    //console.log(relationship)
-
-                    this.editRelationshipModal({
-                        from: relationship.from,
-                        to: relationship.to,
-                        id: relationship.id,
-                        relation: relationship.relation,
-                        reverse: relationship.reverse,
-                    });
-                }
-            });
-        },
-        listenStepsToAddRelationship(person) {
-            //console.log('   @@> listenStep', this.listenPersonFlag)
-            if (this.listenPersonFlag === "step2") {
-                //console.log('   @@> person 2', person)
-                this.newEdgeData.to = person.id;
-                this.addRelationshipModal(this.newEdgeData);
-                this.displayHelpMessage = false;
-                this.listenPersonFlag = "normal";
-                this.newEdgeData = {};
-            }
-            if (this.listenPersonFlag === "step1") {
-                //console.log('   @@> person 1', person)
-                this.newEdgeData.from = person.id;
-                this.listenPersonFlag = "step2";
-            }
-        },
-
-        /// control Layers
-        toggleLayer(value) {
-            let id = value.target.value;
-            //console.log('@@@@@@ toggle Layer', id)
-            this.forceUpdateComponent();
-            if (this.checkedLayers.includes(id)) {
-                this.removeLayer(id);
+    this.canvas = document.getElementById("visgraph").querySelector("canvas");
+    this.link = document.getElementById("exportCanvasBtn");
+  },
+  methods: {
+    addNewPersons({ selected, modal }) {
+      // console.log('@@@ CLICK button addNewPersons', selected);
+      selected.forEach(function (item) {
+        this.$store
+          .dispatch("addMorePerson", item.result)
+          .catch(({ name, violations }) => {
+            if (name === "ValidationException" || name === "AccessException") {
+              violations.forEach((violation) =>
+                this.$toast.open({ message: violation }),
+              );
             } else {
-                this.addLayer(id);
+              this.$toast.open({ message: violations });
             }
-        },
-        addLayer(id) {
-            //console.log('+ addLayer', id)
-            this.checkedLayers.push(id);
-            this.$store.dispatch("excludedNode", ["remove", id]);
-        },
-        removeLayer(id) {
-            //console.log('- removeLayer', id)
-            this.checkedLayers = this.checkedLayers.filter((i) => i !== id);
-            this.$store.dispatch("excludedNode", ["add", id]);
-        },
-
-        /// control Modal
-        addRelationshipModal(edgeData) {
-            //console.log('==- addRelationshipModal', edgeData)
-            this.modal = {
-                data: { from: edgeData.from, to: edgeData.to, reverse: false },
-                action: "create",
-                showModal: true,
-                title: "visgraph.add_relationship_link",
-                button: { class: "btn-create", text: "action.create" },
-            };
-        },
-        editRelationshipModal(edgeData) {
-            //console.log('==- editRelationshipModal', edgeData)
-            this.modal = {
-                data: edgeData,
-                action: "edit",
-                showModal: true,
-                title: "visgraph.edit_relationship_link",
-                button: { class: "btn-edit", text: "action.edit" },
-            };
-        },
-
-        // form
-        resetForm() {
-            this.modal = {
-                data: {
-                    type: "relationship",
-                    from: null,
-                    to: null,
-                    relation: null,
-                    reverse: false,
-                },
-                action: null,
-                title: null,
-                button: { class: null, text: null },
-            };
-            //console.log('==- reset Form', this.modal.data)
-        },
-        getRelationsList() {
-            //console.log('fetch relationsList')
-            return getRelationsList()
-                .then(
-                    (relations) =>
-                        new Promise((resolve) => {
-                            //console.log('+ relations list', relations.results.length)
-                            this.relations = relations.results.filter(
-                                (r) => r.isActive === true,
-                            );
-                            resolve();
-                        }),
-                )
-                .catch();
-        },
-        customLabel(value) {
-            //console.log('customLabel', value)
-            return value.title && value.reverseTitle
-                ? `${value.title.fr} ↔ ${value.reverseTitle.fr}`
-                : "";
-        },
-        getPerson(id) {
-            let person = this.persons.filter((p) => p.id === id);
-            return person[0];
-        },
-        getPersonAge(id) {
-            let person = this.getPerson(id);
-            return getAge(person);
-        },
-
-        // actions
-        createRelationship() {
-            this.displayHelpMessage = true;
-            this.listenPersonFlag = "step1"; // toggle listener in create link mode
-            //console.log('   @@> switch listener to create link mode:', this.listenPersonFlag)
-        },
-        dropRelationship() {
-            //console.log('delete', this.modal.data)
-            deleteRelationship(this.modal.data).catch();
-            this.$store.commit("removeLink", this.modal.data.id);
-            this.modal.showModal = false;
-            this.resetForm();
-            this.forceUpdateComponent();
-        },
-        submitRelationship() {
-            //console.log('submitRelationship', this.modal.action)
-            switch (this.modal.action) {
-                case "create":
-                    return postRelationship(this.modal.data)
-                        .then(
-                            (relationship) =>
-                                new Promise((resolve) => {
-                                    //console.log('post relationship response', relationship)
-                                    this.$store.dispatch(
-                                        "addLinkFromRelationship",
-                                        relationship,
-                                    );
-                                    this.modal.showModal = false;
-                                    this.resetForm();
-                                    this.forceUpdateComponent();
-                                    resolve();
-                                }),
-                        )
-                        .catch((error) => {
-                            if (error.name === "ValidationException") {
-                                for (let v of error.violations) {
-                                    this.$toast.open({ message: v });
-                                    console.log(v);
-                                }
-                            } else {
-                                this.$toast.open({
-                                    message: "An error occurred",
-                                });
-                            }
-                        });
-
-                case "edit":
-                    return patchRelationship(this.modal.data)
-                        .then(
-                            (relationship) =>
-                                new Promise((resolve) => {
-                                    //console.log('patch relationship response', relationship)
-                                    this.$store.commit(
-                                        "updateLink",
-                                        relationship,
-                                    );
-                                    this.modal.showModal = false;
-                                    this.resetForm();
-                                    this.forceUpdateComponent();
-                                    resolve();
-                                }),
-                        )
-                        .catch();
-
-                default:
-                    throw "uncaught action";
-            }
-        },
-
-        // export image
-        async exportCanvasAsImage() {
-            let filename = `filiation_${this.household_id}.jpg`,
-                mime = "image/jpeg",
-                quality = 0.85,
-                footer = `© Chill ${new Date().getFullYear()}`,
-                timestamp = `${visMessages.fr.visgraph.relationship_household} n° ${this.household_id} — ${new Date().toLocaleString()}`;
-
-            // resolve toBlob in a Promise
-            const getCanvasBlob = (canvas) =>
-                new Promise((resolve) => {
-                    canvas.toBlob((blob) => resolve(blob), mime, quality);
-                });
-
-            // build image from new temporary canvas
-            let tmpCanvas = document.createElement("canvas");
-            tmpCanvas.width = this.canvas.width;
-            tmpCanvas.height = this.canvas.height;
-
-            let ctx = tmpCanvas.getContext("2d");
-            ctx.beginPath();
-            ctx.fillStyle = "#fff";
-            ctx.fillRect(0, 0, tmpCanvas.width, tmpCanvas.height);
-            ctx.fillStyle = "#9d4600";
-            ctx.fillText(footer + " — " + timestamp, 5, tmpCanvas.height - 10);
-            ctx.drawImage(this.canvas, 0, 0);
-
-            return await getCanvasBlob(tmpCanvas).then((blob) => {
-                let url = document.createElement("a");
-                url.download = filename;
-                url.href = window.URL.createObjectURL(blob);
-                url.click();
-                console.log("url", url.href);
-                URL.revokeObjectURL(url.href);
-            });
-        },
+          });
+      }, this);
+      this.$refs.addPersons.resetSearch(); // to cast child method
+      modal.showModal = false;
     },
+    initGraph() {
+      this.container = document.getElementById("visgraph");
+      // Instanciate vis objects in separate window variables, see vis-network.js
+      window.network = new vis.Network(
+        this.container,
+        this.visgraph_data,
+        window.options,
+      );
+    },
+    forceUpdateComponent() {
+      //console.log('!! forceUpdateComponent !!')
+      // eslint-disable-next-line @typescript-eslint/no-unused-expressions
+      this.refreshNetwork;
+      this.$forceUpdate();
+    },
+
+    // events
+    listenOnGraph() {
+      window.network.on("selectNode", (data) => {
+        if (data.nodes.length > 1) {
+          throw "Multi selection is not allowed. Disable it in options.interaction !";
+        }
+        let node = data.nodes[0];
+        let nodeType = splitId(node, "type");
+        switch (nodeType) {
+          case "person":
+            let person = this.nodes.filter((n) => n.id === node)[0];
+            //console.log('@@@@@@ event on selected Node', person.id)
+            if (this.listenPersonFlag === "normal") {
+              if (person.folded === true) {
+                //console.log('   @@> expand mode event')
+                this.$store.commit("unfoldPerson", person);
+                this.$store.dispatch("fetchInfoForPerson", person);
+              }
+            } else {
+              //console.log('   @@> create link mode event')
+              this.listenStepsToAddRelationship(person);
+            }
+            break;
+
+          case "household":
+            let household = this.nodes.filter((n) => n.id === node)[0];
+            //console.log('@@@@@@ event on selected Node', household.id)
+            this.$store.dispatch("unfoldPersonsByHousehold", household);
+            break;
+
+          case "accompanying_period":
+            let course = this.nodes.filter((n) => n.id === node)[0];
+            //console.log('@@@@@@ event on selected Node', course.id)
+            this.$store.dispatch("unfoldPersonsByCourse", course);
+            break;
+
+          default:
+            throw "event is undefined for this type of node";
+        }
+        this.forceUpdateComponent();
+      });
+      window.network.on("selectEdge", (data) => {
+        if (data.nodes.length !== 0 || data.edges.length !== 1) {
+          return false; //we don't want to trigger nodeEdge or multiselect !
+        }
+        let link = data.edges[0];
+        let linkType = splitId(link, "link");
+        //console.log('@@@@@ event on selected Edge', data.edges.length, linkType, data)
+
+        if (linkType.startsWith("relationship")) {
+          //console.log('linkType relationship')
+
+          let relationships = this.edges.filter((l) => l.id === link);
+          if (relationships.length > 1) {
+            throw "error: only one link is allowed between two person!";
+          }
+
+          let relationship = relationships[0];
+          //console.log(relationship)
+
+          this.editRelationshipModal({
+            from: relationship.from,
+            to: relationship.to,
+            id: relationship.id,
+            relation: relationship.relation,
+            reverse: relationship.reverse,
+          });
+        }
+      });
+    },
+    listenStepsToAddRelationship(person) {
+      //console.log('   @@> listenStep', this.listenPersonFlag)
+      if (this.listenPersonFlag === "step2") {
+        //console.log('   @@> person 2', person)
+        this.newEdgeData.to = person.id;
+        this.addRelationshipModal(this.newEdgeData);
+        this.displayHelpMessage = false;
+        this.listenPersonFlag = "normal";
+        this.newEdgeData = {};
+      }
+      if (this.listenPersonFlag === "step1") {
+        //console.log('   @@> person 1', person)
+        this.newEdgeData.from = person.id;
+        this.listenPersonFlag = "step2";
+      }
+    },
+
+    /// control Layers
+    toggleLayer(value) {
+      let id = value.target.value;
+      //console.log('@@@@@@ toggle Layer', id)
+      this.forceUpdateComponent();
+      if (this.checkedLayers.includes(id)) {
+        this.removeLayer(id);
+      } else {
+        this.addLayer(id);
+      }
+    },
+    addLayer(id) {
+      //console.log('+ addLayer', id)
+      this.checkedLayers.push(id);
+      this.$store.dispatch("excludedNode", ["remove", id]);
+    },
+    removeLayer(id) {
+      //console.log('- removeLayer', id)
+      this.checkedLayers = this.checkedLayers.filter((i) => i !== id);
+      this.$store.dispatch("excludedNode", ["add", id]);
+    },
+
+    /// control Modal
+    addRelationshipModal(edgeData) {
+      //console.log('==- addRelationshipModal', edgeData)
+      this.modal = {
+        data: { from: edgeData.from, to: edgeData.to, reverse: false },
+        action: "create",
+        showModal: true,
+        title: "visgraph.add_relationship_link",
+        button: { class: "btn-create", text: "action.create" },
+      };
+    },
+    editRelationshipModal(edgeData) {
+      //console.log('==- editRelationshipModal', edgeData)
+      this.modal = {
+        data: edgeData,
+        action: "edit",
+        showModal: true,
+        title: "visgraph.edit_relationship_link",
+        button: { class: "btn-edit", text: "action.edit" },
+      };
+    },
+
+    // form
+    resetForm() {
+      this.modal = {
+        data: {
+          type: "relationship",
+          from: null,
+          to: null,
+          relation: null,
+          reverse: false,
+        },
+        action: null,
+        title: null,
+        button: { class: null, text: null },
+      };
+      //console.log('==- reset Form', this.modal.data)
+    },
+    getRelationsList() {
+      //console.log('fetch relationsList')
+      return getRelationsList()
+        .then(
+          (relations) =>
+            new Promise((resolve) => {
+              //console.log('+ relations list', relations.results.length)
+              this.relations = relations.results.filter(
+                (r) => r.isActive === true,
+              );
+              resolve();
+            }),
+        )
+        .catch();
+    },
+    customLabel(value) {
+      //console.log('customLabel', value)
+      return value.title && value.reverseTitle
+        ? `${value.title.fr} ↔ ${value.reverseTitle.fr}`
+        : "";
+    },
+    getPerson(id) {
+      let person = this.persons.filter((p) => p.id === id);
+      return person[0];
+    },
+    getPersonAge(id) {
+      let person = this.getPerson(id);
+      return getAge(person);
+    },
+
+    // actions
+    createRelationship() {
+      this.displayHelpMessage = true;
+      this.listenPersonFlag = "step1"; // toggle listener in create link mode
+      //console.log('   @@> switch listener to create link mode:', this.listenPersonFlag)
+    },
+    dropRelationship() {
+      //console.log('delete', this.modal.data)
+      deleteRelationship(this.modal.data).catch();
+      this.$store.commit("removeLink", this.modal.data.id);
+      this.modal.showModal = false;
+      this.resetForm();
+      this.forceUpdateComponent();
+    },
+    submitRelationship() {
+      //console.log('submitRelationship', this.modal.action)
+      switch (this.modal.action) {
+        case "create":
+          return postRelationship(this.modal.data)
+            .then(
+              (relationship) =>
+                new Promise((resolve) => {
+                  //console.log('post relationship response', relationship)
+                  this.$store.dispatch("addLinkFromRelationship", relationship);
+                  this.modal.showModal = false;
+                  this.resetForm();
+                  this.forceUpdateComponent();
+                  resolve();
+                }),
+            )
+            .catch((error) => {
+              if (error.name === "ValidationException") {
+                for (let v of error.violations) {
+                  this.$toast.open({ message: v });
+                  console.log(v);
+                }
+              } else {
+                this.$toast.open({
+                  message: "An error occurred",
+                });
+              }
+            });
+
+        case "edit":
+          return patchRelationship(this.modal.data)
+            .then(
+              (relationship) =>
+                new Promise((resolve) => {
+                  //console.log('patch relationship response', relationship)
+                  this.$store.commit("updateLink", relationship);
+                  this.modal.showModal = false;
+                  this.resetForm();
+                  this.forceUpdateComponent();
+                  resolve();
+                }),
+            )
+            .catch();
+
+        default:
+          throw "uncaught action";
+      }
+    },
+
+    // export image
+    async exportCanvasAsImage() {
+      let filename = `filiation_${this.household_id}.jpg`,
+        mime = "image/jpeg",
+        quality = 0.85,
+        footer = `© Chill ${new Date().getFullYear()}`,
+        timestamp = `${visMessages.fr.visgraph.relationship_household} n° ${this.household_id} — ${new Date().toLocaleString()}`;
+
+      // resolve toBlob in a Promise
+      const getCanvasBlob = (canvas) =>
+        new Promise((resolve) => {
+          canvas.toBlob((blob) => resolve(blob), mime, quality);
+        });
+
+      // build image from new temporary canvas
+      let tmpCanvas = document.createElement("canvas");
+      tmpCanvas.width = this.canvas.width;
+      tmpCanvas.height = this.canvas.height;
+
+      let ctx = tmpCanvas.getContext("2d");
+      ctx.beginPath();
+      ctx.fillStyle = "#fff";
+      ctx.fillRect(0, 0, tmpCanvas.width, tmpCanvas.height);
+      ctx.fillStyle = "#9d4600";
+      ctx.fillText(footer + " — " + timestamp, 5, tmpCanvas.height - 10);
+      ctx.drawImage(this.canvas, 0, 0);
+
+      return await getCanvasBlob(tmpCanvas).then((blob) => {
+        let url = document.createElement("a");
+        url.download = filename;
+        url.href = window.URL.createObjectURL(blob);
+        url.click();
+        console.log("url", url.href);
+        URL.revokeObjectURL(url.href);
+      });
+    },
+  },
 };
 </script>
 
@@ -694,21 +645,21 @@ export default {
 
 <style lang="scss" scoped>
 div#visgraph {
-    height: 700px;
-    margin: auto;
+  height: 700px;
+  margin: auto;
 }
 div#visgraph-legend {
-    div.post-menu.legend {
-    }
+  div.post-menu.legend {
+  }
 }
 .modal-mask {
-    background-color: rgba(0, 0, 0, 0.25);
+  background-color: rgba(0, 0, 0, 0.25);
 }
 .debug {
-    margin: 1em;
-    padding: 1em;
-    color: dimgray;
-    font-style: italic;
-    font-size: 80%;
+  margin: 1em;
+  padding: 1em;
+  color: dimgray;
+  font-style: italic;
+  font-size: 80%;
 }
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/accompanyingCourseWorkEvaluationDocument.ts b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/accompanyingCourseWorkEvaluationDocument.ts
index ddb37fab1..577c4b52b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/accompanyingCourseWorkEvaluationDocument.ts
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/accompanyingCourseWorkEvaluationDocument.ts
@@ -2,10 +2,10 @@ import { AccompanyingPeriodWorkEvaluationDocument } from "../../types";
 import { makeFetch } from "../../../../../ChillMainBundle/Resources/public/lib/api/apiMethods";
 
 export const duplicate = async (
-    id: number,
+  id: number,
 ): Promise<AccompanyingPeriodWorkEvaluationDocument> => {
-    return makeFetch<null, AccompanyingPeriodWorkEvaluationDocument>(
-        "POST",
-        `/api/1.0/person/accompanying-course-work-evaluation-document/${id}/duplicate`,
-    );
+  return makeFetch<null, AccompanyingPeriodWorkEvaluationDocument>(
+    "POST",
+    `/api/1.0/person/accompanying-course-work-evaluation-document/${id}/duplicate`,
+  );
 };
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkItem.vue
index 330423a20..98668a65b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkItem.vue
@@ -1,51 +1,45 @@
 <template>
-    <div class="container">
-        <div class="item-bloc">
-            <div class="item-row">
-                <h2 class="badge-title">
-                    <span class="title_label"></span>
-                    <span class="title_action">
-                        <span class="chill-entity entity-social-action">
-                            <span class="badge bg-light text-dark">
-                                {{ acpw?.socialAction?.title.fr }}
-                            </span>
-                        </span>
+  <div class="container">
+    <div class="item-bloc">
+      <div class="item-row">
+        <h2 class="badge-title">
+          <span class="title_label"></span>
+          <span class="title_action">
+            <span class="chill-entity entity-social-action">
+              <span class="badge bg-light text-dark">
+                {{ acpw?.socialAction?.title.fr }}
+              </span>
+            </span>
 
-                        <ul class="small_in_title columns mt-1">
-                            <li>
-                                <span class="item-key">
-                                    {{
-                                        trans(
-                                            ACCOMPANYING_COURSE_WORK_START_DATE,
-                                        )
-                                    }}
-                                    :
-                                </span>
-                                <b>{{ formatDate(acpw.startDate) }}</b>
-                            </li>
+            <ul class="small_in_title columns mt-1">
+              <li>
+                <span class="item-key">
+                  {{ trans(ACCOMPANYING_COURSE_WORK_START_DATE) }}
+                  :
+                </span>
+                <b>{{ formatDate(acpw.startDate) }}</b>
+              </li>
 
-                            <li v-if="acpw.endDate">
-                                <span class="item-key">
-                                    {{
-                                        trans(ACCOMPANYING_COURSE_WORK_END_DATE)
-                                    }}
-                                    :
-                                </span>
-                                <b>{{ formatDate(acpw.endDate) }}</b>
-                            </li>
-                        </ul>
-                    </span>
-                </h2>
-            </div>
-        </div>
+              <li v-if="acpw.endDate">
+                <span class="item-key">
+                  {{ trans(ACCOMPANYING_COURSE_WORK_END_DATE) }}
+                  :
+                </span>
+                <b>{{ formatDate(acpw.endDate) }}</b>
+              </li>
+            </ul>
+          </span>
+        </h2>
+      </div>
     </div>
+  </div>
 </template>
 
 <script setup lang="ts">
 import {
-    ACCOMPANYING_COURSE_WORK_END_DATE,
-    ACCOMPANYING_COURSE_WORK_START_DATE,
-    trans,
+  ACCOMPANYING_COURSE_WORK_END_DATE,
+  ACCOMPANYING_COURSE_WORK_START_DATE,
+  trans,
 } from "translator";
 import { ISOToDate } from "ChillMainAssets/chill/js/date";
 import { DateTime } from "ChillMainAssets/types";
@@ -54,15 +48,15 @@ import { AccompanyingPeriodWork } from "../../../types";
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const props = defineProps<{ acpw: AccompanyingPeriodWork }>();
 const formatDate = (dateObject: DateTime) => {
-    if (dateObject) {
-        const parsedDate = ISOToDate(dateObject.datetime);
-        if (parsedDate) {
-            return new Intl.DateTimeFormat("default", {
-                dateStyle: "short",
-            }).format(parsedDate);
-        } else {
-            return "";
-        }
+  if (dateObject) {
+    const parsedDate = ISOToDate(dateObject.datetime);
+    if (parsedDate) {
+      return new Intl.DateTimeFormat("default", {
+        dateStyle: "short",
+      }).format(parsedDate);
+    } else {
+      return "";
     }
+  }
 };
 </script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkList.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkList.vue
index b2ebc5f1c..c3615c959 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkList.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkList.vue
@@ -1,24 +1,24 @@
 <template>
-    <div class="results">
-        <div
-            v-for="acpw in accompanyingPeriodWorks"
-            :key="acpw.id"
-            class="list-item"
-        >
-            <label class="acpw-item">
-                <div>
-                    <input
-                        type="radio"
-                        :value="acpw"
-                        v-model="selectedAcpw"
-                        name="item"
-                    />
-                </div>
-
-                <accompanying-period-work-item :acpw="acpw" />
-            </label>
+  <div class="results">
+    <div
+      v-for="acpw in accompanyingPeriodWorks"
+      :key="acpw.id"
+      class="list-item"
+    >
+      <label class="acpw-item">
+        <div>
+          <input
+            type="radio"
+            :value="acpw"
+            v-model="selectedAcpw"
+            name="item"
+          />
         </div>
+
+        <accompanying-period-work-item :acpw="acpw" />
+      </label>
     </div>
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -28,7 +28,7 @@ import { defineProps, ref, watch } from "vue";
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const props = defineProps<{
-    accompanyingPeriodWorks: AccompanyingPeriodWork[];
+  accompanyingPeriodWorks: AccompanyingPeriodWork[];
 }>();
 const selectedAcpw = ref<AccompanyingPeriodWork | null>(null);
 
@@ -36,12 +36,12 @@ const selectedAcpw = ref<AccompanyingPeriodWork | null>(null);
 const emit = defineEmits();
 
 watch(selectedAcpw, (newValue) => {
-    emit("update:selectedAcpw", newValue);
+  emit("update:selectedAcpw", newValue);
 });
 </script>
 
 <style>
 .acpw-item {
-    display: flex;
+  display: flex;
 }
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkSelectorModal.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkSelectorModal.vue
index 4b4f3ddba..ee2c7c66c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkSelectorModal.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkSelectorModal.vue
@@ -1,62 +1,52 @@
 <template>
-    <div>
-        <div class="row justify-content-end">
-            <div class="col-md-6 col-sm-10" v-if="selectedAcpw">
-                <ul class="list-suggest remove-items">
-                    <li>
-                        <span
-                            @click="selectedAcpw = null"
-                            class="chill-denomination"
-                            >{{ selectedAcpw?.socialAction?.title.fr }}</span
-                        >
-                    </li>
-                </ul>
-            </div>
-        </div>
-
-        <ul class="record_actions">
-            <li>
-                <a class="btn btn-sm btn-create mt-3" @click="openModal">
-                    {{ trans(ACPW_DUPLICATE_SELECT_ACCOMPANYING_PERIOD_WORK) }}
-                </a>
-            </li>
+  <div>
+    <div class="row justify-content-end">
+      <div class="col-md-6 col-sm-10" v-if="selectedAcpw">
+        <ul class="list-suggest remove-items">
+          <li>
+            <span @click="selectedAcpw = null" class="chill-denomination">{{
+              selectedAcpw?.socialAction?.title.fr
+            }}</span>
+          </li>
         </ul>
-
-        <teleport to="body">
-            <modal
-                v-if="showModal"
-                @close="closeModal"
-                modal-dialog-class="modal-dialog-scrollable modal-xl"
-            >
-                <template #header>
-                    <h3>
-                        {{
-                            trans(
-                                ACPW_DUPLICATE_SELECT_ACCOMPANYING_PERIOD_WORK,
-                            )
-                        }}
-                    </h3>
-                </template>
-
-                <template #body>
-                    <accompanying-period-work-list
-                        :accompanying-period-works="accompanyingPeriodWorks"
-                        v-model:selectedAcpw="selectedAcpw"
-                    />
-                </template>
-
-                <template #footer>
-                    <button
-                        type="button"
-                        class="btn btn-save"
-                        @click="confirmSelection"
-                    >
-                        {{ trans(CONFIRM) }}
-                    </button>
-                </template>
-            </modal>
-        </teleport>
+      </div>
     </div>
+
+    <ul class="record_actions">
+      <li>
+        <a class="btn btn-sm btn-create mt-3" @click="openModal">
+          {{ trans(ACPW_DUPLICATE_SELECT_ACCOMPANYING_PERIOD_WORK) }}
+        </a>
+      </li>
+    </ul>
+
+    <teleport to="body">
+      <modal
+        v-if="showModal"
+        @close="closeModal"
+        modal-dialog-class="modal-dialog-scrollable modal-xl"
+      >
+        <template #header>
+          <h3>
+            {{ trans(ACPW_DUPLICATE_SELECT_ACCOMPANYING_PERIOD_WORK) }}
+          </h3>
+        </template>
+
+        <template #body>
+          <accompanying-period-work-list
+            :accompanying-period-works="accompanyingPeriodWorks"
+            v-model:selectedAcpw="selectedAcpw"
+          />
+        </template>
+
+        <template #footer>
+          <button type="button" class="btn btn-save" @click="confirmSelection">
+            {{ trans(CONFIRM) }}
+          </button>
+        </template>
+      </modal>
+    </teleport>
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -65,14 +55,14 @@ import Modal from "ChillMainAssets/vuejs/_components/Modal.vue";
 import AccompanyingPeriodWorkList from "./AccompanyingPeriodWorkList.vue";
 import { AccompanyingPeriodWork } from "../../../types";
 import {
-    ACPW_DUPLICATE_SELECT_ACCOMPANYING_PERIOD_WORK,
-    CONFIRM,
-    trans,
+  ACPW_DUPLICATE_SELECT_ACCOMPANYING_PERIOD_WORK,
+  CONFIRM,
+  trans,
 } from "translator";
 import { fetchResults } from "ChillMainAssets/lib/api/apiMethods";
 
 interface AccompanyingPeriodWorkSelectorModalProps {
-    accompanyingPeriodId: number;
+  accompanyingPeriodId: number;
 }
 
 const selectedAcpw = ref<AccompanyingPeriodWork | null>(null);
@@ -81,25 +71,25 @@ const accompanyingPeriodWorks = ref<AccompanyingPeriodWork[]>([]);
 const props = defineProps<AccompanyingPeriodWorkSelectorModalProps>();
 
 const emit = defineEmits<{
-    pickWork: [payload: { work: AccompanyingPeriodWork | null }];
+  pickWork: [payload: { work: AccompanyingPeriodWork | null }];
 }>();
 
 onMounted(() => {
-    if (props.accompanyingPeriodId) {
-        getAccompanyingPeriodWorks(props.accompanyingPeriodId);
-    } else {
-        console.error("No accompanyingperiod id was given");
-    }
+  if (props.accompanyingPeriodId) {
+    getAccompanyingPeriodWorks(props.accompanyingPeriodId);
+  } else {
+    console.error("No accompanyingperiod id was given");
+  }
 });
 const getAccompanyingPeriodWorks = async (periodId: number) => {
-    const url = `/api/1.0/person/accompanying-course/${periodId}/works.json`;
+  const url = `/api/1.0/person/accompanying-course/${periodId}/works.json`;
 
-    try {
-        accompanyingPeriodWorks.value = await fetchResults(url);
-    } catch (error) {
-        console.log(error);
-    }
-    /*  makeFetch<number, AccompanyingPeriodWork[]>("GET", url)
+  try {
+    accompanyingPeriodWorks.value = await fetchResults(url);
+  } catch (error) {
+    console.log(error);
+  }
+  /*  makeFetch<number, AccompanyingPeriodWork[]>("GET", url)
     .then((response) => {
       accompanyingPeriodWorks.value = response;
     })
@@ -111,7 +101,7 @@ const getAccompanyingPeriodWorks = async (periodId: number) => {
 const openModal = () => (showModal.value = true);
 const closeModal = () => (showModal.value = false);
 const confirmSelection = () => {
-    emit("pickWork", { work: selectedAcpw.value });
-    closeModal();
+  emit("pickWork", { work: selectedAcpw.value });
+  closeModal();
 };
 </script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.ts b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.ts
index ba7637544..088ff11ea 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.ts
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.ts
@@ -1,64 +1,63 @@
 const personMessages = {
-    fr: {
-        add_persons: {
-            title: "Ajouter des usagers",
-            suggested_counter:
-                "Pas de résultats | 1 résultat | {count} résultats",
-            selected_counter: " 1 sélectionné | {count} sélectionnés",
-            search_some_persons: "Rechercher des personnes..",
-        },
-        item: {
-            type_person: "Usager",
-            type_user: "TMS",
-            type_thirdparty: "Tiers professionnel",
-            type_household: "Ménage",
-        },
-        person: {
-            firstname: "Prénom",
-            lastname: "Nom",
-            born: (ctx: { gender: "man" | "woman" | "neutral" }) => {
-                if (ctx.gender === "man") {
-                    return "Né le";
-                } else if (ctx.gender === "woman") {
-                    return "Née le";
-                } else {
-                    return "Né·e le";
-                }
-            },
-            center_id: "Identifiant du centre",
-            center_type: "Type de centre",
-            center_name: "Territoire", // vendée
-            phonenumber: "Téléphone",
-            mobilenumber: "Mobile",
-            altnames: "Autres noms",
-            email: "Courriel",
-            gender: {
-                title: "Genre",
-                placeholder: "Choisissez le genre de l'usager",
-                woman: "Féminin",
-                man: "Masculin",
-                neutral: "Neutre, non binaire",
-                unknown: "Non renseigné",
-                undefined: "Non renseigné",
-            },
-            civility: {
-                title: "Civilité",
-                placeholder: "Choisissez la civilité",
-            },
-            address: {
-                create_address: "Ajouter une adresse",
-                show_address_form:
-                    "Ajouter une adresse pour un usager non suivi et seul dans un ménage",
-                warning:
-                    "Un nouveau ménage va être créé. L'usager sera membre de ce ménage.",
-            },
-            center: {
-                placeholder: "Choisissez un centre",
-                title: "Centre",
-            },
-        },
-        error_only_one_person: "Une seule personne peut être sélectionnée !",
+  fr: {
+    add_persons: {
+      title: "Ajouter des usagers",
+      suggested_counter: "Pas de résultats | 1 résultat | {count} résultats",
+      selected_counter: " 1 sélectionné | {count} sélectionnés",
+      search_some_persons: "Rechercher des personnes..",
     },
+    item: {
+      type_person: "Usager",
+      type_user: "TMS",
+      type_thirdparty: "Tiers professionnel",
+      type_household: "Ménage",
+    },
+    person: {
+      firstname: "Prénom",
+      lastname: "Nom",
+      born: (ctx: { gender: "man" | "woman" | "neutral" }) => {
+        if (ctx.gender === "man") {
+          return "Né le";
+        } else if (ctx.gender === "woman") {
+          return "Née le";
+        } else {
+          return "Né·e le";
+        }
+      },
+      center_id: "Identifiant du centre",
+      center_type: "Type de centre",
+      center_name: "Territoire", // vendée
+      phonenumber: "Téléphone",
+      mobilenumber: "Mobile",
+      altnames: "Autres noms",
+      email: "Courriel",
+      gender: {
+        title: "Genre",
+        placeholder: "Choisissez le genre de l'usager",
+        woman: "Féminin",
+        man: "Masculin",
+        neutral: "Neutre, non binaire",
+        unknown: "Non renseigné",
+        undefined: "Non renseigné",
+      },
+      civility: {
+        title: "Civilité",
+        placeholder: "Choisissez la civilité",
+      },
+      address: {
+        create_address: "Ajouter une adresse",
+        show_address_form:
+          "Ajouter une adresse pour un usager non suivi et seul dans un ménage",
+        warning:
+          "Un nouveau ménage va être créé. L'usager sera membre de ce ménage.",
+      },
+      center: {
+        placeholder: "Choisissez un centre",
+        title: "Centre",
+      },
+    },
+    error_only_one_person: "Une seule personne peut être sélectionnée !",
+  },
 };
 
 export { personMessages };
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
index 0fee3dcdb..3413861ae 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
@@ -1,158 +1,131 @@
 <template>
-    <div class="item-bloc col">
-        <section class="chill-entity entity-thirdparty">
-            <div class="item-row entity-bloc">
-                <div class="item-col">
-                    <div class="entity-label">
-                        <div :class="'denomination h' + options.hLevel">
-                            <a v-if="this.options.addLink === true" href="#">
-                                <span class="name">{{ thirdparty.text }}</span>
-                            </a>
-                            <span class="name" v-else>{{
-                                thirdparty.text
-                            }}</span>
+  <div class="item-bloc col">
+    <section class="chill-entity entity-thirdparty">
+      <div class="item-row entity-bloc">
+        <div class="item-col">
+          <div class="entity-label">
+            <div :class="'denomination h' + options.hLevel">
+              <a v-if="this.options.addLink === true" href="#">
+                <span class="name">{{ thirdparty.text }}</span>
+              </a>
+              <span class="name" v-else>{{ thirdparty.text }}</span>
 
-                            <span
-                                v-if="options.addId === true"
-                                class="id-number"
-                                :title="'n° ' + thirdparty.id"
-                            >
-                                {{ thirdparty.id }}
-                            </span>
+              <span
+                v-if="options.addId === true"
+                class="id-number"
+                :title="'n° ' + thirdparty.id"
+              >
+                {{ thirdparty.id }}
+              </span>
 
-                            <badge-entity
-                                v-if="options.addEntity === true"
-                                :entity="thirdparty"
-                                :options="{
-                                    displayLong: options.entityDisplayLong,
-                                }"
-                            />
-                        </div>
+              <badge-entity
+                v-if="options.addEntity === true"
+                :entity="thirdparty"
+                :options="{
+                  displayLong: options.entityDisplayLong,
+                }"
+              />
+            </div>
 
-                        <p
-                            v-if="this.options.addInfo === true"
-                            class="moreinfo"
-                        />
-                    </div>
-                </div>
+            <p v-if="this.options.addInfo === true" class="moreinfo" />
+          </div>
+        </div>
 
-                <div class="item-col">
-                    <div class="float-button bottom">
-                        <div class="box">
-                            <div class="action">
-                                <slot name="record-actions" />
-                            </div>
-                            <ul class="list-content fa-ul">
-                                <li v-if="getProfession.length > 0">
-                                    <i class="fa fa-li fa-id-card" />
-                                    <p>
-                                        <span>{{ getProfession[0] }}</span>
-                                    </p>
-                                </li>
-                                <li v-if="hasParent">
-                                    <i class="fa fa-li fa-hand-o-right" />
-                                    <b class="me-2">{{ $t("child_of") }}</b>
-                                    <on-the-fly
-                                        :type="thirdparty.parent.type"
-                                        :id="thirdparty.parent.id"
-                                        :button-text="thirdparty.parent.text"
-                                        :display-badge="'true' === 'true'"
-                                        action="show"
-                                    />
-                                </li>
-                                <!-- TODO hasChildren
+        <div class="item-col">
+          <div class="float-button bottom">
+            <div class="box">
+              <div class="action">
+                <slot name="record-actions" />
+              </div>
+              <ul class="list-content fa-ul">
+                <li v-if="getProfession.length > 0">
+                  <i class="fa fa-li fa-id-card" />
+                  <p>
+                    <span>{{ getProfession[0] }}</span>
+                  </p>
+                </li>
+                <li v-if="hasParent">
+                  <i class="fa fa-li fa-hand-o-right" />
+                  <b class="me-2">{{ $t("child_of") }}</b>
+                  <on-the-fly
+                    :type="thirdparty.parent.type"
+                    :id="thirdparty.parent.id"
+                    :button-text="thirdparty.parent.text"
+                    :display-badge="'true' === 'true'"
+                    action="show"
+                  />
+                </li>
+                <!-- TODO hasChildren
                     NB: we cannot call on-the-fly from RenderBox. See error message in previous version of this file.
                 -->
-                            </ul>
-                            <div v-if="thirdparty.contactDataAnonymous">
-                                <confidential :position-btn-far="false">
-                                    <template #confidential-content>
-                                        <ul class="list-content fa-ul">
-                                            <li v-if="thirdparty.address">
-                                                <i
-                                                    class="fa fa-li fa-map-marker"
-                                                />
-                                                <address-render-box
-                                                    :address="
-                                                        thirdparty.address
-                                                    "
-                                                    :is-multiline="isMultiline"
-                                                />
-                                            </li>
-                                            <li v-if="thirdparty.telephone">
-                                                <i class="fa fa-li fa-mobile" />
-                                                <a
-                                                    :href="
-                                                        'tel: ' +
-                                                        thirdparty.telephone
-                                                    "
-                                                    >{{
-                                                        thirdparty.telephone
-                                                    }}</a
-                                                >
-                                            </li>
-                                            <li v-if="thirdparty.telephone2">
-                                                <i class="fa fa-li fa-mobile" />
-                                                <a
-                                                    :href="
-                                                        'tel: ' +
-                                                        thirdparty.telephone2
-                                                    "
-                                                    >{{
-                                                        thirdparty.telephone2
-                                                    }}</a
-                                                >
-                                            </li>
-                                            <li v-if="thirdparty.email">
-                                                <i
-                                                    class="fa fa-li fa-envelope-o"
-                                                />
-                                                <a
-                                                    :href="
-                                                        'mailto: ' +
-                                                        thirdparty.email
-                                                    "
-                                                    >{{ thirdparty.email }}</a
-                                                >
-                                            </li>
-                                        </ul>
-                                    </template>
-                                </confidential>
-                            </div>
-                            <ul v-else class="list-content fa-ul">
-                                <li v-if="thirdparty.address">
-                                    <i class="fa fa-li fa-map-marker" />
-                                    <address-render-box
-                                        :address="thirdparty.address"
-                                        :is-multiline="isMultiline"
-                                    />
-                                </li>
-                                <li v-if="thirdparty.telephone">
-                                    <i class="fa fa-li fa-mobile" />
-                                    <a :href="'tel: ' + thirdparty.telephone">{{
-                                        thirdparty.telephone
-                                    }}</a>
-                                </li>
-                                <li v-if="thirdparty.telephone2">
-                                    <i class="fa fa-li fa-mobile" />
-                                    <a :href="'tel: ' + thirdparty.telephone2"
-                                        >{{ thirdparty.telephone2 }}
-                                    </a>
-                                </li>
-                                <li v-if="thirdparty.email">
-                                    <i class="fa fa-li fa-envelope-o" />
-                                    <a :href="'mailto: ' + thirdparty.email">{{
-                                        thirdparty.email
-                                    }}</a>
-                                </li>
-                            </ul>
-                        </div>
-                    </div>
-                </div>
+              </ul>
+              <div v-if="thirdparty.contactDataAnonymous">
+                <confidential :position-btn-far="false">
+                  <template #confidential-content>
+                    <ul class="list-content fa-ul">
+                      <li v-if="thirdparty.address">
+                        <i class="fa fa-li fa-map-marker" />
+                        <address-render-box
+                          :address="thirdparty.address"
+                          :is-multiline="isMultiline"
+                        />
+                      </li>
+                      <li v-if="thirdparty.telephone">
+                        <i class="fa fa-li fa-mobile" />
+                        <a :href="'tel: ' + thirdparty.telephone">{{
+                          thirdparty.telephone
+                        }}</a>
+                      </li>
+                      <li v-if="thirdparty.telephone2">
+                        <i class="fa fa-li fa-mobile" />
+                        <a :href="'tel: ' + thirdparty.telephone2">{{
+                          thirdparty.telephone2
+                        }}</a>
+                      </li>
+                      <li v-if="thirdparty.email">
+                        <i class="fa fa-li fa-envelope-o" />
+                        <a :href="'mailto: ' + thirdparty.email">{{
+                          thirdparty.email
+                        }}</a>
+                      </li>
+                    </ul>
+                  </template>
+                </confidential>
+              </div>
+              <ul v-else class="list-content fa-ul">
+                <li v-if="thirdparty.address">
+                  <i class="fa fa-li fa-map-marker" />
+                  <address-render-box
+                    :address="thirdparty.address"
+                    :is-multiline="isMultiline"
+                  />
+                </li>
+                <li v-if="thirdparty.telephone">
+                  <i class="fa fa-li fa-mobile" />
+                  <a :href="'tel: ' + thirdparty.telephone">{{
+                    thirdparty.telephone
+                  }}</a>
+                </li>
+                <li v-if="thirdparty.telephone2">
+                  <i class="fa fa-li fa-mobile" />
+                  <a :href="'tel: ' + thirdparty.telephone2"
+                    >{{ thirdparty.telephone2 }}
+                  </a>
+                </li>
+                <li v-if="thirdparty.email">
+                  <i class="fa fa-li fa-envelope-o" />
+                  <a :href="'mailto: ' + thirdparty.email">{{
+                    thirdparty.email
+                  }}</a>
+                </li>
+              </ul>
             </div>
-            <slot name="end-bloc" />
-        </section>
-    </div>
+          </div>
+        </div>
+      </div>
+      <slot name="end-bloc" />
+    </section>
+  </div>
 </template>
 
 <script>
@@ -161,83 +134,80 @@ import Confidential from "ChillMainAssets/vuejs/_components/Confidential.vue";
 import BadgeEntity from "ChillMainAssets/vuejs/_components/BadgeEntity.vue";
 
 export default {
-    name: "ThirdPartyRenderBox",
-    components: {
-        AddressRenderBox,
-        Confidential,
-        BadgeEntity,
+  name: "ThirdPartyRenderBox",
+  components: {
+    AddressRenderBox,
+    Confidential,
+    BadgeEntity,
+  },
+  // To avoid components recursively invoking eachother resolve OnTheFly component here
+  beforeCreate() {
+    this.$options.components.OnTheFly =
+      require("ChillMainAssets/vuejs/OnTheFly/components/OnTheFly").default;
+  },
+  i18n: {
+    messages: {
+      fr: {
+        children: "Personnes de contact: ",
+        child_of: "Contact de: ",
+      },
     },
-    // To avoid components recursively invoking eachother resolve OnTheFly component here
-    beforeCreate() {
-        this.$options.components.OnTheFly =
-            require("ChillMainAssets/vuejs/OnTheFly/components/OnTheFly").default;
+  },
+  props: ["thirdparty", "options"],
+  computed: {
+    isMultiline: function () {
+      if (this.options.isMultiline) {
+        return this.options.isMultiline;
+      } else {
+        return false;
+      }
     },
-    i18n: {
-        messages: {
-            fr: {
-                children: "Personnes de contact: ",
-                child_of: "Contact de: ",
-            },
-        },
+    hasParent() {
+      return !(
+        this.thirdparty.parent === null || this.thirdparty.parent === undefined
+      );
     },
-    props: ["thirdparty", "options"],
-    computed: {
-        isMultiline: function () {
-            if (this.options.isMultiline) {
-                return this.options.isMultiline;
-            } else {
-                return false;
-            }
-        },
-        hasParent() {
-            return !(
-                this.thirdparty.parent === null ||
-                this.thirdparty.parent === undefined
-            );
-        },
-        getProfession() {
-            let profession = [];
-            if (this.hasParent && this.thirdparty.profession) {
-                profession.push(this.thirdparty.profession);
-                return profession;
-            }
+    getProfession() {
+      let profession = [];
+      if (this.hasParent && this.thirdparty.profession) {
+        profession.push(this.thirdparty.profession);
+        return profession;
+      }
 
-            if (!this.hasParent && this.thirdparty.category) {
-                profession = this.thirdparty.category.map(
-                    (category) => category.text,
-                );
-            }
+      if (!this.hasParent && this.thirdparty.category) {
+        profession = this.thirdparty.category.map((category) => category.text);
+      }
 
-            return profession;
-        },
-        /* TODO need backend normalizer to serve children without circular reference
+      return profession;
+    },
+    /* TODO need backend normalizer to serve children without circular reference
     hasChildren() {
         //console.log(this.thirdparty.activeChildren.length > 0)
         return false
     } */
-    },
+  },
 };
 </script>
 
 <style lang="scss">
 .name {
-    &:before {
-        content: " ";
-    }
+  &:before {
+    content: " ";
+  }
 
-    &.tparty-parent {
-        font-weight: bold;
-        font-variant: all-small-caps;
-    }
+  &.tparty-parent {
+    font-weight: bold;
+    font-variant: all-small-caps;
+  }
 }
 
 .list-professions {
-    &::after {
-        content: " | ";
-    }
+  &::after {
+    content: " | ";
+  }
 
-    &:last-child::after {
-        content: "";
-    }
+  &:last-child::after {
+    content: "";
+  }
 }
 </style>
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyText.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyText.vue
index 2214605e2..dfd46efd9 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyText.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyText.vue
@@ -1,28 +1,28 @@
 <template>
-    <span v-if="isCut">{{ cutText }}</span>
-    <span v-else class="thirdparty-text">
-        <span class="firstname">{{ thirdparty.text }}</span>
-    </span>
+  <span v-if="isCut">{{ cutText }}</span>
+  <span v-else class="thirdparty-text">
+    <span class="firstname">{{ thirdparty.text }}</span>
+  </span>
 </template>
 
 <script>
 export default {
-    name: "ThirdPartyText",
-    props: {
-        thirdparty: {
-            required: true,
-        },
-        isCut: {
-            type: Boolean,
-            required: false,
-            default: false,
-        },
+  name: "ThirdPartyText",
+  props: {
+    thirdparty: {
+      required: true,
     },
-    computed: {
-        cutText: function () {
-            let more = this.thirdparty.text.length > 15 ? "…" : "";
-            return this.thirdparty.text.slice(0, 15) + more;
-        },
+    isCut: {
+      type: Boolean,
+      required: false,
+      default: false,
     },
+  },
+  computed: {
+    cutText: function () {
+      let more = this.thirdparty.text.length > 15 ? "…" : "";
+      return this.thirdparty.text.slice(0, 15) + more;
+    },
+  },
 };
 </script>
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
index eab1db50b..e3b2338bd 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
@@ -1,266 +1,252 @@
 <template>
-    <div v-if="action === 'show'">
-        <div class="flex-table">
-            <third-party-render-box
-                :thirdparty="thirdparty"
-                :options="{
-                    addInfo: true,
-                    addEntity: true,
-                    entityDisplayLong: true,
-                    addAltNames: true,
-                    addId: true,
-                    addLink: false,
-                    addAge: false,
-                    hLevel: 3,
-                    addCenter: true,
-                    addNoData: true,
-                    isMultiline: true,
-                }"
-            />
-        </div>
+  <div v-if="action === 'show'">
+    <div class="flex-table">
+      <third-party-render-box
+        :thirdparty="thirdparty"
+        :options="{
+          addInfo: true,
+          addEntity: true,
+          entityDisplayLong: true,
+          addAltNames: true,
+          addId: true,
+          addLink: false,
+          addAge: false,
+          hLevel: 3,
+          addCenter: true,
+          addNoData: true,
+          isMultiline: true,
+        }"
+      />
     </div>
-    <div
-        v-else-if="
-            action === 'edit' || action === 'create' || action === 'addContact'
-        "
-    >
-        <div v-if="parent">
-            <div class="parent-info">
-                <i class="fa fa-li fa-hand-o-right" />
-                <b class="me-2">{{ trans(THIRDPARTY_MESSAGES_CHILD_OF) }}</b>
-                <span class="chill-entity badge-thirdparty">{{
-                    parent.text
-                }}</span>
-            </div>
-        </div>
-        <div class="form-floating mb-3" v-else-if="kind.value !== 'child'">
-            <div class="form-check">
-                <input
-                    class="form-check-input mt-0"
-                    type="radio"
-                    v-model="kind.value"
-                    value="company"
-                    id="tpartyKindInstitution"
-                />
-                <label for="tpartyKindInstitution" class="required">
-                    <badge-entity
-                        :entity="{ type: 'thirdparty', kind: 'company' }"
-                        :options="{ displayLong: true }"
-                    />
-                </label>
-            </div>
-            <div class="form-check">
-                <input
-                    class="form-check-input mt-0"
-                    type="radio"
-                    v-model="kind.value"
-                    value="contact"
-                    id="tpartyKindContact"
-                />
-                <label for="tpartyKindContact" class="required">
-                    <badge-entity
-                        :entity="{ type: 'thirdparty', kind: 'contact' }"
-                        :options="{ displayLong: true }"
-                    />
-                </label>
-            </div>
-        </div>
-        <div v-else>
-            <p>Contact de&nbsp;:</p>
-            <third-party-render-box
-                :thirdparty="thirdparty.parent"
-                :options="{
-                    addInfo: true,
-                    addEntity: false,
-                    addAltNames: true,
-                    addId: false,
-                    addLink: false,
-                    addAge: false,
-                    hLevel: 4,
-                    addCenter: false,
-                    addNoData: true,
-                    isMultiline: false,
-                }"
-            />
-        </div>
-
-        <div
-            v-if="thirdparty.kind === 'child' || thirdparty.kind === 'contact'"
-        >
-            <div class="child-info">
-                <div class="input-group mb-3 input-section">
-                    <select
-                        class="form-select form-select-lg"
-                        id="civility"
-                        v-model="thirdparty.civility"
-                    >
-                        <option selected disabled :value="null">
-                            {{ trans(THIRDPARTY_MESSAGES_THIRDPARTY_CIVILITY) }}
-                        </option>
-                        <option
-                            v-for="civility in civilities"
-                            :key="civility.id"
-                            :value="civility"
-                        >
-                            {{ localizeString(civility.name) }}
-                        </option>
-                    </select>
-                </div>
-                <div class="input-group mb-3 input-section">
-                    <input
-                        class="form-control form-control-lg"
-                        v-model="thirdparty.profession"
-                        :placeholder="
-                            trans(THIRDPARTY_MESSAGES_THIRDPARTY_PROFESSION)
-                        "
-                        :aria-label="
-                            trans(THIRDPARTY_MESSAGES_THIRDPARTY_PROFESSION)
-                        "
-                        aria-describedby="profession"
-                    />
-                </div>
-            </div>
-            <div class="child-info">
-                <div class="input-section">
-                    <div class="form-floating mb-3">
-                        <input
-                            class="form-control form-control-lg"
-                            id="firstname"
-                            v-model="thirdparty.firstname"
-                            :placeholder="
-                                trans(THIRDPARTY_MESSAGES_THIRDPARTY_FIRSTNAME)
-                            "
-                        />
-                        <label for="firstname">{{
-                            trans(THIRDPARTY_MESSAGES_THIRDPARTY_FIRSTNAME)
-                        }}</label>
-                    </div>
-                    <div v-if="queryItems">
-                        <ul class="list-suggest add-items inline">
-                            <li
-                                v-for="(qi, i) in queryItems"
-                                :key="i"
-                                @click="addQueryItem('firstName', qi)"
-                            >
-                                <span class="person-text">{{ qi }}</span>
-                            </li>
-                        </ul>
-                    </div>
-                </div>
-                <div class="input-section">
-                    <div class="form-floating mb-3">
-                        <input
-                            class="form-control form-control-lg"
-                            id="name"
-                            v-model="thirdparty.name"
-                            :placeholder="
-                                trans(THIRDPARTY_MESSAGES_THIRDPARTY_LASTNAME)
-                            "
-                        />
-                        <label for="name">{{
-                            trans(THIRDPARTY_MESSAGES_THIRDPARTY_LASTNAME)
-                        }}</label>
-                    </div>
-                    <div v-if="queryItems">
-                        <ul class="list-suggest add-items inline">
-                            <li
-                                v-for="(qi, i) in queryItems"
-                                :key="i"
-                                @click="addQueryItem('name', qi)"
-                            >
-                                <span class="person-text">{{ qi }}</span>
-                            </li>
-                        </ul>
-                    </div>
-                </div>
-            </div>
-        </div>
-
-        <div v-if="thirdparty.kind === 'company'">
-            <div class="form-floating mb-3">
-                <input
-                    class="form-control form-control-lg"
-                    id="name"
-                    v-model="thirdparty.name"
-                    :placeholder="trans(THIRDPARTY_MESSAGES_THIRDPARTY_NAME)"
-                />
-                <label for="name">{{
-                    trans(THIRDPARTY_MESSAGES_THIRDPARTY_NAME)
-                }}</label>
-            </div>
-            <div v-if="query">
-                <ul class="list-suggest add-items inline">
-                    <li @click="addQuery(query)">
-                        <span class="person-text">{{ query }}</span>
-                    </li>
-                </ul>
-            </div>
-        </div>
-
-        <template v-if="thirdparty.kind !== 'child'">
-            <AddAddress
-                key="thirdparty"
-                :context="context"
-                :options="addAddress.options"
-                :address-changed-callback="submitAddress"
-                ref="addAddress"
-            />
-        </template>
-
-        <div class="input-group mb-3">
-            <span class="input-group-text" id="email"
-                ><i class="fa fa-fw fa-envelope"
-            /></span>
-            <input
-                class="form-control form-control-lg"
-                v-model="thirdparty.email"
-                :placeholder="trans(THIRDPARTY_MESSAGES_THIRDPARTY_EMAIL)"
-                :aria-label="trans(THIRDPARTY_MESSAGES_THIRDPARTY_EMAIL)"
-                aria-describedby="email"
-            />
-        </div>
-
-        <div class="input-group mb-3">
-            <span class="input-group-text" id="phonenumber"
-                ><i class="fa fa-fw fa-phone"
-            /></span>
-            <input
-                class="form-control form-control-lg"
-                v-model="thirdparty.telephone"
-                :placeholder="trans(THIRDPARTY_MESSAGES_THIRDPARTY_PHONENUMBER)"
-                :aria-label="trans(THIRDPARTY_MESSAGES_THIRDPARTY_PHONENUMBER)"
-                aria-describedby="phonenumber"
-            />
-        </div>
-
-        <div class="input-group mb-3">
-            <span class="input-group-text" id="phonenumber2"
-                ><i class="fa fa-fw fa-phone"
-            /></span>
-            <input
-                class="form-control form-control-lg"
-                v-model="thirdparty.telephone2"
-                :placeholder="
-                    trans(THIRDPARTY_MESSAGES_THIRDPARTY_PHONENUMBER2)
-                "
-                :aria-label="trans(THIRDPARTY_MESSAGES_THIRDPARTY_PHONENUMBER2)"
-                aria-describedby="phonenumber2"
-            />
-        </div>
-
-        <div v-if="parent">
-            <div class="input-group mb-3">
-                <span class="input-group-text" id="comment"
-                    ><i class="fa fa-fw fa-pencil"
-                /></span>
-                <textarea
-                    class="form-control form-control-lg"
-                    :placeholder="trans(THIRDPARTY_MESSAGES_THIRDPARTY_COMMENT)"
-                    v-model="thirdparty.comment"
-                />
-            </div>
-        </div>
+  </div>
+  <div
+    v-else-if="
+      action === 'edit' || action === 'create' || action === 'addContact'
+    "
+  >
+    <div v-if="parent">
+      <div class="parent-info">
+        <i class="fa fa-li fa-hand-o-right" />
+        <b class="me-2">{{ trans(THIRDPARTY_MESSAGES_CHILD_OF) }}</b>
+        <span class="chill-entity badge-thirdparty">{{ parent.text }}</span>
+      </div>
     </div>
+    <div class="form-floating mb-3" v-else-if="kind.value !== 'child'">
+      <div class="form-check">
+        <input
+          class="form-check-input mt-0"
+          type="radio"
+          v-model="kind.value"
+          value="company"
+          id="tpartyKindInstitution"
+        />
+        <label for="tpartyKindInstitution" class="required">
+          <badge-entity
+            :entity="{ type: 'thirdparty', kind: 'company' }"
+            :options="{ displayLong: true }"
+          />
+        </label>
+      </div>
+      <div class="form-check">
+        <input
+          class="form-check-input mt-0"
+          type="radio"
+          v-model="kind.value"
+          value="contact"
+          id="tpartyKindContact"
+        />
+        <label for="tpartyKindContact" class="required">
+          <badge-entity
+            :entity="{ type: 'thirdparty', kind: 'contact' }"
+            :options="{ displayLong: true }"
+          />
+        </label>
+      </div>
+    </div>
+    <div v-else>
+      <p>Contact de&nbsp;:</p>
+      <third-party-render-box
+        :thirdparty="thirdparty.parent"
+        :options="{
+          addInfo: true,
+          addEntity: false,
+          addAltNames: true,
+          addId: false,
+          addLink: false,
+          addAge: false,
+          hLevel: 4,
+          addCenter: false,
+          addNoData: true,
+          isMultiline: false,
+        }"
+      />
+    </div>
+
+    <div v-if="thirdparty.kind === 'child' || thirdparty.kind === 'contact'">
+      <div class="child-info">
+        <div class="input-group mb-3 input-section">
+          <select
+            class="form-select form-select-lg"
+            id="civility"
+            v-model="thirdparty.civility"
+          >
+            <option selected disabled :value="null">
+              {{ trans(THIRDPARTY_MESSAGES_THIRDPARTY_CIVILITY) }}
+            </option>
+            <option
+              v-for="civility in civilities"
+              :key="civility.id"
+              :value="civility"
+            >
+              {{ localizeString(civility.name) }}
+            </option>
+          </select>
+        </div>
+        <div class="input-group mb-3 input-section">
+          <input
+            class="form-control form-control-lg"
+            v-model="thirdparty.profession"
+            :placeholder="trans(THIRDPARTY_MESSAGES_THIRDPARTY_PROFESSION)"
+            :aria-label="trans(THIRDPARTY_MESSAGES_THIRDPARTY_PROFESSION)"
+            aria-describedby="profession"
+          />
+        </div>
+      </div>
+      <div class="child-info">
+        <div class="input-section">
+          <div class="form-floating mb-3">
+            <input
+              class="form-control form-control-lg"
+              id="firstname"
+              v-model="thirdparty.firstname"
+              :placeholder="trans(THIRDPARTY_MESSAGES_THIRDPARTY_FIRSTNAME)"
+            />
+            <label for="firstname">{{
+              trans(THIRDPARTY_MESSAGES_THIRDPARTY_FIRSTNAME)
+            }}</label>
+          </div>
+          <div v-if="queryItems">
+            <ul class="list-suggest add-items inline">
+              <li
+                v-for="(qi, i) in queryItems"
+                :key="i"
+                @click="addQueryItem('firstName', qi)"
+              >
+                <span class="person-text">{{ qi }}</span>
+              </li>
+            </ul>
+          </div>
+        </div>
+        <div class="input-section">
+          <div class="form-floating mb-3">
+            <input
+              class="form-control form-control-lg"
+              id="name"
+              v-model="thirdparty.name"
+              :placeholder="trans(THIRDPARTY_MESSAGES_THIRDPARTY_LASTNAME)"
+            />
+            <label for="name">{{
+              trans(THIRDPARTY_MESSAGES_THIRDPARTY_LASTNAME)
+            }}</label>
+          </div>
+          <div v-if="queryItems">
+            <ul class="list-suggest add-items inline">
+              <li
+                v-for="(qi, i) in queryItems"
+                :key="i"
+                @click="addQueryItem('name', qi)"
+              >
+                <span class="person-text">{{ qi }}</span>
+              </li>
+            </ul>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div v-if="thirdparty.kind === 'company'">
+      <div class="form-floating mb-3">
+        <input
+          class="form-control form-control-lg"
+          id="name"
+          v-model="thirdparty.name"
+          :placeholder="trans(THIRDPARTY_MESSAGES_THIRDPARTY_NAME)"
+        />
+        <label for="name">{{
+          trans(THIRDPARTY_MESSAGES_THIRDPARTY_NAME)
+        }}</label>
+      </div>
+      <div v-if="query">
+        <ul class="list-suggest add-items inline">
+          <li @click="addQuery(query)">
+            <span class="person-text">{{ query }}</span>
+          </li>
+        </ul>
+      </div>
+    </div>
+
+    <template v-if="thirdparty.kind !== 'child'">
+      <AddAddress
+        key="thirdparty"
+        :context="context"
+        :options="addAddress.options"
+        :address-changed-callback="submitAddress"
+        ref="addAddress"
+      />
+    </template>
+
+    <div class="input-group mb-3">
+      <span class="input-group-text" id="email"
+        ><i class="fa fa-fw fa-envelope"
+      /></span>
+      <input
+        class="form-control form-control-lg"
+        v-model="thirdparty.email"
+        :placeholder="trans(THIRDPARTY_MESSAGES_THIRDPARTY_EMAIL)"
+        :aria-label="trans(THIRDPARTY_MESSAGES_THIRDPARTY_EMAIL)"
+        aria-describedby="email"
+      />
+    </div>
+
+    <div class="input-group mb-3">
+      <span class="input-group-text" id="phonenumber"
+        ><i class="fa fa-fw fa-phone"
+      /></span>
+      <input
+        class="form-control form-control-lg"
+        v-model="thirdparty.telephone"
+        :placeholder="trans(THIRDPARTY_MESSAGES_THIRDPARTY_PHONENUMBER)"
+        :aria-label="trans(THIRDPARTY_MESSAGES_THIRDPARTY_PHONENUMBER)"
+        aria-describedby="phonenumber"
+      />
+    </div>
+
+    <div class="input-group mb-3">
+      <span class="input-group-text" id="phonenumber2"
+        ><i class="fa fa-fw fa-phone"
+      /></span>
+      <input
+        class="form-control form-control-lg"
+        v-model="thirdparty.telephone2"
+        :placeholder="trans(THIRDPARTY_MESSAGES_THIRDPARTY_PHONENUMBER2)"
+        :aria-label="trans(THIRDPARTY_MESSAGES_THIRDPARTY_PHONENUMBER2)"
+        aria-describedby="phonenumber2"
+      />
+    </div>
+
+    <div v-if="parent">
+      <div class="input-group mb-3">
+        <span class="input-group-text" id="comment"
+          ><i class="fa fa-fw fa-pencil"
+        /></span>
+        <textarea
+          class="form-control form-control-lg"
+          :placeholder="trans(THIRDPARTY_MESSAGES_THIRDPARTY_COMMENT)"
+          v-model="thirdparty.comment"
+        />
+      </div>
+    </div>
+  </div>
 </template>
 
 <script setup>
@@ -272,17 +258,17 @@ import BadgeEntity from "ChillMainAssets/vuejs/_components/BadgeEntity.vue";
 import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
 import { localizeString as _localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
 import {
-    trans,
-    THIRDPARTY_MESSAGES_THIRDPARTY_FIRSTNAME,
-    THIRDPARTY_MESSAGES_THIRDPARTY_LASTNAME,
-    THIRDPARTY_MESSAGES_THIRDPARTY_NAME,
-    THIRDPARTY_MESSAGES_THIRDPARTY_EMAIL,
-    THIRDPARTY_MESSAGES_THIRDPARTY_PHONENUMBER,
-    THIRDPARTY_MESSAGES_THIRDPARTY_PHONENUMBER2,
-    THIRDPARTY_MESSAGES_THIRDPARTY_COMMENT,
-    THIRDPARTY_MESSAGES_THIRDPARTY_PROFESSION,
-    THIRDPARTY_MESSAGES_THIRDPARTY_CIVILITY,
-    THIRDPARTY_MESSAGES_CHILD_OF,
+  trans,
+  THIRDPARTY_MESSAGES_THIRDPARTY_FIRSTNAME,
+  THIRDPARTY_MESSAGES_THIRDPARTY_LASTNAME,
+  THIRDPARTY_MESSAGES_THIRDPARTY_NAME,
+  THIRDPARTY_MESSAGES_THIRDPARTY_EMAIL,
+  THIRDPARTY_MESSAGES_THIRDPARTY_PHONENUMBER,
+  THIRDPARTY_MESSAGES_THIRDPARTY_PHONENUMBER2,
+  THIRDPARTY_MESSAGES_THIRDPARTY_COMMENT,
+  THIRDPARTY_MESSAGES_THIRDPARTY_PROFESSION,
+  THIRDPARTY_MESSAGES_THIRDPARTY_CIVILITY,
+  THIRDPARTY_MESSAGES_CHILD_OF,
 } from "translator";
 // Props
 const props = defineProps(["id", "type", "action", "query", "parent"]);
@@ -292,175 +278,173 @@ const { proxy } = getCurrentInstance();
 
 // State
 const thirdparty = reactive({
-    type: "thirdparty",
-    address: null,
-    kind: "company",
-    firstname: "",
-    name: "",
-    telephone: "",
-    telephone2: "",
-    civility: null,
-    profession: "",
-    comment: "",
-    parent: props.parent ? props.parent : undefined,
+  type: "thirdparty",
+  address: null,
+  kind: "company",
+  firstname: "",
+  name: "",
+  telephone: "",
+  telephone2: "",
+  civility: null,
+  profession: "",
+  comment: "",
+  parent: props.parent ? props.parent : undefined,
 });
 const civilities = ref([]);
 const addAddress = reactive({
-    options: {
-        openPanesInModal: true,
-        onlyButton: false,
-        button: {
-            size: "btn-sm",
-        },
-        title: {
-            create: "add_an_address_title",
-            edit: "edit_address",
-        },
+  options: {
+    openPanesInModal: true,
+    onlyButton: false,
+    button: {
+      size: "btn-sm",
     },
+    title: {
+      create: "add_an_address_title",
+      edit: "edit_address",
+    },
+  },
 });
 const addAddressRef = ref(null);
 
 // Kind as computed ref
 const kind = computed({
-    get() {
-        return thirdparty.kind !== undefined ? thirdparty.kind : "company";
-    },
-    set(v) {
-        thirdparty.kind = v;
-    },
+  get() {
+    return thirdparty.kind !== undefined ? thirdparty.kind : "company";
+  },
+  set(v) {
+    thirdparty.kind = v;
+  },
 });
 
 // Context as computed
 const context = computed(() => {
-    let ctx = {
-        target: {
-            name: props.type,
-            id: props.id,
-        },
-        edit: false,
-        addressId: null,
-        defaults: window.addaddress,
-    };
-    if (
-        !(thirdparty.address === undefined || thirdparty.address === null) &&
-        thirdparty.address.address_id !== null
-    ) {
-        ctx.addressId = thirdparty.address.address_id;
-        ctx.edit = true;
-    }
-    return ctx;
+  let ctx = {
+    target: {
+      name: props.type,
+      id: props.id,
+    },
+    edit: false,
+    addressId: null,
+    defaults: window.addaddress,
+  };
+  if (
+    !(thirdparty.address === undefined || thirdparty.address === null) &&
+    thirdparty.address.address_id !== null
+  ) {
+    ctx.addressId = thirdparty.address.address_id;
+    ctx.edit = true;
+  }
+  return ctx;
 });
 
 // Query items
 const queryItems = computed(() =>
-    props.query ? props.query.split(" ") : null,
+  props.query ? props.query.split(" ") : null,
 );
 
 // Methods
 function localizeString(str) {
-    return _localizeString(str);
+  return _localizeString(str);
 }
 
 function loadData() {
-    return getThirdparty(props.id).then(
-        (tp) =>
-            new Promise((resolve) => {
-                Object.assign(thirdparty, tp);
-                thirdparty.kind = tp.kind;
-                if (props.action !== "show") {
-                    if (tp.address !== null && addAddressRef.value) {
-                        addAddressRef.value.getInitialAddress(
-                            tp.address.address_id,
-                        );
-                    }
-                }
-                resolve();
-            }),
-    );
+  return getThirdparty(props.id).then(
+    (tp) =>
+      new Promise((resolve) => {
+        Object.assign(thirdparty, tp);
+        thirdparty.kind = tp.kind;
+        if (props.action !== "show") {
+          if (tp.address !== null && addAddressRef.value) {
+            addAddressRef.value.getInitialAddress(tp.address.address_id);
+          }
+        }
+        resolve();
+      }),
+  );
 }
 
 function loadCivilities() {
-    const url = `/api/1.0/main/civility.json`;
-    return makeFetch("GET", url)
-        .then((response) => {
-            civilities.value = response.results;
-            return Promise.resolve();
-        })
-        .catch((error) => {
-            console.log(error);
-            proxy.$toast.open({ message: error.body });
-        });
+  const url = `/api/1.0/main/civility.json`;
+  return makeFetch("GET", url)
+    .then((response) => {
+      civilities.value = response.results;
+      return Promise.resolve();
+    })
+    .catch((error) => {
+      console.log(error);
+      proxy.$toast.open({ message: error.body });
+    });
 }
 
 function submitAddress(payload) {
-    if (typeof payload.addressId !== "undefined") {
-        context.value.edit = true;
-        context.value.addressId = payload.addressId;
-        thirdparty.address = payload.address;
-    }
+  if (typeof payload.addressId !== "undefined") {
+    context.value.edit = true;
+    context.value.addressId = payload.addressId;
+    thirdparty.address = payload.address;
+  }
 }
 
 function addQueryItem(field, queryItem) {
-    switch (field) {
-        case "name":
-            if (thirdparty.name) {
-                thirdparty.name += ` ${queryItem}`;
-            } else {
-                thirdparty.name = queryItem;
-            }
-            break;
-        case "firstName":
-            thirdparty.firstname = queryItem;
-            break;
-    }
+  switch (field) {
+    case "name":
+      if (thirdparty.name) {
+        thirdparty.name += ` ${queryItem}`;
+      } else {
+        thirdparty.name = queryItem;
+      }
+      break;
+    case "firstName":
+      thirdparty.firstname = queryItem;
+      break;
+  }
 }
 
 function addQuery(query) {
-    thirdparty.name = query;
+  thirdparty.name = query;
 }
 
 // Lifecycle
 onMounted(() => {
-    let dependencies = [];
-    dependencies.push(loadCivilities());
-    if (props.action !== "create") {
-        if (props.id) {
-            dependencies.push(loadData());
-        }
-        if (props.action === "addContact") {
-            thirdparty.kind = "child";
-            thirdparty.address = null;
-        }
-    } else {
-        thirdparty.kind = "company";
+  let dependencies = [];
+  dependencies.push(loadCivilities());
+  if (props.action !== "create") {
+    if (props.id) {
+      dependencies.push(loadData());
     }
+    if (props.action === "addContact") {
+      thirdparty.kind = "child";
+      thirdparty.address = null;
+    }
+  } else {
+    thirdparty.kind = "company";
+  }
 });
 </script>
 
 <style lang="scss" scoped>
 div.flex-table {
-    div.item-bloc {
-        div.item-row {
-            div.item-col:last-child {
-                justify-content: flex-start;
-            }
-        }
+  div.item-bloc {
+    div.item-row {
+      div.item-col:last-child {
+        justify-content: flex-start;
+      }
     }
+  }
 }
 dl {
-    dd {
-        margin-left: 1em;
-    }
+  dd {
+    margin-left: 1em;
+  }
 }
 .parent-info {
-    margin-bottom: 1rem;
+  margin-bottom: 1rem;
 }
 
 .child-info {
-    display: flex;
-    justify-content: space-between;
-    .input-section {
-        width: 49%;
-    }
+  display: flex;
+  justify-content: space-between;
+  .input-section {
+    width: 49%;
+  }
 }
 </style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
index ec52ce9ee..eb9166074 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
@@ -1,10 +1,10 @@
 <template>
-    <banner-component :ticket="ticket" />
-    <div class="container-xxl pt-1" style="padding-bottom: 55px">
-        <ticket-selector-component :tickets="[]" />
-        <ticket-history-list-component :history="ticketHistory" />
-    </div>
-    <action-toolbar-component />
+  <banner-component :ticket="ticket" />
+  <div class="container-xxl pt-1" style="padding-bottom: 55px">
+    <ticket-selector-component :tickets="[]" />
+    <ticket-history-list-component :history="ticketHistory" />
+  </div>
+  <action-toolbar-component />
 </template>
 <script setup lang="ts">
 import { useToast } from "vue-toast-notification";
@@ -30,14 +30,14 @@ const ticket = computed(() => store.getters.getTicket as Ticket);
 const ticketHistory = computed(() => store.getters.getDistinctAddressesHistory);
 
 onMounted(async () => {
-    try {
-        await store.dispatch("fetchMotives");
-        await store.dispatch("fetchUserGroups");
-        await store.dispatch("fetchUsers");
-        await store.dispatch("getSuggestedPersons");
-    } catch (error) {
-        toast.error(error as string);
-    }
+  try {
+    await store.dispatch("fetchMotives");
+    await store.dispatch("fetchUserGroups");
+    await store.dispatch("fetchUsers");
+    await store.dispatch("getSuggestedPersons");
+  } catch (error) {
+    toast.error(error as string);
+  }
 });
 </script>
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
index 5eaade60d..259a8aed9 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
@@ -1,152 +1,127 @@
 <template>
-    <div class="fixed-bottom">
-        <div class="footer-ticket-details" v-if="activeTab">
-            <div class="tab-content p-2">
-                <button
-                    type="button"
-                    class="btn btn-link p-0"
-                    style="
-                        position: absolute;
-                        top: 0.5rem;
-                        right: 0.5rem;
-                        font-size: 2rem;
-                        line-height: 1;
-                        color: #888;
-                        text-decoration: none;
-                    "
-                    @click="closeAllActions"
-                    aria-label="Fermer"
-                    title="Fermer"
-                >
-                    <span aria-hidden="true">&times;</span>
-                </button>
-                <div v-if="activeTabTitle">
-                    <label class="col-form-label">
-                        {{ activeTabTitle }}
-                    </label>
-                </div>
+  <div class="fixed-bottom">
+    <div class="footer-ticket-details" v-if="activeTab">
+      <div class="tab-content p-2">
+        <button
+          type="button"
+          class="btn btn-link p-0"
+          style="
+            position: absolute;
+            top: 0.5rem;
+            right: 0.5rem;
+            font-size: 2rem;
+            line-height: 1;
+            color: #888;
+            text-decoration: none;
+          "
+          @click="closeAllActions"
+          aria-label="Fermer"
+          title="Fermer"
+        >
+          <span aria-hidden="true">&times;</span>
+        </button>
+        <div v-if="activeTabTitle">
+          <label class="col-form-label">
+            {{ activeTabTitle }}
+          </label>
+        </div>
 
-                <form @submit.prevent="submitAction">
-                    <add-comment-component
-                        v-model="content"
-                        v-if="activeTab === 'add_comment'"
-                    />
-                    <addressee-selector-component
-                        v-model="addressees"
-                        :suggested="userGroups"
-                        v-if="activeTab === 'addressees_state'"
-                    />
+        <form @submit.prevent="submitAction">
+          <add-comment-component
+            v-model="content"
+            v-if="activeTab === 'add_comment'"
+          />
+          <addressee-selector-component
+            v-model="addressees"
+            :suggested="userGroups"
+            v-if="activeTab === 'addressees_state'"
+          />
 
-                    <motive-selector-component
-                        v-model="motive"
-                        :motives="motives"
-                        v-if="activeTab === 'set_motive'"
-                    />
-                    <div v-if="activeTab === 'persons_state'">
-                        <div class="row">
-                            <label class="col col-form-label">
-                                {{
-                                    trans(
-                                        CHILL_TICKET_TICKET_SET_PERSONS_TITLE_CALLER,
-                                    )
-                                }}
-                            </label>
-                            <label class="col col-form-label">
-                                {{
-                                    trans(
-                                        CHILL_TICKET_TICKET_SET_PERSONS_TITLE_PERSON,
-                                    )
-                                }}
-                            </label>
-                        </div>
-                        <div class="row">
-                            <div class="col">
-                                <caller-selector-component
-                                    v-model="caller"
-                                    :suggested="[]"
-                                />
-                            </div>
-                            <div class="col">
-                                <persons-selector-component
-                                    v-model="persons"
-                                    :suggested="suggestedPersons"
-                                />
-                            </div>
-                        </div>
-                    </div>
-
-                    <ul class="record_actions sticky-form-buttons">
-                        <li>
-                            <button class="btn btn-save" type="submit">
-                                {{
-                                    trans(
-                                        CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_SAVE,
-                                    )
-                                }}
-                            </button>
-                        </li>
-                    </ul>
-                </form>
+          <motive-selector-component
+            v-model="motive"
+            :motives="motives"
+            v-if="activeTab === 'set_motive'"
+          />
+          <div v-if="activeTab === 'persons_state'">
+            <div class="row">
+              <label class="col col-form-label">
+                {{ trans(CHILL_TICKET_TICKET_SET_PERSONS_TITLE_CALLER) }}
+              </label>
+              <label class="col col-form-label">
+                {{ trans(CHILL_TICKET_TICKET_SET_PERSONS_TITLE_PERSON) }}
+              </label>
             </div>
-        </div>
-        <div class="footer-ticket-main">
-            <ul class="nav nav-tabs justify-content-end">
-                <li v-if="hasReturnPath" class="nav-item p-2 go-back">
-                    <a :href="returnPath" class="btn btn-cancel">Annuler</a>
-                </li>
-                <li v-else class="nav-item p-2 go-back">
-                    <button
-                        type="button"
-                        class="btn btn-link p-0"
-                        style="font-size: 1.5rem; line-height: 1; color: #888"
-                        @click="closeAllActions"
-                        aria-label="Fermer"
-                        title="Fermer"
-                    >
-                        <span aria-hidden="true">&times;</span>
-                    </button>
-                    >
-                </li>
-                <li
-                    v-for="btn in actionButtons"
-                    :key="btn.key"
-                    class="nav-item p-2"
-                >
-                    <button
-                        type="button"
-                        :class="`btn ${activeTab === btn.key ? 'btn-primary' : 'btn-light'}`"
-                        @click="
-                            activeTab === btn.key
-                                ? (activeTab = '')
-                                : (activeTab = btn.key)
-                        "
-                        :disabled="btn.disabled.value"
-                    >
-                        <i :class="actionIcons[btn.key]" />
-                        {{ trans(btn.label) }}
-                    </button>
-                </li>
-                <li class="nav-item p-2">
-                    <button
-                        type="button"
-                        class="btn btn-light"
-                        @click="isOpen ? closeTicket() : reopenTicket()"
-                    >
-                        <i :class="actionIcons['state_change']"></i>
-                        {{
-                            isOpen
-                                ? trans(
-                                      CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CLOSE,
-                                  )
-                                : trans(
-                                      CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_REOPEN,
-                                  )
-                        }}
-                    </button>
-                </li>
-            </ul>
-        </div>
+            <div class="row">
+              <div class="col">
+                <caller-selector-component v-model="caller" :suggested="[]" />
+              </div>
+              <div class="col">
+                <persons-selector-component
+                  v-model="persons"
+                  :suggested="suggestedPersons"
+                />
+              </div>
+            </div>
+          </div>
+
+          <ul class="record_actions sticky-form-buttons">
+            <li>
+              <button class="btn btn-save" type="submit">
+                {{ trans(CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_SAVE) }}
+              </button>
+            </li>
+          </ul>
+        </form>
+      </div>
     </div>
+    <div class="footer-ticket-main">
+      <ul class="nav nav-tabs justify-content-end">
+        <li v-if="hasReturnPath" class="nav-item p-2 go-back">
+          <a :href="returnPath" class="btn btn-cancel">Annuler</a>
+        </li>
+        <li v-else class="nav-item p-2 go-back">
+          <button
+            type="button"
+            class="btn btn-link p-0"
+            style="font-size: 1.5rem; line-height: 1; color: #888"
+            @click="closeAllActions"
+            aria-label="Fermer"
+            title="Fermer"
+          >
+            <span aria-hidden="true">&times;</span>
+          </button>
+          >
+        </li>
+        <li v-for="btn in actionButtons" :key="btn.key" class="nav-item p-2">
+          <button
+            type="button"
+            :class="`btn ${activeTab === btn.key ? 'btn-primary' : 'btn-light'}`"
+            @click="
+              activeTab === btn.key ? (activeTab = '') : (activeTab = btn.key)
+            "
+            :disabled="btn.disabled.value"
+          >
+            <i :class="actionIcons[btn.key]" />
+            {{ trans(btn.label) }}
+          </button>
+        </li>
+        <li class="nav-item p-2">
+          <button
+            type="button"
+            class="btn btn-light"
+            @click="isOpen ? closeTicket() : reopenTicket()"
+          >
+            <i :class="actionIcons['state_change']"></i>
+            {{
+              isOpen
+                ? trans(CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CLOSE)
+                : trans(CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_REOPEN)
+            }}
+          </button>
+        </li>
+      </ul>
+    </div>
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -163,33 +138,33 @@ import CallerSelectorComponent from "./CallerSelectorComponent.vue";
 
 // Translations
 import {
-    trans,
-    CHILL_TICKET_TICKET_ADD_ADDRESSEE_TITLE,
-    CHILL_TICKET_TICKET_ADD_ADDRESSEE_ERROR,
-    CHILL_TICKET_TICKET_ADD_ADDRESSEE_SUCCESS,
-    CHILL_TICKET_TICKET_ADD_COMMENT_TITLE,
-    CHILL_TICKET_TICKET_ADD_COMMENT_ERROR,
-    CHILL_TICKET_TICKET_ADD_COMMENT_SUCCESS,
-    CHILL_TICKET_TICKET_SET_MOTIVE_TITLE,
-    CHILL_TICKET_TICKET_SET_MOTIVE_ERROR,
-    CHILL_TICKET_TICKET_SET_MOTIVE_SUCCESS,
-    CHILL_TICKET_TICKET_SET_PERSONS_TITLE_PERSON,
-    CHILL_TICKET_TICKET_SET_PERSONS_TITLE_CALLER,
-    CHILL_TICKET_TICKET_SET_PERSONS_TITLE,
-    CHILL_TICKET_TICKET_SET_PERSONS_SUCCESS,
-    CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_SAVE,
-    CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CLOSE,
-    CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CLOSE_SUCCESS,
-    CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CLOSE_ERROR,
-    CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_REOPEN,
-    CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_REOPEN_SUCCESS,
-    CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_REOPEN_ERROR,
+  trans,
+  CHILL_TICKET_TICKET_ADD_ADDRESSEE_TITLE,
+  CHILL_TICKET_TICKET_ADD_ADDRESSEE_ERROR,
+  CHILL_TICKET_TICKET_ADD_ADDRESSEE_SUCCESS,
+  CHILL_TICKET_TICKET_ADD_COMMENT_TITLE,
+  CHILL_TICKET_TICKET_ADD_COMMENT_ERROR,
+  CHILL_TICKET_TICKET_ADD_COMMENT_SUCCESS,
+  CHILL_TICKET_TICKET_SET_MOTIVE_TITLE,
+  CHILL_TICKET_TICKET_SET_MOTIVE_ERROR,
+  CHILL_TICKET_TICKET_SET_MOTIVE_SUCCESS,
+  CHILL_TICKET_TICKET_SET_PERSONS_TITLE_PERSON,
+  CHILL_TICKET_TICKET_SET_PERSONS_TITLE_CALLER,
+  CHILL_TICKET_TICKET_SET_PERSONS_TITLE,
+  CHILL_TICKET_TICKET_SET_PERSONS_SUCCESS,
+  CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_SAVE,
+  CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CLOSE,
+  CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CLOSE_SUCCESS,
+  CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CLOSE_ERROR,
+  CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_REOPEN,
+  CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_REOPEN_SUCCESS,
+  CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_REOPEN_ERROR,
 } from "translator";
 
 // Types
 import {
-    UserGroup,
-    UserGroupOrUser,
+  UserGroup,
+  UserGroupOrUser,
 } from "../../../../../../../ChillMainBundle/Resources/public/types";
 import { Comment, Motive, Ticket } from "../../../types";
 import { Person } from "ChillPersonAssets/types";
@@ -201,43 +176,43 @@ const activeTab = ref("" as string);
 const actionIcons = ref(store.getters.getActionIcons);
 
 const activeTabTitle = computed((): string => {
-    switch (activeTab.value) {
-        case "add_comment":
-            return trans(CHILL_TICKET_TICKET_ADD_COMMENT_TITLE);
-        case "set_motive":
-            return trans(CHILL_TICKET_TICKET_SET_MOTIVE_TITLE);
-        case "addressees_state":
-            return trans(CHILL_TICKET_TICKET_ADD_ADDRESSEE_TITLE);
-        default:
-            return "";
-    }
+  switch (activeTab.value) {
+    case "add_comment":
+      return trans(CHILL_TICKET_TICKET_ADD_COMMENT_TITLE);
+    case "set_motive":
+      return trans(CHILL_TICKET_TICKET_SET_MOTIVE_TITLE);
+    case "addressees_state":
+      return trans(CHILL_TICKET_TICKET_ADD_ADDRESSEE_TITLE);
+    default:
+      return "";
+  }
 });
 
 const actionButtons = [
-    {
-        key: "set_motive",
-        label: CHILL_TICKET_TICKET_SET_MOTIVE_TITLE,
-        icon: computed(() => actionIcons.value["set_motive"]),
-        disabled: computed(() => !isOpen.value),
-    },
-    {
-        key: "add_comment",
-        label: CHILL_TICKET_TICKET_ADD_COMMENT_TITLE,
-        icon: computed(() => actionIcons.value["add_comment"]),
-        disabled: computed(() => !isOpen.value),
-    },
-    {
-        key: "addressees_state",
-        label: CHILL_TICKET_TICKET_ADD_ADDRESSEE_TITLE,
-        icon: computed(() => actionIcons.value["addressees_state"]),
-        disabled: computed(() => !isOpen.value),
-    },
-    {
-        key: "persons_state",
-        label: CHILL_TICKET_TICKET_SET_PERSONS_TITLE,
-        icon: computed(() => actionIcons.value["persons_state"]),
-        disabled: computed(() => !isOpen.value),
-    },
+  {
+    key: "set_motive",
+    label: CHILL_TICKET_TICKET_SET_MOTIVE_TITLE,
+    icon: computed(() => actionIcons.value["set_motive"]),
+    disabled: computed(() => !isOpen.value),
+  },
+  {
+    key: "add_comment",
+    label: CHILL_TICKET_TICKET_ADD_COMMENT_TITLE,
+    icon: computed(() => actionIcons.value["add_comment"]),
+    disabled: computed(() => !isOpen.value),
+  },
+  {
+    key: "addressees_state",
+    label: CHILL_TICKET_TICKET_ADD_ADDRESSEE_TITLE,
+    icon: computed(() => actionIcons.value["addressees_state"]),
+    disabled: computed(() => !isOpen.value),
+  },
+  {
+    key: "persons_state",
+    label: CHILL_TICKET_TICKET_SET_PERSONS_TITLE,
+    icon: computed(() => actionIcons.value["persons_state"]),
+    disabled: computed(() => !isOpen.value),
+  },
 ];
 
 const ticket = computed(() => store.getters.getTicket as Ticket);
@@ -247,25 +222,25 @@ const userGroups = computed(() => store.getters.getUserGroups as UserGroup[]);
 const suggestedPersons = computed(() => store.getters.getPersons as Person[]);
 console.log("suggestedPersons", suggestedPersons.value);
 const hasReturnPath = computed((): boolean => {
-    const params = new URL(document.location.toString()).searchParams;
-    return params.has("returnPath");
+  const params = new URL(document.location.toString()).searchParams;
+  return params.has("returnPath");
 });
 
 const returnPath = computed((): string => {
-    const params = new URL(document.location.toString()).searchParams;
-    const returnPath = params.get("returnPath");
+  const params = new URL(document.location.toString()).searchParams;
+  const returnPath = params.get("returnPath");
 
-    if (null === returnPath) {
-        throw new Error(
-            "there isn't any returnPath, please check the existence before",
-        );
-    }
+  if (null === returnPath) {
+    throw new Error(
+      "there isn't any returnPath, please check the existence before",
+    );
+  }
 
-    return returnPath;
+  return returnPath;
 });
 
 const motive = ref(
-    ticket.value.currentMotive ? ticket.value.currentMotive : ({} as Motive),
+  ticket.value.currentMotive ? ticket.value.currentMotive : ({} as Motive),
 );
 const content = ref("" as Comment["content"]);
 const addressees = ref(ticket.value.currentAddressees as UserGroupOrUser[]);
@@ -273,117 +248,109 @@ const persons = ref(ticket.value.currentPersons as Person[]);
 const caller = ref(ticket.value.caller as Person);
 
 async function submitAction() {
-    try {
-        switch (activeTab.value) {
-            case "add_comment":
-                if (!content.value) {
-                    toast.error(trans(CHILL_TICKET_TICKET_ADD_COMMENT_ERROR));
-                } else {
-                    await store.dispatch("createComment", {
-                        ticketId: ticket.value.id,
-                        content: content.value,
-                    });
-                    content.value = "";
-                    activeTab.value = "";
-                    toast.success(
-                        trans(CHILL_TICKET_TICKET_ADD_COMMENT_SUCCESS),
-                    );
-                }
-                break;
-            case "set_motive":
-                if (!motive.value.id) {
-                    toast.error(trans(CHILL_TICKET_TICKET_SET_MOTIVE_ERROR));
-                } else {
-                    await store.dispatch("createMotive", {
-                        ticketId: ticket.value.id,
-                        motive: motive.value,
-                    });
-                    activeTab.value = "";
-                    toast.success(
-                        trans(CHILL_TICKET_TICKET_SET_MOTIVE_SUCCESS),
-                    );
-                }
-                break;
-            case "addressees_state":
-                if (!addressees.value.length) {
-                    toast.error(trans(CHILL_TICKET_TICKET_ADD_ADDRESSEE_ERROR));
-                } else {
-                    await store.dispatch("setAdressees", {
-                        ticketId: ticket.value.id,
-                        addressees: addressees.value,
-                    });
-                    activeTab.value = "";
-                    toast.success(
-                        trans(CHILL_TICKET_TICKET_ADD_ADDRESSEE_SUCCESS),
-                    );
-                }
-                break;
-            case "persons_state":
-                await store.dispatch("setPersons", {
-                    persons: persons.value,
-                });
-                activeTab.value = "";
-                toast.success(trans(CHILL_TICKET_TICKET_SET_PERSONS_SUCCESS));
-                break;
+  try {
+    switch (activeTab.value) {
+      case "add_comment":
+        if (!content.value) {
+          toast.error(trans(CHILL_TICKET_TICKET_ADD_COMMENT_ERROR));
+        } else {
+          await store.dispatch("createComment", {
+            ticketId: ticket.value.id,
+            content: content.value,
+          });
+          content.value = "";
+          activeTab.value = "";
+          toast.success(trans(CHILL_TICKET_TICKET_ADD_COMMENT_SUCCESS));
         }
-    } catch (error) {
-        toast.error(error as string);
+        break;
+      case "set_motive":
+        if (!motive.value.id) {
+          toast.error(trans(CHILL_TICKET_TICKET_SET_MOTIVE_ERROR));
+        } else {
+          await store.dispatch("createMotive", {
+            ticketId: ticket.value.id,
+            motive: motive.value,
+          });
+          activeTab.value = "";
+          toast.success(trans(CHILL_TICKET_TICKET_SET_MOTIVE_SUCCESS));
+        }
+        break;
+      case "addressees_state":
+        if (!addressees.value.length) {
+          toast.error(trans(CHILL_TICKET_TICKET_ADD_ADDRESSEE_ERROR));
+        } else {
+          await store.dispatch("setAdressees", {
+            ticketId: ticket.value.id,
+            addressees: addressees.value,
+          });
+          activeTab.value = "";
+          toast.success(trans(CHILL_TICKET_TICKET_ADD_ADDRESSEE_SUCCESS));
+        }
+        break;
+      case "persons_state":
+        await store.dispatch("setPersons", {
+          persons: persons.value,
+        });
+        activeTab.value = "";
+        toast.success(trans(CHILL_TICKET_TICKET_SET_PERSONS_SUCCESS));
+        break;
     }
+  } catch (error) {
+    toast.error(error as string);
+  }
 }
 
 async function closeTicket() {
-    try {
-        await store.dispatch("closeTicket");
-        closeAllActions();
-        toast.success(trans(CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CLOSE_SUCCESS));
-    } catch (error) {
-        console.error(error);
-        toast.success(trans(CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CLOSE_ERROR));
-    }
+  try {
+    await store.dispatch("closeTicket");
+    closeAllActions();
+    toast.success(trans(CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CLOSE_SUCCESS));
+  } catch (error) {
+    console.error(error);
+    toast.success(trans(CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CLOSE_ERROR));
+  }
 }
 
 async function reopenTicket() {
-    try {
-        await store.dispatch("reopenTicket");
-        toast.success(
-            trans(CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_REOPEN_SUCCESS),
-        );
-    } catch (error) {
-        console.error(error);
-        toast.error(trans(CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_REOPEN_ERROR));
-    }
+  try {
+    await store.dispatch("reopenTicket");
+    toast.success(trans(CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_REOPEN_SUCCESS));
+  } catch (error) {
+    console.error(error);
+    toast.error(trans(CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_REOPEN_ERROR));
+  }
 }
 
 function closeAllActions() {
-    activeTab.value = "";
+  activeTab.value = "";
 }
 
 watch(caller, async (newCaller) => {
-    await store.dispatch("setCaller", { caller: newCaller });
-    await store.dispatch("getSuggestedPersons");
+  await store.dispatch("setCaller", { caller: newCaller });
+  await store.dispatch("getSuggestedPersons");
 });
 </script>
 
 <style lang="scss" scoped>
 .go-back {
-    margin-right: auto;
+  margin-right: auto;
 }
 
 .sticky-form-buttons {
-    margin-top: 0px;
-    background: none;
+  margin-top: 0px;
+  background: none;
 }
 div.footer-ticket-main {
-    background: none repeat scroll 0 0 #cabb9f;
+  background: none repeat scroll 0 0 #cabb9f;
 }
 
 div.footer-ticket-details {
-    background: none repeat scroll 0 0 #efe2ca;
+  background: none repeat scroll 0 0 #efe2ca;
 }
 
 .fixed-bottom {
-    position: sticky;
-    top: 0;
-    overflow: hidden;
+  position: sticky;
+  top: 0;
+  overflow: hidden;
 }
 </style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddCommentComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddCommentComponent.vue
index c105dce5f..6cc3c42fe 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddCommentComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddCommentComponent.vue
@@ -1,9 +1,9 @@
 <template>
-    <div class="row">
-        <div class="col-12">
-            <comment-editor v-model="content" />
-        </div>
+  <div class="row">
+    <div class="col-12">
+      <comment-editor v-model="content" />
     </div>
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -11,16 +11,16 @@ import { ref, watch } from "vue";
 import CommentEditor from "ChillMainAssets/vuejs/_components/CommentEditor/CommentEditor.vue";
 
 const props = defineProps<{
-    modelValue?: string;
+  modelValue?: string;
 }>();
 
 const emit =
-    defineEmits<(e: "update:modelValue", value: string | undefined) => void>();
+  defineEmits<(e: "update:modelValue", value: string | undefined) => void>();
 
 const content = ref(props.modelValue);
 
 watch(content, (value) => {
-    emit("update:modelValue", value);
+  emit("update:modelValue", value);
 });
 </script>
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeComponent.vue
index 1e17e6f87..085d62e49 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeComponent.vue
@@ -1,29 +1,29 @@
 <template>
-    <div class="col-12">
-        <span
-            v-for="userGroup in userGroupLevels"
-            :key="userGroup.id"
-            class="badge-user-group"
-            :style="`background-color: ${userGroup.backgroundColor}; color: ${userGroup.foregroundColor};`"
-        >
-            {{ userGroup.label.fr }}
-        </span>
-    </div>
-    <div class="col-12">
-        <span
-            v-for="userGroup in userGroups"
-            :key="userGroup.id"
-            class="badge-user-group"
-            :style="`background-color: ${userGroup.backgroundColor}; color: ${userGroup.foregroundColor};`"
-        >
-            {{ userGroup.label.fr }}
-        </span>
-    </div>
-    <div v-if="users.length > 0" class="col-12">
-        <span class="badge-user" v-for="user in users" :key="user.id">
-            <user-render-box-badge :user="user" />
-        </span>
-    </div>
+  <div class="col-12">
+    <span
+      v-for="userGroup in userGroupLevels"
+      :key="userGroup.id"
+      class="badge-user-group"
+      :style="`background-color: ${userGroup.backgroundColor}; color: ${userGroup.foregroundColor};`"
+    >
+      {{ userGroup.label.fr }}
+    </span>
+  </div>
+  <div class="col-12">
+    <span
+      v-for="userGroup in userGroups"
+      :key="userGroup.id"
+      class="badge-user-group"
+      :style="`background-color: ${userGroup.backgroundColor}; color: ${userGroup.foregroundColor};`"
+    >
+      {{ userGroup.label.fr }}
+    </span>
+  </div>
+  <div v-if="users.length > 0" class="col-12">
+    <span class="badge-user" v-for="user in users" :key="user.id">
+      <user-render-box-badge :user="user" />
+    </span>
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -34,35 +34,34 @@ import UserRenderBoxBadge from "ChillMainAssets/vuejs/_components/Entity/UserRen
 
 // Types
 import {
-    User,
-    UserGroup,
-    UserGroupOrUser,
+  User,
+  UserGroup,
+  UserGroupOrUser,
 } from "../../../../../../../ChillMainBundle/Resources/public/types";
 
 const props = defineProps<{ addressees: UserGroupOrUser[] }>();
 
 const userGroups = computed(
-    () =>
-        props.addressees.filter(
-            (addressee: UserGroupOrUser) =>
-                addressee.type == "user_group" && addressee.excludeKey == "",
-        ) as UserGroup[],
+  () =>
+    props.addressees.filter(
+      (addressee: UserGroupOrUser) =>
+        addressee.type == "user_group" && addressee.excludeKey == "",
+    ) as UserGroup[],
 );
 
 const userGroupLevels = computed(
-    () =>
-        props.addressees.filter(
-            (addressee: UserGroupOrUser) =>
-                addressee.type == "user_group" &&
-                addressee.excludeKey == "level",
-        ) as UserGroup[],
+  () =>
+    props.addressees.filter(
+      (addressee: UserGroupOrUser) =>
+        addressee.type == "user_group" && addressee.excludeKey == "level",
+    ) as UserGroup[],
 );
 
 const users = computed(
-    () =>
-        props.addressees.filter(
-            (addressee: UserGroupOrUser) => addressee.type == "user",
-        ) as User[],
+  () =>
+    props.addressees.filter(
+      (addressee: UserGroupOrUser) => addressee.type == "user",
+    ) as User[],
 );
 </script>
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/MotiveSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/MotiveSelectorComponent.vue
index cff382f03..fc97772cb 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/MotiveSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/MotiveSelectorComponent.vue
@@ -1,25 +1,25 @@
 <template>
-    <div class="row">
-        <div class="col-12">
-            <vue-multiselect
-                name="selectMotive"
-                id="selectMotive"
-                label="label"
-                :custom-label="customLabel"
-                track-by="id"
-                open-direction="top"
-                :multiple="false"
-                :searchable="true"
-                :placeholder="trans(CHILL_TICKET_TICKET_SET_MOTIVE_LABEL)"
-                :select-label="trans(MULTISELECT_SELECT_LABEL)"
-                :deselect-label="trans(MULTISELECT_DESELECT_LABEL)"
-                :selected-label="trans(MULTISELECT_SELECTED_LABEL)"
-                :options="motives"
-                v-model="motive"
-                class="mb-4"
-            />
-        </div>
+  <div class="row">
+    <div class="col-12">
+      <vue-multiselect
+        name="selectMotive"
+        id="selectMotive"
+        label="label"
+        :custom-label="customLabel"
+        track-by="id"
+        open-direction="top"
+        :multiple="false"
+        :searchable="true"
+        :placeholder="trans(CHILL_TICKET_TICKET_SET_MOTIVE_LABEL)"
+        :select-label="trans(MULTISELECT_SELECT_LABEL)"
+        :deselect-label="trans(MULTISELECT_DESELECT_LABEL)"
+        :selected-label="trans(MULTISELECT_SELECTED_LABEL)"
+        :options="motives"
+        v-model="motive"
+        class="mb-4"
+      />
     </div>
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -31,41 +31,41 @@ import { Motive } from "../../../types";
 
 // Translations
 import {
-    trans,
-    CHILL_TICKET_TICKET_SET_MOTIVE_LABEL,
-    MULTISELECT_SELECT_LABEL,
-    MULTISELECT_DESELECT_LABEL,
-    MULTISELECT_SELECTED_LABEL,
+  trans,
+  CHILL_TICKET_TICKET_SET_MOTIVE_LABEL,
+  MULTISELECT_SELECT_LABEL,
+  MULTISELECT_DESELECT_LABEL,
+  MULTISELECT_SELECTED_LABEL,
 } from "translator";
 
 const props = defineProps<{
-    modelValue?: Motive;
-    motives: Motive[];
+  modelValue?: Motive;
+  motives: Motive[];
 }>();
 
 const emit =
-    defineEmits<(e: "update:modelValue", value: Motive | undefined) => void>();
+  defineEmits<(e: "update:modelValue", value: Motive | undefined) => void>();
 
 const motive = ref(props.modelValue);
 
 watch(motive, (val) => {
-    emit("update:modelValue", val);
+  emit("update:modelValue", val);
 });
 
 watch(
-    () => props.modelValue,
-    (val) => {
-        motive.value = val;
-    },
+  () => props.modelValue,
+  (val) => {
+    motive.value = val;
+  },
 );
 
 function customLabel(motive: Motive) {
-    return motive?.label?.fr ?? trans(CHILL_TICKET_TICKET_SET_MOTIVE_LABEL);
+  return motive?.label?.fr ?? trans(CHILL_TICKET_TICKET_SET_MOTIVE_LABEL);
 }
 </script>
 
 <style lang="scss" scoped>
 #selectMotive {
-    margin-bottom: 1.5em;
+  margin-bottom: 1.5em;
 }
 </style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PersonsSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PersonsSelectorComponent.vue
index 0e0a55b32..9d2dd9f6b 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PersonsSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PersonsSelectorComponent.vue
@@ -1,16 +1,16 @@
 <template>
-    <pick-entity
-        uniqid="ticket-person-selector"
-        :types="['person']"
-        :picked="selectedEntities"
-        :suggested="suggestedValues"
-        :multiple="false"
-        :removable-if-set="true"
-        :display-picked="true"
-        :label="trans(CHILL_TICKET_TICKET_SET_PERSONS_USER_LABEL)"
-        @add-new-entity="addNewEntity"
-        @remove-entity="removeEntity"
-    />
+  <pick-entity
+    uniqid="ticket-person-selector"
+    :types="['person']"
+    :picked="selectedEntities"
+    :suggested="suggestedValues"
+    :multiple="false"
+    :removable-if-set="true"
+    :display-picked="true"
+    :label="trans(CHILL_TICKET_TICKET_SET_PERSONS_USER_LABEL)"
+    @add-new-entity="addNewEntity"
+    @remove-entity="removeEntity"
+  />
 </template>
 
 <script setup lang="ts">
@@ -26,66 +26,65 @@ import { Entities } from "ChillPersonAssets/types";
 import { trans, CHILL_TICKET_TICKET_SET_PERSONS_USER_LABEL } from "translator";
 
 const props = defineProps<{
-    modelValue: Entities[];
-    suggested: Entities[];
+  modelValue: Entities[];
+  suggested: Entities[];
 }>();
 const emit = defineEmits<{
-    "update:modelValue": [value: Entities[]];
+  "update:modelValue": [value: Entities[]];
 }>();
 
 const selectedEntities = ref<Entities[]>([...props.modelValue]);
 const suggestedValues = ref<Entities[]>([...props.suggested]);
 
 watch(
-    () => [props.suggested, props.modelValue],
-    () => {
-        suggestedValues.value = props.suggested.filter(
-            (suggested: Entities) =>
-                !props.modelValue.some(
-                    (selected: Entities) =>
-                        suggested.id === selected.id &&
-                        suggested.type === selected.type,
-                ),
-        );
-    },
-    { immediate: true, deep: true },
+  () => [props.suggested, props.modelValue],
+  () => {
+    suggestedValues.value = props.suggested.filter(
+      (suggested: Entities) =>
+        !props.modelValue.some(
+          (selected: Entities) =>
+            suggested.id === selected.id && suggested.type === selected.type,
+        ),
+    );
+  },
+  { immediate: true, deep: true },
 );
 
 function addNewEntity({ entity }: { entity: Entities }) {
-    selectedEntities.value.push(entity);
-    emit("update:modelValue", selectedEntities.value);
+  selectedEntities.value.push(entity);
+  emit("update:modelValue", selectedEntities.value);
 }
 
 function removeEntity({ entity }: { entity: Entities }) {
-    const index = selectedEntities.value.findIndex(
-        (selectedEntity) => selectedEntity === entity,
-    );
-    if (index !== -1) {
-        selectedEntities.value.splice(index, 1);
-    }
-    emit("update:modelValue", selectedEntities.value);
+  const index = selectedEntities.value.findIndex(
+    (selectedEntity) => selectedEntity === entity,
+  );
+  if (index !== -1) {
+    selectedEntities.value.splice(index, 1);
+  }
+  emit("update:modelValue", selectedEntities.value);
 }
 </script>
 <style scoped lang="scss">
 ul.person-list {
-    list-style-type: none;
+  list-style-type: none;
 
-    & > li {
-        display: inline-block;
-        border: 1px solid transparent;
-        border-radius: 6px;
+  & > li {
+    display: inline-block;
+    border: 1px solid transparent;
+    border-radius: 6px;
 
-        button.remove-person {
-            opacity: 10%;
-        }
+    button.remove-person {
+      opacity: 10%;
     }
+  }
 
-    & > li:hover {
-        border: 1px solid white;
+  & > li:hover {
+    border: 1px solid white;
 
-        button.remove-person {
-            opacity: 100%;
-        }
+    button.remove-person {
+      opacity: 100%;
     }
+  }
 }
 </style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent.vue
index f3b67e318..7a690e9b9 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent.vue
@@ -1,7 +1,7 @@
 <template>
-    <div class="col-12">
-        <addressee-component :addressees="addresseeState.addressees" />
-    </div>
+  <div class="col-12">
+    <addressee-component :addressees="addresseeState.addressees" />
+  </div>
 </template>
 <script setup lang="ts">
 // Types
@@ -11,7 +11,7 @@ import { AddresseeState } from "../../../types";
 import AddresseeComponent from "./AddresseeComponent.vue";
 
 defineProps<{
-    addresseeState: AddresseeState;
+  addresseeState: AddresseeState;
 }>();
 </script>
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCommentComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCommentComponent.vue
index aad593b23..63b13b8dc 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCommentComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCommentComponent.vue
@@ -1,9 +1,9 @@
 <template>
-    <div class="col-12">
-        <blockquote class="chill-user-quote">
-            <p v-html="convertMarkdownToHtml(commentHistory.content)"></p>
-        </blockquote>
-    </div>
+  <div class="col-12">
+    <blockquote class="chill-user-quote">
+      <p v-html="convertMarkdownToHtml(commentHistory.content)"></p>
+    </blockquote>
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -16,30 +16,30 @@ import { Comment } from "../../../types";
 defineProps<{ commentHistory: Comment }>();
 
 const preprocess = (markdown: string): string => {
-    return markdown;
+  return markdown;
 };
 
 const postprocess = (html: string): string => {
-    DOMPurify.addHook("afterSanitizeAttributes", (node: Element) => {
-        if ("target" in node) {
-            node.setAttribute("target", "_blank");
-            node.setAttribute("rel", "noopener noreferrer");
-        }
-        if (
-            !node.hasAttribute("target") &&
-            (node.hasAttribute("xlink:href") || node.hasAttribute("href"))
-        ) {
-            node.setAttribute("xlink:show", "new");
-        }
-    });
+  DOMPurify.addHook("afterSanitizeAttributes", (node: Element) => {
+    if ("target" in node) {
+      node.setAttribute("target", "_blank");
+      node.setAttribute("rel", "noopener noreferrer");
+    }
+    if (
+      !node.hasAttribute("target") &&
+      (node.hasAttribute("xlink:href") || node.hasAttribute("href"))
+    ) {
+      node.setAttribute("xlink:show", "new");
+    }
+  });
 
-    return DOMPurify.sanitize(html);
+  return DOMPurify.sanitize(html);
 };
 
 const convertMarkdownToHtml = (markdown: string): string => {
-    marked.use({ hooks: { postprocess, preprocess } });
-    const rawHtml = marked(markdown) as string;
-    return rawHtml;
+  marked.use({ hooks: { postprocess, preprocess } });
+  const rawHtml = marked(markdown) as string;
+  return rawHtml;
 };
 </script>
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCreateComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCreateComponent.vue
index 5f22875f9..fc67467e3 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCreateComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCreateComponent.vue
@@ -1,5 +1,5 @@
 <template>
-    <p>Ticket créé par {{ props.by.text }}</p>
+  <p>Ticket créé par {{ props.by.text }}</p>
 </template>
 
 <script setup lang="ts">
@@ -7,7 +7,7 @@
 import { User } from "../../../../../../../ChillMainBundle/Resources/public/types";
 
 interface TicketHistoryCreateComponentConfig {
-    by: User;
+  by: User;
 }
 
 const props = defineProps<TicketHistoryCreateComponentConfig>();
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryEmergencyComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryEmergencyComponent.vue
index 00f275f37..3efb42333 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryEmergencyComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryEmergencyComponent.vue
@@ -1,15 +1,15 @@
 <template>
-    <div>
-        <span
-            class="badge rounded-pill me-1 mx-2"
-            :class="{
-                'bg-danger': new_emergency === 'yes',
-                'bg-secondary': new_emergency === 'no',
-            }"
-        >
-            {{ trans(CHILL_TICKET_TICKET_BANNER_EMERGENCY) }}
-        </span>
-    </div>
+  <div>
+    <span
+      class="badge rounded-pill me-1 mx-2"
+      :class="{
+        'bg-danger': new_emergency === 'yes',
+        'bg-secondary': new_emergency === 'no',
+      }"
+    >
+      {{ trans(CHILL_TICKET_TICKET_BANNER_EMERGENCY) }}
+    </span>
+  </div>
 </template>
 <script setup lang="ts">
 import { trans, CHILL_TICKET_TICKET_BANNER_EMERGENCY } from "translator";
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryMotiveComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryMotiveComponent.vue
index 167c43fc3..34f2c6a9c 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryMotiveComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryMotiveComponent.vue
@@ -1,7 +1,7 @@
 <template>
-    <div class="col-12 fw-bolder">
-        {{ motiveHistory.motive.label.fr }}
-    </div>
+  <div class="col-12 fw-bolder">
+    {{ motiveHistory.motive.label.fr }}
+  </div>
 </template>
 
 <script lang="ts" setup>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryStateComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryStateComponent.vue
index 4527bd72c..a24c56d7b 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryStateComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryStateComponent.vue
@@ -1,19 +1,19 @@
 <template>
-    <span
-        class="badge rounded-pill me-1 mx-2"
-        :class="{
-            'bg-chill-red': props.new_state == 'closed',
-            'bg-chill-green': props.new_state == 'open',
-        }"
-    >
-        <template v-if="props.new_state == 'open'">
-            {{ trans(CHILL_TICKET_TICKET_BANNER_OPEN) }}
-        </template>
-        <template v-else-if="props.new_state == 'closed'">
-            {{ trans(CHILL_TICKET_TICKET_BANNER_CLOSED) }}
-        </template>
-    </span>
-    <!--
+  <span
+    class="badge rounded-pill me-1 mx-2"
+    :class="{
+      'bg-chill-red': props.new_state == 'closed',
+      'bg-chill-green': props.new_state == 'open',
+    }"
+  >
+    <template v-if="props.new_state == 'open'">
+      {{ trans(CHILL_TICKET_TICKET_BANNER_OPEN) }}
+    </template>
+    <template v-else-if="props.new_state == 'closed'">
+      {{ trans(CHILL_TICKET_TICKET_BANNER_CLOSED) }}
+    </template>
+  </span>
+  <!--
     <span
         class="text-chill-green mx-2"
         style="
@@ -46,9 +46,9 @@ import { StateChange } from "../../../types";
 
 // Translations
 import {
-    trans,
-    CHILL_TICKET_TICKET_BANNER_OPEN,
-    CHILL_TICKET_TICKET_BANNER_CLOSED,
+  trans,
+  CHILL_TICKET_TICKET_BANNER_OPEN,
+  CHILL_TICKET_TICKET_BANNER_CLOSED,
 } from "translator";
 const props = defineProps<StateChange>();
 </script>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketSelectorComponent.vue
index 2d532b8fd..2e66d5a8e 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketSelectorComponent.vue
@@ -1,22 +1,22 @@
 <template>
-    <div class="d-flex justify-content-end">
-        <div class="btn-group" @click="handleClick">
-            <button
-                type="button"
-                class="btn btn-light dropdown-toggle"
-                data-bs-toggle="dropdown"
-                aria-expanded="false"
-            >
-                {{ trans(CHILL_TICKET_TICKET_PREVIOUS_TICKETS) }}
-                <span
-                    class="position-absolute top-0 start-100 translate-middle badge rounded-pill bg-chill-green"
-                >
-                    {{ tickets.length }}
-                    <span class="visually-hidden">Tickets</span>
-                </span>
-            </button>
-        </div>
+  <div class="d-flex justify-content-end">
+    <div class="btn-group" @click="handleClick">
+      <button
+        type="button"
+        class="btn btn-light dropdown-toggle"
+        data-bs-toggle="dropdown"
+        aria-expanded="false"
+      >
+        {{ trans(CHILL_TICKET_TICKET_PREVIOUS_TICKETS) }}
+        <span
+          class="position-absolute top-0 start-100 translate-middle badge rounded-pill bg-chill-green"
+        >
+          {{ tickets.length }}
+          <span class="visually-hidden">Tickets</span>
+        </span>
+      </button>
     </div>
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -29,7 +29,7 @@ import { Ticket } from "../../../types";
 defineProps<{ tickets: Ticket[] }>();
 
 function handleClick() {
-    alert("Sera disponible plus tard");
+  alert("Sera disponible plus tard");
 }
 </script>
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ToggleFlags.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ToggleFlags.vue
index e9472db33..f4d4c4efa 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ToggleFlags.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ToggleFlags.vue
@@ -1,16 +1,16 @@
 <template>
-    <span class="d-block d-sm-inline-block ms-sm-3 ms-md-0">
-        <button
-            class="badge rounded-pill me-1"
-            :class="{
-                'bg-danger': isEmergency,
-                'bg-secondary': !isEmergency,
-            }"
-            @click="toggleEmergency"
-        >
-            {{ trans(CHILL_TICKET_TICKET_BANNER_EMERGENCY) }}
-        </button>
-    </span>
+  <span class="d-block d-sm-inline-block ms-sm-3 ms-md-0">
+    <button
+      class="badge rounded-pill me-1"
+      :class="{
+        'bg-danger': isEmergency,
+        'bg-secondary': !isEmergency,
+      }"
+      @click="toggleEmergency"
+    >
+      {{ trans(CHILL_TICKET_TICKET_BANNER_EMERGENCY) }}
+    </button>
+  </span>
 </template>
 
 <script lang="ts" setup>
@@ -26,42 +26,42 @@ const isEmergency = computed(() => store.getters.isEmergency);
 
 // Methods
 function toggleEmergency() {
-    store
-        .dispatch("toggleEmergency", isEmergency.value ? "no" : "yes")
-        .catch(({ name, violations }) => {
-            if (name === "ValidationException" || name === "AccessException") {
-                violations.forEach((violation: string) =>
-                    toast.open({ message: violation }),
-                );
-            } else {
-                toast.open({ message: "An error occurred" });
-            }
-        });
+  store
+    .dispatch("toggleEmergency", isEmergency.value ? "no" : "yes")
+    .catch(({ name, violations }) => {
+      if (name === "ValidationException" || name === "AccessException") {
+        violations.forEach((violation: string) =>
+          toast.open({ message: violation }),
+        );
+      } else {
+        toast.open({ message: "An error occurred" });
+      }
+    });
 }
 </script>
 
 <style lang="scss" scoped>
 a.flag-toggle {
+  color: white;
+  cursor: pointer;
+  &:hover {
     color: white;
-    cursor: pointer;
-    &:hover {
-        color: white;
-        text-decoration: underline;
-        border-radius: 20px;
-    }
-    i {
-        margin: auto 0.4em;
-    }
-    span.on {
-        font-weight: bolder;
-    }
+    text-decoration: underline;
+    border-radius: 20px;
+  }
+  i {
+    margin: auto 0.4em;
+  }
+  span.on {
+    font-weight: bolder;
+  }
 }
 button.badge {
-    &.bg-secondary {
-        opacity: 0.5;
-        &:hover {
-            opacity: 0.7;
-        }
+  &.bg-secondary {
+    opacity: 0.5;
+    &:hover {
+      opacity: 0.7;
     }
+  }
 }
 </style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts
index 03696e52a..a33de7b50 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts
@@ -7,18 +7,19 @@ import "vue-toast-notification/dist/theme-sugar.css";
 import { store } from "./store";
 
 declare global {
-    interface Window {
-        initialTicket: string;
-        ticketPersonPerTicket: 'one'|'multi';
-    }
+  interface Window {
+    initialTicket: string;
+    ticketPersonPerTicket: "one" | "multi";
+  }
 }
 
 const _app = createApp({
-    template: "<app></app>",
+  template: "<app></app>",
 });
 
-_app.use(store)
-    .use(VueToast)
-    .provide("toast", _app.config.globalProperties.$toast)
-    .component("app", App)
-    .mount("#ticketRoot");
+_app
+  .use(store)
+  .use(VueToast)
+  .provide("toast", _app.config.globalProperties.$toast)
+  .component("app", App)
+  .mount("#ticketRoot");
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts
index b300c682c..6ddcdb4b3 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts
@@ -6,19 +6,19 @@ import { State as AddresseeStates, moduleAddressee } from "./modules/addressee";
 import { State as PersonsState, modulePersons } from "./modules/persons";
 
 export interface RootState {
-    motive: MotiveStates;
-    ticket: TicketStates;
-    comment: CommentStates;
-    addressee: AddresseeStates;
-    persons: PersonsState;
+  motive: MotiveStates;
+  ticket: TicketStates;
+  comment: CommentStates;
+  addressee: AddresseeStates;
+  persons: PersonsState;
 }
 
 export const store = createStore<RootState>({
-    modules: {
-        motive: moduleMotive,
-        ticket: moduleTicket,
-        comment: moduleComment,
-        addressee: moduleAddressee,
-        persons: modulePersons,
-    },
+  modules: {
+    motive: moduleMotive,
+    ticket: moduleTicket,
+    comment: moduleComment,
+    addressee: moduleAddressee,
+    persons: modulePersons,
+  },
 });
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/addressee.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/addressee.ts
index a6c00253a..09917ae25 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/addressee.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/addressee.ts
@@ -1,88 +1,86 @@
 import {
-    fetchResults,
-    makeFetch,
+  fetchResults,
+  makeFetch,
 } from "../../../../../../../../ChillMainBundle/Resources/public/lib/api/apiMethods";
 
 import { Module } from "vuex";
 import { RootState } from "..";
 
 import {
-    ApiException,
-    User,
-    UserGroup,
-    UserGroupOrUser,
+  ApiException,
+  User,
+  UserGroup,
+  UserGroupOrUser,
 } from "../../../../../../../../ChillMainBundle/Resources/public/types";
 
 export interface State {
-    userGroups: UserGroup[];
-    users: User[];
+  userGroups: UserGroup[];
+  users: User[];
 }
 
 export const moduleAddressee: Module<State, RootState> = {
-    state: () => ({
-        userGroups: [] as UserGroup[],
-        users: [] as User[],
-    }),
-    getters: {
-        getUserGroups(state) {
-            return state.userGroups;
-        },
-        getUsers(state) {
-            return state.users;
-        },
+  state: () => ({
+    userGroups: [] as UserGroup[],
+    users: [] as User[],
+  }),
+  getters: {
+    getUserGroups(state) {
+      return state.userGroups;
     },
-    mutations: {
-        setUserGroups(state, userGroups) {
-            state.userGroups = userGroups;
-        },
-        setUsers(state, users) {
-            state.users = users;
-        },
+    getUsers(state) {
+      return state.users;
+    },
+  },
+  mutations: {
+    setUserGroups(state, userGroups) {
+      state.userGroups = userGroups;
+    },
+    setUsers(state, users) {
+      state.users = users;
+    },
+  },
+  actions: {
+    fetchUserGroups({ commit }) {
+      try {
+        fetchResults("/api/1.0/main/user-group.json").then((results) => {
+          commit("setUserGroups", results);
+        });
+      } catch (e: unknown) {
+        const error = e as ApiException;
+        throw error.name;
+      }
+    },
+    fetchUsers({ commit }) {
+      try {
+        fetchResults("/api/1.0/main/user.json").then((results) => {
+          commit("setUsers", results);
+        });
+      } catch (e: unknown) {
+        const error = e as ApiException;
+        throw error.name;
+      }
     },
-    actions: {
-        fetchUserGroups({ commit }) {
-            try {
-                fetchResults("/api/1.0/main/user-group.json").then(
-                    (results) => {
-                        commit("setUserGroups", results);
-                    },
-                );
-            } catch (e: unknown) {
-                const error = e as ApiException;
-                throw error.name;
-            }
-        },
-        fetchUsers({ commit }) {
-            try {
-                fetchResults("/api/1.0/main/user.json").then((results) => {
-                    commit("setUsers", results);
-                });
-            } catch (e: unknown) {
-                const error = e as ApiException;
-                throw error.name;
-            }
-        },
 
-        async setAdressees(
-            { commit },
-            datas: { ticketId: number; addressees: UserGroupOrUser[] },
-        ) {
-            const { ticketId, addressees } = datas;
-            try {
-                const result = await makeFetch(
-                    "POST",
-                    `/api/1.0/ticket/${ticketId}/addressees/set`,
-                    {
-                        addressees: addressees.map((addressee) => {
-                            return { id: addressee.id, type: addressee.type };
-                        }),
-                    },
-                );
-                commit("setTicket", result);
-            } catch (e: unknown) {
-                const error = e as ApiException;
-                throw error.name;
-            }
-        },
+    async setAdressees(
+      { commit },
+      datas: { ticketId: number; addressees: UserGroupOrUser[] },
+    ) {
+      const { ticketId, addressees } = datas;
+      try {
+        const result = await makeFetch(
+          "POST",
+          `/api/1.0/ticket/${ticketId}/addressees/set`,
+          {
+            addressees: addressees.map((addressee) => {
+              return { id: addressee.id, type: addressee.type };
+            }),
+          },
+        );
+        commit("setTicket", result);
+      } catch (e: unknown) {
+        const error = e as ApiException;
+        throw error.name;
+      }
     },
+  },
 };
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/comment.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/comment.ts
index 2e56ff28a..a786299f7 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/comment.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/comment.ts
@@ -7,32 +7,32 @@ import { Comment } from "../../../../types";
 import { ApiException } from "../../../../../../../../ChillMainBundle/Resources/public/types";
 
 export interface State {
-    comments: Comment[];
+  comments: Comment[];
 }
 
 export const moduleComment: Module<State, RootState> = {
-    state: () => ({
-        comments: [] as Comment[],
-    }),
-    getters: {},
-    mutations: {},
-    actions: {
-        async createComment(
-            { commit },
-            datas: { ticketId: number; content: Comment["content"] },
-        ) {
-            const { ticketId, content } = datas;
-            try {
-                const result = await makeFetch(
-                    "POST",
-                    `/api/1.0/ticket/${ticketId}/comment/add`,
-                    { content },
-                );
-                commit("setTicket", result);
-            } catch (e: unknown) {
-                const error = e as ApiException;
-                throw error.name;
-            }
-        },
+  state: () => ({
+    comments: [] as Comment[],
+  }),
+  getters: {},
+  mutations: {},
+  actions: {
+    async createComment(
+      { commit },
+      datas: { ticketId: number; content: Comment["content"] },
+    ) {
+      const { ticketId, content } = datas;
+      try {
+        const result = await makeFetch(
+          "POST",
+          `/api/1.0/ticket/${ticketId}/comment/add`,
+          { content },
+        );
+        commit("setTicket", result);
+      } catch (e: unknown) {
+        const error = e as ApiException;
+        throw error.name;
+      }
     },
+  },
 };
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/motive.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/motive.ts
index f8e775232..c2bafb97e 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/motive.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/motive.ts
@@ -1,6 +1,6 @@
 import {
-    fetchResults,
-    makeFetch,
+  fetchResults,
+  makeFetch,
 } from "../../../../../../../../ChillMainBundle/Resources/public/lib/api/apiMethods";
 
 import { Module } from "vuex";
@@ -10,57 +10,57 @@ import { Motive } from "../../../../types";
 import { ApiException } from "../../../../../../../../ChillMainBundle/Resources/public/types";
 
 export interface State {
-    motives: Motive[];
+  motives: Motive[];
 }
 
 export const moduleMotive: Module<State, RootState> = {
-    state: () => ({
-        motives: [] as Motive[],
-    }),
-    getters: {
-        getMotives(state) {
-            return state.motives;
-        },
+  state: () => ({
+    motives: [] as Motive[],
+  }),
+  getters: {
+    getMotives(state) {
+      return state.motives;
     },
-    mutations: {
-        setMotives(state, motives) {
-            state.motives = motives;
-        },
+  },
+  mutations: {
+    setMotives(state, motives) {
+      state.motives = motives;
+    },
+  },
+  actions: {
+    async fetchMotives({ commit }) {
+      try {
+        const results = (await fetchResults(
+          "/api/1.0/ticket/motive.json",
+        )) as Motive[];
+        commit("setMotives", results);
+      } catch (e: unknown) {
+        const error = e as ApiException;
+        throw error.name;
+      }
     },
-    actions: {
-        async fetchMotives({ commit }) {
-            try {
-                const results = (await fetchResults(
-                    "/api/1.0/ticket/motive.json",
-                )) as Motive[];
-                commit("setMotives", results);
-            } catch (e: unknown) {
-                const error = e as ApiException;
-                throw error.name;
-            }
-        },
 
-        async createMotive(
-            { commit },
-            datas: { ticketId: number; motive: Motive },
-        ) {
-            const { ticketId, motive } = datas;
-            try {
-                const result = await makeFetch(
-                    "POST",
-                    `/api/1.0/ticket/${ticketId}/motive/set`,
-                    {
-                        motive: {
-                            id: motive.id,
-                            type: motive.type,
-                        },
-                    },
-                );
-                commit("setTicket", result);
-            } catch (e: unknown) {
-                const error = e as ApiException;
-                throw error.name;
-            }
-        },
+    async createMotive(
+      { commit },
+      datas: { ticketId: number; motive: Motive },
+    ) {
+      const { ticketId, motive } = datas;
+      try {
+        const result = await makeFetch(
+          "POST",
+          `/api/1.0/ticket/${ticketId}/motive/set`,
+          {
+            motive: {
+              id: motive.id,
+              type: motive.type,
+            },
+          },
+        );
+        commit("setTicket", result);
+      } catch (e: unknown) {
+        const error = e as ApiException;
+        throw error.name;
+      }
     },
+  },
 };
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/persons.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/persons.ts
index be09a41a8..ae93039fb 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/persons.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/persons.ts
@@ -6,81 +6,81 @@ import { RootState } from "..";
 import { Ticket } from "../../../../types";
 
 export interface State {
-    persons: Person[];
+  persons: Person[];
 }
 
 export const modulePersons: Module<State, RootState> = {
-    state: () => ({
-        persons: [] as Person[],
-    }),
-    getters: {
-        getPersons(state) {
-            return state.persons;
-        },
+  state: () => ({
+    persons: [] as Person[],
+  }),
+  getters: {
+    getPersons(state) {
+      return state.persons;
     },
-    mutations: {
-        setPersons(state, persons: Person[]) {
-            state.persons = persons;
-        },
+  },
+  mutations: {
+    setPersons(state, persons: Person[]) {
+      state.persons = persons;
     },
-    actions: {
-        async setPersons(
-            { commit, rootState: RootState },
-            payload: { persons: Person[] },
-        ) {
-            const persons = payload.persons.map((person: Person) => ({
-                id: person.id,
-                type: person.type,
-            }));
-            try {
-                const result: Ticket = await makeFetch(
-                    "POST",
-                    `/api/1.0/ticket/${RootState.ticket.ticket.id}/persons/set`,
-                    { persons },
-                );
-                commit("setTicket", result);
+  },
+  actions: {
+    async setPersons(
+      { commit, rootState: RootState },
+      payload: { persons: Person[] },
+    ) {
+      const persons = payload.persons.map((person: Person) => ({
+        id: person.id,
+        type: person.type,
+      }));
+      try {
+        const result: Ticket = await makeFetch(
+          "POST",
+          `/api/1.0/ticket/${RootState.ticket.ticket.id}/persons/set`,
+          { persons },
+        );
+        commit("setTicket", result);
 
-                return Promise.resolve();
-            } catch (e: unknown) {
-                const error = e as ApiException;
-                throw error.name;
-            }
-        },
-        async setCaller(
-            { commit, rootState: RootState },
-            payload: { caller: Person | null },
-        ) {
-            try {
-                const caller = payload.caller
-                    ? {
-                          id: payload.caller.id,
-                          type: payload.caller.type,
-                      }
-                    : null;
-                const result: Ticket = await makeFetch(
-                    "POST",
-                    `/api/1.0/ticket/ticket/${RootState.ticket.ticket.id}/set-caller`,
-                    { caller },
-                );
-                commit("setTicket", result as Ticket);
-            } catch (e: unknown) {
-                const error = e as ApiException;
-                throw error.name;
-            }
-        },
-
-        async getSuggestedPersons({ commit, rootState: RootState }) {
-            try {
-                const ticketId = RootState.ticket.ticket.id;
-                const result: Person[] = await makeFetch(
-                    "GET",
-                    `/api/1.0/ticket/ticket/${ticketId}/suggest-person`,
-                );
-                commit("setPersons", result);
-            } catch (e: unknown) {
-                const error = e as ApiException;
-                throw error.name;
-            }
-        },
+        return Promise.resolve();
+      } catch (e: unknown) {
+        const error = e as ApiException;
+        throw error.name;
+      }
     },
+    async setCaller(
+      { commit, rootState: RootState },
+      payload: { caller: Person | null },
+    ) {
+      try {
+        const caller = payload.caller
+          ? {
+              id: payload.caller.id,
+              type: payload.caller.type,
+            }
+          : null;
+        const result: Ticket = await makeFetch(
+          "POST",
+          `/api/1.0/ticket/ticket/${RootState.ticket.ticket.id}/set-caller`,
+          { caller },
+        );
+        commit("setTicket", result as Ticket);
+      } catch (e: unknown) {
+        const error = e as ApiException;
+        throw error.name;
+      }
+    },
+
+    async getSuggestedPersons({ commit, rootState: RootState }) {
+      try {
+        const ticketId = RootState.ticket.ticket.id;
+        const result: Person[] = await makeFetch(
+          "GET",
+          `/api/1.0/ticket/ticket/${ticketId}/suggest-person`,
+        );
+        commit("setPersons", result);
+      } catch (e: unknown) {
+        const error = e as ApiException;
+        throw error.name;
+      }
+    },
+  },
 };
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
index 25acaeaed..a842d5c6e 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
@@ -6,89 +6,86 @@ import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
 import { ApiException } from "../../../../../../../../ChillMainBundle/Resources/public/types";
 
 export interface State {
-    ticket: Ticket;
-    action_icons: object;
+  ticket: Ticket;
+  action_icons: object;
 }
 
 export const moduleTicket: Module<State, RootState> = {
-    state: () => ({
-        ticket: {} as Ticket,
-        action_icons: {
-            add_person: "fa fa-user-plus",
-            add_comment: "fa fa-comment",
-            set_motive: "fa fa-paint-brush",
-            addressees_state: "fa fa-paper-plane",
-            persons_state: "fa fa-user",
-            set_caller: "fa fa-phone",
-            state_change: "",
-            emergency_change: "",
-        },
-    }),
-    getters: {
-        isOpen(state) {
-            return state.ticket.currentState === "open";
-        },
-        isEmergency(state) {
-            return state.ticket.emergency == "yes" ? true : false;
-        },
-        getTicket(state) {
-            state.ticket.history = state.ticket.history.sort((a, b) =>
-                b.at.datetime.localeCompare(a.at.datetime),
-            );
-            return state.ticket;
-        },
+  state: () => ({
+    ticket: {} as Ticket,
+    action_icons: {
+      add_person: "fa fa-user-plus",
+      add_comment: "fa fa-comment",
+      set_motive: "fa fa-paint-brush",
+      addressees_state: "fa fa-paper-plane",
+      persons_state: "fa fa-user",
+      set_caller: "fa fa-phone",
+      state_change: "",
+      emergency_change: "",
+    },
+  }),
+  getters: {
+    isOpen(state) {
+      return state.ticket.currentState === "open";
+    },
+    isEmergency(state) {
+      return state.ticket.emergency == "yes" ? true : false;
+    },
+    getTicket(state) {
+      state.ticket.history = state.ticket.history.sort((a, b) =>
+        b.at.datetime.localeCompare(a.at.datetime),
+      );
+      return state.ticket;
+    },
 
-        getActionIcons(state) {
-            return state.action_icons;
-        },
-        getDistinctAddressesHistory(state) {
-            return state.ticket.history;
-        },
+    getActionIcons(state) {
+      return state.action_icons;
     },
-    mutations: {
-        setTicket(state, ticket: Ticket) {
-            state.ticket = ticket;
-        },
+    getDistinctAddressesHistory(state) {
+      return state.ticket.history;
     },
-    actions: {
-        async closeTicket({ commit, state }) {
-            try {
-                const result: Ticket = await makeFetch(
-                    "POST",
-                    `/api/1.0/ticket/ticket/${state.ticket.id}/close`,
-                );
-                commit("setTicket", result as Ticket);
-            } catch (e: unknown) {
-                const error = e as ApiException;
-                throw error.name;
-            }
-        },
-        async reopenTicket({ commit, state }) {
-            try {
-                const result: Ticket = await makeFetch(
-                    "POST",
-                    `/api/1.0/ticket/ticket/${state.ticket.id}/open`,
-                );
-                commit("setTicket", result as Ticket);
-            } catch (e: unknown) {
-                const error = e as ApiException;
-                throw error.name;
-            }
-        },
-        async toggleEmergency(
-            { commit, state },
-            emergency: TicketEmergencyState,
-        ) {
-            try {
-                const result: Ticket = await makeFetch(
-                    "POST",
-                    `/api/1.0/ticket/ticket/${state.ticket.id}/emergency/${emergency}`,
-                );
-                commit("setTicket", result as Ticket);
-            } catch (e: unknown) {
-                const error = e as ApiException;
-                throw error.name;
-            }
-        },
+  },
+  mutations: {
+    setTicket(state, ticket: Ticket) {
+      state.ticket = ticket;
     },
+  },
+  actions: {
+    async closeTicket({ commit, state }) {
+      try {
+        const result: Ticket = await makeFetch(
+          "POST",
+          `/api/1.0/ticket/ticket/${state.ticket.id}/close`,
+        );
+        commit("setTicket", result as Ticket);
+      } catch (e: unknown) {
+        const error = e as ApiException;
+        throw error.name;
+      }
+    },
+    async reopenTicket({ commit, state }) {
+      try {
+        const result: Ticket = await makeFetch(
+          "POST",
+          `/api/1.0/ticket/ticket/${state.ticket.id}/open`,
+        );
+        commit("setTicket", result as Ticket);
+      } catch (e: unknown) {
+        const error = e as ApiException;
+        throw error.name;
+      }
+    },
+    async toggleEmergency({ commit, state }, emergency: TicketEmergencyState) {
+      try {
+        const result: Ticket = await makeFetch(
+          "POST",
+          `/api/1.0/ticket/ticket/${state.ticket.id}/emergency/${emergency}`,
+        );
+        commit("setTicket", result as Ticket);
+      } catch (e: unknown) {
+        const error = e as ApiException;
+        throw error.name;
+      }
+    },
+  },
 };
diff --git a/src/Bundle/ChillWopiBundle/src/Resources/public/module/pending/index.ts b/src/Bundle/ChillWopiBundle/src/Resources/public/module/pending/index.ts
index 584fac047..057ea6060 100644
--- a/src/Bundle/ChillWopiBundle/src/Resources/public/module/pending/index.ts
+++ b/src/Bundle/ChillWopiBundle/src/Resources/public/module/pending/index.ts
@@ -2,39 +2,39 @@ import { is_object_ready } from "ChillDocStoreAssets/vuejs/StoredObjectButton/he
 import { StoredObject } from "ChillDocStoreAssets/types";
 
 declare global {
-    interface Window {
-        stored_object: string | undefined;
-    }
+  interface Window {
+    stored_object: string | undefined;
+  }
 }
 
 async function reload_if_needed(
-    stored_object: StoredObject,
-    i: number,
+  stored_object: StoredObject,
+  i: number,
 ): Promise<void> {
-    const current_status = await is_object_ready(stored_object);
+  const current_status = await is_object_ready(stored_object);
 
-    if (stored_object.status !== current_status.status) {
-        window.location.reload();
-    }
-    wait_before_reload(stored_object, i + 1);
-    return Promise.resolve();
+  if (stored_object.status !== current_status.status) {
+    window.location.reload();
+  }
+  wait_before_reload(stored_object, i + 1);
+  return Promise.resolve();
 }
 
 function wait_before_reload(stored_object: StoredObject, i: number): void {
-    /**
-     * value of the timeout. Set to 5 sec during the first 10 minutes, then every 1 minute
-     */
-    const timeout = i < 1200 ? 5000 : 60000;
+  /**
+   * value of the timeout. Set to 5 sec during the first 10 minutes, then every 1 minute
+   */
+  const timeout = i < 1200 ? 5000 : 60000;
 
-    setTimeout(reload_if_needed, timeout, stored_object, i);
+  setTimeout(reload_if_needed, timeout, stored_object, i);
 }
 
 window.addEventListener("DOMContentLoaded", async function () {
-    if (undefined === window.stored_object) {
-        console.error("window.stored_object is undefined");
-        throw Error("window.stored_object is undefined");
-    }
+  if (undefined === window.stored_object) {
+    console.error("window.stored_object is undefined");
+    throw Error("window.stored_object is undefined");
+  }
 
-    const stored_object = JSON.parse(window.stored_object) as StoredObject;
-    reload_if_needed(stored_object, 0);
+  const stored_object = JSON.parse(window.stored_object) as StoredObject;
+  reload_if_needed(stored_object, 0);
 });
diff --git a/src/shims-vue.d.ts b/src/shims-vue.d.ts
index 8989854c7..e236dd9b8 100644
--- a/src/shims-vue.d.ts
+++ b/src/shims-vue.d.ts
@@ -1,7 +1,7 @@
 declare module "*.vue" {
-    import { defineComponent } from "vue";
+  import { defineComponent } from "vue";
 
-    const Component: ReturnType<typeof defineComponent>;
+  const Component: ReturnType<typeof defineComponent>;
 
-    export default Component;
+  export default Component;
 }
diff --git a/src/vue-multiselect.d.ts b/src/vue-multiselect.d.ts
index efce40fdc..a463890b5 100644
--- a/src/vue-multiselect.d.ts
+++ b/src/vue-multiselect.d.ts
@@ -1,14 +1,14 @@
 declare module "vue-multiselect" {
-    import { defineComponent } from "vue";
+  import { defineComponent } from "vue";
 
-    export interface VueMultiselectProps<T> {
-        options: T;
-        searchable: boolean;
-        trackBy: keyof T;
-        label: keyof T;
-    }
+  export interface VueMultiselectProps<T> {
+    options: T;
+    searchable: boolean;
+    trackBy: keyof T;
+    label: keyof T;
+  }
 
-    const Component: ReturnType<typeof defineComponent<VueMultiselectProps<T>>>;
+  const Component: ReturnType<typeof defineComponent<VueMultiselectProps<T>>>;
 
-    export default Component;
+  export default Component;
 }
diff --git a/src/vuex.d.ts b/src/vuex.d.ts
index 1edfe4fa9..ddb1d87c1 100644
--- a/src/vuex.d.ts
+++ b/src/vuex.d.ts
@@ -1,6 +1,6 @@
 declare module "vuex" {
-    export * from "vuex/types/index.d.ts";
-    export * from "vuex/types/helpers.d.ts";
-    export * from "vuex/types/logger.d.ts";
-    export * from "vuex/types/vue.d.ts";
+  export * from "vuex/types/index.d.ts";
+  export * from "vuex/types/helpers.d.ts";
+  export * from "vuex/types/logger.d.ts";
+  export * from "vuex/types/vue.d.ts";
 }

From d8bd9bd7cd7a8c7a4864a505ca24558dbb5236b3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 9 Jul 2025 18:08:04 +0200
Subject: [PATCH 144/283] Restore defaults and behaviour with pick entity on
 PickEntity.vue

---
 .../Resources/public/module/pick-entity/index.js           | 7 ++++---
 .../Resources/public/vuejs/PickEntity/PickEntity.vue       | 4 ++--
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js b/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js
index 9f6bb753e..8d9484bb1 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/pick-entity/index.js
@@ -124,9 +124,10 @@ function loadDynamicPicker(element) {
         removeEntity({ entity }) {
           if (
             -1 ===
-            this.suggested.findIndex(
-              (e) => e.type === entity.type && e.id === entity.id,
-            )
+              this.suggested.findIndex(
+                (e) => e.type === entity.type && e.id === entity.id,
+              ) &&
+            "me" !== entity
           ) {
             this.suggested.push(entity);
           }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
index 639f3c59f..1defa245d 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
@@ -1,6 +1,6 @@
 <template>
   <div class="grey-card">
-    <ul :class="listClasses" v-if="picked.length && displayPicked">
+    <ul :class="listClasses" v-if="picked.length > 0 && displayPicked">
       <li
         v-for="p in picked"
         @click="removeEntity(p)"
@@ -103,7 +103,7 @@ const props = withDefaults(
     label?: string;
     isCurrentUserPicker?: boolean;
   }>(),
-  { isCurrentUserPicker: false },
+  { isCurrentUserPicker: false, displayPicked: true, removableIfSet: true },
 );
 
 const emits = defineEmits<{

From 15d26d4b060793225b29066ff6ecee257ef85a4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 9 Jul 2025 21:57:28 +0200
Subject: [PATCH 145/283] Refactor selectItsMe and removeEntity to improve type
 annotations and code readability in PickEntity.vue

---
 .../Resources/public/vuejs/PickEntity/PickEntity.vue   | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
index 1defa245d..10d7099c8 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
@@ -167,9 +167,13 @@ const listClasses = computed(() => ({
   inline: true,
 }));
 
-const selectItsMe = (event: InputEvent) => {
+const selectItsMe = (event: InputEvent): void => {
   const target = event.target as HTMLInputElement;
-  target.checked ? addNewSuggested("me") : removeEntity("me");
+  if (target.checked) {
+    addNewSuggested("me");
+  } else {
+    removeEntity("me");
+  }
 };
 
 function addNewSuggested(entity: EntitiesOrMe) {
@@ -185,7 +189,7 @@ function addNewEntity({ selected }: addNewEntities) {
   emits("addNewEntityProcessEnded");
 }
 
-const removeEntity = (entity: EntitiesOrMe) => {
+const removeEntity = (entity: EntitiesOrMe): void => {
   if (!props.removableIfSet) return;
   if (entity === "me" && itsMeCheckbox.value) {
     itsMeCheckbox.value.checked = false;

From 538ecc42ea6144ace443576d22853bd99f24762c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 9 Jul 2025 21:57:38 +0200
Subject: [PATCH 146/283] Update `.editorconfig` for correct formatting rules
 in file patterns

---
 .editorconfig | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/.editorconfig b/.editorconfig
index bede621e3..49ea12528 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -19,11 +19,11 @@ max_line_length = 80
 [COMMIT_EDITMSG]
 max_line_length = 0
 
-[*.{js, vue, ts}]
+[*.{js,vue,ts}]
 indent_size = 2
 indent_style = space
 
-[.rst]
-ident_size = 3
-ident_style = space
+[*.rst]
+indent_size = 3
+indent_style = space
 

From 568c8be7fddf3f82e8c4570b6c12882368e8571a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 9 Jul 2025 21:57:56 +0200
Subject: [PATCH 147/283] Update baseline for eslint

---
 .eslint-baseline.json | 902 +++++++++++++++---------------------------
 package.json          |   2 +-
 2 files changed, 328 insertions(+), 576 deletions(-)

diff --git a/.eslint-baseline.json b/.eslint-baseline.json
index 6483e47b3..7b5d29c67 100644
--- a/.eslint-baseline.json
+++ b/.eslint-baseline.json
@@ -7,14 +7,6 @@
         "message": "'app' is assigned a value but never used.",
         "hash": "f8c2979921289906e3baabae31ba101ead91504f"
     },
-    {
-        "path": "src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/index.js",
-        "line": 57,
-        "column": 23,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'event' is defined but never used.",
-        "hash": "cf0cf378f71403f62a6425f384ccbbdec433d1f2"
-    },
     {
         "path": "src/Bundle/ChillCalendarBundle/Resources/public/module/Invite/answer.js",
         "line": 7,
@@ -25,19 +17,19 @@
     },
     {
         "path": "src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/Components/CalendarActive.vue",
-        "line": 19,
-        "column": 30,
+        "line": 10,
+        "column": 22,
         "ruleId": "vue/valid-v-else",
         "message": "'v-else' directives require no attribute value.",
-        "hash": "505f99b24500a684eec3c6bf870426fcd841c20b"
+        "hash": "c4d34a0df38baaf72092179b2e066c91b6f6733a"
     },
     {
         "path": "src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/Components/CalendarActive.vue",
-        "line": 54,
+        "line": 45,
         "column": 10,
         "ruleId": "@typescript-eslint/no-unused-vars",
         "message": "'mapGetters' is defined but never used.",
-        "hash": "01e3928f7d9be0accb6db3894b158dd683a685ff"
+        "hash": "8e80aff377fdd5af9686df6a89a4ba650911f02a"
     },
     {
         "path": "src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/index.js",
@@ -90,90 +82,50 @@
     {
         "path": "src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store/utils.ts",
         "line": 4,
-        "column": 5,
+        "column": 3,
         "ruleId": "@typescript-eslint/no-unused-vars",
         "message": "'DateTime' is defined but never used.",
-        "hash": "fdf38ad15813c4a931b93f4a85db985ca71105fc"
+        "hash": "88be21db222be347a0cf7f8fbfaba531d5cb0418"
     },
     {
         "path": "src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store/utils.ts",
         "line": 14,
-        "column": 27,
+        "column": 25,
         "ruleId": "@typescript-eslint/no-empty-object-type",
         "message": "The `{}` (\"empty object\") type allows any non-nullish value, including literals like `0` and `\"\"`.\n- If that's what you want, disable this lint rule with an inline comment or configure the 'allowObjectTypes' rule option.\n- If you want a type meaning \"any object\", you probably want `object` instead.\n- If you want a type meaning \"any value\", you probably want `unknown` instead.",
-        "hash": "9602ec11eda8f46ff5712d69dcd87419babcd6f0"
+        "hash": "6c1437cbb501093bde9c9f7eeda4e4853e558c1a"
     },
     {
         "path": "src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store/utils.ts",
         "line": 16,
-        "column": 20,
+        "column": 18,
         "ruleId": "@typescript-eslint/no-empty-object-type",
         "message": "The `{}` (\"empty object\") type allows any non-nullish value, including literals like `0` and `\"\"`.\n- If that's what you want, disable this lint rule with an inline comment or configure the 'allowObjectTypes' rule option.\n- If you want a type meaning \"any object\", you probably want `object` instead.\n- If you want a type meaning \"any value\", you probably want `unknown` instead.",
-        "hash": "23f7a8a1c3cba955077ddbd604bad6805ce30ad2"
+        "hash": "f03d8114bfe562d84f8160f5d122562e484b5de1"
     },
     {
         "path": "src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store/utils.ts",
         "line": 18,
-        "column": 19,
+        "column": 17,
         "ruleId": "@typescript-eslint/no-empty-object-type",
         "message": "The `{}` (\"empty object\") type allows any non-nullish value, including literals like `0` and `\"\"`.\n- If that's what you want, disable this lint rule with an inline comment or configure the 'allowObjectTypes' rule option.\n- If you want a type meaning \"any object\", you probably want `object` instead.\n- If you want a type meaning \"any value\", you probably want `unknown` instead.",
-        "hash": "abbc89e186c74d0f71f45cfda31c490339e39078"
+        "hash": "de706baa154ead33e72ce520c50cdd16a85d1265"
     },
     {
         "path": "src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Invite/Answer.vue",
-        "line": 95,
-        "column": 13,
+        "line": 86,
+        "column": 19,
         "ruleId": "@typescript-eslint/no-unused-vars",
         "message": "'payload' is defined but never used.",
-        "hash": "66c545917093ba30f1d6ca10ddaa676140e749bd"
-    },
-    {
-        "path": "src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App2.vue",
-        "line": 224,
-        "column": 10,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'reactive' is defined but never used.",
-        "hash": "96ed76a9828138fb125fc36c4b55e900bbfe87c2"
-    },
-    {
-        "path": "src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App2.vue",
-        "line": 230,
-        "column": 5,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'DropArg' is defined but never used.",
-        "hash": "bd405399a4091d65e8391404bfb0c4611816c8e0"
-    },
-    {
-        "path": "src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App2.vue",
-        "line": 251,
-        "column": 9,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'t' is assigned a value but never used.",
-        "hash": "bc09207a496405f7a71c178e522b89aeb1f7ebd3"
-    },
-    {
-        "path": "src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App2.vue",
-        "line": 356,
-        "column": 32,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'arg' is defined but never used.",
-        "hash": "aeae152f0669b946a1ad681dd52b0ef03393ae79"
-    },
-    {
-        "path": "src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App2.vue",
-        "line": 434,
-        "column": 11,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'changedEvent' is assigned a value but never used.",
-        "hash": "a7a81a6bf09d00c0364e3aa8207ffad853f0547b"
+        "hash": "8c189da3c258c22dfdd1e0a72d0f0ef5464c26eb"
     },
     {
         "path": "src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/Components/EditLocation.vue",
         "line": 77,
-        "column": 16,
+        "column": 12,
         "ruleId": "@typescript-eslint/no-unused-vars",
         "message": "'_' is defined but never used.",
-        "hash": "d29fb2fc9299c48082167b2fa4c427c569716bd6"
+        "hash": "8040b05fb0422e91d049dd0d7fb4604b4455bf5e"
     },
     {
         "path": "src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/Components/EditLocation.vue",
@@ -202,50 +154,50 @@
     {
         "path": "src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/index2.ts",
         "line": 12,
-        "column": 11,
+        "column": 9,
         "ruleId": "@typescript-eslint/no-unused-vars",
         "message": "'app' is assigned a value but never used.",
-        "hash": "6422c0876b992a3c5174faa99ef06d8339b74b4e"
+        "hash": "3ebdc6637bc62a230176a4dff37a5900061e6eed"
     },
     {
         "path": "src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/index.ts",
-        "line": 46,
-        "column": 20,
+        "line": 44,
+        "column": 74,
         "ruleId": "@typescript-eslint/no-unused-vars",
         "message": "'_' is defined but never used.",
-        "hash": "5bf7ba0b0200fb6788d50df669e6b7701f8a87bb"
+        "hash": "7ac3276b20b1029e510bcbbbc8572fc34400e204"
     },
     {
         "path": "src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/fullcalendar.ts",
         "line": 57,
-        "column": 32,
+        "column": 20,
         "ruleId": "@typescript-eslint/no-unused-vars",
         "message": "'_' is defined but never used.",
-        "hash": "a733a5edfe4c434ed63682bcbd5fe65f175a1b85"
+        "hash": "d25bbc0a04099c361d99f34b0c731892c7b008a7"
     },
     {
         "path": "src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/fullcalendar.ts",
         "line": 64,
-        "column": 32,
+        "column": 20,
         "ruleId": "@typescript-eslint/no-unused-vars",
         "message": "'_' is defined but never used.",
-        "hash": "d83b1879b5fc6179c045ad1981421f46a7cbbd56"
+        "hash": "7c53ad6034cebccfe119a1ee7dd011984a720676"
     },
     {
         "path": "src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/fullcalendar.ts",
         "line": 71,
-        "column": 32,
+        "column": 20,
         "ruleId": "@typescript-eslint/no-unused-vars",
         "message": "'_' is defined but never used.",
-        "hash": "222eed84495212735a60fa05e0c7f298c7bc33e1"
+        "hash": "110e12e976ae0f8fe15cd70b974d99ee381bb6fb"
     },
     {
         "path": "src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/fullcalendar.ts",
         "line": 72,
-        "column": 26,
+        "column": 18,
         "ruleId": "@typescript-eslint/no-unused-vars",
         "message": "'_' is defined but never used.",
-        "hash": "0cf85eccce08b65a8590f7318cace58cbb21ea08"
+        "hash": "7919b6b2becd817e0fad8c51602b0f8c2fc0f5f2"
     },
     {
         "path": "src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/me.ts",
@@ -258,90 +210,90 @@
     {
         "path": "src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue",
         "line": 108,
-        "column": 47,
+        "column": 35,
         "ruleId": "@typescript-eslint/no-unused-vars",
         "message": "'reject' is defined but never used.",
-        "hash": "1a771f9f65375cac2002ed7d706184355685d378"
+        "hash": "e57ca97296d09e44a8e19573138a4f39f7777778"
+    },
+    {
+        "path": "src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue",
+        "line": 145,
+        "column": 15,
+        "ruleId": "vue/no-mutating-props",
+        "message": "Unexpected mutation of \"users\" prop.",
+        "hash": "26378799855b04bc15aa3e030b9ede95f3139c4d"
     },
     {
         "path": "src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue",
         "line": 148,
-        "column": 29,
+        "column": 15,
         "ruleId": "vue/no-mutating-props",
-        "message": "Unexpected mutation of \"users\" prop.",
-        "hash": "d9f7e517892b6588be17516fd077c3149ccbefd9"
+        "message": "Unexpected mutation of \"calendarEvents\" prop.",
+        "hash": "279aee22cdc99740903c9fee736897a65074a8bb"
     },
     {
         "path": "src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue",
         "line": 151,
-        "column": 29,
-        "ruleId": "vue/no-mutating-props",
-        "message": "Unexpected mutation of \"calendarEvents\" prop.",
-        "hash": "47c270d8c0bcda67ea04a83ba267eca3e70fa7fb"
-    },
-    {
-        "path": "src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue",
-        "line": 154,
-        "column": 59,
+        "column": 41,
         "ruleId": "@typescript-eslint/no-unused-vars",
         "message": "'reject' is defined but never used.",
-        "hash": "7cf30f0d2dc567ea0dfb44dadfc9ecf4977e7b95"
+        "hash": "2c597422f93f4b397bfe96365007c602d349ad0c"
     },
     {
         "path": "src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue",
-        "line": 155,
-        "column": 41,
+        "line": 152,
+        "column": 21,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"users\" prop.",
-        "hash": "7876348a3eee16be7effd3e992a6aaa2334cfd24"
+        "hash": "75af3ee3d935ce4d62c037461e552cef3ab0f291"
     },
     {
         "path": "src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue",
-        "line": 164,
-        "column": 63,
+        "line": 158,
+        "column": 47,
         "ruleId": "@typescript-eslint/no-unused-vars",
         "message": "'reject' is defined but never used.",
-        "hash": "0f308d7417bfc294b28eea6890666a2d91e31ecd"
+        "hash": "6ffe789bbd1d731daaf5c2bff4582372fd342dc1"
     },
     {
         "path": "src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue",
-        "line": 185,
-        "column": 57,
+        "line": 170,
+        "column": 27,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"calendarEvents\" prop.",
-        "hash": "5a021a581a33d3aeea21c65e023902f2123bb562"
+        "hash": "ef1795af6c50719c19ec3bffd8e511d06a9bfac2"
     },
     {
         "path": "src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue",
-        "line": 218,
-        "column": 17,
+        "line": 197,
+        "column": 9,
         "ruleId": "@typescript-eslint/prefer-for-of",
         "message": "Expected a `for-of` loop instead of a `for` loop with this simple iteration.",
-        "hash": "655811d4dad8de23b3d37dfbf02f7fca18b6d8f2"
+        "hash": "bc4a3fd50f5afd095d8e938885291d948c4ba689"
     },
     {
         "path": "src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue",
-        "line": 235,
-        "column": 13,
+        "line": 214,
+        "column": 7,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"calendarEvents\" prop.",
-        "hash": "19317d9a564b8b10355cac1eeb9308c7d49c0dd1"
+        "hash": "6a27b96c77fc2747b4fd0f82ccfedc44138b0aa5"
     },
     {
         "path": "src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue",
-        "line": 240,
-        "column": 13,
+        "line": 219,
+        "column": 7,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"users\" prop.",
-        "hash": "95e478eca53a2acfa8edd0aa5747e73b0da01d0c"
+        "hash": "61c0ca5de675766483584b7363b048356f9c55f8"
     },
     {
         "path": "src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue",
-        "line": 246,
-        "column": 13,
+        "line": 225,
+        "column": 7,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"users\" prop.",
-        "hash": "0b66e38f0c0bbe17aa7c548dc127be033133ce06"
+        "hash": "d87ce5e7fbcefc884fb7be907d3c3fef53921ab4"
     },
     {
         "path": "src/Bundle/ChillDocStoreBundle/Resources/public/js/async-upload/uploader.ts",
@@ -399,14 +351,6 @@
         "message": "'error' is defined but never used.",
         "hash": "e26e5e101e90d2b7ee84d6f5de8c819e52129c17"
     },
-    {
-        "path": "src/Bundle/ChillDocStoreBundle/Resources/public/module/async_upload/index.ts",
-        "line": 29,
-        "column": 14,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'vm' is defined but never used.",
-        "hash": "8e7f5e89dd72c54459cf82156389b88988f97d63"
-    },
     {
         "path": "src/Bundle/ChillDocStoreBundle/Resources/public/module/async_upload/uploader.js",
         "line": 39,
@@ -545,11 +489,11 @@
     },
     {
         "path": "src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentActionButtonsGroup.vue",
-        "line": 80,
-        "column": 5,
+        "line": 78,
+        "column": 3,
         "ruleId": "@typescript-eslint/no-unused-vars",
         "message": "'StoredObjectVersion' is defined but never used.",
-        "hash": "2fadbe9e331a66f44b54782acc1420c4b487e1f6"
+        "hash": "da2ec95bcd2bb80819ef2032e40b0d7237acba31"
     },
     {
         "path": "src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/index.ts",
@@ -578,10 +522,10 @@
     {
         "path": "src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/ConvertButton.vue",
         "line": 11,
-        "column": 5,
+        "column": 3,
         "ruleId": "@typescript-eslint/no-unused-vars",
         "message": "'download_and_decrypt_doc' is defined but never used.",
-        "hash": "9a803f1fe608ec60ab065aa8f76e50e2ef1fa4c2"
+        "hash": "ddc9ed7c384b9da6ed1398551cefe7d244cb0c9e"
     },
     {
         "path": "src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/ConvertButton.vue",
@@ -593,11 +537,11 @@
     },
     {
         "path": "src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/ConvertButton.vue",
-        "line": 50,
-        "column": 11,
+        "line": 48,
+        "column": 9,
         "ruleId": "@typescript-eslint/no-unused-vars",
         "message": "'reset_pending' is assigned a value but never used.",
-        "hash": "96fde3634a150f1253fac2f2f2bdcfe6e0daf82a"
+        "hash": "9919afcb6b2724f5b6be69caa1b487026b9260fe"
     },
     {
         "path": "src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton.vue",
@@ -615,29 +559,21 @@
         "message": "'ref' is defined but never used.",
         "hash": "2a27cd6d06a26e1326654c929068e3704137e24b"
     },
-    {
-        "path": "src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton/HistoryButtonList.vue",
-        "line": 57,
-        "column": 17,
-        "ruleId": "vue/valid-v-for",
-        "message": "Custom elements in iteration require 'v-bind:key' directives.",
-        "hash": "cce787939524e83dd135869e13738ef332d7156c"
-    },
     {
         "path": "src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/WopiEditButton.vue",
-        "line": 15,
+        "line": 13,
         "column": 8,
         "ruleId": "@typescript-eslint/no-unused-vars",
         "message": "'WopiEditButton' is defined but never used.",
-        "hash": "80cb06a18ac4db47e8d120103704ec6988696b79"
+        "hash": "f197263cc1b8a5eeadd87e2e2c44eccc618375ec"
     },
     {
         "path": "src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/helpers.ts",
         "line": 3,
-        "column": 5,
+        "column": 3,
         "ruleId": "@typescript-eslint/no-unused-vars",
         "message": "'StoredObjectStatus' is defined but never used.",
-        "hash": "e868cee022cd1499bb54f7b5503a8a822773e097"
+        "hash": "ceb106361b5267900ff8852f6ff191698e065e13"
     },
     {
         "path": "src/Bundle/ChillJobBundle/src/Resources/public/module/cv_edit/index.js",
@@ -761,27 +697,27 @@
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/chill/js/date.ts",
-        "line": 73,
-        "column": 5,
+        "line": 71,
+        "column": 3,
         "ruleId": "prefer-const",
         "message": "'cal' is never reassigned. Use 'const' instead.",
-        "hash": "53586ea7ec719f07750a8874db79f5e76583d5e0"
+        "hash": "f6bce9a9d62ca55fec76a414f36ad445ffbb5f17"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/chill/js/date.ts",
-        "line": 79,
-        "column": 5,
+        "line": 77,
+        "column": 3,
         "ruleId": "prefer-const",
         "message": "'time' is never reassigned. Use 'const' instead.",
-        "hash": "19821279c0b2d7e69418db6877c317f8c6e2dacc"
+        "hash": "7bb4fae8b43da52f82f65b50a87b22d0375b517f"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/chill/js/date.ts",
-        "line": 85,
-        "column": 5,
+        "line": 83,
+        "column": 3,
         "ruleId": "prefer-const",
         "message": "'offset' is never reassigned. Use 'const' instead.",
-        "hash": "244b65de0ab0791ec89219058c5cb4f2e11622c7"
+        "hash": "f91a4b071f6ad88a8408dfa241b3cec00c7d54db"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/lib/download-report/download-report.js",
@@ -914,26 +850,26 @@
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/module/collection/index.ts",
         "line": 141,
-        "column": 5,
+        "column": 3,
         "ruleId": "@typescript-eslint/prefer-for-of",
         "message": "Expected a `for-of` loop instead of a `for` loop with this simple iteration.",
-        "hash": "cd5fc994be294fde5fef27ba841c9af454b81dc0"
+        "hash": "c280bbe030fe9a793f531ce00c1a4a6c6fdcfdc0"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/module/collection/index.ts",
         "line": 153,
-        "column": 5,
+        "column": 3,
         "ruleId": "@typescript-eslint/prefer-for-of",
         "message": "Expected a `for-of` loop instead of a `for` loop with this simple iteration.",
-        "hash": "381830dd078845aeab5ea366757541cd7c77ca3f"
+        "hash": "98e7c2f525eddcfd8d0f839c9bf69b7c56c9d537"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/module/collection/index.ts",
         "line": 162,
-        "column": 9,
+        "column": 5,
         "ruleId": "@typescript-eslint/prefer-for-of",
         "message": "Expected a `for-of` loop instead of a `for` loop with this simple iteration.",
-        "hash": "768b1976fb935d4a4b0890f00be2299b7ff60170"
+        "hash": "66a4dba7d1d666cbac1ed22eb2a7916cf97ca5ec"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/module/disable-buttons/index.js",
@@ -983,22 +919,6 @@
         "message": "'_e' is defined but never used.",
         "hash": "1d6448401778e8c56554020fe5abd47851ed33f3"
     },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/module/wopi-link/index.js",
-        "line": 21,
-        "column": 55,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'e' is defined but never used.",
-        "hash": "eae499e4f6e9f43a9d17f9cd917cb6d3d97be25c"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/page/export/download-export.js",
-        "line": 3,
-        "column": 55,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'e' is defined but never used.",
-        "hash": "088fd383e7807e484aefc9825209bc7c8942bd22"
-    },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/page/homepage_widget/index.js",
         "line": 9,
@@ -1074,514 +994,514 @@
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue",
         "line": 79,
-        "column": 55,
+        "column": 39,
         "ruleId": "@typescript-eslint/no-unused-vars",
         "message": "'reject' is defined but never used.",
-        "hash": "29ea9ef3f1b2cb970e8103383bcde12a4ab66c25"
+        "hash": "3014fecdefbab379cc54e6abe7532c892cc788f6"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/App.vue",
         "line": 101,
-        "column": 55,
+        "column": 39,
         "ruleId": "@typescript-eslint/no-unused-vars",
         "message": "'reject' is defined but never used.",
-        "hash": "b81ee6947049c6876f81410cfbb499dc43da4374"
+        "hash": "03336dded33c9831e1f8c4b950591b0a24eac678"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue",
-        "line": 247,
-        "column": 5,
+        "line": 244,
+        "column": 3,
         "ruleId": "@typescript-eslint/no-unused-vars",
         "message": "'postAddressToPerson' is defined but never used.",
-        "hash": "8a41c437cf2b5554cbbe1704cd51f3102b3d5994"
+        "hash": "0a60babcbc24fd0a410901c25994e93f1cd88acc"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue",
-        "line": 248,
-        "column": 5,
+        "line": 245,
+        "column": 3,
         "ruleId": "@typescript-eslint/no-unused-vars",
         "message": "'postAddressToHousehold' is defined but never used.",
-        "hash": "66dec84b2ece299daf21308e5e60d497ba442b27"
+        "hash": "6022bfb8f8d94a3ce0fb2aca7a846c084c2170af"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue",
-        "line": 490,
-        "column": 21,
+        "line": 486,
+        "column": 11,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"context\" prop.",
-        "hash": "0d3f40c47974a4371072b3b9ee04b197c830162d"
+        "hash": "26b7b1a24fd66b1763e131ad372ea9e9246ed2ca"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue",
-        "line": 491,
-        "column": 21,
+        "line": 487,
+        "column": 11,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"context\" prop.",
-        "hash": "8e877b7e588c30e182f7b572bdb9685360f9cf99"
+        "hash": "1c8c8b1de3e43ec62a8193b0fa6efdfeade74677"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue",
-        "line": 508,
-        "column": 47,
+        "line": 501,
+        "column": 35,
         "ruleId": "@typescript-eslint/no-unused-vars",
         "message": "'reject' is defined but never used.",
-        "hash": "5a3e3401bc3c765d91faaf4cfde57697af1262b7"
+        "hash": "eca7f49f652654fcffdbe10ac410f108ff3fb28e"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue",
-        "line": 525,
-        "column": 47,
+        "line": 518,
+        "column": 35,
         "ruleId": "@typescript-eslint/no-unused-vars",
         "message": "'reject' is defined but never used.",
-        "hash": "35a741d90379574b9323279f5802193d0c98a9dc"
+        "hash": "31097431dfeb6ebcaa0893d89aa5309de9ee774e"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue",
-        "line": 553,
-        "column": 47,
+        "line": 546,
+        "column": 35,
         "ruleId": "@typescript-eslint/no-unused-vars",
         "message": "'reject' is defined but never used.",
-        "hash": "c23d1ddf6c0d10ae97948e74aee9c14b9320b86c"
+        "hash": "142f4ce9e45cf10df3d74345496c2a8919a138bc"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue",
-        "line": 572,
-        "column": 47,
+        "line": 565,
+        "column": 35,
         "ruleId": "@typescript-eslint/no-unused-vars",
         "message": "'reject' is defined but never used.",
-        "hash": "4322e81c6ea9d9734c680633a724d5bd4fabacb2"
+        "hash": "e9973c9eb1f151f71f6386d2a0ce83f322ff2cf5"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue",
-        "line": 803,
-        "column": 47,
+        "line": 787,
+        "column": 35,
         "ruleId": "@typescript-eslint/no-unused-vars",
         "message": "'reject' is defined but never used.",
-        "hash": "7928a6461b9d394c7d97f048933553936f7d8963"
+        "hash": "78f1d0e8d3b2fa2489f4e311db2d1215d77b1c46"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue",
-        "line": 852,
-        "column": 47,
+        "line": 836,
+        "column": 35,
         "ruleId": "@typescript-eslint/no-unused-vars",
         "message": "'reject' is defined but never used.",
-        "hash": "e5afdb8efccb5470a08dde48f755b1268fa947b5"
+        "hash": "cbabc9b1434c9a5690bc269aabd001c8841aeb1b"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue",
         "line": 93,
-        "column": 17,
+        "column": 9,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "68f5e1cf5c03f9ada59c9e0afca0b74c7f3fca4b"
+        "hash": "9c66b7ec84cc786856badd8498414379ef4056ed"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue",
         "line": 101,
-        "column": 17,
+        "column": 9,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "50d730f6109092baff2db66adc44dc1315e2bda2"
+        "hash": "92d482ada1514212e710c366a7700111eda96f1e"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue",
         "line": 109,
-        "column": 17,
+        "column": 9,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "573e4c041ce663f28b933d7a675c2a525aba644c"
+        "hash": "f5c902853071084dfe7fd9a1c50e1c653e4c6a19"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue",
         "line": 117,
-        "column": 17,
+        "column": 9,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "293f845eeab515b1df4649d136c2d8219ed59c4d"
+        "hash": "409c69e33cdf563b7bc2d0c074f413f8d12c0307"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue",
         "line": 125,
-        "column": 17,
+        "column": 9,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "792310bc5def2c7b45f50da97cd8818d82862e8a"
+        "hash": "ea78eb9d3d49445fc131568291b4d777e2e8d271"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue",
         "line": 133,
-        "column": 17,
+        "column": 9,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "a69e5335393f67a83d89720af34a4385a7d7e665"
+        "hash": "db792e379fcff91ef9388fbf88492552885efb66"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue",
         "line": 141,
-        "column": 17,
+        "column": 9,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "2d5a5e680ff207ad97c7e7b7d999064b561dfd8a"
+        "hash": "dbba8af7379ffc65a6d80b4fffd00ca658251fbe"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
-        "line": 106,
-        "column": 17,
+        "line": 104,
+        "column": 9,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "d52356f2af31d0167c02330ec22d09fbfa6b2b9f"
+        "hash": "7c28ce533e2011e4f052d5ca0c7d57610b0461da"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
-        "line": 114,
-        "column": 17,
+        "line": 112,
+        "column": 9,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "c8e8e06f370f93bf05867e93b5f037dfa46937b1"
+        "hash": "c40ccbcab1e9ceccd5a350ddd88ff7dd5c468ec3"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
-        "line": 128,
-        "column": 13,
+        "line": 126,
+        "column": 7,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "9abaf71ca4b4f292b3b01e724d0a7733365e71f1"
+        "hash": "f407cd7f81bc5d33ed0831a592870074e6a4d6f1"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
-        "line": 129,
-        "column": 13,
+        "line": 127,
+        "column": 7,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "0b0743959778a9e3d93089b132608816ee4e6646"
+        "hash": "5d974adadc72bf10bfa1a863bdc44fdc43c2207f"
+    },
+    {
+        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
+        "line": 130,
+        "column": 7,
+        "ruleId": "vue/no-mutating-props",
+        "message": "Unexpected mutation of \"entity\" prop.",
+        "hash": "1fbda9c797af826dbadcfd16dc945b8d21e3ddf0"
+    },
+    {
+        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
+        "line": 131,
+        "column": 7,
+        "ruleId": "vue/no-mutating-props",
+        "message": "Unexpected mutation of \"entity\" prop.",
+        "hash": "b0ff83b3f077f1a6143654e5914321e3cf29ac95"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
         "line": 132,
-        "column": 13,
+        "column": 7,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "9759da7b7859b8ee8efaf74876430658ac6b6fe2"
+        "hash": "19b7e3498b9e90d6a86b3be74338d040247465ab"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
-        "line": 133,
-        "column": 13,
+        "line": 137,
+        "column": 7,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "dba8be9a27ab74ec743b7d9e07c05d857b407dd3"
+        "hash": "d7c45fd73ad1721055f23116102655bdd90a9528"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
-        "line": 134,
-        "column": 13,
-        "ruleId": "vue/no-mutating-props",
-        "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "9b1f5bce779aafc46b19d7a5d266eaa29f8f9be9"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
-        "line": 139,
-        "column": 13,
-        "ruleId": "vue/no-mutating-props",
-        "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "fe6fc4aea0994ba9da15b7c09d308842b67958cb"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
-        "line": 153,
-        "column": 55,
+        "line": 151,
+        "column": 39,
         "ruleId": "@typescript-eslint/no-unused-vars",
         "message": "'reject' is defined but never used.",
-        "hash": "bd0e024fcad2e3f4566f15293e3c25c840f6dd3e"
+        "hash": "bb2767a02ef0c4cd4598702d06ee95d7e79fced3"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
-        "line": 154,
-        "column": 37,
+        "line": 152,
+        "column": 19,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "596c4b180b926b7829f987384328bf5636cd367a"
+        "hash": "ce6c91b98e94605fe9c5b6c4e358a42da79a3150"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
-        "line": 171,
-        "column": 59,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'reject' is defined but never used.",
-        "hash": "5b41d5f9b45da074fb7bbbbd45e0da501da72071"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
-        "line": 172,
+        "line": 168,
         "column": 41,
-        "ruleId": "vue/no-mutating-props",
-        "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "d92b92a25043244cca809bd129633b7e024e26b4"
+        "ruleId": "@typescript-eslint/no-unused-vars",
+        "message": "'reject' is defined but never used.",
+        "hash": "28a03efbb5ade5a575393d46f4ec87fd3ab3af57"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
-        "line": 190,
-        "column": 17,
+        "line": 169,
+        "column": 21,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "dd9a85ea740742d620e864796f67c5bff834486d"
+        "hash": "7eede2e283dcaeeeba01fba092100c0839eacb37"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
-        "line": 191,
-        "column": 17,
+        "line": 186,
+        "column": 9,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "e3e59960d0d50709a57b336f66b586710b774892"
+        "hash": "a7ff3bc5466588198108718a166980b73e87ee40"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
-        "line": 192,
-        "column": 17,
+        "line": 187,
+        "column": 9,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "fe11b0e54396511e7b3b08615a78d22fc27e2fad"
+        "hash": "c87deccee6f42a977abbf54b25c12af2543c4ba6"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
-        "line": 222,
-        "column": 13,
+        "line": 188,
+        "column": 9,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "63c14c2150c33ec701bc4a0ff94efde69537d490"
+        "hash": "83029bfbb4c6e6e76f097dedad5c95b7efbf1d54"
+    },
+    {
+        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue",
+        "line": 218,
+        "column": 7,
+        "ruleId": "vue/no-mutating-props",
+        "message": "Unexpected mutation of \"entity\" prop.",
+        "hash": "f8cc21c434f3a41e97c1e659f3e3e41bc8ea3015"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
         "line": 96,
-        "column": 20,
+        "column": 14,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "d2a9fdaeef0e2810f480022d4c6f99e4f76a818e"
+        "hash": "9f4994768baeedde467d8a6a594eddb96c8d4f35"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
         "line": 96,
-        "column": 20,
+        "column": 14,
         "ruleId": "vue/no-side-effects-in-computed-properties",
         "message": "Unexpected side effect in \"cities\" computed property.",
-        "hash": "dd92a60a9b1ebefeb9a90941d45326fbfa483733"
+        "hash": "efdf2f0fa3127580834a1a71c05cc412cdffc17a"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
         "line": 102,
-        "column": 17,
+        "column": 9,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "04be01ab638ce01f568fb0216929e65e1175ca23"
+        "hash": "331da5bdcdaca996b5a86bbf9d074172d9a97de5"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
         "line": 110,
-        "column": 17,
+        "column": 9,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "8619c8e0b63e87d09268832f90e4fba06b87e41f"
+        "hash": "1503a521d5aac26de71708193d5efe381fce1a91"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
         "line": 124,
-        "column": 13,
+        "column": 7,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "281f918da00635079501418b1e6b2c05b62eb4a7"
+        "hash": "b7099b57a857083cd18ffca20e489fcc894675f0"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
         "line": 125,
-        "column": 13,
+        "column": 7,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "c131b09fa67ab1d069f1d04a54582d6b0f206153"
+        "hash": "577790a8bd8c6081fe75e4d4ebbb99d251e7cf5a"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
         "line": 126,
-        "column": 13,
+        "column": 7,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "3d3a2a4add64c291b8f5f1cddd90a173cd6a819d"
+        "hash": "744ba1d220a69ca2c63c9b7dc1478ef71af0ec8e"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
         "line": 131,
-        "column": 21,
+        "column": 11,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "ed48f4988914d7897018a2e06830a97e6740b3e8"
+        "hash": "e8134808053567607222487fcb4144183e0ffe86"
+    },
+    {
+        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
+        "line": 143,
+        "column": 7,
+        "ruleId": "vue/no-mutating-props",
+        "message": "Unexpected mutation of \"entity\" prop.",
+        "hash": "fab57266818588096de456916ebe3fa88e89a4e4"
+    },
+    {
+        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
+        "line": 144,
+        "column": 7,
+        "ruleId": "vue/no-mutating-props",
+        "message": "Unexpected mutation of \"entity\" prop.",
+        "hash": "f3d04b5c0a3a29bfa65e7eeeb1c50e989ec4821e"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
         "line": 145,
-        "column": 13,
+        "column": 7,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "744f3a7610d4d6015e50e25149bceffd6c6e2763"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
-        "line": 146,
-        "column": 13,
-        "ruleId": "vue/no-mutating-props",
-        "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "eaaaaee5fb2e324ffe0a68eefe340dabdf162324"
+        "hash": "90b3e9a1ba5be62bd6894796ecc2e33e2f29329d"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
         "line": 147,
-        "column": 13,
+        "column": 9,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "2de47b4a4ddbe546b3fce9898af48b72853364bf"
+        "hash": "8a90e844f524ba01cc1c64806eeda052ab88957d"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
         "line": 149,
-        "column": 17,
+        "column": 7,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "1e7b1ad55866f708baaca72dfa4ff26d6f8e5d21"
+        "hash": "e83c3118bc20776c00437d7edc3deaf24915bd66"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
-        "line": 152,
-        "column": 13,
+        "line": 158,
+        "column": 7,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "84779331536ffceec8d4a8c5ca4307310b882549"
+        "hash": "378ccd9fa7cf74e41c905f1a21bdbf1f74c4015f"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
-        "line": 161,
-        "column": 13,
-        "ruleId": "vue/no-mutating-props",
-        "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "0789999841be671a4d8ab080d6fdb679f843eb52"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
-        "line": 170,
-        "column": 51,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'reject' is defined but never used.",
-        "hash": "bbb17afa114f016e2058d90aa32d2a625804f0d1"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
-        "line": 171,
-        "column": 33,
-        "ruleId": "vue/no-mutating-props",
-        "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "5fbe407ceceb37bff2ac800ceddd7942540132f1"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
-        "line": 190,
-        "column": 55,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'reject' is defined but never used.",
-        "hash": "e2af91def877befbabef8e93deba4c58a3ee2ded"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
-        "line": 191,
+        "line": 167,
         "column": 37,
-        "ruleId": "vue/no-mutating-props",
-        "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "ee8544ee45681a650ed7d4918ae979685cdd8f0f"
+        "ruleId": "@typescript-eslint/no-unused-vars",
+        "message": "'reject' is defined but never used.",
+        "hash": "5bbe7140e1370b411abbdfc0554d58d62472d0d7"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
-        "line": 210,
+        "line": 168,
         "column": 17,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "5d9d2217c8c7e6571bc9f72a98ea5b370edb4968"
+        "hash": "b712ccec63c177608e199b9bc63f30bba6e6ecfe"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
-        "line": 211,
-        "column": 17,
-        "ruleId": "vue/no-mutating-props",
-        "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "6e04619b373c23c91f6c36c2aad314ac16cdb697"
+        "line": 186,
+        "column": 39,
+        "ruleId": "@typescript-eslint/no-unused-vars",
+        "message": "'reject' is defined but never used.",
+        "hash": "9a5b009d8e7f30e61c1991c97d390f0735d19968"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
-        "line": 212,
-        "column": 17,
+        "line": 187,
+        "column": 19,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "39df045639a62f64ccdb03a80e286bc3ad772587"
+        "hash": "831be7f044c74b2c1a4244ffe3a065dd21e6247d"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
-        "line": 213,
-        "column": 17,
+        "line": 205,
+        "column": 9,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "c399a43fa797a8ce61c9d96a644a39cc84a387b7"
+        "hash": "6c0fc8e55e3132c27cbaeabd2e84ca2838008247"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
-        "line": 245,
-        "column": 13,
+        "line": 206,
+        "column": 9,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "04337a07944caaa4819cfebcf29e1a7cbfdf248b"
+        "hash": "4b66a3e1cf5476e4a0e2f1b3f3546222572abf8f"
+    },
+    {
+        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
+        "line": 207,
+        "column": 9,
+        "ruleId": "vue/no-mutating-props",
+        "message": "Unexpected mutation of \"entity\" prop.",
+        "hash": "c685acbb0d48bab6c55b0af2dcc701f5edf993fe"
+    },
+    {
+        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
+        "line": 208,
+        "column": 9,
+        "ruleId": "vue/no-mutating-props",
+        "message": "Unexpected mutation of \"entity\" prop.",
+        "hash": "0059a00f9459b29cb4a54eb2b273d9f59d7890af"
+    },
+    {
+        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue",
+        "line": 240,
+        "column": 7,
+        "ruleId": "vue/no-mutating-props",
+        "message": "Unexpected mutation of \"entity\" prop.",
+        "hash": "e66f10f1d6116821b3f0fb066bcbf50772ba5374"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CountrySelection.vue",
-        "line": 76,
-        "column": 13,
+        "line": 72,
+        "column": 7,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "373a2e31f110d138c66d77f1faf5dc61545c55af"
+        "hash": "037d3140ebf15fc52a0f58f7844a9a2af44a3d9c"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CountrySelection.vue",
-        "line": 81,
-        "column": 13,
+        "line": 77,
+        "column": 7,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "421eb6a63224b4b1d81b216677a710c5c99ddee3"
+        "hash": "936e5eed1f826a51d129d97580bfb5084a6a4a48"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue",
-        "line": 95,
-        "column": 17,
+        "line": 92,
+        "column": 9,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "84e13d1fdc79f4568634a78df281adbe81739cbd"
+        "hash": "2058a778c66e3d4005cdfb4354ede1d93e8e1ab6"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/DatePane.vue",
-        "line": 103,
-        "column": 17,
+        "line": 100,
+        "column": 9,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "1eed832462e52537402a2825655733f0f2d391d9"
+        "hash": "20b24f03b3260f915df456ce4d54775f2dda68b6"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue",
-        "line": 155,
-        "column": 17,
+        "line": 152,
+        "column": 9,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "b3a822914fcb5e2fcf28efc331a45b9205002eeb"
+        "hash": "849bea4394a838c6f9c75cb93a29049d9c7a3c9e"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue",
-        "line": 164,
-        "column": 17,
+        "line": 161,
+        "column": 9,
         "ruleId": "vue/no-mutating-props",
         "message": "Unexpected mutation of \"entity\" prop.",
-        "hash": "72c7d850f6cdeaf65b373a33234222f9766ee30b"
+        "hash": "56abd4aa323bb35e94cbd0264603b6d1848298d1"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/index.js",
@@ -1609,19 +1529,11 @@
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/DashboardWidgets/NewsItem.vue",
-        "line": 142,
-        "column": 57,
+        "line": 136,
+        "column": 55,
         "ruleId": "@typescript-eslint/no-explicit-any",
         "message": "Unexpected any. Specify a different type.",
-        "hash": "a68eeba7b2e1e603d83da0946c94cd221134aa99"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue",
-        "line": 204,
-        "column": 22,
-        "ruleId": "vue/return-in-computed-property",
-        "message": "Expected to return a value in \"buttonMessage\" computed property.",
-        "hash": "b101c861dc11bc7024857fa2977118cb9f99c02c"
+        "hash": "2ca5e2fd1fccea428a772ad7d2dd0d001bdc413b"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/index.js",
@@ -1631,77 +1543,53 @@
         "message": "'app' is assigned a value but never used.",
         "hash": "9e6125f4fc387dc362c69cc6e3ce360eb2851f1b"
     },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue",
-        "line": 60,
-        "column": 22,
-        "ruleId": "vue/require-valid-default-prop",
-        "message": "Type of the default value for 'suggested' prop must be a function.",
-        "hash": "d30212820bc2e97fa02d75dbc3a014558693f169"
-    },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/AddressDetails/Parts/AddressDetailsMap.vue",
-        "line": 24,
+        "line": 21,
         "column": 13,
         "ruleId": "@typescript-eslint/no-unused-vars",
         "message": "'LatLngExpression' is defined but never used.",
-        "hash": "78f5a83dddf05b38aa9472ab93871e976719ef30"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/GenderIconRenderBox.vue",
-        "line": 6,
-        "column": 7,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'props' is assigned a value but never used.",
-        "hash": "29fe0a5d52e46c479aa2e7bb23fb55c53df7b22e"
+        "hash": "96b45c0371542f6e2a5b6f1b2d4f598698faff68"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/PickWorkflow.vue",
-        "line": 114,
-        "column": 34,
+        "line": 107,
+        "column": 32,
         "ruleId": "vue/require-valid-default-prop",
         "message": "Type of the default value for 'goToGenerateWorkflowPayload' prop must be a function.",
-        "hash": "d686fa87cfdc801aaaa08b24e827e503e81e86be"
+        "hash": "d86b61c318c09e12544ded19f252f6e281e8f985"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/PickWorkflow.vue",
-        "line": 170,
+        "line": 163,
         "column": 7,
         "ruleId": "@typescript-eslint/no-unused-vars",
         "message": "'goToDuplicateRelatedEntity' is assigned a value but never used.",
-        "hash": "224ddf3abcff96e3e20a0facc7493883958d5a80"
+        "hash": "a6b7b632e663f282e0f4951d95a6987fa70f4046"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/PickWorkflow.vue",
-        "line": 171,
-        "column": 5,
+        "line": 164,
+        "column": 3,
         "ruleId": "@typescript-eslint/no-unused-vars",
         "message": "'event' is defined but never used.",
-        "hash": "aa87fd5511528b5a45713fe1eaeda9ae0a8c0975"
+        "hash": "dd3f0de245d7a2107ad5526965d1a0c29df0ef26"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/PickWorkflow.vue",
-        "line": 172,
-        "column": 5,
+        "line": 165,
+        "column": 3,
         "ruleId": "@typescript-eslint/no-unused-vars",
         "message": "'workflowName' is defined but never used.",
-        "hash": "e34bbcf245552e9329efdf7bd64ea3a56f0d4538"
+        "hash": "d12891a4cc2df02d4b15f30b474edf8b01fd9766"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/PickWorkflow.vue",
-        "line": 173,
+        "line": 166,
         "column": 12,
         "ruleId": "@typescript-eslint/no-empty-function",
         "message": "Unexpected empty arrow function.",
-        "hash": "8bdff7a5b3a7ac1506966a6066a1deb556d30efe"
-    },
-    {
-        "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue",
-        "line": 3,
-        "column": 9,
-        "ruleId": "vue/require-toggle-inside-transition",
-        "message": "The element inside `<transition>` is expected to have a `v-if` or `v-show` directive.",
-        "hash": "0594fb9d0984f4dd1612671aca21b571087ab8ee"
+        "hash": "3977a54eb58bc5c558dfb1ce043b14377a746441"
     },
     {
         "path": "src/Bundle/ChillMainBundle/Resources/public/vuejs/_js/i18n.ts",
@@ -1727,14 +1615,6 @@
         "message": "'tags' is assigned a value but never used.",
         "hash": "ae9bb2e0651c118ed9efd227e88b86cc83f5d80d"
     },
-    {
-        "path": "src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/StickyNav.vue",
-        "line": 116,
-        "column": 18,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'event' is defined but never used.",
-        "hash": "201f182769c6dfb87148b841e7d9b592be429669"
-    },
     {
         "path": "src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/index.js",
         "line": 19,
@@ -1767,14 +1647,6 @@
         "message": "'app' is assigned a value but never used.",
         "hash": "aaaaa63e7a60443b8cbf8191feb9142852ebdf1c"
     },
-    {
-        "path": "src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue",
-        "line": 79,
-        "column": 13,
-        "ruleId": "vue/require-v-for-key",
-        "message": "Elements in iteration expect to have 'v-bind:key' directives.",
-        "hash": "422f53925922e59655d0f71624c19af75d41628c"
-    },
     {
         "path": "src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/index.js",
         "line": 12,
@@ -1815,22 +1687,6 @@
         "message": "'evalFQDN' is assigned a value but never used.",
         "hash": "7fc32caafa23addddf44f3acbc5045b4523a0271"
     },
-    {
-        "path": "src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/store.js",
-        "line": 611,
-        "column": 9,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'errors' is assigned a value but never used.",
-        "hash": "c41cf979fc1626c38328dbf1028800c3395496bd"
-    },
-    {
-        "path": "src/Bundle/ChillPersonBundle/Resources/public/vuejs/ExportFormActionGoalResult/App.vue",
-        "line": 282,
-        "column": 7,
-        "ruleId": "@typescript-eslint/no-unused-expressions",
-        "message": "Expected an assignment or function call and instead saw an expression.",
-        "hash": "de3a6e2bb10a80a2bacba665be74266c7efc7d64"
-    },
     {
         "path": "src/Bundle/ChillPersonBundle/Resources/public/vuejs/ExportFormActionGoalResult/index.js",
         "line": 16,
@@ -1847,38 +1703,6 @@
         "message": "'app' is assigned a value but never used.",
         "hash": "2f161e663689e3e4dfe2c53b0d64c91a4d2b1a60"
     },
-    {
-        "path": "src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue",
-        "line": 263,
-        "column": 19,
-        "ruleId": "vue/return-in-computed-property",
-        "message": "Expected to return a value in \"refreshNetwork\" computed property.",
-        "hash": "2c1b08a49098c83b09058cedc0a962126e91e544"
-    },
-    {
-        "path": "src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue",
-        "line": 270,
-        "column": 7,
-        "ruleId": "vue/no-side-effects-in-computed-properties",
-        "message": "Unexpected side effect in \"legendLayers\" computed property.",
-        "hash": "760948d2187c853f17ac9a1bd7107e883092d4f4"
-    },
-    {
-        "path": "src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue",
-        "line": 281,
-        "column": 5,
-        "ruleId": "vue/no-dupe-keys",
-        "message": "Duplicate key 'checkedLayers'. May cause name collision in script or template tag.",
-        "hash": "447edb461e15e3ff5c60c8ecba88131e442539aa"
-    },
-    {
-        "path": "src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/App.vue",
-        "line": 353,
-        "column": 7,
-        "ruleId": "@typescript-eslint/no-unused-expressions",
-        "message": "Expected an assignment or function call and instead saw an expression.",
-        "hash": "9cf656cbf1eb3d7cc0082e63adcd320b6093d14f"
-    },
     {
         "path": "src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/index.js",
         "line": 20,
@@ -1886,77 +1710,5 @@
         "ruleId": "@typescript-eslint/no-unused-vars",
         "message": "'app' is assigned a value but never used.",
         "hash": "9e94e6412b8a44e47bfe8e66218cad09cff5bed4"
-    },
-    {
-        "path": "src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriod/SetReferrer.vue",
-        "line": 42,
-        "column": 16,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'response' is defined but never used.",
-        "hash": "62de07b13c662e32332bb062038acee23978ea70"
-    },
-    {
-        "path": "src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue",
-        "line": 356,
-        "column": 28,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'_response' is defined but never used.",
-        "hash": "097e7788a2b5dea500b80b8a3cf968e57063a66a"
-    },
-    {
-        "path": "src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUserGroup.vue",
-        "line": 6,
-        "column": 8,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'BadgeEntity' is defined but never used.",
-        "hash": "951a1b012bdec10c4b859af8b34dd894f63add23"
-    },
-    {
-        "path": "src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUserGroup.vue",
-        "line": 7,
-        "column": 8,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'UserRenderBoxBadge' is defined but never used.",
-        "hash": "99eba0d8633b2c9497417f4f61ec4194dbb2a96b"
-    },
-    {
-        "path": "src/Bundle/ChillWopiBundle/src/Resources/public/module/pending/index.ts",
-        "line": 4,
-        "column": 3,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'StoredObjectStatus' is defined but never used.",
-        "hash": "63f8c4572293916850d6165647774b27d4b732c6"
-    },
-    {
-        "path": "src/Bundle/ChillWopiBundle/src/Resources/public/module/pending/index.ts",
-        "line": 5,
-        "column": 3,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'StoredObjectStatusChange' is defined but never used.",
-        "hash": "a87c178e3eb5999bf0f46b3fa1c6da77e1be08b9"
-    },
-    {
-        "path": "src/Bundle/ChillWopiBundle/src/Resources/public/module/pending/index.ts",
-        "line": 30,
-        "column": 61,
-        "ruleId": "@typescript-eslint/no-unused-vars",
-        "message": "'e' is defined but never used.",
-        "hash": "02953121583f4f73742a19adab099ab63df9076e"
-    },
-    {
-        "path": "src/Bundle/ChillWopiBundle/src/Resources/public/module/pending/index.ts",
-        "line": 31,
-        "column": 32,
-        "ruleId": "@typescript-eslint/no-explicit-any",
-        "message": "Unexpected any. Specify a different type.",
-        "hash": "af48e21a1651b6017ede882dab249c00a818a44d"
-    },
-    {
-        "path": "src/Bundle/ChillWopiBundle/src/Resources/public/module/pending/index.ts",
-        "line": 37,
-        "column": 16,
-        "ruleId": "@typescript-eslint/no-explicit-any",
-        "message": "Unexpected any. Specify a different type.",
-        "hash": "7513ea552a0a649ce4ab93b6cf9d40bfef4f68d9"
     }
-]
\ No newline at end of file
+]
diff --git a/package.json b/package.json
index fc50ba29c..a7d959d7e 100644
--- a/package.json
+++ b/package.json
@@ -84,7 +84,7 @@
     "specs-create-dir": "mkdir -p templates/api",
     "specs": "yarn run specs-create-dir && yarn run specs-build && yarn run specs-validate",
     "version": "node --version",
-    "eslint": "npx eslint-baseline --fix \"src/**/*.{js,ts,vue}\""
+    "eslint": "eslint-baseline --fix \"src/**/*.{js,ts,vue}\""
   },
   "private": true
 }

From 3400656d7c6895c3c476209b1f16011af8f60ee5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 11 Jul 2025 12:56:19 +0000
Subject: [PATCH 148/283] Tickets: edit comments and mark them as deleted

---
 package.json                                  |   2 +-
 .../ChillTicketBundle/chill.api.specs.yaml    | 100 +++++++++++++
 .../UpdateCommentContentCommandHandler.php    |  26 ++++
 ...eCommentContentCommandHandlerInterface.php |  20 +++
 ...dateCommentDeletedStatusCommandHandler.php |  26 ++++
 ...ntDeletedStatusCommandHandlerInterface.php |  20 +++
 .../Comment/UpdateCommentContentCommand.php   |  30 ++++
 .../UpdateCommentDeletedStatusCommand.php     |  27 ++++
 .../Handler/AddCommentCommandHandler.php      |   4 +-
 .../src/Controller/AddCommentController.php   |   7 +-
 .../Controller/UpdateCommentController.php    |  69 +++++++++
 .../UpdateCommentDeletedStatusController.php  |  66 +++++++++
 .../ChillTicketBundle/src/Entity/Comment.php  |  19 +++
 .../src/Security/Voter/CommentVoter.php       |  50 +++++++
 .../src/Security/Voter/TicketVoter.php        |  37 +++++
 .../Normalizer/TicketNormalizer.php           |   6 +-
 .../src/config/services.yaml                  |   6 +
 .../src/migrations/Version20250711115128.php  |  33 +++++
 ...UpdateCommentContentCommandHandlerTest.php |  50 +++++++
 ...CommentDeletedStatusCommandHandlerTest.php |  55 +++++++
 .../Controller/AddCommentControllerTest.php   |   2 +
 .../Controller/TicketListControllerTest.php   |   0
 .../UpdateCommentControllerTest.php           | 134 ++++++++++++++++++
 ...dateCommentDeletedStatusControllerTest.php | 114 +++++++++++++++
 .../Normalizer/TicketNormalizerTest.php       |  49 ++++++-
 25 files changed, 945 insertions(+), 7 deletions(-)
 create mode 100644 src/Bundle/ChillTicketBundle/src/Action/Comment/Handler/UpdateCommentContentCommandHandler.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Action/Comment/Handler/UpdateCommentContentCommandHandlerInterface.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Action/Comment/Handler/UpdateCommentDeletedStatusCommandHandler.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Action/Comment/Handler/UpdateCommentDeletedStatusCommandHandlerInterface.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Action/Comment/UpdateCommentContentCommand.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Action/Comment/UpdateCommentDeletedStatusCommand.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Controller/UpdateCommentController.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Controller/UpdateCommentDeletedStatusController.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Security/Voter/CommentVoter.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Security/Voter/TicketVoter.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/migrations/Version20250711115128.php
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Action/Comment/Handler/UpdateCommentContentCommandHandlerTest.php
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Action/Comment/Handler/UpdateCommentDeletedStatusCommandHandlerTest.php
 rename src/Bundle/ChillTicketBundle/tests/{Chill/TicketBundle => }/Controller/TicketListControllerTest.php (100%)
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Controller/UpdateCommentControllerTest.php
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Controller/UpdateCommentDeletedStatusControllerTest.php

diff --git a/package.json b/package.json
index a7d959d7e..ccabc5c25 100644
--- a/package.json
+++ b/package.json
@@ -79,7 +79,7 @@
     "dev": "encore dev",
     "watch": "encore dev --watch",
     "build": "encore production --progress",
-    "specs-build": "yaml-merge src/Bundle/ChillMainBundle/chill.api.specs.yaml src/Bundle/ChillPersonBundle/chill.api.specs.yaml src/Bundle/ChillCalendarBundle/chill.api.specs.yaml src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml src/Bundle/ChillDocStoreBundle/chill.api.specs.yaml> templates/api/specs.yaml",
+    "specs-build": "yaml-merge src/Bundle/ChillMainBundle/chill.api.specs.yaml src/Bundle/ChillPersonBundle/chill.api.specs.yaml src/Bundle/ChillCalendarBundle/chill.api.specs.yaml src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml src/Bundle/ChillDocStoreBundle/chill.api.specs.yaml src/Bundle/ChillTicketBundle/chill.api.specs.yaml> templates/api/specs.yaml",
     "specs-validate": "swagger-cli validate templates/api/specs.yaml",
     "specs-create-dir": "mkdir -p templates/api",
     "specs": "yarn run specs-create-dir && yarn run specs-build && yarn run specs-validate",
diff --git a/src/Bundle/ChillTicketBundle/chill.api.specs.yaml b/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
index 9b579fbcc..da3de8a88 100644
--- a/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
@@ -1,5 +1,10 @@
 components:
     schemas:
+        TicketComment:
+            type: object
+            properties:
+                id:
+                    type: integer
         TicketSimple:
             type: object
             properties:
@@ -162,6 +167,101 @@ paths:
                     description: "ACCEPTED"
                 422:
                     description: "UNPROCESSABLE ENTITY"
+    /1.0/ticket/comment/{id}/edit:
+        post:
+            tags:
+                - ticket
+            summary: Edit the comment' content
+            parameters:
+                -  name: id
+                   in: path
+                   required: true
+                   description: The comment's id
+                   schema:
+                       type: integer
+                       format: integer
+                       minimum: 1
+            requestBody:
+                required: true
+                content:
+                    application/json:
+                        schema:
+                            type: object
+                            properties:
+                                content:
+                                    type: string
+            responses:
+                200:
+                    description: "OK"
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/TicketComment'
+                403:
+                    description: "Unauthorized"
+
+    /1.0/ticket/comment/{id}/delete:
+        post:
+            tags:
+                - ticket
+            summary: Soft-delete a comment within a ticket
+            description: |
+                This will soft delete a comment within a ticket.
+
+                Only the author of the comment is allowed to edit the comment.
+
+                If a comment is deleted, it can be restored by using the "restore" call.
+
+                The method is idempotent: it will have no effect on an already deleted comment.
+            parameters:
+                -  name: id
+                   in: path
+                   required: true
+                   description: The comment's id
+                   schema:
+                       type: integer
+                       format: integer
+                       minimum: 1
+            responses:
+                200:
+                    description: "OK"
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/TicketComment'
+                403:
+                    description: "Unauthorized"
+
+    /1.0/ticket/comment/{id}/restore:
+        post:
+            tags:
+                - ticket
+            summary: Restore a comment within a ticket
+            description: |
+                This will restore a comment of a ticket.
+
+                Only the author of the comment is allowed to restore the comment.
+
+                If the comment is not deleted, this method has no effect.
+
+            parameters:
+                -  name: id
+                   in: path
+                   required: true
+                   description: The comment's id
+                   schema:
+                       type: integer
+                       format: integer
+                       minimum: 1
+            responses:
+                200:
+                    description: "OK"
+                    content:
+                        application/json:
+                            schema:
+                                $ref: '#/components/schemas/TicketComment'
+                403:
+                    description: "Unauthorized"
 
     /1.0/ticket/{id}/persons/set:
         post:
diff --git a/src/Bundle/ChillTicketBundle/src/Action/Comment/Handler/UpdateCommentContentCommandHandler.php b/src/Bundle/ChillTicketBundle/src/Action/Comment/Handler/UpdateCommentContentCommandHandler.php
new file mode 100644
index 000000000..a9a44070c
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Action/Comment/Handler/UpdateCommentContentCommandHandler.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Action\Comment\Handler;
+
+use Chill\TicketBundle\Action\Comment\UpdateCommentContentCommand;
+use Chill\TicketBundle\Entity\Comment;
+
+final readonly class UpdateCommentContentCommandHandler implements UpdateCommentContentCommandHandlerInterface
+{
+    public function __construct(
+    ) {}
+
+    public function handle(Comment $comment, UpdateCommentContentCommand $command): void
+    {
+        $comment->setContent($command->content);
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Action/Comment/Handler/UpdateCommentContentCommandHandlerInterface.php b/src/Bundle/ChillTicketBundle/src/Action/Comment/Handler/UpdateCommentContentCommandHandlerInterface.php
new file mode 100644
index 000000000..b57838ad2
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Action/Comment/Handler/UpdateCommentContentCommandHandlerInterface.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Action\Comment\Handler;
+
+use Chill\TicketBundle\Action\Comment\UpdateCommentContentCommand;
+use Chill\TicketBundle\Entity\Comment;
+
+interface UpdateCommentContentCommandHandlerInterface
+{
+    public function handle(Comment $comment, UpdateCommentContentCommand $command): void;
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Action/Comment/Handler/UpdateCommentDeletedStatusCommandHandler.php b/src/Bundle/ChillTicketBundle/src/Action/Comment/Handler/UpdateCommentDeletedStatusCommandHandler.php
new file mode 100644
index 000000000..f2cfa43ce
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Action/Comment/Handler/UpdateCommentDeletedStatusCommandHandler.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Action\Comment\Handler;
+
+use Chill\TicketBundle\Action\Comment\UpdateCommentDeletedStatusCommand;
+use Chill\TicketBundle\Entity\Comment;
+
+final readonly class UpdateCommentDeletedStatusCommandHandler implements UpdateCommentDeletedStatusCommandHandlerInterface
+{
+    public function __construct(
+    ) {}
+
+    public function handle(Comment $comment, UpdateCommentDeletedStatusCommand $command): void
+    {
+        $comment->setDeleted($command->delete);
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Action/Comment/Handler/UpdateCommentDeletedStatusCommandHandlerInterface.php b/src/Bundle/ChillTicketBundle/src/Action/Comment/Handler/UpdateCommentDeletedStatusCommandHandlerInterface.php
new file mode 100644
index 000000000..7136c2aad
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Action/Comment/Handler/UpdateCommentDeletedStatusCommandHandlerInterface.php
@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Action\Comment\Handler;
+
+use Chill\TicketBundle\Action\Comment\UpdateCommentDeletedStatusCommand;
+use Chill\TicketBundle\Entity\Comment;
+
+interface UpdateCommentDeletedStatusCommandHandlerInterface
+{
+    public function handle(Comment $comment, UpdateCommentDeletedStatusCommand $command): void;
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Action/Comment/UpdateCommentContentCommand.php b/src/Bundle/ChillTicketBundle/src/Action/Comment/UpdateCommentContentCommand.php
new file mode 100644
index 000000000..724617335
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Action/Comment/UpdateCommentContentCommand.php
@@ -0,0 +1,30 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Action\Comment;
+
+use Symfony\Component\Validator\Constraints as Assert;
+use Symfony\Component\Serializer\Annotation as Serializer;
+
+final readonly class UpdateCommentContentCommand
+{
+    public function __construct(
+        /**
+         * The new content of the command.
+         *
+         * The command accept null values, but it should raise a validation error.
+         */
+        #[Assert\NotBlank()]
+        #[Assert\NotNull]
+        #[Serializer\Groups(['write'])]
+        public ?string $content,
+    ) {}
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Action/Comment/UpdateCommentDeletedStatusCommand.php b/src/Bundle/ChillTicketBundle/src/Action/Comment/UpdateCommentDeletedStatusCommand.php
new file mode 100644
index 000000000..fded9b9c3
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Action/Comment/UpdateCommentDeletedStatusCommand.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Action\Comment;
+
+use Symfony\Component\Validator\Constraints as Assert;
+use Symfony\Component\Serializer\Annotation as Serializer;
+
+final readonly class UpdateCommentDeletedStatusCommand
+{
+    public function __construct(
+        /**
+         * The deleted status to set for the comment.
+         */
+        #[Assert\NotNull]
+        #[Serializer\Groups(['write'])]
+        public bool $delete,
+    ) {}
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/AddCommentCommandHandler.php b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/AddCommentCommandHandler.php
index 66c972c3d..a5a211aef 100644
--- a/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/AddCommentCommandHandler.php
+++ b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/AddCommentCommandHandler.php
@@ -22,10 +22,12 @@ final readonly class AddCommentCommandHandler
         private EntityManagerInterface $entityManager,
     ) {}
 
-    public function handle(Ticket $ticket, AddCommentCommand $command): void
+    public function handle(Ticket $ticket, AddCommentCommand $command): Comment
     {
         $comment = new Comment($command->content, $ticket);
 
         $this->entityManager->persist($comment);
+
+        return $comment;
     }
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Controller/AddCommentController.php b/src/Bundle/ChillTicketBundle/src/Controller/AddCommentController.php
index 157e69698..08ff93453 100644
--- a/src/Bundle/ChillTicketBundle/src/Controller/AddCommentController.php
+++ b/src/Bundle/ChillTicketBundle/src/Controller/AddCommentController.php
@@ -14,6 +14,7 @@ namespace Chill\TicketBundle\Controller;
 use Chill\TicketBundle\Action\Ticket\AddCommentCommand;
 use Chill\TicketBundle\Action\Ticket\Handler\AddCommentCommandHandler;
 use Chill\TicketBundle\Entity\Ticket;
+use Chill\TicketBundle\Security\Voter\CommentVoter;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
@@ -54,7 +55,11 @@ final readonly class AddCommentController
             );
         }
 
-        $this->addCommentCommandHandler->handle($ticket, $command);
+        $comment = $this->addCommentCommandHandler->handle($ticket, $command);
+
+        if (!$this->security->isGranted(CommentVoter::CREATE, $comment)) {
+            throw new AccessDeniedHttpException('You are not allowed to add comments to this ticket.');
+        }
 
         $this->entityManager->flush();
 
diff --git a/src/Bundle/ChillTicketBundle/src/Controller/UpdateCommentController.php b/src/Bundle/ChillTicketBundle/src/Controller/UpdateCommentController.php
new file mode 100644
index 000000000..5e35c534d
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Controller/UpdateCommentController.php
@@ -0,0 +1,69 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Controller;
+
+use Chill\TicketBundle\Action\Comment\Handler\UpdateCommentContentCommandHandlerInterface;
+use Chill\TicketBundle\Action\Comment\UpdateCommentContentCommand;
+use Chill\TicketBundle\Entity\Comment;
+use Chill\TicketBundle\Security\Voter\CommentVoter;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\SerializerInterface;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
+
+final readonly class UpdateCommentController
+{
+    public function __construct(
+        private Security $security,
+        private SerializerInterface $serializer,
+        private ValidatorInterface $validator,
+        private UpdateCommentContentCommandHandlerInterface $updateCommentContentCommandHandler,
+        private EntityManagerInterface $entityManager,
+    ) {}
+
+    #[Route('/api/1.0/ticket/comment/{id}/edit', name: 'chill_ticket_comment_edit', methods: ['POST'])]
+    public function __invoke(Comment $comment, Request $request): Response
+    {
+        if (!$this->security->isGranted(CommentVoter::EDIT, $comment)) {
+            throw new AccessDeniedHttpException('You are not allowed to edit this comment.');
+        }
+
+        $command = $this->serializer->deserialize($request->getContent(), UpdateCommentContentCommand::class, 'json', ['groups' => 'write']);
+
+        $errors = $this->validator->validate($command);
+
+        if (count($errors) > 0) {
+            return new JsonResponse(
+                $this->serializer->serialize($errors, 'json'),
+                Response::HTTP_UNPROCESSABLE_ENTITY,
+                [],
+                true
+            );
+        }
+
+        $this->updateCommentContentCommandHandler->handle($comment, $command);
+
+        $this->entityManager->flush();
+
+        return new JsonResponse(
+            $this->serializer->serialize($comment, 'json', ['groups' => 'read']),
+            Response::HTTP_OK,
+            [],
+            true
+        );
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Controller/UpdateCommentDeletedStatusController.php b/src/Bundle/ChillTicketBundle/src/Controller/UpdateCommentDeletedStatusController.php
new file mode 100644
index 000000000..dcdb93a81
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Controller/UpdateCommentDeletedStatusController.php
@@ -0,0 +1,66 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Controller;
+
+use Chill\TicketBundle\Action\Comment\Handler\UpdateCommentDeletedStatusCommandHandlerInterface;
+use Chill\TicketBundle\Action\Comment\UpdateCommentDeletedStatusCommand;
+use Chill\TicketBundle\Entity\Comment;
+use Chill\TicketBundle\Security\Voter\CommentVoter;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\SerializerInterface;
+
+final readonly class UpdateCommentDeletedStatusController
+{
+    public function __construct(
+        private Security $security,
+        private SerializerInterface $serializer,
+        private UpdateCommentDeletedStatusCommandHandlerInterface $updateCommentDeletedStatusCommandHandler,
+        private EntityManagerInterface $entityManager,
+    ) {}
+
+    #[Route('/api/1.0/ticket/comment/{id}/delete', name: 'chill_ticket_comment_delete', methods: ['POST'])]
+    public function deleteComment(Comment $comment): Response
+    {
+        return $this->updateCommentDeletedStatus($comment, true);
+    }
+
+    #[Route('/api/1.0/ticket/comment/{id}/restore', name: 'chill_ticket_comment_restore', methods: ['POST'])]
+    public function restoreComment(Comment $comment): Response
+    {
+        return $this->updateCommentDeletedStatus($comment, false);
+    }
+
+    private function updateCommentDeletedStatus(Comment $comment, bool $delete): Response
+    {
+        if (!$this->security->isGranted(CommentVoter::EDIT, $comment)) {
+            throw new AccessDeniedHttpException('You are not allowed to edit this comment.');
+        }
+
+        $command = new UpdateCommentDeletedStatusCommand(delete: $delete);
+
+        $this->updateCommentDeletedStatusCommandHandler->handle($comment, $command);
+
+        $this->entityManager->flush();
+
+        return new JsonResponse(
+            $this->serializer->serialize($comment, 'json', ['groups' => 'read']),
+            Response::HTTP_OK,
+            [],
+            true
+        );
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Entity/Comment.php b/src/Bundle/ChillTicketBundle/src/Entity/Comment.php
index 8da2342ee..f33fab4e1 100644
--- a/src/Bundle/ChillTicketBundle/src/Entity/Comment.php
+++ b/src/Bundle/ChillTicketBundle/src/Entity/Comment.php
@@ -38,6 +38,10 @@ class Comment implements TrackCreationInterface, TrackUpdateInterface
     #[Serializer\Groups(['read'])]
     private ?int $id = null;
 
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::BOOLEAN, nullable: false, options: ['default' => false])]
+    #[Serializer\Groups(['read'])]
+    private bool $deleted = false;
+
     public function __construct(
         #[ORM\Column(type: \Doctrine\DBAL\Types\Types::TEXT, nullable: false, options: ['default' => ''])]
         #[Serializer\Groups(['read'])]
@@ -63,4 +67,19 @@ class Comment implements TrackCreationInterface, TrackUpdateInterface
     {
         return $this->ticket;
     }
+
+    public function setContent(string $content): void
+    {
+        $this->content = $content;
+    }
+
+    public function isDeleted(): bool
+    {
+        return $this->deleted;
+    }
+
+    public function setDeleted(bool $deleted): void
+    {
+        $this->deleted = $deleted;
+    }
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Security/Voter/CommentVoter.php b/src/Bundle/ChillTicketBundle/src/Security/Voter/CommentVoter.php
new file mode 100644
index 000000000..03622aa4b
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Security/Voter/CommentVoter.php
@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Security\Voter;
+
+use Chill\TicketBundle\Entity\Comment;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authorization\AccessDecisionManagerInterface;
+use Symfony\Component\Security\Core\Authorization\Voter\Voter;
+
+/**
+ * Check permissions on comments.
+ *
+ * - Adding a comment to the ticket requires to be allowed to write on the ticket;
+ * - Only the user who created the comment is allowed to edit it;
+ */
+final class CommentVoter extends Voter
+{
+    public const CREATE = 'CHILL_TICKET_COMMENT_CREATE';
+    public const EDIT = 'CHILL_TICKET_COMMENT_EDIT';
+    public const READ = 'CHILL_TICKET_COMMENT_READ';
+
+    private const ALL = [self::CREATE, self::EDIT, self::READ];
+
+    public function __construct(private readonly AccessDecisionManagerInterface $decisionManager) {}
+
+    protected function supports(string $attribute, $subject): bool
+    {
+        return $subject instanceof Comment && in_array($attribute, self::ALL, true);
+    }
+
+    protected function voteOnAttribute(string $attribute, $subject, TokenInterface $token): bool
+    {
+        /* @var Comment $subject */
+        return match ($attribute) {
+            self::READ => !$subject->isDeleted() || $subject->getCreatedBy() === $token->getUser(),
+            self::CREATE => $this->decisionManager->decide($token, [TicketVoter::WRITE], $subject->getTicket()),
+            self::EDIT => $token->getUser() === $subject->getCreatedBy(),
+            default => throw new \Symfony\Component\Security\Core\Exception\LogicException('Invalid attribute'),
+        };
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Security/Voter/TicketVoter.php b/src/Bundle/ChillTicketBundle/src/Security/Voter/TicketVoter.php
new file mode 100644
index 000000000..284dd55a8
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Security/Voter/TicketVoter.php
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Security\Voter;
+
+use Chill\TicketBundle\Entity\Ticket;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authorization\Voter\Voter;
+
+/**
+ * Check permission on Ticket.
+ */
+final class TicketVoter extends Voter
+{
+    public const WRITE = 'CHILL_TICKET_TICKET_WRITE';
+    public const READ = 'CHILL_TICKET_TICKET_READ';
+
+    private const ALL = [self::WRITE, self::READ];
+
+    protected function supports(string $attribute, $subject): bool
+    {
+        return $subject instanceof Ticket && in_array($attribute, self::ALL, true);
+    }
+
+    protected function voteOnAttribute(string $attribute, $subject, TokenInterface $token): bool
+    {
+        return true;
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php b/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
index 61cbb9461..e306efbd0 100644
--- a/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
+++ b/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
@@ -22,6 +22,8 @@ use Chill\TicketBundle\Entity\MotiveHistory;
 use Chill\TicketBundle\Entity\PersonHistory;
 use Chill\TicketBundle\Entity\StateHistory;
 use Chill\TicketBundle\Entity\Ticket;
+use Chill\TicketBundle\Security\Voter\CommentVoter;
+use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Serializer\Exception\UnexpectedValueException;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
@@ -31,6 +33,8 @@ final class TicketNormalizer implements NormalizerInterface, NormalizerAwareInte
 {
     use NormalizerAwareTrait;
 
+    public function __construct(private Security $security) {}
+
     public function normalize($object, ?string $format = null, array $context = [])
     {
         if (!$object instanceof Ticket) {
@@ -114,7 +118,7 @@ final class TicketNormalizer implements NormalizerInterface, NormalizerAwareInte
                     'by' => $comment->getCreatedBy(),
                     'data' => $comment,
                 ],
-                $ticket->getComments()->toArray(),
+                $ticket->getComments()->filter(fn (Comment $comment) => $this->security->isGranted(CommentVoter::READ, $comment))->toArray(),
             ),
             ...$this->addresseesStates($ticket),
             ...$this->personStates($ticket),
diff --git a/src/Bundle/ChillTicketBundle/src/config/services.yaml b/src/Bundle/ChillTicketBundle/src/config/services.yaml
index 7e3d6050b..659121f8c 100644
--- a/src/Bundle/ChillTicketBundle/src/config/services.yaml
+++ b/src/Bundle/ChillTicketBundle/src/config/services.yaml
@@ -6,6 +6,9 @@ services:
     Chill\TicketBundle\Action\Ticket\Handler\:
         resource: '../Action/Ticket/Handler/'
 
+    Chill\TicketBundle\Action\Comment\Handler\:
+        resource: '../Action/Comment/Handler/'
+
     Chill\TicketBundle\Controller\:
         resource: '../Controller/'
         tags:
@@ -14,6 +17,9 @@ services:
     Chill\TicketBundle\Repository\:
         resource: '../Repository/'
 
+    Chill\TicketBundle\Security\Voter\:
+        resource: '../Security/Voter/'
+
     Chill\TicketBundle\Serializer\:
         resource: '../Serializer/'
 
diff --git a/src/Bundle/ChillTicketBundle/src/migrations/Version20250711115128.php b/src/Bundle/ChillTicketBundle/src/migrations/Version20250711115128.php
new file mode 100644
index 000000000..260d3a396
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/migrations/Version20250711115128.php
@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\Migrations\Ticket;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20250711115128 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add deleted column to comment table to support soft deletion of comments';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_ticket.comment ADD deleted BOOLEAN DEFAULT false NOT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_ticket.comment DROP deleted');
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Action/Comment/Handler/UpdateCommentContentCommandHandlerTest.php b/src/Bundle/ChillTicketBundle/tests/Action/Comment/Handler/UpdateCommentContentCommandHandlerTest.php
new file mode 100644
index 000000000..53cb003c3
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Action/Comment/Handler/UpdateCommentContentCommandHandlerTest.php
@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Tests\Action\Comment\Handler;
+
+use Chill\TicketBundle\Action\Comment\Handler\UpdateCommentContentCommandHandler;
+use Chill\TicketBundle\Action\Comment\UpdateCommentContentCommand;
+use Chill\TicketBundle\Entity\Comment;
+use Chill\TicketBundle\Entity\Ticket;
+use Doctrine\ORM\EntityManagerInterface;
+use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class UpdateCommentContentCommandHandlerTest extends TestCase
+{
+    use ProphecyTrait;
+
+    public function testUpdateCommentContent(): void
+    {
+        $handler = $this->buildCommand();
+
+        $ticket = new Ticket();
+        $comment = new Comment('initial content', $ticket);
+        $command = new UpdateCommentContentCommand(content: 'updated content');
+
+        $handler->handle($comment, $command);
+
+        self::assertEquals('updated content', $comment->getContent());
+    }
+
+    private function buildCommand(): UpdateCommentContentCommandHandler
+    {
+        $entityManager = $this->prophesize(EntityManagerInterface::class);
+
+        return new UpdateCommentContentCommandHandler($entityManager->reveal());
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Action/Comment/Handler/UpdateCommentDeletedStatusCommandHandlerTest.php b/src/Bundle/ChillTicketBundle/tests/Action/Comment/Handler/UpdateCommentDeletedStatusCommandHandlerTest.php
new file mode 100644
index 000000000..a128abc7b
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Action/Comment/Handler/UpdateCommentDeletedStatusCommandHandlerTest.php
@@ -0,0 +1,55 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Tests\Action\Comment\Handler;
+
+use Chill\TicketBundle\Action\Comment\Handler\UpdateCommentDeletedStatusCommandHandler;
+use Chill\TicketBundle\Action\Comment\UpdateCommentDeletedStatusCommand;
+use Chill\TicketBundle\Entity\Comment;
+use Chill\TicketBundle\Entity\Ticket;
+use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class UpdateCommentDeletedStatusCommandHandlerTest extends TestCase
+{
+    use ProphecyTrait;
+
+    public function testUpdateCommentDeletedStatus(): void
+    {
+        $handler = $this->buildCommand();
+
+        $ticket = new Ticket();
+        $comment = new Comment('content', $ticket);
+
+        // Initially, the comment should not be deleted
+        self::assertFalse($comment->isDeleted());
+
+        // Test setting deleted to true
+        $command = new UpdateCommentDeletedStatusCommand(delete: true);
+        $handler->handle($comment, $command);
+        self::assertTrue($comment->isDeleted());
+
+        // Test setting deleted back to false
+        $command = new UpdateCommentDeletedStatusCommand(delete: false);
+        $handler->handle($comment, $command);
+        self::assertFalse($comment->isDeleted());
+    }
+
+    private function buildCommand(): UpdateCommentDeletedStatusCommandHandler
+    {
+        return new UpdateCommentDeletedStatusCommandHandler();
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/AddCommentControllerTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/AddCommentControllerTest.php
index 2826c360d..f954fd084 100644
--- a/src/Bundle/ChillTicketBundle/tests/Controller/AddCommentControllerTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/AddCommentControllerTest.php
@@ -15,6 +15,7 @@ use Chill\TicketBundle\Action\Ticket\Handler\AddCommentCommandHandler;
 use Chill\TicketBundle\Controller\AddCommentController;
 use Chill\TicketBundle\Entity\Comment;
 use Chill\TicketBundle\Entity\Ticket;
+use Chill\TicketBundle\Security\Voter\CommentVoter;
 use Doctrine\ORM\EntityManagerInterface;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
@@ -87,6 +88,7 @@ class AddCommentControllerTest extends KernelTestCase
         $entityManager = $this->prophesize(EntityManagerInterface::class);
 
         if ($willFlush) {
+            $security->isGranted(CommentVoter::CREATE, Argument::type(Comment::class))->willReturn(true);
             $entityManager->persist(Argument::type(Comment::class))->shouldBeCalled();
             $entityManager->flush()->shouldBeCalled();
         }
diff --git a/src/Bundle/ChillTicketBundle/tests/Chill/TicketBundle/Controller/TicketListControllerTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListControllerTest.php
similarity index 100%
rename from src/Bundle/ChillTicketBundle/tests/Chill/TicketBundle/Controller/TicketListControllerTest.php
rename to src/Bundle/ChillTicketBundle/tests/Controller/TicketListControllerTest.php
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/UpdateCommentControllerTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/UpdateCommentControllerTest.php
new file mode 100644
index 000000000..599051702
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/UpdateCommentControllerTest.php
@@ -0,0 +1,134 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Tests\Controller;
+
+use Chill\TicketBundle\Action\Comment\Handler\UpdateCommentContentCommandHandlerInterface;
+use Chill\TicketBundle\Controller\UpdateCommentController;
+use Chill\TicketBundle\Entity\Comment;
+use Chill\TicketBundle\Entity\Ticket;
+use Chill\TicketBundle\Security\Voter\CommentVoter;
+use Doctrine\ORM\EntityManagerInterface;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\SerializerInterface;
+use Symfony\Component\Validator\Validator\ValidatorInterface;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class UpdateCommentControllerTest extends KernelTestCase
+{
+    use ProphecyTrait;
+
+    private SerializerInterface $serializer;
+    private ValidatorInterface $validator;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+        $this->validator = self::getContainer()->get(ValidatorInterface::class);
+        $this->serializer = self::getContainer()->get(SerializerInterface::class);
+    }
+
+    public function testUpdateComment(): void
+    {
+        $ticket = new Ticket();
+        $comment = new Comment('initial content', $ticket);
+        $controller = $this->buildController(willFlush: true, isGranted: true, comment: $comment);
+
+        $request = new Request(content: <<<'JSON'
+            {"content":  "updated content"}
+            JSON);
+
+        $response = $controller->__invoke($comment, $request);
+
+        self::assertEquals(200, $response->getStatusCode());
+    }
+
+    public function testUpdateCommentWithBlankContent(): void
+    {
+        $ticket = new Ticket();
+        $comment = new Comment('initial content', $ticket);
+        $controller = $this->buildController(willFlush: false, isGranted: true, comment: $comment);
+
+        $request = new Request(content: <<<'JSON'
+            {"content":  ""}
+            JSON);
+
+        $response = $controller->__invoke($comment, $request);
+
+        self::assertEquals(422, $response->getStatusCode());
+    }
+
+    public function testUpdateCommentWithNullContent(): void
+    {
+        $ticket = new Ticket();
+        $comment = new Comment('initial content', $ticket);
+        $controller = $this->buildController(willFlush: false, isGranted: true, comment: $comment);
+
+        $request = new Request(content: <<<'JSON'
+            {"content":  null}
+            JSON);
+
+        $response = $controller->__invoke($comment, $request);
+
+        self::assertEquals(422, $response->getStatusCode());
+    }
+
+    public function testUpdateCommentWithoutAuthorization(): void
+    {
+        $ticket = new Ticket();
+        $comment = new Comment('initial content', $ticket);
+        $controller = $this->buildController(willFlush: false, isGranted: false, comment: $comment);
+
+        $request = new Request(content: <<<'JSON'
+            {"content":  "updated content"}
+            JSON);
+
+        $this->expectException(AccessDeniedHttpException::class);
+        $this->expectExceptionMessage('You are not allowed to edit this comment.');
+
+        $controller->__invoke($comment, $request);
+    }
+
+    private function buildController(bool $willFlush, bool $isGranted, Comment $comment): UpdateCommentController
+    {
+        $security = $this->prophesize(Security::class);
+        $security->isGranted(CommentVoter::EDIT, $comment)->willReturn($isGranted);
+
+        $entityManager = $this->prophesize(EntityManagerInterface::class);
+
+        if ($willFlush) {
+            $entityManager->flush()->shouldBeCalled();
+        }
+
+        $commandHandler = $this->prophesize(UpdateCommentContentCommandHandlerInterface::class);
+
+        if ($isGranted && $willFlush) {
+            $commandHandler->handle($comment, Argument::any())->shouldBeCalled();
+        }
+
+        return new UpdateCommentController(
+            $security->reveal(),
+            $this->serializer,
+            $this->validator,
+            $commandHandler->reveal(),
+            $entityManager->reveal(),
+        );
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/UpdateCommentDeletedStatusControllerTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/UpdateCommentDeletedStatusControllerTest.php
new file mode 100644
index 000000000..fb70db76d
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/UpdateCommentDeletedStatusControllerTest.php
@@ -0,0 +1,114 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Tests\Controller;
+
+use Chill\TicketBundle\Action\Comment\Handler\UpdateCommentDeletedStatusCommandHandlerInterface;
+use Chill\TicketBundle\Controller\UpdateCommentDeletedStatusController;
+use Chill\TicketBundle\Entity\Comment;
+use Chill\TicketBundle\Entity\Ticket;
+use Chill\TicketBundle\Security\Voter\CommentVoter;
+use Doctrine\ORM\EntityManagerInterface;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\SerializerInterface;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class UpdateCommentDeletedStatusControllerTest extends KernelTestCase
+{
+    use ProphecyTrait;
+
+    private SerializerInterface $serializer;
+
+    protected function setUp(): void
+    {
+        self::bootKernel();
+        $this->serializer = self::getContainer()->get(SerializerInterface::class);
+    }
+
+    public function testDeleteComment(): void
+    {
+        $ticket = new Ticket();
+        $comment = new Comment('content', $ticket);
+        $controller = $this->buildController(willFlush: true, isGranted: true, comment: $comment);
+
+        $response = $controller->deleteComment($comment);
+
+        self::assertEquals(200, $response->getStatusCode());
+    }
+
+    public function testRestoreComment(): void
+    {
+        $ticket = new Ticket();
+        $comment = new Comment('content', $ticket);
+        $controller = $this->buildController(willFlush: true, isGranted: true, comment: $comment);
+
+        $response = $controller->restoreComment($comment);
+
+        self::assertEquals(200, $response->getStatusCode());
+    }
+
+    public function testDeleteCommentWithoutAuthorization(): void
+    {
+        $ticket = new Ticket();
+        $comment = new Comment('content', $ticket);
+        $controller = $this->buildController(willFlush: false, isGranted: false, comment: $comment);
+
+        $this->expectException(AccessDeniedHttpException::class);
+        $this->expectExceptionMessage('You are not allowed to edit this comment.');
+
+        $controller->deleteComment($comment);
+    }
+
+    public function testRestoreCommentWithoutAuthorization(): void
+    {
+        $ticket = new Ticket();
+        $comment = new Comment('content', $ticket);
+        $controller = $this->buildController(willFlush: false, isGranted: false, comment: $comment);
+
+        $this->expectException(AccessDeniedHttpException::class);
+        $this->expectExceptionMessage('You are not allowed to edit this comment.');
+
+        $controller->restoreComment($comment);
+    }
+
+    private function buildController(bool $willFlush, bool $isGranted, Comment $comment): UpdateCommentDeletedStatusController
+    {
+        $security = $this->prophesize(Security::class);
+        $security->isGranted(CommentVoter::EDIT, $comment)->willReturn($isGranted);
+
+        $entityManager = $this->prophesize(EntityManagerInterface::class);
+
+        if ($willFlush) {
+            $entityManager->flush()->shouldBeCalled();
+        }
+
+        $commandHandler = $this->prophesize(UpdateCommentDeletedStatusCommandHandlerInterface::class);
+
+        if ($isGranted && $willFlush) {
+            $commandHandler->handle($comment, Argument::any())->shouldBeCalled();
+        }
+
+        return new UpdateCommentDeletedStatusController(
+            $security->reveal(),
+            $this->serializer,
+            $commandHandler->reveal(),
+            $entityManager->reveal(),
+        );
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/TicketNormalizerTest.php b/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/TicketNormalizerTest.php
index bda2fd485..2fd983a05 100644
--- a/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/TicketNormalizerTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/TicketNormalizerTest.php
@@ -25,10 +25,13 @@ use Chill\TicketBundle\Entity\PersonHistory;
 use Chill\TicketBundle\Entity\StateEnum;
 use Chill\TicketBundle\Entity\StateHistory;
 use Chill\TicketBundle\Entity\Ticket;
+use Chill\TicketBundle\Security\Voter\CommentVoter;
 use Chill\TicketBundle\Serializer\Normalizer\TicketNormalizer;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
+use Prophecy\Prophecy\ObjectProphecy;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
@@ -40,6 +43,13 @@ class TicketNormalizerTest extends KernelTestCase
 {
     use ProphecyTrait;
 
+    private ObjectProphecy $security;
+
+    protected function setUp(): void
+    {
+        $this->security = $this->prophesize(Security::class);
+    }
+
     /**
      * @dataProvider provideTickets
      */
@@ -192,6 +202,35 @@ class TicketNormalizerTest extends KernelTestCase
         ];
     }
 
+    public function testNormalizeTicketWithCommentNotAllowed(): void
+    {
+        $ticket = new Ticket();
+        $comment = new Comment('Test comment', $ticket);
+        $comment->setCreatedAt(new \DateTimeImmutable('2024-04-01T12:04:00'));
+        $comment->setCreatedBy(new User());
+
+        $this->security->isGranted(CommentVoter::READ, $comment)->willReturn(false)->shouldBeCalled();
+
+        $actual = $this->buildNormalizer()->normalize($ticket, 'json', ['groups' => ['read']]);
+
+        self::assertEmpty($actual['history']);
+    }
+
+    public function testNormalizeTicketWithCommentAllowed(): void
+    {
+        $ticket = new Ticket();
+        $comment = new Comment('Test comment', $ticket);
+        $comment->setCreatedAt(new \DateTimeImmutable('2024-04-01T12:04:00'));
+        $comment->setCreatedBy(new User());
+
+        $this->security->isGranted(CommentVoter::READ, $comment)->willReturn(true)->shouldBeCalled();
+
+        $actual = $this->buildNormalizer()->normalize($ticket, 'json', ['groups' => ['read']]);
+
+        self::assertCount(1, $actual['history']);
+        self::assertEquals('add_comment', $actual['history'][0]['event_type']);
+    }
+
     public function testNormalizeReadSimple(): void
     {
         // Create a ticket with some data
@@ -274,6 +313,10 @@ class TicketNormalizerTest extends KernelTestCase
 
     private function buildNormalizer(): TicketNormalizer
     {
+        $this->security->isGranted(CommentVoter::READ, Argument::type(Comment::class))
+            ->willReturn(true);
+
+
         $normalizer = $this->prophesize(NormalizerInterface::class);
 
         // empty array
@@ -285,14 +328,14 @@ class TicketNormalizerTest extends KernelTestCase
 
         // array of mixed objects
         $normalizer->normalize(
-            Argument::that(fn ($arg) => is_array($arg) && 0 < count($arg) && is_object($arg[0])),
+            Argument::that(fn ($arg) => is_array($arg) && 0 < count($arg) && is_object($arg[0] ?? null)),
             'json',
             Argument::type('array')
         )->will(fn ($args) => array_fill(0, count($args[0]), 'embedded'));
 
         // array of event type
         $normalizer->normalize(
-            Argument::that(fn ($arg) => is_array($arg) && 0 < count($arg) && is_array($arg[0]) && array_key_exists('event_type', $arg[0])),
+            Argument::that(fn ($arg) => is_array($arg) && 0 < count($arg) && is_array($arg[0] ?? null) && array_key_exists('event_type', $arg[0] ?? null)),
             'json',
             Argument::type('array')
         )->will(function ($args): array {
@@ -357,7 +400,7 @@ class TicketNormalizerTest extends KernelTestCase
         // null values
         $normalizer->normalize(null, 'json', Argument::type('array'))->willReturn(null);
 
-        $ticketNormalizer = new TicketNormalizer();
+        $ticketNormalizer = new TicketNormalizer($this->security->reveal());
         $ticketNormalizer->setNormalizer($normalizer->reveal());
 
         return $ticketNormalizer;

From c5e6122d2ce420731d498241357220dad7cb7bbe Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 11 Jul 2025 14:59:34 +0200
Subject: [PATCH 149/283] Add `deleted` boolean property to Ticket type
 definition

---
 src/Bundle/ChillTicketBundle/src/Resources/public/types.ts | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
index 8287c59f7..fddc5b74b 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
@@ -54,6 +54,7 @@ export interface Comment {
   createdAt: DateTime | null;
   updatedBy: User | null;
   updatedAt: DateTime | null;
+  deleted: boolean;
 }
 
 export interface AddresseeHistory {

From 2bd303bbbe864cae779218693a13b470cdd86335 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 11 Jul 2025 15:46:08 +0200
Subject: [PATCH 150/283] Add `supplementaryComments` property to Motive
 entity, update fixtures and types

---
 .../src/DataFixtures/ORM/LoadMotives.php      | 104 ++++++++++--------
 .../ChillTicketBundle/src/Entity/Motive.php   |  22 ++++
 .../src/Resources/public/types.ts             |   3 +
 .../src/migrations/Version20250711131126.php  |  33 ++++++
 .../ReplaceMotiveControllerTest.php           |   2 +
 5 files changed, 120 insertions(+), 44 deletions(-)
 create mode 100644 src/Bundle/ChillTicketBundle/src/migrations/Version20250711131126.php

diff --git a/src/Bundle/ChillTicketBundle/src/DataFixtures/ORM/LoadMotives.php b/src/Bundle/ChillTicketBundle/src/DataFixtures/ORM/LoadMotives.php
index e29470a3f..965787059 100644
--- a/src/Bundle/ChillTicketBundle/src/DataFixtures/ORM/LoadMotives.php
+++ b/src/Bundle/ChillTicketBundle/src/DataFixtures/ORM/LoadMotives.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\TicketBundle\DataFixtures\ORM;
 
+use Chill\TicketBundle\Entity\EmergencyStatusEnum;
 use Chill\TicketBundle\Entity\Motive;
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Bundle\FixturesBundle\FixtureGroupInterface;
@@ -25,58 +26,73 @@ final class LoadMotives extends Fixture implements FixtureGroupInterface
 
     public function load(ObjectManager $manager)
     {
-        foreach (explode("\n", self::MOTIVES) as $label) {
-            if ('' === trim($label)) {
+        foreach (explode("\n", self::MOTIVES) as $row) {
+            if ('' === trim($row)) {
+                continue;
+            }
+
+            $data = str_getcsv($row);
+            if ('' === $data[0]) {
                 continue;
             }
 
             $motive = new Motive();
-            $motive->setLabel(['fr' => trim($label)]);
+            $motive->setLabel(['fr' => trim((string) $data[0])]);
+            $motive->setMakeTicketEmergency(match ($data[1]) {
+                'true' => EmergencyStatusEnum::YES,
+                'false' => EmergencyStatusEnum::NO,
+                default => throw new \UnexpectedValueException('Unexpected value'),
+            });
+
+            foreach (array_slice($data, 2) as $supplementaryComment) {
+                if ('' !== trim((string) $supplementaryComment)) {
+                    $motive->addSupplementaryComment(['label' => trim((string) $supplementaryComment)]);
+                }
+            }
 
             $manager->persist($motive);
         }
-
         $manager->flush();
     }
 
-    private const MOTIVES = <<<'TXT'
-        Coordonnées
-        Horaire de passage
-        Retard de livraison
-        Erreur de livraison
-        Colis incomplet
-        MATLOC
-        Retard DASRI
-        Planning d'astreintes
-        Planning des tournées
-        Contrôle pompe
-        Changement de rendez-vous
-        Renseignement facturation/prestation
-        Décès patient
-        Demande de prise en charge
-        Information absence
-        Demande bulletin de situation
-        Difficultés accès logement
-        Déplacement inutile
-        Problème de prélèvement/de commande
-        Parc auto
-        Demande d'admission
-        Retrait de matériel au domicile
-        Comptes-rendus
-        Démarchage commercial
-        Demande de transport
-        Demande laboratoire
-        Demande admission
-        Suivi de prise en charge
-        Mauvaise adresse
-        Patient absent
-        Annulation
-        Colis perdu
-        Changement de rendez-vous
-        Coordination interservices
-        Problème de substitution produits
-        Problème ordonnance
-        Réclamations facture
-        Préparation urgente
-        TXT;
+    private const MOTIVES = <<<'CSV'
+        "Coordonnées",false,"Nouvelles coordonnées",
+        "Horaire de passage",false,
+        "Retard de livraison",false,
+        "Erreur de livraison",false,
+        "Colis incomplet",false,
+        "MATLOC",false,
+        "Retard DASRI",false,
+        "Planning d'astreintes",false,
+        "Planning des tournées",false,
+        "Contrôle pompe",true,
+        "Changement de rendez-vous",false,"Date du nouveau rendez-vous","Lieu du nouveau rendez-vous",
+        "Renseignement facturation/prestation",false,
+        "Décès patient",false,"Date et heures du décès","Autorisation préalable du médecin pour le décès",
+        "Demande de prise en charge",false,
+        "Information absence",false,
+        "Demande bulletin de situation",false,
+        "Difficultés accès logement",false,
+        "Déplacement inutile",false,
+        "Problème de prélèvement/de commande",false,
+        "Parc auto",false,
+        "Demande d'admission",false,
+        "Retrait de matériel au domicile",false,
+        "Comptes-rendus",false,
+        "Démarchage commercial",false,
+        "Demande de transport",false,
+        "Demande laboratoire",false,
+        "Demande admission",false,
+        "Suivi de prise en charge",false,
+        "Mauvaise adresse",false,
+        "Patient absent",false,
+        "Annulation",false,
+        "Colis perdu",false,
+        "Changement de rendez-vous",false,
+        "Coordination interservices",false,
+        "Problème de substitution produits",true,
+        "Problème ordonnance",false,
+        "Réclamations facture",false,"Numéro de facture concerné",
+        "Préparation urgente",true,
+        CSV;
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Entity/Motive.php b/src/Bundle/ChillTicketBundle/src/Entity/Motive.php
index 8dadecde0..2ea3b47c2 100644
--- a/src/Bundle/ChillTicketBundle/src/Entity/Motive.php
+++ b/src/Bundle/ChillTicketBundle/src/Entity/Motive.php
@@ -37,6 +37,10 @@ class Motive
     #[Serializer\Groups(['read'])]
     private ?EmergencyStatusEnum $makeTicketEmergency = null;
 
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::JSON, nullable: false, options: ['jsonb' => true, 'default' => '[]'])]
+    #[Serializer\Groups(['read'])]
+    private array $supplementaryComments = [];
+
     public function isActive(): bool
     {
         return $this->active;
@@ -76,4 +80,22 @@ class Motive
     {
         return null !== $this->makeTicketEmergency;
     }
+
+    /**
+     * Get the supplementary comments.
+     *
+     * @return array<array{label: string}>
+     */
+    public function getSupplementaryComments(): array
+    {
+        return $this->supplementaryComments;
+    }
+
+    /**
+     * @param array{label: string} $supplementaryComments
+     */
+    public function addSupplementaryComment(array $supplementaryComments): void
+    {
+        $this->supplementaryComments[] = $supplementaryComments;
+    }
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
index fddc5b74b..7cb2e257b 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
@@ -55,6 +55,9 @@ export interface Comment {
   updatedBy: User | null;
   updatedAt: DateTime | null;
   deleted: boolean;
+  supplementaryComments: {
+    label: string;
+  };
 }
 
 export interface AddresseeHistory {
diff --git a/src/Bundle/ChillTicketBundle/src/migrations/Version20250711131126.php b/src/Bundle/ChillTicketBundle/src/migrations/Version20250711131126.php
new file mode 100644
index 000000000..37ea00373
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/migrations/Version20250711131126.php
@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\Migrations\Ticket;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20250711131126 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add supplementaryComments property to Motive entity as JSONB type to store list of comments with label';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_ticket.motive ADD supplementaryComments JSONB DEFAULT \'[]\' NOT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_ticket.motive DROP supplementaryComments');
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/ReplaceMotiveControllerTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/ReplaceMotiveControllerTest.php
index 409cbcf0e..5e899e2b4 100644
--- a/src/Bundle/ChillTicketBundle/tests/Controller/ReplaceMotiveControllerTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/ReplaceMotiveControllerTest.php
@@ -99,6 +99,8 @@ class ReplaceMotiveControllerTest extends KernelTestCase
         $entityManager->flush()->shouldBeCalled();
 
         $changeEmergencyCommandHandler = $this->prophesize(ChangeEmergencyStateCommandHandler::class);
+        $changeEmergencyCommandHandler->__invoke(Argument::any(), Argument::any())->shouldBeCalled()
+            ->will(fn (array $args) => $args[0]);
 
         $handler = new ReplaceMotiveCommandHandler(
             new MockClock(),

From b7c9b60744be8a4d0c4f2bce4a40fb869f2d6897 Mon Sep 17 00:00:00 2001
From: Boris Waaub <boris.waaub@digitalternative.be>
Date: Wed, 16 Jul 2025 09:04:57 +0000
Subject: [PATCH 151/283] =?UTF-8?q?Cr=C3=A9er=20un=20composant=20pour=20af?=
 =?UTF-8?q?ficher=20une=20liste=20des=20tickets?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../public/vuejs/_components/Modal.vue        |   6 +-
 .../src/Resources/public/types.ts             |   2 +-
 .../Resources/public/vuejs/TicketApp/App.vue  |   7 +-
 .../components/ActionToolbarComponent.vue     |  37 ++--
 .../{ => Addressee}/AddresseeComponent.vue    |   2 +-
 .../AddresseeSelectorComponent.vue            |   0
 .../TicketApp/components/BannerComponent.vue  | 130 +++++---------
 .../components/CallerSelectorComponent.vue    |  85 ---------
 .../CommentComponent.vue}                     |   2 +-
 .../CommentEditorComponent.vue}               |   0
 .../EmergencyComponent.vue}                   |   0
 .../EmergencyToggleComponent.vue}             |   0
 .../MotiveComponent.vue}                      |   7 +-
 .../{ => Motive}/MotiveSelectorComponent.vue  |   2 +-
 .../PersonComponent.vue}                      |   4 +-
 .../Person/PersonsSelectorComponent.vue       | 139 +++++++++++++++
 .../components/PersonsSelectorComponent.vue   |  90 ----------
 .../components/PreviousTicketsComponent.vue   | 166 ++++++++++++++++++
 .../StateComponent.vue}                       |  28 +--
 .../TicketHistoryAddresseeComponent.vue       |  18 --
 .../TicketHistoryCreateComponent.vue          |  16 --
 .../components/TicketHistoryListComponent.vue |  41 ++---
 .../components/TicketListComponent.vue        |  39 ++++
 .../components/TicketListItemComponent.vue    | 128 ++++++++++++++
 .../components/TicketSelectorComponent.vue    |  36 ----
 .../vuejs/TicketApp/store/modules/ticket.ts   |  71 +++++++-
 .../public/vuejs/TicketApp/utils/utils.ts     |  94 ++++++++++
 .../Normalizer/TicketNormalizer.php           |   2 +-
 .../src/translations/messages+intl-icu.fr.yml |   8 +-
 .../Normalizer/TicketNormalizerTest.php       |   2 +-
 30 files changed, 745 insertions(+), 417 deletions(-)
 rename src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/{ => Addressee}/AddresseeComponent.vue (95%)
 rename src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/{ => Addressee}/AddresseeSelectorComponent.vue (100%)
 delete mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/CallerSelectorComponent.vue
 rename src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/{TicketHistoryCommentComponent.vue => Comment/CommentComponent.vue} (96%)
 rename src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/{AddCommentComponent.vue => Comment/CommentEditorComponent.vue} (100%)
 rename src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/{TicketHistoryEmergencyComponent.vue => Emergency/EmergencyComponent.vue} (100%)
 rename src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/{ToggleFlags.vue => Emergency/EmergencyToggleComponent.vue} (100%)
 rename src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/{TicketHistoryMotiveComponent.vue => Motive/MotiveComponent.vue} (50%)
 rename src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/{ => Motive}/MotiveSelectorComponent.vue (97%)
 rename src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/{TicketHistoryPersonComponent.vue => Person/PersonComponent.vue} (97%)
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Person/PersonsSelectorComponent.vue
 delete mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PersonsSelectorComponent.vue
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PreviousTicketsComponent.vue
 rename src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/{TicketHistoryStateComponent.vue => State/StateComponent.vue} (50%)
 delete mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent.vue
 delete mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCreateComponent.vue
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketListComponent.vue
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketListItemComponent.vue
 delete mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketSelectorComponent.vue
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/utils/utils.ts

diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
index 4808e2bda..22c934c67 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
@@ -10,9 +10,11 @@
       >
         <div class="modal-dialog" :class="modalDialogClass || {}">
           <div class="modal-content">
-            <div class="modal-header">
+            <div
+              class="modal-header d-flex justify-content-between align-items-center"
+            >
               <slot name="header"></slot>
-              <button class="close btn" @click="emits('close')">
+              <button class="close btn ms-auto" @click="emits('close')">
                 <i class="fa fa-times" aria-hidden="true"></i>
               </button>
             </div>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
index fddc5b74b..e1821fb39 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
@@ -132,6 +132,7 @@ interface BaseTicket<
   type: "ticket_ticket";
   id: number;
   externalRef: string;
+  createdAt: DateTime | null;
   currentAddressees: UserGroupOrUser[];
   currentPersons: Person[];
   currentMotive: null | Motive;
@@ -146,7 +147,6 @@ export interface TicketSimple extends BaseTicket<"ticket_ticket:simple"> {
 
 export interface Ticket extends BaseTicket<"ticket_ticket:extended"> {
   type_extended: "ticket_ticket:extended";
-  createdAt: DateTime | null;
   createdBy: User | null;
   updatedAt: DateTime | null;
   updatedBy: User | null;
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
index eb9166074..73a60cf50 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
@@ -1,11 +1,12 @@
 <template>
   <banner-component :ticket="ticket" />
   <div class="container-xxl pt-1" style="padding-bottom: 55px">
-    <ticket-selector-component :tickets="[]" />
+    <previous-tickets-component />
     <ticket-history-list-component :history="ticketHistory" />
   </div>
   <action-toolbar-component />
 </template>
+
 <script setup lang="ts">
 import { useToast } from "vue-toast-notification";
 import { computed, onMounted } from "vue";
@@ -15,7 +16,7 @@ import { useStore } from "vuex";
 import { Ticket } from "../../types";
 
 // Components
-import TicketSelectorComponent from "./components/TicketSelectorComponent.vue";
+import PreviousTicketsComponent from "./components/PreviousTicketsComponent.vue";
 import TicketHistoryListComponent from "./components/TicketHistoryListComponent.vue";
 import ActionToolbarComponent from "./components/ActionToolbarComponent.vue";
 import BannerComponent from "./components/BannerComponent.vue";
@@ -27,7 +28,7 @@ store.commit("setTicket", JSON.parse(window.initialTicket) as Ticket);
 
 const ticket = computed(() => store.getters.getTicket as Ticket);
 
-const ticketHistory = computed(() => store.getters.getDistinctAddressesHistory);
+const ticketHistory = computed(() => store.getters.getTicketHistory);
 
 onMounted(async () => {
   try {
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
index 259a8aed9..d78e8e2a5 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
@@ -27,7 +27,7 @@
         </div>
 
         <form @submit.prevent="submitAction">
-          <add-comment-component
+          <comment-editor-component
             v-model="content"
             v-if="activeTab === 'add_comment'"
           />
@@ -53,12 +53,21 @@
             </div>
             <div class="row">
               <div class="col">
-                <caller-selector-component v-model="caller" :suggested="[]" />
+                <persons-selector-component
+                  v-model="caller"
+                  :suggested="[]"
+                  :multiple="false"
+                  :types="['person', 'thirdparty']"
+                  :label="trans(CHILL_TICKET_TICKET_SET_PERSONS_CALLER_LABEL)"
+                />
               </div>
               <div class="col">
                 <persons-selector-component
                   v-model="persons"
                   :suggested="suggestedPersons"
+                  :multiple="true"
+                  :types="['person']"
+                  :label="trans(CHILL_TICKET_TICKET_SET_PERSONS_USER_LABEL)"
                 />
               </div>
             </div>
@@ -82,15 +91,14 @@
         <li v-else class="nav-item p-2 go-back">
           <button
             type="button"
-            class="btn btn-link p-0"
-            style="font-size: 1.5rem; line-height: 1; color: #888"
+            class="btn btn-light"
             @click="closeAllActions"
             aria-label="Fermer"
             title="Fermer"
           >
-            <span aria-hidden="true">&times;</span>
+            <i class="fa fa-arrow-left"></i>
+            {{ trans(CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CANCEL) }}
           </button>
-          >
         </li>
         <li v-for="btn in actionButtons" :key="btn.key" class="nav-item p-2">
           <button
@@ -130,11 +138,10 @@ import { useStore } from "vuex";
 import { useToast } from "vue-toast-notification";
 
 // Component
-import MotiveSelectorComponent from "./MotiveSelectorComponent.vue";
-import AddresseeSelectorComponent from "./AddresseeSelectorComponent.vue";
-import AddCommentComponent from "./AddCommentComponent.vue";
-import PersonsSelectorComponent from "./PersonsSelectorComponent.vue";
-import CallerSelectorComponent from "./CallerSelectorComponent.vue";
+import MotiveSelectorComponent from "./Motive/MotiveSelectorComponent.vue";
+import AddresseeSelectorComponent from "./Addressee/AddresseeSelectorComponent.vue";
+import CommentEditorComponent from "./Comment/CommentEditorComponent.vue";
+import PersonsSelectorComponent from "./Person/PersonsSelectorComponent.vue";
 
 // Translations
 import {
@@ -152,6 +159,8 @@ import {
   CHILL_TICKET_TICKET_SET_PERSONS_TITLE_CALLER,
   CHILL_TICKET_TICKET_SET_PERSONS_TITLE,
   CHILL_TICKET_TICKET_SET_PERSONS_SUCCESS,
+  CHILL_TICKET_TICKET_SET_PERSONS_USER_LABEL,
+  CHILL_TICKET_TICKET_SET_PERSONS_CALLER_LABEL,
   CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_SAVE,
   CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CLOSE,
   CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CLOSE_SUCCESS,
@@ -159,6 +168,7 @@ import {
   CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_REOPEN,
   CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_REOPEN_SUCCESS,
   CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_REOPEN_ERROR,
+  CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CANCEL,
 } from "translator";
 
 // Types
@@ -220,7 +230,7 @@ const isOpen = computed(() => store.getters.isOpen);
 const motives = computed(() => store.getters.getMotives as Motive[]);
 const userGroups = computed(() => store.getters.getUserGroups as UserGroup[]);
 const suggestedPersons = computed(() => store.getters.getPersons as Person[]);
-console.log("suggestedPersons", suggestedPersons.value);
+
 const hasReturnPath = computed((): boolean => {
   const params = new URL(document.location.toString()).searchParams;
   return params.has("returnPath");
@@ -291,6 +301,7 @@ async function submitAction() {
         await store.dispatch("setPersons", {
           persons: persons.value,
         });
+        await store.dispatch("fetchTicketsByPerson");
         activeTab.value = "";
         toast.success(trans(CHILL_TICKET_TICKET_SET_PERSONS_SUCCESS));
         break;
@@ -351,6 +362,6 @@ div.footer-ticket-details {
 .fixed-bottom {
   position: sticky;
   top: 0;
-  overflow: hidden;
+  overflow: visible;
 }
 </style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Addressee/AddresseeComponent.vue
similarity index 95%
rename from src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeComponent.vue
rename to src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Addressee/AddresseeComponent.vue
index 085d62e49..92477ba0d 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Addressee/AddresseeComponent.vue
@@ -37,7 +37,7 @@ import {
   User,
   UserGroup,
   UserGroupOrUser,
-} from "../../../../../../../ChillMainBundle/Resources/public/types";
+} from "../../../../../../../../ChillMainBundle/Resources/public/types";
 
 const props = defineProps<{ addressees: UserGroupOrUser[] }>();
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Addressee/AddresseeSelectorComponent.vue
similarity index 100%
rename from src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddresseeSelectorComponent.vue
rename to src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Addressee/AddresseeSelectorComponent.vue
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
index cb8c33201..2239b3af7 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
@@ -3,12 +3,10 @@
     <div class="container-xxl text-primary">
       <div class="row">
         <div class="col-md-6 col-sm-12 ps-md-5 ps-xxl-0">
-          <h1 v-if="ticket.currentMotive">
-            #{{ ticket.id }} {{ ticket.currentMotive.label.fr }}
+          <h1>
+            {{ getTicketTitle(ticket) }}
           </h1>
-          <p class="chill-no-data-statement" v-else>
-            {{ trans(CHILL_TICKET_TICKET_BANNER_NO_MOTIVE) }}
-          </p>
+
           <h2 v-if="ticket.currentPersons.length">
             {{ ticket.currentPersons.map((person) => person.text).join(", ") }}
           </h2>
@@ -16,7 +14,7 @@
 
         <div class="col-md-6 col-sm-12">
           <div class="d-flex justify-content-end">
-            <toggle-flags />
+            <emergency-toggle-component />
 
             <span
               class="badge text-bg-chill-green text-white"
@@ -49,37 +47,42 @@
   <Teleport to="#header-ticket-details">
     <div class="container-xxl">
       <div class="row justify-content-between">
-        <div class="col-md-4 col-sm-12 d-flex flex-column align-items-start">
+        <div
+          class="col-md-4 col-sm-12 d-flex flex-column align-items-start"
+          v-if="ticket.caller"
+        >
           <h3 class="text-primary">
-            {{ trans(CHILL_TICKET_TICKET_BANNER_CALLER) }}
+            {{
+              trans(CHILL_TICKET_TICKET_BANNER_CALLER, {
+                count: ticket.caller ? 1 : 0,
+              })
+            }}
           </h3>
-          <on-the-fly
-            v-if="ticket.caller"
-            :key="ticket.caller.id"
-            :type="ticket.caller.type"
-            :id="ticket.caller.id"
-            :buttonText="ticket.caller.text"
-            :displayBadge="'true' === 'true'"
-            action="show"
-          ></on-the-fly>
+          <person-component :entities="[ticket.caller] as Person[]" />
         </div>
-        <div class="col-md-4 col-sm-12 d-flex flex-column align-items-start">
+        <div
+          class="col-md-4 col-sm-12 d-flex flex-column align-items-start"
+          v-if="ticket.currentPersons.length"
+        >
           <h3 class="text-primary">
-            {{ trans(CHILL_TICKET_TICKET_BANNER_CONCERNED_USAGER) }}
+            {{
+              trans(CHILL_TICKET_TICKET_BANNER_PERSON, {
+                count: ticket.currentPersons.length,
+              })
+            }}
           </h3>
-          <on-the-fly
-            v-for="person in ticket.currentPersons"
-            :key="person.id"
-            :type="person.type"
-            :id="person.id"
-            :buttonText="person.textAge"
-            :displayBadge="'true' === 'true'"
-            action="show"
-          ></on-the-fly>
+          <person-component :entities="ticket.currentPersons" />
         </div>
-        <div class="col-md-4 col-sm-12 d-flex flex-column align-items-start">
+        <div
+          class="col-md-4 col-sm-12 d-flex flex-column align-items-start"
+          v-if="ticket.currentAddressees.length"
+        >
           <h3 class="text-primary">
-            {{ trans(CHILL_TICKET_TICKET_BANNER_SPEAKER) }}
+            {{
+              trans(CHILL_TICKET_TICKET_BANNER_SPEAKER, {
+                count: ticket.currentAddressees.length,
+              })
+            }}
           </h3>
           <addressee-component :addressees="ticket.currentAddressees" />
         </div>
@@ -99,92 +102,41 @@
 import { ref, computed } from "vue";
 
 // Components
-import AddresseeComponent from "./AddresseeComponent.vue";
-import ToggleFlags from "./ToggleFlags.vue";
-import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue";
+import AddresseeComponent from "./Addressee/AddresseeComponent.vue";
+import EmergencyToggleComponent from "./Emergency/EmergencyToggleComponent.vue";
+import PersonComponent from "./Person/PersonComponent.vue";
 
 // Types
 import { Ticket } from "../../../types";
-import { ISOToDatetime } from "../../../../../../../ChillMainBundle/Resources/public/chill/js/date";
 
-// Translations
 import {
   trans,
-  CHILL_TICKET_TICKET_BANNER_NO_MOTIVE,
   CHILL_TICKET_TICKET_BANNER_OPEN,
   CHILL_TICKET_TICKET_BANNER_CLOSED,
   CHILL_TICKET_TICKET_BANNER_SINCE,
-  CHILL_TICKET_TICKET_BANNER_CONCERNED_USAGER,
   CHILL_TICKET_TICKET_BANNER_SPEAKER,
-  CHILL_TICKET_TICKET_BANNER_DAYS,
-  CHILL_TICKET_TICKET_BANNER_HOURS,
-  CHILL_TICKET_TICKET_BANNER_MINUTES,
-  CHILL_TICKET_TICKET_BANNER_SECONDS,
-  CHILL_TICKET_TICKET_BANNER_AND,
   CHILL_TICKET_TICKET_BANNER_CALLER,
+  CHILL_TICKET_TICKET_BANNER_PERSON,
 } from "translator";
 
 // Store
 import { useStore } from "vuex";
+import { Person } from "ChillPersonAssets/types";
+import { getTicketTitle } from "../utils/utils";
 
-const props = defineProps<{
+defineProps<{
   ticket: Ticket;
 }>();
 
 const store = useStore();
 const today = ref(new Date());
-const createdAt = ref(props.ticket.createdAt);
 
 setInterval(() => {
   today.value = new Date();
 }, 5000);
 
 const isOpen = computed(() => store.getters.isOpen);
-
 const since = computed(() => {
-  if (createdAt.value == null) {
-    return "";
-  }
-  const date = ISOToDatetime(createdAt.value.datetime);
-
-  if (date == null) {
-    return "";
-  }
-
-  const timeDiff = Math.abs(today.value.getTime() - date.getTime());
-  const daysDiff = Math.floor(timeDiff / (1000 * 3600 * 24));
-  const hoursDiff = Math.floor((timeDiff % (1000 * 3600 * 24)) / (1000 * 3600));
-  const minutesDiff = Math.floor((timeDiff % (1000 * 3600)) / (1000 * 60));
-  const secondsDiff = Math.floor((timeDiff % (1000 * 60)) / 1000);
-
-  // On construit la liste des parties à afficher
-  const parts: string[] = [];
-  if (daysDiff > 0) {
-    parts.push(trans(CHILL_TICKET_TICKET_BANNER_DAYS, { count: daysDiff }));
-  }
-  if (hoursDiff > 0 || daysDiff > 0) {
-    parts.push(trans(CHILL_TICKET_TICKET_BANNER_HOURS, { count: hoursDiff }));
-  }
-  if (minutesDiff > 0 || hoursDiff > 0 || daysDiff > 0) {
-    parts.push(
-      trans(CHILL_TICKET_TICKET_BANNER_MINUTES, { count: minutesDiff }),
-    );
-  }
-  if (parts.length === 0) {
-    return trans(CHILL_TICKET_TICKET_BANNER_SECONDS, {
-      count: secondsDiff,
-    });
-  }
-  if (parts.length > 1) {
-    const last = parts.pop();
-    return (
-      parts.join(", ") +
-      " " +
-      trans(CHILL_TICKET_TICKET_BANNER_AND) +
-      " " +
-      last
-    );
-  }
-  return parts[0];
+  return store.getters.getSinceCreated(today.value);
 });
 </script>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/CallerSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/CallerSelectorComponent.vue
deleted file mode 100644
index 86655a05b..000000000
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/CallerSelectorComponent.vue
+++ /dev/null
@@ -1,85 +0,0 @@
-<template>
-  <pick-entity
-    uniqid="ticket-person-selector"
-    :types="['person', 'thirdparty']"
-    :picked="selectedEntity ? [selectedEntity] : []"
-    :suggested="suggestedValues"
-    :multiple="false"
-    :removable-if-set="true"
-    :display-picked="true"
-    :label="trans(CHILL_TICKET_TICKET_SET_PERSONS_CALLER_LABEL)"
-    @add-new-entity="addNewEntity"
-    @remove-entity="removeEntity"
-  />
-</template>
-
-<script setup lang="ts">
-import { ref, watch, defineProps, defineEmits } from "vue";
-
-// Components
-import PickEntity from "ChillMainAssets/vuejs/PickEntity/PickEntity.vue";
-
-// Types
-import { Entities } from "ChillPersonAssets/types";
-
-// Translations
-import {
-  trans,
-  CHILL_TICKET_TICKET_SET_PERSONS_CALLER_LABEL,
-} from "translator";
-
-const props = defineProps<{
-  modelValue: Entities | null;
-  suggested: Entities[];
-}>();
-const emit =
-  defineEmits<(event: "update:modelValue", value: Entities | null) => void>();
-
-const selectedEntity = ref<Entities | null>(props.modelValue);
-const suggestedValues = ref<Entities[]>([...props.suggested]);
-
-watch(
-  () => [props.suggested, props.modelValue],
-  () => {
-    suggestedValues.value = props.suggested.filter(
-      (suggested: Entities) =>
-        suggested.id === selectedEntity.value?.id &&
-        suggested.type === selectedEntity.value?.type,
-    );
-  },
-  { immediate: true, deep: true },
-);
-
-function addNewEntity({ entity }: { entity: Entities }) {
-  selectedEntity.value = entity;
-  emit("update:modelValue", selectedEntity.value);
-}
-
-function removeEntity() {
-  selectedEntity.value = null;
-  emit("update:modelValue", null);
-}
-</script>
-<style scoped lang="scss">
-ul.person-list {
-  list-style-type: none;
-
-  & > li {
-    display: inline-block;
-    border: 1px solid transparent;
-    border-radius: 6px;
-
-    button.remove-person {
-      opacity: 10%;
-    }
-  }
-
-  & > li:hover {
-    border: 1px solid white;
-
-    button.remove-person {
-      opacity: 100%;
-    }
-  }
-}
-</style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCommentComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Comment/CommentComponent.vue
similarity index 96%
rename from src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCommentComponent.vue
rename to src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Comment/CommentComponent.vue
index 63b13b8dc..8723c7c72 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCommentComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Comment/CommentComponent.vue
@@ -11,7 +11,7 @@ import { marked } from "marked";
 import DOMPurify from "dompurify";
 
 // Types
-import { Comment } from "../../../types";
+import { Comment } from "../../../../types";
 
 defineProps<{ commentHistory: Comment }>();
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddCommentComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Comment/CommentEditorComponent.vue
similarity index 100%
rename from src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/AddCommentComponent.vue
rename to src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Comment/CommentEditorComponent.vue
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryEmergencyComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Emergency/EmergencyComponent.vue
similarity index 100%
rename from src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryEmergencyComponent.vue
rename to src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Emergency/EmergencyComponent.vue
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ToggleFlags.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Emergency/EmergencyToggleComponent.vue
similarity index 100%
rename from src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ToggleFlags.vue
rename to src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Emergency/EmergencyToggleComponent.vue
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryMotiveComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveComponent.vue
similarity index 50%
rename from src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryMotiveComponent.vue
rename to src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveComponent.vue
index 34f2c6a9c..b568b2895 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryMotiveComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveComponent.vue
@@ -1,12 +1,15 @@
 <template>
   <div class="col-12 fw-bolder">
-    {{ motiveHistory.motive.label.fr }}
+    {{ localizeTranslatableString(motiveHistory.motive.label) }}
   </div>
 </template>
 
 <script lang="ts" setup>
 // Types
-import { MotiveHistory } from "../../../types";
+import { MotiveHistory } from "../../../../types";
+
+//Utils
+import { localizeTranslatableString } from "../../utils/utils";
 
 defineProps<{ motiveHistory: MotiveHistory }>();
 </script>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/MotiveSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveSelectorComponent.vue
similarity index 97%
rename from src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/MotiveSelectorComponent.vue
rename to src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveSelectorComponent.vue
index fc97772cb..fd276191f 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/MotiveSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveSelectorComponent.vue
@@ -27,7 +27,7 @@ import { ref, watch } from "vue";
 import VueMultiselect from "vue-multiselect";
 
 // Types
-import { Motive } from "../../../types";
+import { Motive } from "../../../../types";
 
 // Translations
 import {
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryPersonComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Person/PersonComponent.vue
similarity index 97%
rename from src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryPersonComponent.vue
rename to src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Person/PersonComponent.vue
index c4b296eb4..a5b7b22d0 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryPersonComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Person/PersonComponent.vue
@@ -28,10 +28,10 @@ defineProps<{ entities: Person[] | Thirdparty[] }>();
 <style lang="scss" scoped>
 ul.persons-list {
   list-style-type: none;
-
+  margin: 0;
+  padding: 0;
   & > li {
     display: inline-block;
-    margin: 0 0.15rem;
   }
 }
 </style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Person/PersonsSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Person/PersonsSelectorComponent.vue
new file mode 100644
index 000000000..804cb416e
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Person/PersonsSelectorComponent.vue
@@ -0,0 +1,139 @@
+<template>
+  <pick-entity
+    uniqid="ticket-person-selector"
+    :types="types"
+    :picked="pickedEntities"
+    :suggested="suggestedValues"
+    :multiple="multiple"
+    :removable-if-set="true"
+    :display-picked="true"
+    :label="label"
+    @add-new-entity="addNewEntity"
+    @remove-entity="removeEntity"
+  />
+</template>
+
+<script setup lang="ts">
+import { ref, watch, defineProps, defineEmits, computed } from "vue";
+
+// Components
+import PickEntity from "ChillMainAssets/vuejs/PickEntity/PickEntity.vue";
+
+// Types
+import { Entities, EntityType } from "ChillPersonAssets/types";
+
+const props = defineProps<{
+  modelValue: Entities[] | Entities | null;
+  suggested: Entities[];
+  multiple: boolean;
+  types: EntityType[];
+  label: string;
+}>();
+
+const emit = defineEmits<{
+  "update:modelValue": [value: Entities[] | Entities | null];
+}>();
+
+// Valeurs par défaut
+const multiple = props.multiple;
+const types = props.types;
+const label = props.label;
+
+// État local
+const selectedEntities = ref<Entities[]>(
+  multiple
+    ? [...((props.modelValue as Entities[]) || [])]
+    : props.modelValue
+      ? [props.modelValue as Entities]
+      : [],
+);
+const suggestedValues = ref<Entities[]>([...props.suggested]);
+
+// Entités sélectionnées pour le composant PickEntity
+const pickedEntities = computed(() =>
+  multiple ? selectedEntities.value : selectedEntities.value.slice(0, 1),
+);
+
+watch(
+  () => [props.suggested, props.modelValue],
+  () => {
+    // Mise à jour des entités sélectionnées
+    selectedEntities.value = multiple
+      ? [...((props.modelValue as Entities[]) || [])]
+      : props.modelValue
+        ? [props.modelValue as Entities]
+        : [];
+
+    // Filtrage des suggestions
+    if (multiple) {
+      suggestedValues.value = props.suggested.filter(
+        (suggested: Entities) =>
+          !(props.modelValue as Entities[])?.some(
+            (selected: Entities) =>
+              suggested.id === selected.id && suggested.type === selected.type,
+          ),
+      );
+    } else {
+      const currentEntity = props.modelValue as Entities | null;
+      suggestedValues.value = props.suggested.filter(
+        (suggested: Entities) =>
+          !(
+            currentEntity &&
+            suggested.id === currentEntity.id &&
+            suggested.type === currentEntity.type
+          ),
+      );
+    }
+  },
+  { immediate: true, deep: true },
+);
+
+function addNewEntity({ entity }: { entity: Entities }) {
+  if (multiple) {
+    selectedEntities.value.push(entity);
+    emit("update:modelValue", selectedEntities.value);
+  } else {
+    selectedEntities.value = [entity];
+    emit("update:modelValue", entity);
+  }
+}
+
+function removeEntity({ entity }: { entity: Entities }) {
+  if (multiple) {
+    const index = selectedEntities.value.findIndex(
+      (selectedEntity) => selectedEntity === entity,
+    );
+    if (index !== -1) {
+      selectedEntities.value.splice(index, 1);
+    }
+    emit("update:modelValue", selectedEntities.value);
+  } else {
+    selectedEntities.value = [];
+    emit("update:modelValue", null);
+  }
+}
+</script>
+
+<style scoped lang="scss">
+ul.person-list {
+  list-style-type: none;
+
+  & > li {
+    display: inline-block;
+    border: 1px solid transparent;
+    border-radius: 6px;
+
+    button.remove-person {
+      opacity: 10%;
+    }
+  }
+
+  & > li:hover {
+    border: 1px solid white;
+
+    button.remove-person {
+      opacity: 100%;
+    }
+  }
+}
+</style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PersonsSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PersonsSelectorComponent.vue
deleted file mode 100644
index 9d2dd9f6b..000000000
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PersonsSelectorComponent.vue
+++ /dev/null
@@ -1,90 +0,0 @@
-<template>
-  <pick-entity
-    uniqid="ticket-person-selector"
-    :types="['person']"
-    :picked="selectedEntities"
-    :suggested="suggestedValues"
-    :multiple="false"
-    :removable-if-set="true"
-    :display-picked="true"
-    :label="trans(CHILL_TICKET_TICKET_SET_PERSONS_USER_LABEL)"
-    @add-new-entity="addNewEntity"
-    @remove-entity="removeEntity"
-  />
-</template>
-
-<script setup lang="ts">
-import { ref, watch, defineProps, defineEmits } from "vue";
-
-// Components
-import PickEntity from "ChillMainAssets/vuejs/PickEntity/PickEntity.vue";
-
-// Types
-import { Entities } from "ChillPersonAssets/types";
-
-// Translations
-import { trans, CHILL_TICKET_TICKET_SET_PERSONS_USER_LABEL } from "translator";
-
-const props = defineProps<{
-  modelValue: Entities[];
-  suggested: Entities[];
-}>();
-const emit = defineEmits<{
-  "update:modelValue": [value: Entities[]];
-}>();
-
-const selectedEntities = ref<Entities[]>([...props.modelValue]);
-const suggestedValues = ref<Entities[]>([...props.suggested]);
-
-watch(
-  () => [props.suggested, props.modelValue],
-  () => {
-    suggestedValues.value = props.suggested.filter(
-      (suggested: Entities) =>
-        !props.modelValue.some(
-          (selected: Entities) =>
-            suggested.id === selected.id && suggested.type === selected.type,
-        ),
-    );
-  },
-  { immediate: true, deep: true },
-);
-
-function addNewEntity({ entity }: { entity: Entities }) {
-  selectedEntities.value.push(entity);
-  emit("update:modelValue", selectedEntities.value);
-}
-
-function removeEntity({ entity }: { entity: Entities }) {
-  const index = selectedEntities.value.findIndex(
-    (selectedEntity) => selectedEntity === entity,
-  );
-  if (index !== -1) {
-    selectedEntities.value.splice(index, 1);
-  }
-  emit("update:modelValue", selectedEntities.value);
-}
-</script>
-<style scoped lang="scss">
-ul.person-list {
-  list-style-type: none;
-
-  & > li {
-    display: inline-block;
-    border: 1px solid transparent;
-    border-radius: 6px;
-
-    button.remove-person {
-      opacity: 10%;
-    }
-  }
-
-  & > li:hover {
-    border: 1px solid white;
-
-    button.remove-person {
-      opacity: 100%;
-    }
-  }
-}
-</style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PreviousTicketsComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PreviousTicketsComponent.vue
new file mode 100644
index 000000000..7789986be
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PreviousTicketsComponent.vue
@@ -0,0 +1,166 @@
+<template>
+  <div class="d-flex justify-content-end">
+    <div @click="handleClick">
+      <button type="button" class="btn btn-light position-relative">
+        {{ trans(CHILL_TICKET_TICKET_PREVIOUS_TICKETS) }}
+
+        <span
+          class="position-absolute top-0 start-100 translate-middle badge rounded-pill bg-chill-green"
+        >
+          {{ previousTickets.length }}
+          <span class="visually-hidden">Tickets</span>
+        </span>
+      </button>
+    </div>
+
+    <!-- Modal for ticket list -->
+    <Modal
+      v-if="showPreviousTicketModal"
+      :show="showPreviousTicketModal"
+      modal-dialog-class="modal-lg"
+      @close="closeModal"
+    >
+      <template #header>
+        <h3 class="modal-title">
+          {{
+            trans(CHILL_TICKET_LIST_TITLE_PREVIOUS_TICKETS, {
+              name:
+                currentPersons.length > 0
+                  ? currentPersons
+                      .map((person: Person) => person.text)
+                      .join(", ")
+                  : undefined,
+            })
+          }}
+        </h3>
+      </template>
+
+      <template #body>
+        <TicketListComponent
+          :tickets="previousTickets"
+          @view-ticket="handleViewTicket"
+          @edit-ticket="handleEditTicket"
+        />
+      </template>
+    </Modal>
+
+    <!-- Modal for ticket history -->
+    <Modal
+      v-if="
+        showTicketHistoryModal &&
+        selectedTicketId !== null &&
+        previousTicketHistory
+      "
+      :show="showTicketHistoryModal"
+      modal-dialog-class="modal-xl"
+      @close="closeHistoryModal"
+    >
+      <template #header>
+        <h3 class="modal-title">
+          {{ getTicketTitle(previousTicketDetails) }}
+        </h3>
+      </template>
+
+      <template #body>
+        <TicketHistoryListComponent
+          v-if="previousTicketHistory.length > 0"
+          :history="previousTicketHistory"
+        />
+        <div v-else class="text-center p-4">
+          <div class="spinner-border" role="status">
+            <span class="visually-hidden">Chargement...</span>
+          </div>
+        </div>
+      </template>
+      <template #footer>
+        <button
+          class="btn btn-edit"
+          @click="handleEditTicket(selectedTicketId)"
+        >
+          {{ trans(EDIT) }}
+        </button>
+      </template>
+    </Modal>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, onMounted, computed } from "vue";
+import { useStore } from "vuex";
+
+// Components
+import Modal from "../../../../../../../ChillMainBundle/Resources/public/vuejs/_components/Modal.vue";
+import TicketListComponent from "./TicketListComponent.vue";
+import TicketHistoryListComponent from "./TicketHistoryListComponent.vue";
+
+// Translations
+import {
+  trans,
+  CHILL_TICKET_TICKET_PREVIOUS_TICKETS,
+  CHILL_TICKET_LIST_TITLE_PREVIOUS_TICKETS,
+  EDIT,
+} from "translator";
+
+// Types
+import { Person } from "ChillPersonAssets/types";
+import { TicketHistoryLine, TicketSimple } from "../../../types";
+
+// Utils
+import { getTicketTitle } from "../utils/utils";
+
+const store = useStore();
+const showPreviousTicketModal = ref(false);
+const showTicketHistoryModal = ref(false);
+const selectedTicketId = ref<number | null>(null);
+
+const currentPersons = computed(
+  () => store.getters.getCurrentPersons as Person[],
+);
+const previousTickets = computed(
+  () => store.getters.getPreviousTickets as TicketSimple[],
+);
+const previousTicketHistory = computed(
+  () => store.getters.getPreviousTicketHistory as TicketHistoryLine[],
+);
+const previousTicketDetails = computed(() => {
+  return store.getters.getPreviousTicketDetails as TicketSimple;
+});
+
+onMounted(async () => {
+  try {
+    await store.dispatch("fetchTicketsByPerson");
+  } catch (error) {
+    console.error("Erreur lors du chargement des tickets:", error);
+  }
+});
+
+function handleClick() {
+  showPreviousTicketModal.value = true;
+}
+
+function closeModal() {
+  showPreviousTicketModal.value = false;
+}
+
+async function handleViewTicket(ticketId: number) {
+  selectedTicketId.value = ticketId;
+  showTicketHistoryModal.value = true;
+
+  try {
+    await store.dispatch("fetchPreviousTicketDetails", ticketId);
+  } catch (error) {
+    console.error("Erreur lors du chargement de l'historique:", error);
+  }
+}
+
+function handleEditTicket(ticketId: number) {
+  window.location.href = `/fr/ticket/ticket/${ticketId}/edit`;
+}
+
+function closeHistoryModal() {
+  showTicketHistoryModal.value = false;
+  selectedTicketId.value = null;
+}
+</script>
+
+<style lang="scss" scoped></style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryStateComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/State/StateComponent.vue
similarity index 50%
rename from src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryStateComponent.vue
rename to src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/State/StateComponent.vue
index a24c56d7b..693c0d06c 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryStateComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/State/StateComponent.vue
@@ -13,36 +13,11 @@
       {{ trans(CHILL_TICKET_TICKET_BANNER_CLOSED) }}
     </template>
   </span>
-  <!--
-    <span
-        class="text-chill-green mx-2"
-        style="
-            font-size: 1rem;
-            max-width: 80px;
-            white-space: normal;
-            word-break: break-word;
-        "
-        v-if="props.new_state == 'open'"
-    >
-        {{ trans(CHILL_TICKET_TICKET_BANNER_OPEN) }}
-    </span>
-    <span
-        class="text-chill-red mx-2"
-        style="
-            font-size: 1rem;
-            max-width: 80px;
-            white-space: normal;
-            word-break: break-word;
-        "
-        v-else-if="props.new_state == 'closed'"
-    >
-        {{ trans(CHILL_TICKET_TICKET_BANNER_CLOSED) }}
-    </span> -->
 </template>
 
 <script setup lang="ts">
 // Types
-import { StateChange } from "../../../types";
+import { StateChange } from "../../../../types";
 
 // Translations
 import {
@@ -50,6 +25,7 @@ import {
   CHILL_TICKET_TICKET_BANNER_OPEN,
   CHILL_TICKET_TICKET_BANNER_CLOSED,
 } from "translator";
+
 const props = defineProps<StateChange>();
 </script>
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent.vue
deleted file mode 100644
index 7a690e9b9..000000000
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryAddresseeComponent.vue
+++ /dev/null
@@ -1,18 +0,0 @@
-<template>
-  <div class="col-12">
-    <addressee-component :addressees="addresseeState.addressees" />
-  </div>
-</template>
-<script setup lang="ts">
-// Types
-import { AddresseeState } from "../../../types";
-
-// Components
-import AddresseeComponent from "./AddresseeComponent.vue";
-
-defineProps<{
-  addresseeState: AddresseeState;
-}>();
-</script>
-
-<style lang="scss" scoped></style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCreateComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCreateComponent.vue
deleted file mode 100644
index fc67467e3..000000000
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryCreateComponent.vue
+++ /dev/null
@@ -1,16 +0,0 @@
-<template>
-  <p>Ticket créé par {{ props.by.text }}</p>
-</template>
-
-<script setup lang="ts">
-// Types
-import { User } from "../../../../../../../ChillMainBundle/Resources/public/types";
-
-interface TicketHistoryCreateComponentConfig {
-  by: User;
-}
-
-const props = defineProps<TicketHistoryCreateComponentConfig>();
-</script>
-
-<style scoped lang="scss"></style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
index 0e5265807..23065f9c3 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
@@ -13,12 +13,12 @@
         <div class="d-flex align-items-center fw-bold">
           <i :class="`${actionIcons[history_line.event_type]} me-1`"></i>
           <span>{{ explainSentence(history_line) }}</span>
-          <TicketHistoryStateComponent
+          <state-component
             :new_state="history_line.data.new_state"
             v-if="history_line.event_type == 'state_change'"
           />
-          <TicketHistoryEmergencyComponent
-            v-if="history_line.event_type == 'emergency_change'"
+          <emergency-component
+            v-else-if="history_line.event_type == 'emergency_change'"
             :new_emergency="history_line.data.new_emergency"
           />
         </div>
@@ -37,37 +37,35 @@
     <div
       class="card-body row"
       v-if="
-        !['state_change', 'emergency_change'].includes(history_line.event_type)
+        !['state_change', 'emergency_change', 'create_ticket'].includes(
+          history_line.event_type,
+        )
       "
     >
-      <ticket-history-person-component
+      <person-component
         :entities="history_line.data.persons"
         v-if="history_line.event_type == 'persons_state'"
       />
-      <ticket-history-person-component
+      <person-component
         :entities="
           history_line.data.new_caller
             ? ([history_line.data.new_caller] as Person[] | Thirdparty[])
             : []
         "
-        v-if="history_line.event_type == 'set_caller'"
+        v-else-if="history_line.event_type == 'set_caller'"
       />
-      <ticket-history-motive-component
+      <motive-component
         :motiveHistory="history_line.data"
         v-else-if="history_line.event_type == 'set_motive'"
       />
-      <ticket-history-comment-component
+      <comment-component
         :commentHistory="history_line.data"
         v-else-if="history_line.event_type == 'add_comment'"
       />
-      <ticket-history-addressee-component
-        :addresseeState="history_line.data"
+      <addressee-component
+        :addressees="history_line.data.addressees"
         v-else-if="history_line.event_type == 'addressees_state'"
       />
-      <ticket-history-create-component
-        :by="history_line.by"
-        v-else-if="history_line.event_type == 'create_ticket'"
-      />
     </div>
   </div>
 </template>
@@ -82,13 +80,12 @@ import { Person } from "ChillPersonAssets/types";
 import { Thirdparty } from "src/Bundle/ChillThirdPartyBundle/Resources/public/types";
 
 // Components
-import TicketHistoryPersonComponent from "./TicketHistoryPersonComponent.vue";
-import TicketHistoryMotiveComponent from "./TicketHistoryMotiveComponent.vue";
-import TicketHistoryCommentComponent from "./TicketHistoryCommentComponent.vue";
-import TicketHistoryAddresseeComponent from "./TicketHistoryAddresseeComponent.vue";
-import TicketHistoryCreateComponent from "./TicketHistoryCreateComponent.vue";
-import TicketHistoryStateComponent from "./TicketHistoryStateComponent.vue";
-import TicketHistoryEmergencyComponent from "./TicketHistoryEmergencyComponent.vue";
+import PersonComponent from "./Person/PersonComponent.vue";
+import MotiveComponent from "./Motive/MotiveComponent.vue";
+import CommentComponent from "./Comment/CommentComponent.vue";
+import AddresseeComponent from "./Addressee/AddresseeComponent.vue";
+import StateComponent from "./State/StateComponent.vue";
+import EmergencyComponent from "./Emergency/EmergencyComponent.vue";
 
 import UserRenderBoxBadge from "ChillMainAssets/vuejs/_components/Entity/UserRenderBoxBadge.vue";
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketListComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketListComponent.vue
new file mode 100644
index 000000000..335c32544
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketListComponent.vue
@@ -0,0 +1,39 @@
+<template>
+  <div class="ticket-list-container">
+    <div v-if="tickets.length === 0" class="chill-no-data-statement">
+      {{ trans(CHILL_TICKET_LIST_NO_TICKETS) }}
+    </div>
+
+    <div v-else class="flex-table">
+      <TicketListItemComponent
+        v-for="ticket in tickets"
+        :key="ticket.id"
+        :ticket="ticket"
+        @view-ticket="$emit('view-ticket', $event)"
+        @edit-ticket="$emit('edit-ticket', $event)"
+      />
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineProps, defineEmits } from "vue";
+
+// Types
+import { TicketSimple } from "../../../types";
+
+// Components
+import TicketListItemComponent from "./TicketListItemComponent.vue";
+
+// Translations
+import { trans, CHILL_TICKET_LIST_NO_TICKETS } from "translator";
+
+defineProps<{
+  tickets: TicketSimple[];
+}>();
+
+defineEmits<{
+  "view-ticket": [ticketId: number];
+  "edit-ticket": [ticketId: number];
+}>();
+</script>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketListItemComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketListItemComponent.vue
new file mode 100644
index 000000000..902a4df66
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketListItemComponent.vue
@@ -0,0 +1,128 @@
+<template>
+  <div class="card rounded-4 mb-3">
+    <div class="card-body">
+      <div class="wrap-header">
+        <div class="wh-row d-flex justify-content-between align-items-center">
+          <div class="wh-col">
+            <span
+              v-if="ticket.currentMotive"
+              class="h2"
+              style="color: var(--bs-chill-blue); font-variant: all-small-caps"
+            >
+              {{ getTicketTitle(ticket) }}
+            </span>
+          </div>
+          <div class="wh-col">
+            <emergency-component
+              :new_emergency="ticket.emergency"
+              v-if="ticket.emergency"
+            />
+          </div>
+          <div class="wh-col">
+            <state-component
+              v-if="ticket.currentState"
+              :new_state="ticket.currentState"
+            />
+          </div>
+        </div>
+        <div class="wh-row">
+          <div class="wh-col">#{{ ticket.id }}</div>
+          <div class="wh-col" v-if="ticket.createdAt">
+            <span
+              v-if="ticket"
+              :title="formatDateTime(ticket.createdAt.datetime, 'long', 'long')"
+              style="font-style: italic"
+            >
+              {{ getSinceCreated(ticket.createdAt.datetime, new Date()) }}
+            </span>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div class="card-body pt-0">
+      <div class="wrap-list">
+        <div class="wl-row">
+          <div class="wl-col title text-end">
+            <h3>Attribué à</h3>
+          </div>
+          <div class="wl-col list">
+            <addressee-component :addressees="ticket.currentAddressees" />
+          </div>
+        </div>
+        <div class="wl-row">
+          <div class="wl-col title text-end">
+            <h3>Patients concernés</h3>
+          </div>
+          <div class="wl-col list">
+            <person-component :entities="ticket.currentPersons" />
+          </div>
+        </div>
+        <div class="wl-row">
+          <div class="wl-col title text-end">
+            <h3>Appelants</h3>
+          </div>
+          <div class="wl-col list">
+            <person-component
+              :entities="
+                ticket.caller
+                  ? ([ticket.caller] as Person[] | Thirdparty[])
+                  : []
+              "
+            />
+          </div>
+        </div>
+      </div>
+    </div>
+    <hr class="my-0" />
+    <div class="card-footer bg-transparent border-0">
+      <ul class="record_actions mb-0">
+        <li>
+          <button
+            class="btn btn-view btn-outline-secondary"
+            type="button"
+            @click="$emit('view-ticket', ticket.id)"
+          />
+        </li>
+        <li>
+          <button
+            class="btn btn-update btn-outline-primary"
+            type="button"
+            @click="emit('edit-ticket', ticket.id)"
+          />
+        </li>
+      </ul>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { defineProps, defineEmits } from "vue";
+
+// Types
+import { TicketSimple } from "../../../types";
+import { Person } from "ChillPersonAssets/types";
+import { Thirdparty } from "src/Bundle/ChillThirdPartyBundle/Resources/public/types";
+
+// Utils
+import {
+  getSinceCreated,
+  formatDateTime,
+  getTicketTitle,
+} from "../utils/utils";
+
+// Components
+import EmergencyComponent from "./Emergency/EmergencyComponent.vue";
+import StateComponent from "./State/StateComponent.vue";
+import AddresseeComponent from "./Addressee/AddresseeComponent.vue";
+import PersonComponent from "./Person/PersonComponent.vue";
+
+defineProps<{
+  ticket: TicketSimple;
+}>();
+
+const emit = defineEmits<{
+  "edit-ticket": [ticketId: number];
+  "view-ticket": [ticketId: number];
+}>();
+</script>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketSelectorComponent.vue
deleted file mode 100644
index 2e66d5a8e..000000000
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketSelectorComponent.vue
+++ /dev/null
@@ -1,36 +0,0 @@
-<template>
-  <div class="d-flex justify-content-end">
-    <div class="btn-group" @click="handleClick">
-      <button
-        type="button"
-        class="btn btn-light dropdown-toggle"
-        data-bs-toggle="dropdown"
-        aria-expanded="false"
-      >
-        {{ trans(CHILL_TICKET_TICKET_PREVIOUS_TICKETS) }}
-        <span
-          class="position-absolute top-0 start-100 translate-middle badge rounded-pill bg-chill-green"
-        >
-          {{ tickets.length }}
-          <span class="visually-hidden">Tickets</span>
-        </span>
-      </button>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-// Translations
-import { trans, CHILL_TICKET_TICKET_PREVIOUS_TICKETS } from "translator";
-
-// Types
-import { Ticket } from "../../../types";
-
-defineProps<{ tickets: Ticket[] }>();
-
-function handleClick() {
-  alert("Sera disponible plus tard");
-}
-</script>
-
-<style lang="scss" scoped></style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
index a842d5c6e..fa73223f5 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
@@ -1,18 +1,23 @@
 import { Module } from "vuex";
 import { RootState } from "..";
 
-import { Ticket, TicketEmergencyState } from "../../../../types";
+import { Ticket, TicketEmergencyState, TicketSimple } from "../../../../types";
 import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
 import { ApiException } from "../../../../../../../../ChillMainBundle/Resources/public/types";
+import { getSinceCreated } from "../../utils/utils";
 
 export interface State {
   ticket: Ticket;
+  previous_tickets: TicketSimple[];
+  previous_ticket_details: Ticket;
   action_icons: object;
 }
 
 export const moduleTicket: Module<State, RootState> = {
   state: () => ({
     ticket: {} as Ticket,
+    previous_tickets: [] as TicketSimple[],
+    previous_ticket_details: {} as Ticket,
     action_icons: {
       add_person: "fa fa-user-plus",
       add_comment: "fa fa-comment",
@@ -37,18 +42,42 @@ export const moduleTicket: Module<State, RootState> = {
       );
       return state.ticket;
     },
-
+    getTicketHistory(state) {
+      return state.ticket.history;
+    },
+    getPreviousTickets(state) {
+      return state.previous_tickets;
+    },
+    getPreviousTicketHistory(state) {
+      return state.previous_ticket_details.history;
+    },
+    getPreviousTicketDetails(state) {
+      return state.previous_ticket_details;
+    },
+    getCurrentPersons(state) {
+      return state.ticket.currentPersons ?? [];
+    },
     getActionIcons(state) {
       return state.action_icons;
     },
-    getDistinctAddressesHistory(state) {
-      return state.ticket.history;
+    getSinceCreated: (state) => (currentTime: Date) => {
+      if (!state.ticket.createdAt) {
+        return "";
+      }
+      return getSinceCreated(state.ticket.createdAt.datetime, currentTime);
     },
   },
+
   mutations: {
     setTicket(state, ticket: Ticket) {
       state.ticket = ticket;
     },
+    setPreviousTickets(state, previousTickets: TicketSimple[]) {
+      state.previous_tickets = previousTickets;
+    },
+    setPreviousTicketDetails(state, ticket: Ticket) {
+      state.previous_ticket_details = ticket;
+    },
   },
   actions: {
     async closeTicket({ commit, state }) {
@@ -87,5 +116,39 @@ export const moduleTicket: Module<State, RootState> = {
         throw error.name;
       }
     },
+
+    async fetchTicketsByPerson({ commit, state }) {
+      try {
+        if (state.ticket.currentPersons.length === 0) {
+          commit("setPreviousTickets", []);
+          return;
+        }
+        const { results }: { results: TicketSimple[] } = await makeFetch(
+          "GET",
+          `/api/1.0/ticket/ticket/list?byPerson=${state.ticket.currentPersons.map((person) => person.id).join(",")}`,
+        );
+        const excludeCurrentTicket = results.filter(
+          (ticket) => ticket.id !== state.ticket.id,
+        );
+        commit("setPreviousTickets", excludeCurrentTicket);
+      } catch (e: unknown) {
+        const error = e as ApiException;
+        throw error.name;
+      }
+    },
+
+    async fetchPreviousTicketDetails({ commit }, ticketId: number) {
+      try {
+        const ticket: Ticket = await makeFetch(
+          "GET",
+          `/api/1.0/ticket/ticket/${ticketId}`,
+        );
+        commit("setPreviousTicketDetails", ticket);
+        return ticket;
+      } catch (e: unknown) {
+        const error = e as ApiException;
+        throw error.name;
+      }
+    },
   },
 };
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/utils/utils.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/utils/utils.ts
new file mode 100644
index 000000000..342df70a6
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/utils/utils.ts
@@ -0,0 +1,94 @@
+import { ISOToDatetime } from "../../../../../../../../Bundle/ChillMainBundle/Resources/public/chill/js/date";
+import {
+  trans,
+  CHILL_TICKET_TICKET_BANNER_DAYS,
+  CHILL_TICKET_TICKET_BANNER_HOURS,
+  CHILL_TICKET_TICKET_BANNER_MINUTES,
+  CHILL_TICKET_TICKET_BANNER_SECONDS,
+  CHILL_TICKET_TICKET_BANNER_AND,
+  CHILL_TICKET_TICKET_BANNER_NO_MOTIVE,
+} from "translator";
+import { Ticket, TicketSimple } from "../../../types";
+
+/**
+ * Calcule et formate le temps écoulé depuis une date de création
+ * @param createdAt La date de création au format ISO
+ * @param currentTime La date actuelle
+ * @returns Une chaîne formatée représentant le temps écoulé
+ */
+export function getSinceCreated(createdAt: string, currentTime: Date): string {
+  const date = ISOToDatetime(createdAt);
+  if (date == null) {
+    return "";
+  }
+
+  const timeDiff = Math.abs(currentTime.getTime() - date.getTime());
+  const daysDiff = Math.floor(timeDiff / (1000 * 3600 * 24));
+  const hoursDiff = Math.floor((timeDiff % (1000 * 3600 * 24)) / (1000 * 3600));
+  const minutesDiff = Math.floor((timeDiff % (1000 * 3600)) / (1000 * 60));
+  const secondsDiff = Math.floor((timeDiff % (1000 * 60)) / 1000);
+
+  // On construit la liste des parties à afficher
+  const parts: string[] = [];
+  if (daysDiff > 0) {
+    parts.push(trans(CHILL_TICKET_TICKET_BANNER_DAYS, { count: daysDiff }));
+  }
+  if (hoursDiff > 0 || daysDiff > 0) {
+    parts.push(
+      trans(CHILL_TICKET_TICKET_BANNER_HOURS, {
+        count: hoursDiff,
+      }),
+    );
+  }
+  if (minutesDiff > 0 || hoursDiff > 0 || daysDiff > 0) {
+    parts.push(
+      trans(CHILL_TICKET_TICKET_BANNER_MINUTES, {
+        count: minutesDiff,
+      }),
+    );
+  }
+  if (parts.length === 0) {
+    return trans(CHILL_TICKET_TICKET_BANNER_SECONDS, {
+      count: secondsDiff,
+    });
+  }
+  if (parts.length > 1) {
+    const last = parts.pop();
+    return (
+      parts.join(", ") +
+      " " +
+      trans(CHILL_TICKET_TICKET_BANNER_AND) +
+      " " +
+      last
+    );
+  }
+  return parts[0];
+}
+
+export function localizeTranslatableString(
+  translatableString: Record<string, string> | string,
+): string {
+  // This would be implemented based on your localization logic
+  if (typeof translatableString === "string") {
+    return translatableString;
+  }
+  // Assuming it's an object with locale keys
+  return translatableString?.fr || translatableString?.en || "Unknown";
+}
+
+export function formatDateTime(
+  dateTime: string,
+  dateStyle: string,
+  timeStyle: string,
+): string {
+  return new Date(dateTime).toLocaleString("fr-FR", {
+    dateStyle: dateStyle as "short" | "medium" | "long" | "full",
+    timeStyle: timeStyle as "short" | "medium" | "long" | "full",
+  });
+}
+export function getTicketTitle(ticket: Ticket | TicketSimple): string {
+  if (ticket.currentMotive) {
+    return `#${ticket.id} ${localizeTranslatableString(ticket.currentMotive.label)}`;
+  }
+  return `#${ticket.id} ${trans(CHILL_TICKET_TICKET_BANNER_NO_MOTIVE)}`;
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php b/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
index e306efbd0..ef02ce5eb 100644
--- a/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
+++ b/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
@@ -45,6 +45,7 @@ final class TicketNormalizer implements NormalizerInterface, NormalizerAwareInte
             'type' => 'ticket_ticket',
             'id' => $object->getId(),
             'externalRef' => $object->getExternalRef(),
+            'createdAt' => $this->normalizer->normalize($object->getCreatedAt(), $format, $context),
             'currentPersons' => $this->normalizer->normalize($object->getPersons(), $format, [
                 'groups' => 'read',
             ]),
@@ -65,7 +66,6 @@ final class TicketNormalizer implements NormalizerInterface, NormalizerAwareInte
         $data += [
             'type_extended' => 'ticket_ticket:extended',
             'history' => array_values($this->serializeHistory($object, $format, ['groups' => 'read'])),
-            'createdAt' => $this->normalizer->normalize($object->getCreatedAt(), $format, $context),
             'updatedAt' => $this->normalizer->normalize($object->getUpdatedAt(), $format, $context),
             'updatedBy' => $this->normalizer->normalize($object->getUpdatedBy(), $format, $context),
             'createdBy' => $this->normalizer->normalize($object->getCreatedBy(), $format, $context),
diff --git a/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml b/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
index 9386de9db..72a47e95d 100644
--- a/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
+++ b/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
@@ -1,6 +1,8 @@
 chill_ticket:
   list:
     title: Tickets
+    title_previous_tickets: "{name, select, other {Précédent ticket de {name}} undefined {Précédent ticket}}"
+    no_tickets: "Aucun ticket"
     filter:
       to_me: Tickets qui me sont attribués
       in_alert: Tickets en alerte (délai de résolution dépassé)
@@ -51,9 +53,9 @@ chill_ticket:
       success: "Appelants et usagers mis à jour"
       error: "Aucun usager sélectionné"
     banner:
-      concerned_usager: "Usagers concernés"
-      speaker: "Attribué à"
-      caller: "Appelant"
+      person: "{count, plural, =0 {Aucun usager concerné} =1 {Usager concerné} other {Usagers concernés}}"
+      speaker: "{count, plural, =0 {Aucun intervenant} =1 {Attribué à} other {Attribués à}}"
+      caller: "{count, plural, =0 {Aucun appelant} =1 {Appelant} other {Appelants}}"
       open: "Ouvert"
       closed: "Fermé"
       since: "Depuis {time}"
diff --git a/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/TicketNormalizerTest.php b/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/TicketNormalizerTest.php
index 2fd983a05..764182871 100644
--- a/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/TicketNormalizerTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/TicketNormalizerTest.php
@@ -282,12 +282,12 @@ class TicketNormalizerTest extends KernelTestCase
             'currentState',
             'emergency',
             'caller',
+            'createdAt',
         ];
 
         // Keys that should not be present in read:simple normalization
         $unexpectedKeys = [
             'history',
-            'createdAt',
             'updatedAt',
             'updatedBy',
             'createdBy',

From faed443a9649a470505fce9b36263d1efcad843e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 16 Jul 2025 13:39:27 +0000
Subject: [PATCH 152/283] =?UTF-8?q?Ticket:=20ajout=20de=20param=C3=A8tres?=
 =?UTF-8?q?=20=C3=A0=20la=20requ=C3=AAte=20de=20liste=20de=20tickets?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/packages/chill_ticket.yaml             |   1 +
 .../ChillTicketBundle/chill.api.specs.yaml    |  50 ++++
 .../Controller/TicketListApiController.php    |  68 ++++-
 .../src/DependencyInjection/Configuration.php |  18 ++
 .../src/Entity/EmergencyStatusEnum.php        |   9 +
 .../Repository/TicketACLAwareRepository.php   |  61 ++++-
 .../TicketACLAwareRepositoryInterface.php     |   8 +-
 ...ketListApiControllerByCreatedAfterTest.php | 219 ++++++++++++++++
 ...etListApiControllerByCreatedBeforeTest.php | 219 ++++++++++++++++
 ...piControllerByResponseTimeExceededTest.php | 207 +++++++++++++++
 ...ApiControllerCurrentStateEmergencyTest.php | 137 ++++++++++
 ...icketListApiControllerCurrentStateTest.php | 137 ++++++++++
 .../TicketListApiControllerMotivesTest.php    | 243 ++++++++++++++++++
 .../TicketListApiControllerTest.php           | 116 ++-------
 .../TicketACLAwareRepositoryTest.php          |  47 +++-
 15 files changed, 1441 insertions(+), 99 deletions(-)
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByCreatedAfterTest.php
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByCreatedBeforeTest.php
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByResponseTimeExceededTest.php
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerCurrentStateEmergencyTest.php
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerCurrentStateTest.php
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerMotivesTest.php

diff --git a/config/packages/chill_ticket.yaml b/config/packages/chill_ticket.yaml
index acb5571dc..3706d961d 100644
--- a/config/packages/chill_ticket.yaml
+++ b/config/packages/chill_ticket.yaml
@@ -1,4 +1,5 @@
 chill_ticket:
     ticket:
         person_per_ticket:    one # One of "one"; "many"
+        response_time_exceeded_delay: PT12H
 
diff --git a/src/Bundle/ChillTicketBundle/chill.api.specs.yaml b/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
index da3de8a88..199b056a2 100644
--- a/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
@@ -85,6 +85,56 @@ paths:
                           enum:
                               - open
                               - closed
+                - name: byCurrentStateEmergency
+                  in: query
+                  description: the current state emergency of the ticket
+                  required: false
+                  style: form
+                  explode: false
+                  schema:
+                      type: array
+                      items:
+                          type: string
+                          enum:
+                              - yes
+                              - no
+                - name: byMotives
+                  in: query
+                  description: the motives of the ticket
+                  required: false
+                  style: form
+                  explode: false
+                  schema:
+                      type: array
+                      items:
+                          type: integer
+                          format: integer
+                          minimum: 1
+                - name: byCreatedBefore
+                  in: query
+                  description: "Filter by the creation date for the ticket: only tickets created before the given date."
+                  required: false
+                  schema:
+                      type: string
+                      format: date-time
+                - name: byCreatedAfter
+                  in: query
+                  description: "Filter by the creation date for the ticket: only tickets crated after the given date."
+                  required: false
+                  schema:
+                      type: string
+                      format: date-time
+                - name: byResponseTimeExceeded
+                  in: query
+                  allowEmptyValue: true
+                  description: |
+                      Filter tickets that are not closed and have a response time exceeded (configuration parameter).
+
+                      The value of this parameter is ignored.
+
+                      **Warning**: This silently remove the filters "byCurrentState" and "byCreatedBefore".
+                  schema:
+                      type: string
             responses:
                 200:
                     description: OK
diff --git a/src/Bundle/ChillTicketBundle/src/Controller/TicketListApiController.php b/src/Bundle/ChillTicketBundle/src/Controller/TicketListApiController.php
index 5e1250b2f..606967cbc 100644
--- a/src/Bundle/ChillTicketBundle/src/Controller/TicketListApiController.php
+++ b/src/Bundle/ChillTicketBundle/src/Controller/TicketListApiController.php
@@ -15,8 +15,12 @@ use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
 use Chill\MainBundle\Serializer\Model\Collection;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use Chill\TicketBundle\Entity\EmergencyStatusEnum;
 use Chill\TicketBundle\Entity\StateEnum;
+use Chill\TicketBundle\Repository\MotiveRepository;
 use Chill\TicketBundle\Repository\TicketACLAwareRepositoryInterface;
+use Symfony\Component\Clock\ClockInterface;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
@@ -27,13 +31,20 @@ use Symfony\Component\Serializer\SerializerInterface;
 
 final readonly class TicketListApiController
 {
+    private \DateInterval $expectedTimeResponseDelay;
+
     public function __construct(
         private Security $security,
         private TicketACLAwareRepositoryInterface $ticketRepository,
         private PaginatorFactoryInterface $paginatorFactory,
         private SerializerInterface $serializer,
         private PersonRepository $personRepository,
-    ) {}
+        private MotiveRepository $motiveRepository,
+        private ClockInterface $clock,
+        ParameterBagInterface $parameterBag,
+    ) {
+        $this->expectedTimeResponseDelay = new \DateInterval($parameterBag->get('chill_ticket')['ticket']['response_time_exceeded_delay']);
+    }
 
     #[Route('/api/1.0/ticket/ticket/list', name: 'chill_ticket_list_api', methods: ['GET'])]
     public function listTicket(Request $request): JsonResponse
@@ -66,6 +77,61 @@ final readonly class TicketListApiController
             }
         }
 
+        if ($request->query->has('byCurrentStateEmergency')) {
+            try {
+                $params['byCurrentStateEmergency'] = array_map(
+                    fn (string $state): EmergencyStatusEnum => EmergencyStatusEnum::fromValue($state),
+                    explode(',', $request->query->get('byCurrentStateEmergency'))
+                );
+            } catch (\InvalidArgumentException $e) {
+                throw new BadRequestHttpException($e->getMessage(), $e);
+            }
+        }
+
+        if ($request->query->has('byMotives')) {
+            $params = explode(',', $request->query->get('byMotives'));
+            foreach ($params as $id) {
+                if (!is_numeric($id) || 0 === ((int) $id)) {
+                    throw new BadRequestHttpException('Only numbers are allowed in by motives parameter');
+                }
+                $params['byMotives'][] = $motive = $this->motiveRepository->find($id);
+
+                if (null === $motive) {
+                    throw new BadRequestHttpException('Motive not found');
+                }
+            }
+        }
+
+        if ($request->query->has('byCreatedBefore')) {
+            $params['byCreatedBefore'] =
+                \DateTimeImmutable::createFromFormat(\DateTimeImmutable::RFC3339, $request->query->get('byCreatedBefore'));
+
+            if (false === $params['byCreatedBefore']) {
+                $params['byCreatedBefore'] = \DateTimeImmutable::createFromFormat(\DateTimeImmutable::RFC3339_EXTENDED, $request->query->get('byCreatedBefore'));
+            }
+            if (false === $params['byCreatedBefore']) {
+                throw new BadRequestHttpException('Invalid date for byCreatedBefore');
+            }
+        }
+
+        if ($request->query->has('byCreatedAfter')) {
+            $params['byCreatedAfter'] =
+                \DateTimeImmutable::createFromFormat(\DateTimeImmutable::RFC3339, $request->query->get('byCreatedAfter'));
+            if (false === $params['byCreatedAfter']) {
+                $params['byCreatedAfter'] =
+                    \DateTimeImmutable::createFromFormat(\DateTimeImmutable::RFC3339_EXTENDED, $request->query->get('byCreatedAfter'));
+            }
+            if (false === $params['byCreatedAfter']) {
+                throw new BadRequestHttpException('Invalid date for byCreatedAfter');
+            }
+        }
+
+        if ($request->query->has('byResponseTimeExceeded')) {
+            $params['byCurrentState'] = [StateEnum::OPEN];
+            $params['byCreatedBefore'] = $this->clock->now()->sub($this->expectedTimeResponseDelay);
+            unset($params['byCreatedAfter']);
+        }
+
         $nb = $this->ticketRepository->countTickets($params);
         $paginator = $this->paginatorFactory->create($nb);
 
diff --git a/src/Bundle/ChillTicketBundle/src/DependencyInjection/Configuration.php b/src/Bundle/ChillTicketBundle/src/DependencyInjection/Configuration.php
index 19c107a09..fbea3d280 100644
--- a/src/Bundle/ChillTicketBundle/src/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillTicketBundle/src/DependencyInjection/Configuration.php
@@ -37,6 +37,24 @@ class Configuration implements ConfigurationInterface
             ->defaultValue('many')
             ->end();
 
+        $ticketArray
+            ->children()
+            ->scalarNode('response_time_exceeded_delay')
+            ->info('The delay to declare a ticket as having an exceeded response time. Must be expressed as a valid parameter for instantiating a \DateInterval')
+            ->defaultValue('PT12H')
+            ->validate()
+            ->ifTrue(function (string $value) {
+                try {
+                    new \DateInterval($value);
+                } catch (\Throwable) {
+                    return true;
+                }
+
+                return false;
+            })
+            ->thenInvalid('The date interval provided for response_time_exceeded_delay (%s) is invalid')
+        ;
+
         return $treeBuilder;
     }
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Entity/EmergencyStatusEnum.php b/src/Bundle/ChillTicketBundle/src/Entity/EmergencyStatusEnum.php
index aa070fbf5..c9fbe6c63 100644
--- a/src/Bundle/ChillTicketBundle/src/Entity/EmergencyStatusEnum.php
+++ b/src/Bundle/ChillTicketBundle/src/Entity/EmergencyStatusEnum.php
@@ -18,4 +18,13 @@ enum EmergencyStatusEnum: string
 {
     case YES = 'yes';
     case NO = 'no';
+
+    public static function fromValue(string $value): EmergencyStatusEnum
+    {
+        return match ($value) {
+            self::YES->value => self::YES,
+            self::NO->value => self::NO,
+            default => throw new \InvalidArgumentException(sprintf('Value "%s" is not valid', $value)),
+        };
+    }
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepository.php b/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepository.php
index 0592ea0c3..02122b9fe 100644
--- a/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepository.php
+++ b/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepository.php
@@ -11,6 +11,8 @@ declare(strict_types=1);
 
 namespace Chill\TicketBundle\Repository;
 
+use Chill\TicketBundle\Entity\EmergencyStatusHistory;
+use Chill\TicketBundle\Entity\MotiveHistory;
 use Chill\TicketBundle\Entity\PersonHistory;
 use Chill\TicketBundle\Entity\StateHistory;
 use Chill\TicketBundle\Entity\Ticket;
@@ -23,8 +25,19 @@ final readonly class TicketACLAwareRepository implements TicketACLAwareRepositor
 
     public function findTickets(array $params, int $start = 0, int $limit = 100): array
     {
-        return $this->buildQuery($params)->select('t')->getQuery()->setFirstResult($start)
-            ->setMaxResults($limit)->getResult();
+        $query = $this->buildQuery($params)->select('t');
+
+        // order by emergency. As the value can be 'yes' or 'no', we simply order by 'yes' first
+        $query->addSelect(sprintf("'SELECT u.emergencyStatus FROM %s u WHERE u.ticket = t AND u.endDate IS NULL' AS HIDDEN emergencyStatus", EmergencyStatusHistory::class));
+        $query->addOrderBy('emergencyStatus', 'DESC');
+
+        // most recent tickets first
+        $query->addOrderBy('t.createdAt', 'DESC');
+
+        return $query->getQuery()
+            ->setFirstResult($start)
+            ->setMaxResults($limit)
+            ->getResult();
     }
 
     public function countTickets(array $params): int
@@ -74,6 +87,50 @@ final readonly class TicketACLAwareRepository implements TicketACLAwareRepositor
             $qb->setParameter('currentState', $params['byCurrentState']);
         }
 
+        if (array_key_exists('byCurrentStateEmergency', $params)) {
+            $qb->andWhere(
+                $qb->expr()->exists(sprintf(
+                    'SELECT 1 FROM %s tp_state_emergency_%d WHERE tp_state_emergency_%d.ticket = t
+                    AND tp_state_emergency_%d.emergencyStatus IN (:currentStateEmergency) AND tp_state_emergency_%d.endDate IS NULL',
+                    EmergencyStatusHistory::class,
+                    ++$i,
+                    $i,
+                    $i,
+                    $i,
+                ))
+            );
+            $qb->setParameter('currentStateEmergency', $params['byCurrentStateEmergency']);
+        }
+
+        if (array_key_exists('byMotives', $params)) {
+            foreach ($params['byMotives'] as $motive) {
+                $qb->andWhere(
+                    $qb->expr()->exists(sprintf(
+                        'SELECT 1 FROM %s tp_motive_%d WHERE tp_motive_%d.ticket = t
+                    AND tp_motive_%d.motive = :motive_%d AND tp_motive_%d.endDate IS NULL
+                    ',
+                        MotiveHistory::class,
+                        ++$i,
+                        $i,
+                        $i,
+                        $i,
+                        $i,
+                    ))
+                );
+                $qb->setParameter(sprintf('motive_%d', $i), $motive);
+            }
+        }
+
+        if (array_key_exists('byCreatedAfter', $params)) {
+            $qb->andWhere('t.createdAt >= :opening_after');
+            $qb->setParameter('opening_after', $params['byCreatedAfter']);
+        }
+
+        if (array_key_exists('byCreatedBefore', $params)) {
+            $qb->andWhere('t.createdAt <= :opening_after');
+            $qb->setParameter('opening_after', $params['byCreatedBefore']);
+        }
+
         return $qb;
     }
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepositoryInterface.php b/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepositoryInterface.php
index 6fce13086..474bd7a8d 100644
--- a/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepositoryInterface.php
@@ -12,18 +12,22 @@ declare(strict_types=1);
 namespace Chill\TicketBundle\Repository;
 
 use Chill\PersonBundle\Entity\Person;
+use Chill\TicketBundle\Entity\EmergencyStatusEnum;
+use Chill\TicketBundle\Entity\Motive;
 use Chill\TicketBundle\Entity\StateEnum;
 use Chill\TicketBundle\Entity\Ticket;
 
 /**
  * Repository to find tickets, taking care of permissions.
+ *
+ * @phpstan-type TicketACLAwareRepositoryParam array{byPerson?: list<Person>, byCurrentState?: list<StateEnum>, byCurrentStateEmergency?: list<EmergencyStatusEnum>, byMotives?: list<Motive>, byCreatedBefore?: \DateTimeImmutable, byCreatedAfter?: \DateTimeImmutable}
  */
 interface TicketACLAwareRepositoryInterface
 {
     /**
      * Find tickets.
      *
-     * @param array{byPerson?: list<Person>, byCurrentState: list<StateEnum>} $params
+     * @param TicketACLAwareRepositoryParam $params
      *
      * @return list<Ticket>
      */
@@ -32,7 +36,7 @@ interface TicketACLAwareRepositoryInterface
     /**
      * Find tickets.
      *
-     * @param array{byPerson?: list<Person>} $params
+     * @param TicketACLAwareRepositoryParam $params
      */
     public function countTickets(array $params): int;
 }
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByCreatedAfterTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByCreatedAfterTest.php
new file mode 100644
index 000000000..2b03910e4
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByCreatedAfterTest.php
@@ -0,0 +1,219 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Tests\Controller;
+
+use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Serializer\Model\Collection;
+use Chill\PersonBundle\Repository\PersonRepository;
+use Chill\TicketBundle\Controller\TicketListApiController;
+use Chill\TicketBundle\Entity\Ticket;
+use Chill\TicketBundle\Repository\MotiveRepository;
+use Chill\TicketBundle\Repository\TicketACLAwareRepositoryInterface;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\SerializerInterface;
+use Symfony\Component\Clock\MockClock;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
+
+/**
+ * @internal
+ *
+ * @covers \Chill\TicketBundle\Controller\TicketListApiController
+ */
+final class TicketListApiControllerByCreatedAfterTest extends TestCase
+{
+    use ProphecyTrait;
+
+    public function testListTicketWithByCreatedAfterRFC3339Format(): void
+    {
+        // Mock dependencies
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $ticketRepository = $this->prophesize(TicketACLAwareRepositoryInterface::class);
+        $tickets = [new Ticket(), new Ticket()];
+
+        // The date in RFC3339 format
+        $dateString = '2025-05-15T15:05:00Z';
+        $date = \DateTimeImmutable::createFromFormat(\DateTimeImmutable::RFC3339, $dateString);
+
+        $ticketRepository->countTickets(
+            Argument::that(
+                fn ($params) => isset($params['byCreatedAfter'])
+                && $params['byCreatedAfter'] == $date
+            )
+        )->willReturn(2);
+
+        $ticketRepository->findTickets(
+            Argument::that(
+                fn ($params) => isset($params['byCreatedAfter'])
+                && $params['byCreatedAfter'] == $date
+            ),
+            0,
+            10
+        )->willReturn($tickets);
+
+        $paginator = $this->prophesize(PaginatorInterface::class);
+        $paginator->getCurrentPageFirstItemNumber()->willReturn(0);
+        $paginator->getItemsPerPage()->willReturn(10);
+
+        $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
+        $paginatorFactory->create(2)->willReturn($paginator->reveal());
+
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $serializer->serialize(
+            Argument::that(fn (Collection $collection) => $collection->getItems() === $tickets),
+            'json',
+            ['groups' => 'read:simple']
+        )->willReturn('{"items":[{},{}],"pagination":{}}');
+
+        $personRepository = $this->prophesize(PersonRepository::class);
+        $motiveRepository = $this->prophesize(MotiveRepository::class);
+
+        // Create controller
+        $controller = new TicketListApiController(
+            $security->reveal(),
+            $ticketRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $serializer->reveal(),
+            $personRepository->reveal(),
+            $motiveRepository->reveal(),
+            new MockClock(),
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]])
+        );
+
+        // Create request with byCreatedAfter filter in RFC3339 format
+        $request = new Request(
+            query: ['byCreatedAfter' => $dateString]
+        );
+
+        // Call controller method
+        $response = $controller->listTicket($request);
+
+        // Assert response
+        $this->assertInstanceOf(JsonResponse::class, $response);
+        $this->assertEquals('{"items":[{},{}],"pagination":{}}', $response->getContent());
+    }
+
+    public function testListTicketWithByCreatedAfterRFC3339ExtendedFormat(): void
+    {
+        // Mock dependencies
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $ticketRepository = $this->prophesize(TicketACLAwareRepositoryInterface::class);
+        $tickets = [new Ticket(), new Ticket()];
+
+        // The date in RFC3339_EXTENDED format
+        $dateString = '2025-05-15T15:05:00.000+02:00';
+        $date = \DateTimeImmutable::createFromFormat(\DateTimeImmutable::RFC3339_EXTENDED, $dateString);
+
+        $ticketRepository->countTickets(
+            Argument::that(
+                fn ($params) => isset($params['byCreatedAfter'])
+                && $params['byCreatedAfter'] == $date
+            )
+        )->willReturn(2);
+
+        $ticketRepository->findTickets(
+            Argument::that(
+                fn ($params) => isset($params['byCreatedAfter'])
+                && $params['byCreatedAfter'] == $date
+            ),
+            0,
+            10
+        )->willReturn($tickets);
+
+        $paginator = $this->prophesize(PaginatorInterface::class);
+        $paginator->getCurrentPageFirstItemNumber()->willReturn(0);
+        $paginator->getItemsPerPage()->willReturn(10);
+
+        $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
+        $paginatorFactory->create(2)->willReturn($paginator->reveal());
+
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $serializer->serialize(
+            Argument::that(fn (Collection $collection) => $collection->getItems() === $tickets),
+            'json',
+            ['groups' => 'read:simple']
+        )->willReturn('{"items":[{},{}],"pagination":{}}');
+
+        $personRepository = $this->prophesize(PersonRepository::class);
+        $motiveRepository = $this->prophesize(MotiveRepository::class);
+
+        // Create controller
+        $controller = new TicketListApiController(
+            $security->reveal(),
+            $ticketRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $serializer->reveal(),
+            $personRepository->reveal(),
+            $motiveRepository->reveal(),
+            new MockClock(),
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]])
+        );
+
+        // Create request with byCreatedAfter filter in RFC3339_EXTENDED format
+        $request = new Request(
+            query: ['byCreatedAfter' => $dateString]
+        );
+
+        // Call controller method
+        $response = $controller->listTicket($request);
+
+        // Assert response
+        $this->assertInstanceOf(JsonResponse::class, $response);
+        $this->assertEquals('{"items":[{},{}],"pagination":{}}', $response->getContent());
+    }
+
+    public function testListTicketWithByCreatedAfterInvalidFormat(): void
+    {
+        self::expectException(BadRequestHttpException::class);
+        self::expectExceptionMessage('Invalid date for byCreatedAfter');
+
+        // Mock dependencies
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $ticketRepository = $this->prophesize(TicketACLAwareRepositoryInterface::class);
+        $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $personRepository = $this->prophesize(PersonRepository::class);
+        $motiveRepository = $this->prophesize(MotiveRepository::class);
+
+        // Create controller
+        $controller = new TicketListApiController(
+            $security->reveal(),
+            $ticketRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $serializer->reveal(),
+            $personRepository->reveal(),
+            $motiveRepository->reveal(),
+            new MockClock(),
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]])
+        );
+
+        // Create request with byCreatedAfter filter in invalid format
+        $request = new Request(
+            query: ['byCreatedAfter' => '2025-05-15']
+        );
+
+        // Call controller method
+        $controller->listTicket($request);
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByCreatedBeforeTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByCreatedBeforeTest.php
new file mode 100644
index 000000000..c4fb42ddd
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByCreatedBeforeTest.php
@@ -0,0 +1,219 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Tests\Controller;
+
+use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Serializer\Model\Collection;
+use Chill\PersonBundle\Repository\PersonRepository;
+use Chill\TicketBundle\Controller\TicketListApiController;
+use Chill\TicketBundle\Entity\Ticket;
+use Chill\TicketBundle\Repository\MotiveRepository;
+use Chill\TicketBundle\Repository\TicketACLAwareRepositoryInterface;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\SerializerInterface;
+use Symfony\Component\Clock\MockClock;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
+
+/**
+ * @internal
+ *
+ * @covers \Chill\TicketBundle\Controller\TicketListApiController
+ */
+final class TicketListApiControllerByCreatedBeforeTest extends TestCase
+{
+    use ProphecyTrait;
+
+    public function testListTicketWithByCreatedBeforeRFC3339Format(): void
+    {
+        // Mock dependencies
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $ticketRepository = $this->prophesize(TicketACLAwareRepositoryInterface::class);
+        $tickets = [new Ticket(), new Ticket()];
+
+        // The date in RFC3339 format
+        $dateString = '2025-05-15T15:05:00Z';
+        $date = \DateTimeImmutable::createFromFormat(\DateTimeImmutable::RFC3339, $dateString);
+
+        $ticketRepository->countTickets(
+            Argument::that(
+                fn ($params) => isset($params['byCreatedBefore'])
+                && $params['byCreatedBefore'] == $date
+            )
+        )->willReturn(2);
+
+        $ticketRepository->findTickets(
+            Argument::that(
+                fn ($params) => isset($params['byCreatedBefore'])
+                && $params['byCreatedBefore'] == $date
+            ),
+            0,
+            10
+        )->willReturn($tickets);
+
+        $paginator = $this->prophesize(PaginatorInterface::class);
+        $paginator->getCurrentPageFirstItemNumber()->willReturn(0);
+        $paginator->getItemsPerPage()->willReturn(10);
+
+        $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
+        $paginatorFactory->create(2)->willReturn($paginator->reveal());
+
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $serializer->serialize(
+            Argument::that(fn (Collection $collection) => $collection->getItems() === $tickets),
+            'json',
+            ['groups' => 'read:simple']
+        )->willReturn('{"items":[{},{}],"pagination":{}}');
+
+        $personRepository = $this->prophesize(PersonRepository::class);
+        $motiveRepository = $this->prophesize(MotiveRepository::class);
+
+        // Create controller
+        $controller = new TicketListApiController(
+            $security->reveal(),
+            $ticketRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $serializer->reveal(),
+            $personRepository->reveal(),
+            $motiveRepository->reveal(),
+            new MockClock(),
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]])
+        );
+
+        // Create request with byCreatedAfter filter in RFC3339 format
+        $request = new Request(
+            query: ['byCreatedBefore' => $dateString]
+        );
+
+        // Call controller method
+        $response = $controller->listTicket($request);
+
+        // Assert response
+        $this->assertInstanceOf(JsonResponse::class, $response);
+        $this->assertEquals('{"items":[{},{}],"pagination":{}}', $response->getContent());
+    }
+
+    public function testListTicketWithByCreatedAfterRFC3339ExtendedFormat(): void
+    {
+        // Mock dependencies
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $ticketRepository = $this->prophesize(TicketACLAwareRepositoryInterface::class);
+        $tickets = [new Ticket(), new Ticket()];
+
+        // The date in RFC3339_EXTENDED format
+        $dateString = '2025-05-15T15:05:00.000+02:00';
+        $date = \DateTimeImmutable::createFromFormat(\DateTimeImmutable::RFC3339_EXTENDED, $dateString);
+
+        $ticketRepository->countTickets(
+            Argument::that(
+                fn ($params) => isset($params['byCreatedBefore'])
+                && $params['byCreatedBefore'] == $date
+            )
+        )->willReturn(2);
+
+        $ticketRepository->findTickets(
+            Argument::that(
+                fn ($params) => isset($params['byCreatedBefore'])
+                && $params['byCreatedBefore'] == $date
+            ),
+            0,
+            10
+        )->willReturn($tickets);
+
+        $paginator = $this->prophesize(PaginatorInterface::class);
+        $paginator->getCurrentPageFirstItemNumber()->willReturn(0);
+        $paginator->getItemsPerPage()->willReturn(10);
+
+        $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
+        $paginatorFactory->create(2)->willReturn($paginator->reveal());
+
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $serializer->serialize(
+            Argument::that(fn (Collection $collection) => $collection->getItems() === $tickets),
+            'json',
+            ['groups' => 'read:simple']
+        )->willReturn('{"items":[{},{}],"pagination":{}}');
+
+        $personRepository = $this->prophesize(PersonRepository::class);
+        $motiveRepository = $this->prophesize(MotiveRepository::class);
+
+        // Create controller
+        $controller = new TicketListApiController(
+            $security->reveal(),
+            $ticketRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $serializer->reveal(),
+            $personRepository->reveal(),
+            $motiveRepository->reveal(),
+            new MockClock(),
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]])
+        );
+
+        // Create request with byCreatedAfter filter in RFC3339_EXTENDED format
+        $request = new Request(
+            query: ['byCreatedBefore' => $dateString]
+        );
+
+        // Call controller method
+        $response = $controller->listTicket($request);
+
+        // Assert response
+        $this->assertInstanceOf(JsonResponse::class, $response);
+        $this->assertEquals('{"items":[{},{}],"pagination":{}}', $response->getContent());
+    }
+
+    public function testListTicketWithByCreatedBeforeInvalidFormat(): void
+    {
+        self::expectException(BadRequestHttpException::class);
+        self::expectExceptionMessage('Invalid date for byCreatedBefore');
+
+        // Mock dependencies
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $ticketRepository = $this->prophesize(TicketACLAwareRepositoryInterface::class);
+        $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $personRepository = $this->prophesize(PersonRepository::class);
+        $motiveRepository = $this->prophesize(MotiveRepository::class);
+
+        // Create controller
+        $controller = new TicketListApiController(
+            $security->reveal(),
+            $ticketRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $serializer->reveal(),
+            $personRepository->reveal(),
+            $motiveRepository->reveal(),
+            new MockClock(),
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]])
+        );
+
+        // Create request with byCreatedAfter filter in invalid format
+        $request = new Request(
+            query: ['byCreatedBefore' => '2025-05-15']
+        );
+
+        // Call controller method
+        $controller->listTicket($request);
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByResponseTimeExceededTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByResponseTimeExceededTest.php
new file mode 100644
index 000000000..7768591ea
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByResponseTimeExceededTest.php
@@ -0,0 +1,207 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Tests\Controller;
+
+use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Serializer\Model\Collection;
+use Chill\PersonBundle\Repository\PersonRepository;
+use Chill\TicketBundle\Controller\TicketListApiController;
+use Chill\TicketBundle\Entity\StateEnum;
+use Chill\TicketBundle\Entity\Ticket;
+use Chill\TicketBundle\Repository\MotiveRepository;
+use Chill\TicketBundle\Repository\TicketACLAwareRepositoryInterface;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\SerializerInterface;
+use Symfony\Component\Clock\MockClock;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
+
+/**
+ * @internal
+ *
+ * @covers \Chill\TicketBundle\Controller\TicketListApiController
+ */
+final class TicketListApiControllerByResponseTimeExceededTest extends TestCase
+{
+    use ProphecyTrait;
+
+    public function testListTicketWithByResponseTimeExceededOnly(): void
+    {
+        // Mock dependencies
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $ticketRepository = $this->prophesize(TicketACLAwareRepositoryInterface::class);
+        $tickets = [new Ticket(), new Ticket()];
+
+        // Create a mock clock with a fixed time
+        $mockClock = new MockClock();
+        $now = new \DateTimeImmutable('2025-05-15T15:05:00Z');
+        $mockClock->modify($now->format(\DateTimeImmutable::RFC3339));
+
+        // Calculate the expected byCreatedBefore value (now - PT12H)
+        $expectedCreatedBefore = $now->sub(new \DateInterval('PT12H'));
+
+        $ticketRepository->countTickets(
+            Argument::that(
+                fn ($params) => isset($params['byCurrentState'])
+                && $params['byCurrentState'] === [StateEnum::OPEN]
+                && isset($params['byCreatedBefore'])
+                && $params['byCreatedBefore'] == $expectedCreatedBefore
+                && !isset($params['byCreatedAfter'])
+            )
+        )->willReturn(2);
+
+        $ticketRepository->findTickets(
+            Argument::that(
+                fn ($params) => isset($params['byCurrentState'])
+                && $params['byCurrentState'] === [StateEnum::OPEN]
+                && isset($params['byCreatedBefore'])
+                && $params['byCreatedBefore'] == $expectedCreatedBefore
+                && !isset($params['byCreatedAfter'])
+            ),
+            0,
+            10
+        )->willReturn($tickets);
+
+        $paginator = $this->prophesize(PaginatorInterface::class);
+        $paginator->getCurrentPageFirstItemNumber()->willReturn(0);
+        $paginator->getItemsPerPage()->willReturn(10);
+
+        $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
+        $paginatorFactory->create(2)->willReturn($paginator->reveal());
+
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $serializer->serialize(
+            Argument::that(fn (Collection $collection) => $collection->getItems() === $tickets),
+            'json',
+            ['groups' => 'read:simple']
+        )->willReturn('{"items":[{},{}],"pagination":{}}');
+
+        $personRepository = $this->prophesize(PersonRepository::class);
+        $motiveRepository = $this->prophesize(MotiveRepository::class);
+
+        // Create controller
+        $controller = new TicketListApiController(
+            $security->reveal(),
+            $ticketRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $serializer->reveal(),
+            $personRepository->reveal(),
+            $motiveRepository->reveal(),
+            $mockClock,
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]])
+        );
+
+        // Create request with byResponseTimeExceeded parameter only
+        $request = new Request(
+            query: ['byResponseTimeExceeded' => '']
+        );
+
+        // Call controller method
+        $response = $controller->listTicket($request);
+
+        // Assert response
+        $this->assertInstanceOf(JsonResponse::class, $response);
+        $this->assertEquals('{"items":[{},{}],"pagination":{}}', $response->getContent());
+    }
+
+    public function testListTicketWithByResponseTimeExceededAndByCreatedAfter(): void
+    {
+        // Mock dependencies
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $ticketRepository = $this->prophesize(TicketACLAwareRepositoryInterface::class);
+        $tickets = [new Ticket(), new Ticket()];
+
+        // Create a mock clock with a fixed time
+        $mockClock = new MockClock();
+        $now = new \DateTimeImmutable('2025-05-15T15:05:00Z');
+        $mockClock->modify($now->format(\DateTimeImmutable::RFC3339));
+
+        // Calculate the expected byCreatedBefore value (now - PT12H)
+        $expectedCreatedBefore = $now->sub(new \DateInterval('PT12H'));
+
+        // The byCreatedAfter parameter should be ignored when byResponseTimeExceeded is present
+        $ticketRepository->countTickets(
+            Argument::that(
+                fn ($params) => isset($params['byCurrentState'])
+                && $params['byCurrentState'] === [StateEnum::OPEN]
+                && isset($params['byCreatedBefore'])
+                && $params['byCreatedBefore'] == $expectedCreatedBefore
+                && !isset($params['byCreatedAfter'])
+            )
+        )->willReturn(2);
+
+        $ticketRepository->findTickets(
+            Argument::that(
+                fn ($params) => isset($params['byCurrentState'])
+                && $params['byCurrentState'] === [StateEnum::OPEN]
+                && isset($params['byCreatedBefore'])
+                && $params['byCreatedBefore'] == $expectedCreatedBefore
+                && !isset($params['byCreatedAfter'])
+            ),
+            0,
+            10
+        )->willReturn($tickets);
+
+        $paginator = $this->prophesize(PaginatorInterface::class);
+        $paginator->getCurrentPageFirstItemNumber()->willReturn(0);
+        $paginator->getItemsPerPage()->willReturn(10);
+
+        $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
+        $paginatorFactory->create(2)->willReturn($paginator->reveal());
+
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $serializer->serialize(
+            Argument::that(fn (Collection $collection) => $collection->getItems() === $tickets),
+            'json',
+            ['groups' => 'read:simple']
+        )->willReturn('{"items":[{},{}],"pagination":{}}');
+
+        $personRepository = $this->prophesize(PersonRepository::class);
+        $motiveRepository = $this->prophesize(MotiveRepository::class);
+
+        // Create controller
+        $controller = new TicketListApiController(
+            $security->reveal(),
+            $ticketRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $serializer->reveal(),
+            $personRepository->reveal(),
+            $motiveRepository->reveal(),
+            $mockClock,
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]])
+        );
+
+        // Create request with both byCreatedAfter and byResponseTimeExceeded parameters
+        $request = new Request(
+            query: [
+                'byCreatedAfter' => '2025-05-15T12:00:00+00:00',
+                'byResponseTimeExceeded' => '',
+            ]
+        );
+
+        // Call controller method
+        $response = $controller->listTicket($request);
+
+        // Assert response
+        $this->assertInstanceOf(JsonResponse::class, $response);
+        $this->assertEquals('{"items":[{},{}],"pagination":{}}', $response->getContent());
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerCurrentStateEmergencyTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerCurrentStateEmergencyTest.php
new file mode 100644
index 000000000..79388a4a0
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerCurrentStateEmergencyTest.php
@@ -0,0 +1,137 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Tests\Controller;
+
+use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Serializer\Model\Collection;
+use Chill\PersonBundle\Repository\PersonRepository;
+use Chill\TicketBundle\Controller\TicketListApiController;
+use Chill\TicketBundle\Entity\EmergencyStatusEnum;
+use Chill\TicketBundle\Entity\Ticket;
+use Chill\TicketBundle\Repository\MotiveRepository;
+use Chill\TicketBundle\Repository\TicketACLAwareRepositoryInterface;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\SerializerInterface;
+use Symfony\Component\Clock\MockClock;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
+
+/**
+ * @internal
+ *
+ * @covers \Chill\TicketBundle\Controller\TicketListApiController
+ */
+final class TicketListApiControllerCurrentStateEmergencyTest extends TestCase
+{
+    use ProphecyTrait;
+
+    public function testListTicketWithcurrentStateEmergencyFilter(): void
+    {
+        // Mock dependencies
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $ticketRepository = $this->prophesize(TicketACLAwareRepositoryInterface::class);
+        $tickets = [new Ticket(), new Ticket()];
+        $ticketRepository->countTickets(
+            Argument::that(fn ($params) => isset($params['byCurrentStateEmergency']) && in_array(EmergencyStatusEnum::YES, $params['byCurrentStateEmergency']))
+        )
+            ->willReturn(2);
+        $ticketRepository->findTickets(
+            Argument::that(fn ($params) => isset($params['byCurrentStateEmergency']) && in_array(EmergencyStatusEnum::YES, $params['byCurrentStateEmergency'])),
+            0,
+            10
+        )->willReturn($tickets);
+
+        $paginator = $this->prophesize(PaginatorInterface::class);
+        $paginator->getCurrentPageFirstItemNumber()->willReturn(0);
+        $paginator->getItemsPerPage()->willReturn(10);
+
+        $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
+        $paginatorFactory->create(2)->willReturn($paginator->reveal());
+
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $serializer->serialize(
+            Argument::that(fn (Collection $collection) => $collection->getItems() === $tickets),
+            'json',
+            ['groups' => 'read:simple']
+        )->willReturn('{"items":[{},{}],"pagination":{}}');
+
+        $personRepository = $this->prophesize(PersonRepository::class);
+        $motiveRepository = $this->prophesize(MotiveRepository::class);
+
+        // Create controller
+        $controller = new TicketListApiController(
+            $security->reveal(),
+            $ticketRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $serializer->reveal(),
+            $personRepository->reveal(),
+            $motiveRepository->reveal(),
+            new MockClock(),
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]])
+        );
+
+        // Create request with emergency filter
+        $request = new Request(
+            query: ['byCurrentStateEmergency' => 'yes,no']
+        );
+
+        // Call controller method
+        $response = $controller->listTicket($request);
+
+        // Assert response
+        $this->assertInstanceOf(JsonResponse::class, $response);
+        $this->assertEquals('{"items":[{},{}],"pagination":{}}', $response->getContent());
+    }
+
+    public function testListTicketWithCurrentStateEmergencyWithInvalidFilter(): void
+    {
+        self::expectException(BadRequestHttpException::class);
+
+        // Mock dependencies
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $ticketRepository = $this->prophesize(TicketACLAwareRepositoryInterface::class);
+        $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $personRepository = $this->prophesize(PersonRepository::class);
+        $motiveRepository = $this->prophesize(MotiveRepository::class);
+
+        // Create controller
+        $controller = new TicketListApiController(
+            $security->reveal(),
+            $ticketRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $serializer->reveal(),
+            $personRepository->reveal(),
+            $motiveRepository->reveal(),
+            new MockClock(),
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]])
+        );
+
+        // Create request with invalid emergency filter
+        $request = new Request(
+            query: ['byCurrentStateEmergency' => 'foo']
+        );
+
+        // Call controller method
+        $response = $controller->listTicket($request);
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerCurrentStateTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerCurrentStateTest.php
new file mode 100644
index 000000000..0a8653094
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerCurrentStateTest.php
@@ -0,0 +1,137 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Tests\Controller;
+
+use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Serializer\Model\Collection;
+use Chill\PersonBundle\Repository\PersonRepository;
+use Chill\TicketBundle\Controller\TicketListApiController;
+use Chill\TicketBundle\Entity\StateEnum;
+use Chill\TicketBundle\Entity\Ticket;
+use Chill\TicketBundle\Repository\MotiveRepository;
+use Chill\TicketBundle\Repository\TicketACLAwareRepositoryInterface;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\SerializerInterface;
+use Symfony\Component\Clock\MockClock;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
+
+/**
+ * @internal
+ *
+ * @covers \Chill\TicketBundle\Controller\TicketListApiController
+ */
+final class TicketListApiControllerCurrentStateTest extends TestCase
+{
+    use ProphecyTrait;
+
+    public function testListTicketWithCurrentStateFilter(): void
+    {
+        // Mock dependencies
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $ticketRepository = $this->prophesize(TicketACLAwareRepositoryInterface::class);
+        $tickets = [new Ticket(), new Ticket()];
+        $ticketRepository->countTickets(
+            Argument::that(fn ($params) => isset($params['byCurrentState']) && in_array(StateEnum::OPEN, $params['byCurrentState']))
+        )
+            ->willReturn(2);
+        $ticketRepository->findTickets(
+            Argument::that(fn ($params) => isset($params['byCurrentState']) && in_array(StateEnum::OPEN, $params['byCurrentState'])),
+            0,
+            10
+        )->willReturn($tickets);
+
+        $paginator = $this->prophesize(PaginatorInterface::class);
+        $paginator->getCurrentPageFirstItemNumber()->willReturn(0);
+        $paginator->getItemsPerPage()->willReturn(10);
+
+        $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
+        $paginatorFactory->create(2)->willReturn($paginator->reveal());
+
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $serializer->serialize(
+            Argument::that(fn (Collection $collection) => $collection->getItems() === $tickets),
+            'json',
+            ['groups' => 'read:simple']
+        )->willReturn('{"items":[{},{}],"pagination":{}}');
+
+        $personRepository = $this->prophesize(PersonRepository::class);
+        $motiveRepository = $this->prophesize(MotiveRepository::class);
+
+        // Create controller
+        $controller = new TicketListApiController(
+            $security->reveal(),
+            $ticketRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $serializer->reveal(),
+            $personRepository->reveal(),
+            $motiveRepository->reveal(),
+            new MockClock(),
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]])
+        );
+
+        // Create request with person filter
+        $request = new Request(
+            query: ['byCurrentState' => 'open,closed']
+        );
+
+        // Call controller method
+        $response = $controller->listTicket($request);
+
+        // Assert response
+        $this->assertInstanceOf(JsonResponse::class, $response);
+        $this->assertEquals('{"items":[{},{}],"pagination":{}}', $response->getContent());
+    }
+
+    public function testListTicketWithCurrentStateWithInvalidFilter(): void
+    {
+        self::expectException(BadRequestHttpException::class);
+
+        // Mock dependencies
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $ticketRepository = $this->prophesize(TicketACLAwareRepositoryInterface::class);
+        $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $personRepository = $this->prophesize(PersonRepository::class);
+        $motiveRepository = $this->prophesize(MotiveRepository::class);
+
+        // Create controller
+        $controller = new TicketListApiController(
+            $security->reveal(),
+            $ticketRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $serializer->reveal(),
+            $personRepository->reveal(),
+            $motiveRepository->reveal(),
+            new MockClock(),
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]])
+        );
+
+        // Create request with person filter
+        $request = new Request(
+            query: ['byCurrentState' => 'foo']
+        );
+
+        // Call controller method
+        $response = $controller->listTicket($request);
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerMotivesTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerMotivesTest.php
new file mode 100644
index 000000000..b77f7d4f5
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerMotivesTest.php
@@ -0,0 +1,243 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Tests\Controller;
+
+use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Serializer\Model\Collection;
+use Chill\PersonBundle\Repository\PersonRepository;
+use Chill\TicketBundle\Controller\TicketListApiController;
+use Chill\TicketBundle\Entity\Motive;
+use Chill\TicketBundle\Entity\Ticket;
+use Chill\TicketBundle\Repository\MotiveRepository;
+use Chill\TicketBundle\Repository\TicketACLAwareRepositoryInterface;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\SerializerInterface;
+use Symfony\Component\Clock\MockClock;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
+
+/**
+ * @internal
+ *
+ * @covers \Chill\TicketBundle\Controller\TicketListApiController
+ */
+final class TicketListApiControllerMotivesTest extends TestCase
+{
+    use ProphecyTrait;
+
+    public function testListTicketWithMultipleMotivesFilter(): void
+    {
+        // Mock dependencies
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $motive1 = new Motive();
+        $motive2 = new Motive();
+
+        $ticketRepository = $this->prophesize(TicketACLAwareRepositoryInterface::class);
+        $tickets = [new Ticket(), new Ticket()];
+        $ticketRepository->countTickets(
+            Argument::that(fn ($params) => isset($params['byMotives']) && in_array($motive1, $params['byMotives']) && in_array($motive2, $params['byMotives']))
+        )
+            ->willReturn(2);
+        $ticketRepository->findTickets(
+            Argument::that(fn ($params) => isset($params['byMotives']) && in_array($motive1, $params['byMotives']) && in_array($motive2, $params['byMotives'])),
+            0,
+            10
+        )->willReturn($tickets);
+
+        $paginator = $this->prophesize(PaginatorInterface::class);
+        $paginator->getCurrentPageFirstItemNumber()->willReturn(0);
+        $paginator->getItemsPerPage()->willReturn(10);
+
+        $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
+        $paginatorFactory->create(2)->willReturn($paginator->reveal());
+
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $serializer->serialize(
+            Argument::that(fn (Collection $collection) => $collection->getItems() === $tickets),
+            'json',
+            ['groups' => 'read:simple']
+        )->willReturn('{"items":[{},{}],"pagination":{}}');
+
+        $personRepository = $this->prophesize(PersonRepository::class);
+        $motiveRepository = $this->prophesize(MotiveRepository::class);
+        $motiveRepository->find(1)->willReturn($motive1);
+        $motiveRepository->find(2)->willReturn($motive2);
+
+        // Create controller
+        $controller = new TicketListApiController(
+            $security->reveal(),
+            $ticketRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $serializer->reveal(),
+            $personRepository->reveal(),
+            $motiveRepository->reveal(),
+            new MockClock(),
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]])
+        );
+
+        // Create request with multiple motives filter
+        $request = new Request(
+            query: ['byMotives' => '1,2']
+        );
+
+        // Call controller method
+        $response = $controller->listTicket($request);
+
+        // Assert response
+        $this->assertInstanceOf(JsonResponse::class, $response);
+        $this->assertEquals('{"items":[{},{}],"pagination":{}}', $response->getContent());
+    }
+
+    public function testListTicketWithSingleMotiveFilter(): void
+    {
+        // Mock dependencies
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $motive = new Motive();
+
+        $ticketRepository = $this->prophesize(TicketACLAwareRepositoryInterface::class);
+        $tickets = [new Ticket(), new Ticket()];
+        $ticketRepository->countTickets(
+            Argument::that(fn ($params) => isset($params['byMotives']) && in_array($motive, $params['byMotives']))
+        )
+            ->willReturn(2);
+        $ticketRepository->findTickets(
+            Argument::that(fn ($params) => isset($params['byMotives']) && in_array($motive, $params['byMotives'])),
+            0,
+            10
+        )->willReturn($tickets);
+
+        $paginator = $this->prophesize(PaginatorInterface::class);
+        $paginator->getCurrentPageFirstItemNumber()->willReturn(0);
+        $paginator->getItemsPerPage()->willReturn(10);
+
+        $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
+        $paginatorFactory->create(2)->willReturn($paginator->reveal());
+
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $serializer->serialize(
+            Argument::that(fn (Collection $collection) => $collection->getItems() === $tickets),
+            'json',
+            ['groups' => 'read:simple']
+        )->willReturn('{"items":[{},{}],"pagination":{}}');
+
+        $personRepository = $this->prophesize(PersonRepository::class);
+        $motiveRepository = $this->prophesize(MotiveRepository::class);
+        $motiveRepository->find(1)->willReturn($motive);
+
+        // Create controller
+        $controller = new TicketListApiController(
+            $security->reveal(),
+            $ticketRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $serializer->reveal(),
+            $personRepository->reveal(),
+            $motiveRepository->reveal(),
+            new MockClock(),
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]])
+        );
+
+        // Create request with single motive filter
+        $request = new Request(
+            query: ['byMotives' => '1']
+        );
+
+        // Call controller method
+        $response = $controller->listTicket($request);
+
+        // Assert response
+        $this->assertInstanceOf(JsonResponse::class, $response);
+        $this->assertEquals('{"items":[{},{}],"pagination":{}}', $response->getContent());
+    }
+
+    public function testListTicketWithMotiveNotFound(): void
+    {
+        self::expectException(BadRequestHttpException::class);
+        self::expectExceptionMessage('Motive not found');
+
+        // Mock dependencies
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $ticketRepository = $this->prophesize(TicketACLAwareRepositoryInterface::class);
+        $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $personRepository = $this->prophesize(PersonRepository::class);
+        $motiveRepository = $this->prophesize(MotiveRepository::class);
+        $motiveRepository->find(999)->willReturn(null);
+
+        // Create controller
+        $controller = new TicketListApiController(
+            $security->reveal(),
+            $ticketRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $serializer->reveal(),
+            $personRepository->reveal(),
+            $motiveRepository->reveal(),
+            new MockClock(),
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]])
+        );
+
+        // Create request with non-existent motive
+        $request = new Request(
+            query: ['byMotives' => '999']
+        );
+
+        // Call controller method
+        $controller->listTicket($request);
+    }
+
+    public function testListTicketWithNonIntegerMotiveParameter(): void
+    {
+        self::expectException(BadRequestHttpException::class);
+        self::expectExceptionMessage('Only numbers are allowed in by motives parameter');
+
+        // Mock dependencies
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $ticketRepository = $this->prophesize(TicketACLAwareRepositoryInterface::class);
+        $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $personRepository = $this->prophesize(PersonRepository::class);
+        $motiveRepository = $this->prophesize(MotiveRepository::class);
+
+        // Create controller
+        $controller = new TicketListApiController(
+            $security->reveal(),
+            $ticketRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $serializer->reveal(),
+            $personRepository->reveal(),
+            $motiveRepository->reveal(),
+            new MockClock(),
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]])
+        );
+
+        // Create request with non-integer motive parameter
+        $request = new Request(
+            query: ['byMotives' => 'abc']
+        );
+
+        // Call controller method
+        $controller->listTicket($request);
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerTest.php
index 9582164fb..5a9ec3b3d 100644
--- a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerTest.php
@@ -18,8 +18,8 @@ use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Chill\TicketBundle\Controller\TicketListApiController;
-use Chill\TicketBundle\Entity\StateEnum;
 use Chill\TicketBundle\Entity\Ticket;
+use Chill\TicketBundle\Repository\MotiveRepository;
 use Chill\TicketBundle\Repository\TicketACLAwareRepositoryInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
@@ -27,9 +27,10 @@ use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Component\HttpFoundation\JsonResponse;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
-use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Serializer\SerializerInterface;
+use Symfony\Component\Clock\MockClock;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
 
 /**
  * @internal
@@ -66,6 +67,7 @@ final class TicketListApiControllerTest extends TestCase
         )->willReturn('{"items":[{},{}],"pagination":{}}');
 
         $personRepository = $this->prophesize(PersonRepository::class);
+        $motiveRepository = $this->prophesize(MotiveRepository::class);
 
         // Create controller
         $controller = new TicketListApiController(
@@ -73,7 +75,10 @@ final class TicketListApiControllerTest extends TestCase
             $ticketRepository->reveal(),
             $paginatorFactory->reveal(),
             $serializer->reveal(),
-            $personRepository->reveal()
+            $personRepository->reveal(),
+            $motiveRepository->reveal(),
+            new MockClock(),
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]])
         );
 
         // Create request
@@ -121,6 +126,7 @@ final class TicketListApiControllerTest extends TestCase
 
         $personRepository = $this->prophesize(PersonRepository::class);
         $personRepository->find(123)->willReturn($person);
+        $motiveRepository = $this->prophesize(MotiveRepository::class);
 
         // Create controller
         $controller = new TicketListApiController(
@@ -128,7 +134,10 @@ final class TicketListApiControllerTest extends TestCase
             $ticketRepository->reveal(),
             $paginatorFactory->reveal(),
             $serializer->reveal(),
-            $personRepository->reveal()
+            $personRepository->reveal(),
+            $motiveRepository->reveal(),
+            new MockClock(),
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]])
         );
 
         // Create request with person filter
@@ -144,93 +153,6 @@ final class TicketListApiControllerTest extends TestCase
         $this->assertEquals('{"items":[{},{}],"pagination":{}}', $response->getContent());
     }
 
-    public function testListTicketWithCurrentStateFilter(): void
-    {
-        // Mock dependencies
-        $security = $this->prophesize(Security::class);
-        $security->isGranted('ROLE_USER')->willReturn(true);
-
-        $ticketRepository = $this->prophesize(TicketACLAwareRepositoryInterface::class);
-        $tickets = [new Ticket(), new Ticket()];
-        $ticketRepository->countTickets(
-            Argument::that(fn ($params) => isset($params['byCurrentState']) && in_array(StateEnum::OPEN, $params['byCurrentState']))
-        )
-            ->willReturn(2);
-        $ticketRepository->findTickets(
-            Argument::that(fn ($params) => isset($params['byCurrentState']) && in_array(StateEnum::OPEN, $params['byCurrentState'])),
-            0,
-            10
-        )->willReturn($tickets);
-
-        $paginator = $this->prophesize(PaginatorInterface::class);
-        $paginator->getCurrentPageFirstItemNumber()->willReturn(0);
-        $paginator->getItemsPerPage()->willReturn(10);
-
-        $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
-        $paginatorFactory->create(2)->willReturn($paginator->reveal());
-
-        $serializer = $this->prophesize(SerializerInterface::class);
-        $serializer->serialize(
-            Argument::that(fn (Collection $collection) => $collection->getItems() === $tickets),
-            'json',
-            ['groups' => 'read:simple']
-        )->willReturn('{"items":[{},{}],"pagination":{}}');
-
-        $personRepository = $this->prophesize(PersonRepository::class);
-
-        // Create controller
-        $controller = new TicketListApiController(
-            $security->reveal(),
-            $ticketRepository->reveal(),
-            $paginatorFactory->reveal(),
-            $serializer->reveal(),
-            $personRepository->reveal()
-        );
-
-        // Create request with person filter
-        $request = new Request(
-            query: ['byCurrentState' => 'open,closed']
-        );
-
-        // Call controller method
-        $response = $controller->listTicket($request);
-
-        // Assert response
-        $this->assertInstanceOf(JsonResponse::class, $response);
-        $this->assertEquals('{"items":[{},{}],"pagination":{}}', $response->getContent());
-    }
-
-    public function testListTicketWithCurrentStateWithInvalidFilter(): void
-    {
-        self::expectException(BadRequestHttpException::class);
-
-        // Mock dependencies
-        $security = $this->prophesize(Security::class);
-        $security->isGranted('ROLE_USER')->willReturn(true);
-
-        $ticketRepository = $this->prophesize(TicketACLAwareRepositoryInterface::class);
-        $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
-        $serializer = $this->prophesize(SerializerInterface::class);
-        $personRepository = $this->prophesize(PersonRepository::class);
-
-        // Create controller
-        $controller = new TicketListApiController(
-            $security->reveal(),
-            $ticketRepository->reveal(),
-            $paginatorFactory->reveal(),
-            $serializer->reveal(),
-            $personRepository->reveal()
-        );
-
-        // Create request with person filter
-        $request = new Request(
-            query: ['byCurrentState' => 'foo']
-        );
-
-        // Call controller method
-        $response = $controller->listTicket($request);
-    }
-
     public function testListTicketWithoutUserRole(): void
     {
         // Mock dependencies
@@ -241,6 +163,7 @@ final class TicketListApiControllerTest extends TestCase
         $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
         $serializer = $this->prophesize(SerializerInterface::class);
         $personRepository = $this->prophesize(PersonRepository::class);
+        $motiveRepository = $this->prophesize(MotiveRepository::class);
 
         // Create controller
         $controller = new TicketListApiController(
@@ -248,7 +171,10 @@ final class TicketListApiControllerTest extends TestCase
             $ticketRepository->reveal(),
             $paginatorFactory->reveal(),
             $serializer->reveal(),
-            $personRepository->reveal()
+            $personRepository->reveal(),
+            $motiveRepository->reveal(),
+            new MockClock(),
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]])
         );
 
         // Create request
@@ -277,6 +203,7 @@ final class TicketListApiControllerTest extends TestCase
 
         $personRepository = $this->prophesize(PersonRepository::class);
         $personRepository->find(123)->willReturn($person);
+        $motiveRepository = $this->prophesize(MotiveRepository::class);
 
         // Create controller
         $controller = new TicketListApiController(
@@ -284,7 +211,10 @@ final class TicketListApiControllerTest extends TestCase
             $ticketRepository->reveal(),
             $paginatorFactory->reveal(),
             $serializer->reveal(),
-            $personRepository->reveal()
+            $personRepository->reveal(),
+            $motiveRepository->reveal(),
+            new MockClock(),
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]])
         );
 
         // Create request with person filter
diff --git a/src/Bundle/ChillTicketBundle/tests/Repository/TicketACLAwareRepositoryTest.php b/src/Bundle/ChillTicketBundle/tests/Repository/TicketACLAwareRepositoryTest.php
index 8a0035032..5156f7de5 100644
--- a/src/Bundle/ChillTicketBundle/tests/Repository/TicketACLAwareRepositoryTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Repository/TicketACLAwareRepositoryTest.php
@@ -12,6 +12,8 @@ declare(strict_types=1);
 namespace Chill\TicketBundle\Tests\Repository;
 
 use Chill\PersonBundle\DataFixtures\Helper\RandomPersonHelperTrait;
+use Chill\TicketBundle\Entity\EmergencyStatusEnum;
+use Chill\TicketBundle\Entity\Motive;
 use Chill\TicketBundle\Entity\StateEnum;
 use Chill\TicketBundle\Repository\TicketACLAwareRepository;
 use Doctrine\ORM\EntityManagerInterface;
@@ -74,8 +76,51 @@ class TicketACLAwareRepositoryTest extends KernelTestCase
 
     public function testFindTicketByCurrentStateMultipleState(): void
     {
-        $result = $this->repository->countTickets(['byCurrentState' => [StateEnum::OPEN, StateEnum::CLOSED]]);
+        $result = $this->repository->findTickets(['byCurrentState' => [StateEnum::OPEN, StateEnum::CLOSED]]);
+
+        self::assertIsArray($result);
+    }
+
+    public function testCountTicketByCurrentStateEmergencySingleState(): void
+    {
+        $result = $this->repository->countTickets(['byCurrentStateEmergency' => [EmergencyStatusEnum::YES]]);
 
         self::assertIsInt($result);
     }
+
+    public function testFindTicketByCurrentStateEmergencyMultipleState(): void
+    {
+        $result = $this->repository->findTickets(['byCurrentStateEmergency' => [EmergencyStatusEnum::YES, EmergencyStatusEnum::NO]]);
+
+        self::assertIsArray($result);
+    }
+
+    public function testFindTicketByMotives(): void
+    {
+        $motives = $this->entityManager->createQuery(sprintf('SELECT m FROM %s m', Motive::class))
+            ->setMaxResults(2)
+            ->getResult();
+
+        if ([] === $motives) {
+            throw new \UnexpectedValueException('No motives found');
+        }
+
+        $results = $this->repository->findTickets(['byMotives' => $motives]);
+
+        self::assertIsArray($results);
+    }
+
+    public function testFindTicketByCreatedBefore(): void
+    {
+        $actual = $this->repository->findTickets(['byCreatedBefore' => (new \DateTimeImmutable('now'))->add(new \DateInterval('P1D'))]);
+
+        self::assertIsArray($actual);
+    }
+
+    public function testFindTicketByCreatedAfter(): void
+    {
+        $actual = $this->repository->findTickets(['byCreatedAfter' => (new \DateTimeImmutable('now'))->sub(new \DateInterval('P1M'))]);
+
+        self::assertIsArray($actual);
+    }
 }

From 445a2c9358225a31ac2a8714a0a7ae6a628ca4df Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 18 Jul 2025 11:40:48 +0000
Subject: [PATCH 153/283] [Ticket] add filter by addressee on ticket list api

---
 .../ChillTicketBundle/chill.api.specs.yaml    |  19 ++
 .../Controller/TicketListApiController.php    |  28 +-
 .../Repository/TicketACLAwareRepository.php   |  35 ++
 .../TicketACLAwareRepositoryInterface.php     |   3 +-
 ...TicketListApiControllerByAddresseeTest.php | 302 ++++++++++++++++++
 ...etListApiControllerByAddresseeToMeTest.php | 108 +++++++
 ...ketListApiControllerByCreatedAfterTest.php |  13 +-
 ...etListApiControllerByCreatedBeforeTest.php |  13 +-
 ...piControllerByResponseTimeExceededTest.php |   9 +-
 ...ApiControllerCurrentStateEmergencyTest.php |   9 +-
 ...icketListApiControllerCurrentStateTest.php |   9 +-
 .../TicketListApiControllerMotivesTest.php    |  17 +-
 .../TicketListApiControllerTest.php           |  17 +-
 .../TicketACLAwareRepositoryTest.php          |  16 +
 14 files changed, 573 insertions(+), 25 deletions(-)
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByAddresseeTest.php
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByAddresseeToMeTest.php

diff --git a/src/Bundle/ChillTicketBundle/chill.api.specs.yaml b/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
index 199b056a2..65aec91da 100644
--- a/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
@@ -135,6 +135,25 @@ paths:
                       **Warning**: This silently remove the filters "byCurrentState" and "byCreatedBefore".
                   schema:
                       type: string
+                - name: byAddressee
+                  in: query
+                  description: the id of the addressee to search for. The search is also performed against user groups.
+                  required: false
+                  style: form
+                  explode: false
+                  schema:
+                      type: array
+                      items:
+                          type: integer
+                          format: integer
+                          minimum: 1
+                - name: byAddresseeToMe
+                  in: query
+                  description: filter tickets assigned to the current authenticated users
+                  required: false
+                  allowEmptyValue: true
+                  schema:
+                      type: string
             responses:
                 200:
                     description: OK
diff --git a/src/Bundle/ChillTicketBundle/src/Controller/TicketListApiController.php b/src/Bundle/ChillTicketBundle/src/Controller/TicketListApiController.php
index 606967cbc..a181faf82 100644
--- a/src/Bundle/ChillTicketBundle/src/Controller/TicketListApiController.php
+++ b/src/Bundle/ChillTicketBundle/src/Controller/TicketListApiController.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\TicketBundle\Controller;
 
 use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
+use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Serializer\Model\Collection;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
@@ -42,6 +43,7 @@ final readonly class TicketListApiController
         private MotiveRepository $motiveRepository,
         private ClockInterface $clock,
         ParameterBagInterface $parameterBag,
+        private UserRepositoryInterface $userRepository,
     ) {
         $this->expectedTimeResponseDelay = new \DateInterval($parameterBag->get('chill_ticket')['ticket']['response_time_exceeded_delay']);
     }
@@ -56,8 +58,8 @@ final readonly class TicketListApiController
         $params = [];
 
         if ($request->query->has('byPerson')) {
-            $params = explode(',', $request->query->get('byPerson'));
-            foreach ($params as $id) {
+            $personIds = explode(',', $request->query->get('byPerson'));
+            foreach ($personIds as $id) {
                 $params['byPerson'][] = $person = $this->personRepository->find($id);
 
                 if (!$this->security->isGranted(PersonVoter::SEE, $person)) {
@@ -89,8 +91,8 @@ final readonly class TicketListApiController
         }
 
         if ($request->query->has('byMotives')) {
-            $params = explode(',', $request->query->get('byMotives'));
-            foreach ($params as $id) {
+            $motivesIds = explode(',', $request->query->get('byMotives'));
+            foreach ($motivesIds as $id) {
                 if (!is_numeric($id) || 0 === ((int) $id)) {
                     throw new BadRequestHttpException('Only numbers are allowed in by motives parameter');
                 }
@@ -132,6 +134,24 @@ final readonly class TicketListApiController
             unset($params['byCreatedAfter']);
         }
 
+        if ($request->query->has('byAddresseeToMe')) {
+            $params['byAddressee'][] = $this->security->getUser();
+        }
+
+        if ($request->query->has('byAddressee')) {
+            $userIds = explode(',', $request->query->get('byAddressee'));
+            foreach ($userIds as $id) {
+                if (!is_numeric($id) || 0 === ((int) $id)) {
+                    throw new BadRequestHttpException('Only numbers are allowed in by addressee parameter');
+                }
+
+                $params['byAddressee'][] = $user = $this->userRepository->find($id);
+                if (null === $user) {
+                    throw new BadRequestHttpException('User not found');
+                }
+            }
+        }
+
         $nb = $this->ticketRepository->countTickets($params);
         $paginator = $this->paginatorFactory->create($nb);
 
diff --git a/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepository.php b/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepository.php
index 02122b9fe..eb2da9b6e 100644
--- a/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepository.php
+++ b/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepository.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\TicketBundle\Repository;
 
+use Chill\TicketBundle\Entity\AddresseeHistory;
 use Chill\TicketBundle\Entity\EmergencyStatusHistory;
 use Chill\TicketBundle\Entity\MotiveHistory;
 use Chill\TicketBundle\Entity\PersonHistory;
@@ -131,6 +132,40 @@ final readonly class TicketACLAwareRepository implements TicketACLAwareRepositor
             $qb->setParameter('opening_after', $params['byCreatedBefore']);
         }
 
+        if (array_key_exists('byAddressee', $params)) {
+            $orx = $qb->expr()->orX();
+            foreach ($params['byAddressee'] as $addressee) {
+                $orx->add(
+                    $qb->expr()->exists(sprintf(
+                        'SELECT 1 FROM %s tp_addressee_%d WHERE tp_addressee_%d.ticket = t
+                        AND tp_addressee_%d.endDate IS NULL AND tp_addressee_%d.addresseeUser = :addressee_%d',
+                        AddresseeHistory::class,
+                        ++$i,
+                        $i,
+                        $i,
+                        $i,
+                        $addresseeParam = $i,
+                    ))
+                );
+                $orx->add(
+                    $qb->expr()->exists(sprintf(
+                        'SELECT 1 FROM %s tp_addressee_%d JOIN tp_addressee_%d.addresseeGroup group_%d WHERE tp_addressee_%d.ticket = t
+                        AND tp_addressee_%d.endDate IS NULL AND :addressee_%d MEMBER OF group_%d.users',
+                        AddresseeHistory::class,
+                        ++$i,
+                        $i,
+                        $i,
+                        $i,
+                        $i,
+                        $addresseeParam,
+                        $i,
+                    ))
+                );
+                $qb->setParameter(sprintf('addressee_%d', $addresseeParam), $addressee);
+            }
+            $qb->andWhere($orx);
+        }
+
         return $qb;
     }
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepositoryInterface.php b/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepositoryInterface.php
index 474bd7a8d..59527fb73 100644
--- a/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepositoryInterface.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\TicketBundle\Repository;
 
+use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\Entity\Person;
 use Chill\TicketBundle\Entity\EmergencyStatusEnum;
 use Chill\TicketBundle\Entity\Motive;
@@ -20,7 +21,7 @@ use Chill\TicketBundle\Entity\Ticket;
 /**
  * Repository to find tickets, taking care of permissions.
  *
- * @phpstan-type TicketACLAwareRepositoryParam array{byPerson?: list<Person>, byCurrentState?: list<StateEnum>, byCurrentStateEmergency?: list<EmergencyStatusEnum>, byMotives?: list<Motive>, byCreatedBefore?: \DateTimeImmutable, byCreatedAfter?: \DateTimeImmutable}
+ * @phpstan-type TicketACLAwareRepositoryParam array{byPerson?: list<Person>, byCurrentState?: list<StateEnum>, byCurrentStateEmergency?: list<EmergencyStatusEnum>, byMotives?: list<Motive>, byCreatedBefore?: \DateTimeImmutable, byCreatedAfter?: \DateTimeImmutable, byAddressee?: list<User>}
  */
 interface TicketACLAwareRepositoryInterface
 {
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByAddresseeTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByAddresseeTest.php
new file mode 100644
index 000000000..0508bdfa6
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByAddresseeTest.php
@@ -0,0 +1,302 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Tests\Controller;
+
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Repository\UserRepositoryInterface;
+use Chill\MainBundle\Serializer\Model\Collection;
+use Chill\PersonBundle\Repository\PersonRepository;
+use Chill\TicketBundle\Controller\TicketListApiController;
+use Chill\TicketBundle\Entity\Ticket;
+use Chill\TicketBundle\Repository\MotiveRepository;
+use Chill\TicketBundle\Repository\TicketACLAwareRepositoryInterface;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\SerializerInterface;
+use Symfony\Component\Clock\MockClock;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
+
+/**
+ * @internal
+ *
+ * @covers \Chill\TicketBundle\Controller\TicketListApiController
+ */
+final class TicketListApiControllerByAddresseeTest extends TestCase
+{
+    use ProphecyTrait;
+
+    public function testListTicketWithSingleByAddresseeFilter(): void
+    {
+        // Mock dependencies
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $user = new User();
+
+        $userRepository = $this->prophesize(UserRepositoryInterface::class);
+        $userRepository->find(1)->willReturn($user);
+
+        $ticketRepository = $this->prophesize(TicketACLAwareRepositoryInterface::class);
+        $tickets = [new Ticket(), new Ticket()];
+        $ticketRepository->countTickets(
+            Argument::that(fn ($params) => isset($params['byAddressee']) && in_array($user, $params['byAddressee']))
+        )
+            ->shouldBeCalled()
+            ->willReturn(2);
+        $ticketRepository->findTickets(
+            Argument::that(fn ($params) => isset($params['byAddressee']) && in_array($user, $params['byAddressee'])),
+            0,
+            10
+        )->shouldBeCalled()->willReturn($tickets);
+
+        $paginator = $this->prophesize(PaginatorInterface::class);
+        $paginator->getCurrentPageFirstItemNumber()->willReturn(0);
+        $paginator->getItemsPerPage()->willReturn(10);
+
+        $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
+        $paginatorFactory->create(2)->willReturn($paginator->reveal());
+
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $serializer->serialize(
+            Argument::that(fn (Collection $collection) => $collection->getItems() === $tickets),
+            'json',
+            ['groups' => 'read:simple']
+        )->willReturn('{"items":[{},{}],"pagination":{}}');
+
+        $personRepository = $this->prophesize(PersonRepository::class);
+        $motiveRepository = $this->prophesize(MotiveRepository::class);
+
+        // Create controller
+        $controller = new TicketListApiController(
+            $security->reveal(),
+            $ticketRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $serializer->reveal(),
+            $personRepository->reveal(),
+            $motiveRepository->reveal(),
+            new MockClock(),
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
+            $userRepository->reveal()
+        );
+
+        // Create request with byAddressee filter
+        $request = new Request(
+            query: ['byAddressee' => '1']
+        );
+
+        // Call controller method
+        $response = $controller->listTicket($request);
+
+        // Assert response
+        $this->assertInstanceOf(JsonResponse::class, $response);
+        $this->assertEquals('{"items":[{},{}],"pagination":{}}', $response->getContent());
+    }
+
+    public function testListTicketWithMultipleByAddresseeFilter(): void
+    {
+        // Mock dependencies
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $user1 = new User();
+        $user2 = new User();
+
+        $userRepository = $this->prophesize(UserRepositoryInterface::class);
+        $userRepository->find(1)->willReturn($user1);
+        $userRepository->find(2)->willReturn($user2);
+
+        $ticketRepository = $this->prophesize(TicketACLAwareRepositoryInterface::class);
+        $tickets = [new Ticket(), new Ticket()];
+        $ticketRepository->countTickets(
+            Argument::that(fn ($params) => isset($params['byAddressee'])
+                && in_array($user1, $params['byAddressee'])
+                && in_array($user2, $params['byAddressee']))
+        )
+            ->shouldBeCalled()
+            ->willReturn(2);
+        $ticketRepository->findTickets(
+            Argument::that(fn ($params) => isset($params['byAddressee'])
+                && in_array($user1, $params['byAddressee'])
+                && in_array($user2, $params['byAddressee'])),
+            0,
+            10
+        )->shouldBeCalled()->willReturn($tickets);
+
+        $paginator = $this->prophesize(PaginatorInterface::class);
+        $paginator->getCurrentPageFirstItemNumber()->willReturn(0);
+        $paginator->getItemsPerPage()->willReturn(10);
+
+        $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
+        $paginatorFactory->create(2)->willReturn($paginator->reveal());
+
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $serializer->serialize(
+            Argument::that(fn (Collection $collection) => $collection->getItems() === $tickets),
+            'json',
+            ['groups' => 'read:simple']
+        )->willReturn('{"items":[{},{}],"pagination":{}}');
+
+        $personRepository = $this->prophesize(PersonRepository::class);
+        $motiveRepository = $this->prophesize(MotiveRepository::class);
+
+        // Create controller
+        $controller = new TicketListApiController(
+            $security->reveal(),
+            $ticketRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $serializer->reveal(),
+            $personRepository->reveal(),
+            $motiveRepository->reveal(),
+            new MockClock(),
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
+            $userRepository->reveal()
+        );
+
+        // Create request with multiple byAddressee filter
+        $request = new Request(
+            query: ['byAddressee' => '1,2']
+        );
+
+        // Call controller method
+        $response = $controller->listTicket($request);
+
+        // Assert response
+        $this->assertInstanceOf(JsonResponse::class, $response);
+        $this->assertEquals('{"items":[{},{}],"pagination":{}}', $response->getContent());
+    }
+
+    public function testListTicketWithByAddresseeFilterUserNotFound(): void
+    {
+        self::expectException(BadRequestHttpException::class);
+        self::expectExceptionMessage('User not found');
+
+        // Mock dependencies
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $user1 = new User();
+
+        $userRepository = $this->prophesize(UserRepositoryInterface::class);
+        $userRepository->find(1)->willReturn($user1);
+        $userRepository->find(2)->willReturn(null); // User not found
+
+        $ticketRepository = $this->prophesize(TicketACLAwareRepositoryInterface::class);
+        $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $personRepository = $this->prophesize(PersonRepository::class);
+        $motiveRepository = $this->prophesize(MotiveRepository::class);
+
+        // Create controller
+        $controller = new TicketListApiController(
+            $security->reveal(),
+            $ticketRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $serializer->reveal(),
+            $personRepository->reveal(),
+            $motiveRepository->reveal(),
+            new MockClock(),
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
+            $userRepository->reveal()
+        );
+
+        // Create request with byAddressee filter with non-existent user
+        $request = new Request(
+            query: ['byAddressee' => '1,2']
+        );
+
+        // Call controller method - should throw exception
+        $controller->listTicket($request);
+    }
+
+    public function testListTicketWithByAddresseeAndByAddresseeToMeFilters(): void
+    {
+        // Mock dependencies
+        $currentUser = new User();
+        $user1 = new User();
+
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+        $security->getUser()->willReturn($currentUser);
+
+        $userRepository = $this->prophesize(UserRepositoryInterface::class);
+        $userRepository->find(1)->willReturn($user1);
+
+        $ticketRepository = $this->prophesize(TicketACLAwareRepositoryInterface::class);
+        $tickets = [new Ticket(), new Ticket()];
+        $ticketRepository->countTickets(
+            Argument::that(fn ($params) => isset($params['byAddressee'])
+                && in_array($currentUser, $params['byAddressee'])
+                && in_array($user1, $params['byAddressee']))
+        )
+            ->shouldBeCalled()
+            ->willReturn(2);
+        $ticketRepository->findTickets(
+            Argument::that(fn ($params) => isset($params['byAddressee'])
+                && in_array($currentUser, $params['byAddressee'])
+                && in_array($user1, $params['byAddressee'])),
+            0,
+            10
+        )->shouldBeCalled()->willReturn($tickets);
+
+        $paginator = $this->prophesize(PaginatorInterface::class);
+        $paginator->getCurrentPageFirstItemNumber()->willReturn(0);
+        $paginator->getItemsPerPage()->willReturn(10);
+
+        $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
+        $paginatorFactory->create(2)->willReturn($paginator->reveal());
+
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $serializer->serialize(
+            Argument::that(fn (Collection $collection) => $collection->getItems() === $tickets),
+            'json',
+            ['groups' => 'read:simple']
+        )->willReturn('{"items":[{},{}],"pagination":{}}');
+
+        $personRepository = $this->prophesize(PersonRepository::class);
+        $motiveRepository = $this->prophesize(MotiveRepository::class);
+
+        // Create controller
+        $controller = new TicketListApiController(
+            $security->reveal(),
+            $ticketRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $serializer->reveal(),
+            $personRepository->reveal(),
+            $motiveRepository->reveal(),
+            new MockClock(),
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
+            $userRepository->reveal()
+        );
+
+        // Create request with both byAddressee and byAddresseeToMe filters
+        $request = new Request(
+            query: [
+                'byAddressee' => '1',
+                'byAddresseeToMe' => '',
+            ]
+        );
+
+        // Call controller method
+        $response = $controller->listTicket($request);
+
+        // Assert response
+        $this->assertInstanceOf(JsonResponse::class, $response);
+        $this->assertEquals('{"items":[{},{}],"pagination":{}}', $response->getContent());
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByAddresseeToMeTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByAddresseeToMeTest.php
new file mode 100644
index 000000000..f9d5738e7
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByAddresseeToMeTest.php
@@ -0,0 +1,108 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Tests\Controller;
+
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Repository\UserRepositoryInterface;
+use Chill\MainBundle\Serializer\Model\Collection;
+use Chill\PersonBundle\Repository\PersonRepository;
+use Chill\TicketBundle\Controller\TicketListApiController;
+use Chill\TicketBundle\Entity\Ticket;
+use Chill\TicketBundle\Repository\MotiveRepository;
+use Chill\TicketBundle\Repository\TicketACLAwareRepositoryInterface;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\SerializerInterface;
+use Symfony\Component\Clock\MockClock;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
+
+/**
+ * @internal
+ *
+ * @covers \Chill\TicketBundle\Controller\TicketListApiController
+ */
+final class TicketListApiControllerByAddresseeToMeTest extends TestCase
+{
+    use ProphecyTrait;
+
+    public function testListTicketWithByAddresseeToMeFilter(): void
+    {
+        // Mock dependencies
+        $user = new User();
+
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+        $security->getUser()->willReturn($user);
+
+        $ticketRepository = $this->prophesize(TicketACLAwareRepositoryInterface::class);
+        $tickets = [new Ticket(), new Ticket()];
+        $ticketRepository->countTickets(
+            Argument::that(fn ($params) => isset($params['byAddressee']) && in_array($user, $params['byAddressee']))
+        )
+            ->shouldBeCalled()
+            ->willReturn(2);
+        $ticketRepository->findTickets(
+            Argument::that(fn ($params) => isset($params['byAddressee']) && in_array($user, $params['byAddressee'])),
+            0,
+            10
+        )->shouldBeCalled()->willReturn($tickets);
+
+        $paginator = $this->prophesize(PaginatorInterface::class);
+        $paginator->getCurrentPageFirstItemNumber()->willReturn(0);
+        $paginator->getItemsPerPage()->willReturn(10);
+
+        $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
+        $paginatorFactory->create(2)->willReturn($paginator->reveal());
+
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $serializer->serialize(
+            Argument::that(fn (Collection $collection) => $collection->getItems() === $tickets),
+            'json',
+            ['groups' => 'read:simple']
+        )->willReturn('{"items":[{},{}],"pagination":{}}');
+
+        $personRepository = $this->prophesize(PersonRepository::class);
+        $motiveRepository = $this->prophesize(MotiveRepository::class);
+        $userRepository = $this->prophesize(UserRepositoryInterface::class);
+
+        // Create controller
+        $controller = new TicketListApiController(
+            $security->reveal(),
+            $ticketRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $serializer->reveal(),
+            $personRepository->reveal(),
+            $motiveRepository->reveal(),
+            new MockClock(),
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
+            $userRepository->reveal()
+        );
+
+        // Create request with byAddresseeToMe filter
+        $request = new Request(
+            query: ['byAddresseeToMe' => '']
+        );
+
+        // Call controller method
+        $response = $controller->listTicket($request);
+
+        // Assert response
+        $this->assertInstanceOf(JsonResponse::class, $response);
+        $this->assertEquals('{"items":[{},{}],"pagination":{}}', $response->getContent());
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByCreatedAfterTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByCreatedAfterTest.php
index 2b03910e4..72eabd43d 100644
--- a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByCreatedAfterTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByCreatedAfterTest.php
@@ -13,6 +13,7 @@ namespace Chill\TicketBundle\Tests\Controller;
 
 use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
 use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Serializer\Model\Collection;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\TicketBundle\Controller\TicketListApiController;
@@ -84,6 +85,7 @@ final class TicketListApiControllerByCreatedAfterTest extends TestCase
 
         $personRepository = $this->prophesize(PersonRepository::class);
         $motiveRepository = $this->prophesize(MotiveRepository::class);
+        $userRepository = $this->prophesize(UserRepositoryInterface::class);
 
         // Create controller
         $controller = new TicketListApiController(
@@ -94,7 +96,8 @@ final class TicketListApiControllerByCreatedAfterTest extends TestCase
             $personRepository->reveal(),
             $motiveRepository->reveal(),
             new MockClock(),
-            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]])
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
+            $userRepository->reveal()
         );
 
         // Create request with byCreatedAfter filter in RFC3339 format
@@ -155,6 +158,7 @@ final class TicketListApiControllerByCreatedAfterTest extends TestCase
 
         $personRepository = $this->prophesize(PersonRepository::class);
         $motiveRepository = $this->prophesize(MotiveRepository::class);
+        $userRepository = $this->prophesize(UserRepositoryInterface::class);
 
         // Create controller
         $controller = new TicketListApiController(
@@ -165,7 +169,8 @@ final class TicketListApiControllerByCreatedAfterTest extends TestCase
             $personRepository->reveal(),
             $motiveRepository->reveal(),
             new MockClock(),
-            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]])
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
+            $userRepository->reveal()
         );
 
         // Create request with byCreatedAfter filter in RFC3339_EXTENDED format
@@ -195,6 +200,7 @@ final class TicketListApiControllerByCreatedAfterTest extends TestCase
         $serializer = $this->prophesize(SerializerInterface::class);
         $personRepository = $this->prophesize(PersonRepository::class);
         $motiveRepository = $this->prophesize(MotiveRepository::class);
+        $userRepository = $this->prophesize(UserRepositoryInterface::class);
 
         // Create controller
         $controller = new TicketListApiController(
@@ -205,7 +211,8 @@ final class TicketListApiControllerByCreatedAfterTest extends TestCase
             $personRepository->reveal(),
             $motiveRepository->reveal(),
             new MockClock(),
-            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]])
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
+            $userRepository->reveal()
         );
 
         // Create request with byCreatedAfter filter in invalid format
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByCreatedBeforeTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByCreatedBeforeTest.php
index c4fb42ddd..55fa1911d 100644
--- a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByCreatedBeforeTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByCreatedBeforeTest.php
@@ -13,6 +13,7 @@ namespace Chill\TicketBundle\Tests\Controller;
 
 use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
 use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Serializer\Model\Collection;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\TicketBundle\Controller\TicketListApiController;
@@ -84,6 +85,7 @@ final class TicketListApiControllerByCreatedBeforeTest extends TestCase
 
         $personRepository = $this->prophesize(PersonRepository::class);
         $motiveRepository = $this->prophesize(MotiveRepository::class);
+        $userRepository = $this->prophesize(UserRepositoryInterface::class);
 
         // Create controller
         $controller = new TicketListApiController(
@@ -94,7 +96,8 @@ final class TicketListApiControllerByCreatedBeforeTest extends TestCase
             $personRepository->reveal(),
             $motiveRepository->reveal(),
             new MockClock(),
-            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]])
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
+            $userRepository->reveal()
         );
 
         // Create request with byCreatedAfter filter in RFC3339 format
@@ -155,6 +158,7 @@ final class TicketListApiControllerByCreatedBeforeTest extends TestCase
 
         $personRepository = $this->prophesize(PersonRepository::class);
         $motiveRepository = $this->prophesize(MotiveRepository::class);
+        $userRepository = $this->prophesize(UserRepositoryInterface::class);
 
         // Create controller
         $controller = new TicketListApiController(
@@ -165,7 +169,8 @@ final class TicketListApiControllerByCreatedBeforeTest extends TestCase
             $personRepository->reveal(),
             $motiveRepository->reveal(),
             new MockClock(),
-            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]])
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
+            $userRepository->reveal()
         );
 
         // Create request with byCreatedAfter filter in RFC3339_EXTENDED format
@@ -195,6 +200,7 @@ final class TicketListApiControllerByCreatedBeforeTest extends TestCase
         $serializer = $this->prophesize(SerializerInterface::class);
         $personRepository = $this->prophesize(PersonRepository::class);
         $motiveRepository = $this->prophesize(MotiveRepository::class);
+        $userRepository = $this->prophesize(UserRepositoryInterface::class);
 
         // Create controller
         $controller = new TicketListApiController(
@@ -205,7 +211,8 @@ final class TicketListApiControllerByCreatedBeforeTest extends TestCase
             $personRepository->reveal(),
             $motiveRepository->reveal(),
             new MockClock(),
-            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]])
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
+            $userRepository->reveal()
         );
 
         // Create request with byCreatedAfter filter in invalid format
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByResponseTimeExceededTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByResponseTimeExceededTest.php
index 7768591ea..9c5f386e2 100644
--- a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByResponseTimeExceededTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByResponseTimeExceededTest.php
@@ -13,6 +13,7 @@ namespace Chill\TicketBundle\Tests\Controller;
 
 use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
 use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Serializer\Model\Collection;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\TicketBundle\Controller\TicketListApiController;
@@ -94,6 +95,7 @@ final class TicketListApiControllerByResponseTimeExceededTest extends TestCase
 
         $personRepository = $this->prophesize(PersonRepository::class);
         $motiveRepository = $this->prophesize(MotiveRepository::class);
+        $userRepository = $this->prophesize(UserRepositoryInterface::class);
 
         // Create controller
         $controller = new TicketListApiController(
@@ -104,7 +106,8 @@ final class TicketListApiControllerByResponseTimeExceededTest extends TestCase
             $personRepository->reveal(),
             $motiveRepository->reveal(),
             $mockClock,
-            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]])
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
+            $userRepository->reveal()
         );
 
         // Create request with byResponseTimeExceeded parameter only
@@ -176,6 +179,7 @@ final class TicketListApiControllerByResponseTimeExceededTest extends TestCase
 
         $personRepository = $this->prophesize(PersonRepository::class);
         $motiveRepository = $this->prophesize(MotiveRepository::class);
+        $userRepository = $this->prophesize(UserRepositoryInterface::class);
 
         // Create controller
         $controller = new TicketListApiController(
@@ -186,7 +190,8 @@ final class TicketListApiControllerByResponseTimeExceededTest extends TestCase
             $personRepository->reveal(),
             $motiveRepository->reveal(),
             $mockClock,
-            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]])
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
+            $userRepository->reveal()
         );
 
         // Create request with both byCreatedAfter and byResponseTimeExceeded parameters
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerCurrentStateEmergencyTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerCurrentStateEmergencyTest.php
index 79388a4a0..8f39db1ff 100644
--- a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerCurrentStateEmergencyTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerCurrentStateEmergencyTest.php
@@ -13,6 +13,7 @@ namespace Chill\TicketBundle\Tests\Controller;
 
 use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
 use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Serializer\Model\Collection;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\TicketBundle\Controller\TicketListApiController;
@@ -74,6 +75,7 @@ final class TicketListApiControllerCurrentStateEmergencyTest extends TestCase
 
         $personRepository = $this->prophesize(PersonRepository::class);
         $motiveRepository = $this->prophesize(MotiveRepository::class);
+        $userRepository = $this->prophesize(UserRepositoryInterface::class);
 
         // Create controller
         $controller = new TicketListApiController(
@@ -84,7 +86,8 @@ final class TicketListApiControllerCurrentStateEmergencyTest extends TestCase
             $personRepository->reveal(),
             $motiveRepository->reveal(),
             new MockClock(),
-            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]])
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
+            $userRepository->reveal()
         );
 
         // Create request with emergency filter
@@ -113,6 +116,7 @@ final class TicketListApiControllerCurrentStateEmergencyTest extends TestCase
         $serializer = $this->prophesize(SerializerInterface::class);
         $personRepository = $this->prophesize(PersonRepository::class);
         $motiveRepository = $this->prophesize(MotiveRepository::class);
+        $userRepository = $this->prophesize(UserRepositoryInterface::class);
 
         // Create controller
         $controller = new TicketListApiController(
@@ -123,7 +127,8 @@ final class TicketListApiControllerCurrentStateEmergencyTest extends TestCase
             $personRepository->reveal(),
             $motiveRepository->reveal(),
             new MockClock(),
-            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]])
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
+            $userRepository->reveal()
         );
 
         // Create request with invalid emergency filter
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerCurrentStateTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerCurrentStateTest.php
index 0a8653094..f54258af2 100644
--- a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerCurrentStateTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerCurrentStateTest.php
@@ -13,6 +13,7 @@ namespace Chill\TicketBundle\Tests\Controller;
 
 use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
 use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Serializer\Model\Collection;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\TicketBundle\Controller\TicketListApiController;
@@ -74,6 +75,7 @@ final class TicketListApiControllerCurrentStateTest extends TestCase
 
         $personRepository = $this->prophesize(PersonRepository::class);
         $motiveRepository = $this->prophesize(MotiveRepository::class);
+        $userRepository = $this->prophesize(UserRepositoryInterface::class);
 
         // Create controller
         $controller = new TicketListApiController(
@@ -84,7 +86,8 @@ final class TicketListApiControllerCurrentStateTest extends TestCase
             $personRepository->reveal(),
             $motiveRepository->reveal(),
             new MockClock(),
-            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]])
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
+            $userRepository->reveal()
         );
 
         // Create request with person filter
@@ -113,6 +116,7 @@ final class TicketListApiControllerCurrentStateTest extends TestCase
         $serializer = $this->prophesize(SerializerInterface::class);
         $personRepository = $this->prophesize(PersonRepository::class);
         $motiveRepository = $this->prophesize(MotiveRepository::class);
+        $userRepository = $this->prophesize(UserRepositoryInterface::class);
 
         // Create controller
         $controller = new TicketListApiController(
@@ -123,7 +127,8 @@ final class TicketListApiControllerCurrentStateTest extends TestCase
             $personRepository->reveal(),
             $motiveRepository->reveal(),
             new MockClock(),
-            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]])
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
+            $userRepository->reveal()
         );
 
         // Create request with person filter
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerMotivesTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerMotivesTest.php
index b77f7d4f5..9369ab7a7 100644
--- a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerMotivesTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerMotivesTest.php
@@ -13,6 +13,7 @@ namespace Chill\TicketBundle\Tests\Controller;
 
 use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
 use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Serializer\Model\Collection;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\TicketBundle\Controller\TicketListApiController;
@@ -79,6 +80,7 @@ final class TicketListApiControllerMotivesTest extends TestCase
         $motiveRepository = $this->prophesize(MotiveRepository::class);
         $motiveRepository->find(1)->willReturn($motive1);
         $motiveRepository->find(2)->willReturn($motive2);
+        $userRepository = $this->prophesize(UserRepositoryInterface::class);
 
         // Create controller
         $controller = new TicketListApiController(
@@ -89,7 +91,8 @@ final class TicketListApiControllerMotivesTest extends TestCase
             $personRepository->reveal(),
             $motiveRepository->reveal(),
             new MockClock(),
-            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]])
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
+            $userRepository->reveal()
         );
 
         // Create request with multiple motives filter
@@ -142,6 +145,7 @@ final class TicketListApiControllerMotivesTest extends TestCase
         $personRepository = $this->prophesize(PersonRepository::class);
         $motiveRepository = $this->prophesize(MotiveRepository::class);
         $motiveRepository->find(1)->willReturn($motive);
+        $userRepository = $this->prophesize(UserRepositoryInterface::class);
 
         // Create controller
         $controller = new TicketListApiController(
@@ -152,7 +156,8 @@ final class TicketListApiControllerMotivesTest extends TestCase
             $personRepository->reveal(),
             $motiveRepository->reveal(),
             new MockClock(),
-            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]])
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
+            $userRepository->reveal()
         );
 
         // Create request with single motive filter
@@ -183,6 +188,7 @@ final class TicketListApiControllerMotivesTest extends TestCase
         $personRepository = $this->prophesize(PersonRepository::class);
         $motiveRepository = $this->prophesize(MotiveRepository::class);
         $motiveRepository->find(999)->willReturn(null);
+        $userRepository = $this->prophesize(UserRepositoryInterface::class);
 
         // Create controller
         $controller = new TicketListApiController(
@@ -193,7 +199,8 @@ final class TicketListApiControllerMotivesTest extends TestCase
             $personRepository->reveal(),
             $motiveRepository->reveal(),
             new MockClock(),
-            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]])
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
+            $userRepository->reveal()
         );
 
         // Create request with non-existent motive
@@ -219,6 +226,7 @@ final class TicketListApiControllerMotivesTest extends TestCase
         $serializer = $this->prophesize(SerializerInterface::class);
         $personRepository = $this->prophesize(PersonRepository::class);
         $motiveRepository = $this->prophesize(MotiveRepository::class);
+        $userRepository = $this->prophesize(UserRepositoryInterface::class);
 
         // Create controller
         $controller = new TicketListApiController(
@@ -229,7 +237,8 @@ final class TicketListApiControllerMotivesTest extends TestCase
             $personRepository->reveal(),
             $motiveRepository->reveal(),
             new MockClock(),
-            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]])
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
+            $userRepository->reveal()
         );
 
         // Create request with non-integer motive parameter
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerTest.php
index 5a9ec3b3d..76e5e6998 100644
--- a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerTest.php
@@ -13,6 +13,7 @@ namespace Chill\TicketBundle\Tests\Controller;
 
 use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
 use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Serializer\Model\Collection;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Repository\PersonRepository;
@@ -68,6 +69,7 @@ final class TicketListApiControllerTest extends TestCase
 
         $personRepository = $this->prophesize(PersonRepository::class);
         $motiveRepository = $this->prophesize(MotiveRepository::class);
+        $userRepository = $this->prophesize(UserRepositoryInterface::class);
 
         // Create controller
         $controller = new TicketListApiController(
@@ -78,7 +80,8 @@ final class TicketListApiControllerTest extends TestCase
             $personRepository->reveal(),
             $motiveRepository->reveal(),
             new MockClock(),
-            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]])
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
+            $userRepository->reveal()
         );
 
         // Create request
@@ -127,6 +130,7 @@ final class TicketListApiControllerTest extends TestCase
         $personRepository = $this->prophesize(PersonRepository::class);
         $personRepository->find(123)->willReturn($person);
         $motiveRepository = $this->prophesize(MotiveRepository::class);
+        $userRepository = $this->prophesize(UserRepositoryInterface::class);
 
         // Create controller
         $controller = new TicketListApiController(
@@ -137,7 +141,8 @@ final class TicketListApiControllerTest extends TestCase
             $personRepository->reveal(),
             $motiveRepository->reveal(),
             new MockClock(),
-            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]])
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
+            $userRepository->reveal()
         );
 
         // Create request with person filter
@@ -164,6 +169,7 @@ final class TicketListApiControllerTest extends TestCase
         $serializer = $this->prophesize(SerializerInterface::class);
         $personRepository = $this->prophesize(PersonRepository::class);
         $motiveRepository = $this->prophesize(MotiveRepository::class);
+        $userRepository = $this->prophesize(UserRepositoryInterface::class);
 
         // Create controller
         $controller = new TicketListApiController(
@@ -174,7 +180,8 @@ final class TicketListApiControllerTest extends TestCase
             $personRepository->reveal(),
             $motiveRepository->reveal(),
             new MockClock(),
-            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]])
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
+            $userRepository->reveal()
         );
 
         // Create request
@@ -204,6 +211,7 @@ final class TicketListApiControllerTest extends TestCase
         $personRepository = $this->prophesize(PersonRepository::class);
         $personRepository->find(123)->willReturn($person);
         $motiveRepository = $this->prophesize(MotiveRepository::class);
+        $userRepository = $this->prophesize(UserRepositoryInterface::class);
 
         // Create controller
         $controller = new TicketListApiController(
@@ -214,7 +222,8 @@ final class TicketListApiControllerTest extends TestCase
             $personRepository->reveal(),
             $motiveRepository->reveal(),
             new MockClock(),
-            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]])
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
+            $userRepository->reveal()
         );
 
         // Create request with person filter
diff --git a/src/Bundle/ChillTicketBundle/tests/Repository/TicketACLAwareRepositoryTest.php b/src/Bundle/ChillTicketBundle/tests/Repository/TicketACLAwareRepositoryTest.php
index 5156f7de5..ef81f5058 100644
--- a/src/Bundle/ChillTicketBundle/tests/Repository/TicketACLAwareRepositoryTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Repository/TicketACLAwareRepositoryTest.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\TicketBundle\Tests\Repository;
 
+use Chill\MainBundle\Entity\User;
 use Chill\PersonBundle\DataFixtures\Helper\RandomPersonHelperTrait;
 use Chill\TicketBundle\Entity\EmergencyStatusEnum;
 use Chill\TicketBundle\Entity\Motive;
@@ -123,4 +124,19 @@ class TicketACLAwareRepositoryTest extends KernelTestCase
 
         self::assertIsArray($actual);
     }
+
+    public function testFindByAddressee(): void
+    {
+        $users = $this->entityManager->createQuery('SELECT u FROM '.User::class.' u')
+            ->setMaxResults(2)
+            ->getResult();
+
+        if ([] === $users) {
+            throw new \UnexpectedValueException('No users found');
+        }
+
+        $actual = $this->repository->findTickets(['byAddressee' => $users]);
+
+        self::assertIsArray($actual);
+    }
 }

From 1a66a9e86401ceacd7083f5259f2d08cb4c8bec1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 18 Jul 2025 14:55:12 +0000
Subject: [PATCH 154/283] [Ticket]  Add documents to Motive

---
 config/packages/chill_doc_store.yaml          |   2 +-
 .../StoredObjectVersionNormalizer.php         |  10 +-
 .../Handler/ReplaceMotiveCommandHandler.php   |   8 +-
 .../Controller/ReplaceMotiveController.php    |   2 +-
 .../src/DataFixtures/ORM/LoadMotives.php      | 107 ++++++++++------
 .../src/DataFixtures/ORM/docs/peloton_1.pdf   | Bin 0 -> 194946 bytes
 .../src/DataFixtures/ORM/docs/peloton_2.pdf   | Bin 0 -> 180212 bytes
 .../src/DataFixtures/ORM/docs/schema_1.png    | Bin 0 -> 56408 bytes
 .../ChillTicketBundle/src/Entity/Motive.php   |  34 +++++
 .../src/Repository/MotiveRepository.php       |  16 ++-
 .../MotiveStoredObjectVoter.php               |  33 +++++
 .../src/config/services.yaml                  |   3 +
 .../src/migrations/Version20250718124651.php  |  51 ++++++++
 .../ReplaceMotiveControllerTest.php           | 119 +++++++-----------
 14 files changed, 264 insertions(+), 121 deletions(-)
 create mode 100644 src/Bundle/ChillTicketBundle/src/DataFixtures/ORM/docs/peloton_1.pdf
 create mode 100644 src/Bundle/ChillTicketBundle/src/DataFixtures/ORM/docs/peloton_2.pdf
 create mode 100644 src/Bundle/ChillTicketBundle/src/DataFixtures/ORM/docs/schema_1.png
 create mode 100644 src/Bundle/ChillTicketBundle/src/Security/Authorization/StoredObjectVoter/MotiveStoredObjectVoter.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/migrations/Version20250718124651.php

diff --git a/config/packages/chill_doc_store.yaml b/config/packages/chill_doc_store.yaml
index eb7f6be01..2182b17cc 100644
--- a/config/packages/chill_doc_store.yaml
+++ b/config/packages/chill_doc_store.yaml
@@ -1,5 +1,5 @@
 chill_doc_store:
-    use_driver: openstack
+    use_driver: local_storage
     local_storage:
         storage_path: '%kernel.project_dir%/var/storage'
     openstack:
diff --git a/src/Bundle/ChillDocStoreBundle/Serializer/Normalizer/StoredObjectVersionNormalizer.php b/src/Bundle/ChillDocStoreBundle/Serializer/Normalizer/StoredObjectVersionNormalizer.php
index 4b18989cb..aa35f2052 100644
--- a/src/Bundle/ChillDocStoreBundle/Serializer/Normalizer/StoredObjectVersionNormalizer.php
+++ b/src/Bundle/ChillDocStoreBundle/Serializer/Normalizer/StoredObjectVersionNormalizer.php
@@ -43,11 +43,17 @@ class StoredObjectVersionNormalizer implements NormalizerInterface, NormalizerAw
             'createdBy' => $this->normalizer->normalize($object->getCreatedBy(), $format, [...$context, UserNormalizer::AT_DATE => $object->getCreatedAt()]),
         ];
 
-        if (in_array(self::WITH_POINT_IN_TIMES_CONTEXT, $context[AbstractNormalizer::GROUPS] ?? [], true)) {
+        $normalizationGroups = $context[AbstractNormalizer::GROUPS] ?? [];
+
+        if (is_string($normalizationGroups)) {
+            $normalizationGroups = [$normalizationGroups];
+        }
+
+        if (in_array(self::WITH_POINT_IN_TIMES_CONTEXT, $normalizationGroups, true)) {
             $data['point-in-times'] = $this->normalizer->normalize($object->getPointInTimes(), $format, $context);
         }
 
-        if (in_array(self::WITH_RESTORED_CONTEXT, $context[AbstractNormalizer::GROUPS] ?? [], true)) {
+        if (in_array(self::WITH_RESTORED_CONTEXT, $normalizationGroups, true)) {
             $data['from-restored'] = $this->normalizer->normalize($object->getCreatedFrom(), $format, [AbstractNormalizer::GROUPS => ['read']]);
         }
 
diff --git a/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/ReplaceMotiveCommandHandler.php b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/ReplaceMotiveCommandHandler.php
index 5ad6eed05..a39186efe 100644
--- a/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/ReplaceMotiveCommandHandler.php
+++ b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/ReplaceMotiveCommandHandler.php
@@ -18,12 +18,12 @@ use Chill\TicketBundle\Entity\Ticket;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Clock\ClockInterface;
 
-final readonly class ReplaceMotiveCommandHandler
+class ReplaceMotiveCommandHandler
 {
     public function __construct(
-        private ClockInterface $clock,
-        private EntityManagerInterface $entityManager,
-        private ChangeEmergencyStateCommandHandler $changeEmergencyStateCommandHandler,
+        private readonly ClockInterface $clock,
+        private readonly EntityManagerInterface $entityManager,
+        private readonly ChangeEmergencyStateCommandHandler $changeEmergencyStateCommandHandler,
     ) {}
 
     public function handle(Ticket $ticket, ReplaceMotiveCommand $command): void
diff --git a/src/Bundle/ChillTicketBundle/src/Controller/ReplaceMotiveController.php b/src/Bundle/ChillTicketBundle/src/Controller/ReplaceMotiveController.php
index 8af2773e8..3074ee6c1 100644
--- a/src/Bundle/ChillTicketBundle/src/Controller/ReplaceMotiveController.php
+++ b/src/Bundle/ChillTicketBundle/src/Controller/ReplaceMotiveController.php
@@ -60,7 +60,7 @@ final readonly class ReplaceMotiveController
         $this->entityManager->flush();
 
         return new JsonResponse(
-            $this->serializer->serialize($ticket, 'json', ['groups' => 'read']),
+            $this->serializer->serialize($ticket, 'json', ['groups' => ['read']]),
             Response::HTTP_CREATED,
             [],
             true
diff --git a/src/Bundle/ChillTicketBundle/src/DataFixtures/ORM/LoadMotives.php b/src/Bundle/ChillTicketBundle/src/DataFixtures/ORM/LoadMotives.php
index 965787059..ff65ea016 100644
--- a/src/Bundle/ChillTicketBundle/src/DataFixtures/ORM/LoadMotives.php
+++ b/src/Bundle/ChillTicketBundle/src/DataFixtures/ORM/LoadMotives.php
@@ -11,6 +11,8 @@ declare(strict_types=1);
 
 namespace Chill\TicketBundle\DataFixtures\ORM;
 
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\DocStoreBundle\Service\StoredObjectManagerInterface;
 use Chill\TicketBundle\Entity\EmergencyStatusEnum;
 use Chill\TicketBundle\Entity\Motive;
 use Doctrine\Bundle\FixturesBundle\Fixture;
@@ -19,6 +21,8 @@ use Doctrine\Persistence\ObjectManager;
 
 final class LoadMotives extends Fixture implements FixtureGroupInterface
 {
+    public function __construct(private readonly StoredObjectManagerInterface $storedObjectManager) {}
+
     public static function getGroups(): array
     {
         return ['ticket'];
@@ -26,6 +30,12 @@ final class LoadMotives extends Fixture implements FixtureGroupInterface
 
     public function load(ObjectManager $manager)
     {
+        $docs = [
+            ['label' => '🌙 De 21h à 07h du matin', 'path' => __DIR__.'/docs/peloton_1.pdf'],
+            ['label' => '☀️ De 07h à 21h', 'path' => __DIR__.'/docs/peloton_2.pdf'],
+            ['label' => 'Dimanche et jours fériés', 'path' => __DIR__.'/docs/schema_1.png'],
+        ];
+
         foreach (explode("\n", self::MOTIVES) as $row) {
             if ('' === trim($row)) {
                 continue;
@@ -44,7 +54,26 @@ final class LoadMotives extends Fixture implements FixtureGroupInterface
                 default => throw new \UnexpectedValueException('Unexpected value'),
             });
 
-            foreach (array_slice($data, 2) as $supplementaryComment) {
+            $numberOfDocs = (int) $data[2];
+            for ($i = 1; $i <= $numberOfDocs; ++$i) {
+                $doc = $docs[$i - 1];
+                $storedObject = new StoredObject();
+                $storedObject->setTitle($doc['label']);
+
+                $content = file_get_contents($doc['path']);
+                $contentType = match (substr($doc['path'], -3, 3)) {
+                    'pdf' => 'application/pdf',
+                    'png' => 'image/png',
+                    default => throw new \UnexpectedValueException('Not supported content type here'),
+                };
+                $this->storedObjectManager->write($storedObject, $content, $contentType);
+
+                $motive->addStoredObject($storedObject);
+                $manager->persist($storedObject);
+            }
+
+
+            foreach (array_slice($data, 3) as $supplementaryComment) {
                 if ('' !== trim((string) $supplementaryComment)) {
                     $motive->addSupplementaryComment(['label' => trim((string) $supplementaryComment)]);
                 }
@@ -56,43 +85,43 @@ final class LoadMotives extends Fixture implements FixtureGroupInterface
     }
 
     private const MOTIVES = <<<'CSV'
-        "Coordonnées",false,"Nouvelles coordonnées",
-        "Horaire de passage",false,
-        "Retard de livraison",false,
-        "Erreur de livraison",false,
-        "Colis incomplet",false,
-        "MATLOC",false,
-        "Retard DASRI",false,
-        "Planning d'astreintes",false,
-        "Planning des tournées",false,
-        "Contrôle pompe",true,
-        "Changement de rendez-vous",false,"Date du nouveau rendez-vous","Lieu du nouveau rendez-vous",
-        "Renseignement facturation/prestation",false,
-        "Décès patient",false,"Date et heures du décès","Autorisation préalable du médecin pour le décès",
-        "Demande de prise en charge",false,
-        "Information absence",false,
-        "Demande bulletin de situation",false,
-        "Difficultés accès logement",false,
-        "Déplacement inutile",false,
-        "Problème de prélèvement/de commande",false,
-        "Parc auto",false,
-        "Demande d'admission",false,
-        "Retrait de matériel au domicile",false,
-        "Comptes-rendus",false,
-        "Démarchage commercial",false,
-        "Demande de transport",false,
-        "Demande laboratoire",false,
-        "Demande admission",false,
-        "Suivi de prise en charge",false,
-        "Mauvaise adresse",false,
-        "Patient absent",false,
-        "Annulation",false,
-        "Colis perdu",false,
-        "Changement de rendez-vous",false,
-        "Coordination interservices",false,
-        "Problème de substitution produits",true,
-        "Problème ordonnance",false,
-        "Réclamations facture",false,"Numéro de facture concerné",
-        "Préparation urgente",true,
+        "Coordonnées",false,"3","Nouvelles coordonnées",
+        "Horaire de passage",false,"0",
+        "Retard de livraison",false,"0",
+        "Erreur de livraison",false,"0",
+        "Colis incomplet",false,"0",
+        "MATLOC",false,"0",
+        "Retard DASRI",false,"1",
+        "Planning d'astreintes",false,"0",
+        "Planning des tournées",false,"0",
+        "Contrôle pompe",true,"0",
+        "Changement de rendez-vous",false,"0","Date du nouveau rendez-vous","Lieu du nouveau rendez-vous",
+        "Renseignement facturation/prestation",false,"0",
+        "Décès patient",false,"0","Date et heures du décès","Autorisation préalable du médecin pour le décès",
+        "Demande de prise en charge",false,"0",
+        "Information absence",false,"0",
+        "Demande bulletin de situation",false,"0",
+        "Difficultés accès logement",false,"0",
+        "Déplacement inutile",false,"0",
+        "Problème de prélèvement/de commande",false,"0",
+        "Parc auto",false,"0",
+        "Demande d'admission",false,"0",
+        "Retrait de matériel au domicile",false,"0",
+        "Comptes-rendus",false,"0",
+        "Démarchage commercial",false,"0",
+        "Demande de transport",false,"0",
+        "Demande laboratoire",false,"0",
+        "Demande admission",false,"0",
+        "Suivi de prise en charge",false,"0",
+        "Mauvaise adresse",false,"0",
+        "Patient absent",false,"0",
+        "Annulation",false,"0",
+        "Colis perdu",false,"0",
+        "Changement de rendez-vous",false,"0",
+        "Coordination interservices",false,"0",
+        "Problème de substitution produits",true,"0",
+        "Problème ordonnance",false,"3",
+        "Réclamations facture",false,"0","Numéro de facture concerné",
+        "Préparation urgente",true,"3",
         CSV;
 }
diff --git a/src/Bundle/ChillTicketBundle/src/DataFixtures/ORM/docs/peloton_1.pdf b/src/Bundle/ChillTicketBundle/src/DataFixtures/ORM/docs/peloton_1.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..7b393d6e2195ddd2c803e2393d57fe1bde9d119e
GIT binary patch
literal 194946
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%0A-qxvH_7h<-J
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

literal 0
HcmV?d00001

diff --git a/src/Bundle/ChillTicketBundle/src/DataFixtures/ORM/docs/peloton_2.pdf b/src/Bundle/ChillTicketBundle/src/DataFixtures/ORM/docs/peloton_2.pdf
new file mode 100644
index 0000000000000000000000000000000000000000..7a6e626a48bb834034b594bcc19635e6b484afe0
GIT binary patch
literal 180212
zcmbrFWl$Vnx9$fL5}e>JL4&&w65JuUySp=!U?E6wcXxLPHaLU3yGw9)yZqnx-dpEX
zojSK}oexvBr`PVDz1Qxw*ZR%VO{F9z!N|(QiAYtrb$*V>M#e(sU~G*D1R^r4f*sAs
zm_?0Tjcgq(5Si7@oL#IO?8%r}DcHn05t)^YEX-WUINnZBe*0o&W@097Z|*?G`R@bj
zR%RY%&PvW^=4Q@j_9kyVx&CdCGqSfJ`(kEKi^#0#=4xwY|7PO;mq}0%(ahfTpI>MF
zkHe6#vUN3cCS#VcHF7l*Gc$28HA7^UGqbmFwIt)>Vdp@6JI}?{+04ie1rd}6)zfj&
zZHV^Ph=1t@j^>3>EHl&MHrNii^P2Jh$um{i+5SrZP2WyRD>{Fh`_Rj$<7Tcgt#_E0
zvL4tCwES`f_>0s`7~X3};`MU!e5f&I09o@qe@;yG0eWU}Sy#qQ_7*jsFC6EtQCi&e
zI;`peJ<l@RmmuJ~^$Bjp=iS6L62b9Q0~yR?Ka`rb-GfT++p|tZG*a8PoKaHZ95!0J
zx&;etF1~DH?3^)JMHrRWWBQ40DE7qp@yw+GQ`hc!Won?=<=_3KJqNB#ubaP*%<W!~
zZ;@?3UUm~lZZ=02GBZv_$G8oEOtyZ~`O1ia-wie|LoNKbY+46?h@V+hcCe__RueE-
zH#FRBA`%}6=bgw`U0Ic{Kpq3&^08$P?jC8@-UfZCemXgOTC>``vc@&`a(33KF-9G2
zNAf(+I}s1UX$rPiyjTo6>I!^uP+jF|<(_q|CUrBk{wNk}$I)~&o~~%5NQ|F<J81Wt
z(Biki93YYSlk(ycvheh$8KVV)1Denem|2@VuyQ;vKYltc@$@AvjI?JtQS!(1yxNlF
zd67XT^1UXrh*}HA0n>+5V5lSgm%s(f_DH8`<X9=zoIj7Ynyk&`MaJ~N1EFKrRquJL
zS}y_qqj$wGs(A-xHv?;a^X!<y<xBcUa*Hn#J9S=>7dDft1|EwJYe%DH`HB@T62p4O
zp2d1?U?29>4OLq{!dqVZoa!H^i3^^8rh@VKYONmqG?kXxF`w_FF4W*doD@gbsr|TU
zI?^nAM#7U`oAW=b1Dk<)l~N?x$XEOiz2|=ggHVwed1?!$Ur-Fv{6Mk_alPM~1e$(|
zZ(5x>XJ5zs?P|}7Mz;7aB*KgoW#x61@mr%Og*Biwr}k-OW|YlGd_Umj)y?BqcSLME
zqu5I>NZgp)%sqfWFs*<m1%n!fB@Uly4OzZGdhEbyHubDvz}0%G$TH`5W?<zXboddB
zF5u^BAX1MMDs<{ouJ4%b`z~1ZvUg82<CY>t*PNHl`X<KQgqXKhuEDd_vcr@oY?VkO
z4;drtk=tLUZ<Z=gi`FHJPy(=4nX=kSc}EN>`Z4~jtzm`M8Hz<mlV?c7Pu)a!v55&J
zh;-(`rd6mXPlu`w9y;QsguSz#b$Z?BQLQyP-J*^L{Sq*~K0NJjd=-0V^T(&DbSR}$
zzB*Z7#LEJgH;7pz2<MYGbZXJSJ$aXp(B^z#^zSiR3wxYHT5i3-%$MY-`KH)RmHpor
zV;d=JC!@Oejg7#cfBR9QnV3I0hE#W9HTYK!H;#F5jU%h>ZnDe9;`?aIi5*U1ZtAa<
z0xTo4sgdB<{N@aVju?z1W}Nt)6$h6oY9ok@Qu>0hJ#LIHkDy~qXbuW2HKQ1|-)0m#
z8Op^kH~ZU6G20gLWf8q`zATb6GIz907$+yZYZv*NOQkH;6iKvcA#*r3Ha2WA_`p2M
zj{R)HbbvQ#5IY(!d0#!bFY8B(_0-gvIGC2n`;aOmG^fwyJxsi;R}yrY6!2k$wPp~H
z#5k985cbcSd+*fuv*9x1<RE>iYC=JnRF?yzUo8p(U2}U}IM=_GKDyZ-`Yz=FxZ*Ar
zjU7WuR@W@~cW%KrglVynDd|%~oSsuK##>bwt=xk0i>Xw{#`WH)LRTM}pGjo<BM)Og
zu_@NxLY+8}^xsjW$`LQ19a4-2(xg9bvNKz;1Yu~-tMor+sAyHnzMtv44}?Y>hNhQc
zdIf$$pu*u>{jtpyi@Hr8?dgi;J-3<9V67!K&yD4lVAg>4(TqLrSdf~Ddt1_Xwd*li
z`FN$pYt+S8VeI{HmB;LHywn~?O;qygL#x(P1i3b9a~xclxZV65r+g#WP}PWncv=}*
zx-M({Phdt#U(J0ol&`qvr>?mKjMJ+#I2ijdtkanHnMxRa`Pl=8&DY4nu;C~k<bcX@
z0=K$(HXQmyi8do)DHPthEH%Tw)2?NH1lrG<2Rd4y=TcauY#64Gz7>FWMKFmWUq>O>
zH^Eox52jwXu?3(eIPWUy-QoC!wTL<Zwk5k0_{B#0Rc=8FVK}Zn&$htUv<Y+iOC$`s
zq?)G^$w0hP-?nK9omdEjJkoO?A1RS7WJXnFey_(@x0kmHVu}LNnSi6kB-H5p3Mfit
zY1bB=BTkqNkQvFM$6!m0MxMMbd5Rw|me?^p$UR@IMxOknEJI*i8tAS@x5yxmuBT;H
z_TKRquVj$f&ngdC9>%b#K1k%(lvCfEq%`An4V9q*?_!7XIr;Evv|jj!G!6|%!@RG*
z`o73}3)2rE4ATMise(SJb9dweKu=b_ENCpE_&Q!SLESZWT{dDwFxsK&_IL%(R7Qqd
zDU7_w4pIQ)P#4Uo=bBGJ1rY-`bn6%Z*(o<NH{|-V?4+ML*qDgI=o3G&=BE*@MKPIk
z{M1Dp*TwXP2*~(yspR738PLDcV>y@g>2K_aRRQphNEPH6FuE14g6ne7rM^Y@6=|PP
z&OM}O&l>GDW*@QP=Yv)({RIj1C-|^*@))pm;H!$mU{Ekw<<Bijlnu2-r_XAUvuIh^
z;Ci`v#m9Vm{TKVPhnXy`jimh~LIrsr>8g#5ij{L^0YqpimLfTJoHB)~)hH5QWzW*!
z^i<uoFqi-V^{Y9oYmc^@`<kf$e!X0=ArLT~FyafBSicV0W+7|g&Svj;oTPs!ChDLg
zK&SoF40JR!R91(%+3sc?S%M4(GhneAg@6Flu84c|(&T9%nQ9HNPID3WPWYP@rqiG?
zpkI(0<vsAdp9?_s@lP`h6OwP&b}?0oBML&&LzEYP7~^_xd>h!k$aj$&zh@dlkBS>$
zN=mUpM*fk3w1S!qY2DfQeJKKSG&-4@@aK=8mEm~&MIsUyW)j6$v)*^80hZAQ|0Lp<
z9!}Q$P^{_4X{p6FMC$PHr3K8v@LYWbaKa4Ml=8TQ#~YaXW&(8GTZzU4_Ng$8sofmR
zNSltnH+eezSa5D?pwa%O-t<m5%9{EkfKjTv%y1BqbBHNBP-~OHA2H`|q->1!LvD;I
zBI*}}isGYOEF>7)I6n&C5aqgWoZXdOG`?ugAb7)HM8dE|WI;)`ydSgQsiNxHWKq7|
zp9BHRY0Q2UDi?6XpR|f&ZOpj-s=m`MDqsSv!OSq|eSA-k{4T-x8HP-3;=Qk_cp+fh
zShtf?D5eXhqvdDSZ%y0xMI2`spVGp8l^&9iC$JF|3aqclGJVnG0FnI)gGm%7fG5f=
zCsX2SSl@9N^KrO7Ca3WPU94d_-yFq?cQOG<+W6l3MMVMX!ok<?zcdj}!K|VM8luTV
zYe4>P*nngMq7?XdjOhwEdR5B2QZ+?HR4WVc6>OF5a7$e)Se>89ENS^RvNiv71z>Mr
zcHr>>yAI<&OMLH_q3T!o8%{sUg%-jAa6bQQtt0{a_p9DVz@s2@8D-%+VY>9i&WIXZ
z_xG|C!sh_Hm;+4d)ZPcxse*n%{P4>;9t(wS-T36?g`a{1I0G@X`Wmnd+pNI>(bAnT
z>yt2KA3l3d(KPdnbbpl#2P7$XYXE{p!*~W+5z_$xg$jBU054KK+juY;78-z24HICJ
zx|w4-k~gc18oQW#G;E5ad(&l)7v*opDcsOHo2O%OSi9sPy2uFmHsd8s(flL0SN)bE
z{QSf+#j=^+y6bSXB)FlamhScBM5#A#g_s=hhesH5`;&X2^}}#M>vRardd%6fd~LIX
zL-Sm#&(tW)`VR6WhbO?XY|%VB7mQf;w>mf|ixOvy<XhAUZ_3|Tw$ORB<y&bQS6^&Q
zA+%PUY#6}T&~+GJo<X4D@Xi;wE9yShlX{%5$nSFCT>y?w;{%$WR!Dt#EC+7>l?Uj=
ziRB#r{b_Z-KbhGS{zf-L^$*W03Q7&%?No5VlWRF+3~QGvczmU9A;IO|zv*uZX%CvU
z^Zb6cB2gu|XBQR_OQ%h?tUZCbLExo>_4ochi{Jd6iJRH=54Abna$SoAf}FY;F@~Sx
zd5Ry**<s5pSvT>VaHa8<l!B%KiRlT;E^KzdG|e6`JA>@OLH}%61`|Fz@7Eu9-T>Q=
zjYgxlEK~qxG}wzq1}7o~3}Fud=IYj`xy?9|9%2TLs524X>x-|ps@lKfB|q!<dj+t<
zHj-&YmYAcZI*Roh^vv~jP6t2%>sCh2aAtm|=^~M;pDY)antxVldP3gkiD-tQD48rG
z81`NxXO6rh^AILT6wdZfR8bmQ&~LIvgv^q?<*%&ePrKhyEqW%0FMG(kbZa1Nd-sCK
zZeU#M4i?83LsKuEJc5O-I!necG&8gu-*{zn0xGcoz#G<^>iXA<bC8!Yc3~3e_0YSv
zA^XC+nuOZaNB{b=Nv7dh`d%2l*@#mOy{%dzbc83h8DULR<$bIRLq%?jZ>NPW>iLeC
zd^qzpUc(I3dkfx|<-s|$$_b;M7Ca(|GraLBamKevk=tHqSfN7Ph*s7&>Admh?<Scb
zy%hopbQkQH=0UC;@nJLG(NpWSJ1m!aD|FQ(0PzQ3Ci-65zkDpt!^}*GuhRhIiyO0I
zRWCBdZ(4|B4Fm2m?kK5xAI0dW6Hc-6jrat|zw#D?^#d%|XgH?;Ba{%$!aA{>w=K7~
zjn^G5iOPB{%^pdBQ8_ni+=N3V#sY)o+6gSb3S6rS%|;)4pS#Y^^XtUO1{<J_QP~G5
za?zL^FVDKHv-`<H@pm3WeZFbjF8+5+ko3@C#)oef6X|^$KEdOK(+$!|l$pl$=Q4Hg
zHF>Iv5o-1qe=C43$Pwzy4vlk4?af?EY<>k7FYffXi}N9v$L(;M7{>uskK%I>_6<}|
zEyDd4IOf;5tZTtd`_kYMol3jZUsh9IQh!skRAkp<kVUi019>UCMN&e;)oVl%s#sQv
z0~j9>RWhUC#Vs&r{}g90ML5ENG!tz%H`?p|Vr}L42@i=Tzc&I*d*Y}t4Gk|&=dcM~
zYvr+jF5gV;C)fcmaPjVPk%l$Gtz+{7Z29rW`cjh$VnT`lJh2to+gXt?+52nD1tF|c
zv_!_ym8=tzUv3#t5_Bks0VgFG;}HG987pCyuh&>WX8(I%3B>|FfN^ACajQqU0QOOw
zG`*YrL8sCFh<}C#!(ABeQZiY8V*+{+mLeeIdm)aSbIQZESunchp|ej;DGb3(x%gi3
z^+HpHREy>ZUVV#vcl*BTyi?!R<joe|ug6}Ngtfmb$Y%YQ@!s7be}qq&Mtfl>BAH>a
z!|1>~nf7P5%TZMLZu)a3PVY%35inmoHu-+(LHbI%X6_q#{)9EA^XH+)lY68M%&eN(
zRF2&rh4MgR8%)DOo4CI_n-RHAvI#|KjL`t90vOCZTdolRnQen*u<>c;GAgyqb`b+%
z)t>ZHR67E(Z$vQs7M>C&Uho!nn6Vy|dK5=g!-hu$@HfK2M0Jod)z<V~jJ`b8ERzw7
z7CC2Iem9-g$}YhM?0OV?T8bvJ_NVm47>(p{SOD%4f{m{N*k)48Cf$9PaFHqFTh1K*
z=JKqNSS*H0)&YoTJ4N{CVGSbmIlkPspAM^~w9{D~N}=&xj-m>NNRql$5Okq%1z)jn
zN2nnC0VbAK6#*b!al}wh-6%qAT1Y)DXD=H1OFf2ZN}kYEF@I34banpZnX}V1Ox`uU
z;9Ej2LIg9x@Ny}QI2m_cwdaFBtUeLXSsJ;u#zxwNlC)?x94|ewt*rIp@}XRV?tt9F
zx;8zu&%}lvQ37(&ie2GOks|L&NA}3}Z8m}E3(qpV+qOZG8J;#5$EpaajhTGCl{;?<
z5SNde<0rd0hP<YP3Y{#6s2NeKJf+4%o?2SZChT216?^^#27A%6f^rW_4y&i@MuMfx
zj#)CySC)!Ec8u`Bq+AEuT4k`lc|9uhJ60l7l=7irXX&+wkaiJ~ng`voGJO37(0qZO
zQ0kC9mVnu1SWPF=WM<zBKHOyuttySWfn@y}3|j^`$dR{)6geJo(9^0MPjJY32`YJ?
zji}BLwAHRQ+fQ>$8dXF;J8g;27Ao8UCZ|hj9K=^m$g<|>3Ye|2J2XqRPgF}`QLVAN
zG3!NSU5B)xj$-AoJVj=UPPytsb?<~!kth?cmqGgb1Kc@5Ig@HKZHIT+s)tI*Ztt}h
zq_U_&jMn*@tbH)t>f;dH;B-U3TdRH}<*-I{7dWu?#XLZ4#JQd>${``BuPDV<sHe-C
zg;n}G#DPOnpMdyrP|Jc%Gsrzh9WJbXUSfeE3BW`W(Q~#VmRiK`@jBn5wtATi*6p&+
z=<?e#)c{WfnPyZEA|tv)2B$n<5fO<t@peNDPNslf&X;=Du{faMCo<8hxmw@Lu#aO+
zaZ^J5@H4WBL|L(e_)0d;RIh-$yf(WmMv~sD#vQY(8>o$ETN4~1IQ=v4?nfqh{E#G$
zgvy}A@7_J}*F)*wmiAhzydqz9*J0;MFP?%tKqX>@$1_ax{Q8L*g-q)lv#?GcEo*hY
z%+421BpX5=vuDIk%L8>4{af#l{LNgowq3R?7u`sPCwJGgKdbL%8UJuMZwxf=XYI0X
zYq?}eeh25A){rXN(uGG%z7;SETSM<{w7DgVHxHMAdx6L3ZEdbcM?@;uNRuF7aG60m
z%dVz+cXBHcdH!KFlMf;G1W!vCz#dtqi(cTg&EF;CvvKHkuJp1g!_(G-ZDcZpvgsxs
z4Ic0m+Omu9!VU!M;<j&C<+rpZxP_t5Vd5_E>kw*bo1b2fo<9<LcrPMaMj8mQ;{R}f
z?66(x!>(yTO(obOp4b8lX(LEA4h^1hUw#a{wzf18W8$$}ESVz!1B7EX<hB{wUK^pn
zg1O|rt8-wO1>Vz#hRWgdB^)2Ix^tLHZAe?GlDSfgf7umqmmjSQxy@PB1!e<{A6FWw
zyF5p%rT0=nEN}7go%}={>{pzLbH;8_^33S3mSTP&xjq{LY~nkd#x5jEQ2E)&$?$#4
zW4TFJ*pB=eT-OOu*99JvCVcPHh3k<9xYvk;8%n$(2)=&Oo+7Vo7SwXOf5K|SEbLO~
zwp}D`5|NW#J+FqEC=k;M@ytBVpl{)g12<KwlJA|*V4F{?i@+lV4@;ws{EAMJf6LXO
z+NVJ}5Yi)@aU<38F<=R<haM@Bi3H#I%N+-#6Bv2StBic=(OD(AOT&vLPyPAkV&rm=
z0Bv$ar)l#Le|3>}(g24F$X-`7^%Q|^Aq#)!jB=fJT_qLH7**TVNGxD7tlxKm{eoY)
zH8?q1w(f??irc^*bWa(k-p(F*dd_sFQjHp%SCn0okQqJ!styy>a1;wlmilF(auV)i
zb2oeRBsC?bO<K_6GS2b~zpsB&z}fm<ZW&h46v?Q+F64Vl=+h!4b3PH9CHG@C=PG7q
zq=QSVtbd;yYVZq&m5}z;ebuvp5^8(!b<oC<g<vo#TeYr2a_$~hG>QI|rtoc>V7N5v
zGm;#k4~?jJ4R^^BkjH)wq`5+Bj(#S?Su^|7rzK0t6U6-rx;@+*gEs)SC+~9VOA8Hp
z@;LPGc+w5j!BT$w9n^kK);P2z$**nm{2L2SAK`W>(qWy^XC+x`ZEbjw;0J$b_r`ty
z>OpsPT~KYWqbK>m6VQ!m(;KZb@%?3~TdXP51%8Plwf#<6nXG5;<5Unfvo|^C(7rZg
zeL(Shf$l~9apg-0W(#-ZD?zG(HxtY*GR?A|ikFbHc&nR@-6heKp6e~<K(E;DeEfXO
zl&6}qWs=|8#zq_c=oZi-{A4g)8^iVbDt8V>@{eGAC?=&y>x<8LC%y^gb~mk5iD(#m
zOs4P@QbZ-F<1Y6p>b=T?&13o}gAcD;P^K^1duwIAHm2Z_z(}KrRVqVyL)DZeo9750
zitVk@{bS}kghZqam^C7a{@VAIu^$8??9wG)P@2X;M2mteJ5|r@WxGo{QH`S^4_`2q
zXv4l!M?9kQ0uW7zGxj;`Wj<;;zsK5$G5PW}Kq3!)<YAvQG0{>-fNGP?U@oce#^PzW
z|1e!Peu+F7?YCt$;s_;GVo8xYE-dK}u3M^)X<bnC0WDjfm6NhAe6$DCWTKblLBu;^
zA*j2-GGF++t;>0m^2qR8`P1+Qs;zq%q4=(Yr!k~ES;%cfVfP$0fIiXH;V7Yn^m6`+
z5qQMc<Oh}ZE!ZQ$L=*jqDY7lXf)x?eRnCef=|Xe5%%oK9t=>n~7Tw}IwrtEZEA>v7
zoye^HZcTvbQZ>z<XZL(T2f2?AKO+B5RPkGBnp=2w)o9Q$cLSMYI(w1qL(I92cwfxp
zcifQXvZ~Lnzqw79Lk)yIVX-^)?!m5}g5UG?4tRT>eo)dFO^+=4ZDMZL-VIK$YA8gc
zXX5L5D|PwD1ZK^YKSjPAEZ>hs#A47(LASKKp2OQTJo#;4)=m|DBbmonDSUX~+Wk)l
zBzYbiIKk-mH1K!2bLZ}R1a*c%X5VIM)>kf8J7C)qhw1pMJzDU<U$>$gCI7tKMctI0
z>d~w<v+%BO79_j0R`gVro<cRoT6{g8<7qO;lKVdNrLI^<+<tNpVY;NWZN_&6br~Y)
zxwRBGtvrY-^m00+?)a>`m)l~To_I&D7&QuE`*PRG&Sy9(9NMi&{0>aV^ro2U!K5T)
z5aM=m2-ETI1H<TXIygRJG$qWX8GdHQo|iTHF|p^Yy2GV!olegxi%wplN$PY4H%4uS
z*}}7khSv$p^Yu&oom0A&vO;yyy2h17b$rtmMlGVltjS;3baniy&OU@q#Bh(&6KR0{
zlDLykM5a_(?O%K?I>oB?i&M$fO~VQU3mQvl4dRMrlBK0~NgdqZyy0zu;-2IWHiHD=
zL=f4)8X2E$y#4plpY@R%C4)h^75G0fH48WD`UEce+Pms~PYcsW8nMT9F@he6E^*+B
z=zkvi1PwRrB?QVI0w>^>WA+FeBG$4Pb^>m7Ajx5#m+bOgA-m8;iyvyGH?mI_nBsld
zj!k#eaSgT16L~i-^i0=@mUjY-mAC`84vSYBR%c}&8<@<zJKd`5Gm|({e31R`-t*Cc
zUdAsZ2k-|)wc7BP<l3PdL8Mf#LX?7WV<`V<UjLS_{*U^_#_}eI{bvzQQ_<Mk%)}Lu
zS;fuR^<T1_wB4KhhRCd8W%?$Aak3yXOPN_&Sh|wE>0!*G4z>=?Dvm}bZ}Od(nY)#V
znX;q^BD08<tBaDEv#5ieql3Mfy(<|HBD1vpo3`fY@Q<`cW^QEb@^(oTc_SAaGIrK~
z%XR;q`o_)9{h!4*6T=SFqvssku9`Ym6vuuv<SH~dL&tJB^7wTb{!^u|U$cL@qr-RT
z!F??w;Y`>7e<(-@3k&<zr{+kBsbqIbO7ZzKZ;>wC*D(9~f(>zVt_TJOhJRTPG)ze2
zz7%Fj=`A_sW0LE^Nq#WOS69d&A|g_CiZ4iS4^3>(qx{bIc}DG1&z_zMZcIf%ws>}_
zziawWDa|qHDF1NRB2I=vzY8{zRiOI(_xBg)=ifHzc$BLzoX!!Hl~nV_)jm;@s+N~j
zNH>+POLbEGvh8DOnn?-3P0{9OVP{vNDqH{E9aC0?cx+}pZ#~P_*U_61bCJMTabaoL
zuQSN<NZx(Jjm*C)5_NQOd4o^2iFf~-q#`7xXS^-Zs9UAcWc<_A9}RP_A^8=Ebcj5g
z-p<Of5+uZ^lXJVHGqPt^x0bmqQAIT;xOB6S{ffwZ{>e|O&yf6AaVo>RuK9%pS`X}8
z7q}ob44Y$_8scApcXMmCrANv$vs8U*Oq^xzyg+Irzh)-kuYV%sr=8!XIkI4bncP1#
zBpX)RIGn@7h<SJ28U<&yK?lFN{4`(SR1#6l>#boVUian`T1G)5Vj|Apy7kZD6LHr#
zZJoBZw!b>nFiI=t_vWOA1~BC`Tph75|0M1T$jYY)Bqb&N9{$DQ7XLKKeq$9tZfu;F
zpi$?D{g_ZVTV8v`V0VUl<mwXt@bv3XwUy`7)B6?Cj~eIpo`yP0mDvtbc_wcQ;XzYf
zF_~Ju!bh1B8yl;78?{YmQ>kRbFBv)tcSlT7b5r0Y9hy@@0FL-Psb)Rf#<cpAt)}J^
zG@<dIQ4aKQ?&`x#AJiGUg%$k_ZB<Mv4#3uy_S>i1$HqN&p`*$-E84`<t(bI!cf7g6
zhJK6b(1X@o2Z+y+Q+&iFKnWBkqOjWD-6kw>u=F=z9armEoD$^K&=m8>iTL@>WX|xT
zhNAbT3<d%%Z3^E9R6sP@EB}8LtN(<_|5vQ?u>ap!<>39F#_E3;oou{poc}pI;}`c6
zu(&Y-Hy+zdKKxoB7(Rg`G*LHkH|a=%vChanl_TP%qLO?1tD<*pUSK?f0rvFtyx1PV
zq){MxR;<u(eaNKF6!hYI(h>A|Ihu==4-pa+^nQJLj-wHJI_nO6y;*WFX!j0(y*uCP
zUu*OF(H(0smJz`1i{kUvDca}i??i~t#kMr4`!917=sZU!eCu<aOZVm8*e%4z=lOcB
zc#!0|kJLxE*|m6YEJNV&a!ly;?L%=&t(YljHlM)_Ic<M^8A;`y`rHaS-`pKZ6?h%t
zUR!Q-+L|fVP+7eddcIQWU!C*E!P3<;n<rd)x!a2Ld40aM)Vw%Z;WuACo2xYFt3-A?
zUgV@W1-rXsTG<k5^Q7~+S(|8Xxt7v0rzyNmkR$fT?TLK-Z?NP`qJj7Qvg!8QWLgkt
zy1vq{TH;%G8?<?Xp_qY-XXH^^>Yhz4+g$-jw<-N?C`Z(Oue0SkX)}a3Co3&?iOdEO
zw~6SW&)O%uxU;=Ov(bqjpj<kS-=b^lR73qPo#oVl-$XBXAd-<A=X;qxfraMh&N9kR
zZ*DwIz0!Ddh(RQ&(984f8Z`AYRZ$~A5eYptMIDGMWbeE)7{93(S{Mg}`rMsmgFN8T
zcvk$|dUp+eem3TY40fP`(Dk31T=wiajFf=|%XYRQAN17_#?UQB(-2;t?p@wx>~dyi
z*iFvCxOXUCrqp-ef=7@*V7}e@?7-7Y?GuO{n;Q}5xtBh>$Q^4X%0<g*+do|<Hh8<D
z3Zy&BX;QAFJC!yH*@ybsrwgem#=I!T7U}hoZO!$`eKmkK4iJeuK2K6vLZhb_4DM+3
z;l@qghP{R4eRcM4Sf^l$IP~S_&6(J6oD1!?N>B*WQHDmrdmnFN3Z;1=E9Duvj-t$?
z^}=WiK9BCu=Ccs?RXNE+R%0&;+cPswaQN60zXXGZGXB`n2HaCUwbpzX9sR`JM>G=3
z{$kRMVvUH=5{lv=ZqoZh>Vd=PLby~y@cH&echJBg>(iNa0ph|Xhs<iY`ZbD8t#lxk
zezo=tjH2qAn8FxRm>TgHBP!YPJd#8Kn@#nB(CD#6hGH6#E{kBc5q|ZYdh5X3&z>@C
zaeFPp=(KktNSVzXI|7Sg9eE%hH9Saa*<B1nJmxo#ljZwy(-LQ~ucax&qXygfC7{3u
za^`-M{9G<}XBhALDE>NHHFEzwr-}M8q(Z!Q10>oi`qh<f+O~_7-yPVe6RI7za4LXG
zP(}3V-QZzd3NfY=y?(-sspNUOGQ*KoC;DDW52P?9tOa`uf!UZ5^&A{hTEmrE5{8==
z7_L~4FlI@gVF7(77`l2^ux^DeH7_OSIoOy59a{Kyz6qsaF74*be@H7~vXy{Z1r>_R
z7n4}H`QvKjlJD|BfSfVFu8;BWh0>eK{FHyj&Vl{&x<iv$rOmwVw%tJ0LAbFdQ7zIS
zYXa%^S>yS6Q*CxVztcHw)+4%j9^-Bo^7!*90-GO6pu;_b#Q;)li|(^$EavsxE>|HE
zZ+5858iz3&W2HC`=a1DL)zp$BS#XK#El^12*y;eE^4DGcUidh1Z@G$Cm>ricu;@dD
zI;U}xk*NKw$by$#We!}e?akbUE1v=BV%Gp3*P{&#dwL~W`C|WJcqQDnD>jzV<;aWn
zSIptk`;^%&1>Ttaiz_<rWlOK=8Y@mA<*GF<3Avgn%<M01ycN9Gsh!x0c-C7y6<WN0
zn)8vK?qypqi}KT+oF!;<?nnl*Yx;8ZpiY&Oo3FO(<zFQ9O*cn$y;g(45G)cfe)QC@
z7a}>Uu9ktn_N<s~++{maKD;M-u`hJ2%#dWi1r*w^J6d-Pu;<T{bH?jxm?opn9MsTI
z$6V-bp<M+EvvIdYQvkP3(E#D<e3uS#npF&Yx2!zq;~Hr@yf_qwIV?0$W}_+WYr)$s
zzr8Bixc@;2g=V!3DxArGXQhu6cIKt;(wRzaqCZ6*8YEchf+bz>=)_bC6^4@ld0hUs
z(yvtbF2r^J5W9+PK-2m*>>2Da54q-zfZLG0bWr)8xXInVw1a6asRg%{V1=~|*Q1m7
zc0~H~bt9=pnb=(j>Fw4sw?G^{lsmQ_nGL!(H!)|t>xS8lI%Z$s@T#Ery>_Z6bn+~O
zceQAeXZ|cBNh%i3Oc?^ny>=BET?BPvLIWP0VrO0!dCqHizGm#uXS?x!Z+3x<Qx<P)
zW&9P)5EO9A31Ho#kAKU-#Ma<C?I30kct+r%JjE=xxxejw_ak>ja>WQLqx3nV2r@Qq
z)XNuV3R_Ki@_j=tqkPrJeLBC$9t-8M0JN06X}S7O_vAsrH9d%@L)fS4*50Tr`xt_<
zar=nsY8Dc7d%|ka4w@)+`HC8~nQd1!XT<7F?7ETxi6r)e=V#FQlVFCGgMY+AIZ?gZ
zGN_;x-AF5<fG76k(px6F5+b;`5=m(N7K*tm&payIVhtA$e`Oz?i~<wQysQ>kX;asC
z+~nOKAJ2b7+UD~z$vv<VBVn=E5=V%k$pZYH-smm4JaANOZ3d~w^h{mnli75yZJRY6
zs!8^G3ZL5w(oKh<Q(lGXrfR<m10V{tXC8&=J!V!k`4drUKYgYYQW7?;(Xb7U^H}?7
zu?3H_z02L+Qh?e4xI$U|IQutE0WQ0IzH85eu<_4o0afR{(R6FH8L9-n4N2(CYP7~U
z*Kyuz)dn}=7lPt%TOd@%%G#+TFb*c;)Bz=f_+mkJu;QM_Hp-->K<gfO9A2Z8tOOw=
zL-D;rgTjWm?MhR7)UN^>sURH68r$0TKO<MquFiRGUAcP!m>!j=Of@?D;8N61$N}v5
z_pL@(81<ovk-!Svh2|7p=gF20sv%cFfv3m31~Dhi^EQill+#pf#bvu?gGy9BR6C(I
zr#eW>swr~J!Fqq&rkOupuj1_-Ip&(;IZ5B#-Tn`1W8_oy*2ki-hJ>UPj=t>Y(D#B{
z#aw|w^GFWJP$Y5f(0LB6hteeNNh-yuh~PoNMp3R*FC~O{RdG%ran7bV!=c^71T;0c
zgp{#J-K(@NR_eO)kTb(-jqW%P(ya3QH^YEa>q+dZ&LSVa0@M1=et%ycr6l48Z9rn7
z7V8aA#XoXz10Tg9n)jyseV`hvAU;;xgZi5#@+=&Tk~ts%5k}06U40A4TDe&-<)h52
z*=>DKh3|zx(Qwb}@`A_nVTf18$yGV1J#(32ra`-P%N6ftYu~KQ`o(BI@<*EG!oES|
zqZ2!^P1&83P)7RhKY=IH45#D0Vm0^$Yh$WYT3=CvbE9+&d$maY`Q$3wnm8l3YPj9R
zica5C;{2?KxPV;)bWaE^rKMIJnwUyANnt3iuE_bu$20X@A7iZDIfq57I@y^l0eaBA
zJCMJ_RXp6+E`3n1cgLtGo-Ebaoov8xKyW54q5YGxAI9Y{LRIC!EnVx@OunP?Gg`c?
z8GSXe6zEo3#&<@Ybw<*>89-kvs|M_5qs>4ph1}%h#|C4F&;eG(?xEhU+8V63&2;po
z5(jRfx$05fr$?3HyqvE^$9-?j#DywQpmEUEzB(|Iq@lqja*=Ly=Mku~cT{~!aAYeR
zdaA+6zcjh|_<a514TM0LynS>IXdsZ6_BW5gep1<<`!ZTJ3%q;L>m-I=>La!p*c_ks
zK?!|p42l~ey`>$T;A8qxI3{U!?&nR2p<Hir(V{e1g9U;XCnNhE;<G5t_63~&+~@}9
z-Mp+Oa&DUe8Kv`+01fbaNf#`NLQ54uP$Oh#CZw@2=j=5D_C>mDAop9mjhXrHL*-PY
z_e<TCdn~A-iWWJp<C8m;vYPybc2m!w`k)Yt9BhXZ_*a9h_>=Ab3Kjn2L#_XQw)X#l
z_5T4C{vrJT8P@+lP=WV9qeA)OevB#<=U=D*o1FeB0yabr@e2nX8v=Zt;t}&`2uIM0
z<7OGDn9B9+sIE!HaC+fejn3hGxjTZ(tWPwyy-;iMRy*%lWO~hB%vI?9czL=HLL-%U
zsce5~eyd)S*)6nRQXSgP(>zXB!y#w_$IDGFjIU5!1EAN#)mxdLp)g=OmMOG$@$$pf
z_3EwEr}eo#SwX^OA~JVAU2WYj>nHVjny?}k-6#xc_q@N@goYL>q+8!Rv_B`{sI2Z8
z_&mGyJ(@x>6%Roa1h>zRw<<3|q~1Kw4wAK(K3w284*5uUb-U){^K^Hf&hHVj*LT+b
zbTM@2DcJS;bUC(T-+j)x8brZtenv9W{A=)Tslh=}{sDw}t^~2{Q8_+dY9MC5=}Hwn
ze`B2dYmYUrTj$st4Y}usYn%4w@7E=?RPg(oXo^wjcU(n{FW1!npa%^+9KtFx9P(-d
z#p_n2kp8^?W7lIjcr#odC`5qD%+Q^=y1h(|Mgr_;f4f3gH|YkcpeNpHcWArMYg^vk
z8w;&DOn$(A8Ke$#vBnIM!UQtPwQR|ALacC^anIVHZwT4Ve{Tv<da9z1S%Q9Aj1rGc
z>-x64?kk@Q@-F%Z^I>no0&8)Zqq<a*6ANcVlhPOR<Pn7sgm#Gu1060SC|2#+E|57d
zFzB9=3fX=mo!Mo0zu^;o#;wqsPa+agH<mOH#NPj*`vL1xJV5_anCWc|?)JK#(eP~D
zBo+AXde`7M^3Muyic4t>HfGdo0HG}@l~=5`ZNw;0&fsKqCyGgts&LNsJ9Q_>H#xVk
ze6-Z{{rL;zA*_G)vT#NyW^-Leh3-baCoM_F?9N|S*!!zR>Z9b$<z_e8wxO2&L1-1X
z{c=ZXDYo~WCF_NtsWRjap|WmM?RtB^D4@$Pv3%qC+%a}$5K0F6mQJ=;bCwV}BSRAz
zms^{fG#@TM4HHQ0<pe1glle&=eEW2!i|IYRs5)ax4VCRUi+LWQ-YUcTqUI-kE+SRk
z#Xb?jUF5)Q&=$65PYtDE=`Rug?ANJitmzG|9~hLWw!79g$M)X4ca<B7-0G?%sNEVt
zzvGE`(5fn6`hACkvx>HpqNpCOOTVlK?&BnVp{FNNf$VOGwT;+#%>_f&Y4zVz&$)xt
ziinKjhilrpL+4Xd>smkMt3y79eDvJeH`1xm0Fn-<2=7>78Jru-MF#cNg`D<e!1skV
zYeT-Y)tYPB`x{)u<yAK|2aoY5?Z1y4TM#4rd@WMK>ULJrcjtKx!>qXD1`_T6`ZQgo
z8>oS&hV0o4@3S>CZ#5ysZ;eXJ8Dyu`Gjzh*j~#AppjB{@k~A~lmasV}USEmMIVdt-
zUr7atx~W$uH>q}?YfGp*wnXVnwK9-|mJ-{6k!(sj@jlNMoE7LD>-v}X-qd4R6h&C9
zawtsk)RnmcbIr7pFP0b2{j=3oV$dnZl<4&t0vx=EJruch`<6&7mdEI_12alG2->Ve
zdyNk3fu;n6B*uULSQ7miOoN*7<%@xaWKr~bN?J{Y(Ftp6<4p~)U&|PX9k9^(8B@(=
z5A9z|i<8`G`<Be3a8?ow+$%vjac;o&BD&IRRUS8;$QY+~U3!I<nmEV4yQj0`L1pp_
z4G8>x*H%^fd>M$Go?l-qJc3@o=@5keXc&9G99$1)apM8C$?0N0<zdxBY2)kdRv%Yo
zgoqn$GoFCHYMw}ChLNI4L^Qy<dBwV;k>8vtgIpUlQ5+VbsTqoKoz=y;aVc8FCg$Q^
zkPnLfTT2C@6O$N)CdkYd=e&c5pr%h5Ta%PibDI0IeS!-<-AJjMO*}H;UNzP8Fk{pk
zydq5giKnFnO!;L)HmjYAm*4Aa)(gSf^s=di{9bG-j`(dOQ|W>WSu$b`ni`qI=%ob}
zOOcXz?lTr8XcU!7m2dTf_xy2ezO)7%nodjOrWJQav3e$C>dYhL$8WrOE7+D_@a_qP
zrQHYLoSgEPGI7F{Av!8OK*_SZb21TqQextrrF{jKLglKneY}NPjj8mkEa)47&#)?>
zF?kyQxnnB>LNB3L@aZ0&5f(RRu!8dSPKEsZhdlajGEpi*5TG9KVwo!(F1K{)kwHav
z*Yq4HV*F)8K*++fgs)BDjKPT8pxB$SQgwIOz0O)eeIc(V6+R3%Rjyo&bB4jwy6l?#
zNdZK!^psi<@o{R*#dTCwa<!o@>N^M>LonZbk@ccJpZ8-JqW9hV-nhBt3#_fJ<V2)1
zLC=PP{!0bahI8bh{kuAjQe0AWEiFziz2z%Ft=L!kjC75U6jbK=oXOb=Ks<B>H{>A-
zEm04UQEc}f78UDSd3O5v$v*Y*i-(2K$+r#KC7gNeF|1u*i{U>V6`+a@b<Y;%qtm|P
zutccY{2MKZ#W&VTw}_p5Q9$~cm|Gk9ZTY>a*q?3Ee~NtSHpZdH5Lr*p7Vo!O{|{9F
zWauy{PkHeh*QsHIAqoUC6fL40Y;cAwD7dy~B{{{jgQvxLdGAUUgESLiF2hQzpG^|0
z`cD1W^86)q@0qoK=Laa*M8@v42OgZyDIk)VG!r3#N7uT{5kJZF2Uz&FOO07sEKWQ~
zBOYDN&myv22+DEdfg=&uuDJwRXPgB4mIkRJ56*xwa|Kh@6b$%zOTyJvztc}D<=Hr!
zcEC~e8hR+lVzxsnnG!Sku3cC&W^VFi<$dsx{WdNqH|@srdsAk9I0%smxC+ay&3IXR
z``;N`qrx=H+v`q<66eZFDd4pC7ze&I=PJHg^UCy>U)z~J9F-Mj%<`W2G~z{Z|1pWm
zGf}-MH38b9lX!oxq5E(K1``O<l!CZO!6?Z3S~e?%ckB1A+h&8Y@{15mLJ%u^U{DzR
z8VT*Tr>0zlJn`IPW!1SI-~1-8h=ggV9*}<zrEFp<TEYwhz^uNzF|7wJ=67$OoMD(A
z#fCQg&MU4kGhU>56vf(zzdfTifCS-@gXcKi+~b-~qa#?q7QO47BKIUzU6_ly5pVz7
zRr?3Q74o&4hN5f9F`t?E(e!(;o#zj>;owLv{6|xT4OmFW7k#n-?uU}%+L|!t6BRze
z7h_@l`C|iQ%S-!0MSVSF&Fg{EP?!y&7h_)@qvkhHkev$d8~cW765ErG-E4`NeNQdI
zI-P~j))Y4>L^#4KtcR>x-SI=iYicpVL)gnqm%+8XbP9+2he`39T~>R>fa8lr?KGl4
z3BGV*W&LRqjgr!)kgI{qOBp_GIW#6YK<;QzViO3d=fD^cyIG1miM+ffHmgXy_YEW<
zF>Ant)ZVNEg4EYcmxaQ}gsamL?@oIJ{uyRvSiN+K7XelBN$9T^G~<2BIP6x8{Po`F
z!TP5>F0ge{HPTZ-U5i?tHg<EtZpJ^+75Cl6fn87ot|jw_ZM!W6zPAGk+Y68gJAAH>
zoSCkyhSyxRu{Xv5jko`Z<NsxZ`s~npr1dx8df$1uDXDa^#m_b2RgDcD>b&K*@lkJG
zwn3G*{I-!73bTo_cA|B2yJd`EaC(PIbKIAV#au6RVeD%-uJ`-w&5P4h5i$v==6vD+
zX2nBeK(q=-g*bC84+N&mb@`q=#Rd6I0FF*(*OAjhUPtwe80T+WoFf{cQVfsh7Myxp
zkddav33!@{QOfXAbya?X0jO_<7bEMEwPbf{s#D8Ny;zbOzqV+V&f?tuVXC#{lBWD4
zpO+WrYTeZNY-N(Yt)%RE+RWRmoB=%H-MTXP%pb}?8`>XfsS<+K+(TQVEsC(2!@4~l
z&0x5~=eHOucdQ<}ShXJ=-B>$vdqZJLHO`t2=W)Wj)stuB&V|xr!v3Q2<$X}8T$IgM
z?g@PQc*ZnN@L%Bq`~R=9z{bk`f2D<gwf|?p@V|Ayf2if{1;76eA6VH~czOOaKOB2~
z)Wqt06zU`P_(;_1@hR_%4EEQO)~q5`{&{-8FYx4F$g;?D<^jdlWz~s2^Txp;DF!9`
zD_HIKDM>x^@OQ6h8EZpe_S%NpAE3Br;At#P<WU<x|6@}!*kUy&yYuI}kEldEj_V!&
zyP-tYqy1Fec`_4>-iL!+DSaTsJ}oLKn{^`L^jBnj+Y0%jswqA5Y@y`5$}=tT)8Slr
z;faLv->a(WIl*=wL}?MQ)o_G6*OZ2b39qZR=E33m2T@J?y~s;978Q?JURM#{^D}o6
zJ(9s5T}7Q0l)drdjxDP+9biaYkg%X8e&xv@m%plbf9<<{gOs&^J+dn!d*fhXpJ4c*
z@-$7sNcLjhB7iYWCM#P0rnOPlN#goAeiYVGZ%oLP$jZz!1`*%8KZ?PI($ElTqXTaQ
z)N~k09Apz|sFzD%(IXX)>xXFtGk!XC1yqe&*-yS>QydtwL{}ps$KTCALenG0T2dif
zuV%!OgSAJPjN%q4HVz!8APqW?hBSe+W<d%z+Mb!d)t*TuNyXUOMOA<NY!ZfI9{OR?
z73S>sE69u%Ae04Gy5pN+#u3@b&EL0`4Ez(y&TUQ2-+F}+!P-8#*54zV4XW9NCHrUn
zZmQT+Z)M4{7(Z1Yre1CNJxK0<jCVQpnT+vij{k|$@Ha|{F56!4z<X}=-3Li;Hn5L4
zkwI<iuo55ax2*6-oh`(_E~jh3pcOds4_utfi!Fxrlhg<t_kyS=iy{;Bpl1bNO9Pr-
z)nTHF7gm@j4CCboy)?}yhD$tF1Q!J^hbEECpUU^;7skTeiuouyET+quOO?RP9*2y9
zvfumcRjp5!OZ398x<eu69o<X!2-c@d0=ZMEY^bqpN^~Qf+`lD6ijUHC`c=$JkdM&M
zs&)xHPq&(TJ)95S0@4T(a7N7^8ZP_L&(Eg(&fR;P59~qozTeWYv2LHAw3{i6PKtN!
zG^Fw2w<Al2o&}zY3Ac<^j;HE_;!7UDmkZIWMzDgfGp^tI{3=^%(a}DBpD$_|2>ENW
z@Z9B3PKUw7zY5uB`xX7Ee<mIUqx$VdKB#tAcj#=a{1rCtT!gHb+R9Y4AsxC`6}dhw
zn$Q5Lg@r!}nz%^0#<Dpjs<=f11Y+;`p=>MW5*ZJEJ2OzHbQ4EOh_!1aGugS=HX{al
ztk@+*xcsQDz!2l_Tcp+P<)~LckMq*lz{54HQGbkXjTrMR5x4~Q3r>2`Ti?8XS19D&
z7JJEXI<iZko$6opRR1i~ezJ;%R>Q#pu5=_NBpIaqafQrMS94rB3MUx3XKutJ(BpO3
zQ}yf;s49n=ianbf6pw!0HZpT@m3dSC!IlVfv%Dl>_=4m?a#4T3{{zTPpxQN0mh_?F
z&^kB~C1W^=&_}J^q`*QfTL^pxG7K*A4^qBwy_igcaVl#mmo?FtRqYT>4l^5(&=H9J
zQCzv9?iH>gV@E}OMN_Zmf|PpTfKk1<I7p0zSYIzjigl{-8DR&m>@%@^xt6=(oY+Xr
zzy&ZaBHT&N!n#_xl!+}qg7Il?^EqHcW!TM<SB}6^7PTO5lCryiR+d&(9CTOe&f*XE
z<cJ|E$$HpPfnb+C8y_x<1^QxQqT0Tihxo2c?^SL|vQA(=27Hx^pSlumrFF%G<L+bM
zE+_x%{A)KYN1US8Vo(2vLfX^q*&honA@7g707qXwA=LxcqJVMI9LLGpJ#&0Stzir1
z^{ONct3o~HXz5x%wC|GIzv+xC9y)|wllrzG$qgFBlQ<wfz)(E5pcKY*<yhWef5baS
zZ=1IDv{#`QB091+y|x)-;sV+V2rPimJ!jiXD+`cQi;9PrXXj=G(zFYNgFk6FEMMEJ
zN8Hje{eeUC7-n*;btO9nqq5|PdKG<?=;#%+SJi7}_>$3iUQLc>aI^ni>3Os(8#9he
zuw&s;dIiZt%)*6#+3dOb$4?lQ9SWnHzxalEW|R9wECAa)JVFg>iB0?WvHQVy*bLHl
z43GX0kHaB<2;U^Xs@3D#VA)^0IpW*7>1<3j*{(HuW+qaB*t*#A@ZrFllLjhQ+0e0_
zi5wBnM$(w@V%GV5+$zsgrsaWzpr*o<_~S`Wt?vw3I*R6}Y627*0hG4Zjmd1Tu;__?
zdaZ=!xKEni+6Deg2j4;_I`t8OX&fv7kLuPo+A7b53r8s7$aP(q77L-bzH{7FxM23i
zys&}$2xDG5x^;!cm3?PMVUhtp%Z3;6Qp+XeI}8KX!h9o-{il-}^pz*gm`_r&omR?h
z95ZWaLSKH4hWh?I+`J%Ai>{i97ZDp`9iE-fA#-oDy_aE({Z&m*ic0XBT6`H>wN$(H
z!@qtUfhBv_Xac{t=dR?c@mDeSwGPA}FC`X>g#hhfAyJ_{;K$tx-TX7!Km=7|qf~OH
z1g@lS3&jY%sI7o|xb~Ce;%Xt~NhKqkLk-P9NOdhOfq7Bx?T;O*1WI6AqplU&83@uT
z@Gi58Wvm!2kcY)LzhcAo)Tqzc<wa&m5!wymR%O$Nxwr48{fH^6`{RAeQz`vHveirN
z!63lw*Jn-c(cgHFSr5cF%&<oUYCb5a<?B{wZ~4RGJIXz$_ylpzjDnRC3R?a}(GA~q
zh|Sivt8%&p8-3gfP6QIscaI@n>^AtmUJc*k)(@|BSua|<)w9o{-*4E8)5gm3<_!mk
z*+UCR3~{K?@D-o={z%}IP-V;gp)@aPKIJ7dq)gZr8)<Af7SZt(BU?*I=jdypjyON8
zoX)y)I|QTA(}ZY5{dT>fs<g|!krgj)0BZyW1?xrCw`5Ck!e|+K?bzBs`ULz~+T<6k
zutDzZo4a+}7vG4w9NMj&?i}6n3w+V*ru-8s)p2U3{)!jx>PGXcJOjbj<Ei$le}<N7
z$Zyk=F|C}cw}a0xON;Uo>?2m$mFf$pN|1b)!1T%@0vMxJ2+Sz1a$Qfwjihg5gE1Id
z`7Y7?j4Ej#Z+t=M{V*iD&U?kzYQsGPh*G0OVG`Uqcc^w+UvFdo`6PH{*be)y-E~_v
z1V`c)|E}ndUAk?wu|tmOR^1^$>A=D>kO@)y<&UL@xe`Mr7fol@B2MPTtNL-Lz{J3?
zwmXUBhUy2$FZpqnL)rn(m78{>HX<Rh=S>V_DkO!Zx;SY7^+1`-8Hvotw-n<P`jLf8
zu&jxzAG5{9vclnM$b5J2s~D^|u0f@clhMM>NN_UdBZ^0LM{~2=R|b?YBcC2*v6PYB
zP`5su$Rv^T#y^DMm)h$zyjszs%5csekrmG<rcJuIf`?QGQ(I|d{F$lV<OSmv`mB~{
z&L2YavnuhP(5cp2q}$E~a|RT-#jD)4N{GJ+1;*C9poVX<9n2@vUMBj(z<BQp1tfHX
z&{iblQig5<3d2>R>Do$aMa+2~!w^r+l|NgGmzQq1@&<=B(z1&=FhUN3Drr$=%=WnW
zA$*9aeN`c`4<6PPsv=c1ZsB&-vA@i={vgRLfQ+4*1~Y$r-~Y3EQ&G9Q<VJm`)%=z&
z7y}%NxB0!*zI%dB*C)I;gzU&~Y{gLJc~Y@7A4|gDd+N?<j-}JG2P9RB6SRlLSr|%{
zQOIuj#>G##?4&kW&QneveX8=T+5L2KeQK-vb4~m5a-z*uBt@!&(goE(r8cO3%CT}C
z{A+VAOtv^R-otsIV2IakPU8d;-4I%EYEL8lzgT<AptzpsZ7_iVAtAU1*WiN%mjJ;n
zxVu{*1cE!k-3BLkkOX&`AcGAsxa;7~;4;9@@4s8`*4A#-)>iGO?%Q*F`qr&;Pe125
z(xZ_-D>AbLSfYSs^nqH&!QaJ%GW0eO7yFQQwDzQGz}8!;`qkmTS$RcrnF2WBo#opH
zVW|nxIEcDC_A8g;!9t$!{3hv_-v0)y<VVB{l55fC7YBbhz#GNc#s6vCU6ZxSZ+9LU
zkz)J~FmTIwlDA{!jy)CGTB=JaR)Zg)K*pY>;(t0@{TWYvNCW<J`sv7#(W-Z#M#+y?
zE`;1wHMG?ZzQ*Fbmn}<?LHPrwX9|@;*|d4q`IfYSaYB=^EvEcY+Ttmj)jdX~Aa)>M
zj3&G!z{udXza#fD&B(A;I$Kssh7EP<M(5ZX)b=7-$l-l2boqpKnh;UI>iE;1Up2=m
zKTqi!J~yo$Dfu>zW3~SKjDHSjeoxhgX=Tl59a$3+2KG0yEf3FfB>_!=x~7bawWpuB
zrnp}>UAgi$)lPq$Byk9xY3G~P?VIDl-Pco!6;q)^;@N)RFe`NMF=YyTW%)e=k)h6S
zb_*F3aW)}~-$fCQex|l+{1M?uaSx7lJaL}OT?}c_3|LgxAKZ{X{eoU8DO_i+Aq+`a
zwf{G@9$Y&;F<xkHRdE!Vs9*6z7^R=uwj&}aI}Meb-(;v<reY<l1<MnnTQX3NdeJTa
zwDyN&@x+YME<JMa=<;u<Ip>qy6#sIiSNpMWpu@b~@|5qqyJZUCn*|6@zVW<V#%h!~
zyCJNQy5T1*eBsV{8uJ_lOQ313N)t6Uz4N%eUclv>MtlOvk7hS3(KljMtu~HU*oO@~
ze3~t84uaRaFSvTxwr+;`6|y1-OB9|3<tOG^=cu)T+TsevL*>0f(Kp`?hLCh#TE6T7
zd#qBr$qT-lCePkZ_JjeEI(hCXOGC)X9k}97%NRAjbT&d`DEgc^tzJJ(kU#z$)3S=+
z^N788%y)@Xw7i`gmpbp%%I1RlJ#q8!w&ayaZWUKVdD9cFTt4Bmx;3ipNxXp@PXHJk
z1twu4&W(hi=?t~KoU-x8c~^T(yTc1*cdoE)u~ZFy1M2zUhz-m8$Y@2#n`^c#Eu6EI
zt*4RdA9emNaI$}Yo5kwn-`JP5&1RYQ%wuYCRS7L2r>+DU0qG=8`>Rr<cvWQ8Ntiqe
ze}#N=#Gkz_Nmo<CX5)}%Nr)X}@JRZ?3ex^@+e;!=(4-iziv&ub@7ERF0eF|FA$}Cg
zAa=3RWSnpI-tSIW1kQhOPYESl3u-<qvRju}*g8qpcOMhXm8JgPDF&Q^71lNv5A%T(
zWRq->HmIc$3F<><ufz3=15~I^B|oN|d5^OSA4`C$6ptBF-~3!Me89*ECY>|YN!%HY
zelk;eCs0mbVfA9_(3v>?B~N)~D}MRf>|jXd)SNGA8IAraH<ep?N%_;x4f(2<NW0B-
zke-O8lMf#mN{*QBhvIdk4B=P!qEgzt3@EI_+ZOjl2W~!AbYNOae3o9O8qY{$K8j--
z-h#E)=$3#M#*uf1{Sc$I76%{f2Y$$_j9p)ns`$${6GTx%;#LC#KQVt+6u^c_BF0S9
zshV|v&?vn`bvC|EX)OE0t8urqFoV_L-@HNSk=?y0IQ)S^`K8k$V)UMXbEgUM_q}%o
z8*Vv64dGx>90?K(5mprXk>1wnx{>W{r4ARh$vR5&7N0-!3>(XqNnr%#rwqjT)wv6s
zk&0$$ETRp3LJOO}HdE_KFOjQ%03YIq8(cO>;u!G|_H&r^_KR$nC0SqjEO^**9f+4Z
z7C$>6QSrk*V|!&@ZI3cE@%NfA+gL1{*-)?bBP=Qpsli&3H8BQXydqs(8Tsv?$n*-^
zy7xc3E6E{~GG;ecG9UEi7oN)mqHf#ig9wGarXZO??6-I9<bs>ax7u%l@5~sM`MjEf
zuJJk&LVdy0+w!1o70q;wS8qT2MAVtnk68wHuZ|&&K`y-jy}j(5(TdbLRAF;Grhu22
z^u~{7x~Jvl>c5Iq0V_VfSKZVQwdaog5gc+gkYUZkSz%qs{2jMHdhmn^V`UNcO9JQ4
zFYS3EvK$p;wTU(rYE%h865gALIK^c<5Qm60D|a6Yyw1~F89dM!$ImQ4Zbrj3p3cn^
zr9bDr*yh*S^$~_O&qRFR@BVfFbYj<QQFfj;PU^*wOSMo72g}lO&@6r1>&r&QIUPP+
ze>-YFDah)N6*9RHzqV^Gjoqg$e53+DbfLj;%_>t8t4d=}cp2+)1ueJe^}_(Z{5A7k
z{3ymlj_i_3Pt0Z`G(7zBjRnGZ=bbFOUAJ7Id>*xv9}QiW%hP(8*hP%KP5$BO29)Vu
zO_FNH#C9qpKE7}KcRqjZsDc|Iwf!ncj=J9=DXOs>7OVwLX(O+pN=nB?=4@;Ffb8<c
zx?Hia``gfwpOQKeW(f)t-lUB?irqOM#^viT1%^jy%fdOds5*`#RPOcbAB&~X#f^JA
zrOd=W0G*PJ&$invuleE+`0}7fGgG?1)5Cb+9!I2P9qnWWsyFYAD7dYmdzYGUwrXXQ
zi<9ZP%9Odh{4egJoVJJKt(n2K_#E30f9Z|ymlu9zUGki}@z>+;{_;SArOdJJyx<!C
ze{33J&FUvf#9s^sc{7O=l@3uXk9E3F_zNw}{RWsD)TuKSYYpd9zx6?4E37bs;`(lv
zT0cV1q6qYdBfuE02~TnAFXr;Kb<MOz-%;7Wq~T(3HxT|;v0m(FmM)rTB()Ov>t+3Y
z{pg3F)aG=ZFA{CJ>nWLr-$b31*-N@~)qZ!1I1I%U?dE7Ye+KW&dTgRwp<=l+jPT$?
zBT3&nX5;dOXsK;CY}e%3JqHUOsJ^9EqC`jQS4#u-p&b4=IGv~Zw`<?@D?TsZn#yop
zAo+e(NW7Pd)BAC)^Mr0@OSMm7=vK>$H{2JE*N~46)m$E@6lwhS__&8H5;p%QDUDGa
z>u=*Lgawt#R;ZoHqurA>X|MVl)0v(F7O8$3Y9-gl8{GR|N;d8G@GyPlKV&NIu0WcV
z@>iGpvjnpjvy*=an}gQIRQ=G%SdcnW+k9@K9HYQw{xF+`>!5c(+Z|1-TzBU_-Yfkl
zseJbSOrR~(nzNt>XC>?DHbegTZBg`X#M!SMR-P;Fawx4AUljwVS<N}RmgzBaYc8zp
zq+Hh0#-(k7(nMo4Vqm%Maj2CUt49V)p`#Xz`A+e}h|^ii){Z|$q+{j74)-Jn3}0ZW
zU{NJeWxlQ)CRLzdK%=e;3iQ@05-sx5?BzJP-$Y+b2F#YzZ0$mib>%JBOt{@b2Zo3v
zlu&Tlyvgnj+SPq`YEJ*^kmR=Yi(TmQUT6umTJeTP^!UVjypt!%&!oq*mCgr_i`hFk
zw6GM5a(8sz(>$Cw|DhN4>L6lOF!24iA12C@)Zb=7Ul4?>IOSER@qwGa^HODD2$9js
zgpbO9N{4qS%4o{)`2i<LyE9E+vUsbv@UaG;ZlDPXU6Bezqr-US(&*YL^-Z?wSCM6v
z)tBshCN`0y+$?>5e_VETrr^3(;~#>A90y7&TxE=LMG_j`-LT=Yb-LmN(lMG5$_NuC
z@$bm9YU>=2s8?WC>u9@F601$(EbeE*o(^oRq^Df2^*Oss>26&;hu5&&_E(5qE;A4a
zY;R841DfE5x1@s70fs-4=`43!{uLZSwY3*kDngU=LLR12K=NDZ^jXnp4ITTR1WvLH
z_df5}sJyKCg|agg8(F)pnckJ#xiauFNx<Gh0_J=mU4CdT_CTDd-RWW!71=RHB^LTp
zJ4iv5TQl}L&Wx-dTy-(?6V;N}KKTrdC<e-U9PF%FALo9hU|7gDsY=NY5AAtGQjnUY
zxIx;lO`&ts3}Wy63<5RjbYchaFdOCrElA$_+Bm(mih&PsQueMq&d0`4mV{R$<@aE#
z@w4cw$vSLb`H4$E1_s4@45xY8JV^oj&m*Ieq^N6SX6)~yhfO67*4~+LzCkl^qAMy3
zm)U3=Tr0=eWG^KQI6r=Kss{M5ZO%qCSA<cBI>ad35DLF)^r$Z^C2%%cM%pn9Li=-f
z6_=z{Rw`0&l9JI=L44}QsCtU(a#9*tH*akCHAS+xa8v_7t~;Kc02U!Z5r4GUHAgDm
z5R3LV2-x=D-#mL?klCb+AtW(tdggYBk`IE@E}ITji#Gt%A?6=x^NC(v4t1e9x;_#U
za76~ImP~XV{0x@go%`9I0k27mCVwu0g&ue^pIbtDC#HSATQDi5;0ketY~z;aDf}K;
z3NpU@81(T&4so8l>1!53ryMbw^sYQ5p+^4jNWJ=NR6J8xK$^J$m_&;m#NfX``CVuK
zb(%=<tG3IwuH=~!MgWq;=}x%)Whar8tTsod;gSoXd+Yw@+m+5Z&G;5C=P(nXY*JuT
zxL!~^Gd>(?=CM9<9{dbK@>qx9#AtHPkSn1{IhmIyI;sf{)#dyoH@%CFXQ8kMY+6l?
z&@VhLUqq9Vli@LDjIEY7<y#-uM&_drXX-Q46kX;@H=?U$Bhh;DiTP@_XcOzd;~IW{
zgUrN0`1l)o`}AfG_ZiS>5D1dKpK_Pc%8RI3uZtBnoPYckZPC@fL%7kVYoGXQ5~tV%
z(eNve5fiB(l`cP1Y!3JK&;LjLIe$iSxTZD40VnNY6LgiEBt43ed^F9%B`<id#)K;8
zLHpPHd*@YVTCMFr9Xx^e<mHs?-nR^oiC<D2K!lgiL*Q*^MX7Rx=MviOepG=~Kn?Yu
z07{*6Lp1#%B3?22Xl%00xqN@@eymg%@}RgRA(<`|MY`YAPF`N-Qg|P6iu~wFy&8DZ
zUrZ~eX<_DkciO<MJ8z#}t$Bf6ssqwBvAC;K7vE?RKXuSDTA_aIO_gHC?P_*7Wuq_9
zN^I{gR$R|2D~8B$5wacsDEM^P+2hZ?HV2(RE%zI3nU0qS=kE|y6J-ObawqF0evW<G
zHF07+<R;z{c6PKNPD-{Lv`-w^#IyJE-w@8q4dio1&A##1n2R*T`u9O6!2xqpssgPH
zrkkk2J%ZhCSp+6I%2DzgDUb^GFUTEnisZ{Ns>2Kb6#gmmU0N+&dq%6hSm*%M3@16n
zG2Xu!;uL3>6})L;+j{i@mlUEuaCBKa7H3AM>HVTw;|@Ce9fLTXol4x^4En<Mt%zX4
ztNqL95w44g1Juuok>cGAXA@37>%>f_iocXx?jY}Nb_p5}X6Q%8QkZa_P5l0;Qs+*;
zr<w0B`lEldym5W`^XQnDzW*Qwvx16%a+NkpODvQ<`(2fJgUc%!elU_<UAV;JJk0W|
z>k>k>*uTjzSbu?*PglaS8QF?G+g!lxH(WnrIqJb$NkEJA4!Rr}*Dx&x{tD)wg#h1|
zz3#0xd-r*_L;fAo>5LR%j7>)rq;X{HhcXj31T5qre7*<y013BWFJZ>^;g^Uy4T(C?
z^$YtLs~O$&<Sd-WJ1BTrsgvnl)Kq^p!j*2Ks^{0BKq&AEXGx>}njXSPbhddWH4-WE
z>m|FHu~e?R4_N6eCUI}Bv0aFBerHsOpDC&$v1Jjd3Sojdt|%Kk11#+Y-PnlEYFF8o
zF|uo&aMyIb-8(w|sk0VG0qF}u-p7~f)PeqzijdD~O^SJYx8`WZOnYCq%0>K5ta1u7
zIAam_C&0CpuFBrl{oVw!n%>H>8tT2*zZ=`BI&Y-gus>9u#u605$tjCB;Gs()<RewW
z+5*h;27dh8Sd2}29-<runOfh#I=&8X8zgM#%<*O)e{c9qIkFf%2N3D5LhY7+U1i2!
z{Q}EYg-UI34n>K{lMPJhho8hh!E<yAb3=QV^<I?j-MT=@ub0>Pq9M?7LlH+tOMbfV
z2U&-jxiU@EBbQXsTN{Pqb~n0F>9_6Pje9FDJwH7)dq*FK92JTJF8kWL|E`wzGEo_8
zq38dil>K=sR>c&_;5@Q~=IB+EYsTp3A%j}=a?C-gmMq|#P)eBAr@w!eC8slw-;9N)
zbCo;LX}Zom=frxjI{u}3{qSh9qF%^6{bD!IjN#7a5%ZuZCx%&oqfpC(x+sV4NxIJZ
zo{?1peP1V-oV>g0o^eV`2s2oE|Hi?$w+Lu#3(C{{*@2}TGCj7+QPR+LTeNss<Udh%
z$91H_F2RJ^asN84@Or>4WH})SwI<wUmVjL%QJdw|3_;Y)WKC~sWNHZ1e_tz6$@x~;
zseD-E;?T;y4P*!4X{FNx<dTCFhrVIO{X=ZV2;h4V+T&GL&rwID`5DTZY541g)8MPm
zB#3Ok<_!)RQQ}Ig%Pf&Yt>dsKd!+iR%ltZ<p(rJrTNu#Yy~i$`y+H^8BWXJNFD#Gc
z6Ogf=du&KH{JoCU=i+>U+~AM6L>hN^X|A`t!>pt!(&It_DG{-jpJdFef+f=$Dwj|j
z&<r%_wqGSkn<SEvDn%eSvMR~4s=ES&ir{<ImtWJddGF=e5JjzB+!MN=?#DHzK1l{F
zxDn5OB5b(2uz8h<v|Hp=sBjLy4t{M7252kLn%OI^EFBXE$(*XJL?Wg>$pP+%zGn&0
z<w$vsa%^c*WwjUx%ZqfpW<C7HMo8d~Vy4-9FJbJP(G}j#%o?Dl{0VHzPtW&7v-Zw=
ztL4RZw9_w+yOc9hW7b|@49!dLc5v-H1w9@tQCC-KI`vxy6OJJ;W+6IQYxB#)-*ds-
zR+T2lW+7zCMbL;`CCph5)t5D(;obwE6+a=GFb?DOw+r)6;QV2cPv$81Eg*UB$M*AJ
zc%bo1c55R#PnLV%TM0iQ=4vO6ww{j$e&XuS^m4@jB}{(V#7Y(6&&il>A*HSIzdvcO
zy%5ZmOtYo>&?~(2?{$$)pOgkwlg2kl%t9F5uyhPS5Xp$J#wzKw;Io6GgrAqLK5Pv5
zOIt{yekY&(q~(L7V3V~ZY4+yz_lr=MIlO2x<td$Tz2`~nFf+ph+Xi4H;Fxo#@$0Ys
z=$hSAB)T-B8?{!SBI0BcdzO(sMry~zb2JB2_`^FzR(%NMhJ4LzDx66<SblOksim-&
z@~x=dT6UMHvV^?)<W~pMw5ju38t~7OGL8kCvF#k;+kzW;Rl`J&<w#Y-F3Gq`P|B;?
z)nT~@n?Qv+wno28<qDT&N!I`=T3#xYeH*i2&30cCJde}va#iL+mZT6-MS9_;mL`;M
zu@Aqp*0JtWK1N=OsL5;0hT01k0AL7JwJK>-OplpR?3WTswl)k%<!O_EDZCE%G9xN$
zcz#E#dpvDU5cOM+w5)}a0snOrA4OOPq5Q{xwFX#j^C(4XVXW^pxIbo(9fQnc;n=T&
znez3o@oQ>gJ>-@gh3U9+k5fM|>uw<}e0=|I^)FSz_Q-@MQgD_&zwFNE_ro99bkKN`
zNRu`22EV2n7Io<XRhztV$QiF3mLz!YWqHZ*-}W+Xx(74|>pY@xVfNgZ46dqP-u(k=
zjN{5>;CycZ!f=L{R^#M*mG?#lheonq5@j1&65##~S9A;!t?FDIbJU%XEUuS8r83D6
z`O)e42OukwJ9j1eIr-T)OlZ~o9b2I-fj!rxHWoAaK7nj;H&lV!B~(wz9h9svM!Xf!
z9$qIEmPud6`aF3|WfsD;GW*2RD#`w-$|0!YnO;E`f9Is~m!z6<Q+Z@D-Tn?&Rj_*}
zYZ(5i9a4@H{}5Q=uX(<%a(=n00{iA{iE;Ha=w+!vA)|$Wbi<IJcfU_M#aYb{y2%#<
zD0U6PW+^l9;E&VLVcT-aX#Gb^(l7A2Kf6gKmEYzxx5|zqf2o13CBMnPBS#-a33Ogn
z_5ATv^d<>j%Eg(vS9vFN^=15179~oiZ@Qg8LP+!rch;bPA?%+sh(5ma=FY+TBW>yY
z%pfd^uwoKsbjk6pxhyU%N&Nf3#{=$uWUbqBIa7UakC%@Gz`dh1*4Q!wS^H#<Dkjdy
z_K)xMh%$as&#<;_<qlO8d-=$PF(t@FMC;&(`P&va&Uaj{d40<2Ja&kRB>Ql0GT5Pz
zoifN1^|STvpRr`|MyIy#?}r~YuTt!VxvdDR4)hjfe?nr14u3WVGJ62g=s%px{wyTt
zxEqF=NU#Z^9A@J4AYJX<*-I}7_4Sf0uuGzNy@kT`%W3MF+17VQZRN`&FRyF)xY9s2
zyE)p5)GK&MMtfNeoHYrp!xcw;ag|g)o;Hx}n3m%`N==AUNf(Xs0_I#z+Biy2q5Ev#
zf+kW;Ji#VIoAOfZHv(2n<Dmi^#)W>;Bhs@}dVYgti_S<W@}~5PDz>PQ;NVwlb1QvT
zb7g83sk!!|6rOt5c)Q^k?IN{!_@1F93^-Kr*PXYFNZn8(dxRCk4RxCyZ+ukqeoisA
z$g-?EP}5XekF6ee_Dz1--DAgl3J(_LeJSS17iM>RnV<8^zv@s`g*8Y?{+Pzn!%RZw
z`Wsyky2&K~e$;p&O^IpGfkSf^PD|R~?LusS>&Y`;RJVF(Ko{LtavN8;7+@5S6sO+m
ze;|a3q>V`LNfLh27(ow@#wvF7$6=0lDp7nimcIj+FVo2m5MLiIjWk%l%E+XhsB!L}
zZm7ZWMBY`%F+frdLiZz`t+*IiKQ?DK(;})8Y5$2ix8eEISf#Fo1z6qjK7V$0vWb&A
zUD>b_Z~*KfdFNB&U!x8hto%j9yfx)B`m`{|$IK?R{@;0}k;cHHT1c7(e4%c0^a{Z7
z9I)c^k}OZHE%!A!`}?p0?a@D(VV=E;oZHj5EWw9P!^E9<zk`vkN-Pal*%r^Jm$(rx
zDo-?o#Z={54wvMWw*>H6ic4-wRAMFb{LP*5!b+r0zlvd$trI8fivO%kd3%c(7^mX-
z8T7Ldb4!tXneFraoCrDIOMn?zesSyqGH!3xhOOGSjly}SN7K`P6F>B;R~qeM+lQ)0
zKT9qnx735?jhvOJ<(CK)9jUAjuk1xqRSf9b|4k4kRpGCe>f94{F)b-~P`)?ILPzJJ
z(8qbo6~{5$_I}?lQSp~1*ZViUsab1;0pt0{A((cyA;AJIVv3*92A}1w>J{GXr8*om
z^X_Re-gWS3^K%Yq#MrF$F1i^dBB4dOKx@i<!_Yrh%v?KYH=%$bY#RSKK|ZY`0ER!A
zK)$z3J}Yf7;9cyQ5rQ6dTf$zn{w(HfypDmlz3kY3Wb}<@n>Nt{bsS8IU5Zq!Nv6$t
z5ovaCv|@OV*>LD1^Ch^iQm}>F^`u;2viToy8$813Gft4|`I!WR$C9Hl=qIBFQHHy`
zgufbj-!)TtHrv-k@6hoL;!MtRr2nkP8i~PssNQCYsubGN(!XgJ{Hj@+8nOLozlWuc
z6<&urw0F6JHT?Dmuk;q&S4;W_VVxfq-QF$B!8jM@wxu*^8bI31NEh-((fB1lJ^>w7
z0RMM#)fw>i$Iokzr&*4JSgYDoZt~udq8;(q)SoH_Ru<Kfw)giWUAp@Fkt1rA3rUk}
z#c0G2Nrs2GVrVapty$-?Qa^z1@nrD6em2}j<y{|9<Gs74J7U&uW#KQQMu^p1G9D68
z_L3}-8BThS%TvohB2oV_1H0Ul4}u&yRr=CdqP`u@Deq~teE&+TF@ucTDHeS-{qsr>
z-)7%lR(oLFZnQ1-UF)c132tk19BUJv-kSawDOzlvVzgKtMR2tF#kXePOc8}c(75ep
zv-O9hI{_r4mvW9VSiCN;HxsU~U+i<FOlZ8*(D<2fj8uN<`ReB(Gt~rFS<u<0yAaZi
z+nrS7y`Ll*Z_+}}!Pu`tCT9|x(^_UX>(@=R$#li~>fCT!W-BB`azRc{L4#B~iqDEF
z*8cX`Kb<kX4Vxb;3llmGVqY!*_v+BqObI;N?k53v;G&HBn=hn&=6}^|2TCPJXfi?M
z=sO5_>5$2B3^=k3T!GDII9JA@v_L0mXUub5SEl-qEk}2cDsnCr*@`l<h~4|xUo9=o
znNum3(vj-!MB0DiQVR$Y7fa<5TOA;g?<$cs(Vu9b8!z%-lOOD{bULnt@wL1>Gbb33
zMo(l~THtm|qOwjJm5g5{RM;_$9^ckvD=qBY=D<>xPuMLExvVM$715<Mr_=rTJsGa1
z;j@`$^qFc9WWu?2EgWF-qw!<eo)tEVbz^pYNGi#SoxZ>7MrAIz?>b~7vKzmaEag`Q
zbgBbK8%v8-lC#rH+x@HGa+bNmMDwxMeGKb?+4$FtxJFG2DP%%evoMnuw`w{nC6d-&
zQywg8#az(1tTv>V`LsPl)YmSc0S`vOcu|@>XYoX({b_V%IBDm&G!c_u+%@A;ZQ<5G
zoA!xH;)DZT>(z7IJL%YC3g&eOs|z#u%fh0}^pL61cc)aUEa3g(OgMgeeZ~w)=rP>;
zcgDgYo9B23<(L!=UL#Xl$^5{{wjKR;f!4q0gp-JsqIDV^Jkv_|bv`=$VXNNP;M8oM
zFGs##-e%nLsaL+PA-4YYX4bN*QZ4tZs)-r>`+tyCqMO-Jzm;uoWZaSyvj9J9FtByg
zB{fZ>R@!1`B1){bM4gP3gokXglDcZVe=xQ?i&qREkEY3jU6OME<^>+6AtWV-y}L-X
zr1#&tBp(QhPH&sXZNghEz-szc;>J=&TuzW7gVoTD+3q#W<H|ayuFP#m`t=8~JpOP!
zcXW1nTK7s{dRufu$Fe;83|^#bh5Xy|VTkF{8u$1_sK@pGY-n&(NQQS!#YBJ=nDA@0
zxIBp5viH%o2nMpGw*@n!n$5xIDM~~~_Q<6R7#K6|I<Od)Db?u|Lq#2awa&;KS2PjB
zZltnU57du63ctpdb@$tSjfg-;a2UI$u_2>~>=|SU+f!*d%#;t)AgautHKtN?zmJcJ
zVrVLo*|Et`rYgUQXV5q=e(JwG<1Y3WWFl?1NX2Xk*K#Ha%c#D(pI7$A7atYu=%8+U
z-AI`AzC(HfvgMLAgIml(O-%jCVAT9;7nWD#NL#sN`<qZL&fV!Od92JU+T2?1`0Voi
zg0k{XK8($Hb^H6&vM`ITvzP_#7GpV|l>LvWzuA)r-7E6{@errQ2u_NG?HnUr;xeUC
zG$@q(ZpatT%)vg{+n4U+ykJybZ1ldS@mPgDX*hW3Ur@v#%>M<BV`}~VH)G4028tj4
z*MPl|=?U7^3LhgNnp$Y{*MEG%oUlKwU57ROQbzyGil4x}A9&YkX?`TWr8CM>T?t0=
z1M&~K@9^mm_9N4FmT{<*q%n-3(jyH;smunOMh@vP$R8DX$pg<ucbbnLB_R;>aIC|W
zp&`a>6^7_2cdeiEUrb9L;+BVKc-ghnUr;Cw9ubTZ>019?kI<Nin3D=7=CwseSG^xS
zXZg0Zt$uu^xo?<g0;`a5kHl$Sn<vI~cvI^8&isebyy9S*3!kp>8nA=7ET2yxRXI_e
zO9#F5tZAz^%aJTe!3U;GQjvq(eH_qC%kF_Ck<*p=k{qC76j$~5%9W-yj11?S=EXpz
zDG+pYlK%a#4z_D}r*2R!RE)HIL9h@&r-p}-^@7@?bZ#7{G;NC8Jjf_RFHAE{C1cr;
zN##l)PCcd*86UTgMqMqQLH6;OXaqd{Vl!{Dmb<RnV%rnDn2T_~zZJtYS3|11cSU`_
zWl1wU-nL(wMxj8xMvCilWpF8tkl5Nej1&Bqn1Ol8rK7%CutNZ7BxTKodvHXNc@3SU
zKbN-l-=bT-qR)Nkn7@7*&Rd|XwmEEEeLgcEIu>9F_~7UvP*2daHd#XBZej3(4qinV
zO3`8RUNpF%6J9u(EUVFK>W%5CF_ni$t@=?jPzR)8IA4CC{^K>)kMr)uMP#JhoUvW{
z(!95Z=O)tk;8B0Ri=+73<KkOwO~hMQcfxg5bcsL4=D*l<JP!rkIbyMnO8)f&JhvR*
z&Nvx<+sjI{r6<J^qH_B}fA8Dc^cUw)=fHBuIw@%LLxgVF>WY)=X2EB}O9khXKY#SA
zTNEe+2c?;Dm;Vl>sjj8PFjce*QM56CMtR!3@;;Xx?O=9l0AOG{zY=p!auQ7izVMXu
z5Qvi|36W>ME&hRauji_kl+95H6Gh(hGA|sxM$^@n+w^ph<V_8xfspGLAyyKVf3<Lp
z1q+Ync<H&G<=<Qs<jrL&8vpa`ue=3=uV|CwjHuMHt4UX!M?kBY371X{{PvZ5T-X$e
zxb~Qwf7L=4Ze>slIq{K8#IdH*elNr|e2PMiXp(lyIHeqfaDQ_(^=OWf)(uOG>fU_^
zpnSc$pjlNGI_fnPES-%q0y%d=n5!ij&^ZXXzL2M&U<N@olcG5p`-6Mgg7TX79#&-P
zNDmTC#ty#XMf`os#Sses@;>dK$`r+PJg(X<b)MSnu2OCH4uxRH`=E_8w*`xT{g|lt
zzuP$|1RI!09y<aUNfbs4#QuHK6_Kz{Z8QA81+V|FDE9U7O!)Ilj}E1T|EGk2|Bl-E
z|5R#-N8tagHN=n14fy{hAK<^Vg#WjE0B!*x?*D5(z)Y^ACxK9X)9&*#i%9(Oyef=B
zUMlFt25Cm{2MQ`!_34a<p;UTBYG$X+pUyRt$Co`aN9h#|X<8mP)Pd7;bDNc>WdMF#
zftg1e@9U%WJ&Puagz!Vxz-x<dBahbW`OS#-nSZ8ZI=)34fmKYJ@IWflr@2iDio9Nl
zT<VjAn{|>De|UZZr_s~q2Epy&-Nf{5XeY-r%le&==#8HXio{a3s068301iU>Vla@(
zIC@v0_ksmMmUp^;9!O~#WvW_wmIBYP4GsheKYPQ@ObI|ddHiiz)$412$BdpN4$ELT
zA9xRgC%{hYYgMX&d7_SYE{Bd(xKCbzoKHhen1Su0kKfL#jx7Sb>h*f7Z*cnZRY=aN
z(?1|8(sz}*_@3O`w$(~8&Jbq-j}6;*Lx<a#q97fFPat++z2H;AK=x2>&qX7cnrw}`
zwV5q*&%v=U<xkWTQ3i!Es#^V&{u#unP!4q0FL7}A5Va;aPsEY1VCK?*CBT8{<o9TO
z+tS|qf$OXu9+tiVb&t5chFp->*cxacYT@pleU?<WcpR8ejy&7bGd`3twkNwl^aL?W
z%rjBrr3^lvpj+upz%H8)KMa)d=yEso@8asV01h>v3fy=J-sCwG6%WNk;3Vu8+5b!4
zEuH9VehQiBGRPUvID_;}v2X{*v2hFj16*H&c?I=S?w=z4Id4iCp)@RAA87+3{r@uY
z-iG#V9u0+2JcGC5f2f>XxukqoPA%(Q0AFC-0*AJY2uiM0Jyi&8zo{_05jU45KN`U^
zve@kc*@LN$&Jb)Xta+yit=Ha*DgAg*!rpp_Abs8k;RT5dQs}c!px5f|KKx=|N|eO^
zomyFQdZG(LDTR_m?20-6gB+(5`O_+S=0zOH>gldK3H~Hs`A~8f<0bw!Z;4XK17wnC
zV=}h7Yfr!~hq!ZsGbadiCroY8tx_txuW?_0$fM<i7buwVUi4Wi!9<w)a2w{AvXIHE
zk#oEIDzf}=KknrLW#+9r?KIH1KBe#a!zrWh=ED?^|I;CS%HAQc3sicAjq?kfFe_m|
z_Twl5P@@<_&_!xm4ZWB+Y!KY&VFY`2X_$z*a*K)&n-+snNgz>jca?YMJDJ#2+nGH)
zP_tX+gqS#jK!4X;W+-8bx6zS$9wy^O%Y2cjrtHq#RH&S{4qm2h`hfR?Xs;Jl2ysfe
zO&c~esPyV?P}buQmWU{4ua$b6@@Jmg4naYi!O_Q`e}14-SG}e39pnrLxaZvTZV-6E
zkbAR<QTQn}+_T>iGu1epmJvoKw%+>v!4=*cIq=YDOR{6}InHax6drBrK4FIkHKP-6
zN38QeQd(@AMPr60t?BZ*BZRQKDCqv;#0#gNP2Q#uCJg>J8ZAW9MWHcf3yHLq3FGa_
zCy{=WPXs6Zqx_d5#Ou220-H(L)SAQ)yU1r?3!T8aR0lx^ELfp?vg8pms@nwI()<8-
zHi3%~K$o6WA8Y9^OPVku(AF(w9;3gA1ne^m$`P=j1{V?ap9pxSj)KA=f^Y+(&!QZe
z-UjG-*?8rRui!!fWJ^y$w@|r8B_6vo>EjPpCh9~20V{fAxXSOI+UNTLUiSeoLtvj2
zDaN{K>21lDF>tG3z19{CILiq0isgr`72p2UW_w244D&Q5wT%b_!bomw!E<K<d2gp!
z&O{drz<`tnv{%m~-#2_WPq6{<<S9j(%VrLaZVwnlNU1FH*@3=EG0ec+7(4#`)X6QB
z$@~PnC*go9CX1*M(;K>cR`Pi&-!|2M{YkSyG({Z(s>vnrR7k*!&L>3hzJ0konhtHk
z|9e|0_zIb#8+NmCu_a#jSQ5FbWPwSfW{RA>nEy93o7*<vQRLO{hZr>mo<Ckkt@Xvb
zOFDiM2UgoJ@;8C%cphz)C^{%a634Q+y(3?Z6Gdp`a{mr-3u+;LlY6ZCFx~h#x?v~O
zHzOd<)B73Y7|^ZAPer4h<c65YN@;vmYOh}+7#U3)x4l;*10C5mq65XkUWh}@X3j;c
z;bQ?u9}F>dMLCJ#So^U<L<uo6qR0IdTK=zO$>F55Z;zrSayjX!fZdF2d1Ml>);Z*x
zfx6WEzGz(n3wnXeeoyT-em6W1t0eZg7uA&hpMl!`Cdi3Jitm0VGbb7R%`EHFC@Wv9
zXI>P~+m`Gl<(J;J;vdKIe%Kr6UHb{IY>@e8QY>91d?k+9R@93dTD*eNFidReom<vJ
zp_20F3)d;0`5qZ4i&q-gBv&rpxr@Y=kPD;F7{2YJtxX&{KwAaPlZ5@~SzYq%9@4sD
zxSy3~Y<t(@e6l5JVa&Rtl@iVUoChZpWq1pi6Pnr=(WcHCFd$bQZRTvH^j-(;1OWzY
zObjD$)FhQo7Xh6y+P7`e-M(L_$WU#?QN|_^vsaE!+&En07m^)}xjU#1vi0}sa&&WV
z&dhNsM4S&(*>PrfAbwLj<{zEM>dtF7C~<u@X&2=r%hmnrRR0@x=OY~G?%mc^2c4)n
z^dNQ)wvga}YVf|Ht&K<@5HI3T3GcG+mAfu|(s0!>;gjm)b%*|#<E0lN@_=gc@ASBT
z0ZWk0UOaIM|Hw<gItLSy!6lrC3~*Q;zTb$tTLx31YJsUwpmcc;9o#}p@aozjZe*=D
zPBO}J7vyd5OE2HgPi9jDp4+GQPsc#0-$(G?L-S+yox||>4alWGe+2kY+eS*a$ijZH
z9pKcp$ii~bq6Z0dDlHz_wBT4%<<1-c8$5aNT3h9zxk4@&>GS?Nc?<LrL&t^7NeX&d
z`CzBc$aT~@jCtS^;o5rv;7tp>1bfO8RR#L&pY#EOJa)=o1s~4hYdrEtiHWMU?fQ6M
zYIo%NPis=8P#*t!3|6i~@opCe2OvulP)7rRxDBF+2y=z~J`xz@(L`tP%+LMs6f5t)
zi*ORJqk0d89C^RitzTv9YuIHYAECk*J-2Rw8T%%FOL>T}D=NQM38%x#U>D;&mqEWb
zfqG{MeZThM60}qb4Qzcs0r+upZ_XoW*RopapA71a6-JChfm?zYANP&7u`kX}Dl!5?
z0A(-G4FfPc+F5ssHuOuZfLjs<Z^p~pYoEuIPyE{0ZI5kj+)h~UrFmK>Kj&u+`8U)z
zMca0*X4#p$jR^8g%x;N)NMX}$RZAY))_#-z3F3ND{LpmA&!4|7@O>)T-9PiZ&s2Y*
z$Feiilp!yj@98Ev=o!NGHc<WSvdYT<y-RsxU2>HSI!Slom3fQvPEC5_+nI16NdigC
zZhjx|cnF|gm*RE2W<vTrn^Oxrjr~BCxj>wG?P9NRE0A8T4PQL!ti6>Iy}5IG`Mfym
z(k}t<jn21>j_FI_xD5$x)QbT;0N0g_Wd)AQ9t}$_^>j2wc{3sh%z2Szr1YrXp#Js>
z*MtkY>@<2;8V^VBet=;H^Qy6<s+FxD@f5h7;U(~%ls%fD)7@6mcC}R9o(^p(5*R=6
zw?c-uZV$;f^HZ6!lutA*3*U6Dr=6>3?hW*Bi7zR7HMM7!BG``e8$yLZe_-D*;3om>
zVuo<#RJ`h~%!QLDj%%8(IJs0&O}JbW{txeyi~T|vFg@A4g8;xqH1^}hWj8&U*3!}2
zpc+=zgdguEWJv~M){D6XHVJ(J17dm8d3O5%^M;TM>5}=@hfJ7fJQlIz$MW|4g>z-j
zp|G4QStRwb69k!>{u5;}l7zW&9@GChzmKV6D>GU`g=y~Gb5$`zb>y(^`r&lO*M**v
zzg4t!9vwt#-Z!<6;d`Z+vB3!QE_5p?j-lm)wJw>du)M<y6!y^R;ZX&G>_Qs%z2t`?
zZ_89_N>jrl%RCo3d$Eh;0`}1y=e_$jRX7r;We_3&y{Uj)NZ@72M<aF^*^FZ-FG<WT
zk2jNPi(Vgai1*F{j|lz;G9H>sm^y16eq~s5x6_72Jfom*Zye63(jalvhP5e8-r;G4
z{_Nv&O#n}WaQ!rA$gL_Ew$_nG;GfJja`vW{U77Uha!P+^0Smy`fad1U4uepfyJ2fC
ziS1oEzipn3fs4>0JJ6g5*^$KJX&OXJl=izjLoGKjQ;W%#R=Tg5^P<?XaPFdLSu@&y
z*dqA6|LeXYrBEC@wX9#6I9lFJV~C`WjwooLk=g+LX$JP0vtKjPRy6kfVk1J+%-2NL
z4NhDxbS<mY^W8D<g%a*F|8D{F0FwMeQ&$tOne3K}a<AiOGa=>pv&Fz47y@v&janfQ
zgi?%Y2jY$+KY?Mk-*C9i^f{!mXO|vx8?f)!H<}-4>!+U2vk9I1!LYjnC1C9_Eq!E6
z7dX>JUZ;6sWe1;mN9tt`)ow)|=v%pYzvaueb7!DU@%`qSqnXvrL~@oN7nrHaSU2R4
zrF^NzJ8|dL<D%m~`^fM8uiUm^LY3oH24fxu-YGwJ2mcgLbxL_8sQK}Cav6PJv+3#&
z@oFL-tGtB6GaVNXt@E<<H8<+wUu+<C#In~Bfl>?3xf++jOc|+!->Ylcx1P5Y7Lfx1
zd+-MuQ<-bi^JOfiei1mD=<^%>bFa^Rm8({*0vvY&y{f<Rt5Kl1Ww<mK%0FO+fyGmq
za`7CBqfBKMe9ek5kc}G_HY3z^MWFS<n4t3{Yp>HeGaaGLBh<VVed=w^G@v<EzwD4{
z_w9A*P{`2FypNWzy`SuzvpLR}6C!qb@>CIS4%xKt5&Qa#A|5bc$JC%#$YyUnexz3b
zUEs8t4D|YLl<SVlhH5RiS@B<Dpb3N0X7<^8A$lsup+hylXZ5_(9PdA2t&J)BPb3I7
zmnO&Uv$A7$8PN-{g-gX1sz03hc>>`GaPEo%@}k2BWyEo2%q9hd5N`vL6&u8}hdjKh
zwgodO-u-;IQHeM8uz2vLUo!P~VOr!C$}(W-%c{DoR5V-6n;dQ99?)cClij;8ol~oS
zJbO$lCuPLhdtgI@%<B5`>E`d6riCy93&ideKD7KoBdvCOQEETOAv@NrQR8l})&<>#
zEhIV1iVXu<gj=9RekM5CN>mcV7b4#WhiuDZL`2twE<_<kOp@7Fc}+g4Wuv^HRSB=u
zGBsYP)XlCX(?C$Vw2hNOb_wNE7xM&N%fo%f5VucNa@5~W%UM6RwFj9A(?=gNCP%M(
zw$r(*L*%J09&b|en@s`I5WCJ?<2qBo#mucII8o$a7IHQLgQQldc8>V}?=6-wOP6Ti
z(KKY-9R?wcLH>YKNfIsr7;6`~;+e-(!w6Kj+V(iG-t&p2?ouAwn}u|=@QO!_6b&3$
zTe)o$%YjUG>fr)l+=*)7-IQ{wwtF7h{S{AOCZ;{ninob@M)ss_lVDCMBf*oGaO$*B
z(l0MCfDy_*%elj=b~>V=*y;tbtpo+`RBIx5n!NmMD);!kcYtVs$(Y}_nI$c9e(|R6
zPt2=-0`aQvQ=<b<XFz6%HTG2(Z>jLefv1b4FhwtSlT%?5gq)Io^)3H`>{tmtJ{WNK
z+RNrH1@GB5+SJNL^N>eiVW$jks)^7zC#fBpxGEzCr7{)MhYx;+k`pi<xI<6-fMrgw
z2)`y95ch=|dCK>TxCrIxp`7;RwbE^S^IQ@wQ86~;zT9s_bk%UN`73PvYz`yh?8N4^
z1feO@?j8fMU4;{-6b%r-X>1iZi+dX=7BF1nf;b(D%)?)6Lo^rIlALV^+%8_SDfbla
z+`aP?_7hs5Jcfdsr71W*ouMU&*_u3{Hp#4GMO_~KD+Biqj<tXL;mpz?8t@XtdfUCA
zyIT?B;_X8%J_muU))07kN@SWF`I)$!QM&*?oFOrHh8}QKF~yfGdszhfxdiYE`Kkn&
z6zM-R-4F2!p-0#S-uCP0X!Gp)E**IQ$76jtTr4ET)ih%O&!`{<1GkF~jzCM=AS8U{
zP<!}{F#U0>4cEPJRd~*))my6e%AtdS47a_&`KrB)VsYWp<r+K}kH1r9RKfLOs_JDx
z6!W2fjQK^Xa}23iM(08Y?stw53BX;zbX246f3^TD`OlC?p{h~c$0*h5p}mRoXyGM5
z!jv``Wkl{n6L_)5#sx^ye#IhsyIA==GkRK{oH9^UuyxJ(n!DJOZ?RKvO_nzN;E?TU
ze2m(dN`wW>nB4hpH;OaR<*=5Oj5NV@PKi7_d6m!y&_=A24?B-Gt+*#~u5If${ve@$
zG+RI795ds=so+GZdf-F+4v)hH-;l&Z4C19{+Nyp4h>@%CA*RYd8_qqYLXY|bsmS|@
z7rTa=8^LPbytR*QbGPS5FxQnc$K>Nw?`P$v=14#pUbPpA@G~HxXMX^{{u!Wtf`p?|
z<)*1iQ?p9qYqPfSjvrn75nd$$>RqcoL(n!Ca$l;2TLSoh1MW|I=l``P8H(AEK-SBc
za}Q@$=cLCGauXK4uhS!m$u|)fC4}riz*WqDsJdK!0^2d0PKnAl#w)-}N8V;1Mj%r0
zMJ>lC(<EwE+tRH{>VeUK2x?k%F*^DMe`y+0jGQdts8MtKr2aV3uhgA&?5tTsM^fn(
zPUz{MZR|8{<e45q)T)==Gp$g-f?VaQU!%sTYZ@@DtHsm0FasC{hGqQEHL#TQhQ5%n
zDl$O>S!3W{hA7ZNN|_T1O?aOo^1h-;I;}XR)WpV~(Eu-SHDh^Mv4QTXt{hkZ?wXf0
ziE6!<@teH}rH?Is-2NMYcY+GVFS#<+1r2I(Cpbmzg>C&o4kDJdOqLjfD^1<45EmPS
z^W}kfrr3B`*f8UnEFDm!E#7IxY|ZN5%NXL`dx!O<xNq#mGk~lQs~ky=S1}E1Xs3VO
z3?J#(H}2PQSB>2o?qv|cc;sCxM9U11g@+cARN1^e?UfdpIX^yL(2H`XIC|nayS6AZ
z8Ki%4RvA+XCI%TweMGWiQ>tX9NTvFopp!)h4-uTk+KhZ6Wb{uxL>}~dbp}wFR7vPQ
z1$ghJ3t}#*dcOADC+Tj#mvPZqO1)YZ$BFX1iZRK~b4}|BzUV=Y12m(3$#?>}ku!%`
zPP98Q{r;F*A?j0MCNtUp1ny;c_wgDLop4WubAg#`C&v243XJf#9^a5_nzITMJ#)ZC
z?qvw}NjU7{DimS9JOvlVk91x~nq}A96(6&g!BzaNjbIX@e3g@7-qwV;C`D1?C**k^
zm?YGOZ@yX=f|M=ZiYq-$f~KTUDtTHzftXVn9(V6$=APw2dvcQi);kY&g@XeU%BQt)
z!0@~K(*u&u`<u%cqbJizz#HxFwY%x3zjt`_DKdt%uXymFIQ!$nVZs%yd_C%xg_JYP
zfqzZiuOy}btkr?~AUn`3K=|a4M8)y3P<s;Kb{AM-TAZdf^kHWCnd6a8jt8Rk{eN}*
zpT<HOeI%@2&muSzyS}wk<HJokyh~SbqP!TPTBbu<-~GG(0QdJuoI89n;{zu8D}mfm
zw}~!?*24EP<kcpnMW)5=i-2tq=v=4g?(cy$X}1aby-Zu>V_bZI`j5=y(>)SvAd9zb
z@u42bZfY8m5int1mRC{%G!N^Dy^7&C=~R{j*=^21%<^;DOPfs4364`gH(v2%<dFM0
zCquLz$Q|F3(dA9hG>i84Q_j@aeBOoZJ{InKLF67f1!FYE-0H%-bdTsRdee_q`2%JB
zv|PX`4w$SYMYdoN_GMBR8T8M3y#CX;mv2c({X!3&B0{|)(ER66ext<ESOTn3f~)Bk
z#l!{fdT{~XeGD!^GGNO-#PB<L3-gZal$DEdi8zqrgTz}lg>lw4kGm1mGEJ^DuCuGc
zdlJNJ@%FQ2<-I-_i9p~}41D3IwVN<Crt*nm&uc^ROrwT1HUfW3jO~)41-1aGlugs`
zPqDYnm4jR8Pp2IrlKbN%#3);g!nKC^w#;mI9U1P2`c%rw<wk}1efO2H@2?XzhIiEw
zNRF*wOZUe-A(E|1b2xFGCmaCaga)j5w|=Hho{I0eMSI%(`Z@>_7`aIza=H}$;(bW}
z%I$XdQERlYi{;}CMx{V`;g~AILf>@`IsfgHsRyIp#{LcKL5C`ScM@i<8qk_>0kamo
z`&*M~8rhnjX6@NiSi}T=WwNc4uw4#ZkcZ`goDRY44Ej#ifn)A^`{$E@tfhO`uCzy?
zsi7o@5=j1VXkX`g_egUD*}tMp`Evv%yJlHE1~`9p>~ui>3qFqfT^xsvjsk4PDsW7^
z*pC(n41fqaSN7E7C*sFIa9Ff6>ft2P)_a+&wuJD>6hi2F5$BYu0nLy|N4`Amzx`i)
zAJ16x-oRqsmMq6Q>(f0+7_RQ4pc|$M#yK;xKRG%{=>f0T`0k>g@h?V5ZewCIhb~8d
zDSKS&I=S7Xy9fyofD^xtZt*R&if*nVk+Jx8TBgy!=l%ObA*N;*sECVoVAgKu2z+`n
z8t-0ICHIQ-F4W3f7}1<^sI3ktf|X)FPifTjSrQ2<F>X$^DYNu5TAs`$<UrFib$5ac
zk8)g=87>USuJ1GoubEf?9=Aq0B8tPAUu(a2rG=!S@Ak@hmzc#(t|OSM3EAPdQk8t#
zD_CDLO`qST^fKP03{e`?8RZW=oLkjq95oNC&&0)SCkr!vxbc4a2(&{2$y>XA3_no}
z1QK0#VIs!!>?4YhSaQ^Bkyot?IR=kK_m25x3h0&Vt?UDcNmiRMU2J>1+kW4agF!Av
z$85mRKHzS4t`8Z)z%Nr{rW~l=d1l(K?}r?@1@r^|r<1c+3HOT_@jS4mLJ#07aC=*5
z3ZPG6Yo<Y>$eVr;hvF)-!!v>N^S}jUBFp4CP$B4ycWE3xq<Xl4czodOeQ&cK^BB<u
z5v88heJJ_tx@P@VnYw!Gfs?-TM8?N)qllB9J1+XPC3fZ++t1r-{2Lj11c#|p)(@lb
zZb`p17!`c}+0DfOP6<>;)YZ^0f;M^BDY-NLn*j#AEsuUw0Vb{558W7tzbNCG=z`e!
zYiE5~vrZNLa(-e%Dbc6jAUI+OYeDUL?pErWRN!njDHl@Zz&VW`;5m*4ej65NT!kHw
zZ0x{*Iue|D!SA2qnp?XEnF6fu!h99f&Swej7rl%uD9<9$s)1zRnuqw;kUYp7n>d(y
zap(GY5-(vp>auj*qnj5V<#OX2sDFkQXaSGRa_45Bz*tpbu_cX|yVvX}l)sf1B{s3B
zff32{$iZsQc8NieyAlVFW5HfWU-ns|(BaW^8>sO4?;Z<PT&;(p@k3(vDkq9eBzxpQ
zCSX$yddhdkrYGdCm_?ype1Num4OPs(^C1E3--&SqX7}l?Tx_S?-ciC^Tp@=wy~b`+
z;`*XZ6i)O{fd8Rrso{b$#GxD*OLhv+D>^+y32)_;d;&D0+Yf|K!e6}UR|=Sk6K3o(
zIDh=D`F{Y#u(|-39gc&J$Xjygmbg=q>Hx!KS9mn^{-0`RtgV~=>D(Wn{arSV>0@>j
zlyLp5roq--5Y2R^J~m}I0>V28WHX0<uYM9(TB?+Fq82xJmQQYm72TV{g+Z$u0|Aex
zOf%UHS8vtDVl;|b;eMTU1KS)_tyO&&SHpRcwmN?fOs^yEQ>{~-0AlIMx(ca|IIzka
z5oR{PB95)e*EOg``+Y#?NM~AuZih(~Mdq@HCKQF5qg8v-1b!ho!^$&Z`=^hYi6qy>
z1o;_Z0+fk9EGDxekrV(Z-U`vptgNFxwrK6x4?aC>*j+MLLi&6k3;kFmrncAEp#~;*
znVi+PCCC$qqd1UiNj>`%@2AuMM%!Be#T9Ie+6ivKB|snvFt|f-NpJ>tcXxLWK?Zks
z4esvl5ZrBWcej6X&b#lw=hdlu>sGxtRkNpi_m-aSp5EVDy=JY<GU5(k)t~5JBNh(1
zWj+r}WF<$tcb}vn#G0<sOs{;1w<A$(Er+<Q7PByncOjN{b~h67OdY!gQk4-QH+e|r
zCjaUK5=b&3*HgKCz7e#v=eneE3k-It8j6QJAwPCC_aTIa4CJ`~16W^Q<(_PuZ$j(W
zeJDXrhjr{j02*(@uNu7_nrXGv(`U-#?y4>jpsmpGu*e>{Dp7~9X>@2E&y{`c(dEOS
z+z>fZFfa`W`BDe*rE+bO+<AWvFl-)$YYvh16fxdLw9OPRAWuxpvS~9b`;i|sw5*(P
zQ6Uoy^ezu2{oA)e#V1SKnlB_f9tOWo-P>mwz~Y<u0vd?ODjmV~0egh?uSbV?lg#IM
z{)`1!F%6Hx$XiViC&vt6i5C(}LC;kAzF>;B+|YFQ1d!`p+1O`-mmD?lvOBH{<Y~~c
za)Jr&nr6r`nFw=9M2A48KgBNm*<9gYI1~;0yr#7S)GwJ~AXxT<d7ILJWI|zkei+!F
zmVY_oa$2lr;@rhx&sX!j3Hf|q=&U@8iV7Z4IvSQV9RvbfM8cfz$O9D)@bpj|Vm}p;
zi38v~I!bhUD;cy!M~#qzu0uC;P7d)vHURO@m^uglNW?c~2hrVx_O=u^am=?}hu%70
zhu)Xah(Gq+m+B~9s$`g#-vc|u1WNHTkjn3sJH%cWE}tLTCmAp+Xmf$HY*+E#(LhCY
z2v3p6{)XHjzl`8QCBQq{)$-|dUpzl0^}$5^vVpa!G(`iI9IWF?{#b5c--4+DwnBCc
znjm*MN?s}H7n15Qbv8^-<)t~otHaE7eZ0uhVWrs$E!DYh+m!0qf7kv=T-y5xZ#E{|
z6a3)lW*7w9Cw8gP@f#fLJ&CHbkH;C4UGR@H{PT3Sfnh1$lcf;w<B4>gW=M&@5H8Z0
zxrCHkT!%{MLy`^t-jjcfxP!PMa4rfve;sNZzb2Qhqgb*8Ik6K$$Yn^UtDC}L$m}xx
zpsY_*vXKz0VqxD{c>j4!L(CNB;M>U@G6M-#{xo7cbu4$d6lyLnAz8igtRY_V3WdUD
z=^;ir<SK53ygFVlIre*+Dmoov{mPe-hj=G1f-gC3>K&#_^9)PK5USN4Vu66KX~iVN
z<IF6>(v#?;@JMXJ8KfP^C+8W=9}=q!=h9&<a2RGa69@V(H|5$PtgCY}m<8r8Zt`!p
zGsr2mA%$QmXUIPQ5~U}%1#_H!+B#6^sSU!UA~#eR>vJQt`Y$A_v#*CgN+F0^oH*%T
z8at&tJCek=T^tJ~H#_2Z9qI^qMvW2`R(Ver6eUi2+wZ;5Dz$}?)pJo{DYcC@mgv-8
z92x~aKXdfuK<-v6^d}eszK-UfF09&6$OmRVU!Y(#87baB^ZhpI5-S~k8d}gKzdC*J
z*p1gwxr9u0t{E!&2wahK(X|#f9HBXwu>Q$D#QQ{`20Y|(;OpbYpRvpd&+*U8?0i$)
z!=7t0=r#}zJyi2f4xx2X_QRSW=^AU8@N{Mh`|NFX5vnl(S(Ht3C0;M{ajQ(EN)*Ke
z16tQNbtv#sRq-t1k9H?QCn|m?h>y~G+ua5E5M=7erAtx9EW{vw=#JbX!U`v=??q$4
zWlbC+zo2I1ym0G~u*unsSi_qzPnaaP;rq=z?&{+p1E%Y^;y>BZ$7Hv4dse5eD0(#_
zf93mQkwY{`ZW?tBC;*ds6*kmAB&>t0D(`AKvC?55uJ!;GVpx0~-*Ulcfu2u(6Bn0+
z9tyU-20`GuyuBiP$&I??1A0*3-dBv}S5un+Tepl*0Iz38-35{BVuwcck4)+S$>%z%
z2~XgKSl`>nG%vH~xnJeSMx~h%8I5~4o|H8#o@-~#jIq-g8OuiVS6$oHAZFYfsq2UG
zp>!T&d)BPvm4x|iQ}Vs5Tcp)Zx6D+=h;S5d`=8gL!HE>k<QCQZ0|fZqaAy<M?y*JA
zQ<ArP_g;Tl_2O)1*m4sBHIR8fI!$;0d|qI3bcLqOK+el`8v5gQPnC3H;)_wbjLOTP
zp=<JG=h2QkzrQCYxy8Y})bWndITuQ}>!UDc=n6TOV`<`%aO>Itop+m07JZEh50Ar1
z=8#rQ7*=cm_M6J+R^gOQa*}I=t4Bb%4xo!8i}ZNNwzOl1ZsE?2_(Kh6<+GAPHFIpJ
zo7E=u`Zp>yA|FZe!@y4V&>QCDm0a@2X-P$hBA3T&bla2_#Wz9jNysLHZt2Q}soP$5
zx5CJC>2_#u%RyoH4Y&1}gZIpaSH%6K#!A7_wY~U~P&Bfwm7@j4I8Bg|>c`EI0+6?#
z{q_>f7ujY+d<Qw>6X*JbWVLE*Tsm+u^R}I8jXx(5?+${jJ6#=0DaEJkMQffjUT$^}
zm<430p2=mr=S<Y3nl6}lbGvR4LQb@dFDTYvK*H;&G;HFFl-Q+{Z9~bivFAS)-ek`9
zzT`*i+grnN4}016x!9pedmMV}2s1&9#v^>$e$!D#d!p-O$Q_7z>vKrlD@+$-yE1x_
zpm^ZFGU;<OrC=U=7LJym6@T@CEawUT5r3Wd=SPrAV!Q@S`u5vsq6W-g1m3~@!T+H1
zw@~I4Pp7@RDD#<NP5w(g`Mk`lO5*Brf5m<K$e&9trJ?nXGiH>)bE8+mb)%0_n^$oc
zzegB1dTN9iA{n{pa}D2}UW(;xF}nuc+b33RG5=juBn^xhQGGe<Ow?c{N`x#?=$w-L
zrPd&(&+R<<hmE7`9sqRD2jz%}5yk~=b<hvD*EKtQNmvs|Oq_2JGJZzZ$(X;>+6|C&
zWEalcVrC%3I%z?<s!QHKE7o?o3U@==nh5RD%(N$>cGCvwEP`ckN8z<nT}w+oQ)-9y
zh^L&DOYzie>2C^wBNcd<s~=vLdKH)Vl<c7z(kx;Q)i#{kbuO03nSFG&Rmd3aLT&DB
zd{CB!D9-m_JH$LwEd`NRmPU#kc$lSAm*@RmOG(+D=9o1qCq`*FH<u!?m+2MAC8Z}n
z7aATMedkGt$9Z-N(Yd9iHbjI!L&bQ;bWNWR-D_uD<Bj<OSs1i_?1^<mVrgCH#Exu}
zO{BZ^PECuc(DrzoT@+FY0A-|r+ApueYlet$$=&tI-M8AH{JSWaIoV<Ur1lm{F$vTP
z&5wL3fFuCK8n-sem!qv<qr^8;h{-`AxBA7x$}3%FpSs4Hb3MiMs(V!EBDK0bntPZy
zPyI*B9>7awjaKl$ZWkMvPW6cnE){Os%|u)$r0Y=KDOVcQlJNY4{czO1J9$E`&_ZAW
z*-l04<@Xi&0dyky42bKddN4#~<{)KXV`5vokGvST2gxpaKfq&U;-6?6U`^QQU0B(5
zEhtivyw(?);HMHB^ma%Di2^>CnGj2!na*fVy6<+a*-Vl1iykGzPjA`B`jPU9!QIZY
zaCNA<fgdm`3^zhd;9TzDdo$r6*|%Q2iMt~m?_@HSJ_#Ov@UjZRB&oI6@7IxV6Z^>r
zs^_DEZF5VA`Gbwi#9x)gxM10WTVcokX+z00C7GMqQA3Q$X?ysQ!u@4Q0r6q{jz%+&
zpr{gmz?Ox?+zy>ubA6^s21keWG()kQGHo<p-gPGpo`E=4dLfN>kvus)9IyB~F<F6J
zx{k{=nN-K`a+ysmP|XT@=OtaD(#zmd1eqpYthbyKAN`OhdvUzC+&3XcsMZF$m4r7V
z!E60Q9TalBxxy7z@`3qj?5)evl;W?Z92K7~>AYU+nVN=l?T-exmtN~s1_LxwWRPA+
zw18b9_wpTLc&mHu>#~25wS)f_%PN@~)}q!!_@$)^yHvcV<L0o7eJDWVbxwo-h#rFJ
zv(dlXXds%`|4_3+KIe@P#+Fn#)Q}Q7X!y2OSONC8VEfF!I@r4U7@5Sv_4zUMUlPuW
z*~6sJTF$o^DU>oQ7guefz*=f=AJqVDWpc;@W5Y^5zy9-cyo@7SWN)J2<I25*gqekg
zyl0aScY_KeTFE1MAK)tAJ6e0u)3Q4W2SUuyI`m%)w*2;-1??|(Fn@N5dUC@;beHRo
zCFbH6ry8k!iAu|{y)8CYY%e(@_VL{Kk$nv<wrCpv$d$NnQijTS7U|TQz=xK637xnO
zrH4owRrq_u<0Kkukla~mF^NxppP>#R6-Fc#J!El1rD<_{nCd%E`Wotw#a|IFl8%g^
z>4R=B<jVW${_VLQjRkWorI)j=a^mP~nUy%4Hk*7fepUX`;ciPv=5fCQ#IngS{m<ou
z<r|Rt5r@I9#$St<<iM%LhHgfKpZc}?&_@fRDTZ%x7iz4zcMiU{KI<sCuiKFU#^*SR
zyB}svl7`&FhcZxW+r0R?B(f$J49F+!r{whnT#RE1AC<UW&7l!t*SD@sC_yCWOB7U$
z$V}yD)1>tV$U1mK#!wqutb^2bI>cUs=QBa_Cx1Z;`{8QJ2maT4XzopI959Po$9{YC
zN2y0)35YcC;AaFBnPN~+pn4P)@Aw^02H8JiAoCxox<Z}p;tdFrUiMBiJRXb3{7ueG
zGuSKHLU{S$5U+{4vG}_5I`sOIL**~V2GTp+gsMXt7S4O^5HGpir7!iLJiAW#cc*p?
zY`*to<;c?SU2lA{dh=NB_}&C@-J$K_uEQLrCMV`eWmpw=2LB<PXE|oMg3IEOj}ad~
zL4>#(&DbYWt#EHSO7X{?H~5#Fc5~|zof(y}mw&2cwO(@W-bi0a65j?Mg@dxaqes>O
zL!~hgH7&JU0W&DVyc`faLq0Dzro=4X2N5)UuvIQr8w9PF6`Ggb@%x)0{0mWfZrDL2
zrux5H)W4)zP~{zcYR+Gus}rYHx=nHGeIgB97QXU65$h1Un-+lzrLez&Fstah^Iqh1
z?BGKL-4zHvv)(X+NndiL6c`N1YuBlo%p>0^>iiQ?=Zj3tj*N_zr-=VStk<K+?XL@M
z%sv)WEt6+9TK~AMX8(1lK)VzET`S*u*<UDT%lKbgO7DY4)g5M{mz?mu|Fx}e!Z^gU
zB1k+q`n%N&e){;2#6Pq6%NT|O+v<sKIG^<_c@morQcRDSCwL(3*m#Z9x9^3nYOvNZ
zHKIXxf9baL{?)U2^(S9#BEU}c)<B=upRDN6KcW7lr|j`M!Gs940{bqyj{&@T_r9ob
zqX`G{_wM(v3bOp&6MZGTcAo0Q+84p8-Cy}SNPqz75Yd%qw+rNDhMf2eHTz&NM#HPH
z=h{^7{03kXLdDRXdoKWT9oM3adLEH+Jl_e8tm}ZbeM62I2MIRU@Asa?PR7G54bFVv
z1WQ%mL{<vTtD}1sy@SLdn{x(KW>BdUbJL)Z&Di#MjN!B#bCYSXN2(-!z-W!3y~?Ef
zXxqvoo;dw6#bT@jGMv)&9vk_~Z*b{@t3BJ`D{a}DP%BoXE(Jvb4~RDtm6=Zh$H4mz
z9H8Ue&fwKlL>IepW9*RV^YJ=@9y`Xi;tpP$0nfqhAvA6B{^23&6U1E>whIrt4=1)w
zwSa`xobYp{8t-}_BRP!_2T!Z!gsX{Xe@8}P)PP|?;0YApwFi16N`-HOin;|MBp^GP
zY&-k~tjPTo8SY&fib88hlP0lGoDk2mzRk!q2;*&x%paSX7H+4+Z{Bb_B`Sm+XO@`k
zuL&Nfcm{Rx4i!PH!=X;;FUHiB&W=mTa;K;__{!va#eZkq{_THi-2RQ}e>=PXoBY3G
z+y2+W{=c(rXM|YN^YJ15Gi3J%B-gaD<PjOHA0IoPn5%kWey&h!ZvH8c^c{#H@oFsN
z;n|0kacBA!j3*ekAJ75utAQr44*L@k@0W7c2x-(8%rBF9Vq(~s2Ei~iRyWJ2ea_A<
zOX++YBZ*Snkv86tcYCrDB@!vHPCb9Jv*!Ele*Tng&%#+<ByClDC9lFmTr^<Iw;`lS
zjhQ$dRM#Zn%nw<Z4lc>`zvPO|H5CF1npB_=Gj&^NRdh<fPc9y_a(?6Cm2ZaIwV*wD
zAf=imNOdS?6f-lo3+!a(jaMGoWpNgQ9WgIU_*vYVFk~UJ!*)b{_;FEjtqCmu^=5o$
zykIUN9*Ropn^9u5d{>$w#K*N!*n#I<ovxE~VhVLp!X~=kVMxAG!nYEW`bA!cW$wN6
z01aqO4PSqX=Rj<+AWgNoyq8qW*3V7!wFr;2jrH|!EE!_YW8@$qeXqAHiffRR@+enU
z&ePBAl0?~&;}o}+*KY)&CIQiyzqxDMt(>Eq<<@Tm5Xg7xXipc523^dFvn7RZI}3yg
z?e34wtug2pFRZJ4#SWkngf&X7t)<|%Nb!Fpcf~UZ=Lj%2UaBonMj3|XqJ17X9h%h)
z>$&E8c6i>RY<9VSTCO04*y)IgZ&$K@&yXxfT6m2##+mk=pqZdu%yKb+PxBw^srbfL
zROmFR1NkD9TZ;={Q>zhLfq-e>P6GH9Rb^X`Ox<GMFE$Px+}#+Zunl*Wm;K&%LmUyt
zqk^t#m)rs>gHZmLhW?GAgjzznmb)-4O~ybJIJ$yF6NPD%v!P8i0GvN=74<V;p1dAN
z3UF3MzK5a=`&%&uS(W7I16G)j0n?-w8s>Vba9(v5ZWnoNu+rwl_)lW!04?YeWbcD7
z?kjj}aZ90}rD+ALM6pJ4nq*5Nmtl|v-q?t`Q~-xeo1dWTnoXkpRCzEKmfHC1-}Q81
z_CPbMn$x=OIonuvb<`1tX7)lWS9!%&dih6_<MCa){nSIc1!yN=-559m-;)<n@f%~i
zzSh7(6T>JMRq(6m#!K>kZRX&v3{#!l#Rd(G!;J2t6!<HxV@B#qputtue%USL-1~`V
zezBz+MRJ&4P2(fm9dO_&t%t-p1iuwps7tg(F#v;P5jd{>Rh51Zn9U{MrE&KZdG48l
zG)RQKii6Ita>+7Adqx(44K}fSviO{>w)Ll(5(o1LeQXu>nAX%KkitzOUfwkEd%jqp
ziDLt=i>DrkMQ*^Cr#Ab>6S?y{19haWhu`WN3GqncZdz0}*cH2C0eLyfKB#B9(ZA`n
zX%EZ3Efi)6<S3R{DIUd@vh6wY-8~n|L%&M3pW)1R@+|5M;pK1I$z-g@B$X!yyd=cY
zb75H!p$<Pi?xGx~gxuYHNE~^DM4(-bS*H<A{L(<}WaAJR!^3Uy$F1_qB^qHwsq(*>
z_E`SM;luw10u(bcGck4i!ovFRrae)6JvSr<DLqF=qc0kakO_@Z3yDF%%+W#C$X?LK
z%GSo($lCD>2NHw0wWE=}t&OD~<UnIRO9!L>I>-kL6YIaudj`6`zSU~RVJKvNyKip{
zdx){Wx8B||N79nSrr*Qd73Yc1T)e%lOL>>(9lZOwXGPtp#H<G?dCK9i+i%n%^;a5r
zdpn~zFqnPsc$e@_*^<k5Ly?Q0jp+M%j^Kxqh_^SJ1HJk8Fld#OZ#7*(ut7u%U1xO>
z3t+5B)Gv)1RKhu^StD$Z)lmh|2pM(MvA>}aZbj^){#L>T>qczmJq(4ygV^6X%r_;3
z{jGyVRbJ6s15H>u_Ki#mw%EnMnUnTt-mlp*W;=QC))NVLUUgXIqk|e$US3J$bQnV3
zY9?i?pq(bn<-qB=62kZhy_4h)C07P36*FV0ul=hPa<|gx52a24!kn!i>9nXjj6@B?
zWLcV75jrI+=eYBx*==C;XiC1F@4mQ8Q@=`x-l1DZ&HcM!@HfcH|Lm__|9z~N|5pQn
znH3V3@?V~SC+Tjs*uvOB6sgd`=y+g1?B57KzC#0ujX+re0h&Ka2D9xy!lKD$3-N@?
zp9{z;!k}nx2>Z$RWp7}de@DHb#>s|3LW>Kw4}=lx9&fIkKR%V5@L09Ey^;6!0kkY0
ztS2U)96(-dVH{REstvirrPMk)?iqH^QM^>9Mj~u3UkE%6pt{KVpBe=*q8jMbXnHfl
z8x5!w6fL%Jz_h2jA=pG!cSytsy+l$V&7c>YoJYe`Tcmq$r)wlQH2XpY-O^5)k7+|h
zGAYM#?tB*(yL+gVBSP6KjQ1oi-_<l*e}3bv))=>0by`>eDHxBYaqe7r1l>_vf5%^r
zXS3GtD!31Kre4Kj9E+n%Hs09yX_5aX$C2TJlj^^y8R}=F)M#B*e|(F~Gq15nu!Z2L
z(3Gok=CZ0TY2CvL5`5pKbBh0cx#&z8aj~jhxZFfP9$R1P^AaRjGPZ-7Oe8%?S_%lE
z%3DMJ2oWY;;zc`Hi7MnFQ#m@MvXJHFYm=aOX`g<6I?mpC9*=(2&1t~e@%3UX8>Sgi
zzB7iEi4axR=#drw;;{u+31h`QV&9S=@KefT6W3KyoxqGFDJyimYRq#{(7U=Klv)45
z-U5FlNge|3cjMmGaSZ^>5x;noRTE^yqcBCNGxS-KyPn}tuZblOGn|5NAk{f%RkP?^
zyZQ!cy<KCuBpfISLX5{{78iGFYy<WoX$#a+ur=$WYl(poOn};exvJi0kE57DV94zj
zm2bW6(nHYpT9;$wcq1@PLQk2oEpVAMpz{RVSVVeSCEeq~jWP2pQz-M#<$-R`7#8(7
z!bT@r+H7o=K!+pM1tD{1mWGG`<|%L5^oahxIQ@RQ6)xO0z_;lGk6VPI#qbp_yHN|V
zG3%Y%DqDi0MOo`~j@jB=GrsLxP)+<)33o$ye3PSgp<N5vRHkHUng$?Ry|`i#d4+uF
zS!}xAeEcMO_=QY=1=o27aPA(f(T)0(>&@~4orYe7I`n0%Y{S>wBv&N7NGO3O<X|2L
zFF!eE-eKh;{Xx60L>3}H&?Hg^o2ku;K1i(5ByzVTk(gDXHRgsEMcoX~U-XB<UI~a-
z6|D@ds#5I5y99GL(iBR7ZZ;xL#z*A!gPIJWqb{aOb9;!BF;r+81qBxZ?uK~>i3kL;
z5Y>;>Pe&OughKP3!a{hsE45SDv9@$0`>q<H1@S|%pE9@^<A8Y|U9>qkDvVd`Hm^lM
zV;d33@bkTIAa43kid#K}HWeDw0SHyMD|$>2?+pj6lAZAf2vvQMtmXIM0}kc|46KXq
zurA7<U<XP*KHv5}tjO7gL4}&FXD1EvR4#mmWIJUHGx%^t#@SrUlH~O7{OXt`Q8t}c
zLcW2=L!iFSrEt?A{ZchKEu};!ReQ8E5w^qBEd9kz6S8Yt6}_S+huzb6x-lNotr>-e
zL)ep!Gvxhy!Spmw6%MK|&<?)u5=NG`ruYec%U55;9=?zH6J-L^U4M=yEVlnRX7+~@
zU;SjKMNFZv?g>_=-}7(!&F^rR$I`Jy=~R!cPJeSK`}Mioi}o=Q)9!9Xgg`SjaJwje
z3SJg-=TqN-$>H8}I4%9??dO5-;t<rw2>sQW$wd_f8eRW}x#+}>T3~cxG#wY!y7lS^
z(s~<kAfrFR*G`mGC|tr@tzqkpR|4<v5<~`*G{o<|^c~v62mZ_u+=D;uW%TZG#}{lQ
z?MVv8EkRBjk4x;NGG*H0KK+C43~mcUUCI9Hn265e=>3U5Bus^T#UPUwpsaJX*CMC{
ze;5K7KU(QpRi)Z9Vx4-iS8&ILy;Nc}eb9i|_&SK<<ucCd<GVOxP){GR%{A`L@QD79
z+<T(eDR#x@e9Rc>B>jDiKajqTxFbxm8M>4oPq0IU%P@6GE5)R9PGXJ7-L8E1lb$Y4
z`w%@CAJ1MR?`KmNiSGLbQReEhM?=q)@Fxz*dX$aD6>5-U-X(Jwcav5r4{$Gk_S)GQ
zV#&I*y*pgio$x``m_-Xk8g+i>#ei<<kbOLnarz+TD&dzQolj(&-m4?YT4{jD$ul8s
zQ$I!fERKzHx=46`<6@2YSrTS!!NIkm*tMxA%}%;+Z`uVH@12(=Y+tF1<(ePbNEi#v
z$wNB6{;CckT%EbrrO9?;oH|w~COI-UFsyF!^JhNX@jLDNhD<<j7^fxy+cW0N=A3D>
zZJ!NW6jSQx?&dE}9$fnBgzi3OefMvKky8{IbPUhKv-0}=x@Fb~aHUuvqW~R2RDqDm
z2o-?ecQlLY$4xvB4uA`(PA+}Z*EwCUo{Av`vh>)w{1`Tb^}1R@(hoP(@i&Av68^Hk
z5b2LH`*08F7I3^bNnsg!OqHVH3ekfirOD{M!93M`PHoW9>lhRJ%a`SM%3T}7w(vQw
zLlFj{-_t*)lUZixB<g8ywy7M4kr6M>vMYWS@tAteS7kpikYSh{wV``y1Lsy*v<(l+
zcwkKUBQ%co*eqphBMKv0ptBq*?ND4Gr5~ML4qG_eS6~^MrTJ5!y9J!nU2X8yJrs>;
z!QaIL@7VILknFhJ3b!V19UL3W=rx3|UaF%yK-IWZE<70V2%$yttu$5={trS{ubmWS
zFnudzkNYCk9yo}spM;s_ZmAM4EW2~%tbBj@vMt9uYiwlFtc;+SCrG#4SH^SY_Db2k
z?~wjkck!$4)pTMMCAacUxmBqzsec1X$mH;yYX$-*7cG5|N^Hygo&9<aj^5Gm87L~?
z*;>YP$9<QLJ^nUvKN|O>CY@{xQS%&!75}ka(4xBjxSYf%VmlBXVU&+T$@XiB+k9%j
zbP}`0;Y{HGT1$0f#wDEaG>)F};7nx3&of*0Q(Nj%%-~rd&sh#)dT+_Qm#%b~7&wan
z^{)x`qH$l}B-qQoEUK13en7|)&x?fVy~Ud!@QL;>7T-(UFVTyvnNzS_$A}jh?s<$M
z!iEzx;8#&oxw}>)5BRxN6uI+u)@Tp5n?`P#20<DC^IJvN!3~I+dF>;O^L;E*-O)kq
zq0qvUssPNJ^b@~Ef}Xy`BiTBjc#9DO)zMx+LmOBzTfSD0b;YauG!UeSDzcu!N~L72
zc9C_J^RdmcBnl0?7bSNmKf^)p0^eFIu+X}J<tWFn0CD7Gv{5jc@y~8pu`<h{K<p(p
zQ><+#JH?eeJwKYQC<*v-*sx}xi4;SQ-Ka}>mI-Fb)@h1)&S=GNaPW!p2MRZG%(!D!
z$gFMQS0lAn_ukR=r1y?tN|AsSx!@sp=Hr_WF6iz^D#s;jpO$pq-kS*LpZ_}q{hx;$
z{BOMr{J$blj{idvIa#Ut(8-7b{o|yg7KJq6N0US>whI=*x`L9%wAR3U;q$Lgc)a94
z;CRV--~G$WwMY7!8Z(8$T^IYWZ9S25IRGye?(_Gp>wnik|6}(H|E-4V|5f|2Fn;@2
zKu=GQknUkb52T0@WV7N#ulx=({ywKd;m1f*3Nh5rn0R>Z{5+=tWA8VO2?~!j@)#v$
zqivz7p7Mrcqo-YQy|<~0rboA__Jzv4ND?5eaHj<w^o~lL?rXwNraHv#0Db2lD`f90
zxRVf)lYi>A^WE^A49MM*!Ig#B+C7oZ0rf{^vdNQtj=q;;sx3o9p^rjW`9|f7x+5HH
zxO`wJ`H@F%{@pOL8BCBWrlOrod)#)l-WlBVGn#rU0Y%52Bq17)^(j2{>WjRI5_7=v
z*RpJ#UG(a~V=s63V5!?r5|$ORG_K?gTOZl)w+oAqIM=;W=$w&l+M~XtJl8~1;Qd<m
z&P2=!_xuTdP#f~C@Mp(Z=zn9>p3q}(tPp?lKOJ~mIF-}$i7S#k-iOb>wB-3Wz0dkr
zlKu|~?Z1kJ$-=?-uWfG>GiL42i2m!0Cm{0RD-;%rkU#<^X5OdA+^LLWVgy<$d8Way
z@N4b2^x_I3FmpjB&hRzX?h8bUER1);E=H)(C4@?594>fTP~6=`a;SKv=EHg<o(Wcy
z+~rJrTW-F$S%>4|n7i#MV^>+C^$Uut7{s6M)Kszvo%BQRSlQEb9$yL7WudP=QK`Y!
zQC+KE%LpTn3NK&ECchYeOzgiZaV7N7<zp^nG*anmVgUXL;PQ)g-Ho9g8U+x^&RY7|
z6CLS13=fWBirwlduM46yKG)us$ZC4+sAQLg59A@|0r&wSbaoS>NSv63A)6tlg4klz
zkvGq7)Z=%`fuT}3NLT~*ffa>OPpWGsD8~3rGWb2{+@VD*M%dgr-{g}p^6!dX({UnU
z>LUf@&t7XIcTaMQgahfo-{iM3CjEr@rc&A|a!Az`{vbpq*uX|t)?#W1wok6W*L5sP
zZ&?Knht3&$+8WwfANR5%Su3o%v^gz4!FzEpxc$3s{Lg~+f7OkwO#g?B>lHg<-OY$D
zeD{FFunZfL9>ozYONQ{JYF{w_#WxCtRo;#S3-{S8y{P~VR|x9Bl=v=!7j<OJ-eBp+
zuZsGT2G(FN3j&G4Q%eg>ZmwE#*&@>=_w(Mjo2o<qKR7lFg?<r)HD^B;C4bq_yAm7=
z^Nglii$?yq*C(tl;|vapv_Eq7IDKN^ioySd5+cA_>k^(({My77gV1DIZKl~uM31F%
zm3rZQATBhDWPDhjt)Me&NaK*DOTMZSytw2g{Jo$FL<6c`ZGSDLEgYcN8WzJPEebXx
z@Mr#mt@snOU{C>0-QT{z6_z>~b1d%r*B`Wcuz>7DYPKV-qLP6lNua$)K3O$sX1J>}
zON_ijUX@k;m!xVdoa{boc)d<mBcP|phf6KyKbXIov9}6#yq3B2mbrv)FEdZ>=jv}U
zEfNNGjl;iIr-_d|{apMB%d!%#{04JVri+RgUNXp35x7C}esczx338xjirkF_z1;LW
z{Mr9vzxql*bZ6^H&o7~!S?2UKW)p(vp?NU(XQJk)#k-WiXT5~u3E|)M^M9VK|Eqpx
zW@h`>pQ~0>mw68(O5m9{64A1tUCM|vg5M<bpx&x#J-n?YfQ7bNE=_RFyBd!xsT1zu
zjsHU9aY~E(67iZ4e%avXWUPT^_b{$r=TIz{%0{b{hl(|K>hIdlmwK`^ZUTREf<I>@
z^dNQ)o+ic(xdRpF!3=T^Pi^;ur*Hi>Y0;R9#a3OLl>XY1t;zU5@Q!CVC%u-WyPrAv
z>VstyU!Mv4;esSsaTovmDlW=XH_gab57>S^;QkhNJ7Vk1&llWMe%Rc2cQ?9owko(7
zuXY(n6!(SmCq-)oRbWz)r}sPfXB&!t*I55~?d88{ET%6^Y%HAYY)A}}M%E^dreE0D
zSXuuMKR?G_@Sci&kGI@=#|4Q}VgkB|EqdaVgb3-fWXM$L0?3ATSn2|p2$<#wQk|;r
z!hgE=tySX5vLgd4bM#e?Uy5BX)Vq*yv2Q(gTe-jf_<q**c6Q~{vEDx9kYTcx>{gh@
z;$Zw09aG4#t53+tjnqCg^H}dKp|<rZn5#94U0*Vy$!Z#ID)5*Bsl)s^Z<KGIpK0S=
zG{@(<Vd~v@hOkAfHjpVjy1Z7EBgkv7+vO2!HRZdZx9eQ@;?<nzZ!|LXYeKnN2j{U6
zwep?`ElJ0D8nQIrl9FK>AL5qoP*=HN_AG*keGjg|`zA4$@{9(<hX{$iW8p`K98L`j
zT*Ww1-ivd0Oq*eF>|Q*B&H@X$7s_SHX5~bQy1e%oXKG>$n*-F;-WWrsic`;~Ad6V&
zHTq4lR%4bkXdQUOn1N^X5D;2|Tc5mIL^P?UHMycfwnt)kKJZymXWm5Q_>bTWeOMmv
z^(?ho#u~jU+v|Lf=wZ)Y(1-8LX{`E!ZRlJ;eV5){9kkDDpW4@hXS$cH;)yL>nnAR+
z7!GBAEM~lN&+lqWzN)Zu_5lnF7_Vk`+YuI{)qDcx%&<k&OVy@XW6P8IvNK+_W*#JS
z;VY|RkDcu?Ud+LKzt*zym&NamGTM7Sk%|Hl3z7`lFc`L+*M(3Y@x~N^8d6P)-rcP)
zwRJ}7Z_la(TyKU<Hy)-XoFN6z^lLT)hZY5MRWe3Pa7b1-K1-mZz}9f*mQ0Qbo<QnX
zOOGkZbdCr&a-}4mfw3N5)=MF$YZ<C~rPTEOQ~p(LXeTZ;VzBdb?&IT+YO&|V+b}jM
z$Jke>F>XC=oQ$J{izB)E40qTC?<sG|tW?Q8*|9S)9Y3zju}#rSZUjT<Ge>@%o?qjH
z9g&sIkvA1G;*XZZ42}s$_A#z#zJre$V2%Qjl>E;e*2Mh^U5H0<vO&sL)>(vpN3Xx>
za!)aUyxDKU1X-C+19yr(u?4{A<ocAS`N;A)6Zr$sr2w9+*&w{{hG!g|#q3%IYZ*X#
zF0ej$N}xQuwvwG{tQPih$(I;tHuhqgt#O0)8kIkAseYJ1{z4r%^L5jdw9tugYzOtz
zRe*Cos~7vtn^wy}__vJ~b+ZfHGTwq0iZuQ>rr}hssRyvcTPh}V+4>aq_$);+p}e?C
zgXNiv*ASQUg!*A@0$Oj()>MWKk%~-y4%RHw`tnl6>hj|Qs~51SpxK~3p;?LZe$0yU
zTWyrQ;2N)TLB6%wRHU~x6x-`$W7w;X513a$M`ZPyP^LXIW3aX?uH+@wyw(mbaw^3%
z&ozz9LPg%?1i2UkN0EN_Vf{z5h-4wbv|-%K%=ZjAG^gIk4TwLHW743~+%iBahQ|k|
z**RE8CRrEF<yfDy>6Z5_zEW?)l&|hR4pRCPI;){suym$B45rI*Fn~vQpFMmC-HaSN
z&sC;|m0!oNql^n^ln650nj5x#2CnPLY9sG?{}h+0w+j056N;vaTKL6xT(#`;=<a-u
zpZ3Wme66f_Iq2qJ&U{-oUJ_!d#T(2%D@^_#JtUQW-OvSX8h)Dlx`Cui&4(5Vbqb3M
zUGtt>7IqYt+7|?8Z_37}P(MA<-_(=<ye^9?S5atc_uoB&jRTqF$@(ObgHf2?FT7KH
z&*InBX_@sY2^D*Yx#LJ@o`1DNo8s{ExKVEJ1c#t&k!(v)pv9R&iZgdcbfjsBGu6!`
zU*H>QnnF8|vosc(0{+H>%%S<bLIQ_STOEj1ktU0H$rSkKQm!!A-ArvpoSUespX4@^
zZhoKPInx{W{5a!zg2+3UC+pCsc`OU|q+?bx^6eti<vH3c=(qnZzSWH2Z$*Z@@TK%l
zVX-|D-T=0cWk0+@%Q)dBRx~%K1@@!giXH=h@|Wryo0VlA76>KXp|1JN*FU{=&-plG
z*8Zadkk$YE#QkUT>1}@7MADystK&%_ljXw;d?rgcv(vLn_T^Q<g&NB_=T!y1)c-#E
zKTbS(%QwSg{Cka;GZwq4OnbEd|BC-{45XtW$yb7DTzMWwbTQ~DzliTDSwy<9n0c>}
zOG&~#z6YK6@7$q;ztb~f+KPLDmtMKwV(b0?SH=GIGXGKC|FoC8>EZKpi3d8Q4t)ji
zfBbx6;}Rm{o&j1tgLy-53axRPhHS4YGp2_^(gc!%RH-7<hSb^lwLjUWd27?1r><%f
z+w&?8zPymQTR_(pDlp5t7hFr@M=^64nGV}7v)7Z}+P3tqjb~WsnCh6>RN6>-T&TpZ
z-=D|@TNReiKvxA#+7kFL7}c%>pCI?XKD$(T<X=k-2^{MU^l9tsSgrdm{95St2@Wzt
zLJnh(7Yn;mF_qC<=y|rb|MOj45^s`pW_^8r{i)=JuH!cGl!51u(fX(t>8)3_&1$=o
z(9@i^BZ1sTgSAxuahzY`G*BpO_pQV8uEXwgIb-=HJJ-RZ=?l;++&iIt(lMo7^=|*$
zqxXyNYu#)3YuRi1Yul^8w=92NruFdjKnw^>nGs|6HdTadBujq!hjBQchdOVXDKeim
zow_K+yzhNBNL3HxL|AlENfJF@KP8FOycbH2A|YfJ3}u(yD5gnLj&T>N^*Hg!0QQKr
zW(Kv9*HHChn<KFVq>@NR7f>qHQuSlgq~#QTq^cJB8W5ZrzV_z$Y(pxjj{JPe94>98
zIsNg8sW1ihx56m&sWtr<6Mt!r&yHYxrWDhgw?A(d4!<sCLQSMODcb_-ky8<#1M%hN
zj?2)_p$mgAUy7FQ1*c{9Enj&}3(EbJZP_(&9#(B&OlJ$#z=a#A7%N|2S5P;pwHlno
zPr$;+c%zvrEO%j?vo$74O5<rvUQ07n`2b><i#(7pR(~WRcY&>A*YD^Dw<b=~z?SNu
zbT-GqjUQ^z@YfT^i=??0?&>C@6dLvdX#h4ZW)dD+)?Ul0Z$I$eBA%IB*xN=efG%MK
zvw{UgJGOBRwsCGJwmS{<TXl)}eaB@I&9e4$b^tBSsaZ{V)nh?3(?}GLjGj|3s(C#d
z%zR<u{SQqMm@Rj{*#iVian@ux(PC1<A3U_}oyu2fhL7FWp7UovxEVDC&ws>^-Wn_l
z*^mAaju9OdExT485fGkp#Hfc*X0f&*65gF-RHMyHSJ67fojn+vXdxv<$K)Aj(0duU
z?J5|qddpco;h5dVWT4U`EQOn*22nCODkjL>xZc<+n*X^XAei&mN?Wsz(6niY&m=P#
zR9Zt3wa%D7_+Hr!8vB4y!8r!5WdB6sxMrv8V<F?#i4|kaDI`Dql}!fgGM@bU18?uW
zyn>Mqy`}x6Bw6c?FtPNqS;4Gmxugk5g(jA>MNv9OV|S(`ZTHY9LeZ_{au{k|q9nHM
zhUJ8pnenOLg`hp!=I-#oh=ryYkf`#F!`{JdEreHFh5lCw593^GzjiXEj&|UW(dcQ}
z?F(ZrTz9Nbq>b-BIlH0lN?v|cf|_kb<kY4vL72HT-rX7YUc4e0wr}!hPRJdsiG6&$
zW4o=<Xt>GuRwQ}alp5}m5}&X*R~)}w8ZM1@<uh62ol~qRftgkTpDV@>wrp2IV!aAG
z6p4h2(1o2eP8C;vax+y=TFq6v!E|fbsNCBEe`LbO$6cW(r8?UW&UTKhjG+!xh63c7
z<G>^G(wW4KP8rRn$<58gDAp@D4iW6fa*h$sktD!I?DE-hQ=AYaCJ-GOPm~N>O?D~&
z81qAg%Sms{Oi2s<-t!xS+-8q5KEF_Jr@QcL*k+6i)8c79qH|>KupGFPWjkdf+91}!
zYGu7!Jfb^CKGLoMT1MQi1bffKZdjsdP#KX9enPi>y4boTn%FEaH8wY5gkE+Lb+IBa
za9Ct&dOO$B3OkT-Pg504bVh6EYQjZSRGrDoOwdC~UDrqpZ}IK(ayn_piXWbVx1d{W
zhqtj{?#OH<V@0Vu<D9U6ZdP>{(-6yyxubWENu5)^C3gmru-*m2uPIZZT){M*nSIPX
z8S0zkTJ*&UhTD7A?47u9O0(lIo(XC0=#g{tDVlU<y+lNOGZIWa5w|00Jh`@L3+7KE
z%{k&xo5%`$KX9Z7o@iHOn<t}?3r9o9vGy7j&9FT6j!X8Yw4n2Qq70%r(J-~i3=ONl
z#iZ$~{944>MRE}~n<OYuZ1z0o39jD!SuYGS)w2>B1qHT<&#(u!lyZlQVL=0q<m4X@
zQ@!?^Xy-`Km$v*`BEvhi4i|BSgKaeB^nbDP1Psl(2A=Z`)u;^b*(ixS395lscqtJl
zsM`ZnI0B<p98d%!1#?<4B8oBA#0C%!CK6sPZ-c~qC^I~x$!u$O3YKMeJ4M29w!W5Z
z)D?_G-I8~7EW|#>+<X_Oo|{t4n%Vl`0^Tu}CJeVH1q^QxACy&4Ccb=W5S{xVMf01o
zt6A~ATwW((1j42t0%f$#O!U!*c<S@gcy1I#_WFoNOdF5_+hMYTeyK`mq6jCPhu{=v
z0jCyQoZ1xn*}j1#pXw2Y*%2Th*M@bdhnObDwDcDR6)O^Nh3%J;oYC=#L9$XKZ#5y+
zMTG#~^*C*#FWm%#WSq3Tbj)1cglkyuFX)^MWt#SqrUfK`jaMS(URm#!>Rm}EbFXm~
z@PGR*{!sQiMsA<aEveq$VwRM{l5(USn4{vh5<(KLXXh%*`eegi{uwcnR6+?gHdWW~
zOTYDP;Bd64-dYua_2JC6RLn|m0TQ=bhR?@v6%+sjd>G(vRY>Dy?vA(<Av_HXtlY;^
z*?2$-wKnc4%2yg}fKuhN?Y}afh^+t)?2A~XP3!8}_L#!2eNj(=LFM8~kST7f7D^CE
zr1<EuD2@!m4cN9=LRizq&ygpI0;eu+q_1+Rt)`78cIq*fQDlB)#BQ1gt8w-mmUYDz
zg$#24jHJaK&<$$+7%vKp+a&+SfXwsidbpiaR8i?+4Av9ve69|BhI11tqePR`$O4>s
znv_JT;z6OIK@DxX9#Jfe0FRA0QbI^%%!_eKFf20z9Ex)_+mXo6UCHAJMB^{v9)hu?
zsR7D1l-iOt!zG`JT>V{lP<v|_o=lNw39H#yIS5+&o5w`;e#s0}(?tC`3y>Cdi{}xT
zh@sf0&b8)iwit~FGahr$rBms$8U>J}YOG7T6`4lCUz-_8j|yoDdis0GLf3DYxq2i`
z(U2!@DgoBToVSz{HKM!8um=?pq3pWOS=FKveUHa@OtxzO)EW?PdHBU52jR<2)_{o5
zV3c}QW#nn?-RtVr2IKtkuq1fRGpCH4-xtgW6b@5cEVrpwQP_HfJ;GKOE3Gn?!$n@8
zB9>O{HiWyQN!95~%N!1j{P@f#?xF0FQaxC}i?xA9Dd7>hvedHC&~*lLPj{ZW!QNTn
zuLIqI<c;!7d5>}4v)wOxb650P7G-~|7_$+_6`FBcQwS3q^!O9AmVy%RH%!92)ORey
zd?BqG7;;fs+%_Jr)gQwN-ODleDDCPoZ-8m}y#xSdnkpcOC0@0t7YUF+QzZ$?2hLDc
z34zoBxKvfLAXwn2ihc&>H{hre7zMCPDOc8O2{5LT%NNSW!~u>f=4gVL0mhU}S|Br^
zq>_FJW<D^Ea#IfM2q34~RL)Tai324SbHqT1z%Uj4G)#l|kGVqGn7Q$kvifnDr166)
zBr+gPfPLJ@>|R@dCeV<ENfI<2_p!Ja9RNqeBnF}dz)>@O2fYHX6>=&tz2f%EgctzK
z@%u$WXaMFoTk1(IkTuXzDJK;30GLNLsfHMYnI0#m)Ls5d3KRj%qn!MKSb}*HZ(1l+
zjcFAxCQl*<f&na1VpIsFVd4Vx<Adc$)IpR0lK5a*5={^zKp-ALuDkS?IHDG!6k;|E
z?5}egJ4FyF@VTJ30{BT8j0f;m22%jM6~R%M@bULQKxgsy(jc4odl67YJV#cqH=tb}
zECFbj1v>!v6u=6A*P>nu;IRVuGtjfNR~x`54;BRQ$%4;-trfi<z}AvpZeVL!uLiKS
zsFx7fTHb2`Y%T7k0k)R*5(Bj5!NLG-S+E-*LjkM?$dCh@0W#$E8!%<4FMeT0(o{)+
z2I5>5L85W4s-U1aS6NUxkd>-R5Ck9Br~^6yS}JrG3gu#I15Opdkd2&v38qF|qXwuY
zu2BKR9oMJ@T8?W}0zvkvfl}iZN_!!Jn6r9sfSQH9bwJJB-dUh#es4TbGrM;OXeke7
z2D}#Z<^wfzdi#Kuiu(STcvN=Tm>+<eS-lUyQWgDlOpAEg0pjckUI8MHUtG5cPRAIB
z3#2nuqQ4Cy|C<8+D$K)Y(wPU*-&c{cd!Mt%`32H_esR4aIK5*0-z@mw)hQ&(mgW{n
zcmBn7g5b1-aac<_V<!50IzqOPD7r=}g#3g@XF!iFE!m3*>&Kq$p{341SC+eUdS7k-
zJQGrFib6@!xS{$`ZFeH`r`nao7-;qW+PI>Ks|4HP1T!XXya#y^UtDH7-INL8U8Y&a
zu^XpB==3huprRBrwrN_OAWd1ELh5AdBxB}ymUyNy-IVd00y}f+Y3u^|0!(tW=>y5w
z<Q2(2$=D=vW*jCdU4jYL2s7I0j|Bn+lYAEMfBTxnO>hyg#!#)B(826Hlp1_*lH`;m
z<*?zHcVIGdXw#D{WcsiZBbWr|aPvb_O%gg8j`3zs_a*7kK8{baE!o|!QnDaJvjScL
zE;hD^TY<fxTvCg}kxPMK;COUf_pmoxA^BKyqJJiuDxe5DHomB>;)O$&yTDNA=_0FM
zQv6ub5U6WHSm0W~F<!&iSIrVgl|mJAMUqUC)Xm8dMiocZJ8um&cx<5p!_0JWJi`G<
z8vL?p!ex$)A<A(>I9(wb#Ce7%{W5xuH61A#<T=!r<=?(7p7ojIhIiUUa@~H7J?$~&
z;N7(M_*2M%gtK?oHRrU6WTt(zkNqK*^vTu?e-fYZ(umt<Ca=M9v?PdrgKyeHb6ZQg
zt>?PF;^ZK!!PAPuf6dU{KfQvbt^b;OnnrWmsDSs_6LcV4fR~i9M>4_0J2GyPlws^1
zV#Yolt9gki%{yKjdcZX95qE&$%r|<CKJ72bot)CRjVjIC>Bv9rTwv9nXBjn-$O=0%
zxNX!Nd7xe3kyOuYrPsWi`0GV|rBCkEu-X60+N3%BK)FC8$=bLXWX3Wb{^=Ml!k%~9
zDb0m$`kSN*i&h^_`SuKsWFm_dxOIeMcs+@Jr&S_}-gs%S*6)CX-tB84K@z<#SEd>7
zG?$J(r)e339r->_frA&Q=KCIF`iX?2|DhLXA*@fWz4v|AH_4KwN9uAH@@b%sKEM=K
zMQ6M=%#2EbXd1IX9knf~gh5|@U!wFK-G=T}(>6~5K|zzG3FFwN`>bS5lSxgZJB|V%
zu~au@NO4@TpA`~{4$Yn5&Jr>ji5;ne=r;p-Bnur}C>#W>BjiU}L1rWh(F|R%DH{?|
zbYXXZ!2ypnhE2^ssyYH_e?HR753(*L`a1YgZp=^?L?4gd0ZQNRJYdfG+j}9J_}P0R
z-eh64-+TVCCC5`>n`YGESvv!>N`JWNi}wv={BYYhBx-=JkicL~W}3w?4o$ETN&|bd
z*Xk|l<z<JT#iv=_z#xrUn#dqsKK6G2x4}0=b!~6!t|m9zRYHbv(p2)4r=5KQ7Yiqc
zF-1i3aM$stKFBCO%4c-at!Az>G2g3^ga$m(PXDm-O2E$|D-bGxDPWVl(EJ)fqq=}U
zg585XhTR7sZ8C)6?n&-W5=a(k%uAL?Stw#Lll%$Nd|gOp1LaoX)RR`l*RN;!z@kET
zbl$Oe^1tVY3i9<oe|zT{*?JcBihB=tPr&i+&3l7p+Y5A!*SXhe(pkt<WAzqRRPP0K
z4E_4v6J=fdT(mQ&6JG3%=$Y@F_?-S+`dV{&d9uyQ#&12Wys8Z&-P(i5^~2+=Y2gXZ
zhLJAXrOwZ@zJ0fPysXS1Z`8-deHP0Jp@}M9A}uQqYWI38_Cr39tIWGdX!<vL&Ck%p
zu*4vBLk|w~s*~*B>dXFe5|-S4<ht<BXz%VwZMZM%yY`?7-ZR+hY$GkVMblW_36)n{
zg=<<ZV>b0Wv)kg?QrN=Va@%ScqAizgX!xee?UA4F4mQ;jX509-6E~ths`oa-Rh5gB
zmTa_OHbOOiT7c1nd;V}kFWf3Y(!WR_@zG}aBhzyIS1{YMFow&*+@V?h)iv#M6Um5k
zM9Z4jZG!uq+Ue}+Hx1<$QkBrb*}2((k_pW=qnoD^t&6W1B`Y+mCe~^P+MC+D+U-Wk
zPd}`P#-`?)1Dg}AiyTr9F%J`F4&aY^6S$%^DBNce!w+elZn=2PK^|2t&LjHlbQzV6
z-c>GDX2C8OYkdTCxENBeTFbZ^+`Il-CAgv*mv~Khjd<2-8yWl-8BZvVw$gK!E;k8_
zr)p~Pr^R&fry-@ur<bM7cVVSwrw1AZO@+qs&4rd!PKkzYD}}kw+ok#q9uid^^2*U3
z-~^Jp`%=48yYt8~YRAY$`F-N_Z^K%ZMsXg7%I(}}{)MOssJE!i!p^#y@Ylae^@SKp
zMw;gz%Vvd?E1VLQA|tJAEGnErttjmK8?ca<(q~V>&hD0%BSR@PO&TKJmdlCD-ZQtU
z^#yF@^{ei?3Ne78j690rDnK~hI6DV-Vv~!HL1{gisJpjiPOwxhz}#(}EW{}fxdok!
z_6skHQGKY8M*C}U6hEse`B(aEeG@%}k5aVPfl^6eoIQ_e@}ZKF-!p{v?TIV-3OwNg
zmb6UX<Xx#>e17+eRjgL}$%|mSE0DW+KJJcDkphw0Zsc1u18*gyDCNOv+8QcH*NxJ-
zjcs=8{Rf~(HSK!Sswxt;xz8m{`jZa}A2q_r8D2lG;!Jz!dRx}gsmJ2^)Mjjl1d2vf
zNX+~KKQD-B<n4|}eEM9}L{j5$sTIxZzVl|Cw!F>JWV9D^&?s4<1!irJrp9n$K8VwP
z&}xA(dr&gT8*&3~>1W~BRRV^awrA>I8&dB}xX;&Zo@04>UY6Vxi_($Ppwm9gK%2a`
z@SW|X-jLJ<R6?nu(n2RdIdx)Y;i|&W!r;EU@^kzCff0`bItf}4y2elKJB}=(;yV^U
z`z(~C_mc1h?-l&0zEjCUx%y7~4fzsM!jZqn@*~lOVkG_u9|qh1E}+vi>)l7#Fqlg}
zo-cTV??vAAyvK|BfC4QI9S9}p+tvBy3-U(<ly{HNFTU;HKWDN3K^}y0hvM}`=|psd
zZ+@@kNB^BG3eFMk(|3w5IF-<BS)@@=j_*ppdt?zsq166=tX)HpCD5{L+qP|6GtFtw
zv~AnAZQHhe+qQk%_O$iqZQkGg)sLt}Ms3dO)X6wil?j>XFGd1t4n73#;13xNY3OfG
z0v8TJ=5J4e00a3Ggk2x+dQ=6PLj*)D1x&~Rg9q#b>I04d$`{lZ$`{NR0tpm4fY|>g
z;KtuBz|Oxe037hIC;?@F@IWUZJ5ULj2cQNB0f_;l09_zCP!tFbyaBueyZ~JQe!wO`
z3y=lC2V4NG0962bz$AbONC^}NLIOR2yg&^gF3<u<tIvH)aSL(FQxETs;Ev%A;f~`D
z<BqZh%K^&o5AFXRa0TE3Ky!fU0)>FOKq7tmddPPCcKCMmcJOw>cEonfcF1<zcGxw9
zEtoA3ZDeg|ZFp^PZA5KIZCGtkZ6s?jCh#vPZ8&W(Z3JrwE)Z-`Y%oLsB;Xa`sZUs+
zN*A^YU+ow0$Xx#gxzY!C!&d(WyU^4B{6CUd;A`LzPapw;BKpWE|F7`BXZr-SFxNjp
zuJi&nu+`tetn~D+;H&>7ztwIAzmHV!)!cx6Tji~-!~L?F_t9r!7@pws^OKsN{AsYx
zP|JS=dspV6I-`k-o-L?y;9WRvN;l7#?iUXJ67+o9ec)#%ZOmgHdtj8@<fB-M9tvLy
z+y8aVA17EGaKim#Bl~1T)HnS7=+Ijir+eH+U;`IX22*6){Djvn98Uf<=zc_YMNG1|
z;d!cFG~!mkP0(|5N;o?G12ts<BU5^@JbHrF_m$cCSl{&c58`yutAwS{z3BlTd<8B|
z$kp)Ns5E1K2*6PDr%N-29(;inIBiDTnAGY#n>S+_W^>|9u}U+ay^g87D(<)EuhKMd
zt5b%pjHWXJQCid44rij8VI3`nlSRlfS)I9RywjhZFwY+3I^KVJ3RKR~ymh4g1|RAp
zn9Ar+=>)J>7hFa?>Nq}D=MbIAb8$1=cm=req>qJU6&638nYSg8ahx;)G!AfoKd?=v
z4~C=%so?B&FnUfsv{iewuIOJnS|bJ|Fok_*V{xWJ9sf=hz^3Gd+l9t8d30cRfE@w6
zt%dWrbg+II?W8t2($!_gU1&~CwMa-;9`sNzs?9yB2XODvnW<D}6=-ampQe7{XHMF3
zEws(mIOAUr6Ndho%H1ru$>(oqy(wjE#?%{imKpYD-Zt9eW#&wbYn^x98izKA=EVI{
zI?5UAV+1~PdbutH{YA-*m$blk&7{695r_jks{^_=ZynxXJ<%*QB9#;t+1Cnk%dk(y
zJu`BDTE;o}U{$D{a(d?MV9hJmEnv436{t<+DIy?_j($V4&aVDzPkae?bP?JeKP5|L
zeG0#)z51<4&NKXu20v8YD!Fn-6>69jR{gU^Gw>H#I{)g6_^|?5E4jn2M%=UhjhNA3
zwQ^o(khVyh3^lKgC#mMS$|s1d#34`ni$i_O&(F}-Ry}S`(gAFKES6ms2R7j#lG9?I
zf1_>I_41Us@kboJIhtUrS(q*0OyGSiO!CQ?==E0QBYz5<>>(&l_+#yUJGcEuhL5oC
z!NE>Xb#3s|Jin!4OP`UXoS&evXbe#r<3-niRilpPX(%4VuNl|Y-Gi;9v#kR$9J9I|
zN-`$S8IhmSSa_Kz`=?7v7rT@`BD=jlp%$O-CH#ED=Am`F{sDu3dwuvUJp=C%7L7Ge
z>poR0<Al))YaEOfuC1=ugt$oghN@kpVsBVErr9i{H|BC_3p~xkZIR%w`0T~X1~R+l
zZ$d^&D5y$?!a|12C@4#ZLWn$e37lTMoTln{OEdMj&qzf}P2E=NB4HL~NlE1hlQvz5
z6E#_QTVsYX)<@9NFtG55v6ngB&J$cB2#uqWA|ePb#?)oY2L0BWN3un7XmY-oPJF0c
zp8R?RC&)&4GQr4t#=ozgq{5{r$w;)XN~D{{tePES*lKHQ$>dDU#3CDV2+u5_i^z%+
z`Ac}n3dIv?BMTXRZ}`NH5-{^SOD2=k37HsnZ(f#OUS7WZ2x4O|lZ&$Ar$J(?tveFQ
zYwzvxf<0*lZ0?>lck+=LD{u5?rm|{{{8A0b9OOZT<Ys21r5$QF()p__DB<QTtw7A8
zcxz*ce?F%q=VCCBXxdcL0?W<FbAN{GDTXf@mfWn4O66U8>Z-%H(bX2mnnNpurjVU#
z9K(86@O#g2Z2n}RXi)AL$0~6g8yCIw!k{4mKQ=p}%!5AR7qH`6N`9g+?{KSgV>6M_
zuzDJeo_W5VLUPY=RCc`2!_CDe@ARi{A^dAZL;`N3eJDdVDZJU(z&|(=^n&t_uRV(@
zdFpMI+0ej#xoTPa7a@K*XeIaO*+nH+YiQ4Bk-LdoCR}w9TyFC>H{F?iihpK`85^0i
znh=k1sZNn3@Lm}iO}uyS8I!8{JE2&0_>*lsUpv-AkutE2JmJawE|1=?`hmlcZCx}#
z(qW4BZ`x%^{_OMM4e>N9vO_*Os;r3V?Qw}9mZ!sUgCL2@U=mNSp&a;6$-T?Pihd!@
zy7DyXkYK0hd#SrtGOl@+j__(ThuuM>%fW*D1nY`dU??ex$x<Op&_VrKObdIFSH~K6
zn11w$fhYr$c;0W{Th2K4Y<KUJV>JFwQV8b~*OEVT*#Ic^T30#wxtm!yMcA;5<2Bui
z#4&`ME^ele)&G9P5ZIU6bc!%l`0%@i*>&AG;a5d66PvdURR$5-c7^aGnjrolwb6se
zfq(GW;aOvM3qJcwdgc}dTibGR>n}Sr+)b+u*>gKfwC%R#zsNU~|9Y2DoU9IAIcWC|
za^bKR4Nk!nP_AelqZCxmONZ9ulB*ac8G~rr>@y7N4+FzS)H-+P8X9KF$6A9^owN*W
z45hO#;s?}r<pgVe`-!whR#9)mp%THT{0!rFtgzdi>QQ!|*Kb+AU3TZ+q*pS4&GMNR
zv%Cb;=4grcUX4V?%|=S*1n%+JHunf4{sz(TrgeE31PTLq89cCGi;y&mU^eC(12!^g
zn=)BL^4beO-@XfynZ9S8>^$F_A#+RN4;T0#-<lxMj)YI9%p1@(+p&e?IB=(VGar0!
zUVES4XK)Sf)Y|_hE*iVaWSWz0w0w_tU4P8$TqTGFqxRgYVUwg0gJ^RZ2wg^nkLSvQ
zq>%_yjwy^I#3#yvP>mz8B+85U8p=cdE{iNzIx6{3h%b2rqOc;0DDxB&yH4*V3^or8
z3j~%ubZ6NUu7Kl&;A#lV4${YsHBWGd{Ok5sHc$?E>R;m931skxnX5e2H0crL)@(lI
zeD3mhU+{C6MvV48_H#>MfW`P-UG~>By}vPq+j#jRq=QMwUxSg?4dn(N2wg^33Pe;E
zMgBKtPz_a!5<U`%5oUP9oHVv`VSL#F`*8ZnQAa?rcbx}+-@2yLPW40(at9hv$3wGM
zI-xXD2l4?;06g@tnim8xP}?lv{5)jr!xnA6+riQ#`;8IUaN$u%<2uQzqdML=V4~K?
z&IEEnX#_#Ud;WSw96)#804F}iWh2K79!QFrL$)k!va~K$BWD?^vV`en$3plow4dBV
zQM^)OEZq7aL3uZ!4_94jJJf1m7)5Kk!DRFmG}3gDiIIiHg*5*l$goBZ^n<55%S=(?
zq5kph+B~oxJQRVmms&pJ46T~N{j3_H7I7fT%-ER|1|fvU7Z>f7C1*5J8&=W4382k@
z!^=10Xxg_(#Nh-|X6yWvd<cc|w^1TZ+%Y0E%Fon=K`sdUoE9blI{N)w=A?YnTsXB~
zSJgCT)24n<!ziq21gWP}haN!AqRRiTZhLV>z89^ZhSK12meb%WCnHoUu$2pq=NB6L
zE8tU{-}15WHnaEZ^Ub@0t%BK<3{S=tOHKn02;`%G#Dexw(B)SUef=F8stAk<JB2hL
z9yMNr-G)Mnn{d|T4@;XJJDZ2NJPXgpQ5tilV@f6K1n_fmM8<p1d68y|<3LA#MHku@
z@dRL|R&RD4ciwDeo^>8<E;72UoXAI!m4G@t%5*Omb8^;fbEv$Z>h*DP-Ceyxzh7ru
zJ6cw_Bueg+Ehil1`Iv6jCcX0s5`8@B<KXxoMB6IKJ4y)r=wi9s=0*~D`g-Q(6Fr*A
zpAfNxoa2SPR56dpkYyx7Q+9{M)crwOke{fixQCf<u+_?f%s47Kc{k@M&`f~*Nr+5d
zg*d4x!ZRa%J4~|=u8!p$yADjmd;#et2G3iklMorJp2Cxddx-*LVo(+VfKHj&qgW}3
zCY2X6@dd)J&PSsDuwXU<yM-JeI|?fGqZ0l`Et5H`fk1@kNfRzswLkXXKI3-6jteA*
zF6J>q+8_jFmqZ|22qLFu!2-4dP;Ick)xOf-Y`#wS-yxEORp&?4z?&J@B*LHWqHV^W
z1o0y({Eg^<>2N%yV6p$8LQr^qkMlhbK+cNb2M|Ot(f~-q2P@I7pZ`j_SM>lsuMWl~
zd3J?uhr31Tbw=<-ZJ)+^DKGwNNPO@l0DKbjo-0C*F_#Dak_7{;eq*T_@dGBqwO#Px
z;U#c5x!;#F%)4S-o_W_Z&k$1Ok>?v1@}vrP{9Au)$FB+!kU^&iKg%XpzJgzQiJ2gw
zMBEW<H<POwA%P1#WzqN%sLz5sbiU_$Pj5eDpKD-AaRFWALdW$AYWiEk>bK<oMu5Vp
zKHgxs2~u2D0i41|BM;vo47e~IL_tV@8Gz?h_5Fv)ytaS|{VY3zAL_)3Z<EY||J=Ru
z4iB+F0qQnfTsluUKI57n*|){kTx(Cv-15>I8mvvr_I37qI2!njzFoU2O0zwZ)gHmh
z0B?1OlRErKJr*9O`FS<CCeIej)TT{ma8GOI-EgQ+)x8pj5txTK97w#{2uT+UR_u_o
z6<JE4#w3IkTise%&)PWHeW-nUvj1NQWJVZC8sUB=7Ns8|Yz{M*PHSLjl81jN?C#PT
zb=egTJ?&Z42wnSzR6A?$R)eqbys2YuPI7v~4?Kfp&?24mC!wL$8D;*6zz0Iy>+gLe
zVH)(~I_cn0=lxaXagRA{D9?4`W;Co>OOm3OM1*RB<M-q)zv27)1r@wqJzy(Q@71!r
z{0qiw!PcJ{I8glCUlN!|(LEIIkrr)Uh4^~{)QIyCX8>lv8+RfCLssN(6yDl0mWM1R
z4S9n3m}QGLs3Nn4jJWj6ud5Y}>`n<Y4vfab+Pk(c*gzmf-u5-SL&^-Q!qN%q9hHJ;
z<4P>JAjK<zYG1?!Yfy6LGeyzR&0?PUwNLZSz%D!)kiQ{+MfJMtWwCP{5j~>7kB}@E
z6qh_+S)UJW?Xbk-oPiL;mORo&V;pfBg`B;(6nDacJ$ccz3(SbF>duIBjVNBtQ{}dY
z?xd%Z=C-mBP!)J12#SWucnpFDV8IJ?N+Z&usiKB+da3UZ_}Oicj8sq|8^@TuOv#B*
zTq)Cta&EmlSV!>kQFncH$$vW$04=|}%ZcCf7PZ;t=iuXEJdJI;b+^`ub9b7?OrR_L
zb;ut_?EUR^G1`0gY`1$`<ds&}eKVAbudu`4ejh+wNC0j=bkeWwW^}ZsmLQG5ey)h?
zQXb9MgX`k?A1p<dbs7NTN#ajbls^b9z@qj9xVlbPhbloBgwc2Z_&r&#NJfkqnNn#3
zr7K7uG|71ThKtLoUQHqzWkRl!Xdgdo=JvH|gKSmo5B}BxM{Qeyv*r0I@@oC?B6g(K
z*X%9hmhSC-P=K%LxEultLo>L+W@SfA+}SGccjsMghQ?Zw^M#==jbSyC`&+q~OFy!|
zVFajd6wkmam5M_lgAmPKHT-dn_e{inCSQp{r2>;gr<M4h2>$hQSV^0|tn!0wO=7ZK
zLJF6#c<M~=XZeEo4hDu1UOp!{-nxEOwFJ~vW3v2eI8U)C0b8!?7ur5l6lgP?dNS>_
z&2l103^N%PPK&Dkl-hQ8UCq<{xIq8)XB@O=$$e|23HRTTDedd7s1DbnX==8BsZ1=p
zqqU?Pp|3R$srI&B0dM`?r^?ilA3+#ozJ7zqH#$O|-;1kTFPA?4KEi+2CGY%w5Y?%l
z$b%bK)fu@QK{6%69mx%q$;En52ex2t`E-%0IFE2q4dG+OFpYkfRFp3$E3;zlk;7hF
zl1m-M+RW~+SJz<HTXC^iD+R$%fSkaKq$%r>%t=-@)&F~F@u2i4jT$#F`1*bhQxg9v
zH0Jccm8{`nu29vtPF#*$75_I-B_w%_>$G-(knUkwR#ItW@*wB&6qv11Y2)^^+bn>0
zuAcR@sxmyqebKQsJcAi4dtPAYBJcVl;tr}Q3Qpi<v+Yjhe8&x`8e|<#<sviE%4oC8
zwq(3As+GEW{Dt!rpGUA}X_T=glJ5Z-&MugCJpK#tVB#)2Pkog(GlLWTBGLtC)&=L(
zg=ey%qP}?&K4C48kuvon!UoTw!GkLg$HZ@a5%^=rgku1EZU|ED#51!zB;l(Z{#R#`
zB;k3NhKI1J|GrMSP=I8EMEp<j#_m(QA^fIpf8=ocwoEJ{&d8X;7Rb`fE2d8GB{)<6
zbAy16WAXI<(F61m4{~Q#aZbBGLNuK_BbM!9>R3M#F?pGabSDkkMopHO5&4;TjOX}j
zU3HwNm%z@{)#4MQq9hP_JDg9@(XTc~vTOw6L$ZZh3?+9HBTDuT$5!xbaer~z`Iwt{
zd)JE_(gYg2rz$whb8uFdJ5fp2_3UlTWB6__=Vi%ie*W;vm_280=vN=xY$sc8@9yAQ
zZgm`;yVWsLfeKUD7w<B5l)-ZwJE%CLu~Oejlx>N<_NQ9{>Hete7l1ePQZ&_{9UxE-
zZl4vY_)O3dO19cBNoumsWu;QbxGmQeg#8o3joLjs98*RzB8d|Rs{$tAA)L#Q3L5G0
zXNQus;>}9=ohN>l0+67IPx@Ri0W<L>{30E2l*Kd8_)FS^F#3U?q<0r-$(0~W#rr9g
zZVS05jMx)hxVVJaQbE|5!uv^(KJ_@xe>hzwWT5h=fl5JrrJ}kDO|=5LL^@+X1G;Ve
zw5164##p$+kjf#2G@Z&fVO(1ApQhWN>az5S3`%&9QE)rmJlqAgHyiA3lP<fv+Z9U^
z6t#|jQ%yeG5JpigLE|&K9WRidoSV0Ot*LP*$X)hoIN$3kE46)Qc`WFsaf1Nhdf+JV
zM(>zI19Pt<1MTR&lG*N4p_0z-CE#_<2eG`%y!qg#nOCpuw<K19WdyEaf`5+j8y2Z3
z!#GOV3t`ntkqHF3SOXMfWrwKuYY##uFHiYSr4mTW@*}OyX%hB+Rizk293=0cKB|Me
z{?;GgQX#O7gxm&A3LUT;xT~Rn)~;Z#Cg)|=#stvf8QU(QHvjuKX(kqsF#&qC+k%W<
zi*JlZtLXC!`BKq=EN&{c>>I24A4N5yVjJNZETJBh>>RuAH4U)b?IX~{VhllPRTdQd
zri*sVNNm(--#YQwKtXh$tQPQDN^nMN)f`0_m-%7Vz9seW($x`IahDdcyOHe~Y3Q=C
z<@3nRUFOEI-)8y9AbydfisBNZzvWj*1~_IlIc##(QVu^oh7qW05dQ!Q5YNw`PLqg-
zCwtHp-t>EpHlN|W;kD?3O=`508wmSAwTmllSa@sj`tt^&Hlq~Yj1O~J#z3spU@^do
zgI^9%lEN{<CiI#7GNM4CVRt%oXX5{9QBuE&zJN~9n}T-vyN=wL`;OohcHiqI6^kB+
zb{r=2wa*;FT(d32J9f2+LVf|TdOdDo;DZs9{^dp%cqRTg@04@f=8^}(tXK4Lt~qa7
z>`PvO4iRye9#>Bk67|DLj9w(bP2yWoYcjRRGF!T5+Ll(QiPr~;Ae%M!7ae_e%e-(t
zWM-q9$pJ=|rxui&UvUZUeWVQg;p$dJtxD2W$F~hq*tEO#=XHZL?G{QTa%qrXld?;T
zw-?toQ4>cOo+N*sM@cXHQNNOlk<NJjJUU4q(Jcf&^=46yoQh|y;hE(}gQC(@rq_zf
za^gjtoARcUUfakfP`3SR0sm095~^ynHi(9x!Dybhkg*E0nwUZW7kLkMW{(Obo*Vt<
z)ym2;Vq=20`-`OuGgXJ`cpg4pp=>X4k~QuTe4V@yN>gJ?Tc(?Owej|ioXx!6yv5{)
z%l)9L)>uz=lkK`#k@sQkb*`Y~(U7}dlM*<ZMQWTeRpT}{q8inRE0YzWUCbFyELGnr
zEDyMC#R)s}meVt{(5jg;basLNIIUxEeVfB%5qcI;j<koUu7tBFBAkXjXgx@6V>7K4
z5G^4To;H}bYJP3@qD=ebjPaF1USk65@6$u0Z=`EZ+8HB!QtMpG>d!IwNul?}cVQ7z
z4B_{Ko}Asdnz!VSxuC3PJ(XWC*YCq$uET~p@44H8j=QO)@F$jKeIPdAHwwttb!b{S
zdhnp!rYkR$eZdylHv=j$&(2Eo&*@~$cSFo6EeJ!>wENy_5|h|B<DIlnQ*x!j$;3v>
zKNT7TobEVzpazES8UDFDXKni18F;iq!N(%+??S+Zo<o>7O}MKUO&UAmv~Mx17b&3;
zN^m_RuAKTeHA2NAOiwV={sXx_hW#2?-~3N{I085SEPT9tgJ(*fBe+5MNUb4%hGCKN
zQE|_9v9v`AF-LNpgMTMqWro0Gdzd4T`RGEezEmI^J1+-1C%sBuV5;sT29dh)_vWCI
zpnxTL#V6^5a5({nP7tB)-3<I}L)rN#lF+05D9b=b5`^L1fygRG_a#n;ymS#J4OitO
z2akA{w-%NRrs?FV#x0KpZG;>zRr3R*<C$Dp{n>olO)4#H&2?-S{x=~}Fd93ko>~%!
znfg(<9TrZA)=pxz>zQrb(F4S-&M0)!tm-`m>LpyMdAWzYnahfy8vz&4BSKvbwGQ{}
zgUk3ue$x*idUlWa!+^*Xqa(K-``yL@XuWo)vzRKpY0Z0~ag##<liXA*;ttEjBCYcp
ztSxvN5Q~0K?~Y$hVVt~_zQEqREr-=_5BstGhhIX=ts*EA^$@L4>s%B7$r&31qOW>X
z)2ehNQR<=&2A%>i)jtil^N|*$)h~sU;0vP_Ye{{_41i8w_N<4(Og#|QOK{h)-Kjl4
z{b^r}QX5DP-$bhk;v_rF;|YqdqmKr@pWVdKbAcf$kYEy}obp8tAe#fA`F=j;^F6|T
z{|u<0fx2*RB40VbV{ur#m>vT?&?K5pXgR8Ox|aTl?898^Gk*Sh6c7~?`}=;9wgc#c
zyQU9a#=My<LYCVs*ez?LTQ)!X`ng!&jnvKG!>JekMLqmj$Cp-p<FJzK1&|AjmK=06
zRa-lYS#JiBC|hK9aDQAwoTS&#orRak>OaTS=+8$VoYvUq4*5a*(N4T|gl3)Nm_}+i
zD65j<^6MP85c7~vz+j|0JvDvmoW;tTZ!GHCq5*(jGGpP*?m-1g&XXxpf?eUIDeVxq
zua+O)nFSf*KmZ-^;VTcvyJe6SJ9E_=O}mK`v~1@FMTsc&$kAc9&yO2Rdc|-{N}+v<
z%KR16HRa#o`C$fRfSqOQ);)CMKH|vMEmJuFzr*(r6tts<ok3FNMl9|9Vril5a|E#|
z$tne|le4vyw3`F84W|8HV&>x?G6sj=L)TT+aNL>hv0pbk?YZeYG5F^e0np6-wc=IY
zDXEn-`9meuROK?}Rh5A*nlH?#@GA-`8XgPi8TZ;o%80+qd8p;iRNEntk88r|m^B9f
zIp3&!40C#`D0~&+_5QoIO^Lh5w^{0BZp@gG8e3F|8T?Z9RDFYc><y@0msJRBobJ3K
z)R2<-TRrQjOf#i9*iW!vB=n-!owpeS>nB0J>fL?nk{?T2dxxL>-MgOP>czPDBEIzc
zfx;QUQp@ApJaD>B{L)uA{AjMj)IW5UMD&wszP<h-2pHJXKHJsR*Gzbf(j=ARg{<S;
zfiqd&s7BY;)-;g^5HpdsRomc_T{6xY;!N0jD)K;}@W|mm4Mws>)W7dw5WC-NBK38B
z%<gv?3k{A?U98wdzJ~t<ZI{&%{IZl(J9)~Bxb*lWUH<%1*18Ef@Wo<Bp9WO8_tRI0
z<HzD~g&o@moeRSm!lm>hvNsyAGX&wo#U7HU^z(1tyzLRX5%e{c7|kNzw41o9JxS%?
zv@TcK-5|fd_rDW@gARDje*2hvoRs;t`aLrfYwvV?QzKXVs@sm+dbz)xOV-(4uYJMX
z2A=LDxP4^o6E@fxNa2IY=)$L8f#ME0QVQ$KgVd1){%8SFikxq=(4_GiWuw$q(%hJ-
zg6D$+V`EgG*h!eD{H{(%gb%T{aEb43wY?8G1NY!YYdGjsEbBWvx4t!(%%U{-{7}nG
zTjmQFj@xl^A$wM=sK8N`V$8d~*rr%;zV_5J>N6~AS!x1En5g4z`g4ShFiQZLH}z}r
zUaX=E^~i?`P^+^p_V6h|v~n_M)d~Yv6enkad{zV*)14arX+$Y|El*Pw?hV(~Gn4d7
zIiLy#gw6@9c_x3m-QN!t>%C`zgrj!MYfH*2DAj#6I(4(3lKq{NfcG5m{uZpdl1@(a
z#t?qt&xg-0KO}~aij!x?o`+7(y>nN1C5gXvLiU37PbX^CpMhHo4W9<fm0|uWN+KR|
zv_eWU>ZX=44h=|OYYN4<5mG_?OuZXh)-rwICx!bp_Zqty6jSdD-w^|$v^xyFbV2l=
zXKu!i8}!&=MQSui*lZ&B{>2pV6vz&#Y;E-V^NB{G_Htg^sRHo+-Ojczhs&I~ZvmQW
zDjERyl+@3vl2YOKv6GEdYC<&lY>bNe2RjvKs_c#eFnV92Td~fz=E0A-F=)%ihHpo{
zaJ8R|4wBcjl3-t4?~O7i;qd;%pKC&pX-ESc_!Uu0XM(qFF)V`i2A$PZ+parJ$+31&
zwmJgGX_gc}!M=3EsJNtIKsn5riNJo%!-g%E*T~C{Zq7`WcR+0Z^Jee-XcjI>)>0T2
zmX-VnlBRbk@OU_pP`ZFVk71BQ5wUtu*~ZtZgu?T=yXHi<@}xUoxjwJK(a@}t%(GIL
z^SF?r%dBZud#cuGD=kBdd)gLIws7o->7F;_@S4I?7&BtDi%o8$nxOlmgTL9N^*#}!
z8Ww<kB>{VwEFZV{C-r`4v$Ckc_=NBDd)r^n#$V638uk?-8qAr`l2cIv#Vf9}w0X50
za#6`n2>PNp8QzzLyhtI^<<IfpWU&pD&vo<&hCPpuDU%yjo-e9dLCyGX3MA8(QvI8)
zJOpmKjIlxeKN)zHWEU}i$w|8P+PrxGrY5vw4IASPo-4Y}Q`sHy*#Ttzj>gj*Vatw0
zfmP2zHLe=r<{H?!)oTPP?Q$z0zMfikz%SpfQR;>lBW^!~i^QeB<Zh^&4-5PI1u=^`
z{rV?|mWEni1h<P}z#ekpPrUoZlX_A6B7Q88@IHtUjG?#RpI}X((w{b5<_}gjSn+>M
zTDqs%ZAw&35HFm{Jxh{n6}Qjb_a4Mcr1nLn6Sx&MwT7^(>*1BJWe`kY-hD{fW%hr8
z(ZIy;p58$?V_c}TQeQyc^H#}(wKD6u2WnR>SC~i<Sb;o$v9v#9xJDVqu{1z98M1;+
zS|-IRFTj4W2!41lcKJs-l2N^oqZU~5kxBJhR4C8!p;ZJgB83J^q{!2FPLzjlE<lwu
z7PgD?PhdTprzum~3<pxk@7R#Y9SP|TRhE2DJ@}QnJB^)1Wk?C?X1o`PWEqkw%oUdS
z8KKB4X~LckhX?FA`B^({xNyK0gMGnfF}9@zweaO^$M!{k6R6z!cTWjkJMUlUW5&(%
zPj_$tpjNJIf2K?j4HK`6cvhol->UTuxFUF3!~nBe*-I^`?AC^|&h+~4M6<Aj-l$zx
zl^gcY=cImQfzNSplh=nz&1sp=D`JO#L(AehLQnqXh!akvpJMXnW-V4G2}rN&*E@6%
zEkr<4H_`F3$eoH87X5upsI2vj&*x1Tft0wqb`AkbTpe_Q>S9k@I0IvK>f-d$r6GtF
zgU6x`07gQt6xVigR(J_!E}=Oq^<M9ANZM;OnR_8sv9F*`Q(xFuBh^(^+18~G27q|5
zhC>G>pFE!TuA~M3fRj0N>n=o$K<8hPJLIOyj;za)s_N29(*IeVWpCorjab(tNIm!!
zST0%>4e3A+`BweZ&7}4WTf;nFujf^0Ow6#6$5TL~3bjzt+bafEe7;;?ms=2@rH@H$
z8xjJ;X5`$JE#&hcIw<&$=C^Er)YNoUw@fb9;HNFaW#<>DtBtN5cgE!D;=aCp<|q;N
zR;f1IS+&4}4Z;j$%DQPhA3p_L`Iv0G(4Xr7{G24h`u7|{1^ygWZqqBQSF#;#7ZK(F
z@<{OK-B3`oML0`dFAAjjU}nA|cLG%OYt~qmiJ@~9@y!*}K=GDL0-%<$Zg<D95dZbi
zHPR@N+#rWO?XmfrZ3t?Ghhxm0_zR{jS)y7Cghb{^2o^@kd}?hEMDPfRN}&@bA&(nM
z;Q8$%pVI9K)i%WS2dgDiGZ*R^?I(gFm7uulOJoF`mK-~xRPUF&6HUddFvnx`N~nml
z!<jFxV;!l|hA+8TN%X+R^CF@ipPxp!w)u&?CjM}zKDL>373OrMw$|7>1M9XO4fWb^
zEa>_Ilq&TJdMNTRv_G6)6XP9TcW!nUTxON4DhkOn_<8tt*gUBJu33SM_})WS6TQ<$
zCfGJ(RWtN{=;}E0@`Gb*)z&}0Zw)Z+rs=A+2BLebrp+CAj#~9rtFB(a&+ZLHFG+rt
zVAVQVI``CDPZO*l{7ga1lVlEI>?m8Zq0#6+ahFr&i`PdUHL0je{fI)~&j`se*JqYA
zp3WyzQ{;S~Kt^VX<T1d)X!?Yh=F@yrqvjIg)7kAk0IJ;W&3JZ&lFIUlHk+s{&UAsT
zN2LB$r(yzp8h(@UiRBbc8BOeX{7qF5@{(+t$8El#?4mt~9|9ZA!`toRBZ>{<886D8
z_=xRA?1JQvS^7+U99$jP?WwgO7};`qc`ceh^?ZQ+5Eub988yqfIC$9fWRnw>6Pp%s
z^*6^e$2%R*mXm*c@+UQIv4Udd#wD0T<{_~)CMKgnz<<a{Zd?&!EjV_l4^H$x`g_J+
z*a&yHi<Otw_K1_|EeFA+Pe1~J_9&FXOCR*Ln$L`KIKUl`1VQ(LG-UKbc_%Ba;Q}pW
z@^c&t(@!V!h0J?>KSD|jGiWJguZ@8vaTzP3{Fsb!$wm<QZ(T=|a5*bz&J}x8Yi907
zD}NV{GFLp0kg++T-aecfsn*%V!l1>nY84yinCe{P^yk4?qsFV#Bx6eAw075PL(P#6
z;t#_0xxQ+b2Qw~RZ`fMt0cdfUL15?1?YRo}&2(PDR}P6cV$V@VKVHu%Mv;)+TG<*;
zu(dTSpKM^!RLolajbvMi#!63f<H1Nu3&-Sz%lVX{DJZn7VV^hwj#h3DoFf2xT+_}s
zG~9489Rx>zm<#>B;Y#(kP1`FF2kNU1OL3shJF~1#>o{9)HHns(j@mM_X<E#~$-_zX
zaUEdJZ0|62+4#f3pGf3PkrtWFGS*$f=byu<>HYHvnsjnO?kexek&9rcqaJSnCw>+v
zv*JzBvYE-;H`@#3sPQAdB3es4BrauJ_aE_VKm9jDRAeavf>VEu6$1Nz+U9~un{8uX
z{bKW9ZCjtLmvME5a<Tc_poa-N@m_elROa(fgo(=*w{4D{!vyM$ba%UZfRMC1trkAS
zUya=o_4rN-Clg{(1MqJep7^a=9{cuCn;kCU!9%Au1c9^9*|YZ*D@!OZn-;Ov0W(XT
z?CfkD{{&J^%EA*W5-J`K>K?Dob&$<!k4O5GeROv>;Je{CwK&_Ib1x*s2}Qz<X&Dvg
zMLalIOaziRz7GH59?+uR^;_WF#h|PuJHW+*JoZ_AaN>Fo#+=eSv%SQszIP+^mcaQU
zhI^<4Z7q1<dSg~1gPKxc--Ew}2Wr4ZiMP;Bb<|LD<Sz{ryp@anNbokkMu|~%dR%^v
zj{Qg7zvz@H3h$OjY_-;G_RM2RHG23nogZaQd-xHlq>GH)_$v7(j0l&J>|#QxWCLrh
zfAxDD68c!EgB;>E4vpignROd&O1V6)ZC9-{6e_{JJM9o&aB3pfv}JYw$cZ(Ze6!mK
z?z=$_(oVjz!nJemNZQ7f2~F}$DoW;)4rfV&LKn%QL|Ed-7hw<*(~A?Y=Xeq=R`$s-
z&2}p(5Rx1GWV2{bqetYF#goqDKp@3QRU~uyi8u$#DMGD0ov8@!3^qX&59j=FRvxvW
zCem+s18$hcS4k}9YfKc8J5@+Mi?N)ve2l+gFp0aqQx;}pX1s(`Iw|#+p&T~tT#jWi
zYTUeEl4O!AF-(2lCRE|{iJ;r_zV}YuaZ&Ul?8#K437L*~I!Q)&J_D2w`ZV`R#HyA5
zd~7m1C&(zs3)!yob*MMDwge(?*U!5Fo+ewat1;(U7JRs=87rS3bWRZF-k(P`tS5G^
zMvB82uaz?%Z7DpFSSXwll5S7FLpr?nevNhl#(#lFc=O-%V75Q9)XYyr4ao|yh(9hU
zZ`^S^DarnU?$BT<vo{4q#o<X9Ut}Rl$^3VJif6yxpgvs%3s$?YiIinHhfj7fDqbD6
zQN>Qzm5lvKR9?Hi>Ced%-C<AVdp=!o7x5p11D3it>n3f*VGGRk^}8Yl&d<VTNN#V;
z!5blEh@$zJi0)kNh-c&(Wnf6=sbPU#cq6XHZ9WeprKyB*3cBxOp_SC*n{KVOHt=W=
zsEB`exm0Z&G}U_si<1z*Zt7)h+@`i29+0oE&%4iLs!F_&l#yk*2Ob%Nh5o$gDzm1K
z3dQK0eQ3F#!=2!M=rsG)UM{>3`JyOk)hiUe1unyw&?S~JapKz_HG!mMQnf3;bpaLR
zR+W>dbv#+E0u^XdEKcw}vlCu3b-(=^utVl4lz-nTRd8ccW(MNZHW~)G>O!flh#i|e
zYGR-yWlXBt%Mj`qXcV7rCqHT#3PWb2TivC0O`LzcVe{yUW+5;G*rEx8+q$A9$~SJ{
z9(8xI&tV23wn^6iHixdRDGkbHVSGF7F~72iYhskKH(V<j9q|Q`bmTMBf}a<`l5oas
zmtOW~Rg~8Uqbquqwpg_dehW|54=3&*9Kgr9w3f8+x7L-MUg*mk?W}RHT;<$cRM=+T
zT-M;jJmW#zGReiDD83?`DZ^FFEM*io8bhQ3;^=#9#I|`&*7Wk+bfE-Yxuz#yh0e0D
zk7Z#N{F3=tr$$9LN-HCff3>7j0ZsKQmoX1y=RU(3N(?wEGBvd}BQ5WsrA1!*4F{E@
zZ}RM!ex+>wrI?BIrT(byu5;6HUNjpu+HDzFs&46_?{ro(+dQXKlb$X=kwU|n{ms4b
zQn0ec(%`4UJKR{Ex(K)7mpV%7<<vIUW<+)AaEWMq0}kCPh;${;W%c>iTSc`u&t;)S
zH6t2PaQ5(Q1Mb&V&pVLwxO}tQbaA&M`ta;xm$${)*Y~^<Py?>^=!$6UZj)U(FUrn|
zxB$FzN0d5|JRuYehq3Hd#7R(I;Z~}=7Gooi(M_=-IzNW_KInNS%uL(kzS`wvX8x+B
z5`<%t3*x-JXzWJln`7l;4yqGl_+1qJGp)FDrf00)Jpd#s(Pnb=SQ#jKR$@)X9F771
zzSw<6F7sRU`Xe9o&oE@U;j)ss2RaL7XgXNp3&y^#nnH4ler8;I8RS+I*mXuOlzadh
zqQXf>S`u~>%a)gpf=QS-{6~=LsKy7YnI62aCn|e5a3n$@mR4Xvd!$GX($q4UEi?2j
zVqofRZ)AKj!-H2wt$zm*4~~a${05ZB^5My0SwV>!6rY=}OT*05GqA|u)UOJXzBtd$
zWDbMF;7pm5yRX!&+09&Nk+6~Kc(LaQ{2COL*C^%B9C@B}PGGWhL5W6+<TdA3H^QcA
z=&{KfUru@&{MD7XukrnF7Q6EAgcR`M#id^`-N+!jZ-M)Cx-aR+e2P#rBWarcY?Ky7
zyVE~FzBd7O47o}+02UH3?Kr}pTv8=?d#b??>{i`7-wK;<A{`F8C-VLI&uphX;PCnZ
zS0V7$q%3O_I*I##DAIBY$4NWr6B8L1#HR}{vB#68<~>`JUI_ZuZUm^&&P*Ci`d)HG
zFT@<m$@v>|kFd@t8%*dQtOcnPw41&CGC=E7l9TN_q99$5^D?|{zCWLLzEgj|fThJ6
z^8qGP8YY0gQHwAxKAZh}IY;gF4GXL^(GC|9?Ac1qEEnm>F_ZX=?gxmC5N7hTL8M59
ztl9zu#zxw}eii`99zK*K2EKuB0%S)Z@}AFN&uMP_BrA3`T<h@<5m}Eu8a)qh<BN*<
zd?&=d{`U~q%S4pdQigyIC!+V*<Js(WFI!@<oAns{_mNfrruWTjPYulQd$W&M|Ee{f
zr$EowyZlt{fe^WOVYl66wLP($x%22Lj+vWFjD%zss8wxesN7K`KnjScb654_*%A1Z
zb0Bnw8xR(>%T0e973S7|2dX(p&w?3XW@*l-TMSy2_Vb}8=hwFZ4q-8ts{i4{!Jw8x
z97KxgrKyW?)wEApsJ{q6OsN>nm`@0WAuownHE?g!UKCV7wMvMFNc0N${1=l%3CoZ@
z)}gyS*FBa`x*S#*5HOttN+Z|$bX@w&R`#?8A~V<(d~s%2BFFr`&wG$YitXNWugtFJ
z<1I>&Z0%RAn=G*Z?n(~Kj^>vcK;x_NLZY*t2Cl}`VXm#eU0hcSKRT$mu6(V17Qd}(
z`Kf&s+f3z{vt99Z4rLR=q3VbYu72P!(sRX42`)|P$t@R$fb{rIEQc<I{VnW6^Y2hq
z*`JaX9Kuq6$pU2%Z&!X6aT8*&Q%wk~t)j8ar7ODa27X1lqfqcJH*#;rCv#Gr_4v{G
zL6`1~^2?oio1PWYV4kMKHu`Su_IZ`E%L|>E?8&>u6CG~tk-Sb@5i)+ScCpbc0fCNY
z8y_irN0@FNkk+5k%-Gu8osm`0znKQdONwJ;vSJLknQ%ZzOQ7cTG=nBCo}az=!SwI`
zTws`brR%JMT6{1{SUGDD*p~cxXx6rRY~qSj8THn!QS{1IP5aH*H`{?VZPw=PO;@pW
zK4lxVORh%edLz8&`T=83ldNsW{Y6|NE&m&?<s&bKD<>O_Z_*?><8K-Yck99DFS(qL
zRD#mJ_;QAV9;xSx_*)tw{6tNVVqN(|<exj7zhHo5LMULNpd_Rh3Or$6q_C?Lb4)bJ
zV{=X6bb~}BiRx4tZF3C5a@s$wMne%ZkOw;icbkhMpew%`=+CKcmyg2sJv_aj&J2St
zI)$ciaZGQ6>)RT0val+TWb<Wk4mBkxLCVhz^&9$rqpQyMeUNF=*W)R|1r<o^SNBju
z5XGwIV7c?`=%)czCA5ok0?>81ZSkpXvu>;QU>;H@cEZVBgUMmeu#tA*RzK0IsdJ=!
z=)u#+gF&ZQFtWjB(!G3;fq56L2Bw@atBgvQs-mQ?X&|G>C}!c<sH0w9IbQi|dNq6m
z^WbH(0**0TF0VyqU~YLG7kIo*N3jdqz$x5dd1xMLV?UC#=<B_i+vgqr2WE84SbVgN
ziEbr)Ovh|L<xKkc@6`m5=EJ!iAq@ZQaMfCDt2_KsiIjSb{sZ}`4|rrrTYNNk7T1}I
zX>rJ2u5Jp1kqaq;IY`wktDBVf8`$%7KX>9l|5dl(;EOFy$eKVy6ysHwpR6yb+D49=
z*-V%sKPAi_H*0WUQ$S#CW;o+-TZashz)GaaK})<>zmnQOq@$Ckgh?WPwCqaLk+8(_
zU-S3}n-amv71_5Z*iXSE>Q_@>tEW{Pfnk8;vt^2r-d^odnFd3Fs)u~4YkepfeO$3~
za~|rM7S|}$Jnx&#94qiuU645K;$QrIJ1Whr1sxcE?Y=E8FWVLu2>IL0SeTm%4F%9C
znA7osk7q`*&97U3E9gOK?Z_E$FPWpZ*FK@C2RFvfL09i%4!5_lwCLaJ0A2FP?-E2_
z-ybOhFFzh}gA>3BxIlO32}MV8jDRlEN9-l}!GUAul8j{p+VFh@Zsj`D8-%`MJXB<0
zE={F2sWMZ%n{|gL6khuLE^I5@zzQ$_$0AyyXx&D+d?{77Mf$myy2ozsmqUzC_6yR_
zEoh>24{Pdd_ApU@wNa3|f17eYUEvBY4%k20KSPp6k?hQQ-*KL4_mn+OmJIfa19-=;
zh;xVtL7RIwcoUBPxa4J)+YLrgHeQDwe)?}&*$3paD)>kP_sXe}$q5PKHesQmo^S{@
zGA#e*MpW`<+tITpYlO&^VkZ6CnI+Kah3KmalBp=7-52v-qLq~gNH!<`{H>3!j$saB
zMi(S_dT;6-`i!tJNwHs&((y6+TOJJ~XdMJnyfz;EmqihGw^=k6>a$CJ7SSMP@NrnE
zqtDhig`cD~nYD6sJUXiW{0Y(t#wyKMBrS9=S4iD&CCWG_Q%|L``nmxdG}HFGc_AiF
zx;S&6q7Ay=sbq*&Sy-G0gc;X%n7Vc-Nj^DX$e|hQ6t|Pmj!Tk>t{hlpi@=<h%#-8~
zkuO|Nv_{x#0RK;U$?y>VTRm#C7RwUIs|Wl;cx0KW;$%2ECoOg_D`q(@?Y|2wPPdD~
zzJ4J&Zp)EcA2-`N<eugNAmF)Vy2C3YgBX6VcRBoCNY6io5!2+Gem5^J3_c6I5&-W+
z=ZI)4*5c{~fl*4LPZALozpqIVA1cmACw%v=Ck(Ec3_7>64uWZI^_y)tCNeB*+uqo;
zFt+Vn6cF_v4fPP^3nHULcdxMBd0zhNfFXzF?L+v^L)OdG_JY-+uHE%+vs6{jyI{|u
z87O%sr^Z(?A(?MO?dMM$IJDacPoY5odh=R&tnw*$kvm|af<S&ZS3G)>M2<FRrUd=i
zNi*|C#RB=Ec@D1m`w#x*I^xieU|e6n_UcfpDJU}>Ci<1y)GeuXG7NfyOAa?j&XDTT
z=pJoRkWHx$b5wWx=0gg}QT|B!jn<phE6p~i-O(xWFO?JM^fa2!irU?ss4DXmWqfX~
zlMi3S!p$R{4(%J%V&G0!6E50<7SrPnB8*3VW6~y7bZXXM&(91iVw?QaKZMvOV~oEY
z!QIl3LBIxoOSHiX5R`4v-y)LpMpj*Pd|NzJ*8W{^zh4sq9)cpsaPY|Id<Qfcg~ZTV
z*L`R{sWiuZQY?hY49+drY!f4)*StSlO)fG*h-t2r6Ncf%*_^0HSnYLotw#eZ5YROP
zjt*&>OZ=Dj3{mS+{o__i@u&a5y$$D>gJA37_a~vc^FUQ$x^qN|8j}!F_3%XcK(25=
zK}k(@n6O}Ym}`)T9F5sGUxJTNGODpj(?{c*!{UsUC9?>z>8pMbV4bky`_9ia{Em|Y
zMM|uQ?lq3Bxuo|vyQC`sOaF*TfUJ|keA7iW%3k6x#-X+wD_0vYA|D;46+Djoz}8Ro
z34P%YR`Btub->Yc;O+J4id_{|THxG!8w;|JEOC}}X1c}v=1EW(6&|?Tx;uCUA2^=i
z8HFW0g5G{>k3R`4TA7#3e=Lk2sDpP&Q$oFw=NPJE+|3OSC$|$KxwXGUs-G*Ee{cvG
zJ)kH0ks4EoRisnim0#R#yY9sysJ4ISWz_S5O;<$BQq^5|s3lVtaz}DUN}Qe?H6S_W
zlmLf-0eg|}U495xh5ZRS1}z&JMh+O`8L|H0O+==TNA9rJA{SlFtx}?gn@r6hjI&0q
z(Y$5l0rly2bHNQv(cSR(d8hg079(brzogIzp5t;V1tZ^}lV*HDWzig)mzKHPn0C{@
zmH!=W0$x|A6W~WjM+K;(%;}enm2Wo*HSH8H@J~>az&LxjN<{idwD{e=9hn-9AOW4C
zY2ZG`(LLl0fRWFV7ni}i#pC3lKb_elw&3nHXu3Kt_FJDU0RyjdMY8kaWFf_JquCFf
zuLCNkIZq<uU>QUIfr+BY0ECU;TigmWeu`9L<Eim~kn37C*?0$q1wAkH9q!%cfY;sU
z3<lWL-3P!{V2GhoTjJ!^LH2@xCU9J<Ya=nRt}v<ACLy#S;pnXIkPfRiy6P7s)HG<`
zLow*0M~yx<zr^}38MX^w(q6s{xsU3$t?%r99Rn|wTOV)rrU*Se6_Qxfkq@0h%7qs?
zKfmUUhZXSTN<%_E`7`Nx-@j};n9O$Do$k{DibWsi1j*muxBf=d3pY}7f9=J{>8@ly
zhBPH-!qskWEOK}85;NM^AU?UY^5hiBUAPVx@<WYWZzlhy4T86`>7$?1kh2y9-T-%U
z&Y1p4n^9%dKO%c(y(>ac#K+Ap`pHy-XU>w-3{(L(LFR+!E+W{X%N8lShm_4){!vqE
z_~${QsSE@Ci-okoqF8R+DK3JPK<ks$I`U`{hksO@o&9#nLx`OqlsZk>+dbK#dz_t2
z$vzskHLi$$y~id>+EMXo14EB!eXZXwVfJQw%~s{79@Lg>wXb=3vlmG`L9O!spL(Ol
z#@@u_!uZq>eu+4No~mC)t!D@lRahgD>e*PUou5VTNjj*5YeBP@yk9ZU^rhws_u+75
zB$Ze@5}@(JkI0u7oYc?{_KZGw<|%$NQ>c*IPA<J`(xvAm$HVm<p?H4{<vi<mHhkK*
zxamG(EPadWr4T=|@YLR(N)%!Gm#6HDwc+tV*vnPn@yh0$_t<u35F#-Z?^*^M*erX+
zr2q?ZMsKs&R~xxR16GCNq(@WALP|YOSB&o?Vz?IAxnxAWuU?Lc<EUI@Qr@^~cSs7s
zaUm9}Qy^N(VKafcdRl+#kXFmQVl&AFf^Ayv7s%Fa{FBv|eAnI~T7B}|@T$T?>tHNc
z$&{l<hGR&wZ}TSwgy7<@U!5PMO@1*b3I<Dok_29AN#n~XDY)VJuIgkU|Ke;KKfYFO
zg!kU<_IQ}d>MMi6i1Gj#Ht+R$kpG!Xt>5m`RA34BI@7J$?NDJE=^jL{Ca2*lgXjhp
zoL(BhGw5=F00@Ei$5%0AZ@`ziS&cBTd|C({da?o@A?Xq46aR$8z$pNwX=t0pCaS#N
zf~n|mVbHqLj6|!$@NWptJX{LcKU$4xuTL)J0^ktr!6ApixYfX5&0;Ssh_nqvnZR}u
zx)^fYMq0e&d^unA3k#;_WsGfNVo(|_IjT5*_7?0vx%AGx-P>DV^kC*SFK8`-^SZ5e
z7PJ@R^}cia_f<G6C`94~3h(hFP*GKl=eM29*@95HLQr`XUZE<@2Cy3`M~S_=eK&ZW
z=no|`a4At2&srvu`k*gO6Eg_>x(5G<K$#w5r`a?q1bHVZ2xhr``_7+|ECHCWk-)<F
zVKg$;P!1j7O}y{%{;qm})~Iyli};B(6UP7?T}At<#H@@;&(KfRXDV#h5l{jOWI&%#
zG@4iXqvOyoe2eu8=8b$9Vx^#(V4KM?XNn~CF7!&194L-UX%_q$8+_8ADNFmy5hZ3Z
z*sGMaAl))!ywZP663scNa`xR|Z5Xf~c*+H9st9r7ueUTH*#nl#(Rz9(1{<QXJ(q_i
zJZ2*>!f5Mr#gC;HyQqI;PT3pk%w^M%BYQmVJuVx2RJZL7+d$6@HFQEM+;WNuIdqa&
zv@aGu7pbk&GYg?Et8GmsDnfN29)f6*F1D;x+c6OTe!-_M;V6Moq~k6(Fhr<7!$ow3
zg4}o2_+#x+EU&gJmq;^G{*bC9ows<Qf2yFUGbKm-k<!EjIxaZJzmUtYafN&z=Nz@c
zv10NqTLecdm8EqDz3}79zty+yr8Yh7pI~XgUs9p2>3UB1b4v{NfyO=u=nr0g@zk{E
z%Kpa)e9w)K%2MGMZ-(mmYkFWTc=<DkCBOd?%;|b(C#b5=_FP+c0t%6<#$dt8n43SD
z5yerOL?}6pLWN&@UG`bEsYDLq!h-sJk4!ZUB7;N&70r?a%uCe!K8&)|@oU1KFGpss
zo<KH*yrE!ri*oX^Ggemm5fdE21KR%pN<g*0R$TyUHw|UGj-%*A=&NCy2D4o!YMKlz
z2*i4giqXfbom+>RjhV@jN@UADRexQl33n~gX_kLdUr+DdJmJdqC-Orn3s81OCA|=E
zy+B+;TsL5@!ylrGxRkT2bSr{s*FKHWC~1nQSxiHp81kK~qOypzKXqm}<&0D%c0p^a
z-Z{j$h(qp+SYg!g4d>vki(B$zG5J?l8Eb^TFm?--aS<^A5qCk25oS{V3{Vl)U3vl0
z(Nj#42{V~A!OFccEg4giF$I~T$s|Rt(8u7l75f-KqsNz1lj?>B34z58623vHVMXt&
z24ZX$u+w>sBrh3;!`Dbk%-De0)goDQwYCR4q<^^Z6FJWthGF3+s+N&)JB6R<pLHMq
z%e#;Lx1;S{$G>_UymtJRyYJ8hFmZzJ;-Lxd&`^N<=c8Z$<jBCs=I;it!{GIF^?^NI
ztveqW8-8GSSL@6JFy9AJ59yd6#X2U;4}vuS7S7Q>091uF04_>30D|pmQ3lnb45}r3
zREu;|BeTVZ)BjN+08|kjR{~fu|G#RSST+BD?eu?e=B?8IR}jb5)Bm5CNeuOuA`NnB
zwYklT<mlLB2IiRjm8}J(|Ci%K_YL-K?QoI5yyu$_R*a$6@Is%2=CWT(rr<|XeM#Hs
zL(iOCfB(K-3$O(j{_Do+-hHQ$y?qYZ+mO0fG2#RA`ZZ}debZ{KR5}5{bQ)$Grid0S
zpbh;Ne<k)?l=?7A{T9_FwJloJtV{c4#w?_dYq%3;8yd%;TC;Mtp_FVWo#)D;d=S^L
zu@fa5qH`A|8`g{8+`dh&f(YQZDr#vvg}rBYCd%t8DcB*@x{?XLFfUP-ypik*8>Fnm
z#a8#f;j}}XhEcP+sV}4YBRCggwvCJ#M6s>6FcZbsAj-7?im$n$96FR^!Ud!{T2iHl
zV+LEGY8xfQB@U@X>AHP=F^vvX^YtSg;_9^|V{IjzM1m=&zD&tgN~PT!u{oRDy2DFR
zGTPtW<<$ivUagEK={>B^q*AGr*6e7<yU#Ai$p_nq;s#o&R;%=|QsLxHfqD_pq)HmG
zKA9USj!cYveB_xCrlH}%zl)6ykf8O$!W5PzjSx@+1o9^(Kkj;f`W-;A6`LNwv_FWL
z?r)I)j@lckp=zluX~crzF)&_H`;3;-W`EkDe$%wUw97PWqH%MBAHxm=!|WRv5Nd4=
z#HI#2U@7^ArUnhxc`4eF{V8u!zsVCOqbXpb^|aX7;K!(|!7#(VAwfm0r2)*^d_P?c
zs25vi9vE-lvc8#B%V5`nbn%YP)KI}4FKyU7S&Ap8PEAF)?xamY(<pu-)LzY{N=aLy
zG_`qSDNgFw^FT`MPHV((0m{ES;5LWbqp{Y6Ka}pfqql8$wMlEX8MOx12&)FOPSz4`
z_Qcx~fl#V<6M?zO9AS<TPY}Pw^#(i1pAh?r?SSU}#4P#Rd?aZ(^)NKzx(!alk^cSt
z7K6dkzh5?XKQVTS^9v`-o!bwUN8X&;FtuxHc8bnUWv8~ZybwDyyycDZ*uw_F$vq0K
zAr)TD8WY=%&_RnMs9(Nr#-3R-PCGOH3>E;yMVDGnaVPx(k1sSe0yr~eoC-_<&Y)`@
zYI%VNS1WIMg9q1h8U)_SsUAf}mP%X;7iYMqO;{IfEH|=Z9y_&^U$!;*+fWT*mF)uN
z2qjZ!{Ry<Y<2z+A!>$bXIkN-F#9*^4>{UYhP8Dh!Ze;S>B9hr~xX+n3v-alg4{n+|
zy(#r`*yBOkP!cx`Osq+xF-Thmjd||*a<Vk+3HVl!j_$Q(t9$qQm|X7QVgtt}7bVx%
zHw|D-v0qb1WPeF?<2d{IBw-3?L`=wtSdkI2A|ozB84*`AXtU6+%Lrl4s}t;8zP`mI
z+<?H@BIdZ?xQ>d>fT0B*9BVJxbpmha6#2$2qqNI-qqwMI`m!ydRk%hSQ5pluti8Oi
z<oy`t*+(T)>=$r{98kNXVvl&NN=C&j-k!m<USneg(Ma|O=EKB3;vCYEruzE}`&!_`
zJI6h-0#OKoFWvO`K5k}4-Vz%ZrnwHd+o|TpnnpbwE66LN(gXM1;C2|G%yn_M?S`0j
zhql=a;t<p00zb{+QFJ^WM$QVnydr5paC;4o1Tk&##+bMqud>&@c7X_q$aHs@J5mh|
z!u)8oEt+mdyIwEgz0kjvmaBzy16fz+0e!WeK8?1y%$ik_ts6H*gQiuP1a(@#75djq
z4(PP7im8H%Qh!Q_pUXajbltCDU6=foSUvC8^iP1K_v5IKOSyg{wD!|JU)liCQ%kp{
z`#ED;=xO7i2k2|jF%>S`a06f>nZx0?fLVxBI&f%PTHt$1ZCuoflqYmNQl3zD4vO_^
z><@SQ)c=Z)mCCU!<ZhF~Zr2|#ymvZ^()~Tz55bc17b0EsfG(HP<I^aAK{ufDfG?sg
zy@?p-`njH-0N2b>+_XL|v~gxQfum#F8zw%AX5WFgm9N7PfLc`)k#tTx48a*WN<(vP
z(|SlqKt{7jM#c6;uz<tYch2lsX&;$gR(WA1iq;F9n^wXP+4qztyrW<AE%Y}KoT3#5
zUt(pFlYcEa_)u*Wv;G(Dm0E<rHgC|VSBq3{V1~(R(&==ov4bR~?j{R2SH>a5E`URi
z;cSFUdrk~OPR-mOhnsi<CkKo!$g)`Mf!O3gTa0C6Z3B}Gad76;(Njkcs)aL^`?(X`
zVB9q$9E7#6WS6GLU^w#S-mzMZ2F$+#-dzHmgGhzf{f5v0iIXlg@ENth*M>egBk%{g
z=?Y@y^jI$({|YZ&09QIn<IsSjSg8MYsywVbb#8k?HL$-HMWEOvV^ng54ejUq4YfKE
z<{*v`Xlmf5!W4|JARS6$@RqVcz6>J^qWvM=tt(BeGHGvfE;kAff?E_mAR?lCBSOk~
zjFb!|A*K9Z5mL@$q?C<INGb0Jh;Rt|qc8dUCJ;a#Djd=u+Ogx1o_3GJD6fG$^p{?W
zx;Mgg%D!)m8|~xrTsj@-Z0@8wCkVF?<zx^VY@%u@0z(n&1`tt^Y$2gS9isQ4p?rLO
zETYrc31Ff#IzdF;0w3jUGK3B`Npq}YLoI6Py-USy05!S4k@Y73Do9*sJvHdHqX;qB
zO(EAHPIa)Mv#Ue_t;O8ck-jmE2=MV7tawC!v*vm97h6e999nU4XvM{0@2fa+KE#d4
z8BG4}3bu#+qUPrpH9zqB4zi%(FHrUKOD45nv=jX(W7?9b#x;zy8o5R?^|D8}^t))n
zz1-j&c9&G*3Hk_fMAVBNE$K;6t97(wi?6-D!$*H!VfNbWUXy(6Ddb|5w(aaWuDS2j
zdWF>wH|<n4&*QzD$9wO3bPpA(?Z^G=#LmI!^k(X0ZFdyRlE+ZpC^$<li?wwgBgCF!
z^eI5yCQ>K%Ww`lH$qpU(ekJ@F^^-pQi;rYQD%r$WYu&AnUd^>GjyHc(>VPdEO=QeO
z#*JixAwvo9!MYF`36VkgYcWVhf@A=F8XzM9GHxL636eordPillalrtvyMwS(nF=WD
zL0EYSzJq)W!tu4>#9*Qt)VQje(Rv>*@Q+CEK%UDq{tx???Z8}veazDC%S4bgGU!4Y
zaG}~5xbAEkOhXaO6}5)L4IU$@!mf{^PmvT&E!>dlTnV2q;nd3(UX(Gg^R3+*wy0za
zGWrjc+7fizeI^C{XEK#qtN7!8hc$*}O1+xiqBW~%Fdr!JL-npptEGMp>*-QT4dhD_
z@MQ$>B}aS-^Cf@t+a(jM&;{i^3njfLOF950uE3hK4$>~lG%J0?k}6226x<nt=kyX}
zXP9i)keUE=z6YSoU6XH4R>K;Tw`!_6*l`EAT&?>XBpaq&+FjB#9=@nBu~a~wUa>53
zLs8;Er6un7g>4$y5C6AJV+(n_Q4^^m9Sd(ONlQH74O`W+8!yS!CcoPoHB+jE-!<ti
zT84%deD^PW4wlJgv=%*imHe{aqLa~bwPN8SIU$Grnl)C#!VHw^g>&?2v}Y=Ii*o}?
zv_Xk<lSwz}K$}$#GNy0WQ*jmPg3g|97wPPTWOb7Ms#9&Lsz+oK#E7^_R0JZG#=-=J
z3YH#iJV@O7fuso1m=Yb980`PhS}R9w!O2fn1=aFldA{HZm?-&am62ZfYo#&b^M$M`
zh9v2C<fc%-6EVpbE*njZ)~YAFWM(zJ-R96Uw9=q^H%q-@(J&Axq3?T$`VLiM+(ZW0
zzW)WSa|&DcHS&&m0!F`HBe#~khUob~z->Dl$db+3QkKeQ)$a3&xsE5*C+Op%j}_Jx
z6HKThLSr~oG!Q+{gOjtivpkVCW`C2VwKO<C;XcnN=F}Ze@@Ndv*D6*Nu6JY#ty)dE
z?!ag)CQOywzMw0*qq}LO-JclY2RG^bEwN~C#;4So^*#I64ejW1eR3+%6Ehc@nu-zX
zAGKPIt~r`yn~JII`V1R(r#w2d%@p=ntUiageJuA0EgN9t@kkudiU+j%g4{yHhz^_s
zeo5_bevaG%w`0gpl}v=iuhus`8=7+-(I0QQ$efUz{9RpQqX<M4cvPtASsow9v|QxD
zk&;WlYe`wErFf5}K_Tuy*|0;O`U0#j=qY3~4tL1N>KVDwWwpADOkrzF>CR5qV>*8!
z5-sNvm1MZ!H_~sH=QgC(Y}nDO)xmHv+QYya`QXRG3z=wc!=a(*P+K6`{;h1r-#Q59
z1C$a6<0P7iDY0i<^cr|#gW7h%8~Utaj()l+@p;7wSY{5E+O0K+E3sbN1>S22eU>-O
zHPKJ=O^U?ldBurEt>I9Yyc$OvoR4zMR`kS_gOVviclLbpQ|Xa|eb#g$X4lARIC&N7
zL@`(y9T`sd$21BBuvS`iW}Vs*eCkgoj*mp-8k0$_H|sT4vsxCk@7ld<n>Va7!8|(-
zJk@=26PV>~xa-s<m9y<RavCgb8S>GR(d0kkRMClN*}1~!v<<S}g=^(Y+=K_QiD!9s
zPFwgKuWb})aq~dFXz^aNP$3ZF`<y`&Ymn!5_YQ39as~Q#7V}dHg#mF?ekM^#M1ZEQ
z^%Y`~YL@yZ%)$O#J~#29-tzH@bSy?@8KsN{s|2&KF`Esv4u&J;wqUvq&i4v<=A&S~
zM~N(P8pVTTfhPILyxU}Q$F7lEN_N6+Ij7gFvS$OZ44@<VL|{&J-f=?eH#a9XK9T$Y
zkOqFe<s1*rk!8U&myvE7oEJzw!3X9Xs`I?#M6CfGoZpQd*J?EbS=%BZs8<Z6j=C%h
zXU)lhe5_aqs?|z;D4p*JoIf8QK0H(g%Ht!l^+Vy-h=r07E@ymQiq#mj7MI7V*Q%H&
z&X?!LQ;G6SyQw^4Pqg~r${3-(OMXM{A=-&Mkgv~dCiLtza=K(n#X`!bnvaGquoqIt
zJjeCNkS!?SVE(rX*KrWIwORQT-+VL`y1=Jc@Qsf|MqT4}X3hV^u9Vx-UXSl4zd_05
zv^;Hx8uCf4UZ=TNu6J8)fZ5|3fKTK0{BXgZx2YJ4`Fp)tP3g4ml(*C2@j4cYfb}xS
zfAW7hydFn;$5fk3sZ#2!1WlyKx2gSL&h`?c#5UsR*lRvX4iO2$OimGLVm-O>YCa9V
zqV9Fq$c>j2#25rKH?fJlqm+os&UGD2Or9&*HrOZ|ch-<q(CuK+*J=Z$v+Z+%E##K7
zr2rX#<+ha?E^rS~Oz#lpu#5nMMtEh1&?Od(e)%V`E-)?>{5r0Kk?)e7<G}@NljnHC
zW(1eeYPqvKy2@+lD($7SJiHDNsQ{^?8!qHPN|soE5?m^6e11o|t5$<+?YQRlWns<W
zTd_Q>SuPjfQTuhO5wkwncSoDQ)2!CT0#9Z~TRq|Gu@UY-zpp9o34~p&Gt{@G#gnsL
z(P+Na-QiBUb=|F=v|E>L%RLfyj0~l_!v@)povbD8$Z`djPOG*X%??UV*<zic#9*tJ
zjkN_5{XSjJ74EUKUFjUx;+8XxKWpwVdE?gRR--qvaLDJQWbQZ{4j3G$BO*_Im--l3
zkwjd+m@q>QdI${=X9M9eCG7f(>ABDm`*G&D6fE1-*t7^7k=9@2YsW|tvR#WdJt1}0
zijbu~rZBp#7O>!SbcVSkgI6E9v<hYKZ0?>cu+%@*q_vZ)<T4BArT2~NPbv}V+t>w=
zYB!jt6!QlZ9b3ZE%aT6=4@ZDUghhp1^G@R|daj?<`%A%~Ro4~XSwepTkK=j~%7taw
zy>~Q3-TfP5aM`3gwz&+9F4UY2hO*7U`aM$)xl&G1;K$XJ&zDU3eFSy$hveI&7TjY9
zpy`Nc|Byerl++S%8L<Pa$aN*=owYvA+yn6w-RE_Dqp_xIP;ca8CGRX_eVS*GT#L6`
z-=J&9`#0??-#AH_Gh92HWx@Svlya59W{O4>2Db%1j5d_Z1;g1~kb0qcyxk{PD6|%%
z$4)bJri*G__B2?Ub^~c@CAPw6>DLf>^3$-l9w0ai9_%vE64m52*kKPw!OeP(m?XIp
z#R~V>L$R%mM>NFA)l?gL1##-A$H^%yEKBWHm_01(F{zmEFO{izncD0^Aqy(~m%gh}
zHV9W{;qO-vtkA1+wVZ}ethAb+U3k-Mz)wv47Cdo7bn%vXwebjgDk-}72!4VUrRcXy
z@2h?v^=peWmHri2cgw_4G*jEdV6nZF?KMF`@epOO@><pUi~Vzfi(PZQ?a9Jy^0>W$
zx?+r3?)5J49}?K!59V$ETvy;CzxaeDQDke(;-&AQMBxx7ww7=CEAU`Qnp)ceg9*98
zWwE&pib7jxpf=5&;jq0hldo=exLa~LNB4N%y82XK`kr!V!M}l)Y)8%$b7~^%raDDQ
zJO!xLBz9tpnCiHuCp`LR<8u*vU{)d!j_QJ_hDf82>!0Ntj%bMCT7w$(r-z7k3Nq9J
z9<{wQTuDeoaE61<!mgH{sr(`|tHMV*x9pM7!vG{(4|J|Cf~T<ntxN1WY$YFs-SU8z
zsZu+iGR%cPi>-x*uEPfBQ$T5E!k?AQgIkA6wNqbAPTb8+%vMA3(UarDN2}34F+|s8
zQ|l5|_&UCsetU3sDia?)QW-op*_0ePQcYCae4f@yQ>xtRoq>1DlkZSp0Cx+moITj{
z*{p`-w;?OXO4y)@qi)XmWsG~)c(P{bz*rff(a>SBl~X^o(bj=SH$KtQ@TD3rmfJeT
znRTwFRKhL^AfsoEAy>=p-ny;BWfJ8?qy^eKmAQ$u%Hp*yyvx8|X>y=P32=G>7Ui3B
z6NizllWzT1CJSvHU=@JpzfXLA)Hm;vSJQ#5f*g6KWU**E;$E3PJezvfG1vMz{R!qI
zHVld=n5$+Ou+njk)U&)}PT%@D9vzEqgW}@gEh#~FNnjCcQ!F(OFwlT0INes-+UW}R
z@9J}AnzA0bfi(r4*gOd8HNftL=7B+aW>N_ZJJCWwmLDd;R~Op{Xy%dML;ip=im?y5
z2m>?=v@Z4a_*}?f^Ud0h*JFa-x{muj=;G?@eEsjY5ebB+8*T+peh(OTj8X%ZF9Xn~
z*hXY=q+(%<KFBJ7HS&FvL$6@ujK-1hE_`M2e5?2qcBM=y*W1BU3{c-81@II_T*Le8
zL>IZ~a-b>Dq;*~+H<!GGHg)#3{BQD9zWoVj7ZaURpZ&J!B@<<0pI}Zj_O;uwxUpR+
znophOaa;6g`x87m*Q7p+f^Yy@ni%#8QNnSFbkyE%$I3A`?QN~Kx3Wc6FQAAJDQ;~G
z^kn^7In5|!YHy-Fn(0gRRg1|$*JQ!h5_f4B@E1nTMsofFFg=EgDf-^@K*pgl7_@eq
z&Z1?EW<x0M3EJ(6Qd_(?&8oCIHTa83%jk@{q{|m}uu;?#J`Cvf4D&^zfNi3$5n+EE
za@}Y#X#B_G7o3_4mSgFs6&Ry#pfvUCZ++(n$i}z%k6Gduc&DXg(Olpy#}w(OMH3$d
zGf4Frk$Jb&`dMTlL1Q0&Mm{4~v%a8V*QRleMxz~*i?;8l!8^^T11VQbE|W79ZDbul
z>5*-pA!E?``6#1gWHRvMqsTV;zxjee_WxP?67V>RYu(;^x_f4NnXPBvq?yq+8ZDz;
zn$c*pHd~7=+ghx}vTVy^OU5=kwpmOdK=5VBLKX;XAOT}pw&%g+hI}u9n}B(N4?B7J
z;1VtmlADC^$a};IL8DjIJtIr9O~}2^18PloRjcaMsXG5Tb<QbHQh53&*g?_=Fq(R9
zIOA8RvlB`a(a+#{vzA%Uvr8)e(%~lR$+VdQTF<k~l=~$(vr@NTW|%jxu*+iyt$xX(
zBO}|&YI{q}6u`?yt3Xv&d)MS;Ma_~jU#f@>w2M+FFO~k+w)Wy8G@1Pl`sBu51=^hv
z31&{gle_@<-ZpRWYP<kh48}Ry<Mrxnv$}oAtSTZ=C6OB7<)u^bmY%BuGLx1CfG<2_
zx5fj3m1b+qZM5?moOljrjXsCNZ({N1Ns<v9Mzcer@Ov=)HcTVfNh82nT3(mdYhXmV
zhSQ*b(u!IQi7CAqH5kzE(i#c}{Rja`zX9~47}=*vMjtwl$Vd*5G)!0qAH>3GQ|O)Z
zX0DiHQ|M`+*LeI~-mIS^owMQ+08kFZ`^mBnF6o;J8eLv~nb{dNXM|6XR;|wEm4;v-
z(`8Erj?y&NL!yGmCc6w8?CKkE2B1=#N1&d5ghF|b&FU02`2KykhPRt+ZXTl^#D33c
zX#xYR_{u9_iYjiKs5Y(9ftwUfzVI&uw9n8w=5KH$fu24EDBx9XP!NNjI-$|9mK1vX
zNw3+%n2jm)j<}XJJ7!G`Kg(Q!Uzq_tD-SkQS15K_DS64LoH;hRvJ$^wQ(tz{-&(vN
z-{Ry^qWdix)w^smz}&=r*sT~PI%V0#qa?=bI6|Xik7H)us3kC3%cT!s=v_1m*nu+$
z5IG?DY4i>9S^yNxNS&Im6p3?(gm(l?I82(?AhCb5of$!k)uf|3UYG$7aPTN@hP&c6
z@HDe|av@>fh2t2}muZ5tnvFJto<6C;^nQozH4B>bPl-L80H8gsW&eW_0f{wwE<K^N
zhwz|(BHvKj)1kCS%CzSr_-98+lr&F*M(thJDg$iQA@Eo@%#)}K2W^{F+6G!?JM%fM
z`+z1{yV+<r37S_}g3obUy|O`*{t@w-+BzNc4kPI_fJ?aazROUHjhhaU?~oXISh$#4
z<O~U@1s+{Qt?V$;*_{&_by0%FCp-LlOmkAB6YWN`jl=1?$PJucL(n>r`41M%Oo|n_
z(^*RWpA4nqYJ5hfEgzBaPby?u)*2qR<`9Wz+B5lg+f%{73^-1|o?w5*2!KjvJ4@1c
zlTUMCInn4OKpdUgo@X+&!5#;+@dE8rIq!YW<n^S`iFvb^^CI9E&_1xfWmwBj`XIGR
zK?5&d<>I_|iP7w2+^5p6RB5cT<b6)IMiiAOt!OpaovcRt7^yd9^2|QQX&9FcW>=(d
zN+*eNmV*Oq;@{W61)65)_jwcSj+U8EKb)a2_7<Qo?2n46ouZUNADefGq$s4&hvOpU
z5yeBuJIF@}jvVGJzRAn?NECTw204TP^24HW-{k5(t?CE8tdA&q(&PZGdx51mhir8l
zwDg_-M1!tbtPYN5{yWW^UFmW14NSw*@98Cug1PaIKcfLSgyIak_rPr|y%zR~)Z-HM
z4W&=R7y9)3Y@dD_=V6~f3)fjjEttjEi^R_Dg?WT8?vWlA<1KCr=EPw^Id%?o1(yB0
zy?Gt<hG)((gw|np<(PHk0}pBhImd3ba|H8ijc9hJo2hTW+?4OJJVW3lLq7dI4M$-l
zqi5fPnJm)>GP4oJVsnTV31!w{Z0|h9;P9k?e><ZZ1Lhe#u2nhc%!NHF)f9vFW<#CR
z$A~kT0L=99%<SqUkF0$6Rm!_3SG{}kGVksztggy0sIDqVpCofD3-T(fz`K8pU?{uz
zXY?&{3z)fiNUq|SN#@$S1(>|;ZJ0p&6qy@WzC%;k+pjHGIq<+z0P0Gm5`BS|943=P
zqD53=@;mH)lSa>2LvDAT%rJ7E+a0np=z(mk0{)y<(vo1JX#ZC2EwFQ(y};`&vT~fY
zNR4v;GrkeDupC*V?l{2SODAnMJ}-|<p+BGF`DhB;7UyF*Ic~;yf+QnMa}9K*K#xb1
zgT~%|4el($1QuxVhh^|T5&Tq6<Azm8<B6nFDPGeZfz{@c5%ttCn^IFreUaUgr!#;}
z>3qg78e4rr=|%Y`H<k__?56!elS|T2D3Je>xpBDK=82CdYBt96Senxil(D*ZynNRK
zlacg~0g+su5KI6V^0)xe@OL)dHdaA?%=7T@ThwH68tA;{;nM2SmVnhI11W2ktp>ME
zs^4+vXSJ(|h#?;?euy3;MwL;nQgM<Qn?yW_39CNE3He~mcOrmJ!jH4|gH!Nk+z!ug
zw!!-=OmF3v8~FQa9xlxSg^H9R$6@ywXofN8I2{2C!&m|iXO5XcqwoYX9Q?o*wE|0$
z9IyS%;|$6iCkLI*kd<YvA<*V)7eB-?ViKuBx{#~YHdkZYkS2sge|}1A0-pj$3X|dn
zq#zLByziHr9|7+w@8;GtWcmU}U4XmFOFCE<&zV4ta_{>|()>s=Qz_oC)K@s>a2t7P
z%rikd!OM&}b;&Wuiq`ImlPE3N4Q3Zm&%tjNK~vLLX1100RFwDC1vG#L1csABS^LJw
z&}~CS>Ax}NT&FW&21E-uow;TP&u!b=Q%s#yj%g<u&6`GtK>MrOLq#1?r|gtz0R1^Z
z%kVCnR5Ebjvp-x+$LAN%qj%x=D=~ki>KWt46n5Qd*5$W$kvv$P&cx0rj%0Ay;k`Jo
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
N3`apBt|$TbKLA5z?eqWu

literal 0
HcmV?d00001

diff --git a/src/Bundle/ChillTicketBundle/src/DataFixtures/ORM/docs/schema_1.png b/src/Bundle/ChillTicketBundle/src/DataFixtures/ORM/docs/schema_1.png
new file mode 100644
index 0000000000000000000000000000000000000000..edb9ed774dc098a3c357bffa5e8fa7a388ef2dcd
GIT binary patch
literal 56408
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%0Dnsvm+o
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%0AYPUi(lp1(HaLEEUkro8U
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

literal 0
HcmV?d00001

diff --git a/src/Bundle/ChillTicketBundle/src/Entity/Motive.php b/src/Bundle/ChillTicketBundle/src/Entity/Motive.php
index 2ea3b47c2..c2d8cc6c9 100644
--- a/src/Bundle/ChillTicketBundle/src/Entity/Motive.php
+++ b/src/Bundle/ChillTicketBundle/src/Entity/Motive.php
@@ -11,6 +11,10 @@ declare(strict_types=1);
 
 namespace Chill\TicketBundle\Entity;
 
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
+use Doctrine\Common\Collections\ReadableCollection;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation as Serializer;
 
@@ -37,10 +41,40 @@ class Motive
     #[Serializer\Groups(['read'])]
     private ?EmergencyStatusEnum $makeTicketEmergency = null;
 
+    /**
+     * @var Collection<int, StoredObject>
+     */
+    #[ORM\ManyToMany(targetEntity: StoredObject::class)]
+    #[ORM\JoinTable(name: 'motive_stored_objects', schema: 'chill_ticket')]
+    private Collection $storedObjects;
+
     #[ORM\Column(type: \Doctrine\DBAL\Types\Types::JSON, nullable: false, options: ['jsonb' => true, 'default' => '[]'])]
     #[Serializer\Groups(['read'])]
     private array $supplementaryComments = [];
 
+    public function __construct()
+    {
+        $this->storedObjects = new ArrayCollection();
+    }
+
+    public function addStoredObject(StoredObject $storedObject): void
+    {
+        if (!$this->storedObjects->contains($storedObject)) {
+            $this->storedObjects[] = $storedObject;
+        }
+    }
+
+    public function removeStoredObject(StoredObject $storedObject): void
+    {
+        $this->storedObjects->removeElement($storedObject);
+    }
+
+    #[Serializer\Groups(['read'])]
+    public function getStoredObjects(): ReadableCollection
+    {
+        return $this->storedObjects;
+    }
+
     public function isActive(): bool
     {
         return $this->active;
diff --git a/src/Bundle/ChillTicketBundle/src/Repository/MotiveRepository.php b/src/Bundle/ChillTicketBundle/src/Repository/MotiveRepository.php
index 0c1174a59..7863305fe 100644
--- a/src/Bundle/ChillTicketBundle/src/Repository/MotiveRepository.php
+++ b/src/Bundle/ChillTicketBundle/src/Repository/MotiveRepository.php
@@ -11,6 +11,8 @@ declare(strict_types=1);
 
 namespace Chill\TicketBundle\Repository;
 
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\DocStoreBundle\Repository\AssociatedEntityToStoredObjectInterface;
 use Chill\TicketBundle\Entity\Motive;
 use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
 use Doctrine\Persistence\ManagerRegistry;
@@ -18,10 +20,22 @@ use Doctrine\Persistence\ManagerRegistry;
 /**
  * @template-extends ServiceEntityRepository<Motive>
  */
-class MotiveRepository extends ServiceEntityRepository
+class MotiveRepository extends ServiceEntityRepository implements AssociatedEntityToStoredObjectInterface
 {
     public function __construct(ManagerRegistry $registry)
     {
         parent::__construct($registry, Motive::class);
     }
+
+    public function findAssociatedEntityToStoredObject(StoredObject $storedObject): ?Motive
+    {
+        $query = $this->createQueryBuilder('m');
+        $query->select('m')
+            ->where(':stored_object MEMBER OF m.storedObjects')
+            ->setParameter('stored_object', $storedObject)
+            ->setMaxResults(1)
+        ;
+
+        return $query->getQuery()->getOneOrNullResult();
+    }
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Security/Authorization/StoredObjectVoter/MotiveStoredObjectVoter.php b/src/Bundle/ChillTicketBundle/src/Security/Authorization/StoredObjectVoter/MotiveStoredObjectVoter.php
new file mode 100644
index 000000000..64bfd763b
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Security/Authorization/StoredObjectVoter/MotiveStoredObjectVoter.php
@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Security\Authorization\StoredObjectVoter;
+
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\DocStoreBundle\Security\Authorization\StoredObjectRoleEnum;
+use Chill\DocStoreBundle\Security\Authorization\StoredObjectVoterInterface;
+use Chill\TicketBundle\Repository\MotiveRepository;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+
+final readonly class MotiveStoredObjectVoter implements StoredObjectVoterInterface
+{
+    public function __construct(private MotiveRepository $motiveRepository) {}
+
+    public function supports(StoredObjectRoleEnum $attribute, StoredObject $subject): bool
+    {
+        return null !== $this->motiveRepository->findAssociatedEntityToStoredObject($subject);
+    }
+
+    public function voteOnAttribute(StoredObjectRoleEnum $attribute, StoredObject $subject, TokenInterface $token): bool
+    {
+        return true;
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/config/services.yaml b/src/Bundle/ChillTicketBundle/src/config/services.yaml
index 659121f8c..fb0945fe6 100644
--- a/src/Bundle/ChillTicketBundle/src/config/services.yaml
+++ b/src/Bundle/ChillTicketBundle/src/config/services.yaml
@@ -20,6 +20,9 @@ services:
     Chill\TicketBundle\Security\Voter\:
         resource: '../Security/Voter/'
 
+    Chill\TicketBundle\Security\Authorization\:
+        resource: '../Security/Authorization/'
+
     Chill\TicketBundle\Serializer\:
         resource: '../Serializer/'
 
diff --git a/src/Bundle/ChillTicketBundle/src/migrations/Version20250718124651.php b/src/Bundle/ChillTicketBundle/src/migrations/Version20250718124651.php
new file mode 100644
index 000000000..b34c80d68
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/migrations/Version20250718124651.php
@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\Migrations\Ticket;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20250718124651 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Create join table "chill_ticket.motive_stored_objects"';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql(
+            <<<'SQL'
+            CREATE TABLE chill_ticket.motive_stored_objects (motive_id INT NOT NULL, storedobject_id INT NOT NULL, PRIMARY KEY(motive_id, storedobject_id))
+            SQL
+        );
+        $this->addSql('CREATE INDEX IDX_4247C4849658649C ON chill_ticket.motive_stored_objects (motive_id)');
+        $this->addSql('CREATE INDEX IDX_4247C484EE684399 ON chill_ticket.motive_stored_objects (storedobject_id)');
+        $this->addSql(
+            <<<'SQL'
+            ALTER TABLE chill_ticket.motive_stored_objects ADD CONSTRAINT FK_4247C4849658649C FOREIGN KEY (motive_id) REFERENCES chill_ticket.motive (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE
+            SQL
+        );
+        $this->addSql(
+            <<<'SQL'
+            ALTER TABLE chill_ticket.motive_stored_objects ADD CONSTRAINT FK_4247C484EE684399 FOREIGN KEY (storedobject_id) REFERENCES chill_doc.stored_object (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE
+            SQL
+        );
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_ticket.motive_stored_objects DROP CONSTRAINT FK_4247C4849658649C');
+        $this->addSql('ALTER TABLE chill_ticket.motive_stored_objects DROP CONSTRAINT FK_4247C484EE684399');
+        $this->addSql('DROP TABLE chill_ticket.motive_stored_objects');
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/ReplaceMotiveControllerTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/ReplaceMotiveControllerTest.php
index 5e899e2b4..28bf7dac5 100644
--- a/src/Bundle/ChillTicketBundle/tests/Controller/ReplaceMotiveControllerTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/ReplaceMotiveControllerTest.php
@@ -11,20 +11,19 @@ declare(strict_types=1);
 
 namespace Chill\TicketBundle\Tests\Controller;
 
-use Chill\TicketBundle\Action\Ticket\Handler\ChangeEmergencyStateCommandHandler;
 use Chill\TicketBundle\Action\Ticket\Handler\ReplaceMotiveCommandHandler;
-use Chill\TicketBundle\Controller\ReplaceMotiveController;
+use Chill\TicketBundle\Action\Ticket\ReplaceMotiveCommand;
 use Chill\TicketBundle\Entity\Motive;
-use Chill\TicketBundle\Entity\MotiveHistory;
+use PHPUnit\Framework\TestCase;
+use Chill\TicketBundle\Controller\ReplaceMotiveController;
 use Chill\TicketBundle\Entity\Ticket;
 use Doctrine\ORM\EntityManagerInterface;
-use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-use Symfony\Component\Clock\MockClock;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\SerializerInterface;
+use Symfony\Component\Validator\ConstraintViolationList;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
 
 /**
@@ -32,88 +31,62 @@ use Symfony\Component\Validator\Validator\ValidatorInterface;
  *
  * @coversNothing
  */
-class ReplaceMotiveControllerTest extends KernelTestCase
+class ReplaceMotiveControllerTest extends TestCase
 {
     use ProphecyTrait;
 
-    private SerializerInterface $serializer;
-
-    private ValidatorInterface $validator;
-
-    protected function setUp(): void
+    private function buildController(Ticket $ticket, string $body, Motive $motive): ReplaceMotiveController
     {
-        self::bootKernel();
-        $this->serializer = self::getContainer()->get(SerializerInterface::class);
-        $this->validator = self::getContainer()->get(ValidatorInterface::class);
+        $command = new ReplaceMotiveCommand($motive);
+
+        // Mock Security
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        // Mock EntityManager
+        $entityManager = $this->prophesize(EntityManagerInterface::class);
+        $entityManager->flush()->shouldBeCalled();
+
+        $replaceMotiveCommandHandler = $this->prophesize(ReplaceMotiveCommandHandler::class);
+        $replaceMotiveCommandHandler->handle($ticket, $command)->shouldBeCalled();
+
+        // Mock Validator
+        $validator = $this->prophesize(ValidatorInterface::class);
+        $validator->validate($command)
+            ->shouldBeCalled()
+            ->willReturn(new ConstraintViolationList([]));
+
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $serializer->deserialize($body, ReplaceMotiveCommand::class, 'json', [AbstractNormalizer::GROUPS => ['write']])
+            ->willReturn($command);
+        $serializer->serialize($ticket, 'json', ['groups' => ['read']])
+            ->shouldBeCalled()
+            ->willReturn('{"type": "ticket", "id": 1}');
+
+        return new ReplaceMotiveController(
+            $security->reveal(),
+            $replaceMotiveCommandHandler->reveal(),
+            $serializer->reveal(),
+            $validator->reveal(),
+            $entityManager->reveal()
+        );
     }
 
-    protected function tearDown(): void
-    {
-        self::ensureKernelShutdown();
-    }
-
-    /**
-     * @dataProvider generateMotiveId
-     */
-    public function testAddValidMotive(int $motiveId): void
+    public function testAddValidMotive(): void
     {
         $ticket = new Ticket();
-        $payload = <<<JSON
-            {"motive": {"type":  "ticket_motive", "id":  {$motiveId}}}
+        $motive = new Motive();
+
+        $payload = <<<'JSON'
+            {"motive": {"type":  "ticket_motive", "id": 1}}
             JSON;
 
         $request = new Request(content: $payload);
 
-        $controller = $this->buildController();
+        $controller = $this->buildController($ticket, $payload, $motive);
 
         $response = $controller($ticket, $request);
 
         self::assertEquals(201, $response->getStatusCode());
     }
-
-    public static function generateMotiveId(): iterable
-    {
-        self::bootKernel();
-        $em = self::getContainer()->get(EntityManagerInterface::class);
-
-        $motive = $em->createQuery('SELECT m FROM '.Motive::class.' m ')
-            ->setMaxResults(1)
-            ->getOneOrNullResult();
-
-        if (null === $motive) {
-            throw new \RuntimeException('the motive table seems to be empty');
-        }
-
-        self::ensureKernelShutdown();
-
-        yield [$motive->getId()];
-    }
-
-    private function buildController(): ReplaceMotiveController
-    {
-        $security = $this->prophesize(Security::class);
-        $security->isGranted('ROLE_USER')->willReturn(true);
-
-        $entityManager = $this->prophesize(EntityManagerInterface::class);
-        $entityManager->persist(Argument::type(MotiveHistory::class))->shouldBeCalled();
-        $entityManager->flush()->shouldBeCalled();
-
-        $changeEmergencyCommandHandler = $this->prophesize(ChangeEmergencyStateCommandHandler::class);
-        $changeEmergencyCommandHandler->__invoke(Argument::any(), Argument::any())->shouldBeCalled()
-            ->will(fn (array $args) => $args[0]);
-
-        $handler = new ReplaceMotiveCommandHandler(
-            new MockClock(),
-            $entityManager->reveal(),
-            $changeEmergencyCommandHandler->reveal(),
-        );
-
-        return new ReplaceMotiveController(
-            $security->reveal(),
-            $handler,
-            $this->serializer,
-            $this->validator,
-            $entityManager->reveal(),
-        );
-    }
 }

From 61d1232e311b12d61d82139680df43e72db6346a Mon Sep 17 00:00:00 2001
From: Boris Waaub <boris.waaub@digitalternative.be>
Date: Fri, 18 Jul 2025 16:06:16 +0000
Subject: [PATCH 155/283] =?UTF-8?q?Impl=C3=A9menter=20une=20app=20vue=20av?=
 =?UTF-8?q?ec=20la=20liste=20des=20tickets=20attribu=C3=A9s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Resources/public/lib/api/apiMethods.ts    |  13 +-
 .../localizationHelper/localizationHelper.ts  |  20 +
 .../public/vuejs/PickEntity/PickEntity.vue    |  18 +-
 .../Resources/views/layout.html.twig          |   2 +-
 .../ChillTicketBundle/.vscode/settings.json   |   3 +
 .../ChillTicketBundle/chill.webpack.config.js |  16 +-
 .../src/Resources/public/types.ts             |  20 +
 .../Resources/public/vuejs/TicketApp/App.vue  |   2 +-
 .../Addressee/AddresseeComponent.vue          |  81 ++--
 .../Addressee/AddresseeSelectorComponent.vue  |  36 +-
 .../TicketApp/components/BannerComponent.vue  |  27 +-
 .../Emergency/EmergencyToggleComponent.vue    |  34 +-
 .../Motive/MotiveSelectorComponent.vue        |   1 -
 .../components/Person/PersonComponent.vue     |   1 -
 .../Person/PersonsSelectorComponent.vue       |  16 +-
 .../components/PreviousTicketsComponent.vue   |  76 +---
 .../components/TicketListComponent.vue        |  39 --
 .../public/vuejs/TicketApp/store/index.ts     |   6 +
 .../vuejs/TicketApp/store/modules/ticket.ts   |  67 +--
 .../TicketApp/store/modules/ticket_list.ts    | 142 +++++++
 .../Resources/public/vuejs/TicketList/App.vue | 117 ++++++
 .../components/TicketFilterListComponent.vue  | 396 ++++++++++++++++++
 .../components/TicketHistoryListComponent.vue |  15 +-
 .../components/TicketListComponent.vue        | 140 +++++++
 .../components/TicketListItemComponent.vue    |  27 +-
 .../public/vuejs/TicketList/index.ts          |  15 +
 .../src/Resources/views/Ticket/list.html.twig | 101 +----
 .../src/translations/messages+intl-icu.fr.yml |  25 ++
 28 files changed, 1068 insertions(+), 388 deletions(-)
 create mode 100644 src/Bundle/ChillTicketBundle/.vscode/settings.json
 delete mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketListComponent.vue
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket_list.ts
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/App.vue
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketFilterListComponent.vue
 rename src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/{TicketApp => TicketList}/components/TicketHistoryListComponent.vue (87%)
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListComponent.vue
 rename src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/{TicketApp => TicketList}/components/TicketListItemComponent.vue (80%)
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/index.ts

diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.ts b/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.ts
index 9bfb952b5..887a376f3 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.ts
@@ -5,11 +5,16 @@ export type fetchOption = Record<string, boolean | string | number | null>;
 
 export type Params = Record<string, number | string>;
 
+export interface Pagination {
+  first: number;
+  items_per_page: number;
+  more: boolean;
+  next: string | null;
+  previous: string | null;
+}
+
 export interface PaginationResponse<T> {
-  pagination: {
-    more: boolean;
-    items_per_page: number;
-  };
+  pagination: Pagination;
   results: T[];
   count: number;
 }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/localizationHelper/localizationHelper.ts b/src/Bundle/ChillMainBundle/Resources/public/lib/localizationHelper/localizationHelper.ts
index b2fa260d2..354c9f8af 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/lib/localizationHelper/localizationHelper.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/localizationHelper/localizationHelper.ts
@@ -8,6 +8,26 @@ import { TranslatableString } from "ChillMainAssets/types";
  * @param locale defaults to browser locale
  * @returns The localized string or null if no translation is available
  */
+
+/**
+ * Prepends the current HTML lang code to the given URL.
+ * Example: If lang="fr" and url="/about", returns "/fr/about"
+ *
+ * @param url The URL to localize
+ * @returns The localized URL
+ */
+export function localizedUrl(url: string): string {
+  const lang =
+    document.documentElement.lang || navigator.language.split("-")[0] || "fr";
+  // Ensure url starts with a slash and does not already start with /{lang}/
+  const normalizedUrl = url.startsWith("/") ? url : `/${url}`;
+  const langPrefix = `/${lang}`;
+  if (normalizedUrl.startsWith(langPrefix + "/")) {
+    return normalizedUrl;
+  }
+  return `${langPrefix}${normalizedUrl}`;
+}
+
 export function localizeString(
   translatableString: TranslatableString | null | undefined,
   locale?: string,
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
index 10d7099c8..8e96a1595 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
@@ -1,6 +1,6 @@
 <template>
-  <div class="grey-card">
-    <ul :class="listClasses" v-if="picked.length > 0 && displayPicked">
+  <div class="grey-card p-2">
+    <ul :class="listClasses" v-if="displayPicked">
       <li
         v-for="p in picked"
         @click="removeEntity(p)"
@@ -21,14 +21,15 @@
         </span>
       </li>
     </ul>
-    <ul class="record_actions">
+    <ul class="record_actions mb-0">
       <li v-if="isCurrentUserPicker" class="btn btn-sm btn-misc">
-        <label class="flex items-center gap-2">
+        <label class="flex items-center gap-1">
           <input
             :checked="isMePicked"
             ref="itsMeCheckbox"
             :type="multiple ? 'checkbox' : 'radio'"
             @change="selectItsMe($event as InputEvent)"
+            style="margin: 0"
           />
           {{ trans(USER_CURRENT_USER) }}
         </label>
@@ -45,11 +46,15 @@
       </li>
     </ul>
 
-    <ul class="badge-suggest add-items inline" style="float: right">
+    <ul
+      class="badge-suggest add-items inline"
+      style="justify-content: flex-end; display: flex"
+    >
       <li
         v-for="s in suggested"
         :key="s.type + s.id"
         @click="addNewSuggested(s)"
+        style="margin: 0"
       >
         <span :class="getBadgeClass(s)" :style="getBadgeStyle(s)">
           {{ s.text }}
@@ -221,8 +226,6 @@ function getBadgeStyle(entities: Entities) {
 .grey-card {
   background: #f8f9fa;
   border-radius: 8px;
-  padding: 1.5rem;
-  min-height: 160px;
 }
 
 .btn-check:checked + .btn,
@@ -242,6 +245,7 @@ ul.badge-suggest {
   list-style-type: none;
   padding-left: 0;
   margin-bottom: 0px;
+  min-height: 30px;
 }
 ul.badge-suggest li > span {
   white-space: normal;
diff --git a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
index d92f2e260..4a3fef4e7 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
@@ -1,5 +1,5 @@
 <!DOCTYPE html>
-<html lang="fr">
+<html lang="{{ app.request.locale }}">
 <head>
     <meta charset="UTF-8" />
     <meta http-equiv="x-ua-compatible" content="ie=edge">
diff --git a/src/Bundle/ChillTicketBundle/.vscode/settings.json b/src/Bundle/ChillTicketBundle/.vscode/settings.json
new file mode 100644
index 000000000..c10f4d386
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/.vscode/settings.json
@@ -0,0 +1,3 @@
+{
+  "idf.pythonInstallPath": "/usr/bin/python3"
+}
diff --git a/src/Bundle/ChillTicketBundle/chill.webpack.config.js b/src/Bundle/ChillTicketBundle/chill.webpack.config.js
index fdb1d57e5..57ae98f0d 100644
--- a/src/Bundle/ChillTicketBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillTicketBundle/chill.webpack.config.js
@@ -1,4 +1,14 @@
-module.exports = function(encore, entries) {
-    encore.addEntry('page_ticket', __dirname + '/src/Resources/public/page/ticket/index.ts');
-    encore.addEntry('vue_ticket_app', __dirname + '/src/Resources/public/vuejs/TicketApp/index.ts');
+module.exports = function (encore, entries) {
+  encore.addEntry(
+    "page_ticket",
+    __dirname + "/src/Resources/public/page/ticket/index.ts",
+  );
+  encore.addEntry(
+    "vue_ticket_app",
+    __dirname + "/src/Resources/public/vuejs/TicketApp/index.ts",
+  );
+  encore.addEntry(
+    "vue_ticket_list",
+    __dirname + "/src/Resources/public/vuejs/TicketList/index.ts",
+  );
 };
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
index 4f8c7ffb0..24e4d295e 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
@@ -155,3 +155,23 @@ export interface Ticket extends BaseTicket<"ticket_ticket:extended"> {
   updatedBy: User | null;
   history: TicketHistoryLine[];
 }
+
+export interface TicketFilters {
+  byCurrentState: TicketState[];
+  byCurrentStateEmergency: TicketEmergencyState[];
+  byCreatedAfter: string;
+  byCreatedBefore: string;
+  byResponseTimeExceeded: boolean;
+  byMyTickets: boolean;
+}
+
+export interface TicketFilterParams {
+  byPerson?: number[];
+  byCurrentState?: TicketState[];
+  byCurrentStateEmergency?: TicketEmergencyState[];
+  byMotives?: number[];
+  byCreatedAfter?: string;
+  byCreatedBefore?: string;
+  byResponseTimeExceeded?: string;
+  byMyTickets?: boolean;
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
index 73a60cf50..a024bdeb3 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
@@ -17,7 +17,7 @@ import { Ticket } from "../../types";
 
 // Components
 import PreviousTicketsComponent from "./components/PreviousTicketsComponent.vue";
-import TicketHistoryListComponent from "./components/TicketHistoryListComponent.vue";
+import TicketHistoryListComponent from "../TicketList/components/TicketHistoryListComponent.vue";
 import ActionToolbarComponent from "./components/ActionToolbarComponent.vue";
 import BannerComponent from "./components/BannerComponent.vue";
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Addressee/AddresseeComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Addressee/AddresseeComponent.vue
index 92477ba0d..4b7447132 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Addressee/AddresseeComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Addressee/AddresseeComponent.vue
@@ -1,68 +1,39 @@
 <template>
   <div class="col-12">
-    <span
-      v-for="userGroup in userGroupLevels"
-      :key="userGroup.id"
-      class="badge-user-group"
-      :style="`background-color: ${userGroup.backgroundColor}; color: ${userGroup.foregroundColor};`"
-    >
-      {{ userGroup.label.fr }}
-    </span>
-  </div>
-  <div class="col-12">
-    <span
-      v-for="userGroup in userGroups"
-      :key="userGroup.id"
-      class="badge-user-group"
-      :style="`background-color: ${userGroup.backgroundColor}; color: ${userGroup.foregroundColor};`"
-    >
-      {{ userGroup.label.fr }}
-    </span>
-  </div>
-  <div v-if="users.length > 0" class="col-12">
-    <span class="badge-user" v-for="user in users" :key="user.id">
-      <user-render-box-badge :user="user" />
-    </span>
+    <ul class="addressees-list" v-if="addressees.length > 0">
+      <li v-for="addressee in addressees" :key="addressee.id">
+        <span
+          v-if="addressee.type === 'user_group'"
+          class="badge-user-group"
+          :style="`background-color: ${addressee.backgroundColor}; color: ${addressee.foregroundColor};`"
+        >
+          {{ addressee.label.fr }}
+        </span>
+        <span v-else-if="addressee.type === 'user'" class="badge-user">
+          <user-render-box-badge :user="addressee"
+        /></span>
+      </li>
+    </ul>
   </div>
 </template>
 
 <script setup lang="ts">
-import { computed } from "vue";
-
 // Components
 import UserRenderBoxBadge from "ChillMainAssets/vuejs/_components/Entity/UserRenderBoxBadge.vue";
 
 // Types
-import {
-  User,
-  UserGroup,
-  UserGroupOrUser,
-} from "../../../../../../../../ChillMainBundle/Resources/public/types";
+import { UserGroupOrUser } from "../../../../../../../../ChillMainBundle/Resources/public/types";
 
-const props = defineProps<{ addressees: UserGroupOrUser[] }>();
-
-const userGroups = computed(
-  () =>
-    props.addressees.filter(
-      (addressee: UserGroupOrUser) =>
-        addressee.type == "user_group" && addressee.excludeKey == "",
-    ) as UserGroup[],
-);
-
-const userGroupLevels = computed(
-  () =>
-    props.addressees.filter(
-      (addressee: UserGroupOrUser) =>
-        addressee.type == "user_group" && addressee.excludeKey == "level",
-    ) as UserGroup[],
-);
-
-const users = computed(
-  () =>
-    props.addressees.filter(
-      (addressee: UserGroupOrUser) => addressee.type == "user",
-    ) as User[],
-);
+defineProps<{ addressees: UserGroupOrUser[] }>();
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+ul.addressees-list {
+  list-style-type: none;
+  margin: 0;
+  padding: 0;
+  & > li {
+    display: inline-block;
+  }
+}
+</style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Addressee/AddresseeSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Addressee/AddresseeSelectorComponent.vue
index 69f3ff1ce..2415c5af1 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Addressee/AddresseeSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Addressee/AddresseeSelectorComponent.vue
@@ -1,20 +1,16 @@
 <template>
-  <div class="row">
-    <div class="col-12">
-      <pick-entity
-        uniqid="ticket-addressee-selector"
-        :types="['user', 'user_group', 'thirdparty']"
-        :picked="selectedEntities"
-        :suggested="suggestedValues"
-        :multiple="true"
-        :removable-if-set="true"
-        :display-picked="true"
-        :label="trans(CHILL_TICKET_TICKET_ADD_ADDRESSEE_USER_LABEL)"
-        @add-new-entity="addNewEntity"
-        @remove-entity="removeEntity"
-      />
-    </div>
-  </div>
+  <pick-entity
+    uniqid="ticket-addressee-selector"
+    :types="['user', 'user_group']"
+    :picked="selectedEntities"
+    :suggested="suggestedValues"
+    :multiple="true"
+    :removable-if-set="true"
+    :display-picked="true"
+    :label="trans(CHILL_TICKET_TICKET_ADD_ADDRESSEE_USER_LABEL)"
+    @add-new-entity="addNewEntity"
+    @remove-entity="removeEntity"
+  />
 </template>
 
 <script lang="ts" setup>
@@ -24,7 +20,7 @@ import { ref, watch, defineProps, defineEmits } from "vue";
 import PickEntity from "ChillMainAssets/vuejs/PickEntity/PickEntity.vue";
 
 // Types
-import { Entities } from "ChillPersonAssets/types";
+import { Entities, EntitiesOrMe } from "ChillPersonAssets/types";
 
 // Translations
 import {
@@ -70,12 +66,12 @@ watch(
   { immediate: true, deep: true },
 );
 
-function addNewEntity({ entity }: { entity: Entities }) {
-  selectedEntities.value.push(entity);
+function addNewEntity({ entity }: { entity: EntitiesOrMe }) {
+  selectedEntities.value.push(entity as Entities);
   emit("update:modelValue", selectedEntities.value);
 }
 
-function removeEntity({ entity }: { entity: Entities }) {
+function removeEntity({ entity }: { entity: EntitiesOrMe }) {
   const index = selectedEntities.value.findIndex(
     (selectedEntity) => selectedEntity === entity,
   );
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
index 2239b3af7..975e26fae 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
@@ -14,7 +14,10 @@
 
         <div class="col-md-6 col-sm-12">
           <div class="d-flex justify-content-end">
-            <emergency-toggle-component />
+            <emergency-toggle-component
+              v-model="isEmergencyLocal"
+              @toggle-emergency="handleEmergencyToggle"
+            />
 
             <span
               class="badge text-bg-chill-green text-white"
@@ -100,6 +103,7 @@
 
 <script setup lang="ts">
 import { ref, computed } from "vue";
+import { useToast } from "vue-toast-notification";
 
 // Components
 import AddresseeComponent from "./Addressee/AddresseeComponent.vue";
@@ -107,7 +111,8 @@ import EmergencyToggleComponent from "./Emergency/EmergencyToggleComponent.vue";
 import PersonComponent from "./Person/PersonComponent.vue";
 
 // Types
-import { Ticket } from "../../../types";
+import { Ticket, TicketEmergencyState } from "../../../types";
+import { Person } from "ChillPersonAssets/types";
 
 import {
   trans,
@@ -121,7 +126,8 @@ import {
 
 // Store
 import { useStore } from "vuex";
-import { Person } from "ChillPersonAssets/types";
+
+// Utils
 import { getTicketTitle } from "../utils/utils";
 
 defineProps<{
@@ -129,6 +135,7 @@ defineProps<{
 }>();
 
 const store = useStore();
+const toast = useToast();
 const today = ref(new Date());
 
 setInterval(() => {
@@ -136,7 +143,21 @@ setInterval(() => {
 }, 5000);
 
 const isOpen = computed(() => store.getters.isOpen);
+const isEmergencyLocal = computed(() => store.getters.isEmergency);
 const since = computed(() => {
   return store.getters.getSinceCreated(today.value);
 });
+
+// Methods
+function handleEmergencyToggle(emergency: TicketEmergencyState) {
+  store.dispatch("toggleEmergency", emergency).catch(({ name, violations }) => {
+    if (name === "ValidationException" || name === "AccessException") {
+      violations.forEach((violation: string) =>
+        toast.open({ message: violation }),
+      );
+    } else {
+      toast.open({ message: "An error occurred" });
+    }
+  });
+}
 </script>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Emergency/EmergencyToggleComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Emergency/EmergencyToggleComponent.vue
index f4d4c4efa..2220002ec 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Emergency/EmergencyToggleComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Emergency/EmergencyToggleComponent.vue
@@ -3,8 +3,8 @@
     <button
       class="badge rounded-pill me-1"
       :class="{
-        'bg-danger': isEmergency,
-        'bg-secondary': !isEmergency,
+        'bg-danger': modelValue,
+        'bg-secondary': !modelValue,
       }"
       @click="toggleEmergency"
     >
@@ -14,29 +14,25 @@
 </template>
 
 <script lang="ts" setup>
-import { computed } from "vue";
-import { useStore } from "vuex";
-import { useToast } from "vue-toast-notification";
 import { trans, CHILL_TICKET_TICKET_BANNER_EMERGENCY } from "translator";
+import { TicketEmergencyState } from "../../../../types";
 
-const store = useStore();
-const toast = useToast();
+// Props
+const props = defineProps<{
+  modelValue: boolean;
+}>();
 
-const isEmergency = computed(() => store.getters.isEmergency);
+// Emits
+const emit = defineEmits<{
+  "update:modelValue": [value: boolean];
+  "toggle-emergency": [emergency: TicketEmergencyState];
+}>();
 
 // Methods
 function toggleEmergency() {
-  store
-    .dispatch("toggleEmergency", isEmergency.value ? "no" : "yes")
-    .catch(({ name, violations }) => {
-      if (name === "ValidationException" || name === "AccessException") {
-        violations.forEach((violation: string) =>
-          toast.open({ message: violation }),
-        );
-      } else {
-        toast.open({ message: "An error occurred" });
-      }
-    });
+  const newValue = !props.modelValue;
+  emit("update:modelValue", newValue);
+  emit("toggle-emergency", newValue ? "yes" : "no");
 }
 </script>
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveSelectorComponent.vue
index fd276191f..ffba8041b 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveSelectorComponent.vue
@@ -16,7 +16,6 @@
         :selected-label="trans(MULTISELECT_SELECTED_LABEL)"
         :options="motives"
         v-model="motive"
-        class="mb-4"
       />
     </div>
   </div>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Person/PersonComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Person/PersonComponent.vue
index a5b7b22d0..744417e25 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Person/PersonComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Person/PersonComponent.vue
@@ -11,7 +11,6 @@
         ></on-the-fly>
       </li>
     </ul>
-    <div v-else class="text-muted">Aucune personne concernée</div>
   </div>
 </template>
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Person/PersonsSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Person/PersonsSelectorComponent.vue
index 804cb416e..72096b2a2 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Person/PersonsSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Person/PersonsSelectorComponent.vue
@@ -20,10 +20,10 @@ import { ref, watch, defineProps, defineEmits, computed } from "vue";
 import PickEntity from "ChillMainAssets/vuejs/PickEntity/PickEntity.vue";
 
 // Types
-import { Entities, EntityType } from "ChillPersonAssets/types";
+import { Entities, EntitiesOrMe, EntityType } from "ChillPersonAssets/types";
 
 const props = defineProps<{
-  modelValue: Entities[] | Entities | null;
+  modelValue: EntitiesOrMe[] | EntitiesOrMe | null;
   suggested: Entities[];
   multiple: boolean;
   types: EntityType[];
@@ -31,15 +31,13 @@ const props = defineProps<{
 }>();
 
 const emit = defineEmits<{
-  "update:modelValue": [value: Entities[] | Entities | null];
+  "update:modelValue": [value: EntitiesOrMe[] | EntitiesOrMe | null];
 }>();
 
-// Valeurs par défaut
 const multiple = props.multiple;
 const types = props.types;
 const label = props.label;
 
-// État local
 const selectedEntities = ref<Entities[]>(
   multiple
     ? [...((props.modelValue as Entities[]) || [])]
@@ -88,17 +86,17 @@ watch(
   { immediate: true, deep: true },
 );
 
-function addNewEntity({ entity }: { entity: Entities }) {
+function addNewEntity({ entity }: { entity: EntitiesOrMe }) {
   if (multiple) {
-    selectedEntities.value.push(entity);
+    selectedEntities.value.push(entity as Entities);
     emit("update:modelValue", selectedEntities.value);
   } else {
-    selectedEntities.value = [entity];
+    selectedEntities.value = [entity as Entities];
     emit("update:modelValue", entity);
   }
 }
 
-function removeEntity({ entity }: { entity: Entities }) {
+function removeEntity({ entity }: { entity: EntitiesOrMe }) {
   if (multiple) {
     const index = selectedEntities.value.findIndex(
       (selectedEntity) => selectedEntity === entity,
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PreviousTicketsComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PreviousTicketsComponent.vue
index 7789986be..cd826d9e9 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PreviousTicketsComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PreviousTicketsComponent.vue
@@ -36,51 +36,14 @@
       </template>
 
       <template #body>
-        <TicketListComponent
+        <ticket-list-component
           :tickets="previousTickets"
+          :title="trans(CHILL_TICKET_LIST_NO_TICKETS)"
           @view-ticket="handleViewTicket"
           @edit-ticket="handleEditTicket"
         />
       </template>
     </Modal>
-
-    <!-- Modal for ticket history -->
-    <Modal
-      v-if="
-        showTicketHistoryModal &&
-        selectedTicketId !== null &&
-        previousTicketHistory
-      "
-      :show="showTicketHistoryModal"
-      modal-dialog-class="modal-xl"
-      @close="closeHistoryModal"
-    >
-      <template #header>
-        <h3 class="modal-title">
-          {{ getTicketTitle(previousTicketDetails) }}
-        </h3>
-      </template>
-
-      <template #body>
-        <TicketHistoryListComponent
-          v-if="previousTicketHistory.length > 0"
-          :history="previousTicketHistory"
-        />
-        <div v-else class="text-center p-4">
-          <div class="spinner-border" role="status">
-            <span class="visually-hidden">Chargement...</span>
-          </div>
-        </div>
-      </template>
-      <template #footer>
-        <button
-          class="btn btn-edit"
-          @click="handleEditTicket(selectedTicketId)"
-        >
-          {{ trans(EDIT) }}
-        </button>
-      </template>
-    </Modal>
   </div>
 </template>
 
@@ -90,23 +53,22 @@ import { useStore } from "vuex";
 
 // Components
 import Modal from "../../../../../../../ChillMainBundle/Resources/public/vuejs/_components/Modal.vue";
-import TicketListComponent from "./TicketListComponent.vue";
-import TicketHistoryListComponent from "./TicketHistoryListComponent.vue";
+import TicketListComponent from "../../TicketList/components/TicketListComponent.vue";
 
 // Translations
 import {
   trans,
+  CHILL_TICKET_LIST_NO_TICKETS,
   CHILL_TICKET_TICKET_PREVIOUS_TICKETS,
   CHILL_TICKET_LIST_TITLE_PREVIOUS_TICKETS,
-  EDIT,
 } from "translator";
 
 // Types
 import { Person } from "ChillPersonAssets/types";
-import { TicketHistoryLine, TicketSimple } from "../../../types";
+import { TicketSimple } from "../../../types";
 
 // Utils
-import { getTicketTitle } from "../utils/utils";
+import { localizedUrl } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
 
 const store = useStore();
 const showPreviousTicketModal = ref(false);
@@ -117,18 +79,14 @@ const currentPersons = computed(
   () => store.getters.getCurrentPersons as Person[],
 );
 const previousTickets = computed(
-  () => store.getters.getPreviousTickets as TicketSimple[],
+  () => store.getters.getTicketList as TicketSimple[],
 );
-const previousTicketHistory = computed(
-  () => store.getters.getPreviousTicketHistory as TicketHistoryLine[],
-);
-const previousTicketDetails = computed(() => {
-  return store.getters.getPreviousTicketDetails as TicketSimple;
-});
 
 onMounted(async () => {
   try {
-    await store.dispatch("fetchTicketsByPerson");
+    await store.dispatch("fetchTicketList", {
+      byPerson: currentPersons.value.map((person) => person.id),
+    });
   } catch (error) {
     console.error("Erreur lors du chargement des tickets:", error);
   }
@@ -147,19 +105,17 @@ async function handleViewTicket(ticketId: number) {
   showTicketHistoryModal.value = true;
 
   try {
-    await store.dispatch("fetchPreviousTicketDetails", ticketId);
+    await store.dispatch("fetchTicket", ticketId);
   } catch (error) {
-    console.error("Erreur lors du chargement de l'historique:", error);
+    console.error("Erreur lors du chargement du ticket:", error);
   }
 }
 
 function handleEditTicket(ticketId: number) {
-  window.location.href = `/fr/ticket/ticket/${ticketId}/edit`;
-}
-
-function closeHistoryModal() {
-  showTicketHistoryModal.value = false;
-  selectedTicketId.value = null;
+  const returnPath = localizedUrl(`/ticket/ticket/list`);
+  window.location.href = localizedUrl(
+    `/ticket/ticket/${ticketId}/edit?returnPath=${returnPath}`,
+  );
 }
 </script>
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketListComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketListComponent.vue
deleted file mode 100644
index 335c32544..000000000
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketListComponent.vue
+++ /dev/null
@@ -1,39 +0,0 @@
-<template>
-  <div class="ticket-list-container">
-    <div v-if="tickets.length === 0" class="chill-no-data-statement">
-      {{ trans(CHILL_TICKET_LIST_NO_TICKETS) }}
-    </div>
-
-    <div v-else class="flex-table">
-      <TicketListItemComponent
-        v-for="ticket in tickets"
-        :key="ticket.id"
-        :ticket="ticket"
-        @view-ticket="$emit('view-ticket', $event)"
-        @edit-ticket="$emit('edit-ticket', $event)"
-      />
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { defineProps, defineEmits } from "vue";
-
-// Types
-import { TicketSimple } from "../../../types";
-
-// Components
-import TicketListItemComponent from "./TicketListItemComponent.vue";
-
-// Translations
-import { trans, CHILL_TICKET_LIST_NO_TICKETS } from "translator";
-
-defineProps<{
-  tickets: TicketSimple[];
-}>();
-
-defineEmits<{
-  "view-ticket": [ticketId: number];
-  "edit-ticket": [ticketId: number];
-}>();
-</script>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts
index 6ddcdb4b3..1d6305cc7 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts
@@ -4,6 +4,10 @@ import { State as TicketStates, moduleTicket } from "./modules/ticket";
 import { State as CommentStates, moduleComment } from "./modules/comment";
 import { State as AddresseeStates, moduleAddressee } from "./modules/addressee";
 import { State as PersonsState, modulePersons } from "./modules/persons";
+import {
+  State as TicketListState,
+  moduleTicketList,
+} from "./modules/ticket_list";
 
 export interface RootState {
   motive: MotiveStates;
@@ -11,6 +15,7 @@ export interface RootState {
   comment: CommentStates;
   addressee: AddresseeStates;
   persons: PersonsState;
+  ticketList: TicketListState;
 }
 
 export const store = createStore<RootState>({
@@ -20,5 +25,6 @@ export const store = createStore<RootState>({
     comment: moduleComment,
     addressee: moduleAddressee,
     persons: modulePersons,
+    ticketList: moduleTicketList,
   },
 });
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
index fa73223f5..4949087cb 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
@@ -1,23 +1,19 @@
 import { Module } from "vuex";
 import { RootState } from "..";
 
-import { Ticket, TicketEmergencyState, TicketSimple } from "../../../../types";
+import { Ticket, TicketEmergencyState } from "../../../../types";
 import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
 import { ApiException } from "../../../../../../../../ChillMainBundle/Resources/public/types";
 import { getSinceCreated } from "../../utils/utils";
 
 export interface State {
   ticket: Ticket;
-  previous_tickets: TicketSimple[];
-  previous_ticket_details: Ticket;
   action_icons: object;
 }
 
 export const moduleTicket: Module<State, RootState> = {
   state: () => ({
     ticket: {} as Ticket,
-    previous_tickets: [] as TicketSimple[],
-    previous_ticket_details: {} as Ticket,
     action_icons: {
       add_person: "fa fa-user-plus",
       add_comment: "fa fa-comment",
@@ -42,21 +38,6 @@ export const moduleTicket: Module<State, RootState> = {
       );
       return state.ticket;
     },
-    getTicketHistory(state) {
-      return state.ticket.history;
-    },
-    getPreviousTickets(state) {
-      return state.previous_tickets;
-    },
-    getPreviousTicketHistory(state) {
-      return state.previous_ticket_details.history;
-    },
-    getPreviousTicketDetails(state) {
-      return state.previous_ticket_details;
-    },
-    getCurrentPersons(state) {
-      return state.ticket.currentPersons ?? [];
-    },
     getActionIcons(state) {
       return state.action_icons;
     },
@@ -66,18 +47,18 @@ export const moduleTicket: Module<State, RootState> = {
       }
       return getSinceCreated(state.ticket.createdAt.datetime, currentTime);
     },
+    getTicketHistory: (state) => {
+      return state.ticket.history;
+    },
+    getCurrentPersons(state) {
+      return state.ticket.currentPersons;
+    },
   },
 
   mutations: {
     setTicket(state, ticket: Ticket) {
       state.ticket = ticket;
     },
-    setPreviousTickets(state, previousTickets: TicketSimple[]) {
-      state.previous_tickets = previousTickets;
-    },
-    setPreviousTicketDetails(state, ticket: Ticket) {
-      state.previous_ticket_details = ticket;
-    },
   },
   actions: {
     async closeTicket({ commit, state }) {
@@ -116,39 +97,5 @@ export const moduleTicket: Module<State, RootState> = {
         throw error.name;
       }
     },
-
-    async fetchTicketsByPerson({ commit, state }) {
-      try {
-        if (state.ticket.currentPersons.length === 0) {
-          commit("setPreviousTickets", []);
-          return;
-        }
-        const { results }: { results: TicketSimple[] } = await makeFetch(
-          "GET",
-          `/api/1.0/ticket/ticket/list?byPerson=${state.ticket.currentPersons.map((person) => person.id).join(",")}`,
-        );
-        const excludeCurrentTicket = results.filter(
-          (ticket) => ticket.id !== state.ticket.id,
-        );
-        commit("setPreviousTickets", excludeCurrentTicket);
-      } catch (e: unknown) {
-        const error = e as ApiException;
-        throw error.name;
-      }
-    },
-
-    async fetchPreviousTicketDetails({ commit }, ticketId: number) {
-      try {
-        const ticket: Ticket = await makeFetch(
-          "GET",
-          `/api/1.0/ticket/ticket/${ticketId}`,
-        );
-        commit("setPreviousTicketDetails", ticket);
-        return ticket;
-      } catch (e: unknown) {
-        const error = e as ApiException;
-        throw error.name;
-      }
-    },
   },
 };
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket_list.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket_list.ts
new file mode 100644
index 000000000..8f9264928
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket_list.ts
@@ -0,0 +1,142 @@
+import { Module } from "vuex";
+import { RootState } from "..";
+
+import { Ticket, TicketFilterParams, TicketSimple } from "../../../../types";
+import {
+  makeFetch,
+  Pagination,
+  PaginationResponse,
+} from "ChillMainAssets/lib/api/apiMethods";
+import {
+  ApiException,
+  User,
+} from "../../../../../../../../ChillMainBundle/Resources/public/types";
+
+export interface State {
+  ticket_list: TicketSimple[];
+  ticket_details: Ticket | null;
+  pagination: Pagination;
+  count: number;
+  user: User;
+}
+
+export const moduleTicketList: Module<State, RootState> = {
+  state: () => ({
+    ticket_list: [],
+    ticket_details: null,
+    pagination: {
+      first: 0,
+      items_per_page: 50,
+      more: false,
+      next: null,
+      previous: null,
+    },
+    count: 0,
+    user: {} as User,
+  }),
+  getters: {
+    getTicketList(state): TicketSimple[] {
+      return state.ticket_list;
+    },
+    getTicketDetails(state): Ticket | null {
+      return state.ticket_details;
+    },
+    getPagination(state) {
+      return state.pagination;
+    },
+    getUser(state): User {
+      return state.user;
+    },
+    getCount(state): number {
+      return state.count;
+    },
+  },
+  mutations: {
+    setTicketList(state, ticketList: TicketSimple[]) {
+      state.ticket_list = ticketList;
+    },
+    setTicketDetails(state, ticket: Ticket | null) {
+      state.ticket_details = ticket;
+    },
+    setPagination(state, pagination: State["pagination"]) {
+      state.pagination = pagination;
+    },
+    setUser(state, user: User) {
+      state.user = user;
+    },
+    setCount(state, count: number) {
+      state.count = count;
+    },
+  },
+  actions: {
+    async fetchTicketList({ commit }, ticketFilterParams: TicketFilterParams) {
+      try {
+        const params = new URLSearchParams(
+          ticketFilterParams as Record<string, string>,
+        ).toString();
+        const { results, pagination, count } = (await makeFetch(
+          "GET",
+          `/api/1.0/ticket/ticket/list/?${params}`,
+        )) as PaginationResponse<TicketSimple>;
+
+        commit("setTicketList", results);
+        commit("setCount", count);
+        commit("setPagination", pagination);
+      } catch (e: unknown) {
+        const error = e as ApiException;
+        console.error(
+          "Erreur lors du chargement de la liste des tickets:",
+          error,
+        );
+      }
+    },
+    async fetchConnectedUser({ commit }) {
+      try {
+        const user = await makeFetch(
+          "GET",
+          "http://localhost:8000/api/1.0/main/whoami.json",
+        );
+        commit("setUser", user);
+        return user;
+      } catch (error) {
+        console.error(
+          "Erreur lors de la récupération de l'utilisateur connecté:",
+          error as ApiException,
+        );
+        throw error;
+      }
+    },
+    async fetchTicketDetails({ commit }, ticketId: number) {
+      try {
+        const ticket: Ticket = await makeFetch(
+          "GET",
+          `/api/1.0/ticket/ticket/${ticketId}`,
+        );
+        commit("setTicketDetails", ticket);
+      } catch (error) {
+        console.error(
+          "Erreur lors du chargement du ticket:",
+          error as ApiException,
+        );
+        throw error;
+      }
+    },
+    async fetchTicketListByUrl({ commit, state }, url: string) {
+      try {
+        const { results, pagination, count } = (await makeFetch(
+          "GET",
+          url,
+        )) as PaginationResponse<TicketSimple>;
+        commit("setTicketList", [...state.ticket_list, ...results]);
+        commit("setCount", count);
+        commit("setPagination", pagination);
+      } catch (e: unknown) {
+        const error = e as ApiException;
+        console.error(
+          "Erreur lors du chargement de la liste des tickets par URL:",
+          error,
+        );
+      }
+    },
+  },
+};
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/App.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/App.vue
new file mode 100644
index 000000000..e90d48fe1
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/App.vue
@@ -0,0 +1,117 @@
+<template>
+  <div class="container-fluid">
+    <h1 class="text-primary">
+      {{ title }}
+    </h1>
+    <div class="row">
+      <div class="col-12 mb-4">
+        <ticket-filter-list-component
+          :resultCount="resultCount"
+          :available-persons="availablePersons"
+          :available-motives="availableMotives"
+          @filters-changed="handleFiltersChanged"
+        />
+      </div>
+      <div class="col-12">
+        <!-- Loading state -->
+        <div
+          v-if="isLoading"
+          class="d-flex justify-content-center align-items-center"
+          style="height: 200px"
+        >
+          <div class="text-center">
+            <div class="spinner-border mb-3" role="status">
+              <span class="visually-hidden">{{
+                trans(CHILL_TICKET_LIST_LOADING_TICKET)
+              }}</span>
+            </div>
+            <div class="text-muted">
+              {{ trans(CHILL_TICKET_LIST_LOADING_TICKET) }}
+            </div>
+          </div>
+        </div>
+
+        <!-- Ticket list -->
+        <ticket-list-component
+          v-else
+          :tickets="ticketList"
+          :title="title"
+          :hasMoreTickets="pagination.next !== null"
+          @fetchNextPage="fetchNextPage"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, computed, onMounted } from "vue";
+import { useStore } from "vuex";
+
+// Types
+import { TicketSimple, Motive } from "../../types";
+import type { Person } from "ChillPersonAssets/types";
+
+// Components
+import TicketListComponent from "./components/TicketListComponent.vue";
+import TicketFilterListComponent from "./components/TicketFilterListComponent.vue";
+import { Pagination } from "ChillMainAssets/lib/api/apiMethods";
+
+// Translations
+import { trans, CHILL_TICKET_LIST_LOADING_TICKET } from "translator";
+
+interface TicketFilterParams {
+  byPerson?: number[];
+  byCurrentState?: string[];
+  byCurrentStateEmergency?: string[];
+  byMotives?: number[];
+  byCreatedAfter?: string;
+  byCreatedBefore?: string;
+  byResponseTimeExceeded?: string;
+}
+const store = useStore();
+
+const title = window.title;
+const isLoading = ref(false);
+const ticketList = computed(
+  () => store.getters.getTicketList as TicketSimple[],
+);
+const resultCount = computed(() => store.getters.getCount as number);
+const pagination = computed(() => store.getters.getPagination as Pagination);
+const availablePersons = ref<Person[]>([]);
+const availableMotives = computed(() => store.getters.getMotives as Motive[]);
+
+const handleFiltersChanged = async (filters: TicketFilterParams) => {
+  isLoading.value = true;
+  try {
+    await store.dispatch("fetchTicketList", filters);
+  } finally {
+    isLoading.value = false;
+  }
+};
+
+const fetchNextPage = async () => {
+  console.log("Fetching next page...");
+  if (pagination.value.next) {
+    await store.dispatch("fetchTicketListByUrl", pagination.value.next);
+  }
+};
+
+onMounted(async () => {
+  isLoading.value = true;
+  try {
+    await Promise.all([
+      store.dispatch("fetchTicketList"),
+      store.dispatch("fetchMotives"),
+    ]);
+  } finally {
+    isLoading.value = false;
+  }
+});
+</script>
+
+<style lang="scss" scoped>
+.container-fluid {
+  padding: 1rem;
+}
+</style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketFilterListComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketFilterListComponent.vue
new file mode 100644
index 000000000..896c42cec
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketFilterListComponent.vue
@@ -0,0 +1,396 @@
+<template>
+  <div class="card">
+    <div class="card-header">
+      <h5 class="card-title mb-0">
+        {{ trans(CHILL_TICKET_LIST_FILTER_TITLE) }}
+      </h5>
+    </div>
+    <div class="card-body">
+      <form @submit.prevent="applyFilters">
+        <div class="row">
+          <!-- Filtre par usagé -->
+          <div class="col-md-6 mb-3">
+            <label class="form-label">{{
+              trans(CHILL_TICKET_LIST_FILTER_PERSONS_CONCERNED)
+            }}</label>
+            <persons-selector
+              v-model="selectedPersons"
+              :suggested="availablePersons"
+              :multiple="true"
+              :types="['person']"
+              :label="trans(CHILL_TICKET_LIST_FILTER_BY_PERSON)"
+            />
+          </div>
+
+          <div class="col-md-6">
+            <!-- Filtre par motifs -->
+            <div class="row">
+              <label class="form-label">{{
+                trans(CHILL_TICKET_LIST_FILTER_BY_MOTIVES)
+              }}</label>
+              <motive-selector
+                v-model="selectedMotive"
+                :motives="availableMotives"
+              />
+
+              <div class="mt-1" style="min-height: 2.2em">
+                <div class="d-flex flex-wrap gap-2">
+                  <span
+                    v-for="motive in selectedMotives"
+                    :key="motive.id"
+                    class="badge bg-secondary d-flex align-items-center gap-1"
+                  >
+                    {{ getMotiveDisplayName(motive) }}
+                    <button
+                      type="button"
+                      class="btn-close btn-close-white"
+                      :aria-label="trans(CHILL_TICKET_LIST_FILTER_REMOVE)"
+                      @click="removeMotive(motive)"
+                    ></button>
+                  </span>
+                </div>
+              </div>
+            </div>
+            <!-- Filtre par état actuel -->
+            <div class="row">
+              <div class="col-6">
+                <div class="form-check">
+                  <input
+                    class="form-check-input"
+                    type="checkbox"
+                    value="open"
+                    v-model="filters.byCurrentState"
+                    id="stateOpen"
+                  />
+                  <label class="form-check-label" for="stateOpen">{{
+                    trans(CHILL_TICKET_LIST_FILTER_OPEN)
+                  }}</label>
+                </div>
+                <div class="form-check">
+                  <input
+                    class="form-check-input"
+                    type="checkbox"
+                    value="closed"
+                    v-model="filters.byCurrentState"
+                    id="stateClosed"
+                  />
+                  <label class="form-check-label" for="stateClosed">
+                    {{ trans(CHILL_TICKET_LIST_FILTER_CLOSED) }}
+                  </label>
+                </div>
+              </div>
+              <!-- Filtre par état d'urgence -->
+              <div class="col-6">
+                <div class="form-check">
+                  <input
+                    class="form-check-input"
+                    type="checkbox"
+                    value="yes"
+                    v-model="filters.byCurrentStateEmergency"
+                    id="emergencyYes"
+                  />
+                  <label class="form-check-label" for="emergencyYes">{{
+                    trans(CHILL_TICKET_LIST_FILTER_EMERGENCY)
+                  }}</label>
+                </div>
+                <div class="form-check">
+                  <input
+                    class="form-check-input"
+                    type="checkbox"
+                    value="no"
+                    v-model="filters.byCurrentStateEmergency"
+                    id="emergencyNo"
+                  />
+                  <label class="form-check-label" for="emergencyNo">{{
+                    trans(CHILL_TICKET_LIST_FILTER_NO_EMERGENCY)
+                  }}</label>
+                </div>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <div class="row">
+          <!-- Filtre pour temps de réponse dépassé -->
+          <div class="col-md-6 mb-3">
+            <div class="form-check">
+              <input
+                class="form-check-input"
+                type="checkbox"
+                v-model="filters.byResponseTimeExceeded"
+                @change="handleResponseTimeExceededChange"
+                id="responseTimeExceeded"
+              />
+              <label class="form-check-label" for="responseTimeExceeded">
+                {{ trans(CHILL_TICKET_LIST_FILTER_RESPONSE_TIME_EXCEEDED) }}
+              </label>
+            </div>
+            <small class="form-text text-muted">
+              <i class="bi bi-exclamation-triangle"></i>
+              {{ trans(CHILL_TICKET_LIST_FILTER_RESPONSE_TIME_WARNING) }}
+            </small>
+          </div>
+          <!-- Filtre par mes tickets -->
+          <div class="col-md-6 mb-3">
+            <div class="d-flex gap-3">
+              <div class="form-check">
+                <input
+                  v-model="filters.byMyTickets"
+                  class="form-check-input"
+                  type="checkbox"
+                  id="stateMe"
+                />
+                <label class="form-check-label" for="stateMe">
+                  {{ trans(CHILL_TICKET_LIST_FILTER_TO_ME) }}
+                </label>
+              </div>
+            </div>
+          </div>
+        </div>
+
+        <!-- Filtre par date de création -->
+        <div class="row">
+          <div class="col-md-6 mb-3">
+            <label for="byCreatedAfter" class="form-label">{{
+              trans(CHILL_TICKET_LIST_FILTER_CREATED_AFTER)
+            }}</label>
+            <input
+              type="datetime-local"
+              id="byCreatedAfter"
+              v-model="filters.byCreatedAfter"
+              class="form-control"
+            />
+          </div>
+          <div class="col-md-6 mb-3">
+            <label for="byCreatedBefore" class="form-label">{{
+              trans(CHILL_TICKET_LIST_FILTER_CREATED_BEFORE)
+            }}</label>
+            <input
+              type="datetime-local"
+              id="byCreatedBefore"
+              v-model="filters.byCreatedBefore"
+              class="form-control"
+              :disabled="filters.byResponseTimeExceeded"
+            />
+          </div>
+        </div>
+
+        <div class="row">
+          <div class="col-12 d-flex align-items-end justify-content-end gap-2">
+            <button
+              type="button"
+              @click="resetFilters"
+              class="btn btn-outline-secondary"
+            >
+              <i class="bi bi-arrow-clockwise"></i>
+              {{ trans(CHILL_TICKET_LIST_FILTER_RESET) }}
+            </button>
+            <button type="submit" class="btn btn-primary">
+              <i class="bi bi-funnel"></i>
+              {{ trans(CHILL_TICKET_LIST_FILTER_APPLY) }}
+            </button>
+          </div>
+        </div>
+        <div class="row">
+          <span
+            class="col-12 d-flex align-items-end justify-content-end form-text text-muted mt-1"
+          >
+            {{ resultCount !== 0 ? `${resultCount} ` : "" }}
+            {{ trans(CHILL_TICKET_LIST_FILTER_RESULT, { count: resultCount }) }}
+          </span>
+        </div>
+      </form>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, computed, watch, onMounted } from "vue";
+import type { Person } from "ChillPersonAssets/types";
+import type { Motive, TicketFilterParams, TicketFilters } from "../../../types";
+
+// Translation
+import {
+  trans,
+  CHILL_TICKET_LIST_FILTER_TITLE,
+  CHILL_TICKET_LIST_FILTER_PERSONS_CONCERNED,
+  CHILL_TICKET_LIST_FILTER_BY_PERSON,
+  CHILL_TICKET_LIST_FILTER_BY_MOTIVES,
+  CHILL_TICKET_LIST_FILTER_REMOVE,
+  CHILL_TICKET_LIST_FILTER_OPEN,
+  CHILL_TICKET_LIST_FILTER_CLOSED,
+  CHILL_TICKET_LIST_FILTER_TO_ME,
+  CHILL_TICKET_LIST_FILTER_EMERGENCY,
+  CHILL_TICKET_LIST_FILTER_NO_EMERGENCY,
+  CHILL_TICKET_LIST_FILTER_CREATED_AFTER,
+  CHILL_TICKET_LIST_FILTER_CREATED_BEFORE,
+  CHILL_TICKET_LIST_FILTER_RESPONSE_TIME_EXCEEDED,
+  CHILL_TICKET_LIST_FILTER_RESPONSE_TIME_WARNING,
+  CHILL_TICKET_LIST_FILTER_RESET,
+  CHILL_TICKET_LIST_FILTER_APPLY,
+  CHILL_TICKET_LIST_FILTER_RESULT,
+} from "translator";
+
+// Components
+import PersonsSelector from "../../TicketApp/components/Person/PersonsSelectorComponent.vue";
+import MotiveSelector from "../../TicketApp/components/Motive/MotiveSelectorComponent.vue";
+
+// Props
+const props = defineProps<{
+  availablePersons?: Person[];
+  availableMotives: Motive[];
+  resultCount: number;
+}>();
+
+// Emits
+const emit = defineEmits<{
+  "filters-changed": [filters: TicketFilterParams];
+}>();
+
+// État réactif
+const filters = ref<TicketFilters>({
+  byCurrentState: [],
+  byCurrentStateEmergency: [],
+  byCreatedAfter: "",
+  byCreatedBefore: "",
+  byResponseTimeExceeded: false,
+  byMyTickets: false,
+});
+
+// Sélection des personnes
+const selectedPersons = ref<Person[]>([]);
+const availablePersons = ref<Person[]>(props.availablePersons || []);
+
+// Sélection des motifs
+const selectedMotive = ref<Motive | undefined>();
+const selectedMotives = ref<Motive[]>([]);
+
+// Watchers pour les sélecteurs
+watch(selectedMotive, (newMotive) => {
+  if (newMotive && !selectedMotives.value.find((m) => m.id === newMotive.id)) {
+    selectedMotives.value.push(newMotive);
+    selectedMotive.value = undefined; // Reset pour permettre une nouvelle sélection
+  }
+});
+
+// Computed pour les IDs des personnes sélectionnées
+const selectedPersonIds = computed(() =>
+  selectedPersons.value.map((person) => person.id),
+);
+
+// Computed pour les IDs des motifs sélectionnés
+const selectedMotiveIds = computed(() =>
+  selectedMotives.value.map((motive) => motive.id),
+);
+
+// Méthodes
+const formatDateToISO = (dateString: string): string => {
+  if (!dateString) return dateString;
+  const date = new Date(dateString);
+  return date.toISOString();
+};
+
+const getMotiveDisplayName = (motive: Motive): string => {
+  if (typeof motive.label === "string") {
+    return motive.label;
+  }
+  if (typeof motive.label === "object" && motive.label !== null) {
+    const labels = Object.values(motive.label);
+    return labels[0] || `Motive ${motive.id}`;
+  }
+  return `Motive ${motive.id}`;
+};
+
+const removeMotive = (motiveToRemove: Motive): void => {
+  const index = selectedMotives.value.findIndex(
+    (m) => m.id === motiveToRemove.id,
+  );
+  if (index !== -1) {
+    selectedMotives.value.splice(index, 1);
+  }
+};
+
+const applyFilters = (): void => {
+  const apiFilters: TicketFilterParams = {};
+
+  if (selectedPersonIds.value.length > 0) {
+    apiFilters.byPerson = selectedPersonIds.value;
+  }
+
+  if (filters.value.byCurrentState.length > 0) {
+    apiFilters.byCurrentState = filters.value.byCurrentState;
+  }
+
+  if (filters.value.byCurrentStateEmergency.length > 0) {
+    apiFilters.byCurrentStateEmergency = filters.value.byCurrentStateEmergency;
+  }
+
+  if (selectedMotiveIds.value.length > 0) {
+    apiFilters.byMotives = selectedMotiveIds.value;
+  }
+
+  if (filters.value.byCreatedAfter) {
+    apiFilters.byCreatedAfter = formatDateToISO(filters.value.byCreatedAfter);
+  }
+
+  if (filters.value.byCreatedBefore) {
+    apiFilters.byCreatedBefore = formatDateToISO(filters.value.byCreatedBefore);
+  }
+
+  if (filters.value.byResponseTimeExceeded) {
+    apiFilters.byResponseTimeExceeded = "true";
+  }
+  if (filters.value.byMyTickets) {
+    apiFilters.byMyTickets = true;
+  }
+
+  emit("filters-changed", apiFilters);
+};
+
+const resetFilters = (): void => {
+  filters.value = {
+    byCurrentState: [],
+    byCurrentStateEmergency: [],
+    byCreatedAfter: "",
+    byCreatedBefore: "",
+    byResponseTimeExceeded: false,
+    byMyTickets: false,
+  };
+  selectedPersons.value = [];
+  selectedMotives.value = [];
+  selectedMotive.value = undefined;
+  applyFilters();
+};
+
+const handleResponseTimeExceededChange = (): void => {
+  if (filters.value.byResponseTimeExceeded) {
+    filters.value.byCurrentState = [];
+    filters.value.byCreatedBefore = "";
+  }
+};
+
+// Charger les données disponibles si nécessaire
+onMounted(() => {
+  // Ici vous pourriez faire des appels API pour charger les personnes et motifs disponibles
+  // si ils ne sont pas fournis en props
+});
+</script>
+
+<style scoped>
+.form-text {
+  display: flex;
+  align-items: center;
+  gap: 0.25rem;
+}
+
+.badge .btn-close {
+  font-size: 0.65em;
+}
+
+.form-label {
+  font-weight: bold;
+}
+.form-check-label {
+  font-weight: bold;
+}
+</style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketHistoryListComponent.vue
similarity index 87%
rename from src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
rename to src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketHistoryListComponent.vue
index 23065f9c3..b0b1b4f07 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketHistoryListComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketHistoryListComponent.vue
@@ -80,12 +80,12 @@ import { Person } from "ChillPersonAssets/types";
 import { Thirdparty } from "src/Bundle/ChillThirdPartyBundle/Resources/public/types";
 
 // Components
-import PersonComponent from "./Person/PersonComponent.vue";
-import MotiveComponent from "./Motive/MotiveComponent.vue";
-import CommentComponent from "./Comment/CommentComponent.vue";
-import AddresseeComponent from "./Addressee/AddresseeComponent.vue";
-import StateComponent from "./State/StateComponent.vue";
-import EmergencyComponent from "./Emergency/EmergencyComponent.vue";
+import PersonComponent from "../../TicketApp/components/Person/PersonComponent.vue";
+import MotiveComponent from "../../TicketApp/components/Motive/MotiveComponent.vue";
+import CommentComponent from "../../TicketApp/components/Comment/CommentComponent.vue";
+import AddresseeComponent from "../../TicketApp/components/Addressee/AddresseeComponent.vue";
+import StateComponent from "../../TicketApp/components/State/StateComponent.vue";
+import EmergencyComponent from "../../TicketApp/components/Emergency/EmergencyComponent.vue";
 
 import UserRenderBoxBadge from "ChillMainAssets/vuejs/_components/Entity/UserRenderBoxBadge.vue";
 
@@ -104,8 +104,9 @@ import {
   CHILL_TICKET_TICKET_HISTORY_EMERGENCY_CHANGE,
   CHILL_TICKET_TICKET_HISTORY_SET_CALLER,
 } from "translator";
-defineProps<{ history: TicketHistoryLine[] }>();
 
+const props = defineProps<{ history?: TicketHistoryLine[] }>();
+const history = props.history ?? [];
 const store = useStore();
 
 const actionIcons = ref(store.getters.getActionIcons);
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListComponent.vue
new file mode 100644
index 000000000..3320bc457
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListComponent.vue
@@ -0,0 +1,140 @@
+<template>
+  <div class="ticket-list-container">
+    <div
+      v-if="tickets.length === 0"
+      class="chill-no-data-statement d-flex justify-content-center align-items-center"
+    >
+      <h3 class="text-muted fst-italic display-4">
+        {{ trans(CHILL_TICKET_LIST_NO_TICKETS) }}
+      </h3>
+    </div>
+    <div
+      v-else
+      ref="ticketList"
+      style="overflow-y: scroll; flex: 1; min-height: 0; max-height: 100%"
+    >
+      <TicketListItemComponent
+        v-for="ticket in tickets"
+        :key="ticket.id"
+        :ticket="ticket"
+        @view-ticket="handleViewTicket"
+        @edit-ticket="handleEditTicket"
+      />
+      <!-- Bouton pour charger plus de tickets -->
+      <div
+        v-if="hasMoreTickets"
+        class="text-center py-3"
+        style="margin: 12px 0"
+      >
+        <button class="btn btn-outline-primary" @click="loadMoreTickets">
+          {{ trans(CHILL_TICKET_LIST_LOAD_MORE) }}
+        </button>
+      </div>
+    </div>
+
+    <Modal
+      v-if="selectedTicketId !== null && ticketDetails"
+      :show="showTicketHistoryModal"
+      modal-dialog-class="modal-xl"
+      @close="closeHistoryModal"
+    >
+      <template #header>
+        <h3 class="modal-title">
+          {{ getTicketTitle(ticketDetails) }}
+        </h3>
+      </template>
+
+      <template #body>
+        <ticket-history-list-component
+          v-if="ticketDetails.history.length > 0"
+          :history="ticketDetails.history"
+        />
+        <div v-else class="text-center p-4">
+          <div class="spinner-border" role="status">
+            <span class="visually-hidden">{{
+              trans(CHILL_TICKET_LIST_LOADING_TICKET_DETAILS)
+            }}</span>
+          </div>
+        </div>
+      </template>
+      <template #footer>
+        <button
+          class="btn btn-edit"
+          @click="handleEditTicket(selectedTicketId)"
+        >
+          {{ trans(EDIT) }}
+        </button>
+      </template>
+    </Modal>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed, ref, onUnmounted } from "vue";
+
+// Types
+import { TicketSimple, Ticket } from "../../../types";
+
+// Components
+import TicketListItemComponent from "./TicketListItemComponent.vue";
+import TicketHistoryListComponent from "./TicketHistoryListComponent.vue";
+import Modal from "../../../../../../../ChillMainBundle/Resources/public/vuejs/_components/Modal.vue";
+
+// Utils
+import { getTicketTitle } from "../../TicketApp/utils/utils";
+import { localizedUrl } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
+
+// Translations
+import {
+  trans,
+  EDIT,
+  CHILL_TICKET_LIST_NO_TICKETS,
+  CHILL_TICKET_LIST_LOAD_MORE,
+  CHILL_TICKET_LIST_LOADING_TICKET_DETAILS,
+} from "translator";
+import { useStore } from "vuex";
+
+defineProps<{
+  tickets: TicketSimple[];
+  hasMoreTickets: boolean;
+  title: string;
+}>();
+
+const emit = defineEmits<{
+  fetchNextPage: [];
+}>();
+
+const store = useStore();
+const selectedTicketId = ref<number | null>(null);
+const showTicketHistoryModal = ref(false);
+const ticketDetails = computed(
+  () => store.getters.getTicketDetails as Ticket | null,
+);
+
+function closeHistoryModal() {
+  showTicketHistoryModal.value = false;
+  selectedTicketId.value = null;
+}
+
+async function handleViewTicket(ticketId: number) {
+  await store.dispatch("fetchTicketDetails", ticketId);
+
+  selectedTicketId.value = ticketId;
+  showTicketHistoryModal.value = true;
+}
+
+function handleEditTicket(ticketId: number) {
+  const returnPath = localizedUrl(`/ticket/ticket/list`);
+  window.location.href = localizedUrl(
+    `/ticket/ticket/${ticketId}/edit?returnPath=${returnPath}`,
+  );
+}
+
+function loadMoreTickets() {
+  emit("fetchNextPage");
+}
+
+onUnmounted(() => {
+  // Nettoyage si nécessaire
+});
+</script>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketListItemComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListItemComponent.vue
similarity index 80%
rename from src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketListItemComponent.vue
rename to src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListItemComponent.vue
index 902a4df66..21ca17dc1 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketListItemComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListItemComponent.vue
@@ -1,11 +1,10 @@
 <template>
-  <div class="card rounded-4 mb-3">
+  <div class="card mb-3 text-primary border-primary">
     <div class="card-body">
       <div class="wrap-header">
         <div class="wh-row d-flex justify-content-between align-items-center">
           <div class="wh-col">
             <span
-              v-if="ticket.currentMotive"
               class="h2"
               style="color: var(--bs-chill-blue); font-variant: all-small-caps"
             >
@@ -44,7 +43,7 @@
       <div class="wrap-list">
         <div class="wl-row">
           <div class="wl-col title text-end">
-            <h3>Attribué à</h3>
+            <h3>{{ trans(CHILL_TICKET_LIST_ADDRESSEES) }}</h3>
           </div>
           <div class="wl-col list">
             <addressee-component :addressees="ticket.currentAddressees" />
@@ -52,7 +51,7 @@
         </div>
         <div class="wl-row">
           <div class="wl-col title text-end">
-            <h3>Patients concernés</h3>
+            <h3>{{ trans(CHILL_TICKET_LIST_PERSONS) }}</h3>
           </div>
           <div class="wl-col list">
             <person-component :entities="ticket.currentPersons" />
@@ -60,7 +59,7 @@
         </div>
         <div class="wl-row">
           <div class="wl-col title text-end">
-            <h3>Appelants</h3>
+            <h3>{{ trans(CHILL_TICKET_LIST_CALLERS) }}</h3>
           </div>
           <div class="wl-col list">
             <person-component
@@ -109,13 +108,21 @@ import {
   getSinceCreated,
   formatDateTime,
   getTicketTitle,
-} from "../utils/utils";
+} from "../../TicketApp/utils/utils";
 
 // Components
-import EmergencyComponent from "./Emergency/EmergencyComponent.vue";
-import StateComponent from "./State/StateComponent.vue";
-import AddresseeComponent from "./Addressee/AddresseeComponent.vue";
-import PersonComponent from "./Person/PersonComponent.vue";
+import EmergencyComponent from "../../TicketApp/components/Emergency/EmergencyComponent.vue";
+import StateComponent from "../../TicketApp/components/State/StateComponent.vue";
+import AddresseeComponent from "../../TicketApp/components/Addressee/AddresseeComponent.vue";
+import PersonComponent from "../../TicketApp/components/Person/PersonComponent.vue";
+
+// Translation
+import {
+  trans,
+  CHILL_TICKET_LIST_ADDRESSEES,
+  CHILL_TICKET_LIST_PERSONS,
+  CHILL_TICKET_LIST_CALLERS,
+} from "translator";
 
 defineProps<{
   ticket: TicketSimple;
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/index.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/index.ts
new file mode 100644
index 000000000..328f7362a
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/index.ts
@@ -0,0 +1,15 @@
+import App from "./App.vue";
+import { createApp } from "vue";
+import { store } from "../TicketApp/store";
+
+declare global {
+  interface Window {
+    title: string;
+  }
+}
+
+const _app = createApp({
+  template: "<app></app>",
+});
+
+_app.component("app", App).use(store).mount("#ticketList");
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/list.html.twig b/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/list.html.twig
index 4750e1a37..3616ab207 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/list.html.twig
+++ b/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/list.html.twig
@@ -1,95 +1,20 @@
 {% extends '@ChillMain/layout.html.twig' %}
 
-{% block title 'chill_ticket.list.title'|trans %}
+{% block css %}
+    {{ parent() }}
+    {{ encore_entry_link_tags('vue_ticket_list') }}
+{% endblock %}
+
+{% block js %}
+    {{ parent() }}
+    <script type="text/javascript">
+        window.title = "{{ 'chill_ticket.list.title'|trans|escape('js') }}";
+    </script>
+    {{ encore_entry_script_tags('vue_ticket_list') }}
+{% endblock %}
 
 {% block content %}
-    <h1>{{ block('title') }}</h1>
-
-    {{ filter|chill_render_filter_order_helper }}
-
-    {% if tickets|length == 0 %}
-        <p class="chill-no-data-statement">No tickets</p>
-    {% else %}
-        <div class="flex-table">
-            {% for ticket in tickets %}
-                <div class="item-bloc">
-                    <div class="item-row">
-                        <div class="wrap-header">
-                            <div class="wh-row">
-                                <div class="wh-col">
-                                    {% if ticket.motive is not null %}
-                                        <span class="h2" style="color: var(--bs-chill-blue); font-variant: all-small-caps">
-                                            {{ ticket.motive.label|localize_translatable_string }}
-                                        </span>
-                                    {% else %}
-                                        <span class="h3" style="color: var(--bs-chill-blue); font-style: italic">Sans motif</span>
-                                    {% endif %}
-                                </div>
-                                <div class="wh-col">
-                                    <p style="font-size: 1.5rem;"><span class="badge text-bg-chill-green text-white">Ouvert</span></p>
-                                </div>
-                            </div>
-                            <div class="wh-row">
-                                <div class="wh-col">
-                                    #{{ ticket.id }}
-                                </div>
-                                <div class="wh-col">
-                                    {% if ticket.createdAt is not null %}
-                                        <span title="{{ ticket.createdAt|format_datetime('long', 'long') }}" style="font-style: italic;">{{ ticket.createdAt|ago|capitalize }}</span>
-                                    {% endif %}
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                    {% if ticket.persons|length > 0 or ticket.currentAddressee|length > 0 %}
-                        <div class="item-row separator">
-                            <div class="wrap-list">
-                                {% if ticket.persons|length > 0 %}
-                                    <div class="wl-row">
-                                        <div class="wl-col title"><h3 class="mb-2">Patients concernés</h3></div>
-                                        <div class="wl-col list">
-                                            {% for p in ticket.persons %}
-                                                {% include '@ChillMain/OnTheFly/_insert_vue_onthefly.html.twig' with {
-                                                    targetEntity: { name: 'person', id: p.id },
-                                                    action: 'show',
-                                                    displayBadge: true,
-                                                    buttonText: p|chill_entity_render_string,
-                                                    isDead: p.deathdate is not null
-                                                } %}
-                                            {% endfor %}
-                                        </div>
-                                    </div>
-                                {% endif %}
-                                {% if ticket.currentAddressee|length > 0 %}
-                                    <div class="wl-row">
-                                        <div class="wl-col title"><h3 class="mb-2">Attribué à</h3></div>
-                                        <div class="wl-col list">
-                                            {% for d in ticket.currentAddressee %}
-                                                {% if d.isUser is defined and d.isUser %}
-                                                    <span class="badge-user">
-                                                        {{ d|chill_entity_render_box }}
-                                                    </span>
-                                                {% elseif d.isUserGroup is defined and d.isUserGroup %}
-                                                    {{ d|chill_entity_render_box() }}
-                                                {% endif %}
-                                            {% endfor %}
-                                        </div>
-                                    </div>
-                                {% endif %}
-                            </div>
-                        </div>
-                    {% endif %}
-                    <div class="item-row separator">
-                        <ul class="record_actions">
-                            <li>
-                                <a class="btn btn-update" href="{{ chill_path_add_return_path('chill_ticket_ticket_edit', {'id': ticket.id}) }}"></a>
-                            </li>
-                        </ul>
-                    </div>
-                </div>
-            {% endfor %}
-        </div>
-    {% endif %}
+    <div id="ticketList"></div>
 
     <ul class="record_actions sticky-form-buttons">
         <li>
diff --git a/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml b/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
index 72a47e95d..2c2285426 100644
--- a/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
+++ b/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
@@ -3,10 +3,35 @@ chill_ticket:
     title: Tickets
     title_previous_tickets: "{name, select, other {Précédent ticket de {name}} undefined {Précédent ticket}}"
     no_tickets: "Aucun ticket"
+    loading_ticket: "Chargement des tickets..."
+    loading_ticket_details: "Chargement de l'historique du ticket..."
+    load_more: "Voir plus..."
+    addressees: "Attribué à"
+    persons: "Usager concernés"
+    callers: "Appelants"
     filter:
       to_me: Tickets qui me sont attribués
       in_alert: Tickets en alerte (délai de résolution dépassé)
       created_between: Créés entre
+      state_change: État actuel
+      title: "Filtres des tickets"
+      persons_concerned: "Usager concernés"
+      by_person: "Par personne"
+      by_motives: "Par motifs"
+      current_state: "État actuel"
+      open: "Ouvert"
+      closed: "Fermé"
+      emergency: "Urgent"
+      no_emergency: "Non urgent"
+      created_after: "Créé après"
+      created_before: "Créé avant"
+      response_time_exceeded: "Temps de réponse dépassé"
+      response_time_warning: 'Attention : Ce filtre supprime automatiquement les filtres "État actuel" et "Créé avant"'
+      reset: "Réinitialiser"
+      apply: "Appliquer les filtres"
+      remove: "Supprimer"
+      result: "{count, plural, =0 {Aucun résultat} =1 {resultat} other {resultats}}"
+
   ticket:
     history:
       add_comment: "Nouveau commentaire"

From 4d96eb9457ada0d20b79fccc1763271986f73697 Mon Sep 17 00:00:00 2001
From: Boris Waaub <boris.waaub@digitalternative.be>
Date: Mon, 18 Aug 2025 15:31:59 +0000
Subject: [PATCH 156/283] =?UTF-8?q?Merge=20request=20contenant=20diff?=
 =?UTF-8?q?=C3=A9rentes=20t=C3=A2ches=20provenant=20du=20board=2078?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/Resources/public/types.ts             |  21 +-
 .../Resources/public/vuejs/TicketApp/App.vue  | 112 +++++++-
 .../components/ActionToolbarComponent.vue     | 110 ++++----
 .../TicketApp/components/BannerComponent.vue  | 105 ++++---
 .../components/Comment/CommentComponent.vue   |  86 +++++-
 .../Comment/CommentEditorComponent.vue        |  74 ++++-
 .../Emergency/EmergencyToggleComponent.vue    |  13 +-
 .../TicketApp/components/PelotonComponent.vue | 262 ++++++++++++++++++
 .../components/PreviousTicketsComponent.vue   |  23 +-
 .../components/State/StateToggleComponent.vue |  68 +++++
 .../components/TicketInitFormComponent.vue    | 153 ++++++++++
 .../public/vuejs/TicketApp/store/index.ts     |   3 +
 .../TicketApp/store/modules/addressee.ts      |   8 +-
 .../vuejs/TicketApp/store/modules/comment.ts  |  73 ++++-
 .../vuejs/TicketApp/store/modules/motive.ts   |   8 +-
 .../vuejs/TicketApp/store/modules/persons.ts  |  31 +--
 .../vuejs/TicketApp/store/modules/ticket.ts   |  50 +++-
 .../TicketApp/store/modules/ticket_list.ts    |  50 ++--
 .../vuejs/TicketApp/store/modules/user.ts     |  41 +++
 .../Resources/public/vuejs/TicketList/App.vue |  27 +-
 .../components/TicketFilterListComponent.vue  | 130 ++++-----
 .../components/TicketHistoryListComponent.vue |  20 +-
 .../components/TicketListComponent.vue        |   6 +-
 .../components/TicketListItemComponent.vue    |   1 -
 .../TicketList/components/ToggleComponent.vue | 156 +++++++++++
 .../public/vuejs/TicketList/index.ts          |   4 +-
 .../src/translations/messages+intl-icu.fr.yml |  63 +++--
 27 files changed, 1397 insertions(+), 301 deletions(-)
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PelotonComponent.vue
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/State/StateToggleComponent.vue
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketInitFormComponent.vue
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/user.ts
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/ToggleComponent.vue

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
index 24e4d295e..b024c1a55 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
@@ -6,15 +6,19 @@ import {
 } from "ChillMainAssets/types";
 import { Person } from "ChillPersonAssets/types";
 import { Thirdparty } from "../../../../ChillThirdPartyBundle/Resources/public/types";
+import { StoredObject } from "ChillDocStoreAssets/types";
 
 export interface Motive {
   type: "ticket_motive";
   id: number;
   active: boolean;
   label: TranslatableString;
+  makeTicketEmergency: TicketEmergencyState;
+  storedObjects: StoredObject[];
+  supplementaryComments: { label: string }[];
 }
 
-export type TicketState = "open" | "closed";
+export type TicketState = "open" | "closed" | "close";
 
 export type TicketEmergencyState = "yes" | "no";
 
@@ -55,9 +59,7 @@ export interface Comment {
   updatedBy: User | null;
   updatedAt: DateTime | null;
   deleted: boolean;
-  supplementaryComments: {
-    label: string;
-  };
+  supplementaryComments: { label: string }[];
 }
 
 export interface AddresseeHistory {
@@ -162,7 +164,7 @@ export interface TicketFilters {
   byCreatedAfter: string;
   byCreatedBefore: string;
   byResponseTimeExceeded: boolean;
-  byMyTickets: boolean;
+  byAddresseeToMe: boolean;
 }
 
 export interface TicketFilterParams {
@@ -173,5 +175,12 @@ export interface TicketFilterParams {
   byCreatedAfter?: string;
   byCreatedBefore?: string;
   byResponseTimeExceeded?: string;
-  byMyTickets?: boolean;
+  byAddresseeToMe?: boolean;
+}
+
+export interface TicketInitForm {
+  content: string;
+  motive?: Motive;
+  persons: Person[];
+  caller: Person | null;
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
index a024bdeb3..ed3e489e8 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
@@ -1,25 +1,68 @@
 <template>
   <banner-component :ticket="ticket" />
-  <div class="container-xxl pt-1" style="padding-bottom: 55px">
-    <previous-tickets-component />
-    <ticket-history-list-component :history="ticketHistory" />
+  <div class="container-xxl pt-1" style="padding-bottom: 55px" v-if="!loading">
+    <previous-tickets-component :key="refreshKey" />
+    <ticket-history-list-component
+      :history="ticketHistory"
+      :key="ticketHistory.length"
+    />
   </div>
-  <action-toolbar-component />
+  <div v-else class="text-center p-4">
+    <div class="spinner-border" role="status">
+      <span class="visually-hidden">
+        {{ trans(CHILL_TICKET_LIST_LOADING_TICKET_DETAILS) }}
+      </span>
+    </div>
+    <div>{{ trans(CHILL_TICKET_LIST_LOADING_TICKET_DETAILS) }}</div>
+  </div>
+  <action-toolbar-component :key="refreshKey" v-if="!loading" />
+  <Modal
+    v-if="showTicketInitFormModal"
+    :show="showTicketInitFormModal"
+    modal-dialog-class="modal-lg"
+    @close="closeModal"
+  >
+    <template #header>
+      <h3 class="modal-title">
+        {{ trans(CHILL_TICKET_TICKET_INIT_FORM_TITLE) }}
+      </h3>
+    </template>
+
+    <template #body>
+      <ticket-init-form-component
+        :motives="motives"
+        :suggested-persons="suggestedPersons"
+        @submit="handleFormSubmit"
+      />
+    </template>
+  </Modal>
 </template>
 
 <script setup lang="ts">
 import { useToast } from "vue-toast-notification";
-import { computed, onMounted } from "vue";
+import { computed, onMounted, ref } from "vue";
 import { useStore } from "vuex";
 
 // Types
-import { Ticket } from "../../types";
+import { Ticket, Motive, TicketInitForm } from "../../types";
+import { Person } from "ChillPersonAssets/types";
 
 // Components
+import Modal from "../../../../../../ChillMainBundle/Resources/public/vuejs/_components/Modal.vue";
 import PreviousTicketsComponent from "./components/PreviousTicketsComponent.vue";
 import TicketHistoryListComponent from "../TicketList/components/TicketHistoryListComponent.vue";
 import ActionToolbarComponent from "./components/ActionToolbarComponent.vue";
 import BannerComponent from "./components/BannerComponent.vue";
+import TicketInitFormComponent from "./components/TicketInitFormComponent.vue";
+
+// Translations
+import {
+  trans,
+  CHILL_TICKET_TICKET_INIT_FORM_TITLE,
+  CHILL_TICKET_TICKET_INIT_FORM_SUCCESS,
+  CHILL_TICKET_TICKET_INIT_FORM_ERROR,
+  CHILL_TICKET_LIST_LOADING_TICKET_DETAILS,
+} from "translator";
 
 const store = useStore();
 const toast = useToast();
@@ -27,19 +70,72 @@ const toast = useToast();
 store.commit("setTicket", JSON.parse(window.initialTicket) as Ticket);
 
 const ticket = computed(() => store.getters.getTicket as Ticket);
-
 const ticketHistory = computed(() => store.getters.getTicketHistory);
+const motives = computed(() => store.getters.getMotives as Motive[]);
+const suggestedPersons = computed(() => store.getters.getPersons as Person[]);
+const showTicketInitFormModal = ref(false);
+const loading = ref(true);
+const refreshKey = ref(0);
+
+async function handleFormSubmit(ticketForm: TicketInitForm) {
+  try {
+    if (ticketForm.motive) {
+      await store.dispatch("createMotive", ticketForm.motive);
+    }
+    if (ticketForm.content && ticketForm.content.trim() !== "") {
+      await store.dispatch("createComment", ticketForm.content);
+    }
+    await store.dispatch("setPersons", ticketForm.persons);
+
+    // Rafraîchir les données nécessaires
+    await store.dispatch("fetchTicketHistory");
+    await store.dispatch("fetchPreviousTickets");
+
+    // Forcer le rafraîchissement des composants
+    refreshKey.value++;
+
+    toast.success(trans(CHILL_TICKET_TICKET_INIT_FORM_SUCCESS));
+    closeModal();
+  } catch (error) {
+    toast.error(
+      (error as string) || trans(CHILL_TICKET_TICKET_INIT_FORM_ERROR),
+    );
+  }
+}
+
+function closeModal() {
+  showTicketInitFormModal.value = false;
+}
 
 onMounted(async () => {
   try {
+    await store.dispatch("getCurrentUser");
     await store.dispatch("fetchMotives");
     await store.dispatch("fetchUserGroups");
     await store.dispatch("fetchUsers");
     await store.dispatch("getSuggestedPersons");
+    showTicketInitFormModal.value = store.getters.isNewTicket;
   } catch (error) {
     toast.error(error as string);
+  } finally {
+    loading.value = false;
   }
 });
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+.loading-overlay {
+  position: fixed;
+  top: 0;
+  left: 0;
+  width: 100vw;
+  height: 100vh;
+  background: rgba(255, 255, 255, 0.7);
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  z-index: 9999;
+  font-size: 2rem;
+  color: #333;
+}
+</style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
index d78e8e2a5..589066e3d 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
@@ -29,6 +29,7 @@
         <form @submit.prevent="submitAction">
           <comment-editor-component
             v-model="content"
+            :motive="motive"
             v-if="activeTab === 'add_comment'"
           />
           <addressee-selector-component
@@ -169,6 +170,7 @@ import {
   CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_REOPEN_SUCCESS,
   CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_REOPEN_ERROR,
   CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CANCEL,
+  CHILL_TICKET_TICKET_SET_PERSONS_ERROR,
 } from "translator";
 
 // Types
@@ -249,71 +251,75 @@ const returnPath = computed((): string => {
   return returnPath;
 });
 
-const motive = ref(
-  ticket.value.currentMotive ? ticket.value.currentMotive : ({} as Motive),
-);
+const motive = ref(ticket.value.currentMotive as Motive);
 const content = ref("" as Comment["content"]);
 const addressees = ref(ticket.value.currentAddressees as UserGroupOrUser[]);
 const persons = ref(ticket.value.currentPersons as Person[]);
 const caller = ref(ticket.value.caller as Person);
 
 async function submitAction() {
-  try {
-    switch (activeTab.value) {
-      case "add_comment":
-        if (!content.value) {
-          toast.error(trans(CHILL_TICKET_TICKET_ADD_COMMENT_ERROR));
-        } else {
-          await store.dispatch("createComment", {
-            ticketId: ticket.value.id,
-            content: content.value,
-          });
-          content.value = "";
-          activeTab.value = "";
-          toast.success(trans(CHILL_TICKET_TICKET_ADD_COMMENT_SUCCESS));
-        }
-        break;
-      case "set_motive":
-        if (!motive.value.id) {
-          toast.error(trans(CHILL_TICKET_TICKET_SET_MOTIVE_ERROR));
-        } else {
-          await store.dispatch("createMotive", {
-            ticketId: ticket.value.id,
-            motive: motive.value,
-          });
-          activeTab.value = "";
-          toast.success(trans(CHILL_TICKET_TICKET_SET_MOTIVE_SUCCESS));
-        }
-        break;
-      case "addressees_state":
-        if (!addressees.value.length) {
-          toast.error(trans(CHILL_TICKET_TICKET_ADD_ADDRESSEE_ERROR));
-        } else {
-          await store.dispatch("setAdressees", {
-            ticketId: ticket.value.id,
-            addressees: addressees.value,
-          });
+  switch (activeTab.value) {
+    case "add_comment":
+      if (!content.value) {
+        toast.error(trans(CHILL_TICKET_TICKET_ADD_COMMENT_ERROR));
+      } else {
+        await store.dispatch("createComment", content.value);
+        content.value = "";
+        activeTab.value = "";
+        toast.success(trans(CHILL_TICKET_TICKET_ADD_COMMENT_SUCCESS));
+      }
+      break;
+    case "set_motive":
+      if (!motive.value) {
+        toast.error(trans(CHILL_TICKET_TICKET_SET_MOTIVE_ERROR));
+      } else {
+        await store.dispatch("createMotive", motive.value);
+        activeTab.value = "";
+        toast.success(trans(CHILL_TICKET_TICKET_SET_MOTIVE_SUCCESS));
+      }
+      break;
+    case "addressees_state":
+      if (addressees.value.length) {
+        try {
+          await store.dispatch(
+            "setAddressees",
+            addressees.value as UserGroupOrUser[],
+          );
           activeTab.value = "";
           toast.success(trans(CHILL_TICKET_TICKET_ADD_ADDRESSEE_SUCCESS));
+        } catch (error) {
+          console.error(trans(CHILL_TICKET_TICKET_ADD_ADDRESSEE_ERROR), error);
+          toast.error(trans(CHILL_TICKET_TICKET_ADD_ADDRESSEE_ERROR));
         }
-        break;
-      case "persons_state":
-        await store.dispatch("setPersons", {
-          persons: persons.value,
-        });
-        await store.dispatch("fetchTicketsByPerson");
-        activeTab.value = "";
+      } else {
+        await store.dispatch("setAddressees", [] as UserGroupOrUser[]);
+        toast.success(trans(CHILL_TICKET_TICKET_ADD_ADDRESSEE_SUCCESS));
+      }
+      break;
+    case "persons_state":
+      if (persons.value.length) {
+        await store.dispatch("setPersons", persons.value);
+        try {
+          await store.dispatch("fetchTicketList", {
+            byPerson: persons.value.map((person) => person.id),
+          });
+          activeTab.value = "";
+          toast.success(trans(CHILL_TICKET_TICKET_SET_PERSONS_SUCCESS));
+        } catch (error) {
+          console.error(trans(CHILL_TICKET_TICKET_SET_PERSONS_ERROR), error);
+          toast.error(trans(CHILL_TICKET_TICKET_SET_PERSONS_ERROR));
+        }
+      } else {
+        store.dispatch("setPersons", [] as Person[]);
         toast.success(trans(CHILL_TICKET_TICKET_SET_PERSONS_SUCCESS));
-        break;
-    }
-  } catch (error) {
-    toast.error(error as string);
+      }
+      break;
   }
 }
 
 async function closeTicket() {
   try {
-    await store.dispatch("closeTicket");
+    await store.dispatch("setTicketState", "close");
     closeAllActions();
     toast.success(trans(CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CLOSE_SUCCESS));
   } catch (error) {
@@ -324,7 +330,7 @@ async function closeTicket() {
 
 async function reopenTicket() {
   try {
-    await store.dispatch("reopenTicket");
+    await store.dispatch("setTicketState", "open");
     toast.success(trans(CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_REOPEN_SUCCESS));
   } catch (error) {
     console.error(error);
@@ -337,7 +343,7 @@ function closeAllActions() {
 }
 
 watch(caller, async (newCaller) => {
-  await store.dispatch("setCaller", { caller: newCaller });
+  await store.dispatch("setCaller", newCaller);
   await store.dispatch("getSuggestedPersons");
 });
 </script>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
index 975e26fae..f48e6aec9 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
@@ -8,31 +8,21 @@
           </h1>
 
           <h2 v-if="ticket.currentPersons.length">
-            {{ ticket.currentPersons.map((person) => person.text).join(", ") }}
+            {{
+              ticket.currentPersons
+                .map((person: Person) => person.text)
+                .join(", ")
+            }}
           </h2>
         </div>
 
         <div class="col-md-6 col-sm-12">
           <div class="d-flex justify-content-end">
             <emergency-toggle-component
-              v-model="isEmergencyLocal"
-              @toggle-emergency="handleEmergencyToggle"
+              v-model="isEmergency"
+              :disabled="!isOpen"
             />
-
-            <span
-              class="badge text-bg-chill-green text-white"
-              style="font-size: 1rem"
-              v-if="isOpen"
-            >
-              {{ trans(CHILL_TICKET_TICKET_BANNER_OPEN) }}
-            </span>
-            <span
-              class="badge text-bg-chill-red text-white"
-              style="font-size: 1rem"
-              v-else
-            >
-              {{ trans(CHILL_TICKET_TICKET_BANNER_CLOSED) }}
-            </span>
+            <state-toggle-component v-model="isOpen" />
           </div>
           <div class="d-flex justify-content-end">
             <p class="created-at-timespan" v-if="ticket.createdAt">
@@ -102,26 +92,33 @@
 </style>
 
 <script setup lang="ts">
-import { ref, computed } from "vue";
+import { computed, ref } from "vue";
 import { useToast } from "vue-toast-notification";
 
 // Components
 import AddresseeComponent from "./Addressee/AddresseeComponent.vue";
 import EmergencyToggleComponent from "./Emergency/EmergencyToggleComponent.vue";
+import StateToggleComponent from "./State/StateToggleComponent.vue";
 import PersonComponent from "./Person/PersonComponent.vue";
 
 // Types
-import { Ticket, TicketEmergencyState } from "../../../types";
+import { Ticket } from "../../../types";
 import { Person } from "ChillPersonAssets/types";
 
 import {
   trans,
-  CHILL_TICKET_TICKET_BANNER_OPEN,
-  CHILL_TICKET_TICKET_BANNER_CLOSED,
   CHILL_TICKET_TICKET_BANNER_SINCE,
   CHILL_TICKET_TICKET_BANNER_SPEAKER,
   CHILL_TICKET_TICKET_BANNER_CALLER,
   CHILL_TICKET_TICKET_BANNER_PERSON,
+  CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_REOPEN_SUCCESS,
+  CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_REOPEN_ERROR,
+  CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CLOSE_SUCCESS,
+  CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CLOSE_ERROR,
+  CHILL_TICKET_TICKET_BANNER_EMERGENCY_SUCCESS,
+  CHILL_TICKET_TICKET_BANNER_EMERGENCY_ERROR,
+  CHILL_TICKET_TICKET_BANNER_NO_EMERGENCY_ERROR,
+  CHILL_TICKET_TICKET_BANNER_NO_EMERGENCY_SUCCESS,
 } from "translator";
 
 // Store
@@ -142,22 +139,56 @@ setInterval(() => {
   today.value = new Date();
 }, 5000);
 
-const isOpen = computed(() => store.getters.isOpen);
-const isEmergencyLocal = computed(() => store.getters.isEmergency);
+const isOpen = computed({
+  get: () => store.getters.isOpen as boolean,
+  set: async (value: boolean) => {
+    try {
+      await store.dispatch("setTicketState", value ? "open" : "close");
+      toast.success(
+        trans(
+          value
+            ? CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_REOPEN_SUCCESS
+            : CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CLOSE_SUCCESS,
+        ),
+      );
+    } catch (error) {
+      console.error(error);
+      toast.error(
+        trans(
+          value
+            ? CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_REOPEN_ERROR
+            : CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CLOSE_ERROR,
+        ),
+      );
+    }
+  },
+});
+const isEmergency = computed({
+  get: () => store.getters.isEmergency as boolean,
+  set: async (value: boolean) => {
+    try {
+      await store.dispatch("setEmergency", value ? "yes" : "no");
+      toast.success(
+        trans(
+          value
+            ? CHILL_TICKET_TICKET_BANNER_EMERGENCY_SUCCESS
+            : CHILL_TICKET_TICKET_BANNER_NO_EMERGENCY_SUCCESS,
+        ),
+      );
+    } catch (error) {
+      console.error(error);
+      toast.error(
+        trans(
+          value
+            ? CHILL_TICKET_TICKET_BANNER_EMERGENCY_ERROR
+            : CHILL_TICKET_TICKET_BANNER_NO_EMERGENCY_ERROR,
+        ),
+      );
+    }
+  },
+});
+
 const since = computed(() => {
   return store.getters.getSinceCreated(today.value);
 });
-
-// Methods
-function handleEmergencyToggle(emergency: TicketEmergencyState) {
-  store.dispatch("toggleEmergency", emergency).catch(({ name, violations }) => {
-    if (name === "ValidationException" || name === "AccessException") {
-      violations.forEach((violation: string) =>
-        toast.open({ message: violation }),
-      );
-    } else {
-      toast.open({ message: "An error occurred" });
-    }
-  });
-}
 </script>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Comment/CommentComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Comment/CommentComponent.vue
index 8723c7c72..da5ca4ccb 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Comment/CommentComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Comment/CommentComponent.vue
@@ -1,19 +1,103 @@
 <template>
   <div class="col-12">
     <blockquote class="chill-user-quote">
+      <button
+        class="btn btn-sm btn-edit float-end"
+        title="Edit"
+        @click="editCommentModal = true"
+        style="top: 0.5rem; right: 0.5rem"
+        v-if="canBeEdited && isOpen"
+      />
       <p v-html="convertMarkdownToHtml(commentHistory.content)"></p>
     </blockquote>
   </div>
+  <Modal
+    v-if="editCommentModal"
+    :show="editCommentModal"
+    modal-dialog-class="modal-xl"
+    @close="editCommentModal = false"
+  >
+    <template #header>
+      <h5 class="modal-title">
+        {{ trans(CHILL_TICKET_TICKET_EDIT_COMMENT_TITLE) }}
+      </h5>
+    </template>
+    <template #body>
+      <comment-editor v-model="editedComment" />
+    </template>
+    <template #footer>
+      <button
+        class="btn btn-primary"
+        @click="restoreComment"
+        v-if="commentHistory.deleted"
+      >
+        {{ trans(RESTORE) }}
+      </button>
+      <button class="btn btn-delete" @click="deleteComment" v-else>
+        {{ trans(DELETE) }}
+      </button>
+      <button class="btn btn-save" @click="saveComment">
+        {{ trans(SAVE) }}
+      </button>
+    </template>
+  </Modal>
 </template>
 
 <script setup lang="ts">
+import { computed, ref } from "vue";
+import { useStore } from "vuex";
 import { marked } from "marked";
 import DOMPurify from "dompurify";
 
 // Types
 import { Comment } from "../../../../types";
 
-defineProps<{ commentHistory: Comment }>();
+// Components
+import CommentEditor from "ChillMainAssets/vuejs/_components/CommentEditor/CommentEditor.vue";
+import Modal from "../../../../../../../../ChillMainBundle/Resources/public/vuejs/_components/Modal.vue";
+
+import {
+  trans,
+  SAVE,
+  DELETE,
+  RESTORE,
+  CHILL_TICKET_TICKET_EDIT_COMMENT_TITLE,
+  CHILL_TICKET_TICKET_EDIT_COMMENT_SUCCESS,
+  CHILL_TICKET_TICKET_DELETE_COMMENT_SUCCESS,
+  CHILL_TICKET_TICKET_RESTORE_COMMENT_SUCCESS,
+} from "translator";
+import { useToast } from "vue-toast-notification";
+
+const props = defineProps<{ commentHistory: Comment }>();
+const toast = useToast();
+const store = useStore();
+const isOpen = computed(() => store.getters.isOpen as boolean);
+const canBeEdited = computed(() =>
+  store.getters["canBeEdited"](props.commentHistory),
+);
+const editCommentModal = ref<boolean>(false);
+const editedComment = ref<string>(props.commentHistory.content);
+
+const saveComment = () => {
+  store.dispatch("editComment", {
+    id: props.commentHistory.id,
+    content: editedComment.value,
+  });
+  editCommentModal.value = false;
+  toast.success(trans(CHILL_TICKET_TICKET_EDIT_COMMENT_SUCCESS));
+};
+
+const deleteComment = () => {
+  store.dispatch("deleteComment", props.commentHistory.id);
+  editCommentModal.value = false;
+  toast.success(trans(CHILL_TICKET_TICKET_DELETE_COMMENT_SUCCESS));
+};
+
+const restoreComment = () => {
+  store.dispatch("restoreComment", props.commentHistory.id);
+  editCommentModal.value = false;
+  toast.success(trans(CHILL_TICKET_TICKET_RESTORE_COMMENT_SUCCESS));
+};
 
 const preprocess = (markdown: string): string => {
   return markdown;
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Comment/CommentEditorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Comment/CommentEditorComponent.vue
index 6cc3c42fe..8579d66fd 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Comment/CommentEditorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Comment/CommentEditorComponent.vue
@@ -1,24 +1,92 @@
 <template>
   <div class="row">
+    <div class="col-12" v-if="motive">
+      <div class="input-group mb-2">
+        <input
+          type="text"
+          :value="localizeTranslatableString(motive.label)"
+          readonly
+          class="form-control"
+        />
+        <div class="input-group-append">
+          <peloton-component :stored-objects="motive.storedObjects" />
+        </div>
+      </div>
+    </div>
     <div class="col-12">
       <comment-editor v-model="content" />
     </div>
+    <div class="col-12" v-if="motive">
+      <div
+        class="input-group mb-2"
+        v-for="(supplementaryComments, index) in motive.supplementaryComments"
+        :key="index"
+      >
+        <div class="input-group-prepend d-flex align-items-center px-1">
+          <span class="badge rounded-pill bg-chill-red">
+            {{ supplementaryComments.label }}
+          </span>
+        </div>
+
+        <input
+          type="text"
+          v-model="supplementaryCommentsInput[index]"
+          class="form-control"
+          @keyup.enter="addSupplementaryComments(index)"
+          @keydown.enter.prevent
+        />
+        <div class="input-group-append">
+          <button
+            class="input-group-text btn btn-submit"
+            type="button"
+            @click="addSupplementaryComments(index)"
+          >
+            <i class="fa fa-plus"></i>
+          </button>
+        </div>
+      </div>
+    </div>
   </div>
 </template>
 
 <script setup lang="ts">
-import { ref, watch } from "vue";
+import { reactive, ref, watch } from "vue";
+
+// Components
 import CommentEditor from "ChillMainAssets/vuejs/_components/CommentEditor/CommentEditor.vue";
+import PelotonComponent from "../PelotonComponent.vue";
+
+// Types
+import { Motive } from "../../../../types";
+
+// Utils
+import { localizeTranslatableString } from "../../utils/utils";
+import { StoredObject } from "ChillDocStoreAssets/types";
 
 const props = defineProps<{
   modelValue?: string;
+  motive?: Motive;
 }>();
 
-const emit =
-  defineEmits<(e: "update:modelValue", value: string | undefined) => void>();
+const supplementaryCommentsInput = reactive<string[]>([]);
+
+const emit = defineEmits<{
+  "update:modelValue": [value: string | undefined];
+  "show-peloton-modal": [storedObjects: StoredObject[]];
+}>();
 
 const content = ref(props.modelValue);
 
+function addSupplementaryComments(index: number) {
+  if (supplementaryCommentsInput[index]) {
+    const supplementaryText = `**${props.motive?.supplementaryComments[index].label}**:  ${supplementaryCommentsInput[index]}`;
+    content.value = content.value
+      ? content.value + "\n" + supplementaryText
+      : supplementaryText;
+    supplementaryCommentsInput[index] = "";
+  }
+}
+
 watch(content, (value) => {
   emit("update:modelValue", value);
 });
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Emergency/EmergencyToggleComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Emergency/EmergencyToggleComponent.vue
index 2220002ec..5bc5b52ea 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Emergency/EmergencyToggleComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Emergency/EmergencyToggleComponent.vue
@@ -3,36 +3,41 @@
     <button
       class="badge rounded-pill me-1"
       :class="{
-        'bg-danger': modelValue,
+        'bg-chill-red': modelValue,
         'bg-secondary': !modelValue,
+        'no-pointer': props.disabled,
       }"
       @click="toggleEmergency"
+      :disabled="props.disabled"
     >
       {{ trans(CHILL_TICKET_TICKET_BANNER_EMERGENCY) }}
     </button>
   </span>
 </template>
+<style scoped>
+.no-pointer {
+  cursor: not-allowed !important;
+}
+</style>
 
 <script lang="ts" setup>
 import { trans, CHILL_TICKET_TICKET_BANNER_EMERGENCY } from "translator";
-import { TicketEmergencyState } from "../../../../types";
 
 // Props
 const props = defineProps<{
   modelValue: boolean;
+  disabled?: boolean;
 }>();
 
 // Emits
 const emit = defineEmits<{
   "update:modelValue": [value: boolean];
-  "toggle-emergency": [emergency: TicketEmergencyState];
 }>();
 
 // Methods
 function toggleEmergency() {
   const newValue = !props.modelValue;
   emit("update:modelValue", newValue);
-  emit("toggle-emergency", newValue ? "yes" : "no");
 }
 </script>
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PelotonComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PelotonComponent.vue
new file mode 100644
index 000000000..b50682a02
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PelotonComponent.vue
@@ -0,0 +1,262 @@
+<template>
+  <button
+    class="input-group-text btn btn-primary"
+    type="button"
+    @click="handleClick"
+    :disabled="!storedObjects?.length"
+  >
+    <i class="fa fa-sitemap"></i>
+  </button>
+  <Modal
+    v-if="showPelotonsModal"
+    :show="showPelotonsModal"
+    modal-dialog-class="modal-xl"
+    @close="closeModal"
+  >
+    <template #header>
+      <div class="dropdown-container">
+        <select
+          v-model="selectedStoredObject"
+          class="form-select"
+          @change="onSelectionChange"
+          style="max-width: 400px"
+        >
+          <option
+            v-for="storedObject in storedObjects"
+            :key="storedObject.id"
+            :value="storedObject"
+          >
+            {{ storedObject.title }}
+          </option>
+        </select>
+      </div>
+    </template>
+    <template #body>
+      <div v-if="selectedStoredObject && documentUrl" class="document-viewer">
+        <div v-if="documentType === 'image'" class="image-container">
+          <img
+            :src="documentUrl"
+            class="img-fluid"
+            style="max-width: 100%; height: auto"
+          />
+        </div>
+
+        <div v-else-if="documentType === 'pdf'" class="pdf-container">
+          <iframe
+            :src="documentUrl"
+            width="100%"
+            height="100%"
+            style="border: 1px solid #ccc"
+          ></iframe>
+          <noscript>
+            <p>
+              {{ trans(CHILL_TICKET_PELOTON_IFRAME_NOT_SUPPORTED) }}
+              <a :href="documentUrl" target="_blank">
+                {{ trans(CHILL_TICKET_PELOTON_CLICK_TO_OPEN_PDF) }}
+              </a>
+            </p>
+          </noscript>
+        </div>
+
+        <div v-else class="unsupported-document">
+          <p>{{ trans(CHILL_TICKET_PELOTON_UNSUPPORTED_TYPE) }}</p>
+          <a :href="documentUrl" target="_blank" class="btn btn-primary">
+            {{ trans(CHILL_TICKET_PELOTON_OPEN_NEW_TAB) }}
+          </a>
+        </div>
+      </div>
+
+      <div v-if="isLoading" class="loading-indicator">
+        <div class="spinner-border" role="status">
+          <span class="visually-hidden">{{
+            trans(CHILL_TICKET_PELOTON_LOADING)
+          }}</span>
+        </div>
+        <p>{{ trans(CHILL_TICKET_PELOTON_LOADING_DOCUMENT) }}</p>
+      </div>
+
+      <div v-if="error" class="alert alert-danger">
+        {{ error }}
+      </div>
+    </template>
+  </Modal>
+</template>
+
+<script setup lang="ts">
+import { ref, watch } from "vue";
+
+// Component
+import Modal from "../../../../../../../ChillMainBundle/Resources/public/vuejs/_components/Modal.vue";
+
+// Translations
+import {
+  CHILL_TICKET_PELOTON_LOADING_DOCUMENT,
+  CHILL_TICKET_PELOTON_LOADING,
+  CHILL_TICKET_PELOTON_ERROR_LOADING,
+  CHILL_TICKET_PELOTON_ERROR_NOT_READY,
+  CHILL_TICKET_PELOTON_UNSUPPORTED_TYPE,
+  CHILL_TICKET_PELOTON_OPEN_NEW_TAB,
+  CHILL_TICKET_PELOTON_IFRAME_NOT_SUPPORTED,
+  CHILL_TICKET_PELOTON_CLICK_TO_OPEN_PDF,
+  trans,
+} from "translator";
+// Type
+import { StoredObject } from "ChillDocStoreAssets/types";
+
+// Utils
+import {
+  download_and_decrypt_doc,
+  is_object_ready,
+} from "ChillDocStoreAssets/vuejs/StoredObjectButton/helpers";
+
+const props = defineProps<{ storedObjects: StoredObject[] }>();
+
+const selectedStoredObject = ref<StoredObject | null>(null);
+const documentUrl = ref<string>("");
+const documentType = ref<string>("");
+const isLoading = ref<boolean>(false);
+const error = ref<string>("");
+const showPelotonsModal = ref<boolean>(false);
+
+watch(
+  () => props.storedObjects,
+  (newStoredObjects) => {
+    if (
+      newStoredObjects &&
+      newStoredObjects.length > 0 &&
+      !selectedStoredObject.value
+    ) {
+      selectedStoredObject.value = newStoredObjects[0];
+      onSelectionChange();
+    }
+  },
+  { immediate: true },
+);
+
+async function onSelectionChange() {
+  if (!selectedStoredObject.value) {
+    cleanupPrevious();
+    documentType.value = "";
+    error.value = "";
+    return;
+  }
+
+  isLoading.value = true;
+  error.value = "";
+  cleanupPrevious();
+
+  try {
+    const document = await is_object_ready(selectedStoredObject.value);
+
+    if (!document) {
+      error.value = trans(CHILL_TICKET_PELOTON_ERROR_NOT_READY);
+      return;
+    }
+
+    const doc = await download_and_decrypt_doc(
+      selectedStoredObject.value,
+      selectedStoredObject.value.currentVersion,
+    );
+
+    const blob = new Blob([doc], { type: document.type });
+    documentUrl.value = URL.createObjectURL(blob);
+
+    if (document.type.startsWith("image/")) {
+      documentType.value = "image";
+    } else if (document.type === "application/pdf") {
+      documentType.value = "pdf";
+    } else {
+      documentType.value = "other";
+    }
+  } catch (err) {
+    console.error(trans(CHILL_TICKET_PELOTON_ERROR_LOADING), err);
+    error.value = trans(CHILL_TICKET_PELOTON_ERROR_LOADING);
+  } finally {
+    isLoading.value = false;
+  }
+}
+
+// Nettoyer les URLs blob précédentes
+function cleanupPrevious() {
+  if (documentUrl.value) {
+    URL.revokeObjectURL(documentUrl.value);
+    documentUrl.value = "";
+  }
+}
+
+function handleClick() {
+  showPelotonsModal.value = true;
+  if (
+    !selectedStoredObject.value &&
+    props.storedObjects &&
+    props.storedObjects.length > 0
+  ) {
+    selectedStoredObject.value = props.storedObjects[0];
+    onSelectionChange();
+  }
+}
+
+function closeModal() {
+  showPelotonsModal.value = false;
+}
+</script>
+
+<style lang="scss" scoped>
+.dropdown-container {
+  .form-label {
+    font-weight: 500;
+    margin-bottom: 0.5rem;
+  }
+}
+
+.document-viewer {
+  height: 80vh;
+
+  .image-container {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
+
+    img {
+      box-shadow: 0 2px 4px rgba(0, 0, 0, 0.1);
+      border-radius: 0.25rem;
+    }
+  }
+
+  .pdf-container {
+    height: 100%;
+
+    iframe {
+      border-radius: 0.25rem;
+      height: 100% !important;
+    }
+  }
+
+  .unsupported-document {
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    height: 100%;
+
+    p {
+      margin-bottom: 1rem;
+      color: #6c757d;
+    }
+  }
+}
+
+.loading-indicator {
+  text-align: center;
+  padding: 2rem;
+
+  .spinner-border {
+    margin-bottom: 1rem;
+  }
+
+  p {
+    color: #6c757d;
+    margin: 0;
+  }
+}
+</style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PreviousTicketsComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PreviousTicketsComponent.vue
index cd826d9e9..8c33d804c 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PreviousTicketsComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PreviousTicketsComponent.vue
@@ -37,8 +37,10 @@
 
       <template #body>
         <ticket-list-component
+          :hasMoreTickets="pagination.next !== null"
           :tickets="previousTickets"
           :title="trans(CHILL_TICKET_LIST_NO_TICKETS)"
+          @fetchNextPage="fetchNextPage"
           @view-ticket="handleViewTicket"
           @edit-ticket="handleEditTicket"
         />
@@ -59,6 +61,7 @@ import TicketListComponent from "../../TicketList/components/TicketListComponent
 import {
   trans,
   CHILL_TICKET_LIST_NO_TICKETS,
+  CHILL_TICKET_LIST_ERROR_LOADING_TICKET,
   CHILL_TICKET_TICKET_PREVIOUS_TICKETS,
   CHILL_TICKET_LIST_TITLE_PREVIOUS_TICKETS,
 } from "translator";
@@ -69,12 +72,14 @@ import { TicketSimple } from "../../../types";
 
 // Utils
 import { localizedUrl } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
+import { Pagination } from "ChillMainAssets/lib/api/apiMethods";
 
 const store = useStore();
 const showPreviousTicketModal = ref(false);
 const showTicketHistoryModal = ref(false);
 const selectedTicketId = ref<number | null>(null);
 
+const pagination = computed(() => store.getters.getPagination as Pagination);
 const currentPersons = computed(
   () => store.getters.getCurrentPersons as Person[],
 );
@@ -84,11 +89,13 @@ const previousTickets = computed(
 
 onMounted(async () => {
   try {
-    await store.dispatch("fetchTicketList", {
-      byPerson: currentPersons.value.map((person) => person.id),
-    });
+    if (currentPersons.value.length) {
+      await store.dispatch("fetchTicketList", {
+        byPerson: currentPersons.value.map((person) => person.id),
+      });
+    }
   } catch (error) {
-    console.error("Erreur lors du chargement des tickets:", error);
+    console.error(trans(CHILL_TICKET_LIST_ERROR_LOADING_TICKET), error);
   }
 });
 
@@ -107,10 +114,16 @@ async function handleViewTicket(ticketId: number) {
   try {
     await store.dispatch("fetchTicket", ticketId);
   } catch (error) {
-    console.error("Erreur lors du chargement du ticket:", error);
+    console.error(trans(CHILL_TICKET_LIST_ERROR_LOADING_TICKET), error);
   }
 }
 
+const fetchNextPage = async () => {
+  if (pagination.value.next) {
+    await store.dispatch("fetchTicketListByUrl", pagination.value.next);
+  }
+};
+
 function handleEditTicket(ticketId: number) {
   const returnPath = localizedUrl(`/ticket/ticket/list`);
   window.location.href = localizedUrl(
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/State/StateToggleComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/State/StateToggleComponent.vue
new file mode 100644
index 000000000..c7c993743
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/State/StateToggleComponent.vue
@@ -0,0 +1,68 @@
+<template>
+  <span class="d-block d-sm-inline-block ms-sm-3 ms-md-0">
+    <button
+      class="badge rounded-pill me-1"
+      :class="{
+        'bg-chill-green': modelValue,
+        'bg-chill-red': !modelValue,
+      }"
+      @click="toggleEmergency"
+    >
+      {{
+        modelValue
+          ? trans(CHILL_TICKET_TICKET_BANNER_OPEN)
+          : trans(CHILL_TICKET_TICKET_BANNER_CLOSED)
+      }}
+    </button>
+  </span>
+</template>
+
+<script lang="ts" setup>
+import {
+  trans,
+  CHILL_TICKET_TICKET_BANNER_OPEN,
+  CHILL_TICKET_TICKET_BANNER_CLOSED,
+} from "translator";
+
+// Props
+const props = defineProps<{
+  modelValue: boolean;
+}>();
+
+// Emits
+const emit = defineEmits<{
+  "update:modelValue": [value: boolean];
+}>();
+
+// Methods
+function toggleEmergency() {
+  const newValue = !props.modelValue;
+  emit("update:modelValue", newValue);
+}
+</script>
+
+<style lang="scss" scoped>
+a.flag-toggle {
+  color: white;
+  cursor: pointer;
+  &:hover {
+    color: white;
+    text-decoration: underline;
+    border-radius: 20px;
+  }
+  i {
+    margin: auto 0.4em;
+  }
+  span.on {
+    font-weight: bolder;
+  }
+}
+button.badge {
+  &.bg-secondary {
+    opacity: 0.5;
+    &:hover {
+      opacity: 0.7;
+    }
+  }
+}
+</style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketInitFormComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketInitFormComponent.vue
new file mode 100644
index 000000000..1a995010c
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketInitFormComponent.vue
@@ -0,0 +1,153 @@
+<template>
+  <div class="card mb-4">
+    <div class="card-body">
+      <form @submit.prevent="submitForm">
+        <!-- Sélection du motif -->
+        <div class="mb-3">
+          <label class="form-label">{{
+            trans(CHILL_TICKET_TICKET_SET_MOTIVE_TITLE)
+          }}</label>
+          <motive-selector-component
+            v-model="ticketForm.motive"
+            :motives="motives"
+          />
+        </div>
+
+        <!-- Sélection des personnes -->
+        <div class="row mb-3">
+          <div class="col-md-6">
+            <label class="form-label">
+              {{ trans(CHILL_TICKET_TICKET_SET_PERSONS_TITLE_CALLER) }}
+            </label>
+            <persons-selector-component
+              v-model="ticketForm.caller"
+              :suggested="[]"
+              :multiple="false"
+              :types="['person', 'thirdparty']"
+              :label="trans(CHILL_TICKET_TICKET_SET_PERSONS_CALLER_LABEL)"
+            />
+          </div>
+          <div class="col-md-6">
+            <label class="form-label">
+              {{ trans(CHILL_TICKET_TICKET_SET_PERSONS_TITLE_PERSON) }}
+            </label>
+            <persons-selector-component
+              v-model="ticketForm.persons"
+              :suggested="suggestedPersons"
+              :multiple="true"
+              :types="['person']"
+              :label="trans(CHILL_TICKET_TICKET_SET_PERSONS_USER_LABEL)"
+            />
+          </div>
+        </div>
+
+        <!-- Éditeur de commentaire -->
+        <div class="mb-3">
+          <label class="form-label">{{
+            trans(CHILL_TICKET_TICKET_ADD_COMMENT_TITLE)
+          }}</label>
+          <comment-editor-component
+            v-model="ticketForm.content"
+            :motive="ticketForm.motive"
+          />
+        </div>
+
+        <!-- Boutons d'action -->
+        <div class="d-flex justify-content-end gap-2 mt-4">
+          <button type="button" class="btn btn-secondary" @click="resetForm">
+            {{ trans(CHILL_TICKET_TICKET_INIT_FORM_RESET) }}
+          </button>
+          <button type="submit" class="btn btn-primary">
+            {{ trans(CHILL_TICKET_TICKET_INIT_FORM_SUBMIT) }}
+          </button>
+        </div>
+      </form>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { reactive, watch } from "vue";
+import { useStore } from "vuex";
+
+// Components
+import MotiveSelectorComponent from "./Motive/MotiveSelectorComponent.vue";
+import CommentEditorComponent from "./Comment/CommentEditorComponent.vue";
+import PersonsSelectorComponent from "./Person/PersonsSelectorComponent.vue";
+
+// Types
+import { Motive, TicketInitForm } from "../../../types";
+import { Person } from "ChillPersonAssets/types";
+
+// Translations
+import {
+  trans,
+  CHILL_TICKET_TICKET_INIT_FORM_SUBMIT,
+  CHILL_TICKET_TICKET_INIT_FORM_RESET,
+  CHILL_TICKET_TICKET_SET_MOTIVE_TITLE,
+  CHILL_TICKET_TICKET_ADD_COMMENT_TITLE,
+  CHILL_TICKET_TICKET_SET_PERSONS_TITLE_CALLER,
+  CHILL_TICKET_TICKET_SET_PERSONS_TITLE_PERSON,
+  CHILL_TICKET_TICKET_SET_PERSONS_CALLER_LABEL,
+  CHILL_TICKET_TICKET_SET_PERSONS_USER_LABEL,
+} from "translator";
+
+defineProps<{
+  motives: Motive[];
+  suggestedPersons: Person[];
+}>();
+
+const emit = defineEmits<{
+  "update:modelValue": [value: TicketInitForm];
+  submit: [formData: TicketInitForm];
+}>();
+
+const store = useStore();
+
+const ticketForm = reactive({
+  content: "",
+  motive: undefined as Motive | undefined,
+  persons: [] as Person[],
+  caller: null as Person | null,
+} as TicketInitForm);
+
+watch(
+  () => ticketForm.caller,
+  async (newCaller) => {
+    await store.dispatch("setCaller", newCaller);
+    await store.dispatch("getSuggestedPersons");
+  },
+);
+
+function submitForm() {
+  emit("submit", {
+    content: ticketForm.content,
+    motive: ticketForm.motive,
+    persons: [...ticketForm.persons],
+    caller: ticketForm.caller,
+  });
+}
+
+function resetForm() {
+  ticketForm.content = "";
+  ticketForm.motive = undefined;
+  ticketForm.persons = [];
+  ticketForm.caller = null;
+}
+</script>
+
+<style lang="scss" scoped>
+.card {
+  border: 1px solid #dee2e6;
+  border-radius: 0.375rem;
+}
+
+.card-header {
+  background-color: #f8f9fa;
+  border-bottom: 1px solid #dee2e6;
+}
+
+.gap-2 {
+  gap: 0.5rem;
+}
+</style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts
index 1d6305cc7..05e273b4c 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts
@@ -8,6 +8,7 @@ import {
   State as TicketListState,
   moduleTicketList,
 } from "./modules/ticket_list";
+import { State as UserState, moduleUser } from "./modules/user";
 
 export interface RootState {
   motive: MotiveStates;
@@ -16,6 +17,7 @@ export interface RootState {
   addressee: AddresseeStates;
   persons: PersonsState;
   ticketList: TicketListState;
+  user: UserState;
 }
 
 export const store = createStore<RootState>({
@@ -26,5 +28,6 @@ export const store = createStore<RootState>({
     addressee: moduleAddressee,
     persons: modulePersons,
     ticketList: moduleTicketList,
+    user: moduleUser,
   },
 });
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/addressee.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/addressee.ts
index 09917ae25..f1f6d9df9 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/addressee.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/addressee.ts
@@ -61,15 +61,11 @@ export const moduleAddressee: Module<State, RootState> = {
       }
     },
 
-    async setAdressees(
-      { commit },
-      datas: { ticketId: number; addressees: UserGroupOrUser[] },
-    ) {
-      const { ticketId, addressees } = datas;
+    async setAddressees({ commit, rootState }, addressees: UserGroupOrUser[]) {
       try {
         const result = await makeFetch(
           "POST",
-          `/api/1.0/ticket/${ticketId}/addressees/set`,
+          `/api/1.0/ticket/${rootState.ticket.ticket.id}/addressees/set`,
           {
             addressees: addressees.map((addressee) => {
               return { id: addressee.id, type: addressee.type };
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/comment.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/comment.ts
index a786299f7..ab8192df8 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/comment.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/comment.ts
@@ -3,7 +3,7 @@ import { makeFetch } from "../../../../../../../../ChillMainBundle/Resources/pub
 import { Module } from "vuex";
 import { RootState } from "..";
 
-import { Comment } from "../../../../types";
+import { Comment, Ticket } from "../../../../types";
 import { ApiException } from "../../../../../../../../ChillMainBundle/Resources/public/types";
 
 export interface State {
@@ -14,18 +14,32 @@ export const moduleComment: Module<State, RootState> = {
   state: () => ({
     comments: [] as Comment[],
   }),
-  getters: {},
+  getters: {
+    canBeDisplayed:
+      (state: State, getters: unknown, rootState: RootState) =>
+      (comment: Comment) => {
+        return (
+          (comment.deleted &&
+            comment.createdBy?.username ===
+              rootState.user.currentUser?.username) ||
+          !comment.deleted
+        );
+      },
+    canBeEdited:
+      (state: State, getters: unknown, rootState: RootState) =>
+      (comment: Comment) => {
+        return (
+          comment.createdBy?.username === rootState.user.currentUser?.username
+        );
+      },
+  },
   mutations: {},
   actions: {
-    async createComment(
-      { commit },
-      datas: { ticketId: number; content: Comment["content"] },
-    ) {
-      const { ticketId, content } = datas;
+    async createComment({ commit, rootState }, content: Comment["content"]) {
       try {
-        const result = await makeFetch(
+        const result: Ticket = await makeFetch(
           "POST",
-          `/api/1.0/ticket/${ticketId}/comment/add`,
+          `/api/1.0/ticket/${rootState.ticket.ticket.id}/comment/add`,
           { content },
         );
         commit("setTicket", result);
@@ -34,5 +48,46 @@ export const moduleComment: Module<State, RootState> = {
         throw error.name;
       }
     },
+    async editComment(
+      { commit },
+      { id, content }: { id: Comment["id"]; content: Comment["content"] },
+    ) {
+      try {
+        const result: Comment = await makeFetch(
+          "POST",
+          `/api/1.0/ticket/comment/${id}/edit`,
+          { content },
+        );
+        commit("setTicketHistoryComment", result);
+      } catch (e: unknown) {
+        const error = e as ApiException;
+        throw error.name;
+      }
+    },
+    async deleteComment({ commit }, id: Comment["id"]) {
+      try {
+        const result: Comment = await makeFetch(
+          "POST",
+          `/api/1.0/ticket/comment/${id}/delete`,
+        );
+        commit("setTicketHistoryComment", result);
+      } catch (e: unknown) {
+        const error = e as ApiException;
+        throw error.name;
+      }
+    },
+
+    async restoreComment({ commit }, id: Comment["id"]) {
+      try {
+        const result: Comment = await makeFetch(
+          "POST",
+          `/api/1.0/ticket/comment/${id}/restore`,
+        );
+        commit("setTicketHistoryComment", result);
+      } catch (e: unknown) {
+        const error = e as ApiException;
+        throw error.name;
+      }
+    },
   },
 };
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/motive.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/motive.ts
index c2bafb97e..9f7db5509 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/motive.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/motive.ts
@@ -40,15 +40,11 @@ export const moduleMotive: Module<State, RootState> = {
       }
     },
 
-    async createMotive(
-      { commit },
-      datas: { ticketId: number; motive: Motive },
-    ) {
-      const { ticketId, motive } = datas;
+    async createMotive({ commit, rootState }, motive: Motive) {
       try {
         const result = await makeFetch(
           "POST",
-          `/api/1.0/ticket/${ticketId}/motive/set`,
+          `/api/1.0/ticket/${rootState.ticket.ticket.id}/motive/set`,
           {
             motive: {
               id: motive.id,
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/persons.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/persons.ts
index ae93039fb..048d3941c 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/persons.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/persons.ts
@@ -24,19 +24,17 @@ export const modulePersons: Module<State, RootState> = {
     },
   },
   actions: {
-    async setPersons(
-      { commit, rootState: RootState },
-      payload: { persons: Person[] },
-    ) {
-      const persons = payload.persons.map((person: Person) => ({
+    async setPersons({ commit, rootState }, persons: Person[]) {
+      const personData = persons.map((person: Person) => ({
         id: person.id,
         type: person.type,
       }));
+      console.log("Setting persons:", personData);
       try {
         const result: Ticket = await makeFetch(
           "POST",
-          `/api/1.0/ticket/${RootState.ticket.ticket.id}/persons/set`,
-          { persons },
+          `/api/1.0/ticket/${rootState.ticket.ticket.id}/persons/set`,
+          { persons: personData },
         );
         commit("setTicket", result);
 
@@ -46,21 +44,18 @@ export const modulePersons: Module<State, RootState> = {
         throw error.name;
       }
     },
-    async setCaller(
-      { commit, rootState: RootState },
-      payload: { caller: Person | null },
-    ) {
+    async setCaller({ commit, rootState }, caller: Person | null) {
       try {
-        const caller = payload.caller
+        const callerData = caller
           ? {
-              id: payload.caller.id,
-              type: payload.caller.type,
+              id: caller.id,
+              type: caller.type,
             }
           : null;
         const result: Ticket = await makeFetch(
           "POST",
-          `/api/1.0/ticket/ticket/${RootState.ticket.ticket.id}/set-caller`,
-          { caller },
+          `/api/1.0/ticket/ticket/${rootState.ticket.ticket.id}/set-caller`,
+          { caller: callerData },
         );
         commit("setTicket", result as Ticket);
       } catch (e: unknown) {
@@ -69,9 +64,9 @@ export const modulePersons: Module<State, RootState> = {
       }
     },
 
-    async getSuggestedPersons({ commit, rootState: RootState }) {
+    async getSuggestedPersons({ commit, rootState }) {
       try {
-        const ticketId = RootState.ticket.ticket.id;
+        const ticketId = rootState.ticket.ticket.id;
         const result: Person[] = await makeFetch(
           "GET",
           `/api/1.0/ticket/ticket/${ticketId}/suggest-person`,
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
index 4949087cb..c90e97913 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
@@ -1,7 +1,13 @@
 import { Module } from "vuex";
 import { RootState } from "..";
 
-import { Ticket, TicketEmergencyState } from "../../../../types";
+import {
+  Comment,
+  Ticket,
+  TicketEmergencyState,
+  TicketHistoryLine,
+  TicketState,
+} from "../../../../types";
 import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
 import { ApiException } from "../../../../../../../../ChillMainBundle/Resources/public/types";
 import { getSinceCreated } from "../../utils/utils";
@@ -30,7 +36,10 @@ export const moduleTicket: Module<State, RootState> = {
       return state.ticket.currentState === "open";
     },
     isEmergency(state) {
-      return state.ticket.emergency == "yes" ? true : false;
+      return state.ticket.emergency == "yes";
+    },
+    isNewTicket(state) {
+      return state.ticket.history.length == 3;
     },
     getTicket(state) {
       state.ticket.history = state.ticket.history.sort((a, b) =>
@@ -59,13 +68,24 @@ export const moduleTicket: Module<State, RootState> = {
     setTicket(state, ticket: Ticket) {
       state.ticket = ticket;
     },
+    setTicketHistoryComment(state, ticketHistoryData: Comment) {
+      const index = state.ticket.history.findIndex(
+        (item: TicketHistoryLine) =>
+          item.event_type == "add_comment" &&
+          item.data.id === ticketHistoryData.id,
+      );
+
+      if (index !== -1) {
+        state.ticket.history[index].data = ticketHistoryData;
+      }
+    },
   },
   actions: {
-    async closeTicket({ commit, state }) {
+    async setTicketState({ commit, state }, ticketState: TicketState) {
       try {
         const result: Ticket = await makeFetch(
           "POST",
-          `/api/1.0/ticket/ticket/${state.ticket.id}/close`,
+          `/api/1.0/ticket/ticket/${state.ticket.id}/${ticketState}`,
         );
         commit("setTicket", result as Ticket);
       } catch (e: unknown) {
@@ -73,19 +93,23 @@ export const moduleTicket: Module<State, RootState> = {
         throw error.name;
       }
     },
-    async reopenTicket({ commit, state }) {
+
+    async fetchTicket({ commit }, ticketId: number) {
       try {
-        const result: Ticket = await makeFetch(
-          "POST",
-          `/api/1.0/ticket/ticket/${state.ticket.id}/open`,
+        const ticket: Ticket = await makeFetch(
+          "GET",
+          `/api/1.0/ticket/ticket/${ticketId}`,
         );
-        commit("setTicket", result as Ticket);
-      } catch (e: unknown) {
-        const error = e as ApiException;
-        throw error.name;
+        commit("setTicket", ticket);
+      } catch (error) {
+        console.error(
+          "Erreur lors du chargement du ticket:",
+          error as ApiException,
+        );
+        throw error;
       }
     },
-    async toggleEmergency({ commit, state }, emergency: TicketEmergencyState) {
+    async setEmergency({ commit, state }, emergency: TicketEmergencyState) {
       try {
         const result: Ticket = await makeFetch(
           "POST",
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket_list.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket_list.ts
index 8f9264928..9af30abee 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket_list.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket_list.ts
@@ -1,7 +1,7 @@
 import { Module } from "vuex";
 import { RootState } from "..";
 
-import { Ticket, TicketFilterParams, TicketSimple } from "../../../../types";
+import { TicketFilterParams, TicketSimple } from "../../../../types";
 import {
   makeFetch,
   Pagination,
@@ -14,7 +14,6 @@ import {
 
 export interface State {
   ticket_list: TicketSimple[];
-  ticket_details: Ticket | null;
   pagination: Pagination;
   count: number;
   user: User;
@@ -23,7 +22,6 @@ export interface State {
 export const moduleTicketList: Module<State, RootState> = {
   state: () => ({
     ticket_list: [],
-    ticket_details: null,
     pagination: {
       first: 0,
       items_per_page: 50,
@@ -38,9 +36,6 @@ export const moduleTicketList: Module<State, RootState> = {
     getTicketList(state): TicketSimple[] {
       return state.ticket_list;
     },
-    getTicketDetails(state): Ticket | null {
-      return state.ticket_details;
-    },
     getPagination(state) {
       return state.pagination;
     },
@@ -55,9 +50,6 @@ export const moduleTicketList: Module<State, RootState> = {
     setTicketList(state, ticketList: TicketSimple[]) {
       state.ticket_list = ticketList;
     },
-    setTicketDetails(state, ticket: Ticket | null) {
-      state.ticket_details = ticket;
-    },
     setPagination(state, pagination: State["pagination"]) {
       state.pagination = pagination;
     },
@@ -69,11 +61,26 @@ export const moduleTicketList: Module<State, RootState> = {
     },
   },
   actions: {
-    async fetchTicketList({ commit }, ticketFilterParams: TicketFilterParams) {
+    async fetchTicketList(
+      { commit },
+      ticketFilterParams: TicketFilterParams | null,
+    ) {
       try {
-        const params = new URLSearchParams(
-          ticketFilterParams as Record<string, string>,
-        ).toString();
+        let params = "";
+        if (ticketFilterParams) {
+          const filteredParams = Object.fromEntries(
+            Object.entries(ticketFilterParams).filter(
+              ([, value]) =>
+                value !== undefined &&
+                value !== null &&
+                value !== "" &&
+                value.length > 0,
+            ),
+          );
+          params = new URLSearchParams(
+            filteredParams as Record<string, string>,
+          ).toString();
+        }
         const { results, pagination, count } = (await makeFetch(
           "GET",
           `/api/1.0/ticket/ticket/list/?${params}`,
@@ -94,7 +101,7 @@ export const moduleTicketList: Module<State, RootState> = {
       try {
         const user = await makeFetch(
           "GET",
-          "http://localhost:8000/api/1.0/main/whoami.json",
+          "/api/1.0/main/whoami.json",
         );
         commit("setUser", user);
         return user;
@@ -106,21 +113,6 @@ export const moduleTicketList: Module<State, RootState> = {
         throw error;
       }
     },
-    async fetchTicketDetails({ commit }, ticketId: number) {
-      try {
-        const ticket: Ticket = await makeFetch(
-          "GET",
-          `/api/1.0/ticket/ticket/${ticketId}`,
-        );
-        commit("setTicketDetails", ticket);
-      } catch (error) {
-        console.error(
-          "Erreur lors du chargement du ticket:",
-          error as ApiException,
-        );
-        throw error;
-      }
-    },
     async fetchTicketListByUrl({ commit, state }, url: string) {
       try {
         const { results, pagination, count } = (await makeFetch(
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/user.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/user.ts
new file mode 100644
index 000000000..06492f027
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/user.ts
@@ -0,0 +1,41 @@
+import { Module } from "vuex";
+import { RootState } from "../index";
+import { ApiException, User } from "ChillMainAssets/types";
+import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
+
+export interface State {
+  currentUser: User | null;
+}
+
+export const moduleUser: Module<State, RootState> = {
+  state: () => ({
+    currentUser: null,
+  }),
+
+  getters: {
+    currentUser(state) {
+      return state.currentUser;
+    },
+  },
+
+  mutations: {
+    setCurrentUser(state, user: User) {
+      state.currentUser = user;
+    },
+  },
+
+  actions: {
+    async getCurrentUser({ commit }) {
+      try {
+        const userData: User = await makeFetch(
+          "GET",
+          "/api/1.0/main/whoami.json",
+        );
+        commit("setCurrentUser", userData);
+      } catch (e: unknown) {
+        const error = e as ApiException;
+        throw error.name;
+      }
+    },
+  },
+};
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/App.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/App.vue
index e90d48fe1..1f4cfd891 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/App.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/App.vue
@@ -49,7 +49,7 @@ import { ref, computed, onMounted } from "vue";
 import { useStore } from "vuex";
 
 // Types
-import { TicketSimple, Motive } from "../../types";
+import { TicketSimple, Motive, TicketFilterParams } from "../../types";
 import type { Person } from "ChillPersonAssets/types";
 
 // Components
@@ -60,15 +60,6 @@ import { Pagination } from "ChillMainAssets/lib/api/apiMethods";
 // Translations
 import { trans, CHILL_TICKET_LIST_LOADING_TICKET } from "translator";
 
-interface TicketFilterParams {
-  byPerson?: number[];
-  byCurrentState?: string[];
-  byCurrentStateEmergency?: string[];
-  byMotives?: number[];
-  byCreatedAfter?: string;
-  byCreatedBefore?: string;
-  byResponseTimeExceeded?: string;
-}
 const store = useStore();
 
 const title = window.title;
@@ -91,7 +82,6 @@ const handleFiltersChanged = async (filters: TicketFilterParams) => {
 };
 
 const fetchNextPage = async () => {
-  console.log("Fetching next page...");
   if (pagination.value.next) {
     await store.dispatch("fetchTicketListByUrl", pagination.value.next);
   }
@@ -99,11 +89,18 @@ const fetchNextPage = async () => {
 
 onMounted(async () => {
   isLoading.value = true;
+  const filters: TicketFilterParams = {
+    byCurrentState: ["open"],
+    byCurrentStateEmergency: [],
+    byCreatedAfter: "",
+    byCreatedBefore: "",
+    byResponseTimeExceeded: "",
+    byAddresseeToMe: false,
+  };
   try {
-    await Promise.all([
-      store.dispatch("fetchTicketList"),
-      store.dispatch("fetchMotives"),
-    ]);
+    await store.dispatch("getCurrentUser");
+    await store.dispatch("fetchTicketList", filters);
+    await store.dispatch("fetchMotives");
   } finally {
     isLoading.value = false;
   }
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketFilterListComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketFilterListComponent.vue
index 896c42cec..0c99ab846 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketFilterListComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketFilterListComponent.vue
@@ -10,7 +10,7 @@
         <div class="row">
           <!-- Filtre par usagé -->
           <div class="col-md-6 mb-3">
-            <label class="form-label">{{
+            <label class="form-label" for="personSelector">{{
               trans(CHILL_TICKET_LIST_FILTER_PERSONS_CONCERNED)
             }}</label>
             <persons-selector
@@ -18,6 +18,7 @@
               :suggested="availablePersons"
               :multiple="true"
               :types="['person']"
+              id="personSelector"
               :label="trans(CHILL_TICKET_LIST_FILTER_BY_PERSON)"
             />
           </div>
@@ -25,12 +26,13 @@
           <div class="col-md-6">
             <!-- Filtre par motifs -->
             <div class="row">
-              <label class="form-label">{{
+              <label class="form-label" for="motiveSelector">{{
                 trans(CHILL_TICKET_LIST_FILTER_BY_MOTIVES)
               }}</label>
               <motive-selector
                 v-model="selectedMotive"
                 :motives="availableMotives"
+                id="motiveSelector"
               />
 
               <div class="mt-1" style="min-height: 2.2em">
@@ -54,56 +56,40 @@
             <!-- Filtre par état actuel -->
             <div class="row">
               <div class="col-6">
-                <div class="form-check">
-                  <input
-                    class="form-check-input"
-                    type="checkbox"
-                    value="open"
-                    v-model="filters.byCurrentState"
-                    id="stateOpen"
-                  />
-                  <label class="form-check-label" for="stateOpen">{{
-                    trans(CHILL_TICKET_LIST_FILTER_OPEN)
-                  }}</label>
-                </div>
-                <div class="form-check">
-                  <input
-                    class="form-check-input"
-                    type="checkbox"
-                    value="closed"
-                    v-model="filters.byCurrentState"
-                    id="stateClosed"
-                  />
-                  <label class="form-check-label" for="stateClosed">
-                    {{ trans(CHILL_TICKET_LIST_FILTER_CLOSED) }}
+                <div class="mb-2">
+                  <label class="form-label pe-2" for="currentState">
+                    {{ trans(CHILL_TICKET_LIST_FILTER_CURRENT_STATE) }}
                   </label>
+                  <toggle-component
+                    v-model="isClosedToggled"
+                    :on-label="trans(CHILL_TICKET_LIST_FILTER_CLOSED)"
+                    :off-label="trans(CHILL_TICKET_LIST_FILTER_OPEN)"
+                    :classColor="{
+                      on: 'bg-chill-red',
+                      off: 'bg-chill-green',
+                    }"
+                    @update:model-value="handleStateToggle"
+                    id="currentState"
+                  />
                 </div>
               </div>
               <!-- Filtre par état d'urgence -->
               <div class="col-6">
-                <div class="form-check">
-                  <input
-                    class="form-check-input"
-                    type="checkbox"
-                    value="yes"
-                    v-model="filters.byCurrentStateEmergency"
-                    id="emergencyYes"
+                <div class="mb-2">
+                  <label class="form-label pe-2" for="emergency">
+                    {{ trans(CHILL_TICKET_LIST_FILTER_EMERGENCY) }}
+                  </label>
+                  <toggle-component
+                    v-model="isEmergencyToggled"
+                    :on-label="trans(CHILL_TICKET_LIST_FILTER_EMERGENCY)"
+                    :off-label="trans(CHILL_TICKET_LIST_FILTER_EMERGENCY)"
+                    :classColor="{
+                      on: 'bg-chill-red',
+                      off: 'bg-secondary',
+                    }"
+                    @update:model-value="handleEmergencyToggle"
+                    id="emergency"
                   />
-                  <label class="form-check-label" for="emergencyYes">{{
-                    trans(CHILL_TICKET_LIST_FILTER_EMERGENCY)
-                  }}</label>
-                </div>
-                <div class="form-check">
-                  <input
-                    class="form-check-input"
-                    type="checkbox"
-                    value="no"
-                    v-model="filters.byCurrentStateEmergency"
-                    id="emergencyNo"
-                  />
-                  <label class="form-check-label" for="emergencyNo">{{
-                    trans(CHILL_TICKET_LIST_FILTER_NO_EMERGENCY)
-                  }}</label>
                 </div>
               </div>
             </div>
@@ -135,7 +121,7 @@
             <div class="d-flex gap-3">
               <div class="form-check">
                 <input
-                  v-model="filters.byMyTickets"
+                  v-model="filters.byAddresseeToMe"
                   class="form-check-input"
                   type="checkbox"
                   id="stateMe"
@@ -159,6 +145,7 @@
               id="byCreatedAfter"
               v-model="filters.byCreatedAfter"
               class="form-control"
+              :disabled="filters.byResponseTimeExceeded"
             />
           </div>
           <div class="col-md-6 mb-3">
@@ -205,7 +192,7 @@
 </template>
 
 <script setup lang="ts">
-import { ref, computed, watch, onMounted } from "vue";
+import { ref, computed, watch } from "vue";
 import type { Person } from "ChillPersonAssets/types";
 import type { Motive, TicketFilterParams, TicketFilters } from "../../../types";
 
@@ -221,7 +208,6 @@ import {
   CHILL_TICKET_LIST_FILTER_CLOSED,
   CHILL_TICKET_LIST_FILTER_TO_ME,
   CHILL_TICKET_LIST_FILTER_EMERGENCY,
-  CHILL_TICKET_LIST_FILTER_NO_EMERGENCY,
   CHILL_TICKET_LIST_FILTER_CREATED_AFTER,
   CHILL_TICKET_LIST_FILTER_CREATED_BEFORE,
   CHILL_TICKET_LIST_FILTER_RESPONSE_TIME_EXCEEDED,
@@ -229,11 +215,13 @@ import {
   CHILL_TICKET_LIST_FILTER_RESET,
   CHILL_TICKET_LIST_FILTER_APPLY,
   CHILL_TICKET_LIST_FILTER_RESULT,
+  CHILL_TICKET_LIST_FILTER_CURRENT_STATE,
 } from "translator";
 
 // Components
 import PersonsSelector from "../../TicketApp/components/Person/PersonsSelectorComponent.vue";
 import MotiveSelector from "../../TicketApp/components/Motive/MotiveSelectorComponent.vue";
+import ToggleComponent from "./ToggleComponent.vue";
 
 // Props
 const props = defineProps<{
@@ -249,12 +237,12 @@ const emit = defineEmits<{
 
 // État réactif
 const filters = ref<TicketFilters>({
-  byCurrentState: [],
+  byCurrentState: ["open"],
   byCurrentStateEmergency: [],
   byCreatedAfter: "",
   byCreatedBefore: "",
   byResponseTimeExceeded: false,
-  byMyTickets: false,
+  byAddresseeToMe: false,
 });
 
 // Sélection des personnes
@@ -283,6 +271,27 @@ const selectedMotiveIds = computed(() =>
   selectedMotives.value.map((motive) => motive.id),
 );
 
+// Nouveaux états pour les toggles
+const isClosedToggled = ref(false);
+const isEmergencyToggled = ref(false);
+
+// Méthodes pour gérer les toggles
+const handleStateToggle = (value: boolean) => {
+  if (value) {
+    filters.value.byCurrentState = ["closed"];
+  } else {
+    filters.value.byCurrentState = ["open"];
+  }
+};
+
+const handleEmergencyToggle = (value: boolean) => {
+  if (value) {
+    filters.value.byCurrentStateEmergency = ["yes"];
+  } else {
+    filters.value.byCurrentStateEmergency = ["no"];
+  }
+};
+
 // Méthodes
 const formatDateToISO = (dateString: string): string => {
   if (!dateString) return dateString;
@@ -340,8 +349,8 @@ const applyFilters = (): void => {
   if (filters.value.byResponseTimeExceeded) {
     apiFilters.byResponseTimeExceeded = "true";
   }
-  if (filters.value.byMyTickets) {
-    apiFilters.byMyTickets = true;
+  if (filters.value.byAddresseeToMe) {
+    apiFilters.byAddresseeToMe = true;
   }
 
   emit("filters-changed", apiFilters);
@@ -349,31 +358,28 @@ const applyFilters = (): void => {
 
 const resetFilters = (): void => {
   filters.value = {
-    byCurrentState: [],
+    byCurrentState: ["open"],
     byCurrentStateEmergency: [],
     byCreatedAfter: "",
     byCreatedBefore: "",
     byResponseTimeExceeded: false,
-    byMyTickets: false,
+    byAddresseeToMe: false,
   };
   selectedPersons.value = [];
   selectedMotives.value = [];
   selectedMotive.value = undefined;
+  isClosedToggled.value = true;
+  isEmergencyToggled.value = false;
   applyFilters();
 };
 
 const handleResponseTimeExceededChange = (): void => {
   if (filters.value.byResponseTimeExceeded) {
-    filters.value.byCurrentState = [];
     filters.value.byCreatedBefore = "";
+    filters.value.byCreatedAfter = "";
+    isClosedToggled.value = true;
   }
 };
-
-// Charger les données disponibles si nécessaire
-onMounted(() => {
-  // Ici vous pourriez faire des appels API pour charger les personnes et motifs disponibles
-  // si ils ne sont pas fournis en props
-});
 </script>
 
 <style scoped>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketHistoryListComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketHistoryListComponent.vue
index b0b1b4f07..4bb047aac 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketHistoryListComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketHistoryListComponent.vue
@@ -13,6 +13,15 @@
         <div class="d-flex align-items-center fw-bold">
           <i :class="`${actionIcons[history_line.event_type]} me-1`"></i>
           <span>{{ explainSentence(history_line) }}</span>
+          <span
+            v-if="
+              history_line.event_type === 'add_comment' &&
+              history_line.data.deleted
+            "
+            class="badge bg-danger ms-2"
+          >
+            {{ trans(CHILL_TICKET_TICKET_HISTORY_DELETED) }}
+          </span>
           <state-component
             :new_state="history_line.data.new_state"
             v-if="history_line.event_type == 'state_change'"
@@ -24,9 +33,7 @@
         </div>
         <div>
           <span class="badge-user">
-            <user-render-box-badge
-              :user="history_line.by"
-            ></user-render-box-badge>
+            <user-render-box-badge :user="history_line.by" />
           </span>
           <span class="fst-italic mx-2">
             {{ formatDate(history_line.at) }}
@@ -60,7 +67,10 @@
       />
       <comment-component
         :commentHistory="history_line.data"
-        v-else-if="history_line.event_type == 'add_comment'"
+        v-else-if="
+          history_line.event_type == 'add_comment' &&
+          canBeDisplayed(history_line.data)
+        "
       />
       <addressee-component
         :addressees="history_line.data.addressees"
@@ -103,6 +113,7 @@ import {
   CHILL_TICKET_TICKET_HISTORY_STATE_CHANGE,
   CHILL_TICKET_TICKET_HISTORY_EMERGENCY_CHANGE,
   CHILL_TICKET_TICKET_HISTORY_SET_CALLER,
+  CHILL_TICKET_TICKET_HISTORY_DELETED,
 } from "translator";
 
 const props = defineProps<{ history?: TicketHistoryLine[] }>();
@@ -110,6 +121,7 @@ const history = props.history ?? [];
 const store = useStore();
 
 const actionIcons = ref(store.getters.getActionIcons);
+const canBeDisplayed = ref(store.getters["canBeDisplayed"]);
 
 function explainSentence(history: TicketHistoryLine): string {
   switch (history.event_type) {
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListComponent.vue
index 3320bc457..a0c3d8da2 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListComponent.vue
@@ -107,9 +107,7 @@ const emit = defineEmits<{
 const store = useStore();
 const selectedTicketId = ref<number | null>(null);
 const showTicketHistoryModal = ref(false);
-const ticketDetails = computed(
-  () => store.getters.getTicketDetails as Ticket | null,
-);
+const ticketDetails = computed(() => store.getters.getTicket as Ticket | null);
 
 function closeHistoryModal() {
   showTicketHistoryModal.value = false;
@@ -117,7 +115,7 @@ function closeHistoryModal() {
 }
 
 async function handleViewTicket(ticketId: number) {
-  await store.dispatch("fetchTicketDetails", ticketId);
+  await store.dispatch("fetchTicket", ticketId);
 
   selectedTicketId.value = ticketId;
   showTicketHistoryModal.value = true;
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListItemComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListItemComponent.vue
index 21ca17dc1..d4cd45daf 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListItemComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListItemComponent.vue
@@ -25,7 +25,6 @@
           </div>
         </div>
         <div class="wh-row">
-          <div class="wh-col">#{{ ticket.id }}</div>
           <div class="wh-col" v-if="ticket.createdAt">
             <span
               v-if="ticket"
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/ToggleComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/ToggleComponent.vue
new file mode 100644
index 000000000..8fc206a2c
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/ToggleComponent.vue
@@ -0,0 +1,156 @@
+<template>
+  <div class="toggle-wrapper">
+    <input
+      :id="inputId"
+      type="checkbox"
+      class="toggle-input"
+      :checked="modelValue"
+      @change="handleChange"
+      :disabled="disabled"
+    />
+    <label
+      :for="inputId"
+      class="toggle-label"
+      :class="[
+        modelValue
+          ? classColor?.on || 'bg-chill-green'
+          : classColor?.off || 'bg-chill-red',
+      ]"
+      :style="{
+        backgroundColor: classColor
+          ? undefined
+          : !modelValue
+            ? colorOff
+            : colorOn,
+        height: '28px',
+        width: toggleWidth + 'px',
+      }"
+    >
+      <span
+        class="toggle-slider"
+        :style="{
+          transform: modelValue ? `translateX(${toggleWidth - 26}px)` : 'none',
+          width: '24px',
+          height: '24px',
+        }"
+      >
+      </span>
+      <span
+        class="toggle-text"
+        :style="{
+          color: 'white',
+          marginLeft: !modelValue ? '28px' : '0',
+          paddingLeft: modelValue ? '6px' : '0',
+        }"
+      >
+        {{ modelValue ? onLabel : offLabel }}
+      </span>
+    </label>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed } from "vue";
+
+interface Props {
+  modelValue: boolean;
+  onLabel?: string;
+  offLabel?: string;
+  disabled?: boolean;
+  id?: string;
+  colorOn?: string;
+  colorOff?: string;
+  classColor?: {
+    on: string;
+    off: string;
+  };
+}
+
+type Emits = (e: "update:modelValue", value: boolean) => void;
+
+const props = withDefaults(defineProps<Props>(), {
+  onLabel: "ON",
+  offLabel: "OFF",
+  disabled: false,
+  id: undefined,
+  colorOn: "#4caf50",
+  colorOff: "#ccc",
+  classColor: () => ({
+    on: "bg-chill-green",
+    off: "bg-chill-red",
+  }),
+});
+
+const emit = defineEmits<Emits>();
+
+const inputId = computed(
+  () => props.id || `toggle-${Math.random().toString(36).substr(2, 9)}`,
+);
+
+// Calcule la largeur du toggle basée sur le label le plus long
+const toggleWidth = computed(() => {
+  const onLength = props.onLabel.length;
+  const offLength = props.offLabel.length;
+  const maxLength = Math.max(onLength, offLength);
+
+  // Largeur minimale: 56px, puis 7px par caractère supplémentaire au-delà de 3 caractères
+  const baseWidth = 56;
+  const extraWidth = Math.max(0, maxLength - 3) * 7;
+
+  return baseWidth + extraWidth;
+});
+
+const handleChange = (event: Event) => {
+  const target = event.target as HTMLInputElement;
+  emit("update:modelValue", target.checked);
+};
+</script>
+
+<style scoped>
+.toggle-wrapper {
+  display: inline-block;
+  position: relative;
+}
+
+.toggle-input {
+  display: none;
+}
+
+.toggle-label {
+  display: block;
+  border-radius: 14px;
+  position: relative;
+  cursor: pointer;
+  transition: background-color 0.3s ease;
+  user-select: none;
+}
+
+.toggle-label:hover {
+  filter: brightness(0.95);
+}
+
+.toggle-input:disabled + .toggle-label {
+  opacity: 0.6;
+  cursor: not-allowed;
+}
+
+.toggle-slider {
+  position: absolute;
+  top: 2px;
+  left: 2px;
+  background-color: white;
+  border-radius: 50%;
+  transition: transform 0.3s ease;
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  box-shadow: 0 2px 4px rgba(0, 0, 0, 0.2);
+}
+
+.toggle-text {
+  font-size: 9px;
+  font-weight: bold;
+  letter-spacing: 0.5px;
+  transition: opacity 0.3s ease;
+}
+</style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/index.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/index.ts
index 328f7362a..b59961d66 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/index.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/index.ts
@@ -1,6 +1,8 @@
 import App from "./App.vue";
 import { createApp } from "vue";
 import { store } from "../TicketApp/store";
+import VueToast from "vue-toast-notification";
+import "vue-toast-notification/dist/theme-sugar.css";
 
 declare global {
   interface Window {
@@ -12,4 +14,4 @@ const _app = createApp({
   template: "<app></app>",
 });
 
-_app.component("app", App).use(store).mount("#ticketList");
+_app.component("app", App).use(store).use(VueToast).mount("#ticketList");
diff --git a/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml b/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
index 2c2285426..bad68a2de 100644
--- a/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
+++ b/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
@@ -1,3 +1,4 @@
+restore: Restaurer
 chill_ticket:
   list:
     title: Tickets
@@ -5,6 +6,7 @@ chill_ticket:
     no_tickets: "Aucun ticket"
     loading_ticket: "Chargement des tickets..."
     loading_ticket_details: "Chargement de l'historique du ticket..."
+    error_loading_ticket: "Erreur lors du chargement des ticket"
     load_more: "Voir plus..."
     addressees: "Attribué à"
     persons: "Usager concernés"
@@ -15,7 +17,7 @@ chill_ticket:
       created_between: Créés entre
       state_change: État actuel
       title: "Filtres des tickets"
-      persons_concerned: "Usager concernés"
+      persons_concerned: "Usagers concernés"
       by_person: "Par personne"
       by_motives: "Par motifs"
       current_state: "État actuel"
@@ -26,13 +28,19 @@ chill_ticket:
       created_after: "Créé après"
       created_before: "Créé avant"
       response_time_exceeded: "Temps de réponse dépassé"
-      response_time_warning: 'Attention : Ce filtre supprime automatiquement les filtres "État actuel" et "Créé avant"'
+      response_time_warning: 'Attention : ce filtre désactive les filtres "par dates" et affiche uniquement les tickets ouverts'
       reset: "Réinitialiser"
       apply: "Appliquer les filtres"
       remove: "Supprimer"
       result: "{count, plural, =0 {Aucun résultat} =1 {resultat} other {resultats}}"
 
   ticket:
+    init_form:
+      title: "Ajouter des informations sur le ticket"
+      submit: "Mettre à jour le ticket"
+      reset: "Réinitialiser"
+      success: "Ticket mis à jour avec succès"
+      error: "Veuillez remplir tous les champs obligatoires"
     history:
       add_comment: "Nouveau commentaire"
       addressees_state: "Attributions"
@@ -42,6 +50,7 @@ chill_ticket:
       create_ticket: "Ticket créé"
       state_change: ""
       emergency_change: ""
+      deleted: "Supprimé"
     previous_tickets: "Précédents tickets"
     actions_toolbar:
       cancel: "Annuler"
@@ -52,6 +61,13 @@ chill_ticket:
       reopen: "Rouvrir"
       reopen_success: "Rouverture du ticket réussie"
       reopen_error: "Erreur lors de la rouverture du ticket"
+    restore_comment:
+      success: "Commentaire restauré"
+    delete_comment:
+      success: "Commentaire supprimé"
+    edit_comment:
+      title: "Éditer le commentaire"
+      success: "Commentaire modifié"
     add_comment:
       title: "Commentaire"
       label: "Ajouter un commentaire"
@@ -78,8 +94,8 @@ chill_ticket:
       success: "Appelants et usagers mis à jour"
       error: "Aucun usager sélectionné"
     banner:
-      person: "{count, plural, =0 {Aucun usager concerné} =1 {Usager concerné} other {Usagers concernés}}"
-      speaker: "{count, plural, =0 {Aucun intervenant} =1 {Attribué à} other {Attribués à}}"
+      person: "{count, plural, =0 {Aucun usager impliqué} =1 {Usager impliqué} other {Usagers impliqués}}"
+      speaker: "{count, plural, =0 {Aucun intervenant} =1 {Intervenant attribué} other {Intervenants attribués}}"
       caller: "{count, plural, =0 {Aucun appelant} =1 {Appelant} other {Appelants}}"
       open: "Ouvert"
       closed: "Fermé"
@@ -87,27 +103,40 @@ chill_ticket:
       and: "et"
       days: >-
         {count, plural,
-            =0    {aucun jour}
-            =1    {1 jour}
-            other {# jours}
+                =0    {aucun jour}
+                =1    {1 jour}
+                other {# jours}
         }
       hours: >-
         {count, plural,
-            =0    {aucune heure}
-            =1    {1 heure}
-            other {# heures}
+                =0    {aucune heure}
+                =1    {1 heure}
+                other {# heures}
         }
       minutes: >-
         {count, plural,
-            =0    {aucune minute}
-            =1    {1 minute}
-            other {# minutes}
+                =0    {aucune minute}
+                =1    {1 minute}
+                other {# minutes}
         }
       seconds: >-
         {count, plural,
-            =0    {aucune seconde}
-            =1    {1 seconde}
-            other {# secondes}
+                =0    {aucune seconde}
+                =1    {1 seconde}
+                other {# secondes}
         }
-      no_motive: "Pas de motif"
+      no_motive: "Aucun motif"
       emergency: "URGENT"
+      emergency_success: "Ticket marqué comme urgent"
+      emergency_error: "Erreur lors de la tentative de marquage du ticket comme urgent"
+      no_emergency_success: "Ticket marqué comme non urgent"
+      no_emergency_error: "Erreur lors de la tentative de marquage du ticket comme non urgent"
+  peloton:
+    loading: "Chargement..."
+    loading_document: "Chargement du document..."
+    error_loading: "Erreur lors du chargement du document."
+    error_not_ready: "Le document n'est pas prêt ou accessible."
+    unsupported_type: "Type de document non supporté pour l'affichage."
+    open_new_tab: "Ouvrir dans un nouvel onglet"
+    iframe_not_supported: "Votre navigateur ne supporte pas les iframes."
+    click_to_open_pdf: "Cliquez ici pour ouvrir le PDF"

From e7c04e34a9a7017cf91ca5eece973d26e4c217ea Mon Sep 17 00:00:00 2001
From: Boris Waaub <boris.waaub@digitalternative.be>
Date: Mon, 1 Sep 2025 13:35:15 +0000
Subject: [PATCH 157/283] =?UTF-8?q?Am=C3=A9liorations=20du=20dernier=20MR?=
 =?UTF-8?q?=20multiple-tasks-from-board-78?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_components/Entity/PersonRenderBox.vue    |  2 +-
 .../components/ActionToolbarComponent.vue     |  8 ++-
 .../TicketApp/components/BannerComponent.vue  |  4 ++
 .../Comment/CommentEditorComponent.vue        | 51 ++++++-------------
 .../components/Motive/MotiveComponent.vue     |  7 +++
 .../Motive/MotiveSelectorComponent.vue        | 47 ++++++++++-------
 .../TicketApp/components/PelotonComponent.vue | 12 ++++-
 7 files changed, 75 insertions(+), 56 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
index 0d9e3ec5f..8995506a9 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -152,7 +152,7 @@
 
                 <template
                   v-if="
-                    this.showResidentialAddresses &&
+                    showResidentialAddresses &&
                     (person.current_residential_addresses || []).length > 0
                   "
                 >
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
index 589066e3d..4c5769266 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
@@ -29,6 +29,7 @@
         <form @submit.prevent="submitAction">
           <comment-editor-component
             v-model="content"
+            @supplementary-text="(value) => (supplementaryText = value)"
             :motive="motive"
             v-if="activeTab === 'add_comment'"
           />
@@ -253,6 +254,7 @@ const returnPath = computed((): string => {
 
 const motive = ref(ticket.value.currentMotive as Motive);
 const content = ref("" as Comment["content"]);
+const supplementaryText = ref("" as string);
 const addressees = ref(ticket.value.currentAddressees as UserGroupOrUser[]);
 const persons = ref(ticket.value.currentPersons as Person[]);
 const caller = ref(ticket.value.caller as Person);
@@ -263,8 +265,12 @@ async function submitAction() {
       if (!content.value) {
         toast.error(trans(CHILL_TICKET_TICKET_ADD_COMMENT_ERROR));
       } else {
-        await store.dispatch("createComment", content.value);
+        await store.dispatch(
+          "createComment",
+          content.value + supplementaryText.value,
+        );
         content.value = "";
+        supplementaryText.value = "";
         activeTab.value = "";
         toast.success(trans(CHILL_TICKET_TICKET_ADD_COMMENT_SUCCESS));
       }
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
index f48e6aec9..981579ad4 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
@@ -5,6 +5,9 @@
         <div class="col-md-6 col-sm-12 ps-md-5 ps-xxl-0">
           <h1>
             {{ getTicketTitle(ticket) }}
+            <peloton-component
+              :stored-objects="ticket.currentMotive?.storedObjects ?? null"
+            />
           </h1>
 
           <h2 v-if="ticket.currentPersons.length">
@@ -96,6 +99,7 @@ import { computed, ref } from "vue";
 import { useToast } from "vue-toast-notification";
 
 // Components
+import PelotonComponent from "./PelotonComponent.vue";
 import AddresseeComponent from "./Addressee/AddresseeComponent.vue";
 import EmergencyToggleComponent from "./Emergency/EmergencyToggleComponent.vue";
 import StateToggleComponent from "./State/StateToggleComponent.vue";
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Comment/CommentEditorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Comment/CommentEditorComponent.vue
index 8579d66fd..f34c19f25 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Comment/CommentEditorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Comment/CommentEditorComponent.vue
@@ -1,18 +1,5 @@
 <template>
   <div class="row">
-    <div class="col-12" v-if="motive">
-      <div class="input-group mb-2">
-        <input
-          type="text"
-          :value="localizeTranslatableString(motive.label)"
-          readonly
-          class="form-control"
-        />
-        <div class="input-group-append">
-          <peloton-component :stored-objects="motive.storedObjects" />
-        </div>
-      </div>
-    </div>
     <div class="col-12">
       <comment-editor v-model="content" />
     </div>
@@ -32,18 +19,7 @@
           type="text"
           v-model="supplementaryCommentsInput[index]"
           class="form-control"
-          @keyup.enter="addSupplementaryComments(index)"
-          @keydown.enter.prevent
         />
-        <div class="input-group-append">
-          <button
-            class="input-group-text btn btn-submit"
-            type="button"
-            @click="addSupplementaryComments(index)"
-          >
-            <i class="fa fa-plus"></i>
-          </button>
-        </div>
       </div>
     </div>
   </div>
@@ -54,13 +30,11 @@ import { reactive, ref, watch } from "vue";
 
 // Components
 import CommentEditor from "ChillMainAssets/vuejs/_components/CommentEditor/CommentEditor.vue";
-import PelotonComponent from "../PelotonComponent.vue";
 
 // Types
 import { Motive } from "../../../../types";
 
 // Utils
-import { localizeTranslatableString } from "../../utils/utils";
 import { StoredObject } from "ChillDocStoreAssets/types";
 
 const props = defineProps<{
@@ -73,19 +47,26 @@ const supplementaryCommentsInput = reactive<string[]>([]);
 const emit = defineEmits<{
   "update:modelValue": [value: string | undefined];
   "show-peloton-modal": [storedObjects: StoredObject[]];
+  "supplementary-text": [value: string];
 }>();
 
 const content = ref(props.modelValue);
 
-function addSupplementaryComments(index: number) {
-  if (supplementaryCommentsInput[index]) {
-    const supplementaryText = `**${props.motive?.supplementaryComments[index].label}**:  ${supplementaryCommentsInput[index]}`;
-    content.value = content.value
-      ? content.value + "\n" + supplementaryText
-      : supplementaryText;
-    supplementaryCommentsInput[index] = "";
-  }
-}
+watch(
+  supplementaryCommentsInput,
+  (value) => {
+    let supplementaryText = " \n\n ";
+    for (const index in value) {
+      if (value[index]) {
+        supplementaryText +=
+          `**${props.motive?.supplementaryComments[index].label}**:  ${value[index]}` +
+          " \n\n ";
+      }
+    }
+    emit("supplementary-text", supplementaryText);
+  },
+  { deep: true },
+);
 
 watch(content, (value) => {
   emit("update:modelValue", value);
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveComponent.vue
index b568b2895..58edb7c19 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveComponent.vue
@@ -1,6 +1,10 @@
 <template>
   <div class="col-12 fw-bolder">
     {{ localizeTranslatableString(motiveHistory.motive.label) }}
+    <peloton-component
+      :stored-objects="motiveHistory.motive.storedObjects ?? null"
+      pelotonBtnClass="float-end"
+    />
   </div>
 </template>
 
@@ -11,6 +15,9 @@ import { MotiveHistory } from "../../../../types";
 //Utils
 import { localizeTranslatableString } from "../../utils/utils";
 
+//Components
+import PelotonComponent from "../PelotonComponent.vue";
+
 defineProps<{ motiveHistory: MotiveHistory }>();
 </script>
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveSelectorComponent.vue
index ffba8041b..cbc428675 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveSelectorComponent.vue
@@ -1,22 +1,28 @@
 <template>
   <div class="row">
     <div class="col-12">
-      <vue-multiselect
-        name="selectMotive"
-        id="selectMotive"
-        label="label"
-        :custom-label="customLabel"
-        track-by="id"
-        open-direction="top"
-        :multiple="false"
-        :searchable="true"
-        :placeholder="trans(CHILL_TICKET_TICKET_SET_MOTIVE_LABEL)"
-        :select-label="trans(MULTISELECT_SELECT_LABEL)"
-        :deselect-label="trans(MULTISELECT_DESELECT_LABEL)"
-        :selected-label="trans(MULTISELECT_SELECTED_LABEL)"
-        :options="motives"
-        v-model="motive"
-      />
+      <div class="input-group mb-2">
+        <vue-multiselect
+          name="selectMotive"
+          id="selectMotive"
+          label="label"
+          :custom-label="customLabel"
+          track-by="id"
+          open-direction="top"
+          :multiple="false"
+          :searchable="true"
+          :placeholder="trans(CHILL_TICKET_TICKET_SET_MOTIVE_LABEL)"
+          :select-label="trans(MULTISELECT_SELECT_LABEL)"
+          :deselect-label="trans(MULTISELECT_DESELECT_LABEL)"
+          :selected-label="trans(MULTISELECT_SELECTED_LABEL)"
+          :options="motives"
+          v-model="motive"
+          class="form-control"
+        />
+        <div class="input-group-append">
+          <peloton-component :stored-objects="motive?.storedObjects ?? null" />
+        </div>
+      </div>
     </div>
   </div>
 </template>
@@ -37,6 +43,9 @@ import {
   MULTISELECT_SELECTED_LABEL,
 } from "translator";
 
+// Component
+import PelotonComponent from "../PelotonComponent.vue";
+
 const props = defineProps<{
   modelValue?: Motive;
   motives: Motive[];
@@ -59,7 +68,7 @@ watch(
 );
 
 function customLabel(motive: Motive) {
-  return motive?.label?.fr ?? trans(CHILL_TICKET_TICKET_SET_MOTIVE_LABEL);
+  return motive?.label?.fr;
 }
 </script>
 
@@ -67,4 +76,8 @@ function customLabel(motive: Motive) {
 #selectMotive {
   margin-bottom: 1.5em;
 }
+// Supprime le padding de .form-control pour ce composant
+.form-control {
+  padding: 0 !important;
+}
 </style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PelotonComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PelotonComponent.vue
index b50682a02..577f054dc 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PelotonComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PelotonComponent.vue
@@ -1,6 +1,6 @@
 <template>
   <button
-    class="input-group-text btn btn-primary"
+    :class="['input-group-text', 'btn', 'btn-primary', pelotonBtnClass]"
     type="button"
     @click="handleClick"
     :disabled="!storedObjects?.length"
@@ -109,7 +109,15 @@ import {
   is_object_ready,
 } from "ChillDocStoreAssets/vuejs/StoredObjectButton/helpers";
 
-const props = defineProps<{ storedObjects: StoredObject[] }>();
+const props = withDefaults(
+  defineProps<{
+    storedObjects: StoredObject[] | null;
+    pelotonBtnClass?: string;
+  }>(),
+  {
+    pelotonBtnClass: "",
+  },
+);
 
 const selectedStoredObject = ref<StoredObject | null>(null);
 const documentUrl = ref<string>("");

From 25561cdf639fbca5db60d86ff677f17c37b99ac2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 2 Sep 2025 10:12:47 +0200
Subject: [PATCH 158/283] Add an importer for motives

---
 ...ImportTicketMotiveConfigurationCommand.php |  50 +++++++
 .../ChillTicketBundle/src/Entity/Motive.php   |  10 ++
 .../src/Repository/MotiveRepository.php       |  14 ++
 .../Import/ImportMotivesFromDirectory.php     | 136 ++++++++++++++++++
 .../src/config/services.yaml                  |   3 +
 .../Import/ImportMotivesFromDirectoryTest.php |  95 ++++++++++++
 6 files changed, 308 insertions(+)
 create mode 100644 src/Bundle/ChillTicketBundle/src/Command/ImportTicketMotiveConfigurationCommand.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Service/Import/ImportMotivesFromDirectory.php
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Service/Import/ImportMotivesFromDirectoryTest.php

diff --git a/src/Bundle/ChillTicketBundle/src/Command/ImportTicketMotiveConfigurationCommand.php b/src/Bundle/ChillTicketBundle/src/Command/ImportTicketMotiveConfigurationCommand.php
new file mode 100644
index 000000000..02808960e
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Command/ImportTicketMotiveConfigurationCommand.php
@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Command;
+
+use Chill\TicketBundle\Service\Import\ImportMotivesFromDirectory;
+use Symfony\Component\Console\Attribute\AsCommand;
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+
+#[AsCommand(name: 'chill:ticket:import_ticket_motive_configuration', description: 'Import ticket motives from a directory configuration.')]
+class ImportTicketMotiveConfigurationCommand extends Command
+{
+    protected static $defaultName = 'chill:ticket:import_ticket_motive_configuration';
+
+    public function __construct(private readonly ImportMotivesFromDirectory $importMotivesFromDirectory)
+    {
+        parent::__construct();
+    }
+
+    protected function configure(): void
+    {
+        $this
+            ->setDescription('Import ticket motives from a directory containing motives.yaml and referenced files')
+            ->addArgument('directory', InputArgument::REQUIRED, 'The directory path containing motives.yaml')
+            ->addArgument('lang', InputArgument::REQUIRED, 'The language key to use for matching labels (e.g., fr)');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $directory = (string) $input->getArgument('directory');
+        $lang = (string) $input->getArgument('lang');
+
+        $this->importMotivesFromDirectory->import($directory, $lang);
+
+        $output->writeln('<info>Ticket motives import completed successfully.</info>');
+
+        return Command::SUCCESS;
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Entity/Motive.php b/src/Bundle/ChillTicketBundle/src/Entity/Motive.php
index c2d8cc6c9..380ea3d02 100644
--- a/src/Bundle/ChillTicketBundle/src/Entity/Motive.php
+++ b/src/Bundle/ChillTicketBundle/src/Entity/Motive.php
@@ -132,4 +132,14 @@ class Motive
     {
         $this->supplementaryComments[] = $supplementaryComments;
     }
+
+    public function setSupplementaryComment(array $supplementaryComments): void
+    {
+        foreach ($this->supplementaryComments as $key => $supplementaryComment) {
+            unset($this->supplementaryComments[$key]);
+        }
+        foreach (array_values($supplementaryComments) as $key => $supplementaryComment) {
+            $this->supplementaryComments[$key] = $supplementaryComment;
+        }
+    }
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Repository/MotiveRepository.php b/src/Bundle/ChillTicketBundle/src/Repository/MotiveRepository.php
index 7863305fe..234a7fd70 100644
--- a/src/Bundle/ChillTicketBundle/src/Repository/MotiveRepository.php
+++ b/src/Bundle/ChillTicketBundle/src/Repository/MotiveRepository.php
@@ -38,4 +38,18 @@ class MotiveRepository extends ServiceEntityRepository implements AssociatedEnti
 
         return $query->getQuery()->getOneOrNullResult();
     }
+
+    /**
+     * @return list<Motive>
+     */
+    public function findByLabel(string $label, string $lang): array
+    {
+        $query = $this->createQueryBuilder('m');
+        $query->select('m')
+            ->where($query->expr()->like('JSON_EXTRACT(m.label, :lang)', ':label'))
+            ->setParameter('label', $label)
+            ->setParameter('lang', $lang);
+
+        return $query->getQuery()->getResult();
+    }
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Service/Import/ImportMotivesFromDirectory.php b/src/Bundle/ChillTicketBundle/src/Service/Import/ImportMotivesFromDirectory.php
new file mode 100644
index 000000000..946a25922
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Service/Import/ImportMotivesFromDirectory.php
@@ -0,0 +1,136 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Service\Import;
+
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\DocStoreBundle\Service\StoredObjectManagerInterface;
+use Chill\TicketBundle\Entity\EmergencyStatusEnum;
+use Chill\TicketBundle\Entity\Motive;
+use Chill\TicketBundle\Repository\MotiveRepository;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\Yaml\Yaml;
+
+final readonly class ImportMotivesFromDirectory
+{
+    public function __construct(
+        private EntityManagerInterface $entityManager,
+        private StoredObjectManagerInterface $storedObjectManager,
+        private MotiveRepository $motiveRepository,
+    ) {}
+
+    public function import(string $directory, string $lang): void
+    {
+        $directory = rtrim($directory, DIRECTORY_SEPARATOR);
+        if (!is_dir($directory)) {
+            throw new \InvalidArgumentException(sprintf('The given path "%s" is not a directory.', $directory));
+        }
+
+        $configPath = $directory.DIRECTORY_SEPARATOR.'motives.yaml';
+        if (!is_file($configPath)) {
+            throw new \RuntimeException(sprintf('Missing motives.yaml in directory: %s', $directory));
+        }
+
+        $items = Yaml::parseFile($configPath);
+        if (!\is_array($items)) {
+            throw new \RuntimeException('The motives.yaml must contain a YAML array of items.');
+        }
+
+        foreach ($items as $index => $item) {
+            if (!\is_array($item)) {
+                throw new \RuntimeException(sprintf('Item at index %d is not an object/array.', $index));
+            }
+
+            // label: set as-is (expects an array)
+            if (!array_key_exists('label', $item) || !\is_array($item['label'])) {
+                throw new \RuntimeException(sprintf('Item %d: missing or invalid "label" (expected array).', $index));
+            }
+            $labelArray = $item['label'];
+            $labelForSearch = $labelArray[$lang] ?? null;
+            if (!\is_string($labelForSearch) || '' === trim($labelForSearch)) {
+                throw new \RuntimeException(sprintf('Item %d: missing label for language "%s".', $index, $lang));
+            }
+
+            $existing = $this->motiveRepository->findByLabel($labelForSearch, $lang);
+            if (\count($existing) > 1) {
+                throw new \RuntimeException(sprintf('Item %d: multiple motives found with label "%s" for lang "%s".', $index, $labelForSearch, $lang));
+            }
+            $motive = $existing[0] ?? new Motive();
+
+            $motive->setLabel($labelArray);
+
+            // urgent: if true => YES, if explicitly false => NO, if absent => leave null
+            if (array_key_exists('urgent', $item)) {
+                $urgent = (bool) $item['urgent'];
+                $motive->setMakeTicketEmergency($urgent ? EmergencyStatusEnum::YES : EmergencyStatusEnum::NO);
+            }
+
+            // supplementary informations (support both keys with/without underscore)
+            $suppKey = array_key_exists('supplementary_informations', $item) ? 'supplementary_informations' : (array_key_exists('supplementary informations', $item) ? 'supplementary informations' : null);
+            if ($suppKey && \is_array($item[$suppKey])) {
+                $motive->setSupplementaryComment(array_map(fn (array $supplementaryDefinition) => ['label' => $supplementaryDefinition['label'][$lang]], $item[$suppKey]));
+            }
+
+            // stored objects
+            $storedKey = array_key_exists('stored_objects', $item) ? 'stored_objects' : (array_key_exists('stored object', $item) ? 'stored object' : null);
+            if ($storedKey && \is_array($item[$storedKey])) {
+                foreach ($item[$storedKey] as $docIndex => $doc) {
+                    if (!\is_array($doc)) {
+                        throw new \RuntimeException(sprintf('Item %d, stored object %d: invalid entry.', $index, $docIndex));
+                    }
+                    $label = $doc['label'][$lang] ?? ($doc['label'] ?? null);
+                    $filename = $doc['filename'] ?? null;
+                    if (null === $filename || !\is_string($filename)) {
+                        throw new \RuntimeException(sprintf('Item %d, stored object %d: missing filename.', $index, $docIndex));
+                    }
+
+                    $fullPath = $directory.DIRECTORY_SEPARATOR.$filename;
+                    if (!is_file($fullPath)) {
+                        throw new \RuntimeException(sprintf('Referenced file not found: %s', $fullPath));
+                    }
+
+                    $storedObject = new StoredObject();
+                    if (\is_string($label)) {
+                        $storedObject->setTitle($label);
+                    } elseif (\is_array($label) && isset($label['fr']) && \is_string($label['fr'])) {
+                        $storedObject->setTitle($label['fr']);
+                    } else {
+                        $storedObject->setTitle(pathinfo($filename, PATHINFO_FILENAME));
+                    }
+
+                    $content = file_get_contents($fullPath);
+                    if (false === $content) {
+                        throw new \RuntimeException(sprintf('Unable to read file: %s', $fullPath));
+                    }
+
+                    $ext = strtolower((string) pathinfo($fullPath, PATHINFO_EXTENSION));
+                    $contentType = match ($ext) {
+                        'pdf' => 'application/pdf',
+                        'png' => 'image/png',
+                        'jpg', 'jpeg' => 'image/jpeg',
+                        'webp' => 'image/webp',
+                        'txt' => 'text/plain',
+                        default => 'application/octet-stream',
+                    };
+
+                    $this->storedObjectManager->write($storedObject, $content, $contentType);
+
+                    $motive->addStoredObject($storedObject);
+                    $this->entityManager->persist($storedObject);
+                }
+            }
+
+            $this->entityManager->persist($motive);
+        }
+
+        $this->entityManager->flush();
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/config/services.yaml b/src/Bundle/ChillTicketBundle/src/config/services.yaml
index fb0945fe6..1089b574e 100644
--- a/src/Bundle/ChillTicketBundle/src/config/services.yaml
+++ b/src/Bundle/ChillTicketBundle/src/config/services.yaml
@@ -9,6 +9,9 @@ services:
     Chill\TicketBundle\Action\Comment\Handler\:
         resource: '../Action/Comment/Handler/'
 
+    Chill\TicketBundle\Command\:
+        resource: '../Command/'
+
     Chill\TicketBundle\Controller\:
         resource: '../Controller/'
         tags:
diff --git a/src/Bundle/ChillTicketBundle/tests/Service/Import/ImportMotivesFromDirectoryTest.php b/src/Bundle/ChillTicketBundle/tests/Service/Import/ImportMotivesFromDirectoryTest.php
new file mode 100644
index 000000000..0553901b0
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Service/Import/ImportMotivesFromDirectoryTest.php
@@ -0,0 +1,95 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Tests\Service\Import;
+
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\DocStoreBundle\Entity\StoredObjectVersion;
+use Chill\DocStoreBundle\Service\StoredObjectManagerInterface;
+use Chill\TicketBundle\Repository\MotiveRepository;
+use Chill\TicketBundle\Service\Import\ImportMotivesFromDirectory;
+use Doctrine\ORM\EntityManagerInterface;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class ImportMotivesFromDirectoryTest extends TestCase
+{
+    use ProphecyTrait;
+
+    public function testImportSmoke(): void
+    {
+        // 1) Prepare temporary directory with a minimal motives.yaml and a small file
+        $tmpBase = sys_get_temp_dir().DIRECTORY_SEPARATOR.'chill_ticket_import_'.bin2hex(random_bytes(6));
+        $this->assertTrue(mkdir($tmpBase, 0777, true));
+
+        $filePath = $tmpBase.DIRECTORY_SEPARATOR.'file.txt';
+        file_put_contents($filePath, 'hello world');
+
+        $yaml = <<<'YAML'
+- label:
+    fr: "Test Motive"
+  urgent: true
+  supplementary_informations:
+    - label:
+        fr: "Some note"
+  stored_objects:
+    - label:
+        fr: "Doc title"
+      filename: "file.txt"
+YAML;
+        file_put_contents($tmpBase.DIRECTORY_SEPARATOR.'motives.yaml', $yaml);
+
+        // 2) Create mocks (Prophecy) for dependencies
+        $emProphecy = $this->prophesize(EntityManagerInterface::class);
+        // persist should be called for StoredObject and Motive at least once
+        $emProphecy->persist(Argument::type(StoredObject::class))->shouldBeCalled();
+        $emProphecy->persist(Argument::that(fn($arg) =>
+            // Motive class is in another namespace; just check it's an object with setLabel method
+            \is_object($arg) && method_exists($arg, 'setLabel')))->shouldBeCalled();
+        $emProphecy->flush()->shouldBeCalled();
+
+        $somMock = $this->createMock(StoredObjectManagerInterface::class);
+        $somMock
+            ->expects($this->once())
+            ->method('write')
+            ->willReturnCallback(function (StoredObject $so, string $content, ?string $contentType) {
+                $this->assertSame('text/plain', $contentType);
+
+                return new StoredObjectVersion($so, 1, [], [], $contentType ?? 'application/octet-stream', 'file.txt');
+            });
+
+        $repoProphecy = $this->prophesize(MotiveRepository::class);
+        $repoProphecy->findByLabel('Test Motive', 'fr')->willReturn([])->shouldBeCalled();
+
+        // 3) Run the importer
+        $importer = new ImportMotivesFromDirectory(
+            $emProphecy->reveal(),
+            $somMock,
+            $repoProphecy->reveal(),
+        );
+
+        $importer->import($tmpBase, 'fr');
+
+        // 4) Cleanup
+        @unlink($filePath);
+        @unlink($tmpBase.DIRECTORY_SEPARATOR.'motives.yaml');
+        @rmdir($tmpBase);
+
+        // If we reached here, it's a successful smoke test
+        $this->assertTrue(true);
+    }
+}

From c5cedb8bd65f1180bdba1091213ba6343c089596 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 5 Sep 2025 18:34:37 +0200
Subject: [PATCH 159/283] fix cs

---
 .../tests/Service/Import/ImportMotivesFromDirectoryTest.php     | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillTicketBundle/tests/Service/Import/ImportMotivesFromDirectoryTest.php b/src/Bundle/ChillTicketBundle/tests/Service/Import/ImportMotivesFromDirectoryTest.php
index 0553901b0..b86d471a8 100644
--- a/src/Bundle/ChillTicketBundle/tests/Service/Import/ImportMotivesFromDirectoryTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Service/Import/ImportMotivesFromDirectoryTest.php
@@ -57,7 +57,7 @@ YAML;
         $emProphecy = $this->prophesize(EntityManagerInterface::class);
         // persist should be called for StoredObject and Motive at least once
         $emProphecy->persist(Argument::type(StoredObject::class))->shouldBeCalled();
-        $emProphecy->persist(Argument::that(fn($arg) =>
+        $emProphecy->persist(Argument::that(fn ($arg) =>
             // Motive class is in another namespace; just check it's an object with setLabel method
             \is_object($arg) && method_exists($arg, 'setLabel')))->shouldBeCalled();
         $emProphecy->flush()->shouldBeCalled();

From fb6b26bfb52d817ab8cde028ef5c052d0bc5927c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 5 Sep 2025 18:37:36 +0200
Subject: [PATCH 160/283] fix type hinting

---
 .../src/Service/Import/ImportMotivesFromDirectory.php       | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Service/Import/ImportMotivesFromDirectory.php b/src/Bundle/ChillTicketBundle/src/Service/Import/ImportMotivesFromDirectory.php
index 946a25922..2bd1178b0 100644
--- a/src/Bundle/ChillTicketBundle/src/Service/Import/ImportMotivesFromDirectory.php
+++ b/src/Bundle/ChillTicketBundle/src/Service/Import/ImportMotivesFromDirectory.php
@@ -75,13 +75,13 @@ final readonly class ImportMotivesFromDirectory
 
             // supplementary informations (support both keys with/without underscore)
             $suppKey = array_key_exists('supplementary_informations', $item) ? 'supplementary_informations' : (array_key_exists('supplementary informations', $item) ? 'supplementary informations' : null);
-            if ($suppKey && \is_array($item[$suppKey])) {
+            if (null !== $suppKey && \is_array($item[$suppKey])) {
                 $motive->setSupplementaryComment(array_map(fn (array $supplementaryDefinition) => ['label' => $supplementaryDefinition['label'][$lang]], $item[$suppKey]));
             }
 
             // stored objects
             $storedKey = array_key_exists('stored_objects', $item) ? 'stored_objects' : (array_key_exists('stored object', $item) ? 'stored object' : null);
-            if ($storedKey && \is_array($item[$storedKey])) {
+            if (null !== $storedKey && \is_array($item[$storedKey])) {
                 foreach ($item[$storedKey] as $docIndex => $doc) {
                     if (!\is_array($doc)) {
                         throw new \RuntimeException(sprintf('Item %d, stored object %d: invalid entry.', $index, $docIndex));
@@ -111,7 +111,7 @@ final readonly class ImportMotivesFromDirectory
                         throw new \RuntimeException(sprintf('Unable to read file: %s', $fullPath));
                     }
 
-                    $ext = strtolower((string) pathinfo($fullPath, PATHINFO_EXTENSION));
+                    $ext = strtolower(pathinfo($fullPath, PATHINFO_EXTENSION));
                     $contentType = match ($ext) {
                         'pdf' => 'application/pdf',
                         'png' => 'image/png',

From cd594cd5808e2feba916293cf5d335625a304a1a Mon Sep 17 00:00:00 2001
From: Boris Waaub <boris.waaub@digitalternative.be>
Date: Mon, 8 Sep 2025 12:19:49 +0000
Subject: [PATCH 161/283] =?UTF-8?q?Am=C3=A9liorations=20li=C3=A9es=20au=20?=
 =?UTF-8?q?board=2078?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Resources/public/vuejs/TicketApp/App.vue  | 14 +++--
 .../components/ActionToolbarComponent.vue     |  8 +--
 .../TicketApp/components/BannerComponent.vue  |  8 +--
 .../components/Comment/CommentComponent.vue   | 54 +++++++++++--------
 .../Comment/CommentEditorComponent.vue        | 37 +++++++------
 .../Emergency/EmergencyComponent.vue          | 20 ++++---
 .../Emergency/EmergencyToggleComponent.vue    |  2 +-
 .../components/State/StateComponent.vue       |  1 -
 .../components/TicketInitFormComponent.vue    | 11 ++--
 .../vuejs/TicketApp/store/modules/comment.ts  |  4 +-
 .../vuejs/TicketApp/store/modules/persons.ts  |  8 ++-
 .../vuejs/TicketApp/store/modules/ticket.ts   | 10 +++-
 .../TicketApp/store/modules/ticket_list.ts    |  9 ++--
 .../components/TicketFilterListComponent.vue  |  4 +-
 .../components/TicketHistoryListComponent.vue | 51 ++++++++++++------
 .../components/TicketListItemComponent.vue    | 10 ++--
 .../TicketList/components/ToggleComponent.vue |  2 +-
 .../src/translations/messages+intl-icu.fr.yml | 32 +++++------
 18 files changed, 159 insertions(+), 126 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
index ed3e489e8..b9d330543 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
@@ -30,6 +30,7 @@
 
     <template #body>
       <ticket-init-form-component
+        :ticket="ticket"
         :motives="motives"
         :suggested-persons="suggestedPersons"
         @submit="handleFormSubmit"
@@ -61,6 +62,7 @@ import {
   CHILL_TICKET_TICKET_INIT_FORM_TITLE,
   CHILL_TICKET_TICKET_INIT_FORM_SUCCESS,
   CHILL_TICKET_TICKET_INIT_FORM_ERROR,
+  CHILL_TICKET_TICKET_INIT_FORM_WARNING,
   CHILL_TICKET_LIST_LOADING_TICKET_DETAILS,
 } from "translator";
 
@@ -81,16 +83,18 @@ async function handleFormSubmit(ticketForm: TicketInitForm) {
   try {
     if (ticketForm.motive) {
       await store.dispatch("createMotive", ticketForm.motive);
+    } else {
+      toast.warning(trans(CHILL_TICKET_TICKET_INIT_FORM_WARNING));
+      return;
     }
     if (ticketForm.content && ticketForm.content.trim() !== "") {
       await store.dispatch("createComment", ticketForm.content);
+    } else {
+      toast.warning(trans(CHILL_TICKET_TICKET_INIT_FORM_WARNING));
+      return;
     }
     await store.dispatch("setPersons", ticketForm.persons);
 
-    // Rafraîchir les données nécessaires
-    await store.dispatch("fetchTicketHistory");
-    await store.dispatch("fetchPreviousTickets");
-
     // Forcer le rafraîchissement des composants
     refreshKey.value++;
 
@@ -114,7 +118,7 @@ onMounted(async () => {
     await store.dispatch("fetchUserGroups");
     await store.dispatch("fetchUsers");
     await store.dispatch("getSuggestedPersons");
-    showTicketInitFormModal.value = store.getters.isNewTicket;
+    showTicketInitFormModal.value = store.getters.isIncompleteTicket;
   } catch (error) {
     toast.error(error as string);
   } finally {
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
index 4c5769266..589066e3d 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
@@ -29,7 +29,6 @@
         <form @submit.prevent="submitAction">
           <comment-editor-component
             v-model="content"
-            @supplementary-text="(value) => (supplementaryText = value)"
             :motive="motive"
             v-if="activeTab === 'add_comment'"
           />
@@ -254,7 +253,6 @@ const returnPath = computed((): string => {
 
 const motive = ref(ticket.value.currentMotive as Motive);
 const content = ref("" as Comment["content"]);
-const supplementaryText = ref("" as string);
 const addressees = ref(ticket.value.currentAddressees as UserGroupOrUser[]);
 const persons = ref(ticket.value.currentPersons as Person[]);
 const caller = ref(ticket.value.caller as Person);
@@ -265,12 +263,8 @@ async function submitAction() {
       if (!content.value) {
         toast.error(trans(CHILL_TICKET_TICKET_ADD_COMMENT_ERROR));
       } else {
-        await store.dispatch(
-          "createComment",
-          content.value + supplementaryText.value,
-        );
+        await store.dispatch("createComment", content.value);
         content.value = "";
-        supplementaryText.value = "";
         activeTab.value = "";
         toast.success(trans(CHILL_TICKET_TICKET_ADD_COMMENT_SUCCESS));
       }
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
index 981579ad4..c874142b2 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
@@ -10,12 +10,8 @@
             />
           </h1>
 
-          <h2 v-if="ticket.currentPersons.length">
-            {{
-              ticket.currentPersons
-                .map((person: Person) => person.text)
-                .join(", ")
-            }}
+          <h2 v-if="ticket.caller">
+            {{ ticket.caller.text }}
           </h2>
         </div>
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Comment/CommentComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Comment/CommentComponent.vue
index da5ca4ccb..215adc58b 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Comment/CommentComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Comment/CommentComponent.vue
@@ -2,13 +2,34 @@
   <div class="col-12">
     <blockquote class="chill-user-quote">
       <button
-        class="btn btn-sm btn-edit float-end"
-        title="Edit"
+        class="btn btn-sm btn-primary float-end"
+        title="Visible"
+        @click="visibleComment"
+        v-if="commentHistory.deleted"
+      >
+        <i class="bi bi-eye"></i>
+      </button>
+      <button
+        class="btn btn-sm bg-chill-red float-end text-white"
+        @click="maskComment"
+        v-else
+      >
+        <i class="bi bi-eye-slash"></i>
+      </button>
+      <button
+        class="btn btn-sm btn-edit mx-2 float-end text-white"
         @click="editCommentModal = true"
         style="top: 0.5rem; right: 0.5rem"
         v-if="canBeEdited && isOpen"
       />
+
       <p v-html="convertMarkdownToHtml(commentHistory.content)"></p>
+      <span
+        v-if="commentHistory.deleted"
+        class="ms-2 d-block text-center fst-italic text-muted"
+      >
+        {{ trans(CHILL_TICKET_TICKET_MASK_COMMENT_HINT) }}
+      </span>
     </blockquote>
   </div>
   <Modal
@@ -26,16 +47,6 @@
       <comment-editor v-model="editedComment" />
     </template>
     <template #footer>
-      <button
-        class="btn btn-primary"
-        @click="restoreComment"
-        v-if="commentHistory.deleted"
-      >
-        {{ trans(RESTORE) }}
-      </button>
-      <button class="btn btn-delete" @click="deleteComment" v-else>
-        {{ trans(DELETE) }}
-      </button>
       <button class="btn btn-save" @click="saveComment">
         {{ trans(SAVE) }}
       </button>
@@ -59,12 +70,11 @@ import Modal from "../../../../../../../../ChillMainBundle/Resources/public/vuej
 import {
   trans,
   SAVE,
-  DELETE,
-  RESTORE,
   CHILL_TICKET_TICKET_EDIT_COMMENT_TITLE,
   CHILL_TICKET_TICKET_EDIT_COMMENT_SUCCESS,
-  CHILL_TICKET_TICKET_DELETE_COMMENT_SUCCESS,
-  CHILL_TICKET_TICKET_RESTORE_COMMENT_SUCCESS,
+  CHILL_TICKET_TICKET_MASK_COMMENT_SUCCESS,
+  CHILL_TICKET_TICKET_MASK_COMMENT_HINT,
+  CHILL_TICKET_TICKET_VISIBLE_COMMENT_SUCCESS,
 } from "translator";
 import { useToast } from "vue-toast-notification";
 
@@ -87,16 +97,16 @@ const saveComment = () => {
   toast.success(trans(CHILL_TICKET_TICKET_EDIT_COMMENT_SUCCESS));
 };
 
-const deleteComment = () => {
-  store.dispatch("deleteComment", props.commentHistory.id);
+const maskComment = () => {
+  store.dispatch("maskComment", props.commentHistory.id);
   editCommentModal.value = false;
-  toast.success(trans(CHILL_TICKET_TICKET_DELETE_COMMENT_SUCCESS));
+  toast.success(trans(CHILL_TICKET_TICKET_MASK_COMMENT_SUCCESS));
 };
 
-const restoreComment = () => {
-  store.dispatch("restoreComment", props.commentHistory.id);
+const visibleComment = () => {
+  store.dispatch("visibleComment", props.commentHistory.id);
   editCommentModal.value = false;
-  toast.success(trans(CHILL_TICKET_TICKET_RESTORE_COMMENT_SUCCESS));
+  toast.success(trans(CHILL_TICKET_TICKET_VISIBLE_COMMENT_SUCCESS));
 };
 
 const preprocess = (markdown: string): string => {
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Comment/CommentEditorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Comment/CommentEditorComponent.vue
index f34c19f25..a3d7f84f3 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Comment/CommentEditorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Comment/CommentEditorComponent.vue
@@ -26,7 +26,7 @@
 </template>
 
 <script setup lang="ts">
-import { reactive, ref, watch } from "vue";
+import { reactive, ref, watch, computed } from "vue";
 
 // Components
 import CommentEditor from "ChillMainAssets/vuejs/_components/CommentEditor/CommentEditor.vue";
@@ -45,31 +45,38 @@ const props = defineProps<{
 const supplementaryCommentsInput = reactive<string[]>([]);
 
 const emit = defineEmits<{
-  "update:modelValue": [value: string | undefined];
+  "update:modelValue": [value: string];
   "show-peloton-modal": [storedObjects: StoredObject[]];
-  "supplementary-text": [value: string];
 }>();
 
 const content = ref(props.modelValue);
 
+const aggregateSupplementaryComments = computed(() => {
+  let supplementaryText = " \n\n ";
+  if (props.motive && props.motive.supplementaryComments) {
+    props.motive.supplementaryComments.forEach(
+      (item: { label: string }, index: number) => {
+        if (supplementaryCommentsInput[index]) {
+          supplementaryText +=
+            `**${item.label}**:  ${supplementaryCommentsInput[index]}` +
+            " \n\n ";
+        }
+      },
+    );
+  }
+  return (content.value || "") + supplementaryText;
+});
+
 watch(
   supplementaryCommentsInput,
-  (value) => {
-    let supplementaryText = " \n\n ";
-    for (const index in value) {
-      if (value[index]) {
-        supplementaryText +=
-          `**${props.motive?.supplementaryComments[index].label}**:  ${value[index]}` +
-          " \n\n ";
-      }
-    }
-    emit("supplementary-text", supplementaryText);
+  () => {
+    emit("update:modelValue", aggregateSupplementaryComments.value);
   },
   { deep: true },
 );
 
-watch(content, (value) => {
-  emit("update:modelValue", value);
+watch(content, () => {
+  emit("update:modelValue", aggregateSupplementaryComments.value);
 });
 </script>
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Emergency/EmergencyComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Emergency/EmergencyComponent.vue
index 3efb42333..6e861a53f 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Emergency/EmergencyComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Emergency/EmergencyComponent.vue
@@ -1,15 +1,13 @@
 <template>
-  <div>
-    <span
-      class="badge rounded-pill me-1 mx-2"
-      :class="{
-        'bg-danger': new_emergency === 'yes',
-        'bg-secondary': new_emergency === 'no',
-      }"
-    >
-      {{ trans(CHILL_TICKET_TICKET_BANNER_EMERGENCY) }}
-    </span>
-  </div>
+  <span
+    class="badge rounded-pill me-1 mx-2"
+    :class="{
+      'bg-warning': new_emergency === 'yes',
+      'bg-secondary': new_emergency === 'no',
+    }"
+  >
+    {{ trans(CHILL_TICKET_TICKET_BANNER_EMERGENCY) }}
+  </span>
 </template>
 <script setup lang="ts">
 import { trans, CHILL_TICKET_TICKET_BANNER_EMERGENCY } from "translator";
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Emergency/EmergencyToggleComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Emergency/EmergencyToggleComponent.vue
index 5bc5b52ea..e41d6a560 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Emergency/EmergencyToggleComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Emergency/EmergencyToggleComponent.vue
@@ -3,7 +3,7 @@
     <button
       class="badge rounded-pill me-1"
       :class="{
-        'bg-chill-red': modelValue,
+        'bg-warning': modelValue,
         'bg-secondary': !modelValue,
         'no-pointer': props.disabled,
       }"
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/State/StateComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/State/StateComponent.vue
index 693c0d06c..773c78d43 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/State/StateComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/State/StateComponent.vue
@@ -25,7 +25,6 @@ import {
   CHILL_TICKET_TICKET_BANNER_OPEN,
   CHILL_TICKET_TICKET_BANNER_CLOSED,
 } from "translator";
-
 const props = defineProps<StateChange>();
 </script>
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketInitFormComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketInitFormComponent.vue
index 1a995010c..19d1c4c2e 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketInitFormComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketInitFormComponent.vue
@@ -76,7 +76,7 @@ import CommentEditorComponent from "./Comment/CommentEditorComponent.vue";
 import PersonsSelectorComponent from "./Person/PersonsSelectorComponent.vue";
 
 // Types
-import { Motive, TicketInitForm } from "../../../types";
+import { Motive, Ticket, TicketInitForm } from "../../../types";
 import { Person } from "ChillPersonAssets/types";
 
 // Translations
@@ -92,7 +92,8 @@ import {
   CHILL_TICKET_TICKET_SET_PERSONS_USER_LABEL,
 } from "translator";
 
-defineProps<{
+const props = defineProps<{
+  ticket: Ticket;
   motives: Motive[];
   suggestedPersons: Person[];
 }>();
@@ -106,9 +107,9 @@ const store = useStore();
 
 const ticketForm = reactive({
   content: "",
-  motive: undefined as Motive | undefined,
-  persons: [] as Person[],
-  caller: null as Person | null,
+  motive: props.ticket.currentMotive as Motive | null,
+  persons: props.ticket.currentPersons as Person[],
+  caller: props.ticket.caller as Person | null,
 } as TicketInitForm);
 
 watch(
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/comment.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/comment.ts
index ab8192df8..8f1ff9dde 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/comment.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/comment.ts
@@ -64,7 +64,7 @@ export const moduleComment: Module<State, RootState> = {
         throw error.name;
       }
     },
-    async deleteComment({ commit }, id: Comment["id"]) {
+    async maskComment({ commit }, id: Comment["id"]) {
       try {
         const result: Comment = await makeFetch(
           "POST",
@@ -77,7 +77,7 @@ export const moduleComment: Module<State, RootState> = {
       }
     },
 
-    async restoreComment({ commit }, id: Comment["id"]) {
+    async visibleComment({ commit }, id: Comment["id"]) {
       try {
         const result: Comment = await makeFetch(
           "POST",
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/persons.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/persons.ts
index 048d3941c..84c92051d 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/persons.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/persons.ts
@@ -4,6 +4,7 @@ import { ApiException } from "../../../../../../../../ChillMainBundle/Resources/
 import { Module } from "vuex";
 import { RootState } from "..";
 import { Ticket } from "../../../../types";
+import { Thirdparty } from "src/Bundle/ChillThirdPartyBundle/Resources/public/types";
 
 export interface State {
   persons: Person[];
@@ -29,7 +30,6 @@ export const modulePersons: Module<State, RootState> = {
         id: person.id,
         type: person.type,
       }));
-      console.log("Setting persons:", personData);
       try {
         const result: Ticket = await makeFetch(
           "POST",
@@ -67,10 +67,14 @@ export const modulePersons: Module<State, RootState> = {
     async getSuggestedPersons({ commit, rootState }) {
       try {
         const ticketId = rootState.ticket.ticket.id;
-        const result: Person[] = await makeFetch(
+        const caller = rootState.ticket.ticket.caller;
+        const result: (Person | Thirdparty)[] = await makeFetch(
           "GET",
           `/api/1.0/ticket/ticket/${ticketId}/suggest-person`,
         );
+        if (caller) {
+          result.push(caller);
+        }
         commit("setPersons", result);
       } catch (e: unknown) {
         const error = e as ApiException;
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
index c90e97913..890890c9d 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
@@ -38,8 +38,11 @@ export const moduleTicket: Module<State, RootState> = {
     isEmergency(state) {
       return state.ticket.emergency == "yes";
     },
-    isNewTicket(state) {
-      return state.ticket.history.length == 3;
+    isIncompleteTicket(state) {
+      return (
+        state.ticket.currentMotive === null ||
+        !state.ticket.history.some((item) => item.event_type == "add_comment")
+      );
     },
     getTicket(state) {
       state.ticket.history = state.ticket.history.sort((a, b) =>
@@ -62,6 +65,9 @@ export const moduleTicket: Module<State, RootState> = {
     getCurrentPersons(state) {
       return state.ticket.currentPersons;
     },
+    getCaller: (state) => {
+      return state.ticket.caller;
+    },
   },
 
   mutations: {
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket_list.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket_list.ts
index 9af30abee..a77df41a3 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket_list.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket_list.ts
@@ -73,14 +73,14 @@ export const moduleTicketList: Module<State, RootState> = {
               ([, value]) =>
                 value !== undefined &&
                 value !== null &&
-                value !== "" &&
-                value.length > 0,
+                (value === true || (value !== "" && value.length > 0)),
             ),
           );
           params = new URLSearchParams(
             filteredParams as Record<string, string>,
           ).toString();
         }
+
         const { results, pagination, count } = (await makeFetch(
           "GET",
           `/api/1.0/ticket/ticket/list/?${params}`,
@@ -99,10 +99,7 @@ export const moduleTicketList: Module<State, RootState> = {
     },
     async fetchConnectedUser({ commit }) {
       try {
-        const user = await makeFetch(
-          "GET",
-          "/api/1.0/main/whoami.json",
-        );
+        const user = await makeFetch("GET", "/api/1.0/main/whoami.json");
         commit("setUser", user);
         return user;
       } catch (error) {
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketFilterListComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketFilterListComponent.vue
index 0c99ab846..d60e620e9 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketFilterListComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketFilterListComponent.vue
@@ -84,7 +84,7 @@
                     :on-label="trans(CHILL_TICKET_LIST_FILTER_EMERGENCY)"
                     :off-label="trans(CHILL_TICKET_LIST_FILTER_EMERGENCY)"
                     :classColor="{
-                      on: 'bg-chill-red',
+                      on: 'bg-warning',
                       off: 'bg-secondary',
                     }"
                     @update:model-value="handleEmergencyToggle"
@@ -288,7 +288,7 @@ const handleEmergencyToggle = (value: boolean) => {
   if (value) {
     filters.value.byCurrentStateEmergency = ["yes"];
   } else {
-    filters.value.byCurrentStateEmergency = ["no"];
+    filters.value.byCurrentStateEmergency = [];
   }
 };
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketHistoryListComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketHistoryListComponent.vue
index 4bb047aac..6220d9a44 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketHistoryListComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketHistoryListComponent.vue
@@ -1,9 +1,7 @@
 <template>
   <div
     class="card my-2 bg-light"
-    v-for="history_line in history.filter(
-      (line) => line.event_type != 'add_person',
-    )"
+    v-for="history_line in filteredHistoryLines"
     :key="history.indexOf(history_line)"
   >
     <div class="card-header">
@@ -20,8 +18,9 @@
             "
             class="badge bg-danger ms-2"
           >
-            {{ trans(CHILL_TICKET_TICKET_HISTORY_DELETED) }}
+            {{ trans(CHILL_TICKET_TICKET_HISTORY_MASK_COMMENT) }}
           </span>
+
           <state-component
             :new_state="history_line.data.new_state"
             v-if="history_line.event_type == 'state_change'"
@@ -41,14 +40,7 @@
         </div>
       </div>
     </div>
-    <div
-      class="card-body row"
-      v-if="
-        !['state_change', 'emergency_change', 'create_ticket'].includes(
-          history_line.event_type,
-        )
-      "
-    >
+    <div class="card-body row" v-if="displayBody(history_line)">
       <person-component
         :entities="history_line.data.persons"
         v-if="history_line.event_type == 'persons_state'"
@@ -80,7 +72,7 @@
   </div>
 </template>
 <script setup lang="ts">
-import { ref } from "vue";
+import { computed, ref } from "vue";
 import { useStore } from "vuex";
 
 // Types
@@ -113,7 +105,7 @@ import {
   CHILL_TICKET_TICKET_HISTORY_STATE_CHANGE,
   CHILL_TICKET_TICKET_HISTORY_EMERGENCY_CHANGE,
   CHILL_TICKET_TICKET_HISTORY_SET_CALLER,
-  CHILL_TICKET_TICKET_HISTORY_DELETED,
+  CHILL_TICKET_TICKET_HISTORY_MASK_COMMENT,
 } from "translator";
 
 const props = defineProps<{ history?: TicketHistoryLine[] }>();
@@ -121,14 +113,22 @@ const history = props.history ?? [];
 const store = useStore();
 
 const actionIcons = ref(store.getters.getActionIcons);
-const canBeDisplayed = ref(store.getters["canBeDisplayed"]);
+const canBeDisplayed = ref(store.getters.canBeDisplayed);
+
+const filteredHistoryLines = computed(() =>
+  history.filter(
+    (line: TicketHistoryLine) => !(line.event_type === "add_person"),
+  ),
+);
 
 function explainSentence(history: TicketHistoryLine): string {
   switch (history.event_type) {
     case "add_comment":
       return trans(CHILL_TICKET_TICKET_HISTORY_ADD_COMMENT);
     case "addressees_state":
-      return trans(CHILL_TICKET_TICKET_HISTORY_ADDRESSEES_STATE);
+      return trans(CHILL_TICKET_TICKET_HISTORY_ADDRESSEES_STATE, {
+        count: history.data.addressees.length,
+      });
     case "persons_state":
       return trans(CHILL_TICKET_TICKET_HISTORY_PERSONS_STATE, {
         count: history.data.persons.length,
@@ -142,12 +142,29 @@ function explainSentence(history: TicketHistoryLine): string {
     case "emergency_change":
       return trans(CHILL_TICKET_TICKET_HISTORY_EMERGENCY_CHANGE);
     case "set_caller":
-      return trans(CHILL_TICKET_TICKET_HISTORY_SET_CALLER);
+      return trans(CHILL_TICKET_TICKET_HISTORY_SET_CALLER, {
+        id: history.data.new_caller?.id ?? "null",
+      });
     default:
       return "";
   }
 }
 
+function displayBody(history_line: TicketHistoryLine): boolean {
+  // Dont display body if no entities or if is change of state, emergency
+  const data = Object.values(history_line.data)[0];
+  if (data == null) {
+    return false;
+  } else if (Array.isArray(data) && data.length === 0) {
+    return false;
+  } else if (
+    ["state_change", "emergency_change"].includes(history_line.event_type)
+  ) {
+    return false;
+  }
+  return true;
+}
+
 function formatDate(d: DateTime): string {
   const date = ISOToDatetime(d.datetime);
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListItemComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListItemComponent.vue
index d4cd45daf..5985615e9 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListItemComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListItemComponent.vue
@@ -14,10 +14,8 @@
           <div class="wh-col">
             <emergency-component
               :new_emergency="ticket.emergency"
-              v-if="ticket.emergency"
+              v-if="ticket.emergency == 'yes'"
             />
-          </div>
-          <div class="wh-col">
             <state-component
               v-if="ticket.currentState"
               :new_state="ticket.currentState"
@@ -40,7 +38,7 @@
 
     <div class="card-body pt-0">
       <div class="wrap-list">
-        <div class="wl-row">
+        <div class="wl-row" v-if="ticket.currentAddressees.length">
           <div class="wl-col title text-end">
             <h3>{{ trans(CHILL_TICKET_LIST_ADDRESSEES) }}</h3>
           </div>
@@ -48,7 +46,7 @@
             <addressee-component :addressees="ticket.currentAddressees" />
           </div>
         </div>
-        <div class="wl-row">
+        <div class="wl-row" v-if="ticket.currentPersons.length">
           <div class="wl-col title text-end">
             <h3>{{ trans(CHILL_TICKET_LIST_PERSONS) }}</h3>
           </div>
@@ -56,7 +54,7 @@
             <person-component :entities="ticket.currentPersons" />
           </div>
         </div>
-        <div class="wl-row">
+        <div class="wl-row" v-if="ticket.caller">
           <div class="wl-col title text-end">
             <h3>{{ trans(CHILL_TICKET_LIST_CALLERS) }}</h3>
           </div>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/ToggleComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/ToggleComponent.vue
index 8fc206a2c..b761a8d05 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/ToggleComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/ToggleComponent.vue
@@ -14,7 +14,7 @@
       :class="[
         modelValue
           ? classColor?.on || 'bg-chill-green'
-          : classColor?.off || 'bg-chill-red',
+          : classColor?.off || 'bg-danger',
       ]"
       :style="{
         backgroundColor: classColor
diff --git a/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml b/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
index bad68a2de..6a4442213 100644
--- a/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
+++ b/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
@@ -22,7 +22,7 @@ chill_ticket:
       by_motives: "Par motifs"
       current_state: "État actuel"
       open: "Ouvert"
-      closed: "Fermé"
+      closed: "Clôturé"
       emergency: "Urgent"
       no_emergency: "Non urgent"
       created_after: "Créé après"
@@ -41,30 +41,32 @@ chill_ticket:
       reset: "Réinitialiser"
       success: "Ticket mis à jour avec succès"
       error: "Veuillez remplir tous les champs obligatoires"
+      warning: "Veuillez remplir au minimum le motif et le commentaire"
     history:
-      add_comment: "Nouveau commentaire"
-      addressees_state: "Attributions"
-      persons_state: "{count, plural, =0 {Aucun usager concerné} =1 {Usager concerné} other {Usagers concernés}}"
-      set_caller: "Appelant"
-      set_motive: "Nouveau motifs"
+      add_comment: "Commentaire ajouté"
+      addressees_state: "{count, plural, =0 {Attributions supprimées} =1 {Attribution ajoutée} other {Attributions ajoutées}}"
+      persons_state: "{count, plural, =0 {Usagers supprimés} =1 {Usager concerné ajouté} other {Usagers concernés ajoutés}}"
+      set_caller: "{id, select, null {Appelant supprimé} other {Appelant ajouté}}"
+      set_motive: "Motif ajouté"
       create_ticket: "Ticket créé"
       state_change: ""
       emergency_change: ""
-      deleted: "Supprimé"
+      mask_comment: "Masqué"
     previous_tickets: "Précédents tickets"
     actions_toolbar:
       cancel: "Annuler"
       save: "Enregistrer"
-      close: "Fermer"
-      close_success: "Ticket fermé"
-      close_error: "Erreur lors de la fermeture du ticket"
+      close: "Clôturer"
+      close_success: "Ticket clôturé"
+      close_error: "Erreur lors de la clotûre du ticket"
       reopen: "Rouvrir"
       reopen_success: "Rouverture du ticket réussie"
       reopen_error: "Erreur lors de la rouverture du ticket"
-    restore_comment:
-      success: "Commentaire restauré"
-    delete_comment:
-      success: "Commentaire supprimé"
+    visible_comment:
+      success: "Commentaire visible"
+    mask_comment:
+      success: "Commentaire masqué"
+      hint: "Ce commentaire est masqué; il n'est visible que par vous."
     edit_comment:
       title: "Éditer le commentaire"
       success: "Commentaire modifié"
@@ -98,7 +100,7 @@ chill_ticket:
       speaker: "{count, plural, =0 {Aucun intervenant} =1 {Intervenant attribué} other {Intervenants attribués}}"
       caller: "{count, plural, =0 {Aucun appelant} =1 {Appelant} other {Appelants}}"
       open: "Ouvert"
-      closed: "Fermé"
+      closed: "Clôturé"
       since: "Depuis {time}"
       and: "et"
       days: >-

From 18f67801c7ff4d8a8f1671327288d84a1a0ea413 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 8 Sep 2025 14:18:02 +0000
Subject: [PATCH 162/283] Fix bugs in api endpoint to filter tickets, and add
 parameters byAddresseeGroup and byCreator

---
 .junie/guidelines.md                          |   8 +-
 .../ChillTicketBundle/chill.api.specs.yaml    |  26 ++-
 .../Controller/TicketListApiController.php    |  31 +++
 .../Repository/TicketACLAwareRepository.php   |  35 ++-
 .../TicketACLAwareRepositoryInterface.php     |   3 +-
 ...tListApiControllerByAddresseeGroupTest.php | 211 ++++++++++++++++++
 ...TicketListApiControllerByAddresseeTest.php |  13 +-
 ...etListApiControllerByAddresseeToMeTest.php |   4 +-
 ...ketListApiControllerByCreatedAfterTest.php |  12 +-
 ...etListApiControllerByCreatedBeforeTest.php |  10 +-
 .../TicketListApiControllerByCreatorTest.php  | 203 +++++++++++++++++
 ...piControllerByResponseTimeExceededTest.php |   7 +-
 ...ApiControllerCurrentStateEmergencyTest.php |   7 +-
 ...icketListApiControllerCurrentStateTest.php |   7 +-
 .../TicketListApiControllerMotivesTest.php    |  13 +-
 .../TicketListApiControllerTest.php           |  13 +-
 .../TicketACLAwareRepositoryTest.php          |  46 ++++
 17 files changed, 611 insertions(+), 38 deletions(-)
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByAddresseeGroupTest.php
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByCreatorTest.php

diff --git a/.junie/guidelines.md b/.junie/guidelines.md
index 97a2be27d..0de3e87ad 100644
--- a/.junie/guidelines.md
+++ b/.junie/guidelines.md
@@ -234,15 +234,9 @@ This must be a decision made by a human, not by an AI. Every AI task must abort
 
 #### Running Tests
 
-The tests are run from the project's root (not from the bundle's root).
+The tests are run from the project's root (not from the bundle's root: so, do not change the directory to any bundle directory before running tests).
 
 ```bash
-# Run all tests
-vendor/bin/phpunit
-
-# Run tests for a specific bundle
-vendor/bin/phpunit --testsuite NameBundle
-
 # Run a specific test file
 vendor/bin/phpunit path/to/TestFile.php
 
diff --git a/src/Bundle/ChillTicketBundle/chill.api.specs.yaml b/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
index 65aec91da..cbd4ab0ce 100644
--- a/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
@@ -137,7 +137,7 @@ paths:
                       type: string
                 - name: byAddressee
                   in: query
-                  description: the id of the addressee to search for. The search is also performed against user groups.
+                  description: "The id of the addressee to search for. The search is also performed against user groups: the api endpoint filter for ticket assigned to the groups of the user given as parameter."
                   required: false
                   style: form
                   explode: false
@@ -154,6 +154,30 @@ paths:
                   allowEmptyValue: true
                   schema:
                       type: string
+                - name: byAddresseeGroup
+                  in: query
+                  description: the id of the addressee users group to search for.
+                  required: false
+                  style: form
+                  explode: false
+                  schema:
+                      type: array
+                      items:
+                          type: integer
+                          format: integer
+                          minimum: 1
+                - name: byCreator
+                  in: query
+                  description: The id of the creator to search for.
+                  required: false
+                  style: form
+                  explode: false
+                  schema:
+                      type: array
+                      items:
+                          type: integer
+                          format: integer
+                          minimum: 1
             responses:
                 200:
                     description: OK
diff --git a/src/Bundle/ChillTicketBundle/src/Controller/TicketListApiController.php b/src/Bundle/ChillTicketBundle/src/Controller/TicketListApiController.php
index a181faf82..74d52ee01 100644
--- a/src/Bundle/ChillTicketBundle/src/Controller/TicketListApiController.php
+++ b/src/Bundle/ChillTicketBundle/src/Controller/TicketListApiController.php
@@ -13,6 +13,7 @@ namespace Chill\TicketBundle\Controller;
 
 use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
 use Chill\MainBundle\Repository\UserRepositoryInterface;
+use Chill\MainBundle\Repository\UserGroupRepositoryInterface;
 use Chill\MainBundle\Serializer\Model\Collection;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
@@ -44,6 +45,7 @@ final readonly class TicketListApiController
         private ClockInterface $clock,
         ParameterBagInterface $parameterBag,
         private UserRepositoryInterface $userRepository,
+        private UserGroupRepositoryInterface $userGroupRepository,
     ) {
         $this->expectedTimeResponseDelay = new \DateInterval($parameterBag->get('chill_ticket')['ticket']['response_time_exceeded_delay']);
     }
@@ -152,6 +154,35 @@ final readonly class TicketListApiController
             }
         }
 
+        if ($request->query->has('byCreator')) {
+            $userIds = explode(',', $request->query->get('byCreator'));
+            foreach ($userIds as $id) {
+                if (!is_numeric($id) || 0 === ((int) $id)) {
+                    throw new BadRequestHttpException('Only numbers are allowed in by creator parameter');
+                }
+
+                $params['byCreator'][] = $user = $this->userRepository->find($id);
+                if (null === $user) {
+                    throw new BadRequestHttpException('User not found');
+                }
+            }
+        }
+
+        if ($request->query->has('byAddresseeGroup')) {
+            $groupIds = explode(',', $request->query->get('byAddresseeGroup'));
+            foreach ($groupIds as $id) {
+                if (!is_numeric($id) || 0 === ((int) $id)) {
+                    throw new BadRequestHttpException('Only numbers are allowed in by addressee group parameter');
+                }
+
+                $group = $this->userGroupRepository->find($id);
+                if (null === $group) {
+                    throw new BadRequestHttpException('User group not found');
+                }
+                $params['byAddresseeGroup'][] = $group;
+            }
+        }
+
         $nb = $this->ticketRepository->countTickets($params);
         $paginator = $this->paginatorFactory->create($nb);
 
diff --git a/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepository.php b/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepository.php
index eb2da9b6e..3167757e6 100644
--- a/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepository.php
+++ b/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepository.php
@@ -104,8 +104,9 @@ final readonly class TicketACLAwareRepository implements TicketACLAwareRepositor
         }
 
         if (array_key_exists('byMotives', $params)) {
+            $byMotives = $qb->expr()->orX();
             foreach ($params['byMotives'] as $motive) {
-                $qb->andWhere(
+                $byMotives->add(
                     $qb->expr()->exists(sprintf(
                         'SELECT 1 FROM %s tp_motive_%d WHERE tp_motive_%d.ticket = t
                     AND tp_motive_%d.motive = :motive_%d AND tp_motive_%d.endDate IS NULL
@@ -120,6 +121,7 @@ final readonly class TicketACLAwareRepository implements TicketACLAwareRepositor
                 );
                 $qb->setParameter(sprintf('motive_%d', $i), $motive);
             }
+            $qb->andWhere($byMotives);
         }
 
         if (array_key_exists('byCreatedAfter', $params)) {
@@ -128,8 +130,13 @@ final readonly class TicketACLAwareRepository implements TicketACLAwareRepositor
         }
 
         if (array_key_exists('byCreatedBefore', $params)) {
-            $qb->andWhere('t.createdAt <= :opening_after');
-            $qb->setParameter('opening_after', $params['byCreatedBefore']);
+            $qb->andWhere('t.createdAt <= :opening_before');
+            $qb->setParameter('opening_before', $params['byCreatedBefore']);
+        }
+
+        if (array_key_exists('byCreator', $params)) {
+            $qb->andWhere('t.createdBy IN (:creators)');
+            $qb->setParameter('creators', $params['byCreator']);
         }
 
         if (array_key_exists('byAddressee', $params)) {
@@ -166,6 +173,28 @@ final readonly class TicketACLAwareRepository implements TicketACLAwareRepositor
             $qb->andWhere($orx);
         }
 
+        if (array_key_exists('byAddresseeGroup', $params)) {
+            $addresseeGroupOr = $qb->expr()->orX();
+            foreach ($params['byAddresseeGroup'] as $addresseeGroup) {
+                $addresseeGroupOr->add(
+                    $qb->expr()->exists(sprintf(
+                        'SELECT 1 FROM %s tp_addressee_%d JOIN tp_addressee_%d.addresseeGroup group_%d WHERE tp_addressee_%d.ticket = t
+                        AND tp_addressee_%d.endDate IS NULL AND tp_addressee_%d.addresseeGroup = :addressee_%d',
+                        AddresseeHistory::class,
+                        ++$i,
+                        $i,
+                        $i,
+                        $i,
+                        $i,
+                        $i,
+                        $i,
+                    ))
+                );
+                $qb->setParameter(sprintf('addressee_%d', $i), $addresseeGroup);
+            }
+            $qb->andWhere($addresseeGroupOr);
+        }
+
         return $qb;
     }
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepositoryInterface.php b/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepositoryInterface.php
index 59527fb73..952c4166c 100644
--- a/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepositoryInterface.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\TicketBundle\Repository;
 
 use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Entity\UserGroup;
 use Chill\PersonBundle\Entity\Person;
 use Chill\TicketBundle\Entity\EmergencyStatusEnum;
 use Chill\TicketBundle\Entity\Motive;
@@ -21,7 +22,7 @@ use Chill\TicketBundle\Entity\Ticket;
 /**
  * Repository to find tickets, taking care of permissions.
  *
- * @phpstan-type TicketACLAwareRepositoryParam array{byPerson?: list<Person>, byCurrentState?: list<StateEnum>, byCurrentStateEmergency?: list<EmergencyStatusEnum>, byMotives?: list<Motive>, byCreatedBefore?: \DateTimeImmutable, byCreatedAfter?: \DateTimeImmutable, byAddressee?: list<User>}
+ * @phpstan-type TicketACLAwareRepositoryParam array{byPerson?: list<Person>, byCurrentState?: list<StateEnum>, byCurrentStateEmergency?: list<EmergencyStatusEnum>, byMotives?: list<Motive>, byCreatedBefore?: \DateTimeImmutable, byCreatedAfter?: \DateTimeImmutable, byAddressee?: list<User>, byAddresseeGroup?: list<UserGroup>, byCreator?: list<User>}
  */
 interface TicketACLAwareRepositoryInterface
 {
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByAddresseeGroupTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByAddresseeGroupTest.php
new file mode 100644
index 000000000..94c1bf705
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByAddresseeGroupTest.php
@@ -0,0 +1,211 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Tests\Controller;
+
+use Chill\MainBundle\Entity\UserGroup;
+use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Repository\UserGroupRepositoryInterface;
+use Chill\MainBundle\Repository\UserRepositoryInterface;
+use Chill\MainBundle\Serializer\Model\Collection;
+use Chill\PersonBundle\Repository\PersonRepository;
+use Chill\TicketBundle\Controller\TicketListApiController;
+use Chill\TicketBundle\Entity\Ticket;
+use Chill\TicketBundle\Repository\MotiveRepository;
+use Chill\TicketBundle\Repository\TicketACLAwareRepositoryInterface;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Component\Clock\MockClock;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\SerializerInterface;
+
+/**
+ * @internal
+ *
+ * @covers \Chill\TicketBundle\Controller\TicketListApiController
+ */
+final class TicketListApiControllerByAddresseeGroupTest extends TestCase
+{
+    use ProphecyTrait;
+
+    public function testListTicketWithSingleByAddresseeGroupFilter(): void
+    {
+        // Mocks
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $group = new UserGroup();
+
+        $groupRepository = $this->prophesize(UserGroupRepositoryInterface::class);
+        $groupRepository->find(10)->willReturn($group);
+
+        $ticketRepository = $this->prophesize(TicketACLAwareRepositoryInterface::class);
+        $tickets = [new Ticket(), new Ticket()];
+        $ticketRepository->countTickets(
+            Argument::that(fn ($params) => isset($params['byAddresseeGroup']) && in_array($group, $params['byAddresseeGroup'], true))
+        )->shouldBeCalled()->willReturn(2);
+        $ticketRepository->findTickets(
+            Argument::that(fn ($params) => isset($params['byAddresseeGroup']) && in_array($group, $params['byAddresseeGroup'], true)),
+            0,
+            10
+        )->shouldBeCalled()->willReturn($tickets);
+
+        $paginator = $this->prophesize(PaginatorInterface::class);
+        $paginator->getCurrentPageFirstItemNumber()->willReturn(0);
+        $paginator->getItemsPerPage()->willReturn(10);
+
+        $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
+        $paginatorFactory->create(2)->willReturn($paginator->reveal());
+
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $serializer->serialize(
+            Argument::that(fn (Collection $collection) => $collection->getItems() === $tickets),
+            'json',
+            ['groups' => 'read:simple']
+        )->willReturn('{"items":[{},{}],"pagination":{}}');
+
+        $personRepository = $this->prophesize(PersonRepository::class);
+        $motiveRepository = $this->prophesize(MotiveRepository::class);
+        $userRepository = $this->prophesize(UserRepositoryInterface::class);
+
+        $controller = new TicketListApiController(
+            $security->reveal(),
+            $ticketRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $serializer->reveal(),
+            $personRepository->reveal(),
+            $motiveRepository->reveal(),
+            new MockClock(),
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
+            $userRepository->reveal(),
+            $groupRepository->reveal(),
+        );
+
+        $request = new Request(query: ['byAddresseeGroup' => '10']);
+
+        $response = $controller->listTicket($request);
+
+        self::assertInstanceOf(JsonResponse::class, $response);
+        self::assertSame('{"items":[{},{}],"pagination":{}}', $response->getContent());
+    }
+
+    public function testListTicketWithMultipleByAddresseeGroupFilter(): void
+    {
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $group1 = new UserGroup();
+        $group2 = new UserGroup();
+
+        $groupRepository = $this->prophesize(UserGroupRepositoryInterface::class);
+        $groupRepository->find(10)->willReturn($group1);
+        $groupRepository->find(20)->willReturn($group2);
+
+        $ticketRepository = $this->prophesize(TicketACLAwareRepositoryInterface::class);
+        $tickets = [new Ticket(), new Ticket()];
+        $ticketRepository->countTickets(
+            Argument::that(fn ($params) => isset($params['byAddresseeGroup'])
+                && in_array($group1, $params['byAddresseeGroup'], true)
+                && in_array($group2, $params['byAddresseeGroup'], true))
+        )->shouldBeCalled()->willReturn(2);
+        $ticketRepository->findTickets(
+            Argument::that(fn ($params) => isset($params['byAddresseeGroup'])
+                && in_array($group1, $params['byAddresseeGroup'], true)
+                && in_array($group2, $params['byAddresseeGroup'], true)),
+            0,
+            10
+        )->shouldBeCalled()->willReturn($tickets);
+
+        $paginator = $this->prophesize(PaginatorInterface::class);
+        $paginator->getCurrentPageFirstItemNumber()->willReturn(0);
+        $paginator->getItemsPerPage()->willReturn(10);
+
+        $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
+        $paginatorFactory->create(2)->willReturn($paginator->reveal());
+
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $serializer->serialize(
+            Argument::that(fn (Collection $collection) => $collection->getItems() === $tickets),
+            'json',
+            ['groups' => 'read:simple']
+        )->willReturn('{"items":[{},{}],"pagination":{}}');
+
+        $personRepository = $this->prophesize(PersonRepository::class);
+        $motiveRepository = $this->prophesize(MotiveRepository::class);
+        $userRepository = $this->prophesize(UserRepositoryInterface::class);
+
+        $controller = new TicketListApiController(
+            $security->reveal(),
+            $ticketRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $serializer->reveal(),
+            $personRepository->reveal(),
+            $motiveRepository->reveal(),
+            new MockClock(),
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
+            $userRepository->reveal(),
+            $groupRepository->reveal(),
+        );
+
+        $request = new Request(query: ['byAddresseeGroup' => '10,20']);
+
+        $response = $controller->listTicket($request);
+
+        self::assertInstanceOf(JsonResponse::class, $response);
+        self::assertSame('{"items":[{},{}],"pagination":{}}', $response->getContent());
+    }
+
+    public function testListTicketWithByAddresseeGroupFilterGroupNotFound(): void
+    {
+        self::expectException(BadRequestHttpException::class);
+        self::expectExceptionMessage('User group not found');
+
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $group1 = new UserGroup();
+
+        $groupRepository = $this->prophesize(UserGroupRepositoryInterface::class);
+        $groupRepository->find(10)->willReturn($group1);
+        $groupRepository->find(20)->willReturn(null); // not found
+
+        $ticketRepository = $this->prophesize(TicketACLAwareRepositoryInterface::class);
+        $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $personRepository = $this->prophesize(PersonRepository::class);
+        $motiveRepository = $this->prophesize(MotiveRepository::class);
+        $userRepository = $this->prophesize(UserRepositoryInterface::class);
+
+        $controller = new TicketListApiController(
+            $security->reveal(),
+            $ticketRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $serializer->reveal(),
+            $personRepository->reveal(),
+            $motiveRepository->reveal(),
+            new MockClock(),
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
+            $userRepository->reveal(),
+            $groupRepository->reveal(),
+        );
+
+        $request = new Request(query: ['byAddresseeGroup' => '10,20']);
+
+        // should throw
+        $controller->listTicket($request);
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByAddresseeTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByAddresseeTest.php
index 0508bdfa6..3a4099fae 100644
--- a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByAddresseeTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByAddresseeTest.php
@@ -15,6 +15,7 @@ use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
 use Chill\MainBundle\Pagination\PaginatorInterface;
 use Chill\MainBundle\Repository\UserRepositoryInterface;
+use Chill\MainBundle\Repository\UserGroupRepositoryInterface;
 use Chill\MainBundle\Serializer\Model\Collection;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\TicketBundle\Controller\TicketListApiController;
@@ -92,7 +93,8 @@ final class TicketListApiControllerByAddresseeTest extends TestCase
             $motiveRepository->reveal(),
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
-            $userRepository->reveal()
+            $userRepository->reveal(),
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
         );
 
         // Create request with byAddressee filter
@@ -165,7 +167,8 @@ final class TicketListApiControllerByAddresseeTest extends TestCase
             $motiveRepository->reveal(),
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
-            $userRepository->reveal()
+            $userRepository->reveal(),
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
         );
 
         // Create request with multiple byAddressee filter
@@ -212,7 +215,8 @@ final class TicketListApiControllerByAddresseeTest extends TestCase
             $motiveRepository->reveal(),
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
-            $userRepository->reveal()
+            $userRepository->reveal(),
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
         );
 
         // Create request with byAddressee filter with non-existent user
@@ -281,7 +285,8 @@ final class TicketListApiControllerByAddresseeTest extends TestCase
             $motiveRepository->reveal(),
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
-            $userRepository->reveal()
+            $userRepository->reveal(),
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
         );
 
         // Create request with both byAddressee and byAddresseeToMe filters
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByAddresseeToMeTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByAddresseeToMeTest.php
index f9d5738e7..ebc984e7e 100644
--- a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByAddresseeToMeTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByAddresseeToMeTest.php
@@ -13,6 +13,7 @@ namespace Chill\TicketBundle\Tests\Controller;
 
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
+use Chill\MainBundle\Repository\UserGroupRepositoryInterface;
 use Chill\MainBundle\Pagination\PaginatorInterface;
 use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Serializer\Model\Collection;
@@ -90,7 +91,8 @@ final class TicketListApiControllerByAddresseeToMeTest extends TestCase
             $motiveRepository->reveal(),
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
-            $userRepository->reveal()
+            $userRepository->reveal(),
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
         );
 
         // Create request with byAddresseeToMe filter
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByCreatedAfterTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByCreatedAfterTest.php
index 72eabd43d..c11de568d 100644
--- a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByCreatedAfterTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByCreatedAfterTest.php
@@ -14,6 +14,7 @@ namespace Chill\TicketBundle\Tests\Controller;
 use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
 use Chill\MainBundle\Pagination\PaginatorInterface;
 use Chill\MainBundle\Repository\UserRepositoryInterface;
+use Chill\MainBundle\Repository\UserGroupRepositoryInterface;
 use Chill\MainBundle\Serializer\Model\Collection;
 use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\TicketBundle\Controller\TicketListApiController;
@@ -50,7 +51,7 @@ final class TicketListApiControllerByCreatedAfterTest extends TestCase
         $tickets = [new Ticket(), new Ticket()];
 
         // The date in RFC3339 format
-        $dateString = '2025-05-15T15:05:00Z';
+        $dateString = '2025-05-15T15:05:00+00:00';
         $date = \DateTimeImmutable::createFromFormat(\DateTimeImmutable::RFC3339, $dateString);
 
         $ticketRepository->countTickets(
@@ -97,7 +98,8 @@ final class TicketListApiControllerByCreatedAfterTest extends TestCase
             $motiveRepository->reveal(),
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
-            $userRepository->reveal()
+            $userRepository->reveal(),
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
         );
 
         // Create request with byCreatedAfter filter in RFC3339 format
@@ -170,7 +172,8 @@ final class TicketListApiControllerByCreatedAfterTest extends TestCase
             $motiveRepository->reveal(),
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
-            $userRepository->reveal()
+            $userRepository->reveal(),
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
         );
 
         // Create request with byCreatedAfter filter in RFC3339_EXTENDED format
@@ -212,7 +215,8 @@ final class TicketListApiControllerByCreatedAfterTest extends TestCase
             $motiveRepository->reveal(),
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
-            $userRepository->reveal()
+            $userRepository->reveal(),
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
         );
 
         // Create request with byCreatedAfter filter in invalid format
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByCreatedBeforeTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByCreatedBeforeTest.php
index 55fa1911d..da0f16e47 100644
--- a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByCreatedBeforeTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByCreatedBeforeTest.php
@@ -13,6 +13,7 @@ namespace Chill\TicketBundle\Tests\Controller;
 
 use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
 use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Repository\UserGroupRepositoryInterface;
 use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Serializer\Model\Collection;
 use Chill\PersonBundle\Repository\PersonRepository;
@@ -97,7 +98,8 @@ final class TicketListApiControllerByCreatedBeforeTest extends TestCase
             $motiveRepository->reveal(),
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
-            $userRepository->reveal()
+            $userRepository->reveal(),
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
         );
 
         // Create request with byCreatedAfter filter in RFC3339 format
@@ -170,7 +172,8 @@ final class TicketListApiControllerByCreatedBeforeTest extends TestCase
             $motiveRepository->reveal(),
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
-            $userRepository->reveal()
+            $userRepository->reveal(),
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
         );
 
         // Create request with byCreatedAfter filter in RFC3339_EXTENDED format
@@ -212,7 +215,8 @@ final class TicketListApiControllerByCreatedBeforeTest extends TestCase
             $motiveRepository->reveal(),
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
-            $userRepository->reveal()
+            $userRepository->reveal(),
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
         );
 
         // Create request with byCreatedAfter filter in invalid format
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByCreatorTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByCreatorTest.php
new file mode 100644
index 000000000..a8828f545
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByCreatorTest.php
@@ -0,0 +1,203 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Tests\Controller;
+
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Repository\UserGroupRepositoryInterface;
+use Chill\MainBundle\Repository\UserRepositoryInterface;
+use Chill\MainBundle\Serializer\Model\Collection;
+use Chill\PersonBundle\Repository\PersonRepository;
+use Chill\TicketBundle\Controller\TicketListApiController;
+use Chill\TicketBundle\Entity\Ticket;
+use Chill\TicketBundle\Repository\MotiveRepository;
+use Chill\TicketBundle\Repository\TicketACLAwareRepositoryInterface;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\SerializerInterface;
+use Symfony\Component\Clock\MockClock;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
+
+/**
+ * @internal
+ *
+ * @covers \Chill\TicketBundle\Controller\TicketListApiController
+ */
+final class TicketListApiControllerByCreatorTest extends TestCase
+{
+    use ProphecyTrait;
+
+    public function testListTicketWithSingleByCreatorFilter(): void
+    {
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $user = new User();
+
+        $userRepository = $this->prophesize(UserRepositoryInterface::class);
+        $userRepository->find(1)->willReturn($user);
+
+        $ticketRepository = $this->prophesize(TicketACLAwareRepositoryInterface::class);
+        $tickets = [new Ticket(), new Ticket()];
+        $ticketRepository->countTickets(
+            Argument::that(fn ($params) => isset($params['byCreator']) && in_array($user, $params['byCreator'], true))
+        )->shouldBeCalled()->willReturn(2);
+        $ticketRepository->findTickets(
+            Argument::that(fn ($params) => isset($params['byCreator']) && in_array($user, $params['byCreator'], true)),
+            0,
+            10
+        )->shouldBeCalled()->willReturn($tickets);
+
+        $paginator = $this->prophesize(PaginatorInterface::class);
+        $paginator->getCurrentPageFirstItemNumber()->willReturn(0);
+        $paginator->getItemsPerPage()->willReturn(10);
+
+        $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
+        $paginatorFactory->create(2)->willReturn($paginator->reveal());
+
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $serializer->serialize(
+            Argument::that(fn (Collection $collection) => $collection->getItems() === $tickets),
+            'json',
+            ['groups' => 'read:simple']
+        )->willReturn('{"items":[{},{}],"pagination":{}}');
+
+        $personRepository = $this->prophesize(PersonRepository::class);
+        $motiveRepository = $this->prophesize(MotiveRepository::class);
+
+        $controller = new TicketListApiController(
+            $security->reveal(),
+            $ticketRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $serializer->reveal(),
+            $personRepository->reveal(),
+            $motiveRepository->reveal(),
+            new MockClock(),
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
+            $userRepository->reveal(),
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
+        );
+
+        $request = new Request(query: ['byCreator' => '1']);
+
+        $response = $controller->listTicket($request);
+
+        $this->assertInstanceOf(JsonResponse::class, $response);
+        $this->assertEquals('{"items":[{},{}],"pagination":{}}', $response->getContent());
+    }
+
+    public function testListTicketWithMultipleByCreatorFilter(): void
+    {
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $user1 = new User();
+        $user2 = new User();
+
+        $userRepository = $this->prophesize(UserRepositoryInterface::class);
+        $userRepository->find(1)->willReturn($user1);
+        $userRepository->find(2)->willReturn($user2);
+
+        $ticketRepository = $this->prophesize(TicketACLAwareRepositoryInterface::class);
+        $tickets = [new Ticket()];
+        $ticketRepository->countTickets(
+            Argument::that(fn ($params) => isset($params['byCreator']) && in_array($user1, $params['byCreator'], true) && in_array($user2, $params['byCreator'], true))
+        )->willReturn(1);
+        $ticketRepository->findTickets(
+            Argument::that(fn ($params) => isset($params['byCreator']) && in_array($user1, $params['byCreator'], true) && in_array($user2, $params['byCreator'], true)),
+            0,
+            10
+        )->willReturn($tickets);
+
+        $paginator = $this->prophesize(PaginatorInterface::class);
+        $paginator->getCurrentPageFirstItemNumber()->willReturn(0);
+        $paginator->getItemsPerPage()->willReturn(10);
+
+        $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
+        $paginatorFactory->create(1)->willReturn($paginator->reveal());
+
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $serializer->serialize(
+            Argument::that(fn (Collection $collection) => $collection->getItems() === $tickets),
+            'json',
+            ['groups' => 'read:simple']
+        )->willReturn('{"items":[{}],"pagination":{}}');
+
+        $personRepository = $this->prophesize(PersonRepository::class);
+        $motiveRepository = $this->prophesize(MotiveRepository::class);
+
+        $controller = new TicketListApiController(
+            $security->reveal(),
+            $ticketRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $serializer->reveal(),
+            $personRepository->reveal(),
+            $motiveRepository->reveal(),
+            new MockClock(),
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
+            $userRepository->reveal(),
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
+        );
+
+        $request = new Request(query: ['byCreator' => '1,2']);
+        $response = $controller->listTicket($request);
+
+        $this->assertInstanceOf(JsonResponse::class, $response);
+        $this->assertEquals('{"items":[{}],"pagination":{}}', $response->getContent());
+    }
+
+    public function testListTicketWithByCreatorFilterUserNotFound(): void
+    {
+        $this->expectException(BadRequestHttpException::class);
+
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $userRepository = $this->prophesize(UserRepositoryInterface::class);
+        $userRepository->find(99)->willReturn(null);
+
+        $ticketRepository = $this->prophesize(TicketACLAwareRepositoryInterface::class);
+
+        $paginator = $this->prophesize(PaginatorInterface::class);
+        $paginator->getCurrentPageFirstItemNumber()->willReturn(0);
+        $paginator->getItemsPerPage()->willReturn(10);
+
+        $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
+        $paginatorFactory->create(0)->willReturn($paginator->reveal());
+
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $personRepository = $this->prophesize(PersonRepository::class);
+        $motiveRepository = $this->prophesize(MotiveRepository::class);
+
+        $controller = new TicketListApiController(
+            $security->reveal(),
+            $ticketRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $serializer->reveal(),
+            $personRepository->reveal(),
+            $motiveRepository->reveal(),
+            new MockClock(),
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
+            $userRepository->reveal(),
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
+        );
+
+        $request = new Request(query: ['byCreator' => '99']);
+        $controller->listTicket($request);
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByResponseTimeExceededTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByResponseTimeExceededTest.php
index 9c5f386e2..54fae993b 100644
--- a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByResponseTimeExceededTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByResponseTimeExceededTest.php
@@ -13,6 +13,7 @@ namespace Chill\TicketBundle\Tests\Controller;
 
 use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
 use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Repository\UserGroupRepositoryInterface;
 use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Serializer\Model\Collection;
 use Chill\PersonBundle\Repository\PersonRepository;
@@ -107,7 +108,8 @@ final class TicketListApiControllerByResponseTimeExceededTest extends TestCase
             $motiveRepository->reveal(),
             $mockClock,
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
-            $userRepository->reveal()
+            $userRepository->reveal(),
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
         );
 
         // Create request with byResponseTimeExceeded parameter only
@@ -191,7 +193,8 @@ final class TicketListApiControllerByResponseTimeExceededTest extends TestCase
             $motiveRepository->reveal(),
             $mockClock,
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
-            $userRepository->reveal()
+            $userRepository->reveal(),
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
         );
 
         // Create request with both byCreatedAfter and byResponseTimeExceeded parameters
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerCurrentStateEmergencyTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerCurrentStateEmergencyTest.php
index 8f39db1ff..ea4636ffe 100644
--- a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerCurrentStateEmergencyTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerCurrentStateEmergencyTest.php
@@ -13,6 +13,7 @@ namespace Chill\TicketBundle\Tests\Controller;
 
 use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
 use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Repository\UserGroupRepositoryInterface;
 use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Serializer\Model\Collection;
 use Chill\PersonBundle\Repository\PersonRepository;
@@ -87,7 +88,8 @@ final class TicketListApiControllerCurrentStateEmergencyTest extends TestCase
             $motiveRepository->reveal(),
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
-            $userRepository->reveal()
+            $userRepository->reveal(),
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
         );
 
         // Create request with emergency filter
@@ -128,7 +130,8 @@ final class TicketListApiControllerCurrentStateEmergencyTest extends TestCase
             $motiveRepository->reveal(),
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
-            $userRepository->reveal()
+            $userRepository->reveal(),
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
         );
 
         // Create request with invalid emergency filter
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerCurrentStateTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerCurrentStateTest.php
index f54258af2..15c8bcf51 100644
--- a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerCurrentStateTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerCurrentStateTest.php
@@ -13,6 +13,7 @@ namespace Chill\TicketBundle\Tests\Controller;
 
 use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
 use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Repository\UserGroupRepositoryInterface;
 use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Serializer\Model\Collection;
 use Chill\PersonBundle\Repository\PersonRepository;
@@ -87,7 +88,8 @@ final class TicketListApiControllerCurrentStateTest extends TestCase
             $motiveRepository->reveal(),
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
-            $userRepository->reveal()
+            $userRepository->reveal(),
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
         );
 
         // Create request with person filter
@@ -128,7 +130,8 @@ final class TicketListApiControllerCurrentStateTest extends TestCase
             $motiveRepository->reveal(),
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
-            $userRepository->reveal()
+            $userRepository->reveal(),
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
         );
 
         // Create request with person filter
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerMotivesTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerMotivesTest.php
index 9369ab7a7..858a352b3 100644
--- a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerMotivesTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerMotivesTest.php
@@ -13,6 +13,7 @@ namespace Chill\TicketBundle\Tests\Controller;
 
 use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
 use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Repository\UserGroupRepositoryInterface;
 use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Serializer\Model\Collection;
 use Chill\PersonBundle\Repository\PersonRepository;
@@ -92,7 +93,8 @@ final class TicketListApiControllerMotivesTest extends TestCase
             $motiveRepository->reveal(),
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
-            $userRepository->reveal()
+            $userRepository->reveal(),
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
         );
 
         // Create request with multiple motives filter
@@ -157,7 +159,8 @@ final class TicketListApiControllerMotivesTest extends TestCase
             $motiveRepository->reveal(),
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
-            $userRepository->reveal()
+            $userRepository->reveal(),
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
         );
 
         // Create request with single motive filter
@@ -200,7 +203,8 @@ final class TicketListApiControllerMotivesTest extends TestCase
             $motiveRepository->reveal(),
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
-            $userRepository->reveal()
+            $userRepository->reveal(),
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
         );
 
         // Create request with non-existent motive
@@ -238,7 +242,8 @@ final class TicketListApiControllerMotivesTest extends TestCase
             $motiveRepository->reveal(),
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
-            $userRepository->reveal()
+            $userRepository->reveal(),
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
         );
 
         // Create request with non-integer motive parameter
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerTest.php
index 76e5e6998..d9b8dd697 100644
--- a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerTest.php
@@ -14,6 +14,7 @@ namespace Chill\TicketBundle\Tests\Controller;
 use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
 use Chill\MainBundle\Pagination\PaginatorInterface;
 use Chill\MainBundle\Repository\UserRepositoryInterface;
+use Chill\MainBundle\Repository\UserGroupRepositoryInterface;
 use Chill\MainBundle\Serializer\Model\Collection;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Repository\PersonRepository;
@@ -81,7 +82,8 @@ final class TicketListApiControllerTest extends TestCase
             $motiveRepository->reveal(),
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
-            $userRepository->reveal()
+            $userRepository->reveal(),
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
         );
 
         // Create request
@@ -142,7 +144,8 @@ final class TicketListApiControllerTest extends TestCase
             $motiveRepository->reveal(),
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
-            $userRepository->reveal()
+            $userRepository->reveal(),
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
         );
 
         // Create request with person filter
@@ -181,7 +184,8 @@ final class TicketListApiControllerTest extends TestCase
             $motiveRepository->reveal(),
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
-            $userRepository->reveal()
+            $userRepository->reveal(),
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
         );
 
         // Create request
@@ -223,7 +227,8 @@ final class TicketListApiControllerTest extends TestCase
             $motiveRepository->reveal(),
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
-            $userRepository->reveal()
+            $userRepository->reveal(),
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
         );
 
         // Create request with person filter
diff --git a/src/Bundle/ChillTicketBundle/tests/Repository/TicketACLAwareRepositoryTest.php b/src/Bundle/ChillTicketBundle/tests/Repository/TicketACLAwareRepositoryTest.php
index ef81f5058..695c5d76d 100644
--- a/src/Bundle/ChillTicketBundle/tests/Repository/TicketACLAwareRepositoryTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Repository/TicketACLAwareRepositoryTest.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\TicketBundle\Tests\Repository;
 
 use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Entity\UserGroup;
 use Chill\PersonBundle\DataFixtures\Helper\RandomPersonHelperTrait;
 use Chill\TicketBundle\Entity\EmergencyStatusEnum;
 use Chill\TicketBundle\Entity\Motive;
@@ -139,4 +140,49 @@ class TicketACLAwareRepositoryTest extends KernelTestCase
 
         self::assertIsArray($actual);
     }
+
+    public function testFindByCreator(): void
+    {
+        $users = $this->entityManager->createQuery('SELECT u FROM '.User::class.' u')
+            ->setMaxResults(2)
+            ->getResult();
+
+        if ([] === $users) {
+            throw new \UnexpectedValueException('No users found');
+        }
+
+        $actual = $this->repository->findTickets(['byCreator' => $users]);
+
+        self::assertIsArray($actual);
+    }
+
+    public function testCountByCreator(): void
+    {
+        $users = $this->entityManager->createQuery('SELECT u FROM '.User::class.' u')
+            ->setMaxResults(2)
+            ->getResult();
+
+        if ([] === $users) {
+            throw new \UnexpectedValueException('No users found');
+        }
+
+        $count = $this->repository->countTickets(['byCreator' => $users]);
+
+        self::assertIsInt($count);
+    }
+
+    public function testFindByAddresseeGroup(): void
+    {
+        $userGroups = $this->entityManager->createQuery('SELECT ug FROM '.UserGroup::class.' ug')
+            ->setMaxResults(2)
+            ->getResult();
+
+        if ([] === $userGroups) {
+            throw new \UnexpectedValueException('No users found');
+        }
+
+        $actual = $this->repository->findTickets(['byCreator' => $userGroups]);
+
+        self::assertIsArray($actual);
+    }
 }

From 711aa8db9b4476ec17142725cf03d9a6cd35f1d1 Mon Sep 17 00:00:00 2001
From: Boris Waaub <boris.waaub@digitalternative.be>
Date: Tue, 9 Sep 2025 08:24:08 +0000
Subject: [PATCH 163/283] =?UTF-8?q?[Frontend]=20Ajouter=20les=20s=C3=A9lec?=
 =?UTF-8?q?teur=20"par=20cr=C3=A9ateur",=20et=20"par=20utilisateur=20assig?=
 =?UTF-8?q?n=C3=A9"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/Resources/public/types.ts             |  3 +
 .../Addressee/AddresseeSelectorComponent.vue  | 16 +++--
 .../Resources/public/vuejs/TicketList/App.vue |  1 +
 .../components/TicketFilterListComponent.vue  | 71 ++++++++++++++++++-
 .../src/translations/messages+intl-icu.fr.yml | 14 ++--
 5 files changed, 94 insertions(+), 11 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
index b024c1a55..331522e05 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
@@ -169,6 +169,9 @@ export interface TicketFilters {
 
 export interface TicketFilterParams {
   byPerson?: number[];
+  byCreator?: number[];
+  byAddressee?: number[];
+  byAddresseeGroup?: number[];
   byCurrentState?: TicketState[];
   byCurrentStateEmergency?: TicketEmergencyState[];
   byMotives?: number[];
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Addressee/AddresseeSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Addressee/AddresseeSelectorComponent.vue
index 2415c5af1..074e3b7c1 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Addressee/AddresseeSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Addressee/AddresseeSelectorComponent.vue
@@ -7,7 +7,7 @@
     :multiple="true"
     :removable-if-set="true"
     :display-picked="true"
-    :label="trans(CHILL_TICKET_TICKET_ADD_ADDRESSEE_USER_LABEL)"
+    :label="label"
     @add-new-entity="addNewEntity"
     @remove-entity="removeEntity"
   />
@@ -28,10 +28,16 @@ import {
   trans,
 } from "translator";
 
-const props = defineProps<{
-  modelValue: Entities[];
-  suggested: Entities[];
-}>();
+const props = withDefaults(
+  defineProps<{
+    modelValue: Entities[];
+    suggested: Entities[];
+    label?: string;
+  }>(),
+  {
+    label: trans(CHILL_TICKET_TICKET_ADD_ADDRESSEE_USER_LABEL),
+  },
+);
 
 const emit = defineEmits<(e: "update:modelValue", value: Entities[]) => void>();
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/App.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/App.vue
index 1f4cfd891..2a886dfd5 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/App.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/App.vue
@@ -101,6 +101,7 @@ onMounted(async () => {
     await store.dispatch("getCurrentUser");
     await store.dispatch("fetchTicketList", filters);
     await store.dispatch("fetchMotives");
+    await store.dispatch("fetchUserGroups");
   } finally {
     isLoading.value = false;
   }
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketFilterListComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketFilterListComponent.vue
index d60e620e9..0b9f055ff 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketFilterListComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketFilterListComponent.vue
@@ -23,6 +23,31 @@
             />
           </div>
 
+          <div class="col-md-6 mb-3">
+            <label class="form-label" for="userSelector">{{
+              trans(CHILL_TICKET_LIST_FILTER_CREATORS)
+            }}</label>
+            <persons-selector
+              v-model="selectedCreator"
+              :suggested="[]"
+              :multiple="true"
+              :types="['user']"
+              id="userSelector"
+              :label="trans(CHILL_TICKET_LIST_FILTER_BY_CREATOR)"
+            />
+          </div>
+
+          <div class="col-md-6 mb-3">
+            <label class="form-label" for="addresseeSelector">{{
+              trans(CHILL_TICKET_LIST_FILTER_ADDRESSEES)
+            }}</label>
+            <addressee-selector-component
+              v-model="selectedAddressees"
+              :suggested="userGroups"
+              :label="trans(CHILL_TICKET_LIST_FILTER_BY_ADDRESSEES)"
+              id="addresseeSelector"
+            />
+          </div>
           <div class="col-md-6">
             <!-- Filtre par motifs -->
             <div class="row">
@@ -193,8 +218,10 @@
 
 <script setup lang="ts">
 import { ref, computed, watch } from "vue";
+import { useStore } from "vuex";
 import type { Person } from "ChillPersonAssets/types";
 import type { Motive, TicketFilterParams, TicketFilters } from "../../../types";
+import { User, UserGroup, UserGroupOrUser } from "ChillMainAssets/types";
 
 // Translation
 import {
@@ -202,6 +229,10 @@ import {
   CHILL_TICKET_LIST_FILTER_TITLE,
   CHILL_TICKET_LIST_FILTER_PERSONS_CONCERNED,
   CHILL_TICKET_LIST_FILTER_BY_PERSON,
+  CHILL_TICKET_LIST_FILTER_CREATORS,
+  CHILL_TICKET_LIST_FILTER_BY_CREATOR,
+  CHILL_TICKET_LIST_FILTER_ADDRESSEES,
+  CHILL_TICKET_LIST_FILTER_BY_ADDRESSEES,
   CHILL_TICKET_LIST_FILTER_BY_MOTIVES,
   CHILL_TICKET_LIST_FILTER_REMOVE,
   CHILL_TICKET_LIST_FILTER_OPEN,
@@ -221,6 +252,7 @@ import {
 // Components
 import PersonsSelector from "../../TicketApp/components/Person/PersonsSelectorComponent.vue";
 import MotiveSelector from "../../TicketApp/components/Motive/MotiveSelectorComponent.vue";
+import AddresseeSelectorComponent from "../../TicketApp/components/Addressee/AddresseeSelectorComponent.vue";
 import ToggleComponent from "./ToggleComponent.vue";
 
 // Props
@@ -235,6 +267,8 @@ const emit = defineEmits<{
   "filters-changed": [filters: TicketFilterParams];
 }>();
 
+const store = useStore();
+
 // État réactif
 const filters = ref<TicketFilters>({
   byCurrentState: ["open"],
@@ -249,6 +283,13 @@ const filters = ref<TicketFilters>({
 const selectedPersons = ref<Person[]>([]);
 const availablePersons = ref<Person[]>(props.availablePersons || []);
 
+// Sélection des utilisateur assigné
+const selectedAddressees = ref<UserGroupOrUser[]>([]);
+const userGroups = computed(() => store.getters.getUserGroups as UserGroup[]);
+
+// Séléction des créateurs
+const selectedCreator = ref<User[]>([]);
+
 // Sélection des motifs
 const selectedMotive = ref<Motive | undefined>();
 const selectedMotives = ref<Motive[]>([]);
@@ -266,6 +307,24 @@ const selectedPersonIds = computed(() =>
   selectedPersons.value.map((person) => person.id),
 );
 
+// Computed pour les IDs des utilisateur ou groupes sélectionnées
+const selectedUserAddresseesIds = computed(() =>
+  selectedAddressees.value
+    .filter((addressee) => addressee.type === "user")
+    .map((addressee) => addressee.id),
+);
+
+const selectedGroupAddresseesIds = computed(() =>
+  selectedAddressees.value
+    .filter((addressee) => addressee.type === "user_group")
+    .map((addressee) => addressee.id),
+);
+
+// Computed pour les IDs des créateurs
+const selectedCreatorIds = computed(() =>
+  selectedCreator.value.map((creator) => creator.id),
+);
+
 // Computed pour les IDs des motifs sélectionnés
 const selectedMotiveIds = computed(() =>
   selectedMotives.value.map((motive) => motive.id),
@@ -325,7 +384,15 @@ const applyFilters = (): void => {
   if (selectedPersonIds.value.length > 0) {
     apiFilters.byPerson = selectedPersonIds.value;
   }
-
+  if (selectedCreatorIds.value.length > 0) {
+    apiFilters.byCreator = selectedCreatorIds.value;
+  }
+  if (selectedUserAddresseesIds.value.length > 0) {
+    apiFilters.byAddressee = selectedUserAddresseesIds.value;
+  }
+  if (selectedGroupAddresseesIds.value.length > 0) {
+    apiFilters.byAddresseeGroup = selectedGroupAddresseesIds.value;
+  }
   if (filters.value.byCurrentState.length > 0) {
     apiFilters.byCurrentState = filters.value.byCurrentState;
   }
@@ -366,6 +433,8 @@ const resetFilters = (): void => {
     byAddresseeToMe: false,
   };
   selectedPersons.value = [];
+  selectedCreator.value = [];
+  selectedAddressees.value = [];
   selectedMotives.value = [];
   selectedMotive.value = undefined;
   isClosedToggled.value = true;
diff --git a/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml b/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
index 6a4442213..95e211534 100644
--- a/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
+++ b/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
@@ -8,17 +8,21 @@ chill_ticket:
     loading_ticket_details: "Chargement de l'historique du ticket..."
     error_loading_ticket: "Erreur lors du chargement des ticket"
     load_more: "Voir plus..."
-    addressees: "Attribué à"
+    addressees: "Destinataires"
     persons: "Usager concernés"
     callers: "Appelants"
     filter:
-      to_me: Tickets qui me sont attribués
+      to_me: Tickets qui me sont destinés
       in_alert: Tickets en alerte (délai de résolution dépassé)
       created_between: Créés entre
       state_change: État actuel
       title: "Filtres des tickets"
       persons_concerned: "Usagers concernés"
       by_person: "Par personne"
+      creators: "Créateurs"
+      by_creator: "Par créateur"
+      addressees: "Par destinataire"
+      by_addressees: "Par destinataire"
       by_motives: "Par motifs"
       current_state: "État actuel"
       open: "Ouvert"
@@ -44,7 +48,7 @@ chill_ticket:
       warning: "Veuillez remplir au minimum le motif et le commentaire"
     history:
       add_comment: "Commentaire ajouté"
-      addressees_state: "{count, plural, =0 {Attributions supprimées} =1 {Attribution ajoutée} other {Attributions ajoutées}}"
+      addressees_state: "{count, plural, =0 {Destinataire supprimé} =1 {Destinataire ajouté} other {Destinataire ajoutés}}"
       persons_state: "{count, plural, =0 {Usagers supprimés} =1 {Usager concerné ajouté} other {Usagers concernés ajoutés}}"
       set_caller: "{id, select, null {Appelant supprimé} other {Appelant ajouté}}"
       set_motive: "Motif ajouté"
@@ -83,7 +87,7 @@ chill_ticket:
       error: "Aucun motif sélectionné"
     add_addressee:
       title: "Attribuer"
-      user_group_label: "Attributer à un groupe"
+      user_group_label: "Attribuer à un groupe"
       user_label: "Attribuer à un ou plusieurs utilisateurs"
       success: "Attribution effectuée"
       error: "Aucun destinataire sélectionné"
@@ -97,7 +101,7 @@ chill_ticket:
       error: "Aucun usager sélectionné"
     banner:
       person: "{count, plural, =0 {Aucun usager impliqué} =1 {Usager impliqué} other {Usagers impliqués}}"
-      speaker: "{count, plural, =0 {Aucun intervenant} =1 {Intervenant attribué} other {Intervenants attribués}}"
+      speaker: "{count, plural, =0 {Aucun destinataire} =1 {Destinataire} other {Destinataires}}"
       caller: "{count, plural, =0 {Aucun appelant} =1 {Appelant} other {Appelants}}"
       open: "Ouvert"
       closed: "Clôturé"

From 8e2e676e3dc5a41c0039eeebeb0996eaedae1157 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 15 Sep 2025 11:11:40 +0200
Subject: [PATCH 164/283] Add ticket filtering "byTicketId"

---
 .../PersonIdentifierApiController.php         |  14 ++
 .../ChillTicketBundle/chill.api.specs.yaml    |  12 ++
 .../Controller/TicketListApiController.php    |   8 +
 .../Repository/TicketACLAwareRepository.php   |   7 +
 .../TicketACLAwareRepositoryInterface.php     |   2 +-
 .../TicketListApiControllerByTicketIdTest.php | 147 ++++++++++++++++++
 .../TicketACLAwareRepositoryTest.php          |   7 +
 7 files changed, 196 insertions(+), 1 deletion(-)
 create mode 100644 src/Bundle/ChillPersonBundle/Controller/PersonIdentifierApiController.php
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByTicketIdTest.php

diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonIdentifierApiController.php b/src/Bundle/ChillPersonBundle/Controller/PersonIdentifierApiController.php
new file mode 100644
index 000000000..200d5c224
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonIdentifierApiController.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\Controller;
+
+final readonly class PersonIdentifierApiController {}
diff --git a/src/Bundle/ChillTicketBundle/chill.api.specs.yaml b/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
index cbd4ab0ce..e2eea460b 100644
--- a/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
@@ -60,6 +60,18 @@ paths:
                 - ticket
             summary: List of tickets
             parameters:
+                - name: byTicketId
+                  in: query
+                  description: >
+                    The id of the ticket.
+
+                    When the id of the ticket is set, the other parameters are ignored.
+                  required: false
+                  style: form
+                  explode: false
+                  schema:
+                      type: integer
+                      minimum: 0
                 - name: byPerson
                   in: query
                   description: the id of the person
diff --git a/src/Bundle/ChillTicketBundle/src/Controller/TicketListApiController.php b/src/Bundle/ChillTicketBundle/src/Controller/TicketListApiController.php
index 74d52ee01..fd1db6e22 100644
--- a/src/Bundle/ChillTicketBundle/src/Controller/TicketListApiController.php
+++ b/src/Bundle/ChillTicketBundle/src/Controller/TicketListApiController.php
@@ -59,6 +59,14 @@ final readonly class TicketListApiController
 
         $params = [];
 
+        if ($request->query->has('byTicketId')) {
+            $params['byTicketId'] = $request->query->getInt('byTicketId', -1);
+
+            if (-1 === $params['byTicketId']) {
+                throw new BadRequestHttpException("The parameter 'byTicketId' is not an integer.");
+            }
+        }
+
         if ($request->query->has('byPerson')) {
             $personIds = explode(',', $request->query->get('byPerson'));
             foreach ($personIds as $id) {
diff --git a/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepository.php b/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepository.php
index 3167757e6..222199666 100644
--- a/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepository.php
+++ b/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepository.php
@@ -53,6 +53,13 @@ final readonly class TicketACLAwareRepository implements TicketACLAwareRepositor
         // counter for all the loops
         $i = 0;
 
+        if (array_key_exists('byTicketId', $params)) {
+            $qb->andWhere($qb->expr()->in('t.id', ':byTicketId'));
+            $qb->setParameter('byTicketId', $params['byTicketId']);
+
+            return $qb;
+        }
+
         if (array_key_exists('byPerson', $params)) {
             $or = $qb->expr()->orX();
 
diff --git a/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepositoryInterface.php b/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepositoryInterface.php
index 952c4166c..646ca3403 100644
--- a/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepositoryInterface.php
@@ -22,7 +22,7 @@ use Chill\TicketBundle\Entity\Ticket;
 /**
  * Repository to find tickets, taking care of permissions.
  *
- * @phpstan-type TicketACLAwareRepositoryParam array{byPerson?: list<Person>, byCurrentState?: list<StateEnum>, byCurrentStateEmergency?: list<EmergencyStatusEnum>, byMotives?: list<Motive>, byCreatedBefore?: \DateTimeImmutable, byCreatedAfter?: \DateTimeImmutable, byAddressee?: list<User>, byAddresseeGroup?: list<UserGroup>, byCreator?: list<User>}
+ * @phpstan-type TicketACLAwareRepositoryParam array{byPerson?: list<Person>, byCurrentState?: list<StateEnum>, byCurrentStateEmergency?: list<EmergencyStatusEnum>, byMotives?: list<Motive>, byCreatedBefore?: \DateTimeImmutable, byCreatedAfter?: \DateTimeImmutable, byAddressee?: list<User>, byAddresseeGroup?: list<UserGroup>, byCreator?: list<User>, byTicketId?: int}
  */
 interface TicketACLAwareRepositoryInterface
 {
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByTicketIdTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByTicketIdTest.php
new file mode 100644
index 000000000..f3fb1c1eb
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByTicketIdTest.php
@@ -0,0 +1,147 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Tests\Controller;
+
+use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Repository\UserGroupRepositoryInterface;
+use Chill\MainBundle\Repository\UserRepositoryInterface;
+use Chill\MainBundle\Serializer\Model\Collection;
+use Chill\PersonBundle\Repository\PersonRepository;
+use Chill\TicketBundle\Controller\TicketListApiController;
+use Chill\TicketBundle\Entity\Ticket;
+use Chill\TicketBundle\Repository\MotiveRepository;
+use Chill\TicketBundle\Repository\TicketACLAwareRepositoryInterface;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Component\Clock\MockClock;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\SerializerInterface;
+
+/**
+ * @internal
+ *
+ * @covers \Chill\TicketBundle\Controller\TicketListApiController
+ */
+final class TicketListApiControllerByTicketIdTest extends TestCase
+{
+    use ProphecyTrait;
+
+    public function testListTicketWithByTicketIdFilter(): void
+    {
+        // Mock dependencies
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $ticketRepository = $this->prophesize(TicketACLAwareRepositoryInterface::class);
+        $tickets = [new Ticket(), new Ticket()];
+        $ticketRepository->countTickets(
+            Argument::that(fn ($params) => isset($params['byTicketId']) && 5 === $params['byTicketId'])
+        )
+            ->shouldBeCalled()
+            ->willReturn(2);
+        $ticketRepository->findTickets(
+            Argument::that(fn ($params) => isset($params['byTicketId']) && 5 === $params['byTicketId']),
+            0,
+            10
+        )->shouldBeCalled()->willReturn($tickets);
+
+        $paginator = $this->prophesize(PaginatorInterface::class);
+        $paginator->getCurrentPageFirstItemNumber()->willReturn(0);
+        $paginator->getItemsPerPage()->willReturn(10);
+
+        $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
+        $paginatorFactory->create(2)->willReturn($paginator->reveal());
+
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $serializer->serialize(
+            Argument::that(fn (Collection $collection) => $collection->getItems() === $tickets),
+            'json',
+            ['groups' => 'read:simple']
+        )->willReturn('{"items":[{},{}],"pagination":{}}');
+
+        $personRepository = $this->prophesize(PersonRepository::class);
+        $motiveRepository = $this->prophesize(MotiveRepository::class);
+
+        // Needed for controller constructor but not used here
+        $userRepository = $this->prophesize(UserRepositoryInterface::class);
+        $userGroupRepository = $this->prophesize(UserGroupRepositoryInterface::class);
+
+        // Create controller
+        $controller = new TicketListApiController(
+            $security->reveal(),
+            $ticketRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $serializer->reveal(),
+            $personRepository->reveal(),
+            $motiveRepository->reveal(),
+            new MockClock(),
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
+            $userRepository->reveal(),
+            $userGroupRepository->reveal()
+        );
+
+        // Create request with byTicketId filter
+        $request = new Request(
+            query: ['byTicketId' => '5']
+        );
+
+        // Call controller method
+        $response = $controller->listTicket($request);
+
+        // Assert response
+        $this->assertInstanceOf(JsonResponse::class, $response);
+        $this->assertEquals('{"items":[{},{}],"pagination":{}}', $response->getContent());
+    }
+
+    public function testListTicketWithInvalidByTicketIdThrows(): void
+    {
+        $this->expectException(BadRequestHttpException::class);
+
+        // Mock dependencies
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $ticketRepository = $this->prophesize(TicketACLAwareRepositoryInterface::class);
+
+        $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $personRepository = $this->prophesize(PersonRepository::class);
+        $motiveRepository = $this->prophesize(MotiveRepository::class);
+        $userRepository = $this->prophesize(UserRepositoryInterface::class);
+        $userGroupRepository = $this->prophesize(UserGroupRepositoryInterface::class);
+
+        $controller = new TicketListApiController(
+            $security->reveal(),
+            $ticketRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $serializer->reveal(),
+            $personRepository->reveal(),
+            $motiveRepository->reveal(),
+            new MockClock(),
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
+            $userRepository->reveal(),
+            $userGroupRepository->reveal()
+        );
+
+        // Use -1 to trigger the controller's validation error
+        $request = new Request(query: ['byTicketId' => '-1']);
+
+        // This should throw BadRequestHttpException
+        $controller->listTicket($request);
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Repository/TicketACLAwareRepositoryTest.php b/src/Bundle/ChillTicketBundle/tests/Repository/TicketACLAwareRepositoryTest.php
index 695c5d76d..3635d3dc3 100644
--- a/src/Bundle/ChillTicketBundle/tests/Repository/TicketACLAwareRepositoryTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Repository/TicketACLAwareRepositoryTest.php
@@ -185,4 +185,11 @@ class TicketACLAwareRepositoryTest extends KernelTestCase
 
         self::assertIsArray($actual);
     }
+
+    public function testFindByTicketid(): void
+    {
+        $actual = $this->repository->findTickets(['byTicketId' => 1]);
+
+        self::assertIsArray($actual);
+    }
 }

From 0ba2cbc1e89b329a172a031fe7d3f1aa5f6a64a7 Mon Sep 17 00:00:00 2001
From: Boris Waaub <boris.waaub@digitalternative.be>
Date: Tue, 16 Sep 2025 11:16:57 +0000
Subject: [PATCH 165/283] Misc: homepage widget with tickets, and improvements
 in ticket list

---
 .../public/page/homepage_widget/index.js      |  15 --
 .../public/page/homepage_widget/index.ts      |   6 +
 .../public/vuejs/HomepageWidget/App.vue       | 154 ++++++-------
 .../HomepageWidget/MyAccompanyingCourses.vue  |  91 ++++----
 .../public/vuejs/HomepageWidget/MyCustoms.vue | 206 +++++++++---------
 .../vuejs/HomepageWidget/MyEvaluations.vue    | 144 +++++++-----
 .../vuejs/HomepageWidget/MyNotifications.vue  | 153 +++++++------
 .../public/vuejs/HomepageWidget/MyTasks.vue   | 120 +++++-----
 .../public/vuejs/HomepageWidget/MyTickets.vue |  58 +++++
 .../vuejs/HomepageWidget/MyWorkflows.vue      |  27 +--
 .../vuejs/HomepageWidget/MyWorkflowsTable.vue |  88 ++++----
 .../public/vuejs/HomepageWidget/MyWorks.vue   |  99 +++++----
 .../vuejs/HomepageWidget/TabCounter.vue       |  20 +-
 .../public/vuejs/HomepageWidget/TabTable.vue  |   7 +-
 .../public/vuejs/HomepageWidget/js/i18n.js    |  89 --------
 .../vuejs/HomepageWidget/store/index.ts       |  55 +++++
 .../store.js => store/modules/homepage.ts}    | 154 +++++++------
 .../public/vuejs/PickEntity/PickEntity.vue    |   5 +-
 .../Entity/SearchUserGroupApiProvider.php     |   6 +-
 .../ChillMainBundle/chill.api.specs.yaml      |   2 +-
 .../ChillMainBundle/chill.webpack.config.js   |   2 +-
 .../translations/messages+intl-icu.fr.yaml    |  58 +++++
 .../Resources/public/types.ts                 |  69 +++++-
 .../src/Resources/public/types.ts             |   2 +
 .../components/Comment/CommentComponent.vue   |  41 ++--
 .../components/Ticket/TicketSelector.vue      |  49 +++++
 .../vuejs/TicketApp/store/modules/comment.ts  |  25 +--
 .../TicketApp/store/modules/ticket_list.ts    |   5 +-
 .../Resources/public/vuejs/TicketList/App.vue |   1 -
 .../DateAndTimeSelectorComponent.vue          |  65 ++++++
 .../components/TicketFilterListComponent.vue  | 184 +++++++++-------
 .../components/TicketHistoryListComponent.vue |  28 +--
 .../src/translations/messages+intl-icu.fr.yml |  10 +-
 33 files changed, 1200 insertions(+), 838 deletions(-)
 delete mode 100644 src/Bundle/ChillMainBundle/Resources/public/page/homepage_widget/index.js
 create mode 100644 src/Bundle/ChillMainBundle/Resources/public/page/homepage_widget/index.ts
 create mode 100644 src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyTickets.vue
 delete mode 100644 src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js
 create mode 100644 src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/store/index.ts
 rename src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/{js/store.js => store/modules/homepage.ts} (63%)
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Ticket/TicketSelector.vue
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/DateAndTimeSelectorComponent.vue

diff --git a/src/Bundle/ChillMainBundle/Resources/public/page/homepage_widget/index.js b/src/Bundle/ChillMainBundle/Resources/public/page/homepage_widget/index.js
deleted file mode 100644
index 7166c08a0..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/page/homepage_widget/index.js
+++ /dev/null
@@ -1,15 +0,0 @@
-import { createApp } from "vue";
-import { _createI18n } from "ChillMainAssets/vuejs/_js/i18n";
-import { appMessages } from "ChillMainAssets/vuejs/HomepageWidget/js/i18n";
-import { store } from "ChillMainAssets/vuejs/HomepageWidget/js/store";
-import App from "ChillMainAssets/vuejs/HomepageWidget/App";
-
-const i18n = _createI18n(appMessages);
-
-const app = createApp({
-  template: `<app></app>`,
-})
-  .use(store)
-  .use(i18n)
-  .component("app", App)
-  .mount("#homepage_widget");
diff --git a/src/Bundle/ChillMainBundle/Resources/public/page/homepage_widget/index.ts b/src/Bundle/ChillMainBundle/Resources/public/page/homepage_widget/index.ts
new file mode 100644
index 000000000..2ac0d85f7
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/page/homepage_widget/index.ts
@@ -0,0 +1,6 @@
+import App from "ChillMainAssets/vuejs/HomepageWidget/App.vue";
+import { createApp } from "vue";
+import { store } from "ChillMainAssets/vuejs/HomepageWidget/store";
+
+const _app = createApp(App);
+_app.use(store).mount("#homepage_widget");
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue
index c550d1c0d..8016266ac 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue
@@ -1,5 +1,5 @@
 <template>
-  <h2>{{ $t("main_title") }}</h2>
+  <h2>{{ trans(MAIN_TITLE) }}</h2>
 
   <ul class="nav nav-tabs">
     <li class="nav-item">
@@ -11,14 +11,24 @@
         <i class="fa fa-dashboard" />
       </a>
     </li>
+    <li class="nav-item">
+      <a
+        class="nav-link"
+        :class="{ active: activeTab === 'MyTickets' }"
+        @click="selectTab('MyTickets')"
+      >
+        {{ trans(MY_TICKETS_TAB) }}
+        <tab-counter :count="ticketListState.value?.count || 0" />
+      </a>
+    </li>
     <li class="nav-item">
       <a
         class="nav-link"
         :class="{ active: activeTab === 'MyNotifications' }"
         @click="selectTab('MyNotifications')"
       >
-        {{ $t("my_notifications.tab") }}
-        <tab-counter :count="state.notifications.count" />
+        {{ trans(MY_NOTIFICATIONS_TAB) }}
+        <tab-counter :count="state.value?.notifications?.count || 0" />
       </a>
     </li>
     <li class="nav-item">
@@ -27,25 +37,17 @@
         :class="{ active: activeTab === 'MyAccompanyingCourses' }"
         @click="selectTab('MyAccompanyingCourses')"
       >
-        {{ $t("my_accompanying_courses.tab") }}
+        {{ trans(MY_ACCOMPANYING_COURSES_TAB) }}
       </a>
     </li>
-    <!-- <li class="nav-item">
-         <a class="nav-link"
-            :class="{'active': activeTab === 'MyWorks'}"
-            @click="selectTab('MyWorks')">
-            {{ $t('my_works.tab') }}
-            <tab-counter :count="state.works.count"></tab-counter>
-         </a>
-      </li> -->
     <li class="nav-item">
       <a
         class="nav-link"
         :class="{ active: activeTab === 'MyEvaluations' }"
         @click="selectTab('MyEvaluations')"
       >
-        {{ $t("my_evaluations.tab") }}
-        <tab-counter :count="state.evaluations.count" />
+        {{ trans(MY_EVALUATIONS_TAB) }}
+        <tab-counter :count="state.value?.evaluations?.count || 0" />
       </a>
     </li>
     <li class="nav-item">
@@ -54,9 +56,12 @@
         :class="{ active: activeTab === 'MyTasks' }"
         @click="selectTab('MyTasks')"
       >
-        {{ $t("my_tasks.tab") }}
+        {{ trans(MY_TASKS_TAB) }}
         <tab-counter
-          :count="state.tasks.warning.count + state.tasks.alert.count"
+          :count="
+            (state.value?.tasks?.warning?.count || 0) +
+            (state.value?.tasks?.alert?.count || 0)
+          "
         />
       </a>
     </li>
@@ -66,19 +71,25 @@
         :class="{ active: activeTab === 'MyWorkflows' }"
         @click="selectTab('MyWorkflows')"
       >
-        {{ $t("my_workflows.tab") }}
-        <tab-counter :count="state.workflows.count + state.workflowsCc.count" />
+        {{ trans(MY_WORKFLOWS_TAB) }}
+        <tab-counter
+          :count="
+            (state.value?.workflows?.count || 0) +
+            (state.value?.workflowsCc?.count || 0)
+          "
+        />
       </a>
     </li>
     <li class="nav-item loading ms-auto py-2" v-if="loading">
       <i
         class="fa fa-circle-o-notch fa-spin fa-lg text-chill-gray"
-        :title="$t('loading')"
+        :title="trans(LOADING)"
       />
     </li>
   </ul>
 
   <div class="my-4">
+    <my-tickets v-if="activeTab == 'MyTickets'" />
     <my-customs v-if="activeTab === 'MyCustoms'" />
     <my-works v-else-if="activeTab === 'MyWorks'" />
     <my-evaluations v-else-if="activeTab === 'MyEvaluations'" />
@@ -91,63 +102,58 @@
   </div>
 </template>
 
-<script>
-import MyCustoms from "./MyCustoms";
-import MyWorks from "./MyWorks";
-import MyEvaluations from "./MyEvaluations";
-import MyTasks from "./MyTasks";
-import MyAccompanyingCourses from "./MyAccompanyingCourses";
-import MyNotifications from "./MyNotifications";
+<script lang="ts" setup>
+import { ref, computed, onMounted } from "vue";
+import { useStore } from "vuex";
+import MyCustoms from "./MyCustoms.vue";
+import MyWorks from "./MyWorks.vue";
+import MyEvaluations from "./MyEvaluations.vue";
+import MyTasks from "./MyTasks.vue";
+import MyAccompanyingCourses from "./MyAccompanyingCourses.vue";
+import MyNotifications from "./MyNotifications.vue";
 import MyWorkflows from "./MyWorkflows.vue";
-import TabCounter from "./TabCounter";
-import { mapState } from "vuex";
+import MyTickets from "./MyTickets.vue";
+import TabCounter from "./TabCounter.vue";
+import {
+  MAIN_TITLE,
+  MY_TICKETS_TAB,
+  MY_EVALUATIONS_TAB,
+  MY_TASKS_TAB,
+  MY_ACCOMPANYING_COURSES_TAB,
+  MY_NOTIFICATIONS_TAB,
+  MY_WORKFLOWS_TAB,
+  LOADING,
+  trans,
+} from "translator";
+const store = useStore();
 
-export default {
-  name: "App",
-  components: {
-    MyCustoms,
-    MyWorks,
-    MyEvaluations,
-    MyTasks,
-    MyWorkflows,
-    MyAccompanyingCourses,
-    MyNotifications,
-    TabCounter,
-  },
-  data() {
-    return {
-      activeTab: "MyCustoms",
-    };
-  },
-  computed: {
-    ...mapState(["loading"]),
-    // just to see all in devtool :
-    ...mapState({
-      state: (state) => state,
-    }),
-  },
-  methods: {
-    selectTab(tab) {
-      if (tab !== "MyCustoms") {
-        this.$store.dispatch("getByTab", { tab: tab });
-      }
-      this.activeTab = tab;
-      console.log(this.activeTab);
-    },
-  },
-  mounted() {
-    for (const m of [
-      "MyNotifications",
-      "MyAccompanyingCourses",
-      // 'MyWorks',
-      "MyEvaluations",
-      "MyTasks",
-      "MyWorkflows",
-    ]) {
-      this.$store.dispatch("getByTab", { tab: m, param: "countOnly=1" });
-    }
-  },
-};
+const activeTab = ref("MyCustoms");
+
+const loading = computed(() => store.state.loading);
+
+const state = computed(() => store.state.homepage);
+const ticketListState = computed(() => store.state.ticketList);
+
+function selectTab(tab: string) {
+  if (tab !== "MyCustoms") {
+    store.dispatch("getByTab", { tab: tab });
+  }
+  activeTab.value = tab;
+}
+
+onMounted(() => {
+  for (const m of [
+    "MyTickets",
+    "MyNotifications",
+    "MyAccompanyingCourses",
+    // 'MyWorks',
+    "MyEvaluations",
+    "MyTasks",
+    "MyWorkflows",
+  ]) {
+    store.dispatch("getByTab", { tab: m, param: "countOnly=1" });
+  }
+});
 </script>
 
 <style scoped>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyAccompanyingCourses.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyAccompanyingCourses.vue
index bd3b5cdf8..863e4784f 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyAccompanyingCourses.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyAccompanyingCourses.vue
@@ -1,35 +1,35 @@
 <template>
   <div class="alert alert-light">
-    {{ $t("my_accompanying_courses.description") }}
+    {{ trans(MY_ACCOMPANYING_COURSES_DESCRIPTION) }}
   </div>
-  <span v-if="noResults" class="chill-no-data-statement">{{
-    $t("no_data")
-  }}</span>
+  <span v-if="noResults" class="chill-no-data-statement">
+    {{ trans(NO_DATA) }}
+  </span>
   <tab-table v-else>
     <template #thead>
       <th scope="col">
-        {{ $t("opening_date") }}
+        {{ trans(OPENING_DATE) }}
       </th>
       <th scope="col">
-        {{ $t("social_issues") }}
+        {{ trans(SOCIAL_ISSUES) }}
       </th>
       <th scope="col">
-        {{ $t("concerned_persons") }}
+        {{ trans(CONCERNED_PERSONS) }}
       </th>
       <th scope="col" />
       <th scope="col" />
     </template>
     <template #tbody>
       <tr v-for="(c, i) in accompanyingCourses.results" :key="`course-${i}`">
-        <td>{{ $d(c.openingDate.datetime, "short") }}</td>
+        <td>{{ $d(new Date(c.openingDate.datetime), "short") }}</td>
         <td>
           <span
-            v-for="(i, index) in c.socialIssues"
+            v-for="(issue, index) in c.socialIssues"
             :key="index"
             class="chill-entity entity-social-issue"
           >
             <span class="badge bg-chill-l-gray text-dark">
-              {{ localizeString(i.title) }}
+              {{ localizeString(issue.title) }}
             </span>
           </span>
         </td>
@@ -46,15 +46,15 @@
         </td>
         <td>
           <span v-if="c.emergency" class="badge rounded-pill bg-danger me-1">{{
-            $t("emergency")
+            trans(EMERGENCY)
           }}</span>
           <span v-if="c.confidential" class="badge rounded-pill bg-danger">{{
-            $t("confidential")
+            trans(CONFIDENTIAL)
           }}</span>
         </td>
         <td>
           <a class="btn btn-sm btn-show" :href="getUrl(c)">
-            {{ $t("show_entity", { entity: $t("the_course") }) }}
+            {{ trans(SHOW_ENTITY, { entity: trans(THE_COURSE) }) }}
           </a>
         </td>
       </tr>
@@ -62,36 +62,45 @@
   </tab-table>
 </template>
 
-<script>
-import { mapState, mapGetters } from "vuex";
-import TabTable from "./TabTable";
-import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly";
+<script lang="ts" setup>
+import { computed, ComputedRef } from "vue";
+import { useStore } from "vuex";
+import TabTable from "./TabTable.vue";
+import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue";
 import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
+import { AccompanyingCourse } from "ChillPersonAssets/types";
+import { PaginationResponse } from "ChillMainAssets/lib/api/apiMethods";
+import {
+  MY_ACCOMPANYING_COURSES_DESCRIPTION,
+  OPENING_DATE,
+  SOCIAL_ISSUES,
+  CONCERNED_PERSONS,
+  SHOW_ENTITY,
+  THE_COURSE,
+  NO_DATA,
+  EMERGENCY,
+  CONFIDENTIAL,
+  trans,
+} from "translator";
+const store = useStore();
 
-export default {
-  name: "MyAccompanyingCourses",
-  components: {
-    TabTable,
-    OnTheFly,
-  },
-  computed: {
-    ...mapState(["accompanyingCourses"]),
-    ...mapGetters(["isAccompanyingCoursesLoaded"]),
-    noResults() {
-      if (!this.isAccompanyingCoursesLoaded) {
-        return false;
-      } else {
-        return this.accompanyingCourses.count === 0;
-      }
-    },
-  },
-  methods: {
-    localizeString,
-    getUrl(c) {
-      return `/fr/parcours/${c.id}`;
-    },
-  },
-};
+const accompanyingCourses: ComputedRef<PaginationResponse<AccompanyingCourse>> =
+  computed(() => store.state.homepage.accompanyingCourses);
+const isAccompanyingCoursesLoaded = computed(
+  () => store.getters.isAccompanyingCoursesLoaded,
+);
+
+const noResults = computed(() => {
+  if (!isAccompanyingCoursesLoaded.value) {
+    return false;
+  } else {
+    return accompanyingCourses.value.count === 0;
+  }
+});
+
+function getUrl(c: { id: number }): string {
+  return `/fr/parcours/${c.id}`;
+}
 </script>
 
 <style scoped>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyCustoms.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyCustoms.vue
index 5b10dc89c..46751a0d2 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyCustoms.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyCustoms.vue
@@ -1,93 +1,72 @@
 <template>
-  <span v-if="noResults" class="chill-no-data-statement">{{
-    $t("no_dashboard")
-  }}</span>
+  <span v-if="noResults" class="chill-no-data-statement">
+    {{ trans(NO_DASHBOARD) }}
+  </span>
   <div v-else id="dashboards" class="container g-3">
     <div class="row">
       <div class="mbloc col-xs-12 col-sm-4">
         <div class="custom1">
           <ul class="list-unstyled">
-            <li v-if="counter.notifications > 0">
-              <i18n-t
-                keypath="counter.unread_notifications"
-                tag="span"
-                :class="counterClass"
-                :plural="counter.notifications"
-              >
-                <template #n>
-                  <span>{{ counter.notifications }}</span>
-                </template>
-              </i18n-t>
+            <li v-if="(counter.value?.notifications || 0) > 0">
+              <span :class="counterClass">
+                {{
+                  trans(COUNTER_UNREAD_NOTIFICATIONS, {
+                    n: counter.value?.notifications || 0,
+                  })
+                }}
+              </span>
             </li>
-            <li v-if="counter.accompanyingCourses > 0">
-              <i18n-t
-                keypath="counter.assignated_courses"
-                tag="span"
-                :class="counterClass"
-                :plural="counter.accompanyingCourses"
-              >
-                <template #n>
-                  <span>{{ counter.accompanyingCourses }}</span>
-                </template>
-              </i18n-t>
+            <li v-if="(counter.value?.accompanyingCourses || 0) > 0">
+              <span :class="counterClass">
+                {{
+                  trans(COUNTER_ASSIGNATED_COURSES, {
+                    n: counter.value?.accompanyingCourses || 0,
+                  })
+                }}
+              </span>
             </li>
-            <li v-if="counter.works > 0">
-              <i18n-t
-                keypath="counter.assignated_actions"
-                tag="span"
-                :class="counterClass"
-                :plural="counter.works"
-              >
-                <template #n>
-                  <span>{{ counter.works }}</span>
-                </template>
-              </i18n-t>
+            <li v-if="(counter.value?.works || 0) > 0">
+              <span :class="counterClass">
+                {{
+                  trans(COUNTER_ASSIGNATED_ACTIONS, {
+                    n: counter.value?.works || 0,
+                  })
+                }}
+              </span>
             </li>
-            <li v-if="counter.evaluations > 0">
-              <i18n-t
-                keypath="counter.assignated_evaluations"
-                tag="span"
-                :class="counterClass"
-                :plural="counter.evaluations"
-              >
-                <template #n>
-                  <span>{{ counter.evaluations }}</span>
-                </template>
-              </i18n-t>
+            <li v-if="(counter.value?.evaluations || 0) > 0">
+              <span :class="counterClass">
+                {{
+                  trans(COUNTER_ASSIGNATED_EVALUATIONS, {
+                    n: counter.value?.evaluations || 0,
+                  })
+                }}
+              </span>
             </li>
-            <li v-if="counter.tasksAlert > 0">
-              <i18n-t
-                keypath="counter.alert_tasks"
-                tag="span"
-                :class="counterClass"
-                :plural="counter.tasksAlert"
-              >
-                <template #n>
-                  <span>{{ counter.tasksAlert }}</span>
-                </template>
-              </i18n-t>
+            <li v-if="(counter.value?.tasksAlert || 0) > 0">
+              <span :class="counterClass">
+                {{
+                  trans(COUNTER_ALERT_TASKS, {
+                    n: counter.value?.tasksAlert || 0,
+                  })
+                }}
+              </span>
             </li>
-            <li v-if="counter.tasksWarning > 0">
-              <i18n-t
-                keypath="counter.warning_tasks"
-                tag="span"
-                :class="counterClass"
-                :plural="counter.tasksWarning"
-              >
-                <template #n>
-                  <span>{{ counter.tasksWarning }}</span>
-                </template>
-              </i18n-t>
+            <li v-if="(counter.value?.tasksWarning || 0) > 0">
+              <span :class="counterClass">
+                {{
+                  trans(COUNTER_WARNING_TASKS, {
+                    n: counter.value?.tasksWarning || 0,
+                  })
+                }}
+              </span>
             </li>
           </ul>
         </div>
       </div>
 
-      <template v-if="this.hasDashboardItems">
-        <template
-          v-for="(dashboardItem, index) in this.dashboardItems"
-          :key="index"
-        >
+      <template v-if="hasDashboardItems">
+        <template v-for="(dashboardItem, index) in dashboardItems" :key="index">
           <div
             class="mbloc col-xs-12 col-sm-8 news"
             v-if="dashboardItem.type === 'news'"
@@ -100,44 +79,53 @@
   </div>
 </template>
 
-<script>
-import { mapGetters } from "vuex";
+<script lang="ts" setup>
+import { ref, computed, onMounted } from "vue";
+import { useStore } from "vuex";
 import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
 import News from "./DashboardWidgets/News.vue";
+import {
+  NO_DASHBOARD,
+  COUNTER_UNREAD_NOTIFICATIONS,
+  COUNTER_ASSIGNATED_COURSES,
+  COUNTER_ASSIGNATED_ACTIONS,
+  COUNTER_ASSIGNATED_EVALUATIONS,
+  COUNTER_ALERT_TASKS,
+  COUNTER_WARNING_TASKS,
+  trans,
+} from "translator";
 
-export default {
-  name: "MyCustoms",
-  components: {
-    News,
-  },
-  data() {
-    return {
-      counterClass: {
-        counter: true, //hack to pass class 'counter' in i18n-t
-      },
-      dashboardItems: [],
-      masonry: null,
-    };
-  },
-  computed: {
-    ...mapGetters(["counter"]),
-    noResults() {
-      return false;
-    },
-    hasDashboardItems() {
-      return this.dashboardItems.length > 0;
-    },
-  },
-  mounted() {
-    makeFetch("GET", "/api/1.0/main/dashboard-config-item.json")
-      .then((response) => {
-        this.dashboardItems = response;
-      })
-      .catch((error) => {
-        throw error;
-      });
-  },
-};
+interface MyCustom {
+  id: number;
+  type: string;
+  metadata: Record<string, unknown>;
+  userId: number;
+  position: string;
+}
+
+const store = useStore();
+
+const counter = computed(() => store.getters.counter);
+
+const counterClass = { counter: true };
+
+const dashboardItems = ref<MyCustom[]>([]);
+
+const noResults = computed(() => false);
+
+const hasDashboardItems = computed(() => dashboardItems.value.length > 0);
+
+onMounted(async () => {
+  try {
+    const response: MyCustom[] = await makeFetch(
+      "GET",
+      "/api/1.0/main/dashboard-config-item.json",
+    );
+    dashboardItems.value = response;
+  } catch (error) {
+    throw error;
+  }
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyEvaluations.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyEvaluations.vue
index b7db53a53..538de040b 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyEvaluations.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyEvaluations.vue
@@ -1,44 +1,50 @@
 <template>
   <div class="accompanying-course-work">
     <div class="alert alert-light">
-      {{ $t("my_evaluations.description") }}
+      {{ trans(MY_EVALUATIONS_DESCRIPTION) }}
     </div>
-    <span v-if="noResults" class="chill-no-data-statement">{{
-      $t("no_data")
-    }}</span>
+    <span v-if="noResults" class="chill-no-data-statement">
+      {{ trans(NO_DATA) }}
+    </span>
     <tab-table v-else>
       <template #thead>
         <th scope="col">
-          {{ $t("max_date") }}
+          {{ trans(MAX_DATE) }}
         </th>
         <th scope="col">
-          {{ $t("evaluation") }}
+          {{ trans(EVALUATION) }}
         </th>
         <th scope="col">
-          {{ $t("SocialAction") }}
+          {{ trans(SOCIAL_ACTION) }}
         </th>
         <th scope="col" />
       </template>
       <template #tbody>
         <tr v-for="(e, i) in evaluations.results" :key="`evaluation-${i}`">
-          <td>{{ $d(e.maxDate.datetime, "short") }}</td>
           <td>
-            {{ localizeString(e.evaluation.title) }}
+            {{
+              e.maxDate?.datetime
+                ? $d(new Date(e.maxDate.datetime), "short")
+                : ""
+            }}
+          </td>
+          <td>
+            {{ localizeString(e.evaluation?.title ?? null) }}
           </td>
           <td>
             <span class="chill-entity entity-social-issue">
               <span class="badge bg-chill-l-gray text-dark">
-                {{ e.accompanyingPeriodWork.socialAction.issue.text }}
+                {{ e.accompanyingPeriodWork?.socialAction?.issue?.text ?? "" }}
               </span>
             </span>
             <h4 class="badge-title">
               <span class="title_label" />
               <span class="title_action">
-                {{ e.accompanyingPeriodWork.socialAction.text }}
+                {{ e.accompanyingPeriodWork?.socialAction?.text ?? "" }}
               </span>
             </h4>
             <span
-              v-for="person in e.accompanyingPeriodWork.persons"
+              v-for="person in e.accompanyingPeriodWork?.persons ?? []"
               class="me-1"
               :key="person.id"
             >
@@ -55,18 +61,22 @@
             <div class="btn-group-vertical" role="group" aria-label="Actions">
               <a class="btn btn-sm btn-show" :href="getUrl(e)">
                 {{
-                  $t("show_entity", {
-                    entity: $t("the_evaluation"),
+                  trans(SHOW_ENTITY, {
+                    entity: trans(THE_EVALUATION),
                   })
                 }}
               </a>
               <a
                 class="btn btn-sm btn-show"
-                :href="getUrl(e.accompanyingPeriodWork.accompanyingPeriod)"
+                :href="getUrl(e.accompanyingPeriodWork.accompanyingPeriod!)"
+                v-if="
+                  e.accompanyingPeriodWork &&
+                  e.accompanyingPeriodWork.accompanyingPeriod
+                "
               >
                 {{
-                  $t("show_entity", {
-                    entity: $t("the_course"),
+                  trans(SHOW_ENTITY, {
+                    entity: trans(THE_COURSE),
                   })
                 }}
               </a>
@@ -78,46 +88,70 @@
   </div>
 </template>
 
-<script>
-import { mapState, mapGetters } from "vuex";
-import TabTable from "./TabTable";
-import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly";
+<script lang="ts" setup>
+import { computed } from "vue";
+import { useStore } from "vuex";
+import TabTable from "./TabTable.vue";
+import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue";
 import { localizeString } from "../../lib/localizationHelper/localizationHelper";
 
-export default {
-  name: "MyEvaluations",
-  components: {
-    TabTable,
-    OnTheFly,
-  },
-  computed: {
-    ...mapState(["evaluations"]),
-    ...mapGetters(["isEvaluationsLoaded"]),
-    noResults() {
-      if (!this.isEvaluationsLoaded) {
-        return false;
-      } else {
-        return this.evaluations.count === 0;
-      }
-    },
-  },
-  methods: {
-    localizeString,
-    getUrl(e) {
-      switch (e.type) {
-        case "accompanying_period_work_evaluation":
-          let anchor = "#evaluations";
-          return `/fr/person/accompanying-period/work/${e.accompanyingPeriodWork.id}/edit${anchor}`;
-        case "accompanying_period_work":
-          return `/fr/person/accompanying-period/work/${e.id}/edit`;
-        case "accompanying_period":
-          return `/fr/parcours/${e.id}`;
-        default:
-          throw "entity type unknown";
-      }
-    },
-  },
-};
+const store = useStore();
+
+import type { ComputedRef } from "vue";
+import {
+  AccompanyingPeriod,
+  AccompanyingPeriodWorkEvaluation,
+  AccompanyingPeriodWork,
+} from "ChillPersonAssets/types";
+import { PaginationResponse } from "ChillMainAssets/lib/api/apiMethods";
+import {
+  MY_EVALUATIONS_DESCRIPTION,
+  MAX_DATE,
+  EVALUATION,
+  SHOW_ENTITY,
+  THE_COURSE,
+  THE_EVALUATION,
+  SOCIAL_ACTION,
+  NO_DATA,
+  trans,
+} from "translator";
+const evaluations: ComputedRef<
+  PaginationResponse<AccompanyingPeriodWorkEvaluation>
+> = computed(() => store.state.homepage.evaluations);
+const isEvaluationsLoaded = computed(() => store.getters.isEvaluationsLoaded);
+
+const noResults = computed(() => {
+  if (!isEvaluationsLoaded.value) {
+    return false;
+  } else {
+    return evaluations.value.count === 0;
+  }
+});
+
+function getUrl(
+  e:
+    | AccompanyingPeriodWorkEvaluation
+    | AccompanyingPeriod
+    | AccompanyingPeriodWork,
+): string {
+  if (!e) {
+    throw "entity is undefined";
+  }
+
+  if ("type" in e && typeof e.type === "string") {
+    switch (e.type) {
+      case "accompanying_period_work_evaluation":
+        return `/fr/person/accompanying-period/work/${e.accompanyingPeriodWork?.id}/edit#evaluations`;
+      case "accompanying_period_work":
+        return `/fr/person/accompanying-period/work/${e.id}/edit`;
+      case "accompanying_period":
+        return `/fr/parcours/${e.id}`;
+      default:
+        throw "entity type unknown";
+    }
+  }
+  return "";
+}
 </script>
 
 <style scoped></style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyNotifications.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyNotifications.vue
index 21fd1a9b7..effea6f35 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyNotifications.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyNotifications.vue
@@ -1,26 +1,26 @@
 <template>
   <div class="alert alert-light">
-    {{ $t("my_notifications.description") }}
+    {{ trans(MY_NOTIFICATIONS_DESCRIPTION) }}
   </div>
-  <span v-if="noResults" class="chill-no-data-statement">{{
-    $t("no_data")
-  }}</span>
+  <span v-if="noResults" class="chill-no-data-statement">
+    {{ trans(NO_DATA) }}
+  </span>
   <tab-table v-else>
     <template #thead>
       <th scope="col">
-        {{ $t("Date") }}
+        {{ trans(DATE) }}
       </th>
       <th scope="col">
-        {{ $t("Subject") }}
+        {{ trans(SUBJECT) }}
       </th>
       <th scope="col">
-        {{ $t("From") }}
+        {{ trans(FROM) }}
       </th>
       <th scope="col" />
     </template>
     <template #tbody>
       <tr v-for="(n, i) in notifications.results" :key="`notify-${i}`">
-        <td>{{ $d(n.date.datetime, "long") }}</td>
+        <td>{{ $d(new Date(n.date.datetime), "long") }}</td>
         <td>
           <span class="unread">
             <i class="fa fa-envelope-o" />
@@ -31,11 +31,11 @@
           {{ n.sender.text }}
         </td>
         <td v-else>
-          {{ $t("automatic_notification") }}
+          {{ trans(AUTOMATIC_NOTIFICATION) }}
         </td>
         <td>
           <a class="btn btn-sm btn-show" :href="getEntityUrl(n)">
-            {{ $t("show_entity", { entity: getEntityName(n) }) }}
+            {{ trans(SHOW_ENTITY, { entity: getEntityName(n) }) }}
           </a>
         </td>
       </tr>
@@ -43,65 +43,82 @@
   </tab-table>
 </template>
 
-<script>
-import { mapState, mapGetters } from "vuex";
-import TabTable from "./TabTable";
-import { appMessages } from "ChillMainAssets/vuejs/HomepageWidget/js/i18n";
+<script lang="ts" setup>
+import { computed, ComputedRef } from "vue";
+import { useStore } from "vuex";
+import TabTable from "./TabTable.vue";
+import { Notification } from "ChillPersonAssets/types";
 
-export default {
-  name: "MyNotifications",
-  components: {
-    TabTable,
-  },
-  computed: {
-    ...mapState(["notifications"]),
-    ...mapGetters(["isNotificationsLoaded"]),
-    noResults() {
-      if (!this.isNotificationsLoaded) {
-        return false;
-      } else {
-        return this.notifications.count === 0;
-      }
-    },
-  },
-  methods: {
-    getNotificationUrl(n) {
-      return `/fr/notification/${n.id}/show`;
-    },
-    getEntityName(n) {
-      switch (n.relatedEntityClass) {
-        case "Chill\\ActivityBundle\\Entity\\Activity":
-          return appMessages.fr.the_activity;
-        case "Chill\\PersonBundle\\Entity\\AccompanyingPeriod":
-          return appMessages.fr.the_course;
-        case "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork":
-          return appMessages.fr.the_action;
-        case "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument":
-          return appMessages.fr.the_evaluation_document;
-        case "Chill\\MainBundle\\Entity\\Workflow\\EntityWorkflow":
-          return appMessages.fr.the_workflow;
-        default:
-          throw "notification type unknown";
-      }
-    },
-    getEntityUrl(n) {
-      switch (n.relatedEntityClass) {
-        case "Chill\\ActivityBundle\\Entity\\Activity":
-          return `/fr/activity/${n.relatedEntityId}/show`;
-        case "Chill\\PersonBundle\\Entity\\AccompanyingPeriod":
-          return `/fr/parcours/${n.relatedEntityId}`;
-        case "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork":
-          return `/fr/person/accompanying-period/work/${n.relatedEntityId}/show`;
-        case "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument":
-          return `/fr/person/accompanying-period/work/evaluation/document/${n.relatedEntityId}/show`;
-        case "Chill\\MainBundle\\Entity\\Workflow\\EntityWorkflow":
-          return `/fr/main/workflow/${n.relatedEntityId}/show`;
-        default:
-          throw "notification type unknown";
-      }
-    },
-  },
-};
+import {
+  MY_NOTIFICATIONS_DESCRIPTION,
+  DATE,
+  FROM,
+  SUBJECT,
+  SHOW_ENTITY,
+  THE_ACTIVITY,
+  THE_COURSE,
+  THE_ACTION,
+  THE_EVALUATION_DOCUMENT,
+  THE_WORKFLOW,
+  NO_DATA,
+  AUTOMATIC_NOTIFICATION,
+  trans,
+} from "translator";
+import { PaginationResponse } from "ChillMainAssets/lib/api/apiMethods";
+const store = useStore();
+
+const notifications: ComputedRef<PaginationResponse<Notification>> = computed(
+  () => store.state.homepage.notifications,
+);
+const isNotificationsLoaded = computed(
+  () => store.getters.isNotificationsLoaded,
+);
+
+const noResults = computed(() => {
+  if (!isNotificationsLoaded.value) {
+    return false;
+  } else {
+    return notifications.value.count === 0;
+  }
+});
+
+function getNotificationUrl(n: Notification): string {
+  return `/fr/notification/${n.id}/show`;
+}
+
+function getEntityName(n: Notification): string {
+  switch (n.relatedEntityClass) {
+    case "Chill\\ActivityBundle\\Entity\\Activity":
+      return trans(THE_ACTIVITY);
+    case "Chill\\PersonBundle\\Entity\\AccompanyingPeriod":
+      return trans(THE_COURSE);
+    case "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork":
+      return trans(THE_ACTION);
+    case "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument":
+      return trans(THE_EVALUATION_DOCUMENT);
+    case "Chill\\MainBundle\\Entity\\Workflow\\EntityWorkflow":
+      return trans(THE_WORKFLOW);
+    default:
+      throw "notification type unknown";
+  }
+}
+
+function getEntityUrl(n: Notification): string {
+  switch (n.relatedEntityClass) {
+    case "Chill\\ActivityBundle\\Entity\\Activity":
+      return `/fr/activity/${n.relatedEntityId}/show`;
+    case "Chill\\PersonBundle\\Entity\\AccompanyingPeriod":
+      return `/fr/parcours/${n.relatedEntityId}`;
+    case "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork":
+      return `/fr/person/accompanying-period/work/${n.relatedEntityId}/show`;
+    case "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument":
+      return `/fr/person/accompanying-period/work/evaluation/document/${n.relatedEntityId}/show`;
+    case "Chill\\MainBundle\\Entity\\Workflow\\EntityWorkflow":
+      return `/fr/main/workflow/${n.relatedEntityId}/show`;
+    default:
+      throw "notification type unknown";
+  }
+}
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyTasks.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyTasks.vue
index cc043461e..637767842 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyTasks.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyTasks.vue
@@ -1,36 +1,38 @@
 <template>
   <div class="alert alert-light">
-    {{ $t("my_tasks.description_warning") }}
+    {{ trans(MY_TASKS_DESCRIPTION_WARNING) }}
   </div>
-  <span v-if="noResultsAlert" class="chill-no-data-statement">{{
-    $t("no_data")
-  }}</span>
+  <span v-if="noResultsAlert" class="chill-no-data-statement">
+    {{ trans(NO_DATA) }}
+  </span>
   <tab-table v-else>
     <template #thead>
       <th scope="col">
-        {{ $t("warning_date") }}
+        {{ trans(WARNING_DATE) }}
       </th>
       <th scope="col">
-        {{ $t("max_date") }}
+        {{ trans(MAX_DATE) }}
       </th>
       <th scope="col">
-        {{ $t("task") }}
+        {{ trans(TASK) }}
       </th>
       <th scope="col" />
     </template>
     <template #tbody>
       <tr v-for="(t, i) in tasks.alert.results" :key="`task-alert-${i}`">
-        <td v-if="null !== t.warningDate">
-          {{ $d(t.warningDate.datetime, "short") }}
+        <td v-if="t.warningDate !== null">
+          {{ $d(new Date(t.warningDate.datetime), "short") }}
         </td>
         <td v-else />
         <td>
-          <span class="outdated">{{ $d(t.endDate.datetime, "short") }}</span>
+          <span class="outdated">{{
+            $d(new Date(t.endDate.datetime), "short")
+          }}</span>
         </td>
         <td>{{ t.title }}</td>
         <td>
           <a class="btn btn-sm btn-show" :href="getUrl(t)">
-            {{ $t("show_entity", { entity: $t("the_task") }) }}
+            {{ trans(SHOW_ENTITY, { entity: trans(THE_TASK) }) }}
           </a>
         </td>
       </tr>
@@ -38,21 +40,21 @@
   </tab-table>
 
   <div class="alert alert-light">
-    {{ $t("my_tasks.description_alert") }}
+    {{ trans(MY_TASKS_DESCRIPTION_ALERT) }}
   </div>
-  <span v-if="noResultsWarning" class="chill-no-data-statement">{{
-    $t("no_data")
-  }}</span>
+  <span v-if="noResultsWarning" class="chill-no-data-statement">
+    {{ trans(NO_DATA) }}
+  </span>
   <tab-table v-else>
     <template #thead>
       <th scope="col">
-        {{ $t("warning_date") }}
+        {{ trans(WARNING_DATE) }}
       </th>
       <th scope="col">
-        {{ $t("max_date") }}
+        {{ trans(MAX_DATE) }}
       </th>
       <th scope="col">
-        {{ $t("task") }}
+        {{ trans(TASK) }}
       </th>
       <th scope="col" />
     </template>
@@ -60,14 +62,14 @@
       <tr v-for="(t, i) in tasks.warning.results" :key="`task-warning-${i}`">
         <td>
           <span class="outdated">{{
-            $d(t.warningDate.datetime, "short")
+            $d(new Date(t.warningDate.datetime), "short")
           }}</span>
         </td>
-        <td>{{ $d(t.endDate.datetime, "short") }}</td>
+        <td>{{ $d(new Date(t.endDate.datetime), "short") }}</td>
         <td>{{ t.title }}</td>
         <td>
           <a class="btn btn-sm btn-show" :href="getUrl(t)">
-            {{ $t("show_entity", { entity: $t("the_task") }) }}
+            {{ trans(SHOW_ENTITY, { entity: trans(THE_TASK) }) }}
           </a>
         </td>
       </tr>
@@ -75,39 +77,51 @@
   </tab-table>
 </template>
 
-<script>
-import { mapState, mapGetters } from "vuex";
-import TabTable from "./TabTable";
+<script lang="ts" setup>
+import { computed, ComputedRef } from "vue";
+import { useStore } from "vuex";
+import TabTable from "./TabTable.vue";
+import {
+  MY_TASKS_DESCRIPTION_ALERT,
+  MY_TASKS_DESCRIPTION_WARNING,
+  MAX_DATE,
+  WARNING_DATE,
+  TASK,
+  SHOW_ENTITY,
+  THE_TASK,
+  NO_DATA,
+  trans,
+} from "translator";
+import { TasksState } from "./store/modules/homepage";
+import { Alert, Warning } from "ChillPersonAssets/types";
 
-export default {
-  name: "MyTasks",
-  components: {
-    TabTable,
-  },
-  computed: {
-    ...mapState(["tasks"]),
-    ...mapGetters(["isTasksWarningLoaded", "isTasksAlertLoaded"]),
-    noResultsAlert() {
-      if (!this.isTasksAlertLoaded) {
-        return false;
-      } else {
-        return this.tasks.alert.count === 0;
-      }
-    },
-    noResultsWarning() {
-      if (!this.isTasksWarningLoaded) {
-        return false;
-      } else {
-        return this.tasks.warning.count === 0;
-      }
-    },
-  },
-  methods: {
-    getUrl(t) {
-      return `/fr/task/single-task/${t.id}/show`;
-    },
-  },
-};
+const store = useStore();
+
+const tasks: ComputedRef<TasksState> = computed(
+  () => store.state.homepage.tasks,
+);
+const isTasksWarningLoaded = computed(() => store.getters.isTasksWarningLoaded);
+const isTasksAlertLoaded = computed(() => store.getters.isTasksAlertLoaded);
+
+const noResultsAlert = computed(() => {
+  if (!isTasksAlertLoaded.value) {
+    return false;
+  } else {
+    return tasks.value.alert.count === 0;
+  }
+});
+
+const noResultsWarning = computed(() => {
+  if (!isTasksWarningLoaded.value) {
+    return false;
+  } else {
+    return tasks.value.warning.count === 0;
+  }
+});
+
+function getUrl(t: Warning | Alert): string {
+  return `/fr/task/single-task/${t.id}/show`;
+}
 </script>
 
 <style scoped>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyTickets.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyTickets.vue
new file mode 100644
index 000000000..50bc99f6c
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyTickets.vue
@@ -0,0 +1,58 @@
+<template>
+  <div class="col-12">
+    <!-- Loading state -->
+    <div
+      v-if="isTicketLoading"
+      class="d-flex justify-content-center align-items-center"
+      style="height: 200px"
+    >
+      <div class="text-center">
+        <div class="spinner-border mb-3" role="status">
+          <span class="visually-hidden">{{
+            trans(CHILL_TICKET_LIST_LOADING_TICKET)
+          }}</span>
+        </div>
+        <div class="text-muted">
+          {{ trans(CHILL_TICKET_LIST_LOADING_TICKET) }}
+        </div>
+      </div>
+    </div>
+
+    <!-- Ticket list -->
+    <ticket-list-component
+      v-else
+      :tickets="ticketList"
+      title=""
+      :hasMoreTickets="pagination.next !== null"
+      @fetchNextPage="fetchNextPage"
+    />
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { computed } from "vue";
+import { useStore } from "vuex";
+// Components
+import TicketListComponent from "../../../../../ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListComponent.vue";
+
+// Types
+import { Pagination } from "ChillMainAssets/lib/api/apiMethods";
+import { TicketSimple } from "src/Bundle/ChillTicketBundle/src/Resources/public/types";
+
+// Translation
+import { CHILL_TICKET_LIST_LOADING_TICKET, trans } from "translator";
+
+const store = useStore();
+const pagination = computed(() => store.getters.getPagination as Pagination);
+
+const ticketList = computed(
+  () => store.getters.getTicketList as TicketSimple[],
+);
+const isTicketLoading = computed(() => store.getters.isTicketLoading);
+
+const fetchNextPage = async () => {
+  if (pagination.value.next) {
+    await store.dispatch("fetchTicketListByUrl", pagination.value.next);
+  }
+};
+</script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorkflows.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorkflows.vue
index 453ed19b4..c47cfd171 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorkflows.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorkflows.vue
@@ -1,26 +1,27 @@
 <template>
   <div class="alert alert-light">
-    {{ $t("my_workflows.description") }}
+    {{ trans(MY_WORKFLOWS_DESCRIPTION) }}
   </div>
   <my-workflows-table :workflows="workflows" />
 
   <div class="alert alert-light">
-    {{ $t("my_workflows.description_cc") }}
+    {{ trans(MY_WORKFLOWS_DESCRIPTION_CC) }}
   </div>
   <my-workflows-table :workflows="workflowsCc" />
 </template>
 
-<script>
-import { mapState } from "vuex";
+<script lang="ts" setup>
+import { computed } from "vue";
+import { useStore } from "vuex";
 import MyWorkflowsTable from "./MyWorkflowsTable.vue";
+import {
+  MY_WORKFLOWS_DESCRIPTION,
+  MY_WORKFLOWS_DESCRIPTION_CC,
+  trans,
+} from "translator";
 
-export default {
-  name: "MyWorkflows",
-  components: {
-    MyWorkflowsTable,
-  },
-  computed: {
-    ...mapState(["workflows", "workflowsCc"]),
-  },
-};
+const store = useStore();
+
+const workflows = computed(() => store.state.homepage.workflows);
+const workflowsCc = computed(() => store.state.homepage.workflowsCc);
 </script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorkflowsTable.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorkflowsTable.vue
index b10cbacfe..1b36ba1c5 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorkflowsTable.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorkflowsTable.vue
@@ -1,17 +1,17 @@
 <template>
-  <span v-if="hasNoResults(workflows)" class="chill-no-data-statement">{{
-    $t("no_data")
-  }}</span>
+  <span v-if="hasNoResults" class="chill-no-data-statement">
+    {{ trans(NO_DATA) }}
+  </span>
   <tab-table v-else>
     <template #thead>
       <th scope="col">
-        {{ $t("Object_workflow") }}
+        {{ trans(OBJECT_WORKFLOW) }}
       </th>
       <th scope="col">
-        {{ $t("Step") }}
+        {{ trans(STEP) }}
       </th>
       <th scope="col">
-        {{ $t("concerned_users") }}
+        {{ trans(CONCERNED_USERS) }}
       </th>
       <th scope="col" />
     </template>
@@ -29,7 +29,7 @@
             <span
               v-if="w.isOnHoldAtCurrentStep"
               class="badge bg-success rounded-pill"
-              >{{ $t("on_hold") }}</span
+              >{{ trans(ON_HOLD) }}</span
             >
           </div>
         </td>
@@ -46,7 +46,7 @@
         </td>
         <td>
           <a class="btn btn-sm btn-show" :href="getUrl(w)">
-            {{ $t("show_entity", { entity: $t("the_workflow") }) }}
+            {{ trans(SHOW_ENTITY, { entity: trans(THE_WORKFLOW) }) }}
           </a>
         </td>
       </tr>
@@ -54,38 +54,48 @@
   </tab-table>
 </template>
 
-<script>
-import { mapGetters } from "vuex";
-import TabTable from "./TabTable";
-import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly";
+<script lang="ts" setup>
+import { computed } from "vue";
+import { useStore } from "vuex";
+import TabTable from "./TabTable.vue";
+import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue";
+import { Workflow } from "ChillPersonAssets/types";
+import {
+  CONCERNED_USERS,
+  OBJECT_WORKFLOW,
+  ON_HOLD,
+  SHOW_ENTITY,
+  THE_WORKFLOW,
+  NO_DATA,
+  STEP,
+  trans,
+} from "translator";
+import { PaginationResponse } from "ChillMainAssets/lib/api/apiMethods";
 
-export default {
-  name: "MyWorkflows",
-  components: {
-    TabTable,
-    OnTheFly,
-  },
-  props: ["workflows"],
-  computed: {
-    ...mapGetters(["isWorkflowsLoaded"]),
-  },
-  methods: {
-    hasNoResults(workflows) {
-      if (!this.isWorkflowsLoaded) {
-        return false;
-      } else {
-        return workflows.count === 0;
-      }
-    },
-    getUrl(w) {
-      return `/fr/main/workflow/${w.id}/show`;
-    },
-    getStep(w) {
-      const lastStep = w.steps.length - 1;
-      return w.steps[lastStep].currentStep.text;
-    },
-  },
-};
+const props = defineProps<{
+  workflows: PaginationResponse<Workflow>;
+}>();
+
+const store = useStore();
+
+const isWorkflowsLoaded = computed(() => store.getters.isWorkflowsLoaded);
+
+const hasNoResults = computed(() => {
+  if (!isWorkflowsLoaded.value) {
+    return false;
+  } else {
+    return props.workflows.count === 0;
+  }
+});
+
+function getUrl(w: Workflow): string {
+  return `/fr/main/workflow/${w.id}/show`;
+}
+
+function getStep(w: Workflow): string {
+  const lastStep = w.steps.length - 1;
+  return w.steps[lastStep].currentStep.text;
+}
 </script>
 
 <style scoped>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorks.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorks.vue
index 84400dfc2..a8cc39b83 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorks.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorks.vue
@@ -1,27 +1,26 @@
-// CURRENTLY NOT IN USE
 <template>
   <div class="accompanying-course-work">
     <div class="alert alert-light">
-      {{ $t("my_works.description") }}
+      {{ trans(MY_WORKS_DESCRIPTION) }}
     </div>
-    <span v-if="noResults" class="chill-no-data-statement">{{
-      $t("no_data")
-    }}</span>
+    <span v-if="noResults" class="chill-no-data-statement">
+      {{ trans(NO_DATA) }}
+    </span>
     <tab-table v-else>
       <template #thead>
         <th scope="col">
-          {{ $t("StartDate") }}
+          {{ trans(START_DATE) }}
         </th>
         <th scope="col">
-          {{ $t("SocialAction") }}
+          {{ trans(SOCIAL_ACTION) }}
         </th>
         <th scope="col">
-          {{ $t("concerned_persons") }}
+          {{ trans(CONCERNED_PERSONS) }}
         </th>
         <th scope="col" />
       </template>
       <template #tbody>
-        <tr v-for="(w, i) in works.results" :key="`works-${i}`">
+        <tr v-for="(w, i) in works.value.results" :key="`works-${i}`">
           <td>{{ $d(w.startDate.datetime, "short") }}</td>
           <td>
             <span class="chill-entity entity-social-issue">
@@ -51,8 +50,8 @@
             <div class="btn-group-vertical" role="group" aria-label="Actions">
               <a class="btn btn-sm btn-update" :href="getUrl(w)">
                 {{
-                  $t("show_entity", {
-                    entity: $t("the_action"),
+                  trans(SHOW_ENTITY, {
+                    entity: trans(THE_ACTION),
                   })
                 }}
               </a>
@@ -61,8 +60,8 @@
                 :href="getUrl(w.accompanyingPeriod)"
               >
                 {{
-                  $t("show_entity", {
-                    entity: $t("the_course"),
+                  trans(SHOW_ENTITY, {
+                    entity: trans(THE_COURSE),
                   })
                 }}
               </a>
@@ -74,41 +73,47 @@
   </div>
 </template>
 
-<script>
-import { mapState, mapGetters } from "vuex";
-import TabTable from "./TabTable";
-import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly";
+<script lang="ts" setup>
+import { computed } from "vue";
+import { useStore } from "vuex";
+import TabTable from "./TabTable.vue";
+import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue";
+import {
+  MY_WORKS_DESCRIPTION,
+  CONCERNED_PERSONS,
+  SHOW_ENTITY,
+  THE_COURSE,
+  THE_ACTION,
+  SOCIAL_ACTION,
+  START_DATE,
+  NO_DATA,
+  trans,
+} from "translator";
+import { Workflow } from "ChillPersonAssets/types";
 
-export default {
-  name: "MyWorks",
-  components: {
-    TabTable,
-    OnTheFly,
-  },
-  computed: {
-    ...mapState(["works"]),
-    ...mapGetters(["isWorksLoaded"]),
-    noResults() {
-      if (!this.isWorksLoaded) {
-        return false;
-      } else {
-        return this.works.count === 0;
-      }
-    },
-  },
-  methods: {
-    getUrl(e) {
-      switch (e.type) {
-        case "accompanying_period_work":
-          return `/fr/person/accompanying-period/work/${e.id}/edit`;
-        case "accompanying_period":
-          return `/fr/parcours/${e.id}`;
-        default:
-          throw "entity type unknown";
-      }
-    },
-  },
-};
+const store = useStore();
+
+const works = computed(() => store.state.homepage.works);
+const isWorksLoaded = computed(() => store.getters.isWorksLoaded);
+
+const noResults = computed(() => {
+  if (!isWorksLoaded.value) {
+    return false;
+  } else {
+    return works.value.count === 0;
+  }
+});
+
+function getUrl(e: Workflow): string {
+  switch (e.type) {
+    case "accompanying_period_work":
+      return `/fr/person/accompanying-period/work/${e.id}/edit`;
+    case "accompanying_period":
+      return `/fr/parcours/${e.id}`;
+    default:
+      throw "entity type unknown";
+  }
+}
 </script>
 
 <style scoped></style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/TabCounter.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/TabCounter.vue
index 231d101bf..d25d1628b 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/TabCounter.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/TabCounter.vue
@@ -4,14 +4,14 @@
   </span>
 </template>
 
-<script>
-export default {
-  name: "TabCounter",
-  props: ["count"],
-  computed: {
-    isCounterAvailable() {
-      return typeof this.count !== "undefined" && this.count > 0;
-    },
-  },
-};
+<script lang="ts" setup>
+import { computed } from "vue";
+
+const props = defineProps<{
+  count: number;
+}>();
+
+const isCounterAvailable = computed(
+  () => typeof props.count !== "undefined" && props.count > 0,
+);
 </script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/TabTable.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/TabTable.vue
index d96f88dc5..0ca7ed273 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/TabTable.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/TabTable.vue
@@ -11,11 +11,8 @@
   </table>
 </template>
 
-<script>
-export default {
-  name: "TabTable",
-  props: [],
-};
+<script lang="ts" setup>
+// Pas de props à définir, composant slot simple
 </script>
 
 <style scoped></style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js
deleted file mode 100644
index 574854c91..000000000
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/i18n.js
+++ /dev/null
@@ -1,89 +0,0 @@
-const appMessages = {
-  fr: {
-    main_title: "Vue d'ensemble",
-    my_works: {
-      tab: "Mes actions",
-      description:
-        "Liste des actions d'accompagnement dont je suis référent et qui arrivent à échéance.",
-    },
-    my_evaluations: {
-      tab: "Mes évaluations",
-      description:
-        "Liste des évaluations dont je suis référent et qui arrivent à échéance.",
-    },
-    my_tasks: {
-      tab: "Mes tâches",
-      description_alert:
-        "Liste des tâches auxquelles je suis assigné et dont la date de rappel est dépassée.",
-      description_warning:
-        "Liste des tâches auxquelles je suis assigné et dont la date d'échéance est dépassée.",
-    },
-    my_accompanying_courses: {
-      tab: "Mes nouveaux parcours",
-      description:
-        "Liste des parcours d'accompagnement que l'on vient de m'attribuer depuis moins de 15 jours.",
-    },
-    my_notifications: {
-      tab: "Mes nouvelles notifications",
-      description: "Liste des notifications reçues et non lues.",
-    },
-    my_workflows: {
-      tab: "Mes workflows",
-      description: "Liste des workflows en attente d'une action.",
-      description_cc: "Liste des workflows dont je suis en copie.",
-    },
-    opening_date: "Date d'ouverture",
-    social_issues: "Problématiques sociales",
-    concerned_persons: "Usagers concernés",
-    max_date: "Date d'échéance",
-    warning_date: "Date de rappel",
-    evaluation: "Évaluation",
-    task: "Tâche",
-    Date: "Date",
-    From: "Expéditeur",
-    Subject: "Objet",
-    Entity: "Associé à",
-    Step: "Étape",
-    concerned_users: "Usagers concernés",
-    Object_workflow: "Objet du workflow",
-    on_hold: "En attente",
-    show_entity: "Voir {entity}",
-    the_activity: "l'échange",
-    the_course: "le parcours",
-    the_action: "l'action",
-    the_evaluation: "l'évaluation",
-    the_evaluation_document: "le document",
-    the_task: "la tâche",
-    the_workflow: "le workflow",
-    StartDate: "Date d'ouverture",
-    SocialAction: "Action d'accompagnement",
-    no_data: "Aucun résultats",
-    no_dashboard: "Pas de tableaux de bord",
-    counter: {
-      unread_notifications:
-        "{n} notification non lue | {n} notifications non lues",
-      assignated_courses:
-        "{n} parcours récent assigné | {n} parcours récents assignés",
-      assignated_actions: "{n} action assignée | {n} actions assignées",
-      assignated_evaluations:
-        "{n} évaluation assignée | {n} évaluations assignées",
-      alert_tasks: "{n} tâche en rappel | {n} tâches en rappel",
-      warning_tasks: "{n} tâche à échéance | {n} tâches à échéance",
-    },
-    emergency: "Urgent",
-    confidential: "Confidentiel",
-    automatic_notification: "Notification automatique",
-    widget: {
-      news: {
-        title: "Actualités",
-        readMore: "Lire la suite",
-        date: "Date",
-        none: "Aucune actualité",
-      },
-    },
-  },
-};
-
-Object.assign(appMessages.fr);
-
-export { appMessages };
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/store/index.ts b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/store/index.ts
new file mode 100644
index 000000000..e21c6929a
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/store/index.ts
@@ -0,0 +1,55 @@
+import { createStore } from "vuex";
+import { State as HomepageStates, moduleHomepage } from "./modules/homepage";
+
+import {
+  State as TicketListStates,
+  moduleTicketList,
+} from "../../../../../../ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket_list";
+import {
+  State as TicketStates,
+  moduleTicket,
+} from "../../../../../../ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket";
+import {
+  State as CommentStates,
+  moduleComment,
+} from "../../../../../../ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/comment";
+import {
+  moduleMotive,
+  State as MotiveStates,
+} from "../../../../../../ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/motive";
+import {
+  State as AddresseeStates,
+  moduleAddressee,
+} from "../../../../../../ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/addressee";
+import {
+  modulePersons,
+  State as PersonsState,
+} from "../../../../../../ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/persons";
+
+import {
+  moduleUser,
+  State as UserState,
+} from "../../../../../../ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/user";
+
+export interface RootState {
+  homepage: HomepageStates;
+  motive: MotiveStates;
+  ticket: TicketStates;
+  comment: CommentStates;
+  addressee: AddresseeStates;
+  persons: PersonsState;
+  ticketList: TicketListStates;
+  user: UserState;
+}
+export const store = createStore<RootState>({
+  modules: {
+    homepage: moduleHomepage,
+    motive: moduleMotive,
+    ticket: moduleTicket,
+    comment: moduleComment,
+    addressee: moduleAddressee,
+    person: modulePersons,
+    ticketList: moduleTicketList,
+    user: moduleUser,
+  },
+});
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/store.js b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/store/modules/homepage.ts
similarity index 63%
rename from src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/store.js
rename to src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/store/modules/homepage.ts
index ed88b857d..776e5cb82 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/js/store.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/store/modules/homepage.ts
@@ -1,90 +1,113 @@
 import "es6-promise/auto";
-import { createStore } from "vuex";
-import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
+import { Module } from "vuex";
+import {
+  makeFetch,
+  PaginationResponse,
+} from "ChillMainAssets/lib/api/apiMethods";
+import {
+  AccompanyingCourse,
+  Alert,
+  Evaluation,
+  Warning,
+  Workflow,
+  WorflowCc,
+} from "ChillPersonAssets/types";
+import { RootState } from "..";
 
-const debug = process.env.NODE_ENV !== "production";
+export interface TasksState {
+  warning: PaginationResponse<Warning>;
+  alert: PaginationResponse<Alert>;
+}
 
-const isEmpty = (obj) => {
-  return (
-    obj &&
-    Object.keys(obj).length <= 1 &&
-    Object.getPrototypeOf(obj) === Object.prototype
-  );
-};
+export interface State {
+  evaluations: PaginationResponse<Evaluation>;
+  tasks: TasksState;
+  accompanyingCourses: PaginationResponse<AccompanyingCourse>;
+  notifications: PaginationResponse<Notification>;
+  workflows: PaginationResponse<Workflow>;
+  workflowsCc: PaginationResponse<WorflowCc>;
+  errorMsg: unknown[];
+  loading: boolean;
+  ticketsLoading: boolean;
+}
 
-const store = createStore({
-  strict: debug,
+export const moduleHomepage: Module<State, RootState> = {
   state: {
-    // works: {},
-    evaluations: {},
+    evaluations: {
+      count: 0,
+    } as PaginationResponse<Evaluation>,
     tasks: {
-      warning: {},
-      alert: {},
+      warning: {
+        count: 0,
+      } as PaginationResponse<Warning>,
+      alert: {
+        count: 0,
+      } as PaginationResponse<Alert>,
     },
-    accompanyingCourses: {},
-    notifications: {},
-    workflows: {},
-    workflowsCc: {},
+    accompanyingCourses: {
+      count: 0,
+    } as PaginationResponse<AccompanyingCourse>,
+    notifications: {
+      count: 0,
+    } as PaginationResponse<Notification>,
+    workflows: {
+      count: 0,
+    } as PaginationResponse<Workflow>,
+    workflowsCc: {
+      count: 0,
+    } as PaginationResponse<WorflowCc>,
+    ticketsLoading: false,
     errorMsg: [],
     loading: false,
   },
   getters: {
-    // isWorksLoaded(state) {
-    //     return !isEmpty(state.works);
-    // },
+    isTicketLoading: (state) => {
+      return state.ticketsLoading;
+    },
     isEvaluationsLoaded(state) {
-      return !isEmpty(state.evaluations);
+      return Array.isArray(state.evaluations.results);
     },
     isTasksWarningLoaded(state) {
-      return !isEmpty(state.tasks.warning);
+      return Array.isArray(state.tasks.warning.results);
     },
     isTasksAlertLoaded(state) {
-      return !isEmpty(state.tasks.alert);
+      return Array.isArray(state.tasks.alert.results);
     },
     isAccompanyingCoursesLoaded(state) {
-      return !isEmpty(state.accompanyingCourses);
+      return Array.isArray(state.accompanyingCourses.results);
     },
     isNotificationsLoaded(state) {
-      return !isEmpty(state.notifications);
+      return Array.isArray(state.notifications.results);
     },
     isWorkflowsLoaded(state) {
-      return !isEmpty(state.workflows);
+      return Array.isArray(state.workflows.results);
     },
-    counter(state) {
+    counter(state, getters, rootState, rootGetters) {
       return {
-        // works: state.works.count,
-        evaluations: state.evaluations.count,
-        tasksWarning: state.tasks.warning.count,
-        tasksAlert: state.tasks.alert.count,
-        accompanyingCourses: state.accompanyingCourses.count,
-        notifications: state.notifications.count,
-        workflows: state.workflows.count,
+        tickets: rootGetters["ticketList/getCount"] || 0,
+        evaluations: state.evaluations.count || 0,
+        tasksWarning: state.tasks.warning.count || 0,
+        tasksAlert: state.tasks.alert.count || 0,
+        accompanyingCourses: state.accompanyingCourses.count || 0,
+        notifications: state.notifications.count || 0,
+        workflows: state.workflows.count || 0,
       };
     },
   },
   mutations: {
-    // addWorks(state, works) {
-    //     //console.log('addWorks', works);
-    //     state.works = works;
-    // },
     addEvaluations(state, evaluations) {
-      //console.log('addEvaluations', evaluations);
       state.evaluations = evaluations;
     },
     addTasksWarning(state, tasks) {
-      //console.log('addTasksWarning', tasks);
       state.tasks.warning = tasks;
     },
     addTasksAlert(state, tasks) {
-      //console.log('addTasksAlert', tasks);
       state.tasks.alert = tasks;
     },
     addCourses(state, courses) {
-      //console.log('addCourses', courses);
       state.accompanyingCourses = courses;
     },
     addNotifications(state, notifications) {
-      //console.log('addNotifications', notifications);
       state.notifications = notifications;
     },
     addWorkflows(state, workflows) {
@@ -96,29 +119,29 @@ const store = createStore({
     setLoading(state, bool) {
       state.loading = bool;
     },
+    setTicketsLoading(state, bool) {
+      state.ticketsLoading = bool;
+    },
     catchError(state, error) {
       state.errorMsg.push(error);
     },
   },
   actions: {
-    getByTab({ commit, getters }, { tab, param }) {
+    async getByTab({ commit, getters, dispatch }, { tab, param }) {
       switch (tab) {
-        // case 'MyWorks':
-        //     if (!getters.isWorksLoaded) {
-        //         commit('setLoading', true);
-        //         const url = `/api/1.0/person/accompanying-period/work/my-near-end${'?'+ param}`;
-        //         makeFetch('GET', url)
-        //             .then((response) => {
-        //                 commit('addWorks', response);
-        //                 commit('setLoading', false);
-        //             })
-        //             .catch((error) => {
-        //                 commit('catchError', error);
-        //                 throw error;
-        //             })
-        //         ;
-        //     }
-        //     break;
+        case "MyTickets":
+          if (!getters.isTicketsLoaded) {
+            commit("setTicketsLoading", true);
+            // Utilise l'action du module ticket_list
+            await dispatch(
+              "fetchTicketList",
+              { byAddresseeToMe: true },
+              { root: true },
+            );
+
+            commit("setTicketsLoading", false);
+          }
+          break;
         case "MyEvaluations":
           if (!getters.isEvaluationsLoaded) {
             commit("setLoading", true);
@@ -180,7 +203,6 @@ const store = createStore({
             const url = `/api/1.0/main/notification/my/unread${"?" + param}`;
             makeFetch("GET", url)
               .then((response) => {
-                console.log("notifications", response);
                 commit("addNotifications", response);
                 commit("setLoading", false);
               })
@@ -217,6 +239,4 @@ const store = createStore({
       }
     },
   },
-});
-
-export { store };
+};
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
index 8e96a1595..98c0d0034 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
@@ -46,10 +46,7 @@
       </li>
     </ul>
 
-    <ul
-      class="badge-suggest add-items inline"
-      style="justify-content: flex-end; display: flex"
-    >
+    <ul class="badge-suggest add-items inline text-end">
       <li
         v-for="s in suggested"
         :key="s.type + s.id"
diff --git a/src/Bundle/ChillMainBundle/Search/Entity/SearchUserGroupApiProvider.php b/src/Bundle/ChillMainBundle/Search/Entity/SearchUserGroupApiProvider.php
index acdd99976..40f1b792d 100644
--- a/src/Bundle/ChillMainBundle/Search/Entity/SearchUserGroupApiProvider.php
+++ b/src/Bundle/ChillMainBundle/Search/Entity/SearchUserGroupApiProvider.php
@@ -44,16 +44,16 @@ class SearchUserGroupApiProvider implements SearchApiInterface, LocaleAwareInter
 
     public function provideQuery(string $pattern, array $parameters): SearchApiQuery
     {
-        return $this->userGroupRepository->provideSearchApiQuery($pattern, $this->getLocale(), 'user-group');
+        return $this->userGroupRepository->provideSearchApiQuery($pattern, $this->getLocale(), 'user_group');
     }
 
     public function supportsResult(string $key, array $metadatas): bool
     {
-        return 'user-group' === $key;
+        return 'user_group' === $key;
     }
 
     public function supportsTypes(string $pattern, array $types, array $parameters): bool
     {
-        return in_array('user-group', $types, true);
+        return in_array('user_group', $types, true);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/chill.api.specs.yaml b/src/Bundle/ChillMainBundle/chill.api.specs.yaml
index 047f69675..5054af4d8 100644
--- a/src/Bundle/ChillMainBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillMainBundle/chill.api.specs.yaml
@@ -305,7 +305,7 @@ paths:
                                 - thirdparty
                                 - user
                                 - household
-                                - user-group
+                                - user_group
             responses:
                 200:
                     description: "OK"
diff --git a/src/Bundle/ChillMainBundle/chill.webpack.config.js b/src/Bundle/ChillMainBundle/chill.webpack.config.js
index 011fc9559..feabedd07 100644
--- a/src/Bundle/ChillMainBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillMainBundle/chill.webpack.config.js
@@ -26,7 +26,7 @@ module.exports = function (encore, entries) {
   );
   encore.addEntry(
     "page_homepage_widget",
-    __dirname + "/Resources/public/page/homepage_widget/index.js",
+    __dirname + "/Resources/public/page/homepage_widget/index.ts",
   );
   encore.addEntry(
     "page_export",
diff --git a/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml b/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml
index 15bc7a84e..6b893410a 100644
--- a/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml
+++ b/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml
@@ -191,3 +191,61 @@ pick_entity:
             one {Tiers}
             other {Tiers}
         }
+
+loading: "Chargement..."
+main_title: "Vue d'ensemble"
+my_tickets.tab: "Mes Tickets"
+my_works.tab: "Mes actions"
+my_works.description: "Liste des actions d'accompagnement dont je suis référent et qui arrivent à échéance."
+my_evaluations.tab: "Mes évaluations"
+my_evaluations.description: "Liste des évaluations dont je suis référent et qui arrivent à échéance."
+my_tasks.tab: "Mes tâches"
+my_tasks.description_alert: "Liste des tâches auxquelles je suis assigné et dont la date de rappel est dépassée."
+my_tasks.description_warning: "Liste des tâches auxquelles je suis assigné et dont la date d'échéance est dépassée."
+my_accompanying_courses.tab: "Mes nouveaux parcours"
+my_accompanying_courses.description: "Liste des parcours d'accompagnement que l'on vient de m'attribuer depuis moins de 15 jours."
+my_notifications.tab: "Mes nouvelles notifications"
+my_notifications.description: "Liste des notifications reçues et non lues."
+my_workflows.tab: "Mes workflows"
+my_workflows.description: "Liste des workflows en attente d'une action."
+my_workflows.description_cc: "Liste des workflows dont je suis en copie."
+opening_date: "Date d'ouverture"
+social_issues: "Problématiques sociales"
+concerned_persons: "Usagers concernés"
+max_date: "Date d'échéance"
+warning_date: "Date de rappel"
+evaluation: "Évaluation"
+task: "Tâche"
+Date: "Date"
+From: "Expéditeur"
+Subject: "Objet"
+Entity: "Associé à"
+Step: "Étape"
+concerned_users: "Usagers concernés"
+Object_workflow: "Objet du workflow"
+on_hold: "En attente"
+show_entity: "Voir {entity}"
+the_activity: "l'échange"
+the_course: "le parcours"
+the_action: "l'action"
+the_evaluation: "l'évaluation"
+the_evaluation_document: "le document"
+the_task: "la tâche"
+the_workflow: "le workflow"
+StartDate: "Date d'ouverture"
+SocialAction: "Action d'accompagnement"
+no_data: "Aucun résultats"
+no_dashboard: "Pas de tableaux de bord"
+counter.unread_notifications: "{n, plural, one {# notification non lue} other {# notifications non lues}}"
+counter.assignated_courses: "{n, plural, one {# parcours récent assigné} other {# parcours récents assignés}}"
+counter.assignated_actions: "{n, plural, one {# action assignée} other {# actions assignées}}"
+counter.assignated_evaluations: "{n, plural, one {# évaluation assignée} other {# évaluations assignées}}"
+counter.alert_tasks: "{n, plural, one {# tâche en rappel} other {# tâches en rappel}}"
+counter.warning_tasks: "{n, plural, one {# tâche à échéance} other {# tâches à échéance}}"
+emergency: "Urgent"
+confidential: "Confidentiel"
+automatic_notification: "Notification automatique"
+widget.news.title: "Actualités"
+widget.news.readMore: "Lire la suite"
+widget.news.date: "Date"
+widget.news.none: "Aucune actualité"
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/types.ts b/src/Bundle/ChillPersonBundle/Resources/public/types.ts
index 32dc24f73..a4c07e85a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/types.ts
+++ b/src/Bundle/ChillPersonBundle/Resources/public/types.ts
@@ -14,12 +14,12 @@ import {
 import { StoredObject } from "ChillDocStoreAssets/types";
 import { Thirdparty } from "../../../ChillThirdPartyBundle/Resources/public/types";
 import { Calendar } from "../../../ChillCalendarBundle/Resources/public/types";
+import Person from "./vuejs/_components/OnTheFly/Person.vue";
 
 export interface AltName {
   label: string;
   key: string;
 }
-
 export interface Person {
   id: number;
   type: "person";
@@ -45,6 +45,7 @@ export interface Person {
 
 export interface AccompanyingPeriod {
   id: number;
+  type: "accompanying_period";
   addressLocation?: Address | null;
   administrativeLocation?: Location | null;
   calendars: Calendar[];
@@ -81,6 +82,7 @@ export interface AccompanyingPeriod {
 
 export interface AccompanyingPeriodWork {
   id: number;
+  type: "accompanying_period_work";
   accompanyingPeriod?: AccompanyingPeriod;
   accompanyingPeriodWorkEvaluations: AccompanyingPeriodWorkEvaluation[];
   createdAt?: string;
@@ -105,6 +107,7 @@ export interface AccompanyingPeriodWork {
 
 export interface SocialAction {
   id: number;
+  text: string;
   parent?: SocialAction | null;
   children: SocialAction[];
   issue?: SocialIssue | null;
@@ -166,6 +169,7 @@ export interface AccompanyingPeriodLocationHistory {
 
 export interface SocialIssue {
   id: number;
+  text: string;
   parent?: SocialIssue | null;
   children: SocialIssue[];
   socialActions?: SocialAction[] | null;
@@ -206,6 +210,7 @@ export interface AccompanyingPeriodWorkGoal {
 }
 
 export interface AccompanyingPeriodWorkEvaluation {
+  type: "accompanying_period_work_evaluation";
   accompanyingPeriodWork: AccompanyingPeriodWork | null;
   comment: string;
   createdAt: DateTime | null;
@@ -236,6 +241,68 @@ export interface Evaluation {
   notificationDelay: string;
 }
 
+export interface Step {
+  currentStep: {
+    text: string;
+  };
+}
+
+export interface Workflow {
+  id: number;
+  title: string;
+  type: "accompanying_period_work" | "accompanying_period";
+  isOnHoldAtCurrentStep: boolean;
+  datas: {
+    persons: Person[];
+  };
+  steps: Step[];
+}
+
+export interface WorflowCc {
+  id: number;
+  title: string;
+  isOnHoldAtCurrentStep: boolean;
+  datas: {
+    persons: Person[];
+  };
+  steps: Step[];
+}
+
+export interface Warning {
+  id: number;
+  warningDate: DateTime;
+  endDate: DateTime;
+  title: string;
+}
+export interface Alert {
+  id: number;
+  warningDate: DateTime;
+  endDate: DateTime;
+  title: string;
+}
+
+export interface Notification {
+  id: number;
+  date: DateTime;
+  title: string;
+  sender: {
+    text: string;
+  };
+  relatedEntityClass: string;
+  relatedEntityId: number;
+}
+export interface Participation {
+  person: Person;
+}
+export interface AccompanyingCourse {
+  id: number;
+  openingDate: DateTime;
+  socialIssues: SocialIssue[];
+  participations: Participation[];
+  emergency: boolean;
+  confidential: boolean;
+}
+
 export interface AccompanyingPeriodWorkReferrerHistory {
   id: number;
   accompanyingPeriodWork: AccompanyingPeriodWork;
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
index 331522e05..42e0aff81 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
@@ -165,6 +165,7 @@ export interface TicketFilters {
   byCreatedBefore: string;
   byResponseTimeExceeded: boolean;
   byAddresseeToMe: boolean;
+  byTicketId: number | null;
 }
 
 export interface TicketFilterParams {
@@ -179,6 +180,7 @@ export interface TicketFilterParams {
   byCreatedBefore?: string;
   byResponseTimeExceeded?: string;
   byAddresseeToMe?: boolean;
+  byTicketId?: number;
 }
 
 export interface TicketInitForm {
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Comment/CommentComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Comment/CommentComponent.vue
index 215adc58b..2e63a5bdc 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Comment/CommentComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Comment/CommentComponent.vue
@@ -1,20 +1,11 @@
 <template>
-  <div class="col-12">
+  <div class="col-12" v-if="!commentHistory.deleted">
     <blockquote class="chill-user-quote">
-      <button
-        class="btn btn-sm btn-primary float-end"
-        title="Visible"
-        @click="visibleComment"
-        v-if="commentHistory.deleted"
-      >
-        <i class="bi bi-eye"></i>
-      </button>
       <button
         class="btn btn-sm bg-chill-red float-end text-white"
-        @click="maskComment"
-        v-else
+        @click="deleteComment"
       >
-        <i class="bi bi-eye-slash"></i>
+        <i class="bi bi-trash"></i>
       </button>
       <button
         class="btn btn-sm btn-edit mx-2 float-end text-white"
@@ -24,14 +15,16 @@
       />
 
       <p v-html="convertMarkdownToHtml(commentHistory.content)"></p>
-      <span
-        v-if="commentHistory.deleted"
-        class="ms-2 d-block text-center fst-italic text-muted"
-      >
-        {{ trans(CHILL_TICKET_TICKET_MASK_COMMENT_HINT) }}
-      </span>
     </blockquote>
   </div>
+  <div class="col-12" v-else>
+    <span class="ms-2 d-block text-center">
+      {{ trans(CHILL_TICKET_TICKET_MASK_COMMENT_HINT) }}
+      <button class="btn btn-primary btn-sm ms-2" @click="restoreComment">
+        {{ trans(CANCEL) }}
+      </button>
+    </span>
+  </div>
   <Modal
     v-if="editCommentModal"
     :show="editCommentModal"
@@ -75,6 +68,7 @@ import {
   CHILL_TICKET_TICKET_MASK_COMMENT_SUCCESS,
   CHILL_TICKET_TICKET_MASK_COMMENT_HINT,
   CHILL_TICKET_TICKET_VISIBLE_COMMENT_SUCCESS,
+  CANCEL,
 } from "translator";
 import { useToast } from "vue-toast-notification";
 
@@ -97,18 +91,17 @@ const saveComment = () => {
   toast.success(trans(CHILL_TICKET_TICKET_EDIT_COMMENT_SUCCESS));
 };
 
-const maskComment = () => {
-  store.dispatch("maskComment", props.commentHistory.id);
+const deleteComment = () => {
+  store.dispatch("deleteComment", props.commentHistory.id);
+  store.commit("addRemovedCommentIds", props.commentHistory.id);
   editCommentModal.value = false;
   toast.success(trans(CHILL_TICKET_TICKET_MASK_COMMENT_SUCCESS));
 };
-
-const visibleComment = () => {
-  store.dispatch("visibleComment", props.commentHistory.id);
+const restoreComment = () => {
+  store.dispatch("restoreComment", props.commentHistory.id);
   editCommentModal.value = false;
   toast.success(trans(CHILL_TICKET_TICKET_VISIBLE_COMMENT_SUCCESS));
 };
-
 const preprocess = (markdown: string): string => {
   return markdown;
 };
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Ticket/TicketSelector.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Ticket/TicketSelector.vue
new file mode 100644
index 000000000..eeafbae6c
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Ticket/TicketSelector.vue
@@ -0,0 +1,49 @@
+<template>
+  <div class="input-group mb-3">
+    <input
+      v-model="ticketId"
+      type="number"
+      class="form-control"
+      :placeholder="trans(CHILL_TICKET_LIST_FILTER_TICKET_ID)"
+      @input="
+        ticketId = isNaN(Number(($event.target as HTMLInputElement).value))
+          ? null
+          : Number(($event.target as HTMLInputElement).value)
+      "
+    />
+    <span class="input-group-text" v-if="ticketId !== null">
+      <i
+        class="fa fa-times chill-red"
+        style="cursor: pointer"
+        @click="ticketId = null"
+        title="clear"
+      ></i>
+    </span>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, watch } from "vue";
+// Translation
+import { trans, CHILL_TICKET_LIST_FILTER_TICKET_ID } from "translator";
+const props = defineProps<{
+  modelValue: number | null;
+}>();
+
+const ticketId = ref<number | null>(props.modelValue);
+
+watch(
+  () => props.modelValue,
+  (newVal) => {
+    if (newVal === null) {
+      ticketId.value = null;
+    }
+  },
+);
+
+const emit = defineEmits(["update:modelValue"]);
+
+watch(ticketId, (ticketId) => {
+  emit("update:modelValue", ticketId ? ticketId : null);
+});
+</script>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/comment.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/comment.ts
index 8f1ff9dde..932705fd3 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/comment.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/comment.ts
@@ -8,23 +8,15 @@ import { ApiException } from "../../../../../../../../ChillMainBundle/Resources/
 
 export interface State {
   comments: Comment[];
+  removedCommentIds: Comment["id"][];
 }
 
 export const moduleComment: Module<State, RootState> = {
   state: () => ({
     comments: [] as Comment[],
+    removedCommentIds: [] as Comment["id"][],
   }),
   getters: {
-    canBeDisplayed:
-      (state: State, getters: unknown, rootState: RootState) =>
-      (comment: Comment) => {
-        return (
-          (comment.deleted &&
-            comment.createdBy?.username ===
-              rootState.user.currentUser?.username) ||
-          !comment.deleted
-        );
-      },
     canBeEdited:
       (state: State, getters: unknown, rootState: RootState) =>
       (comment: Comment) => {
@@ -32,8 +24,15 @@ export const moduleComment: Module<State, RootState> = {
           comment.createdBy?.username === rootState.user.currentUser?.username
         );
       },
+    getRemovedCommentIds(state) {
+      return state.removedCommentIds;
+    },
+  },
+  mutations: {
+    addRemovedCommentIds(state, commentId: number) {
+      state.removedCommentIds.push(commentId);
+    },
   },
-  mutations: {},
   actions: {
     async createComment({ commit, rootState }, content: Comment["content"]) {
       try {
@@ -64,7 +63,7 @@ export const moduleComment: Module<State, RootState> = {
         throw error.name;
       }
     },
-    async maskComment({ commit }, id: Comment["id"]) {
+    async deleteComment({ commit }, id: Comment["id"]) {
       try {
         const result: Comment = await makeFetch(
           "POST",
@@ -77,7 +76,7 @@ export const moduleComment: Module<State, RootState> = {
       }
     },
 
-    async visibleComment({ commit }, id: Comment["id"]) {
+    async restoreComment({ commit }, id: Comment["id"]) {
       try {
         const result: Comment = await makeFetch(
           "POST",
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket_list.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket_list.ts
index a77df41a3..a5387245e 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket_list.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket_list.ts
@@ -73,7 +73,10 @@ export const moduleTicketList: Module<State, RootState> = {
               ([, value]) =>
                 value !== undefined &&
                 value !== null &&
-                (value === true || (value !== "" && value.length > 0)),
+                (value === true ||
+                  (typeof value === "number" && !isNaN(value)) ||
+                  (typeof value === "string" && value !== "") ||
+                  (Array.isArray(value) && value.length > 0)),
             ),
           );
           params = new URLSearchParams(
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/App.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/App.vue
index 2a886dfd5..1f4cfd891 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/App.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/App.vue
@@ -101,7 +101,6 @@ onMounted(async () => {
     await store.dispatch("getCurrentUser");
     await store.dispatch("fetchTicketList", filters);
     await store.dispatch("fetchMotives");
-    await store.dispatch("fetchUserGroups");
   } finally {
     isLoading.value = false;
   }
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/DateAndTimeSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/DateAndTimeSelectorComponent.vue
new file mode 100644
index 000000000..83f5e41ec
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/DateAndTimeSelectorComponent.vue
@@ -0,0 +1,65 @@
+<template>
+  <label :for="dateId" class="form-label col-12">
+    {{ label }}
+  </label>
+  <div class="d-flex gap-2">
+    <div class="input-group">
+      <input
+        type="date"
+        :id="dateId"
+        v-model="modelDate"
+        class="form-control"
+        :disabled="disabled"
+      />
+      <input
+        type="time"
+        v-model="modelTime"
+        class="form-control"
+        :disabled="disabled"
+        style="max-width: 120px"
+        placeholder="hh:mm"
+      />
+      <span class="input-group-text" v-if="modelDate">
+        <i
+          class="fa fa-times chill-red"
+          style="cursor: pointer"
+          @click="clear"
+          title="clear"
+        ></i>
+      </span>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { computed } from "vue";
+
+const props = defineProps<{
+  label: string;
+  dateId: string;
+  modelValueDate: string;
+  modelValueTime: string;
+  defaultValueTime: string;
+  disabled?: boolean;
+}>();
+
+const emit = defineEmits<{
+  (e: "update:modelValueDate", value: string): void;
+  (e: "update:modelValueTime", value: string): void;
+}>();
+
+const modelDate = computed({
+  get: () => props.modelValueDate,
+  set: (val: string) => emit("update:modelValueDate", val),
+});
+
+const modelTime = computed({
+  get: () => props.modelValueTime,
+  set: (val: string) => emit("update:modelValueTime", val),
+});
+
+function clear() {
+  emit("update:modelValueDate", "");
+  emit("update:modelValueTime", props.defaultValueTime);
+}
+</script>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketFilterListComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketFilterListComponent.vue
index 0b9f055ff..e9e0a9b27 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketFilterListComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketFilterListComponent.vue
@@ -43,12 +43,12 @@
             }}</label>
             <addressee-selector-component
               v-model="selectedAddressees"
-              :suggested="userGroups"
+              :suggested="[]"
               :label="trans(CHILL_TICKET_LIST_FILTER_BY_ADDRESSEES)"
               id="addresseeSelector"
             />
           </div>
-          <div class="col-md-6">
+          <div class="col-md-6 mb-3">
             <!-- Filtre par motifs -->
             <div class="row">
               <label class="form-label" for="motiveSelector">{{
@@ -60,7 +60,7 @@
                 id="motiveSelector"
               />
 
-              <div class="mt-1" style="min-height: 2.2em">
+              <div class="mb-2" style="min-height: 2em">
                 <div class="d-flex flex-wrap gap-2">
                   <span
                     v-for="motive in selectedMotives"
@@ -79,43 +79,40 @@
               </div>
             </div>
             <!-- Filtre par état actuel -->
-            <div class="row">
-              <div class="col-6">
-                <div class="mb-2">
-                  <label class="form-label pe-2" for="currentState">
-                    {{ trans(CHILL_TICKET_LIST_FILTER_CURRENT_STATE) }}
-                  </label>
-                  <toggle-component
-                    v-model="isClosedToggled"
-                    :on-label="trans(CHILL_TICKET_LIST_FILTER_CLOSED)"
-                    :off-label="trans(CHILL_TICKET_LIST_FILTER_OPEN)"
-                    :classColor="{
-                      on: 'bg-chill-red',
-                      off: 'bg-chill-green',
-                    }"
-                    @update:model-value="handleStateToggle"
-                    id="currentState"
-                  />
-                </div>
+            <div class="d-flex gap-3">
+              <div>
+                <label class="form-label pe-2" for="currentState">
+                  {{ trans(CHILL_TICKET_LIST_FILTER_CURRENT_STATE) }}
+                </label>
+                <toggle-component
+                  v-model="isClosedToggled"
+                  :on-label="trans(CHILL_TICKET_LIST_FILTER_CLOSED)"
+                  :off-label="trans(CHILL_TICKET_LIST_FILTER_OPEN)"
+                  :classColor="{
+                    on: 'bg-chill-red',
+                    off: 'bg-chill-green',
+                  }"
+                  @update:model-value="handleStateToggle"
+                  id="currentState"
+                />
               </div>
+
               <!-- Filtre par état d'urgence -->
-              <div class="col-6">
-                <div class="mb-2">
-                  <label class="form-label pe-2" for="emergency">
-                    {{ trans(CHILL_TICKET_LIST_FILTER_EMERGENCY) }}
-                  </label>
-                  <toggle-component
-                    v-model="isEmergencyToggled"
-                    :on-label="trans(CHILL_TICKET_LIST_FILTER_EMERGENCY)"
-                    :off-label="trans(CHILL_TICKET_LIST_FILTER_EMERGENCY)"
-                    :classColor="{
-                      on: 'bg-warning',
-                      off: 'bg-secondary',
-                    }"
-                    @update:model-value="handleEmergencyToggle"
-                    id="emergency"
-                  />
-                </div>
+              <div>
+                <label class="form-label pe-2" for="emergency">
+                  {{ trans(CHILL_TICKET_LIST_FILTER_EMERGENCY) }}
+                </label>
+                <toggle-component
+                  v-model="isEmergencyToggled"
+                  :on-label="trans(CHILL_TICKET_LIST_FILTER_EMERGENCY)"
+                  :off-label="trans(CHILL_TICKET_LIST_FILTER_EMERGENCY)"
+                  :classColor="{
+                    on: 'bg-warning',
+                    off: 'bg-secondary',
+                  }"
+                  @update:model-value="handleEmergencyToggle"
+                  id="emergency"
+                />
               </div>
             </div>
           </div>
@@ -124,6 +121,18 @@
         <div class="row">
           <!-- Filtre pour temps de réponse dépassé -->
           <div class="col-md-6 mb-3">
+            <div class="form-check">
+              <input
+                v-model="filters.byAddresseeToMe"
+                class="form-check-input"
+                type="checkbox"
+                id="stateMe"
+              />
+              <label class="form-check-label" for="stateMe">
+                {{ trans(CHILL_TICKET_LIST_FILTER_TO_ME) }}
+              </label>
+            </div>
+
             <div class="form-check">
               <input
                 class="form-check-input"
@@ -141,48 +150,40 @@
               {{ trans(CHILL_TICKET_LIST_FILTER_RESPONSE_TIME_WARNING) }}
             </small>
           </div>
-          <!-- Filtre par mes tickets -->
+          <!-- Filtre par numéro de ticket -->
           <div class="col-md-6 mb-3">
-            <div class="d-flex gap-3">
-              <div class="form-check">
-                <input
-                  v-model="filters.byAddresseeToMe"
-                  class="form-check-input"
-                  type="checkbox"
-                  id="stateMe"
-                />
-                <label class="form-check-label" for="stateMe">
-                  {{ trans(CHILL_TICKET_LIST_FILTER_TO_ME) }}
-                </label>
-              </div>
-            </div>
+            <label class="form-label pe-2" for="ticketSelector">
+              {{ trans(CHILL_TICKET_LIST_FILTER_BY_TICKET_ID) }}
+            </label>
+            <ticket-selector v-model="filters.byTicketId" id="ticketSelector" />
           </div>
         </div>
 
         <!-- Filtre par date de création -->
         <div class="row">
           <div class="col-md-6 mb-3">
-            <label for="byCreatedAfter" class="form-label">{{
-              trans(CHILL_TICKET_LIST_FILTER_CREATED_AFTER)
-            }}</label>
-            <input
-              type="datetime-local"
-              id="byCreatedAfter"
-              v-model="filters.byCreatedAfter"
-              class="form-control"
+            <date-and-time-selector-component
+              :label="trans(CHILL_TICKET_LIST_FILTER_CREATED_AFTER)"
+              date-id="byCreatedAfter"
+              default-value-time="00:00"
+              :model-value-date="filters.byCreatedAfter"
+              :model-value-time="byCreatedAfterTime"
               :disabled="filters.byResponseTimeExceeded"
+              @update:modelValueDate="filters.byCreatedAfter = $event"
+              @update:modelValueTime="byCreatedAfterTime = $event"
             />
           </div>
+
           <div class="col-md-6 mb-3">
-            <label for="byCreatedBefore" class="form-label">{{
-              trans(CHILL_TICKET_LIST_FILTER_CREATED_BEFORE)
-            }}</label>
-            <input
-              type="datetime-local"
-              id="byCreatedBefore"
-              v-model="filters.byCreatedBefore"
-              class="form-control"
+            <date-and-time-selector-component
+              :label="trans(CHILL_TICKET_LIST_FILTER_CREATED_BEFORE)"
+              date-id="byCreatedBefore"
+              default-value-time="23:59"
+              :model-value-date="filters.byCreatedBefore"
+              :model-value-time="byCreatedBeforeTime"
               :disabled="filters.byResponseTimeExceeded"
+              @update:modelValueDate="filters.byCreatedBefore = $event"
+              @update:modelValueTime="byCreatedBeforeTime = $event"
             />
           </div>
         </div>
@@ -218,10 +219,13 @@
 
 <script setup lang="ts">
 import { ref, computed, watch } from "vue";
-import { useStore } from "vuex";
 import type { Person } from "ChillPersonAssets/types";
-import type { Motive, TicketFilterParams, TicketFilters } from "../../../types";
-import { User, UserGroup, UserGroupOrUser } from "ChillMainAssets/types";
+import {
+  type Motive,
+  type TicketFilterParams,
+  type TicketFilters,
+} from "../../../types";
+import { User, UserGroupOrUser } from "ChillMainAssets/types";
 
 // Translation
 import {
@@ -234,6 +238,7 @@ import {
   CHILL_TICKET_LIST_FILTER_ADDRESSEES,
   CHILL_TICKET_LIST_FILTER_BY_ADDRESSEES,
   CHILL_TICKET_LIST_FILTER_BY_MOTIVES,
+  CHILL_TICKET_LIST_FILTER_BY_TICKET_ID,
   CHILL_TICKET_LIST_FILTER_REMOVE,
   CHILL_TICKET_LIST_FILTER_OPEN,
   CHILL_TICKET_LIST_FILTER_CLOSED,
@@ -254,6 +259,8 @@ import PersonsSelector from "../../TicketApp/components/Person/PersonsSelectorCo
 import MotiveSelector from "../../TicketApp/components/Motive/MotiveSelectorComponent.vue";
 import AddresseeSelectorComponent from "../../TicketApp/components/Addressee/AddresseeSelectorComponent.vue";
 import ToggleComponent from "./ToggleComponent.vue";
+import TicketSelector from "../../TicketApp/components/Ticket/TicketSelector.vue";
+import DateAndTimeSelectorComponent from "./DateAndTimeSelectorComponent.vue";
 
 // Props
 const props = defineProps<{
@@ -267,8 +274,6 @@ const emit = defineEmits<{
   "filters-changed": [filters: TicketFilterParams];
 }>();
 
-const store = useStore();
-
 // État réactif
 const filters = ref<TicketFilters>({
   byCurrentState: ["open"],
@@ -277,15 +282,18 @@ const filters = ref<TicketFilters>({
   byCreatedBefore: "",
   byResponseTimeExceeded: false,
   byAddresseeToMe: false,
+  byTicketId: null,
 });
 
+const byCreatedAfterTime = ref("00:00");
+const byCreatedBeforeTime = ref("23:59");
+
 // Sélection des personnes
 const selectedPersons = ref<Person[]>([]);
 const availablePersons = ref<Person[]>(props.availablePersons || []);
 
 // Sélection des utilisateur assigné
 const selectedAddressees = ref<UserGroupOrUser[]>([]);
-const userGroups = computed(() => store.getters.getUserGroups as UserGroup[]);
 
 // Séléction des créateurs
 const selectedCreator = ref<User[]>([]);
@@ -351,10 +359,10 @@ const handleEmergencyToggle = (value: boolean) => {
   }
 };
 
-// Méthodes
-const formatDateToISO = (dateString: string): string => {
-  if (!dateString) return dateString;
+const formatDateToISO = (dateString: string, timeString: string): string => {
+  const [hours, minutes] = timeString.split(":").map(Number);
   const date = new Date(dateString);
+  date.setHours(hours, minutes, 0, 0);
   return date.toISOString();
 };
 
@@ -406,11 +414,17 @@ const applyFilters = (): void => {
   }
 
   if (filters.value.byCreatedAfter) {
-    apiFilters.byCreatedAfter = formatDateToISO(filters.value.byCreatedAfter);
+    apiFilters.byCreatedAfter = formatDateToISO(
+      filters.value.byCreatedAfter,
+      byCreatedAfterTime.value,
+    );
   }
 
   if (filters.value.byCreatedBefore) {
-    apiFilters.byCreatedBefore = formatDateToISO(filters.value.byCreatedBefore);
+    apiFilters.byCreatedBefore = formatDateToISO(
+      filters.value.byCreatedBefore,
+      byCreatedBeforeTime.value,
+    );
   }
 
   if (filters.value.byResponseTimeExceeded) {
@@ -419,7 +433,12 @@ const applyFilters = (): void => {
   if (filters.value.byAddresseeToMe) {
     apiFilters.byAddresseeToMe = true;
   }
-
+  if (filters.value.byAddresseeToMe) {
+    apiFilters.byAddresseeToMe = true;
+  }
+  if (filters.value.byTicketId) {
+    apiFilters.byTicketId = filters.value.byTicketId;
+  }
   emit("filters-changed", apiFilters);
 };
 
@@ -431,13 +450,14 @@ const resetFilters = (): void => {
     byCreatedBefore: "",
     byResponseTimeExceeded: false,
     byAddresseeToMe: false,
+    byTicketId: null,
   };
   selectedPersons.value = [];
   selectedCreator.value = [];
   selectedAddressees.value = [];
   selectedMotives.value = [];
   selectedMotive.value = undefined;
-  isClosedToggled.value = true;
+  isClosedToggled.value = false;
   isEmergencyToggled.value = false;
   applyFilters();
 };
@@ -446,7 +466,7 @@ const handleResponseTimeExceededChange = (): void => {
   if (filters.value.byResponseTimeExceeded) {
     filters.value.byCreatedBefore = "";
     filters.value.byCreatedAfter = "";
-    isClosedToggled.value = true;
+    isClosedToggled.value = false;
   }
 };
 </script>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketHistoryListComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketHistoryListComponent.vue
index 6220d9a44..af36d0ca5 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketHistoryListComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketHistoryListComponent.vue
@@ -11,16 +11,6 @@
         <div class="d-flex align-items-center fw-bold">
           <i :class="`${actionIcons[history_line.event_type]} me-1`"></i>
           <span>{{ explainSentence(history_line) }}</span>
-          <span
-            v-if="
-              history_line.event_type === 'add_comment' &&
-              history_line.data.deleted
-            "
-            class="badge bg-danger ms-2"
-          >
-            {{ trans(CHILL_TICKET_TICKET_HISTORY_MASK_COMMENT) }}
-          </span>
-
           <state-component
             :new_state="history_line.data.new_state"
             v-if="history_line.event_type == 'state_change'"
@@ -59,10 +49,7 @@
       />
       <comment-component
         :commentHistory="history_line.data"
-        v-else-if="
-          history_line.event_type == 'add_comment' &&
-          canBeDisplayed(history_line.data)
-        "
+        v-else-if="history_line.event_type == 'add_comment'"
       />
       <addressee-component
         :addressees="history_line.data.addressees"
@@ -105,19 +92,24 @@ import {
   CHILL_TICKET_TICKET_HISTORY_STATE_CHANGE,
   CHILL_TICKET_TICKET_HISTORY_EMERGENCY_CHANGE,
   CHILL_TICKET_TICKET_HISTORY_SET_CALLER,
-  CHILL_TICKET_TICKET_HISTORY_MASK_COMMENT,
 } from "translator";
 
 const props = defineProps<{ history?: TicketHistoryLine[] }>();
 const history = props.history ?? [];
 const store = useStore();
 
-const actionIcons = ref(store.getters.getActionIcons);
-const canBeDisplayed = ref(store.getters.canBeDisplayed);
+const actionIcons = ref<Record<string, string>>(store.getters.getActionIcons);
+const removedCommentIds = ref<number[]>(store.getters.getRemovedCommentIds);
 
 const filteredHistoryLines = computed(() =>
   history.filter(
-    (line: TicketHistoryLine) => !(line.event_type === "add_person"),
+    (line: TicketHistoryLine) =>
+      line.event_type !== "add_person" &&
+      !(
+        line.event_type == "add_comment" &&
+        line.data.deleted &&
+        !removedCommentIds.value.includes(line.data.id)
+      ),
   ),
 );
 
diff --git a/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml b/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
index 95e211534..b47eaa035 100644
--- a/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
+++ b/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
@@ -24,6 +24,8 @@ chill_ticket:
       addressees: "Par destinataire"
       by_addressees: "Par destinataire"
       by_motives: "Par motifs"
+      by_ticket_id: "Par numéro de ticket"
+      ticket_id: "Numéro de ticket"
       current_state: "État actuel"
       open: "Ouvert"
       closed: "Clôturé"
@@ -55,7 +57,7 @@ chill_ticket:
       create_ticket: "Ticket créé"
       state_change: ""
       emergency_change: ""
-      mask_comment: "Masqué"
+      mask_comment: "Supprimer"
     previous_tickets: "Précédents tickets"
     actions_toolbar:
       cancel: "Annuler"
@@ -67,10 +69,10 @@ chill_ticket:
       reopen_success: "Rouverture du ticket réussie"
       reopen_error: "Erreur lors de la rouverture du ticket"
     visible_comment:
-      success: "Commentaire visible"
+      success: "Commentaire restauré"
     mask_comment:
-      success: "Commentaire masqué"
-      hint: "Ce commentaire est masqué; il n'est visible que par vous."
+      success: "Commentaire supprimé"
+      hint: "Ce commentaire a été supprimé."
     edit_comment:
       title: "Éditer le commentaire"
       success: "Commentaire modifié"

From e1ef65d4ca1be41662ad75d9702576eba63bb7a5 Mon Sep 17 00:00:00 2001
From: Boris Waaub <boris.waaub@digitalternative.be>
Date: Mon, 22 Sep 2025 09:23:30 +0000
Subject: [PATCH 166/283] Correction de bugs, ajout champs urgents dans la
 modal d'initialisation du ticket et ajout d'un configuration pour l'affichage
 des tabs dans la homepage

---
 .../Entity/StoredObject.php                   |   2 +-
 .../public/page/homepage_widget/index.ts      |   6 +
 .../ChillMainBundle/Resources/public/types.ts |  22 ++
 .../public/vuejs/HomepageWidget/App.vue       | 197 +++++++++---------
 .../vuejs/HomepageWidget/TabCounter.vue       |   2 +-
 .../HomepageWidget/store/modules/homepage.ts  |  26 +--
 .../Resources/views/Homepage/index.html.twig  |   8 +
 .../src/Controller/MotiveApiController.php    |   9 +
 .../ChillTicketBundle/src/Entity/Motive.php   |   2 +-
 .../src/Resources/public/types.ts             |   2 +
 .../Resources/public/vuejs/TicketApp/App.vue  |  16 +-
 .../components/ActionToolbarComponent.vue     |   1 +
 .../Addressee/AddresseeSelectorComponent.vue  |   6 +-
 .../Emergency/EmergencyToggleComponent.vue    |   1 +
 .../Motive/MotiveSelectorComponent.vue        |  20 +-
 .../components/PreviousTicketsComponent.vue   |   2 +-
 .../components/TicketInitFormComponent.vue    |  52 ++++-
 .../TicketApp/store/modules/ticket_list.ts    |   5 +
 .../Resources/public/vuejs/TicketList/App.vue |   4 +-
 19 files changed, 242 insertions(+), 141 deletions(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
index c849abacc..35ad2ee45 100644
--- a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
@@ -94,7 +94,7 @@ class StoredObject implements Document, TrackCreationInterface
     /**
      * @var Collection<int, StoredObjectVersion>&Selectable<int, StoredObjectVersion>
      */
-    #[ORM\OneToMany(mappedBy: 'storedObject', targetEntity: StoredObjectVersion::class, cascade: ['persist'], orphanRemoval: true)]
+    #[ORM\OneToMany(mappedBy: 'storedObject', targetEntity: StoredObjectVersion::class, cascade: ['persist'], orphanRemoval: true, fetch: 'EAGER')]
     private Collection&Selectable $versions;
 
     /**
diff --git a/src/Bundle/ChillMainBundle/Resources/public/page/homepage_widget/index.ts b/src/Bundle/ChillMainBundle/Resources/public/page/homepage_widget/index.ts
index 2ac0d85f7..f7dacbefd 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/page/homepage_widget/index.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/page/homepage_widget/index.ts
@@ -2,5 +2,11 @@ import App from "ChillMainAssets/vuejs/HomepageWidget/App.vue";
 import { createApp } from "vue";
 import { store } from "ChillMainAssets/vuejs/HomepageWidget/store";
 
+declare global {
+  interface Window {
+    homepage_config: string;
+  }
+}
+
 const _app = createApp(App);
 _app.use(store).mount("#homepage_widget");
diff --git a/src/Bundle/ChillMainBundle/Resources/public/types.ts b/src/Bundle/ChillMainBundle/Resources/public/types.ts
index fecb9a578..54e5658a2 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/types.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/types.ts
@@ -278,3 +278,25 @@ export interface addNewEntities {
   selected: Selected[];
   modal: Modal;
 }
+
+export enum HomepageTabs {
+  MyCustoms,
+  MyTickets,
+  MyNotifications,
+  MyAccompanyingCourses,
+  MyEvaluations,
+  MyTasks,
+  MyWorkflows,
+}
+
+export interface HomepageConfig {
+  defaultTab: HomepageTabs;
+  displayTabs: HomepageTabs[];
+}
+
+export interface TabDefinition {
+  key: HomepageTabs;
+  label: string;
+  icon: string | null;
+  counter: () => number;
+}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue
index 8016266ac..c1ac025ff 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue
@@ -1,83 +1,15 @@
 <template>
   <h2>{{ trans(MAIN_TITLE) }}</h2>
-
   <ul class="nav nav-tabs">
-    <li class="nav-item">
+    <li v-for="tab in displayedTabs" :key="tab.key" class="nav-item">
       <a
         class="nav-link"
-        :class="{ active: activeTab === 'MyCustoms' }"
-        @click="selectTab('MyCustoms')"
+        :class="{ active: activeTab === tab.key }"
+        @click="selectTab(tab.key)"
       >
-        <i class="fa fa-dashboard" />
-      </a>
-    </li>
-    <li class="nav-item">
-      <a
-        class="nav-link"
-        :class="{ active: activeTab === 'MyTickets' }"
-        @click="selectTab('MyTickets')"
-      >
-        {{ trans(MY_TICKETS_TAB) }}
-        <tab-counter :count="ticketListState.value?.count || 0" />
-      </a>
-    </li>
-    <li class="nav-item">
-      <a
-        class="nav-link"
-        :class="{ active: activeTab === 'MyNotifications' }"
-        @click="selectTab('MyNotifications')"
-      >
-        {{ trans(MY_NOTIFICATIONS_TAB) }}
-        <tab-counter :count="state.value?.notifications?.count || 0" />
-      </a>
-    </li>
-    <li class="nav-item">
-      <a
-        class="nav-link"
-        :class="{ active: activeTab === 'MyAccompanyingCourses' }"
-        @click="selectTab('MyAccompanyingCourses')"
-      >
-        {{ trans(MY_ACCOMPANYING_COURSES_TAB) }}
-      </a>
-    </li>
-    <li class="nav-item">
-      <a
-        class="nav-link"
-        :class="{ active: activeTab === 'MyEvaluations' }"
-        @click="selectTab('MyEvaluations')"
-      >
-        {{ trans(MY_EVALUATIONS_TAB) }}
-        <tab-counter :count="state.value?.evaluations?.count || 0" />
-      </a>
-    </li>
-    <li class="nav-item">
-      <a
-        class="nav-link"
-        :class="{ active: activeTab === 'MyTasks' }"
-        @click="selectTab('MyTasks')"
-      >
-        {{ trans(MY_TASKS_TAB) }}
-        <tab-counter
-          :count="
-            (state.value?.tasks?.warning?.count || 0) +
-            (state.value?.tasks?.alert?.count || 0)
-          "
-        />
-      </a>
-    </li>
-    <li class="nav-item">
-      <a
-        class="nav-link"
-        :class="{ active: activeTab === 'MyWorkflows' }"
-        @click="selectTab('MyWorkflows')"
-      >
-        {{ trans(MY_WORKFLOWS_TAB) }}
-        <tab-counter
-          :count="
-            (state.value?.workflows?.count || 0) +
-            (state.value?.workflowsCc?.count || 0)
-          "
-        />
+        <i v-if="tab.icon" :class="tab.icon" />
+        <span v-else>{{ tab.label }}</span>
+        <tab-counter v-if="tab.counter" :count="tab.counter()" />
       </a>
     </li>
     <li class="nav-item loading ms-auto py-2" v-if="loading">
@@ -87,26 +19,25 @@
       />
     </li>
   </ul>
-
   <div class="my-4">
-    <my-tickets v-if="activeTab == 'MyTickets'" />
-    <my-customs v-if="activeTab === 'MyCustoms'" />
-    <my-works v-else-if="activeTab === 'MyWorks'" />
-    <my-evaluations v-else-if="activeTab === 'MyEvaluations'" />
-    <my-tasks v-else-if="activeTab === 'MyTasks'" />
-    <my-accompanying-courses
-      v-else-if="activeTab === 'MyAccompanyingCourses'"
+    <MyCustoms v-if="activeTab === HomepageTabs.MyCustoms" />
+    <MyTickets v-else-if="activeTab === HomepageTabs.MyTickets" />
+    <MyNotifications v-else-if="activeTab === HomepageTabs.MyNotifications" />
+    <MyAccompanyingCourses
+      v-else-if="activeTab === HomepageTabs.MyAccompanyingCourses"
     />
-    <my-notifications v-else-if="activeTab === 'MyNotifications'" />
-    <my-workflows v-else-if="activeTab === 'MyWorkflows'" />
+    <MyEvaluations v-else-if="activeTab === HomepageTabs.MyEvaluations" />
+    <MyTasks v-else-if="activeTab === HomepageTabs.MyTasks" />
+    <MyWorkflows v-else-if="activeTab === HomepageTabs.MyWorkflows" />
   </div>
 </template>
 
 <script lang="ts" setup>
 import { ref, computed, onMounted } from "vue";
 import { useStore } from "vuex";
+
+// Components
 import MyCustoms from "./MyCustoms.vue";
-import MyWorks from "./MyWorks.vue";
 import MyEvaluations from "./MyEvaluations.vue";
 import MyTasks from "./MyTasks.vue";
 import MyAccompanyingCourses from "./MyAccompanyingCourses.vue";
@@ -114,6 +45,8 @@ import MyNotifications from "./MyNotifications.vue";
 import MyWorkflows from "./MyWorkflows.vue";
 import MyTickets from "./MyTickets.vue";
 import TabCounter from "./TabCounter.vue";
+
+// Translations
 import {
   MAIN_TITLE,
   MY_TICKETS_TAB,
@@ -125,33 +58,97 @@ import {
   LOADING,
   trans,
 } from "translator";
+
+// Types
+import {
+  HomepageConfig,
+  HomepageTabs,
+  TabDefinition,
+} from "ChillMainAssets/types";
+
 const store = useStore();
 
-const activeTab = ref("MyCustoms");
-
-const loading = computed(() => store.state.loading);
+defineExpose({ HomepageTabs });
 
+const homepageConfig = ref<HomepageConfig>(JSON.parse(window.homepage_config));
 const state = computed(() => store.state.homepage);
 const ticketListState = computed(() => store.state.ticketList);
 
-function selectTab(tab: string) {
-  if (tab !== "MyCustoms") {
+const tabDefinitions: TabDefinition[] = [
+  {
+    key: HomepageTabs.MyCustoms,
+    label: "",
+    icon: "fa fa-dashboard",
+    counter: () => 0,
+  },
+  {
+    key: HomepageTabs.MyTickets,
+    label: trans(MY_TICKETS_TAB),
+    icon: null,
+    counter: () => ticketListState.value?.count,
+  },
+  {
+    key: HomepageTabs.MyNotifications,
+    label: trans(MY_NOTIFICATIONS_TAB),
+    icon: null,
+    counter: () => state.value?.notifications?.count,
+  },
+  {
+    key: HomepageTabs.MyAccompanyingCourses,
+    label: trans(MY_ACCOMPANYING_COURSES_TAB),
+    icon: null,
+    counter: () => state.value?.accompanyingCourses?.count,
+  },
+  {
+    key: HomepageTabs.MyEvaluations,
+    label: trans(MY_EVALUATIONS_TAB),
+    icon: null,
+    counter: () => state.value?.evaluations?.count,
+  },
+  {
+    key: HomepageTabs.MyTasks,
+    label: trans(MY_TASKS_TAB),
+    icon: null,
+    counter: () =>
+      state.value?.tasks?.warning?.count + state.value?.tasks?.alert?.count,
+  },
+  {
+    key: HomepageTabs.MyWorkflows,
+    label: trans(MY_WORKFLOWS_TAB),
+    icon: null,
+    counter: () =>
+      state.value?.workflows?.count + state.value?.workflowsCc?.count,
+  },
+];
+
+const displayedTabs = computed(() => {
+  // Always show MyCustoms first if present
+  const tabs = [] as TabDefinition[];
+  for (const tabEnum of homepageConfig.value.displayTabs) {
+    const def = tabDefinitions.find(
+      (t) => t.key === Number(HomepageTabs[tabEnum]),
+    );
+    if (def) tabs.push(def);
+  }
+  return tabs.filter(Boolean);
+});
+
+const activeTab = ref(Number(HomepageTabs[homepageConfig.value.defaultTab]));
+
+const loading = computed(() => store.state.loading);
+
+function selectTab(tab: HomepageTabs) {
+  if (tab !== HomepageTabs.MyCustoms) {
     store.dispatch("getByTab", { tab: tab });
   }
   activeTab.value = tab;
 }
 
 onMounted(() => {
-  for (const m of [
-    "MyTickets",
-    "MyNotifications",
-    "MyAccompanyingCourses",
-    // 'MyWorks',
-    "MyEvaluations",
-    "MyTasks",
-    "MyWorkflows",
-  ]) {
-    store.dispatch("getByTab", { tab: m, param: "countOnly=1" });
+  for (const tab of displayedTabs.value) {
+    if (tab.key !== HomepageTabs.MyCustoms) {
+      store.dispatch("getByTab", { tab: tab.key, param: "countOnly=1" });
+    }
   }
 });
 </script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/TabCounter.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/TabCounter.vue
index d25d1628b..712a5247c 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/TabCounter.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/TabCounter.vue
@@ -1,5 +1,5 @@
 <template>
-  <span v-if="isCounterAvailable" class="badge rounded-pill bg-danger">
+  <span v-if="isCounterAvailable" class="badge rounded-pill bg-danger mx-2">
     {{ count }}
   </span>
 </template>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/store/modules/homepage.ts b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/store/modules/homepage.ts
index 776e5cb82..a06250c3b 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/store/modules/homepage.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/store/modules/homepage.ts
@@ -13,6 +13,7 @@ import {
   WorflowCc,
 } from "ChillPersonAssets/types";
 import { RootState } from "..";
+import { HomepageTabs } from "ChillMainAssets/types";
 
 export interface TasksState {
   warning: PaginationResponse<Warning>;
@@ -82,17 +83,6 @@ export const moduleHomepage: Module<State, RootState> = {
     isWorkflowsLoaded(state) {
       return Array.isArray(state.workflows.results);
     },
-    counter(state, getters, rootState, rootGetters) {
-      return {
-        tickets: rootGetters["ticketList/getCount"] || 0,
-        evaluations: state.evaluations.count || 0,
-        tasksWarning: state.tasks.warning.count || 0,
-        tasksAlert: state.tasks.alert.count || 0,
-        accompanyingCourses: state.accompanyingCourses.count || 0,
-        notifications: state.notifications.count || 0,
-        workflows: state.workflows.count || 0,
-      };
-    },
   },
   mutations: {
     addEvaluations(state, evaluations) {
@@ -129,20 +119,20 @@ export const moduleHomepage: Module<State, RootState> = {
   actions: {
     async getByTab({ commit, getters, dispatch }, { tab, param }) {
       switch (tab) {
-        case "MyTickets":
+        case HomepageTabs.MyTickets:
           if (!getters.isTicketsLoaded) {
             commit("setTicketsLoading", true);
             // Utilise l'action du module ticket_list
             await dispatch(
               "fetchTicketList",
-              { byAddresseeToMe: true },
+              { byAddresseeToMe: true, byCurrentState: "open" },
               { root: true },
             );
 
             commit("setTicketsLoading", false);
           }
           break;
-        case "MyEvaluations":
+        case HomepageTabs.MyEvaluations:
           if (!getters.isEvaluationsLoaded) {
             commit("setLoading", true);
             const url = `/api/1.0/person/accompanying-period/work/evaluation/my-near-end${"?" + param}`;
@@ -157,7 +147,7 @@ export const moduleHomepage: Module<State, RootState> = {
               });
           }
           break;
-        case "MyTasks":
+        case HomepageTabs.MyTasks:
           if (!(getters.isTasksWarningLoaded && getters.isTasksAlertLoaded)) {
             commit("setLoading", true);
             const urlWarning = `/api/1.0/task/single-task/list/my?f[q]=&f[checkboxes][status][]=warning&f[checkboxes][states][]=new&f[checkboxes][states][]=in_progress${"&" + param}`,
@@ -182,7 +172,7 @@ export const moduleHomepage: Module<State, RootState> = {
               });
           }
           break;
-        case "MyAccompanyingCourses":
+        case HomepageTabs.MyAccompanyingCourses:
           if (!getters.isAccompanyingCoursesLoaded) {
             commit("setLoading", true);
             const url = `/api/1.0/person/accompanying-course/list/by-recent-attributions${"?" + param}`;
@@ -197,7 +187,7 @@ export const moduleHomepage: Module<State, RootState> = {
               });
           }
           break;
-        case "MyNotifications":
+        case HomepageTabs.MyNotifications:
           if (!getters.isNotificationsLoaded) {
             commit("setLoading", true);
             const url = `/api/1.0/main/notification/my/unread${"?" + param}`;
@@ -212,7 +202,7 @@ export const moduleHomepage: Module<State, RootState> = {
               });
           }
           break;
-        case "MyWorkflows":
+        case HomepageTabs.MyWorkflows:
           if (!getters.isWorflowsLoaded) {
             commit("setLoading", true);
             makeFetch("GET", "/api/1.0/main/workflow/my")
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Homepage/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Homepage/index.html.twig
index 98af21171..290fd91ef 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Homepage/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Homepage/index.html.twig
@@ -11,5 +11,13 @@
 {% endblock %}
 
 {% block js %}
+    <script type="text/javascript">
+        window.homepage_config = JSON.stringify({
+            defaultTab: 'MyTickets',
+            displayTabs: ['MyCustoms', 'MyTickets', 'MyNotifications']
+        });
+    </script>
+
     {{ encore_entry_script_tags('page_homepage_widget') }}
+
 {% endblock %}
diff --git a/src/Bundle/ChillTicketBundle/src/Controller/MotiveApiController.php b/src/Bundle/ChillTicketBundle/src/Controller/MotiveApiController.php
index d3f682615..d57b43e7b 100644
--- a/src/Bundle/ChillTicketBundle/src/Controller/MotiveApiController.php
+++ b/src/Bundle/ChillTicketBundle/src/Controller/MotiveApiController.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\TicketBundle\Controller;
 
+use Chill\DocStoreBundle\Serializer\Normalizer\StoredObjectNormalizer;
 use Chill\MainBundle\CRUD\Controller\ApiController;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\HttpFoundation\Request;
@@ -22,4 +23,12 @@ final class MotiveApiController extends ApiController
         /* @var $query QueryBuilder */
         $query->andWhere('e.active = TRUE');
     }
+
+    protected function getContextForSerialization(string $action, Request $request, string $_format, $entity): array
+    {
+        return match ($request->getMethod()) {
+            Request::METHOD_GET => ['groups' => ['read', StoredObjectNormalizer::DOWNLOAD_LINK_ONLY]],
+            default => parent::getContextForSerialization($action, $request, $_format, $entity),
+        };
+    }
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Entity/Motive.php b/src/Bundle/ChillTicketBundle/src/Entity/Motive.php
index 380ea3d02..789d6b562 100644
--- a/src/Bundle/ChillTicketBundle/src/Entity/Motive.php
+++ b/src/Bundle/ChillTicketBundle/src/Entity/Motive.php
@@ -44,7 +44,7 @@ class Motive
     /**
      * @var Collection<int, StoredObject>
      */
-    #[ORM\ManyToMany(targetEntity: StoredObject::class)]
+    #[ORM\ManyToMany(targetEntity: StoredObject::class, fetch: 'EAGER')]
     #[ORM\JoinTable(name: 'motive_stored_objects', schema: 'chill_ticket')]
     private Collection $storedObjects;
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
index 42e0aff81..4c31f2341 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
@@ -186,6 +186,8 @@ export interface TicketFilterParams {
 export interface TicketInitForm {
   content: string;
   motive?: Motive;
+  addressees: UserGroupOrUser[];
   persons: Person[];
   caller: Person | null;
+  emergency: TicketEmergencyState;
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
index b9d330543..6cdc02ac9 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
@@ -87,12 +87,16 @@ async function handleFormSubmit(ticketForm: TicketInitForm) {
       toast.warning(trans(CHILL_TICKET_TICKET_INIT_FORM_WARNING));
       return;
     }
+
     if (ticketForm.content && ticketForm.content.trim() !== "") {
       await store.dispatch("createComment", ticketForm.content);
     } else {
       toast.warning(trans(CHILL_TICKET_TICKET_INIT_FORM_WARNING));
       return;
     }
+
+    await store.dispatch("setEmergency", ticketForm.emergency);
+    await store.dispatch("setAddressees", ticketForm.addressees);
     await store.dispatch("setPersons", ticketForm.persons);
 
     // Forcer le rafraîchissement des composants
@@ -111,13 +115,13 @@ function closeModal() {
   showTicketInitFormModal.value = false;
 }
 
-onMounted(async () => {
+onMounted(() => {
   try {
-    await store.dispatch("getCurrentUser");
-    await store.dispatch("fetchMotives");
-    await store.dispatch("fetchUserGroups");
-    await store.dispatch("fetchUsers");
-    await store.dispatch("getSuggestedPersons");
+    store.dispatch("getCurrentUser");
+    store.dispatch("fetchMotives");
+    store.dispatch("fetchUserGroups");
+    store.dispatch("fetchUsers");
+    store.dispatch("getSuggestedPersons");
     showTicketInitFormModal.value = store.getters.isIncompleteTicket;
   } catch (error) {
     toast.error(error as string);
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
index 589066e3d..6c437f0b7 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
@@ -41,6 +41,7 @@
           <motive-selector-component
             v-model="motive"
             :motives="motives"
+            open-direction="top"
             v-if="activeTab === 'set_motive'"
           />
           <div v-if="activeTab === 'persons_state'">
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Addressee/AddresseeSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Addressee/AddresseeSelectorComponent.vue
index 074e3b7c1..02040b008 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Addressee/AddresseeSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Addressee/AddresseeSelectorComponent.vue
@@ -46,10 +46,12 @@ const suggestedValues = ref<Entities[]>([...props.suggested]);
 watch(
   () => [props.suggested, props.modelValue],
   () => {
-    const modelValue = props.modelValue ?? [];
+    // Mise à jour des entités sélectionnées
+    selectedEntities.value = [...(props.modelValue as Entities[])];
 
+    // Filtrage des suggestions
     suggestedValues.value = props.suggested.filter((suggested: Entities) => {
-      return !modelValue.some((selected: Entities) => {
+      return !props.modelValue.some((selected: Entities) => {
         if (suggested.type == "user_group" && selected.type == "user_group") {
           switch (selected.excludeKey) {
             case "level":
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Emergency/EmergencyToggleComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Emergency/EmergencyToggleComponent.vue
index e41d6a560..3c2022cb2 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Emergency/EmergencyToggleComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Emergency/EmergencyToggleComponent.vue
@@ -9,6 +9,7 @@
       }"
       @click="toggleEmergency"
       :disabled="props.disabled"
+      type="button"
     >
       {{ trans(CHILL_TICKET_TICKET_BANNER_EMERGENCY) }}
     </button>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveSelectorComponent.vue
index cbc428675..b1f6315d1 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveSelectorComponent.vue
@@ -8,7 +8,7 @@
           label="label"
           :custom-label="customLabel"
           track-by="id"
-          open-direction="top"
+          :open-direction="openDirection"
           :multiple="false"
           :searchable="true"
           :placeholder="trans(CHILL_TICKET_TICKET_SET_MOTIVE_LABEL)"
@@ -46,10 +46,20 @@ import {
 // Component
 import PelotonComponent from "../PelotonComponent.vue";
 
-const props = defineProps<{
-  modelValue?: Motive;
-  motives: Motive[];
-}>();
+const props = defineProps({
+  modelValue: {
+    type: Object as () => Motive | undefined,
+    default: undefined,
+  },
+  motives: {
+    type: Array as () => Motive[],
+    default: () => [],
+  },
+  openDirection: {
+    type: String,
+    default: "bottom",
+  },
+});
 
 const emit =
   defineEmits<(e: "update:modelValue", value: Motive | undefined) => void>();
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PreviousTicketsComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PreviousTicketsComponent.vue
index 8c33d804c..8570ab184 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PreviousTicketsComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PreviousTicketsComponent.vue
@@ -84,7 +84,7 @@ const currentPersons = computed(
   () => store.getters.getCurrentPersons as Person[],
 );
 const previousTickets = computed(
-  () => store.getters.getTicketList as TicketSimple[],
+  () => store.getters.getPreviousTicketList as TicketSimple[],
 );
 
 onMounted(async () => {
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketInitFormComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketInitFormComponent.vue
index 19d1c4c2e..9d7e6dee1 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketInitFormComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketInitFormComponent.vue
@@ -12,7 +12,16 @@
             :motives="motives"
           />
         </div>
-
+        <!-- Attribution des tickets -->
+        <div class="mb-3">
+          <label class="form-label">
+            {{ trans(CHILL_TICKET_TICKET_ADD_COMMENT_TITLE) }}
+          </label>
+          <addressee-selector-component
+            v-model="ticketForm.addressees"
+            :suggested="userGroups"
+          />
+        </div>
         <!-- Sélection des personnes -->
         <div class="row mb-3">
           <div class="col-md-6">
@@ -51,6 +60,22 @@
             :motive="ticketForm.motive"
           />
         </div>
+        <div class="mb-3">
+          <label class="form-label pe-2" for="emergency">
+            {{ trans(CHILL_TICKET_LIST_FILTER_EMERGENCY) }}
+          </label>
+          <toggle-component
+            v-model="isEmergency"
+            :on-label="trans(CHILL_TICKET_LIST_FILTER_EMERGENCY)"
+            :off-label="trans(CHILL_TICKET_LIST_FILTER_EMERGENCY)"
+            :classColor="{
+              on: 'bg-warning',
+              off: 'bg-secondary',
+            }"
+            id="emergency"
+            class="float-end"
+          />
+        </div>
 
         <!-- Boutons d'action -->
         <div class="d-flex justify-content-end gap-2 mt-4">
@@ -67,16 +92,23 @@
 </template>
 
 <script setup lang="ts">
-import { reactive, watch } from "vue";
+import { computed, reactive, ref, watch } from "vue";
 import { useStore } from "vuex";
 
 // Components
 import MotiveSelectorComponent from "./Motive/MotiveSelectorComponent.vue";
 import CommentEditorComponent from "./Comment/CommentEditorComponent.vue";
 import PersonsSelectorComponent from "./Person/PersonsSelectorComponent.vue";
+import AddresseeSelectorComponent from "./Addressee/AddresseeSelectorComponent.vue";
+import ToggleComponent from "../../TicketList/components/ToggleComponent.vue";
 
 // Types
-import { Motive, Ticket, TicketInitForm } from "../../../types";
+import {
+  Motive,
+  Ticket,
+  TicketEmergencyState,
+  TicketInitForm,
+} from "../../../types";
 import { Person } from "ChillPersonAssets/types";
 
 // Translations
@@ -90,7 +122,9 @@ import {
   CHILL_TICKET_TICKET_SET_PERSONS_TITLE_PERSON,
   CHILL_TICKET_TICKET_SET_PERSONS_CALLER_LABEL,
   CHILL_TICKET_TICKET_SET_PERSONS_USER_LABEL,
+  CHILL_TICKET_LIST_FILTER_EMERGENCY,
 } from "translator";
+import { UserGroup, UserGroupOrUser } from "ChillMainAssets/types";
 
 const props = defineProps<{
   ticket: Ticket;
@@ -107,11 +141,19 @@ const store = useStore();
 
 const ticketForm = reactive({
   content: "",
+  addressees: props.ticket.currentAddressees as UserGroupOrUser[],
   motive: props.ticket.currentMotive as Motive | null,
   persons: props.ticket.currentPersons as Person[],
   caller: props.ticket.caller as Person | null,
+  emergency: props.ticket.emergency as TicketEmergencyState,
 } as TicketInitForm);
 
+const isEmergency = ref<boolean>(
+  props.ticket.emergency == "yes" ? true : false,
+);
+
+const userGroups = computed(() => store.getters.getUserGroups as UserGroup[]);
+
 watch(
   () => ticketForm.caller,
   async (newCaller) => {
@@ -124,16 +166,18 @@ function submitForm() {
   emit("submit", {
     content: ticketForm.content,
     motive: ticketForm.motive,
+    addressees: [...ticketForm.addressees],
     persons: [...ticketForm.persons],
     caller: ticketForm.caller,
+    emergency: isEmergency.value ? "yes" : "no",
   });
 }
-
 function resetForm() {
   ticketForm.content = "";
   ticketForm.motive = undefined;
   ticketForm.persons = [];
   ticketForm.caller = null;
+  ticketForm.emergency = props.ticket.emergency as TicketEmergencyState;
 }
 </script>
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket_list.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket_list.ts
index a5387245e..af60123a8 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket_list.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket_list.ts
@@ -36,6 +36,11 @@ export const moduleTicketList: Module<State, RootState> = {
     getTicketList(state): TicketSimple[] {
       return state.ticket_list;
     },
+    getPreviousTicketList(state, getters, rootState): TicketSimple[] {
+      return state.ticket_list.filter(
+        (ticket) => ticket.id !== rootState.ticket.ticket.id,
+      );
+    },
     getPagination(state) {
       return state.pagination;
     },
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/App.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/App.vue
index 1f4cfd891..de34d0d28 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/App.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/App.vue
@@ -98,9 +98,9 @@ onMounted(async () => {
     byAddresseeToMe: false,
   };
   try {
-    await store.dispatch("getCurrentUser");
     await store.dispatch("fetchTicketList", filters);
-    await store.dispatch("fetchMotives");
+    store.dispatch("getCurrentUser");
+    store.dispatch("fetchMotives");
   } finally {
     isLoading.value = false;
   }

From 4637dc692c5a568747b56142c8a525ba8625571a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 29 Sep 2025 13:05:32 +0200
Subject: [PATCH 167/283] Add `OverrideTranslationCommand` for generating
 customized translation catalogues

- Introduced a Symfony console command `chill:main:override_translation` to apply YAML-defined translation overrides.
- Added an example configuration file in `resources/translation_override/` to illustrate usage.
- Updated service definitions to register the new command.
---
 resources/translation_override/README.md      |   6 +
 resources/translation_override/overrides.yaml |   8 ++
 .../Command/OverrideTranslationCommand.php    | 115 ++++++++++++++++++
 .../config/services/command.yaml              |  18 +--
 4 files changed, 132 insertions(+), 15 deletions(-)
 create mode 100644 resources/translation_override/README.md
 create mode 100644 resources/translation_override/overrides.yaml
 create mode 100644 src/Bundle/ChillMainBundle/Command/OverrideTranslationCommand.php

diff --git a/resources/translation_override/README.md b/resources/translation_override/README.md
new file mode 100644
index 000000000..837f071fd
--- /dev/null
+++ b/resources/translation_override/README.md
@@ -0,0 +1,6 @@
+In this directory, you find an example of file for the command `chill:main:override_translation`.
+
+This file contains a list of translations to override in the translation catalogue. Each entry is a dictionary with two keys: `from` and `to`. The `from` key contains the original translation string, and the `to` key contains the replacement string.
+
+The command `chill:main:override_translation` uses this file to generate a new translation catalogue with the specified overrides applied.
+
diff --git a/resources/translation_override/overrides.yaml b/resources/translation_override/overrides.yaml
new file mode 100644
index 000000000..c9f896df0
--- /dev/null
+++ b/resources/translation_override/overrides.yaml
@@ -0,0 +1,8 @@
+- {from: "de l'usager", to: "du patient"}
+- {from: "l'usager", to: "le patient"}
+- {from: "L'usager", to: "Le patient"}
+- {from: "d'usagers", to: "de patients"}
+- {from: "usagers", to: "patients"}
+- {from: "Usagers", to: "Patients"}
+- {from: "usager", to: "patient"}
+- {from: "Usager", to: "Patient"}
diff --git a/src/Bundle/ChillMainBundle/Command/OverrideTranslationCommand.php b/src/Bundle/ChillMainBundle/Command/OverrideTranslationCommand.php
new file mode 100644
index 000000000..0f8070456
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Command/OverrideTranslationCommand.php
@@ -0,0 +1,115 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Command;
+
+use Symfony\Component\Console\Command\Command;
+use Symfony\Component\Console\Input\InputArgument;
+use Symfony\Component\Console\Input\InputInterface;
+use Symfony\Component\Console\Output\OutputInterface;
+use Symfony\Component\HttpKernel\KernelInterface;
+use Symfony\Component\Translation\MessageCatalogue;
+use Symfony\Component\Translation\Reader\TranslationReaderInterface;
+use Symfony\Component\Translation\Writer\TranslationWriterInterface;
+use Symfony\Component\Yaml\Yaml;
+
+class OverrideTranslationCommand extends Command
+{
+    public function __construct(
+        private readonly TranslationReaderInterface $reader,
+        private readonly TranslationWriterInterface $writer,
+    ) {
+        $this->setName('chill:main:override_translation');
+        parent::__construct();
+    }
+
+    protected function configure(): void
+    {
+        $this
+            ->setDescription('Generate a translation catalogue with translation remplacements based on replacements provided in a YAML file.')
+            ->addArgument('locale', InputArgument::REQUIRED, 'The locale to process (e.g. fr, en).')
+            ->addArgument('overrides', InputArgument::REQUIRED, 'Path to the overrides YAML file (list of {from, to}).');
+    }
+
+    protected function execute(InputInterface $input, OutputInterface $output): int
+    {
+        $locale = (string) $input->getArgument('locale');
+        $overridesPath = (string) $input->getArgument('overrides');
+
+        $catalogue = $this->loadCatalogue($locale);
+        $overrides = $this->loadOverrides($overridesPath);
+
+
+        $toOverrideCatalogue = new MessageCatalogue($locale);
+        foreach ($catalogue->getDomains() as $domain) {
+            // hack: we have to replace the suffix ".intl-icu" by "+intl-ic"
+            $domain = str_replace('.intl-icu', '+intl-icu', $domain);
+            foreach ($catalogue->all($domain) as $key => $translation) {
+                foreach ($overrides as $changes) {
+                    $from = $changes['from'];
+                    $to = $changes['to'];
+
+                    if (is_string($translation) && str_contains($translation, $from)) {
+                        $newTranslation = strtr($translation, [$from => $to]);
+                        $toOverrideCatalogue->set($key, $newTranslation, $domain);
+                        $translation = $newTranslation;
+                    }
+                }
+            }
+        }
+
+        /** @var KernelInterface $kernel */
+        /* @phpstan-ignore-next-line */
+        $kernel = $this->getApplication()->getKernel();
+        $outputDir = rtrim($kernel->getProjectDir(), '/').'/translations';
+        if (!is_dir($outputDir)) {
+            @mkdir($outputDir, 0775, true);
+        }
+
+        // Writer expects the 'path' option to be a directory; it will create the proper file name
+        $this->writer->write($toOverrideCatalogue, 'yaml', ['path' => $outputDir]);
+
+        $output->writeln(sprintf('Override catalogue written to %s (domain: messages, locale: %s).', $outputDir, $locale));
+
+        return Command::SUCCESS;
+    }
+
+    /**
+     * @return list<array{from: string, to: string}>
+     */
+    private function loadOverrides(string $path): array
+    {
+        return Yaml::parseFile($path);
+    }
+
+    private function loadCatalogue(string $locale): MessageCatalogue
+    {
+        /** @var KernelInterface $kernel */
+        /* @phpstan-ignore-next-line */
+        $kernel = $this->getApplication()->getKernel();
+
+        // collect path for translations
+        $transPaths = [];
+        foreach ($kernel->getBundles() as $bundle) {
+            $bundleDir = $bundle->getPath();
+            $transPaths[] = is_dir($bundleDir.'/Resources/translations') ? $bundleDir.'/Resources/translations' : $bundle->getPath().'/translations';
+        }
+
+        $currentCatalogue = new MessageCatalogue($locale);
+        foreach ($transPaths as $path) {
+            if (is_dir($path)) {
+                $this->reader->read($path, $currentCatalogue);
+            }
+        }
+
+        return $currentCatalogue;
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/config/services/command.yaml b/src/Bundle/ChillMainBundle/config/services/command.yaml
index 313ca28c5..2b765a1c1 100644
--- a/src/Bundle/ChillMainBundle/config/services/command.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/command.yaml
@@ -42,38 +42,26 @@ services:
             - { name: console.command }
 
     Chill\MainBundle\Command\LoadAddressesFRFromBANOCommand:
-        autoconfigure: true
-        autowire: true
         tags:
             - { name: console.command }
 
     Chill\MainBundle\Command\LoadAddressesFRFromBANCommand:
-        autoconfigure: true
-        autowire: true
         tags:
             - { name: console.command }
 
     Chill\MainBundle\Command\LoadAddressesBEFromBestAddressCommand:
-        autoconfigure: true
-        autowire: true
         tags:
             - { name: console.command }
 
     Chill\MainBundle\Command\LoadPostalCodeFR:
-        autoconfigure: true
-        autowire: true
         tags:
             - { name: console.command }
 
     Chill\MainBundle\Command\LoadAddressesLUFromBDAddressCommand:
-        autoconfigure: true
-        autowire: true
         tags:
             - { name: console.command }
 
     Chill\MainBundle\Command\ExecuteCronJobCommand:
-        autoconfigure: true
-        autowire: true
         tags:
             - {name: console.command }
 
@@ -81,6 +69,6 @@ services:
         tags:
             - {name: console.command}
 
-    Chill\MainBundle\Command\DumpListPermissionsCommand:
-        autoconfigure: true
-        autowire: true
+    Chill\MainBundle\Command\DumpListPermissionsCommand: ~
+
+    Chill\MainBundle\Command\OverrideTranslationCommand: ~

From 4f51ef81adaabd6c00603b7c3211837e81a9996a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 29 Sep 2025 13:05:42 +0200
Subject: [PATCH 168/283] Add resources and examples for
 `chill:main:ticket_motives_import` command

- Added a `README.md` file in `resources/ticket_motives_import/` to explain the command's usage.
- Included a sample `motives.yaml` file with predefined ticket motives for importing.
---
 resources/ticket_motives_import/README.md    |   8 ++
 resources/ticket_motives_import/motives.yaml | 136 +++++++++++++++++++
 2 files changed, 144 insertions(+)
 create mode 100644 resources/ticket_motives_import/README.md
 create mode 100644 resources/ticket_motives_import/motives.yaml

diff --git a/resources/ticket_motives_import/README.md b/resources/ticket_motives_import/README.md
new file mode 100644
index 000000000..a24a80e5a
--- /dev/null
+++ b/resources/ticket_motives_import/README.md
@@ -0,0 +1,8 @@
+In this directory, you find an example of file for the command `chill:main:ticket_motives_import`.
+
+This file contains a list of ticket motives to import into the system. Each entry is a dictionary with two keys: `code` and `label`. The `code` key contains the unique code for the ticket motive, and the `label` key contains the human-readable label for the ticket motive.
+
+The `stored_objects` key contains the documents that will be associated with the tickets. They must be found in the same directory.
+
+The command `chill:main:ticket_motives_import` uses this file to import the specified ticket motives into the system.
+
diff --git a/resources/ticket_motives_import/motives.yaml b/resources/ticket_motives_import/motives.yaml
new file mode 100644
index 000000000..fb6bcb159
--- /dev/null
+++ b/resources/ticket_motives_import/motives.yaml
@@ -0,0 +1,136 @@
+- label:
+    fr: Appel famille pour annonce de décès
+  urgent: false
+  supplementary_informations:
+  - label:
+      fr: Date du décès
+  - label:
+      fr: lieu du décès (domicile ou hôpital)
+  - label:
+      fr: nom de l’hôpital
+  - label:
+      fr: service concerné
+  stored_objects:
+  - label:
+      fr: ☀️ De 07h à 21h
+    filename: 2_doc_20250402_Pelotons flux externes consolidés.pdf
+  - label:
+      fr: 🌙 De 21h à 07h du matin
+    filename: 3_doc_20250402_Pelotons flux externes consolidés.pdf
+  - label:
+      fr: 🗓️ Dimanches et jours fériés
+    filename: 4_doc_20250402_Pelotons flux externes consolidés.pdf
+- label:
+    fr: 'Appel famille pour annonce absence : hospitalisation ou consultation'
+  urgent: false
+  supplementary_informations:
+  - label:
+      fr: Quel hôpital
+  - label:
+      fr: quel service
+  - label:
+      fr: pour quelles raisons
+  - label:
+      fr: 'consultation : date et heure'
+  - label:
+      fr: hospitalisation complète ou HDJ
+  stored_objects:
+  - label:
+      fr: ☀️ De 07h à 21h
+    filename: 5_doc_20250402_Pelotons flux externes consolidés.pdf
+  - label:
+      fr: 🌙 De 21h à 07h du matin
+    filename: 6_doc_20250402_Pelotons flux externes consolidés.pdf
+  - label:
+      fr: 🗓️ Dimanches et jours fériés
+    filename: 7_doc_20250402_Pelotons flux externes consolidés.pdf
+- label:
+    fr: 'Appel famille pour annonce absence : interruption de prise en charge'
+  urgent: false
+  supplementary_informations:
+  - label:
+      fr: Pour quelles raisons ? Date
+  - label:
+      fr: durée
+  - label:
+      fr: accord médical ?
+  stored_objects:
+  - label:
+      fr: ☀️ De 07h à 21h
+    filename: 8_doc_20250402_Pelotons flux externes consolidés.pdf
+  - label:
+      fr: 🌙 De 21h à 07h du matin
+    filename: 9_doc_20250402_Pelotons flux externes consolidés.pdf
+  - label:
+      fr: 🗓️ Dimanches et jours fériés
+    filename: 10_doc_20250402_Pelotons flux externes consolidés.pdf
+- label:
+    fr: 'Appel famille pour annonce absence : changement d’adresse'
+  urgent: false
+  supplementary_informations:
+  - label:
+      fr: Où
+  - label:
+      fr: Pourquoi ? Pour combien de temps ? Besoin d’un relais des soins ? Nouvelle adresse ?
+  stored_objects:
+  - label:
+      fr: ☀️ De 07h à 21h
+    filename: 11_doc_20250402_Pelotons flux externes consolidés.pdf
+  - label:
+      fr: 🌙 De 21h à 07h du matin
+    filename: 12_doc_20250402_Pelotons flux externes consolidés.pdf
+  - label:
+      fr: 🗓️ Dimanches et jours fériés
+    filename: 13_doc_20250402_Pelotons flux externes consolidés.pdf
+- label:
+    fr: Appel famille pour altération de l’état général du patient
+  urgent: true
+  supplementary_informations:
+  - label:
+      fr: Recherche des symptômes
+  - label:
+      fr: Attentes par rapport à la demande
+  stored_objects:
+  - label:
+      fr: ☀️ De 07h à 21h
+    filename: 14_doc_20250402_Pelotons flux externes consolidés.pdf
+  - label:
+      fr: 🌙 De 21h à 07h du matin
+    filename: 15_doc_20250402_Pelotons flux externes consolidés.pdf
+  - label:
+      fr: 🗓️ Dimanches et jours fériés
+    filename: 16_doc_20250402_Pelotons flux externes consolidés.pdf
+- label:
+    fr: Appel famille pour prise en charge de la douleur
+  urgent: true
+  supplementary_informations:
+  - label:
+      fr: Localisation douleur
+  - label:
+      fr: Horaire dernier passage
+  - label:
+      fr: Traitements en cours
+  stored_objects:
+  - label:
+      fr: ☀️ De 07h à 21h
+    filename: 17_doc_20250402_Pelotons flux externes consolidés.pdf
+  - label:
+      fr: 🌙 De 21h à 07h du matin
+    filename: 18_doc_20250402_Pelotons flux externes consolidés.pdf
+  - label:
+      fr: 🗓️ Dimanches et jours fériés
+    filename: 19_doc_20250402_Pelotons flux externes consolidés.pdf
+- label:
+    fr: Appel famille pour information sur la date de prise en charge
+  urgent: false
+  supplementary_informations: []
+  stored_objects:
+  - label:
+      fr: ☀️ De 07h à 21h
+    filename: 20_doc_20250402_Pelotons flux externes consolidés.pdf
+  - label:
+      fr: 🌙 De 21h à 07h du matin
+    filename: 21_doc_20250402_Pelotons flux externes consolidés.pdf
+  - label:
+      fr: 🗓️ Dimanches et jours fériés
+    filename: 22_doc_20250402_Pelotons flux externes consolidés.pdf

From 3928b2cc7ac43174738bb4d93404452d015a535a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 29 Sep 2025 15:03:05 +0000
Subject: [PATCH 169/283] Refactor `MenuComposer` to improve type safety and
 simplify local menu builder integration

---
 .../ChillMainBundle/ChillMainBundle.php       |   2 -
 .../Resources/views/Menu/section.html.twig    |  32 ++---
 .../ChillMainBundle/Routing/MenuComposer.php  |  70 ++++++-----
 .../ChillMainBundle/Routing/MenuTwig.php      |  14 +--
 .../Tests/Services/MenuComposerTest.php       | 109 ++++++++++++++----
 .../config/services/routing.yaml              |   5 +-
 6 files changed, 132 insertions(+), 100 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/ChillMainBundle.php b/src/Bundle/ChillMainBundle/ChillMainBundle.php
index 4a059662c..8d2969ee3 100644
--- a/src/Bundle/ChillMainBundle/ChillMainBundle.php
+++ b/src/Bundle/ChillMainBundle/ChillMainBundle.php
@@ -14,7 +14,6 @@ namespace Chill\MainBundle;
 use Chill\MainBundle\Cron\CronJobInterface;
 use Chill\MainBundle\CRUD\CompilerPass\CRUDControllerCompilerPass;
 use Chill\MainBundle\DependencyInjection\CompilerPass\ACLFlagsCompilerPass;
-use Chill\MainBundle\DependencyInjection\CompilerPass\MenuCompilerPass;
 use Chill\MainBundle\DependencyInjection\CompilerPass\NotificationCounterCompilerPass;
 use Chill\MainBundle\DependencyInjection\CompilerPass\SearchableServicesCompilerPass;
 use Chill\MainBundle\DependencyInjection\CompilerPass\TimelineCompilerClass;
@@ -70,7 +69,6 @@ class ChillMainBundle extends Bundle
         $container->addCompilerPass(new TimelineCompilerClass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
         $container->addCompilerPass(new WidgetsCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
         $container->addCompilerPass(new NotificationCounterCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
-        $container->addCompilerPass(new MenuCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
         $container->addCompilerPass(new ACLFlagsCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
         $container->addCompilerPass(new CRUDControllerCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
     }
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Menu/section.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Menu/section.html.twig
index 67683bf50..56bb9a2a9 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Menu/section.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Menu/section.html.twig
@@ -1,34 +1,16 @@
-{#
- * Copyright (C) 2014-2015, Champs Libres Cooperative SCRLFS, 
- <info@champs-libres.coop> / <http://www.champs-libres.coop>
- *
- * This program is free software: you can redistribute it and/or modify
- *  it under the terms of the GNU Affero General Public License as
- * published by the Free Software Foundation, either version 3 of the
- *  License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU Affero General Public License for more details.
- *
- * You should have received a copy of the GNU Affero General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
-#}
-
 <li class="nav-item dropdown btn btn-primary nav-section">
-    <a id="menu-section" 
-        class="nav-link dropdown-toggle" 
-        type="button" 
-        data-bs-toggle="dropdown" 
-        aria-haspopup="true" 
+    <a id="menu-section"
+        class="nav-link dropdown-toggle"
+        type="button"
+        data-bs-toggle="dropdown"
+        aria-haspopup="true"
         aria-expanded="false">
-        
+
         {{ 'Sections'|trans }}
     </a>
     <div class="dropdown-menu dropdown-menu-end dropdown-menu-dark" aria-labelledby="menu-section">
         {% for menu in menus %}
-            <a class="dropdown-item list-group-item bg-dark text-white" 
+            <a class="dropdown-item list-group-item bg-dark text-white"
                 href="{{ menu.uri }}">
                 {{ menu.label }}
                 {% apply spaceless %}
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuComposer.php b/src/Bundle/ChillMainBundle/Routing/MenuComposer.php
index e16b10e8f..101a97f6e 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuComposer.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuComposer.php
@@ -13,32 +13,30 @@ namespace Chill\MainBundle\Routing;
 
 use Knp\Menu\FactoryInterface;
 use Knp\Menu\ItemInterface;
-use Symfony\Component\Routing\RouteCollection;
+use Knp\Menu\MenuItem;
 use Symfony\Component\Routing\RouterInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
  * This class permit to build menu from the routing information
  * stored in each bundle.
- *
- * how to must come here FIXME
  */
-class MenuComposer
+final readonly class MenuComposer
 {
-    private array $localMenuBuilders = [];
+    public function __construct(
+        private RouterInterface $router,
+        private FactoryInterface $menuFactory,
+        private TranslatorInterface $translator,
+        /**
+         * @var iterable<LocalMenuBuilderInterface>
+         */
+        private iterable $localMenuBuilders,
+    ) {}
 
-    private RouteCollection $routeCollection;
-
-    public function __construct(private readonly RouterInterface $router, private readonly FactoryInterface $menuFactory, private readonly TranslatorInterface $translator) {}
-
-    public function addLocalMenuBuilder(LocalMenuBuilderInterface $menuBuilder, $menuId)
+    public function getMenuFor($menuId, array $parameters = []): ItemInterface
     {
-        $this->localMenuBuilders[$menuId][] = $menuBuilder;
-    }
-
-    public function getMenuFor($menuId, array $parameters = [])
-    {
-        $routes = $this->getRoutesFor($menuId, $parameters);
+        $routes = $this->getRoutesForInternal($menuId, $parameters);
+        /** @var MenuItem $menu */
         $menu = $this->menuFactory->createItem($menuId);
 
         // build menu from routes
@@ -55,10 +53,9 @@ class MenuComposer
                 ]);
         }
 
-        if ($this->hasLocalMenuBuilder($menuId)) {
-            foreach ($this->localMenuBuilders[$menuId] as $builder) {
-                /* @var $builder LocalMenuBuilderInterface */
-                $builder->buildMenu($menuId, $menu, $parameters['args']);
+        foreach ($this->localMenuBuilders as $builder) {
+            if (in_array($menuId, $builder::getMenuIds(), true)) {
+                $builder->buildMenu($menuId, $menu, $parameters);
             }
         }
 
@@ -71,12 +68,16 @@ class MenuComposer
      * Return an array of routes added to $menuId,
      * The array is aimed to build route with MenuTwig.
      *
-     * @param string $menuId
-     * @param array  $parameters see https://redmine.champs-libres.coop/issues/179
+     * @deprecated
      *
-     * @return array
+     * @param array $parameters see https://redmine.champs-libres.coop/issues/179
      */
-    public function getRoutesFor($menuId, array $parameters = [])
+    public function getRoutesFor(string $menuId, array $parameters = []): array
+    {
+        return $this->getRoutesForInternal($menuId, $parameters);
+    }
+
+    private function getRoutesForInternal(string $menuId, array $parameters = []): array
     {
         $routes = [];
         $routeCollection = $this->router->getRouteCollection();
@@ -108,22 +109,17 @@ class MenuComposer
      * should be used, or `getRouteFor`. The method `getMenuFor` should be used
      * if the result is true (it **does** exists at least one menu builder.
      *
-     * @param string $menuId
+     * @deprecated
      */
-    public function hasLocalMenuBuilder($menuId): bool
+    public function hasLocalMenuBuilder(string $menuId): bool
     {
-        return \array_key_exists($menuId, $this->localMenuBuilders);
-    }
+        foreach ($this->localMenuBuilders as $localMenuBuilder) {
+            if (in_array($menuId, $localMenuBuilder::getMenuIds(), true)) {
+                return true;
+            }
+        }
 
-    /**
-     * Set the route Collection
-     * This function is needed for testing purpose: routeCollection is not
-     * available as a service (RouterInterface is provided as a service and
-     * added to this class as paramater in __construct).
-     */
-    public function setRouteCollection(RouteCollection $routeCollection)
-    {
-        $this->routeCollection = $routeCollection;
+        return false;
     }
 
     private function reorderMenu(ItemInterface $menu)
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuTwig.php b/src/Bundle/ChillMainBundle/Routing/MenuTwig.php
index 3b6ce7e02..409dcca11 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuTwig.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuTwig.php
@@ -18,7 +18,7 @@ use Twig\TwigFunction;
 /**
  * Add the filter 'chill_menu'.
  */
-class MenuTwig extends AbstractExtension
+final class MenuTwig extends AbstractExtension
 {
     /**
      * the default parameters for chillMenu.
@@ -43,22 +43,16 @@ class MenuTwig extends AbstractExtension
      *
      * @deprecated link: see https://redmine.champs-libres.coop/issues/179 for more informations
      *
-     * @param string  $menuId
-     * @param mixed[] $params
+     * @param array{layout?: string, activeRouteKey?: string|null, args?: array<array-key, mixed>} $params
      */
-    public function chillMenu(Environment $env, $menuId, array $params = [])
+    public function chillMenu(Environment $env, string $menuId, array $params = []): string
     {
         $resolvedParams = array_merge($this->defaultParams, $params);
 
         $layout = $resolvedParams['layout'];
         unset($resolvedParams['layout']);
 
-        if (false === $this->menuComposer->hasLocalMenuBuilder($menuId)) {
-            $resolvedParams['routes'] = $this->menuComposer->getRoutesFor($menuId, $resolvedParams);
-
-            return $env->render($layout, $resolvedParams);
-        }
-        $resolvedParams['menus'] = $this->menuComposer->getMenuFor($menuId, $resolvedParams);
+        $resolvedParams['menus'] = $resolvedParams['routes'] = $this->menuComposer->getMenuFor($menuId, $resolvedParams['args']);
 
         return $env->render($layout, $resolvedParams);
     }
diff --git a/src/Bundle/ChillMainBundle/Tests/Services/MenuComposerTest.php b/src/Bundle/ChillMainBundle/Tests/Services/MenuComposerTest.php
index ae63557eb..7be02c7e4 100644
--- a/src/Bundle/ChillMainBundle/Tests/Services/MenuComposerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Services/MenuComposerTest.php
@@ -11,44 +11,107 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Tests\Services;
 
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Chill\MainBundle\Routing\MenuComposer;
+use Knp\Menu\MenuFactory;
+use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Component\Routing\RouterInterface;
 use Symfony\Component\Routing\RouteCollection;
+use Symfony\Contracts\Translation\TranslatorInterface;
 
 /**
- * This class provide functional test for MenuComposer.
+ * Tests for MenuComposer methods.
+ *
+ * We only verify that items provided by local menu builders are present
+ * when getRoutesFor() yields no routes, and that hasLocalMenuBuilder behaves
+ * as expected with the configured builders.
  *
  * @internal
  *
  * @coversNothing
  */
-final class MenuComposerTest extends KernelTestCase
+final class MenuComposerTest extends TestCase
 {
-    /**
-     * @var \Symfony\Bundle\FrameworkBundle\Routing\DelegatingLoader;
-     */
-    private $loader;
+    use ProphecyTrait;
 
-    /**
-     * @var \Chill\MainBundle\DependencyInjection\Services\MenuComposer;
-     */
-    private $menuComposer;
-
-    protected function setUp(): void
+    private function buildMenuComposerWithDefaultBuilder(): array
     {
-        self::bootKernel(['environment' => 'test']);
-        $this->menuComposer = self::getContainer()
-            ->get('chill.main.menu_composer');
+        // Router: returns an empty RouteCollection so getRoutesFor() yields []
+        $routerProphecy = $this->prophesize(RouterInterface::class);
+        $routerProphecy->getRouteCollection()->willReturn(new RouteCollection());
+        $router = $routerProphecy->reveal();
+
+        // Menu factory from Knp\Menu
+        $menuFactory = new MenuFactory();
+
+        // Translator: identity translator
+        $translator = new class () implements TranslatorInterface {
+            public function trans(string $id, array $parameters = [], ?string $domain = null, ?string $locale = null): string
+            {
+                return $id;
+            }
+
+            public function getLocale(): string
+            {
+                return 'en';
+            }
+        };
+
+        // Local builder that adds two items to the requested menu
+        $builder = new class () implements LocalMenuBuilderInterface {
+            public static function getMenuIds(): array
+            {
+                return ['main'];
+            }
+
+            public function buildMenu($menuId, \Knp\Menu\MenuItem $menu, array $parameters)
+            {
+                // Ensure we can use parameters passed to getMenuFor
+                $suffix = $parameters['suffix'] ?? '';
+                $menu->addChild('local_item_one', [
+                    'label' => 'Local Item One'.$suffix,
+                ])->setExtras(['order' => 1]);
+                $menu->addChild('local_item_two', [
+                    'label' => 'Local Item Two'.$suffix,
+                ])->setExtras(['order' => 2]);
+            }
+        };
+
+        $composer = new MenuComposer(
+            $router,
+            $menuFactory,
+            $translator,
+            [$builder]
+        );
+
+        return [$composer, $builder];
     }
 
-    /**
-     * @covers \Chill\MainBundle\Routing\MenuComposer
-     */
-    public function testMenuComposer()
+    public function testGetMenuForReturnsItemsFromLocalBuildersOnly(): void
     {
-        $collection = new RouteCollection();
+        [$composer] = $this->buildMenuComposerWithDefaultBuilder();
 
-        $routes = $this->menuComposer->getRoutesFor('dummy0');
+        $menu = $composer->getMenuFor('main', []);
 
-        $this->assertIsArray($routes);
+        // No routes were added, only local builder items should be present
+        $children = $menu->getChildren();
+        self::assertCount(2, $children, 'Menu should contain exactly the items provided by local builders');
+
+        // Assert the two expected items exist with their names
+        self::assertNotNull($menu->getChild('local_item_one'));
+        self::assertNotNull($menu->getChild('local_item_two'));
+
+        // And that their labels include the parameter suffix
+        self::assertSame('Local Item One', $menu->getChild('local_item_one')->getLabel());
+        self::assertSame('Local Item Two', $menu->getChild('local_item_two')->getLabel());
+    }
+
+    public function testHasLocalMenuBuilder(): void
+    {
+        [$composer] = $this->buildMenuComposerWithDefaultBuilder();
+
+        self::assertTrue($composer->hasLocalMenuBuilder('main'));
+        self::assertFalse($composer->hasLocalMenuBuilder('secondary'));
     }
 }
diff --git a/src/Bundle/ChillMainBundle/config/services/routing.yaml b/src/Bundle/ChillMainBundle/config/services/routing.yaml
index 7d5a80358..1ade9a6b3 100644
--- a/src/Bundle/ChillMainBundle/config/services/routing.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/routing.yaml
@@ -6,9 +6,8 @@ services:
     chill.main.menu_composer:
         class: Chill\MainBundle\Routing\MenuComposer
         arguments:
-            - '@Symfony\Component\Routing\RouterInterface'
-            - '@Knp\Menu\FactoryInterface'
-            - '@Symfony\Contracts\Translation\TranslatorInterface'
+            $localMenuBuilders: !tagged_iterator 'chill.menu_builder'
+
     Chill\MainBundle\Routing\MenuComposer: '@chill.main.menu_composer'
 
     chill.main.routes_loader:

From 4ffd7034d0177109f736ffeb21f85ed4e1940b62 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 8 Aug 2025 15:09:52 +0200
Subject: [PATCH 170/283] feat: add invitation list

- Introduced `MyInvitationsController` for managing user invitations
- Added `InviteACLAwareRepository` and its interface for handling invite data operations
- Created views for listing and displaying user-specific invitations
- Updated user menu to include "My invitations list" option
---
 .../unreleased/Feature-20250808-120802.yaml   |   6 +
 .../Controller/CalendarController.php         |   2 +-
 .../Controller/MyInvitationsController.php    |  62 +++++++
 .../Menu/UserMenuBuilder.php                  |   7 +
 .../Repository/InviteACLAwareRepository.php   |  68 +++++++
 .../InviteACLAwareRepositoryInterface.php     |  21 +++
 .../views/Invitations/_list_item.html.twig    | 172 ++++++++++++++++++
 .../views/Invitations/listByUser.html.twig    |  27 +++
 8 files changed, 364 insertions(+), 1 deletion(-)
 create mode 100644 .changes/unreleased/Feature-20250808-120802.yaml
 create mode 100644 src/Bundle/ChillCalendarBundle/Controller/MyInvitationsController.php
 create mode 100644 src/Bundle/ChillCalendarBundle/Repository/InviteACLAwareRepository.php
 create mode 100644 src/Bundle/ChillCalendarBundle/Repository/InviteACLAwareRepositoryInterface.php
 create mode 100644 src/Bundle/ChillCalendarBundle/Resources/views/Invitations/_list_item.html.twig
 create mode 100644 src/Bundle/ChillCalendarBundle/Resources/views/Invitations/listByUser.html.twig

diff --git a/.changes/unreleased/Feature-20250808-120802.yaml b/.changes/unreleased/Feature-20250808-120802.yaml
new file mode 100644
index 000000000..50d1eb8ba
--- /dev/null
+++ b/.changes/unreleased/Feature-20250808-120802.yaml
@@ -0,0 +1,6 @@
+kind: Feature
+body: Create invitation list in user menu
+time: 2025-08-08T12:08:02.446361367+02:00
+custom:
+    Issue: "385"
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
index 94db03b1f..ae8114ea7 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
@@ -266,7 +266,7 @@ class CalendarController extends AbstractController
         }
 
         if (!$this->getUser() instanceof User) {
-            throw new UnauthorizedHttpException('you are not an user');
+            throw new UnauthorizedHttpException('you are not a user');
         }
 
         $view = '@ChillCalendar/Calendar/listByUser.html.twig';
diff --git a/src/Bundle/ChillCalendarBundle/Controller/MyInvitationsController.php b/src/Bundle/ChillCalendarBundle/Controller/MyInvitationsController.php
new file mode 100644
index 000000000..d39e21476
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Controller/MyInvitationsController.php
@@ -0,0 +1,62 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\CalendarBundle\Controller;
+
+use Chill\CalendarBundle\Repository\InviteACLAwareRepository;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Pagination\PaginatorFactory;
+use Doctrine\ORM\NonUniqueResultException;
+use Doctrine\ORM\NoResultException;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\UnauthorizedHttpException;
+use Symfony\Component\Routing\Annotation\Route;
+
+class MyInvitationsController extends AbstractController
+{
+    public function __construct(private readonly InviteACLAwareRepository $inviteACLAwareRepository, private readonly PaginatorFactory $paginator) {}
+
+    /**
+     * @throws NonUniqueResultException
+     * @throws NoResultException
+     */
+    #[Route(path: '/{_locale}/calendar/invitations/my', name: 'chill_calendar_invitations_list_my')]
+    public function myInvitations(Request $request): Response
+    {
+        $this->denyAccessUnlessGranted('ROLE_USER');
+
+        $user = $this->getUser();
+
+        if (!$user instanceof User) {
+            throw new UnauthorizedHttpException('you are not a user');
+        }
+
+        $total = $this->inviteACLAwareRepository->countByUser($user);
+        $paginator = $this->paginator->create($total);
+        $invitations = $this->inviteACLAwareRepository->findByUser(
+            $user,
+            ['createdAt' => 'DESC'],
+            $paginator->getCurrentPageFirstItemNumber(),
+            $paginator->getItemsPerPage()
+        );
+
+        dump($invitations);
+
+        $view = '@ChillCalendar/Invitations/listByUser.html.twig';
+
+        return $this->render($view, [
+            'invitations' => $invitations,
+            'paginator' => $paginator,
+        ]);
+    }
+}
diff --git a/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php b/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php
index 3a062f7b8..fe3083d96 100644
--- a/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php
+++ b/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php
@@ -30,6 +30,13 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
                     'order' => 9,
                     'icon' => 'tasks',
                 ]);
+            $menu->addChild('My invitations list', [
+                'route' => 'chill_calendar_invitations_list_my',
+            ])
+                ->setExtras([
+                    'order' => 9,
+                    'icon' => 'tasks',
+                ]);
         }
     }
 
diff --git a/src/Bundle/ChillCalendarBundle/Repository/InviteACLAwareRepository.php b/src/Bundle/ChillCalendarBundle/Repository/InviteACLAwareRepository.php
new file mode 100644
index 000000000..e79381e19
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Repository/InviteACLAwareRepository.php
@@ -0,0 +1,68 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\CalendarBundle\Repository;
+
+use Chill\CalendarBundle\Entity\Invite;
+use Chill\MainBundle\Entity\User;
+use Doctrine\ORM\EntityManagerInterface;
+use Doctrine\ORM\NonUniqueResultException;
+use Doctrine\ORM\NoResultException;
+use Doctrine\ORM\QueryBuilder;
+
+readonly class InviteACLAwareRepository implements InviteACLAwareRepositoryInterface
+{
+    public function __construct(private EntityManagerInterface $em) {}
+
+    /**
+     * @throws NonUniqueResultException
+     * @throws NoResultException
+     */
+    public function countByUser(User $user): int
+    {
+        return $this->buildQueryByUser($user)
+            ->select('COUNT(i)')
+            ->getQuery()
+            ->getSingleScalarResult();
+    }
+
+    public function findByUser(User $user, ?array $orderBy = [], ?int $offset = null, ?int $limit = null): array
+    {
+        $qb = $this->buildQueryByUser($user)
+            ->select('i');
+
+        foreach ($orderBy as $sort => $order) {
+            $qb->addOrderBy('i.'.$sort, $order);
+        }
+
+        if (null !== $offset) {
+            $qb->setFirstResult($offset);
+        }
+
+        if (null !== $limit) {
+            $qb->setMaxResults($limit);
+        }
+
+        return $qb->getQuery()->getResult();
+    }
+
+    public function buildQueryByUser(User $user): QueryBuilder
+    {
+        $qb = $this->em->createQueryBuilder()
+            ->from(Invite::class, 'i');
+
+        $qb->where('i.user = :user');
+
+        $qb->setParameter('user', $user);
+
+        return $qb;
+    }
+}
diff --git a/src/Bundle/ChillCalendarBundle/Repository/InviteACLAwareRepositoryInterface.php b/src/Bundle/ChillCalendarBundle/Repository/InviteACLAwareRepositoryInterface.php
new file mode 100644
index 000000000..c388b0c03
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Repository/InviteACLAwareRepositoryInterface.php
@@ -0,0 +1,21 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\CalendarBundle\Repository;
+
+use Chill\MainBundle\Entity\User;
+
+interface InviteACLAwareRepositoryInterface
+{
+    public function countByUser(User $user): int;
+
+    public function findByUser(User $user, ?array $orderBy = [], ?int $offset = null, ?int $limit = null): array;
+}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Invitations/_list_item.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Invitations/_list_item.html.twig
new file mode 100644
index 000000000..10a6a2282
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Invitations/_list_item.html.twig
@@ -0,0 +1,172 @@
+{% if invitations|length > 0 %}
+    <div class="flex-table list-records">
+
+        {% for invitation in invitations %}
+        {% set calendar = invitation.getCalendar %}
+
+            {% if calendar is not null %}
+            <div class="item-bloc">
+                <div class="item-row main">
+                    <div class="item-col">
+                        <div class="wrap-header">
+                            <div class="wl-row">
+                                <div class="wl-col title">
+                                    <p class="date-label">
+                                        {% if calendar.endDate.diff(calendar.startDate).days >= 1 %}
+                                            {{ calendar.startDate|format_datetime('short', 'short') }}
+                                            - {{ calendar.endDate|format_datetime('short', 'short') }}
+                                        {% else %}
+                                            {{ calendar.startDate|format_datetime('short', 'short') }}
+                                            - {{ calendar.endDate|format_datetime('none', 'short') }}
+                                        {% endif %}
+                                    </p>
+
+                                    <div class="duration short-message">
+                                        <i class="fa fa-fw fa-hourglass-end"></i>
+                                        {{ calendar.duration|date('%H:%I') }}
+                                        {% if false == calendar.sendSMS or null == calendar.sendSMS %}
+                                            <!-- no sms will be send -->
+                                        {% else %}
+                                            {% if calendar.smsStatus == 'sms_sent' %}
+                                                <span title="{{ 'SMS already sent'|trans }}" class="badge bg-info">
+                                                    <i class="fa fa-check "></i>
+                                                    <i class="fa fa-envelope "></i>
+                                                </span>
+                                            {% else %}
+                                                <span title="{{ 'Will send SMS'|trans }}" class="badge bg-info">
+                                                    <i class="fa fa-envelope "></i>
+                                                    <i class="fa fa-hourglass-end "></i>
+                                                </span>
+                                            {% endif %}
+                                        {% endif %}
+                                    </div>
+
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="item-col">
+                            <ul class="list-content">
+                                {% if calendar.mainUser is not empty %}
+                                    <span class="badge-user">{{ calendar.mainUser|chill_entity_render_box({'at_date': calendar.startDate}) }}</span>
+                                {% endif %}
+                            </ul>
+                        </div>
+
+                    </div>
+                </div>
+
+                {% if calendar.comment.comment is not empty
+                    or calendar.users|length > 0
+                    or calendar.thirdParties|length > 0
+                    or calendar.users|length > 0 %}
+                    <div class="item-row details separator">
+                        <div class="item-col">
+                            {% include '@ChillActivity/Activity/concernedGroups.html.twig' with {
+                                'context': calendar.context == 'person' ?  'calendar_person' : 'calendar_accompanyingCourse',
+                                'render': 'wrap-list',
+                                'entity': calendar
+                            } %}
+                        </div>
+
+                    </div>
+                {% endif %}
+
+                {% if calendar.comment.comment is not empty %}
+                    <div class="item-row details separator">
+                        <div class="item-col comment">
+                            {{ calendar.comment|chill_entity_render_box( { 'limit_lines': 3, 'metadata': false } ) }}
+                        </div>
+                    </div>
+                {% endif %}
+
+                {% if calendar.location is not empty %}
+                    <div class="item-row separator">
+                        <div>
+                            {% if calendar.location.address is not same as(null) and calendar.location.name is not empty %}
+                                <i class="fa fa-map-marker"></i>{% endif %}
+                            {% if calendar.location.name is not empty %}{{ calendar.location.name }}{% endif %}
+                            {% if calendar.location.address is not same as(null) %}{{ calendar.location.address|chill_entity_render_box({'multiline': false, 'with_picto': (calendar.location.name is empty)}) }}{% else %}
+                                <i class="fa fa-map-marker"></i>{% endif %}
+                            {% if calendar.location.phonenumber1 is not empty %}<i
+                                class="fa fa-phone"></i> {{ calendar.location.phonenumber1|chill_format_phonenumber }}{% endif %}
+                            {% if calendar.location.phonenumber2 is not empty %}<i
+                                class="fa fa-phone"></i> {{ calendar.location.phonenumber2|chill_format_phonenumber }}{% endif %}
+                        </div>
+                    </div>
+                {% endif %}
+
+                <div class="item-row separator column">
+                    <div>
+
+                        {{ include('@ChillCalendar/Calendar/_documents.twig.html') }}
+                    </div>
+                </div>
+
+                {% if calendar.activity is not null %}
+                    <div class="item-row separator">
+                        <div class="item-col">
+                            <div class="wrap-list">
+                                <div class="wl-row">
+                                    <div class="wl-col title"><h3>{{ 'Activity'|trans }}</h3></div>
+                                    <div class="wl-col list activity-linked">
+                                        <h2 class="badge-title">
+                                            <span class="title_label"></span>
+                                            <span class="title_action">
+                                            {{ calendar.activity.type.name | localize_translatable_string }}
+
+                                                {% if calendar.activity.emergency %}
+                                                    <span class="badge bg-danger rounded-pill fs-6 float-end">{{ 'Emergency'|trans|upper }}</span>
+                                                {% endif %}
+                                        </span>
+                                        </h2>
+
+                                        <ul class="record_actions">
+                                            <li class="cancel">
+                                                <span class="createdBy">
+                                                     {{ 'Created by'|trans }}
+                                                    <b>{{ calendar.activity.createdBy|chill_entity_render_string({'at_date': calendar.activity.createdAt}) }}</b>, {{ 'on'|trans }} {{ calendar.activity.createdAt|format_datetime('short', 'short') }}
+                                                </span>
+                                            </li>
+                                            {% if is_granted('CHILL_ACTIVITY_SEE', calendar.activity) %}
+                                                <li>
+                                                    <a href="{{ chill_path_add_return_path('chill_activity_activity_show', {'id': calendar.activity.id}) }}" class="btn btn-sm btn-show" ></a>
+                                                </li>
+                                            {% endif %}
+                                        </ul>
+
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                {% endif %}
+
+                <div class="item-row separator">
+                    <ul class="record_actions">
+
+                        {% if (calendar.isInvited(app.user)) %}
+                            {% set invite = calendar.inviteForUser(app.user) %}
+                            <li>
+                                <div invite-answer data-status="{{ invite.status|e('html_attr') }}"
+                                     data-calendar-id="{{ calendar.id|e('html_attr') }}"></div>
+                            </li>
+                        {% endif %}
+                        <li>
+                            <a href="{{ chill_path_add_return_path('chill_calendar_calendar_show', { 'id': calendar.id}) }}"
+                               class="btn btn-show "></a>
+                        </li>
+                    </ul>
+
+                </div>
+
+            </div>
+        {% endif %}
+        {% endfor %}
+
+        {% if invitations|length < paginator.getTotalItems %}
+            {{ chill_pagination(paginator) }}
+        {% endif %}
+
+    </div>
+{% endif %}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Invitations/listByUser.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Invitations/listByUser.html.twig
new file mode 100644
index 000000000..22ca9d7a8
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Invitations/listByUser.html.twig
@@ -0,0 +1,27 @@
+{% extends "@ChillMain/layout.html.twig" %}
+
+{% set activeRouteKey = 'chill_calendar_invitations_list' %}
+
+{% block title %}{{ 'My invitations list' |trans }}{% endblock title %}
+
+{% block content %}
+
+    <h1>{{ 'Invitation list' |trans }}</h1>
+
+    {% if invitations|length == 0 %}
+        <p class="chill-no-data-statement">
+            {{ "There is no invitation items."|trans }}
+        </p>
+    {% else %}
+        {{ include ('@ChillCalendar/Invitations/_list_item.html.twig') }}
+    {% endif %}
+
+{% endblock %}
+
+{% block js %}
+    {{ parent() }}
+{% endblock %}
+
+{% block css %}
+    {{ parent() }}
+{% endblock %}

From 675e8450fc4a3a497fe0f3a3fa3f162343a02356 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 8 Sep 2025 08:33:36 +0200
Subject: [PATCH 171/283] WIP: switch from ACLAware to normal repository usage

---
 .../Controller/MyInvitationsController.php    | 25 ++++---
 .../Repository/InviteACLAwareRepository.php   | 68 -------------------
 .../InviteACLAwareRepositoryInterface.php     | 21 ------
 .../Repository/InviteRepository.php           |  6 +-
 .../views/Invitations/listByUser.html.twig    |  2 +-
 .../translations/messages.fr.yml              |  2 +
 6 files changed, 18 insertions(+), 106 deletions(-)
 delete mode 100644 src/Bundle/ChillCalendarBundle/Repository/InviteACLAwareRepository.php
 delete mode 100644 src/Bundle/ChillCalendarBundle/Repository/InviteACLAwareRepositoryInterface.php

diff --git a/src/Bundle/ChillCalendarBundle/Controller/MyInvitationsController.php b/src/Bundle/ChillCalendarBundle/Controller/MyInvitationsController.php
index d39e21476..fc2743e08 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/MyInvitationsController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/MyInvitationsController.php
@@ -11,11 +11,9 @@ declare(strict_types=1);
 
 namespace Chill\CalendarBundle\Controller;
 
-use Chill\CalendarBundle\Repository\InviteACLAwareRepository;
+use Chill\CalendarBundle\Repository\InviteRepository;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Pagination\PaginatorFactory;
-use Doctrine\ORM\NonUniqueResultException;
-use Doctrine\ORM\NoResultException;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
@@ -24,12 +22,8 @@ use Symfony\Component\Routing\Annotation\Route;
 
 class MyInvitationsController extends AbstractController
 {
-    public function __construct(private readonly InviteACLAwareRepository $inviteACLAwareRepository, private readonly PaginatorFactory $paginator) {}
+    public function __construct(private readonly InviteRepository $inviteRepository, private readonly PaginatorFactory $paginator) {}
 
-    /**
-     * @throws NonUniqueResultException
-     * @throws NoResultException
-     */
     #[Route(path: '/{_locale}/calendar/invitations/my', name: 'chill_calendar_invitations_list_my')]
     public function myInvitations(Request $request): Response
     {
@@ -41,13 +35,18 @@ class MyInvitationsController extends AbstractController
             throw new UnauthorizedHttpException('you are not a user');
         }
 
-        $total = $this->inviteACLAwareRepository->countByUser($user);
+        $total = count($this->inviteRepository->findBy(['user' => $user]));
+        dump($total);
+        dump($this->inviteRepository->findBy(['user' => $user]));
         $paginator = $this->paginator->create($total);
-        $invitations = $this->inviteACLAwareRepository->findByUser(
-            $user,
+
+        dump($paginator->getCurrentPageFirstItemNumber());
+        dump($paginator->getItemsPerPage());
+        $invitations = $this->inviteRepository->findBy(
+            ['user' => $user],
             ['createdAt' => 'DESC'],
-            $paginator->getCurrentPageFirstItemNumber(),
-            $paginator->getItemsPerPage()
+//            $paginator->getCurrentPageFirstItemNumber(),
+//            $paginator->getItemsPerPage()
         );
 
         dump($invitations);
diff --git a/src/Bundle/ChillCalendarBundle/Repository/InviteACLAwareRepository.php b/src/Bundle/ChillCalendarBundle/Repository/InviteACLAwareRepository.php
deleted file mode 100644
index e79381e19..000000000
--- a/src/Bundle/ChillCalendarBundle/Repository/InviteACLAwareRepository.php
+++ /dev/null
@@ -1,68 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\CalendarBundle\Repository;
-
-use Chill\CalendarBundle\Entity\Invite;
-use Chill\MainBundle\Entity\User;
-use Doctrine\ORM\EntityManagerInterface;
-use Doctrine\ORM\NonUniqueResultException;
-use Doctrine\ORM\NoResultException;
-use Doctrine\ORM\QueryBuilder;
-
-readonly class InviteACLAwareRepository implements InviteACLAwareRepositoryInterface
-{
-    public function __construct(private EntityManagerInterface $em) {}
-
-    /**
-     * @throws NonUniqueResultException
-     * @throws NoResultException
-     */
-    public function countByUser(User $user): int
-    {
-        return $this->buildQueryByUser($user)
-            ->select('COUNT(i)')
-            ->getQuery()
-            ->getSingleScalarResult();
-    }
-
-    public function findByUser(User $user, ?array $orderBy = [], ?int $offset = null, ?int $limit = null): array
-    {
-        $qb = $this->buildQueryByUser($user)
-            ->select('i');
-
-        foreach ($orderBy as $sort => $order) {
-            $qb->addOrderBy('i.'.$sort, $order);
-        }
-
-        if (null !== $offset) {
-            $qb->setFirstResult($offset);
-        }
-
-        if (null !== $limit) {
-            $qb->setMaxResults($limit);
-        }
-
-        return $qb->getQuery()->getResult();
-    }
-
-    public function buildQueryByUser(User $user): QueryBuilder
-    {
-        $qb = $this->em->createQueryBuilder()
-            ->from(Invite::class, 'i');
-
-        $qb->where('i.user = :user');
-
-        $qb->setParameter('user', $user);
-
-        return $qb;
-    }
-}
diff --git a/src/Bundle/ChillCalendarBundle/Repository/InviteACLAwareRepositoryInterface.php b/src/Bundle/ChillCalendarBundle/Repository/InviteACLAwareRepositoryInterface.php
deleted file mode 100644
index c388b0c03..000000000
--- a/src/Bundle/ChillCalendarBundle/Repository/InviteACLAwareRepositoryInterface.php
+++ /dev/null
@@ -1,21 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\CalendarBundle\Repository;
-
-use Chill\MainBundle\Entity\User;
-
-interface InviteACLAwareRepositoryInterface
-{
-    public function countByUser(User $user): int;
-
-    public function findByUser(User $user, ?array $orderBy = [], ?int $offset = null, ?int $limit = null): array;
-}
diff --git a/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php b/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php
index 8778330f8..5d19d326c 100644
--- a/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php
+++ b/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php
@@ -16,9 +16,9 @@ use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\Persistence\ObjectRepository;
 
-class InviteRepository implements ObjectRepository
+readonly class InviteRepository implements ObjectRepository
 {
-    private readonly EntityRepository $entityRepository;
+    private EntityRepository $entityRepository;
 
     public function __construct(EntityManagerInterface $em)
     {
@@ -41,7 +41,7 @@ class InviteRepository implements ObjectRepository
     /**
      * @return array|Invite[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null)
+    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
     {
         return $this->entityRepository->findBy($criteria, $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Invitations/listByUser.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Invitations/listByUser.html.twig
index 22ca9d7a8..282b83dfe 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Invitations/listByUser.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Invitations/listByUser.html.twig
@@ -10,7 +10,7 @@
 
     {% if invitations|length == 0 %}
         <p class="chill-no-data-statement">
-            {{ "There is no invitation items."|trans }}
+            {{ "invite.list.none"|trans }}
         </p>
     {% else %}
         {{ include ('@ChillCalendar/Invitations/_list_item.html.twig') }}
diff --git a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
index cfb2fe057..740303fd5 100644
--- a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
@@ -86,6 +86,8 @@ invite:
     declined: Refusé
     pending: En attente
     tentative: Accepté provisoirement
+    list:
+        none: Il n'y aucun invitation
 
 # exports
 Exports of calendar: Exports des rendez-vous

From e57d1ac696e162c9ca00d0eb5fcebec1da56c146 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 30 Sep 2025 13:12:06 +0000
Subject: [PATCH 172/283] Support for parent/children motives

---
 .../ChillTicketBundle/chill.api.specs.yaml    |   2 +-
 .../src/Controller/MotiveApiController.php    |   5 +-
 .../src/DataFixtures/ORM/LoadMotives.php      |  83 ++++++----
 .../ChillTicketBundle/src/Entity/Motive.php   |  88 +++++++++-
 .../src/Entity/MotiveHistory.php              |   2 +-
 .../Repository/TicketACLAwareRepository.php   |   5 +-
 .../src/Resources/public/types.ts             |  26 ++-
 .../components/ActionToolbarComponent.vue     |   4 +-
 .../Addressee/AddresseeComponent.vue          |   5 +-
 .../TicketApp/components/BannerComponent.vue  |  14 +-
 .../Comment/CommentEditorComponent.vue        |  23 ++-
 .../components/Motive/MotiveComponent.vue     |  18 +-
 .../Motive/MotiveSelectorComponent.vue        | 141 ++++++++++++----
 .../components/TicketInitFormComponent.vue    |   7 +-
 .../vuejs/TicketApp/store/modules/motive.ts   |  13 ++
 .../vuejs/TicketApp/store/modules/persons.ts  |   2 +-
 .../TicketApp/store/modules/ticket_list.ts    |   3 +-
 .../public/vuejs/TicketApp/utils/utils.ts     |  32 ++--
 .../components/TicketFilterListComponent.vue  |  10 +-
 .../TicketList/components/ToggleComponent.vue |   8 +-
 .../Normalizer/MotiveNormalizer.php           | 103 ++++++++++++
 .../Normalizer/TicketNormalizer.php           |  12 +-
 .../src/migrations/Version20250924124214.php  |  37 +++++
 .../tests/Entity/MotiveTest.php               |  63 +++++++
 .../Normalizer/MotiveNormalizerTest.php       | 154 ++++++++++++++++++
 25 files changed, 724 insertions(+), 136 deletions(-)
 create mode 100644 src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/MotiveNormalizer.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/migrations/Version20250924124214.php
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Entity/MotiveTest.php
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/MotiveNormalizerTest.php

diff --git a/src/Bundle/ChillTicketBundle/chill.api.specs.yaml b/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
index e2eea460b..f0255fb19 100644
--- a/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
@@ -112,7 +112,7 @@ paths:
                               - no
                 - name: byMotives
                   in: query
-                  description: the motives of the ticket
+                  description: the motives of the ticket. All the descendants of the motive are taken into account.
                   required: false
                   style: form
                   explode: false
diff --git a/src/Bundle/ChillTicketBundle/src/Controller/MotiveApiController.php b/src/Bundle/ChillTicketBundle/src/Controller/MotiveApiController.php
index d57b43e7b..1b9ce263c 100644
--- a/src/Bundle/ChillTicketBundle/src/Controller/MotiveApiController.php
+++ b/src/Bundle/ChillTicketBundle/src/Controller/MotiveApiController.php
@@ -13,6 +13,7 @@ namespace Chill\TicketBundle\Controller;
 
 use Chill\DocStoreBundle\Serializer\Normalizer\StoredObjectNormalizer;
 use Chill\MainBundle\CRUD\Controller\ApiController;
+use Chill\TicketBundle\Serializer\Normalizer\MotiveNormalizer;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\HttpFoundation\Request;
 
@@ -21,13 +22,13 @@ final class MotiveApiController extends ApiController
     protected function customizeQuery(string $action, Request $request, $query): void
     {
         /* @var $query QueryBuilder */
-        $query->andWhere('e.active = TRUE');
+        $query->andWhere('e.active = TRUE')->andWhere('e.parent IS NULL');
     }
 
     protected function getContextForSerialization(string $action, Request $request, string $_format, $entity): array
     {
         return match ($request->getMethod()) {
-            Request::METHOD_GET => ['groups' => ['read', StoredObjectNormalizer::DOWNLOAD_LINK_ONLY]],
+            Request::METHOD_GET => ['groups' => ['read', 'read:extended', StoredObjectNormalizer::DOWNLOAD_LINK_ONLY, MotiveNormalizer::GROUP_PARENT_TO_CHILDREN]],
             default => parent::getContextForSerialization($action, $request, $_format, $entity),
         };
     }
diff --git a/src/Bundle/ChillTicketBundle/src/DataFixtures/ORM/LoadMotives.php b/src/Bundle/ChillTicketBundle/src/DataFixtures/ORM/LoadMotives.php
index ff65ea016..044949d1e 100644
--- a/src/Bundle/ChillTicketBundle/src/DataFixtures/ORM/LoadMotives.php
+++ b/src/Bundle/ChillTicketBundle/src/DataFixtures/ORM/LoadMotives.php
@@ -13,7 +13,6 @@ namespace Chill\TicketBundle\DataFixtures\ORM;
 
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\DocStoreBundle\Service\StoredObjectManagerInterface;
-use Chill\TicketBundle\Entity\EmergencyStatusEnum;
 use Chill\TicketBundle\Entity\Motive;
 use Doctrine\Bundle\FixturesBundle\Fixture;
 use Doctrine\Bundle\FixturesBundle\FixtureGroupInterface;
@@ -35,6 +34,7 @@ final class LoadMotives extends Fixture implements FixtureGroupInterface
             ['label' => '☀️ De 07h à 21h', 'path' => __DIR__.'/docs/peloton_2.pdf'],
             ['label' => 'Dimanche et jours fériés', 'path' => __DIR__.'/docs/schema_1.png'],
         ];
+        $motivesByLabel = [];
 
         foreach (explode("\n", self::MOTIVES) as $row) {
             if ('' === trim($row)) {
@@ -46,50 +46,65 @@ final class LoadMotives extends Fixture implements FixtureGroupInterface
                 continue;
             }
 
-            $motive = new Motive();
-            $motive->setLabel(['fr' => trim((string) $data[0])]);
-            $motive->setMakeTicketEmergency(match ($data[1]) {
-                'true' => EmergencyStatusEnum::YES,
-                'false' => EmergencyStatusEnum::NO,
-                default => throw new \UnexpectedValueException('Unexpected value'),
-            });
+            $labels = explode(' > ', $data[0]);
+            $parent = null;
 
-            $numberOfDocs = (int) $data[2];
-            for ($i = 1; $i <= $numberOfDocs; ++$i) {
-                $doc = $docs[$i - 1];
-                $storedObject = new StoredObject();
-                $storedObject->setTitle($doc['label']);
+            while (count($labels) > 0) {
+                $label = array_shift($labels);
+                dump($labels);
+                if (isset($motivesByLabel[$label])) {
+                    $motive = $motivesByLabel[$label];
+                } else {
+                    $motive = new Motive();
+                    $motive->setLabel(['fr' => $label]);
+                    $motivesByLabel[$label] = $motive;
+                }
 
-                $content = file_get_contents($doc['path']);
-                $contentType = match (substr($doc['path'], -3, 3)) {
-                    'pdf' => 'application/pdf',
-                    'png' => 'image/png',
-                    default => throw new \UnexpectedValueException('Not supported content type here'),
-                };
-                $this->storedObjectManager->write($storedObject, $content, $contentType);
+                if (null !== $parent) {
+                    $motive->setParent($parent);
+                }
 
-                $motive->addStoredObject($storedObject);
-                $manager->persist($storedObject);
-            }
+                $manager->persist($motive);
+                $parent = $motive;
+
+                if (0 === count($labels)) {
+                    // this is the last one, we add data
+                    $numberOfDocs = (int) $data[2];
+                    for ($i = 1; $i <= $numberOfDocs; ++$i) {
+                        $doc = $docs[$i - 1];
+                        $storedObject = new StoredObject();
+                        $storedObject->setTitle($doc['label']);
+
+                        $content = file_get_contents($doc['path']);
+                        $contentType = match (substr($doc['path'], -3, 3)) {
+                            'pdf' => 'application/pdf',
+                            'png' => 'image/png',
+                            default => throw new \UnexpectedValueException('Not supported content type here'),
+                        };
+                        $this->storedObjectManager->write($storedObject, $content, $contentType);
+
+                        $motive->addStoredObject($storedObject);
+                        $manager->persist($storedObject);
+                    }
 
 
-            foreach (array_slice($data, 3) as $supplementaryComment) {
-                if ('' !== trim((string) $supplementaryComment)) {
-                    $motive->addSupplementaryComment(['label' => trim((string) $supplementaryComment)]);
+                    foreach (array_slice($data, 3) as $supplementaryComment) {
+                        if ('' !== trim((string) $supplementaryComment)) {
+                            $motive->addSupplementaryComment(['label' => trim((string) $supplementaryComment)]);
+                        }
+                    }
                 }
             }
-
-            $manager->persist($motive);
         }
         $manager->flush();
     }
 
     private const MOTIVES = <<<'CSV'
-        "Coordonnées",false,"3","Nouvelles coordonnées",
-        "Horaire de passage",false,"0",
-        "Retard de livraison",false,"0",
-        "Erreur de livraison",false,"0",
-        "Colis incomplet",false,"0",
+        "Motif administratif > Coordonnées",false,"3","Nouvelles coordonnées",
+        "Organisation > Horaire de passage",false,"0",
+        "Organisation > Livraison > Retard de livraison",false,"0",
+        "Organisation > Livraison > Erreur de livraison",false,"0",
+        "Organisation > Livraison > Colis incomplet",false,"0",
         "MATLOC",false,"0",
         "Retard DASRI",false,"1",
         "Planning d'astreintes",false,"0",
@@ -116,7 +131,7 @@ final class LoadMotives extends Fixture implements FixtureGroupInterface
         "Mauvaise adresse",false,"0",
         "Patient absent",false,"0",
         "Annulation",false,"0",
-        "Colis perdu",false,"0",
+        "Organisation > Livraison > Colis perdu",false,"0",
         "Changement de rendez-vous",false,"0",
         "Coordination interservices",false,"0",
         "Problème de substitution produits",true,"0",
diff --git a/src/Bundle/ChillTicketBundle/src/Entity/Motive.php b/src/Bundle/ChillTicketBundle/src/Entity/Motive.php
index 789d6b562..1be0fe47f 100644
--- a/src/Bundle/ChillTicketBundle/src/Entity/Motive.php
+++ b/src/Bundle/ChillTicketBundle/src/Entity/Motive.php
@@ -15,6 +15,7 @@ use Chill\DocStoreBundle\Entity\StoredObject;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\ReadableCollection;
+use Doctrine\Common\Collections\Selectable;
 use Doctrine\ORM\Mapping as ORM;
 use Symfony\Component\Serializer\Annotation as Serializer;
 
@@ -26,19 +27,15 @@ class Motive
     #[ORM\Id]
     #[ORM\Column(type: \Doctrine\DBAL\Types\Types::INTEGER, nullable: false)]
     #[ORM\GeneratedValue(strategy: 'AUTO')]
-    #[Serializer\Groups(['read'])]
     private ?int $id = null;
 
     #[ORM\Column(type: \Doctrine\DBAL\Types\Types::JSON, nullable: false, options: ['default' => '[]'])]
-    #[Serializer\Groups(['read'])]
     private array $label = [];
 
     #[ORM\Column(type: \Doctrine\DBAL\Types\Types::BOOLEAN, nullable: false, options: ['default' => true])]
-    #[Serializer\Groups(['read'])]
     private bool $active = true;
 
     #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, nullable: true, enumType: EmergencyStatusEnum::class)]
-    #[Serializer\Groups(['read'])]
     private ?EmergencyStatusEnum $makeTicketEmergency = null;
 
     /**
@@ -49,12 +46,22 @@ class Motive
     private Collection $storedObjects;
 
     #[ORM\Column(type: \Doctrine\DBAL\Types\Types::JSON, nullable: false, options: ['jsonb' => true, 'default' => '[]'])]
-    #[Serializer\Groups(['read'])]
     private array $supplementaryComments = [];
 
+    #[ORM\ManyToOne(targetEntity: Motive::class, inversedBy: 'children')]
+    private ?Motive $parent = null;
+
+
+    /**
+     * @var Collection<int, Motive>&Selectable<int, Motive>
+     */
+    #[ORM\OneToMany(targetEntity: Motive::class, mappedBy: 'parent')]
+    private Collection&Selectable $children;
+
     public function __construct()
     {
         $this->storedObjects = new ArrayCollection();
+        $this->children = new ArrayCollection();
     }
 
     public function addStoredObject(StoredObject $storedObject): void
@@ -69,7 +76,6 @@ class Motive
         $this->storedObjects->removeElement($storedObject);
     }
 
-    #[Serializer\Groups(['read'])]
     public function getStoredObjects(): ReadableCollection
     {
         return $this->storedObjects;
@@ -142,4 +148,74 @@ class Motive
             $this->supplementaryComments[$key] = $supplementaryComment;
         }
     }
+
+    public function isParent(): bool
+    {
+        return $this->children->count() > 0;
+    }
+
+    public function isChild(): bool
+    {
+        return null !== $this->parent;
+    }
+
+    public function setParent(?Motive $parent): void
+    {
+        if (null !== $parent) {
+            $parent->addChild($this);
+        } else {
+            $this->parent->removeChild($this);
+        }
+
+        $this->parent = $parent;
+    }
+
+    /**
+     * @internal use @see{setParent} instead
+     */
+    public function addChild(Motive $child): void
+    {
+        if (!$this->children->contains($child)) {
+            $this->children->add($child);
+        }
+    }
+
+    /**
+     * @internal use @see{setParent} with null as argument instead
+     */
+    public function removeChild(Motive $child): void
+    {
+        $this->children->removeElement($child);
+    }
+
+    public function getChildren(): ReadableCollection&Selectable
+    {
+        return $this->children;
+    }
+
+    public function getParent(): ?Motive
+    {
+        return $this->parent;
+    }
+
+    /**
+     * Get the descendants of the current entity.
+     *
+     * This method collects all descendant entities recursively, starting from the current entity
+     * and including all of its children and their descendants.
+     *
+     * @return ReadableCollection&Selectable A collection containing the current entity and all its descendants
+     */
+    public function getDescendants(): ReadableCollection&Selectable
+    {
+        $collection = new ArrayCollection([$this]);
+
+        foreach ($this->getChildren() as $child) {
+            foreach ($child->getDescendants() as $descendant) {
+                $collection->add($descendant);
+            }
+        }
+
+        return $collection;
+    }
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Entity/MotiveHistory.php b/src/Bundle/ChillTicketBundle/src/Entity/MotiveHistory.php
index e2902aae3..e3de710be 100644
--- a/src/Bundle/ChillTicketBundle/src/Entity/MotiveHistory.php
+++ b/src/Bundle/ChillTicketBundle/src/Entity/MotiveHistory.php
@@ -42,7 +42,7 @@ class MotiveHistory implements TrackCreationInterface
     public function __construct(
         #[ORM\ManyToOne(targetEntity: Motive::class)]
         #[ORM\JoinColumn(nullable: false)]
-        #[Serializer\Groups(['read'])]
+        #[Serializer\Groups(['read', 'read:children-to-parent'])]
         private Motive $motive,
         #[ORM\ManyToOne(targetEntity: Ticket::class)]
         #[ORM\JoinColumn(nullable: false)]
diff --git a/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepository.php b/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepository.php
index 222199666..ad8fa1387 100644
--- a/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepository.php
+++ b/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepository.php
@@ -113,10 +113,11 @@ final readonly class TicketACLAwareRepository implements TicketACLAwareRepositor
         if (array_key_exists('byMotives', $params)) {
             $byMotives = $qb->expr()->orX();
             foreach ($params['byMotives'] as $motive) {
+                $motivesWithDescendants = $motive->getDescendants()->toArray();
                 $byMotives->add(
                     $qb->expr()->exists(sprintf(
                         'SELECT 1 FROM %s tp_motive_%d WHERE tp_motive_%d.ticket = t
-                    AND tp_motive_%d.motive = :motive_%d AND tp_motive_%d.endDate IS NULL
+                    AND tp_motive_%d.motive IN (:motives_%d) AND tp_motive_%d.endDate IS NULL
                     ',
                         MotiveHistory::class,
                         ++$i,
@@ -126,7 +127,7 @@ final readonly class TicketACLAwareRepository implements TicketACLAwareRepositor
                         $i,
                     ))
                 );
-                $qb->setParameter(sprintf('motive_%d', $i), $motive);
+                $qb->setParameter(sprintf('motives_%d', $i), $motivesWithDescendants);
             }
             $qb->andWhere($byMotives);
         }
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
index 4c31f2341..1c914570e 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
@@ -8,14 +8,32 @@ import { Person } from "ChillPersonAssets/types";
 import { Thirdparty } from "../../../../ChillThirdPartyBundle/Resources/public/types";
 import { StoredObject } from "ChillDocStoreAssets/types";
 
-export interface Motive {
+interface MotiveBase {
   type: "ticket_motive";
   id: number;
   active: boolean;
   label: TranslatableString;
+}
+
+/**
+ * Represent a motive with basic information and parent motive.
+ *
+ * Match the "read" and "read:children-to-parent" serializer groups.
+ */
+export interface MotiveWithParent extends MotiveBase {
+  parent: MotiveWithParent | null;
+}
+
+/**
+ * Represents a motive for a ticket, including details like emergency status, stored objects, and supplementary comments.
+ *
+ * Match the "read:extended" serializer group in MotiveNormalizer.
+ */
+export interface Motive extends MotiveBase {
   makeTicketEmergency: TicketEmergencyState;
   storedObjects: StoredObject[];
   supplementaryComments: { label: string }[];
+  children: Motive[];
 }
 
 export type TicketState = "open" | "closed" | "close";
@@ -45,7 +63,7 @@ export interface MotiveHistory {
   id: number;
   startDate: null;
   endDate: null | DateTime;
-  motive: Motive;
+  motive: MotiveWithParent;
   createdBy: User | null;
   createdAt: DateTime | null;
 }
@@ -140,7 +158,7 @@ interface BaseTicket<
   createdAt: DateTime | null;
   currentAddressees: UserGroupOrUser[];
   currentPersons: Person[];
-  currentMotive: null | Motive;
+  currentMotive: MotiveWithParent | null;
   currentState: TicketState | null;
   emergency: TicketEmergencyState | null;
   caller: Person | Thirdparty | null;
@@ -185,7 +203,7 @@ export interface TicketFilterParams {
 
 export interface TicketInitForm {
   content: string;
-  motive?: Motive;
+  motive?: MotiveWithParent | null;
   addressees: UserGroupOrUser[];
   persons: Person[];
   caller: Person | null;
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
index 6c437f0b7..69569f304 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
@@ -179,7 +179,7 @@ import {
   UserGroup,
   UserGroupOrUser,
 } from "../../../../../../../ChillMainBundle/Resources/public/types";
-import { Comment, Motive, Ticket } from "../../../types";
+import { Comment, Motive, MotiveWithParent, Ticket } from "../../../types";
 import { Person } from "ChillPersonAssets/types";
 
 const store = useStore();
@@ -252,7 +252,7 @@ const returnPath = computed((): string => {
   return returnPath;
 });
 
-const motive = ref(ticket.value.currentMotive as Motive);
+const motive = ref(ticket.value.currentMotive as MotiveWithParent | null);
 const content = ref("" as Comment["content"]);
 const addressees = ref(ticket.value.currentAddressees as UserGroupOrUser[]);
 const persons = ref(ticket.value.currentPersons as Person[]);
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Addressee/AddresseeComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Addressee/AddresseeComponent.vue
index 4b7447132..edd9503c9 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Addressee/AddresseeComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Addressee/AddresseeComponent.vue
@@ -7,7 +7,7 @@
           class="badge-user-group"
           :style="`background-color: ${addressee.backgroundColor}; color: ${addressee.foregroundColor};`"
         >
-          {{ addressee.label.fr }}
+          {{ localizeString(addressee.label) }}
         </span>
         <span v-else-if="addressee.type === 'user'" class="badge-user">
           <user-render-box-badge :user="addressee"
@@ -24,6 +24,9 @@ import UserRenderBoxBadge from "ChillMainAssets/vuejs/_components/Entity/UserRen
 // Types
 import { UserGroupOrUser } from "../../../../../../../../ChillMainBundle/Resources/public/types";
 
+// Utils
+import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
+
 defineProps<{ addressees: UserGroupOrUser[] }>();
 </script>
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
index c874142b2..0b0c5131a 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
@@ -6,7 +6,9 @@
           <h1>
             {{ getTicketTitle(ticket) }}
             <peloton-component
-              :stored-objects="ticket.currentMotive?.storedObjects ?? null"
+              :stored-objects="
+                currentMotive ? currentMotive.storedObjects : null
+              "
             />
           </h1>
 
@@ -91,7 +93,7 @@
 </style>
 
 <script setup lang="ts">
-import { computed, ref } from "vue";
+import { computed, ComputedRef, ref } from "vue";
 import { useToast } from "vue-toast-notification";
 
 // Components
@@ -102,7 +104,7 @@ import StateToggleComponent from "./State/StateToggleComponent.vue";
 import PersonComponent from "./Person/PersonComponent.vue";
 
 // Types
-import { Ticket } from "../../../types";
+import { Motive, Ticket } from "../../../types";
 import { Person } from "ChillPersonAssets/types";
 
 import {
@@ -127,7 +129,7 @@ import { useStore } from "vuex";
 // Utils
 import { getTicketTitle } from "../utils/utils";
 
-defineProps<{
+const props = defineProps<{
   ticket: Ticket;
 }>();
 
@@ -135,6 +137,10 @@ const store = useStore();
 const toast = useToast();
 const today = ref(new Date());
 
+const currentMotive: ComputedRef<Motive | null> = computed(() =>
+  store.getters.getMotiveById(props.ticket.currentMotive?.id),
+);
+
 setInterval(() => {
   today.value = new Date();
 }, 5000);
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Comment/CommentEditorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Comment/CommentEditorComponent.vue
index a3d7f84f3..d34e2ddd0 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Comment/CommentEditorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Comment/CommentEditorComponent.vue
@@ -26,22 +26,24 @@
 </template>
 
 <script setup lang="ts">
-import { reactive, ref, watch, computed } from "vue";
+import { reactive, ref, watch, computed, ComputedRef } from "vue";
 
 // Components
 import CommentEditor from "ChillMainAssets/vuejs/_components/CommentEditor/CommentEditor.vue";
 
 // Types
-import { Motive } from "../../../../types";
+import { Motive, MotiveWithParent } from "../../../../types";
 
 // Utils
 import { StoredObject } from "ChillDocStoreAssets/types";
+import { useStore } from "vuex";
 
 const props = defineProps<{
   modelValue?: string;
-  motive?: Motive;
+  motive?: MotiveWithParent | null;
 }>();
 
+const store = useStore();
 const supplementaryCommentsInput = reactive<string[]>([]);
 
 const emit = defineEmits<{
@@ -50,11 +52,14 @@ const emit = defineEmits<{
 }>();
 
 const content = ref(props.modelValue);
+const motive: ComputedRef<Motive | null> = computed(() =>
+  store.getters.getMotiveById(props.motive?.id),
+);
 
-const aggregateSupplementaryComments = computed(() => {
+function aggregateSupplementaryComments() {
   let supplementaryText = " \n\n ";
-  if (props.motive && props.motive.supplementaryComments) {
-    props.motive.supplementaryComments.forEach(
+  if (props.motive && motive.value && motive.value.supplementaryComments) {
+    motive.value.supplementaryComments.forEach(
       (item: { label: string }, index: number) => {
         if (supplementaryCommentsInput[index]) {
           supplementaryText +=
@@ -65,18 +70,18 @@ const aggregateSupplementaryComments = computed(() => {
     );
   }
   return (content.value || "") + supplementaryText;
-});
+}
 
 watch(
   supplementaryCommentsInput,
   () => {
-    emit("update:modelValue", aggregateSupplementaryComments.value);
+    emit("update:modelValue", aggregateSupplementaryComments());
   },
   { deep: true },
 );
 
 watch(content, () => {
-  emit("update:modelValue", aggregateSupplementaryComments.value);
+  emit("update:modelValue", aggregateSupplementaryComments());
 });
 </script>
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveComponent.vue
index 58edb7c19..6ea2c67b2 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveComponent.vue
@@ -1,24 +1,32 @@
 <template>
   <div class="col-12 fw-bolder">
-    {{ localizeTranslatableString(motiveHistory.motive.label) }}
+    {{ motiveLabelRecursive(props.motiveHistory.motive) }}
     <peloton-component
-      :stored-objects="motiveHistory.motive.storedObjects ?? null"
+      :stored-objects="motive ? motive.storedObjects : null"
       pelotonBtnClass="float-end"
     />
   </div>
 </template>
 
 <script lang="ts" setup>
+import { useStore } from "vuex";
 // Types
-import { MotiveHistory } from "../../../../types";
+import {Motive, MotiveHistory, MotiveWithParent} from "../../../../types";
 
 //Utils
-import { localizeTranslatableString } from "../../utils/utils";
+import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
 
 //Components
 import PelotonComponent from "../PelotonComponent.vue";
+import { computed, ComputedRef } from "vue";
+import {motiveLabelRecursive} from "../../utils/utils";
 
-defineProps<{ motiveHistory: MotiveHistory }>();
+const props = defineProps<{ motiveHistory: MotiveHistory }>();
+
+const store = useStore();
+const motive: ComputedRef<Motive | null> = computed(() =>
+  store.getters.getMotiveById(props.motiveHistory.motive.id),
+);
 </script>
 
 <style lang="scss" scoped></style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveSelectorComponent.vue
index b1f6315d1..de094743a 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveSelectorComponent.vue
@@ -5,22 +5,50 @@
         <vue-multiselect
           name="selectMotive"
           id="selectMotive"
-          label="label"
-          :custom-label="customLabel"
+          label="displayLabel"
+          :custom-label="(value: Motive) => localizeString(value.label)"
           track-by="id"
           :open-direction="openDirection"
           :multiple="false"
           :searchable="true"
           :placeholder="trans(CHILL_TICKET_TICKET_SET_MOTIVE_LABEL)"
-          :select-label="trans(MULTISELECT_SELECT_LABEL)"
-          :deselect-label="trans(MULTISELECT_DESELECT_LABEL)"
-          :selected-label="trans(MULTISELECT_SELECTED_LABEL)"
-          :options="motives"
+          :options="flattenedMotives"
           v-model="motive"
           class="form-control"
-        />
+          @remove="(value: Motive) => $emit('remove', value)"
+        >
+          <template
+            #option="{
+              option,
+            }: {
+              option: Motive & {
+                isChild?: boolean;
+                isParent?: boolean;
+                level?: number;
+                breadcrumb: string[];
+              };
+            }"
+          >
+            <span
+              :data-select="trans(MULTISELECT_SELECT_LABEL)"
+              :data-selected="trans(MULTISELECT_SELECTED_LABEL)"
+              :data-deselect="trans(MULTISELECT_DESELECT_LABEL)"
+            >
+              <span v-for="(crumb, idx) in option.breadcrumb" :key="idx">
+                <template v-if="idx < option.breadcrumb.length - 1">
+                  <i>{{ crumb }}</i> &gt;
+                </template>
+                <template v-else>
+                  {{ crumb }}
+                </template>
+              </span>
+            </span>
+          </template>
+        </vue-multiselect>
         <div class="input-group-append">
-          <peloton-component :stored-objects="motive?.storedObjects ?? null" />
+          <peloton-component
+            :stored-objects="motive ? motive.storedObjects : null"
+          />
         </div>
       </div>
     </div>
@@ -28,11 +56,11 @@
 </template>
 
 <script setup lang="ts">
-import { ref, watch } from "vue";
+import { computed } from "vue";
 import VueMultiselect from "vue-multiselect";
 
 // Types
-import { Motive } from "../../../../types";
+import { Motive, MotiveWithParent } from "../../../../types";
 
 // Translations
 import {
@@ -46,10 +74,14 @@ import {
 // Component
 import PelotonComponent from "../PelotonComponent.vue";
 
+// Utils
+import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
+import { useStore } from "vuex";
+
 const props = defineProps({
   modelValue: {
-    type: Object as () => Motive | undefined,
-    default: undefined,
+    type: Object as () => MotiveWithParent | Motive | null,
+    default: null,
   },
   motives: {
     type: Array as () => Motive[],
@@ -59,34 +91,73 @@ const props = defineProps({
     type: String,
     default: "bottom",
   },
-});
-
-const emit =
-  defineEmits<(e: "update:modelValue", value: Motive | undefined) => void>();
-
-const motive = ref(props.modelValue);
-
-watch(motive, (val) => {
-  emit("update:modelValue", val);
-});
-
-watch(
-  () => props.modelValue,
-  (val) => {
-    motive.value = val;
+  allowParentSelection: {
+    type: Boolean,
+    default: false,
   },
-);
+});
+const store = useStore();
 
-function customLabel(motive: Motive) {
-  return motive?.label?.fr;
-}
+const emit = defineEmits<{
+  (e: "update:modelValue", value: Motive | null): void;
+  (e: "remove", value: Motive): void;
+}>();
+
+const motive = computed<Motive | null>({
+  get() {
+    return store.getters.getMotiveById(props.modelValue?.id);
+  },
+  set(value: Motive | null) {
+    emit("update:modelValue", value);
+  },
+});
+
+const flattenedMotives = computed(() => {
+  const result: (Motive & {
+    isChild?: boolean;
+    isParent?: boolean;
+    level?: number;
+    displayLabel: string;
+    breadcrumb: string[];
+  })[] = [];
+
+  const processMotiveRecursively = (
+    motive: Motive,
+    isChild = false,
+    level = 0,
+    parentBreadcrumb: string[] = [],
+  ) => {
+    const hasChildren = motive.children && motive.children.length > 0;
+    const displayLabel = localizeString(motive.label);
+    const breadcrumb = [...parentBreadcrumb, displayLabel];
+
+    if (props.allowParentSelection || !hasChildren) {
+      result.push({
+        ...motive,
+        isChild,
+        isParent: hasChildren,
+        level,
+        breadcrumb,
+        displayLabel,
+      });
+    }
+
+    if (hasChildren) {
+      motive.children.forEach((childMotive) => {
+        processMotiveRecursively(childMotive, true, level + 1, breadcrumb);
+      });
+    }
+  };
+
+  props.motives.forEach((parentMotive) => {
+    processMotiveRecursively(parentMotive, false, 0, []);
+  });
+
+  return result;
+});
 </script>
 
 <style lang="scss" scoped>
-#selectMotive {
-  margin-bottom: 1.5em;
-}
-// Supprime le padding de .form-control pour ce composant
 .form-control {
   padding: 0 !important;
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketInitFormComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketInitFormComponent.vue
index 9d7e6dee1..75fcb9169 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketInitFormComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketInitFormComponent.vue
@@ -57,7 +57,7 @@
           }}</label>
           <comment-editor-component
             v-model="ticketForm.content"
-            :motive="ticketForm.motive"
+            :motive="ticketForm.motive ? ticketForm.motive : null"
           />
         </div>
         <div class="mb-3">
@@ -105,6 +105,7 @@ import ToggleComponent from "../../TicketList/components/ToggleComponent.vue";
 // Types
 import {
   Motive,
+  MotiveWithParent,
   Ticket,
   TicketEmergencyState,
   TicketInitForm,
@@ -142,7 +143,7 @@ const store = useStore();
 const ticketForm = reactive({
   content: "",
   addressees: props.ticket.currentAddressees as UserGroupOrUser[],
-  motive: props.ticket.currentMotive as Motive | null,
+  motive: props.ticket.currentMotive as MotiveWithParent | null,
   persons: props.ticket.currentPersons as Person[],
   caller: props.ticket.caller as Person | null,
   emergency: props.ticket.emergency as TicketEmergencyState,
@@ -174,7 +175,7 @@ function submitForm() {
 }
 function resetForm() {
   ticketForm.content = "";
-  ticketForm.motive = undefined;
+  ticketForm.motive = null;
   ticketForm.persons = [];
   ticketForm.caller = null;
   ticketForm.emergency = props.ticket.emergency as TicketEmergencyState;
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/motive.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/motive.ts
index 9f7db5509..355613fba 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/motive.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/motive.ts
@@ -21,6 +21,19 @@ export const moduleMotive: Module<State, RootState> = {
     getMotives(state) {
       return state.motives;
     },
+    getMotiveById: (state) => (motiveId: number) => {
+      const findInChildren = (motives: Motive[]): Motive | null => {
+        for (const motive of motives) {
+          if (motive.id === motiveId) return motive;
+          const found = motive.children?.length
+            ? findInChildren(motive.children)
+            : null;
+          if (found) return found;
+        }
+        return null;
+      };
+      return findInChildren(state.motives);
+    },
   },
   mutations: {
     setMotives(state, motives) {
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/persons.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/persons.ts
index 84c92051d..dcdad685b 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/persons.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/persons.ts
@@ -3,7 +3,7 @@ import { Person } from "../../../../../../../../ChillPersonBundle/Resources/publ
 import { ApiException } from "../../../../../../../../ChillMainBundle/Resources/public/types";
 import { Module } from "vuex";
 import { RootState } from "..";
-import { Ticket } from "../../../../types";
+import { Ticket } from ".././../../../types";
 import { Thirdparty } from "src/Bundle/ChillThirdPartyBundle/Resources/public/types";
 
 export interface State {
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket_list.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket_list.ts
index af60123a8..dfaa1a9a3 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket_list.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket_list.ts
@@ -1,6 +1,5 @@
 import { Module } from "vuex";
 import { RootState } from "..";
-
 import { TicketFilterParams, TicketSimple } from "../../../../types";
 import {
   makeFetch,
@@ -76,7 +75,7 @@ export const moduleTicketList: Module<State, RootState> = {
           const filteredParams = Object.fromEntries(
             Object.entries(ticketFilterParams).filter(
               ([, value]) =>
-                value !== undefined &&
+                value !== null &&
                 value !== null &&
                 (value === true ||
                   (typeof value === "number" && !isNaN(value)) ||
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/utils/utils.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/utils/utils.ts
index 342df70a6..34a2ad09d 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/utils/utils.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/utils/utils.ts
@@ -8,7 +8,8 @@ import {
   CHILL_TICKET_TICKET_BANNER_AND,
   CHILL_TICKET_TICKET_BANNER_NO_MOTIVE,
 } from "translator";
-import { Ticket, TicketSimple } from "../../../types";
+import {MotiveWithParent, Ticket, TicketSimple} from "../../../types";
+import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
 
 /**
  * Calcule et formate le temps écoulé depuis une date de création
@@ -65,17 +66,6 @@ export function getSinceCreated(createdAt: string, currentTime: Date): string {
   return parts[0];
 }
 
-export function localizeTranslatableString(
-  translatableString: Record<string, string> | string,
-): string {
-  // This would be implemented based on your localization logic
-  if (typeof translatableString === "string") {
-    return translatableString;
-  }
-  // Assuming it's an object with locale keys
-  return translatableString?.fr || translatableString?.en || "Unknown";
-}
-
 export function formatDateTime(
   dateTime: string,
   dateStyle: string,
@@ -88,7 +78,23 @@ export function formatDateTime(
 }
 export function getTicketTitle(ticket: Ticket | TicketSimple): string {
   if (ticket.currentMotive) {
-    return `#${ticket.id} ${localizeTranslatableString(ticket.currentMotive.label)}`;
+    return `#${ticket.id} ${localizeString(ticket.currentMotive.label)}`;
   }
   return `#${ticket.id} ${trans(CHILL_TICKET_TICKET_BANNER_NO_MOTIVE)}`;
 }
+
+export function motiveLabelRecursive(motive: MotiveWithParent|null): string  {
+  console.log('test', motive);
+  if (null === motive) {
+    return "";
+  }
+
+  const str = [];
+  let m: MotiveWithParent|null = motive;
+  do {
+    str.push(localizeString(m.label));
+    m = m.parent;
+  } while (m !== null);
+
+  return str.reverse().join(" > ");
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketFilterListComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketFilterListComponent.vue
index e9e0a9b27..510ffe3a2 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketFilterListComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketFilterListComponent.vue
@@ -57,6 +57,8 @@
               <motive-selector
                 v-model="selectedMotive"
                 :motives="availableMotives"
+                :allow-parent-selection="true"
+                @remove="(motive) => removeMotive(motive)"
                 id="motiveSelector"
               />
 
@@ -299,14 +301,13 @@ const selectedAddressees = ref<UserGroupOrUser[]>([]);
 const selectedCreator = ref<User[]>([]);
 
 // Sélection des motifs
-const selectedMotive = ref<Motive | undefined>();
+const selectedMotive = ref<Motive | null>();
 const selectedMotives = ref<Motive[]>([]);
 
 // Watchers pour les sélecteurs
 watch(selectedMotive, (newMotive) => {
   if (newMotive && !selectedMotives.value.find((m) => m.id === newMotive.id)) {
     selectedMotives.value.push(newMotive);
-    selectedMotive.value = undefined; // Reset pour permettre une nouvelle sélection
   }
 });
 
@@ -384,6 +385,9 @@ const removeMotive = (motiveToRemove: Motive): void => {
   if (index !== -1) {
     selectedMotives.value.splice(index, 1);
   }
+  if (selectedMotive.value && motiveToRemove.id == selectedMotive.value.id) {
+    selectedMotive.value = null;
+  }
 };
 
 const applyFilters = (): void => {
@@ -456,7 +460,7 @@ const resetFilters = (): void => {
   selectedCreator.value = [];
   selectedAddressees.value = [];
   selectedMotives.value = [];
-  selectedMotive.value = undefined;
+  selectedMotive.value = null;
   isClosedToggled.value = false;
   isEmergencyToggled.value = false;
   applyFilters();
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/ToggleComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/ToggleComponent.vue
index b761a8d05..65c3b1707 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/ToggleComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/ToggleComponent.vue
@@ -17,11 +17,7 @@
           : classColor?.off || 'bg-danger',
       ]"
       :style="{
-        backgroundColor: classColor
-          ? undefined
-          : !modelValue
-            ? colorOff
-            : colorOn,
+        backgroundColor: classColor ? '' : !modelValue ? colorOff : colorOn,
         height: '28px',
         width: toggleWidth + 'px',
       }"
@@ -72,7 +68,7 @@ const props = withDefaults(defineProps<Props>(), {
   onLabel: "ON",
   offLabel: "OFF",
   disabled: false,
-  id: undefined,
+  id: "",
   colorOn: "#4caf50",
   colorOff: "#ccc",
   classColor: () => ({
diff --git a/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/MotiveNormalizer.php b/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/MotiveNormalizer.php
new file mode 100644
index 000000000..a9b33483b
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/MotiveNormalizer.php
@@ -0,0 +1,103 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Serializer\Normalizer;
+
+use Chill\TicketBundle\Entity\Motive;
+use Symfony\Component\Serializer\Exception\UnexpectedValueException;
+use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
+use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
+use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+
+/**
+ * Normalizes a Motive object into an array format, supporting different serialization groups
+ * to customize the output depending on the context.
+ *
+ * There are several serialization groups available:
+ * - 'read': Basic information about the motive.
+ * - 'read:extended': Includes additional details like stored objects and supplementary comments.
+ * - 'read:parent-to-children': Normalizes children recursively without exposing parent to avoid cycles.
+ * - 'read:children-to-parent': Normalizes parent recursively without exposing children to avoid cycles.
+ */
+final class MotiveNormalizer implements NormalizerInterface, NormalizerAwareInterface
+{
+    use NormalizerAwareTrait;
+
+    public const GROUP_PARENT_TO_CHILDREN = 'read:parent-to-children';
+    public const GROUP_CHILDREN_TO_PARENT = 'read:children-to-parent';
+
+    public function normalize($object, ?string $format = null, array $context = []): array
+    {
+        if (!$object instanceof Motive) {
+            throw new UnexpectedValueException('Expected instance of '.Motive::class);
+        }
+
+        $groups = $context[AbstractNormalizer::GROUPS] ?? [];
+        if (is_string($groups)) {
+            $groups = [$groups];
+        }
+
+        $data = [];
+
+        if (in_array('read', $groups, true) || in_array('read:extended', $groups, true)) {
+            // Build base representation
+            $data = [
+                'type' => 'ticket_motive',
+                'id' => $object->getId(),
+                'label' => $object->getLabel(),
+                'active' => $object->isActive(),
+            ];
+        }
+
+        if (in_array('read:extended', $groups, true)) {
+            $data['makeTicketEmergency'] = $object->getMakeTicketEmergency();
+            $data['supplementaryComments'] = $object->getSupplementaryComments();
+            // Normalize stored objects (delegated to their own normalizer when present)
+            $storedObjects = [];
+            foreach ($object->getStoredObjects() as $storedObject) {
+                $storedObjects[] = $this->normalizer->normalize($storedObject, $format, $context);
+            }
+            $data['storedObjects'] = $storedObjects;
+
+        }
+
+        if (in_array(self::GROUP_PARENT_TO_CHILDREN, $groups, true)) {
+            // Normalize children recursively (but we do not expose parent to avoid cycles)
+            $children = [];
+            foreach ($object->getChildren() as $child) {
+                $children[] = $this->normalizer->normalize($child, $format, $context);
+            }
+            $data['children'] = $children;
+        } elseif (in_array(self::GROUP_CHILDREN_TO_PARENT, $groups, true)) {
+            $data['parent'] = $this->normalizer->normalize($object->getParent(), $format, $context);
+        }
+
+        return $data;
+    }
+
+    public function supportsNormalization($data, ?string $format = null, array $context = []): bool
+    {
+        return $data instanceof Motive;
+    }
+
+    /**
+     * Optimization hint for the Serializer (available since Symfony 5.3+).
+     *
+     * @return array<class-string, bool>
+     */
+    public function getSupportedTypes(?string $format): array
+    {
+        return [
+            Motive::class => true,
+        ];
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php b/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
index ef02ce5eb..30b057f21 100644
--- a/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
+++ b/src/Bundle/ChillTicketBundle/src/Serializer/Normalizer/TicketNormalizer.php
@@ -51,7 +51,7 @@ final class TicketNormalizer implements NormalizerInterface, NormalizerAwareInte
             ]),
             'currentAddressees' => $this->normalizer->normalize($object->getCurrentAddressee(), $format, ['groups' => 'read']),
             'currentInputs' => $this->normalizer->normalize($object->getCurrentInputs(), $format, ['groups' => 'read']),
-            'currentMotive' => $this->normalizer->normalize($object->getMotive(), $format, ['groups' => 'read']),
+            'currentMotive' => $this->normalizer->normalize($object->getMotive(), $format, ['groups' => ['read', MotiveNormalizer::GROUP_CHILDREN_TO_PARENT]]),
             'currentState' => $object->getState()?->value ?? 'open',
             'emergency' => $object->getEmergencyStatus()?->value ?? 'no',
             'caller' => $this->normalizer->normalize($object->getCaller(), $format, ['groups' => 'read']),
@@ -167,12 +167,20 @@ final class TicketNormalizer implements NormalizerInterface, NormalizerAwareInte
                 'event_type' => $data['event_type'],
                 'at' => $this->normalizer->normalize($data['at'], $format, $context),
                 'by' => $this->normalizer->normalize($data['by'], $format, $context),
-                'data' => $this->normalizer->normalize($data['data'], $format, $context),
+                'data' => $this->normalizer->normalize($data['data'], $format, $this->contextByEventType($data['event_type'], $context)),
             ],
             $events
         );
     }
 
+    private function contextByEventType(string $eventType, array $context): array
+    {
+        return match($eventType) {
+            'set_motive' => array_merge($context, ['groups' => ['read', MotiveNormalizer::GROUP_CHILDREN_TO_PARENT]]),
+            default => $context,
+        };
+    }
+
     private function addresseesStates(Ticket $ticket): array
     {
         /** @var array{string, array{added: list<AddresseeHistory>, removed: list<AddresseeHistory>}} $changes */
diff --git a/src/Bundle/ChillTicketBundle/src/migrations/Version20250924124214.php b/src/Bundle/ChillTicketBundle/src/migrations/Version20250924124214.php
new file mode 100644
index 000000000..0af41c592
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/migrations/Version20250924124214.php
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\Migrations\Ticket;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20250924124214 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add parent to motive';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_ticket.motive ADD parent_id INT DEFAULT NULL');
+        $this->addSql('ALTER TABLE chill_ticket.motive ADD CONSTRAINT FK_DE298BF8727ACA70 FOREIGN KEY (parent_id) REFERENCES chill_ticket.motive (id) NOT DEFERRABLE INITIALLY IMMEDIATE');
+        $this->addSql('CREATE INDEX IDX_DE298BF8727ACA70 ON chill_ticket.motive (parent_id)');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_ticket.motive DROP CONSTRAINT FK_DE298BF8727ACA70');
+        $this->addSql('DROP INDEX chill_ticket.IDX_DE298BF8727ACA70');
+        $this->addSql('ALTER TABLE chill_ticket.motive DROP parent_id');
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Entity/MotiveTest.php b/src/Bundle/ChillTicketBundle/tests/Entity/MotiveTest.php
new file mode 100644
index 000000000..c9bba7f6f
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Entity/MotiveTest.php
@@ -0,0 +1,63 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Tests\Entity;
+
+use Chill\TicketBundle\Entity\Motive;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @internal
+ *
+ * @covers \Chill\TicketBundle\Entity\Motive::getWithDescendants
+ */
+final class MotiveTest extends TestCase
+{
+    public function testGetDescendantsOnLeafReturnsSelfOnly(): void
+    {
+        $leaf = new Motive();
+        $leaf->setLabel(['fr' => 'Feuille']);
+
+        $collection = $leaf->getDescendants();
+
+        self::assertCount(1, $collection);
+        self::assertSame($leaf, $collection->first());
+        self::assertContains($leaf, $collection->toArray());
+    }
+
+    public function testGetWithDescendantsReturnsSelfAndAllDescendants(): void
+    {
+        $parent = new Motive();
+        $parent->setLabel(['fr' => 'Parent']);
+
+        $childA = new Motive();
+        $childA->setLabel(['fr' => 'Enfant A']);
+        $childA->setParent($parent);
+
+        $childB = new Motive();
+        $childB->setLabel(['fr' => 'Enfant B']);
+        $childB->setParent($parent);
+
+        $grandChildA1 = new Motive();
+        $grandChildA1->setLabel(['fr' => 'Petit-enfant A1']);
+        $grandChildA1->setParent($childA);
+
+        $descendants = $parent->getDescendants();
+        $asArray = $descendants->toArray();
+
+        // It should contain the parent itself, both children and the grand child
+        self::assertCount(4, $descendants, 'Expected parent + 2 children + 1 grandchild');
+        self::assertContains($parent, $asArray);
+        self::assertContains($childA, $asArray);
+        self::assertContains($childB, $asArray);
+        self::assertContains($grandChildA1, $asArray);
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/MotiveNormalizerTest.php b/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/MotiveNormalizerTest.php
new file mode 100644
index 000000000..1d9ecd10a
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Serializer/Normalizer/MotiveNormalizerTest.php
@@ -0,0 +1,154 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Tests\Serializer\Normalizer;
+
+use Chill\DocStoreBundle\Entity\StoredObject;
+use Chill\TicketBundle\Entity\EmergencyStatusEnum;
+use Chill\TicketBundle\Entity\Motive;
+use Chill\TicketBundle\Serializer\Normalizer\MotiveNormalizer;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+
+/**
+ * @internal
+ *
+ * @covers \Chill\TicketBundle\Serializer\Normalizer\MotiveNormalizer
+ */
+final class MotiveNormalizerTest extends TestCase
+{
+    public function testNormalizeReadBasic(): void
+    {
+        $motive = new Motive();
+        $motive->setLabel(['fr' => 'Logement', 'en' => 'Housing']);
+        // active is true by default
+
+        $normalizer = new MotiveNormalizer();
+        $normalizer->setNormalizer($this->buildDummyNormalizer());
+
+        $actual = $normalizer->normalize($motive, 'json', ['groups' => 'read']);
+
+        self::assertSame('ticket_motive', $actual['type']);
+        self::assertNull($actual['id']);
+        self::assertSame(['fr' => 'Logement', 'en' => 'Housing'], $actual['label']);
+        self::assertTrue($actual['active']);
+        // no extended fields here
+        self::assertArrayNotHasKey('makeTicketEmergency', $actual);
+        self::assertArrayNotHasKey('supplementaryComments', $actual);
+        self::assertArrayNotHasKey('storedObjects', $actual);
+        self::assertArrayNotHasKey('children', $actual);
+    }
+
+    public function testNormalizeExtended(): void
+    {
+        $motive = new Motive();
+        $motive->setLabel(['fr' => 'Financier']);
+        $motive->setMakeTicketEmergency(EmergencyStatusEnum::YES);
+        $motive->addSupplementaryComment(['label' => 'Justifier le revenu']);
+        $motive->addStoredObject(new StoredObject('pending'));
+
+        $normalizer = new MotiveNormalizer();
+        $normalizer->setNormalizer($this->buildDummyNormalizer());
+
+        $actual = $normalizer->normalize($motive, 'json', ['groups' => ['read', 'read:extended']]);
+
+        self::assertSame('ticket_motive', $actual['type']);
+        self::assertSame(['fr' => 'Financier'], $actual['label']);
+        self::assertSame(EmergencyStatusEnum::YES, $actual['makeTicketEmergency']);
+        self::assertSame([
+            ['label' => 'Justifier le revenu'],
+        ], $actual['supplementaryComments']);
+        self::assertSame([
+            ['stored_object'],
+        ], $actual['storedObjects']);
+    }
+
+    public function testNormalizeParentToChildren(): void
+    {
+        $parent = new Motive();
+        $parent->setLabel(['fr' => 'Parent']);
+        $child1 = new Motive();
+        $child1->setLabel(['fr' => 'Enfant 1']);
+        $child2 = new Motive();
+        $child2->setLabel(['fr' => 'Enfant 2']);
+
+        // build relation
+        $child1->setParent($parent);
+        $child2->setParent($parent);
+
+        $normalizer = new MotiveNormalizer();
+        $normalizer->setNormalizer($this->buildDummyNormalizer());
+
+        $actual = $normalizer->normalize($parent, 'json', ['groups' => [MotiveNormalizer::GROUP_PARENT_TO_CHILDREN]]);
+
+        // children must be normalized by the injected normalizer and parent not exposed
+        self::assertArrayHasKey('children', $actual);
+        self::assertSame([
+            ['motive' => 'normalized'],
+            ['motive' => 'normalized'],
+        ], $actual['children']);
+        self::assertArrayNotHasKey('parent', $actual);
+    }
+
+    public function testNormalizeChildrenToParent(): void
+    {
+        $parent = new Motive();
+        $parent->setLabel(['fr' => 'Parent']);
+        $child = new Motive();
+        $child->setLabel(['fr' => 'Enfant']);
+        $child->setParent($parent);
+
+        $normalizer = new MotiveNormalizer();
+        $normalizer->setNormalizer($this->buildDummyNormalizer());
+
+        $actual = $normalizer->normalize($child, 'json', ['groups' => ['read', MotiveNormalizer::GROUP_CHILDREN_TO_PARENT]]);
+
+        // parent must be normalized by the injected normalizer and children not exposed
+        self::assertArrayHasKey('parent', $actual);
+        self::assertSame(['motive' => 'normalized'], $actual['parent']);
+        self::assertArrayNotHasKey('children', $actual);
+    }
+
+    public function testSupportsAndSupportedTypes(): void
+    {
+        $motive = new Motive();
+        $normalizer = new MotiveNormalizer();
+
+        self::assertTrue($normalizer->supportsNormalization($motive, 'json'));
+        self::assertFalse($normalizer->supportsNormalization(new \stdClass(), 'json'));
+
+        $supported = $normalizer->getSupportedTypes('json');
+        self::assertArrayHasKey(Motive::class, $supported);
+        self::assertTrue($supported[Motive::class]);
+    }
+
+    private function buildDummyNormalizer(): NormalizerInterface
+    {
+        return new class () implements NormalizerInterface {
+            public function normalize($object, ?string $format = null, array $context = []): array
+            {
+                if ($object instanceof StoredObject) {
+                    return ['stored_object'];
+                }
+                if ($object instanceof Motive) {
+                    return ['motive' => 'normalized'];
+                }
+
+                return ['normalized'];
+            }
+
+            public function supportsNormalization($data, ?string $format = null): bool
+            {
+                return true;
+            }
+        };
+    }
+}

From 1675c56f3d2bb475745b6b0770202c9787a85edc Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 30 Sep 2025 15:29:41 +0200
Subject: [PATCH 173/283] Fix order of paginator parameters passed to findBy
 method

---
 .../Controller/MyInvitationsController.php        | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/Bundle/ChillCalendarBundle/Controller/MyInvitationsController.php b/src/Bundle/ChillCalendarBundle/Controller/MyInvitationsController.php
index fc2743e08..de029dd20 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/MyInvitationsController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/MyInvitationsController.php
@@ -11,7 +11,9 @@ declare(strict_types=1);
 
 namespace Chill\CalendarBundle\Controller;
 
+use Chill\CalendarBundle\Entity\Calendar;
 use Chill\CalendarBundle\Repository\InviteRepository;
+use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepository;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -22,7 +24,7 @@ use Symfony\Component\Routing\Annotation\Route;
 
 class MyInvitationsController extends AbstractController
 {
-    public function __construct(private readonly InviteRepository $inviteRepository, private readonly PaginatorFactory $paginator) {}
+    public function __construct(private readonly InviteRepository $inviteRepository, private readonly PaginatorFactory $paginator, private readonly DocGeneratorTemplateRepository $docGeneratorTemplateRepository) {}
 
     #[Route(path: '/{_locale}/calendar/invitations/my', name: 'chill_calendar_invitations_list_my')]
     public function myInvitations(Request $request): Response
@@ -36,26 +38,21 @@ class MyInvitationsController extends AbstractController
         }
 
         $total = count($this->inviteRepository->findBy(['user' => $user]));
-        dump($total);
-        dump($this->inviteRepository->findBy(['user' => $user]));
         $paginator = $this->paginator->create($total);
 
-        dump($paginator->getCurrentPageFirstItemNumber());
-        dump($paginator->getItemsPerPage());
         $invitations = $this->inviteRepository->findBy(
             ['user' => $user],
             ['createdAt' => 'DESC'],
-//            $paginator->getCurrentPageFirstItemNumber(),
-//            $paginator->getItemsPerPage()
+            $paginator->getItemsPerPage(),
+            $paginator->getCurrentPageFirstItemNumber()
         );
 
-        dump($invitations);
-
         $view = '@ChillCalendar/Invitations/listByUser.html.twig';
 
         return $this->render($view, [
             'invitations' => $invitations,
             'paginator' => $paginator,
+            'templates' => $this->docGeneratorTemplateRepository->findByEntity(Calendar::class),
         ]);
     }
 }

From 68a0ef7115c5d86710e5bbe9681065d1f9790d62 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 30 Sep 2025 15:30:14 +0200
Subject: [PATCH 174/283] Reorganize templates to allow re-use of
 _list.html.twig within listByUser.html.twig template

---
 .../Resources/views/Calendar/_list.html.twig  | 443 +++++++++---------
 .../listByAccompanyingCourse.html.twig        |  13 +-
 .../views/Calendar/listByPerson.html.twig     |  12 +-
 .../views/Invitations/_list_item.html.twig    | 172 -------
 .../views/Invitations/listByUser.html.twig    |  17 +-
 5 files changed, 254 insertions(+), 403 deletions(-)
 delete mode 100644 src/Bundle/ChillCalendarBundle/Resources/views/Invitations/_list_item.html.twig

diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig
index cff5c00cc..01241643b 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig
@@ -1,240 +1,229 @@
-{# list used in context of person or accompanyingPeriod #}
+{# list used in context of person, accompanyingPeriod or user #}
 
-{% if calendarItems|length > 0 %}
-    <div class="flex-table list-records context-accompanyingCourse">
+<div class="item-bloc">
+    <div class="item-row main">
+        <div class="item-col">
+            <div class="wrap-header">
+                <div class="wl-row">
+                    <div class="wl-col title">
+                        <p class="date-label">
+                            {% if context == 'person' and calendar.context == 'accompanying_period' %}
+                                <a href="{{ chill_path_add_return_path('chill_person_accompanying_course_index', {'accompanying_period_id': calendar.accompanyingPeriod.id}) }}" style="text-decoration: none;">
+                                    <span class="badge bg-primary">
+                                            <i class="fa fa-random"></i> {{ calendar.accompanyingPeriod.id }}
+                                    </span>
+                                </a>
+                            {% endif %}
+                            {% if calendar.endDate.diff(calendar.startDate).days >= 1 %}
+                                    {{ calendar.startDate|format_datetime('short', 'short') }}
+                                    - {{ calendar.endDate|format_datetime('short', 'short') }}
+                            {% else %}
+                                {{ calendar.startDate|format_datetime('short', 'short') }}
+                                    - {{ calendar.endDate|format_datetime('none', 'short') }}
+                            {% endif %}
+                        </p>
 
-        {% for calendar in calendarItems %}
-
-            <div class="item-bloc">
-                <div class="item-row main">
-                    <div class="item-col">
-                        <div class="wrap-header">
-                            <div class="wl-row">
-                                <div class="wl-col title">
-                                    <p class="date-label">
-                                        {% if context == 'person' and calendar.context == 'accompanying_period' %}
-                                            <a href="{{ chill_path_add_return_path('chill_person_accompanying_course_index', {'accompanying_period_id': calendar.accompanyingPeriod.id}) }}" style="text-decoration: none;">
-                                                <span class="badge bg-primary">
-                                                        <i class="fa fa-random"></i> {{ calendar.accompanyingPeriod.id }}
-                                                </span>
-                                            </a>
-                                        {% endif %}
-                                        {% if calendar.endDate.diff(calendar.startDate).days >= 1 %}
-                                                {{ calendar.startDate|format_datetime('short', 'short') }}
-                                                - {{ calendar.endDate|format_datetime('short', 'short') }}
-                                        {% else %}
-                                            {{ calendar.startDate|format_datetime('short', 'short') }}
-                                                - {{ calendar.endDate|format_datetime('none', 'short') }}
-                                        {% endif %}
-                                    </p>
-
-                                    <div class="duration short-message">
-                                        <i class="fa fa-fw fa-hourglass-end"></i>
-                                        {{ calendar.duration|date('%H:%I') }}
-                                        {% if false == calendar.sendSMS or null == calendar.sendSMS %}
-                                            <!-- no sms will be send -->
-                                        {% else %}
-                                            {% if calendar.smsStatus == 'sms_sent' %}
-                                                <span title="{{ 'SMS already sent'|trans }}" class="badge bg-info">
-                                                    <i class="fa fa-check "></i>
-                                                    <i class="fa fa-envelope "></i>
-                                                </span>
-                                            {% else %}
-                                                <span title="{{ 'Will send SMS'|trans }}" class="badge bg-info">
-                                                    <i class="fa fa-envelope "></i>
-                                                    <i class="fa fa-hourglass-end "></i>
-                                                </span>
-                                            {% endif %}
-                                        {% endif %}
-                                    </div>
-
-                                </div>
-                            </div>
+                        <div class="duration short-message">
+                            <i class="fa fa-fw fa-hourglass-end"></i>
+                            {{ calendar.duration|date('%H:%I') }}
+                            {% if false == calendar.sendSMS or null == calendar.sendSMS %}
+                                <!-- no sms will be send -->
+                            {% else %}
+                                {% if calendar.smsStatus == 'sms_sent' %}
+                                    <span title="{{ 'SMS already sent'|trans }}" class="badge bg-info">
+                                        <i class="fa fa-check "></i>
+                                        <i class="fa fa-envelope "></i>
+                                    </span>
+                                {% else %}
+                                    <span title="{{ 'Will send SMS'|trans }}" class="badge bg-info">
+                                        <i class="fa fa-envelope "></i>
+                                        <i class="fa fa-hourglass-end "></i>
+                                    </span>
+                                {% endif %}
+                            {% endif %}
                         </div>
 
-                        <div class="item-col">
-                            <ul class="list-content">
-                                {% if calendar.mainUser is not empty %}
-                                    <span class="badge-user">{{ calendar.mainUser|chill_entity_render_box({'at_date': calendar.startDate}) }}</span>
+                    </div>
+                </div>
+            </div>
+
+            <div class="item-col">
+                <ul class="list-content">
+                    {% if calendar.mainUser is not empty %}
+                        <span class="badge-user">{{ calendar.mainUser|chill_entity_render_box({'at_date': calendar.startDate}) }}</span>
+                    {% endif %}
+                </ul>
+            </div>
+
+        </div>
+    </div>
+
+    {% if calendar.comment.comment is not empty
+        or calendar.users|length > 0
+        or calendar.thirdParties|length > 0
+        or calendar.users|length > 0 %}
+        <div class="item-row details separator">
+            <div class="item-col">
+                {% include '@ChillActivity/Activity/concernedGroups.html.twig' with {
+                    'context': calendar.context == 'person' ?  'calendar_person' : 'calendar_accompanyingCourse',
+                    'render': 'wrap-list',
+                    'entity': calendar
+                } %}
+            </div>
+
+        </div>
+    {% endif %}
+
+    {% if calendar.comment.comment is not empty %}
+        <div class="item-row details separator">
+            <div class="item-col comment">
+                {{ calendar.comment|chill_entity_render_box( { 'limit_lines': 3, 'metadata': false } ) }}
+            </div>
+        </div>
+    {% endif %}
+
+    {% if calendar.location is not empty %}
+        <div class="item-row separator">
+            <div>
+                {% if calendar.location.address is not same as(null) and calendar.location.name is not empty %}
+                    <i class="fa fa-map-marker"></i>{% endif %}
+                {% if calendar.location.name is not empty %}{{ calendar.location.name }}{% endif %}
+                {% if calendar.location.address is not same as(null) %}{{ calendar.location.address|chill_entity_render_box({'multiline': false, 'with_picto': (calendar.location.name is empty)}) }}{% else %}
+                    <i class="fa fa-map-marker"></i>{% endif %}
+                {% if calendar.location.phonenumber1 is not empty %}<i
+                    class="fa fa-phone"></i> {{ calendar.location.phonenumber1|chill_format_phonenumber }}{% endif %}
+                {% if calendar.location.phonenumber2 is not empty %}<i
+                    class="fa fa-phone"></i> {{ calendar.location.phonenumber2|chill_format_phonenumber }}{% endif %}
+            </div>
+        </div>
+    {% endif %}
+
+    <div class="item-row separator column">
+        <div>
+
+            {{ include('@ChillCalendar/Calendar/_documents.twig.html') }}
+        </div>
+    </div>
+
+    {% if calendar.activity is not null %}
+        <div class="item-row separator">
+            <div class="item-col">
+                <div class="wrap-list">
+                    <div class="wl-row">
+                        <div class="wl-col title"><h3>{{ 'Activity'|trans }}</h3></div>
+                        <div class="wl-col list activity-linked">
+                            <h2 class="badge-title">
+                                <span class="title_label"></span>
+                                <span class="title_action">
+                                {{ calendar.activity.type.name | localize_translatable_string }}
+
+                                    {% if calendar.activity.emergency %}
+                                        <span class="badge bg-danger rounded-pill fs-6 float-end">{{ 'Emergency'|trans|upper }}</span>
+                                    {% endif %}
+                            </span>
+                            </h2>
+
+                            <ul class="record_actions">
+                                <li class="cancel">
+                                    <span class="createdBy">
+                                         {{ 'Created by'|trans }}
+                                        <b>{{ calendar.activity.createdBy|chill_entity_render_string({'at_date': calendar.activity.createdAt}) }}</b>, {{ 'on'|trans }} {{ calendar.activity.createdAt|format_datetime('short', 'short') }}
+                                    </span>
+                                </li>
+                                {% if is_granted('CHILL_ACTIVITY_SEE', calendar.activity) %}
+                                    <li>
+                                        <a href="{{ chill_path_add_return_path('chill_activity_activity_show', {'id': calendar.activity.id}) }}" class="btn btn-sm btn-show" ></a>
+                                    </li>
                                 {% endif %}
                             </ul>
-                        </div>
 
+                        </div>
                     </div>
                 </div>
-
-                {% if calendar.comment.comment is not empty
-                    or calendar.users|length > 0
-                    or calendar.thirdParties|length > 0
-                    or calendar.users|length > 0 %}
-                    <div class="item-row details separator">
-                        <div class="item-col">
-                            {% include '@ChillActivity/Activity/concernedGroups.html.twig' with {
-                                'context': calendar.context == 'person' ?  'calendar_person' : 'calendar_accompanyingCourse',
-                                'render': 'wrap-list',
-                                'entity': calendar
-                            } %}
-                        </div>
-
-                    </div>
-                {% endif %}
-
-                {% if calendar.comment.comment is not empty %}
-                    <div class="item-row details separator">
-                        <div class="item-col comment">
-                            {{ calendar.comment|chill_entity_render_box( { 'limit_lines': 3, 'metadata': false } ) }}
-                        </div>
-                    </div>
-                {% endif %}
-
-                {% if calendar.location is not empty %}
-                    <div class="item-row separator">
-                        <div>
-                            {% if calendar.location.address is not same as(null) and calendar.location.name is not empty %}
-                                <i class="fa fa-map-marker"></i>{% endif %}
-                            {% if calendar.location.name is not empty %}{{ calendar.location.name }}{% endif %}
-                            {% if calendar.location.address is not same as(null) %}{{ calendar.location.address|chill_entity_render_box({'multiline': false, 'with_picto': (calendar.location.name is empty)}) }}{% else %}
-                                <i class="fa fa-map-marker"></i>{% endif %}
-                            {% if calendar.location.phonenumber1 is not empty %}<i
-                                class="fa fa-phone"></i> {{ calendar.location.phonenumber1|chill_format_phonenumber }}{% endif %}
-                            {% if calendar.location.phonenumber2 is not empty %}<i
-                                class="fa fa-phone"></i> {{ calendar.location.phonenumber2|chill_format_phonenumber }}{% endif %}
-                        </div>
-                    </div>
-                {% endif %}
-
-                <div class="item-row separator column">
-                    <div>
-
-                        {{ include('@ChillCalendar/Calendar/_documents.twig.html') }}
-                    </div>
-                </div>
-
-                {% if calendar.activity is not null %}
-                    <div class="item-row separator">
-                        <div class="item-col">
-                            <div class="wrap-list">
-                                <div class="wl-row">
-                                    <div class="wl-col title"><h3>{{ 'Activity'|trans }}</h3></div>
-                                    <div class="wl-col list activity-linked">
-                                        <h2 class="badge-title">
-                                            <span class="title_label"></span>
-                                            <span class="title_action">
-                                            {{ calendar.activity.type.name | localize_translatable_string }}
-
-                                                {% if calendar.activity.emergency %}
-                                                    <span class="badge bg-danger rounded-pill fs-6 float-end">{{ 'Emergency'|trans|upper }}</span>
-                                                {% endif %}
-                                        </span>
-                                        </h2>
-
-                                        <ul class="record_actions">
-                                            <li class="cancel">
-                                                <span class="createdBy">
-                                                     {{ 'Created by'|trans }}
-                                                    <b>{{ calendar.activity.createdBy|chill_entity_render_string({'at_date': calendar.activity.createdAt}) }}</b>, {{ 'on'|trans }} {{ calendar.activity.createdAt|format_datetime('short', 'short') }}
-                                                </span>
-                                            </li>
-                                            {% if is_granted('CHILL_ACTIVITY_SEE', calendar.activity) %}
-                                                <li>
-                                                    <a href="{{ chill_path_add_return_path('chill_activity_activity_show', {'id': calendar.activity.id}) }}" class="btn btn-sm btn-show" ></a>
-                                                </li>
-                                            {% endif %}
-                                        </ul>
-
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                {% endif %}
-
-                <div class="item-row separator">
-                    <ul class="record_actions">
-                        {% if is_granted('CHILL_CALENDAR_DOC_EDIT', calendar) %}
-                            {% if templates|length == 0 %}
-                                <li>
-                                    <a class="btn btn-create"
-                                       href="{{ chill_path_add_return_path('chill_calendar_calendardoc_new', {'id': calendar.id }) }}">
-                                        {{ 'chill_calendar.Add a document'|trans }}
-                                    </a>
-                                </li>
-                            {% else %}
-                                <li>
-                                    <div class="dropdown">
-                                        <button class="btn btn-create dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
-                                            {{ 'chill_calendar.Add a document'|trans }}
-                                        </button>
-                                        <ul class="dropdown-menu">
-                                            <li>
-                                                <a class="dropdown-item"
-                                                   href="{{ chill_path_add_return_path('chill_calendar_calendardoc_new', {'id': calendar.id }) }}">
-                                                    {{ 'chill_calendar.Upload a document'|trans }}
-                                                </a>
-                                            </li>
-                                            {% for template in templates %}
-                                            <li>
-                                                <a class="dropdown-item"
-                                                    href="{{ chill_path_add_return_path('chill_docgenerator_generate_from_template', {'template': template.id, 'entityClassName': 'Chill\\CalendarBundle\\Entity\\Calendar', 'entityId': calendar.id}) }}"
-                                                >
-                                                   {{ template.name|localize_translatable_string }}
-                                                </a>
-                                            </li>
-                                            {% endfor %}
-                                        </ul>
-                                    </div>
-                                </li>
-                            {% endif %}
-                        {% endif %}
-                        {% if calendar.activity is null and (
-                            (calendar.context == 'accompanying_period' and is_granted('CHILL_ACTIVITY_CREATE', calendar.accompanyingPeriod))
-                            or
-                            (calendar.context == 'person' and is_granted('CHILL_ACTIVITY_CREATE', calendar.person))
-                            )
-                        %}
-                            <li>
-                                <a class="btn btn-create"
-                                   href="{{ chill_path_add_return_path('chill_calendar_calendar_to_activity', { 'id': calendar.id }) }}">
-                                    {{ 'Transform to activity'|trans }}
-                                </a>
-                            </li>
-                        {% endif %}
-
-                        {% if (calendar.isInvited(app.user)) %}
-                            {% set invite = calendar.inviteForUser(app.user) %}
-                            <li>
-                                <div invite-answer data-status="{{ invite.status|e('html_attr') }}"
-                                     data-calendar-id="{{ calendar.id|e('html_attr') }}"></div>
-                            </li>
-                        {% endif %}
-                        {% if false %}
-                            <li>
-                                <a href="{{ chill_path_add_return_path('chill_calendar_calendar_show', { 'id': calendar.id}) }}"
-                                   class="btn btn-show "></a>
-                            </li>
-                        {% endif %}
-                        {% if is_granted('CHILL_CALENDAR_CALENDAR_EDIT', calendar) %}
-                        <li>
-                            <a href="{{ chill_path_add_return_path('chill_calendar_calendar_edit', { 'id': calendar.id }) }}"
-                               class="btn btn-update "></a>
-                        </li>
-                        {% endif %}
-                        {% if is_granted('CHILL_CALENDAR_CALENDAR_DELETE', calendar) %}
-                        <li>
-                            <a href="{{ chill_path_add_return_path('chill_calendar_calendar_delete', { 'id': calendar.id } ) }}"
-                               class="btn btn-delete "></a>
-                        </li>
-                        {% endif %}
-                    </ul>
-
-                </div>
-
             </div>
-        {% endfor %}
+        </div>
+    {% endif %}
 
-        {% if calendarItems|length < paginator.getTotalItems %}
-            {{ chill_pagination(paginator) }}
-        {% endif %}
+    <div class="item-row separator">
+        <ul class="record_actions">
+                {% if is_granted('CHILL_CALENDAR_DOC_EDIT', calendar) %}
+                    {% if templates|length == 0 %}
+                        <li>
+                            <a class="btn btn-create"
+                               href="{{ chill_path_add_return_path('chill_calendar_calendardoc_new', {'id': calendar.id }) }}">
+                                {{ 'chill_calendar.Add a document'|trans }}
+                            </a>
+                        </li>
+                    {% else %}
+                        <li>
+                            <div class="dropdown">
+                                <button class="btn btn-create dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
+                                    {{ 'chill_calendar.Add a document'|trans }}
+                                </button>
+                                <ul class="dropdown-menu">
+                                    <li>
+                                        <a class="dropdown-item"
+                                           href="{{ chill_path_add_return_path('chill_calendar_calendardoc_new', {'id': calendar.id }) }}">
+                                            {{ 'chill_calendar.Upload a document'|trans }}
+                                        </a>
+                                    </li>
+                                    {% for template in templates %}
+                                    <li>
+                                        <a class="dropdown-item"
+                                            href="{{ chill_path_add_return_path('chill_docgenerator_generate_from_template', {'template': template.id, 'entityClassName': 'Chill\\CalendarBundle\\Entity\\Calendar', 'entityId': calendar.id}) }}"
+                                        >
+                                           {{ template.name|localize_translatable_string }}
+                                        </a>
+                                    </li>
+                                    {% endfor %}
+                                </ul>
+                            </div>
+                        </li>
+                    {% endif %}
+                {% endif %}
+            {% if calendar.activity is null and (
+                (calendar.context == 'accompanying_period' and is_granted('CHILL_ACTIVITY_CREATE', calendar.accompanyingPeriod))
+                or
+                (calendar.context == 'person' and is_granted('CHILL_ACTIVITY_CREATE', calendar.person))
+                )
+            %}
+                <li>
+                    <a class="btn btn-create"
+                       href="{{ chill_path_add_return_path('chill_calendar_calendar_to_activity', { 'id': calendar.id }) }}">
+                        {{ 'Transform to activity'|trans }}
+                    </a>
+                </li>
+            {% endif %}
+
+            {% if (calendar.isInvited(app.user)) %}
+                {% set invite = calendar.inviteForUser(app.user) %}
+                <li>
+                    <div invite-answer data-status="{{ invite.status|e('html_attr') }}"
+                         data-calendar-id="{{ calendar.id|e('html_attr') }}"></div>
+                </li>
+            {% endif %}
+            {% if false %}
+                <li>
+                    <a href="{{ chill_path_add_return_path('chill_calendar_calendar_show', { 'id': calendar.id}) }}"
+                       class="btn btn-show "></a>
+                </li>
+            {% endif %}
+            {% if is_granted('CHILL_CALENDAR_CALENDAR_EDIT', calendar) %}
+            <li>
+                <a href="{{ chill_path_add_return_path('chill_calendar_calendar_edit', { 'id': calendar.id }) }}"
+                   class="btn btn-update "></a>
+            </li>
+            {% endif %}
+            {% if is_granted('CHILL_CALENDAR_CALENDAR_DELETE', calendar) %}
+            <li>
+                <a href="{{ chill_path_add_return_path('chill_calendar_calendar_delete', { 'id': calendar.id } ) }}"
+                   class="btn btn-delete "></a>
+            </li>
+            {% endif %}
+        </ul>
 
     </div>
-{% endif %}
+
+</div>
+
+
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByAccompanyingCourse.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByAccompanyingCourse.html.twig
index 7ce1003bc..96ddb3388 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByAccompanyingCourse.html.twig
@@ -34,7 +34,18 @@
             {% endif %}
         </p>
     {% else %}
-        {{ include('@ChillCalendar/Calendar/_list.html.twig', {context: 'accompanying_course'}) }}
+        {% if calendarItems|length > 0 %}
+            <div class="flex-table list-records context-accompanyingCourse">
+                {% for calendar in calendarItems %}
+                    {{ include('@ChillCalendar/Calendar/_list.html.twig', {context: 'accompanying_course'}) }}
+                {% endfor %}
+            </div>
+
+            {% if calendarItems|length < paginator.getTotalItems %}
+                {{ chill_pagination(paginator) }}
+            {% endif %}
+
+        {% endif %}
     {% endif %}
 
     <ul class="record_actions sticky-form-buttons">
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByPerson.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByPerson.html.twig
index 9e3b59d2a..dc44b721c 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByPerson.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByPerson.html.twig
@@ -33,7 +33,17 @@
             {% endif %}
         </p>
     {% else %}
-        {{ include ('@ChillCalendar/Calendar/_list.html.twig', {context: 'person'}) }}
+        {% if calendarItems|length > 0 %}
+            <div class="flex-table list-records context-person">
+                {% for calendar in calendarItems %}
+                    {{ include ('@ChillCalendar/Calendar/_list.html.twig', {context: 'person'}) }}
+                {% endfor %}
+            </div>
+
+            {% if calendarItems|length < paginator.getTotalItems %}
+                {{ chill_pagination(paginator) }}
+            {% endif %}
+        {% endif %}
     {% endif %}
 
     <ul class="record_actions sticky-form-buttons">
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Invitations/_list_item.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Invitations/_list_item.html.twig
deleted file mode 100644
index 10a6a2282..000000000
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Invitations/_list_item.html.twig
+++ /dev/null
@@ -1,172 +0,0 @@
-{% if invitations|length > 0 %}
-    <div class="flex-table list-records">
-
-        {% for invitation in invitations %}
-        {% set calendar = invitation.getCalendar %}
-
-            {% if calendar is not null %}
-            <div class="item-bloc">
-                <div class="item-row main">
-                    <div class="item-col">
-                        <div class="wrap-header">
-                            <div class="wl-row">
-                                <div class="wl-col title">
-                                    <p class="date-label">
-                                        {% if calendar.endDate.diff(calendar.startDate).days >= 1 %}
-                                            {{ calendar.startDate|format_datetime('short', 'short') }}
-                                            - {{ calendar.endDate|format_datetime('short', 'short') }}
-                                        {% else %}
-                                            {{ calendar.startDate|format_datetime('short', 'short') }}
-                                            - {{ calendar.endDate|format_datetime('none', 'short') }}
-                                        {% endif %}
-                                    </p>
-
-                                    <div class="duration short-message">
-                                        <i class="fa fa-fw fa-hourglass-end"></i>
-                                        {{ calendar.duration|date('%H:%I') }}
-                                        {% if false == calendar.sendSMS or null == calendar.sendSMS %}
-                                            <!-- no sms will be send -->
-                                        {% else %}
-                                            {% if calendar.smsStatus == 'sms_sent' %}
-                                                <span title="{{ 'SMS already sent'|trans }}" class="badge bg-info">
-                                                    <i class="fa fa-check "></i>
-                                                    <i class="fa fa-envelope "></i>
-                                                </span>
-                                            {% else %}
-                                                <span title="{{ 'Will send SMS'|trans }}" class="badge bg-info">
-                                                    <i class="fa fa-envelope "></i>
-                                                    <i class="fa fa-hourglass-end "></i>
-                                                </span>
-                                            {% endif %}
-                                        {% endif %}
-                                    </div>
-
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="item-col">
-                            <ul class="list-content">
-                                {% if calendar.mainUser is not empty %}
-                                    <span class="badge-user">{{ calendar.mainUser|chill_entity_render_box({'at_date': calendar.startDate}) }}</span>
-                                {% endif %}
-                            </ul>
-                        </div>
-
-                    </div>
-                </div>
-
-                {% if calendar.comment.comment is not empty
-                    or calendar.users|length > 0
-                    or calendar.thirdParties|length > 0
-                    or calendar.users|length > 0 %}
-                    <div class="item-row details separator">
-                        <div class="item-col">
-                            {% include '@ChillActivity/Activity/concernedGroups.html.twig' with {
-                                'context': calendar.context == 'person' ?  'calendar_person' : 'calendar_accompanyingCourse',
-                                'render': 'wrap-list',
-                                'entity': calendar
-                            } %}
-                        </div>
-
-                    </div>
-                {% endif %}
-
-                {% if calendar.comment.comment is not empty %}
-                    <div class="item-row details separator">
-                        <div class="item-col comment">
-                            {{ calendar.comment|chill_entity_render_box( { 'limit_lines': 3, 'metadata': false } ) }}
-                        </div>
-                    </div>
-                {% endif %}
-
-                {% if calendar.location is not empty %}
-                    <div class="item-row separator">
-                        <div>
-                            {% if calendar.location.address is not same as(null) and calendar.location.name is not empty %}
-                                <i class="fa fa-map-marker"></i>{% endif %}
-                            {% if calendar.location.name is not empty %}{{ calendar.location.name }}{% endif %}
-                            {% if calendar.location.address is not same as(null) %}{{ calendar.location.address|chill_entity_render_box({'multiline': false, 'with_picto': (calendar.location.name is empty)}) }}{% else %}
-                                <i class="fa fa-map-marker"></i>{% endif %}
-                            {% if calendar.location.phonenumber1 is not empty %}<i
-                                class="fa fa-phone"></i> {{ calendar.location.phonenumber1|chill_format_phonenumber }}{% endif %}
-                            {% if calendar.location.phonenumber2 is not empty %}<i
-                                class="fa fa-phone"></i> {{ calendar.location.phonenumber2|chill_format_phonenumber }}{% endif %}
-                        </div>
-                    </div>
-                {% endif %}
-
-                <div class="item-row separator column">
-                    <div>
-
-                        {{ include('@ChillCalendar/Calendar/_documents.twig.html') }}
-                    </div>
-                </div>
-
-                {% if calendar.activity is not null %}
-                    <div class="item-row separator">
-                        <div class="item-col">
-                            <div class="wrap-list">
-                                <div class="wl-row">
-                                    <div class="wl-col title"><h3>{{ 'Activity'|trans }}</h3></div>
-                                    <div class="wl-col list activity-linked">
-                                        <h2 class="badge-title">
-                                            <span class="title_label"></span>
-                                            <span class="title_action">
-                                            {{ calendar.activity.type.name | localize_translatable_string }}
-
-                                                {% if calendar.activity.emergency %}
-                                                    <span class="badge bg-danger rounded-pill fs-6 float-end">{{ 'Emergency'|trans|upper }}</span>
-                                                {% endif %}
-                                        </span>
-                                        </h2>
-
-                                        <ul class="record_actions">
-                                            <li class="cancel">
-                                                <span class="createdBy">
-                                                     {{ 'Created by'|trans }}
-                                                    <b>{{ calendar.activity.createdBy|chill_entity_render_string({'at_date': calendar.activity.createdAt}) }}</b>, {{ 'on'|trans }} {{ calendar.activity.createdAt|format_datetime('short', 'short') }}
-                                                </span>
-                                            </li>
-                                            {% if is_granted('CHILL_ACTIVITY_SEE', calendar.activity) %}
-                                                <li>
-                                                    <a href="{{ chill_path_add_return_path('chill_activity_activity_show', {'id': calendar.activity.id}) }}" class="btn btn-sm btn-show" ></a>
-                                                </li>
-                                            {% endif %}
-                                        </ul>
-
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                {% endif %}
-
-                <div class="item-row separator">
-                    <ul class="record_actions">
-
-                        {% if (calendar.isInvited(app.user)) %}
-                            {% set invite = calendar.inviteForUser(app.user) %}
-                            <li>
-                                <div invite-answer data-status="{{ invite.status|e('html_attr') }}"
-                                     data-calendar-id="{{ calendar.id|e('html_attr') }}"></div>
-                            </li>
-                        {% endif %}
-                        <li>
-                            <a href="{{ chill_path_add_return_path('chill_calendar_calendar_show', { 'id': calendar.id}) }}"
-                               class="btn btn-show "></a>
-                        </li>
-                    </ul>
-
-                </div>
-
-            </div>
-        {% endif %}
-        {% endfor %}
-
-        {% if invitations|length < paginator.getTotalItems %}
-            {{ chill_pagination(paginator) }}
-        {% endif %}
-
-    </div>
-{% endif %}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Invitations/listByUser.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Invitations/listByUser.html.twig
index 282b83dfe..8030df0a0 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Invitations/listByUser.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Invitations/listByUser.html.twig
@@ -6,22 +6,35 @@
 
 {% block content %}
 
-    <h1>{{ 'Invitation list' |trans }}</h1>
+    <h1>{{ 'invite.list.title'|trans }}</h1>
 
     {% if invitations|length == 0 %}
         <p class="chill-no-data-statement">
             {{ "invite.list.none"|trans }}
         </p>
     {% else %}
-        {{ include ('@ChillCalendar/Invitations/_list_item.html.twig') }}
+        <div class="flex-table list-records">
+            {% for invitation in invitations %}
+                {% set calendar = invitation.getCalendar %}
+                {{ include('@ChillCalendar/Calendar/_list.html.twig', {context: 'user'}) }}
+            {% endfor %}
+        </div>
+
+        {% if invitations|length < paginator.getTotalItems %}
+            {{ chill_pagination(paginator) }}
+        {% endif %}
     {% endif %}
 
 {% endblock %}
 
 {% block js %}
     {{ parent() }}
+    {{ encore_entry_script_tags('mod_answer') }}
+    {{ encore_entry_script_tags('mod_document_action_buttons_group') }}
 {% endblock %}
 
 {% block css %}
     {{ parent() }}
+    {{ encore_entry_link_tags('mod_answer') }}
+    {{ encore_entry_link_tags('mod_document_action_buttons_group') }}
 {% endblock %}

From e6a799abc4a89382741754727ac11c4e63d299ea Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 30 Sep 2025 15:30:38 +0200
Subject: [PATCH 175/283] Add translation for invitation list page title

---
 src/Bundle/ChillCalendarBundle/translations/messages.fr.yml | 1 +
 1 file changed, 1 insertion(+)

diff --git a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
index 740303fd5..179597346 100644
--- a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
@@ -88,6 +88,7 @@ invite:
     tentative: Accepté provisoirement
     list:
         none: Il n'y aucun invitation
+        title: Mes invitations
 
 # exports
 Exports of calendar: Exports des rendez-vous

From f93c7e014f9bdc8462a339ce3e2557ff12ab50dc Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 30 Sep 2025 15:45:26 +0200
Subject: [PATCH 176/283] Add test for MyInvitationsController.php

---
 .../Controller/MyInvitationsController.php    |   4 +-
 .../Repository/InviteRepository.php           |   2 +-
 .../MyInvitationsControllerTest.php           | 292 ++++++++++++++++++
 ...ocGeneratorTemplateRepositoryInterface.php |   5 +
 .../Pagination/PaginatorFactory.php           |   2 +-
 5 files changed, 301 insertions(+), 4 deletions(-)
 create mode 100644 src/Bundle/ChillCalendarBundle/Tests/Controller/MyInvitationsControllerTest.php

diff --git a/src/Bundle/ChillCalendarBundle/Controller/MyInvitationsController.php b/src/Bundle/ChillCalendarBundle/Controller/MyInvitationsController.php
index de029dd20..7af5ac18f 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/MyInvitationsController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/MyInvitationsController.php
@@ -13,7 +13,7 @@ namespace Chill\CalendarBundle\Controller;
 
 use Chill\CalendarBundle\Entity\Calendar;
 use Chill\CalendarBundle\Repository\InviteRepository;
-use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepository;
+use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepositoryInterface;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Pagination\PaginatorFactory;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -24,7 +24,7 @@ use Symfony\Component\Routing\Annotation\Route;
 
 class MyInvitationsController extends AbstractController
 {
-    public function __construct(private readonly InviteRepository $inviteRepository, private readonly PaginatorFactory $paginator, private readonly DocGeneratorTemplateRepository $docGeneratorTemplateRepository) {}
+    public function __construct(private readonly InviteRepository $inviteRepository, private readonly PaginatorFactory $paginator, private readonly DocGeneratorTemplateRepositoryInterface $docGeneratorTemplateRepository) {}
 
     #[Route(path: '/{_locale}/calendar/invitations/my', name: 'chill_calendar_invitations_list_my')]
     public function myInvitations(Request $request): Response
diff --git a/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php b/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php
index 5d19d326c..2c89021ac 100644
--- a/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php
+++ b/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php
@@ -16,7 +16,7 @@ use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\Persistence\ObjectRepository;
 
-readonly class InviteRepository implements ObjectRepository
+class InviteRepository implements ObjectRepository
 {
     private EntityRepository $entityRepository;
 
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Controller/MyInvitationsControllerTest.php b/src/Bundle/ChillCalendarBundle/Tests/Controller/MyInvitationsControllerTest.php
new file mode 100644
index 000000000..32ed70456
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Tests/Controller/MyInvitationsControllerTest.php
@@ -0,0 +1,292 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\CalendarBundle\Tests\Controller;
+
+use Chill\CalendarBundle\Controller\MyInvitationsController;
+use Chill\CalendarBundle\Entity\Calendar;
+use Chill\CalendarBundle\Entity\Invite;
+use Chill\CalendarBundle\Repository\InviteRepository;
+use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepositoryInterface;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Pagination\PaginatorFactory;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
+use Twig\Environment;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+final class MyInvitationsControllerTest extends TestCase
+{
+    use ProphecyTrait;
+
+    private MyInvitationsController $controller;
+
+    protected function setUp(): void
+    {
+        // Create prophecies for dependencies
+        $inviteRepository = $this->prophesize(InviteRepository::class);
+        $paginatorFactory = $this->prophesize(PaginatorFactory::class);
+        $docGeneratorTemplateRepository = $this->prophesize(DocGeneratorTemplateRepositoryInterface::class);
+
+        // Create controller instance
+        $this->controller = new MyInvitationsController(
+            $inviteRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $docGeneratorTemplateRepository->reveal()
+        );
+
+        // Set up necessary services for AbstractController
+        $authorizationChecker = $this->prophesize(AuthorizationCheckerInterface::class);
+        $tokenStorage = $this->prophesize(TokenStorageInterface::class);
+        $twig = $this->prophesize(Environment::class);
+
+        // Use reflection to set the container
+        $reflection = new \ReflectionClass($this->controller);
+        $containerProperty = $reflection->getParentClass()->getProperty('container');
+        $containerProperty->setAccessible(true);
+
+        // Create a mock container
+        $container = $this->prophesize(\Psr\Container\ContainerInterface::class);
+        $container->has('security.authorization_checker')->willReturn(true);
+        $container->get('security.authorization_checker')->willReturn($authorizationChecker->reveal());
+        $container->has('security.token_storage')->willReturn(true);
+        $container->get('security.token_storage')->willReturn($tokenStorage->reveal());
+        $container->has('twig')->willReturn(true);
+        $container->get('twig')->willReturn($twig->reveal());
+
+        $containerProperty->setValue($this->controller, $container->reveal());
+    }
+
+    public function testMyInvitationsReturnsCorrectAmountOfInvitations(): void
+    {
+        // Create test user
+        $user = new User();
+        $user->setUsername('testuser');
+
+        // Create test invitations
+        $invite1 = new Invite();
+        $invite1->setUser($user);
+        $invite1->setStatus(Invite::PENDING);
+
+        $invite2 = new Invite();
+        $invite2->setUser($user);
+        $invite2->setStatus(Invite::ACCEPTED);
+
+        $invite3 = new Invite();
+        $invite3->setUser($user);
+        $invite3->setStatus(Invite::DECLINED);
+
+        $allInvitations = [$invite1, $invite2, $invite3];
+        $paginatedInvitations = [$invite1, $invite2]; // First page with 2 items per page
+
+        // Set up repository prophecies
+        $inviteRepository = $this->prophesize(InviteRepository::class);
+        $inviteRepository->findBy(['user' => $user])->willReturn($allInvitations);
+        $inviteRepository->findBy(
+            ['user' => $user],
+            ['createdAt' => 'DESC'],
+            2, // items per page
+            0  // offset
+        )->willReturn($paginatedInvitations);
+
+        // Set up paginator prophecies
+        $paginator = $this->prophesize(PaginatorInterface::class);
+        $paginator->getItemsPerPage()->willReturn(2);
+        $paginator->getCurrentPageFirstItemNumber()->willReturn(0);
+
+        $paginatorFactory = $this->prophesize(PaginatorFactory::class);
+        $paginatorFactory->create(3)->willReturn($paginator->reveal());
+
+        // Set up doc generator repository
+        $docGeneratorTemplateRepository = $this->prophesize(DocGeneratorTemplateRepositoryInterface::class);
+        $docGeneratorTemplateRepository->findByEntity(Calendar::class)->willReturn([]);
+
+        // Create controller with mocked dependencies
+        $controller = new MyInvitationsController(
+            $inviteRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $docGeneratorTemplateRepository->reveal()
+        );
+
+        // Set up authorization checker to return true for ROLE_USER
+        $authorizationChecker = $this->prophesize(AuthorizationCheckerInterface::class);
+        $authorizationChecker->isGranted('ROLE_USER', null)->willReturn(true);
+
+        // Set up token storage to return user
+        $token = $this->prophesize(TokenInterface::class);
+        $token->getUser()->willReturn($user);
+        $tokenStorage = $this->prophesize(TokenStorageInterface::class);
+        $tokenStorage->getToken()->willReturn($token->reveal());
+
+        // Set up twig to return a response
+        $twig = $this->prophesize(Environment::class);
+        $twig->render('@ChillCalendar/Invitations/listByUser.html.twig', [
+            'invitations' => $paginatedInvitations,
+            'paginator' => $paginator->reveal(),
+            'templates' => [],
+        ])->willReturn('rendered content');
+
+        // Set up container
+        $container = $this->prophesize(\Psr\Container\ContainerInterface::class);
+        $container->has('security.authorization_checker')->willReturn(true);
+        $container->get('security.authorization_checker')->willReturn($authorizationChecker->reveal());
+        $container->has('security.token_storage')->willReturn(true);
+        $container->get('security.token_storage')->willReturn($tokenStorage->reveal());
+        $container->has('twig')->willReturn(true);
+        $container->get('twig')->willReturn($twig->reveal());
+
+        // Use reflection to set the container
+        $reflection = new \ReflectionClass($controller);
+        $containerProperty = $reflection->getParentClass()->getProperty('container');
+        $containerProperty->setAccessible(true);
+        $containerProperty->setValue($controller, $container->reveal());
+
+        // Create request
+        $request = new Request();
+
+        // Execute the action
+        $response = $controller->myInvitations($request);
+
+        // Assert that response is successful
+        self::assertInstanceOf(Response::class, $response);
+        self::assertSame(200, $response->getStatusCode());
+        self::assertSame('rendered content', $response->getContent());
+    }
+
+    public function testMyInvitationsPageLoads(): void
+    {
+        // Create test user
+        $user = new User();
+        $user->setUsername('testuser');
+
+        // Set up repository prophecies - no invitations
+        $inviteRepository = $this->prophesize(InviteRepository::class);
+        $inviteRepository->findBy(['user' => $user])->willReturn([]);
+        $inviteRepository->findBy(
+            ['user' => $user],
+            ['createdAt' => 'DESC'],
+            20, // default items per page
+            0   // offset
+        )->willReturn([]);
+
+        // Set up paginator prophecies
+        $paginator = $this->prophesize(PaginatorInterface::class);
+        $paginator->getItemsPerPage()->willReturn(20);
+        $paginator->getCurrentPageFirstItemNumber()->willReturn(0);
+
+        $paginatorFactory = $this->prophesize(PaginatorFactory::class);
+        $paginatorFactory->create(0)->willReturn($paginator->reveal());
+
+        // Set up doc generator repository
+        $docGeneratorTemplateRepository = $this->prophesize(DocGeneratorTemplateRepositoryInterface::class);
+        $docGeneratorTemplateRepository->findByEntity(Calendar::class)->willReturn([]);
+
+        // Create controller with mocked dependencies
+        $controller = new MyInvitationsController(
+            $inviteRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $docGeneratorTemplateRepository->reveal()
+        );
+
+        // Set up authorization checker to return true for ROLE_USER
+        $authorizationChecker = $this->prophesize(AuthorizationCheckerInterface::class);
+        $authorizationChecker->isGranted('ROLE_USER', null)->willReturn(true);
+
+        // Set up token storage to return user
+        $token = $this->prophesize(TokenInterface::class);
+        $token->getUser()->willReturn($user);
+        $tokenStorage = $this->prophesize(TokenStorageInterface::class);
+        $tokenStorage->getToken()->willReturn($token->reveal());
+
+        // Set up twig to return a response
+        $twig = $this->prophesize(Environment::class);
+        $twig->render('@ChillCalendar/Invitations/listByUser.html.twig', [
+            'invitations' => [],
+            'paginator' => $paginator->reveal(),
+            'templates' => [],
+        ])->willReturn('empty page content');
+
+        // Set up container
+        $container = $this->prophesize(\Psr\Container\ContainerInterface::class);
+        $container->has('security.authorization_checker')->willReturn(true);
+        $container->get('security.authorization_checker')->willReturn($authorizationChecker->reveal());
+        $container->has('security.token_storage')->willReturn(true);
+        $container->get('security.token_storage')->willReturn($tokenStorage->reveal());
+        $container->has('twig')->willReturn(true);
+        $container->get('twig')->willReturn($twig->reveal());
+
+        // Use reflection to set the container
+        $reflection = new \ReflectionClass($controller);
+        $containerProperty = $reflection->getParentClass()->getProperty('container');
+        $containerProperty->setAccessible(true);
+        $containerProperty->setValue($controller, $container->reveal());
+
+        // Create request
+        $request = new Request();
+
+        // Execute the action
+        $response = $controller->myInvitations($request);
+
+        // Assert that page loads successfully
+        self::assertInstanceOf(Response::class, $response);
+        self::assertSame(200, $response->getStatusCode());
+        self::assertSame('empty page content', $response->getContent());
+    }
+
+    public function testMyInvitationsRequiresAuthentication(): void
+    {
+        // Create controller with minimal dependencies
+        $inviteRepository = $this->prophesize(InviteRepository::class);
+        $paginatorFactory = $this->prophesize(PaginatorFactory::class);
+        $docGeneratorTemplateRepository = $this->prophesize(DocGeneratorTemplateRepositoryInterface::class);
+
+        $controller = new MyInvitationsController(
+            $inviteRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $docGeneratorTemplateRepository->reveal()
+        );
+
+        // Set up authorization checker to return false for ROLE_USER
+        $authorizationChecker = $this->prophesize(AuthorizationCheckerInterface::class);
+        $authorizationChecker->isGranted('ROLE_USER')->willReturn(false);
+        $authorizationChecker->isGranted('ROLE_USER', null)->willReturn(false);
+
+        // Set up container
+        $container = $this->prophesize(\Psr\Container\ContainerInterface::class);
+        $container->has('security.authorization_checker')->willReturn(true);
+        $container->get('security.authorization_checker')->willReturn($authorizationChecker->reveal());
+
+        // Use reflection to set the container
+        $reflection = new \ReflectionClass($controller);
+        $containerProperty = $reflection->getParentClass()->getProperty('container');
+        $containerProperty->setAccessible(true);
+        $containerProperty->setValue($controller, $container->reveal());
+
+        // Create request
+        $request = new Request();
+
+        // Expect AccessDeniedException
+        $this->expectException(\Symfony\Component\Security\Core\Exception\AccessDeniedException::class);
+
+        // Execute the action
+        $controller->myInvitations($request);
+    }
+}
diff --git a/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepositoryInterface.php b/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepositoryInterface.php
index e5071e76a..f2e3cf629 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepositoryInterface.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepositoryInterface.php
@@ -20,4 +20,9 @@ use Doctrine\Persistence\ObjectRepository;
 interface DocGeneratorTemplateRepositoryInterface extends ObjectRepository
 {
     public function countByEntity(string $entity): int;
+
+    /**
+     * @return array|DocGeneratorTemplate[]
+     */
+    public function findByEntity(string $entity, ?int $start = 0, ?int $limit = 50): array;
 }
diff --git a/src/Bundle/ChillMainBundle/Pagination/PaginatorFactory.php b/src/Bundle/ChillMainBundle/Pagination/PaginatorFactory.php
index 9a809287b..e53139fac 100644
--- a/src/Bundle/ChillMainBundle/Pagination/PaginatorFactory.php
+++ b/src/Bundle/ChillMainBundle/Pagination/PaginatorFactory.php
@@ -17,7 +17,7 @@ use Symfony\Component\Routing\RouterInterface;
 /**
  * Create paginator instances.
  */
-final readonly class PaginatorFactory implements PaginatorFactoryInterface
+class PaginatorFactory implements PaginatorFactoryInterface
 {
     final public const DEFAULT_CURRENT_PAGE_KEY = 'page';
 

From b43aeebc3cc100eea289788a3802e5f3922d63ae Mon Sep 17 00:00:00 2001
From: Boris Waaub <boris.waaub@digitalternative.be>
Date: Tue, 30 Sep 2025 13:49:04 +0000
Subject: [PATCH 177/283] FIX des bugs du merge request 884

---
 assets/translator.ts                          | 15 ++++--
 .../localizationHelper/localizationHelper.ts  | 54 +++++++++++++++++--
 .../public/vuejs/HomepageWidget/App.vue       |  6 +--
 .../DashboardWidgets/NewsItem.vue             | 16 +++---
 .../HomepageWidget/MyAccompanyingCourses.vue  |  4 +-
 .../public/vuejs/HomepageWidget/MyCustoms.vue | 41 +++++++-------
 .../vuejs/HomepageWidget/MyEvaluations.vue    |  8 ++-
 .../vuejs/HomepageWidget/MyNotifications.vue  |  4 +-
 .../public/vuejs/HomepageWidget/MyTasks.vue   |  9 ++--
 .../public/vuejs/HomepageWidget/MyWorks.vue   |  3 +-
 .../HomepageWidget/store/modules/homepage.ts  |  2 +
 .../Resources/public/types.ts                 |  1 +
 .../components/TicketInitFormComponent.vue    | 42 ++++++---------
 ts-config-base.json                           |  1 +
 webpack.config.js                             |  2 +-
 15 files changed, 127 insertions(+), 81 deletions(-)

diff --git a/assets/translator.ts b/assets/translator.ts
index fe4e14ffa..2daba91aa 100644
--- a/assets/translator.ts
+++ b/assets/translator.ts
@@ -1,7 +1,12 @@
-import { trans, setLocale, setLocaleFallbacks } from "./ux-translator";
+import {
+  trans,
+  setLocale,
+  getLocale,
+  setLocaleFallbacks,
+} from "./ux-translator";
 
-setLocaleFallbacks({"en": "fr", "nl": "fr", "fr": "en"});
-setLocale('fr');
+setLocaleFallbacks({ en: "fr", nl: "fr", fr: "en" });
+setLocale("fr");
 
-export { trans };
-export * from '../var/translations';
+export { trans, getLocale };
+export * from "../var/translations";
diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/localizationHelper/localizationHelper.ts b/src/Bundle/ChillMainBundle/Resources/public/lib/localizationHelper/localizationHelper.ts
index 354c9f8af..3b67da68e 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/lib/localizationHelper/localizationHelper.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/localizationHelper/localizationHelper.ts
@@ -1,4 +1,5 @@
-import { TranslatableString } from "ChillMainAssets/types";
+import { DateTime, TranslatableString } from "ChillMainAssets/types";
+import { getLocale } from "translator";
 
 /**
  * Localizes a translatable string object based on the current locale.
@@ -17,11 +18,10 @@ import { TranslatableString } from "ChillMainAssets/types";
  * @returns The localized URL
  */
 export function localizedUrl(url: string): string {
-  const lang =
-    document.documentElement.lang || navigator.language.split("-")[0] || "fr";
+  const locale = getLocale();
   // Ensure url starts with a slash and does not already start with /{lang}/
   const normalizedUrl = url.startsWith("/") ? url : `/${url}`;
-  const langPrefix = `/${lang}`;
+  const langPrefix = `/${locale}`;
   if (normalizedUrl.startsWith(langPrefix + "/")) {
     return normalizedUrl;
   }
@@ -36,7 +36,7 @@ export function localizeString(
     return "";
   }
 
-  const currentLocale = locale || navigator.language.split("-")[0] || "fr";
+  const currentLocale = locale || getLocale();
 
   if (translatableString[currentLocale]) {
     return translatableString[currentLocale];
@@ -59,3 +59,47 @@ export function localizeString(
 
   return "";
 }
+
+const datetimeFormats: Record<
+  string,
+  Record<string, Intl.DateTimeFormatOptions>
+> = {
+  fr: {
+    short: {
+      year: "numeric",
+      month: "numeric",
+      day: "numeric",
+    },
+    text: {
+      year: "numeric",
+      month: "long",
+      day: "numeric",
+    },
+    long: {
+      year: "numeric",
+      month: "numeric",
+      day: "numeric",
+      hour: "numeric",
+      minute: "numeric",
+      hour12: false,
+    },
+    hoursOnly: {
+      hour: "numeric",
+      minute: "numeric",
+      hour12: false,
+    },
+  },
+};
+export function localizeDateTimeFormat(
+  dateTime: DateTime,
+  format: keyof typeof datetimeFormats.fr = "short",
+): string {
+  const locale = getLocale();
+  const options =
+    datetimeFormats[locale]?.[format] || datetimeFormats.fr[format];
+  return new Intl.DateTimeFormat(locale, options).format(
+    new Date(dateTime.datetime),
+  );
+}
+
+export default datetimeFormats;
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue
index c1ac025ff..a494cfea8 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue
@@ -122,7 +122,6 @@ const tabDefinitions: TabDefinition[] = [
 ];
 
 const displayedTabs = computed(() => {
-  // Always show MyCustoms first if present
   const tabs = [] as TabDefinition[];
   for (const tabEnum of homepageConfig.value.displayTabs) {
     const def = tabDefinitions.find(
@@ -137,10 +136,7 @@ const activeTab = ref(Number(HomepageTabs[homepageConfig.value.defaultTab]));
 
 const loading = computed(() => store.state.loading);
 
-function selectTab(tab: HomepageTabs) {
-  if (tab !== HomepageTabs.MyCustoms) {
-    store.dispatch("getByTab", { tab: tab });
-  }
+async function selectTab(tab: HomepageTabs) {
   activeTab.value = tab;
 }
 
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/DashboardWidgets/NewsItem.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/DashboardWidgets/NewsItem.vue
index 5cbd33712..f98451249 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/DashboardWidgets/NewsItem.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/DashboardWidgets/NewsItem.vue
@@ -2,7 +2,9 @@
   <li>
     <h2>{{ props.item.title }}</h2>
     <time class="createdBy" datetime="{{item.startDate.datetime}}">{{
-      $d(newsItemStartDate(), "text")
+      props.item?.startDate
+        ? localizeDateTimeFormat(props.item?.startDate, "text")
+        : ""
     }}</time>
     <div class="content" v-if="shouldTruncate(item.content)">
       <div v-html="prepareContent(item.content)"></div>
@@ -26,7 +28,9 @@
       <template #body>
         <p class="news-date">
           <time class="createdBy" datetime="{{item.startDate.datetime}}">{{
-            $d(newsItemStartDate(), "text")
+            props.item?.startDate
+              ? localizeDateTimeFormat(props.item?.startDate, "text")
+              : ""
           }}</time>
         </p>
         <div v-html="convertMarkdownToHtml(item.content)"></div>
@@ -42,7 +46,7 @@ import DOMPurify from "dompurify";
 import { NewsItemType } from "../../../types";
 import type { PropType } from "vue";
 import { ref } from "vue";
-import { ISOToDatetime } from "../../../chill/js/date";
+import { localizeDateTimeFormat } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
 
 const props = defineProps({
   item: {
@@ -133,7 +137,7 @@ const preprocess = (markdown: string): string => {
 };
 
 const postprocess = (html: string): string => {
-  DOMPurify.addHook("afterSanitizeAttributes", (node: any) => {
+  DOMPurify.addHook("afterSanitizeAttributes", (node: Element) => {
     if ("target" in node) {
       node.setAttribute("target", "_blank");
       node.setAttribute("rel", "noopener noreferrer");
@@ -159,10 +163,6 @@ const prepareContent = (content: string): string => {
   const htmlContent = convertMarkdownToHtml(content);
   return truncateContent(htmlContent);
 };
-
-const newsItemStartDate = (): null | Date => {
-  return ISOToDatetime(props.item?.startDate.datetime);
-};
 </script>
 
 <style scoped>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyAccompanyingCourses.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyAccompanyingCourses.vue
index 863e4784f..4c6ce61c9 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyAccompanyingCourses.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyAccompanyingCourses.vue
@@ -21,7 +21,7 @@
     </template>
     <template #tbody>
       <tr v-for="(c, i) in accompanyingCourses.results" :key="`course-${i}`">
-        <td>{{ $d(new Date(c.openingDate.datetime), "short") }}</td>
+        <td>{{ localizeDateTimeFormat(c.openingDate, "short") }}</td>
         <td>
           <span
             v-for="(issue, index) in c.socialIssues"
@@ -82,6 +82,8 @@ import {
   CONFIDENTIAL,
   trans,
 } from "translator";
+import { localizeDateTimeFormat } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
+
 const store = useStore();
 
 const accompanyingCourses: ComputedRef<PaginationResponse<AccompanyingCourse>> =
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyCustoms.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyCustoms.vue
index 46751a0d2..2bb221e25 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyCustoms.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyCustoms.vue
@@ -1,62 +1,59 @@
 <template>
-  <span v-if="noResults" class="chill-no-data-statement">
-    {{ trans(NO_DASHBOARD) }}
-  </span>
-  <div v-else id="dashboards" class="container g-3">
+  <div id="dashboards" class="container g-3">
     <div class="row">
       <div class="mbloc col-xs-12 col-sm-4">
         <div class="custom1">
           <ul class="list-unstyled">
-            <li v-if="(counter.value?.notifications || 0) > 0">
+            <li v-if="counter.notifications > 0">
               <span :class="counterClass">
                 {{
                   trans(COUNTER_UNREAD_NOTIFICATIONS, {
-                    n: counter.value?.notifications || 0,
+                    n: counter.notifications,
                   })
                 }}
               </span>
             </li>
-            <li v-if="(counter.value?.accompanyingCourses || 0) > 0">
+            <li v-if="counter.accompanyingCourses > 0">
               <span :class="counterClass">
                 {{
                   trans(COUNTER_ASSIGNATED_COURSES, {
-                    n: counter.value?.accompanyingCourses || 0,
+                    n: counter.accompanyingCourses,
                   })
                 }}
               </span>
             </li>
-            <li v-if="(counter.value?.works || 0) > 0">
+            <li v-if="counter.works > 0">
               <span :class="counterClass">
                 {{
                   trans(COUNTER_ASSIGNATED_ACTIONS, {
-                    n: counter.value?.works || 0,
+                    n: counter.works,
                   })
                 }}
               </span>
             </li>
-            <li v-if="(counter.value?.evaluations || 0) > 0">
+            <li v-if="counter.evaluations > 0">
               <span :class="counterClass">
                 {{
                   trans(COUNTER_ASSIGNATED_EVALUATIONS, {
-                    n: counter.value?.evaluations || 0,
+                    n: counter.evaluations,
                   })
                 }}
               </span>
             </li>
-            <li v-if="(counter.value?.tasksAlert || 0) > 0">
+            <li v-if="counter.tasksAlert > 0">
               <span :class="counterClass">
                 {{
                   trans(COUNTER_ALERT_TASKS, {
-                    n: counter.value?.tasksAlert || 0,
+                    n: counter.tasksAlert,
                   })
                 }}
               </span>
             </li>
-            <li v-if="(counter.value?.tasksWarning || 0) > 0">
+            <li v-if="counter.tasksWarning > 0">
               <span :class="counterClass">
                 {{
                   trans(COUNTER_WARNING_TASKS, {
-                    n: counter.value?.tasksWarning || 0,
+                    n: counter.tasksWarning,
                   })
                 }}
               </span>
@@ -85,7 +82,6 @@ import { useStore } from "vuex";
 import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
 import News from "./DashboardWidgets/News.vue";
 import {
-  NO_DASHBOARD,
   COUNTER_UNREAD_NOTIFICATIONS,
   COUNTER_ASSIGNATED_COURSES,
   COUNTER_ASSIGNATED_ACTIONS,
@@ -105,14 +101,19 @@ interface MyCustom {
 
 const store = useStore();
 
-const counter = computed(() => store.getters.counter);
+const counter = computed(() => ({
+  notifications: store.state.homepage.notifications?.count ?? 0,
+  accompanyingCourses: store.state.homepage.accompanyingCourses?.count ?? 0,
+  works: store.state.homepage.works?.count ?? 0,
+  evaluations: store.state.homepage.evaluations?.count ?? 0,
+  tasksAlert: store.state.homepage.tasksAlert?.count ?? 0,
+  tasksWarning: store.state.homepage.tasksWarning?.count ?? 0,
+}));
 
 const counterClass = { counter: true };
 
 const dashboardItems = ref<MyCustom[]>([]);
 
-const noResults = computed(() => false);
-
 const hasDashboardItems = computed(() => dashboardItems.value.length > 0);
 
 onMounted(async () => {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyEvaluations.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyEvaluations.vue
index 538de040b..5a37388cf 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyEvaluations.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyEvaluations.vue
@@ -22,11 +22,7 @@
       <template #tbody>
         <tr v-for="(e, i) in evaluations.results" :key="`evaluation-${i}`">
           <td>
-            {{
-              e.maxDate?.datetime
-                ? $d(new Date(e.maxDate.datetime), "short")
-                : ""
-            }}
+            {{ e.maxDate ? localizeDateTimeFormat(e.maxDate, "short") : "" }}
           </td>
           <td>
             {{ localizeString(e.evaluation?.title ?? null) }}
@@ -115,6 +111,8 @@ import {
   NO_DATA,
   trans,
 } from "translator";
+import { localizeDateTimeFormat } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
+
 const evaluations: ComputedRef<
   PaginationResponse<AccompanyingPeriodWorkEvaluation>
 > = computed(() => store.state.homepage.evaluations);
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyNotifications.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyNotifications.vue
index effea6f35..4d618e6eb 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyNotifications.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyNotifications.vue
@@ -20,7 +20,7 @@
     </template>
     <template #tbody>
       <tr v-for="(n, i) in notifications.results" :key="`notify-${i}`">
-        <td>{{ $d(new Date(n.date.datetime), "long") }}</td>
+        <td>{{ localizeDateTimeFormat(n.date, "long") }}</td>
         <td>
           <span class="unread">
             <i class="fa fa-envelope-o" />
@@ -65,6 +65,8 @@ import {
   trans,
 } from "translator";
 import { PaginationResponse } from "ChillMainAssets/lib/api/apiMethods";
+import { localizeDateTimeFormat } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
+
 const store = useStore();
 
 const notifications: ComputedRef<PaginationResponse<Notification>> = computed(
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyTasks.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyTasks.vue
index 637767842..932431729 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyTasks.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyTasks.vue
@@ -21,12 +21,12 @@
     <template #tbody>
       <tr v-for="(t, i) in tasks.alert.results" :key="`task-alert-${i}`">
         <td v-if="t.warningDate !== null">
-          {{ $d(new Date(t.warningDate.datetime), "short") }}
+          {{ localizeDateTimeFormat(t.warningDate, "short") }}
         </td>
         <td v-else />
         <td>
           <span class="outdated">{{
-            $d(new Date(t.endDate.datetime), "short")
+            localizeDateTimeFormat(t.endDate, "short")
           }}</span>
         </td>
         <td>{{ t.title }}</td>
@@ -62,10 +62,10 @@
       <tr v-for="(t, i) in tasks.warning.results" :key="`task-warning-${i}`">
         <td>
           <span class="outdated">{{
-            $d(new Date(t.warningDate.datetime), "short")
+            localizeDateTimeFormat(t.warningDate, "short")
           }}</span>
         </td>
-        <td>{{ $d(new Date(t.endDate.datetime), "short") }}</td>
+        <td>{{ localizeDateTimeFormat(t.endDate, "short") }}</td>
         <td>{{ t.title }}</td>
         <td>
           <a class="btn btn-sm btn-show" :href="getUrl(t)">
@@ -94,6 +94,7 @@ import {
 } from "translator";
 import { TasksState } from "./store/modules/homepage";
 import { Alert, Warning } from "ChillPersonAssets/types";
+import { localizeDateTimeFormat } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
 
 const store = useStore();
 
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorks.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorks.vue
index a8cc39b83..9cccd6dd6 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorks.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorks.vue
@@ -21,7 +21,7 @@
       </template>
       <template #tbody>
         <tr v-for="(w, i) in works.value.results" :key="`works-${i}`">
-          <td>{{ $d(w.startDate.datetime, "short") }}</td>
+          <td>{{ localizeDateTimeFormat(w.startDate.datetime, "short") }}</td>
           <td>
             <span class="chill-entity entity-social-issue">
               <span class="badge bg-chill-l-gray text-dark">
@@ -90,6 +90,7 @@ import {
   trans,
 } from "translator";
 import { Workflow } from "ChillPersonAssets/types";
+import { localizeDateTimeFormat } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
 
 const store = useStore();
 
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/store/modules/homepage.ts b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/store/modules/homepage.ts
index a06250c3b..4fc8dae8c 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/store/modules/homepage.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/store/modules/homepage.ts
@@ -11,6 +11,7 @@ import {
   Warning,
   Workflow,
   WorflowCc,
+  Notification,
 } from "ChillPersonAssets/types";
 import { RootState } from "..";
 import { HomepageTabs } from "ChillMainAssets/types";
@@ -191,6 +192,7 @@ export const moduleHomepage: Module<State, RootState> = {
           if (!getters.isNotificationsLoaded) {
             commit("setLoading", true);
             const url = `/api/1.0/main/notification/my/unread${"?" + param}`;
+
             makeFetch("GET", url)
               .then((response) => {
                 commit("addNotifications", response);
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/types.ts b/src/Bundle/ChillPersonBundle/Resources/public/types.ts
index a4c07e85a..678011576 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/types.ts
+++ b/src/Bundle/ChillPersonBundle/Resources/public/types.ts
@@ -291,6 +291,7 @@ export interface Notification {
   relatedEntityClass: string;
   relatedEntityId: number;
 }
+
 export interface Participation {
   person: Person;
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketInitFormComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketInitFormComponent.vue
index 75fcb9169..7a3066251 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketInitFormComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketInitFormComponent.vue
@@ -2,6 +2,13 @@
   <div class="card mb-4">
     <div class="card-body">
       <form @submit.prevent="submitForm">
+        <div class="mb-3">
+          <label class="form-label pe-2" for="emergency">
+            {{ trans(CHILL_TICKET_LIST_FILTER_EMERGENCY) }}
+          </label>
+          <emergency-toggle-component v-model="isEmergency" class="float-end" />
+        </div>
+
         <!-- Sélection du motif -->
         <div class="mb-3">
           <label class="form-label">{{
@@ -12,16 +19,7 @@
             :motives="motives"
           />
         </div>
-        <!-- Attribution des tickets -->
-        <div class="mb-3">
-          <label class="form-label">
-            {{ trans(CHILL_TICKET_TICKET_ADD_COMMENT_TITLE) }}
-          </label>
-          <addressee-selector-component
-            v-model="ticketForm.addressees"
-            :suggested="userGroups"
-          />
-        </div>
+
         <!-- Sélection des personnes -->
         <div class="row mb-3">
           <div class="col-md-6">
@@ -60,23 +58,17 @@
             :motive="ticketForm.motive ? ticketForm.motive : null"
           />
         </div>
+
+        <!-- Attribution des tickets -->
         <div class="mb-3">
-          <label class="form-label pe-2" for="emergency">
-            {{ trans(CHILL_TICKET_LIST_FILTER_EMERGENCY) }}
+          <label class="form-label">
+            {{ trans(CHILL_TICKET_TICKET_ADD_ADDRESSEE_TITLE) }}
           </label>
-          <toggle-component
-            v-model="isEmergency"
-            :on-label="trans(CHILL_TICKET_LIST_FILTER_EMERGENCY)"
-            :off-label="trans(CHILL_TICKET_LIST_FILTER_EMERGENCY)"
-            :classColor="{
-              on: 'bg-warning',
-              off: 'bg-secondary',
-            }"
-            id="emergency"
-            class="float-end"
+          <addressee-selector-component
+            v-model="ticketForm.addressees"
+            :suggested="userGroups"
           />
         </div>
-
         <!-- Boutons d'action -->
         <div class="d-flex justify-content-end gap-2 mt-4">
           <button type="button" class="btn btn-secondary" @click="resetForm">
@@ -100,8 +92,7 @@ import MotiveSelectorComponent from "./Motive/MotiveSelectorComponent.vue";
 import CommentEditorComponent from "./Comment/CommentEditorComponent.vue";
 import PersonsSelectorComponent from "./Person/PersonsSelectorComponent.vue";
 import AddresseeSelectorComponent from "./Addressee/AddresseeSelectorComponent.vue";
-import ToggleComponent from "../../TicketList/components/ToggleComponent.vue";
-
+import EmergencyToggleComponent from "./Emergency/EmergencyToggleComponent.vue";
 // Types
 import {
   Motive,
@@ -124,6 +115,7 @@ import {
   CHILL_TICKET_TICKET_SET_PERSONS_CALLER_LABEL,
   CHILL_TICKET_TICKET_SET_PERSONS_USER_LABEL,
   CHILL_TICKET_LIST_FILTER_EMERGENCY,
+  CHILL_TICKET_TICKET_ADD_ADDRESSEE_TITLE,
 } from "translator";
 import { UserGroup, UserGroupOrUser } from "ChillMainAssets/types";
 
diff --git a/ts-config-base.json b/ts-config-base.json
index 646ae0597..7260a798d 100644
--- a/ts-config-base.json
+++ b/ts-config-base.json
@@ -19,6 +19,7 @@
         "sourceMap": true
     },
     "includes": [
+        "./assets/**/*.ts",
         "./src/**/*.ts",
         "./src/**/*.vue"
     ],
diff --git a/webpack.config.js b/webpack.config.js
index d3a9b40b8..27a77ad45 100644
--- a/webpack.config.js
+++ b/webpack.config.js
@@ -104,7 +104,7 @@ module.exports = (async () => {
   await populateConfig(Encore, chillEntries);
 
   Encore.addAliases({
-    translator: resolve(__dirname, './assets/translator'),
+    translator: resolve(__dirname, 'assets/translator.ts'),
     "@symfony/ux-translator": resolve(__dirname, './vendor/symfony/ux-translator/assets'),
   });
 

From 74c9eb5585586a30cc95f191a728c164059172f4 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 30 Sep 2025 16:23:27 +0200
Subject: [PATCH 178/283] Rector corrections

---
 .../ChillCalendarBundle/Repository/InviteRepository.php     | 2 +-
 src/Bundle/ChillMainBundle/Pagination/PaginatorFactory.php  | 6 +++---
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php b/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php
index 2c89021ac..6cb34738c 100644
--- a/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php
+++ b/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php
@@ -18,7 +18,7 @@ use Doctrine\Persistence\ObjectRepository;
 
 class InviteRepository implements ObjectRepository
 {
-    private EntityRepository $entityRepository;
+    private readonly EntityRepository $entityRepository;
 
     public function __construct(EntityManagerInterface $em)
     {
diff --git a/src/Bundle/ChillMainBundle/Pagination/PaginatorFactory.php b/src/Bundle/ChillMainBundle/Pagination/PaginatorFactory.php
index e53139fac..fa4897224 100644
--- a/src/Bundle/ChillMainBundle/Pagination/PaginatorFactory.php
+++ b/src/Bundle/ChillMainBundle/Pagination/PaginatorFactory.php
@@ -29,16 +29,16 @@ class PaginatorFactory implements PaginatorFactoryInterface
         /**
          * the request stack.
          */
-        private RequestStack $requestStack,
+        private readonly RequestStack $requestStack,
         /**
          * the router and generator for url.
          */
-        private RouterInterface $router,
+        private readonly RouterInterface $router,
         /**
          * the default item per page. This may be overriden by
          * the request or inside the paginator.
          */
-        private int $itemPerPage = 20,
+        private readonly int $itemPerPage = 20,
     ) {}
 
     /**

From 6d2e78ce550a7b637c1205001f275fb3285d13c7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 3 Oct 2025 12:00:51 +0200
Subject: [PATCH 179/283] Fix parameter handling in `MenuComposer` and
 `MenuTwig`

- Corrected `routeParameters` assignment in `MenuComposer` for proper parameter usage.
- Adjusted `menus` and `routes` assignment order in `MenuTwig` for consistent handling.
---
 src/Bundle/ChillMainBundle/Routing/MenuComposer.php | 2 +-
 src/Bundle/ChillMainBundle/Routing/MenuTwig.php     | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Routing/MenuComposer.php b/src/Bundle/ChillMainBundle/Routing/MenuComposer.php
index 101a97f6e..4386a765b 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuComposer.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuComposer.php
@@ -43,7 +43,7 @@ final readonly class MenuComposer
         foreach ($routes as $order => $route) {
             $menu->addChild($this->translator->trans($route['label']), [
                 'route' => $route['key'],
-                'routeParameters' => $parameters['args'],
+                'routeParameters' => $parameters,
                 'order' => $order,
             ])
                 ->setExtras([
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuTwig.php b/src/Bundle/ChillMainBundle/Routing/MenuTwig.php
index 409dcca11..f087c4aaa 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuTwig.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuTwig.php
@@ -51,8 +51,8 @@ final class MenuTwig extends AbstractExtension
 
         $layout = $resolvedParams['layout'];
         unset($resolvedParams['layout']);
-
-        $resolvedParams['menus'] = $resolvedParams['routes'] = $this->menuComposer->getMenuFor($menuId, $resolvedParams['args']);
+        $resolvedParams['routes'] = $this->menuComposer->getMenuFor($menuId, $resolvedParams['args']);
+        $resolvedParams['menus'] = $resolvedParams['routes'];
 
         return $env->render($layout, $resolvedParams);
     }

From bc2fbee5c6cf49123cfba94557fcd965d081ad5b Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 6 Oct 2025 12:14:00 +0200
Subject: [PATCH 180/283] Fix: notification edit template

form field addressesEmail removed
---
 .changes/unreleased/Fixed-20251006-121315.yaml              | 6 ++++++
 .../Resources/views/Notification/edit.html.twig             | 2 --
 2 files changed, 6 insertions(+), 2 deletions(-)
 create mode 100644 .changes/unreleased/Fixed-20251006-121315.yaml

diff --git a/.changes/unreleased/Fixed-20251006-121315.yaml b/.changes/unreleased/Fixed-20251006-121315.yaml
new file mode 100644
index 000000000..714b55e99
--- /dev/null
+++ b/.changes/unreleased/Fixed-20251006-121315.yaml
@@ -0,0 +1,6 @@
+kind: Fixed
+body: 'Notification: fix editing of sent notification by removing form.addressesEmails, a field that no longer exists'
+time: 2025-10-06T12:13:15.45905994+02:00
+custom:
+    Issue: "434"
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/edit.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/edit.html.twig
index fd3b3b6bf..b51cc4dab 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Notification/edit.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/edit.html.twig
@@ -21,8 +21,6 @@
     {{ form_row(form.title, { 'label': 'notification.subject'|trans }) }}
     {{ form_row(form.addressees, { 'label': 'notification.sent_to'|trans }) }}
 
-    {{ form_row(form.addressesEmails) }}
-
     {% include handler.template(notification) with handler.templateData(notification) %}
 
     <div class="mb-3 row">

From 84cf11933d684421093eaf36001e24731587726a Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 5 Jun 2025 10:12:16 +0200
Subject: [PATCH 181/283] Fix loading of classlists in SocialIssuesAcc.vue

---
 .changes/unreleased/Fixed-20250605-101314.yaml    |  6 ++++++
 package.json                                      |  1 +
 .../vuejs/Activity/components/SocialIssuesAcc.vue | 15 +++++++++++++--
 3 files changed, 20 insertions(+), 2 deletions(-)
 create mode 100644 .changes/unreleased/Fixed-20250605-101314.yaml

diff --git a/.changes/unreleased/Fixed-20250605-101314.yaml b/.changes/unreleased/Fixed-20250605-101314.yaml
new file mode 100644
index 000000000..e01274cde
--- /dev/null
+++ b/.changes/unreleased/Fixed-20250605-101314.yaml
@@ -0,0 +1,6 @@
+kind: Fixed
+body: Fix loading of classLists in SocialIssuesAcc.vue, ensure elements are present
+time: 2025-06-05T10:13:14.351260769+02:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change
diff --git a/package.json b/package.json
index a013df3da..1b4c7df13 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
     "@hotwired/stimulus": "^3.0.0",
     "@luminateone/eslint-baseline": "^1.0.9",
     "@symfony/stimulus-bridge": "^3.2.0",
+    "@symfony/ux-translator": "file:vendor/symfony/ux-translator/assets",
     "@symfony/webpack-encore": "^4.1.0",
     "@tsconfig/node20": "^20.1.4",
     "@types/dompurify": "^3.0.5",
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue
index a45d93b2a..18e090fc8 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue
@@ -136,8 +136,8 @@ export default {
             issueIsLoading: false,
             actionIsLoading: false,
             actionAreLoaded: false,
-            socialIssuesClassList: `col-form-label ${document.querySelector("input#chill_activitybundle_activity_socialIssues").getAttribute("required") ? "required" : ""}`,
-            socialActionsClassList: `col-form-label ${document.querySelector("input#chill_activitybundle_activity_socialActions").getAttribute("required") ? "required" : ""}`,
+            socialIssuesClassList: 'col-form-label',
+            socialActionsClassList: 'col-form-label',
         };
     },
     computed: {
@@ -158,6 +158,17 @@ export default {
         },
     },
     mounted() {
+        /* Load classNames after element is present */
+        const socialActionsEl = document.querySelector("input#chill_activitybundle_activity_socialActions");
+        if (socialActionsEl && socialActionsEl.hasAttribute("required")) {
+            this.socialActionsClassList += ' required';
+        }
+
+        const socialIssuessEl = document.querySelector("input#chill_activitybundle_activity_socialIssues");
+        if (socialIssuessEl && socialIssuessEl.hasAttribute("required")) {
+            this.socialIssuesClassList += ' required';
+        }
+
         /* Load other issues in multiselect */
         this.issueIsLoading = true;
         this.actionAreLoaded = false;

From a7e3b1c5d249232a86adf45f502d9f2c077076f5 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 8 Oct 2025 11:35:24 +0200
Subject: [PATCH 182/283] Use an object (instead of string) for dynamic
 classList in SocialIssuesAcc.vue component

---
 .../unreleased/Fixed-20251008-113621.yaml     |  6 +++++
 .../Activity/components/SocialIssuesAcc.vue   | 24 +++++++++++++------
 2 files changed, 23 insertions(+), 7 deletions(-)
 create mode 100644 .changes/unreleased/Fixed-20251008-113621.yaml

diff --git a/.changes/unreleased/Fixed-20251008-113621.yaml b/.changes/unreleased/Fixed-20251008-113621.yaml
new file mode 100644
index 000000000..75dcd9a4a
--- /dev/null
+++ b/.changes/unreleased/Fixed-20251008-113621.yaml
@@ -0,0 +1,6 @@
+kind: Fixed
+body: Fix loading of social issues and social actions within vue component
+time: 2025-10-08T11:36:21.158819835+02:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue
index 18e090fc8..210f8092f 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue
@@ -136,8 +136,14 @@ export default {
             issueIsLoading: false,
             actionIsLoading: false,
             actionAreLoaded: false,
-            socialIssuesClassList: 'col-form-label',
-            socialActionsClassList: 'col-form-label',
+            socialIssuesClassList: {
+                "col-form-label": true,
+                required: false,
+            },
+            socialActionsClassList: {
+                "col-form-label": true,
+                required: false,
+            },
         };
     },
     computed: {
@@ -159,14 +165,18 @@ export default {
     },
     mounted() {
         /* Load classNames after element is present */
-        const socialActionsEl = document.querySelector("input#chill_activitybundle_activity_socialActions");
+        const socialActionsEl = document.querySelector(
+            "input#chill_activitybundle_activity_socialActions",
+        );
         if (socialActionsEl && socialActionsEl.hasAttribute("required")) {
-            this.socialActionsClassList += ' required';
+            this.socialActionsClassList.required = true;
         }
 
-        const socialIssuessEl = document.querySelector("input#chill_activitybundle_activity_socialIssues");
-        if (socialIssuessEl && socialIssuessEl.hasAttribute("required")) {
-            this.socialIssuesClassList += ' required';
+        const socialIssuesEl = document.querySelector(
+            "input#chill_activitybundle_activity_socialIssues",
+        );
+        if (socialIssuesEl && socialIssuesEl.hasAttribute("required")) {
+            this.socialIssuesClassList.required = true;
         }
 
         /* Load other issues in multiselect */

From d82c9cc9a70b495ca9d0d93b9789c2aa20609281 Mon Sep 17 00:00:00 2001
From: LenaertsJ <julie.lenaerts@champs-libres.coop>
Date: Wed, 8 Oct 2025 11:05:22 +0000
Subject: [PATCH 183/283] =?UTF-8?q?Resolve=20"Ajouter=20un=20bandeau=20qui?=
 =?UTF-8?q?=20permet=20de=20distinguer=20les=20diff=C3=A9rents=20environne?=
 =?UTF-8?q?ments"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../unreleased/Feature-20251007-101949.yaml   |  6 ++
 config/packages/chill.yaml                    |  7 ++
 .../ChillMainExtension.php                    |  6 ++
 .../DependencyInjection/Configuration.php     | 14 +++
 .../views/Layout/_top_banner.html.twig        | 17 ++++
 .../Resources/views/layout.html.twig          |  4 +
 .../DependencyInjection/ConfigurationTest.php | 98 +++++++++++++++++++
 7 files changed, 152 insertions(+)
 create mode 100644 .changes/unreleased/Feature-20251007-101949.yaml
 create mode 100644 src/Bundle/ChillMainBundle/Resources/views/Layout/_top_banner.html.twig
 create mode 100644 src/Bundle/ChillMainBundle/Tests/DependencyInjection/ConfigurationTest.php

diff --git a/.changes/unreleased/Feature-20251007-101949.yaml b/.changes/unreleased/Feature-20251007-101949.yaml
new file mode 100644
index 000000000..a0ba84124
--- /dev/null
+++ b/.changes/unreleased/Feature-20251007-101949.yaml
@@ -0,0 +1,6 @@
+kind: Feature
+body: Create environment banner that can be activated and configured depending on the image deployed
+time: 2025-10-07T10:19:49.784462956+02:00
+custom:
+    Issue: "423"
+    SchemaChange: No schema change
diff --git a/config/packages/chill.yaml b/config/packages/chill.yaml
index 6ed6b6984..e5974a6bc 100644
--- a/config/packages/chill.yaml
+++ b/config/packages/chill.yaml
@@ -1,6 +1,13 @@
 chill_main:
     available_languages: [ '%env(resolve:LOCALE)%', 'en' ]
     available_countries: ['BE', 'FR']
+    top_banner:
+        visible: true
+        text:
+            fr: 'Vous travaillez actuellement avec la version de PRÉ-PRODUCTION.'
+            nl: 'Je werkt momenteel in de PRE-PRODUCTIE versie'
+        color: '#353535'
+        background_color: '#d8bb48'
     notifications:
         from_email: '%env(resolve:NOTIFICATION_FROM_EMAIL)%'
         from_name: '%env(resolve:NOTIFICATION_FROM_NAME)%'
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
index 70f0df071..ebb28d2e7 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
@@ -205,6 +205,11 @@ class ChillMainExtension extends Extension implements
                 []
         );
 
+        $container->setParameter(
+            'chill_main.top_banner',
+            $config['top_banner'] ?? []
+        );
+
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
         $loader->load('services.yaml');
         $loader->load('services/doctrine.yaml');
@@ -250,6 +255,7 @@ class ChillMainExtension extends Extension implements
                     'name' => $config['installation_name'], ],
                 'available_languages' => $config['available_languages'],
                 'add_address' => $config['add_address'],
+                'chill_main_config' => $config,
             ],
             'form_themes' => ['@ChillMain/Form/fields.html.twig'],
         ];
diff --git a/src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
index 6625488dd..a3247d88e 100644
--- a/src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
@@ -168,6 +168,20 @@ class Configuration implements ConfigurationInterface
             ->end()
             ->end()
             ->end()
+            ->arrayNode('top_banner')
+            ->canBeUnset()
+            ->children()
+            ->booleanNode('visible')
+            ->defaultFalse()
+            ->end()
+            ->arrayNode('text')
+            ->useAttributeAsKey('lang')
+            ->scalarPrototype()->end()
+            ->end() // end of text
+            ->scalarNode('color')->defaultNull()->end()
+            ->scalarNode('background_color')->defaultNull()->end()
+            ->end() // end of top_banner children
+            ->end() // end of top_banner
             ->arrayNode('widgets')
             ->canBeEnabled()
             ->canBeUnset()
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Layout/_top_banner.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Layout/_top_banner.html.twig
new file mode 100644
index 000000000..0ad81cce1
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/views/Layout/_top_banner.html.twig
@@ -0,0 +1,17 @@
+{% if chill_main_config.top_banner is defined and chill_main_config.top_banner.text is defined %}
+    {% set banner_text = '' %}
+    {% set current_locale = app.request.locale %}
+
+    {% if chill_main_config.top_banner.text[current_locale] is defined %}
+        {% set banner_text = chill_main_config.top_banner.text[current_locale] %}
+    {% else %}
+        {% set banner_text = chill_main_config.top_banner.text|first %}
+    {% endif %}
+
+    {% if banner_text %}
+        <div class="top-banner w-100 text-center py-2"
+             style="{% if chill_main_config.top_banner.color is defined %}color: {{ chill_main_config.top_banner.color }};{% endif %}{% if chill_main_config.top_banner.background_color is defined %}background-color: {{ chill_main_config.top_banner.background_color }};{% endif %}">
+            {{ banner_text }}
+        </div>
+    {% endif %}
+{% endif %}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
index 343c12eea..0ff39c8d9 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
@@ -26,6 +26,10 @@
 </head>
 
 <body>
+    {% if chill_main_config.top_banner is defined and chill_main_config.top_banner.visible is true %}
+        {{ include('@ChillMain/Layout/_top_banner.html.twig') }}
+    {% endif %}
+
     {% if responsive_debug is defined and responsive_debug == 1 %}
         {{ include('@ChillMain/Layout/_debug.html.twig') }}
     {% endif %}
diff --git a/src/Bundle/ChillMainBundle/Tests/DependencyInjection/ConfigurationTest.php b/src/Bundle/ChillMainBundle/Tests/DependencyInjection/ConfigurationTest.php
new file mode 100644
index 000000000..27f4db512
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -0,0 +1,98 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Tests\DependencyInjection;
+
+use Chill\MainBundle\DependencyInjection\Configuration;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\Definition\Processor;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class ConfigurationTest extends TestCase
+{
+    public function testTopBannerConfiguration(): void
+    {
+        $containerBuilder = new ContainerBuilder();
+        $configuration = new Configuration([], $containerBuilder);
+        $processor = new Processor();
+
+        // Test with top_banner configuration
+        $config = [
+            'chill_main' => [
+                'top_banner' => [
+                    'text' => [
+                        'fr' => 'Vous travaillez actuellement avec la version de pré-production de Chill.',
+                        'nl' => 'Je werkte momenteel in de pré-productie versie van Chill.',
+                    ],
+                    'color' => 'white',
+                    'background-color' => 'red',
+                ],
+            ],
+        ];
+
+        $processedConfig = $processor->processConfiguration($configuration, $config);
+
+        self::assertArrayHasKey('top_banner', $processedConfig);
+        self::assertArrayHasKey('text', $processedConfig['top_banner']);
+        self::assertArrayHasKey('fr', $processedConfig['top_banner']['text']);
+        self::assertArrayHasKey('nl', $processedConfig['top_banner']['text']);
+        self::assertSame('white', $processedConfig['top_banner']['color']);
+        self::assertSame('red', $processedConfig['top_banner']['background_color']);
+    }
+
+    public function testTopBannerConfigurationOptional(): void
+    {
+        $containerBuilder = new ContainerBuilder();
+        $configuration = new Configuration([], $containerBuilder);
+        $processor = new Processor();
+
+        // Test without top_banner configuration
+        $config = [
+            'chill_main' => [],
+        ];
+
+        $processedConfig = $processor->processConfiguration($configuration, $config);
+
+        // top_banner should not be present when not configured
+        self::assertArrayNotHasKey('top_banner', $processedConfig);
+    }
+
+    public function testTopBannerWithMinimalConfiguration(): void
+    {
+        $containerBuilder = new ContainerBuilder();
+        $configuration = new Configuration([], $containerBuilder);
+        $processor = new Processor();
+
+        // Test with minimal top_banner configuration (only text)
+        $config = [
+            'chill_main' => [
+                'top_banner' => [
+                    'text' => [
+                        'fr' => 'Test message',
+                    ],
+                ],
+            ],
+        ];
+
+        $processedConfig = $processor->processConfiguration($configuration, $config);
+
+        self::assertArrayHasKey('top_banner', $processedConfig);
+        self::assertArrayHasKey('text', $processedConfig['top_banner']);
+        self::assertSame('Test message', $processedConfig['top_banner']['text']['fr']);
+        self::assertNull($processedConfig['top_banner']['color']);
+        self::assertNull($processedConfig['top_banner']['background_color']);
+    }
+}

From 1b9b581c31036722882c57d4d2722789a8961183 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 8 Oct 2025 13:10:26 +0200
Subject: [PATCH 184/283] Hide top_banner by default

---
 config/packages/chill.yaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/config/packages/chill.yaml b/config/packages/chill.yaml
index e5974a6bc..0f5aa08b7 100644
--- a/config/packages/chill.yaml
+++ b/config/packages/chill.yaml
@@ -2,7 +2,7 @@ chill_main:
     available_languages: [ '%env(resolve:LOCALE)%', 'en' ]
     available_countries: ['BE', 'FR']
     top_banner:
-        visible: true
+        visible: false
         text:
             fr: 'Vous travaillez actuellement avec la version de PRÉ-PRODUCTION.'
             nl: 'Je werkt momenteel in de PRE-PRODUCTIE versie'

From 9089c8959bb2f6f850b3234e1d622a749452390c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 8 Oct 2025 11:35:47 +0000
Subject: [PATCH 185/283] remove ux/translator package in error

---
 package.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/package.json b/package.json
index 1b4c7df13..a013df3da 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,6 @@
     "@hotwired/stimulus": "^3.0.0",
     "@luminateone/eslint-baseline": "^1.0.9",
     "@symfony/stimulus-bridge": "^3.2.0",
-    "@symfony/ux-translator": "file:vendor/symfony/ux-translator/assets",
     "@symfony/webpack-encore": "^4.1.0",
     "@tsconfig/node20": "^20.1.4",
     "@types/dompurify": "^3.0.5",

From e1bf4a24d2d2ab7586cfd73d59a1e72b22b39bd4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 13 Oct 2025 10:47:47 +0000
Subject: [PATCH 186/283] Enforce filename uniqueness in `StoredObjectVersion`
 with partial unique index...

---
 .../unreleased/Fixed-20251013-123932.yaml     |  6 ++
 .../Entity/StoredObjectVersion.php            |  4 ++
 .../migrations/Version20251013094414.php      | 63 +++++++++++++++++++
 3 files changed, 73 insertions(+)
 create mode 100644 .changes/unreleased/Fixed-20251013-123932.yaml
 create mode 100644 src/Bundle/ChillDocStoreBundle/migrations/Version20251013094414.php

diff --git a/.changes/unreleased/Fixed-20251013-123932.yaml b/.changes/unreleased/Fixed-20251013-123932.yaml
new file mode 100644
index 000000000..3c4b6ae74
--- /dev/null
+++ b/.changes/unreleased/Fixed-20251013-123932.yaml
@@ -0,0 +1,6 @@
+kind: Fixed
+body: Add unique condition on stored object filename, with cleaning step on existing duplicate filenames
+time: 2025-10-13T12:39:32.85885314+02:00
+custom:
+    Issue: "446"
+    SchemaChange: Drop or rename table or columns, or enforce new constraint that must be manually fixed
diff --git a/src/Bundle/ChillDocStoreBundle/Entity/StoredObjectVersion.php b/src/Bundle/ChillDocStoreBundle/Entity/StoredObjectVersion.php
index 18c78563a..472e77e55 100644
--- a/src/Bundle/ChillDocStoreBundle/Entity/StoredObjectVersion.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/StoredObjectVersion.php
@@ -23,10 +23,14 @@ use Random\RandomException;
  * Store each version of StoredObject's.
  *
  * A version should not be created manually: use the method @see{StoredObject::registerVersion} instead.
+ *
+ * Each filename must be unique within the same StoredObject. We add a condition on id to apply this condition only for
+ * newly created versions when this new index is applied.
  */
 #[ORM\Entity]
 #[ORM\Table('chill_doc.stored_object_version')]
 #[ORM\UniqueConstraint(name: 'chill_doc_stored_object_version_unique_by_object', columns: ['stored_object_id', 'version'])]
+#[ORM\UniqueConstraint(name: 'chill_doc_stored_object_version_unique_by_filename', columns: ['filename'], options: ['where' => '(id > 0)'])]
 class StoredObjectVersion implements TrackCreationInterface
 {
     use TrackCreationTrait;
diff --git a/src/Bundle/ChillDocStoreBundle/migrations/Version20251013094414.php b/src/Bundle/ChillDocStoreBundle/migrations/Version20251013094414.php
new file mode 100644
index 000000000..9195e2567
--- /dev/null
+++ b/src/Bundle/ChillDocStoreBundle/migrations/Version20251013094414.php
@@ -0,0 +1,63 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\Migrations\DocStore;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20251013094414 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'DocStore: Enforce filename uniqueness on chill_doc.stored_object_version; clean duplicates and add partial unique index on filename (for new rows only).';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // 1) Clean duplicates: for each (stored_object_id, filename, key, iv), keep only the last inserted row
+        //    and delete all others. Use ROW_NUMBER over id DESC to define the last one.
+        $this->addSql(<<<'SQL'
+            WITH ranked AS (
+                SELECT id,
+                       rank() OVER (
+                           PARTITION BY stored_object_id, filename, "key"::jsonb, iv::jsonb
+                           ORDER BY id DESC
+                       ) AS rn
+                FROM chill_doc.stored_object_version
+            )
+            DELETE FROM chill_doc.stored_object_version sov
+            USING ranked r
+            WHERE sov.id = r.id
+              AND r.rn > 1
+        SQL);
+
+        // 2) Create a partial unique index on filename that applies only to subsequently inserted rows.
+        //    Per user's instruction, compute the cutoff using the stored_object_id sequence value.
+        $nextVal = (int) $this->connection->fetchOne("SELECT nextval('chill_doc.stored_object_version_id_seq')");
+
+        // Safety: if somehow sequence is not available, fallback to current max id from the table
+        if ($nextVal <= 0) {
+            $nextVal = (int) $this->connection->fetchOne('SELECT COALESCE(MAX(id), 0) FROM chill_doc.stored_object_version');
+        }
+
+        $this->addSql(sprintf(
+            'CREATE UNIQUE INDEX chill_doc_stored_object_version_unique_by_filename ON chill_doc.stored_object_version (filename) WHERE id > %d',
+            $nextVal
+        ));
+    }
+
+    public function down(Schema $schema): void
+    {
+        // Drop the partial unique index; data cleanup is irreversible.
+        $this->addSql('DROP INDEX IF EXISTS chill_doc_stored_object_version_unique_by_filename');
+    }
+}

From ddb2a654193e0d7ad0dd0c9e86c838bbee6f848a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 13 Oct 2025 14:12:06 +0000
Subject: [PATCH 187/283] Take permissions into account for deletion of
 WorkflowAttachment (+ type safety)

---
 .../unreleased/Fixed-20251013-160526.yaml     |  6 +++
 .../Resources/public/types/generic_doc.ts     | 17 ++++++++
 .../ChillMainBundle/Resources/public/types.ts | 24 ++++++++++-
 .../public/vuejs/WorkflowAttachment/App.vue   |  3 +-
 .../Component/AttachmentList.vue              | 43 +++++++++++++------
 .../Component/GenericDocItemBox.vue           |  4 +-
 .../translations/messages.fr.yml              |  2 +
 7 files changed, 81 insertions(+), 18 deletions(-)
 create mode 100644 .changes/unreleased/Fixed-20251013-160526.yaml

diff --git a/.changes/unreleased/Fixed-20251013-160526.yaml b/.changes/unreleased/Fixed-20251013-160526.yaml
new file mode 100644
index 000000000..86419d005
--- /dev/null
+++ b/.changes/unreleased/Fixed-20251013-160526.yaml
@@ -0,0 +1,6 @@
+kind: Fixed
+body: '[workflow] take permissions into account to delete the workflow attachment'
+time: 2025-10-13T16:05:26.088124301+02:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/types/generic_doc.ts b/src/Bundle/ChillDocStoreBundle/Resources/public/types/generic_doc.ts
index 497cfee5a..04c324b4a 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/types/generic_doc.ts
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/types/generic_doc.ts
@@ -36,6 +36,18 @@ export interface GenericDocForAccompanyingPeriod extends GenericDoc {
     context: "accompanying-period";
 }
 
+export function isGenericDocForAccompanyingPeriod(
+    doc: GenericDoc,
+): doc is GenericDocForAccompanyingPeriod {
+    return doc.context === "accompanying-period";
+}
+
+export function isGenericDocWithStoredObject(
+    doc: GenericDoc,
+): doc is GenericDoc & { storedObject: StoredObject } {
+    return doc.storedObject !== null;
+}
+
 interface BaseMetadataWithHtml extends BaseMetadata {
     html: string;
 }
@@ -44,28 +56,33 @@ export interface GenericDocForAccompanyingCourseDocument
     extends GenericDocForAccompanyingPeriod {
     key: "accompanying_course_document";
     metadata: BaseMetadataWithHtml;
+    storedObject: StoredObject;
 }
 
 export interface GenericDocForAccompanyingCourseActivityDocument
     extends GenericDocForAccompanyingPeriod {
     key: "accompanying_course_activity_document";
     metadata: BaseMetadataWithHtml;
+    storedObject: StoredObject;
 }
 
 export interface GenericDocForAccompanyingCourseCalendarDocument
     extends GenericDocForAccompanyingPeriod {
     key: "accompanying_course_calendar_document";
     metadata: BaseMetadataWithHtml;
+    storedObject: StoredObject;
 }
 
 export interface GenericDocForAccompanyingCoursePersonDocument
     extends GenericDocForAccompanyingPeriod {
     key: "person_document";
     metadata: BaseMetadataWithHtml;
+    storedObject: StoredObject;
 }
 
 export interface GenericDocForAccompanyingCourseWorkEvaluationDocument
     extends GenericDocForAccompanyingPeriod {
     key: "accompanying_period_work_evaluation_document";
     metadata: BaseMetadataWithHtml;
+    storedObject: StoredObject;
 }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/types.ts b/src/Bundle/ChillMainBundle/Resources/public/types.ts
index b96462ceb..c39db4a76 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/types.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/types.ts
@@ -1,4 +1,7 @@
-import { GenericDoc } from "ChillDocStoreAssets/types/generic_doc";
+import {
+    GenericDoc,
+    isGenericDocWithStoredObject,
+} from "ChillDocStoreAssets/types/generic_doc";
 import { StoredObject, StoredObjectStatus } from "ChillDocStoreAssets/types";
 import { Person } from "../../../ChillPersonBundle/Resources/public/types";
 
@@ -203,6 +206,25 @@ export interface WorkflowAttachment {
     genericDoc: null | GenericDoc;
 }
 
+export type AttachmentWithDocAndStored = WorkflowAttachment & {
+    genericDoc: GenericDoc & { storedObject: StoredObject };
+};
+
+export function isAttachmentWithDocAndStored(
+    a: WorkflowAttachment,
+): a is AttachmentWithDocAndStored {
+    return (
+        isWorkflowAttachmentWithGenericDoc(a) &&
+        isGenericDocWithStoredObject(a.genericDoc)
+    );
+}
+
+export function isWorkflowAttachmentWithGenericDoc(
+    attachment: WorkflowAttachment,
+): attachment is WorkflowAttachment & { genericDoc: GenericDoc } {
+    return attachment.genericDoc !== null;
+}
+
 export interface Workflow {
     name: string;
     text: string;
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/App.vue
index 289b49788..af319580d 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/App.vue
@@ -6,6 +6,7 @@ import { GenericDocForAccompanyingPeriod } from "ChillDocStoreAssets/types/gener
 import AttachmentList from "ChillMainAssets/vuejs/WorkflowAttachment/Component/AttachmentList.vue";
 import { GenericDoc } from "ChillDocStoreAssets/types";
 import { fetchWorkflow } from "ChillMainAssets/lib/workflow/api";
+import { trans, WORKFLOW_ATTACHMENTS_ADD_AN_ATTACHMENT } from "translator";
 
 interface AppConfig {
     workflowId: number;
@@ -83,7 +84,7 @@ const canEditAttachement = computed<boolean>(() => {
     <ul v-if="canEditAttachement" class="record_actions">
         <li>
             <button type="button" class="btn btn-create" @click="openModal">
-                Ajouter une pièce jointe
+                {{ trans(WORKFLOW_ATTACHMENTS_ADD_AN_ATTACHMENT) }}
             </button>
         </li>
     </ul>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/AttachmentList.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/AttachmentList.vue
index c0d3a8eb4..d12496266 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/AttachmentList.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/AttachmentList.vue
@@ -1,7 +1,14 @@
 <script setup lang="ts">
-import { EntityWorkflow, WorkflowAttachment } from "ChillMainAssets/types";
+import {
+    AttachmentWithDocAndStored,
+    EntityWorkflow,
+    isAttachmentWithDocAndStored,
+    WorkflowAttachment,
+} from "ChillMainAssets/types";
 import GenericDocItemBox from "ChillMainAssets/vuejs/WorkflowAttachment/Component/GenericDocItemBox.vue";
 import DocumentActionButtonsGroup from "ChillDocStoreAssets/vuejs/DocumentActionButtonsGroup.vue";
+import { computed } from "vue";
+import { trans, WORKFLOW_ATTACHMENTS_NO_ATTACHMENT } from "translator";
 
 interface AttachmentListProps {
     attachments: WorkflowAttachment[];
@@ -14,35 +21,43 @@ const emit = defineEmits<{
 }>();
 
 const props = defineProps<AttachmentListProps>();
+
+const notNullAttachments = computed<AttachmentWithDocAndStored[]>(() =>
+    props.attachments.filter(
+        (a: WorkflowAttachment): a is AttachmentWithDocAndStored =>
+            isAttachmentWithDocAndStored(a),
+    ),
+);
+
+const canRemove = computed<boolean>((): boolean => {
+    if (null === props.workflow) {
+        return false;
+    }
+
+    return props.workflow._permissions.CHILL_MAIN_WORKFLOW_ATTACHMENT_EDIT;
+});
 </script>
 
 <template>
     <p
-        v-if="props.attachments.length === 0"
+        v-if="notNullAttachments.length === 0"
         class="chill-no-data-statement text-center"
     >
-        Aucune pièce jointe
+        {{ trans(WORKFLOW_ATTACHMENTS_NO_ATTACHMENT) }}
     </p>
-    <!-- TODO translate -->
-    <div else class="flex-table">
-        <div v-for="a in props.attachments" :key="a.id" class="item-bloc">
+    <div v-else class="flex-table">
+        <div v-for="a in notNullAttachments" :key="a.id" class="item-bloc">
             <generic-doc-item-box
-                v-if="a.genericDoc !== null"
                 :generic-doc="a.genericDoc"
             ></generic-doc-item-box>
             <div class="item-row separator">
                 <ul class="record_actions">
-                    <li v-if="a.genericDoc?.storedObject !== null">
+                    <li>
                         <document-action-buttons-group
                             :stored-object="a.genericDoc.storedObject"
                         ></document-action-buttons-group>
                     </li>
-                    <li
-                        v-if="
-                            !workflow?._permissions
-                                .CHILL_MAIN_WORKFLOW_ATTACHMENT_EDIT
-                        "
-                    >
+                    <li v-if="canRemove">
                         <button
                             type="button"
                             class="btn btn-delete"
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/GenericDocItemBox.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/GenericDocItemBox.vue
index 8b96b4eea..d57a99475 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/GenericDocItemBox.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/GenericDocItemBox.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import { GenericDocForAccompanyingPeriod } from "ChillDocStoreAssets/types/generic_doc";
+import { GenericDoc } from "ChillDocStoreAssets/types/generic_doc";
 
 interface GenericDocItemBoxProps {
-    genericDoc: GenericDocForAccompanyingPeriod;
+    genericDoc: GenericDoc;
 }
 
 const props = defineProps<GenericDocItemBoxProps>();
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index 0430b72c6..676f9cdea 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -670,6 +670,8 @@ workflow:
 
     attachments:
         title: Pièces jointes
+        no_attachment: Aucune pièce jointe
+        Add_an_attachment: Ajouter une pièce jointe
 
     wait:
         title: En attente de traitement

From 372d8e5825bf1e51fa7b3399b87cd6b8395f3c50 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 15 Oct 2025 10:12:10 +0000
Subject: [PATCH 188/283] Fix sending of daily notification, when the previous
 last_execution parameter is not a valid last_execution date format

---
 .../unreleased/Fixed-20251015-110202.yaml     |   6 +
 .junie/guidelines.md                          |   6 +-
 .../Email/DailyNotificationDigestCronjob.php  |   7 +-
 ...otificationDigestCronJobFunctionalTest.php |   5 -
 .../DailyNotificationDigestCronJobTest.php    | 135 +++++++++++++++++-
 5 files changed, 149 insertions(+), 10 deletions(-)
 create mode 100644 .changes/unreleased/Fixed-20251015-110202.yaml

diff --git a/.changes/unreleased/Fixed-20251015-110202.yaml b/.changes/unreleased/Fixed-20251015-110202.yaml
new file mode 100644
index 000000000..06b9c65a7
--- /dev/null
+++ b/.changes/unreleased/Fixed-20251015-110202.yaml
@@ -0,0 +1,6 @@
+kind: Fixed
+body: Fix the execution of daily cronjob notification, when the previous last execution storage was invalid
+time: 2025-10-15T11:02:02.704326098+02:00
+custom:
+    Issue: "448"
+    SchemaChange: No schema change
diff --git a/.junie/guidelines.md b/.junie/guidelines.md
index a53bfe8cf..ff84fdffa 100644
--- a/.junie/guidelines.md
+++ b/.junie/guidelines.md
@@ -240,9 +240,6 @@ The tests are run from the project's root (not from the bundle's root).
 # Run all tests
 vendor/bin/phpunit
 
-# Run tests for a specific bundle
-vendor/bin/phpunit --testsuite NameBundle
-
 # Run a specific test file
 vendor/bin/phpunit path/to/TestFile.php
 
@@ -250,6 +247,9 @@ vendor/bin/phpunit path/to/TestFile.php
 vendor/bin/phpunit --filter methodName path/to/TestFile.php
 ```
 
+When writing tests, only test specific files. Do not run all tests or the full
+test suite.
+
 #### Test Structure
 
 Tests are organized by bundle and follow the same structure as the bundle itself:
diff --git a/src/Bundle/ChillMainBundle/Notification/Email/DailyNotificationDigestCronjob.php b/src/Bundle/ChillMainBundle/Notification/Email/DailyNotificationDigestCronjob.php
index 5ed6696f7..c80b9cc67 100644
--- a/src/Bundle/ChillMainBundle/Notification/Email/DailyNotificationDigestCronjob.php
+++ b/src/Bundle/ChillMainBundle/Notification/Email/DailyNotificationDigestCronjob.php
@@ -53,11 +53,16 @@ readonly class DailyNotificationDigestCronjob implements CronJobInterface
     public function run(array $lastExecutionData): ?array
     {
         $now = $this->clock->now();
+
         if (isset($lastExecutionData['last_execution'])) {
             $lastExecution = \DateTimeImmutable::createFromFormat(
                 \DateTimeImmutable::ATOM,
                 $lastExecutionData['last_execution']
             );
+
+            if (false === $lastExecution) {
+                $lastExecution = $now->sub(new \DateInterval('P1D'));
+            }
         } else {
             $lastExecution = $now->sub(new \DateInterval('P1D'));
         }
@@ -96,7 +101,7 @@ readonly class DailyNotificationDigestCronjob implements CronJobInterface
         ]);
 
         return [
-            'last_execution' => $now->format('Y-m-d-H:i:s.u e'),
+            'last_execution' => $now->format(\DateTimeInterface::ATOM),
         ];
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Notification/Email/DailyNotificationDigestCronJobFunctionalTest.php b/src/Bundle/ChillMainBundle/Tests/Notification/Email/DailyNotificationDigestCronJobFunctionalTest.php
index 0caeebc36..a1f749399 100644
--- a/src/Bundle/ChillMainBundle/Tests/Notification/Email/DailyNotificationDigestCronJobFunctionalTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Notification/Email/DailyNotificationDigestCronJobFunctionalTest.php
@@ -37,10 +37,5 @@ class DailyNotificationDigestCronJobFunctionalTest extends KernelTestCase
         $actual = $this->dailyNotificationDigestCronjob->run([]);
 
         self::assertArrayHasKey('last_execution', $actual);
-        self::assertInstanceOf(
-            \DateTimeImmutable::class,
-            \DateTimeImmutable::createFromFormat('Y-m-d-H:i:s.u e', $actual['last_execution']),
-            'test that the string can be converted to a date'
-        );
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Notification/Email/DailyNotificationDigestCronJobTest.php b/src/Bundle/ChillMainBundle/Tests/Notification/Email/DailyNotificationDigestCronJobTest.php
index 5894385c6..075929838 100644
--- a/src/Bundle/ChillMainBundle/Tests/Notification/Email/DailyNotificationDigestCronJobTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Notification/Email/DailyNotificationDigestCronJobTest.php
@@ -12,16 +12,21 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Tests\Notification\Email;
 
 use Chill\MainBundle\Notification\Email\DailyNotificationDigestCronjob;
+use Chill\MainBundle\Notification\Email\NotificationEmailMessages\ScheduleDailyNotificationDigestMessage;
 use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Result;
+use Doctrine\DBAL\Statement;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Clock\ClockInterface;
+use Symfony\Component\Clock\MockClock;
+use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\MessageBusInterface;
 
 /**
  * @internal
  *
- * @coversNothing
+ * @covers \DailyNotificationDigestCronjob
  */
 class DailyNotificationDigestCronJobTest extends TestCase
 {
@@ -30,6 +35,7 @@ class DailyNotificationDigestCronJobTest extends TestCase
     private MessageBusInterface $messageBus;
     private LoggerInterface $logger;
     private DailyNotificationDigestCronjob $cronjob;
+    private \DateTimeImmutable $firstNow;
 
     protected function setUp(): void
     {
@@ -38,6 +44,8 @@ class DailyNotificationDigestCronJobTest extends TestCase
         $this->messageBus = $this->createMock(MessageBusInterface::class);
         $this->logger = $this->createMock(LoggerInterface::class);
 
+        $this->firstNow = new \DateTimeImmutable('2024-01-02T07:15:00+00:00');
+
         $this->cronjob = new DailyNotificationDigestCronjob(
             $this->clock,
             $this->connection,
@@ -78,4 +86,129 @@ class DailyNotificationDigestCronJobTest extends TestCase
             'hour 23 - should not run' => [23, false],
         ];
     }
+
+    public function testRunFirstExecutionReturnsStateAndDispatches(): array
+    {
+        // Use MockClock for deterministic time
+        $firstNow = $this->firstNow;
+        $clock = new MockClock($firstNow);
+
+        // Mock DBAL statement/result
+        $statement = $this->createMock(Statement::class);
+        $result = $this->createMock(Result::class);
+
+        $this->connection->method('prepare')->willReturn($statement);
+        $statement->method('bindValue')->willReturnSelf();
+        $statement->method('executeQuery')->willReturn($result);
+
+        $rows = [
+            ['user_id' => 10],
+            ['user_id' => 42],
+        ];
+        $result->method('fetchAllAssociative')->willReturn($rows);
+
+        $dispatched = [];
+        $this->messageBus->method('dispatch')->willReturnCallback(function ($message) use (&$dispatched) {
+            $dispatched[] = $message;
+
+            return new Envelope($message);
+        });
+
+        $cron = new DailyNotificationDigestCronjob($clock, $this->connection, $this->messageBus, $this->logger);
+        $state = $cron->run([]);
+
+        // Assert dispatch count and message contents
+        self::assertCount(2, $dispatched);
+        $expectedLast = $firstNow->sub(new \DateInterval('P1D'));
+        foreach ($dispatched as $i => $msg) {
+            self::assertInstanceOf(ScheduleDailyNotificationDigestMessage::class, $msg);
+            self::assertTrue(in_array($msg->getUserId(), [10, 42], true));
+            self::assertEquals($firstNow, $msg->getCurrentDateTime(), 'compare the current date');
+            self::assertEquals($expectedLast, $msg->getLastExecutionDateTime(), 'compare the last execution date');
+        }
+
+        // Assert returned state
+        self::assertIsArray($state);
+        self::assertArrayHasKey('last_execution', $state);
+        self::assertSame($firstNow->format(\DateTimeInterface::ATOM), $state['last_execution']);
+
+        return $state;
+    }
+
+    /**
+     * @depends testRunFirstExecutionReturnsStateAndDispatches
+     */
+    public function testRunSecondExecutionUsesPreviousState(array $previousState): void
+    {
+        $firstNow = $this->firstNow;
+        $secondNow = $firstNow->add(new \DateInterval('P1D'));
+        $clock = new MockClock($secondNow);
+
+        // Mock DBAL for a single user this time
+        $statement = $this->createMock(Statement::class);
+        $result = $this->createMock(Result::class);
+
+        $this->connection->method('prepare')->willReturn($statement);
+        $statement->method('bindValue')->willReturnSelf();
+        $statement->method('executeQuery')->willReturn($result);
+
+        $rows = [
+            ['user_id' => 7],
+        ];
+        $result->method('fetchAllAssociative')->willReturn($rows);
+
+        $captured = [];
+        $this->messageBus->method('dispatch')->willReturnCallback(function ($message) use (&$captured) {
+            $captured[] = $message;
+
+            return new Envelope($message);
+        });
+
+        $cron = new DailyNotificationDigestCronjob($clock, $this->connection, $this->messageBus, $this->logger);
+        $cron->run($previousState);
+
+        self::assertCount(1, $captured);
+        $msg = $captured[0];
+        self::assertInstanceOf(ScheduleDailyNotificationDigestMessage::class, $msg);
+        self::assertEquals(7, $msg->getUserId());
+        self::assertEquals($secondNow, $msg->getCurrentDateTime(), 'compare the current date');
+        self::assertEquals($firstNow, $msg->getLastExecutionDateTime(), 'compare the last execution date');
+    }
+
+    public function testRunWithInvalidExecutionState(): void
+    {
+        $firstNow = new \DateTimeImmutable('2025-10-14T10:30:00 Europe/Brussels');
+        $previousExpected = $firstNow->sub(new \DateInterval('P1D'));
+        $clock = new MockClock($firstNow);
+
+        // Mock DBAL for a single user this time
+        $statement = $this->createMock(Statement::class);
+        $result = $this->createMock(Result::class);
+
+        $this->connection->method('prepare')->willReturn($statement);
+        $statement->method('bindValue')->willReturnSelf();
+        $statement->method('executeQuery')->willReturn($result);
+
+        $rows = [
+            ['user_id' => 7],
+        ];
+        $result->method('fetchAllAssociative')->willReturn($rows);
+
+        $captured = [];
+        $this->messageBus->method('dispatch')->willReturnCallback(function ($message) use (&$captured) {
+            $captured[] = $message;
+
+            return new Envelope($message);
+        });
+
+        $cron = new DailyNotificationDigestCronjob($clock, $this->connection, $this->messageBus, $this->logger);
+        $cron->run(['last_execution' => 'invalid data']);
+
+        self::assertCount(1, $captured);
+        $msg = $captured[0];
+        self::assertInstanceOf(ScheduleDailyNotificationDigestMessage::class, $msg);
+        self::assertEquals(7, $msg->getUserId());
+        self::assertEquals($firstNow, $msg->getCurrentDateTime(), 'compare the current date');
+        self::assertEquals($previousExpected, $msg->getLastExecutionDateTime(), 'compare the last execution date');
+    }
 }

From b1fa9242a08c6d8220e723a7bef5acd201542f32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 15 Oct 2025 10:13:38 +0000
Subject: [PATCH 189/283] Only show active workflow on the page "my tracked
 workflows"

---
 .../unreleased/Feature-20251015-113430.yaml   |  6 ++++
 .../Controller/WorkflowController.php         |  3 +-
 .../Workflow/EntityWorkflowRepository.php     | 29 +++++++++++++++----
 3 files changed, 32 insertions(+), 6 deletions(-)
 create mode 100644 .changes/unreleased/Feature-20251015-113430.yaml

diff --git a/.changes/unreleased/Feature-20251015-113430.yaml b/.changes/unreleased/Feature-20251015-113430.yaml
new file mode 100644
index 000000000..f89f6c1bf
--- /dev/null
+++ b/.changes/unreleased/Feature-20251015-113430.yaml
@@ -0,0 +1,6 @@
+kind: Feature
+body: Only show active workflow on the page "my tracked workflow"
+time: 2025-10-15T11:34:30.857052581+02:00
+custom:
+    Issue: "394"
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillMainBundle/Controller/WorkflowController.php b/src/Bundle/ChillMainBundle/Controller/WorkflowController.php
index 248bd286e..1a78d2884 100644
--- a/src/Bundle/ChillMainBundle/Controller/WorkflowController.php
+++ b/src/Bundle/ChillMainBundle/Controller/WorkflowController.php
@@ -264,11 +264,12 @@ class WorkflowController extends AbstractController
     {
         $this->denyAccessUnlessGranted('IS_AUTHENTICATED_REMEMBERED');
 
-        $total = $this->entityWorkflowRepository->countBySubscriber($this->security->getUser());
+        $total = $this->entityWorkflowRepository->countBySubscriber($this->security->getUser(), false);
         $paginator = $this->paginatorFactory->create($total);
 
         $workflows = $this->entityWorkflowRepository->findBySubscriber(
             $this->security->getUser(),
+            false,
             ['createdAt' => 'DESC'],
             $paginator->getItemsPerPage(),
             $paginator->getCurrentPageFirstItemNumber()
diff --git a/src/Bundle/ChillMainBundle/Repository/Workflow/EntityWorkflowRepository.php b/src/Bundle/ChillMainBundle/Repository/Workflow/EntityWorkflowRepository.php
index a3f210ed2..b8ba982d3 100644
--- a/src/Bundle/ChillMainBundle/Repository/Workflow/EntityWorkflowRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/Workflow/EntityWorkflowRepository.php
@@ -57,9 +57,15 @@ class EntityWorkflowRepository implements ObjectRepository
         return (int) $qb->getQuery()->getSingleScalarResult();
     }
 
-    public function countBySubscriber(User $user): int
+    /**
+     * @param bool|null $isFinal true to get only the entityWorkflow which is finalized, false to get the workflows that are not finalized, and null to ignore
+     *
+     * @throws \Doctrine\ORM\NoResultException
+     * @throws \Doctrine\ORM\NonUniqueResultException
+     */
+    public function countBySubscriber(User $user, ?bool $isFinal = null): int
     {
-        $qb = $this->buildQueryBySubscriber($user)->select('count(ew)');
+        $qb = $this->buildQueryBySubscriber($user, $isFinal)->select('count(ew)');
 
         return (int) $qb->getQuery()->getSingleScalarResult();
     }
@@ -182,9 +188,14 @@ class EntityWorkflowRepository implements ObjectRepository
         return $qb->getQuery()->getResult();
     }
 
-    public function findBySubscriber(User $user, ?array $orderBy = null, $limit = null, $offset = null): array
+    /**
+     * @param bool|null  $isFinal true to get only the entityWorkflow which is finalized, false to get the workflows that are not finalized, and null to ignore
+     * @param mixed|null $limit
+     * @param mixed|null $offset
+     */
+    public function findBySubscriber(User $user, ?bool $isFinal = null, ?array $orderBy = null, $limit = null, $offset = null): array
     {
-        $qb = $this->buildQueryBySubscriber($user)->select('ew');
+        $qb = $this->buildQueryBySubscriber($user, $isFinal)->select('ew');
 
         foreach ($orderBy as $key => $sort) {
             $qb->addOrderBy('ew.'.$key, $sort);
@@ -312,7 +323,7 @@ class EntityWorkflowRepository implements ObjectRepository
         return $qb;
     }
 
-    private function buildQueryBySubscriber(User $user): QueryBuilder
+    private function buildQueryBySubscriber(User $user, ?bool $isFinal): QueryBuilder
     {
         $qb = $this->repository->createQueryBuilder('ew');
 
@@ -325,6 +336,14 @@ class EntityWorkflowRepository implements ObjectRepository
 
         $qb->setParameter('user', $user);
 
+        if (null !== $isFinal) {
+            if ($isFinal) {
+                $qb->andWhere(sprintf('EXISTS (SELECT 1 FROM %s step WHERE step.isFinal = true AND ew = step.entityWorkflow)', EntityWorkflowStep::class));
+            } else {
+                $qb->andWhere(sprintf('NOT EXISTS (SELECT 1 FROM %s step WHERE step.isFinal = true AND ew = step.entityWorkflow)', EntityWorkflowStep::class));
+            }
+        }
+
         return $qb;
     }
 }

From 8ad6f397a87d5f795f8e0be4633bb86cc2fc73cc Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 15 Oct 2025 12:40:22 +0200
Subject: [PATCH 190/283] Release v4.6.0

---
 .changes/unreleased/Feature-20251007-101949.yaml |  6 ------
 .changes/unreleased/Feature-20251015-113430.yaml |  6 ------
 .changes/unreleased/Fixed-20250605-101314.yaml   |  6 ------
 .changes/unreleased/Fixed-20251003-224044.yaml   |  6 ------
 .changes/unreleased/Fixed-20251006-121315.yaml   |  6 ------
 .changes/unreleased/Fixed-20251008-113621.yaml   |  6 ------
 .changes/unreleased/Fixed-20251013-123932.yaml   |  6 ------
 .changes/unreleased/Fixed-20251013-160526.yaml   |  6 ------
 .changes/unreleased/Fixed-20251015-110202.yaml   |  6 ------
 .changes/v4.6.0.md                               | 14 ++++++++++++++
 CHANGELOG.md                                     | 15 +++++++++++++++
 11 files changed, 29 insertions(+), 54 deletions(-)
 delete mode 100644 .changes/unreleased/Feature-20251007-101949.yaml
 delete mode 100644 .changes/unreleased/Feature-20251015-113430.yaml
 delete mode 100644 .changes/unreleased/Fixed-20250605-101314.yaml
 delete mode 100644 .changes/unreleased/Fixed-20251003-224044.yaml
 delete mode 100644 .changes/unreleased/Fixed-20251006-121315.yaml
 delete mode 100644 .changes/unreleased/Fixed-20251008-113621.yaml
 delete mode 100644 .changes/unreleased/Fixed-20251013-123932.yaml
 delete mode 100644 .changes/unreleased/Fixed-20251013-160526.yaml
 delete mode 100644 .changes/unreleased/Fixed-20251015-110202.yaml
 create mode 100644 .changes/v4.6.0.md

diff --git a/.changes/unreleased/Feature-20251007-101949.yaml b/.changes/unreleased/Feature-20251007-101949.yaml
deleted file mode 100644
index a0ba84124..000000000
--- a/.changes/unreleased/Feature-20251007-101949.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Feature
-body: Create environment banner that can be activated and configured depending on the image deployed
-time: 2025-10-07T10:19:49.784462956+02:00
-custom:
-    Issue: "423"
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/Feature-20251015-113430.yaml b/.changes/unreleased/Feature-20251015-113430.yaml
deleted file mode 100644
index f89f6c1bf..000000000
--- a/.changes/unreleased/Feature-20251015-113430.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Feature
-body: Only show active workflow on the page "my tracked workflow"
-time: 2025-10-15T11:34:30.857052581+02:00
-custom:
-    Issue: "394"
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/Fixed-20250605-101314.yaml b/.changes/unreleased/Fixed-20250605-101314.yaml
deleted file mode 100644
index e01274cde..000000000
--- a/.changes/unreleased/Fixed-20250605-101314.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Fixed
-body: Fix loading of classLists in SocialIssuesAcc.vue, ensure elements are present
-time: 2025-06-05T10:13:14.351260769+02:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/Fixed-20251003-224044.yaml b/.changes/unreleased/Fixed-20251003-224044.yaml
deleted file mode 100644
index c5b3e7304..000000000
--- a/.changes/unreleased/Fixed-20251003-224044.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Fixed
-body: Fix the rendering of list of StoredObjectVersions, where there are kept version (before converting to pdf) and intermediate versions deleted
-time: 2025-10-03T22:40:44.685474863+02:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/Fixed-20251006-121315.yaml b/.changes/unreleased/Fixed-20251006-121315.yaml
deleted file mode 100644
index 714b55e99..000000000
--- a/.changes/unreleased/Fixed-20251006-121315.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Fixed
-body: 'Notification: fix editing of sent notification by removing form.addressesEmails, a field that no longer exists'
-time: 2025-10-06T12:13:15.45905994+02:00
-custom:
-    Issue: "434"
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/Fixed-20251008-113621.yaml b/.changes/unreleased/Fixed-20251008-113621.yaml
deleted file mode 100644
index 75dcd9a4a..000000000
--- a/.changes/unreleased/Fixed-20251008-113621.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Fixed
-body: Fix loading of social issues and social actions within vue component
-time: 2025-10-08T11:36:21.158819835+02:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/Fixed-20251013-123932.yaml b/.changes/unreleased/Fixed-20251013-123932.yaml
deleted file mode 100644
index 3c4b6ae74..000000000
--- a/.changes/unreleased/Fixed-20251013-123932.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Fixed
-body: Add unique condition on stored object filename, with cleaning step on existing duplicate filenames
-time: 2025-10-13T12:39:32.85885314+02:00
-custom:
-    Issue: "446"
-    SchemaChange: Drop or rename table or columns, or enforce new constraint that must be manually fixed
diff --git a/.changes/unreleased/Fixed-20251013-160526.yaml b/.changes/unreleased/Fixed-20251013-160526.yaml
deleted file mode 100644
index 86419d005..000000000
--- a/.changes/unreleased/Fixed-20251013-160526.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Fixed
-body: '[workflow] take permissions into account to delete the workflow attachment'
-time: 2025-10-13T16:05:26.088124301+02:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/Fixed-20251015-110202.yaml b/.changes/unreleased/Fixed-20251015-110202.yaml
deleted file mode 100644
index 06b9c65a7..000000000
--- a/.changes/unreleased/Fixed-20251015-110202.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Fixed
-body: Fix the execution of daily cronjob notification, when the previous last execution storage was invalid
-time: 2025-10-15T11:02:02.704326098+02:00
-custom:
-    Issue: "448"
-    SchemaChange: No schema change
diff --git a/.changes/v4.6.0.md b/.changes/v4.6.0.md
new file mode 100644
index 000000000..9c06b1e5a
--- /dev/null
+++ b/.changes/v4.6.0.md
@@ -0,0 +1,14 @@
+## v4.6.0 - 2025-10-15
+### Feature
+* ([#423](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/423)) Create environment banner that can be activated and configured depending on the image deployed   
+* ([#394](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/394)) Only show active workflow on the page "my tracked workflow"   
+### Fixed
+* Fix loading of classLists in SocialIssuesAcc.vue, ensure elements are present   
+* Fix the rendering of list of StoredObjectVersions, where there are kept version (before converting to pdf) and intermediate versions deleted   
+* ([#434](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/434)) Notification: fix editing of sent notification by removing form.addressesEmails, a field that no longer exists   
+* Fix loading of social issues and social actions within vue component   
+* ([#446](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/446)) Add unique condition on stored object filename, with cleaning step on existing duplicate filenames   
+
+  **Schema Change**: Drop or rename table or columns, or enforce new constraint that must be manually fixed
+* [workflow] take permissions into account to delete the workflow attachment   
+* ([#448](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/448)) Fix the execution of daily cronjob notification, when the previous last execution storage was invalid   
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 359b777c5..9d04f83fa 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,21 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
+## v4.6.0 - 2025-10-15
+### Feature
+* ([#423](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/423)) Create environment banner that can be activated and configured depending on the image deployed   
+* ([#394](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/394)) Only show active workflow on the page "my tracked workflow"   
+### Fixed
+* Fix loading of classLists in SocialIssuesAcc.vue, ensure elements are present   
+* Fix the rendering of list of StoredObjectVersions, where there are kept version (before converting to pdf) and intermediate versions deleted   
+* ([#434](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/434)) Notification: fix editing of sent notification by removing form.addressesEmails, a field that no longer exists   
+* Fix loading of social issues and social actions within vue component   
+* ([#446](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/446)) Add unique condition on stored object filename, with cleaning step on existing duplicate filenames   
+
+  **Schema Change**: Drop or rename table or columns, or enforce new constraint that must be manually fixed
+* [workflow] take permissions into account to delete the workflow attachment   
+* ([#448](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/448)) Fix the execution of daily cronjob notification, when the previous last execution storage was invalid   
+
 ## v4.5.1 - 2025-10-03
 ### Fixed
 * Add missing javascript dependency   

From 30bcb8554909a8fc8cb066bb1ca95d93cbcda71f Mon Sep 17 00:00:00 2001
From: Boris Waaub <boris.waaub@digitalternative.be>
Date: Wed, 15 Oct 2025 11:06:02 +0000
Subject: [PATCH 191/283] =?UTF-8?q?Cr=C3=A9er=20la=20page=20et=20la=20list?=
 =?UTF-8?q?e=20des=20tickets=20dans=20le=20dossier=20d'usager?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/Controller/TicketListController.php   |  53 ++-----
 .../src/DataFixtures/ORM/LoadMotives.php      |   2 +-
 .../src/Menu/PersonMenuBuilder.php            |  69 +++++++++
 .../src/Repository/TicketRepository.php       |  16 +++
 .../Repository/TicketRepositoryInterface.php  |   3 +
 .../src/Resources/public/types.ts             |   6 +-
 .../Addressee/AddresseeSelectorComponent.vue  |  33 +++--
 .../Motive/MotiveSelectorComponent.vue        |   5 +
 .../Person/PersonsSelectorComponent.vue       |  51 ++++---
 .../components/Ticket/TicketSelector.vue      |  13 +-
 .../Resources/public/vuejs/TicketList/App.vue |  36 +++--
 .../components/TicketFilterListComponent.vue  | 132 +++++++++---------
 .../components/TicketListComponent.vue        |   1 -
 .../public/vuejs/TicketList/index.ts          |   2 +
 .../src/Resources/views/Person/list.html.twig |  32 +++++
 .../src/Resources/views/Ticket/list.html.twig |   6 +-
 .../src/translations/messages+intl-icu.fr.yml |   4 +-
 17 files changed, 308 insertions(+), 156 deletions(-)
 create mode 100644 src/Bundle/ChillTicketBundle/src/Menu/PersonMenuBuilder.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/views/Person/list.html.twig

diff --git a/src/Bundle/ChillTicketBundle/src/Controller/TicketListController.php b/src/Bundle/ChillTicketBundle/src/Controller/TicketListController.php
index f15329689..7a25bbbc5 100644
--- a/src/Bundle/ChillTicketBundle/src/Controller/TicketListController.php
+++ b/src/Bundle/ChillTicketBundle/src/Controller/TicketListController.php
@@ -11,38 +11,22 @@ declare(strict_types=1);
 
 namespace Chill\TicketBundle\Controller;
 
-use Chill\MainBundle\Templating\Listing\FilterOrderHelper;
-use Chill\MainBundle\Templating\Listing\FilterOrderHelperFactory;
-use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Chill\TicketBundle\Entity\Motive;
-use Chill\TicketBundle\Repository\MotiveRepository;
-use Chill\TicketBundle\Repository\TicketRepositoryInterface;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use Chill\PersonBundle\Entity\Person;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
 use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Security\Core\Security;
 use Twig\Environment;
-use Twig\Error\LoaderError;
-use Twig\Error\RuntimeError;
-use Twig\Error\SyntaxError;
 
 final readonly class TicketListController
 {
     public function __construct(
         private Security $security,
-        private TicketRepositoryInterface $ticketRepository,
         private Environment $twig,
-        private FilterOrderHelperFactory $filterOrderHelperFactory,
-        // private MotiveRepository $motiveRepository,
-        // private TranslatableStringHelperInterface $translatableStringHelper,
     ) {}
 
-    /**
-     * @throws RuntimeError
-     * @throws SyntaxError
-     * @throws LoaderError
-     */
     #[Route('/{_locale}/ticket/ticket/list', name: 'chill_ticket_ticket_list')]
     public function __invoke(Request $request): Response
     {
@@ -50,35 +34,22 @@ final readonly class TicketListController
             throw new AccessDeniedHttpException('only user can access this page');
         }
 
-        $filter = $this->buildFilter();
-
-        $tickets = $this->ticketRepository->findAllOrdered();
-
         return new Response(
-            $this->twig->render('@ChillTicket/Ticket/list.html.twig', [
-                'tickets' => $tickets,
-                'filter' => $filter,
-            ])
+            $this->twig->render('@ChillTicket/Ticket/list.html.twig')
         );
     }
 
-    private function buildFilter(): FilterOrderHelper
+    #[Route('/{_locale}/ticket/by-person/{id}/list', name: 'chill_person_ticket_list')]
+    public function listByPerson(Request $request, Person $person): Response
     {
-        // $motives = $this->motiveRepository->findAll();
+        if (!$this->security->isGranted(PersonVoter::SEE, $person)) {
+            throw new AccessDeniedHttpException('you are not allowed to see this person');
+        }
 
-        return $this->filterOrderHelperFactory
-            ->create(self::class)
-            ->addSingleCheckbox('to_me', 'chill_ticket.list.filter.to_me')
-            ->addSingleCheckbox('in_alert', 'chill_ticket.list.filter.in_alert')
-            ->addDateRange('created_between', 'chill_ticket.list.filter.created_between')
-            /*
-            ->addEntityChoice('by_motive', 'chill_ticket.list.filter.by_motive', Motive::class, $motives, [
-                'choice_label' => fn (Motive $motive) => $this->translatableStringHelper->localize($motive->getLabel()),
-                'expanded' => true,
-                'multiple' => true,
-                'attr' => ['class' => 'select2'],
+        return new Response(
+            $this->twig->render('@ChillTicket/Person/list.html.twig', [
+                'person' => $person,
             ])
-            */
-            ->build();
+        );
     }
 }
diff --git a/src/Bundle/ChillTicketBundle/src/DataFixtures/ORM/LoadMotives.php b/src/Bundle/ChillTicketBundle/src/DataFixtures/ORM/LoadMotives.php
index 044949d1e..d5191898e 100644
--- a/src/Bundle/ChillTicketBundle/src/DataFixtures/ORM/LoadMotives.php
+++ b/src/Bundle/ChillTicketBundle/src/DataFixtures/ORM/LoadMotives.php
@@ -46,7 +46,7 @@ final class LoadMotives extends Fixture implements FixtureGroupInterface
                 continue;
             }
 
-            $labels = explode(' > ', $data[0]);
+            $labels = explode(' > ', (string) $data[0]);
             $parent = null;
 
             while (count($labels) > 0) {
diff --git a/src/Bundle/ChillTicketBundle/src/Menu/PersonMenuBuilder.php b/src/Bundle/ChillTicketBundle/src/Menu/PersonMenuBuilder.php
new file mode 100644
index 000000000..ce780f036
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Menu/PersonMenuBuilder.php
@@ -0,0 +1,69 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Menu;
+
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use Chill\TicketBundle\Repository\TicketRepositoryInterface;
+use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Knp\Menu\MenuItem;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+/**
+ * Add menu entrie to person menu.
+ *
+ * Menu entries added :
+ *
+ * - person details ;
+ * - accompanying period (if `visible`)
+ *
+ * @implements LocalMenuBuilderInterface<array{person: Person}>
+ */
+class PersonMenuBuilder implements LocalMenuBuilderInterface
+{
+    public function __construct(
+        private readonly AuthorizationCheckerInterface $authorizationChecker,
+        private readonly TranslatorInterface $translator,
+        private readonly TicketRepositoryInterface $ticketRepository,
+    ) {}
+
+    /**
+     * @param array{person: Person} $parameters
+     *
+     * @return void
+     */
+    public function buildMenu($menuId, MenuItem $menu, array $parameters)
+    {
+        /** @var Person $person */
+        $person = $parameters['person'];
+
+        if ($this->authorizationChecker->isGranted(PersonVoter::SEE, $person)) {
+            $menu->addChild($this->translator->trans('chill_ticket.list.title_menu'), [
+                'route' => 'chill_person_ticket_list',
+                'routeParameters' => [
+                    'id' => $person->getId(),
+                ],
+            ])
+                ->setExtras([
+                    'order' => 150,
+                    'counter' => 0 < ($nbTickets = $this->ticketRepository->countOpenedByPerson($person))
+                        ? $nbTickets : null,
+                ]);
+        }
+    }
+
+    public static function getMenuIds(): array
+    {
+        return ['person'];
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Repository/TicketRepository.php b/src/Bundle/ChillTicketBundle/src/Repository/TicketRepository.php
index d68598510..d519a77cb 100644
--- a/src/Bundle/ChillTicketBundle/src/Repository/TicketRepository.php
+++ b/src/Bundle/ChillTicketBundle/src/Repository/TicketRepository.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\TicketBundle\Repository;
 
+use Chill\PersonBundle\Entity\Person;
 use Chill\TicketBundle\Entity\Ticket;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\Persistence\ObjectRepository;
@@ -61,4 +62,19 @@ final readonly class TicketRepository implements TicketRepositoryInterface
     {
         return $this->repository->findOneBy(['externalRef' => $extId]);
     }
+
+    /**
+     * Count tickets associated with a person where endDate is null.
+     */
+    public function countOpenedByPerson(Person $person): int
+    {
+        return (int) $this->objectManager->createQuery(
+            'SELECT COUNT(DISTINCT t.id) FROM '.$this->getClassName().' t
+             JOIN t.personHistories ph
+             WHERE ph.person = :person
+             AND ph.endDate IS NULL'
+        )
+            ->setParameter('person', $person)
+            ->getSingleScalarResult();
+    }
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Repository/TicketRepositoryInterface.php b/src/Bundle/ChillTicketBundle/src/Repository/TicketRepositoryInterface.php
index 9dc713e72..c1e4cb188 100644
--- a/src/Bundle/ChillTicketBundle/src/Repository/TicketRepositoryInterface.php
+++ b/src/Bundle/ChillTicketBundle/src/Repository/TicketRepositoryInterface.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\TicketBundle\Repository;
 
 use Chill\TicketBundle\Entity\Ticket;
+use Chill\PersonBundle\Entity\Person;
 use Doctrine\Persistence\ObjectRepository;
 
 /**
@@ -25,4 +26,6 @@ interface TicketRepositoryInterface extends ObjectRepository
      * @return list<Ticket>
      */
     public function findAllOrdered(): array;
+
+    public function countOpenedByPerson(Person $person): int;
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
index 1c914570e..601f299ff 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
@@ -177,8 +177,12 @@ export interface Ticket extends BaseTicket<"ticket_ticket:extended"> {
 }
 
 export interface TicketFilters {
+  byPerson: Person[];
+  byCreator: User[];
+  byAddressee: UserGroupOrUser[];
   byCurrentState: TicketState[];
   byCurrentStateEmergency: TicketEmergencyState[];
+  byMotives: Motive[];
   byCreatedAfter: string;
   byCreatedBefore: string;
   byResponseTimeExceeded: boolean;
@@ -198,7 +202,7 @@ export interface TicketFilterParams {
   byCreatedBefore?: string;
   byResponseTimeExceeded?: string;
   byAddresseeToMe?: boolean;
-  byTicketId?: number;
+  byTicketId?: number | null;
 }
 
 export interface TicketInitForm {
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Addressee/AddresseeSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Addressee/AddresseeSelectorComponent.vue
index 02040b008..df291989a 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Addressee/AddresseeSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Addressee/AddresseeSelectorComponent.vue
@@ -1,16 +1,23 @@
 <template>
-  <pick-entity
-    uniqid="ticket-addressee-selector"
-    :types="['user', 'user_group']"
-    :picked="selectedEntities"
-    :suggested="suggestedValues"
-    :multiple="true"
-    :removable-if-set="true"
-    :display-picked="true"
-    :label="label"
-    @add-new-entity="addNewEntity"
-    @remove-entity="removeEntity"
-  />
+  <div
+    :class="{
+      'opacity-50': disabled,
+    }"
+    :style="disabled ? 'pointer-events: none;' : ''"
+  >
+    <pick-entity
+      uniqid="ticket-addressee-selector"
+      :types="['user', 'user_group']"
+      :picked="selectedEntities"
+      :suggested="suggestedValues"
+      :multiple="true"
+      :removable-if-set="true"
+      :display-picked="true"
+      :label="label"
+      @add-new-entity="addNewEntity"
+      @remove-entity="removeEntity"
+    />
+  </div>
 </template>
 
 <script lang="ts" setup>
@@ -33,9 +40,11 @@ const props = withDefaults(
     modelValue: Entities[];
     suggested: Entities[];
     label?: string;
+    disabled?: boolean;
   }>(),
   {
     label: trans(CHILL_TICKET_TICKET_ADD_ADDRESSEE_USER_LABEL),
+    disabled: false,
   },
 );
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveSelectorComponent.vue
index de094743a..447bbba86 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveSelectorComponent.vue
@@ -16,6 +16,7 @@
           v-model="motive"
           class="form-control"
           @remove="(value: Motive) => $emit('remove', value)"
+          :disabled="disabled"
         >
           <template
             #option="{
@@ -95,6 +96,10 @@ const props = defineProps({
     type: Boolean,
     default: false,
   },
+  disabled: {
+    type: Boolean,
+    default: false,
+  },
 });
 const store = useStore();
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Person/PersonsSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Person/PersonsSelectorComponent.vue
index 72096b2a2..f02864476 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Person/PersonsSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Person/PersonsSelectorComponent.vue
@@ -1,16 +1,23 @@
 <template>
-  <pick-entity
-    uniqid="ticket-person-selector"
-    :types="types"
-    :picked="pickedEntities"
-    :suggested="suggestedValues"
-    :multiple="multiple"
-    :removable-if-set="true"
-    :display-picked="true"
-    :label="label"
-    @add-new-entity="addNewEntity"
-    @remove-entity="removeEntity"
-  />
+  <div
+    :class="{
+      'opacity-50': disabled,
+    }"
+    :style="disabled ? 'pointer-events: none;' : ''"
+  >
+    <pick-entity
+      uniqid="ticket-person-selector"
+      :types="types"
+      :picked="pickedEntities"
+      :suggested="suggestedValues"
+      :multiple="multiple"
+      :removable-if-set="true"
+      :display-picked="true"
+      :label="label"
+      @add-new-entity="addNewEntity"
+      @remove-entity="removeEntity"
+    />
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -22,13 +29,19 @@ import PickEntity from "ChillMainAssets/vuejs/PickEntity/PickEntity.vue";
 // Types
 import { Entities, EntitiesOrMe, EntityType } from "ChillPersonAssets/types";
 
-const props = defineProps<{
-  modelValue: EntitiesOrMe[] | EntitiesOrMe | null;
-  suggested: Entities[];
-  multiple: boolean;
-  types: EntityType[];
-  label: string;
-}>();
+const props = withDefaults(
+  defineProps<{
+    modelValue: EntitiesOrMe[] | EntitiesOrMe | null;
+    suggested: Entities[];
+    multiple: boolean;
+    types: EntityType[];
+    label: string;
+    disabled?: boolean;
+  }>(),
+  {
+    disabled: false,
+  },
+);
 
 const emit = defineEmits<{
   "update:modelValue": [value: EntitiesOrMe[] | EntitiesOrMe | null];
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Ticket/TicketSelector.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Ticket/TicketSelector.vue
index eeafbae6c..b83d0b7e2 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Ticket/TicketSelector.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Ticket/TicketSelector.vue
@@ -5,6 +5,7 @@
       type="number"
       class="form-control"
       :placeholder="trans(CHILL_TICKET_LIST_FILTER_TICKET_ID)"
+      :disabled="disabled"
       @input="
         ticketId = isNaN(Number(($event.target as HTMLInputElement).value))
           ? null
@@ -26,9 +27,15 @@
 import { ref, watch } from "vue";
 // Translation
 import { trans, CHILL_TICKET_LIST_FILTER_TICKET_ID } from "translator";
-const props = defineProps<{
-  modelValue: number | null;
-}>();
+const props = withDefaults(
+  defineProps<{
+    modelValue: number | null;
+    disabled?: boolean;
+  }>(),
+  {
+    disabled: false,
+  },
+);
 
 const ticketId = ref<number | null>(props.modelValue);
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/App.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/App.vue
index de34d0d28..df27fbde5 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/App.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/App.vue
@@ -1,14 +1,12 @@
 <template>
   <div class="container-fluid">
-    <h1 class="text-primary">
-      {{ title }}
-    </h1>
     <div class="row">
       <div class="col-12 mb-4">
         <ticket-filter-list-component
           :resultCount="resultCount"
           :available-persons="availablePersons"
           :available-motives="availableMotives"
+          :ticket-filter-params="ticketFilterParams"
           @filters-changed="handleFiltersChanged"
         />
       </div>
@@ -35,7 +33,6 @@
         <ticket-list-component
           v-else
           :tickets="ticketList"
-          :title="title"
           :hasMoreTickets="pagination.next !== null"
           @fetchNextPage="fetchNextPage"
         />
@@ -61,8 +58,10 @@ import { Pagination } from "ChillMainAssets/lib/api/apiMethods";
 import { trans, CHILL_TICKET_LIST_LOADING_TICKET } from "translator";
 
 const store = useStore();
+const ticketFilterParams = window.ticketFilterParams
+  ? window.ticketFilterParams
+  : null;
 
-const title = window.title;
 const isLoading = ref(false);
 const ticketList = computed(
   () => store.getters.getTicketList as TicketSimple[],
@@ -90,12 +89,27 @@ const fetchNextPage = async () => {
 onMounted(async () => {
   isLoading.value = true;
   const filters: TicketFilterParams = {
-    byCurrentState: ["open"],
-    byCurrentStateEmergency: [],
-    byCreatedAfter: "",
-    byCreatedBefore: "",
-    byResponseTimeExceeded: "",
-    byAddresseeToMe: false,
+    byPerson: ticketFilterParams?.byPerson
+      ? ticketFilterParams.byPerson.map((person) => person.id)
+      : [],
+    byCreator: ticketFilterParams?.byCreator
+      ? ticketFilterParams.byCreator.map((creator) => creator.id)
+      : [],
+    byAddressee: ticketFilterParams?.byAddressee
+      ? ticketFilterParams.byAddressee.map((addressee) => addressee.id)
+      : [],
+    byCurrentState: ticketFilterParams?.byCurrentState ?? ["open"],
+    byCurrentStateEmergency: ticketFilterParams?.byCurrentStateEmergency ?? [],
+    byMotives: ticketFilterParams?.byMotives
+      ? ticketFilterParams.byMotives.map((motive) => motive.id)
+      : [],
+    byCreatedAfter: ticketFilterParams?.byCreatedAfter ?? "",
+    byCreatedBefore: ticketFilterParams?.byCreatedBefore ?? "",
+    byResponseTimeExceeded: ticketFilterParams?.byResponseTimeExceeded
+      ? "true"
+      : "",
+    byAddresseeToMe: ticketFilterParams?.byAddresseeToMe ?? false,
+    byTicketId: ticketFilterParams?.byTicketId ?? null,
   };
   try {
     await store.dispatch("fetchTicketList", filters);
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketFilterListComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketFilterListComponent.vue
index 510ffe3a2..7bbe08d3c 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketFilterListComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketFilterListComponent.vue
@@ -14,12 +14,13 @@
               trans(CHILL_TICKET_LIST_FILTER_PERSONS_CONCERNED)
             }}</label>
             <persons-selector
-              v-model="selectedPersons"
+              v-model="filters.byPerson"
               :suggested="availablePersons"
               :multiple="true"
               :types="['person']"
               id="personSelector"
               :label="trans(CHILL_TICKET_LIST_FILTER_BY_PERSON)"
+              :disabled="ticketFilterParams?.byPerson ? true : false"
             />
           </div>
 
@@ -28,12 +29,13 @@
               trans(CHILL_TICKET_LIST_FILTER_CREATORS)
             }}</label>
             <persons-selector
-              v-model="selectedCreator"
+              v-model="filters.byCreator"
               :suggested="[]"
               :multiple="true"
               :types="['user']"
               id="userSelector"
               :label="trans(CHILL_TICKET_LIST_FILTER_BY_CREATOR)"
+              :disabled="ticketFilterParams?.byCreator ? true : false"
             />
           </div>
 
@@ -42,10 +44,11 @@
               trans(CHILL_TICKET_LIST_FILTER_ADDRESSEES)
             }}</label>
             <addressee-selector-component
-              v-model="selectedAddressees"
+              v-model="filters.byAddressee"
               :suggested="[]"
               :label="trans(CHILL_TICKET_LIST_FILTER_BY_ADDRESSEES)"
               id="addresseeSelector"
+              :disabled="ticketFilterParams?.byAddressee ? true : false"
             />
           </div>
           <div class="col-md-6 mb-3">
@@ -60,12 +63,13 @@
                 :allow-parent-selection="true"
                 @remove="(motive) => removeMotive(motive)"
                 id="motiveSelector"
+                :disabled="ticketFilterParams?.byMotives ? true : false"
               />
 
               <div class="mb-2" style="min-height: 2em">
                 <div class="d-flex flex-wrap gap-2">
                   <span
-                    v-for="motive in selectedMotives"
+                    v-for="motive in filters.byMotives"
                     :key="motive.id"
                     class="badge bg-secondary d-flex align-items-center gap-1"
                   >
@@ -75,6 +79,7 @@
                       class="btn-close btn-close-white"
                       :aria-label="trans(CHILL_TICKET_LIST_FILTER_REMOVE)"
                       @click="removeMotive(motive)"
+                      :disabled="ticketFilterParams?.byMotives ? true : false"
                     ></button>
                   </span>
                 </div>
@@ -96,6 +101,7 @@
                   }"
                   @update:model-value="handleStateToggle"
                   id="currentState"
+                  :disabled="ticketFilterParams?.byCurrentState ? true : false"
                 />
               </div>
 
@@ -114,6 +120,9 @@
                   }"
                   @update:model-value="handleEmergencyToggle"
                   id="emergency"
+                  :disabled="
+                    ticketFilterParams?.byCurrentStateEmergency ? true : false
+                  "
                 />
               </div>
             </div>
@@ -129,6 +138,7 @@
                 class="form-check-input"
                 type="checkbox"
                 id="stateMe"
+                :disabled="ticketFilterParams?.byAddresseeToMe ? true : false"
               />
               <label class="form-check-label" for="stateMe">
                 {{ trans(CHILL_TICKET_LIST_FILTER_TO_ME) }}
@@ -142,6 +152,9 @@
                 v-model="filters.byResponseTimeExceeded"
                 @change="handleResponseTimeExceededChange"
                 id="responseTimeExceeded"
+                :disabled="
+                  ticketFilterParams?.byResponseTimeExceeded ? true : false
+                "
               />
               <label class="form-check-label" for="responseTimeExceeded">
                 {{ trans(CHILL_TICKET_LIST_FILTER_RESPONSE_TIME_EXCEEDED) }}
@@ -157,7 +170,11 @@
             <label class="form-label pe-2" for="ticketSelector">
               {{ trans(CHILL_TICKET_LIST_FILTER_BY_TICKET_ID) }}
             </label>
-            <ticket-selector v-model="filters.byTicketId" id="ticketSelector" />
+            <ticket-selector
+              v-model="filters.byTicketId"
+              id="ticketSelector"
+              :disabled="ticketFilterParams?.byTicketId ? true : false"
+            />
           </div>
         </div>
 
@@ -170,7 +187,12 @@
               default-value-time="00:00"
               :model-value-date="filters.byCreatedAfter"
               :model-value-time="byCreatedAfterTime"
-              :disabled="filters.byResponseTimeExceeded"
+              :disabled="
+                filters.byResponseTimeExceeded ||
+                ticketFilterParams?.byCreatedAfter
+                  ? true
+                  : false
+              "
               @update:modelValueDate="filters.byCreatedAfter = $event"
               @update:modelValueTime="byCreatedAfterTime = $event"
             />
@@ -183,7 +205,12 @@
               default-value-time="23:59"
               :model-value-date="filters.byCreatedBefore"
               :model-value-time="byCreatedBeforeTime"
-              :disabled="filters.byResponseTimeExceeded"
+              :disabled="
+                filters.byResponseTimeExceeded ||
+                ticketFilterParams?.byCreatedBefore
+                  ? true
+                  : false
+              "
               @update:modelValueDate="filters.byCreatedBefore = $event"
               @update:modelValueTime="byCreatedBeforeTime = $event"
             />
@@ -227,7 +254,6 @@ import {
   type TicketFilterParams,
   type TicketFilters,
 } from "../../../types";
-import { User, UserGroupOrUser } from "ChillMainAssets/types";
 
 // Translation
 import {
@@ -269,6 +295,7 @@ const props = defineProps<{
   availablePersons?: Person[];
   availableMotives: Motive[];
   resultCount: number;
+  ticketFilterParams: TicketFilters | null;
 }>();
 
 // Emits
@@ -276,74 +303,66 @@ const emit = defineEmits<{
   "filters-changed": [filters: TicketFilterParams];
 }>();
 
+const filtersInitValues: TicketFilters = {
+  byPerson: props.ticketFilterParams?.byPerson ?? [],
+  byCreator: props.ticketFilterParams?.byCreator ?? [],
+  byAddressee: props.ticketFilterParams?.byAddressee ?? [],
+  byCurrentState: props.ticketFilterParams?.byCurrentState ?? ["open"],
+  byCurrentStateEmergency:
+    props.ticketFilterParams?.byCurrentStateEmergency ?? [],
+  byMotives: props.ticketFilterParams?.byMotives ?? [],
+  byCreatedAfter: props.ticketFilterParams?.byCreatedAfter ?? "",
+  byCreatedBefore: props.ticketFilterParams?.byCreatedBefore ?? "",
+  byResponseTimeExceeded:
+    props.ticketFilterParams?.byResponseTimeExceeded ?? false,
+  byAddresseeToMe: props.ticketFilterParams?.byAddresseeToMe ?? false,
+  byTicketId: props.ticketFilterParams?.byTicketId ?? null,
+};
+
 // État réactif
-const filters = ref<TicketFilters>({
-  byCurrentState: ["open"],
-  byCurrentStateEmergency: [],
-  byCreatedAfter: "",
-  byCreatedBefore: "",
-  byResponseTimeExceeded: false,
-  byAddresseeToMe: false,
-  byTicketId: null,
-});
+const filters = ref<TicketFilters>({ ...filtersInitValues });
 
 const byCreatedAfterTime = ref("00:00");
 const byCreatedBeforeTime = ref("23:59");
+const isClosedToggled = ref(false);
+const isEmergencyToggled = ref(false);
 
-// Sélection des personnes
-const selectedPersons = ref<Person[]>([]);
 const availablePersons = ref<Person[]>(props.availablePersons || []);
-
-// Sélection des utilisateur assigné
-const selectedAddressees = ref<UserGroupOrUser[]>([]);
-
-// Séléction des créateurs
-const selectedCreator = ref<User[]>([]);
-
-// Sélection des motifs
 const selectedMotive = ref<Motive | null>();
-const selectedMotives = ref<Motive[]>([]);
 
-// Watchers pour les sélecteurs
 watch(selectedMotive, (newMotive) => {
-  if (newMotive && !selectedMotives.value.find((m) => m.id === newMotive.id)) {
-    selectedMotives.value.push(newMotive);
+  if (
+    newMotive &&
+    !filters.value.byMotives.find((m) => m.id === newMotive.id)
+  ) {
+    filters.value.byMotives = [...filters.value.byMotives, newMotive];
   }
 });
 
-// Computed pour les IDs des personnes sélectionnées
 const selectedPersonIds = computed(() =>
-  selectedPersons.value.map((person) => person.id),
+  filters.value.byPerson.map((person) => person.id),
 );
 
-// Computed pour les IDs des utilisateur ou groupes sélectionnées
 const selectedUserAddresseesIds = computed(() =>
-  selectedAddressees.value
+  filters.value.byAddressee
     .filter((addressee) => addressee.type === "user")
     .map((addressee) => addressee.id),
 );
 
 const selectedGroupAddresseesIds = computed(() =>
-  selectedAddressees.value
+  filters.value.byAddressee
     .filter((addressee) => addressee.type === "user_group")
     .map((addressee) => addressee.id),
 );
 
-// Computed pour les IDs des créateurs
 const selectedCreatorIds = computed(() =>
-  selectedCreator.value.map((creator) => creator.id),
+  filters.value.byCreator.map((creator) => creator.id),
 );
 
-// Computed pour les IDs des motifs sélectionnés
 const selectedMotiveIds = computed(() =>
-  selectedMotives.value.map((motive) => motive.id),
+  filters.value.byMotives.map((motive) => motive.id),
 );
 
-// Nouveaux états pour les toggles
-const isClosedToggled = ref(false);
-const isEmergencyToggled = ref(false);
-
-// Méthodes pour gérer les toggles
 const handleStateToggle = (value: boolean) => {
   if (value) {
     filters.value.byCurrentState = ["closed"];
@@ -379,12 +398,9 @@ const getMotiveDisplayName = (motive: Motive): string => {
 };
 
 const removeMotive = (motiveToRemove: Motive): void => {
-  const index = selectedMotives.value.findIndex(
-    (m) => m.id === motiveToRemove.id,
+  filters.value.byMotives = filters.value.byMotives.filter(
+    (m) => m.id !== motiveToRemove.id,
   );
-  if (index !== -1) {
-    selectedMotives.value.splice(index, 1);
-  }
   if (selectedMotive.value && motiveToRemove.id == selectedMotive.value.id) {
     selectedMotive.value = null;
   }
@@ -447,22 +463,12 @@ const applyFilters = (): void => {
 };
 
 const resetFilters = (): void => {
-  filters.value = {
-    byCurrentState: ["open"],
-    byCurrentStateEmergency: [],
-    byCreatedAfter: "",
-    byCreatedBefore: "",
-    byResponseTimeExceeded: false,
-    byAddresseeToMe: false,
-    byTicketId: null,
-  };
-  selectedPersons.value = [];
-  selectedCreator.value = [];
-  selectedAddressees.value = [];
-  selectedMotives.value = [];
+  filters.value = { ...filtersInitValues };
   selectedMotive.value = null;
   isClosedToggled.value = false;
   isEmergencyToggled.value = false;
+  byCreatedAfterTime.value = "00:00";
+  byCreatedBeforeTime.value = "23:59";
   applyFilters();
 };
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListComponent.vue
index a0c3d8da2..bbd9a63bd 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListComponent.vue
@@ -97,7 +97,6 @@ import { useStore } from "vuex";
 defineProps<{
   tickets: TicketSimple[];
   hasMoreTickets: boolean;
-  title: string;
 }>();
 
 const emit = defineEmits<{
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/index.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/index.ts
index b59961d66..10aa5a051 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/index.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/index.ts
@@ -3,10 +3,12 @@ import { createApp } from "vue";
 import { store } from "../TicketApp/store";
 import VueToast from "vue-toast-notification";
 import "vue-toast-notification/dist/theme-sugar.css";
+import { TicketFilters } from "../../types";
 
 declare global {
   interface Window {
     title: string;
+    ticketFilterParams: TicketFilters;
   }
 }
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/views/Person/list.html.twig b/src/Bundle/ChillTicketBundle/src/Resources/views/Person/list.html.twig
new file mode 100644
index 000000000..76bd14595
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/views/Person/list.html.twig
@@ -0,0 +1,32 @@
+{% extends "@ChillPerson/Person/layout.html.twig"  %}
+{% set ticketTitle = 'chill_ticket.list.title_with_name'|trans({'%name%': person|chill_entity_render_string }) %}
+{% set activeRouteKey = 'chill_person_ticket_list' %}
+{% set ticketFilterParams = {
+    'byPerson': [person]
+} %}
+{% block title %}{{ ticketTitle }}{% endblock %}
+
+{% block css %}
+    {{ parent() }}
+    {{ encore_entry_link_tags('vue_ticket_list') }}
+{% endblock %}
+
+{% block js %}
+    {{ parent() }}
+    <script type="text/javascript">
+        window.ticketFilterParams = {{ ticketFilterParams|serialize|raw }};
+    </script>
+    {{ encore_entry_script_tags('vue_ticket_list') }}
+{% endblock %}
+
+{% block content %}
+    <h1>{{ ticketTitle }}</h1>
+
+    <div id="ticketList"></div>
+
+    <ul class="record_actions sticky-form-buttons">
+        <li>
+            <a href="{{ chill_path_add_return_path('chill_ticket_createticket__invoke') }}" class="btn btn-create">{{ 'Create'|trans }}</a>
+        </li>
+    </ul>
+{% endblock %}
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/list.html.twig b/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/list.html.twig
index 3616ab207..b1597535a 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/list.html.twig
+++ b/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/list.html.twig
@@ -1,4 +1,6 @@
 {% extends '@ChillMain/layout.html.twig' %}
+{% set ticketTitle = 'chill_ticket.list.title'|trans %}
+{% block title %}{{ ticketTitle }}{% endblock %}
 
 {% block css %}
     {{ parent() }}
@@ -7,13 +9,11 @@
 
 {% block js %}
     {{ parent() }}
-    <script type="text/javascript">
-        window.title = "{{ 'chill_ticket.list.title'|trans|escape('js') }}";
-    </script>
     {{ encore_entry_script_tags('vue_ticket_list') }}
 {% endblock %}
 
 {% block content %}
+    <h1>{{ ticketTitle }}</h1>
     <div id="ticketList"></div>
 
     <ul class="record_actions sticky-form-buttons">
diff --git a/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml b/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
index b47eaa035..94d0399c1 100644
--- a/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
+++ b/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
@@ -1,7 +1,9 @@
 restore: Restaurer
 chill_ticket:
   list:
-    title: Tickets
+    title: "Tickets"
+    title_with_name: "{name, select, null {Tickets} undefined {Tickets} other {Tickets de {name}}}"
+    title_menu: "Tickets de l'usager"
     title_previous_tickets: "{name, select, other {Précédent ticket de {name}} undefined {Précédent ticket}}"
     no_tickets: "Aucun ticket"
     loading_ticket: "Chargement des tickets..."

From 98902bdeb8bce9e77bfc23689302eded7363ca4c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 16 Oct 2025 12:34:12 +0000
Subject: [PATCH 192/283] Add Events when a ticket is updated, and trigger
 asynchronously post update events

---
 config/packages/messenger.yaml                |  1 +
 .../ChangeEmergencyStateCommandHandler.php    | 16 +++-
 .../Handler/ReplaceMotiveCommandHandler.php   | 13 +++
 .../Handler/SetPersonsCommandHandler.php      | 12 +++
 .../src/Event/EmergencyStatusUpdateEvent.php  | 26 ++++++
 ...eneratePostUpdateTicketEventSubscriber.php | 52 +++++++++++
 .../src/Event/MotiveUpdateEvent.php           | 31 +++++++
 .../src/Event/PersonsUpdateEvent.php          | 38 ++++++++
 .../src/Event/PostTicketUpdateEvent.php       | 29 ++++++
 .../src/Event/TicketUpdateEvent.php           | 22 +++++
 .../src/Event/TicketUpdateKindEnum.php        | 23 +++++
 .../PostTicketUpdateMessageHandler.php        | 37 ++++++++
 .../src/Messenger/PostTicketUpdateMessage.php | 27 ++++++
 .../src/config/services.yaml                  |  6 ++
 ...ChangeEmergencyStateCommandHandlerTest.php | 33 ++++++-
 .../ReplaceMotiveCommandHandlerTest.php       | 53 +++++++++--
 .../Handler/SetPersonsCommandHandlerTest.php  | 52 +++++++++--
 ...atePostUpdateTicketEventSubscriberTest.php | 58 ++++++++++++
 .../PostTicketUpdateMessageHandlerTest.php    | 92 +++++++++++++++++++
 19 files changed, 604 insertions(+), 17 deletions(-)
 create mode 100644 src/Bundle/ChillTicketBundle/src/Event/EmergencyStatusUpdateEvent.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Event/EventSubscriber/GeneratePostUpdateTicketEventSubscriber.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Event/MotiveUpdateEvent.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Event/PersonsUpdateEvent.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Event/PostTicketUpdateEvent.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Event/TicketUpdateEvent.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Event/TicketUpdateKindEnum.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Messenger/Handler/PostTicketUpdateMessageHandler.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Messenger/PostTicketUpdateMessage.php
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Event/EventSubscriber/GeneratePostUpdateTicketEventSubscriberTest.php
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Messenger/Handler/PostTicketUpdateMessageHandlerTest.php

diff --git a/config/packages/messenger.yaml b/config/packages/messenger.yaml
index 4274aeec6..45802f50b 100644
--- a/config/packages/messenger.yaml
+++ b/config/packages/messenger.yaml
@@ -66,6 +66,7 @@ framework:
             'Chill\MainBundle\Export\Messenger\ExportRequestGenerationMessage': priority
             'Chill\MainBundle\Export\Messenger\RemoveExportGenerationMessage': async
             'Chill\MainBundle\Notification\Email\NotificationEmailMessages\ScheduleDailyNotificationDigestMessage': async
+            'Chill\TicketBundle\Messenger\PostTicketUpdateMessage': async
             # end of routes added by chill-bundles recipes
             # Route your messages to the transports
             # 'App\Message\YourMessage': async
diff --git a/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/ChangeEmergencyStateCommandHandler.php b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/ChangeEmergencyStateCommandHandler.php
index 2a5440916..0ff810d07 100644
--- a/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/ChangeEmergencyStateCommandHandler.php
+++ b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/ChangeEmergencyStateCommandHandler.php
@@ -14,14 +14,20 @@ namespace Chill\TicketBundle\Action\Ticket\Handler;
 use Chill\TicketBundle\Action\Ticket\ChangeEmergencyStateCommand;
 use Chill\TicketBundle\Entity\EmergencyStatusHistory;
 use Chill\TicketBundle\Entity\Ticket;
+use Chill\TicketBundle\Event\EmergencyStatusUpdateEvent;
+use Chill\TicketBundle\Event\TicketUpdateEvent;
 use Symfony\Component\Clock\ClockInterface;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
 /**
  * Handler for changing the emergency status of a ticket.
  */
 class ChangeEmergencyStateCommandHandler
 {
-    public function __construct(private readonly ClockInterface $clock) {}
+    public function __construct(
+        private readonly ClockInterface $clock,
+        private readonly EventDispatcherInterface $eventDispatcher,
+    ) {}
 
     public function __invoke(Ticket $ticket, ChangeEmergencyStateCommand $command): Ticket
     {
@@ -30,6 +36,8 @@ class ChangeEmergencyStateCommandHandler
             return $ticket;
         }
 
+        $previous = $ticket->getEmergencyStatus();
+
         // End the current emergency status history (if any)
         foreach ($ticket->getEmergencyStatusHistories() as $emergencyStatusHistory) {
             if (null === $emergencyStatusHistory->getEndDate()) {
@@ -44,6 +52,12 @@ class ChangeEmergencyStateCommandHandler
             $this->clock->now(),
         );
 
+        // Dispatch event about the toggle
+        if (null !== $previous) {
+            $event = new EmergencyStatusUpdateEvent($ticket, $previous, $command->newEmergencyStatus);
+            $this->eventDispatcher->dispatch($event, TicketUpdateEvent::class);
+        }
+
         return $ticket;
     }
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/ReplaceMotiveCommandHandler.php b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/ReplaceMotiveCommandHandler.php
index a39186efe..985031156 100644
--- a/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/ReplaceMotiveCommandHandler.php
+++ b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/ReplaceMotiveCommandHandler.php
@@ -15,8 +15,11 @@ use Chill\TicketBundle\Action\Ticket\ChangeEmergencyStateCommand;
 use Chill\TicketBundle\Action\Ticket\ReplaceMotiveCommand;
 use Chill\TicketBundle\Entity\MotiveHistory;
 use Chill\TicketBundle\Entity\Ticket;
+use Chill\TicketBundle\Event\MotiveUpdateEvent;
+use Chill\TicketBundle\Event\TicketUpdateEvent;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Clock\ClockInterface;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
 class ReplaceMotiveCommandHandler
 {
@@ -24,6 +27,7 @@ class ReplaceMotiveCommandHandler
         private readonly ClockInterface $clock,
         private readonly EntityManagerInterface $entityManager,
         private readonly ChangeEmergencyStateCommandHandler $changeEmergencyStateCommandHandler,
+        private readonly EventDispatcherInterface $eventDispatcher,
     ) {}
 
     public function handle(Ticket $ticket, ReplaceMotiveCommand $command): void
@@ -32,6 +36,8 @@ class ReplaceMotiveCommandHandler
             throw new \InvalidArgumentException('The new motive cannot be null');
         }
 
+        $event = new MotiveUpdateEvent($ticket);
+
         // will add if there are no existing motive
         $readyToAdd = 0 === count($ticket->getMotiveHistories());
 
@@ -45,6 +51,8 @@ class ReplaceMotiveCommandHandler
                 continue;
             }
 
+            // collect previous active motives before closing
+            $event->previousMotive = $history->getMotive();
             $history->setEndDate($this->clock->now());
             $readyToAdd = true;
         }
@@ -52,6 +60,7 @@ class ReplaceMotiveCommandHandler
         if ($readyToAdd) {
             $history = new MotiveHistory($command->motive, $ticket, $this->clock->now());
             $this->entityManager->persist($history);
+            $event->newMotive = $command->motive;
 
             // Check if the motive has makeTicketEmergency set and update the ticket's emergency status if needed
             if ($command->motive->isMakeTicketEmergency()) {
@@ -59,5 +68,9 @@ class ReplaceMotiveCommandHandler
                 ($this->changeEmergencyStateCommandHandler)($ticket, $changeEmergencyCommand);
             }
         }
+
+        if ($event->hasChanges()) {
+            $this->eventDispatcher->dispatch($event, TicketUpdateEvent::class);
+        }
     }
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/SetPersonsCommandHandler.php b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/SetPersonsCommandHandler.php
index e0a7cfbd0..cab723e7f 100644
--- a/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/SetPersonsCommandHandler.php
+++ b/src/Bundle/ChillTicketBundle/src/Action/Ticket/Handler/SetPersonsCommandHandler.php
@@ -15,9 +15,12 @@ use Chill\MainBundle\Entity\User;
 use Chill\TicketBundle\Action\Ticket\SetPersonsCommand;
 use Chill\TicketBundle\Entity\PersonHistory;
 use Chill\TicketBundle\Entity\Ticket;
+use Chill\TicketBundle\Event\PersonsUpdateEvent;
+use Chill\TicketBundle\Event\TicketUpdateEvent;
 use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Clock\ClockInterface;
 use Symfony\Component\Security\Core\Security;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
 final readonly class SetPersonsCommandHandler
 {
@@ -25,10 +28,13 @@ final readonly class SetPersonsCommandHandler
         private ClockInterface $clock,
         private EntityManagerInterface $entityManager,
         private Security $security,
+        private EventDispatcherInterface $eventDispatcher,
     ) {}
 
     public function handle(Ticket $ticket, SetPersonsCommand $command): void
     {
+        $event = new PersonsUpdateEvent($ticket);
+
         // remove existing addresses which are not in the new addresses
         foreach ($ticket->getPersonHistories() as $personHistory) {
             if (null !== $personHistory->getEndDate()) {
@@ -40,6 +46,7 @@ final readonly class SetPersonsCommandHandler
                 if (($user = $this->security->getUser()) instanceof User) {
                     $personHistory->setRemovedBy($user);
                 }
+                $event->personsRemoved[] = $personHistory->getPerson();
             }
         }
 
@@ -51,6 +58,11 @@ final readonly class SetPersonsCommandHandler
 
             $history = new PersonHistory($person, $ticket, $this->clock->now());
             $this->entityManager->persist($history);
+            $event->personsAdded[] = $person;
+        }
+
+        if ($event->hasChanges()) {
+            $this->eventDispatcher->dispatch($event, TicketUpdateEvent::class);
         }
     }
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Event/EmergencyStatusUpdateEvent.php b/src/Bundle/ChillTicketBundle/src/Event/EmergencyStatusUpdateEvent.php
new file mode 100644
index 000000000..934c38dde
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Event/EmergencyStatusUpdateEvent.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Event;
+
+use Chill\TicketBundle\Entity\EmergencyStatusEnum;
+use Chill\TicketBundle\Entity\Ticket;
+
+final class EmergencyStatusUpdateEvent extends TicketUpdateEvent
+{
+    public function __construct(
+        Ticket $ticket,
+        public EmergencyStatusEnum $previousEmergencyStatus,
+        public EmergencyStatusEnum $newEmergencyStatus,
+    ) {
+        parent::__construct(TicketUpdateKindEnum::TOGGLE_EMERGENCY, $ticket);
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Event/EventSubscriber/GeneratePostUpdateTicketEventSubscriber.php b/src/Bundle/ChillTicketBundle/src/Event/EventSubscriber/GeneratePostUpdateTicketEventSubscriber.php
new file mode 100644
index 000000000..7b8889c1c
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Event/EventSubscriber/GeneratePostUpdateTicketEventSubscriber.php
@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Event\EventSubscriber;
+
+use Chill\TicketBundle\Event\TicketUpdateEvent;
+use Chill\TicketBundle\Messenger\PostTicketUpdateMessage;
+use Symfony\Component\EventDispatcher\EventSubscriberInterface;
+use Symfony\Component\HttpKernel\Event\TerminateEvent;
+use Symfony\Component\HttpKernel\KernelEvents;
+use Symfony\Component\Messenger\MessageBusInterface;
+
+/**
+ * Subscribe to TicketUpdateEvents and dispatch a message for each one when the kernel terminates.
+ */
+final class GeneratePostUpdateTicketEventSubscriber implements EventSubscriberInterface
+{
+    /**
+     * @var list<PostTicketUpdateMessage>
+     */
+    private array $toDispatch = [];
+
+    public function __construct(private readonly MessageBusInterface $messageBus) {}
+
+    public static function getSubscribedEvents(): array
+    {
+        return [
+            TicketUpdateEvent::class => ['onTicketUpdate', 0],
+            KernelEvents::TERMINATE => ['onKernelTerminate', 8096],
+        ];
+    }
+
+    public function onTicketUpdate(TicketUpdateEvent $event): void
+    {
+        $this->toDispatch[] = new PostTicketUpdateMessage($event->ticket, $event->updateKind);
+    }
+
+    public function onKernelTerminate(TerminateEvent $event): void
+    {
+        foreach ($this->toDispatch as $message) {
+            $this->messageBus->dispatch($message);
+        }
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Event/MotiveUpdateEvent.php b/src/Bundle/ChillTicketBundle/src/Event/MotiveUpdateEvent.php
new file mode 100644
index 000000000..59aadf054
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Event/MotiveUpdateEvent.php
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Event;
+
+use Chill\TicketBundle\Entity\Motive;
+use Chill\TicketBundle\Entity\Ticket;
+
+final class MotiveUpdateEvent extends TicketUpdateEvent
+{
+    public function __construct(
+        Ticket $ticket,
+        public ?Motive $previousMotive = null,
+        public ?Motive $newMotive = null,
+    ) {
+        parent::__construct(TicketUpdateKindEnum::UPDATE_MOTIVE, $ticket);
+    }
+
+    public function hasChanges(): bool
+    {
+        return null !== $this->newMotive || null !== $this->previousMotive;
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Event/PersonsUpdateEvent.php b/src/Bundle/ChillTicketBundle/src/Event/PersonsUpdateEvent.php
new file mode 100644
index 000000000..6d1672dc3
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Event/PersonsUpdateEvent.php
@@ -0,0 +1,38 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Event;
+
+use Chill\PersonBundle\Entity\Person;
+use Chill\TicketBundle\Entity\Ticket;
+
+class PersonsUpdateEvent extends TicketUpdateEvent
+{
+    public function __construct(Ticket $ticket)
+    {
+        parent::__construct(TicketUpdateKindEnum::UPDATE_PERSONS, $ticket);
+    }
+
+    /**
+     * @var list<Person>
+     */
+    public $personsAdded = [];
+
+    /**
+     * @var list<Person>
+     */
+    public $personsRemoved = [];
+
+    public function hasChanges(): bool
+    {
+        return count($this->personsAdded) > 0 || count($this->personsRemoved) > 0;
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Event/PostTicketUpdateEvent.php b/src/Bundle/ChillTicketBundle/src/Event/PostTicketUpdateEvent.php
new file mode 100644
index 000000000..d4e8fd738
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Event/PostTicketUpdateEvent.php
@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Event;
+
+use Chill\TicketBundle\Entity\Ticket;
+
+/**
+ * Event triggered asynchronously after a ticket has been updated.
+ *
+ * This event is trigged by PostTicketUpdateMessageHandler, using Messenger component.
+ *
+ * To use a synchronous event, see @see{TicketUpdateEvent}
+ */
+class PostTicketUpdateEvent
+{
+    public function __construct(
+        public readonly TicketUpdateKindEnum $updateKind,
+        public readonly Ticket $ticket,
+    ) {}
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Event/TicketUpdateEvent.php b/src/Bundle/ChillTicketBundle/src/Event/TicketUpdateEvent.php
new file mode 100644
index 000000000..e3b1ac175
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Event/TicketUpdateEvent.php
@@ -0,0 +1,22 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Event;
+
+use Chill\TicketBundle\Entity\Ticket;
+
+abstract class TicketUpdateEvent
+{
+    public function __construct(
+        public readonly TicketUpdateKindEnum $updateKind,
+        public readonly Ticket $ticket,
+    ) {}
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Event/TicketUpdateKindEnum.php b/src/Bundle/ChillTicketBundle/src/Event/TicketUpdateKindEnum.php
new file mode 100644
index 000000000..eda7a3075
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Event/TicketUpdateKindEnum.php
@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Event;
+
+enum TicketUpdateKindEnum: string
+{
+    case UPDATE_ADDRESSEE = 'UPDATE_ADDRESSEE';
+    case ADD_COMMENT  = 'ADD_COMMENT';
+    case TOGGLE_EMERGENCY = 'TOGGLE_EMERGENCY';
+    case TOGGLE_STATE = 'TOGGLE_STATE';
+    case UPDATE_MOTIVE  = 'UPDATE_MOTIVE';
+    case UPDATE_CALLER = 'UPDATE_CALLER';
+    case UPDATE_PERSONS = 'UPDATE_PERSONS';
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Messenger/Handler/PostTicketUpdateMessageHandler.php b/src/Bundle/ChillTicketBundle/src/Messenger/Handler/PostTicketUpdateMessageHandler.php
new file mode 100644
index 000000000..5c8412fc4
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Messenger/Handler/PostTicketUpdateMessageHandler.php
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Messenger\Handler;
+
+use Chill\TicketBundle\Event\PostTicketUpdateEvent;
+use Chill\TicketBundle\Messenger\PostTicketUpdateMessage;
+use Chill\TicketBundle\Repository\TicketRepositoryInterface;
+use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
+
+final readonly class PostTicketUpdateMessageHandler
+{
+    public function __construct(
+        private EventDispatcherInterface $eventDispatcher,
+        private TicketRepositoryInterface $ticketRepository,
+    ) {}
+
+    public function __invoke(PostTicketUpdateMessage $event): void
+    {
+        $ticket = $this->ticketRepository->find($event->ticketId);
+
+        if (null === $ticket) {
+            throw new UnrecoverableMessageHandlingException('Ticket not found');
+        }
+
+        $this->eventDispatcher->dispatch(new PostTicketUpdateEvent($event->updateKind, $ticket));
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Messenger/PostTicketUpdateMessage.php b/src/Bundle/ChillTicketBundle/src/Messenger/PostTicketUpdateMessage.php
new file mode 100644
index 000000000..ac6f9c2d5
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Messenger/PostTicketUpdateMessage.php
@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Messenger;
+
+use Chill\TicketBundle\Entity\Ticket;
+use Chill\TicketBundle\Event\TicketUpdateKindEnum;
+
+final readonly class PostTicketUpdateMessage
+{
+    public readonly int $ticketId;
+
+    public function __construct(
+        Ticket $ticket,
+        public TicketUpdateKindEnum $updateKind,
+    ) {
+        $this->ticketId = $ticket->getId();
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/config/services.yaml b/src/Bundle/ChillTicketBundle/src/config/services.yaml
index 1089b574e..5e2b8e1b3 100644
--- a/src/Bundle/ChillTicketBundle/src/config/services.yaml
+++ b/src/Bundle/ChillTicketBundle/src/config/services.yaml
@@ -17,6 +17,9 @@ services:
         tags:
             - controller.service_arguments
 
+    Chill\TicketBundle\Event\EventSubscriber\:
+        resource: '../Event/EventSubscriber/'
+
     Chill\TicketBundle\Repository\:
         resource: '../Repository/'
 
@@ -35,6 +38,9 @@ services:
     Chill\TicketBundle\Menu\:
         resource: '../Menu/'
 
+    Chill\TicketBundle\Messenger\Handler\:
+        resource: '../Messenger/Handler'
+
     Chill\TicketBundle\Validation\:
         resource: '../Validation/'
 
diff --git a/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/ChangeEmergencyStateCommandHandlerTest.php b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/ChangeEmergencyStateCommandHandlerTest.php
index c80204490..fe3e85f43 100644
--- a/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/ChangeEmergencyStateCommandHandlerTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/ChangeEmergencyStateCommandHandlerTest.php
@@ -16,9 +16,13 @@ use Chill\TicketBundle\Action\Ticket\Handler\ChangeEmergencyStateCommandHandler;
 use Chill\TicketBundle\Entity\EmergencyStatusEnum;
 use Chill\TicketBundle\Entity\EmergencyStatusHistory;
 use Chill\TicketBundle\Entity\Ticket;
+use Chill\TicketBundle\Event\EmergencyStatusUpdateEvent;
+use Chill\TicketBundle\Event\TicketUpdateEvent;
 use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Component\Clock\MockClock;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
 /**
  * @internal
@@ -36,7 +40,10 @@ final class ChangeEmergencyStateCommandHandlerTest extends TestCase
         // Create a YES emergency status history
         new EmergencyStatusHistory(EmergencyStatusEnum::YES, $ticket);
 
-        $handler = new ChangeEmergencyStateCommandHandler(new MockClock());
+        $eventDispatcher = $this->prophesize(EventDispatcherInterface::class);
+        $eventDispatcher->dispatch(Argument::type(EmergencyStatusUpdateEvent::class), TicketUpdateEvent::class)->shouldNotBeCalled();
+
+        $handler = new ChangeEmergencyStateCommandHandler(new MockClock(), $eventDispatcher->reveal());
         $command = new ChangeEmergencyStateCommand(EmergencyStatusEnum::YES);
 
         $result = $handler->__invoke($ticket, $command);
@@ -57,7 +64,17 @@ final class ChangeEmergencyStateCommandHandlerTest extends TestCase
         // Create a YES emergency status history
         new EmergencyStatusHistory(EmergencyStatusEnum::YES, $ticket);
 
-        $handler = new ChangeEmergencyStateCommandHandler(new MockClock());
+        $eventDispatcher = $this->prophesize(EventDispatcherInterface::class);
+        $eventDispatcher->dispatch(
+            Argument::that(
+                fn ($e) => $e instanceof EmergencyStatusUpdateEvent
+                && EmergencyStatusEnum::YES === $e->previousEmergencyStatus
+                && EmergencyStatusEnum::NO === $e->newEmergencyStatus
+            ),
+            TicketUpdateEvent::class
+        )->shouldBeCalled();
+
+        $handler = new ChangeEmergencyStateCommandHandler(new MockClock(), $eventDispatcher->reveal());
         $command = new ChangeEmergencyStateCommand(EmergencyStatusEnum::NO);
 
         $result = $handler->__invoke($ticket, $command);
@@ -90,7 +107,17 @@ final class ChangeEmergencyStateCommandHandlerTest extends TestCase
         // Create a NO emergency status history
         new EmergencyStatusHistory(EmergencyStatusEnum::NO, $ticket);
 
-        $handler = new ChangeEmergencyStateCommandHandler(new MockClock());
+        $eventDispatcher = $this->prophesize(EventDispatcherInterface::class);
+        $eventDispatcher->dispatch(
+            Argument::that(
+                fn ($e) => $e instanceof EmergencyStatusUpdateEvent
+                && EmergencyStatusEnum::NO === $e->previousEmergencyStatus
+                && EmergencyStatusEnum::YES === $e->newEmergencyStatus
+            ),
+            TicketUpdateEvent::class
+        )->shouldBeCalled();
+
+        $handler = new ChangeEmergencyStateCommandHandler(new MockClock(), $eventDispatcher->reveal());
         $command = new ChangeEmergencyStateCommand(EmergencyStatusEnum::YES);
 
         $result = $handler->__invoke($ticket, $command);
diff --git a/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/ReplaceMotiveCommandHandlerTest.php b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/ReplaceMotiveCommandHandlerTest.php
index 17b1e88d9..4a97ebb13 100644
--- a/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/ReplaceMotiveCommandHandlerTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/ReplaceMotiveCommandHandlerTest.php
@@ -19,16 +19,19 @@ use Chill\TicketBundle\Entity\EmergencyStatusEnum;
 use Chill\TicketBundle\Entity\Motive;
 use Chill\TicketBundle\Entity\MotiveHistory;
 use Chill\TicketBundle\Entity\Ticket;
+use Chill\TicketBundle\Event\MotiveUpdateEvent;
+use Chill\TicketBundle\Event\TicketUpdateEvent;
 use Doctrine\ORM\EntityManagerInterface;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Clock\MockClock;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
 /**
  * @internal
  *
- * @coversNothing
+ * @covers \Chill\TicketBundle\Action\Ticket\Handler\ReplaceMotiveCommandHandler
  */
 final class ReplaceMotiveCommandHandlerTest extends KernelTestCase
 {
@@ -37,14 +40,18 @@ final class ReplaceMotiveCommandHandlerTest extends KernelTestCase
     private function buildHandler(
         EntityManagerInterface $entityManager,
         ?ChangeEmergencyStateCommandHandler $changeEmergencyStateCommandHandler = null,
+        ?EventDispatcherInterface $eventDispatcher = null,
     ): ReplaceMotiveCommandHandler {
         $clock = new MockClock();
 
         if (null === $changeEmergencyStateCommandHandler) {
             $changeEmergencyStateCommandHandler = $this->prophesize(ChangeEmergencyStateCommandHandler::class)->reveal();
         }
+        if (null === $eventDispatcher) {
+            $eventDispatcher = $this->prophesize(EventDispatcherInterface::class)->reveal();
+        }
 
-        return new ReplaceMotiveCommandHandler($clock, $entityManager, $changeEmergencyStateCommandHandler);
+        return new ReplaceMotiveCommandHandler($clock, $entityManager, $changeEmergencyStateCommandHandler, $eventDispatcher);
     }
 
     public function testHandleOnTicketWithoutMotive(): void
@@ -61,7 +68,16 @@ final class ReplaceMotiveCommandHandlerTest extends KernelTestCase
             return $arg->getMotive() === $motive;
         }))->shouldBeCalled();
 
-        $handler = $this->buildHandler($entityManager->reveal());
+        $eventDispatcher = $this->prophesize(EventDispatcherInterface::class);
+        $eventDispatcher->dispatch(
+            Argument::that(fn ($event) => $event instanceof MotiveUpdateEvent
+                && $event->newMotive === $motive
+                && null === $event->previousMotive
+                && $event->hasChanges()),
+            TicketUpdateEvent::class
+        )->shouldBeCalled();
+
+        $handler = $this->buildHandler($entityManager->reveal(), null, $eventDispatcher->reveal());
 
         $handler->handle($ticket, new ReplaceMotiveCommand($motive));
 
@@ -83,7 +99,17 @@ final class ReplaceMotiveCommandHandlerTest extends KernelTestCase
             return $arg->getMotive() === $motive;
         }))->shouldBeCalled();
 
-        $handler = $this->buildHandler($entityManager->reveal());
+        $previous = $history->getMotive();
+        $eventDispatcher = $this->prophesize(EventDispatcherInterface::class);
+        $eventDispatcher->dispatch(
+            Argument::that(fn ($event) => $event instanceof MotiveUpdateEvent
+                && $event->newMotive === $motive
+                && $previous === $event->previousMotive
+                && $event->hasChanges()),
+            TicketUpdateEvent::class
+        )->shouldBeCalled();
+
+        $handler = $this->buildHandler($entityManager->reveal(), null, $eventDispatcher->reveal());
 
         $handler->handle($ticket, new ReplaceMotiveCommand($motive));
 
@@ -106,7 +132,10 @@ final class ReplaceMotiveCommandHandlerTest extends KernelTestCase
             return $arg->getMotive() === $motive;
         }))->shouldNotBeCalled();
 
-        $handler = $this->buildHandler($entityManager->reveal());
+        $eventDispatcher = $this->prophesize(EventDispatcherInterface::class);
+        $eventDispatcher->dispatch(Argument::any(), TicketUpdateEvent::class)->shouldNotBeCalled();
+
+        $handler = $this->buildHandler($entityManager->reveal(), null, $eventDispatcher->reveal());
 
         $handler->handle($ticket, new ReplaceMotiveCommand($motive));
 
@@ -134,10 +163,15 @@ final class ReplaceMotiveCommandHandlerTest extends KernelTestCase
             Argument::that(fn (ChangeEmergencyStateCommand $command) => EmergencyStatusEnum::YES === $command->newEmergencyStatus)
         )->shouldBeCalled();
 
+        // Expect event dispatch for motive update
+        $eventDispatcher = $this->prophesize(EventDispatcherInterface::class);
+        $eventDispatcher->dispatch(Argument::type(MotiveUpdateEvent::class), TicketUpdateEvent::class)->shouldBeCalled();
+
         // Create the handler with our mocks
         $handler = $this->buildHandler(
             $entityManager->reveal(),
-            $changeEmergencyStateCommandHandler->reveal()
+            $changeEmergencyStateCommandHandler->reveal(),
+            $eventDispatcher->reveal()
         );
 
         // Handle the command
@@ -166,10 +200,15 @@ final class ReplaceMotiveCommandHandlerTest extends KernelTestCase
             Argument::cetera()
         )->shouldNotBeCalled();
 
+        // Expect event dispatch for motive update
+        $eventDispatcher = $this->prophesize(EventDispatcherInterface::class);
+        $eventDispatcher->dispatch(Argument::type(MotiveUpdateEvent::class), TicketUpdateEvent::class)->shouldBeCalled();
+
         // Create the handler with our mocks
         $handler = $this->buildHandler(
             $entityManager->reveal(),
-            $changeEmergencyStateCommandHandler->reveal()
+            $changeEmergencyStateCommandHandler->reveal(),
+            $eventDispatcher->reveal()
         );
 
         // Handle the command
diff --git a/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/SetPersonsCommandHandlerTest.php b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/SetPersonsCommandHandlerTest.php
index 5c609b543..6097ba993 100644
--- a/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/SetPersonsCommandHandlerTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Action/Ticket/Handler/SetPersonsCommandHandlerTest.php
@@ -17,12 +17,15 @@ use Chill\TicketBundle\Action\Ticket\Handler\SetPersonsCommandHandler;
 use Chill\TicketBundle\Action\Ticket\SetPersonsCommand;
 use Chill\TicketBundle\Entity\PersonHistory;
 use Chill\TicketBundle\Entity\Ticket;
+use Chill\TicketBundle\Event\PersonsUpdateEvent;
+use Chill\TicketBundle\Event\TicketUpdateEvent;
 use Doctrine\ORM\EntityManagerInterface;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Component\Clock\MockClock;
 use Symfony\Component\Security\Core\Security;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
 /**
  * @internal
@@ -42,7 +45,16 @@ final class SetPersonsCommandHandlerTest extends TestCase
         $entityManager->persist(Argument::that(fn ($arg) => $arg instanceof PersonHistory && $arg->getPerson() === $person1))->shouldBeCalledOnce();
         $entityManager->persist(Argument::that(fn ($arg) => $arg instanceof PersonHistory && $arg->getPerson() === $group1))->shouldBeCalledOnce();
 
-        $handler = $this->buildHandler($entityManager->reveal());
+        $eventDispatcher = $this->prophesize(EventDispatcherInterface::class);
+        $eventDispatcher->dispatch(
+            Argument::that(fn ($arg) => $arg instanceof PersonsUpdateEvent
+                && in_array($person1, $arg->personsAdded, true)
+                && in_array($group1, $arg->personsAdded, true)
+                && [] === $arg->personsRemoved),
+            TicketUpdateEvent::class
+        )->shouldBeCalled();
+
+        $handler = $this->buildHandler($entityManager->reveal(), $eventDispatcher->reveal());
 
         $handler->handle($ticket, $command);
 
@@ -59,7 +71,15 @@ final class SetPersonsCommandHandlerTest extends TestCase
         $entityManager = $this->prophesize(EntityManagerInterface::class);
         $entityManager->persist(Argument::that(fn ($arg) => $arg instanceof PersonHistory && $arg->getPerson() === $person))->shouldNotBeCalled();
 
-        $handler = $this->buildHandler($entityManager->reveal());
+        $eventDispatcher = $this->prophesize(EventDispatcherInterface::class);
+        $eventDispatcher->dispatch(
+            Argument::that(
+                fn ($arg) => $arg instanceof PersonsUpdateEvent
+            ),
+            TicketUpdateEvent::class
+        )->shouldNotBeCalled();
+
+        $handler = $this->buildHandler($entityManager->reveal(), $eventDispatcher->reveal());
 
         $handler->handle($ticket, $command);
 
@@ -78,7 +98,17 @@ final class SetPersonsCommandHandlerTest extends TestCase
         $entityManager = $this->prophesize(EntityManagerInterface::class);
         $entityManager->persist(Argument::that(fn ($arg) => $arg instanceof PersonHistory && $arg->getPerson() === $person2))->shouldBeCalled();
 
-        $handler = $this->buildHandler($entityManager->reveal());
+        $eventDispatcher = $this->prophesize(EventDispatcherInterface::class);
+        $eventDispatcher->dispatch(
+            Argument::that(
+                fn ($arg) => $arg instanceof PersonsUpdateEvent
+                && in_array($person, $arg->personsRemoved, true) && 1 === count($arg->personsRemoved)
+                && in_array($person2, $arg->personsAdded, true) && 1 === count($arg->personsAdded)
+            ),
+            TicketUpdateEvent::class
+        )->shouldBeCalled();
+
+        $handler = $this->buildHandler($entityManager->reveal(), $eventDispatcher->reveal());
 
         $handler->handle($ticket, $command);
 
@@ -95,18 +125,28 @@ final class SetPersonsCommandHandlerTest extends TestCase
         $entityManager = $this->prophesize(EntityManagerInterface::class);
         $entityManager->persist(Argument::that(fn ($arg) => $arg instanceof PersonHistory && $arg->getPerson() === $person))->shouldBeCalledOnce();
 
-        $handler = $this->buildHandler($entityManager->reveal());
+        $eventDispatcher = $this->prophesize(EventDispatcherInterface::class);
+        $eventDispatcher->dispatch(
+            Argument::that(
+                fn ($arg) => $arg instanceof PersonsUpdateEvent
+                && in_array($person, $arg->personsAdded, true) && 1 === count($arg->personsAdded)
+                && [] === $arg->personsRemoved
+            ),
+            TicketUpdateEvent::class
+        )->shouldBeCalled();
+
+        $handler = $this->buildHandler($entityManager->reveal(), $eventDispatcher->reveal());
 
         $handler->handle($ticket, $command);
 
         self::assertCount(1, $ticket->getPersons());
     }
 
-    private function buildHandler(EntityManagerInterface $entityManager): SetPersonsCommandHandler
+    private function buildHandler(EntityManagerInterface $entityManager, EventDispatcherInterface $eventDispatcher): SetPersonsCommandHandler
     {
         $security = $this->prophesize(Security::class);
         $security->getUser()->willReturn(new User());
 
-        return new SetPersonsCommandHandler(new MockClock(), $entityManager, $security->reveal());
+        return new SetPersonsCommandHandler(new MockClock(), $entityManager, $security->reveal(), $eventDispatcher);
     }
 }
diff --git a/src/Bundle/ChillTicketBundle/tests/Event/EventSubscriber/GeneratePostUpdateTicketEventSubscriberTest.php b/src/Bundle/ChillTicketBundle/tests/Event/EventSubscriber/GeneratePostUpdateTicketEventSubscriberTest.php
new file mode 100644
index 000000000..e6a982906
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Event/EventSubscriber/GeneratePostUpdateTicketEventSubscriberTest.php
@@ -0,0 +1,58 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\tests\Event\EventSubscriber;
+
+use Chill\TicketBundle\Entity\Ticket;
+use Chill\TicketBundle\Event\EventSubscriber\GeneratePostUpdateTicketEventSubscriber;
+use Chill\TicketBundle\Event\TicketUpdateEvent;
+use Chill\TicketBundle\Event\TicketUpdateKindEnum;
+use Chill\TicketBundle\Messenger\PostTicketUpdateMessage;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Event\TerminateEvent;
+use Symfony\Component\HttpKernel\KernelInterface;
+use Symfony\Component\Messenger\Envelope;
+use Symfony\Component\Messenger\MessageBusInterface;
+
+/**
+ * @covers \Chill\TicketBundle\Event\EventSubscriber\GeneratePostUpdateTicketEventSubscriber
+ *
+ * @internal
+ */
+class GeneratePostUpdateTicketEventSubscriberTest extends TestCase
+{
+    use ProphecyTrait;
+
+    public function testOnTicketUpdate(): void
+    {
+        $ticket = new Ticket();
+        $reflection = new \ReflectionClass(Ticket::class);
+        $idProperty = $reflection->getProperty('id');
+        $idProperty->setValue($ticket, 1);
+        $event = new class (TicketUpdateKindEnum::UPDATE_MOTIVE, $ticket) extends TicketUpdateEvent {};
+
+        $messageBus = $this->prophesize(MessageBusInterface::class);
+        $messageBus->dispatch(Argument::that(fn ($arg) => $arg instanceof PostTicketUpdateMessage && TicketUpdateKindEnum::UPDATE_MOTIVE === $arg->updateKind && 1 === $arg->ticketId))
+            ->will(fn ($args) => new Envelope($args[0]))
+            ->shouldBeCalled();
+
+        $eventSubscriber = new GeneratePostUpdateTicketEventSubscriber($messageBus->reveal());
+        $eventSubscriber->onTicketUpdate($event);
+
+        $kernel = $this->prophesize(KernelInterface::class);
+        $terminate = new TerminateEvent($kernel->reveal(), new Request(), new Response());
+        $eventSubscriber->onKernelTerminate($terminate);
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Messenger/Handler/PostTicketUpdateMessageHandlerTest.php b/src/Bundle/ChillTicketBundle/tests/Messenger/Handler/PostTicketUpdateMessageHandlerTest.php
new file mode 100644
index 000000000..7d5f33e5d
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Messenger/Handler/PostTicketUpdateMessageHandlerTest.php
@@ -0,0 +1,92 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\tests\Messenger\Handler;
+
+use Chill\TicketBundle\Entity\Ticket;
+use Chill\TicketBundle\Event\PostTicketUpdateEvent;
+use Chill\TicketBundle\Event\TicketUpdateKindEnum;
+use Chill\TicketBundle\Messenger\PostTicketUpdateMessage;
+use Chill\TicketBundle\Messenger\Handler\PostTicketUpdateMessageHandler;
+use Chill\TicketBundle\Repository\TicketRepositoryInterface;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
+
+/**
+ * @covers \Chill\TicketBundle\Messenger\Handler\PostTicketUpdateMessageHandler
+ *
+ * @internal
+ */
+class PostTicketUpdateMessageHandlerTest extends TestCase
+{
+    use ProphecyTrait;
+
+    public function testDispatchesEventWhenTicketExists(): void
+    {
+        // Arrange: a Ticket with an ID
+        $ticket = new Ticket();
+        $reflection = new \ReflectionClass(Ticket::class);
+        $idProperty = $reflection->getProperty('id');
+        $idProperty->setValue($ticket, 123);
+
+        $message = new PostTicketUpdateMessage($ticket, TicketUpdateKindEnum::UPDATE_MOTIVE);
+
+        // Mock repository to return the Ticket when searching by id
+        $ticketRepository = $this->prophesize(TicketRepositoryInterface::class);
+        $ticketRepository->find(123)->willReturn($ticket)->shouldBeCalledOnce();
+
+        // Expect the dispatcher to dispatch a PostTicketUpdateEvent with correct data
+        $eventDispatcher = $this->prophesize(EventDispatcherInterface::class);
+        $eventDispatcher
+            ->dispatch(Argument::that(fn ($event) => $event instanceof PostTicketUpdateEvent
+                && TicketUpdateKindEnum::UPDATE_MOTIVE === $event->updateKind
+                && $event->ticket === $ticket))
+            ->will(fn ($args) => $args[0])
+            ->shouldBeCalledOnce();
+
+        $handler = new PostTicketUpdateMessageHandler($eventDispatcher->reveal(), $ticketRepository->reveal());
+
+        // Act
+        $handler($message);
+
+        // Assert: expectations asserted by Prophecy
+        self::assertTrue(true);
+    }
+
+    public function testThrowsWhenTicketNotFound(): void
+    {
+        // Arrange: a Ticket with an ID for the message, but repository will return null
+        $ticket = new Ticket();
+        $reflection = new \ReflectionClass(Ticket::class);
+        $idProperty = $reflection->getProperty('id');
+        $idProperty->setValue($ticket, 999);
+
+        $message = new PostTicketUpdateMessage($ticket, TicketUpdateKindEnum::UPDATE_MOTIVE);
+
+        $ticketRepository = $this->prophesize(TicketRepositoryInterface::class);
+        $ticketRepository->find(999)->willReturn(null)->shouldBeCalledOnce();
+
+        $eventDispatcher = $this->prophesize(EventDispatcherInterface::class);
+        $eventDispatcher->dispatch(Argument::any())->shouldNotBeCalled();
+
+        $handler = new PostTicketUpdateMessageHandler($eventDispatcher->reveal(), $ticketRepository->reveal());
+
+        // Assert: exception is thrown
+        $this->expectException(UnrecoverableMessageHandlingException::class);
+        $this->expectExceptionMessage('Ticket not found');
+
+        // Act
+        $handler($message);
+    }
+}

From 62e5842311e4966d1024fdedbed26b4af243d041 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 27 Oct 2025 12:49:26 +0100
Subject: [PATCH 193/283] Fix case where no 'reason' is picked within the
 PersonHavingActivityBetweenDateFilter.php

---
 .../unreleased/Fixed-20251027-124814.yaml     |  6 +++
 .../PersonFilters/ActivityReasonFilter.php    |  4 +-
 .../PersonHavingActivityBetweenDateFilter.php | 44 ++++++++++++++++---
 3 files changed, 46 insertions(+), 8 deletions(-)
 create mode 100644 .changes/unreleased/Fixed-20251027-124814.yaml

diff --git a/.changes/unreleased/Fixed-20251027-124814.yaml b/.changes/unreleased/Fixed-20251027-124814.yaml
new file mode 100644
index 000000000..6f699a2f7
--- /dev/null
+++ b/.changes/unreleased/Fixed-20251027-124814.yaml
@@ -0,0 +1,6 @@
+kind: Fixed
+body: Fix export case where no 'reason' is picked within the PersonHavingActivityBetweenDateFilter.php
+time: 2025-10-27T12:48:14.851325971+01:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php
index 4802fc7ac..9909eab26 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php
@@ -90,7 +90,9 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt
 
     public function getFormDefaultData(): array
     {
-        return [];
+        return [
+            'reasons' => [],
+        ];
     }
 
     public function describeAction($data, ExportGenerationContext $context): string|\Symfony\Contracts\Translation\TranslatableInterface|array
diff --git a/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php b/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php
index 673aac25e..f3e8b347a 100644
--- a/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php
@@ -42,6 +42,8 @@ final readonly class PersonHavingActivityBetweenDateFilter implements ExportElem
 
     public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
     {
+        error_log('alterQuery called with data: '.json_encode(array_keys($data)));
+
         // create a subquery for activity
         $sqb = $qb->getEntityManager()->createQueryBuilder();
         $sqb->select('1')
@@ -59,7 +61,6 @@ final readonly class PersonHavingActivityBetweenDateFilter implements ExportElem
         if (\in_array('activity', $qb->getAllAliases(), true)) {
             $sqb->andWhere('activity_person_having_activity.id = activity.id');
         }
-
         if (isset($data['reasons']) && [] !== $data['reasons']) {
             // add clause activity reason
             $sqb->join('activity_person_having_activity.reasons', 'reasons_person_having_activity');
@@ -124,12 +125,38 @@ final readonly class PersonHavingActivityBetweenDateFilter implements ExportElem
 
     public function normalizeFormData(array $formData): array
     {
-        return ['date_from_rolling' => $formData['date_from_rolling']->normalize(), 'date_to_rolling' => $formData['date_to_rolling']->normalize()];
+        $normalized = [
+            'date_from_rolling' => $formData['date_from_rolling']->normalize(),
+            'date_to_rolling' => $formData['date_to_rolling']->normalize(),
+            'reasons' => [],
+        ];
+
+        if (isset($formData['reasons']) && [] !== $formData['reasons']) {
+            $normalized['reasons'] = array_map(
+                fn (ActivityReason $reason) => $reason->getId(),
+                $formData['reasons']
+            );
+        }
+
+        return $normalized;
     }
 
     public function denormalizeFormData(array $formData, int $fromVersion): array
     {
-        return ['date_from_rolling' => RollingDate::fromNormalized($formData['date_from_rolling']), 'date_to_rolling' => RollingDate::fromNormalized($formData['date_to_rolling'])];
+        $denormalized = [
+            'date_from_rolling' => RollingDate::fromNormalized($formData['date_from_rolling']),
+            'date_to_rolling' => RollingDate::fromNormalized($formData['date_to_rolling']),
+            'reasons' => [],
+        ];
+
+        if (isset($formData['reasons']) && [] !== $formData['reasons']) {
+            $denormalized['reasons'] = array_map(
+                fn ($id) => $this->activityReasonRepository->find($id),
+                $formData['reasons']
+            );
+        }
+
+        return $denormalized;
     }
 
     public function getFormDefaultData(): array
@@ -143,10 +170,12 @@ final readonly class PersonHavingActivityBetweenDateFilter implements ExportElem
 
     public function describeAction($data, ExportGenerationContext $context): array
     {
+        $reasons = $data['reasons'] ?? [];
+
         return [
-            [] === $data['reasons'] ?
-                'export.filter.person_between_dates.describe_action_with_no_subject'
-                : 'export.filter.person_between_dates.describe_action_with_subject',
+            [] === $reasons ?
+                'export.filter.activity.describe_action_with_no_subject'
+                : 'export.filter.activity.describe_action_with_subject',
             [
                 'date_from' => $this->rollingDateConverter->convert($data['date_from_rolling']),
                 'date_to' => $this->rollingDateConverter->convert($data['date_to_rolling']),
@@ -154,7 +183,7 @@ final readonly class PersonHavingActivityBetweenDateFilter implements ExportElem
                     ', ',
                     array_map(
                         fn (ActivityReason $r): string => '"'.$this->translatableStringHelper->localize($r->getName()).'"',
-                        $data['reasons']
+                        $reasons
                     )
                 ),
             ],
@@ -168,6 +197,7 @@ final readonly class PersonHavingActivityBetweenDateFilter implements ExportElem
 
     public function validateForm($data, ExecutionContextInterface $context): void
     {
+        error_log('validateForm called with data: '.json_encode(array_keys($data)));
         if ($this->rollingDateConverter->convert($data['date_from_rolling'])
             >= $this->rollingDateConverter->convert($data['date_to_rolling'])) {
             $context->buildViolation('export.filter.activity.person_between_dates.date mismatch')

From 01889ac67168db260e7d76cfe9db1e64a405959e Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 27 Oct 2025 12:59:11 +0100
Subject: [PATCH 194/283] Upgrade to v4.6.1

---
 .changes/unreleased/Fixed-20251027-124814.yaml | 6 ------
 .changes/v4.6.1.md                             | 3 +++
 CHANGELOG.md                                   | 4 ++++
 3 files changed, 7 insertions(+), 6 deletions(-)
 delete mode 100644 .changes/unreleased/Fixed-20251027-124814.yaml
 create mode 100644 .changes/v4.6.1.md

diff --git a/.changes/unreleased/Fixed-20251027-124814.yaml b/.changes/unreleased/Fixed-20251027-124814.yaml
deleted file mode 100644
index 6f699a2f7..000000000
--- a/.changes/unreleased/Fixed-20251027-124814.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Fixed
-body: Fix export case where no 'reason' is picked within the PersonHavingActivityBetweenDateFilter.php
-time: 2025-10-27T12:48:14.851325971+01:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change
diff --git a/.changes/v4.6.1.md b/.changes/v4.6.1.md
new file mode 100644
index 000000000..47cddf537
--- /dev/null
+++ b/.changes/v4.6.1.md
@@ -0,0 +1,3 @@
+## v4.6.1 - 2025-10-27
+### Fixed
+* Fix export case where no 'reason' is picked within the PersonHavingActivityBetweenDateFilter.php   
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 9d04f83fa..4573e5ba2 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,10 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
+## v4.6.1 - 2025-10-27
+### Fixed
+* Fix export case where no 'reason' is picked within the PersonHavingActivityBetweenDateFilter.php   
+
 ## v4.6.0 - 2025-10-15
 ### Feature
 * ([#423](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/423)) Create environment banner that can be activated and configured depending on the image deployed   

From f42bb498e4a7655e4d884bc23b2bc1b08b09ec77 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 27 Oct 2025 13:21:04 +0100
Subject: [PATCH 195/283] Fix deprecation notice League/csv for
 createFromStream and createFromPath replaced by new from() method

---
 .../ChillMainBundle/Command/ChillImportUsersCommand.php     | 6 +++---
 .../Command/ChillUserSendRenewPasswordCodeCommand.php       | 2 +-
 .../ChillMainBundle/Controller/UserExportController.php     | 4 ++--
 .../Service/Import/AddressReferenceBEFromBestAddress.php    | 2 +-
 .../Service/Import/AddressReferenceBaseImporter.php         | 2 +-
 .../Service/Import/AddressReferenceFromBAN.php              | 2 +-
 .../Service/Import/AddressReferenceFromBano.php             | 2 +-
 .../ChillMainBundle/Service/Import/AddressReferenceLU.php   | 2 +-
 .../Service/Import/PostalCodeBEFromBestAddress.php          | 2 +-
 .../Service/Import/PostalCodeFRFromOpenData.php             | 2 +-
 .../ChillPersonBundle/Command/ImportSocialWorkMetadata.php  | 2 +-
 .../DataFixtures/ORM/LoadSocialWorkMetadata.php             | 2 +-
 .../Service/SocialWork/SocialActionCSVExportService.php     | 2 +-
 .../Service/SocialWork/SocialIssueCSVExportService.php      | 2 +-
 .../Controller/ThirdpartyCSVExportController.php            | 2 +-
 15 files changed, 18 insertions(+), 18 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php b/src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php
index 44a86cb24..cbc6ee059 100644
--- a/src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php
@@ -334,7 +334,7 @@ class ChillImportUsersCommand extends Command
 
     protected function loadUsers()
     {
-        $reader = Reader::createFromPath($this->tempInput->getArgument('csvfile'));
+        $reader = Reader::from($this->tempInput->getArgument('csvfile'));
         $reader->setHeaderOffset(0);
 
         foreach ($reader->getRecords() as $line => $r) {
@@ -362,7 +362,7 @@ class ChillImportUsersCommand extends Command
 
     protected function prepareGroupingCenters()
     {
-        $reader = Reader::createFromPath($this->tempInput->getOption('grouping-centers'));
+        $reader = Reader::from($this->tempInput->getOption('grouping-centers'));
         $reader->setHeaderOffset(0);
 
         foreach ($reader->getRecords() as $r) {
@@ -378,7 +378,7 @@ class ChillImportUsersCommand extends Command
 
     protected function prepareWriter()
     {
-        $this->output = $output = Writer::createFromPath($this->tempInput
+        $this->output = $output = Writer::from($this->tempInput
             ->getOption('csv-dump'), 'a+');
 
         $output->insertOne([
diff --git a/src/Bundle/ChillMainBundle/Command/ChillUserSendRenewPasswordCodeCommand.php b/src/Bundle/ChillMainBundle/Command/ChillUserSendRenewPasswordCodeCommand.php
index c4d835dbd..f17194971 100644
--- a/src/Bundle/ChillMainBundle/Command/ChillUserSendRenewPasswordCodeCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/ChillUserSendRenewPasswordCodeCommand.php
@@ -119,7 +119,7 @@ class ChillUserSendRenewPasswordCodeCommand extends Command
     protected function getReader()
     {
         try {
-            $reader = Reader::createFromPath($this->input->getArgument('csvfile'));
+            $reader = Reader::from($this->input->getArgument('csvfile'));
         } catch (\Exception $e) {
             $this->logger->error('The csv file could not be read', [
                 'path' => $this->input->getArgument('csvfile'),
diff --git a/src/Bundle/ChillMainBundle/Controller/UserExportController.php b/src/Bundle/ChillMainBundle/Controller/UserExportController.php
index 6d944a4c3..cb921d47f 100644
--- a/src/Bundle/ChillMainBundle/Controller/UserExportController.php
+++ b/src/Bundle/ChillMainBundle/Controller/UserExportController.php
@@ -43,7 +43,7 @@ final readonly class UserExportController
 
         $users = $this->userRepository->findAllAsArray($request->getLocale());
 
-        $csv = Writer::createFromPath('php://temp', 'r+');
+        $csv = Writer::from('php://temp', 'r+');
         $csv->insertOne(
             array_map(
                 fn (string $e) => $this->translator->trans('admin.users.export.'.$e),
@@ -104,7 +104,7 @@ final readonly class UserExportController
 
         $userPermissions = $this->userRepository->findAllUserACLAsArray();
 
-        $csv = Writer::createFromPath('php://temp', 'r+');
+        $csv = Writer::from('php://temp', 'r+');
         $csv->insertOne(
             array_map(
                 fn (string $e) => $this->translator->trans('admin.users.export.'.$e),
diff --git a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBEFromBestAddress.php b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBEFromBestAddress.php
index fcf49079f..f8fc56f7a 100644
--- a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBEFromBestAddress.php
+++ b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBEFromBestAddress.php
@@ -64,7 +64,7 @@ class AddressReferenceBEFromBestAddress
 
         $uncompressedStream = gzopen($tmpname, 'r');
 
-        $csv = Reader::createFromStream($uncompressedStream);
+        $csv = Reader::from($uncompressedStream);
         $csv->setDelimiter(',');
         $csv->setHeaderOffset(0);
 
diff --git a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBaseImporter.php b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBaseImporter.php
index adb49549b..b9ce839d3 100644
--- a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBaseImporter.php
+++ b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBaseImporter.php
@@ -287,7 +287,7 @@ final class AddressReferenceBaseImporter
 
             $filename = sprintf('%s-%s.csv', (new \DateTimeImmutable())->format('Ymd-His'), uniqid());
             $path = Path::normalize(sprintf('%s%s%s', sys_get_temp_dir(), DIRECTORY_SEPARATOR, $filename));
-            $writer = Writer::createFromPath($path, 'w+');
+            $writer = Writer::from($path, 'w+');
             // insert headers
             $writer->insertOne([
                 'postalcode',
diff --git a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceFromBAN.php b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceFromBAN.php
index 1c03b7bfb..0aa4cd6ce 100644
--- a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceFromBAN.php
+++ b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceFromBAN.php
@@ -53,7 +53,7 @@ class AddressReferenceFromBAN
         // re-open it to read it
         $csvDecompressed = gzopen($path, 'r');
 
-        $csv = Reader::createFromStream($csvDecompressed);
+        $csv = Reader::from($csvDecompressed);
         $csv->setDelimiter(';')->setHeaderOffset(0);
         $stmt = new Statement();
         $stmt = $stmt->process($csv, [
diff --git a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceFromBano.php b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceFromBano.php
index be20bbc11..6e7e693c8 100644
--- a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceFromBano.php
+++ b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceFromBano.php
@@ -41,7 +41,7 @@ class AddressReferenceFromBano
 
         fseek($file, 0);
 
-        $csv = Reader::createFromStream($file);
+        $csv = Reader::from($file);
         $csv->setDelimiter(',');
         $stmt = new Statement();
         $stmt = $stmt->process($csv, [
diff --git a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceLU.php b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceLU.php
index e1294732b..9c65e9367 100644
--- a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceLU.php
+++ b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceLU.php
@@ -39,7 +39,7 @@ class AddressReferenceLU
 
         fseek($file, 0);
 
-        $csv = Reader::createFromStream($file);
+        $csv = Reader::from($file);
         $csv->setDelimiter(';');
         $csv->setHeaderOffset(0);
 
diff --git a/src/Bundle/ChillMainBundle/Service/Import/PostalCodeBEFromBestAddress.php b/src/Bundle/ChillMainBundle/Service/Import/PostalCodeBEFromBestAddress.php
index a95ba1abc..13b85b44a 100644
--- a/src/Bundle/ChillMainBundle/Service/Import/PostalCodeBEFromBestAddress.php
+++ b/src/Bundle/ChillMainBundle/Service/Import/PostalCodeBEFromBestAddress.php
@@ -43,7 +43,7 @@ class PostalCodeBEFromBestAddress
 
         $uncompressedStream = gzopen($tmpname, 'r');
 
-        $csv = Reader::createFromStream($uncompressedStream);
+        $csv = Reader::from($uncompressedStream);
         $csv->setDelimiter(',');
         $csv->setHeaderOffset(0);
 
diff --git a/src/Bundle/ChillMainBundle/Service/Import/PostalCodeFRFromOpenData.php b/src/Bundle/ChillMainBundle/Service/Import/PostalCodeFRFromOpenData.php
index 8893181a8..1fa1de41b 100644
--- a/src/Bundle/ChillMainBundle/Service/Import/PostalCodeFRFromOpenData.php
+++ b/src/Bundle/ChillMainBundle/Service/Import/PostalCodeFRFromOpenData.php
@@ -47,7 +47,7 @@ class PostalCodeFRFromOpenData
 
         fseek($tmpfile, 0);
 
-        $csv = Reader::createFromStream($tmpfile);
+        $csv = Reader::from($tmpfile);
         $csv->setDelimiter(',');
         $csv->setHeaderOffset(0);
 
diff --git a/src/Bundle/ChillPersonBundle/Command/ImportSocialWorkMetadata.php b/src/Bundle/ChillPersonBundle/Command/ImportSocialWorkMetadata.php
index 636330138..0c4092ed4 100644
--- a/src/Bundle/ChillPersonBundle/Command/ImportSocialWorkMetadata.php
+++ b/src/Bundle/ChillPersonBundle/Command/ImportSocialWorkMetadata.php
@@ -49,7 +49,7 @@ final class ImportSocialWorkMetadata extends Command
         $filepath = $input->getOption('filepath');
 
         try {
-            $csv = Reader::createFromPath($filepath);
+            $csv = Reader::from($filepath);
         } catch (\Throwable $e) {
             throw new \Exception('Error while loading CSV.', 0, $e);
         }
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialWorkMetadata.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialWorkMetadata.php
index 2c7e22b46..d6758eb8a 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialWorkMetadata.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadSocialWorkMetadata.php
@@ -29,7 +29,7 @@ class LoadSocialWorkMetadata extends Fixture implements OrderedFixtureInterface
     public function load(ObjectManager $manager): void
     {
         try {
-            $csv = Reader::createFromPath(__DIR__.'/data/social_work_metadata.csv');
+            $csv = Reader::from(__DIR__.'/data/social_work_metadata.csv');
         } catch (\Throwable $e) {
             throw new \Exception('Error while loading CSV.', 0, $e);
         }
diff --git a/src/Bundle/ChillPersonBundle/Service/SocialWork/SocialActionCSVExportService.php b/src/Bundle/ChillPersonBundle/Service/SocialWork/SocialActionCSVExportService.php
index d19b01382..09b4442b2 100644
--- a/src/Bundle/ChillPersonBundle/Service/SocialWork/SocialActionCSVExportService.php
+++ b/src/Bundle/ChillPersonBundle/Service/SocialWork/SocialActionCSVExportService.php
@@ -38,7 +38,7 @@ final readonly class SocialActionCSVExportService
             array_keys($this->formatRow(new SocialAction()))
         );
 
-        $csv = Writer::createFromPath('php://temp', 'w+');
+        $csv = Writer::from('php://temp', 'w+');
         $csv->insertOne($headers);
 
         foreach ($actions as $action) {
diff --git a/src/Bundle/ChillPersonBundle/Service/SocialWork/SocialIssueCSVExportService.php b/src/Bundle/ChillPersonBundle/Service/SocialWork/SocialIssueCSVExportService.php
index ce403d192..8a3ba708f 100644
--- a/src/Bundle/ChillPersonBundle/Service/SocialWork/SocialIssueCSVExportService.php
+++ b/src/Bundle/ChillPersonBundle/Service/SocialWork/SocialIssueCSVExportService.php
@@ -36,7 +36,7 @@ readonly class SocialIssueCSVExportService
     public function generateCsv(array $issues): Writer
     {
         // CSV headers
-        $csv = Writer::createFromPath('php://temp', 'r+');
+        $csv = Writer::from('php://temp', 'r+');
         $csv->insertOne(
             array_map(
                 fn (string $e) => $this->translator->trans($e),
diff --git a/src/Bundle/ChillThirdPartyBundle/Controller/ThirdpartyCSVExportController.php b/src/Bundle/ChillThirdPartyBundle/Controller/ThirdpartyCSVExportController.php
index 708d08076..6c7a70014 100644
--- a/src/Bundle/ChillThirdPartyBundle/Controller/ThirdpartyCSVExportController.php
+++ b/src/Bundle/ChillThirdPartyBundle/Controller/ThirdpartyCSVExportController.php
@@ -52,7 +52,7 @@ class ThirdpartyCSVExportController extends AbstractController
             fwrite($output, "\xEF\xBB\xBF");
 
             // Create CSV writer
-            $csv = Writer::createFromStream($output);
+            $csv = Writer::from($output);
 
             // Write header row
             $header = array_map(

From 94744b9542fea50511c653971e98ab92dd5cad42 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 27 Oct 2025 15:58:48 +0000
Subject: [PATCH 196/283] Send notifications log to dedicated `notifierLogger`
 channel if available

---
 .changes/unreleased/DX-20251027-150053.yaml                | 7 +++++++
 .../Service/Notifier/SentMessageEventSubscriber.php        | 6 +++---
 2 files changed, 10 insertions(+), 3 deletions(-)
 create mode 100644 .changes/unreleased/DX-20251027-150053.yaml

diff --git a/.changes/unreleased/DX-20251027-150053.yaml b/.changes/unreleased/DX-20251027-150053.yaml
new file mode 100644
index 000000000..880894bd4
--- /dev/null
+++ b/.changes/unreleased/DX-20251027-150053.yaml
@@ -0,0 +1,7 @@
+kind: DX
+body: |
+    Send notifications log to dedicated channel, if it exists
+time: 2025-10-27T15:00:53.309372316+01:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillMainBundle/Service/Notifier/SentMessageEventSubscriber.php b/src/Bundle/ChillMainBundle/Service/Notifier/SentMessageEventSubscriber.php
index 2d003d775..92d9c3fdd 100644
--- a/src/Bundle/ChillMainBundle/Service/Notifier/SentMessageEventSubscriber.php
+++ b/src/Bundle/ChillMainBundle/Service/Notifier/SentMessageEventSubscriber.php
@@ -18,7 +18,7 @@ use Symfony\Component\Notifier\Event\SentMessageEvent;
 final readonly class SentMessageEventSubscriber implements EventSubscriberInterface
 {
     public function __construct(
-        private LoggerInterface $logger,
+        private LoggerInterface $notifierLogger, // will be send to "notifierLogger" if it exists
     ) {}
 
     public static function getSubscribedEvents()
@@ -33,9 +33,9 @@ final readonly class SentMessageEventSubscriber implements EventSubscriberInterf
         $message = $event->getMessage();
 
         if (null === $message->getMessageId()) {
-            $this->logger->info('[sms] a sms message did not had any id after sending.', ['validReceiversI' => $message->getOriginalMessage()->getRecipientId()]);
+            $this->notifierLogger->info('[sms] a sms message did not had any id after sending.', ['validReceiversI' => $message->getOriginalMessage()->getRecipientId()]);
         } else {
-            $this->logger->warning('[sms] a sms was sent', ['validReceiversI' => $message->getOriginalMessage()->getRecipientId(), 'idsI' => $message->getMessageId()]);
+            $this->notifierLogger->warning('[sms] a sms was sent', ['validReceiversI' => $message->getOriginalMessage()->getRecipientId(), 'idsI' => $message->getMessageId()]);
         }
     }
 }

From 2221d17930c0cb099a4fc6900fdf7023fd34ce43 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 29 Oct 2025 11:13:59 +0100
Subject: [PATCH 197/283] Redo ux for selceting follow-up preferences for
 workflow

---
 .changes/unreleased/UX-20251029-110804.yaml   |  6 ++
 .../EntityWorkflowVueSubscriber.vue           | 56 +++++++++----------
 2 files changed, 32 insertions(+), 30 deletions(-)
 create mode 100644 .changes/unreleased/UX-20251029-110804.yaml

diff --git a/.changes/unreleased/UX-20251029-110804.yaml b/.changes/unreleased/UX-20251029-110804.yaml
new file mode 100644
index 000000000..5342d3a1e
--- /dev/null
+++ b/.changes/unreleased/UX-20251029-110804.yaml
@@ -0,0 +1,6 @@
+kind: UX
+body: Improve the ux for selecting whether user wants to be notified of the final step of a workflow or all steps
+time: 2025-10-29T11:08:04.077020411+01:00
+custom:
+    Issue: "542"
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/EntityWorkflowVueSubscriber.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/EntityWorkflowVueSubscriber.vue
index 332849ef5..a9e5348ea 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/EntityWorkflowVueSubscriber.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/EntityWorkflowVueSubscriber.vue
@@ -1,40 +1,38 @@
 <template>
     <div class="d-grid gap-2 my-3">
         <button
-            class="btn btn-misc"
+            class="btn btn-outline-primary text-start d-flex align-items-center"
+            :class="{ active: subscriberFinal }"
             type="button"
-            v-if="!subscriberFinal"
-            @click="subscribeTo('subscribe', 'final')"
+            @click="
+                subscribeTo(
+                    subscriberFinal ? 'unsubscribe' : 'subscribe',
+                    'final',
+                )
+            "
         >
-            <i class="fa fa-check fa-fw"></i>
-            {{ trans(WORKFLOW_SUBSCRIBE_FINAL) }}
+            <i
+                class="fa fa-fw me-2"
+                :class="subscriberFinal ? 'fa-check-square-o' : 'fa-square-o'"
+            ></i>
+            <span>{{ trans(WORKFLOW_SUBSCRIBE_FINAL) }}</span>
         </button>
         <button
-            class="btn btn-misc"
+            class="btn btn-outline-primary text-start d-flex align-items-center"
+            :class="{ active: subscriberStep }"
             type="button"
-            v-if="subscriberFinal"
-            @click="subscribeTo('unsubscribe', 'final')"
+            @click="
+                subscribeTo(
+                    subscriberStep ? 'unsubscribe' : 'subscribe',
+                    'step',
+                )
+            "
         >
-            <i class="fa fa-times fa-fw"></i>
-            {{ trans(WORKFLOW_UNSUBSCRIBE_FINAL) }}
-        </button>
-        <button
-            class="btn btn-misc"
-            type="button"
-            v-if="!subscriberStep"
-            @click="subscribeTo('subscribe', 'step')"
-        >
-            <i class="fa fa-check fa-fw"></i>
-            {{ trans(WORKFLOW_SUBSCRIBE_ALL_STEPS) }}
-        </button>
-        <button
-            class="btn btn-misc"
-            type="button"
-            v-if="subscriberStep"
-            @click="subscribeTo('unsubscribe', 'step')"
-        >
-            <i class="fa fa-times fa-fw"></i>
-            {{ trans(WORKFLOW_UNSUBSCRIBE_ALL_STEPS) }}
+            <i
+                class="fa fa-fw me-2"
+                :class="subscriberStep ? 'fa-check-square-o' : 'fa-square-o'"
+            ></i>
+            <span>{{ trans(WORKFLOW_SUBSCRIBE_ALL_STEPS) }}</span>
         </button>
     </div>
 </template>
@@ -45,9 +43,7 @@ import { defineProps, defineEmits } from "vue";
 import {
     trans,
     WORKFLOW_SUBSCRIBE_FINAL,
-    WORKFLOW_UNSUBSCRIBE_FINAL,
     WORKFLOW_SUBSCRIBE_ALL_STEPS,
-    WORKFLOW_UNSUBSCRIBE_ALL_STEPS,
 } from "translator";
 
 // props

From 3d99c0f56132c1ed03d4d7e2333ff18b49db7c41 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 29 Oct 2025 15:26:06 +0100
Subject: [PATCH 198/283] Feature: add columns for comments linked to an
 activity (comment, user, date)

---
 .changes/unreleased/Feature-20251029-152510.yaml          | 6 ++++++
 .../Export/Export/ListActivityHelper.php                  | 8 ++++++++
 .../ChillActivityBundle/translations/messages.fr.yml      | 4 +++-
 3 files changed, 17 insertions(+), 1 deletion(-)
 create mode 100644 .changes/unreleased/Feature-20251029-152510.yaml

diff --git a/.changes/unreleased/Feature-20251029-152510.yaml b/.changes/unreleased/Feature-20251029-152510.yaml
new file mode 100644
index 000000000..fab026c08
--- /dev/null
+++ b/.changes/unreleased/Feature-20251029-152510.yaml
@@ -0,0 +1,6 @@
+kind: Feature
+body: Add columns for comments linked to an activity in the activity list export
+time: 2025-10-29T15:25:10.493968528+01:00
+custom:
+    Issue: "404"
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillActivityBundle/Export/Export/ListActivityHelper.php b/src/Bundle/ChillActivityBundle/Export/Export/ListActivityHelper.php
index dd817e7ab..c3a4428aa 100644
--- a/src/Bundle/ChillActivityBundle/Export/Export/ListActivityHelper.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/ListActivityHelper.php
@@ -66,6 +66,9 @@ class ListActivityHelper
             ->leftJoin('activity.location', 'location')
             ->addSelect('location.name AS locationName')
             ->addSelect('activity.sentReceived')
+            ->addSelect('activity.comment.comment AS commentText')
+            ->addSelect('activity.comment.date AS commentDate')
+            ->addSelect('JSON_BUILD_OBJECT(\'uid\', activity.comment.userId, \'d\', activity.comment.date) AS commentUser')
             ->addSelect('JSON_BUILD_OBJECT(\'uid\', IDENTITY(activity.createdBy), \'d\', activity.createdAt) AS createdBy')
             ->addSelect('activity.createdAt')
             ->addSelect('JSON_BUILD_OBJECT(\'uid\', IDENTITY(activity.updatedBy), \'d\', activity.updatedAt) AS updatedBy')
@@ -87,6 +90,8 @@ class ListActivityHelper
             'createdAt', 'updatedAt' => $this->dateTimeHelper->getLabel($key),
             'createdBy', 'updatedBy' => $this->userHelper->getLabel($key, $values, $key),
             'date' => $this->dateTimeHelper->getLabel(self::MSG_KEY.$key),
+            'commentDate' => $this->dateTimeHelper->getLabel(self::MSG_KEY.'comment_date'),
+            'commentUser' => $this->userHelper->getLabel($key, $values, self::MSG_KEY.'comment_user'),
             'attendeeName' => function ($value) {
                 if ('_header' === $value) {
                     return 'Attendee';
@@ -176,6 +181,9 @@ class ListActivityHelper
             'usersNames',
             'thirdPartiesIds',
             'thirdPartiesNames',
+            'commentText',
+            'commentDate',
+            'commentUser',
             'createdBy',
             'createdAt',
             'updatedBy',
diff --git a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
index 883310df9..380ac235d 100644
--- a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
@@ -404,7 +404,9 @@ export:
             id: Identifiant
             List activities linked to an accompanying course: Liste les échanges liés à un parcours en fonction de différents filtres.
             List activity linked to a course: Liste des échanges liés à un parcours
-
+            commentText: Commentaire
+            comment_date: Date de la dernière édition du commentaire
+            comment_user: Dernière édition par
 
     filter:
         activity:

From bf38ec22c93ba984f3b3969878ff0ebff06474aa Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 30 Oct 2025 11:40:20 +0100
Subject: [PATCH 199/283] Add missing import in FormEvaluation.vue and
 temporarily set wopi-bundle requirement to specific commit (until bundles is
 fully upgraded to sf7)

---
 composer.json                                                   | 2 +-
 .../AccompanyingCourseWorkEdit/components/FormEvaluation.vue    | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 8d36d4d07..6740b8538 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
         "ext-openssl": "*",
         "ext-redis": "*",
         "ext-zlib": "*",
-        "champs-libres/wopi-bundle": "dev-master@dev",
+        "champs-libres/wopi-bundle": "dev-master#1be045ee95310d2037683859ecefdbf3a10f7be6 as 0.4.x-dev",
         "champs-libres/wopi-lib": "dev-master@dev",
         "doctrine/data-fixtures": "^1.8",
         "doctrine/doctrine-bundle": "^2.1",
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
index 76eaf2e9e..7bdde14e9 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
@@ -60,6 +60,7 @@ import {
     EVALUATION_DOCUMENT_MOVE_SUCCESS,
 } from "translator";
 import { useToast } from "vue-toast-notification";
+import { buildLinkCreate as buildLinkCreateNotification } from "ChillMainAssets/lib/entity-notification/api";
 
 const props = defineProps(["evaluation", "docAnchorId"]);
 const store = useStore();

From 722b37fbcc1a296a6e298ae86a4866b09d72c59f Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 4 Nov 2025 09:28:23 +0100
Subject: [PATCH 200/283] Set wopi-bundle dependency back to original

---
 composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/composer.json b/composer.json
index 6740b8538..8d36d4d07 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
         "ext-openssl": "*",
         "ext-redis": "*",
         "ext-zlib": "*",
-        "champs-libres/wopi-bundle": "dev-master#1be045ee95310d2037683859ecefdbf3a10f7be6 as 0.4.x-dev",
+        "champs-libres/wopi-bundle": "dev-master@dev",
         "champs-libres/wopi-lib": "dev-master@dev",
         "doctrine/data-fixtures": "^1.8",
         "doctrine/doctrine-bundle": "^2.1",

From 769d76a0cca503069beb55db1aafaaa36931446b Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 4 Nov 2025 13:52:54 +0100
Subject: [PATCH 201/283] Fix the possibility to delete a workflow when it is
 on hold

---
 .../unreleased/Fixed-20251104-135108.yaml     |  6 +++
 .../Entity/Workflow/EntityWorkflowStep.php    |  2 +-
 .../migrations/Version20251104124123.php      | 46 +++++++++++++++++++
 3 files changed, 53 insertions(+), 1 deletion(-)
 create mode 100644 .changes/unreleased/Fixed-20251104-135108.yaml
 create mode 100644 src/Bundle/ChillMainBundle/migrations/Version20251104124123.php

diff --git a/.changes/unreleased/Fixed-20251104-135108.yaml b/.changes/unreleased/Fixed-20251104-135108.yaml
new file mode 100644
index 000000000..a96d57edb
--- /dev/null
+++ b/.changes/unreleased/Fixed-20251104-135108.yaml
@@ -0,0 +1,6 @@
+kind: Fixed
+body: Fix the possibility to delete a workflow
+time: 2025-11-04T13:51:08.113234488+01:00
+custom:
+    Issue: ""
+    SchemaChange: Drop or rename table or columns, or enforce new constraint that must be manually fixed
diff --git a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php
index 24acc4f78..13978493a 100644
--- a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php
+++ b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php
@@ -123,7 +123,7 @@ class EntityWorkflowStep
     /**
      * @var Collection<int, EntityWorkflowStepHold>
      */
-    #[ORM\OneToMany(mappedBy: 'step', targetEntity: EntityWorkflowStepHold::class)]
+    #[ORM\OneToMany(mappedBy: 'step', targetEntity: EntityWorkflowStepHold::class, cascade: ['remove'])]
     private Collection $holdsOnStep;
 
     /**
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20251104124123.php b/src/Bundle/ChillMainBundle/migrations/Version20251104124123.php
new file mode 100644
index 000000000..9ba086f36
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/migrations/Version20251104124123.php
@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\Migrations\Main;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20251104124123 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Delete on cascade EntityWorkflowStepHold';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_main_workflow_entity_step_hold
+                   DROP CONSTRAINT fk_1be2e7c73b21e9c');
+
+        $this->addSql('ALTER TABLE chill_main_workflow_entity_step_hold
+                   ADD CONSTRAINT fk_1be2e7c73b21e9c
+                   FOREIGN KEY (step_id)
+                   REFERENCES chill_main_workflow_entity_step (id)
+                   ON DELETE CASCADE');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_main_workflow_entity_step_hold
+                   DROP CONSTRAINT fk_1be2e7c73b21e9c');
+
+        $this->addSql('ALTER TABLE chill_main_workflow_entity_step_hold
+                   ADD CONSTRAINT fk_1be2e7c73b21e9c
+                   FOREIGN KEY (step_id)
+                   REFERENCES chill_main_workflow_entity_step (id)');
+    }
+}

From b7a92bf656648aff8fcc431cb4f3282be47470be Mon Sep 17 00:00:00 2001
From: LenaertsJ <julie.lenaerts@champs-libres.coop>
Date: Tue, 4 Nov 2025 15:25:10 +0000
Subject: [PATCH 202/283] Resolve "Partout, renommer "cercle" en "service" et
 "centre" en "territoire""

---
 .changes/unreleased/UX-20251006-123932.yaml   |   6 +
 CHANGELOG.md                                  | 384 +++++++++---------
 .../bundles/docStore/doc_store_classes.puml   |   4 +-
 .../development/database-principles.rst       |   2 +-
 .../development/database/table_list.csv       |   8 +-
 .../translations/messages.fr.yml              |   6 +-
 .../src/translations/messages.fr.yml          |   2 +-
 .../Controller/EventController.php            |   2 +-
 .../translations/messages.fr.yml              |   6 +-
 .../Resources/views/User/index.html.twig      |   2 +-
 .../MenuBuilder/AdminUserMenuBuilder.php      |   2 +-
 .../Tests/Controller/ScopeControllerTest.php  |   2 +-
 .../translations/messages.fr.yml              |  90 ++--
 .../translations/validators.fr.yml            |   8 +-
 .../vuejs/AccompanyingCourse/js/i18n.js       |   2 +-
 .../Resources/public/vuejs/VisGraph/i18n.js   |   4 +-
 .../Resources/public/vuejs/_js/i18n.ts        |   8 +-
 .../translations/messages.fr.yml              |  10 +-
 .../translations/validators.fr.yml            |   2 +-
 .../translations/messages.fr.yml              |   2 +-
 .../translations/messages.fr.yml              |   4 +-
 .../translations/messages.fr.yml              |   4 +-
 22 files changed, 283 insertions(+), 277 deletions(-)
 create mode 100644 .changes/unreleased/UX-20251006-123932.yaml

diff --git a/.changes/unreleased/UX-20251006-123932.yaml b/.changes/unreleased/UX-20251006-123932.yaml
new file mode 100644
index 000000000..19f304e6a
--- /dev/null
+++ b/.changes/unreleased/UX-20251006-123932.yaml
@@ -0,0 +1,6 @@
+kind: UX
+body: Change the terms 'cercle' and 'centre' to 'service', and 'territoire' respectively.
+time: 2025-10-06T12:39:32.514056818+02:00
+custom:
+    Issue: "425"
+    SchemaChange: No schema change
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 359b777c5..13709b7b9 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -8,57 +8,57 @@ and is generated by [Changie](https://github.com/miniscruff/changie).
 
 ## v4.5.1 - 2025-10-03
 ### Fixed
-* Add missing javascript dependency   
-* Add exception handling for conversion of attachment on sending external, when documens are already in pdf   
+* Add missing javascript dependency
+* Add exception handling for conversion of attachment on sending external, when documens are already in pdf
 
 ## v4.5.0 - 2025-10-03
 ### Feature
-* Only allow delete of attachment on workflows that are not final   
-* Move up signature buttons on index workflow page for easier access   
-* Filter out document from attachment list if it is the same as the workflow document   
-* Block edition on attached document on workflow, if the workflow is finalized or sent external   
-* Convert workflow's attached document to pdf while sending them external   
-* After a signature is canceled or rejected, going to a waiting page until the post-process routines apply a workflow transition   
+* Only allow delete of attachment on workflows that are not final
+* Move up signature buttons on index workflow page for easier access
+* Filter out document from attachment list if it is the same as the workflow document
+* Block edition on attached document on workflow, if the workflow is finalized or sent external
+* Convert workflow's attached document to pdf while sending them external
+* After a signature is canceled or rejected, going to a waiting page until the post-process routines apply a workflow transition
 ### Fixed
-* ([#426](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/426)) Increased the number of required characters when setting a new password in Chill from 9 to 14 - GDPR compliance   
-* Fix permissions on storedObject which are subject by a workflow   
+* ([#426](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/426)) Increased the number of required characters when setting a new password in Chill from 9 to 14 - GDPR compliance
+* Fix permissions on storedObject which are subject by a workflow
 ### DX
-* Introduce a WaitingScreen component to display a waiting screen   
+* Introduce a WaitingScreen component to display a waiting screen
 
 ## v4.4.2 - 2025-09-12
 ### Fixed
-* Fix document generation and workflow generation do not work on accompanying period work documents   
+* Fix document generation and workflow generation do not work on accompanying period work documents
 
 ## v4.4.1 - 2025-09-11
 ### Fixed
-* fix translations in duplicate evaluation document modal and realign close modal button   
+* fix translations in duplicate evaluation document modal and realign close modal button
 
 ## v4.4.0 - 2025-09-11
 ### Feature
-* ([#359](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/359)) Allow the merge of two accompanying period works   
-* ([#369](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/369)) Duplication of a document to another accompanying period work evaluation   
-* ([#359](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/359)) Fusion of two accompanying period works   
+* ([#359](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/359)) Allow the merge of two accompanying period works
+* ([#369](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/369)) Duplication of a document to another accompanying period work evaluation
+* ([#359](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/359)) Fusion of two accompanying period works
 ### Fixed
-* Fix display of 'duplicate' and 'merge' buttons in CRUD templates   
-* Fix saving notification preferences in user's profile   
+* Fix display of 'duplicate' and 'merge' buttons in CRUD templates
+* Fix saving notification preferences in user's profile
 
 ## v4.3.0 - 2025-09-08
 ### Feature
-* ([#409](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/409)) Add 45 and 60 min calendar ranges   
-* Add a command to generate a list of permissions   
-* ([#412](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/412)) Add an absence end date   
+* ([#409](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/409)) Add 45 and 60 min calendar ranges
+* Add a command to generate a list of permissions
+* ([#412](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/412)) Add an absence end date
 
   **Schema Change**: Add columns or tables
 ### Fixed
-* fix date formatting in calendar range display   
-* Change route URL to avoid clash with person duplicate controller method   
+* fix date formatting in calendar range display
+* Change route URL to avoid clash with person duplicate controller method
 
 ## v4.2.1 - 2025-09-03
 ### Fixed
-* Fix exports to work with DirectExportInterface   
+* Fix exports to work with DirectExportInterface
 ### DX
 * Improve error message when a stored object cannot be written on local disk
-   
+
 
 ## v4.2.0 - 2025-09-02
 ### Feature
@@ -73,26 +73,26 @@ and is generated by [Changie](https://github.com/miniscruff/changie).
 
 ## v4.1.0 - 2025-08-26
 ### Feature
-* ([#400](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/400)) Add filter to social actions list to filter out actions where current user intervenes   
-* ([#399](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/399)) Show filters on list pages unfolded by default   
-* Expansion of event module with new fields in the creation form: thematic, internal/external animator, responsable, and budget elements. Filtering options in the event list + adapted exports   
+* ([#400](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/400)) Add filter to social actions list to filter out actions where current user intervenes
+* ([#399](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/399)) Show filters on list pages unfolded by default
+* Expansion of event module with new fields in the creation form: thematic, internal/external animator, responsable, and budget elements. Filtering options in the event list + adapted exports
 
   **Schema Change**: Add columns or tables
 ### Fixed
-* ([#382](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/382)) adjust display logic for accompanying period dates, include closing date if period is closed.   
-* ([#384](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/384)) add min and step attributes to integer field in DateIntervalType   
+* ([#382](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/382)) adjust display logic for accompanying period dates, include closing date if period is closed.
+* ([#384](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/384)) add min and step attributes to integer field in DateIntervalType
 ### UX
-* Limit display of participations in event list   
+* Limit display of participations in event list
 
 ## v4.0.2 - 2025-07-09
 ### Fixed
-* Fix add missing translation   
-* Fix the transfer of evaluations and documents during of accompanyingperiodwork   
+* Fix add missing translation
+* Fix the transfer of evaluations and documents during of accompanyingperiodwork
 
 ## v4.0.1 - 2025-07-08
 ### Fixed
 * Fix package.json for compilation
-   
+
 
 ## v4.0.0 - 2025-07-08
 ### Feature
@@ -171,30 +171,30 @@ framework:
 
 ## v3.12.1 - 2025-06-30
 ### Fixed
-* Fix loading of the list of documents   
+* Fix loading of the list of documents
 
 ## v3.12.0 - 2025-06-30
 ### Feature
-* ([#377](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/377)) Add the document file name to the document title when a user upload a document, unless there is already a document title.   
-* Add desactivation date for social action and issue csv export   
-* Add Emoji and Fullscreen feature to ckeditor configuration   
-* ([#321](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/321)) Create editor which allow us to toggle between rich and simple text editor   
-* Do not remove workflow which are automatically canceled after staling for more than 30 days   
+* ([#377](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/377)) Add the document file name to the document title when a user upload a document, unless there is already a document title.
+* Add desactivation date for social action and issue csv export
+* Add Emoji and Fullscreen feature to ckeditor configuration
+* ([#321](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/321)) Create editor which allow us to toggle between rich and simple text editor
+* Do not remove workflow which are automatically canceled after staling for more than 30 days
 ### Fixed
-* ([#376](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/376)) trying to prevent bug of typeerror in doc-history + improved display of document history   
-* ([#381](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/381)) Display previous participation in acc course work even if the person has left the acc course   
-* ([#372](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/372)) Fix display of text in calendar events   
-* Add missing translation for user_group.no_user_groups   
-* Fix admin entity edit actions for event admin entities and activity reason (category) entities   
+* ([#376](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/376)) trying to prevent bug of typeerror in doc-history + improved display of document history
+* ([#381](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/381)) Display previous participation in acc course work even if the person has left the acc course
+* ([#372](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/372)) Fix display of text in calendar events
+* Add missing translation for user_group.no_user_groups
+* Fix admin entity edit actions for event admin entities and activity reason (category) entities
 * ([#392](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/392)) Allow null and cast as string to setContent method for NewsItem
-   
-* ([#393](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/393)) Doc Generation: the "dump only" method send the document as an email attachment.   
+
+* ([#393](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/393)) Doc Generation: the "dump only" method send the document as an email attachment.
 ### DX
-* ([#352](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/352)) Remove dead code for wopi-link module   
-* Replace library node-sass by sass, and upgrade bootstrap to version 5.3 (yarn upgrade / install is required)   
+* ([#352](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/352)) Remove dead code for wopi-link module
+* Replace library node-sass by sass, and upgrade bootstrap to version 5.3 (yarn upgrade / install is required)
 ### UX
-* ([#374](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/374)) Remove default filter in_progress for the page 'my tasks'; Allows for new tasks to be displayed upon opening of the page   
-* Improve labeling of fields in person resource creation form   
+* ([#374](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/374)) Remove default filter in_progress for the page 'my tasks'; Allows for new tasks to be displayed upon opening of the page
+* Improve labeling of fields in person resource creation form
 
 ## v3.11.0 - 2025-04-17
 ### Feature
@@ -218,11 +218,11 @@ framework:
 
 ## v3.10.3 - 2025-03-18
 ### DX
-* Eslint fixes   
+* Eslint fixes
 
 ## v3.10.2 - 2025-03-17
 ### Fixed
-* Replace a ts-expect-error with a ts-ignore   
+* Replace a ts-expect-error with a ts-ignore
 
 ## v3.10.1 - 2025-03-17
 ### DX
@@ -230,37 +230,37 @@ framework:
 
 ## v3.10.0 - 2025-03-17
 ### Feature
-* ([#363](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/363)) Display social actions grouped per social issue within activity form   
+* ([#363](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/363)) Display social actions grouped per social issue within activity form
 ### Fixed
-* ([#362](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/362)) Fix Dependency Injection, which prevented to save the CalendarRange   
-* ([#368](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/368)) fix search query for user groups   
+* ([#362](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/362)) Fix Dependency Injection, which prevented to save the CalendarRange
+* ([#368](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/368)) fix search query for user groups
 
 ## v3.9.2 - 2025-02-27
 ### Fixed
-* Use fetchResults method to fetch all social issues instead of only the first page   
+* Use fetchResults method to fetch all social issues instead of only the first page
 
 ## v3.9.1 - 2025-02-27
 ### Fixed
-* Fix post/patch request with missing 'type' property for gender   
+* Fix post/patch request with missing 'type' property for gender
 
 ## v3.9.0 - 2025-02-27
 ### Feature
-* ([#349](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/349)) Suggest all referrers within actions of the accompanying period when creating an activity   
-* ([#343](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/343)) Add possibility to export a csv with all social issues and social actions   
-* ([#360](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/360)) Restore document to previous kept version when a workflow is canceled   
-* ([#341](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/341)) Add a list of third parties from within the admin (csv download)   
+* ([#349](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/349)) Suggest all referrers within actions of the accompanying period when creating an activity
+* ([#343](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/343)) Add possibility to export a csv with all social issues and social actions
+* ([#360](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/360)) Restore document to previous kept version when a workflow is canceled
+* ([#341](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/341)) Add a list of third parties from within the admin (csv download)
 ### Fixed
-* fix generation of document with accompanying period context, and list of activities and works   
+* fix generation of document with accompanying period context, and list of activities and works
 ### DX
-* ([#333](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/333)) Create an unique source of trust for translations   
+* ([#333](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/333)) Create an unique source of trust for translations
 
 ## v3.8.2 - 2025-02-10
 ### Fixed
-* ([#358](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/358)) Remove "filter" button on list of documents in the workflow's "add attachement" modal   
+* ([#358](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/358)) Remove "filter" button on list of documents in the workflow's "add attachement" modal
 
 ## v3.8.1 - 2025-02-05
 ### Fixed
-* Fix household link in the parcours banner   
+* Fix household link in the parcours banner
 
 ## v3.8.0 - 2025-02-03
 ### Feature
@@ -276,7 +276,7 @@ framework:
 
 ## v3.7.1 - 2025-01-21
 ### Fixed
-* Fix legacy configuration processor for notifier component   
+* Fix legacy configuration processor for notifier component
 
 ## v3.7.0 - 2025-01-21
 ### Feature
@@ -343,33 +343,33 @@ chill_main:
 
 ## v3.6.0 - 2025-01-16
 ### Feature
-* Importer for addresses does not fails when the postal code is not found with some addresses, and compute a recap list of all addresses that could not be imported. This recap list can be send by email. 
+* Importer for addresses does not fails when the postal code is not found with some addresses, and compute a recap list of all addresses that could not be imported. This recap list can be send by email.
 * ([#346](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/346)) Create a driver for storing documents on disk (instead of openstack object store)
- 
-* Add address importer from french Base d'Adresse Nationale (BAN) 
-* ([#343](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/343)) Add csv export for social issues and social actions 
+
+* Add address importer from french Base d'Adresse Nationale (BAN)
+* ([#343](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/343)) Add csv export for social issues and social actions
 ### Fixed
-* Export: fix missing alias in activity between certain dates filter. Condition added for alias. 
+* Export: fix missing alias in activity between certain dates filter. Condition added for alias.
 
 ## v3.5.3 - 2025-01-07
 ### Fixed
-* Fix the EntityToJsonTransformer to return an empty array if the value is "" 
+* Fix the EntityToJsonTransformer to return an empty array if the value is ""
 
 ## v3.5.2 - 2024-12-19
 ### Fixed
-* ([#345](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/345)) Export: activity filtering of users that were associated to an activity between certain dates. Results contained activities that were not within the specified date range" 
+* ([#345](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/345)) Export: activity filtering of users that were associated to an activity between certain dates. Results contained activities that were not within the specified date range"
 
 ## v3.5.1 - 2024-12-16
 ### Fixed
-* Filiation: fix the display of the gender label in the graph 
-* Wrap handling of PdfSignedMessage into transactions 
+* Filiation: fix the display of the gender label in the graph
+* Wrap handling of PdfSignedMessage into transactions
 
 ## v3.5.0 - 2024-12-09
 ### Feature
-* ([#318](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/318)) Show all the pages of the documents in the signature app 
+* ([#318](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/318)) Show all the pages of the documents in the signature app
 ### Fixed
-* Wrap the signature's change state into a transaction, to avoid race conditions 
-* Fix display of gender label 
+* Wrap the signature's change state into a transaction, to avoid race conditions
+* Fix display of gender label
 
 ## v3.4.3 - 2024-12-05
 ### Fixed
@@ -378,76 +378,76 @@ chill_main:
 
 ## v3.4.2 - 2024-12-05
 ### Fixed
-* ([#329](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/329)) Fix the serialization of gender for the generation of documents 
-* ([#337](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/337)) Enforce unique contraint on activity storedobject 
+* ([#329](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/329)) Fix the serialization of gender for the generation of documents
+* ([#337](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/337)) Enforce unique contraint on activity storedobject
 ### DX
-* ([#310](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/310)) Clean migrations, to reduce the number of bloated migration when running diff on schema 
+* ([#310](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/310)) Clean migrations, to reduce the number of bloated migration when running diff on schema
 
 ## v3.4.1 - 2024-11-22
 ### Fixed
-* Set the workflow's title to notification content and subject 
+* Set the workflow's title to notification content and subject
 
 ## v3.4.0 - 2024-11-20
 ### Feature
 * ([#314](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/314)) Admin: improve document type admin form with a select field for related class.
-Admin: Allow administrator to assign multiple group centers in one go to a user. 
+Admin: Allow administrator to assign multiple group centers in one go to a user.
 
 ## v3.3.0 - 2024-11-20
 ### Feature
 * Electronic signature
 
-Implementation of the electronic signature for documents within chill. 
-* ([#286](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/286)) The behavoir of the voters for stored objects is adjusted so as to limit edit and delete possibilities to users related to the activity, social action or workflow entity. 
-* ([#288](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/288)) Metadata form added for person signatures 
-* Add a signature step in workflow, which allow to apply an electronic signature on documents 
-* Keep an history of each version of a stored object. 
-* Add a "send external" step in workflow, which allow to send stored objects and other elements to remote people, by sending them a public url 
+Implementation of the electronic signature for documents within chill.
+* ([#286](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/286)) The behavoir of the voters for stored objects is adjusted so as to limit edit and delete possibilities to users related to the activity, social action or workflow entity.
+* ([#288](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/288)) Metadata form added for person signatures
+* Add a signature step in workflow, which allow to apply an electronic signature on documents
+* Keep an history of each version of a stored object.
+* Add a "send external" step in workflow, which allow to send stored objects and other elements to remote people, by sending them a public url
 ### Fixed
-* Adjust household list export to include households even if their address is NULL 
-* Remove validation of date string on deathDate 
+* Adjust household list export to include households even if their address is NULL
+* Remove validation of date string on deathDate
 
 ## v3.2.4 - 2024-11-06
 ### Fixed
-* Fix compilation of chill assets 
+* Fix compilation of chill assets
 
 ## v3.2.3 - 2024-11-05
 ### Fixed
 * ([#315](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/315)) Fix display of accompanying period work referrers. Only current referrers should be displayed.
-Fix color of Chill footer 
+Fix color of Chill footer
 
 ## v3.2.2 - 2024-10-31
 ### Fixed
-* Fix gender translation for unknown 
+* Fix gender translation for unknown
 
 ## v3.2.1 - 2024-10-31
 ### Fixed
-* Add the possibility of unknown to the gender entity 
-* Fix the fusion of person doubles by excluding accompanyingPeriod work entities to be deleted. They are moved instead. 
+* Add the possibility of unknown to the gender entity
+* Fix the fusion of person doubles by excluding accompanyingPeriod work entities to be deleted. They are moved instead.
 
 ## v3.2.0 - 2024-10-30
 ### Feature
-* Introduce a gender entity 
+* Introduce a gender entity
 
 ## v3.1.1 - 2024-10-01
 ### Fixed
-* ([#308](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/308)) Show only the current referrer in the page "show" for an accompanying period workf 
+* ([#308](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/308)) Show only the current referrer in the page "show" for an accompanying period workf
 * ([#309](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/309)) Correctly compute the grouping by referrer aggregator
- 
-* Fixed typing of custom field long choice and custom field group 
+
+* Fixed typing of custom field long choice and custom field group
 
 ## v3.1.0 - 2024-08-30
 ### Feature
-* Add export aggregator to aggregate activities by household + filter persons that are not part of an accompanyingperiod during a certain timeframe. 
+* Add export aggregator to aggregate activities by household + filter persons that are not part of an accompanyingperiod during a certain timeframe.
 
 ## v3.0.0 - 2024-08-26
 ### Fixed
-* Fix delete action for accompanying periods in draft state 
-* Fix connection to azure when making an calendar event in chill 
-* CollectionType js fixes for remove button and adding multiple entries 
+* Fix delete action for accompanying periods in draft state
+* Fix connection to azure when making an calendar event in chill
+* CollectionType js fixes for remove button and adding multiple entries
 
 ## v2.24.0 - 2024-09-11
 ### Feature
-* ([#306](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/306)) When a document is converted or downloaded in the browser, this document is removed from the browser memory after 45s. Future click on the button re-download the document. 
+* ([#306](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/306)) When a document is converted or downloaded in the browser, this document is removed from the browser memory after 45s. Future click on the button re-download the document.
 
 ## v2.23.0 - 2024-07-23 & 2024-07-19
 ### Feature
@@ -482,13 +482,13 @@ Fix color of Chill footer
 
 ## v2.22.2 - 2024-07-03
 ### Fixed
-* Remove scope required for event participation stats 
+* Remove scope required for event participation stats
 
 ## v2.22.1 - 2024-07-01
 ### Fixed
-* Remove debug word 
+* Remove debug word
 ### DX
-* Add a command for reading official address DB from Luxembourg and update chill addresses 
+* Add a command for reading official address DB from Luxembourg and update chill addresses
 
 ## v2.22.0 - 2024-06-25
 ### Feature
@@ -531,7 +531,7 @@ Fix color of Chill footer
 
 ## v2.20.1 - 2024-06-05
 ### Fixed
-* Do not allow StoredObjectCreated for edit and convert buttons 
+* Do not allow StoredObjectCreated for edit and convert buttons
 
 ## v2.20.0 - 2024-06-05
 ### Fixed
@@ -578,96 +578,96 @@ Fix color of Chill footer
 
 ## v2.18.2 - 2024-04-12
 ### Fixed
-* ([#250](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/250)) Postal codes import : fix the source URL and the keys to handle each record 
+* ([#250](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/250)) Postal codes import : fix the source URL and the keys to handle each record
 
 ## v2.18.1 - 2024-03-26
 ### Fixed
-* Fix layout issue in document generation for admin (minor) 
+* Fix layout issue in document generation for admin (minor)
 
 ## v2.18.0 - 2024-03-26
 ### Feature
-* ([#268](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/268)) Improve admin UX to configure document templates for document generation 
+* ([#268](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/268)) Improve admin UX to configure document templates for document generation
 ### Fixed
-* ([#267](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/267)) Fix the join between job and user in the user list (admin): show only the current user job 
+* ([#267](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/267)) Fix the join between job and user in the user list (admin): show only the current user job
 
 ## v2.17.0 - 2024-03-19
 ### Feature
-* ([#237](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/237)) New export filter for social actions with an evaluation created between two dates 
-* ([#258](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/258)) In the list of accompangying period, add the list of person's centers and the duration of the course 
-* ([#238](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/238)) Allow to customize list person with new fields 
+* ([#237](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/237)) New export filter for social actions with an evaluation created between two dates
+* ([#258](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/258)) In the list of accompangying period, add the list of person's centers and the duration of the course
+* ([#238](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/238)) Allow to customize list person with new fields
 * ([#159](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/159)) Admin can publish news on the homepage
 ### Fixed
-* ([#264](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/264)) Fix languages: load the languages in all availables languages configured for Chill 
-* ([#259](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/259)) Keep a consistent behaviour between the filtering of activities within the document generation (model "accompanying period with activities"), and the same filter in the list of activities for an accompanying period 
+* ([#264](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/264)) Fix languages: load the languages in all availables languages configured for Chill
+* ([#259](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/259)) Keep a consistent behaviour between the filtering of activities within the document generation (model "accompanying period with activities"), and the same filter in the list of activities for an accompanying period
 
 ## v2.16.3 - 2024-02-26
 ### Fixed
-* ([#236](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/236)) Fix translation of user job -> 'service' must be 'métier' 
+* ([#236](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/236)) Fix translation of user job -> 'service' must be 'métier'
 ### UX
-* ([#232](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/232)) Order user jobs and services alphabetically in export filters 
+* ([#232](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/232)) Order user jobs and services alphabetically in export filters
 
 ## v2.16.2 - 2024-02-21
 ### Fixed
-* Check for null values in closing motive of parcours d'accompagnement for correct rendering of template 
+* Check for null values in closing motive of parcours d'accompagnement for correct rendering of template
 
 ## v2.16.1 - 2024-02-09
 ### Fixed
-* Force bootstrap version to avoid error in builds with newer version 
+* Force bootstrap version to avoid error in builds with newer version
 
 ## v2.16.0 - 2024-02-08
 ### Feature
-* ([#231](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/231)) Create new filter for persons having a participation in an accompanying period during a certain time span 
-* ([#241](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/241)) [Export][List of accompanyign period] Add two columns: the list of persons participating to the period, and their ids 
-* ([#244](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/244)) Add capability to generate export about change of steps of accompanying period, and generate exports for this 
-* ([#253](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/253)) Export: group accompanying period by person participating 
-* ([#243](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/243)) Export: add filter for courses not linked to a reference address 
-* ([#229](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/229)) Allow to group activities linked with accompanying period by reason 
-* ([#115](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/115)) Prevent social work to be saved when another user edited conccurently the social work 
-* Modernize the event bundle, with some new fields and multiple improvements 
+* ([#231](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/231)) Create new filter for persons having a participation in an accompanying period during a certain time span
+* ([#241](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/241)) [Export][List of accompanyign period] Add two columns: the list of persons participating to the period, and their ids
+* ([#244](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/244)) Add capability to generate export about change of steps of accompanying period, and generate exports for this
+* ([#253](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/253)) Export: group accompanying period by person participating
+* ([#243](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/243)) Export: add filter for courses not linked to a reference address
+* ([#229](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/229)) Allow to group activities linked with accompanying period by reason
+* ([#115](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/115)) Prevent social work to be saved when another user edited conccurently the social work
+* Modernize the event bundle, with some new fields and multiple improvements
 ### Fixed
-* ([#220](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/220)) Fix error in logs about wrong typing of eventArgs in onEditNotificationComment method 
-* ([#256](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/256)) Fix the conditions upon which social actions should be optional or required in relation to social issues within the activity creation form 
+* ([#220](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/220)) Fix error in logs about wrong typing of eventArgs in onEditNotificationComment method
+* ([#256](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/256)) Fix the conditions upon which social actions should be optional or required in relation to social issues within the activity creation form
 ### UX
-* ([#260](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/260)) Order list of centers alphabetically in dropdown 'user' section admin. 
+* ([#260](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/260)) Order list of centers alphabetically in dropdown 'user' section admin.
 
 ## v2.15.2 - 2024-01-11
 ### Fixed
-* Fix the id_seq used when creating a new accompanying period participation during fusion of two person files 
+* Fix the id_seq used when creating a new accompanying period participation during fusion of two person files
 ### DX
-* Set placeholder to False for expanded EntityType form fields where required is set to False. 
+* Set placeholder to False for expanded EntityType form fields where required is set to False.
 
 ## v2.15.1 - 2023-12-20
 ### Fixed
-* Fix the household export query to exclude accompanying periods that are in draft state. 
+* Fix the household export query to exclude accompanying periods that are in draft state.
 ### DX
-* ([#167](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/167)) Fixed readthedocs compilation by updating readthedocs config file and requirements for Sphinx 
+* ([#167](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/167)) Fixed readthedocs compilation by updating readthedocs config file and requirements for Sphinx
 
 ## v2.15.0 - 2023-12-11
 ### Feature
-* ([#191](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/191)) Add export "number of household associate with an exchange" 
-* ([#235](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/235)) Export: add dates on the filter "filter course by activity type" 
+* ([#191](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/191)) Add export "number of household associate with an exchange"
+* ([#235](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/235)) Export: add dates on the filter "filter course by activity type"
 ### Fixed
-* ([#214](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/214)) Fix error when posting an empty comment on an accompanying period. 
-* ([#233](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/233)) Fix "filter evaluation by evaluation type" (and add select2 to the list of evaluation types to pick) 
+* ([#214](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/214)) Fix error when posting an empty comment on an accompanying period.
+* ([#233](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/233)) Fix "filter evaluation by evaluation type" (and add select2 to the list of evaluation types to pick)
 * ([#234](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/234)) Fix "filter aside activity by date"
- 
-* ([#228](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/228)) Fix export of activity for people created before the introduction of the createdAt column on person (during v1) 
-* ([#246](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/246)) Do not show activities, evaluations and social work when associated to a confidential accompanying period, except for the users which are allowed to see them 
+
+* ([#228](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/228)) Fix export of activity for people created before the introduction of the createdAt column on person (during v1)
+* ([#246](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/246)) Do not show activities, evaluations and social work when associated to a confidential accompanying period, except for the users which are allowed to see them
 
 ## v2.14.1 - 2023-11-29
 ### Fixed
-* Export: fix list person with custom fields 
-* ([#100](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/100)) Add a paginator to budget elements (resource and charge types) in the admin 
-* Fix error in ListEvaluation when "handling agents" are alone 
+* Export: fix list person with custom fields
+* ([#100](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/100)) Add a paginator to budget elements (resource and charge types) in the admin
+* Fix error in ListEvaluation when "handling agents" are alone
 
 ## v2.14.0 - 2023-11-24
 ### Feature
-* ([#161](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/161)) Export: in filter "Filter accompanying period work (social action) by type, goal and result", order the items alphabetically or with the defined order 
+* ([#161](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/161)) Export: in filter "Filter accompanying period work (social action) by type, goal and result", order the items alphabetically or with the defined order
 ### Fixed
-* ([#141](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/141)) Export: on filter "action by type goals, and results", restore the fields when editing a saved export 
-* ([#219](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/219)) Export: fix the list of accompanying period work, when the "calc date" is null 
-* ([#222](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/222)) Fix rendering of custom fields 
-* Fix various errors in custom fields administration 
+* ([#141](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/141)) Export: on filter "action by type goals, and results", restore the fields when editing a saved export
+* ([#219](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/219)) Export: fix the list of accompanying period work, when the "calc date" is null
+* ([#222](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/222)) Fix rendering of custom fields
+* Fix various errors in custom fields administration
 
 ## v2.13.0 - 2023-11-21
 ### Feature
@@ -681,7 +681,7 @@ Fix color of Chill footer
 
 ## v2.12.1 - 2023-11-16
 ### Fixed
-* ([#208](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/208)) Export: fix loading of form for "filter action by type, goal and result" 
+* ([#208](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/208)) Export: fix loading of form for "filter action by type, goal and result"
 
 ## v2.12.0 - 2023-11-15
 ### Feature
@@ -712,36 +712,36 @@ Fix color of Chill footer
 
 ## v2.11.0 - 2023-11-07
 ### Feature
-* ([#194](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/194)) Export: add a filter "filter activity by creator job" 
+* ([#194](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/194)) Export: add a filter "filter activity by creator job"
 ### Fixed
-* ([#185](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/185)) Export: fix "group accompanying period by geographical unit": take into account the accompanying periods when the period is not located within an unit 
-* Fix "group activity by creator job" aggregator 
+* ([#185](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/185)) Export: fix "group accompanying period by geographical unit": take into account the accompanying periods when the period is not located within an unit
+* Fix "group activity by creator job" aggregator
 
 ## v2.10.6 - 2023-11-07
 ### Fixed
-* ([#182](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/182)) Fix merging of double person files. Adjustement relationship sql statement 
-* ([#185](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/185)) Export: fix aggregator by geographical unit on person: avoid inconsistencies 
+* ([#182](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/182)) Fix merging of double person files. Adjustement relationship sql statement
+* ([#185](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/185)) Export: fix aggregator by geographical unit on person: avoid inconsistencies
 
 ## v2.10.5 - 2023-11-05
 ### Fixed
-* ([#183](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/183)) Fix "problem during download" on some filters, which used a wrong data type 
-* ([#184](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/184)) Fix filter "activity by date" 
+* ([#183](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/183)) Fix "problem during download" on some filters, which used a wrong data type
+* ([#184](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/184)) Fix filter "activity by date"
 
 ## v2.10.4 - 2023-10-26
 ### Fixed
-* Fix null value constraint errors when merging relationships in doubles 
+* Fix null value constraint errors when merging relationships in doubles
 
 ## v2.10.3 - 2023-10-26
 ### Fixed
-* ([#175](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/175)) Replace old method of getting translator with injection of translatorInterface 
+* ([#175](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/175)) Replace old method of getting translator with injection of translatorInterface
 
 ## v2.10.2 - 2023-10-26
 ### Fixed
-* ([#175](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/175)) Use injection of translator instead of ->get(). 
+* ([#175](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/175)) Use injection of translator instead of ->get().
 
 ## v2.10.1 - 2023-10-24
 ### Fixed
-* Fix export controller when generating an export without any data in session 
+* Fix export controller when generating an export without any data in session
 
 ## v2.10.0 - 2023-10-24
 ### Feature
@@ -761,16 +761,16 @@ Fix color of Chill footer
 - ajout d'un filtre et regroupement par usager participant sur les échanges
 - ajout d'un regroupement: par type d'activité associé au parcours;
 - trie les filtre et regroupements par ordre alphabétique dans els exports
-- ajout d'un paramètre qui permet de désactiver le filtre par centre dans les exports
+- ajout d'un paramètre qui permet de désactiver le filtre par territoire dans les exports
 - correction de l'interface de date dans les filtres et regroupements "par statut du parcours à la date"
 
 ## v2.9.2 - 2023-10-17
 ### Fixed
-* Fix possible null values in string's entities 
+* Fix possible null values in string's entities
 
 ## v2.9.1 - 2023-10-17
 ### Fixed
-* Fix the handling of activity form when editing or creating an activity in an accompanying period with multiple centers 
+* Fix the handling of activity form when editing or creating an activity in an accompanying period with multiple centers
 
 ## v2.9.0 - 2023-10-17
 ### Feature
@@ -818,57 +818,57 @@ But if you do not need this any more, you must ensure that the configuration key
 
 ## v2.7.0 - 2023-09-27
 ### Feature
-* ([#155](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/155)) The regulation list load accompanying periods by exact postal code (address associated with postal code), and not by the content of the postal code (postal code with same code's string) 
+* ([#155](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/155)) The regulation list load accompanying periods by exact postal code (address associated with postal code), and not by the content of the postal code (postal code with same code's string)
 ### Fixed
-* ([#142](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/142)) Fix the label of filter ActivityTypeFilter to a more obvious one 
-* ([#140](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/140)) [export] Fix association of filter "filter location by type" which did not appears on "list of activities" 
+* ([#142](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/142)) Fix the label of filter ActivityTypeFilter to a more obvious one
+* ([#140](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/140)) [export] Fix association of filter "filter location by type" which did not appears on "list of activities"
 
 ## v2.6.3 - 2023-09-19
 ### Fixed
-* Remove id property from document 
-mappedsuperclass 
+* Remove id property from document
+mappedsuperclass
 
 ## v2.6.2 - 2023-09-18
 ### Fixed
-* Fix doctrine mapping of AbstractTaskPlaceEvent and SingleTaskPlaceEvent: id property moved. 
+* Fix doctrine mapping of AbstractTaskPlaceEvent and SingleTaskPlaceEvent: id property moved.
 
 ## v2.6.1 - 2023-09-14
 ### Fixed
-* Filter out active centers in exports, which uses a different PickCenterType. 
+* Filter out active centers in exports, which uses a different PickCenterType.
 
 ## v2.6.0 - 2023-09-14
 ### Feature
-* ([#133](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/133)) Add locations in Aside Activity. By default, suggest user location, otherwise a select with all locations. 
-* ([#133](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/133)) Adapt Aside Activity exports: display location, filter by location, group by location 
-* Use the CRUD controller for center entity + add the isActive property to be able to mask instances of Center that are no longer in use. 
+* ([#133](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/133)) Add locations in Aside Activity. By default, suggest user location, otherwise a select with all locations.
+* ([#133](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/133)) Adapt Aside Activity exports: display location, filter by location, group by location
+* Use the CRUD controller for center entity + add the isActive property to be able to mask instances of Center that are no longer in use.
 ### Fixed
-* ([#107](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/107)) reinstate the fusion of duplicate persons 
-* Missing translation in Work Actions exports 
-* Reimplement the mission type filter on tasks, only for instances that have a config parameter indicating true for this. 
-* ([#135](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/135)) Corrects a typing error in 2 filters, which caused an 
+* ([#107](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/107)) reinstate the fusion of duplicate persons
+* Missing translation in Work Actions exports
+* Reimplement the mission type filter on tasks, only for instances that have a config parameter indicating true for this.
+* ([#135](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/135)) Corrects a typing error in 2 filters, which caused an
 error when trying to reedit a saved export
 
- 
-* ([#136](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/136)) [household] when moving a person to a sharing position to a not-sharing position on the same household on the same date, remove the previous household membership on the same household. This fix duplicate member. 
+
+* ([#136](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/136)) [household] when moving a person to a sharing position to a not-sharing position on the same household on the same date, remove the previous household membership on the same household. This fix duplicate member.
 * Add missing translation for comment field placeholder in repositionning household editor.
- 
-* Do not send an email to creator twice when adding a comment to a notification 
-* ([#107](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/107)) Fix gestion doublon functionality to work with chill bundles v2 
+
+* Do not send an email to creator twice when adding a comment to a notification
+* ([#107](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/107)) Fix gestion doublon functionality to work with chill bundles v2
 ### UX
 * Uniformize badge-person in household banner (background, size)
- 
+
 
 ## v2.5.3 - 2023-07-20
 ### Fixed
-* ([#132](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/132)) Rendez-vous documents created would appear in all documents lists of all persons with an accompanying period. Or statements are now added to the where clause to filter out documents that come from unrelated accompanying period/ or person rendez-vous. 
+* ([#132](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/132)) Rendez-vous documents created would appear in all documents lists of all persons with an accompanying period. Or statements are now added to the where clause to filter out documents that come from unrelated accompanying period/ or person rendez-vous.
 
 ## v2.5.2 - 2023-07-15
 ### Fixed
-* [Collate Address] when updating address point, do not use the point's address reference if the similarity is below the requirement for associating the address reference and the address (it uses the postcode's center instead) 
+* [Collate Address] when updating address point, do not use the point's address reference if the similarity is below the requirement for associating the address reference and the address (it uses the postcode's center instead)
 
 ## v2.5.1 - 2023-07-14
 ### Fixed
-* [collate addresses] block collating addresses to another address reference where the address reference is already the best match 
+* [collate addresses] block collating addresses to another address reference where the address reference is already the best match
 
 ## v2.5.0 - 2023-07-14
 ### Feature
@@ -941,7 +941,7 @@ error when trying to reedit a saved export
 - ajout d'un regroupement par métier des intervenants sur un parcours;
 - ajout d'un regroupement par service des intervenants sur un parcours;
 - ajout d'un regroupement par utilisateur intervenant sur un parcours
-- ajout d'un regroupement "par centre de l'usager";
+- ajout d'un regroupement "par territoire de l'usager";
 - ajout d'un filtre "par métier intervenant sur un parcours";
 - ajout d'un filtre "par service intervenant sur un parcours";
 - création d'un rôle spécifique pour voir les parcours confidentiels (et séparer de celui de la liste qui permet de ré-assigner les parcours en lot);
diff --git a/docs/source/_static/bundles/docStore/doc_store_classes.puml b/docs/source/_static/bundles/docStore/doc_store_classes.puml
index 431d268c0..f0c61f44c 100644
--- a/docs/source/_static/bundles/docStore/doc_store_classes.puml
+++ b/docs/source/_static/bundles/docStore/doc_store_classes.puml
@@ -23,8 +23,8 @@ class "Document" {
     - text description
     - ArrayCollection_DocumentCategory categories
     - varchar_150 content #link to openstack
-    - Center center
-    - Cercle cercle
+    - Territoire territoire
+    - Service service
     - User user
     - DateTime date # Creation date
 }
diff --git a/docs/source/development/database-principles.rst b/docs/source/development/database-principles.rst
index 455354934..3b528ae22 100644
--- a/docs/source/development/database-principles.rst
+++ b/docs/source/development/database-principles.rst
@@ -38,7 +38,7 @@ Certaines données sont historisées:
 
 - les référents d'un parcours;
 - les statuts d'un parcours;
-- la liaison entre les centres et les usagers;
+- la liaison entre les territoires et les usagers;
 - etc.
 
 Dans ces cas-là, Chill crée généralement deux colonnes, qui sont habituellement nommées :code:`startDate` et :code:`endDate`. Lorsque la colonne :code:`endDate` est à :code:`NULL`, cela signifie que la période n'est pas "fermée". La colonne :code:`startDate` n'est pas nullable.
diff --git a/docs/source/development/database/table_list.csv b/docs/source/development/database/table_list.csv
index fe688318d..be72a52ab 100644
--- a/docs/source/development/database/table_list.csv
+++ b/docs/source/development/database/table_list.csv
@@ -1,6 +1,6 @@
 order,table_schema,table_name,commentaire
 1,chill_3party,party_category,Catégorie de tiers
-2,chill_3party,party_center,Association entre les tiers et les centres (déprécié)
+2,chill_3party,party_center,Association entre les tiers et les territoires (déprécié)
 3,chill_3party,party_profession,Profession du tiers (déprécié)
 4,chill_3party,third_party,Tiers
 5,chill_3party,thirdparty_category,association tiers - catégories
@@ -54,7 +54,7 @@ order,table_schema,table_name,commentaire
 53,public,activitytpresence,Présence aux échanges
 54,public,activitytype,Types d'échanges
 55,public,activitytypecategory,Catégories de types d'échanges
-56,public,centers,"Centres (territoires, agences, etc.)"
+56,public,centers,"Territoires (territoires, agences, etc.)"
 57,public,chill_activity_activity_chill_person_socialaction,
 58,public,chill_activity_activity_chill_person_socialissue
 59,public,chill_docgen_template,Gabarits de documents
@@ -111,7 +111,7 @@ order,table_schema,table_name,commentaire
 110,public,chill_person_marital_status,Etats civils
 111,public,chill_person_not_duplicate,
 112,public,chill_person_person,Usagers
-113,public,chill_person_person_center_history,Historique des centres d'un usagers
+113,public,chill_person_person_center_history,Historique des territoires d'un usagers
 114,public,chill_person_persons_to_addresses,Déprécié
 115,public,chill_person_phone,Numéros d etéléphone supplémentaires d'un usager
 116,public,chill_person_relations,Types de relations de filiation
@@ -142,7 +142,7 @@ order,table_schema,table_name,commentaire
 141,public,permission_groups
 142,public,permissionsgroup_rolescope
 143,public,persons_spoken_languages
-144,public,regroupment,Regroupement de centres
+144,public,regroupment,Regroupement de territoires
 145,public,regroupment_center,
 146,public,role_scopes,
 147,public,scopes,Services
diff --git a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
index 883310df9..70079bfc9 100644
--- a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
@@ -10,7 +10,7 @@ Attendee: Présence de l'usager
 attendee: présence de l'usager
 list_reasons: liste des sujets
 user_username: nom de l'utilisateur
-circle_name: nom du cercle
+circle_name: nom du service
 Remark: Commentaire
 No comments: Aucun commentaire
 Add a new activity: Ajouter une nouvel échange
@@ -20,7 +20,7 @@ not present: absent
 Delete: Supprimer
 Update: Mettre à jour
 Update activity: Modifier l'échange
-Scope: Cercle
+Scope: Service
 Activity data: Données de l'échange
 Activity location: Localisation de l'échange
 No reason associated: Aucun sujet
@@ -398,7 +398,7 @@ export:
             sent received: Envoyé ou reçu
             emergency: Urgence
             accompanying course id: Identifiant du parcours
-            course circles: Cercles du parcours
+            course circles: Services du parcours
             travelTime: Durée de déplacement
             durationTime: Durée
             id: Identifiant
diff --git a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
index 7d3c7a20e..618171e39 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
+++ b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
@@ -177,7 +177,7 @@ export:
         agent_id: Utilisateur
         creator_id: Créateur
         main_scope: Service principal de l'utilisateur
-        main_center: Centre principal de l'utilisateur
+        main_center: Territoire principal de l'utilisateur
         aside_activity_type: Catégorie d'activité annexe
         date: Date
         duration: Durée
diff --git a/src/Bundle/ChillEventBundle/Controller/EventController.php b/src/Bundle/ChillEventBundle/Controller/EventController.php
index 7bcc8dbe6..b52697868 100644
--- a/src/Bundle/ChillEventBundle/Controller/EventController.php
+++ b/src/Bundle/ChillEventBundle/Controller/EventController.php
@@ -246,7 +246,7 @@ final class EventController extends AbstractController
                 'class' => Center::class,
                 'choices' => $centers,
                 'placeholder' => $this->translator->trans('Pick a center'),
-                'label' => 'To which centre should the event be associated ?',
+                'label' => 'To which territory should the event be associated ?',
             ])
             ->add('submit', SubmitType::class, [
                 'label' => 'Next step',
diff --git a/src/Bundle/ChillEventBundle/translations/messages.fr.yml b/src/Bundle/ChillEventBundle/translations/messages.fr.yml
index 2251dbd6c..45bee74e4 100644
--- a/src/Bundle/ChillEventBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillEventBundle/translations/messages.fr.yml
@@ -64,7 +64,7 @@ CHILL_EVENT_PARTICIPATION_SEE_DETAILS: Voir le détail d'une participation
 
 # TODO check place to put this
 Next step: Étape suivante
-To which centre should the event be associated ?: À quel centre doit être associé l'événement ?
+To which territory should the event be associated ?: À quel territoire doit être associé l'événement ?
 
 # timeline
 past: passé
@@ -151,7 +151,7 @@ event:
     filter:
         event_types: Par types d'événement
         event_dates: Par date d'événement
-        center: Par centre
+        center: Par territoire
         by_responsable: Par responsable
         pick_responsable: Filtrer par responsables
     budget:
@@ -188,7 +188,7 @@ event_id: Identifiant
 event_name: Nom
 event_date: Date
 event_type: Type d'évenement
-event_center: Centre
+event_center: Territoire
 event_moderator: Responsable
 event_participants_count: Nombre de participants
 event_location: Localisation
diff --git a/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig b/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
index 5393f09c8..66ffc030b 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
@@ -61,7 +61,7 @@
                                 {% endif %}
                             </li>
                             <li>
-                                <span class="dt">cercle/centre:</span>
+                                <span class="dt">{{ 'Scope'|trans }}/{{ 'center'|trans }}:</span>
                                 {% if entity.mainScope %}
                                     {{ entity.mainScope.name|localize_translatable_string }}
                                 {% endif %}
diff --git a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminUserMenuBuilder.php b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminUserMenuBuilder.php
index 6c2baf0fd..045c9d47f 100644
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminUserMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminUserMenuBuilder.php
@@ -49,7 +49,7 @@ class AdminUserMenuBuilder implements LocalMenuBuilderInterface
             'route' => 'chill_crud_center_index',
         ])->setExtras(['order' => 1010]);
 
-        $menu->addChild('Regroupements des centres', [
+        $menu->addChild('Regroupements des territoires', [
             'route' => 'chill_crud_regroupment_index',
         ])->setExtras(['order' => 1015]);
 
diff --git a/src/Bundle/ChillMainBundle/Tests/Controller/ScopeControllerTest.php b/src/Bundle/ChillMainBundle/Tests/Controller/ScopeControllerTest.php
index b88b0a852..ffc832c37 100644
--- a/src/Bundle/ChillMainBundle/Tests/Controller/ScopeControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/ScopeControllerTest.php
@@ -35,7 +35,7 @@ final class ScopeControllerTest extends WebTestCase
             $client->getResponse()->getStatusCode(),
             'Unexpected HTTP status code for GET /fr/admin/scope/'
         );
-        $crawler = $client->click($crawler->selectLink('Créer un nouveau cercle')->link());
+        $crawler = $client->click($crawler->selectLink('Créer un nouveau service')->link());
         // Fill in the form and submit it
         $form = $crawler->selectButton('Créer')->form([
             'chill_mainbundle_scope[name][fr]' => 'Test en fr',
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index 0430b72c6..e9739d3f3 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -54,7 +54,7 @@ user:
         title: Mon profil
         Profile successfully updated!: Votre profil a été mis à jour!
         no job: Pas de métier assigné
-        no scope: Pas de cercle assigné
+        no scope: Pas de service assigné
         notification_preferences: Préférences pour mes notifications
 
 user_group:
@@ -102,9 +102,9 @@ createdAt: Créé le
 createdBy: Créé par
 
 #elements used in software
-centers: centres
-Centers: Centres
-center: centre
+centers: territoires
+Centers: Territoires
+center: territoire
 comment: commentaire
 Comment: Commentaire
 Comments: Commentaires
@@ -227,12 +227,12 @@ Location Menu: Localisations et types de localisation
 Management of location: Gestion des localisations et types de localisation
 
 #admin section for center's administration
-Create a new center: Créer un nouveau centre
-Center list: Liste des centres
-Center edit: Édition d'un centre
-Center creation: Création d'un centre
-New center: Nouveau centre
-Center: Centre
+Create a new center: Créer une nouveau territoire
+Center list: Liste des territoires
+Center edit: Édition d'un territoire
+Center creation: Création d'un territoire
+New center: Nouveau territoire
+Center: Territoire
 
 #admin section for permissions group
 Permissions group list: Groupes de permissions
@@ -246,15 +246,15 @@ New permission group: Nouveau groupe de permissions
 PermissionsGroup "%name%" edit: Modification du groupe de permission '%name%'
 Role: Rôle
 Choose amongst roles: Choisir un rôle
-Choose amongst scopes: Choisir un cercle
+Choose amongst scopes: Choisir un service
 Add permission: Ajouter les permissions
 This group does not provide any permission: Ce groupe n'attribue aucune permission
 The role '%role%' has been removed: Le rôle "%role%" a été enlevé de ce groupe de permission
-The role '%role%' on circle '%scope%' has been removed: Le rôle "%role%" sur le cercle "%scope%" a été enlevé de ce groupe de permission
+The role '%role%' on circle '%scope%' has been removed: Le rôle "%role%" sur le service "%scope%" a été enlevé de ce groupe de permission
 Unclassified: Non classifié
-Help to pick role and scope: Certains rôles ne nécessitent pas de cercle.
-The role need scope: Ce rôle nécessite un cercle.
-The role does not need scope: Ce rôle ne nécessite pas de cercle !
+Help to pick role and scope: Certains rôles ne nécessitent pas de service.
+The role need scope: Ce rôle nécessite un service.
+The role does not need scope: Ce rôle ne nécessite pas de service !
 
 #admin section for users
 User configuration: Gestion des utilisateurs
@@ -270,7 +270,7 @@ Grant new permissions: Ajout de permissions
 Add a new groupCenter: Ajout de permissions
 The permissions have been successfully added to the user: Les permissions ont été accordées à l'utilisateur
 The permissions where removed.: Les permissions ont été enlevées.
-Center & groups: Centre et groupes
+Center & groups: Territoire et groupes
 User %username%: Utilisateur %username%
 Add a new user: Ajouter un nouvel utilisateur
 The permissions have been added: Les permissions ont été ajoutées
@@ -280,13 +280,13 @@ Back to the user edition: Retour au formulaire d'édition
 Password successfully updated!: Mot de passe mis à jour
 Flags: Drapeaux
 Main location: Localisation principale
-Main scope: Cercle
-Main center: Centre
+Main scope: Service
+Main center: Territoire
 user job: Métier de l'utilisateur
 Job: Métier
 Jobs: Métiers
-Choose a main center: Choisir un centre
-Choose a main scope: Choisir un cercle
+Choose a main center: Choisir un territoire
+Choose a main scope: Choisir un service
 choose a job: Choisir un métier
 choose a location: Choisir une localisation
 
@@ -302,12 +302,12 @@ Current location successfully updated: Localisation actuelle mise à jour
 Pick a location: Choisir un lieu
 
 #admin section for circles (old: scopes)
-List circles: Cercles
-New circle: Nouveau cercle
-Circle: Cercle
-Circle edit: Modification du cercle
-Circle creation: Création d'un cercle
-Create a new circle: Créer un nouveau cercle
+List circles: Services
+New circle: Nouveau service
+Circle: Service
+Circle edit: Modification du service
+Circle creation: Création d'un service
+Create a new circle: Créer un nouveau service
 
 #admin section for location
 Location: Localisation
@@ -347,9 +347,9 @@ Country list: Liste des pays
 Country code: Code du pays
 
 # circles / scopes
-Choose the circle: Choisir le cercle
-Scope: Cercle
-Scopes: Cercles
+Choose the circle: Choisir le service
+Scope: Service
+Scopes: Services
 
 #export
 
@@ -357,14 +357,14 @@ Scopes: Cercles
 Exports list: Liste des exports
 Create an export: Créer un export
 #export creation step 'center' : pick a center
-Pick centers: Choisir les centres
-Pick a center: Choisir un centre
-The export will contains only data from the picked centers.: L'export ne contiendra que les données des centres choisis.
-This will eventually restrict your possibilities in filtering the data.: Les possibilités de filtrages seront adaptées aux droits de consultation pour les centres choisis.
+Pick centers: Choisir les territoires
+Pick a center: Choisir un territoire
+The export will contains only data from the picked centers.: L'export ne contiendra que les données des territoires choisis.
+This will eventually restrict your possibilities in filtering the data.: Les possibilités de filtrages seront adaptées aux droits de consultation pour les territoires choisis.
 Go to export options: Vers la préparation de l'export
-Pick aggregated centers: Regroupement de centres
-uncheck all centers: Désélectionner tous les centres
-check all centers: Sélectionner tous les centres
+Pick aggregated centers: Regroupement de territoires
+uncheck all centers: Désélectionner tous les territoires
+check all centers: Sélectionner tous les territoires
 # export creation step 'export' : choose aggregators, filtering and formatter
 Formatter: Mise en forme
 Choose the formatter: Choisissez le format d'export voulu.
@@ -510,10 +510,10 @@ crud:
         title_edit: Modifier un regroupement
     center:
         index:
-            title: Liste des centres
-            add_new: Ajouter un centre
-        title_new: Nouveau centre
-        title_edit: Modifier un centre
+            title: Liste des territoires
+            add_new: Ajouter un territoire
+        title_new: Nouveau territoire
+        title_edit: Modifier un territoire
     news_item:
         index:
             title: Liste des actualités
@@ -860,7 +860,7 @@ absence:
 admin:
     users:
         export_list_csv: Liste des utilisateurs (format CSV)
-        export_permissions_csv: Association utilisateurs - groupes de permissions - centre (format CSV)
+        export_permissions_csv: Association utilisateurs - groupes de permissions - territoire (format CSV)
         export:
             id: Identifiant
             username: Nom d'utilisateur
@@ -870,8 +870,8 @@ admin:
             civility_abbreviation: Abbréviation civilité
             civility_name: Civilité
             label: Label
-            mainCenter_id: Identifiant centre principal
-            mainCenter_name: Centre principal
+            mainCenter_id: Identifiant territoire principal
+            mainCenter_name: Territoire principal
             mainScope_id: Identifiant service principal
             mainScope_name: Service principal
             userJob_id: Identifiant métier
@@ -881,8 +881,8 @@ admin:
             mainLocation_id: Identifiant localisation principale
             mainLocation_name: Localisation principale
             absenceStart: Absent à partir du
-            center_id: Identifiant du centre
-            center_name: Centre
+            center_id: Identifiant du territoire
+            center_name: Territoire
             permissionsGroup_id: Identifiant du groupe de permissions
             permissionsGroup_name: Groupe de permissions
         job_scope_histories:
diff --git a/src/Bundle/ChillMainBundle/translations/validators.fr.yml b/src/Bundle/ChillMainBundle/translations/validators.fr.yml
index ce84efc9f..54083cf7c 100644
--- a/src/Bundle/ChillMainBundle/translations/validators.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/validators.fr.yml
@@ -1,15 +1,15 @@
 # role_scope constraint
 # scope presence
-The role "%role%" require to be associated with a scope.: Le rôle "%role%" doit être associé à un cercle.
-The role "%role%" should not be associated with a scope.: Le rôle "%role%" ne doit pas être associé à un cercle.
+The role "%role%" require to be associated with a scope.: Le rôle "%role%" doit être associé à un service.
+The role "%role%" should not be associated with a scope.: Le rôle "%role%" ne doit pas être associé à un service.
 "The password must contains one letter, one capitalized letter, one number and one special character as *[@#$%!,;:+\"'-/{}~=µ()£]). Other characters are allowed.": "Le mot de passe doit contenir une majuscule, une minuscule, et au moins un caractère spécial parmi *[@#$%!,;:+\"'-/{}~=µ()£]). Les autres caractères sont autorisés."
 The password fields must match: Les mots de passe doivent correspondre
 The password must be greater than {{ limit }} characters: "[1,Inf] Le mot de passe doit contenir au moins {{ limit }} caractères"
 
-A permission is already present for the same role and scope: Une permission est déjà présente pour le même rôle et cercle.
+A permission is already present for the same role and scope: Une permission est déjà présente pour le même rôle et service.
 
 #UserCircleConsistency
-"{{ username }} is not allowed to see entities published in this circle": "{{ username }} n'est pas autorisé à voir l'élément publié dans ce cercle."
+"{{ username }} is not allowed to see entities published in this circle": "{{ username }} n'est pas autorisé à voir l'élément publié dans ce service."
 
 The user in cc cannot be a dest user in the same workflow step: Un utilisateur en Cc ne peut pas être un utilisateur qui valide.
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
index 6756381de..9d00136ea 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/js/i18n.js
@@ -80,7 +80,7 @@ const appMessages = {
       firstName: "Prénom",
       lastName: "Nom",
       birthdate: "Date de naissance",
-      center: "Centre",
+      center: "Territoire",
       phonenumber: "Téléphone",
       mobilenumber: "Mobile",
       altNames: "Autres noms",
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/i18n.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/i18n.js
index 289a68a34..a24e63015 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/i18n.js
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/VisGraph/i18n.js
@@ -50,8 +50,8 @@ const visMessages = {
           return "Né·e le";
         }
       },
-      center_id: "Identifiant du centre",
-      center_type: "Type de centre",
+      center_id: "Identifiant du territoire",
+      center_type: "Type de territoire",
       center_name: "Territoire", // vendée
       phonenumber: "Téléphone",
       mobilenumber: "Mobile",
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.ts b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.ts
index ba7637544..26d905a97 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.ts
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.ts
@@ -25,8 +25,8 @@ const personMessages = {
                     return "Né·e le";
                 }
             },
-            center_id: "Identifiant du centre",
-            center_type: "Type de centre",
+            center_id: "Identifiant du territoire",
+            center_type: "Type de territoire",
             center_name: "Territoire", // vendée
             phonenumber: "Téléphone",
             mobilenumber: "Mobile",
@@ -53,8 +53,8 @@ const personMessages = {
                     "Un nouveau ménage va être créé. L'usager sera membre de ce ménage.",
             },
             center: {
-                placeholder: "Choisissez un centre",
-                title: "Centre",
+                placeholder: "Choisissez un territoire",
+                title: "territoire",
             },
         },
         error_only_one_person: "Une seule personne peut être sélectionnée !",
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index cde9a6add..88b12f7bd 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -376,7 +376,7 @@ Create a list of people according to various filters.: Crée une liste d'usagers
 Fields to include in export: Champs à inclure dans l'export
 Address valid at this date: Addresse valide à cette date
 Data valid at this date: Données valides à cette date
-Data regarding center, addresses, and so on will be computed at this date: Les données concernant le centre, l'adresse, le ménage, sera calculé à cette date.
+Data regarding center, addresses, and so on will be computed at this date: Les données concernant le territoire, l'adresse, le ménage, sera calculé à cette date.
 List duplicates: Liste des doublons
 Create a list of duplicate people: Créer la liste des usagers détectés comme doublons.
 Count people participating in an accompanying course: Nombre d'usagers concernés par un parcours
@@ -1110,9 +1110,9 @@ export:
                 Group course by household composition: Grouper les usagers par composition familiale
                 Calc date: Date de calcul de la composition du ménage
             by_center:
-                title: Grouper les usagers par centre
-                at_date: Date de calcul du centre
-                center: Centre de l'usager
+                title: Grouper les usagers par territoire
+                at_date: Date de calcul du territoire
+                center: Territoire de l'usager
             by_postal_code:
                 title: Grouper les usagers par code postal de l'adresse
                 at_date: Date de calcul de l'adresse
@@ -1437,7 +1437,7 @@ export:
             acpParticipantPersons: Usagers concernés
             acpParticipantPersonsIds: Usagers concernés (identifiants)
             duration: Durée du parcours (en jours)
-            centers: Centres des usagers
+            centers: Territoires des usagers
 
         eval:
             List of evaluations: Liste des évaluations
diff --git a/src/Bundle/ChillPersonBundle/translations/validators.fr.yml b/src/Bundle/ChillPersonBundle/translations/validators.fr.yml
index 691fef833..c6fe0f912 100644
--- a/src/Bundle/ChillPersonBundle/translations/validators.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/validators.fr.yml
@@ -23,7 +23,7 @@ The gender must be set: Le genre doit être renseigné
 You are not allowed to perform this action: Vous n'avez pas le droit de changer cette valeur.
 Sorry, but someone else has already changed this entity. Please refresh the page and apply the changes again: Désolé, mais quelqu'un d'autre a déjà modifié cette entité. Veuillez actualiser la page et appliquer à nouveau les modifications
 
-A center is required: Un centre est requis
+A center is required: Un territoire est requis
 
 #export list
 You must select at least one element: Vous devez sélectionner au moins un élément
diff --git a/src/Bundle/ChillReportBundle/translations/messages.fr.yml b/src/Bundle/ChillReportBundle/translations/messages.fr.yml
index c22ed17fb..a8d5ed979 100644
--- a/src/Bundle/ChillReportBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillReportBundle/translations/messages.fr.yml
@@ -9,7 +9,7 @@
 'Report list': 'Liste des rapports'
 Details: Détails
 Person: Usager
-Scope: Cercle
+Scope: Service
 Date: Date
 User: Utilisateur
 'Report type': 'Type de rapport'
diff --git a/src/Bundle/ChillTaskBundle/translations/messages.fr.yml b/src/Bundle/ChillTaskBundle/translations/messages.fr.yml
index b0d155f59..341e889ec 100644
--- a/src/Bundle/ChillTaskBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillTaskBundle/translations/messages.fr.yml
@@ -4,7 +4,7 @@ Tasks: "Tâches"
 Title: Titre
 Description: Description
 Assignee: "Personne assignée"
-Scope: Cercle
+Scope: Service
 "Start date": "Date de début"
 "End date": "Date d'échéance"
 "Warning date": "Date d'avertissement"
@@ -106,7 +106,7 @@ My tasks over deadline: Mes tâches à échéance dépassée
 #transition page
 Apply transition on task <em>%title%</em>: Appliquer la transition sur la tâche <em>%title%</em>
 
-All centers: Tous les centres
+All centers: Tous les territoires
 
 # ROLES
 CHILL_TASK_TASK_CREATE: Ajouter une tâche
diff --git a/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml b/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
index 2c5e8f262..bdd9420f7 100644
--- a/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
@@ -73,8 +73,8 @@ No acronym given: Aucun sigle renseigné
 No phone given: Aucun téléphone renseigné
 No email given:  Aucune adresse courriel renseignée
 
-The party is visible in those centers: Le tiers est visible dans ces centres
-The party is not visible in any center: Le tiers n'est associé à aucun centre
+The party is visible in those centers: Le tiers est visible dans ces territoires
+The party is not visible in any center: Le tiers n'est associé à aucun territoire
 No third parties: Aucun tiers
 Any third party selected: Aucun tiers sélectionné
 

From e87e5cbbafea384da683113f530d3017c1bb777b Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 5 Nov 2025 08:32:54 +0000
Subject: [PATCH 203/283] Fix loading of wopi-bundle

---
 composer.json      | 2 +-
 config/bundles.php | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index 8d36d4d07..c1e235670 100644
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
         "ext-openssl": "*",
         "ext-redis": "*",
         "ext-zlib": "*",
-        "champs-libres/wopi-bundle": "dev-master@dev",
+        "champs-libres/wopi-bundle": "dev-symfony-v5@dev",
         "champs-libres/wopi-lib": "dev-master@dev",
         "doctrine/data-fixtures": "^1.8",
         "doctrine/doctrine-bundle": "^2.1",
diff --git a/config/bundles.php b/config/bundles.php
index ec11bc0b6..72b5e22f5 100644
--- a/config/bundles.php
+++ b/config/bundles.php
@@ -2,7 +2,6 @@
 
 return [
     Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
-    loophp\PsrHttpMessageBridgeBundle\PsrHttpMessageBridgeBundle::class => ['all' => true],
     ChampsLibres\WopiBundle\WopiBundle::class => ['all' => true],
     Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true],
     Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true],
@@ -37,4 +36,5 @@ return [
     Chill\WopiBundle\ChillWopiBundle::class => ['all' => true],
     Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
     Symfony\UX\Translator\UxTranslatorBundle::class => ['all' => true],
+    loophp\PsrHttpMessageBridgeBundle\PsrHttpMessageBridgeBundle::class => ['all' => true],
 ];

From ffb8183d4d0da74e7193bb8e58e7784db807686c Mon Sep 17 00:00:00 2001
From: LenaertsJ <julie.lenaerts@champs-libres.coop>
Date: Wed, 5 Nov 2025 08:47:49 +0000
Subject: [PATCH 204/283] Fix: export actions and their results in csv even
 when action does not have...

---
 .../unreleased/Fixed-20251029-143836.yaml     |  6 +++
 .../SocialActionCSVExportService.php          | 37 +++++++++++++------
 2 files changed, 31 insertions(+), 12 deletions(-)
 create mode 100644 .changes/unreleased/Fixed-20251029-143836.yaml

diff --git a/.changes/unreleased/Fixed-20251029-143836.yaml b/.changes/unreleased/Fixed-20251029-143836.yaml
new file mode 100644
index 000000000..308ed0fca
--- /dev/null
+++ b/.changes/unreleased/Fixed-20251029-143836.yaml
@@ -0,0 +1,6 @@
+kind: Fixed
+body: 'Fix: export actions and their results in csv even when action does not have any goals attached to it.'
+time: 2025-10-29T14:38:36.195220844+01:00
+custom:
+    Issue: "453"
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillPersonBundle/Service/SocialWork/SocialActionCSVExportService.php b/src/Bundle/ChillPersonBundle/Service/SocialWork/SocialActionCSVExportService.php
index 09b4442b2..71c548dd1 100644
--- a/src/Bundle/ChillPersonBundle/Service/SocialWork/SocialActionCSVExportService.php
+++ b/src/Bundle/ChillPersonBundle/Service/SocialWork/SocialActionCSVExportService.php
@@ -42,28 +42,41 @@ final readonly class SocialActionCSVExportService
         $csv->insertOne($headers);
 
         foreach ($actions as $action) {
-            if ($action->getGoals()->isEmpty() && $action->getResults()->isEmpty() && $action->getEvaluations()->isEmpty()) {
+            $hasGoals = !$action->getGoals()->isEmpty();
+            $hasResults = !$action->getResults()->isEmpty();
+            $hasEvaluations = !$action->getEvaluations()->isEmpty();
+
+            // If action has no goals, results, or evaluations, insert a single row
+            if (!$hasGoals && !$hasResults && !$hasEvaluations) {
                 $csv->insertOne($this->formatRow($action));
+                continue;
             }
 
-            foreach ($action->getGoals() as $goal) {
-                if ($goal->getResults()->isEmpty()) {
-                    $csv->insertOne($this->formatRow($action, $goal));
-                }
-
-                foreach ($goal->getResults() as $goalResult) {
-                    $csv->insertOne($this->formatRow($action, $goal, $goalResult));
+            // Process goals and their results
+            if ($hasGoals) {
+                foreach ($action->getGoals() as $goal) {
+                    if ($goal->getResults()->isEmpty()) {
+                        $csv->insertOne($this->formatRow($action, $goal));
+                    } else {
+                        foreach ($goal->getResults() as $goalResult) {
+                            $csv->insertOne($this->formatRow($action, $goal, $goalResult));
+                        }
+                    }
                 }
             }
 
-            foreach ($action->getResults() as $result) {
-                if ($result->getGoals()->isEmpty()) {
+            // Process results that are linked to this action (regardless of whether they have goals elsewhere)
+            if ($hasResults && !$hasGoals) {
+                foreach ($action->getResults() as $result) {
                     $csv->insertOne($this->formatRow($action, null, null, $result));
                 }
             }
 
-            foreach ($action->getEvaluations() as $evaluation) {
-                $csv->insertOne($this->formatRow($action, evaluation: $evaluation));
+            // Process evaluations
+            if ($hasEvaluations) {
+                foreach ($action->getEvaluations() as $evaluation) {
+                    $csv->insertOne($this->formatRow($action, evaluation: $evaluation));
+                }
             }
         }
 

From c79c39b562a0f9327fd73317fc701ccb8108239a Mon Sep 17 00:00:00 2001
From: LenaertsJ <julie.lenaerts@champs-libres.coop>
Date: Wed, 5 Nov 2025 08:51:47 +0000
Subject: [PATCH 205/283] Fix: display also social actions linked to parents of
 the selected social issue

---
 .../unreleased/Fixed-20251029-124355.yaml     |  6 ++++++
 .../Entity/SocialWork/SocialIssue.php         | 19 +++++++++++++------
 2 files changed, 19 insertions(+), 6 deletions(-)
 create mode 100644 .changes/unreleased/Fixed-20251029-124355.yaml

diff --git a/.changes/unreleased/Fixed-20251029-124355.yaml b/.changes/unreleased/Fixed-20251029-124355.yaml
new file mode 100644
index 000000000..e032e7703
--- /dev/null
+++ b/.changes/unreleased/Fixed-20251029-124355.yaml
@@ -0,0 +1,6 @@
+kind: Fixed
+body: 'Fix: display also social actions linked to parents of the selected social issue'
+time: 2025-10-29T12:43:55.008647232+01:00
+custom:
+    Issue: "451"
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php
index 02c38a60a..66189642e 100644
--- a/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php
+++ b/src/Bundle/ChillPersonBundle/Entity/SocialWork/SocialIssue.php
@@ -122,6 +122,8 @@ class SocialIssue
      * get all the ancestors of the social issue.
      *
      * @param bool $includeThis if the array in the result must include the present SocialIssue
+     *
+     * @return list<SocialIssue>
      */
     public function getAncestors(bool $includeThis = true): array
     {
@@ -176,7 +178,7 @@ class SocialIssue
     }
 
     /**
-     * @return Collection|SocialAction[] All the descendant social actions of the entity
+     * @return Collection<int, SocialAction> All the descendant social actions of the entity
      */
     public function getDescendantsSocialActions(): Collection
     {
@@ -239,18 +241,23 @@ class SocialIssue
     }
 
     /**
-     * @return Collection<SocialAction> All the descendant social actions of all
-     *                                  the descendants of the entity
+     * @return Collection<int, SocialAction> All the social actions of the entity, it's
+     *                                       the descendants and it's parents
      */
     public function getRecursiveSocialActions(): Collection
     {
         $recursiveSocialActions = new ArrayCollection();
 
+        // Get social actions from parent issues
+        foreach ($this->getAncestors(false) as $ancestor) {
+            foreach ($ancestor->getDescendantsSocialActions() as $descendant) {
+                $recursiveSocialActions->add($descendant);
+            }
+        }
+
         foreach ($this->getDescendantsWithThis() as $socialIssue) {
             foreach ($socialIssue->getDescendantsSocialActions() as $descendant) {
-                if (!$recursiveSocialActions->contains($descendant)) {
-                    $recursiveSocialActions->add($descendant);
-                }
+                $recursiveSocialActions->add($descendant);
             }
         }
 

From 671ed21d597829dfdf649d47415c18b0a8fbd397 Mon Sep 17 00:00:00 2001
From: LenaertsJ <julie.lenaerts@champs-libres.coop>
Date: Wed, 5 Nov 2025 09:29:50 +0000
Subject: [PATCH 206/283] Expand timeSpent choices for evaluation document and
 translate them to user locale or fallback 'fr'

---
 .changes/unreleased/UX-20251030-180919.yaml   |   6 +
 .../translations/messages+intl-icu.fr.yaml    |  14 ++
 .../components/FormEvaluation.vue             | 140 ++++++++++++++----
 .../_objectifs_results_evaluations.html.twig  |  26 +++-
 4 files changed, 153 insertions(+), 33 deletions(-)
 create mode 100644 .changes/unreleased/UX-20251030-180919.yaml

diff --git a/.changes/unreleased/UX-20251030-180919.yaml b/.changes/unreleased/UX-20251030-180919.yaml
new file mode 100644
index 000000000..a15866242
--- /dev/null
+++ b/.changes/unreleased/UX-20251030-180919.yaml
@@ -0,0 +1,6 @@
+kind: UX
+body: Expand timeSpent choices for evaluation document and translate them to user locale or fallback 'fr'
+time: 2025-10-30T18:09:19.373907522+01:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml b/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml
index 580910b2c..5b0841238 100644
--- a/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml
+++ b/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml
@@ -127,6 +127,20 @@ duration:
             few {# minutes}
             other {# minutes}
         }
+    hour: >-
+        {h, plural,
+            =0 {Aucune durée}
+            one {# heure}
+            few {# heures}
+            other {# heures}
+        }
+    day: >-
+        {d, plural,
+            =0 {Aucune durée}
+            one {# jour}
+            few {# jours}
+            other {# jours}
+        }
 
 filter_order:
     by_date:
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
index 7bdde14e9..c20c9eb9f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
@@ -67,37 +67,117 @@ const store = useStore();
 
 const $toast = useToast();
 
-const timeSpentChoices = [
-    { text: "1 minute", value: 60 },
-    { text: "2 minutes", value: 120 },
-    { text: "3 minutes", value: 180 },
-    { text: "4 minutes", value: 240 },
-    { text: "5 minutes", value: 300 },
-    { text: "10 minutes", value: 600 },
-    { text: "15 minutes", value: 900 },
-    { text: "20 minutes", value: 1200 },
-    { text: "25 minutes", value: 1500 },
-    { text: "30 minutes", value: 1800 },
-    { text: "45 minutes", value: 2700 },
-    { text: "1 hour", value: 3600 },
-    { text: "1 hour 15 minutes", value: 4500 },
-    { text: "1 hour 30 minutes", value: 5400 },
-    { text: "1 hour 45 minutes", value: 6300 },
-    { text: "2 hours", value: 7200 },
-    { text: "2 hours 30 minutes", value: 9000 },
-    { text: "3 hours", value: 10800 },
-    { text: "3 hours 30 minutes", value: 12600 },
-    { text: "4 hours", value: 14400 },
-    { text: "4 hours 30 minutes", value: 16200 },
-    { text: "5 hours", value: 18000 },
-    { text: "5 hours 30 minutes", value: 19800 },
-    { text: "6 hours", value: 21600 },
-    { text: "6 hours 30 minutes", value: 23400 },
-    { text: "7 hours", value: 25200 },
-    { text: "7 hours 30 minutes", value: 27000 },
-    { text: "8 hours", value: 28800 },
+const timeSpentValues = [
+    60,
+    120,
+    180,
+    240,
+    300,
+    600,
+    900,
+    1200,
+    1500,
+    1800,
+    2700,
+    3600,
+    4500,
+    5400,
+    6300,
+    7200,
+    9000,
+    10800,
+    12600,
+    14400,
+    16200,
+    18000,
+    19800,
+    21600,
+    23400,
+    25200,
+    27000,
+    28800,
+    43200,
+    57600,
+    72000,
+    86400,
+    100800,
+    115200,
+    129600,
+    144000, // goes from 1 minute to 40 hours
 ];
 
+const formatDuration = (seconds, locale) => {
+    const currentLocale = locale || navigator.language || "fr";
+
+    const totalHours = Math.floor(seconds / 3600);
+    const remainingMinutes = Math.floor((seconds % 3600) / 60);
+
+    if (totalHours >= 8) {
+        const days = Math.floor(totalHours / 8);
+        const remainingHours = totalHours % 8;
+
+        const parts = [];
+
+        if (days > 0) {
+            parts.push(
+                new Intl.NumberFormat(currentLocale, {
+                    style: "unit",
+                    unit: "day",
+                    unitDisplay: "long",
+                }).format(days),
+            );
+        }
+
+        if (remainingHours > 0) {
+            parts.push(
+                new Intl.NumberFormat(currentLocale, {
+                    style: "unit",
+                    unit: "hour",
+                    unitDisplay: "long",
+                }).format(remainingHours),
+            );
+        }
+
+        return parts.join(" ");
+    }
+
+    // For less than 8 hours, use hour and minute format
+    const parts = [];
+
+    if (totalHours > 0) {
+        parts.push(
+            new Intl.NumberFormat(currentLocale, {
+                style: "unit",
+                unit: "hour",
+                unitDisplay: "long",
+            }).format(totalHours),
+        );
+    }
+
+    if (remainingMinutes > 0) {
+        parts.push(
+            new Intl.NumberFormat(currentLocale, {
+                style: "unit",
+                unit: "minute",
+                unitDisplay: "long",
+            }).format(remainingMinutes),
+        );
+    }
+
+    console.log(parts);
+    console.log(parts.join(" "));
+
+    return parts.join(" ");
+};
+
+const timeSpentChoices = computed(() => {
+    const locale = "fr";
+    return timeSpentValues.map((value) => ({
+        text: formatDuration(value, locale),
+        value: parseInt(value),
+    }));
+});
+
 const startDate = computed({
     get() {
         return props.evaluation.startDate;
@@ -194,7 +274,7 @@ function updateWarningInterval(value) {
 }
 
 function updateTimeSpent(value) {
-    timeSpent.value = value;
+    timeSpent.value = parseInt(value);
 }
 
 function updateComment(value) {
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig
index f35310503..f1efbd31e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig
@@ -216,9 +216,29 @@
 
                                     {% if e.timeSpent is not null and e.timeSpent > 0 %}
                                         <li>
-                                            {% set minutes = (e.timeSpent / 60) %}
-                                            <span
-                                                class="item-key">{{ 'accompanying_course_work.timeSpent'|trans ~ ' : ' }}</span> {{ 'duration.minute'|trans({ '{m}' : minutes }) }}
+                                            {% set totalHours = (e.timeSpent / 3600)|round(0, 'floor') %}
+                                            {% set totalMinutes = ((e.timeSpent % 3600) / 60)|round(0, 'floor') %}
+
+                                            <span class="item-key">{{ 'accompanying_course_work.timeSpent'|trans ~ ' : ' }}</span>
+
+                                            {% if totalHours >= 8 %}
+                                                {% set days = (totalHours / 8)|round(0, 'floor') %}
+                                                {% set remainingHours = totalHours % 8 %}
+
+                                                {% if days > 0 %}
+                                                    {{ 'duration.day'|trans({ '{d}' : days }) }}
+                                                {% endif %}
+                                                {% if remainingHours > 0 %}
+                                                    {{ 'duration.hour'|trans({ '{h}' : remainingHours }) }}
+                                                {% endif %}
+                                            {% else %}
+                                                {% if totalHours > 0 %}
+                                                    {{ 'duration.hour'|trans({ '{h}' : totalHours }) }}
+                                                {% endif %}
+                                                {% if totalMinutes > 0 %}
+                                                    {{ 'duration.minute'|trans({ '{m}' : totalMinutes }) }}
+                                                {% endif %}
+                                            {% endif %}
                                         </li>
                                     {% elseif displayContent is defined and displayContent == 'long' %}
                                         <li>

From b0c86e238d8b00fa55ad1960bfd1a8587132c4cd Mon Sep 17 00:00:00 2001
From: LenaertsJ <julie.lenaerts@champs-libres.coop>
Date: Wed, 5 Nov 2025 09:48:50 +0000
Subject: [PATCH 207/283] =?UTF-8?q?Resolve=20"Activit=C3=A9s=20annexes:=20?=
 =?UTF-8?q?ajouter=20le=20nombre=20d'usagers=20concern=C3=A9s=20pour=20cha?=
 =?UTF-8?q?que=20activit=C3=A9=20annexe"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 config/packages/chill_aside_activity.yaml     |   2 +
 .../ChillAsideActivityExtension.php           |  19 +++
 .../src/DependencyInjection/Configuration.php |   6 +
 .../src/Entity/AsideActivity.php              |  16 +++
 .../ByConcernedPersonsCountAggregator.php     |  86 +++++++++++++
 .../SumConcernedPersonsCountAsideActivity.php | 116 ++++++++++++++++++
 .../src/Form/AsideActivityFormType.php        |  13 ++
 .../views/asideActivity/index.html.twig       |   5 +
 .../views/asideActivity/view.html.twig        |   5 +
 .../ByConcernedPersonsCountAggregatorTest.php |  49 ++++++++
 ...ConcernedPersonsCountAsideActivityTest.php |  50 ++++++++
 .../src/config/services/export.yaml           |   8 ++
 .../src/migrations/Version20251006113048.php  |  33 +++++
 .../src/translations/messages.fr.yml          |   4 +
 14 files changed, 412 insertions(+)
 create mode 100644 config/packages/chill_aside_activity.yaml
 create mode 100644 src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByConcernedPersonsCountAggregator.php
 create mode 100644 src/Bundle/ChillAsideActivityBundle/src/Export/Export/SumConcernedPersonsCountAsideActivity.php
 create mode 100644 src/Bundle/ChillAsideActivityBundle/src/Tests/Export/Aggregator/ByConcernedPersonsCountAggregatorTest.php
 create mode 100644 src/Bundle/ChillAsideActivityBundle/src/Tests/Export/Export/SumConcernedPersonsCountAsideActivityTest.php
 create mode 100644 src/Bundle/ChillAsideActivityBundle/src/migrations/Version20251006113048.php

diff --git a/config/packages/chill_aside_activity.yaml b/config/packages/chill_aside_activity.yaml
new file mode 100644
index 000000000..eb5c2d70e
--- /dev/null
+++ b/config/packages/chill_aside_activity.yaml
@@ -0,0 +1,2 @@
+chill_aside_activity:
+    show_concerned_persons_count: hidden
diff --git a/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php b/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php
index 056f29ba1..6fa123146 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php
@@ -25,6 +25,7 @@ final class ChillAsideActivityExtension extends Extension implements PrependExte
         $config = $this->processConfiguration($configuration, $configs);
 
         $container->setParameter('chill_aside_activity.form.time_duration', $config['form']['time_duration']);
+        $container->setParameter('chill_aside_activity.show_concerned_persons_count', 'visible' === $config['show_concerned_persons_count']);
 
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
         $loader->load('services.yaml');
@@ -38,6 +39,24 @@ final class ChillAsideActivityExtension extends Extension implements PrependExte
     {
         $this->prependRoute($container);
         $this->prependCruds($container);
+        $this->prependTwigConfig($container);
+    }
+
+    protected function prependTwigConfig(ContainerBuilder $container)
+    {
+        // Get the configuration for this bundle
+        $chillAsideActivityConfig = $container->getExtensionConfig($this->getAlias());
+        $config = $this->processConfiguration($this->getConfiguration($chillAsideActivityConfig, $container), $chillAsideActivityConfig);
+
+        // Add configuration to twig globals
+        $twigConfig = [
+            'globals' => [
+                'chill_aside_activity_config' => [
+                    'show_concerned_persons_count' => 'visible' === $config['show_concerned_persons_count'],
+                ],
+            ],
+        ];
+        $container->prependExtensionConfig('twig', $twigConfig);
     }
 
     protected function prependCruds(ContainerBuilder $container)
diff --git a/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/Configuration.php b/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/Configuration.php
index 241a545a8..66f3d3c86 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/Configuration.php
@@ -141,6 +141,12 @@ class Configuration implements ConfigurationInterface
             ->end()
             ->end()
             ->end()
+            ->end()
+            ->enumNode('show_concerned_persons_count')
+            ->values(['hidden', 'visible'])
+            ->defaultValue('hidden')
+            ->info('Show the concerned persons count field in aside activity forms and views')
+            ->end()
             ->end();
 
         return $treeBuilder;
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php b/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php
index b7671c61a..0082deaf9 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php
@@ -62,6 +62,10 @@ class AsideActivity implements TrackCreationInterface, TrackUpdateInterface
     #[ORM\ManyToOne(targetEntity: User::class)]
     private User $updatedBy;
 
+    #[Assert\GreaterThanOrEqual(0)]
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::INTEGER, nullable: true)]
+    private ?int $concernedPersonsCount = 0;
+
     public function getAgent(): ?User
     {
         return $this->agent;
@@ -186,4 +190,16 @@ class AsideActivity implements TrackCreationInterface, TrackUpdateInterface
 
         return $this;
     }
+
+    public function getConcernedPersonsCount(): ?int
+    {
+        return $this->concernedPersonsCount;
+    }
+
+    public function setConcernedPersonsCount(?int $concernedPersonsCount): self
+    {
+        $this->concernedPersonsCount = $concernedPersonsCount;
+
+        return $this;
+    }
 }
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByConcernedPersonsCountAggregator.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByConcernedPersonsCountAggregator.php
new file mode 100644
index 000000000..444c49269
--- /dev/null
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByConcernedPersonsCountAggregator.php
@@ -0,0 +1,86 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\AsideActivityBundle\Export\Aggregator;
+
+use Chill\AsideActivityBundle\Export\Declarations;
+use Chill\MainBundle\Export\AggregatorInterface;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class ByConcernedPersonsCountAggregator implements AggregatorInterface
+{
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
+    {
+        $qb->addSelect('aside.concernedPersonsCount AS by_concerned_persons_count_aggregator')
+            ->addGroupBy('by_concerned_persons_count_aggregator');
+    }
+
+    public function applyOn(): string
+    {
+        return Declarations::ASIDE_ACTIVITY_TYPE;
+    }
+
+    public function buildForm(FormBuilderInterface $builder): void
+    {
+        // No form needed
+    }
+
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
+    public function getLabels($key, array $values, $data): callable
+    {
+        return function ($value): string {
+            if ('_header' === $value) {
+                return 'export.aggregator.Concerned persons count';
+            }
+
+            if (null === $value) {
+                return 'export.aggregator.No concerned persons count specified';
+            }
+
+            return (string) $value;
+        };
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['by_concerned_persons_count_aggregator'];
+    }
+
+    public function getTitle(): string
+    {
+        return 'export.aggregator.Group by concerned persons count';
+    }
+}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Export/Export/SumConcernedPersonsCountAsideActivity.php b/src/Bundle/ChillAsideActivityBundle/src/Export/Export/SumConcernedPersonsCountAsideActivity.php
new file mode 100644
index 000000000..ab22302c2
--- /dev/null
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Export/SumConcernedPersonsCountAsideActivity.php
@@ -0,0 +1,116 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\AsideActivityBundle\Export\Export;
+
+use Chill\AsideActivityBundle\Export\Declarations;
+use Chill\AsideActivityBundle\Repository\AsideActivityRepository;
+use Chill\AsideActivityBundle\Security\AsideActivityVoter;
+use Chill\MainBundle\Export\ExportInterface;
+use Chill\MainBundle\Export\FormatterInterface;
+use Chill\MainBundle\Export\GroupedExportInterface;
+use Doctrine\ORM\Query;
+use Symfony\Component\Form\FormBuilderInterface;
+
+class SumConcernedPersonsCountAsideActivity implements ExportInterface, GroupedExportInterface
+{
+    public function __construct(private readonly AsideActivityRepository $repository) {}
+
+    public function buildForm(FormBuilderInterface $builder) {}
+
+    public function getNormalizationVersion(): int
+    {
+        return 1;
+    }
+
+    public function normalizeFormData(array $formData): array
+    {
+        return [];
+    }
+
+    public function denormalizeFormData(array $formData, int $fromVersion): array
+    {
+        return [];
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
+    public function getAllowedFormattersTypes(): array
+    {
+        return [FormatterInterface::TYPE_TABULAR];
+    }
+
+    public function getDescription(): string
+    {
+        return 'export.Sum concerned persons count for aside activities';
+    }
+
+    public function getGroup(): string
+    {
+        return 'export.Exports of aside activities';
+    }
+
+    public function getLabels($key, array $values, $data)
+    {
+        if ('export_sum_concerned_persons_count' !== $key) {
+            throw new \LogicException("the key {$key} is not used by this export");
+        }
+
+        $labels = array_combine($values, $values);
+        $labels['_header'] = $this->getTitle();
+
+        return static fn ($value) => $labels[$value];
+    }
+
+    public function getQueryKeys($data): array
+    {
+        return ['export_sum_concerned_persons_count'];
+    }
+
+    public function getResult($query, $data, \Chill\MainBundle\Export\ExportGenerationContext $context): array
+    {
+        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
+    }
+
+    public function getTitle(): string
+    {
+        return 'export.Sum concerned persons count for aside activities';
+    }
+
+    public function getType(): string
+    {
+        return Declarations::ASIDE_ACTIVITY_TYPE;
+    }
+
+    public function initiateQuery(array $requiredModifiers, array $acl, array $data, \Chill\MainBundle\Export\ExportGenerationContext $context): \Doctrine\ORM\QueryBuilder
+    {
+        $qb = $this->repository->createQueryBuilder('aside');
+
+        $qb->select('SUM(COALESCE(aside.concernedPersonsCount, 0)) as export_sum_concerned_persons_count');
+
+        return $qb;
+    }
+
+    public function requiredRole(): string
+    {
+        return AsideActivityVoter::STATS;
+    }
+
+    public function supportsModifiers(): array
+    {
+        return [
+            Declarations::ASIDE_ACTIVITY_TYPE,
+        ];
+    }
+}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php b/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
index d6fcb821c..ea04fdc42 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
@@ -21,6 +21,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToTimestampTransformer;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\IntegerType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
@@ -29,11 +30,13 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 final class AsideActivityFormType extends AbstractType
 {
     private readonly array $timeChoices;
+    private readonly bool $showConcernedPersonsCount;
 
     public function __construct(
         ParameterBagInterface $parameterBag,
     ) {
         $this->timeChoices = $parameterBag->get('chill_aside_activity.form.time_duration');
+        $this->showConcernedPersonsCount = $parameterBag->get('chill_aside_activity.show_concerned_persons_count');
     }
 
     public function buildForm(FormBuilderInterface $builder, array $options)
@@ -76,6 +79,16 @@ final class AsideActivityFormType extends AbstractType
             ->add('location', PickUserLocationType::class)
         ;
 
+        if ($this->showConcernedPersonsCount) {
+            $builder->add('concernedPersonsCount', IntegerType::class, [
+                'label' => 'Concerned persons count',
+                'required' => false,
+                'attr' => [
+                    'min' => 0,
+                ],
+            ]);
+        }
+
         foreach (['duration'] as $fieldName) {
             $builder->get($fieldName)
                 ->addModelTransformer($durationTimeTransformer);
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig
index 0a8648749..0d06e5ba9 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig
@@ -42,6 +42,11 @@
                                 {%- if entity.location.name is defined -%}
                                     <div><i class="fa fa-fw fa-map-marker"></i>{{ entity.location.name }}</div>
                                 {%- endif -%}
+
+                                {%- if entity.concernedPersonsCount > 0 -%}
+                                    <div><i class="fa fa-fw fa-user"></i>{{ entity.concernedPersonsCount }}</div>
+                                {%- endif -%}
+
 							</div>
 							<div class="item-col" style="justify-content: flex-end;">
 								<div class="box">
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig
index ef6faa9c6..330a2ab13 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig
@@ -38,6 +38,11 @@
 				<dt class="inline">{{ 'Duration'|trans }}</dt>
 				<dd>{{ entity.duration|date('H:i') }}</dd>
 
+                {% if chill_aside_activity_config.show_concerned_persons_count == 'visible' %}
+                    <dt class="inline">{{ 'Concerned persons count'|trans }}</dt>
+                    <dd>{{ entity.concernedPersonsCount }}</dd>
+                {% endif %}
+
 				<dt class="inline">{{ 'Remark'|trans }}</dt>
 				{%- if entity.note is empty -%}
 					<dd>
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Tests/Export/Aggregator/ByConcernedPersonsCountAggregatorTest.php b/src/Bundle/ChillAsideActivityBundle/src/Tests/Export/Aggregator/ByConcernedPersonsCountAggregatorTest.php
new file mode 100644
index 000000000..a1d133d8c
--- /dev/null
+++ b/src/Bundle/ChillAsideActivityBundle/src/Tests/Export/Aggregator/ByConcernedPersonsCountAggregatorTest.php
@@ -0,0 +1,49 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\AsideActivityBundle\Tests\Export\Aggregator;
+
+use Chill\AsideActivityBundle\Entity\AsideActivity;
+use Chill\AsideActivityBundle\Export\Aggregator\ByConcernedPersonsCountAggregator;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Doctrine\ORM\EntityManagerInterface;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class ByConcernedPersonsCountAggregatorTest extends AbstractAggregatorTest
+{
+    public function getAggregator()
+    {
+        return new ByConcernedPersonsCountAggregator();
+    }
+
+    public static function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public static function getQueryBuilders(): iterable
+    {
+        self::bootKernel();
+        $em = self::getContainer()->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(aside.id)')
+                ->from(AsideActivity::class, 'aside'),
+        ];
+    }
+}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/Tests/Export/Export/SumConcernedPersonsCountAsideActivityTest.php b/src/Bundle/ChillAsideActivityBundle/src/Tests/Export/Export/SumConcernedPersonsCountAsideActivityTest.php
new file mode 100644
index 000000000..499986ac1
--- /dev/null
+++ b/src/Bundle/ChillAsideActivityBundle/src/Tests/Export/Export/SumConcernedPersonsCountAsideActivityTest.php
@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\AsideActivityBundle\Tests\Export\Export;
+
+use Chill\AsideActivityBundle\Export\Export\SumConcernedPersonsCountAsideActivity;
+use Chill\AsideActivityBundle\Repository\AsideActivityRepository;
+use Chill\MainBundle\Test\Export\AbstractExportTest;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+final class SumConcernedPersonsCountAsideActivityTest extends AbstractExportTest
+{
+    protected function setUp(): void
+    {
+        self::bootKernel();
+    }
+
+    public function getExport()
+    {
+        $repository = self::getContainer()->get(AsideActivityRepository::class);
+
+        yield new SumConcernedPersonsCountAsideActivity($repository);
+    }
+
+    public static function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public static function getModifiersCombination(): array
+    {
+        return [
+            ['aside_activity'],
+        ];
+    }
+}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/config/services/export.yaml b/src/Bundle/ChillAsideActivityBundle/src/config/services/export.yaml
index 40cb120da..efba7a8af 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/config/services/export.yaml
+++ b/src/Bundle/ChillAsideActivityBundle/src/config/services/export.yaml
@@ -20,6 +20,10 @@ services:
       tags:
           - { name: chill.export, alias: 'avg_aside_activity_duration' }
 
+  Chill\AsideActivityBundle\Export\Export\SumConcernedPersonsCountAsideActivity:
+      tags:
+          - { name: chill.export, alias: 'sum_aside_activity_concerned_persons_count' }
+
   ## Filters
   chill.aside_activity.export.date_filter:
     class: Chill\AsideActivityBundle\Export\Filter\ByDateFilter
@@ -70,3 +74,7 @@ services:
   Chill\AsideActivityBundle\Export\Aggregator\ByLocationAggregator:
       tags:
           - { name: chill.export_aggregator, alias: 'aside_activity_location_aggregator' }
+
+  Chill\AsideActivityBundle\Export\Aggregator\ByConcernedPersonsCountAggregator:
+      tags:
+          - { name: chill.export_aggregator, alias: 'aside_activity_concerned_persons_count_aggregator' }
diff --git a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20251006113048.php b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20251006113048.php
new file mode 100644
index 000000000..8ea1dbf4c
--- /dev/null
+++ b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20251006113048.php
@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\Migrations\AsideActivity;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20251006113048 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add concernedPersonsCount property to AsideActivity entity';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_asideactivity.asideactivity ADD concernedPersonsCount INT DEFAULT 0');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_asideactivity.AsideActivity DROP concernedPersonsCount');
+    }
+}
diff --git a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
index 7d3c7a20e..664cd41b7 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
+++ b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
@@ -27,6 +27,7 @@ Emergency: Urgent
 by: "Par "
 location: Lieu
 Asideactivity location: Localisation de l'activité
+Concerned persons count: Nombre d'usager concernés
 
 # Crud
 crud:
@@ -190,6 +191,7 @@ export:
     Count aside activities by various parameters.: Compte le nombre d'activités annexes selon divers critères
     Average aside activities duration: Durée moyenne des activités annexes
     Sum aside activities duration: Durée des activités annexes
+    Sum concerned persons count for aside activities: Nombre d'usager concernés par les activités annexes
     filter:
         Filter by aside activity date: Filtrer les activités annexes par date
         Filter by aside activity type: Filtrer les activités annexes par type d'activité
@@ -210,6 +212,8 @@ export:
         'Filtered by aside activity location: only %location%': "Filtré par localisation: uniquement %location%"
     aggregator:
         Group by aside activity type: Grouper les activités annexes par type d'activité
+        Group by concerned persons count: Grouper les activités annexes par nombre d'usagers conernés
+        Concerned persons count: Nombre d'usagers concernés
         Aside activity type: Type d'activité annexe
         by_user_job:
             Aggregate by user job: Grouper les activités annexes par métier des utilisateurs

From 305c6deb2423f184848bd2f213061e603b411989 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 6 Nov 2025 10:16:36 +0100
Subject: [PATCH 208/283] Add vue-tsc to dev dependencies

# Conflicts:
#	.junie/guidelines.md
#	src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue
#	src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/App.vue
#	src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App2.vue
#	src/Bundle/ChillDocStoreBundle/Resources/public/types/generic_doc.ts
#	src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DropFileWidget/DropFileModal.vue
#	src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton/HistoryButtonListItem.vue
#	src/Bundle/ChillMainBundle/Resources/public/chill/js/date.ts
#	src/Bundle/ChillMainBundle/Resources/public/vuejs/DownloadExport/App.vue
#	src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/App.vue
#	src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/AttachmentList.vue
#	src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/GenericDocItemBox.vue
#	src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/PickGenericDoc.vue
#	src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/PickGenericDocModal.vue
#	src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/EntityWorkflowVueSubscriber.vue
#	src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
#	src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
#	src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml
#	src/Bundle/ChillPersonBundle/Resources/public/mod/DuplicateSelector/AccompanyingPeriodWorkSelector.ts
#	src/Bundle/ChillPersonBundle/Resources/public/types.ts
#	src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
#	src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
#	src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkList.vue
#	src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkSelectorModal.vue
#	src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.ts
#	src/Bundle/ChillPersonBundle/translations/messages.fr.yml
---
 package.json | 1 +
 1 file changed, 1 insertion(+)

diff --git a/package.json b/package.json
index f3a717823..12a5fee26 100644
--- a/package.json
+++ b/package.json
@@ -41,6 +41,7 @@
     "typescript": "^5.6.3",
     "typescript-eslint": "^8.13.0",
     "vue-loader": "^17.0.0",
+    "vue-tsc": "^3.1.3",
     "webpack": "^5.75.0",
     "webpack-cli": "^5.0.1"
   },

From b31778c06842b3d0cc828d664628eac6b28955ad Mon Sep 17 00:00:00 2001
From: Boris Waaub <boris.waaub@digitalternative.be>
Date: Thu, 6 Nov 2025 10:10:06 +0000
Subject: [PATCH 209/283] =?UTF-8?q?Am=C3=A9liorer=20l'affichage=20de=20la?=
 =?UTF-8?q?=20hi=C3=A9rarchie=20des=20motifs=20et=20ajouter=20une=20checkb?=
 =?UTF-8?q?ox=20=C2=AB=20Afficher=20uniquement=20les=20commentaires=20?=
 =?UTF-8?q?=C2=BB.?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vuejs/StoredObjectButton/helpers.ts       |   2 -
 .../PostTicketUpdateMessageHandler.php        |   2 +
 .../src/Resources/public/types.ts             |   1 +
 .../Resources/public/vuejs/TicketApp/App.vue  |  47 +++++---
 .../Addressee/AddresseeSelectorComponent.vue  |   2 +-
 .../TicketApp/components/BannerComponent.vue  |   7 +-
 .../components/Motive/MotiveComponent.vue     |  34 ++++--
 .../Motive/MotiveSelectorComponent.vue        | 100 +++++++++++-------
 .../Person/PersonsSelectorComponent.vue       |   2 +-
 .../components/PreviousTicketsComponent.vue   |  88 ++++++++-------
 .../public/vuejs/TicketApp/store/index.ts     |   2 +-
 .../TicketApp/store/modules/addressee.ts      |   4 +-
 .../vuejs/TicketApp/store/modules/ticket.ts   |   5 +
 .../public/vuejs/TicketApp/utils/utils.ts     |  23 ++--
 .../components/TicketListItemComponent.vue    |  26 +++--
 .../src/translations/messages+intl-icu.fr.yml |   1 +
 src/shims-custom.d.ts                         |   3 +
 tsconfig.json                                 |   5 +
 18 files changed, 222 insertions(+), 132 deletions(-)
 create mode 100644 src/shims-custom.d.ts

diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/helpers.ts b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/helpers.ts
index aceaa038b..3941683cb 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/helpers.ts
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/helpers.ts
@@ -175,8 +175,6 @@ async function download_and_decrypt_doc(
     throw new Error("no version associated to stored object");
   }
 
-  // sometimes, the downloadInfo may be embedded into the storedObject
-  console.log("storedObject", storedObject);
   let downloadInfo;
   if (
     typeof storedObject._links !== "undefined" &&
diff --git a/src/Bundle/ChillTicketBundle/src/Messenger/Handler/PostTicketUpdateMessageHandler.php b/src/Bundle/ChillTicketBundle/src/Messenger/Handler/PostTicketUpdateMessageHandler.php
index 5c8412fc4..9424203e9 100644
--- a/src/Bundle/ChillTicketBundle/src/Messenger/Handler/PostTicketUpdateMessageHandler.php
+++ b/src/Bundle/ChillTicketBundle/src/Messenger/Handler/PostTicketUpdateMessageHandler.php
@@ -16,7 +16,9 @@ use Chill\TicketBundle\Messenger\PostTicketUpdateMessage;
 use Chill\TicketBundle\Repository\TicketRepositoryInterface;
 use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException;
 use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
+use Symfony\Component\Messenger\Attribute\AsMessageHandler;
 
+#[AsMessageHandler]
 final readonly class PostTicketUpdateMessageHandler
 {
     public function __construct(
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
index 601f299ff..5999007f6 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
@@ -13,6 +13,7 @@ interface MotiveBase {
   id: number;
   active: boolean;
   label: TranslatableString;
+  makeTicketEmergency: TicketEmergencyState;
 }
 
 /**
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
index 6cdc02ac9..40923f853 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
@@ -1,7 +1,24 @@
 <template>
   <banner-component :ticket="ticket" />
   <div class="container-xxl pt-1" style="padding-bottom: 55px" v-if="!loading">
-    <previous-tickets-component :key="refreshKey" />
+    <div class="row">
+      <div class="col">
+        <div class="form-check">
+          <input
+            v-model="showOnlyHistoryComments"
+            class="form-check-input"
+            type="checkbox"
+            id="showOnlyCommentsCheckbox"
+          />
+          <label class="form-check-label" for="showOnlyCommentsCheckbox">
+            {{ trans(CHILL_TICKET_LIST_SHOW_ONLY_HISTORY_COMMENTS) }}
+          </label>
+        </div>
+      </div>
+      <div class="col d-flex justify-content-end">
+        <previous-tickets-component :key="refreshKey" />
+      </div>
+    </div>
     <ticket-history-list-component
       :history="ticketHistory"
       :key="ticketHistory.length"
@@ -64,15 +81,20 @@ import {
   CHILL_TICKET_TICKET_INIT_FORM_ERROR,
   CHILL_TICKET_TICKET_INIT_FORM_WARNING,
   CHILL_TICKET_LIST_LOADING_TICKET_DETAILS,
+  CHILL_TICKET_LIST_SHOW_ONLY_HISTORY_COMMENTS,
 } from "translator";
 
 const store = useStore();
 const toast = useToast();
 
 store.commit("setTicket", JSON.parse(window.initialTicket) as Ticket);
-
+const showOnlyHistoryComments = ref(false);
 const ticket = computed(() => store.getters.getTicket as Ticket);
-const ticketHistory = computed(() => store.getters.getTicketHistory);
+const ticketHistory = computed(() =>
+  showOnlyHistoryComments.value
+    ? store.getters.getTicketHistoryComments
+    : store.getters.getTicketHistory,
+);
 const motives = computed(() => store.getters.getMotives as Motive[]);
 const suggestedPersons = computed(() => store.getters.getPersons as Person[]);
 const showTicketInitFormModal = ref(false);
@@ -81,21 +103,22 @@ const refreshKey = ref(0);
 
 async function handleFormSubmit(ticketForm: TicketInitForm) {
   try {
+    if (!ticketForm.motive || ticketForm.content.trim() === "") {
+      toast.warning(trans(CHILL_TICKET_TICKET_INIT_FORM_WARNING));
+      return;
+    }
     if (ticketForm.motive) {
       await store.dispatch("createMotive", ticketForm.motive);
-    } else {
-      toast.warning(trans(CHILL_TICKET_TICKET_INIT_FORM_WARNING));
-      return;
     }
-
-    if (ticketForm.content && ticketForm.content.trim() !== "") {
+    if (ticketForm.content.trim() !== "") {
       await store.dispatch("createComment", ticketForm.content);
-    } else {
-      toast.warning(trans(CHILL_TICKET_TICKET_INIT_FORM_WARNING));
-      return;
     }
 
-    await store.dispatch("setEmergency", ticketForm.emergency);
+    // Ne pas mettre à jour emergency si le motif force l'état d'urgence
+    if (ticketForm.motive && !ticketForm.motive.makeTicketEmergency) {
+      await store.dispatch("setEmergency", ticketForm.emergency);
+    }
+
     await store.dispatch("setAddressees", ticketForm.addressees);
     await store.dispatch("setPersons", ticketForm.persons);
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Addressee/AddresseeSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Addressee/AddresseeSelectorComponent.vue
index df291989a..db7b3aa67 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Addressee/AddresseeSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Addressee/AddresseeSelectorComponent.vue
@@ -90,7 +90,7 @@ function addNewEntity({ entity }: { entity: EntitiesOrMe }) {
 
 function removeEntity({ entity }: { entity: EntitiesOrMe }) {
   const index = selectedEntities.value.findIndex(
-    (selectedEntity) => selectedEntity === entity,
+    (selectedEntity: Entities) => selectedEntity === entity,
   );
   if (index !== -1) {
     selectedEntities.value.splice(index, 1);
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
index 0b0c5131a..8915514ec 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
@@ -3,6 +3,9 @@
     <div class="container-xxl text-primary">
       <div class="row">
         <div class="col-md-6 col-sm-12 ps-md-5 ps-xxl-0">
+          <div class="small text-muted">
+            {{ motiveHierarchyLabel(ticket.currentMotive) }}
+          </div>
           <h1>
             {{ getTicketTitle(ticket) }}
             <peloton-component
@@ -26,7 +29,7 @@
             <state-toggle-component v-model="isOpen" />
           </div>
           <div class="d-flex justify-content-end">
-            <p class="created-at-timespan" v-if="ticket.createdAt">
+            <p class="created-at-timespan" v-if="since">
               {{
                 trans(CHILL_TICKET_TICKET_BANNER_SINCE, {
                   time: since,
@@ -127,7 +130,7 @@ import {
 import { useStore } from "vuex";
 
 // Utils
-import { getTicketTitle } from "../utils/utils";
+import { getTicketTitle, motiveHierarchyLabel } from "../utils/utils";
 
 const props = defineProps<{
   ticket: Ticket;
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveComponent.vue
index 6ea2c67b2..1690a5aa3 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveComponent.vue
@@ -1,6 +1,10 @@
 <template>
-  <div class="col-12 fw-bolder">
-    {{ motiveLabelRecursive(props.motiveHistory.motive) }}
+  <div class="col-12">
+    <span class="badge-motive">
+      <div>
+        {{ localizeString(props.motiveHistory.motive.label) }}
+      </div>
+    </span>
     <peloton-component
       :stored-objects="motive ? motive.storedObjects : null"
       pelotonBtnClass="float-end"
@@ -9,17 +13,17 @@
 </template>
 
 <script lang="ts" setup>
+import { computed, ComputedRef } from "vue";
 import { useStore } from "vuex";
-// Types
-import {Motive, MotiveHistory, MotiveWithParent} from "../../../../types";
 
-//Utils
+//utils
 import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
 
+// Types
+import { Motive, MotiveHistory } from "../../../../types";
+
 //Components
 import PelotonComponent from "../PelotonComponent.vue";
-import { computed, ComputedRef } from "vue";
-import {motiveLabelRecursive} from "../../utils/utils";
 
 const props = defineProps<{ motiveHistory: MotiveHistory }>();
 
@@ -29,4 +33,18 @@ const motive: ComputedRef<Motive | null> = computed(() =>
 );
 </script>
 
-<style lang="scss" scoped></style>
+<style lang="scss" scoped>
+span.badge-motive {
+  margin: 0.2rem 0.1rem;
+  display: inline-block;
+  padding: 0 0.5em !important;
+  background-color: #fff;
+  color: #2c2d2f;
+  border: 1px solid #dee2e6;
+  border-bottom-width: 1px;
+  border-bottom-style: solid;
+  border-bottom-width: 2px;
+  border-bottom-style: solid;
+  border-radius: 6px;
+}
+</style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveSelectorComponent.vue
index 447bbba86..6a2b28201 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveSelectorComponent.vue
@@ -11,11 +11,14 @@
           :open-direction="openDirection"
           :multiple="false"
           :searchable="true"
+          :internalSearch="false"
           :placeholder="trans(CHILL_TICKET_TICKET_SET_MOTIVE_LABEL)"
-          :options="flattenedMotives"
+          :options="options"
+          :loading="isLoading"
           v-model="motive"
           class="form-control"
           @remove="(value: Motive) => $emit('remove', value)"
+          @search-change="search"
           :disabled="disabled"
         >
           <template
@@ -57,7 +60,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed } from "vue";
+import { computed, ref, watch } from "vue";
 import VueMultiselect from "vue-multiselect";
 
 // Types
@@ -116,50 +119,73 @@ const motive = computed<Motive | null>({
     emit("update:modelValue", value);
   },
 });
+type MotiveOptions = Motive & {
+  isChild?: boolean;
+  isParent?: boolean;
+  level?: number;
+  displayLabel: string;
+  breadcrumb: string[];
+};
 
-const flattenedMotives = computed(() => {
-  const result: (Motive & {
-    isChild?: boolean;
-    isParent?: boolean;
-    level?: number;
-    displayLabel: string;
-    breadcrumb: string[];
-  })[] = [];
+const motiveOptions: MotiveOptions[] = [];
+const options = ref<MotiveOptions[]>([]);
+const isLoading = ref<boolean>(false);
 
-  const processMotiveRecursively = (
-    motive: Motive,
-    isChild = false,
-    level = 0,
-    parentBreadcrumb: string[] = [],
-  ) => {
-    const hasChildren = motive.children && motive.children.length > 0;
-    const displayLabel = localizeString(motive.label);
-    const breadcrumb = [...parentBreadcrumb, displayLabel];
+function search(query: string) {
+  isLoading.value = true;
+  options.value = motiveOptions.filter((m) =>
+    m.breadcrumb.some((crumb) =>
+      crumb.toLowerCase().includes(query.trim().toLowerCase()),
+    ),
+  );
+  isLoading.value = false;
+}
 
-    if (props.allowParentSelection || !hasChildren) {
-      result.push({
-        ...motive,
-        isChild,
-        isParent: hasChildren,
-        level,
-        breadcrumb,
-        displayLabel,
-      });
-    }
+function processMotiveRecursively(
+  motive: Motive,
+  isChild = false,
+  level = 0,
+  parentBreadcrumb: string[] = [],
+) {
+  const hasChildren = motive.children && motive.children.length > 0;
+  const displayLabel = localizeString(motive.label);
+  const breadcrumb = [...parentBreadcrumb, displayLabel];
 
-    if (hasChildren) {
-      motive.children.forEach((childMotive) => {
-        processMotiveRecursively(childMotive, true, level + 1, breadcrumb);
-      });
-    }
-  };
+  if (props.allowParentSelection || !hasChildren) {
+    const optionValue = {
+      ...motive,
+      isChild,
+      isParent: hasChildren,
+      level,
+      breadcrumb,
+      displayLabel,
+    };
+    motiveOptions.push(optionValue);
+    options.value.push(optionValue);
+  }
 
+  if (hasChildren) {
+    motive.children.forEach((childMotive) => {
+      processMotiveRecursively(childMotive, true, level + 1, breadcrumb);
+    });
+  }
+}
+
+function fillOptions() {
+  motiveOptions.length = 0;
+  options.value.length = 0;
   props.motives.forEach((parentMotive) => {
     processMotiveRecursively(parentMotive, false, 0, []);
   });
+}
 
-  return result;
-});
+watch(
+  () => props.motives,
+  () => {
+    fillOptions();
+  },
+  { deep: true },
+);
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Person/PersonsSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Person/PersonsSelectorComponent.vue
index f02864476..c1b90d0f7 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Person/PersonsSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Person/PersonsSelectorComponent.vue
@@ -112,7 +112,7 @@ function addNewEntity({ entity }: { entity: EntitiesOrMe }) {
 function removeEntity({ entity }: { entity: EntitiesOrMe }) {
   if (multiple) {
     const index = selectedEntities.value.findIndex(
-      (selectedEntity) => selectedEntity === entity,
+      (selectedEntity: Entities) => selectedEntity === entity,
     );
     if (index !== -1) {
       selectedEntities.value.splice(index, 1);
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PreviousTicketsComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PreviousTicketsComponent.vue
index 8570ab184..3b3ab18d0 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PreviousTicketsComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PreviousTicketsComponent.vue
@@ -1,52 +1,48 @@
 <template>
-  <div class="d-flex justify-content-end">
-    <div @click="handleClick">
-      <button type="button" class="btn btn-light position-relative">
-        {{ trans(CHILL_TICKET_TICKET_PREVIOUS_TICKETS) }}
+  <div @click="handleClick">
+    <button type="button" class="btn btn-light position-relative">
+      {{ trans(CHILL_TICKET_TICKET_PREVIOUS_TICKETS) }}
 
-        <span
-          class="position-absolute top-0 start-100 translate-middle badge rounded-pill bg-chill-green"
-        >
-          {{ previousTickets.length }}
-          <span class="visually-hidden">Tickets</span>
-        </span>
-      </button>
-    </div>
-
-    <!-- Modal for ticket list -->
-    <Modal
-      v-if="showPreviousTicketModal"
-      :show="showPreviousTicketModal"
-      modal-dialog-class="modal-lg"
-      @close="closeModal"
-    >
-      <template #header>
-        <h3 class="modal-title">
-          {{
-            trans(CHILL_TICKET_LIST_TITLE_PREVIOUS_TICKETS, {
-              name:
-                currentPersons.length > 0
-                  ? currentPersons
-                      .map((person: Person) => person.text)
-                      .join(", ")
-                  : undefined,
-            })
-          }}
-        </h3>
-      </template>
-
-      <template #body>
-        <ticket-list-component
-          :hasMoreTickets="pagination.next !== null"
-          :tickets="previousTickets"
-          :title="trans(CHILL_TICKET_LIST_NO_TICKETS)"
-          @fetchNextPage="fetchNextPage"
-          @view-ticket="handleViewTicket"
-          @edit-ticket="handleEditTicket"
-        />
-      </template>
-    </Modal>
+      <span
+        class="position-absolute top-0 start-100 translate-middle badge rounded-pill bg-chill-green"
+      >
+        {{ previousTickets.length }}
+        <span class="visually-hidden">Tickets</span>
+      </span>
+    </button>
   </div>
+
+  <!-- Modal for ticket list -->
+  <Modal
+    v-if="showPreviousTicketModal"
+    :show="showPreviousTicketModal"
+    modal-dialog-class="modal-lg"
+    @close="closeModal"
+  >
+    <template #header>
+      <h3 class="modal-title">
+        {{
+          trans(CHILL_TICKET_LIST_TITLE_PREVIOUS_TICKETS, {
+            name:
+              currentPersons.length > 0
+                ? currentPersons.map((person: Person) => person.text).join(", ")
+                : undefined,
+          })
+        }}
+      </h3>
+    </template>
+
+    <template #body>
+      <ticket-list-component
+        :hasMoreTickets="pagination.next !== null"
+        :tickets="previousTickets"
+        :title="trans(CHILL_TICKET_LIST_NO_TICKETS)"
+        @fetchNextPage="fetchNextPage"
+        @view-ticket="handleViewTicket"
+        @edit-ticket="handleEditTicket"
+      />
+    </template>
+  </Modal>
 </template>
 
 <script setup lang="ts">
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts
index 05e273b4c..c0d102dc1 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/index.ts
@@ -20,7 +20,7 @@ export interface RootState {
   user: UserState;
 }
 
-export const store = createStore<RootState>({
+export const store = createStore({
   modules: {
     motive: moduleMotive,
     ticket: moduleTicket,
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/addressee.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/addressee.ts
index f1f6d9df9..f5efc9fd5 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/addressee.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/addressee.ts
@@ -3,8 +3,8 @@ import {
   makeFetch,
 } from "../../../../../../../../ChillMainBundle/Resources/public/lib/api/apiMethods";
 
-import { Module } from "vuex";
-import { RootState } from "..";
+import type { RootState } from "..";
+import type { Module } from "vuex";
 
 import {
   ApiException,
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
index 890890c9d..228dc74eb 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/ticket.ts
@@ -62,6 +62,11 @@ export const moduleTicket: Module<State, RootState> = {
     getTicketHistory: (state) => {
       return state.ticket.history;
     },
+    getTicketHistoryComments: (state) => {
+      return state.ticket.history.filter(
+        (history) => history.event_type == "add_comment",
+      );
+    },
     getCurrentPersons(state) {
       return state.ticket.currentPersons;
     },
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/utils/utils.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/utils/utils.ts
index 34a2ad09d..5ff6f995a 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/utils/utils.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/utils/utils.ts
@@ -8,7 +8,7 @@ import {
   CHILL_TICKET_TICKET_BANNER_AND,
   CHILL_TICKET_TICKET_BANNER_NO_MOTIVE,
 } from "translator";
-import {MotiveWithParent, Ticket, TicketSimple} from "../../../types";
+import { MotiveWithParent, Ticket, TicketSimple } from "../../../types";
 import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
 
 /**
@@ -18,8 +18,11 @@ import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizat
  * @returns Une chaîne formatée représentant le temps écoulé
  */
 export function getSinceCreated(createdAt: string, currentTime: Date): string {
+  if (!createdAt) {
+    return "";
+  }
   const date = ISOToDatetime(createdAt);
-  if (date == null) {
+  if (!date) {
     return "";
   }
 
@@ -29,7 +32,6 @@ export function getSinceCreated(createdAt: string, currentTime: Date): string {
   const minutesDiff = Math.floor((timeDiff % (1000 * 3600)) / (1000 * 60));
   const secondsDiff = Math.floor((timeDiff % (1000 * 60)) / 1000);
 
-  // On construit la liste des parties à afficher
   const parts: string[] = [];
   if (daysDiff > 0) {
     parts.push(trans(CHILL_TICKET_TICKET_BANNER_DAYS, { count: daysDiff }));
@@ -83,18 +85,19 @@ export function getTicketTitle(ticket: Ticket | TicketSimple): string {
   return `#${ticket.id} ${trans(CHILL_TICKET_TICKET_BANNER_NO_MOTIVE)}`;
 }
 
-export function motiveLabelRecursive(motive: MotiveWithParent|null): string  {
-  console.log('test', motive);
+export function motiveHierarchyLabel(motive: MotiveWithParent | null): string {
   if (null === motive) {
-    return "";
+    return "Aucun motif";
   }
-
   const str = [];
-  let m: MotiveWithParent|null = motive;
+  let m: MotiveWithParent | null = motive;
   do {
     str.push(localizeString(m.label));
     m = m.parent;
   } while (m !== null);
-
-  return str.reverse().join(" > ");
+  str.reverse();
+  if (str.length > 1) {
+    str.pop();
+  }
+  return str.join(" > ");
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListItemComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListItemComponent.vue
index 5985615e9..a7e7fd277 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListItemComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListItemComponent.vue
@@ -2,14 +2,11 @@
   <div class="card mb-3 text-primary border-primary">
     <div class="card-body">
       <div class="wrap-header">
-        <div class="wh-row d-flex justify-content-between align-items-center">
-          <div class="wh-col">
-            <span
-              class="h2"
-              style="color: var(--bs-chill-blue); font-variant: all-small-caps"
-            >
-              {{ getTicketTitle(ticket) }}
-            </span>
+        <div class="wh-row d-flex justify-content-between align-items-top">
+          <div v-if="null !== ticket.currentMotive && null !== ticket.currentMotive.parent" class="wh-col">
+            <div class="small text-muted">
+              {{ motiveHierarchyLabel(ticket.currentMotive) }}
+            </div>
           </div>
           <div class="wh-col">
             <emergency-component
@@ -23,9 +20,17 @@
           </div>
         </div>
         <div class="wh-row">
-          <div class="wh-col" v-if="ticket.createdAt">
+          <div class="wh-col">
             <span
-              v-if="ticket"
+              class="h2"
+              style="color: var(--bs-chill-blue); font-variant: all-small-caps"
+            >
+              {{ getTicketTitle(ticket) }}
+            </span>
+          </div>
+          <div class="wh-col">
+            <span
+              v-if="ticket.createdAt"
               :title="formatDateTime(ticket.createdAt.datetime, 'long', 'long')"
               style="font-style: italic"
             >
@@ -105,6 +110,7 @@ import {
   getSinceCreated,
   formatDateTime,
   getTicketTitle,
+  motiveHierarchyLabel,
 } from "../../TicketApp/utils/utils";
 
 // Components
diff --git a/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml b/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
index 94d0399c1..ec46a9c98 100644
--- a/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
+++ b/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
@@ -4,6 +4,7 @@ chill_ticket:
     title: "Tickets"
     title_with_name: "{name, select, null {Tickets} undefined {Tickets} other {Tickets de {name}}}"
     title_menu: "Tickets de l'usager"
+    show_only_history_comments: "Afficher uniquement les commentaires"
     title_previous_tickets: "{name, select, other {Précédent ticket de {name}} undefined {Précédent ticket}}"
     no_tickets: "Aucun ticket"
     loading_ticket: "Chargement des tickets..."
diff --git a/src/shims-custom.d.ts b/src/shims-custom.d.ts
new file mode 100644
index 000000000..0e24561cc
--- /dev/null
+++ b/src/shims-custom.d.ts
@@ -0,0 +1,3 @@
+declare module "vue-multiselect";
+declare module "ChillMainAssets/vuejs/_components/Entity/UserRenderBoxBadge.vue";
+declare module "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue";
diff --git a/tsconfig.json b/tsconfig.json
index 6bd6667c7..fc842b68e 100644
--- a/tsconfig.json
+++ b/tsconfig.json
@@ -11,4 +11,9 @@
             "ChillPersonAssets/*": ["./src/Bundle/ChillPersonBundle/Resources/public/*"]
         }
     },
+    "include": [
+        "src/**/*.ts",
+        "src/**/*.d.ts",
+        "src/**/*.vue"
+    ]
 }

From ae5ba6706417b83ae879f042c1768e373187f9d0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 6 Nov 2025 13:00:28 +0100
Subject: [PATCH 210/283] Update UserMenuBuilder to adjust menu labels and sort
 order

- Renamed 'My invitations list' to 'invite.list.title'.
- Updated the sort order for 'My calendar' from 9 to 8, to place "invitation list" just after the calendar list
---
 src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php b/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php
index fe3083d96..672b53460 100644
--- a/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php
+++ b/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php
@@ -27,10 +27,10 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
                 'route' => 'chill_calendar_calendar_list_my',
             ])
                 ->setExtras([
-                    'order' => 9,
+                    'order' => 8,
                     'icon' => 'tasks',
                 ]);
-            $menu->addChild('My invitations list', [
+            $menu->addChild('invite.list.title', [
                 'route' => 'chill_calendar_invitations_list_my',
             ])
                 ->setExtras([

From b8b68e5e5a153f34ee6b93ba2304df899481d893 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 6 Nov 2025 13:00:38 +0100
Subject: [PATCH 211/283] Rename page title key for invitations list to align
 with translation standards

- Replaced hardcoded title 'My invitations list' with 'invite.list.title' translation key.
---
 .../Resources/views/Invitations/listByUser.html.twig            | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Invitations/listByUser.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Invitations/listByUser.html.twig
index 8030df0a0..c7b7ecc86 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Invitations/listByUser.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Invitations/listByUser.html.twig
@@ -2,7 +2,7 @@
 
 {% set activeRouteKey = 'chill_calendar_invitations_list' %}
 
-{% block title %}{{ 'My invitations list' |trans }}{% endblock title %}
+{% block title %}{{ 'invite.list.title'|trans }}{% endblock title %}
 
 {% block content %}
 

From a4cfc6a1784a03fafa5bc21f8debd0c7c7b40452 Mon Sep 17 00:00:00 2001
From: LenaertsJ <julie.lenaerts@champs-libres.coop>
Date: Thu, 6 Nov 2025 15:07:11 +0000
Subject: [PATCH 212/283] Permettre d'annuler un rendez-vous

---
 .../Controller/CalendarController.php         |  52 +++++++
 .../DataFixtures/ORM/LoadCancelReason.php     |   2 +-
 .../ChillCalendarBundle/Entity/Calendar.php   |   5 +
 .../Entity/CancelReason.php                   |   6 +-
 .../Form/CancelReasonType.php                 |  11 +-
 .../ChillCalendarBundle/Form/CancelType.php   |  42 +++++
 .../Doctrine/CalendarEntityListener.php       |  27 +++-
 .../Message/CalendarRemovedMessage.php        |   2 +
 .../Repository/CalendarRepository.php         |   1 +
 .../Resources/config/services/controller.yml  |   1 +
 .../Resources/views/Calendar/_list.html.twig  | 146 ++++++++++--------
 ...ncelCalendarByAccompanyingCourse.html.twig |  29 ++++
 .../Calendar/cancelCalendarByPerson.html.twig |  29 ++++
 ...d.twig => short_message_canceled.txt.twig} |   0
 .../views/CancelReason/index.html.twig        |   4 +-
 .../DefaultShortMessageForCalendarBuilder.php |   3 +-
 .../translations/messages.fr.yml              |  11 +-
 .../CRUD/Controller/CRUDController.php        |   3 +-
 18 files changed, 296 insertions(+), 78 deletions(-)
 create mode 100644 src/Bundle/ChillCalendarBundle/Form/CancelType.php
 create mode 100644 src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByAccompanyingCourse.html.twig
 create mode 100644 src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByPerson.html.twig
 rename src/Bundle/ChillCalendarBundle/Resources/views/CalendarShortMessage/{short_message_canceled.twig => short_message_canceled.txt.twig} (100%)

diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
index ae8114ea7..6705d7bb7 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
@@ -13,6 +13,7 @@ namespace Chill\CalendarBundle\Controller;
 
 use Chill\CalendarBundle\Entity\Calendar;
 use Chill\CalendarBundle\Form\CalendarType;
+use Chill\CalendarBundle\Form\CancelType;
 use Chill\CalendarBundle\RemoteCalendar\Connector\RemoteCalendarConnectorInterface;
 use Chill\CalendarBundle\Repository\CalendarACLAwareRepositoryInterface;
 use Chill\CalendarBundle\Security\Voter\CalendarVoter;
@@ -30,6 +31,7 @@ use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Doctrine\ORM\EntityManagerInterface;
 use http\Exception\UnexpectedValueException;
 use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -60,6 +62,7 @@ class CalendarController extends AbstractController
         private readonly UserRepositoryInterface $userRepository,
         private readonly TranslatorInterface $translator,
         private readonly \Doctrine\Persistence\ManagerRegistry $managerRegistry,
+        private readonly EntityManagerInterface $em,
     ) {}
 
     /**
@@ -111,6 +114,55 @@ class CalendarController extends AbstractController
         ]);
     }
 
+    #[Route(path: '/{_locale}/calendar/calendar/{id}/cancel', name: 'chill_calendar_calendar_cancel')]
+    public function cancelAction(Calendar $calendar, Request $request): Response
+    {
+        // Deal with sms being sent or not
+        // Communicate cancellation with the remote calendar.
+
+        $this->denyAccessUnlessGranted(CalendarVoter::EDIT, $calendar);
+
+        [$person, $accompanyingPeriod] = [$calendar->getPerson(), $calendar->getAccompanyingPeriod()];
+
+        $form = $this->createForm(CancelType::class, $calendar);
+        $form->add('submit', SubmitType::class);
+
+        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
+            $view = '@ChillCalendar/Calendar/cancelCalendarByAccompanyingCourse.html.twig';
+            $redirectRoute = $this->generateUrl('chill_calendar_calendar_list_by_period', ['id' => $accompanyingPeriod->getId()]);
+        } elseif ($person instanceof Person) {
+            $view = '@ChillCalendar/Calendar/cancelCalendarByPerson.html.twig';
+            $redirectRoute = $this->generateUrl('chill_calendar_calendar_list_by_person', ['id' => $person->getId()]);
+        } else {
+            throw new \RuntimeException('nor person or accompanying period');
+        }
+
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+
+            $this->logger->notice('A calendar event has been cancelled', [
+                'by_user' => $this->getUser()->getUsername(),
+                'calendar_id' => $calendar->getId(),
+            ]);
+
+            $calendar->setStatus($calendar::STATUS_CANCELED);
+            $calendar->setSmsStatus($calendar::SMS_CANCEL_PENDING);
+            $this->em->flush();
+
+            $this->addFlash('success', $this->translator->trans('chill_calendar.calendar_canceled'));
+
+            return new RedirectResponse($redirectRoute);
+        }
+
+        return $this->render($view, [
+            'calendar' => $calendar,
+            'form' => $form->createView(),
+            'accompanyingCourse' => $accompanyingPeriod,
+            'person' => $person,
+        ]);
+    }
+
     /**
      * Edit a calendar item.
      */
diff --git a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCancelReason.php b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCancelReason.php
index d7e552d5d..2a8e371e0 100644
--- a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCancelReason.php
+++ b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCancelReason.php
@@ -35,7 +35,7 @@ class LoadCancelReason extends Fixture implements FixtureGroupInterface
         $arr = [
             ['name' => CancelReason::CANCELEDBY_USER],
             ['name' => CancelReason::CANCELEDBY_PERSON],
-            ['name' => CancelReason::CANCELEDBY_DONOTCOUNT],
+            ['name' => CancelReason::CANCELEDBY_OTHER],
         ];
 
         foreach ($arr as $a) {
diff --git a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
index dad302193..c194c247e 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
@@ -269,6 +269,11 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
         return $this->cancelReason;
     }
 
+    public function isCanceled(): bool
+    {
+        return null !== $this->cancelReason;
+    }
+
     public function getCenters(): ?iterable
     {
         return match ($this->getContext()) {
diff --git a/src/Bundle/ChillCalendarBundle/Entity/CancelReason.php b/src/Bundle/ChillCalendarBundle/Entity/CancelReason.php
index d4a2ed9a9..04192133c 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/CancelReason.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/CancelReason.php
@@ -18,14 +18,14 @@ use Doctrine\ORM\Mapping as ORM;
 #[ORM\Table(name: 'chill_calendar.cancel_reason')]
 class CancelReason
 {
-    final public const CANCELEDBY_DONOTCOUNT = 'CANCELEDBY_DONOTCOUNT';
+    final public const CANCELEDBY_OTHER = 'CANCELEDBY_OTHER';
 
     final public const CANCELEDBY_PERSON = 'CANCELEDBY_PERSON';
 
     final public const CANCELEDBY_USER = 'CANCELEDBY_USER';
 
-    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::BOOLEAN)]
-    private ?bool $active = null;
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::BOOLEAN, options: ['default' => true])]
+    private bool $active = true;
 
     #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, length: 255)]
     private ?string $canceledBy = null;
diff --git a/src/Bundle/ChillCalendarBundle/Form/CancelReasonType.php b/src/Bundle/ChillCalendarBundle/Form/CancelReasonType.php
index c0ac4ddb0..311d3ac02 100644
--- a/src/Bundle/ChillCalendarBundle/Form/CancelReasonType.php
+++ b/src/Bundle/ChillCalendarBundle/Form/CancelReasonType.php
@@ -15,7 +15,7 @@ use Chill\CalendarBundle\Entity\CancelReason;
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -28,7 +28,14 @@ class CancelReasonType extends AbstractType
             ->add('active', CheckboxType::class, [
                 'required' => false,
             ])
-            ->add('canceledBy', TextType::class);
+            ->add('canceledBy', ChoiceType::class, [
+                'choices' => [
+                    'chill_calendar.canceled_by.user' => CancelReason::CANCELEDBY_USER,
+                    'chill_calendar.canceled_by.person' => CancelReason::CANCELEDBY_PERSON,
+                    'chill_calendar.canceled_by.other' => CancelReason::CANCELEDBY_OTHER,
+                ],
+                'required' => true,
+            ]);
     }
 
     public function configureOptions(OptionsResolver $resolver)
diff --git a/src/Bundle/ChillCalendarBundle/Form/CancelType.php b/src/Bundle/ChillCalendarBundle/Form/CancelType.php
new file mode 100644
index 000000000..ad41a6105
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Form/CancelType.php
@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\CalendarBundle\Form;
+
+use Chill\CalendarBundle\Entity\Calendar;
+use Chill\CalendarBundle\Entity\CancelReason;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class CancelType extends AbstractType
+{
+    public function __construct(private readonly TranslatableStringHelperInterface $translatableStringHelper) {}
+
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder->add('cancelReason', EntityType::class, [
+            'class' => CancelReason::class,
+            'required' => true,
+            'choice_label' => fn (CancelReason $cancelReason) => $this->translatableStringHelper->localize($cancelReason->getName()),
+        ]);
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults([
+            'data_class' => Calendar::class,
+
+        ]);
+    }
+}
diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarEntityListener.php b/src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarEntityListener.php
index 8f62fdcdb..2319fde99 100644
--- a/src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarEntityListener.php
+++ b/src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarEntityListener.php
@@ -21,6 +21,7 @@ namespace Chill\CalendarBundle\Messenger\Doctrine;
 use Chill\CalendarBundle\Entity\Calendar;
 use Chill\CalendarBundle\Messenger\Message\CalendarMessage;
 use Chill\CalendarBundle\Messenger\Message\CalendarRemovedMessage;
+use Chill\MainBundle\Entity\User;
 use Doctrine\ORM\Event\PostPersistEventArgs;
 use Doctrine\ORM\Event\PostRemoveEventArgs;
 use Doctrine\ORM\Event\PostUpdateEventArgs;
@@ -31,6 +32,17 @@ class CalendarEntityListener
 {
     public function __construct(private readonly MessageBusInterface $messageBus, private readonly Security $security) {}
 
+    private function getAuthenticatedUser(): User
+    {
+        $user = $this->security->getUser();
+
+        if (!$user instanceof User) {
+            throw new \LogicException('Expected an instance of User.');
+        }
+
+        return $user;
+    }
+
     public function postPersist(Calendar $calendar, PostPersistEventArgs $args): void
     {
         if (!$calendar->preventEnqueueChanges) {
@@ -38,7 +50,7 @@ class CalendarEntityListener
                 new CalendarMessage(
                     $calendar,
                     CalendarMessage::CALENDAR_PERSIST,
-                    $this->security->getUser()
+                    $this->getAuthenticatedUser()
                 )
             );
         }
@@ -50,7 +62,7 @@ class CalendarEntityListener
             $this->messageBus->dispatch(
                 new CalendarRemovedMessage(
                     $calendar,
-                    $this->security->getUser()
+                    $this->getAuthenticatedUser()
                 )
             );
         }
@@ -58,12 +70,19 @@ class CalendarEntityListener
 
     public function postUpdate(Calendar $calendar, PostUpdateEventArgs $args): void
     {
-        if (!$calendar->preventEnqueueChanges) {
+        if ($calendar->getStatus() === $calendar::STATUS_CANCELED) {
+            $this->messageBus->dispatch(
+                new CalendarRemovedMessage(
+                    $calendar,
+                    $this->getAuthenticatedUser()
+                )
+            );
+        } elseif (!$calendar->preventEnqueueChanges) {
             $this->messageBus->dispatch(
                 new CalendarMessage(
                     $calendar,
                     CalendarMessage::CALENDAR_UPDATE,
-                    $this->security->getUser()
+                    $this->getAuthenticatedUser()
                 )
             );
         }
diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarRemovedMessage.php b/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarRemovedMessage.php
index 53dcea28c..7d2e88fef 100644
--- a/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarRemovedMessage.php
+++ b/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarRemovedMessage.php
@@ -70,6 +70,8 @@ class CalendarRemovedMessage
 
     public function getRemoteId(): string
     {
+        dump($this->remoteId);
+
         return $this->remoteId;
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php b/src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php
index 3121854e5..e6f90f279 100644
--- a/src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php
+++ b/src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php
@@ -191,6 +191,7 @@ class CalendarRepository implements ObjectRepository
                     $qb->expr()->eq('c.mainUser', ':user'),
                     $qb->expr()->gte('c.startDate', ':startDate'),
                     $qb->expr()->lte('c.endDate', ':endDate'),
+                    $qb->expr()->isNull('c.cancelReason'),
                 )
             )
             ->setParameters([
diff --git a/src/Bundle/ChillCalendarBundle/Resources/config/services/controller.yml b/src/Bundle/ChillCalendarBundle/Resources/config/services/controller.yml
index a0457c5a8..cce562d7d 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/config/services/controller.yml
+++ b/src/Bundle/ChillCalendarBundle/Resources/config/services/controller.yml
@@ -1,5 +1,6 @@
 services:
     Chill\CalendarBundle\Controller\:
         autowire: true
+        autoconfigure: true
         resource: '../../../Controller'
         tags: ['controller.service_arguments']
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig
index 01241643b..c827ca4f4 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig
@@ -5,29 +5,45 @@
         <div class="item-col">
             <div class="wrap-header">
                 <div class="wl-row">
-                    <div class="wl-col title">
-                        <p class="date-label">
-                            {% if context == 'person' and calendar.context == 'accompanying_period' %}
-                                <a href="{{ chill_path_add_return_path('chill_person_accompanying_course_index', {'accompanying_period_id': calendar.accompanyingPeriod.id}) }}" style="text-decoration: none;">
-                                    <span class="badge bg-primary">
-                                            <i class="fa fa-random"></i> {{ calendar.accompanyingPeriod.id }}
-                                    </span>
-                                </a>
-                            {% endif %}
-                            {% if calendar.endDate.diff(calendar.startDate).days >= 1 %}
-                                    {{ calendar.startDate|format_datetime('short', 'short') }}
-                                    - {{ calendar.endDate|format_datetime('short', 'short') }}
-                            {% else %}
-                                {{ calendar.startDate|format_datetime('short', 'short') }}
-                                    - {{ calendar.endDate|format_datetime('none', 'short') }}
-                            {% endif %}
-                        </p>
+                    {% if calendar.status == 'canceled' %}
+                                <div class="badge rounded-pill bg-danger">
+                                    <span>{{ 'chill_calendar.canceled'|trans }}: </span>
+                                    <span>{{ calendar.cancelReason.name|localize_translatable_string }}</span>
+                                </div>
+                                    {% endif %}
+                            </div>
+                            <div class="wl-row">
+                                <div class="wl-col title">
+                                    <p class="date-label">
+                                        {% if calendar.status == 'canceled' %}
+                                        <del>
+                                            {% endif %}
+                                        {% if context == 'person' and calendar.context == 'accompanying_period' %}
+                                            <a href="{{ chill_path_add_return_path('chill_person_accompanying_course_index', {'accompanying_period_id': calendar.accompanyingPeriod.id}) }}" style="text-decoration: none;">
+                                                <span class="badge bg-primary">
+                                                        <i class="fa fa-random"></i> {{ calendar.accompanyingPeriod.id }}
+                                                </span>
+                                            </a>
+                                        {% endif %}
+                                        {% if calendar.status == 'canceled' %}
+                                            <del>
+                                        {% endif %}
+                                        {% if calendar.endDate.diff(calendar.startDate).days >= 1 %}
+                                                {{ calendar.startDate|format_datetime('short', 'short') }}
+                                                - {{ calendar.endDate|format_datetime('short', 'short') }}
+                                        {% else %}
+                                            {{ calendar.startDate|format_datetime('short', 'short') }}
+                                                - {{ calendar.endDate|format_datetime('none', 'short') }}
+                                        {% endif %}
+                                        {% if calendar.status == 'canceled' %}
+                                            </del>
+                                        {% endif %}
 
                         <div class="duration short-message">
                             <i class="fa fa-fw fa-hourglass-end"></i>
                             {{ calendar.duration|date('%H:%I') }}
                             {% if false == calendar.sendSMS or null == calendar.sendSMS %}
-                                <!-- no sms will be send -->
+                                <!-- no sms will be sent -->
                             {% else %}
                                 {% if calendar.smsStatus == 'sms_sent' %}
                                     <span title="{{ 'SMS already sent'|trans }}" class="badge bg-info">
@@ -59,17 +75,17 @@
     </div>
 
     {% if calendar.comment.comment is not empty
-        or calendar.users|length > 0
-        or calendar.thirdParties|length > 0
-        or calendar.users|length > 0 %}
-        <div class="item-row details separator">
-            <div class="item-col">
-                {% include '@ChillActivity/Activity/concernedGroups.html.twig' with {
-                    'context': calendar.context == 'person' ?  'calendar_person' : 'calendar_accompanyingCourse',
-                    'render': 'wrap-list',
-                    'entity': calendar
-                } %}
-            </div>
+                    or calendar.users|length > 0
+                    or calendar.thirdParties|length > 0
+                    or calendar.users|length > 0 %}
+                    <div class="item-row details separator">
+                        <div class="item-col">
+                            {% include '@ChillActivity/Activity/concernedGroups.html.twig' with {
+                                'context': calendar.context == 'person' ?  'calendar_person' : 'calendar_accompanyingCourse',
+                                'render': 'wrap-list',
+                                'entity': calendar
+                            } %}
+                        </div>
 
         </div>
     {% endif %}
@@ -98,12 +114,13 @@
         </div>
     {% endif %}
 
-    <div class="item-row separator column">
-        <div>
-
-            {{ include('@ChillCalendar/Calendar/_documents.twig.html') }}
+    {% if calendar.documents is not empty %}
+        <div class="item-row separator column">
+            <div>
+                {{ include('@ChillCalendar/Calendar/_documents.twig.html') }}
+            </div>
         </div>
-    </div>
+    {% endif %}
 
     {% if calendar.activity is not null %}
         <div class="item-row separator">
@@ -146,7 +163,7 @@
 
     <div class="item-row separator">
         <ul class="record_actions">
-                {% if is_granted('CHILL_CALENDAR_DOC_EDIT', calendar) %}
+                {% if is_granted('CHILL_CALENDAR_DOC_EDIT', calendar) and calendar.status is not constant('STATUS_CANCELED', calendar) %}
                     {% if templates|length == 0 %}
                         <li>
                             <a class="btn btn-create"
@@ -186,6 +203,7 @@
                 or
                 (calendar.context == 'person' and is_granted('CHILL_ACTIVITY_CREATE', calendar.person))
                 )
+                            and calendar.status is not constant('STATUS_CANCELED', calendar)
             %}
                 <li>
                     <a class="btn btn-create"
@@ -195,32 +213,38 @@
                 </li>
             {% endif %}
 
-            {% if (calendar.isInvited(app.user)) %}
-                {% set invite = calendar.inviteForUser(app.user) %}
-                <li>
-                    <div invite-answer data-status="{{ invite.status|e('html_attr') }}"
-                         data-calendar-id="{{ calendar.id|e('html_attr') }}"></div>
-                </li>
-            {% endif %}
-            {% if false %}
-                <li>
-                    <a href="{{ chill_path_add_return_path('chill_calendar_calendar_show', { 'id': calendar.id}) }}"
-                       class="btn btn-show "></a>
-                </li>
-            {% endif %}
-            {% if is_granted('CHILL_CALENDAR_CALENDAR_EDIT', calendar) %}
-            <li>
-                <a href="{{ chill_path_add_return_path('chill_calendar_calendar_edit', { 'id': calendar.id }) }}"
-                   class="btn btn-update "></a>
-            </li>
-            {% endif %}
-            {% if is_granted('CHILL_CALENDAR_CALENDAR_DELETE', calendar) %}
-            <li>
-                <a href="{{ chill_path_add_return_path('chill_calendar_calendar_delete', { 'id': calendar.id } ) }}"
-                   class="btn btn-delete "></a>
-            </li>
-            {% endif %}
-        </ul>
+            {% if calendar.isInvited(app.user) and not calendar.isCanceled %}
+                            {% set invite = calendar.inviteForUser(app.user) %}
+                            <li>
+                                <div invite-answer data-status="{{ invite.status|e('html_attr') }}"
+                                     data-calendar-id="{{ calendar.id|e('html_attr') }}"></div>
+                            </li>
+                        {% endif %}
+                        {% if false %}
+                            <li>
+                                <a href="{{ chill_path_add_return_path('chill_calendar_calendar_show', { 'id': calendar.id}) }}"
+                                   class="btn btn-show "></a>
+                            </li>
+                        {% endif %}
+
+                        {% if is_granted('CHILL_CALENDAR_CALENDAR_EDIT', calendar) and calendar.status is not constant('STATUS_CANCELED', calendar) %}
+                        <li>
+                            <a href="{{ chill_path_add_return_path('chill_calendar_calendar_edit', { 'id': calendar.id }) }}"
+                               class="btn btn-update "></a>
+                        </li>
+                        <li>
+                            <a href="{{ chill_path_add_return_path('chill_calendar_calendar_cancel', { 'id': calendar.id } ) }}"
+                               class="btn btn-action"><i class="bi bi-x-circle"></i> {{ 'Cancel'|trans }}</a>
+                        </li>
+                        {% endif %}
+
+                        {% if is_granted('CHILL_CALENDAR_CALENDAR_DELETE', calendar) %}
+                        <li>
+                            <a href="{{ chill_path_add_return_path('chill_calendar_calendar_delete', { 'id': calendar.id } ) }}"
+                               class="btn btn-delete "></a>
+                        </li>
+                        {% endif %}
+                    </ul>
 
     </div>
 
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByAccompanyingCourse.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByAccompanyingCourse.html.twig
new file mode 100644
index 000000000..2f6759725
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByAccompanyingCourse.html.twig
@@ -0,0 +1,29 @@
+{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig" %}
+
+{% set activeRouteKey = 'chill_calendar_calendar_list' %}
+
+{% block title  'chill_calendar.cancel_calendar_item'|trans %}
+
+{% block content %}
+
+    {{ form_start(form) }}
+
+    {{ form_row(form.cancelReason) }}
+
+    <ul class="record_actions sticky-form-buttons">
+        <li class="cancel">
+            <a
+                class="btn btn-cancel"
+                href="{{ chill_return_path_or('chill_calendar_calendar_list', { 'id': accompanyingCourse.id } )}}"
+            >
+                {{ 'Cancel'|trans|chill_return_path_label }}
+            </a>
+        </li>
+        <li>
+            {{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-save' }, 'label': 'Save' } ) }}
+        </li>
+    </ul>
+
+    {{ form_end(form) }}
+
+{% endblock %}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByPerson.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByPerson.html.twig
new file mode 100644
index 000000000..76196b23e
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByPerson.html.twig
@@ -0,0 +1,29 @@
+{% extends "@ChillPerson/Person/layout.html.twig" %}
+
+{% set activeRouteKey = 'chill_calendar_calendar_list' %}
+
+{% block title  'chill_calendar.cancel_calendar_item'|trans %}
+
+{% block content %}
+
+    {{ form_start(form) }}
+
+    {{ form_row(form.cancelReason) }}
+
+    <ul class="record_actions sticky-form-buttons">
+        <li class="cancel">
+            <a
+                class="btn btn-cancel"
+                href="{{ chill_return_path_or('chill_calendar_calendar_list', { 'id': person.id } )}}"
+            >
+                {{ 'Cancel'|trans|chill_return_path_label }}
+            </a>
+        </li>
+        <li>
+            {{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-save' }, 'label': 'Save' } ) }}
+        </li>
+    </ul>
+
+    {{ form_end(form) }}
+
+{% endblock %}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/CalendarShortMessage/short_message_canceled.twig b/src/Bundle/ChillCalendarBundle/Resources/views/CalendarShortMessage/short_message_canceled.txt.twig
similarity index 100%
rename from src/Bundle/ChillCalendarBundle/Resources/views/CalendarShortMessage/short_message_canceled.twig
rename to src/Bundle/ChillCalendarBundle/Resources/views/CalendarShortMessage/short_message_canceled.txt.twig
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/CancelReason/index.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/CancelReason/index.html.twig
index 0668d8db5..bd99d6e6f 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/CancelReason/index.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/CancelReason/index.html.twig
@@ -5,7 +5,7 @@
         {% block table_entities_thead_tr %}
             <th>{{ 'Id'|trans }}</th>
             <th>{{ 'Name'|trans }}</th>
-            <th>{{ 'canceledBy'|trans }}</th>
+            <th>{{ 'Canceled by'|trans }}</th>
             <th>{{ 'active'|trans }}</th>
             <th>&nbsp;</th>
         {% endblock %}
@@ -40,4 +40,4 @@
             </li>
         {% endblock %}
     {% endembed %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/DefaultShortMessageForCalendarBuilder.php b/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/DefaultShortMessageForCalendarBuilder.php
index dfce0548c..bce9b1487 100644
--- a/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/DefaultShortMessageForCalendarBuilder.php
+++ b/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/DefaultShortMessageForCalendarBuilder.php
@@ -19,6 +19,7 @@ declare(strict_types=1);
 namespace Chill\CalendarBundle\Service\ShortMessageNotification;
 
 use Chill\CalendarBundle\Entity\Calendar;
+use Chill\CalendarBundle\Entity\CancelReason;
 use libphonenumber\PhoneNumberFormat;
 use libphonenumber\PhoneNumberUtil;
 use Symfony\Component\Notifier\Message\SmsMessage;
@@ -57,7 +58,7 @@ class DefaultShortMessageForCalendarBuilder implements ShortMessageForCalendarBu
                     $this->phoneUtil->format($person->getMobilenumber(), PhoneNumberFormat::E164),
                     $this->engine->render('@ChillCalendar/CalendarShortMessage/short_message.txt.twig', ['calendar' => $calendar]),
                 );
-            } elseif (Calendar::SMS_CANCEL_PENDING === $calendar->getSmsStatus()) {
+            } elseif (Calendar::SMS_CANCEL_PENDING === $calendar->getSmsStatus() && (null === $calendar->getCancelReason() || CancelReason::CANCELEDBY_PERSON !== $calendar->getCancelReason()->getCanceledBy())) {
                 $toUsers[] = new SmsMessage(
                     $this->phoneUtil->format($person->getMobilenumber(), PhoneNumberFormat::E164),
                     $this->engine->render('@ChillCalendar/CalendarShortMessage/short_message_canceled.txt.twig', ['calendar' => $calendar]),
diff --git a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
index 179597346..8717dcd9f 100644
--- a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
@@ -31,8 +31,7 @@ Will send SMS: Un SMS de rappel sera envoyé
 Will not send SMS: Aucun SMS de rappel ne sera envoyé
 SMS already sent: Un SMS a été envoyé
 
-canceledBy: supprimé par
-Canceled by: supprimé par
+Canceled by: Annulé par
 Calendar configuration: Gestion des rendez-vous
 
 crud:
@@ -44,6 +43,14 @@ crud:
         title_edit: Modifier le motif d'annulation
 
 chill_calendar:
+    canceled: Annulé
+    cancel_reason: Raison d'annulation
+    cancel_calendar_item: Annuler rendez-vous
+    calendar_canceled: Le rendez-vous a été annulé
+    canceled_by:
+        user: Utilisateur
+        person: Usager
+        other: Autre
     Document: Document d'un rendez-vous
     form:
         The main user is mandatory. He will organize the appointment.: L'utilisateur principal est obligatoire. Il est l'organisateur de l'événement.
diff --git a/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php b/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
index 19e9014da..ccba39848 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
@@ -102,7 +102,6 @@ class CRUDController extends AbstractController
                 Resolver::class => Resolver::class,
                 SerializerInterface::class => SerializerInterface::class,
                 FilterOrderHelperFactoryInterface::class => FilterOrderHelperFactoryInterface::class,
-                ManagerRegistry::class => ManagerRegistry::class,
             ]
         );
     }
@@ -674,7 +673,7 @@ class CRUDController extends AbstractController
 
     protected function getManagerRegistry(): ManagerRegistry
     {
-        return $this->container->get(ManagerRegistry::class);
+        return $this->container->get('doctrine');
     }
 
     /**

From a706c6f33740b59d567a2c9ae2b68e7d833b76d5 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 6 Nov 2025 16:18:33 +0100
Subject: [PATCH 213/283] fix: set back to true suggestion of referrer when
 creating notification for accompanyingPeriodWorkDocument

---
 .changes/unreleased/Fixed-20251106-161605.yaml              | 6 ++++++
 .../AccompanyingCourseWorkEdit/components/DocumentsList.vue | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 .changes/unreleased/Fixed-20251106-161605.yaml

diff --git a/.changes/unreleased/Fixed-20251106-161605.yaml b/.changes/unreleased/Fixed-20251106-161605.yaml
new file mode 100644
index 000000000..3962daf8a
--- /dev/null
+++ b/.changes/unreleased/Fixed-20251106-161605.yaml
@@ -0,0 +1,6 @@
+kind: Fixed
+body: Fix suggestion of referrer when creating notification for accompanyingPeriodWorkDocument
+time: 2025-11-06T16:16:05.861813041+01:00
+custom:
+    Issue: "428"
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/DocumentsList.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/DocumentsList.vue
index 77fa443d4..7c9892de9 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/DocumentsList.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/DocumentsList.vue
@@ -97,7 +97,7 @@
                                                 @click="
                                                     goToGenerateDocumentNotification(
                                                         d,
-                                                        false,
+                                                        true,
                                                     )
                                                 "
                                             >

From 51607572deb84a34dc5ab0db93aa82c6edc64e6e Mon Sep 17 00:00:00 2001
From: LenaertsJ <julie.lenaerts@champs-libres.coop>
Date: Fri, 7 Nov 2025 10:11:46 +0000
Subject: [PATCH 214/283] Create admin for motive

---
 .../unreleased/Feature-20250808-120802.yaml   |   6 +
 .../unreleased/Feature-20251007-155945.yaml   |   6 +
 .../unreleased/Feature-20251022-111552.yaml   |   6 +
 .../unreleased/Fixed-20251106-161605.yaml     |   6 +
 .../Controller/CalendarController.php         |  54 ++-
 .../Controller/MyInvitationsController.php    |  58 +++
 .../DataFixtures/ORM/LoadCancelReason.php     |   2 +-
 .../ChillCalendarBundle/Entity/Calendar.php   |   5 +
 .../Entity/CancelReason.php                   |   6 +-
 .../Form/CancelReasonType.php                 |  11 +-
 .../ChillCalendarBundle/Form/CancelType.php   |  42 +++
 .../Menu/UserMenuBuilder.php                  |   7 +
 .../Doctrine/CalendarEntityListener.php       |  27 +-
 .../Message/CalendarRemovedMessage.php        |   2 +
 .../Repository/CalendarRepository.php         |   1 +
 .../Repository/InviteRepository.php           |   2 +-
 .../Resources/config/services/controller.yml  |   1 +
 .../Resources/views/Calendar/_list.html.twig  | 349 +++++++++---------
 ...ncelCalendarByAccompanyingCourse.html.twig |  29 ++
 .../Calendar/cancelCalendarByPerson.html.twig |  29 ++
 .../listByAccompanyingCourse.html.twig        |  13 +-
 .../views/Calendar/listByPerson.html.twig     |  12 +-
 ...d.twig => short_message_canceled.txt.twig} |   0
 .../views/CancelReason/index.html.twig        |   4 +-
 .../views/Invitations/listByUser.html.twig    |  40 ++
 .../DefaultShortMessageForCalendarBuilder.php |   3 +-
 .../MyInvitationsControllerTest.php           | 292 +++++++++++++++
 .../translations/messages.fr.yml              |  14 +-
 ...ocGeneratorTemplateRepositoryInterface.php |   5 +
 .../CRUD/Controller/CRUDController.php        |   3 +-
 .../Pagination/PaginatorFactory.php           |   8 +-
 .../components/DocumentsList.vue              |   2 +-
 .../src/Controller/Admin/MotiveController.php |  54 +++
 .../src/Controller/AdminController.php        |  31 ++
 .../ChillTicketExtension.php                  |  36 ++
 .../ChillTicketBundle/src/Entity/Motive.php   |  16 +-
 .../ChillTicketBundle/src/Form/MotiveType.php |  71 ++++
 .../src/Menu/AdminMenuBuilder.php             |  45 +++
 .../ChillTicketBundle/src/MotiveDTO.php       |  67 ++++
 .../views/Admin/Motive/edit.html.twig         |  15 +
 .../views/Admin/Motive/index.html.twig        |  68 ++++
 .../views/Admin/Motive/new.html.twig          |  15 +
 .../views/Admin/Motive/view.html.twig         |  68 ++++
 .../src/Resources/views/Admin/index.html.twig |  13 +
 .../src/config/services.yaml                  |   3 +
 .../src/migrations/Version20251022081554.php  |  34 ++
 .../src/translations/messages+intl-icu.fr.yml |  33 ++
 47 files changed, 1418 insertions(+), 196 deletions(-)
 create mode 100644 .changes/unreleased/Feature-20250808-120802.yaml
 create mode 100644 .changes/unreleased/Feature-20251007-155945.yaml
 create mode 100644 .changes/unreleased/Feature-20251022-111552.yaml
 create mode 100644 .changes/unreleased/Fixed-20251106-161605.yaml
 create mode 100644 src/Bundle/ChillCalendarBundle/Controller/MyInvitationsController.php
 create mode 100644 src/Bundle/ChillCalendarBundle/Form/CancelType.php
 create mode 100644 src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByAccompanyingCourse.html.twig
 create mode 100644 src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByPerson.html.twig
 rename src/Bundle/ChillCalendarBundle/Resources/views/CalendarShortMessage/{short_message_canceled.twig => short_message_canceled.txt.twig} (100%)
 create mode 100644 src/Bundle/ChillCalendarBundle/Resources/views/Invitations/listByUser.html.twig
 create mode 100644 src/Bundle/ChillCalendarBundle/Tests/Controller/MyInvitationsControllerTest.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Controller/Admin/MotiveController.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Controller/AdminController.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Form/MotiveType.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Menu/AdminMenuBuilder.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/MotiveDTO.php
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/views/Admin/Motive/edit.html.twig
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/views/Admin/Motive/index.html.twig
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/views/Admin/Motive/new.html.twig
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/views/Admin/Motive/view.html.twig
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/views/Admin/index.html.twig
 create mode 100644 src/Bundle/ChillTicketBundle/src/migrations/Version20251022081554.php

diff --git a/.changes/unreleased/Feature-20250808-120802.yaml b/.changes/unreleased/Feature-20250808-120802.yaml
new file mode 100644
index 000000000..50d1eb8ba
--- /dev/null
+++ b/.changes/unreleased/Feature-20250808-120802.yaml
@@ -0,0 +1,6 @@
+kind: Feature
+body: Create invitation list in user menu
+time: 2025-08-08T12:08:02.446361367+02:00
+custom:
+    Issue: "385"
+    SchemaChange: No schema change
diff --git a/.changes/unreleased/Feature-20251007-155945.yaml b/.changes/unreleased/Feature-20251007-155945.yaml
new file mode 100644
index 000000000..9b59e7ea5
--- /dev/null
+++ b/.changes/unreleased/Feature-20251007-155945.yaml
@@ -0,0 +1,6 @@
+kind: Feature
+body: Admin interface for Motive entity
+time: 2025-10-07T15:59:45.597029709+02:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change
diff --git a/.changes/unreleased/Feature-20251022-111552.yaml b/.changes/unreleased/Feature-20251022-111552.yaml
new file mode 100644
index 000000000..058e40d82
--- /dev/null
+++ b/.changes/unreleased/Feature-20251022-111552.yaml
@@ -0,0 +1,6 @@
+kind: Feature
+body: Add an admin interface for Motive entity
+time: 2025-10-22T11:15:52.13937955+02:00
+custom:
+    Issue: ""
+    SchemaChange: Add columns or tables
diff --git a/.changes/unreleased/Fixed-20251106-161605.yaml b/.changes/unreleased/Fixed-20251106-161605.yaml
new file mode 100644
index 000000000..3962daf8a
--- /dev/null
+++ b/.changes/unreleased/Fixed-20251106-161605.yaml
@@ -0,0 +1,6 @@
+kind: Fixed
+body: Fix suggestion of referrer when creating notification for accompanyingPeriodWorkDocument
+time: 2025-11-06T16:16:05.861813041+01:00
+custom:
+    Issue: "428"
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
index 94db03b1f..6705d7bb7 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
@@ -13,6 +13,7 @@ namespace Chill\CalendarBundle\Controller;
 
 use Chill\CalendarBundle\Entity\Calendar;
 use Chill\CalendarBundle\Form\CalendarType;
+use Chill\CalendarBundle\Form\CancelType;
 use Chill\CalendarBundle\RemoteCalendar\Connector\RemoteCalendarConnectorInterface;
 use Chill\CalendarBundle\Repository\CalendarACLAwareRepositoryInterface;
 use Chill\CalendarBundle\Security\Voter\CalendarVoter;
@@ -30,6 +31,7 @@ use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
+use Doctrine\ORM\EntityManagerInterface;
 use http\Exception\UnexpectedValueException;
 use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -60,6 +62,7 @@ class CalendarController extends AbstractController
         private readonly UserRepositoryInterface $userRepository,
         private readonly TranslatorInterface $translator,
         private readonly \Doctrine\Persistence\ManagerRegistry $managerRegistry,
+        private readonly EntityManagerInterface $em,
     ) {}
 
     /**
@@ -111,6 +114,55 @@ class CalendarController extends AbstractController
         ]);
     }
 
+    #[Route(path: '/{_locale}/calendar/calendar/{id}/cancel', name: 'chill_calendar_calendar_cancel')]
+    public function cancelAction(Calendar $calendar, Request $request): Response
+    {
+        // Deal with sms being sent or not
+        // Communicate cancellation with the remote calendar.
+
+        $this->denyAccessUnlessGranted(CalendarVoter::EDIT, $calendar);
+
+        [$person, $accompanyingPeriod] = [$calendar->getPerson(), $calendar->getAccompanyingPeriod()];
+
+        $form = $this->createForm(CancelType::class, $calendar);
+        $form->add('submit', SubmitType::class);
+
+        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
+            $view = '@ChillCalendar/Calendar/cancelCalendarByAccompanyingCourse.html.twig';
+            $redirectRoute = $this->generateUrl('chill_calendar_calendar_list_by_period', ['id' => $accompanyingPeriod->getId()]);
+        } elseif ($person instanceof Person) {
+            $view = '@ChillCalendar/Calendar/cancelCalendarByPerson.html.twig';
+            $redirectRoute = $this->generateUrl('chill_calendar_calendar_list_by_person', ['id' => $person->getId()]);
+        } else {
+            throw new \RuntimeException('nor person or accompanying period');
+        }
+
+        $form->handleRequest($request);
+
+        if ($form->isSubmitted() && $form->isValid()) {
+
+            $this->logger->notice('A calendar event has been cancelled', [
+                'by_user' => $this->getUser()->getUsername(),
+                'calendar_id' => $calendar->getId(),
+            ]);
+
+            $calendar->setStatus($calendar::STATUS_CANCELED);
+            $calendar->setSmsStatus($calendar::SMS_CANCEL_PENDING);
+            $this->em->flush();
+
+            $this->addFlash('success', $this->translator->trans('chill_calendar.calendar_canceled'));
+
+            return new RedirectResponse($redirectRoute);
+        }
+
+        return $this->render($view, [
+            'calendar' => $calendar,
+            'form' => $form->createView(),
+            'accompanyingCourse' => $accompanyingPeriod,
+            'person' => $person,
+        ]);
+    }
+
     /**
      * Edit a calendar item.
      */
@@ -266,7 +318,7 @@ class CalendarController extends AbstractController
         }
 
         if (!$this->getUser() instanceof User) {
-            throw new UnauthorizedHttpException('you are not an user');
+            throw new UnauthorizedHttpException('you are not a user');
         }
 
         $view = '@ChillCalendar/Calendar/listByUser.html.twig';
diff --git a/src/Bundle/ChillCalendarBundle/Controller/MyInvitationsController.php b/src/Bundle/ChillCalendarBundle/Controller/MyInvitationsController.php
new file mode 100644
index 000000000..7af5ac18f
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Controller/MyInvitationsController.php
@@ -0,0 +1,58 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\CalendarBundle\Controller;
+
+use Chill\CalendarBundle\Entity\Calendar;
+use Chill\CalendarBundle\Repository\InviteRepository;
+use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepositoryInterface;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Pagination\PaginatorFactory;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\UnauthorizedHttpException;
+use Symfony\Component\Routing\Annotation\Route;
+
+class MyInvitationsController extends AbstractController
+{
+    public function __construct(private readonly InviteRepository $inviteRepository, private readonly PaginatorFactory $paginator, private readonly DocGeneratorTemplateRepositoryInterface $docGeneratorTemplateRepository) {}
+
+    #[Route(path: '/{_locale}/calendar/invitations/my', name: 'chill_calendar_invitations_list_my')]
+    public function myInvitations(Request $request): Response
+    {
+        $this->denyAccessUnlessGranted('ROLE_USER');
+
+        $user = $this->getUser();
+
+        if (!$user instanceof User) {
+            throw new UnauthorizedHttpException('you are not a user');
+        }
+
+        $total = count($this->inviteRepository->findBy(['user' => $user]));
+        $paginator = $this->paginator->create($total);
+
+        $invitations = $this->inviteRepository->findBy(
+            ['user' => $user],
+            ['createdAt' => 'DESC'],
+            $paginator->getItemsPerPage(),
+            $paginator->getCurrentPageFirstItemNumber()
+        );
+
+        $view = '@ChillCalendar/Invitations/listByUser.html.twig';
+
+        return $this->render($view, [
+            'invitations' => $invitations,
+            'paginator' => $paginator,
+            'templates' => $this->docGeneratorTemplateRepository->findByEntity(Calendar::class),
+        ]);
+    }
+}
diff --git a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCancelReason.php b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCancelReason.php
index d7e552d5d..2a8e371e0 100644
--- a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCancelReason.php
+++ b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCancelReason.php
@@ -35,7 +35,7 @@ class LoadCancelReason extends Fixture implements FixtureGroupInterface
         $arr = [
             ['name' => CancelReason::CANCELEDBY_USER],
             ['name' => CancelReason::CANCELEDBY_PERSON],
-            ['name' => CancelReason::CANCELEDBY_DONOTCOUNT],
+            ['name' => CancelReason::CANCELEDBY_OTHER],
         ];
 
         foreach ($arr as $a) {
diff --git a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
index dad302193..c194c247e 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
@@ -269,6 +269,11 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
         return $this->cancelReason;
     }
 
+    public function isCanceled(): bool
+    {
+        return null !== $this->cancelReason;
+    }
+
     public function getCenters(): ?iterable
     {
         return match ($this->getContext()) {
diff --git a/src/Bundle/ChillCalendarBundle/Entity/CancelReason.php b/src/Bundle/ChillCalendarBundle/Entity/CancelReason.php
index d4a2ed9a9..04192133c 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/CancelReason.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/CancelReason.php
@@ -18,14 +18,14 @@ use Doctrine\ORM\Mapping as ORM;
 #[ORM\Table(name: 'chill_calendar.cancel_reason')]
 class CancelReason
 {
-    final public const CANCELEDBY_DONOTCOUNT = 'CANCELEDBY_DONOTCOUNT';
+    final public const CANCELEDBY_OTHER = 'CANCELEDBY_OTHER';
 
     final public const CANCELEDBY_PERSON = 'CANCELEDBY_PERSON';
 
     final public const CANCELEDBY_USER = 'CANCELEDBY_USER';
 
-    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::BOOLEAN)]
-    private ?bool $active = null;
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::BOOLEAN, options: ['default' => true])]
+    private bool $active = true;
 
     #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, length: 255)]
     private ?string $canceledBy = null;
diff --git a/src/Bundle/ChillCalendarBundle/Form/CancelReasonType.php b/src/Bundle/ChillCalendarBundle/Form/CancelReasonType.php
index c0ac4ddb0..311d3ac02 100644
--- a/src/Bundle/ChillCalendarBundle/Form/CancelReasonType.php
+++ b/src/Bundle/ChillCalendarBundle/Form/CancelReasonType.php
@@ -15,7 +15,7 @@ use Chill\CalendarBundle\Entity\CancelReason;
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
-use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -28,7 +28,14 @@ class CancelReasonType extends AbstractType
             ->add('active', CheckboxType::class, [
                 'required' => false,
             ])
-            ->add('canceledBy', TextType::class);
+            ->add('canceledBy', ChoiceType::class, [
+                'choices' => [
+                    'chill_calendar.canceled_by.user' => CancelReason::CANCELEDBY_USER,
+                    'chill_calendar.canceled_by.person' => CancelReason::CANCELEDBY_PERSON,
+                    'chill_calendar.canceled_by.other' => CancelReason::CANCELEDBY_OTHER,
+                ],
+                'required' => true,
+            ]);
     }
 
     public function configureOptions(OptionsResolver $resolver)
diff --git a/src/Bundle/ChillCalendarBundle/Form/CancelType.php b/src/Bundle/ChillCalendarBundle/Form/CancelType.php
new file mode 100644
index 000000000..ad41a6105
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Form/CancelType.php
@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\CalendarBundle\Form;
+
+use Chill\CalendarBundle\Entity\Calendar;
+use Chill\CalendarBundle\Entity\CancelReason;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class CancelType extends AbstractType
+{
+    public function __construct(private readonly TranslatableStringHelperInterface $translatableStringHelper) {}
+
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder->add('cancelReason', EntityType::class, [
+            'class' => CancelReason::class,
+            'required' => true,
+            'choice_label' => fn (CancelReason $cancelReason) => $this->translatableStringHelper->localize($cancelReason->getName()),
+        ]);
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults([
+            'data_class' => Calendar::class,
+
+        ]);
+    }
+}
diff --git a/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php b/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php
index 3a062f7b8..672b53460 100644
--- a/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php
+++ b/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php
@@ -25,6 +25,13 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
         if ($this->security->isGranted('ROLE_USER')) {
             $menu->addChild('My calendar list', [
                 'route' => 'chill_calendar_calendar_list_my',
+            ])
+                ->setExtras([
+                    'order' => 8,
+                    'icon' => 'tasks',
+                ]);
+            $menu->addChild('invite.list.title', [
+                'route' => 'chill_calendar_invitations_list_my',
             ])
                 ->setExtras([
                     'order' => 9,
diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarEntityListener.php b/src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarEntityListener.php
index 8f62fdcdb..2319fde99 100644
--- a/src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarEntityListener.php
+++ b/src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarEntityListener.php
@@ -21,6 +21,7 @@ namespace Chill\CalendarBundle\Messenger\Doctrine;
 use Chill\CalendarBundle\Entity\Calendar;
 use Chill\CalendarBundle\Messenger\Message\CalendarMessage;
 use Chill\CalendarBundle\Messenger\Message\CalendarRemovedMessage;
+use Chill\MainBundle\Entity\User;
 use Doctrine\ORM\Event\PostPersistEventArgs;
 use Doctrine\ORM\Event\PostRemoveEventArgs;
 use Doctrine\ORM\Event\PostUpdateEventArgs;
@@ -31,6 +32,17 @@ class CalendarEntityListener
 {
     public function __construct(private readonly MessageBusInterface $messageBus, private readonly Security $security) {}
 
+    private function getAuthenticatedUser(): User
+    {
+        $user = $this->security->getUser();
+
+        if (!$user instanceof User) {
+            throw new \LogicException('Expected an instance of User.');
+        }
+
+        return $user;
+    }
+
     public function postPersist(Calendar $calendar, PostPersistEventArgs $args): void
     {
         if (!$calendar->preventEnqueueChanges) {
@@ -38,7 +50,7 @@ class CalendarEntityListener
                 new CalendarMessage(
                     $calendar,
                     CalendarMessage::CALENDAR_PERSIST,
-                    $this->security->getUser()
+                    $this->getAuthenticatedUser()
                 )
             );
         }
@@ -50,7 +62,7 @@ class CalendarEntityListener
             $this->messageBus->dispatch(
                 new CalendarRemovedMessage(
                     $calendar,
-                    $this->security->getUser()
+                    $this->getAuthenticatedUser()
                 )
             );
         }
@@ -58,12 +70,19 @@ class CalendarEntityListener
 
     public function postUpdate(Calendar $calendar, PostUpdateEventArgs $args): void
     {
-        if (!$calendar->preventEnqueueChanges) {
+        if ($calendar->getStatus() === $calendar::STATUS_CANCELED) {
+            $this->messageBus->dispatch(
+                new CalendarRemovedMessage(
+                    $calendar,
+                    $this->getAuthenticatedUser()
+                )
+            );
+        } elseif (!$calendar->preventEnqueueChanges) {
             $this->messageBus->dispatch(
                 new CalendarMessage(
                     $calendar,
                     CalendarMessage::CALENDAR_UPDATE,
-                    $this->security->getUser()
+                    $this->getAuthenticatedUser()
                 )
             );
         }
diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarRemovedMessage.php b/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarRemovedMessage.php
index 53dcea28c..7d2e88fef 100644
--- a/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarRemovedMessage.php
+++ b/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarRemovedMessage.php
@@ -70,6 +70,8 @@ class CalendarRemovedMessage
 
     public function getRemoteId(): string
     {
+        dump($this->remoteId);
+
         return $this->remoteId;
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php b/src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php
index 3121854e5..e6f90f279 100644
--- a/src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php
+++ b/src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php
@@ -191,6 +191,7 @@ class CalendarRepository implements ObjectRepository
                     $qb->expr()->eq('c.mainUser', ':user'),
                     $qb->expr()->gte('c.startDate', ':startDate'),
                     $qb->expr()->lte('c.endDate', ':endDate'),
+                    $qb->expr()->isNull('c.cancelReason'),
                 )
             )
             ->setParameters([
diff --git a/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php b/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php
index 8778330f8..6cb34738c 100644
--- a/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php
+++ b/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php
@@ -41,7 +41,7 @@ class InviteRepository implements ObjectRepository
     /**
      * @return array|Invite[]
      */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null)
+    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
     {
         return $this->entityRepository->findBy($criteria, $orderBy, $limit, $offset);
     }
diff --git a/src/Bundle/ChillCalendarBundle/Resources/config/services/controller.yml b/src/Bundle/ChillCalendarBundle/Resources/config/services/controller.yml
index a0457c5a8..cce562d7d 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/config/services/controller.yml
+++ b/src/Bundle/ChillCalendarBundle/Resources/config/services/controller.yml
@@ -1,5 +1,6 @@
 services:
     Chill\CalendarBundle\Controller\:
         autowire: true
+        autoconfigure: true
         resource: '../../../Controller'
         tags: ['controller.service_arguments']
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig
index cff5c00cc..c827ca4f4 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig
@@ -1,17 +1,23 @@
-{# list used in context of person or accompanyingPeriod #}
+{# list used in context of person, accompanyingPeriod or user #}
 
-{% if calendarItems|length > 0 %}
-    <div class="flex-table list-records context-accompanyingCourse">
-
-        {% for calendar in calendarItems %}
-
-            <div class="item-bloc">
-                <div class="item-row main">
-                    <div class="item-col">
-                        <div class="wrap-header">
+<div class="item-bloc">
+    <div class="item-row main">
+        <div class="item-col">
+            <div class="wrap-header">
+                <div class="wl-row">
+                    {% if calendar.status == 'canceled' %}
+                                <div class="badge rounded-pill bg-danger">
+                                    <span>{{ 'chill_calendar.canceled'|trans }}: </span>
+                                    <span>{{ calendar.cancelReason.name|localize_translatable_string }}</span>
+                                </div>
+                                    {% endif %}
+                            </div>
                             <div class="wl-row">
                                 <div class="wl-col title">
                                     <p class="date-label">
+                                        {% if calendar.status == 'canceled' %}
+                                        <del>
+                                            {% endif %}
                                         {% if context == 'person' and calendar.context == 'accompanying_period' %}
                                             <a href="{{ chill_path_add_return_path('chill_person_accompanying_course_index', {'accompanying_period_id': calendar.accompanyingPeriod.id}) }}" style="text-decoration: none;">
                                                 <span class="badge bg-primary">
@@ -19,6 +25,9 @@
                                                 </span>
                                             </a>
                                         {% endif %}
+                                        {% if calendar.status == 'canceled' %}
+                                            <del>
+                                        {% endif %}
                                         {% if calendar.endDate.diff(calendar.startDate).days >= 1 %}
                                                 {{ calendar.startDate|format_datetime('short', 'short') }}
                                                 - {{ calendar.endDate|format_datetime('short', 'short') }}
@@ -26,44 +35,46 @@
                                             {{ calendar.startDate|format_datetime('short', 'short') }}
                                                 - {{ calendar.endDate|format_datetime('none', 'short') }}
                                         {% endif %}
-                                    </p>
-
-                                    <div class="duration short-message">
-                                        <i class="fa fa-fw fa-hourglass-end"></i>
-                                        {{ calendar.duration|date('%H:%I') }}
-                                        {% if false == calendar.sendSMS or null == calendar.sendSMS %}
-                                            <!-- no sms will be send -->
-                                        {% else %}
-                                            {% if calendar.smsStatus == 'sms_sent' %}
-                                                <span title="{{ 'SMS already sent'|trans }}" class="badge bg-info">
-                                                    <i class="fa fa-check "></i>
-                                                    <i class="fa fa-envelope "></i>
-                                                </span>
-                                            {% else %}
-                                                <span title="{{ 'Will send SMS'|trans }}" class="badge bg-info">
-                                                    <i class="fa fa-envelope "></i>
-                                                    <i class="fa fa-hourglass-end "></i>
-                                                </span>
-                                            {% endif %}
+                                        {% if calendar.status == 'canceled' %}
+                                            </del>
                                         {% endif %}
-                                    </div>
 
-                                </div>
-                            </div>
-                        </div>
-
-                        <div class="item-col">
-                            <ul class="list-content">
-                                {% if calendar.mainUser is not empty %}
-                                    <span class="badge-user">{{ calendar.mainUser|chill_entity_render_box({'at_date': calendar.startDate}) }}</span>
+                        <div class="duration short-message">
+                            <i class="fa fa-fw fa-hourglass-end"></i>
+                            {{ calendar.duration|date('%H:%I') }}
+                            {% if false == calendar.sendSMS or null == calendar.sendSMS %}
+                                <!-- no sms will be sent -->
+                            {% else %}
+                                {% if calendar.smsStatus == 'sms_sent' %}
+                                    <span title="{{ 'SMS already sent'|trans }}" class="badge bg-info">
+                                        <i class="fa fa-check "></i>
+                                        <i class="fa fa-envelope "></i>
+                                    </span>
+                                {% else %}
+                                    <span title="{{ 'Will send SMS'|trans }}" class="badge bg-info">
+                                        <i class="fa fa-envelope "></i>
+                                        <i class="fa fa-hourglass-end "></i>
+                                    </span>
                                 {% endif %}
-                            </ul>
+                            {% endif %}
                         </div>
 
                     </div>
                 </div>
+            </div>
 
-                {% if calendar.comment.comment is not empty
+            <div class="item-col">
+                <ul class="list-content">
+                    {% if calendar.mainUser is not empty %}
+                        <span class="badge-user">{{ calendar.mainUser|chill_entity_render_box({'at_date': calendar.startDate}) }}</span>
+                    {% endif %}
+                </ul>
+            </div>
+
+        </div>
+    </div>
+
+    {% if calendar.comment.comment is not empty
                     or calendar.users|length > 0
                     or calendar.thirdParties|length > 0
                     or calendar.users|length > 0 %}
@@ -76,131 +87,133 @@
                             } %}
                         </div>
 
-                    </div>
-                {% endif %}
+        </div>
+    {% endif %}
+
+    {% if calendar.comment.comment is not empty %}
+        <div class="item-row details separator">
+            <div class="item-col comment">
+                {{ calendar.comment|chill_entity_render_box( { 'limit_lines': 3, 'metadata': false } ) }}
+            </div>
+        </div>
+    {% endif %}
+
+    {% if calendar.location is not empty %}
+        <div class="item-row separator">
+            <div>
+                {% if calendar.location.address is not same as(null) and calendar.location.name is not empty %}
+                    <i class="fa fa-map-marker"></i>{% endif %}
+                {% if calendar.location.name is not empty %}{{ calendar.location.name }}{% endif %}
+                {% if calendar.location.address is not same as(null) %}{{ calendar.location.address|chill_entity_render_box({'multiline': false, 'with_picto': (calendar.location.name is empty)}) }}{% else %}
+                    <i class="fa fa-map-marker"></i>{% endif %}
+                {% if calendar.location.phonenumber1 is not empty %}<i
+                    class="fa fa-phone"></i> {{ calendar.location.phonenumber1|chill_format_phonenumber }}{% endif %}
+                {% if calendar.location.phonenumber2 is not empty %}<i
+                    class="fa fa-phone"></i> {{ calendar.location.phonenumber2|chill_format_phonenumber }}{% endif %}
+            </div>
+        </div>
+    {% endif %}
+
+    {% if calendar.documents is not empty %}
+        <div class="item-row separator column">
+            <div>
+                {{ include('@ChillCalendar/Calendar/_documents.twig.html') }}
+            </div>
+        </div>
+    {% endif %}
+
+    {% if calendar.activity is not null %}
+        <div class="item-row separator">
+            <div class="item-col">
+                <div class="wrap-list">
+                    <div class="wl-row">
+                        <div class="wl-col title"><h3>{{ 'Activity'|trans }}</h3></div>
+                        <div class="wl-col list activity-linked">
+                            <h2 class="badge-title">
+                                <span class="title_label"></span>
+                                <span class="title_action">
+                                {{ calendar.activity.type.name | localize_translatable_string }}
+
+                                    {% if calendar.activity.emergency %}
+                                        <span class="badge bg-danger rounded-pill fs-6 float-end">{{ 'Emergency'|trans|upper }}</span>
+                                    {% endif %}
+                            </span>
+                            </h2>
+
+                            <ul class="record_actions">
+                                <li class="cancel">
+                                    <span class="createdBy">
+                                         {{ 'Created by'|trans }}
+                                        <b>{{ calendar.activity.createdBy|chill_entity_render_string({'at_date': calendar.activity.createdAt}) }}</b>, {{ 'on'|trans }} {{ calendar.activity.createdAt|format_datetime('short', 'short') }}
+                                    </span>
+                                </li>
+                                {% if is_granted('CHILL_ACTIVITY_SEE', calendar.activity) %}
+                                    <li>
+                                        <a href="{{ chill_path_add_return_path('chill_activity_activity_show', {'id': calendar.activity.id}) }}" class="btn btn-sm btn-show" ></a>
+                                    </li>
+                                {% endif %}
+                            </ul>
 
-                {% if calendar.comment.comment is not empty %}
-                    <div class="item-row details separator">
-                        <div class="item-col comment">
-                            {{ calendar.comment|chill_entity_render_box( { 'limit_lines': 3, 'metadata': false } ) }}
                         </div>
                     </div>
-                {% endif %}
-
-                {% if calendar.location is not empty %}
-                    <div class="item-row separator">
-                        <div>
-                            {% if calendar.location.address is not same as(null) and calendar.location.name is not empty %}
-                                <i class="fa fa-map-marker"></i>{% endif %}
-                            {% if calendar.location.name is not empty %}{{ calendar.location.name }}{% endif %}
-                            {% if calendar.location.address is not same as(null) %}{{ calendar.location.address|chill_entity_render_box({'multiline': false, 'with_picto': (calendar.location.name is empty)}) }}{% else %}
-                                <i class="fa fa-map-marker"></i>{% endif %}
-                            {% if calendar.location.phonenumber1 is not empty %}<i
-                                class="fa fa-phone"></i> {{ calendar.location.phonenumber1|chill_format_phonenumber }}{% endif %}
-                            {% if calendar.location.phonenumber2 is not empty %}<i
-                                class="fa fa-phone"></i> {{ calendar.location.phonenumber2|chill_format_phonenumber }}{% endif %}
-                        </div>
-                    </div>
-                {% endif %}
-
-                <div class="item-row separator column">
-                    <div>
-
-                        {{ include('@ChillCalendar/Calendar/_documents.twig.html') }}
-                    </div>
                 </div>
+            </div>
+        </div>
+    {% endif %}
 
-                {% if calendar.activity is not null %}
-                    <div class="item-row separator">
-                        <div class="item-col">
-                            <div class="wrap-list">
-                                <div class="wl-row">
-                                    <div class="wl-col title"><h3>{{ 'Activity'|trans }}</h3></div>
-                                    <div class="wl-col list activity-linked">
-                                        <h2 class="badge-title">
-                                            <span class="title_label"></span>
-                                            <span class="title_action">
-                                            {{ calendar.activity.type.name | localize_translatable_string }}
-
-                                                {% if calendar.activity.emergency %}
-                                                    <span class="badge bg-danger rounded-pill fs-6 float-end">{{ 'Emergency'|trans|upper }}</span>
-                                                {% endif %}
-                                        </span>
-                                        </h2>
-
-                                        <ul class="record_actions">
-                                            <li class="cancel">
-                                                <span class="createdBy">
-                                                     {{ 'Created by'|trans }}
-                                                    <b>{{ calendar.activity.createdBy|chill_entity_render_string({'at_date': calendar.activity.createdAt}) }}</b>, {{ 'on'|trans }} {{ calendar.activity.createdAt|format_datetime('short', 'short') }}
-                                                </span>
-                                            </li>
-                                            {% if is_granted('CHILL_ACTIVITY_SEE', calendar.activity) %}
-                                                <li>
-                                                    <a href="{{ chill_path_add_return_path('chill_activity_activity_show', {'id': calendar.activity.id}) }}" class="btn btn-sm btn-show" ></a>
-                                                </li>
-                                            {% endif %}
-                                        </ul>
-
-                                    </div>
-                                </div>
+    <div class="item-row separator">
+        <ul class="record_actions">
+                {% if is_granted('CHILL_CALENDAR_DOC_EDIT', calendar) and calendar.status is not constant('STATUS_CANCELED', calendar) %}
+                    {% if templates|length == 0 %}
+                        <li>
+                            <a class="btn btn-create"
+                               href="{{ chill_path_add_return_path('chill_calendar_calendardoc_new', {'id': calendar.id }) }}">
+                                {{ 'chill_calendar.Add a document'|trans }}
+                            </a>
+                        </li>
+                    {% else %}
+                        <li>
+                            <div class="dropdown">
+                                <button class="btn btn-create dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
+                                    {{ 'chill_calendar.Add a document'|trans }}
+                                </button>
+                                <ul class="dropdown-menu">
+                                    <li>
+                                        <a class="dropdown-item"
+                                           href="{{ chill_path_add_return_path('chill_calendar_calendardoc_new', {'id': calendar.id }) }}">
+                                            {{ 'chill_calendar.Upload a document'|trans }}
+                                        </a>
+                                    </li>
+                                    {% for template in templates %}
+                                    <li>
+                                        <a class="dropdown-item"
+                                            href="{{ chill_path_add_return_path('chill_docgenerator_generate_from_template', {'template': template.id, 'entityClassName': 'Chill\\CalendarBundle\\Entity\\Calendar', 'entityId': calendar.id}) }}"
+                                        >
+                                           {{ template.name|localize_translatable_string }}
+                                        </a>
+                                    </li>
+                                    {% endfor %}
+                                </ul>
                             </div>
-                        </div>
-                    </div>
+                        </li>
+                    {% endif %}
                 {% endif %}
+            {% if calendar.activity is null and (
+                (calendar.context == 'accompanying_period' and is_granted('CHILL_ACTIVITY_CREATE', calendar.accompanyingPeriod))
+                or
+                (calendar.context == 'person' and is_granted('CHILL_ACTIVITY_CREATE', calendar.person))
+                )
+                            and calendar.status is not constant('STATUS_CANCELED', calendar)
+            %}
+                <li>
+                    <a class="btn btn-create"
+                       href="{{ chill_path_add_return_path('chill_calendar_calendar_to_activity', { 'id': calendar.id }) }}">
+                        {{ 'Transform to activity'|trans }}
+                    </a>
+                </li>
+            {% endif %}
 
-                <div class="item-row separator">
-                    <ul class="record_actions">
-                        {% if is_granted('CHILL_CALENDAR_DOC_EDIT', calendar) %}
-                            {% if templates|length == 0 %}
-                                <li>
-                                    <a class="btn btn-create"
-                                       href="{{ chill_path_add_return_path('chill_calendar_calendardoc_new', {'id': calendar.id }) }}">
-                                        {{ 'chill_calendar.Add a document'|trans }}
-                                    </a>
-                                </li>
-                            {% else %}
-                                <li>
-                                    <div class="dropdown">
-                                        <button class="btn btn-create dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
-                                            {{ 'chill_calendar.Add a document'|trans }}
-                                        </button>
-                                        <ul class="dropdown-menu">
-                                            <li>
-                                                <a class="dropdown-item"
-                                                   href="{{ chill_path_add_return_path('chill_calendar_calendardoc_new', {'id': calendar.id }) }}">
-                                                    {{ 'chill_calendar.Upload a document'|trans }}
-                                                </a>
-                                            </li>
-                                            {% for template in templates %}
-                                            <li>
-                                                <a class="dropdown-item"
-                                                    href="{{ chill_path_add_return_path('chill_docgenerator_generate_from_template', {'template': template.id, 'entityClassName': 'Chill\\CalendarBundle\\Entity\\Calendar', 'entityId': calendar.id}) }}"
-                                                >
-                                                   {{ template.name|localize_translatable_string }}
-                                                </a>
-                                            </li>
-                                            {% endfor %}
-                                        </ul>
-                                    </div>
-                                </li>
-                            {% endif %}
-                        {% endif %}
-                        {% if calendar.activity is null and (
-                            (calendar.context == 'accompanying_period' and is_granted('CHILL_ACTIVITY_CREATE', calendar.accompanyingPeriod))
-                            or
-                            (calendar.context == 'person' and is_granted('CHILL_ACTIVITY_CREATE', calendar.person))
-                            )
-                        %}
-                            <li>
-                                <a class="btn btn-create"
-                                   href="{{ chill_path_add_return_path('chill_calendar_calendar_to_activity', { 'id': calendar.id }) }}">
-                                    {{ 'Transform to activity'|trans }}
-                                </a>
-                            </li>
-                        {% endif %}
-
-                        {% if (calendar.isInvited(app.user)) %}
+            {% if calendar.isInvited(app.user) and not calendar.isCanceled %}
                             {% set invite = calendar.inviteForUser(app.user) %}
                             <li>
                                 <div invite-answer data-status="{{ invite.status|e('html_attr') }}"
@@ -213,12 +226,18 @@
                                    class="btn btn-show "></a>
                             </li>
                         {% endif %}
-                        {% if is_granted('CHILL_CALENDAR_CALENDAR_EDIT', calendar) %}
+
+                        {% if is_granted('CHILL_CALENDAR_CALENDAR_EDIT', calendar) and calendar.status is not constant('STATUS_CANCELED', calendar) %}
                         <li>
                             <a href="{{ chill_path_add_return_path('chill_calendar_calendar_edit', { 'id': calendar.id }) }}"
                                class="btn btn-update "></a>
                         </li>
+                        <li>
+                            <a href="{{ chill_path_add_return_path('chill_calendar_calendar_cancel', { 'id': calendar.id } ) }}"
+                               class="btn btn-action"><i class="bi bi-x-circle"></i> {{ 'Cancel'|trans }}</a>
+                        </li>
                         {% endif %}
+
                         {% if is_granted('CHILL_CALENDAR_CALENDAR_DELETE', calendar) %}
                         <li>
                             <a href="{{ chill_path_add_return_path('chill_calendar_calendar_delete', { 'id': calendar.id } ) }}"
@@ -227,14 +246,8 @@
                         {% endif %}
                     </ul>
 
-                </div>
-
-            </div>
-        {% endfor %}
-
-        {% if calendarItems|length < paginator.getTotalItems %}
-            {{ chill_pagination(paginator) }}
-        {% endif %}
-
     </div>
-{% endif %}
+
+</div>
+
+
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByAccompanyingCourse.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByAccompanyingCourse.html.twig
new file mode 100644
index 000000000..2f6759725
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByAccompanyingCourse.html.twig
@@ -0,0 +1,29 @@
+{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig" %}
+
+{% set activeRouteKey = 'chill_calendar_calendar_list' %}
+
+{% block title  'chill_calendar.cancel_calendar_item'|trans %}
+
+{% block content %}
+
+    {{ form_start(form) }}
+
+    {{ form_row(form.cancelReason) }}
+
+    <ul class="record_actions sticky-form-buttons">
+        <li class="cancel">
+            <a
+                class="btn btn-cancel"
+                href="{{ chill_return_path_or('chill_calendar_calendar_list', { 'id': accompanyingCourse.id } )}}"
+            >
+                {{ 'Cancel'|trans|chill_return_path_label }}
+            </a>
+        </li>
+        <li>
+            {{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-save' }, 'label': 'Save' } ) }}
+        </li>
+    </ul>
+
+    {{ form_end(form) }}
+
+{% endblock %}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByPerson.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByPerson.html.twig
new file mode 100644
index 000000000..76196b23e
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByPerson.html.twig
@@ -0,0 +1,29 @@
+{% extends "@ChillPerson/Person/layout.html.twig" %}
+
+{% set activeRouteKey = 'chill_calendar_calendar_list' %}
+
+{% block title  'chill_calendar.cancel_calendar_item'|trans %}
+
+{% block content %}
+
+    {{ form_start(form) }}
+
+    {{ form_row(form.cancelReason) }}
+
+    <ul class="record_actions sticky-form-buttons">
+        <li class="cancel">
+            <a
+                class="btn btn-cancel"
+                href="{{ chill_return_path_or('chill_calendar_calendar_list', { 'id': person.id } )}}"
+            >
+                {{ 'Cancel'|trans|chill_return_path_label }}
+            </a>
+        </li>
+        <li>
+            {{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-save' }, 'label': 'Save' } ) }}
+        </li>
+    </ul>
+
+    {{ form_end(form) }}
+
+{% endblock %}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByAccompanyingCourse.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByAccompanyingCourse.html.twig
index 7ce1003bc..96ddb3388 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByAccompanyingCourse.html.twig
@@ -34,7 +34,18 @@
             {% endif %}
         </p>
     {% else %}
-        {{ include('@ChillCalendar/Calendar/_list.html.twig', {context: 'accompanying_course'}) }}
+        {% if calendarItems|length > 0 %}
+            <div class="flex-table list-records context-accompanyingCourse">
+                {% for calendar in calendarItems %}
+                    {{ include('@ChillCalendar/Calendar/_list.html.twig', {context: 'accompanying_course'}) }}
+                {% endfor %}
+            </div>
+
+            {% if calendarItems|length < paginator.getTotalItems %}
+                {{ chill_pagination(paginator) }}
+            {% endif %}
+
+        {% endif %}
     {% endif %}
 
     <ul class="record_actions sticky-form-buttons">
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByPerson.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByPerson.html.twig
index 9e3b59d2a..dc44b721c 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByPerson.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByPerson.html.twig
@@ -33,7 +33,17 @@
             {% endif %}
         </p>
     {% else %}
-        {{ include ('@ChillCalendar/Calendar/_list.html.twig', {context: 'person'}) }}
+        {% if calendarItems|length > 0 %}
+            <div class="flex-table list-records context-person">
+                {% for calendar in calendarItems %}
+                    {{ include ('@ChillCalendar/Calendar/_list.html.twig', {context: 'person'}) }}
+                {% endfor %}
+            </div>
+
+            {% if calendarItems|length < paginator.getTotalItems %}
+                {{ chill_pagination(paginator) }}
+            {% endif %}
+        {% endif %}
     {% endif %}
 
     <ul class="record_actions sticky-form-buttons">
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/CalendarShortMessage/short_message_canceled.twig b/src/Bundle/ChillCalendarBundle/Resources/views/CalendarShortMessage/short_message_canceled.txt.twig
similarity index 100%
rename from src/Bundle/ChillCalendarBundle/Resources/views/CalendarShortMessage/short_message_canceled.twig
rename to src/Bundle/ChillCalendarBundle/Resources/views/CalendarShortMessage/short_message_canceled.txt.twig
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/CancelReason/index.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/CancelReason/index.html.twig
index 0668d8db5..bd99d6e6f 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/CancelReason/index.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/CancelReason/index.html.twig
@@ -5,7 +5,7 @@
         {% block table_entities_thead_tr %}
             <th>{{ 'Id'|trans }}</th>
             <th>{{ 'Name'|trans }}</th>
-            <th>{{ 'canceledBy'|trans }}</th>
+            <th>{{ 'Canceled by'|trans }}</th>
             <th>{{ 'active'|trans }}</th>
             <th>&nbsp;</th>
         {% endblock %}
@@ -40,4 +40,4 @@
             </li>
         {% endblock %}
     {% endembed %}
-{% endblock %}
\ No newline at end of file
+{% endblock %}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Invitations/listByUser.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Invitations/listByUser.html.twig
new file mode 100644
index 000000000..c7b7ecc86
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Invitations/listByUser.html.twig
@@ -0,0 +1,40 @@
+{% extends "@ChillMain/layout.html.twig" %}
+
+{% set activeRouteKey = 'chill_calendar_invitations_list' %}
+
+{% block title %}{{ 'invite.list.title'|trans }}{% endblock title %}
+
+{% block content %}
+
+    <h1>{{ 'invite.list.title'|trans }}</h1>
+
+    {% if invitations|length == 0 %}
+        <p class="chill-no-data-statement">
+            {{ "invite.list.none"|trans }}
+        </p>
+    {% else %}
+        <div class="flex-table list-records">
+            {% for invitation in invitations %}
+                {% set calendar = invitation.getCalendar %}
+                {{ include('@ChillCalendar/Calendar/_list.html.twig', {context: 'user'}) }}
+            {% endfor %}
+        </div>
+
+        {% if invitations|length < paginator.getTotalItems %}
+            {{ chill_pagination(paginator) }}
+        {% endif %}
+    {% endif %}
+
+{% endblock %}
+
+{% block js %}
+    {{ parent() }}
+    {{ encore_entry_script_tags('mod_answer') }}
+    {{ encore_entry_script_tags('mod_document_action_buttons_group') }}
+{% endblock %}
+
+{% block css %}
+    {{ parent() }}
+    {{ encore_entry_link_tags('mod_answer') }}
+    {{ encore_entry_link_tags('mod_document_action_buttons_group') }}
+{% endblock %}
diff --git a/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/DefaultShortMessageForCalendarBuilder.php b/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/DefaultShortMessageForCalendarBuilder.php
index dfce0548c..bce9b1487 100644
--- a/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/DefaultShortMessageForCalendarBuilder.php
+++ b/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/DefaultShortMessageForCalendarBuilder.php
@@ -19,6 +19,7 @@ declare(strict_types=1);
 namespace Chill\CalendarBundle\Service\ShortMessageNotification;
 
 use Chill\CalendarBundle\Entity\Calendar;
+use Chill\CalendarBundle\Entity\CancelReason;
 use libphonenumber\PhoneNumberFormat;
 use libphonenumber\PhoneNumberUtil;
 use Symfony\Component\Notifier\Message\SmsMessage;
@@ -57,7 +58,7 @@ class DefaultShortMessageForCalendarBuilder implements ShortMessageForCalendarBu
                     $this->phoneUtil->format($person->getMobilenumber(), PhoneNumberFormat::E164),
                     $this->engine->render('@ChillCalendar/CalendarShortMessage/short_message.txt.twig', ['calendar' => $calendar]),
                 );
-            } elseif (Calendar::SMS_CANCEL_PENDING === $calendar->getSmsStatus()) {
+            } elseif (Calendar::SMS_CANCEL_PENDING === $calendar->getSmsStatus() && (null === $calendar->getCancelReason() || CancelReason::CANCELEDBY_PERSON !== $calendar->getCancelReason()->getCanceledBy())) {
                 $toUsers[] = new SmsMessage(
                     $this->phoneUtil->format($person->getMobilenumber(), PhoneNumberFormat::E164),
                     $this->engine->render('@ChillCalendar/CalendarShortMessage/short_message_canceled.txt.twig', ['calendar' => $calendar]),
diff --git a/src/Bundle/ChillCalendarBundle/Tests/Controller/MyInvitationsControllerTest.php b/src/Bundle/ChillCalendarBundle/Tests/Controller/MyInvitationsControllerTest.php
new file mode 100644
index 000000000..32ed70456
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/Tests/Controller/MyInvitationsControllerTest.php
@@ -0,0 +1,292 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\CalendarBundle\Tests\Controller;
+
+use Chill\CalendarBundle\Controller\MyInvitationsController;
+use Chill\CalendarBundle\Entity\Calendar;
+use Chill\CalendarBundle\Entity\Invite;
+use Chill\CalendarBundle\Repository\InviteRepository;
+use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepositoryInterface;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Pagination\PaginatorFactory;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
+use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
+use Twig\Environment;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+final class MyInvitationsControllerTest extends TestCase
+{
+    use ProphecyTrait;
+
+    private MyInvitationsController $controller;
+
+    protected function setUp(): void
+    {
+        // Create prophecies for dependencies
+        $inviteRepository = $this->prophesize(InviteRepository::class);
+        $paginatorFactory = $this->prophesize(PaginatorFactory::class);
+        $docGeneratorTemplateRepository = $this->prophesize(DocGeneratorTemplateRepositoryInterface::class);
+
+        // Create controller instance
+        $this->controller = new MyInvitationsController(
+            $inviteRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $docGeneratorTemplateRepository->reveal()
+        );
+
+        // Set up necessary services for AbstractController
+        $authorizationChecker = $this->prophesize(AuthorizationCheckerInterface::class);
+        $tokenStorage = $this->prophesize(TokenStorageInterface::class);
+        $twig = $this->prophesize(Environment::class);
+
+        // Use reflection to set the container
+        $reflection = new \ReflectionClass($this->controller);
+        $containerProperty = $reflection->getParentClass()->getProperty('container');
+        $containerProperty->setAccessible(true);
+
+        // Create a mock container
+        $container = $this->prophesize(\Psr\Container\ContainerInterface::class);
+        $container->has('security.authorization_checker')->willReturn(true);
+        $container->get('security.authorization_checker')->willReturn($authorizationChecker->reveal());
+        $container->has('security.token_storage')->willReturn(true);
+        $container->get('security.token_storage')->willReturn($tokenStorage->reveal());
+        $container->has('twig')->willReturn(true);
+        $container->get('twig')->willReturn($twig->reveal());
+
+        $containerProperty->setValue($this->controller, $container->reveal());
+    }
+
+    public function testMyInvitationsReturnsCorrectAmountOfInvitations(): void
+    {
+        // Create test user
+        $user = new User();
+        $user->setUsername('testuser');
+
+        // Create test invitations
+        $invite1 = new Invite();
+        $invite1->setUser($user);
+        $invite1->setStatus(Invite::PENDING);
+
+        $invite2 = new Invite();
+        $invite2->setUser($user);
+        $invite2->setStatus(Invite::ACCEPTED);
+
+        $invite3 = new Invite();
+        $invite3->setUser($user);
+        $invite3->setStatus(Invite::DECLINED);
+
+        $allInvitations = [$invite1, $invite2, $invite3];
+        $paginatedInvitations = [$invite1, $invite2]; // First page with 2 items per page
+
+        // Set up repository prophecies
+        $inviteRepository = $this->prophesize(InviteRepository::class);
+        $inviteRepository->findBy(['user' => $user])->willReturn($allInvitations);
+        $inviteRepository->findBy(
+            ['user' => $user],
+            ['createdAt' => 'DESC'],
+            2, // items per page
+            0  // offset
+        )->willReturn($paginatedInvitations);
+
+        // Set up paginator prophecies
+        $paginator = $this->prophesize(PaginatorInterface::class);
+        $paginator->getItemsPerPage()->willReturn(2);
+        $paginator->getCurrentPageFirstItemNumber()->willReturn(0);
+
+        $paginatorFactory = $this->prophesize(PaginatorFactory::class);
+        $paginatorFactory->create(3)->willReturn($paginator->reveal());
+
+        // Set up doc generator repository
+        $docGeneratorTemplateRepository = $this->prophesize(DocGeneratorTemplateRepositoryInterface::class);
+        $docGeneratorTemplateRepository->findByEntity(Calendar::class)->willReturn([]);
+
+        // Create controller with mocked dependencies
+        $controller = new MyInvitationsController(
+            $inviteRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $docGeneratorTemplateRepository->reveal()
+        );
+
+        // Set up authorization checker to return true for ROLE_USER
+        $authorizationChecker = $this->prophesize(AuthorizationCheckerInterface::class);
+        $authorizationChecker->isGranted('ROLE_USER', null)->willReturn(true);
+
+        // Set up token storage to return user
+        $token = $this->prophesize(TokenInterface::class);
+        $token->getUser()->willReturn($user);
+        $tokenStorage = $this->prophesize(TokenStorageInterface::class);
+        $tokenStorage->getToken()->willReturn($token->reveal());
+
+        // Set up twig to return a response
+        $twig = $this->prophesize(Environment::class);
+        $twig->render('@ChillCalendar/Invitations/listByUser.html.twig', [
+            'invitations' => $paginatedInvitations,
+            'paginator' => $paginator->reveal(),
+            'templates' => [],
+        ])->willReturn('rendered content');
+
+        // Set up container
+        $container = $this->prophesize(\Psr\Container\ContainerInterface::class);
+        $container->has('security.authorization_checker')->willReturn(true);
+        $container->get('security.authorization_checker')->willReturn($authorizationChecker->reveal());
+        $container->has('security.token_storage')->willReturn(true);
+        $container->get('security.token_storage')->willReturn($tokenStorage->reveal());
+        $container->has('twig')->willReturn(true);
+        $container->get('twig')->willReturn($twig->reveal());
+
+        // Use reflection to set the container
+        $reflection = new \ReflectionClass($controller);
+        $containerProperty = $reflection->getParentClass()->getProperty('container');
+        $containerProperty->setAccessible(true);
+        $containerProperty->setValue($controller, $container->reveal());
+
+        // Create request
+        $request = new Request();
+
+        // Execute the action
+        $response = $controller->myInvitations($request);
+
+        // Assert that response is successful
+        self::assertInstanceOf(Response::class, $response);
+        self::assertSame(200, $response->getStatusCode());
+        self::assertSame('rendered content', $response->getContent());
+    }
+
+    public function testMyInvitationsPageLoads(): void
+    {
+        // Create test user
+        $user = new User();
+        $user->setUsername('testuser');
+
+        // Set up repository prophecies - no invitations
+        $inviteRepository = $this->prophesize(InviteRepository::class);
+        $inviteRepository->findBy(['user' => $user])->willReturn([]);
+        $inviteRepository->findBy(
+            ['user' => $user],
+            ['createdAt' => 'DESC'],
+            20, // default items per page
+            0   // offset
+        )->willReturn([]);
+
+        // Set up paginator prophecies
+        $paginator = $this->prophesize(PaginatorInterface::class);
+        $paginator->getItemsPerPage()->willReturn(20);
+        $paginator->getCurrentPageFirstItemNumber()->willReturn(0);
+
+        $paginatorFactory = $this->prophesize(PaginatorFactory::class);
+        $paginatorFactory->create(0)->willReturn($paginator->reveal());
+
+        // Set up doc generator repository
+        $docGeneratorTemplateRepository = $this->prophesize(DocGeneratorTemplateRepositoryInterface::class);
+        $docGeneratorTemplateRepository->findByEntity(Calendar::class)->willReturn([]);
+
+        // Create controller with mocked dependencies
+        $controller = new MyInvitationsController(
+            $inviteRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $docGeneratorTemplateRepository->reveal()
+        );
+
+        // Set up authorization checker to return true for ROLE_USER
+        $authorizationChecker = $this->prophesize(AuthorizationCheckerInterface::class);
+        $authorizationChecker->isGranted('ROLE_USER', null)->willReturn(true);
+
+        // Set up token storage to return user
+        $token = $this->prophesize(TokenInterface::class);
+        $token->getUser()->willReturn($user);
+        $tokenStorage = $this->prophesize(TokenStorageInterface::class);
+        $tokenStorage->getToken()->willReturn($token->reveal());
+
+        // Set up twig to return a response
+        $twig = $this->prophesize(Environment::class);
+        $twig->render('@ChillCalendar/Invitations/listByUser.html.twig', [
+            'invitations' => [],
+            'paginator' => $paginator->reveal(),
+            'templates' => [],
+        ])->willReturn('empty page content');
+
+        // Set up container
+        $container = $this->prophesize(\Psr\Container\ContainerInterface::class);
+        $container->has('security.authorization_checker')->willReturn(true);
+        $container->get('security.authorization_checker')->willReturn($authorizationChecker->reveal());
+        $container->has('security.token_storage')->willReturn(true);
+        $container->get('security.token_storage')->willReturn($tokenStorage->reveal());
+        $container->has('twig')->willReturn(true);
+        $container->get('twig')->willReturn($twig->reveal());
+
+        // Use reflection to set the container
+        $reflection = new \ReflectionClass($controller);
+        $containerProperty = $reflection->getParentClass()->getProperty('container');
+        $containerProperty->setAccessible(true);
+        $containerProperty->setValue($controller, $container->reveal());
+
+        // Create request
+        $request = new Request();
+
+        // Execute the action
+        $response = $controller->myInvitations($request);
+
+        // Assert that page loads successfully
+        self::assertInstanceOf(Response::class, $response);
+        self::assertSame(200, $response->getStatusCode());
+        self::assertSame('empty page content', $response->getContent());
+    }
+
+    public function testMyInvitationsRequiresAuthentication(): void
+    {
+        // Create controller with minimal dependencies
+        $inviteRepository = $this->prophesize(InviteRepository::class);
+        $paginatorFactory = $this->prophesize(PaginatorFactory::class);
+        $docGeneratorTemplateRepository = $this->prophesize(DocGeneratorTemplateRepositoryInterface::class);
+
+        $controller = new MyInvitationsController(
+            $inviteRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $docGeneratorTemplateRepository->reveal()
+        );
+
+        // Set up authorization checker to return false for ROLE_USER
+        $authorizationChecker = $this->prophesize(AuthorizationCheckerInterface::class);
+        $authorizationChecker->isGranted('ROLE_USER')->willReturn(false);
+        $authorizationChecker->isGranted('ROLE_USER', null)->willReturn(false);
+
+        // Set up container
+        $container = $this->prophesize(\Psr\Container\ContainerInterface::class);
+        $container->has('security.authorization_checker')->willReturn(true);
+        $container->get('security.authorization_checker')->willReturn($authorizationChecker->reveal());
+
+        // Use reflection to set the container
+        $reflection = new \ReflectionClass($controller);
+        $containerProperty = $reflection->getParentClass()->getProperty('container');
+        $containerProperty->setAccessible(true);
+        $containerProperty->setValue($controller, $container->reveal());
+
+        // Create request
+        $request = new Request();
+
+        // Expect AccessDeniedException
+        $this->expectException(\Symfony\Component\Security\Core\Exception\AccessDeniedException::class);
+
+        // Execute the action
+        $controller->myInvitations($request);
+    }
+}
diff --git a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
index cfb2fe057..8717dcd9f 100644
--- a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
@@ -31,8 +31,7 @@ Will send SMS: Un SMS de rappel sera envoyé
 Will not send SMS: Aucun SMS de rappel ne sera envoyé
 SMS already sent: Un SMS a été envoyé
 
-canceledBy: supprimé par
-Canceled by: supprimé par
+Canceled by: Annulé par
 Calendar configuration: Gestion des rendez-vous
 
 crud:
@@ -44,6 +43,14 @@ crud:
         title_edit: Modifier le motif d'annulation
 
 chill_calendar:
+    canceled: Annulé
+    cancel_reason: Raison d'annulation
+    cancel_calendar_item: Annuler rendez-vous
+    calendar_canceled: Le rendez-vous a été annulé
+    canceled_by:
+        user: Utilisateur
+        person: Usager
+        other: Autre
     Document: Document d'un rendez-vous
     form:
         The main user is mandatory. He will organize the appointment.: L'utilisateur principal est obligatoire. Il est l'organisateur de l'événement.
@@ -86,6 +93,9 @@ invite:
     declined: Refusé
     pending: En attente
     tentative: Accepté provisoirement
+    list:
+        none: Il n'y aucun invitation
+        title: Mes invitations
 
 # exports
 Exports of calendar: Exports des rendez-vous
diff --git a/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepositoryInterface.php b/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepositoryInterface.php
index e5071e76a..f2e3cf629 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepositoryInterface.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepositoryInterface.php
@@ -20,4 +20,9 @@ use Doctrine\Persistence\ObjectRepository;
 interface DocGeneratorTemplateRepositoryInterface extends ObjectRepository
 {
     public function countByEntity(string $entity): int;
+
+    /**
+     * @return array|DocGeneratorTemplate[]
+     */
+    public function findByEntity(string $entity, ?int $start = 0, ?int $limit = 50): array;
 }
diff --git a/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php b/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
index 19e9014da..ccba39848 100644
--- a/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
@@ -102,7 +102,6 @@ class CRUDController extends AbstractController
                 Resolver::class => Resolver::class,
                 SerializerInterface::class => SerializerInterface::class,
                 FilterOrderHelperFactoryInterface::class => FilterOrderHelperFactoryInterface::class,
-                ManagerRegistry::class => ManagerRegistry::class,
             ]
         );
     }
@@ -674,7 +673,7 @@ class CRUDController extends AbstractController
 
     protected function getManagerRegistry(): ManagerRegistry
     {
-        return $this->container->get(ManagerRegistry::class);
+        return $this->container->get('doctrine');
     }
 
     /**
diff --git a/src/Bundle/ChillMainBundle/Pagination/PaginatorFactory.php b/src/Bundle/ChillMainBundle/Pagination/PaginatorFactory.php
index 9a809287b..fa4897224 100644
--- a/src/Bundle/ChillMainBundle/Pagination/PaginatorFactory.php
+++ b/src/Bundle/ChillMainBundle/Pagination/PaginatorFactory.php
@@ -17,7 +17,7 @@ use Symfony\Component\Routing\RouterInterface;
 /**
  * Create paginator instances.
  */
-final readonly class PaginatorFactory implements PaginatorFactoryInterface
+class PaginatorFactory implements PaginatorFactoryInterface
 {
     final public const DEFAULT_CURRENT_PAGE_KEY = 'page';
 
@@ -29,16 +29,16 @@ final readonly class PaginatorFactory implements PaginatorFactoryInterface
         /**
          * the request stack.
          */
-        private RequestStack $requestStack,
+        private readonly RequestStack $requestStack,
         /**
          * the router and generator for url.
          */
-        private RouterInterface $router,
+        private readonly RouterInterface $router,
         /**
          * the default item per page. This may be overriden by
          * the request or inside the paginator.
          */
-        private int $itemPerPage = 20,
+        private readonly int $itemPerPage = 20,
     ) {}
 
     /**
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/DocumentsList.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/DocumentsList.vue
index 77fa443d4..7c9892de9 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/DocumentsList.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/DocumentsList.vue
@@ -97,7 +97,7 @@
                                                 @click="
                                                     goToGenerateDocumentNotification(
                                                         d,
-                                                        false,
+                                                        true,
                                                     )
                                                 "
                                             >
diff --git a/src/Bundle/ChillTicketBundle/src/Controller/Admin/MotiveController.php b/src/Bundle/ChillTicketBundle/src/Controller/Admin/MotiveController.php
new file mode 100644
index 000000000..891f82d07
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Controller/Admin/MotiveController.php
@@ -0,0 +1,54 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Controller\Admin;
+
+use Chill\MainBundle\CRUD\Controller\CRUDController;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\TicketBundle\Entity\Motive;
+use Chill\TicketBundle\MotiveDTO;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\HttpFoundation\Request;
+
+class MotiveController extends CRUDController
+{
+    protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
+    {
+        /* @var QueryBuilder $query */
+        $query->addOrderBy('e.ordering', 'ASC');
+
+        return parent::orderQuery($action, $query, $request, $paginator);
+    }
+
+    protected function createFormFor(string $action, mixed $entity, ?string $formClass = null, array $formOptions = []): FormInterface
+    {
+        if (in_array($action, ['new', 'edit'], true) && $entity instanceof Motive) {
+            $dto = MotiveDTO::fromMotive($entity);
+
+            return parent::createFormFor($action, $dto, $formClass, $formOptions);
+        }
+
+        return parent::createFormFor($action, $entity, $formClass, $formOptions);
+    }
+
+    protected function onFormValid(string $action, object $entity, FormInterface $form, Request $request): void
+    {
+        if (in_array($action, ['new', 'edit'], true) && $entity instanceof Motive) {
+            $dto = $form->getData();
+            if ($dto instanceof MotiveDTO) {
+                $dto->applyToMotive($entity);
+            }
+        }
+
+        parent::onFormValid($action, $entity, $form, $request);
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Controller/AdminController.php b/src/Bundle/ChillTicketBundle/src/Controller/AdminController.php
new file mode 100644
index 000000000..9bf5028c1
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Controller/AdminController.php
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Controller;
+
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\Routing\Annotation\Route;
+
+/**
+ * Class AdminController
+ * Controller for the ticket configuration section (in admin section).
+ */
+class AdminController extends AbstractController
+{
+    /**
+     * Ticket admin.
+     */
+    #[Route(path: '/{_locale}/admin/ticket', name: 'chill_ticket_admin_index')]
+    public function indexAdminAction()
+    {
+        return $this->render('@ChillTicket/Admin/index.html.twig');
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/DependencyInjection/ChillTicketExtension.php b/src/Bundle/ChillTicketBundle/src/DependencyInjection/ChillTicketExtension.php
index 596cb655a..a990cfa16 100644
--- a/src/Bundle/ChillTicketBundle/src/DependencyInjection/ChillTicketExtension.php
+++ b/src/Bundle/ChillTicketBundle/src/DependencyInjection/ChillTicketExtension.php
@@ -11,8 +11,10 @@ declare(strict_types=1);
 
 namespace Chill\TicketBundle\DependencyInjection;
 
+use Chill\TicketBundle\Controller\Admin\MotiveController;
 use Chill\TicketBundle\Controller\MotiveApiController;
 use Chill\TicketBundle\Entity\Motive;
+use Chill\TicketBundle\Form\MotiveType;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
@@ -36,6 +38,7 @@ class ChillTicketExtension extends Extension implements PrependExtensionInterfac
     public function prepend(ContainerBuilder $container)
     {
         $this->prependApi($container);
+        $this->prependCruds($container);
     }
 
     private function prependApi(ContainerBuilder $container): void
@@ -66,4 +69,37 @@ class ChillTicketExtension extends Extension implements PrependExtensionInterfac
             ],
         ]);
     }
+
+    protected function prependCruds(ContainerBuilder $container): void
+    {
+        $container->prependExtensionConfig('chill_main', [
+            'cruds' => [
+                [
+                    'class' => Motive::class,
+                    'name' => 'motive',
+                    'base_path' => '/admin/ticket/motive',
+                    'form_class' => MotiveType::class,
+                    'controller' => MotiveController::class,
+                    'actions' => [
+                        'index' => [
+                            'template' => '@ChillTicket/Admin/Motive/index.html.twig',
+                            'role' => 'ROLE_ADMIN',
+                        ],
+                        'new' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillTicket/Admin/Motive/new.html.twig',
+                        ],
+                        'view' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillTicket/Admin/Motive/view.html.twig',
+                        ],
+                        'edit' => [
+                            'role' => 'ROLE_ADMIN',
+                            'template' => '@ChillTicket/Admin/Motive/edit.html.twig',
+                        ],
+                    ],
+                ],
+            ],
+        ]);
+    }
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Entity/Motive.php b/src/Bundle/ChillTicketBundle/src/Entity/Motive.php
index 1be0fe47f..a22898b14 100644
--- a/src/Bundle/ChillTicketBundle/src/Entity/Motive.php
+++ b/src/Bundle/ChillTicketBundle/src/Entity/Motive.php
@@ -51,13 +51,15 @@ class Motive
     #[ORM\ManyToOne(targetEntity: Motive::class, inversedBy: 'children')]
     private ?Motive $parent = null;
 
-
     /**
      * @var Collection<int, Motive>&Selectable<int, Motive>
      */
-    #[ORM\OneToMany(targetEntity: Motive::class, mappedBy: 'parent')]
+    #[ORM\OneToMany(mappedBy: 'parent', targetEntity: Motive::class)]
     private Collection&Selectable $children;
 
+    #[ORM\Column(name: 'ordering', type: \Doctrine\DBAL\Types\Types::FLOAT, nullable: true, options: ['default' => '0.0'])]
+    private float $ordering = 0;
+
     public function __construct()
     {
         $this->storedObjects = new ArrayCollection();
@@ -218,4 +220,14 @@ class Motive
 
         return $collection;
     }
+
+    public function getOrdering(): float
+    {
+        return $this->ordering;
+    }
+
+    public function setOrdering(float $ordering): void
+    {
+        $this->ordering = $ordering;
+    }
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Form/MotiveType.php b/src/Bundle/ChillTicketBundle/src/Form/MotiveType.php
new file mode 100644
index 000000000..61251cb40
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Form/MotiveType.php
@@ -0,0 +1,71 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Form;
+
+use Chill\MainBundle\Form\Type\ChillCollectionType;
+use Chill\MainBundle\Form\Type\TranslatableStringFormType;
+use Chill\TicketBundle\Entity\EmergencyStatusEnum;
+use Chill\TicketBundle\MotiveDTO;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
+use Symfony\Component\Form\Extension\Core\Type\EnumType;
+use Symfony\Component\Form\Extension\Core\Type\NumberType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class MotiveType extends AbstractType
+{
+    public function buildForm(FormBuilderInterface $builder, array $options): void
+    {
+        $builder
+            ->add('label', TranslatableStringFormType::class, [
+                'label' => 'Label',
+                'required' => true,
+            ])
+            ->add('active', CheckboxType::class, [
+                'label' => 'Active',
+                'required' => false,
+            ])
+            ->add('makeTicketEmergency', EnumType::class, [
+                'class' => EmergencyStatusEnum::class,
+                'label' => 'emergency?',
+                'required' => false,
+                'placeholder' => 'Choose an option...',
+            ])
+            ->add('supplementaryComments', ChillCollectionType::class, [
+                'entry_type' => TextType::class,
+                'allow_add' => true,
+                'allow_delete' => true,
+                'by_reference' => true,
+                'label' => 'Supplementary comments',
+                'required' => false,
+            ])
+            ->add('ordering', NumberType::class, [
+                'scale' => 4,
+                'label' => 'Ordering',
+            ])
+        ;
+    }
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $resolver->setDefaults([
+            'data_class' => MotiveDTO::class,
+        ]);
+    }
+
+    public function getBlockPrefix(): string
+    {
+        return 'chill_ticketbundle_motive';
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Menu/AdminMenuBuilder.php b/src/Bundle/ChillTicketBundle/src/Menu/AdminMenuBuilder.php
new file mode 100644
index 000000000..b12dab2bf
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Menu/AdminMenuBuilder.php
@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Menu;
+
+use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Knp\Menu\MenuItem;
+use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
+
+class AdminMenuBuilder implements LocalMenuBuilderInterface
+{
+    public function __construct(protected AuthorizationCheckerInterface $authorizationChecker) {}
+
+    public function buildMenu($menuId, MenuItem $menu, array $parameters): void
+    {
+        if (!$this->authorizationChecker->isGranted('ROLE_ADMIN')) {
+            return;
+        }
+
+        $menu->addChild('Tickets', [
+            'route' => 'chill_ticket_admin_index',
+        ])
+            ->setAttribute('class', 'list-group-item-header')
+            ->setExtras([
+                'order' => 7500,
+            ]);
+
+        $menu->addChild('admin.ticket.motive.menu', [
+            'route' => 'chill_crud_motive_index',
+        ])->setExtras(['order' => 7510]);
+    }
+
+    public static function getMenuIds(): array
+    {
+        return ['admin_section', 'admin_ticket'];
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/MotiveDTO.php b/src/Bundle/ChillTicketBundle/src/MotiveDTO.php
new file mode 100644
index 000000000..e84565ee2
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/MotiveDTO.php
@@ -0,0 +1,67 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle;
+
+use Chill\TicketBundle\Entity\EmergencyStatusEnum;
+use Chill\TicketBundle\Entity\Motive;
+use Doctrine\Common\Collections\ArrayCollection;
+use Doctrine\Common\Collections\Collection;
+use Symfony\Component\Validator\Constraints as Assert;
+
+class MotiveDTO
+{
+    public function __construct(
+        #[Assert\NotBlank()]
+        public array $label = [],
+        public bool $active = true,
+        public Collection $supplementaryComments = new ArrayCollection(),
+        public ?EmergencyStatusEnum $makeTicketEmergency = null,
+        public float $ordering = 0.0,
+    ) {
+        if ($this->supplementaryComments->isEmpty()) {
+            $this->supplementaryComments = new ArrayCollection();
+        }
+    }
+
+    public static function fromMotive(Motive $motive): self
+    {
+        $supplementaryCommentsCollection = new ArrayCollection();
+
+        foreach ($motive->getSupplementaryComments() as $comment) {
+            $supplementaryCommentsCollection->add($comment['label']);
+        }
+
+        return new self(
+            label: $motive->getLabel(),
+            active: $motive->isActive(),
+            supplementaryComments: $supplementaryCommentsCollection,
+            makeTicketEmergency: $motive->getMakeTicketEmergency(),
+            ordering: $motive->getOrdering(),
+        );
+    }
+
+    public function applyToMotive(Motive $motive): void
+    {
+        $motive->setLabel($this->label);
+        $motive->setActive($this->active);
+        $motive->setMakeTicketEmergency($this->makeTicketEmergency);
+        $motive->setOrdering($this->ordering);
+
+        $supplementaryCommentsArray = [];
+
+        foreach ($this->supplementaryComments as $supplementaryComment) {
+            $supplementaryCommentsArray[] = ['label' => $supplementaryComment];
+        }
+
+        $motive->setSupplementaryComment($supplementaryCommentsArray);
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/views/Admin/Motive/edit.html.twig b/src/Bundle/ChillTicketBundle/src/Resources/views/Admin/Motive/edit.html.twig
new file mode 100644
index 000000000..73c005374
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/views/Admin/Motive/edit.html.twig
@@ -0,0 +1,15 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_edit_title.html.twig') %}
+{% endblock %}
+
+{% block js %}
+{{ parent() }}
+{% endblock %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_edit_content.html.twig' %}
+        {% block content_form_actions_save_and_view %}{% endblock %}
+    {% endembed %}
+{% endblock %}
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/views/Admin/Motive/index.html.twig b/src/Bundle/ChillTicketBundle/src/Resources/views/Admin/Motive/index.html.twig
new file mode 100644
index 000000000..fe3959309
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/views/Admin/Motive/index.html.twig
@@ -0,0 +1,68 @@
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
+
+{% block title %}{{ 'admin.motive.list.title'|trans }}{% endblock title %}
+
+{% block admin_content %}
+
+    <h1>{{ 'admin.motive.list.title'|trans }}</h1>
+
+	<table class="records_list table table-bordered border-dark">
+		<thead>
+			<tr>
+				<th>{{ 'Label'|trans }}</th>
+				<th>{{ 'Active'|trans }}</th>
+                <th>{{ 'emergency?'|trans }}</th>
+                <th>{{ 'Ordering'|trans }}</th>
+                <th>{{ 'Supplementary comments'|trans }}</th>
+                <th>&nbsp;</th>
+			</tr>
+		</thead>
+		<tbody>
+			{% for entity in entities %}
+				<tr>
+					<td>{{ entity.label|localize_translatable_string }}</td>
+					<td style="text-align:center;">
+						{%- if entity.isActive -%}
+							<i class="fa fa-check-square-o"></i>
+						{%- else -%}
+							<i class="fa fa-square-o"></i>
+						{%- endif -%}
+					</td>
+                    <td style="text-align:center;">
+                        {%- if entity.makeTicketEmergency -%}
+                            {{ entity.makeTicketEmergency.value|trans }}
+                        {%- else -%}
+                            -
+                        {%- endif -%}
+                    </td>
+                    <td style="text-align:center;">
+                        {{ entity.ordering }}
+                    </td>
+                    <td style="text-align:center;">
+                        {{ entity.supplementaryComments|length }}
+                    </td>
+                    <td>
+						<ul class="record_actions">
+							<li>
+								<a href="{{ path('chill_crud_motive_view', { 'id': entity.id }) }}" class="btn btn-show" title="{{ 'show'|trans }}"></a>
+							</li>
+							<li>
+								<a href="{{ path('chill_crud_motive_edit', { 'id': entity.id }) }}" class="btn btn-edit" title="{{ 'edit'|trans }}"></a>
+							</li>
+						</ul>
+					</td>
+				</tr>
+			{% endfor %}
+		</tbody>
+	</table>
+
+    {{ chill_pagination(paginator) }}
+
+	<ul class="record_actions sticky-form-buttons">
+		<li>
+			<a href="{{ path('chill_crud_motive_new') }}" class="btn btn-create">
+				{{ 'admin.motive.new.title'|trans }}
+			</a>
+		</li>
+	</ul>
+{% endblock %}
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/views/Admin/Motive/new.html.twig b/src/Bundle/ChillTicketBundle/src/Resources/views/Admin/Motive/new.html.twig
new file mode 100644
index 000000000..428c3fa75
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/views/Admin/Motive/new.html.twig
@@ -0,0 +1,15 @@
+{% extends '@ChillMain/CRUD/Admin/index.html.twig' %}
+
+{% block title %}
+    {% include('@ChillMain/CRUD/_new_title.html.twig') %}
+{% endblock %}
+
+{% block js %}
+{{ parent() }}
+{% endblock %}
+
+{% block admin_content %}
+    {% embed '@ChillMain/CRUD/_new_content.html.twig' %}
+        {% block content_form_actions_save_and_show %}{% endblock %}
+    {% endembed %}
+{% endblock %}
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/views/Admin/Motive/view.html.twig b/src/Bundle/ChillTicketBundle/src/Resources/views/Admin/Motive/view.html.twig
new file mode 100644
index 000000000..8ac3176ff
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/views/Admin/Motive/view.html.twig
@@ -0,0 +1,68 @@
+{% extends '@ChillMain/Admin/layoutWithVerticalMenu.html.twig' %}
+
+{% block title %}{{ 'admin.motive.view.title'|trans }}{% endblock title %}
+
+{% block admin_content %}
+
+    <h1>{{ 'admin.motive.view.title'|trans }}</h1>
+
+    <table class="record_properties table table-bordered">
+        <tbody>
+            <tr>
+                <th>{{ 'Id'|trans }}</th>
+                <td>{{ entity.id }}</td>
+            </tr>
+            <tr>
+                <th>{{ 'Label'|trans }}</th>
+                <td>{{ entity.label|localize_translatable_string }}</td>
+            </tr>
+            <tr>
+                <th>{{ 'Active'|trans }}</th>
+                <td style="text-align:center;">
+                    {%- if entity.isActive -%}
+                        <i class="fa fa-check-square-o"></i> {{ 'Yes'|trans }}
+                    {%- else -%}
+                        <i class="fa fa-square-o"></i> {{ 'No'|trans }}
+                    {%- endif -%}
+                </td>
+            </tr>
+            <tr>
+                <th>{{ 'emergency?'|trans }}</th>
+                <td>
+                    {%- if entity.makeTicketEmergency -%}
+                        {{ entity.makeTicketEmergency.value|trans }}
+                    {%- else -%}
+                        -
+                    {%- endif -%}
+                </td>
+            </tr>
+        </tbody>
+    </table>
+
+    {% if entity.supplementaryComments is not empty %}
+        <h2>{{ 'Supplementary comments'|trans }}</h2>
+        <div class="supplementary-comments">
+            {% for comment in entity.supplementaryComments %}
+                <div class="card mb-3">
+                    <div class="card-body">
+                        <div class="comment-content">
+                            {{ comment.label|raw }}
+                        </div>
+                    </div>
+                </div>
+            {% endfor %}
+        </div>
+    {% else %}
+        <h2>{{ 'Supplementary comments'|trans }}</h2>
+        <p class="text-muted">{{ 'No supplementary comments'|trans }}</p>
+    {% endif %}
+
+    <ul class="record_actions sticky-form-buttons">
+        <li class="cancel">
+            <a href="{{ path('chill_crud_motive_index') }}" class="btn btn-cancel">{{ 'Back to the list'|trans }}</a>
+        </li>
+        <li>
+            <a href="{{ path('chill_crud_motive_edit', { 'id': entity.id }) }}" class="btn btn-edit">{{ 'Edit'|trans }}</a>
+        </li>
+    </ul>
+{% endblock %}
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/views/Admin/index.html.twig b/src/Bundle/ChillTicketBundle/src/Resources/views/Admin/index.html.twig
new file mode 100644
index 000000000..8a5ec98f0
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/views/Admin/index.html.twig
@@ -0,0 +1,13 @@
+{% extends "@ChillMain/Admin/layoutWithVerticalMenu.html.twig" %}
+
+{% block vertical_menu_content %}
+    {{ chill_menu('admin_ticket', {
+        'layout': '@ChillMain/Admin/menu_admin_section.html.twig',
+    }) }}
+{% endblock %}
+
+{% block layout_wvm_content %}
+    {% block admin_content %}<!-- block content empty -->
+        <h1>{{ 'Tickets configuration' |trans }}</h1>
+    {% endblock %}
+{% endblock  %}
diff --git a/src/Bundle/ChillTicketBundle/src/config/services.yaml b/src/Bundle/ChillTicketBundle/src/config/services.yaml
index 5e2b8e1b3..b7f6df2c2 100644
--- a/src/Bundle/ChillTicketBundle/src/config/services.yaml
+++ b/src/Bundle/ChillTicketBundle/src/config/services.yaml
@@ -46,3 +46,6 @@ services:
 
     Chill\TicketBundle\DataFixtures\:
         resource: '../DataFixtures/'
+
+    Chill\TicketBundle\Form\:
+        resource: '../Form/'
diff --git a/src/Bundle/ChillTicketBundle/src/migrations/Version20251022081554.php b/src/Bundle/ChillTicketBundle/src/migrations/Version20251022081554.php
new file mode 100644
index 000000000..c024b334b
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/migrations/Version20251022081554.php
@@ -0,0 +1,34 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\Migrations\Ticket;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20251022081554 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add ordering property on motive entity';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_ticket.motive ADD ordering DOUBLE PRECISION DEFAULT \'0.0\'');
+        $this->addSql('UPDATE chill_ticket.motive SET ordering = id * 100');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_ticket.motive DROP ordering');
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml b/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
index ec46a9c98..a6436ea9f 100644
--- a/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
+++ b/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
@@ -151,3 +151,36 @@ chill_ticket:
     open_new_tab: "Ouvrir dans un nouvel onglet"
     iframe_not_supported: "Votre navigateur ne supporte pas les iframes."
     click_to_open_pdf: "Cliquez ici pour ouvrir le PDF"
+
+admin:
+    ticket:
+        motive:
+            menu: Motifs
+    motive:
+        list:
+            title: Liste des motifs
+        view:
+            title: Le motif
+        new:
+            title: Créer un motif
+crud:
+    motive:
+        title_new: Nouveau motif
+        title_edit: Modifier le motif
+        new:
+          "Create a new motive": "Créer un nouveau motif"
+
+"Label": "Libellé"
+"Active": "Actif"
+"emergency?": "Urgent ?"
+"Supplementary comments": "Commentaires supplémentaires"
+"edit": "modifier"
+"show": "voir"
+"Yes": "Oui"
+"No": "Non"
+"Id": "ID"
+"Date": "Date"
+"User": "Utilisateur"
+"No supplementary comments": "Aucun commentaire supplémentaire"
+"Back to the list": "Retour à la liste"
+"Edit": "Modifier"

From 9e2c0302249dff228b42167e1a84d2d559d9de64 Mon Sep 17 00:00:00 2001
From: LenaertsJ <julie.lenaerts@champs-libres.coop>
Date: Fri, 7 Nov 2025 10:50:03 +0000
Subject: [PATCH 215/283] Fix the fusion of thirdparty properties that are
 located in another schema...

---
 .../unreleased/Fixed-20251106-123641.yaml     |  6 +++
 .../Service/ThirdpartyMergeService.php        | 34 +++++++++---
 .../Service/ThirdpartyMergeServiceTest.php    | 53 +++++++++++++++++--
 3 files changed, 81 insertions(+), 12 deletions(-)
 create mode 100644 .changes/unreleased/Fixed-20251106-123641.yaml

diff --git a/.changes/unreleased/Fixed-20251106-123641.yaml b/.changes/unreleased/Fixed-20251106-123641.yaml
new file mode 100644
index 000000000..a65a6ea8b
--- /dev/null
+++ b/.changes/unreleased/Fixed-20251106-123641.yaml
@@ -0,0 +1,6 @@
+kind: Fixed
+body: Fix the fusion of thirdparty properties that are located in another schema than public for TO_ONE relations + add extra loop for MANY_TO_MANY relations where thirdparty is the source instead of the target
+time: 2025-11-06T12:36:41.555991969+01:00
+custom:
+    Issue: "457"
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillThirdPartyBundle/Service/ThirdpartyMergeService.php b/src/Bundle/ChillThirdPartyBundle/Service/ThirdpartyMergeService.php
index 4eecb09b4..a5aecea45 100644
--- a/src/Bundle/ChillThirdPartyBundle/Service/ThirdpartyMergeService.php
+++ b/src/Bundle/ChillThirdPartyBundle/Service/ThirdpartyMergeService.php
@@ -69,10 +69,11 @@ readonly class ThirdpartyMergeService
                 if (($assoc['type'] & ClassMetadata::TO_ONE) !== 0) {
                     $joinColumn = $meta->getSingleAssociationJoinColumnName($assoc['fieldName']);
 
-                    $suffix = (ThirdParty::class === $assoc['sourceEntity']) ? 'chill_3party.' : '';
+                    $schema = $meta->getSchemaName();
+                    $prefix = null !== $schema && '' !== $schema ? $schema.'.' : '';
 
                     $queries[] = [
-                        'sql' => "UPDATE {$suffix}{$tableName} SET {$joinColumn} = :toKeep WHERE {$joinColumn} = :toDelete",
+                        'sql' => "UPDATE {$prefix}{$tableName} SET {$joinColumn} = :toKeep WHERE {$joinColumn} = :toDelete",
                         'params' => ['toKeep' => $toKeep->getId(), 'toDelete' => $toDelete->getId()],
                     ];
                 } elseif (ClassMetadata::MANY_TO_MANY === $assoc['type'] && isset($assoc['joinTable'])) {
@@ -85,13 +86,36 @@ readonly class ThirdpartyMergeService
                     ];
 
                     $queries[] = [
-                        'sql' => "DELETE FROM {$joinTable} WHERE {$joinColumn} = :toDelete",
+                        'sql' => "DELETE FROM {$prefix}{$joinTable} WHERE {$joinColumn} = :toDelete",
                         'params' => ['toDelete' => $toDelete->getId()],
                     ];
                 }
             }
         }
 
+        // Also handle many-to-many where ThirdParty is the source
+        $thirdPartyMeta = $this->em->getClassMetadata(ThirdParty::class);
+        foreach ($thirdPartyMeta->getAssociationMappings() as $assoc) {
+            if (ClassMetadata::MANY_TO_MANY === $assoc['type'] && isset($assoc['joinTable'])) {
+                $joinTable = $assoc['joinTable']['name'];
+                $prefix = null !== ($assoc['joinTable']['schema'] ?? null) ? $assoc['joinTable']['schema'].'.' : '';
+                $joinColumn = $assoc['joinTable']['joinColumns'][0]['name']; // Note: joinColumns, not inverseJoinColumns
+
+                // Get the other column name to build proper duplicate check
+                $otherColumn = $assoc['joinTable']['inverseJoinColumns'][0]['name'];
+
+                $queries[] = [
+                    'sql' => "UPDATE {$prefix}{$joinTable} SET {$joinColumn} = :toKeep WHERE {$joinColumn} = :toDelete AND NOT EXISTS (SELECT 1 FROM {$prefix}{$joinTable} AS t2 WHERE t2.{$joinColumn} = :toKeep AND t2.{$otherColumn} = {$prefix}{$joinTable}.{$otherColumn})",
+                    'params' => ['toKeep' => $toKeep->getId(), 'toDelete' => $toDelete->getId()],
+                ];
+
+                $queries[] = [
+                    'sql' => "DELETE FROM {$prefix}{$joinTable} WHERE {$joinColumn} = :toDelete",
+                    'params' => ['toDelete' => $toDelete->getId()],
+                ];
+            }
+        }
+
         return $queries;
     }
 
@@ -102,10 +126,6 @@ readonly class ThirdpartyMergeService
                 'sql' => 'UPDATE chill_3party.third_party SET parent_id = :toKeep WHERE parent_id = :toDelete',
                 'params' => ['toKeep' => $toKeep->getId(), 'toDelete' => $toDelete->getId()],
             ],
-            [
-                'sql' => 'UPDATE chill_3party.thirdparty_category SET thirdparty_id = :toKeep WHERE thirdparty_id = :toDelete AND NOT EXISTS (SELECT 1 FROM chill_3party.thirdparty_category WHERE thirdparty_id = :toKeep)',
-                'params' => ['toKeep' => $toKeep->getId(), 'toDelete' => $toDelete->getId()],
-            ],
             [
                 'sql' => 'DELETE FROM chill_3party.third_party WHERE id = :toDelete',
                 'params' => ['toDelete' => $toDelete->getId()],
diff --git a/src/Bundle/ChillThirdPartyBundle/Tests/Service/ThirdpartyMergeServiceTest.php b/src/Bundle/ChillThirdPartyBundle/Tests/Service/ThirdpartyMergeServiceTest.php
index 4b2819751..4d8afbb7d 100644
--- a/src/Bundle/ChillThirdPartyBundle/Tests/Service/ThirdpartyMergeServiceTest.php
+++ b/src/Bundle/ChillThirdPartyBundle/Tests/Service/ThirdpartyMergeServiceTest.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\ThirdPartyBundle\Tests\Service;
 
 use Chill\ActivityBundle\Entity\Activity;
+use Chill\MainBundle\Entity\Center;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
 use Chill\ThirdPartyBundle\Entity\ThirdPartyCategory;
 use Chill\ThirdPartyBundle\Service\ThirdpartyMergeService;
@@ -47,19 +48,20 @@ class ThirdpartyMergeServiceTest extends KernelTestCase
         $toDelete->setName('Thirdparty to delete');
         $this->em->persist($toDelete);
 
-        // Create a related entity with TO_ONE relation (thirdparty parent)
+        // Create a related entity with TO_ONE relation (thirdparty parent) - tests schema handling for TO_ONE
         $relatedToOneEntity = new ThirdParty();
         $relatedToOneEntity->setName('RelatedToOne thirdparty');
         $relatedToOneEntity->setParent($toDelete);
         $this->em->persist($relatedToOneEntity);
 
-        // Create a related entity with TO_MANY relation (thirdparty category)
+        // Create a related entity with MANY_TO_MANY relation (thirdparty category) - tests schema handling for MANY_TO_MANY where ThirdParty is target
         $thirdpartyCategory = new ThirdPartyCategory();
         $thirdpartyCategory->setName(['fr' => 'Thirdparty category']);
         $this->em->persist($thirdpartyCategory);
         $toDelete->addCategory($thirdpartyCategory);
         $this->em->persist($toDelete);
 
+        // Test MANY_TO_MANY relation from another bundle (Activity) - tests cross-bundle schema handling
         $activity = new Activity();
         $activity->setDate(new \DateTime());
         $activity->addThirdParty($toDelete);
@@ -73,14 +75,55 @@ class ThirdpartyMergeServiceTest extends KernelTestCase
         $this->em->refresh($relatedToOneEntity);
 
         // Check that references were updated
-        $this->assertEquals($toKeep->getId(), $relatedToOneEntity->getParent()->getId(), 'The parent thirdparty was succesfully merged');
 
+        // Test TO_ONE relation in chill_3party schema was properly handled
+        $this->assertEquals($toKeep->getId(), $relatedToOneEntity->getParent()->getId(), 'The parent thirdparty in chill_3party schema was successfully merged');
+
+        // Test MANY_TO_MANY relation in chill_3party schema was properly handled
         $updatedRelatedManyEntity = $this->em->find(ThirdPartyCategory::class, $thirdpartyCategory->getId());
-        $this->assertContains($updatedRelatedManyEntity, $toKeep->getCategories(), 'The thirdparty category was found in the toKeep entity');
+        $this->assertContains($updatedRelatedManyEntity, $toKeep->getCategories(), 'The thirdparty category in chill_3party schema was found in the toKeep entity');
+
+        // Test MANY_TO_MANY relation from different schema (Activity bundle) was properly handled
+        $this->em->refresh($activity);
+        $this->assertContains($toKeep, $activity->getThirdParties(), 'The activity relation from different schema was successfully merged');
+        $this->assertNotContains($toDelete, $activity->getThirdParties(), 'The toDelete thirdparty was removed from activity relation');
 
         // Check that toDelete was removed
         $this->em->clear();
         $deletedThirdParty = $this->em->find(ThirdParty::class, $toDelete->getId());
-        $this->assertNull($deletedThirdParty);
+        $this->assertNull($deletedThirdParty, 'The toDelete thirdparty was successfully removed');
+    }
+
+    public function testMergeWithSharedCenterDoesNotCauseUniqueConstraintViolation(): void
+    {
+        // Create a center that will be shared by both thirdparties
+        $sharedCenter = new Center();
+        $sharedCenter->setName('Shared Center');
+        $this->em->persist($sharedCenter);
+
+        // Create ThirdParty entities
+        $toKeep = new ThirdParty();
+        $toKeep->setName('Thirdparty to keep');
+        $toKeep->addCenter($sharedCenter); // Both thirdparties linked to same center
+        $this->em->persist($toKeep);
+
+        $toDelete = new ThirdParty();
+        $toDelete->setName('Thirdparty to delete');
+        $toDelete->addCenter($sharedCenter); // Both thirdparties linked to same center
+        $this->em->persist($toDelete);
+
+        $this->em->flush();
+
+        // This should not throw a unique constraint violation
+        $this->service->merge($toKeep, $toDelete);
+
+        // Verify that toKeep still has the shared center
+        $this->em->refresh($toKeep);
+        $this->assertContains($sharedCenter, $toKeep->getCenters(), 'The shared center is still linked to the kept thirdparty');
+
+        // Verify that toDelete was removed
+        $this->em->clear();
+        $deletedThirdParty = $this->em->find(ThirdParty::class, $toDelete->getId());
+        $this->assertNull($deletedThirdParty, 'The toDelete thirdparty was successfully removed');
     }
 }

From f0b3e63d660e795a5178d9b41653c52d530cbd3e Mon Sep 17 00:00:00 2001
From: Boris Waaub <boris.waaub@digitalternative.be>
Date: Fri, 7 Nov 2025 12:54:29 +0000
Subject: [PATCH 216/283] FIX: Frontend: La liste des motifs reste vide et
 Frontend: l'appelant apparait deux fois dans les suggestions

---
 .../Motive/MotiveSelectorComponent.vue        | 106 +++++++++---------
 .../vuejs/TicketApp/store/modules/persons.ts  |   2 +-
 2 files changed, 53 insertions(+), 55 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveSelectorComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveSelectorComponent.vue
index 6a2b28201..91e5f89c4 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveSelectorComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Motive/MotiveSelectorComponent.vue
@@ -60,7 +60,7 @@
 </template>
 
 <script setup lang="ts">
-import { computed, ref, watch } from "vue";
+import { computed, ref } from "vue";
 import VueMultiselect from "vue-multiselect";
 
 // Types
@@ -127,65 +127,63 @@ type MotiveOptions = Motive & {
   breadcrumb: string[];
 };
 
-const motiveOptions: MotiveOptions[] = [];
-const options = ref<MotiveOptions[]>([]);
+const searchQuery = ref<string>("");
 const isLoading = ref<boolean>(false);
 
+const allMotiveOptions = computed<MotiveOptions[]>(() => {
+  const result: MotiveOptions[] = [];
+
+  const processMotiveRecursively = (
+    motive: Motive,
+    isChild = false,
+    level = 0,
+    parentBreadcrumb: string[] = [],
+  ) => {
+    const hasChildren = motive.children && motive.children.length > 0;
+    const displayLabel = localizeString(motive.label);
+    const breadcrumb = [...parentBreadcrumb, displayLabel];
+
+    if (props.allowParentSelection || !hasChildren) {
+      result.push({
+        ...motive,
+        isChild,
+        isParent: hasChildren,
+        level,
+        breadcrumb,
+        displayLabel,
+      });
+    }
+
+    if (hasChildren) {
+      motive.children.forEach((childMotive) => {
+        processMotiveRecursively(childMotive, true, level + 1, breadcrumb);
+      });
+    }
+  };
+
+  props.motives.forEach((motive) => {
+    processMotiveRecursively(motive);
+  });
+
+  return result;
+});
+
+const options = computed<MotiveOptions[]>(() => {
+  if (!searchQuery.value.trim()) {
+    return allMotiveOptions.value;
+  }
+  return allMotiveOptions.value.filter((m) =>
+    m.breadcrumb.some((crumb) =>
+      crumb.toLowerCase().includes(searchQuery.value.trim().toLowerCase()),
+    ),
+  );
+});
+
 function search(query: string) {
   isLoading.value = true;
-  options.value = motiveOptions.filter((m) =>
-    m.breadcrumb.some((crumb) =>
-      crumb.toLowerCase().includes(query.trim().toLowerCase()),
-    ),
-  );
+  searchQuery.value = query;
   isLoading.value = false;
 }
-
-function processMotiveRecursively(
-  motive: Motive,
-  isChild = false,
-  level = 0,
-  parentBreadcrumb: string[] = [],
-) {
-  const hasChildren = motive.children && motive.children.length > 0;
-  const displayLabel = localizeString(motive.label);
-  const breadcrumb = [...parentBreadcrumb, displayLabel];
-
-  if (props.allowParentSelection || !hasChildren) {
-    const optionValue = {
-      ...motive,
-      isChild,
-      isParent: hasChildren,
-      level,
-      breadcrumb,
-      displayLabel,
-    };
-    motiveOptions.push(optionValue);
-    options.value.push(optionValue);
-  }
-
-  if (hasChildren) {
-    motive.children.forEach((childMotive) => {
-      processMotiveRecursively(childMotive, true, level + 1, breadcrumb);
-    });
-  }
-}
-
-function fillOptions() {
-  motiveOptions.length = 0;
-  options.value.length = 0;
-  props.motives.forEach((parentMotive) => {
-    processMotiveRecursively(parentMotive, false, 0, []);
-  });
-}
-
-watch(
-  () => props.motives,
-  () => {
-    fillOptions();
-  },
-  { deep: true },
-);
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/persons.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/persons.ts
index dcdad685b..ae6a35545 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/persons.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/store/modules/persons.ts
@@ -72,7 +72,7 @@ export const modulePersons: Module<State, RootState> = {
           "GET",
           `/api/1.0/ticket/ticket/${ticketId}/suggest-person`,
         );
-        if (caller) {
+        if (caller && !result.some((person) => person.id === caller.id)) {
           result.push(caller);
         }
         commit("setPersons", result);

From 86dd9bfb805e060a7be1f225b1bddae4e777bfd1 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Fri, 7 Nov 2025 15:18:02 +0100
Subject: [PATCH 217/283] Wrap text when it is too long within badges

---
 .changes/unreleased/UX-20251107-151736.yaml   |  6 ++++++
 .../SocialIssuesAcc/CheckSocialAction.vue     | 20 +++++++++++++++----
 .../SocialIssuesAcc/CheckSocialIssue.vue      | 15 ++++++++++++++
 3 files changed, 37 insertions(+), 4 deletions(-)
 create mode 100644 .changes/unreleased/UX-20251107-151736.yaml

diff --git a/.changes/unreleased/UX-20251107-151736.yaml b/.changes/unreleased/UX-20251107-151736.yaml
new file mode 100644
index 000000000..3bf9387f6
--- /dev/null
+++ b/.changes/unreleased/UX-20251107-151736.yaml
@@ -0,0 +1,6 @@
+kind: UX
+body: Wrap text when it is too long within badges
+time: 2025-11-07T15:17:36.104379989+01:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialAction.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialAction.vue
index 8172b2b6f..503977dbd 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialAction.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialAction.vue
@@ -43,11 +43,23 @@ export default {
 span.badge {
     @include badge_social($social-action-color);
     font-size: 95%;
+    white-space: normal;
+    word-wrap: break-word;
+    word-break: break-word;
+    display: inline-block;
+    max-width: 100%;
     margin-bottom: 5px;
     margin-right: 1em;
-    max-width: 100%; /* Adjust as needed */
-    overflow: hidden;
-    text-overflow: ellipsis;
-    white-space: nowrap;
+    text-align: left;
+    line-height: 1.2em;
+
+    &::before {
+        position: absolute;
+        left: 11px;
+        top: 0;
+        margin: 0 0.3em 0 -0.75em;
+    }
+    position: relative;
+    padding-left: 1.5em;
 }
 </style>
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialIssue.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialIssue.vue
index 9dbedf2ea..ef1c82a35 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialIssue.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialIssue.vue
@@ -43,7 +43,22 @@ export default {
 span.badge {
     @include badge_social($social-issue-color);
     font-size: 95%;
+    white-space: normal;
+    word-wrap: break-word;
+    word-break: break-word;
+    display: inline-block;
+    max-width: 100%;
     margin-bottom: 5px;
     margin-right: 1em;
+    text-align: left;
+
+    &::before {
+        position: absolute;
+        left: 11px;
+        top: 0;
+        margin: 0 0.3em 0 -0.75em;
+    }
+    position: relative;
+    padding-left: 1.5em;
 }
 </style>

From c28bd2256001645e0f5f1dc10aa7f51e3f09c3c5 Mon Sep 17 00:00:00 2001
From: LenaertsJ <julie.lenaerts@champs-libres.coop>
Date: Fri, 7 Nov 2025 16:23:52 +0000
Subject: [PATCH 218/283] =?UTF-8?q?Resolve=20"Action=20d'accompagnement=20?=
 =?UTF-8?q?-=20afficher=20les=20objectifs=20avant=20les=20r=C3=A9sultats"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .changes/unreleased/UX-20251103-131554.yaml   |  6 +++
 .../vuejs/AccompanyingCourseWorkEdit/App.vue  | 43 ++++++++++------
 .../_objectifs_results_evaluations.html.twig  | 49 ++++++++++---------
 3 files changed, 60 insertions(+), 38 deletions(-)
 create mode 100644 .changes/unreleased/UX-20251103-131554.yaml

diff --git a/.changes/unreleased/UX-20251103-131554.yaml b/.changes/unreleased/UX-20251103-131554.yaml
new file mode 100644
index 000000000..660665b23
--- /dev/null
+++ b/.changes/unreleased/UX-20251103-131554.yaml
@@ -0,0 +1,6 @@
+kind: UX
+body: Change the order of display for results and objectives in the social work/action form
+time: 2025-11-03T13:15:54.837971477+01:00
+custom:
+    Issue: "455"
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index bf403291e..bd888dd3c 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -52,20 +52,7 @@
                 </div>
             </div>
 
-            <!-- results which are not attached to an objective -->
-            <div v-if="hasResultsForAction">
-                <div class="results_without_objective">
-                    {{ $t("results_without_objective") }}
-                </div>
-                <div>
-                    <add-result
-                        :availableResults="resultsForAction"
-                        destination="action"
-                    ></add-result>
-                </div>
-            </div>
-
-            <!-- results which **are** attached to an objective -->
+            <!-- 1. Goals with results that were already selected/saved to the entity -->
             <div v-for="g in goalsPicked" :key="g.goal.id">
                 <div class="item-title" @click="removeGoal(g)">
                     <span class="removable">{{
@@ -76,6 +63,32 @@
                     <add-result :goal="g.goal" destination="goal"></add-result>
                 </div>
             </div>
+
+            <!-- 2. Results without objectives that were already selected/saved to the entity -->
+            <div v-if="hasResultsForAction">
+                <div
+                    class="results_without_objective"
+                    style="
+                        background: repeating-linear-gradient(
+                            45deg,
+                            #e6e6e6,
+                            #e6e6e6 10px,
+                            #f3f3f3 0,
+                            #f3f3f3 20px
+                        );
+                    "
+                >
+                    {{ $t("results_without_objective") }}
+                </div>
+                <div>
+                    <add-result
+                        :availableResults="resultsForAction"
+                        destination="action"
+                    ></add-result>
+                </div>
+            </div>
+
+            <!-- 3. Selector for objectives with results -->
             <div class="accordion" id="expandedSuggestions">
                 <div
                     v-if="availableForCheckGoal.length > 0"
@@ -138,6 +151,8 @@
                     }}</span>
                 </div>
             </div>
+
+            <!-- 4. Selector for results without objectives is already included above in section 2 -->
         </div>
 
         <div id="evaluations" class="action-row">
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig
index f1efbd31e..9adba79ff 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/AccompanyingCourseWork/_objectifs_results_evaluations.html.twig
@@ -2,30 +2,6 @@
 #  OPTIONS
 #  - displayContent: [short|long] default: short
 #}
-{% if w.results|length > 0 %}
-
-    <table class="obj-res-eval">
-        <thead>
-        <th class="obj"><h4 class="title_label">{{ 'accompanying_course_work.goal'|trans }}</h4></th>
-        <th class="res"><h4 class="title_label">{{ 'accompanying_course_work.results'|trans }}</h4></th>
-        </thead>
-        <tbody>
-        <tr>
-            <td class="obj">
-                <p class="chill-no-data-statement">{{ 'accompanying_course_work.results without objective'|trans }}</p>
-            </td>
-            <td class="res">
-                <ul class="result_list">
-                    {% for r in w.results %}
-                        <li>{{ r.title|localize_translatable_string }}</li>
-                    {% endfor %}
-                </ul>
-            </td>
-        </tr>
-        </tbody>
-    </table>
-{% endif %}
-
 {% if w.goals|length > 0 %}
     <table class="obj-res-eval">
         <thead>
@@ -57,6 +33,31 @@
     </table>
 {% endif %}
 
+{% if w.results|length > 0 %}
+
+    <table class="obj-res-eval">
+        <thead>
+        <th class="obj"><h4 class="title_label">{{ 'accompanying_course_work.goal'|trans }}</h4></th>
+        <th class="res"><h4 class="title_label">{{ 'accompanying_course_work.results'|trans }}</h4></th>
+        </thead>
+        <tbody>
+        <tr>
+            <td class="obj">
+                <p class="chill-no-data-statement">{{ 'accompanying_course_work.results without objective'|trans }}</p>
+            </td>
+            <td class="res">
+                <ul class="result_list">
+                    {% for r in w.results %}
+                        <li>{{ r.title|localize_translatable_string }}</li>
+                    {% endfor %}
+                </ul>
+            </td>
+        </tr>
+        </tbody>
+    </table>
+{% endif %}
+
+
 {% if w.accompanyingPeriodWorkEvaluations|length > 0 %}
     <table class="obj-res-eval">
         <thead>

From 0a58e052308d7d6dd08d27405ad9a866f8c55014 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 10 Nov 2025 16:47:38 +0100
Subject: [PATCH 219/283] Update chill bundles to v4.7.0

---
 .changes/unreleased/DX-20251027-150053.yaml   |   7 -
 .../unreleased/Feature-20250808-120802.yaml   |   6 -
 .../unreleased/Feature-20251029-152510.yaml   |   6 -
 .../unreleased/Fixed-20251029-124355.yaml     |   6 -
 .../unreleased/Fixed-20251029-143836.yaml     |   6 -
 .../unreleased/Fixed-20251104-135108.yaml     |   6 -
 .../unreleased/Fixed-20251106-123641.yaml     |   6 -
 .../unreleased/Fixed-20251106-161605.yaml     |   6 -
 .changes/unreleased/UX-20251006-123932.yaml   |   6 -
 .changes/unreleased/UX-20251029-110804.yaml   |   6 -
 .changes/unreleased/UX-20251030-180919.yaml   |   6 -
 .changes/unreleased/UX-20251103-131554.yaml   |   6 -
 .changes/unreleased/UX-20251107-151736.yaml   |   6 -
 .changes/v4.7.0.md                            |  21 +
 CHANGELOG.md                                  | 406 +++++++++---------
 15 files changed, 235 insertions(+), 271 deletions(-)
 delete mode 100644 .changes/unreleased/DX-20251027-150053.yaml
 delete mode 100644 .changes/unreleased/Feature-20250808-120802.yaml
 delete mode 100644 .changes/unreleased/Feature-20251029-152510.yaml
 delete mode 100644 .changes/unreleased/Fixed-20251029-124355.yaml
 delete mode 100644 .changes/unreleased/Fixed-20251029-143836.yaml
 delete mode 100644 .changes/unreleased/Fixed-20251104-135108.yaml
 delete mode 100644 .changes/unreleased/Fixed-20251106-123641.yaml
 delete mode 100644 .changes/unreleased/Fixed-20251106-161605.yaml
 delete mode 100644 .changes/unreleased/UX-20251006-123932.yaml
 delete mode 100644 .changes/unreleased/UX-20251029-110804.yaml
 delete mode 100644 .changes/unreleased/UX-20251030-180919.yaml
 delete mode 100644 .changes/unreleased/UX-20251103-131554.yaml
 delete mode 100644 .changes/unreleased/UX-20251107-151736.yaml
 create mode 100644 .changes/v4.7.0.md

diff --git a/.changes/unreleased/DX-20251027-150053.yaml b/.changes/unreleased/DX-20251027-150053.yaml
deleted file mode 100644
index 880894bd4..000000000
--- a/.changes/unreleased/DX-20251027-150053.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-kind: DX
-body: |
-    Send notifications log to dedicated channel, if it exists
-time: 2025-10-27T15:00:53.309372316+01:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/Feature-20250808-120802.yaml b/.changes/unreleased/Feature-20250808-120802.yaml
deleted file mode 100644
index 50d1eb8ba..000000000
--- a/.changes/unreleased/Feature-20250808-120802.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Feature
-body: Create invitation list in user menu
-time: 2025-08-08T12:08:02.446361367+02:00
-custom:
-    Issue: "385"
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/Feature-20251029-152510.yaml b/.changes/unreleased/Feature-20251029-152510.yaml
deleted file mode 100644
index fab026c08..000000000
--- a/.changes/unreleased/Feature-20251029-152510.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Feature
-body: Add columns for comments linked to an activity in the activity list export
-time: 2025-10-29T15:25:10.493968528+01:00
-custom:
-    Issue: "404"
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/Fixed-20251029-124355.yaml b/.changes/unreleased/Fixed-20251029-124355.yaml
deleted file mode 100644
index e032e7703..000000000
--- a/.changes/unreleased/Fixed-20251029-124355.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Fixed
-body: 'Fix: display also social actions linked to parents of the selected social issue'
-time: 2025-10-29T12:43:55.008647232+01:00
-custom:
-    Issue: "451"
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/Fixed-20251029-143836.yaml b/.changes/unreleased/Fixed-20251029-143836.yaml
deleted file mode 100644
index 308ed0fca..000000000
--- a/.changes/unreleased/Fixed-20251029-143836.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Fixed
-body: 'Fix: export actions and their results in csv even when action does not have any goals attached to it.'
-time: 2025-10-29T14:38:36.195220844+01:00
-custom:
-    Issue: "453"
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/Fixed-20251104-135108.yaml b/.changes/unreleased/Fixed-20251104-135108.yaml
deleted file mode 100644
index a96d57edb..000000000
--- a/.changes/unreleased/Fixed-20251104-135108.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Fixed
-body: Fix the possibility to delete a workflow
-time: 2025-11-04T13:51:08.113234488+01:00
-custom:
-    Issue: ""
-    SchemaChange: Drop or rename table or columns, or enforce new constraint that must be manually fixed
diff --git a/.changes/unreleased/Fixed-20251106-123641.yaml b/.changes/unreleased/Fixed-20251106-123641.yaml
deleted file mode 100644
index a65a6ea8b..000000000
--- a/.changes/unreleased/Fixed-20251106-123641.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Fixed
-body: Fix the fusion of thirdparty properties that are located in another schema than public for TO_ONE relations + add extra loop for MANY_TO_MANY relations where thirdparty is the source instead of the target
-time: 2025-11-06T12:36:41.555991969+01:00
-custom:
-    Issue: "457"
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/Fixed-20251106-161605.yaml b/.changes/unreleased/Fixed-20251106-161605.yaml
deleted file mode 100644
index 3962daf8a..000000000
--- a/.changes/unreleased/Fixed-20251106-161605.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Fixed
-body: Fix suggestion of referrer when creating notification for accompanyingPeriodWorkDocument
-time: 2025-11-06T16:16:05.861813041+01:00
-custom:
-    Issue: "428"
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/UX-20251006-123932.yaml b/.changes/unreleased/UX-20251006-123932.yaml
deleted file mode 100644
index 19f304e6a..000000000
--- a/.changes/unreleased/UX-20251006-123932.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: UX
-body: Change the terms 'cercle' and 'centre' to 'service', and 'territoire' respectively.
-time: 2025-10-06T12:39:32.514056818+02:00
-custom:
-    Issue: "425"
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/UX-20251029-110804.yaml b/.changes/unreleased/UX-20251029-110804.yaml
deleted file mode 100644
index 5342d3a1e..000000000
--- a/.changes/unreleased/UX-20251029-110804.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: UX
-body: Improve the ux for selecting whether user wants to be notified of the final step of a workflow or all steps
-time: 2025-10-29T11:08:04.077020411+01:00
-custom:
-    Issue: "542"
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/UX-20251030-180919.yaml b/.changes/unreleased/UX-20251030-180919.yaml
deleted file mode 100644
index a15866242..000000000
--- a/.changes/unreleased/UX-20251030-180919.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: UX
-body: Expand timeSpent choices for evaluation document and translate them to user locale or fallback 'fr'
-time: 2025-10-30T18:09:19.373907522+01:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/UX-20251103-131554.yaml b/.changes/unreleased/UX-20251103-131554.yaml
deleted file mode 100644
index 660665b23..000000000
--- a/.changes/unreleased/UX-20251103-131554.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: UX
-body: Change the order of display for results and objectives in the social work/action form
-time: 2025-11-03T13:15:54.837971477+01:00
-custom:
-    Issue: "455"
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/UX-20251107-151736.yaml b/.changes/unreleased/UX-20251107-151736.yaml
deleted file mode 100644
index 3bf9387f6..000000000
--- a/.changes/unreleased/UX-20251107-151736.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: UX
-body: Wrap text when it is too long within badges
-time: 2025-11-07T15:17:36.104379989+01:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change
diff --git a/.changes/v4.7.0.md b/.changes/v4.7.0.md
new file mode 100644
index 000000000..48e6095fc
--- /dev/null
+++ b/.changes/v4.7.0.md
@@ -0,0 +1,21 @@
+## v4.7.0 - 2025-11-10
+### Feature
+* ([#385](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/385)) Create invitation list in user menu   
+* ([#404](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/404)) Add columns for comments linked to an activity in the activity list export   
+### Fixed
+* ([#451](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/451)) Fix: display also social actions linked to parents of the selected social issue   
+* ([#453](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/453)) Fix: export actions and their results in csv even when action does not have any goals attached to it.   
+* Fix the possibility to delete a workflow   
+
+  **Schema Change**: Drop or rename table or columns, or enforce new constraint that must be manually fixed
+* ([#457](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/457)) Fix the fusion of thirdparty properties that are located in another schema than public for TO_ONE relations + add extra loop for MANY_TO_MANY relations where thirdparty is the source instead of the target   
+* ([#428](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/428)) Fix suggestion of referrer when creating notification for accompanyingPeriodWorkDocument   
+### DX
+* Send notifications log to dedicated channel, if it exists
+   
+### UX
+* ([#425](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/425)) Change the terms 'cercle' and 'centre' to 'service', and 'territoire' respectively.   
+* ([#542](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/542)) Improve the ux for selecting whether user wants to be notified of the final step of a workflow or all steps   
+* Expand timeSpent choices for evaluation document and translate them to user locale or fallback 'fr'   
+* ([#455](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/455)) Change the order of display for results and objectives in the social work/action form   
+* Wrap text when it is too long within badges   
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4fea862c6..e684bb689 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,28 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
+## v4.7.0 - 2025-11-10
+### Feature
+* ([#385](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/385)) Create invitation list in user menu   
+* ([#404](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/404)) Add columns for comments linked to an activity in the activity list export   
+### Fixed
+* ([#451](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/451)) Fix: display also social actions linked to parents of the selected social issue   
+* ([#453](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/453)) Fix: export actions and their results in csv even when action does not have any goals attached to it.   
+* Fix the possibility to delete a workflow   
+
+  **Schema Change**: Drop or rename table or columns, or enforce new constraint that must be manually fixed
+* ([#457](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/457)) Fix the fusion of thirdparty properties that are located in another schema than public for TO_ONE relations + add extra loop for MANY_TO_MANY relations where thirdparty is the source instead of the target   
+* ([#428](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/428)) Fix suggestion of referrer when creating notification for accompanyingPeriodWorkDocument   
+### DX
+* Send notifications log to dedicated channel, if it exists
+   
+### UX
+* ([#425](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/425)) Change the terms 'cercle' and 'centre' to 'service', and 'territoire' respectively.   
+* ([#542](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/542)) Improve the ux for selecting whether user wants to be notified of the final step of a workflow or all steps   
+* Expand timeSpent choices for evaluation document and translate them to user locale or fallback 'fr'   
+* ([#455](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/455)) Change the order of display for results and objectives in the social work/action form   
+* Wrap text when it is too long within badges   
+
 ## v4.6.1 - 2025-10-27
 ### Fixed
 * Fix export case where no 'reason' is picked within the PersonHavingActivityBetweenDateFilter.php   
@@ -27,57 +49,57 @@ and is generated by [Changie](https://github.com/miniscruff/changie).
 
 ## v4.5.1 - 2025-10-03
 ### Fixed
-* Add missing javascript dependency
-* Add exception handling for conversion of attachment on sending external, when documens are already in pdf
+* Add missing javascript dependency   
+* Add exception handling for conversion of attachment on sending external, when documens are already in pdf   
 
 ## v4.5.0 - 2025-10-03
 ### Feature
-* Only allow delete of attachment on workflows that are not final
-* Move up signature buttons on index workflow page for easier access
-* Filter out document from attachment list if it is the same as the workflow document
-* Block edition on attached document on workflow, if the workflow is finalized or sent external
-* Convert workflow's attached document to pdf while sending them external
-* After a signature is canceled or rejected, going to a waiting page until the post-process routines apply a workflow transition
+* Only allow delete of attachment on workflows that are not final   
+* Move up signature buttons on index workflow page for easier access   
+* Filter out document from attachment list if it is the same as the workflow document   
+* Block edition on attached document on workflow, if the workflow is finalized or sent external   
+* Convert workflow's attached document to pdf while sending them external   
+* After a signature is canceled or rejected, going to a waiting page until the post-process routines apply a workflow transition   
 ### Fixed
-* ([#426](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/426)) Increased the number of required characters when setting a new password in Chill from 9 to 14 - GDPR compliance
-* Fix permissions on storedObject which are subject by a workflow
+* ([#426](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/426)) Increased the number of required characters when setting a new password in Chill from 9 to 14 - GDPR compliance   
+* Fix permissions on storedObject which are subject by a workflow   
 ### DX
-* Introduce a WaitingScreen component to display a waiting screen
+* Introduce a WaitingScreen component to display a waiting screen   
 
 ## v4.4.2 - 2025-09-12
 ### Fixed
-* Fix document generation and workflow generation do not work on accompanying period work documents
+* Fix document generation and workflow generation do not work on accompanying period work documents   
 
 ## v4.4.1 - 2025-09-11
 ### Fixed
-* fix translations in duplicate evaluation document modal and realign close modal button
+* fix translations in duplicate evaluation document modal and realign close modal button   
 
 ## v4.4.0 - 2025-09-11
 ### Feature
-* ([#359](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/359)) Allow the merge of two accompanying period works
-* ([#369](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/369)) Duplication of a document to another accompanying period work evaluation
-* ([#359](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/359)) Fusion of two accompanying period works
+* ([#359](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/359)) Allow the merge of two accompanying period works   
+* ([#369](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/369)) Duplication of a document to another accompanying period work evaluation   
+* ([#359](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/359)) Fusion of two accompanying period works   
 ### Fixed
-* Fix display of 'duplicate' and 'merge' buttons in CRUD templates
-* Fix saving notification preferences in user's profile
+* Fix display of 'duplicate' and 'merge' buttons in CRUD templates   
+* Fix saving notification preferences in user's profile   
 
 ## v4.3.0 - 2025-09-08
 ### Feature
-* ([#409](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/409)) Add 45 and 60 min calendar ranges
-* Add a command to generate a list of permissions
-* ([#412](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/412)) Add an absence end date
+* ([#409](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/409)) Add 45 and 60 min calendar ranges   
+* Add a command to generate a list of permissions   
+* ([#412](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/412)) Add an absence end date   
 
   **Schema Change**: Add columns or tables
 ### Fixed
-* fix date formatting in calendar range display
-* Change route URL to avoid clash with person duplicate controller method
+* fix date formatting in calendar range display   
+* Change route URL to avoid clash with person duplicate controller method   
 
 ## v4.2.1 - 2025-09-03
 ### Fixed
-* Fix exports to work with DirectExportInterface
+* Fix exports to work with DirectExportInterface   
 ### DX
 * Improve error message when a stored object cannot be written on local disk
-
+   
 
 ## v4.2.0 - 2025-09-02
 ### Feature
@@ -92,26 +114,26 @@ and is generated by [Changie](https://github.com/miniscruff/changie).
 
 ## v4.1.0 - 2025-08-26
 ### Feature
-* ([#400](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/400)) Add filter to social actions list to filter out actions where current user intervenes
-* ([#399](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/399)) Show filters on list pages unfolded by default
-* Expansion of event module with new fields in the creation form: thematic, internal/external animator, responsable, and budget elements. Filtering options in the event list + adapted exports
+* ([#400](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/400)) Add filter to social actions list to filter out actions where current user intervenes   
+* ([#399](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/399)) Show filters on list pages unfolded by default   
+* Expansion of event module with new fields in the creation form: thematic, internal/external animator, responsable, and budget elements. Filtering options in the event list + adapted exports   
 
   **Schema Change**: Add columns or tables
 ### Fixed
-* ([#382](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/382)) adjust display logic for accompanying period dates, include closing date if period is closed.
-* ([#384](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/384)) add min and step attributes to integer field in DateIntervalType
+* ([#382](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/382)) adjust display logic for accompanying period dates, include closing date if period is closed.   
+* ([#384](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/384)) add min and step attributes to integer field in DateIntervalType   
 ### UX
-* Limit display of participations in event list
+* Limit display of participations in event list   
 
 ## v4.0.2 - 2025-07-09
 ### Fixed
-* Fix add missing translation
-* Fix the transfer of evaluations and documents during of accompanyingperiodwork
+* Fix add missing translation   
+* Fix the transfer of evaluations and documents during of accompanyingperiodwork   
 
 ## v4.0.1 - 2025-07-08
 ### Fixed
 * Fix package.json for compilation
-
+   
 
 ## v4.0.0 - 2025-07-08
 ### Feature
@@ -190,30 +212,30 @@ framework:
 
 ## v3.12.1 - 2025-06-30
 ### Fixed
-* Fix loading of the list of documents
+* Fix loading of the list of documents   
 
 ## v3.12.0 - 2025-06-30
 ### Feature
-* ([#377](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/377)) Add the document file name to the document title when a user upload a document, unless there is already a document title.
-* Add desactivation date for social action and issue csv export
-* Add Emoji and Fullscreen feature to ckeditor configuration
-* ([#321](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/321)) Create editor which allow us to toggle between rich and simple text editor
-* Do not remove workflow which are automatically canceled after staling for more than 30 days
+* ([#377](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/377)) Add the document file name to the document title when a user upload a document, unless there is already a document title.   
+* Add desactivation date for social action and issue csv export   
+* Add Emoji and Fullscreen feature to ckeditor configuration   
+* ([#321](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/321)) Create editor which allow us to toggle between rich and simple text editor   
+* Do not remove workflow which are automatically canceled after staling for more than 30 days   
 ### Fixed
-* ([#376](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/376)) trying to prevent bug of typeerror in doc-history + improved display of document history
-* ([#381](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/381)) Display previous participation in acc course work even if the person has left the acc course
-* ([#372](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/372)) Fix display of text in calendar events
-* Add missing translation for user_group.no_user_groups
-* Fix admin entity edit actions for event admin entities and activity reason (category) entities
+* ([#376](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/376)) trying to prevent bug of typeerror in doc-history + improved display of document history   
+* ([#381](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/381)) Display previous participation in acc course work even if the person has left the acc course   
+* ([#372](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/372)) Fix display of text in calendar events   
+* Add missing translation for user_group.no_user_groups   
+* Fix admin entity edit actions for event admin entities and activity reason (category) entities   
 * ([#392](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/392)) Allow null and cast as string to setContent method for NewsItem
-
-* ([#393](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/393)) Doc Generation: the "dump only" method send the document as an email attachment.
+   
+* ([#393](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/393)) Doc Generation: the "dump only" method send the document as an email attachment.   
 ### DX
-* ([#352](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/352)) Remove dead code for wopi-link module
-* Replace library node-sass by sass, and upgrade bootstrap to version 5.3 (yarn upgrade / install is required)
+* ([#352](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/352)) Remove dead code for wopi-link module   
+* Replace library node-sass by sass, and upgrade bootstrap to version 5.3 (yarn upgrade / install is required)   
 ### UX
-* ([#374](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/374)) Remove default filter in_progress for the page 'my tasks'; Allows for new tasks to be displayed upon opening of the page
-* Improve labeling of fields in person resource creation form
+* ([#374](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/374)) Remove default filter in_progress for the page 'my tasks'; Allows for new tasks to be displayed upon opening of the page   
+* Improve labeling of fields in person resource creation form   
 
 ## v3.11.0 - 2025-04-17
 ### Feature
@@ -237,11 +259,11 @@ framework:
 
 ## v3.10.3 - 2025-03-18
 ### DX
-* Eslint fixes
+* Eslint fixes   
 
 ## v3.10.2 - 2025-03-17
 ### Fixed
-* Replace a ts-expect-error with a ts-ignore
+* Replace a ts-expect-error with a ts-ignore   
 
 ## v3.10.1 - 2025-03-17
 ### DX
@@ -249,37 +271,37 @@ framework:
 
 ## v3.10.0 - 2025-03-17
 ### Feature
-* ([#363](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/363)) Display social actions grouped per social issue within activity form
+* ([#363](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/363)) Display social actions grouped per social issue within activity form   
 ### Fixed
-* ([#362](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/362)) Fix Dependency Injection, which prevented to save the CalendarRange
-* ([#368](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/368)) fix search query for user groups
+* ([#362](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/362)) Fix Dependency Injection, which prevented to save the CalendarRange   
+* ([#368](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/368)) fix search query for user groups   
 
 ## v3.9.2 - 2025-02-27
 ### Fixed
-* Use fetchResults method to fetch all social issues instead of only the first page
+* Use fetchResults method to fetch all social issues instead of only the first page   
 
 ## v3.9.1 - 2025-02-27
 ### Fixed
-* Fix post/patch request with missing 'type' property for gender
+* Fix post/patch request with missing 'type' property for gender   
 
 ## v3.9.0 - 2025-02-27
 ### Feature
-* ([#349](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/349)) Suggest all referrers within actions of the accompanying period when creating an activity
-* ([#343](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/343)) Add possibility to export a csv with all social issues and social actions
-* ([#360](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/360)) Restore document to previous kept version when a workflow is canceled
-* ([#341](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/341)) Add a list of third parties from within the admin (csv download)
+* ([#349](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/349)) Suggest all referrers within actions of the accompanying period when creating an activity   
+* ([#343](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/343)) Add possibility to export a csv with all social issues and social actions   
+* ([#360](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/360)) Restore document to previous kept version when a workflow is canceled   
+* ([#341](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/341)) Add a list of third parties from within the admin (csv download)   
 ### Fixed
-* fix generation of document with accompanying period context, and list of activities and works
+* fix generation of document with accompanying period context, and list of activities and works   
 ### DX
-* ([#333](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/333)) Create an unique source of trust for translations
+* ([#333](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/333)) Create an unique source of trust for translations   
 
 ## v3.8.2 - 2025-02-10
 ### Fixed
-* ([#358](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/358)) Remove "filter" button on list of documents in the workflow's "add attachement" modal
+* ([#358](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/358)) Remove "filter" button on list of documents in the workflow's "add attachement" modal   
 
 ## v3.8.1 - 2025-02-05
 ### Fixed
-* Fix household link in the parcours banner
+* Fix household link in the parcours banner   
 
 ## v3.8.0 - 2025-02-03
 ### Feature
@@ -295,7 +317,7 @@ framework:
 
 ## v3.7.1 - 2025-01-21
 ### Fixed
-* Fix legacy configuration processor for notifier component
+* Fix legacy configuration processor for notifier component   
 
 ## v3.7.0 - 2025-01-21
 ### Feature
@@ -362,33 +384,33 @@ chill_main:
 
 ## v3.6.0 - 2025-01-16
 ### Feature
-* Importer for addresses does not fails when the postal code is not found with some addresses, and compute a recap list of all addresses that could not be imported. This recap list can be send by email.
+* Importer for addresses does not fails when the postal code is not found with some addresses, and compute a recap list of all addresses that could not be imported. This recap list can be send by email. 
 * ([#346](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/346)) Create a driver for storing documents on disk (instead of openstack object store)
-
-* Add address importer from french Base d'Adresse Nationale (BAN)
-* ([#343](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/343)) Add csv export for social issues and social actions
+ 
+* Add address importer from french Base d'Adresse Nationale (BAN) 
+* ([#343](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/343)) Add csv export for social issues and social actions 
 ### Fixed
-* Export: fix missing alias in activity between certain dates filter. Condition added for alias.
+* Export: fix missing alias in activity between certain dates filter. Condition added for alias. 
 
 ## v3.5.3 - 2025-01-07
 ### Fixed
-* Fix the EntityToJsonTransformer to return an empty array if the value is ""
+* Fix the EntityToJsonTransformer to return an empty array if the value is "" 
 
 ## v3.5.2 - 2024-12-19
 ### Fixed
-* ([#345](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/345)) Export: activity filtering of users that were associated to an activity between certain dates. Results contained activities that were not within the specified date range"
+* ([#345](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/345)) Export: activity filtering of users that were associated to an activity between certain dates. Results contained activities that were not within the specified date range" 
 
 ## v3.5.1 - 2024-12-16
 ### Fixed
-* Filiation: fix the display of the gender label in the graph
-* Wrap handling of PdfSignedMessage into transactions
+* Filiation: fix the display of the gender label in the graph 
+* Wrap handling of PdfSignedMessage into transactions 
 
 ## v3.5.0 - 2024-12-09
 ### Feature
-* ([#318](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/318)) Show all the pages of the documents in the signature app
+* ([#318](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/318)) Show all the pages of the documents in the signature app 
 ### Fixed
-* Wrap the signature's change state into a transaction, to avoid race conditions
-* Fix display of gender label
+* Wrap the signature's change state into a transaction, to avoid race conditions 
+* Fix display of gender label 
 
 ## v3.4.3 - 2024-12-05
 ### Fixed
@@ -397,76 +419,76 @@ chill_main:
 
 ## v3.4.2 - 2024-12-05
 ### Fixed
-* ([#329](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/329)) Fix the serialization of gender for the generation of documents
-* ([#337](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/337)) Enforce unique contraint on activity storedobject
+* ([#329](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/329)) Fix the serialization of gender for the generation of documents 
+* ([#337](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/337)) Enforce unique contraint on activity storedobject 
 ### DX
-* ([#310](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/310)) Clean migrations, to reduce the number of bloated migration when running diff on schema
+* ([#310](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/310)) Clean migrations, to reduce the number of bloated migration when running diff on schema 
 
 ## v3.4.1 - 2024-11-22
 ### Fixed
-* Set the workflow's title to notification content and subject
+* Set the workflow's title to notification content and subject 
 
 ## v3.4.0 - 2024-11-20
 ### Feature
 * ([#314](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/314)) Admin: improve document type admin form with a select field for related class.
-Admin: Allow administrator to assign multiple group centers in one go to a user.
+Admin: Allow administrator to assign multiple group centers in one go to a user. 
 
 ## v3.3.0 - 2024-11-20
 ### Feature
 * Electronic signature
 
-Implementation of the electronic signature for documents within chill.
-* ([#286](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/286)) The behavoir of the voters for stored objects is adjusted so as to limit edit and delete possibilities to users related to the activity, social action or workflow entity.
-* ([#288](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/288)) Metadata form added for person signatures
-* Add a signature step in workflow, which allow to apply an electronic signature on documents
-* Keep an history of each version of a stored object.
-* Add a "send external" step in workflow, which allow to send stored objects and other elements to remote people, by sending them a public url
+Implementation of the electronic signature for documents within chill. 
+* ([#286](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/286)) The behavoir of the voters for stored objects is adjusted so as to limit edit and delete possibilities to users related to the activity, social action or workflow entity. 
+* ([#288](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/288)) Metadata form added for person signatures 
+* Add a signature step in workflow, which allow to apply an electronic signature on documents 
+* Keep an history of each version of a stored object. 
+* Add a "send external" step in workflow, which allow to send stored objects and other elements to remote people, by sending them a public url 
 ### Fixed
-* Adjust household list export to include households even if their address is NULL
-* Remove validation of date string on deathDate
+* Adjust household list export to include households even if their address is NULL 
+* Remove validation of date string on deathDate 
 
 ## v3.2.4 - 2024-11-06
 ### Fixed
-* Fix compilation of chill assets
+* Fix compilation of chill assets 
 
 ## v3.2.3 - 2024-11-05
 ### Fixed
 * ([#315](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/315)) Fix display of accompanying period work referrers. Only current referrers should be displayed.
-Fix color of Chill footer
+Fix color of Chill footer 
 
 ## v3.2.2 - 2024-10-31
 ### Fixed
-* Fix gender translation for unknown
+* Fix gender translation for unknown 
 
 ## v3.2.1 - 2024-10-31
 ### Fixed
-* Add the possibility of unknown to the gender entity
-* Fix the fusion of person doubles by excluding accompanyingPeriod work entities to be deleted. They are moved instead.
+* Add the possibility of unknown to the gender entity 
+* Fix the fusion of person doubles by excluding accompanyingPeriod work entities to be deleted. They are moved instead. 
 
 ## v3.2.0 - 2024-10-30
 ### Feature
-* Introduce a gender entity
+* Introduce a gender entity 
 
 ## v3.1.1 - 2024-10-01
 ### Fixed
-* ([#308](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/308)) Show only the current referrer in the page "show" for an accompanying period workf
+* ([#308](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/308)) Show only the current referrer in the page "show" for an accompanying period workf 
 * ([#309](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/309)) Correctly compute the grouping by referrer aggregator
-
-* Fixed typing of custom field long choice and custom field group
+ 
+* Fixed typing of custom field long choice and custom field group 
 
 ## v3.1.0 - 2024-08-30
 ### Feature
-* Add export aggregator to aggregate activities by household + filter persons that are not part of an accompanyingperiod during a certain timeframe.
+* Add export aggregator to aggregate activities by household + filter persons that are not part of an accompanyingperiod during a certain timeframe. 
 
 ## v3.0.0 - 2024-08-26
 ### Fixed
-* Fix delete action for accompanying periods in draft state
-* Fix connection to azure when making an calendar event in chill
-* CollectionType js fixes for remove button and adding multiple entries
+* Fix delete action for accompanying periods in draft state 
+* Fix connection to azure when making an calendar event in chill 
+* CollectionType js fixes for remove button and adding multiple entries 
 
 ## v2.24.0 - 2024-09-11
 ### Feature
-* ([#306](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/306)) When a document is converted or downloaded in the browser, this document is removed from the browser memory after 45s. Future click on the button re-download the document.
+* ([#306](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/306)) When a document is converted or downloaded in the browser, this document is removed from the browser memory after 45s. Future click on the button re-download the document. 
 
 ## v2.23.0 - 2024-07-23 & 2024-07-19
 ### Feature
@@ -501,13 +523,13 @@ Fix color of Chill footer
 
 ## v2.22.2 - 2024-07-03
 ### Fixed
-* Remove scope required for event participation stats
+* Remove scope required for event participation stats 
 
 ## v2.22.1 - 2024-07-01
 ### Fixed
-* Remove debug word
+* Remove debug word 
 ### DX
-* Add a command for reading official address DB from Luxembourg and update chill addresses
+* Add a command for reading official address DB from Luxembourg and update chill addresses 
 
 ## v2.22.0 - 2024-06-25
 ### Feature
@@ -550,7 +572,7 @@ Fix color of Chill footer
 
 ## v2.20.1 - 2024-06-05
 ### Fixed
-* Do not allow StoredObjectCreated for edit and convert buttons
+* Do not allow StoredObjectCreated for edit and convert buttons 
 
 ## v2.20.0 - 2024-06-05
 ### Fixed
@@ -597,96 +619,96 @@ Fix color of Chill footer
 
 ## v2.18.2 - 2024-04-12
 ### Fixed
-* ([#250](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/250)) Postal codes import : fix the source URL and the keys to handle each record
+* ([#250](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/250)) Postal codes import : fix the source URL and the keys to handle each record 
 
 ## v2.18.1 - 2024-03-26
 ### Fixed
-* Fix layout issue in document generation for admin (minor)
+* Fix layout issue in document generation for admin (minor) 
 
 ## v2.18.0 - 2024-03-26
 ### Feature
-* ([#268](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/268)) Improve admin UX to configure document templates for document generation
+* ([#268](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/268)) Improve admin UX to configure document templates for document generation 
 ### Fixed
-* ([#267](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/267)) Fix the join between job and user in the user list (admin): show only the current user job
+* ([#267](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/267)) Fix the join between job and user in the user list (admin): show only the current user job 
 
 ## v2.17.0 - 2024-03-19
 ### Feature
-* ([#237](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/237)) New export filter for social actions with an evaluation created between two dates
-* ([#258](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/258)) In the list of accompangying period, add the list of person's centers and the duration of the course
-* ([#238](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/238)) Allow to customize list person with new fields
+* ([#237](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/237)) New export filter for social actions with an evaluation created between two dates 
+* ([#258](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/258)) In the list of accompangying period, add the list of person's centers and the duration of the course 
+* ([#238](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/238)) Allow to customize list person with new fields 
 * ([#159](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/159)) Admin can publish news on the homepage
 ### Fixed
-* ([#264](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/264)) Fix languages: load the languages in all availables languages configured for Chill
-* ([#259](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/259)) Keep a consistent behaviour between the filtering of activities within the document generation (model "accompanying period with activities"), and the same filter in the list of activities for an accompanying period
+* ([#264](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/264)) Fix languages: load the languages in all availables languages configured for Chill 
+* ([#259](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/259)) Keep a consistent behaviour between the filtering of activities within the document generation (model "accompanying period with activities"), and the same filter in the list of activities for an accompanying period 
 
 ## v2.16.3 - 2024-02-26
 ### Fixed
-* ([#236](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/236)) Fix translation of user job -> 'service' must be 'métier'
+* ([#236](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/236)) Fix translation of user job -> 'service' must be 'métier' 
 ### UX
-* ([#232](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/232)) Order user jobs and services alphabetically in export filters
+* ([#232](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/232)) Order user jobs and services alphabetically in export filters 
 
 ## v2.16.2 - 2024-02-21
 ### Fixed
-* Check for null values in closing motive of parcours d'accompagnement for correct rendering of template
+* Check for null values in closing motive of parcours d'accompagnement for correct rendering of template 
 
 ## v2.16.1 - 2024-02-09
 ### Fixed
-* Force bootstrap version to avoid error in builds with newer version
+* Force bootstrap version to avoid error in builds with newer version 
 
 ## v2.16.0 - 2024-02-08
 ### Feature
-* ([#231](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/231)) Create new filter for persons having a participation in an accompanying period during a certain time span
-* ([#241](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/241)) [Export][List of accompanyign period] Add two columns: the list of persons participating to the period, and their ids
-* ([#244](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/244)) Add capability to generate export about change of steps of accompanying period, and generate exports for this
-* ([#253](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/253)) Export: group accompanying period by person participating
-* ([#243](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/243)) Export: add filter for courses not linked to a reference address
-* ([#229](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/229)) Allow to group activities linked with accompanying period by reason
-* ([#115](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/115)) Prevent social work to be saved when another user edited conccurently the social work
-* Modernize the event bundle, with some new fields and multiple improvements
+* ([#231](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/231)) Create new filter for persons having a participation in an accompanying period during a certain time span 
+* ([#241](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/241)) [Export][List of accompanyign period] Add two columns: the list of persons participating to the period, and their ids 
+* ([#244](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/244)) Add capability to generate export about change of steps of accompanying period, and generate exports for this 
+* ([#253](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/253)) Export: group accompanying period by person participating 
+* ([#243](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/243)) Export: add filter for courses not linked to a reference address 
+* ([#229](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/229)) Allow to group activities linked with accompanying period by reason 
+* ([#115](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/115)) Prevent social work to be saved when another user edited conccurently the social work 
+* Modernize the event bundle, with some new fields and multiple improvements 
 ### Fixed
-* ([#220](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/220)) Fix error in logs about wrong typing of eventArgs in onEditNotificationComment method
-* ([#256](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/256)) Fix the conditions upon which social actions should be optional or required in relation to social issues within the activity creation form
+* ([#220](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/220)) Fix error in logs about wrong typing of eventArgs in onEditNotificationComment method 
+* ([#256](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/256)) Fix the conditions upon which social actions should be optional or required in relation to social issues within the activity creation form 
 ### UX
-* ([#260](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/260)) Order list of centers alphabetically in dropdown 'user' section admin.
+* ([#260](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/260)) Order list of centers alphabetically in dropdown 'user' section admin. 
 
 ## v2.15.2 - 2024-01-11
 ### Fixed
-* Fix the id_seq used when creating a new accompanying period participation during fusion of two person files
+* Fix the id_seq used when creating a new accompanying period participation during fusion of two person files 
 ### DX
-* Set placeholder to False for expanded EntityType form fields where required is set to False.
+* Set placeholder to False for expanded EntityType form fields where required is set to False. 
 
 ## v2.15.1 - 2023-12-20
 ### Fixed
-* Fix the household export query to exclude accompanying periods that are in draft state.
+* Fix the household export query to exclude accompanying periods that are in draft state. 
 ### DX
-* ([#167](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/167)) Fixed readthedocs compilation by updating readthedocs config file and requirements for Sphinx
+* ([#167](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/167)) Fixed readthedocs compilation by updating readthedocs config file and requirements for Sphinx 
 
 ## v2.15.0 - 2023-12-11
 ### Feature
-* ([#191](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/191)) Add export "number of household associate with an exchange"
-* ([#235](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/235)) Export: add dates on the filter "filter course by activity type"
+* ([#191](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/191)) Add export "number of household associate with an exchange" 
+* ([#235](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/235)) Export: add dates on the filter "filter course by activity type" 
 ### Fixed
-* ([#214](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/214)) Fix error when posting an empty comment on an accompanying period.
-* ([#233](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/233)) Fix "filter evaluation by evaluation type" (and add select2 to the list of evaluation types to pick)
+* ([#214](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/214)) Fix error when posting an empty comment on an accompanying period. 
+* ([#233](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/233)) Fix "filter evaluation by evaluation type" (and add select2 to the list of evaluation types to pick) 
 * ([#234](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/234)) Fix "filter aside activity by date"
-
-* ([#228](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/228)) Fix export of activity for people created before the introduction of the createdAt column on person (during v1)
-* ([#246](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/246)) Do not show activities, evaluations and social work when associated to a confidential accompanying period, except for the users which are allowed to see them
+ 
+* ([#228](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/228)) Fix export of activity for people created before the introduction of the createdAt column on person (during v1) 
+* ([#246](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/246)) Do not show activities, evaluations and social work when associated to a confidential accompanying period, except for the users which are allowed to see them 
 
 ## v2.14.1 - 2023-11-29
 ### Fixed
-* Export: fix list person with custom fields
-* ([#100](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/100)) Add a paginator to budget elements (resource and charge types) in the admin
-* Fix error in ListEvaluation when "handling agents" are alone
+* Export: fix list person with custom fields 
+* ([#100](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/100)) Add a paginator to budget elements (resource and charge types) in the admin 
+* Fix error in ListEvaluation when "handling agents" are alone 
 
 ## v2.14.0 - 2023-11-24
 ### Feature
-* ([#161](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/161)) Export: in filter "Filter accompanying period work (social action) by type, goal and result", order the items alphabetically or with the defined order
+* ([#161](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/161)) Export: in filter "Filter accompanying period work (social action) by type, goal and result", order the items alphabetically or with the defined order 
 ### Fixed
-* ([#141](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/141)) Export: on filter "action by type goals, and results", restore the fields when editing a saved export
-* ([#219](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/219)) Export: fix the list of accompanying period work, when the "calc date" is null
-* ([#222](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/222)) Fix rendering of custom fields
-* Fix various errors in custom fields administration
+* ([#141](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/141)) Export: on filter "action by type goals, and results", restore the fields when editing a saved export 
+* ([#219](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/219)) Export: fix the list of accompanying period work, when the "calc date" is null 
+* ([#222](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/222)) Fix rendering of custom fields 
+* Fix various errors in custom fields administration 
 
 ## v2.13.0 - 2023-11-21
 ### Feature
@@ -700,7 +722,7 @@ Fix color of Chill footer
 
 ## v2.12.1 - 2023-11-16
 ### Fixed
-* ([#208](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/208)) Export: fix loading of form for "filter action by type, goal and result"
+* ([#208](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/208)) Export: fix loading of form for "filter action by type, goal and result" 
 
 ## v2.12.0 - 2023-11-15
 ### Feature
@@ -731,36 +753,36 @@ Fix color of Chill footer
 
 ## v2.11.0 - 2023-11-07
 ### Feature
-* ([#194](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/194)) Export: add a filter "filter activity by creator job"
+* ([#194](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/194)) Export: add a filter "filter activity by creator job" 
 ### Fixed
-* ([#185](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/185)) Export: fix "group accompanying period by geographical unit": take into account the accompanying periods when the period is not located within an unit
-* Fix "group activity by creator job" aggregator
+* ([#185](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/185)) Export: fix "group accompanying period by geographical unit": take into account the accompanying periods when the period is not located within an unit 
+* Fix "group activity by creator job" aggregator 
 
 ## v2.10.6 - 2023-11-07
 ### Fixed
-* ([#182](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/182)) Fix merging of double person files. Adjustement relationship sql statement
-* ([#185](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/185)) Export: fix aggregator by geographical unit on person: avoid inconsistencies
+* ([#182](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/182)) Fix merging of double person files. Adjustement relationship sql statement 
+* ([#185](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/185)) Export: fix aggregator by geographical unit on person: avoid inconsistencies 
 
 ## v2.10.5 - 2023-11-05
 ### Fixed
-* ([#183](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/183)) Fix "problem during download" on some filters, which used a wrong data type
-* ([#184](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/184)) Fix filter "activity by date"
+* ([#183](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/183)) Fix "problem during download" on some filters, which used a wrong data type 
+* ([#184](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/184)) Fix filter "activity by date" 
 
 ## v2.10.4 - 2023-10-26
 ### Fixed
-* Fix null value constraint errors when merging relationships in doubles
+* Fix null value constraint errors when merging relationships in doubles 
 
 ## v2.10.3 - 2023-10-26
 ### Fixed
-* ([#175](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/175)) Replace old method of getting translator with injection of translatorInterface
+* ([#175](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/175)) Replace old method of getting translator with injection of translatorInterface 
 
 ## v2.10.2 - 2023-10-26
 ### Fixed
-* ([#175](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/175)) Use injection of translator instead of ->get().
+* ([#175](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/175)) Use injection of translator instead of ->get(). 
 
 ## v2.10.1 - 2023-10-24
 ### Fixed
-* Fix export controller when generating an export without any data in session
+* Fix export controller when generating an export without any data in session 
 
 ## v2.10.0 - 2023-10-24
 ### Feature
@@ -780,16 +802,16 @@ Fix color of Chill footer
 - ajout d'un filtre et regroupement par usager participant sur les échanges
 - ajout d'un regroupement: par type d'activité associé au parcours;
 - trie les filtre et regroupements par ordre alphabétique dans els exports
-- ajout d'un paramètre qui permet de désactiver le filtre par territoire dans les exports
+- ajout d'un paramètre qui permet de désactiver le filtre par centre dans les exports
 - correction de l'interface de date dans les filtres et regroupements "par statut du parcours à la date"
 
 ## v2.9.2 - 2023-10-17
 ### Fixed
-* Fix possible null values in string's entities
+* Fix possible null values in string's entities 
 
 ## v2.9.1 - 2023-10-17
 ### Fixed
-* Fix the handling of activity form when editing or creating an activity in an accompanying period with multiple centers
+* Fix the handling of activity form when editing or creating an activity in an accompanying period with multiple centers 
 
 ## v2.9.0 - 2023-10-17
 ### Feature
@@ -837,57 +859,57 @@ But if you do not need this any more, you must ensure that the configuration key
 
 ## v2.7.0 - 2023-09-27
 ### Feature
-* ([#155](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/155)) The regulation list load accompanying periods by exact postal code (address associated with postal code), and not by the content of the postal code (postal code with same code's string)
+* ([#155](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/155)) The regulation list load accompanying periods by exact postal code (address associated with postal code), and not by the content of the postal code (postal code with same code's string) 
 ### Fixed
-* ([#142](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/142)) Fix the label of filter ActivityTypeFilter to a more obvious one
-* ([#140](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/140)) [export] Fix association of filter "filter location by type" which did not appears on "list of activities"
+* ([#142](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/142)) Fix the label of filter ActivityTypeFilter to a more obvious one 
+* ([#140](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/140)) [export] Fix association of filter "filter location by type" which did not appears on "list of activities" 
 
 ## v2.6.3 - 2023-09-19
 ### Fixed
-* Remove id property from document
-mappedsuperclass
+* Remove id property from document 
+mappedsuperclass 
 
 ## v2.6.2 - 2023-09-18
 ### Fixed
-* Fix doctrine mapping of AbstractTaskPlaceEvent and SingleTaskPlaceEvent: id property moved.
+* Fix doctrine mapping of AbstractTaskPlaceEvent and SingleTaskPlaceEvent: id property moved. 
 
 ## v2.6.1 - 2023-09-14
 ### Fixed
-* Filter out active centers in exports, which uses a different PickCenterType.
+* Filter out active centers in exports, which uses a different PickCenterType. 
 
 ## v2.6.0 - 2023-09-14
 ### Feature
-* ([#133](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/133)) Add locations in Aside Activity. By default, suggest user location, otherwise a select with all locations.
-* ([#133](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/133)) Adapt Aside Activity exports: display location, filter by location, group by location
-* Use the CRUD controller for center entity + add the isActive property to be able to mask instances of Center that are no longer in use.
+* ([#133](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/133)) Add locations in Aside Activity. By default, suggest user location, otherwise a select with all locations. 
+* ([#133](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/133)) Adapt Aside Activity exports: display location, filter by location, group by location 
+* Use the CRUD controller for center entity + add the isActive property to be able to mask instances of Center that are no longer in use. 
 ### Fixed
-* ([#107](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/107)) reinstate the fusion of duplicate persons
-* Missing translation in Work Actions exports
-* Reimplement the mission type filter on tasks, only for instances that have a config parameter indicating true for this.
-* ([#135](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/135)) Corrects a typing error in 2 filters, which caused an
+* ([#107](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/107)) reinstate the fusion of duplicate persons 
+* Missing translation in Work Actions exports 
+* Reimplement the mission type filter on tasks, only for instances that have a config parameter indicating true for this. 
+* ([#135](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/135)) Corrects a typing error in 2 filters, which caused an 
 error when trying to reedit a saved export
 
-
-* ([#136](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/136)) [household] when moving a person to a sharing position to a not-sharing position on the same household on the same date, remove the previous household membership on the same household. This fix duplicate member.
+ 
+* ([#136](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/136)) [household] when moving a person to a sharing position to a not-sharing position on the same household on the same date, remove the previous household membership on the same household. This fix duplicate member. 
 * Add missing translation for comment field placeholder in repositionning household editor.
-
-* Do not send an email to creator twice when adding a comment to a notification
-* ([#107](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/107)) Fix gestion doublon functionality to work with chill bundles v2
+ 
+* Do not send an email to creator twice when adding a comment to a notification 
+* ([#107](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/107)) Fix gestion doublon functionality to work with chill bundles v2 
 ### UX
 * Uniformize badge-person in household banner (background, size)
-
+ 
 
 ## v2.5.3 - 2023-07-20
 ### Fixed
-* ([#132](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/132)) Rendez-vous documents created would appear in all documents lists of all persons with an accompanying period. Or statements are now added to the where clause to filter out documents that come from unrelated accompanying period/ or person rendez-vous.
+* ([#132](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/132)) Rendez-vous documents created would appear in all documents lists of all persons with an accompanying period. Or statements are now added to the where clause to filter out documents that come from unrelated accompanying period/ or person rendez-vous. 
 
 ## v2.5.2 - 2023-07-15
 ### Fixed
-* [Collate Address] when updating address point, do not use the point's address reference if the similarity is below the requirement for associating the address reference and the address (it uses the postcode's center instead)
+* [Collate Address] when updating address point, do not use the point's address reference if the similarity is below the requirement for associating the address reference and the address (it uses the postcode's center instead) 
 
 ## v2.5.1 - 2023-07-14
 ### Fixed
-* [collate addresses] block collating addresses to another address reference where the address reference is already the best match
+* [collate addresses] block collating addresses to another address reference where the address reference is already the best match 
 
 ## v2.5.0 - 2023-07-14
 ### Feature
@@ -960,7 +982,7 @@ error when trying to reedit a saved export
 - ajout d'un regroupement par métier des intervenants sur un parcours;
 - ajout d'un regroupement par service des intervenants sur un parcours;
 - ajout d'un regroupement par utilisateur intervenant sur un parcours
-- ajout d'un regroupement "par territoire de l'usager";
+- ajout d'un regroupement "par centre de l'usager";
 - ajout d'un filtre "par métier intervenant sur un parcours";
 - ajout d'un filtre "par service intervenant sur un parcours";
 - création d'un rôle spécifique pour voir les parcours confidentiels (et séparer de celui de la liste qui permet de ré-assigner les parcours en lot);

From f7ea7e4dbf03cd091bd281c869042da9d5e1e5be Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 12 Nov 2025 13:00:52 +0100
Subject: [PATCH 220/283] Display calendar items linked to person within search
 results

---
 .../unreleased/Feature-20251112-130016.yaml   |  6 ++++
 .../public/chill/scss/calendar-list.scss      | 18 +++++-----
 .../ChillPersonBundle/Entity/Person.php       | 23 ++++++++++++
 .../Resources/views/Entity/person.html.twig   | 36 +++++++++++++++++++
 4 files changed, 74 insertions(+), 9 deletions(-)
 create mode 100644 .changes/unreleased/Feature-20251112-130016.yaml

diff --git a/.changes/unreleased/Feature-20251112-130016.yaml b/.changes/unreleased/Feature-20251112-130016.yaml
new file mode 100644
index 000000000..d7a576dde
--- /dev/null
+++ b/.changes/unreleased/Feature-20251112-130016.yaml
@@ -0,0 +1,6 @@
+kind: Feature
+body: Display appointments (calendar items) linked to a person within the search results, like it was done for accompanying periods
+time: 2025-11-12T13:00:16.844313583+01:00
+custom:
+    Issue: "462"
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/chill/scss/calendar-list.scss b/src/Bundle/ChillCalendarBundle/Resources/public/chill/scss/calendar-list.scss
index 6fa84f15a..654d8c8c5 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/chill/scss/calendar-list.scss
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/chill/scss/calendar-list.scss
@@ -14,13 +14,13 @@ div.calendar-list {
     ul.calendar-list {
         display: inline-block;
     }
-
-    & > a.calendar-list__global {
-        display: inline-block;
-        padding: 0.2rem;
-        min-width: 2rem;
-        border: 1px solid var(--bs-chill-blue);
-        border-radius: 0.25rem;
-        text-align: center;
-    }
+}
+
+.calendar-list__global {
+    display: inline-block;
+    padding: 0.2rem;
+    min-width: 2rem;
+    border: 1px solid var(--bs-chill-blue);
+    border-radius: 0.25rem;
+    text-align: center;
 }
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php
index aa78774b6..d75a0d9df 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person.php
@@ -866,6 +866,29 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this->calendars;
     }
 
+    /**
+     * Get next calendars for this person.
+     * Only returns calendars where this person is in the persons collection and the person property is not null.
+     *
+     * @param int $limit Maximum number of calendars to return
+     *
+     * @return ReadableCollection<int, Calendar>
+     */
+    public function getNextCalendarsForPerson(int $limit = 5): ReadableCollection
+    {
+        $today = new \DateTimeImmutable('today');
+
+        $filtered = $this->calendars->filter(
+            fn (Calendar $calendar) => $calendar->getStartDate() >= $today
+                && $calendar->getPerson() === $this
+        );
+
+        $sorted = $filtered->toArray();
+        usort($sorted, fn ($a, $b) => $a->getStartDate() <=> $b->getStartDate());
+
+        return new ArrayCollection(array_slice($sorted, 0, $limit));
+    }
+
     public function getCenter(): ?Center
     {
         if (null !== $this->centerCurrent) {
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
index d8a930b40..417ff4e7b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
@@ -189,7 +189,43 @@
                     {% endfor %}
                 </li>
             {% endif %}
+
+            {% set calendars = [] %}
+            {% for c in person.getNextCalendarsForPerson(10) %}
+                {% if is_granted('CHILL_CALENDAR_CALENDAR_SEE', c) %}
+                    {% set calendars = calendars|merge([c]) %}
+                {% endif %}
+            {% endfor %}
+
+            {% if calendars|length > 0 %}
+                <div class="d-flex align-items-center justify-content-between flex-wrap gap-3 mt-3">
+                    <h5 class="mb-0">{{ 'chill_calendar.Next calendars'|trans }}</h5>
+
+                    <ul class="list-inline mb-0 d-flex flex-wrap align-items-center">
+                        {% for c in calendars %}
+                            <li class="list-inline-item">
+                                {% if is_granted('CHILL_CALENDAR_CALENDAR_EDIT', c) %}
+                                    <a href="{{ chill_path_add_return_path('chill_calendar_calendar_edit', { id: c.id }) }}">
+                            <span class="badge bg-secondary">
+                                {{ c.startDate|format_datetime('long', 'short') }}
+                            </span>
+                                    </a>
+                                {% else %}
+                                    <span class="badge bg-secondary">
+                            {{ c.startDate|format_datetime('long', 'short') }}
+                        </span>
+                                {% endif %}
+                            </li>
+                        {% endfor %}
+                    </ul>
+                    {% if is_granted('CHILL_CALENDAR_CALENDAR_SEE', person) %}
+                        <a href="{{ chill_path_add_return_path('chill_calendar_calendar_list_by_person', {'id': person.id}) }}" class="calendar-list__global"><i class="fa fa-list"></i></a>
+                    {% endif %}
+                </div>
+            {% endif %}
         </ul>
+    </div>
+    <div class="item-col">
         <ul class="record_actions">
             {% if options['customButtons']['before'] is defined %}
                 {{ options['customButtons']['before'] }}

From 869880d8f39a2169b8bba696e92cf148a1c80e5d Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 12 Nov 2025 13:08:54 +0100
Subject: [PATCH 221/283] Revert "Display calendar items linked to person
 within search results"

This reverts commit f7ea7e4dbf03cd091bd281c869042da9d5e1e5be.
---
 .../unreleased/Feature-20251112-130016.yaml   |  6 ----
 .../public/chill/scss/calendar-list.scss      | 16 ++++-----
 .../ChillPersonBundle/Entity/Person.php       | 23 ------------
 .../Resources/views/Entity/person.html.twig   | 36 -------------------
 4 files changed, 8 insertions(+), 73 deletions(-)
 delete mode 100644 .changes/unreleased/Feature-20251112-130016.yaml

diff --git a/.changes/unreleased/Feature-20251112-130016.yaml b/.changes/unreleased/Feature-20251112-130016.yaml
deleted file mode 100644
index d7a576dde..000000000
--- a/.changes/unreleased/Feature-20251112-130016.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Feature
-body: Display appointments (calendar items) linked to a person within the search results, like it was done for accompanying periods
-time: 2025-11-12T13:00:16.844313583+01:00
-custom:
-    Issue: "462"
-    SchemaChange: No schema change
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/chill/scss/calendar-list.scss b/src/Bundle/ChillCalendarBundle/Resources/public/chill/scss/calendar-list.scss
index 654d8c8c5..6fa84f15a 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/chill/scss/calendar-list.scss
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/chill/scss/calendar-list.scss
@@ -14,13 +14,13 @@ div.calendar-list {
     ul.calendar-list {
         display: inline-block;
     }
-}
 
-.calendar-list__global {
-    display: inline-block;
-    padding: 0.2rem;
-    min-width: 2rem;
-    border: 1px solid var(--bs-chill-blue);
-    border-radius: 0.25rem;
-    text-align: center;
+    & > a.calendar-list__global {
+        display: inline-block;
+        padding: 0.2rem;
+        min-width: 2rem;
+        border: 1px solid var(--bs-chill-blue);
+        border-radius: 0.25rem;
+        text-align: center;
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php
index d75a0d9df..aa78774b6 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person.php
@@ -866,29 +866,6 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this->calendars;
     }
 
-    /**
-     * Get next calendars for this person.
-     * Only returns calendars where this person is in the persons collection and the person property is not null.
-     *
-     * @param int $limit Maximum number of calendars to return
-     *
-     * @return ReadableCollection<int, Calendar>
-     */
-    public function getNextCalendarsForPerson(int $limit = 5): ReadableCollection
-    {
-        $today = new \DateTimeImmutable('today');
-
-        $filtered = $this->calendars->filter(
-            fn (Calendar $calendar) => $calendar->getStartDate() >= $today
-                && $calendar->getPerson() === $this
-        );
-
-        $sorted = $filtered->toArray();
-        usort($sorted, fn ($a, $b) => $a->getStartDate() <=> $b->getStartDate());
-
-        return new ArrayCollection(array_slice($sorted, 0, $limit));
-    }
-
     public function getCenter(): ?Center
     {
         if (null !== $this->centerCurrent) {
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
index 417ff4e7b..d8a930b40 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
@@ -189,43 +189,7 @@
                     {% endfor %}
                 </li>
             {% endif %}
-
-            {% set calendars = [] %}
-            {% for c in person.getNextCalendarsForPerson(10) %}
-                {% if is_granted('CHILL_CALENDAR_CALENDAR_SEE', c) %}
-                    {% set calendars = calendars|merge([c]) %}
-                {% endif %}
-            {% endfor %}
-
-            {% if calendars|length > 0 %}
-                <div class="d-flex align-items-center justify-content-between flex-wrap gap-3 mt-3">
-                    <h5 class="mb-0">{{ 'chill_calendar.Next calendars'|trans }}</h5>
-
-                    <ul class="list-inline mb-0 d-flex flex-wrap align-items-center">
-                        {% for c in calendars %}
-                            <li class="list-inline-item">
-                                {% if is_granted('CHILL_CALENDAR_CALENDAR_EDIT', c) %}
-                                    <a href="{{ chill_path_add_return_path('chill_calendar_calendar_edit', { id: c.id }) }}">
-                            <span class="badge bg-secondary">
-                                {{ c.startDate|format_datetime('long', 'short') }}
-                            </span>
-                                    </a>
-                                {% else %}
-                                    <span class="badge bg-secondary">
-                            {{ c.startDate|format_datetime('long', 'short') }}
-                        </span>
-                                {% endif %}
-                            </li>
-                        {% endfor %}
-                    </ul>
-                    {% if is_granted('CHILL_CALENDAR_CALENDAR_SEE', person) %}
-                        <a href="{{ chill_path_add_return_path('chill_calendar_calendar_list_by_person', {'id': person.id}) }}" class="calendar-list__global"><i class="fa fa-list"></i></a>
-                    {% endif %}
-                </div>
-            {% endif %}
         </ul>
-    </div>
-    <div class="item-col">
         <ul class="record_actions">
             {% if options['customButtons']['before'] is defined %}
                 {{ options['customButtons']['before'] }}

From 635efd6f1d35bbac3665c1207ccad9ccaa4da53f Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 12 Nov 2025 17:01:09 +0100
Subject: [PATCH 222/283] Update calendar with accepted invites

---
 .../unreleased/Fixed-20251112-170025.yaml     |  6 +++
 .../Controller/CalendarAPIController.php      | 39 ++++++++++++---
 .../Repository/InviteRepository.php           | 47 +++++++++++++++++++
 3 files changed, 85 insertions(+), 7 deletions(-)
 create mode 100644 .changes/unreleased/Fixed-20251112-170025.yaml

diff --git a/.changes/unreleased/Fixed-20251112-170025.yaml b/.changes/unreleased/Fixed-20251112-170025.yaml
new file mode 100644
index 000000000..6808564b5
--- /dev/null
+++ b/.changes/unreleased/Fixed-20251112-170025.yaml
@@ -0,0 +1,6 @@
+kind: Fixed
+body: Display calendar items for which an invite was accepted on the mes rendez-vous page
+time: 2025-11-12T17:00:25.58946528+01:00
+custom:
+    Issue: "463"
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillCalendarBundle/Controller/CalendarAPIController.php b/src/Bundle/ChillCalendarBundle/Controller/CalendarAPIController.php
index eb5812b4d..d3919d3a3 100644
--- a/src/Bundle/ChillCalendarBundle/Controller/CalendarAPIController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarAPIController.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\CalendarBundle\Controller;
 
 use Chill\CalendarBundle\Repository\CalendarRepository;
+use Chill\CalendarBundle\Repository\InviteRepository;
 use Chill\MainBundle\CRUD\Controller\ApiController;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Serializer\Model\Collection;
@@ -23,7 +24,10 @@ use Symfony\Component\Routing\Annotation\Route;
 
 class CalendarAPIController extends ApiController
 {
-    public function __construct(private readonly CalendarRepository $calendarRepository) {}
+    public function __construct(
+        private readonly CalendarRepository $calendarRepository,
+        private readonly InviteRepository $inviteRepository,
+    ) {}
 
     #[Route(path: '/api/1.0/calendar/calendar/by-user/{id}.{_format}', name: 'chill_api_single_calendar_list_by-user', requirements: ['_format' => 'json'])]
     public function listByUser(User $user, Request $request, string $_format): JsonResponse
@@ -52,16 +56,37 @@ class CalendarAPIController extends ApiController
             throw new BadRequestHttpException('dateTo not parsable');
         }
 
-        $total = $this->calendarRepository->countByUser($user, $dateFrom, $dateTo);
-        $paginator = $this->getPaginatorFactory()->create($total);
-        $ranges = $this->calendarRepository->findByUser(
+        // Get calendar items where user is the main user
+        $ownCalendars = $this->calendarRepository->findByUser(
             $user,
             $dateFrom,
-            $dateTo,
-            $paginator->getItemsPerPage(),
-            $paginator->getCurrentPageFirstItemNumber()
+            $dateTo
         );
 
+        // Get calendar items from accepted invites
+        $acceptedInvites = $this->inviteRepository->findAcceptedInvitesByUserAndDateRange($user, $dateFrom, $dateTo);
+        $inviteCalendars = array_map(fn ($invite) => $invite->getCalendar(), $acceptedInvites);
+
+        // Merge
+        $allCalendars = array_merge($ownCalendars, $inviteCalendars);
+        $uniqueCalendars = [];
+        $seenIds = [];
+
+        foreach ($allCalendars as $calendar) {
+            $id = $calendar->getId();
+            if (!in_array($id, $seenIds, true)) {
+                $seenIds[] = $id;
+                $uniqueCalendars[] = $calendar;
+            }
+        }
+
+        $total = count($uniqueCalendars);
+        $paginator = $this->getPaginatorFactory()->create($total);
+
+        $offset = $paginator->getCurrentPageFirstItemNumber();
+        $limit = $paginator->getItemsPerPage();
+        $ranges = array_slice($uniqueCalendars, $offset, $limit);
+
         $collection = new Collection($ranges, $paginator);
 
         return $this->json($collection, Response::HTTP_OK, [], ['groups' => ['calendar:light']]);
diff --git a/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php b/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php
index 6cb34738c..8fe28f500 100644
--- a/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php
+++ b/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\CalendarBundle\Repository;
 
 use Chill\CalendarBundle\Entity\Invite;
+use Chill\MainBundle\Entity\User;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\Persistence\ObjectRepository;
@@ -51,6 +52,52 @@ class InviteRepository implements ObjectRepository
         return $this->entityRepository->findOneBy($criteria);
     }
 
+    /**
+     * Find accepted invites for a user within a date range.
+     *
+     * @return array|Invite[]
+     */
+    public function findAcceptedInvitesByUserAndDateRange(User $user, \DateTimeImmutable $from, \DateTimeImmutable $to): array
+    {
+        return $this->buildAcceptedInviteByUserAndDateRangeQuery($user, $from, $to)
+            ->getQuery()
+            ->getResult();
+    }
+
+    /**
+     * Count accepted invites for a user within a date range.
+     */
+    public function countAcceptedInvitesByUserAndDateRange(User $user, \DateTimeImmutable $from, \DateTimeImmutable $to): int
+    {
+        return $this->buildAcceptedInviteByUserAndDateRangeQuery($user, $from, $to)
+            ->select('COUNT(c)')
+            ->getQuery()
+            ->getSingleScalarResult();
+    }
+
+    public function buildAcceptedInviteByUserAndDateRangeQuery(User $user, \DateTimeImmutable $from, \DateTimeImmutable $to)
+    {
+        $qb = $this->entityRepository->createQueryBuilder('i');
+
+        return $qb
+            ->join('i.calendar', 'c')
+            ->where(
+                $qb->expr()->andX(
+                    $qb->expr()->eq('i.user', ':user'),
+                    $qb->expr()->eq('i.status', ':status'),
+                    $qb->expr()->gte('c.startDate', ':startDate'),
+                    $qb->expr()->lte('c.endDate', ':endDate'),
+                    $qb->expr()->isNull('c.cancelReason')
+                )
+            )
+            ->setParameters([
+                'user' => $user,
+                'status' => Invite::ACCEPTED,
+                'startDate' => $from,
+                'endDate' => $to,
+            ]);
+    }
+
     public function getClassName(): string
     {
         return Invite::class;

From 82f347b93aa29ee69870ba1953bcec8bd2464bc7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 14 Nov 2025 10:16:08 +0000
Subject: [PATCH 223/283] Improve accessibility on the login page

---
 .changes/unreleased/Fixed-20251113-120125.yaml             | 7 +++++++
 .../Resources/views/Login/_login-logo.html.twig            | 2 +-
 .../ChillMainBundle/Resources/views/Login/login.html.twig  | 6 +++---
 src/Bundle/ChillMainBundle/translations/messages.fr.yml    | 3 +++
 4 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 .changes/unreleased/Fixed-20251113-120125.yaml

diff --git a/.changes/unreleased/Fixed-20251113-120125.yaml b/.changes/unreleased/Fixed-20251113-120125.yaml
new file mode 100644
index 000000000..a9bfc78ad
--- /dev/null
+++ b/.changes/unreleased/Fixed-20251113-120125.yaml
@@ -0,0 +1,7 @@
+kind: Fixed
+body: |
+    Improve accessibility on login page
+time: 2025-11-13T12:01:25.488478771+01:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Login/_login-logo.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Login/_login-logo.html.twig
index 751165357..6c5d06de7 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Login/_login-logo.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Login/_login-logo.html.twig
@@ -1 +1 @@
-<img class="logo" src="{{ asset('build/images/logo-chill-outil-accompagnement_white.png') }}">
\ No newline at end of file
+<img class="logo" alt="{{ 'login_page.logo_alt'|trans }}" src="{{ asset('build/images/logo-chill-outil-accompagnement_white.png') }}">
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Login/login.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Login/login.html.twig
index 8a636a8cd..4edbc19f5 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Login/login.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Login/login.html.twig
@@ -16,7 +16,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
 #}
 <!DOCTYPE html>
-<html>
+<html lang="{{ app.request.locale }}">
     <head>
         <meta charset="UTF-8" />
         <title>
@@ -35,10 +35,10 @@
 
             <form method="POST" action="{{ path('login_check') }}">
                 <label for="_username">{{ 'Username'|trans }}</label>
-                <input type="text" name="_username" value="{{ last_username }}" />
+                <input type="text" name="_username" value="{{ last_username }}" id="_username" />
                 <br/>
                 <label for="_password">{{ 'Password'|trans }}</label>
-                <input type="password" name="_password" />
+                <input type="password" name="_password" id="_password" />
                 <input type="hidden" name="_csrf_token" value="{{ csrf_token('authenticate') }}" />
                 <br/>
                 <button type="submit" name="login">{{ 'Login'|trans }}</button>
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index 797aa6383..de0027dd7 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -975,3 +975,6 @@ multiselect:
 editor:
     switch_to_simple: Éditeur simple
     switch_to_complex: Éditeur riche
+
+login_page:
+    logo_alt: "Logo de Chill"

From 799d04142e90da63b417e646b62c4bf4202f8601 Mon Sep 17 00:00:00 2001
From: LenaertsJ <julie.lenaerts@champs-libres.coop>
Date: Fri, 14 Nov 2025 13:52:33 +0000
Subject: [PATCH 224/283] Ajouter une variable de localisation aux utilisateurs

---
 config/packages/chill.yaml                    |  2 +-
 .../Service/Messenger/OnGenerationFails.php   | 22 +++++
 .../Messenger/RequestGenerationHandler.php    | 27 ++++++
 .../UpdateProfile/UpdateProfileCommand.php    |  5 +-
 .../UpdateProfileCommandHandler.php           |  1 +
 src/Bundle/ChillMainBundle/Entity/User.php    | 15 +++-
 .../Form/Type/UserLocaleType.php              | 43 ++++++++++
 .../Form/UpdateProfileType.php                |  2 +
 .../Notification/Email/NotificationMailer.php | 85 ++++++++++++++++++-
 ....fr.md.twig => email_daily_digest.md.twig} |  0
 ...l_non_system_notification_content.md.twig} |  2 +-
 ...tem_notification_content_to_email.md.twig} |  0
 ...mail_notification_comment_persist.md.twig} |  2 +-
 .../Resources/views/User/profile.html.twig    |  1 +
 ...n_transition_completed_content.fr.txt.twig | 12 +--
 ..._on_transition_completed_title.fr.txt.twig |  4 +-
 .../PasswordRecover/RecoverPasswordHelper.php | 22 ++++-
 .../NotificationToUserGroupsOnTransition.php  | 21 +++++
 .../ChillMainBundle/config/services/form.yaml |  6 ++
 .../migrations/Version20251022140718.php      | 33 +++++++
 .../translations/messages.fr.yml              | 32 ++++++-
 .../translations/messages.nl.yml              | 19 +++++
 22 files changed, 337 insertions(+), 19 deletions(-)
 create mode 100644 src/Bundle/ChillMainBundle/Form/Type/UserLocaleType.php
 rename src/Bundle/ChillMainBundle/Resources/views/Notification/{email_daily_digest.fr.md.twig => email_daily_digest.md.twig} (100%)
 rename src/Bundle/ChillMainBundle/Resources/views/Notification/{email_non_system_notification_content.fr.md.twig => email_non_system_notification_content.md.twig} (88%)
 rename src/Bundle/ChillMainBundle/Resources/views/Notification/{email_non_system_notification_content_to_email.fr.md.twig => email_non_system_notification_content_to_email.md.twig} (100%)
 rename src/Bundle/ChillMainBundle/Resources/views/Notification/{email_notification_comment_persist.fr.md.twig => email_notification_comment_persist.md.twig} (87%)
 create mode 100644 src/Bundle/ChillMainBundle/migrations/Version20251022140718.php

diff --git a/config/packages/chill.yaml b/config/packages/chill.yaml
index 0f5aa08b7..26f91feb5 100644
--- a/config/packages/chill.yaml
+++ b/config/packages/chill.yaml
@@ -1,5 +1,5 @@
 chill_main:
-    available_languages: [ '%env(resolve:LOCALE)%', 'en' ]
+    available_languages: [ '%env(resolve:LOCALE)%', 'en', 'nl' ]
     available_countries: ['BE', 'FR']
     top_banner:
         visible: false
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/OnGenerationFails.php b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/OnGenerationFails.php
index b9d538a63..a950b88c0 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/OnGenerationFails.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/OnGenerationFails.php
@@ -25,6 +25,8 @@ use Symfony\Component\Mailer\MailerInterface;
 use Symfony\Component\Messenger\Event\WorkerMessageFailedEvent;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
+// use Symfony\Component\Translation\LocaleSwitcher;
+
 /**
  * @see OnGenerationFailsTest for test suite
  */
@@ -40,6 +42,7 @@ final readonly class OnGenerationFails implements EventSubscriberInterface
         private StoredObjectRepositoryInterface $storedObjectRepository,
         private TranslatorInterface $translator,
         private UserRepositoryInterface $userRepository,
+        // private LocaleSwitcher $localeSwitcher,
     ) {}
 
     public static function getSubscribedEvents()
@@ -118,6 +121,25 @@ final readonly class OnGenerationFails implements EventSubscriberInterface
             return;
         }
 
+        // Implementation with LocaleSwitcher (commented out - to be activated after migration to sf7.2):
+        /*
+        $this->localeSwitcher->runWithLocale($creator->getLocale(), function () use ($message, $errors, $template, $creator) {
+            $email = (new TemplatedEmail())
+                ->to($message->getSendResultToEmail())
+                ->subject($this->translator->trans('docgen.failure_email.The generation of a document failed'))
+                ->textTemplate('@ChillDocGenerator/Email/on_generation_failed_email.txt.twig')
+                ->context([
+                    'errors' => $errors,
+                    'template' => $template,
+                    'creator' => $creator,
+                    'stored_object_id' => $message->getDestinationStoredObjectId(),
+                ]);
+
+            $this->mailer->send($email);
+        });
+        */
+
+        // Current implementation:
         $email = (new TemplatedEmail())
             ->to($message->getSendResultToEmail())
             ->subject($this->translator->trans('docgen.failure_email.The generation of a document failed'))
diff --git a/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php
index 9dd20af91..a67f5a68f 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Service/Messenger/RequestGenerationHandler.php
@@ -27,6 +27,8 @@ use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
+// use Symfony\Component\Translation\LocaleSwitcher;
+
 /**
  * Handle the request of document generation.
  */
@@ -46,6 +48,7 @@ class RequestGenerationHandler implements MessageHandlerInterface
         private readonly MailerInterface $mailer,
         private readonly TranslatorInterface $translator,
         private readonly StoredObjectManagerInterface $storedObjectManager,
+        // private readonly LocaleSwitcher $localeSwitcher,
     ) {}
 
     public function __invoke(RequestGenerationMessage $message)
@@ -122,6 +125,30 @@ class RequestGenerationHandler implements MessageHandlerInterface
 
     private function sendDataDump(StoredObject $destinationStoredObject, RequestGenerationMessage $message): void
     {
+        // Implementation with LocaleSwitcher (commented out - to be activated after migration to sf7.2):
+        // Note: This method sends emails to admin addresses, not user addresses, so locale switching may not be needed
+        /*
+        $this->localeSwitcher->runWithLocale('fr', function () use ($destinationStoredObject, $message) {
+            // Get the content of the document
+            $content = $this->storedObjectManager->read($destinationStoredObject);
+            $filename = $destinationStoredObject->getFilename();
+            $contentType = $destinationStoredObject->getType();
+
+            // Create the email with the document as an attachment
+            $email = (new TemplatedEmail())
+                ->to($message->getSendResultToEmail())
+                ->textTemplate('@ChillDocGenerator/Email/send_data_dump_to_admin.txt.twig')
+                ->context([
+                    'filename' => $filename,
+                ])
+                ->subject($this->translator->trans('docgen.data_dump_email.subject'))
+                ->attach($content, $filename, $contentType);
+
+            $this->mailer->send($email);
+        });
+        */
+
+        // Current implementation:
         // Get the content of the document
         $content = $this->storedObjectManager->read($destinationStoredObject);
         $filename = $destinationStoredObject->getFilename();
diff --git a/src/Bundle/ChillMainBundle/Action/User/UpdateProfile/UpdateProfileCommand.php b/src/Bundle/ChillMainBundle/Action/User/UpdateProfile/UpdateProfileCommand.php
index f0751cb58..061f8e55a 100644
--- a/src/Bundle/ChillMainBundle/Action/User/UpdateProfile/UpdateProfileCommand.php
+++ b/src/Bundle/ChillMainBundle/Action/User/UpdateProfile/UpdateProfileCommand.php
@@ -15,6 +15,7 @@ use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Notification\NotificationFlagManager;
 use Chill\MainBundle\Validation\Constraint\PhonenumberConstraint;
 use libphonenumber\PhoneNumber;
+use Symfony\Component\Validator\Constraints as Assert;
 
 final class UpdateProfileCommand
 {
@@ -23,11 +24,13 @@ final class UpdateProfileCommand
     public function __construct(
         #[PhonenumberConstraint]
         public ?PhoneNumber $phonenumber,
+        #[Assert\Choice(choices: ['fr', 'nl'], message: 'Locale must be either "fr" or "nl"')]
+        public string $locale = 'fr',
     ) {}
 
     public static function create(User $user, NotificationFlagManager $flagManager): self
     {
-        $updateProfileCommand = new self($user->getPhonenumber());
+        $updateProfileCommand = new self($user->getPhonenumber(), $user->getLocale());
 
         foreach ($flagManager->getAllNotificationFlagProviders() as $provider) {
             $updateProfileCommand->setNotificationFlag(
diff --git a/src/Bundle/ChillMainBundle/Action/User/UpdateProfile/UpdateProfileCommandHandler.php b/src/Bundle/ChillMainBundle/Action/User/UpdateProfile/UpdateProfileCommandHandler.php
index 4c46e686e..08684b8c6 100644
--- a/src/Bundle/ChillMainBundle/Action/User/UpdateProfile/UpdateProfileCommandHandler.php
+++ b/src/Bundle/ChillMainBundle/Action/User/UpdateProfile/UpdateProfileCommandHandler.php
@@ -18,6 +18,7 @@ final readonly class UpdateProfileCommandHandler
     public function updateProfile(User $user, UpdateProfileCommand $command): void
     {
         $user->setPhonenumber($command->phonenumber);
+        $user->setLocale($command->locale);
 
         foreach ($command->notificationFlags as $flag => $values) {
             $user->setNotificationImmediately($flag, $values['immediate_email']);
diff --git a/src/Bundle/ChillMainBundle/Entity/User.php b/src/Bundle/ChillMainBundle/Entity/User.php
index 70b032238..b5539aa83 100644
--- a/src/Bundle/ChillMainBundle/Entity/User.php
+++ b/src/Bundle/ChillMainBundle/Entity/User.php
@@ -128,6 +128,12 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter
     #[ORM\Column(type: \Doctrine\DBAL\Types\Types::JSON, nullable: false, options: ['default' => '[]', 'jsonb' => true])]
     private array $notificationFlags = [];
 
+    /**
+     * User's preferred locale.
+     */
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, length: 5, nullable: false, options: ['default' => 'fr'])]
+    private string $locale = 'fr';
+
     /**
      * User constructor.
      */
@@ -716,7 +722,14 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter
 
     public function getLocale(): string
     {
-        return 'fr';
+        return $this->locale;
+    }
+
+    public function setLocale(string $locale): self
+    {
+        $this->locale = $locale;
+
+        return $this;
     }
 
     #[Assert\Callback]
diff --git a/src/Bundle/ChillMainBundle/Form/Type/UserLocaleType.php b/src/Bundle/ChillMainBundle/Form/Type/UserLocaleType.php
new file mode 100644
index 000000000..8e9c7fa62
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Form/Type/UserLocaleType.php
@@ -0,0 +1,43 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Form\Type;
+
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Intl\Languages;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class UserLocaleType extends AbstractType
+{
+    public function __construct(private readonly array $availableLanguages) {}
+
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $choices = [];
+        foreach ($this->availableLanguages as $languageCode) {
+            $choices[Languages::getName($languageCode)] = $languageCode;
+        }
+
+        $resolver->setDefaults([
+            'choices' => $choices,
+            'placeholder' => 'user.locale.placeholder',
+            'required' => true,
+            'label' => 'user.locale.label',
+            'help' => 'user.locale.help',
+        ]);
+    }
+
+    public function getParent(): string
+    {
+        return ChoiceType::class;
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/Form/UpdateProfileType.php b/src/Bundle/ChillMainBundle/Form/UpdateProfileType.php
index 6aa8f0943..3806facb9 100644
--- a/src/Bundle/ChillMainBundle/Form/UpdateProfileType.php
+++ b/src/Bundle/ChillMainBundle/Form/UpdateProfileType.php
@@ -14,6 +14,7 @@ namespace Chill\MainBundle\Form;
 use Chill\MainBundle\Action\User\UpdateProfile\UpdateProfileCommand;
 use Chill\MainBundle\Form\Type\ChillPhoneNumberType;
 use Chill\MainBundle\Form\Type\NotificationFlagsType;
+use Chill\MainBundle\Form\Type\UserLocaleType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
@@ -26,6 +27,7 @@ class UpdateProfileType extends AbstractType
             ->add('phonenumber', ChillPhoneNumberType::class, [
                 'required' => false,
             ])
+            ->add('locale', UserLocaleType::class)
             ->add('notificationFlags', NotificationFlagsType::class)
         ;
     }
diff --git a/src/Bundle/ChillMainBundle/Notification/Email/NotificationMailer.php b/src/Bundle/ChillMainBundle/Notification/Email/NotificationMailer.php
index 2f888ffd5..1cb64ff4a 100644
--- a/src/Bundle/ChillMainBundle/Notification/Email/NotificationMailer.php
+++ b/src/Bundle/ChillMainBundle/Notification/Email/NotificationMailer.php
@@ -24,6 +24,8 @@ use Symfony\Component\Mime\Email;
 use Symfony\Component\Messenger\MessageBusInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
+// use Symfony\Component\Translation\LocaleSwitcher;
+
 readonly class NotificationMailer
 {
     public function __construct(
@@ -31,6 +33,7 @@ readonly class NotificationMailer
         private LoggerInterface $logger,
         private MessageBusInterface $messageBus,
         private TranslatorInterface $translator,
+        // private LocaleSwitcher $localeSwitcher,
     ) {}
 
     public function postPersistComment(NotificationComment $comment, PostPersistEventArgs $eventArgs): void
@@ -56,7 +59,7 @@ readonly class NotificationMailer
             $email
                 ->to($dest->getEmail())
                 ->subject('Re: '.$comment->getNotification()->getTitle())
-                ->textTemplate('@ChillMain/Notification/email_notification_comment_persist.fr.md.twig')
+                ->textTemplate('@ChillMain/Notification/email_notification_comment_persist.md.twig')
                 ->context([
                     'comment' => $comment,
                     'dest' => $dest,
@@ -137,13 +140,53 @@ readonly class NotificationMailer
             return;
         }
 
+        // Implementation with LocaleSwitcher (commented out - to be activated after migration to sf7.2):
+        /*
+        $this->localeSwitcher->runWithLocale($addressee->getLocale(), function () use ($notification, $addressee) {
+            if ($notification->isSystem()) {
+                $email = new Email();
+                $email->text($notification->getMessage());
+            } else {
+                $email = new TemplatedEmail();
+                $email
+                    ->textTemplate('@ChillMain/Notification/email_non_system_notification_content.md.twig')
+                    ->context([
+                        'notification' => $notification,
+                        'dest' => $addressee,
+                    ]);
+            }
+
+            $email
+                ->subject($notification->getTitle())
+                ->to($addressee->getEmail());
+
+            try {
+                $this->mailer->send($email);
+                $this->logger->info('[NotificationMailer] Email sent successfully', [
+                    'notification_id' => $notification->getId(),
+                    'addressee_email' => $addressee->getEmail(),
+                    'locale' => $addressee->getLocale(),
+                ]);
+            } catch (TransportExceptionInterface $e) {
+                $this->logger->warning('[NotificationMailer] Could not send an email notification', [
+                    'to' => $addressee->getEmail(),
+                    'notification_id' => $notification->getId(),
+                    'error_message' => $e->getMessage(),
+                    'error_trace' => $e->getTraceAsString(),
+                ]);
+                throw $e;
+            }
+        });
+        */
+
+        // Current implementation:
         if ($notification->isSystem()) {
             $email = new Email();
             $email->text($notification->getMessage());
         } else {
             $email = new TemplatedEmail();
             $email
-                ->textTemplate('@ChillMain/Notification/email_non_system_notification_content.fr.md.twig')
+                ->textTemplate('@ChillMain/Notification/email_non_system_notification_content.md.twig')
                 ->context([
                     'notification' => $notification,
                     'dest' => $addressee,
@@ -182,9 +225,43 @@ readonly class NotificationMailer
             return;
         }
 
+        // Implementation with LocaleSwitcher (commented out - to be activated after migration to sf7.2):
+        /*
+        $this->localeSwitcher->runWithLocale($user->getLocale(), function () use ($user, $notifications) {
+            $email = new TemplatedEmail();
+            $email
+                ->htmlTemplate('@ChillMain/Notification/email_daily_digest.md.twig')
+                ->context([
+                    'user' => $user,
+                    'notifications' => $notifications,
+                    'notification_count' => count($notifications),
+                ])
+                ->subject($this->translator->trans('notification.Daily Notification Digest'))
+                ->to($user->getEmail());
+
+            try {
+                $this->mailer->send($email);
+                $this->logger->info('[NotificationMailer] Daily digest email sent successfully', [
+                    'user_email' => $user->getEmail(),
+                    'notification_count' => count($notifications),
+                    'locale' => $user->getLocale(),
+                ]);
+            } catch (TransportExceptionInterface $e) {
+                $this->logger->warning('[NotificationMailer] Could not send daily digest email', [
+                    'to' => $user->getEmail(),
+                    'notification_count' => count($notifications),
+                    'error_message' => $e->getMessage(),
+                    'error_trace' => $e->getTraceAsString(),
+                ]);
+                throw $e;
+            }
+        });
+        */
+
+        // Current implementation:
         $email = new TemplatedEmail();
         $email
-            ->htmlTemplate('@ChillMain/Notification/email_daily_digest.fr.md.twig')
+            ->htmlTemplate('@ChillMain/Notification/email_daily_digest.md.twig')
             ->context([
                 'user' => $user,
                 'notifications' => $notifications,
@@ -222,7 +299,7 @@ readonly class NotificationMailer
 
             $email = new TemplatedEmail();
             $email
-                ->textTemplate('@ChillMain/Notification/email_non_system_notification_content_to_email.fr.md.twig')
+                ->textTemplate('@ChillMain/Notification/email_non_system_notification_content_to_email.md.twig')
                 ->context([
                     'notification' => $notification,
                     'dest' => $emailAddress,
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/email_daily_digest.fr.md.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/email_daily_digest.md.twig
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/views/Notification/email_daily_digest.fr.md.twig
rename to src/Bundle/ChillMainBundle/Resources/views/Notification/email_daily_digest.md.twig
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/email_non_system_notification_content.fr.md.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/email_non_system_notification_content.md.twig
similarity index 88%
rename from src/Bundle/ChillMainBundle/Resources/views/Notification/email_non_system_notification_content.fr.md.twig
rename to src/Bundle/ChillMainBundle/Resources/views/Notification/email_non_system_notification_content.md.twig
index 62e41860b..023f2901a 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Notification/email_non_system_notification_content.fr.md.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/email_non_system_notification_content.md.twig
@@ -14,7 +14,7 @@
 
 Vous pouvez visualiser la notification et y répondre ici:
 
-{{ absolute_url(path('chill_main_notification_show', {'_locale': 'fr', 'id': notification.id }, false)) }}
+{{ absolute_url(path('chill_main_notification_show', {'_locale': dest.locale, 'id': notification.id }, false)) }}
 
 --
 Le logiciel Chill
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/email_non_system_notification_content_to_email.fr.md.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/email_non_system_notification_content_to_email.md.twig
similarity index 100%
rename from src/Bundle/ChillMainBundle/Resources/views/Notification/email_non_system_notification_content_to_email.fr.md.twig
rename to src/Bundle/ChillMainBundle/Resources/views/Notification/email_non_system_notification_content_to_email.md.twig
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Notification/email_notification_comment_persist.fr.md.twig b/src/Bundle/ChillMainBundle/Resources/views/Notification/email_notification_comment_persist.md.twig
similarity index 87%
rename from src/Bundle/ChillMainBundle/Resources/views/Notification/email_notification_comment_persist.fr.md.twig
rename to src/Bundle/ChillMainBundle/Resources/views/Notification/email_notification_comment_persist.md.twig
index b1244da39..e7e212492 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Notification/email_notification_comment_persist.fr.md.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/email_notification_comment_persist.md.twig
@@ -13,7 +13,7 @@ Commentaire:
 
 Vous pouvez visualiser la notification et y répondre ici:
 
-{{ absolute_url(path('chill_main_notification_show', {'_locale': 'fr', 'id': comment.notification.id }, false)) }}
+{{ absolute_url(path('chill_main_notification_show', {'_locale': dest.locale, 'id': comment.notification.id }, false)) }}
 
 --
 Le logiciel Chill
diff --git a/src/Bundle/ChillMainBundle/Resources/views/User/profile.html.twig b/src/Bundle/ChillMainBundle/Resources/views/User/profile.html.twig
index 0b268af03..266f75115 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/User/profile.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/User/profile.html.twig
@@ -44,6 +44,7 @@
         <div>
             {{ form_start(form) }}
             {{ form_row(form.phonenumber) }}
+            {{ form_row(form.locale) }}
 
             <h2 class="mb-4">{{ 'user.profile.notification_preferences'|trans }}</h2>
             <table class="table table-striped align-middle">
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/workflow_notification_on_transition_completed_content.fr.txt.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/workflow_notification_on_transition_completed_content.fr.txt.twig
index 03ddad84f..2b4beb42b 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Workflow/workflow_notification_on_transition_completed_content.fr.txt.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/workflow_notification_on_transition_completed_content.fr.txt.twig
@@ -1,16 +1,16 @@
 {{ dest.label }},
 
-Un suivi "{{ workflow.text }}" a atteint une nouvelle étape: {{ workflow.text }}
+{{ 'workflow.notification.content.new_step_reached'|trans({'%workflow%': workflow.text}) }}
 
-Titre du workflow: "{{ title }}".
+{{ 'workflow.notification.content.workflow_title'|trans({'%title%': title}) }}
 {% if is_dest %}
 
-Vous êtes invités à valider cette étape au plus tôt.
+{{ 'workflow.notification.content.validation_needed'|trans }}
 {% endif %}
 
 
-Vous pouvez visualiser le workflow sur cette page:
+{{ 'workflow.notification.content.view_workflow'|trans }}
 
-{{ absolute_url(path('chill_main_workflow_show', {'id': entity_workflow.id, '_locale': 'fr'})) }}
+{{ absolute_url(path('chill_main_workflow_show', {'id': entity_workflow.id, '_locale': dest.locale|default('fr')})) }}
 
-Cordialement,
+{{ 'workflow.notification.content.regards'|trans }}
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Workflow/workflow_notification_on_transition_completed_title.fr.txt.twig b/src/Bundle/ChillMainBundle/Resources/views/Workflow/workflow_notification_on_transition_completed_title.fr.txt.twig
index 9a6bc70a0..0d266cbac 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Workflow/workflow_notification_on_transition_completed_title.fr.txt.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/workflow_notification_on_transition_completed_title.fr.txt.twig
@@ -1,5 +1,5 @@
 {%- if is_dest -%}
-Un suivi {{ workflow.text }} demande votre attention: {{ title }}
+{{ 'workflow.notification.title.attention_needed'|trans({'%workflow%': workflow.text, '%title%': title}) }}
 {%- else -%}
-Un suivi {{ workflow.text }} a atteint une nouvelle étape: {{ place.text }}: {{ title }}
+{{ 'workflow.notification.title.new_step'|trans({'%workflow%': workflow.text, '%place%': place.text, '%title%': title}) }}
 {%- endif -%}
diff --git a/src/Bundle/ChillMainBundle/Security/PasswordRecover/RecoverPasswordHelper.php b/src/Bundle/ChillMainBundle/Security/PasswordRecover/RecoverPasswordHelper.php
index b325a9345..7ef9eadb2 100644
--- a/src/Bundle/ChillMainBundle/Security/PasswordRecover/RecoverPasswordHelper.php
+++ b/src/Bundle/ChillMainBundle/Security/PasswordRecover/RecoverPasswordHelper.php
@@ -16,11 +16,13 @@ use Symfony\Bridge\Twig\Mime\TemplatedEmail;
 use Symfony\Component\Mailer\MailerInterface;
 use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
 
+// use Symfony\Component\Translation\LocaleSwitcher;
+
 class RecoverPasswordHelper
 {
     final public const RECOVER_PASSWORD_ROUTE = 'password_recover';
 
-    public function __construct(private readonly TokenManager $tokenManager, private readonly UrlGeneratorInterface $urlGenerator, private readonly MailerInterface $mailer) {}
+    public function __construct(private readonly TokenManager $tokenManager, private readonly UrlGeneratorInterface $urlGenerator, private readonly MailerInterface $mailer/* , private readonly LocaleSwitcher $localeSwitcher */) {}
 
     /**
      * @param bool  $absolute
@@ -53,6 +55,24 @@ class RecoverPasswordHelper
             throw new \UnexpectedValueException('No emaail associated to the user');
         }
 
+        // Implementation with LocaleSwitcher (commented out - to be activated after migration to sf7.2):
+        /*
+        $this->localeSwitcher->runWithLocale($user->getLocale(), function () use ($user, $expiration, $template, $templateParameters, $emailSubject, $additionalUrlParameters) {
+            $email = (new TemplatedEmail())
+                ->subject($emailSubject)
+                ->to($user->getEmail())
+                ->textTemplate($template)
+                ->context([
+                    'user' => $user,
+                    'url' => $this->generateUrl($user, $expiration, true, $additionalUrlParameters),
+                    ...$templateParameters,
+                ]);
+
+            $this->mailer->send($email);
+        });
+        */
+
+        // Current implementation:
         $email = (new TemplatedEmail())
             ->subject($emailSubject)
             ->to($user->getEmail())
diff --git a/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/NotificationToUserGroupsOnTransition.php b/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/NotificationToUserGroupsOnTransition.php
index 1eebb03a6..dad18a30c 100644
--- a/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/NotificationToUserGroupsOnTransition.php
+++ b/src/Bundle/ChillMainBundle/Workflow/EventSubscriber/NotificationToUserGroupsOnTransition.php
@@ -22,6 +22,8 @@ use Symfony\Component\Mailer\MailerInterface;
 use Symfony\Component\Workflow\Event\Event;
 use Symfony\Component\Workflow\Registry;
 
+// use Symfony\Component\Translation\LocaleSwitcher;
+
 final readonly class NotificationToUserGroupsOnTransition implements EventSubscriberInterface
 {
     public function __construct(
@@ -31,6 +33,7 @@ final readonly class NotificationToUserGroupsOnTransition implements EventSubscr
         private MailerInterface $mailer,
         private EntityManagerInterface $entityManager,
         private EntityWorkflowManager $entityWorkflowManager,
+        // private LocaleSwitcher $localeSwitcher,
     ) {}
 
     public static function getSubscribedEvents(): array
@@ -87,6 +90,24 @@ final readonly class NotificationToUserGroupsOnTransition implements EventSubscr
                 'title' => $title,
             ];
 
+            // Implementation with LocaleSwitcher (commented out - to be activated after migration to sf7.2):
+            // Note: This sends emails to user groups, not individual users, so locale switching may use default locale
+            /*
+            $this->localeSwitcher->runWithLocale('fr', function () use ($context, $userGroup) {
+                $email = new TemplatedEmail();
+                $email
+                    ->htmlTemplate('@ChillMain/Workflow/workflow_notification_on_transition_completed_content_to_user_group.fr.txt.twig')
+                    ->context($context)
+                    ->subject(
+                        $this->engine->render('@ChillMain/Workflow/workflow_notification_on_transition_completed_title.fr.txt.twig', $context)
+                    )
+                    ->to($userGroup->getEmail());
+
+                $this->mailer->send($email);
+            });
+            */
+
+            // Current implementation:
             $email = new TemplatedEmail();
             $email
                 ->htmlTemplate('@ChillMain/Workflow/workflow_notification_on_transition_completed_content_to_user_group.fr.txt.twig')
diff --git a/src/Bundle/ChillMainBundle/config/services/form.yaml b/src/Bundle/ChillMainBundle/config/services/form.yaml
index e917b37c9..ab7a49c68 100644
--- a/src/Bundle/ChillMainBundle/config/services/form.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/form.yaml
@@ -12,6 +12,12 @@ services:
         tags:
             - { name: form.type, alias: translatable_string }
 
+    Chill\MainBundle\Form\Type\UserLocaleType:
+        arguments:
+            - "%chill_main.available_languages%"
+        tags:
+            - { name: form.type }
+
     chill.main.form.type.select2choice:
         class: Chill\MainBundle\Form\Type\Select2ChoiceType
         tags:
diff --git a/src/Bundle/ChillMainBundle/migrations/Version20251022140718.php b/src/Bundle/ChillMainBundle/migrations/Version20251022140718.php
new file mode 100644
index 000000000..733bf5da1
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/migrations/Version20251022140718.php
@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\Migrations\Main;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20251022140718 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add locale field to users table for user language preferences';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE users ADD locale VARCHAR(5) DEFAULT \'fr\' NOT NULL');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE users DROP locale');
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index de0027dd7..b6343312e 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -56,6 +56,10 @@ user:
         no job: Pas de métier assigné
         no scope: Pas de service assigné
         notification_preferences: Préférences pour mes notifications
+    locale:
+        label: Langue de communication
+        help: Langue utilisée pour les notifications par email et autres communications.
+        placeholder: Choisissez une langue
 
 user_group:
     inactive: Inactif
@@ -668,6 +672,17 @@ workflow:
         reject_are_you_sure: Êtes-vous sûr de vouloir rejeter la signature de %signer%
         waiting_for: En attente de modification de l'état de la signature
 
+    notification:
+        title:
+            attention_needed: "Attention requise dans le workflow %workflow% pour %title%"
+            new_step: "Nouvelle étape dans le workflow %workflow% (%place%) pour %title%"
+        content:
+            new_step_reached: "Une nouvelle étape a été atteinte dans le workflow %workflow%."
+            workflow_title: "Titre du workflow : %title%"
+            validation_needed: "Votre validation est nécessaire pour cette étape."
+            view_workflow: "Vous pouvez consulter le workflow ici :"
+            regards: "Cordialement,"
+
     attachments:
         title: Pièces jointes
         no_attachment: Aucune pièce jointe
@@ -747,7 +762,22 @@ notification:
         greeting: "Bonjour %user%"
         intro: "Vous avez reçu %notification_count% nouvelle(s) notification(s)."
         view_notification: "Vous pouvez visualiser la notification et y répondre ici:"
-        signature: "Le logiciel Chill"
+        signature: "L'équipe Chill"
+
+daily_notifications: "{1}Vous avez 1 nouvelle notification.|]1,Inf[Vous avez %notification_count% nouvelles notifications."
+
+docgen:
+    failure_email:
+        "The generation of a document failed": "La génération d'un document a échoué"
+        "The generation of the document %template_name% failed": "La génération du document %template_name% a échoué"
+        "Forward this email to your administrator for solving": "Transmettez cet email à votre administrateur pour résolution"
+        "References": "Références"
+        "The following errors were encoutered": "Les erreurs suivantes ont été rencontrées"
+    data_dump_email:
+        subject: "Export de données disponible"
+        "Dear": "Cher utilisateur,"
+        "data_dump_ready_and_attached": "Votre export de données est prêt et joint à cet email."
+        "filename": "Nom du fichier : %filename%"
 
 CHILL_MAIN_COMPOSE_EXPORT: Exécuter des exports et les sauvegarder
 CHILL_MAIN_GENERATE_SAVED_EXPORT: Exécuter et modifier des exports préalablement sauvegardés
diff --git a/src/Bundle/ChillMainBundle/translations/messages.nl.yml b/src/Bundle/ChillMainBundle/translations/messages.nl.yml
index 22bb6a50e..f545f7396 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.nl.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.nl.yml
@@ -46,6 +46,14 @@ No title: Geen titel
 User profile: Mijn gebruikersprofiel
 Phonenumber successfully updated!: Telefoonnummer bijgewerkt!
 
+user:
+    locale:
+        label: Communicatietaal
+        help: Taal gebruikt voor e-mailmeldingen en andere communicatie.
+        placeholder: Kies een taal
+        choice:
+            french: Français
+            dutch: Nederlands
 
 Edit: Bewerken
 Update: Updaten
@@ -423,6 +431,17 @@ workflow:
     For: Pour
     Cc: Cc
 
+    notification:
+        title:
+            attention_needed: "Aandacht vereist in workflow %workflow% voor %title%"
+            new_step: "Nieuwe stap in workflow %workflow% (%place%) voor %title%"
+        content:
+            new_step_reached: "Een nieuwe stap is bereikt in workflow %workflow%."
+            workflow_title: "Workflow titel: %title%"
+            validation_needed: "Uw validatie is nodig voor deze stap."
+            view_workflow: "U kunt de workflow hier bekijken:"
+            regards: "Met vriendelijke groeten,"
+
 
 Subscribe final: Recevoir une notification à l'étape finale
 Subscribe all steps: Recevoir une notification à chaque étape

From fccd29e3c7d945a4c2f86e64c0ca96ec9c959033 Mon Sep 17 00:00:00 2001
From: LenaertsJ <julie.lenaerts@champs-libres.coop>
Date: Fri, 14 Nov 2025 14:08:03 +0000
Subject: [PATCH 225/283] Resolve "Rendre le rendez-vous clicable dans la page
 "mes rendez-vous""

---
 .changes/unreleased/Feature-20251112-103224.yaml  |  6 ++++++
 .../public/vuejs/MyCalendarRange/App2.vue         | 15 ++++++++++++---
 2 files changed, 18 insertions(+), 3 deletions(-)
 create mode 100644 .changes/unreleased/Feature-20251112-103224.yaml

diff --git a/.changes/unreleased/Feature-20251112-103224.yaml b/.changes/unreleased/Feature-20251112-103224.yaml
new file mode 100644
index 000000000..44a7d4c60
--- /dev/null
+++ b/.changes/unreleased/Feature-20251112-103224.yaml
@@ -0,0 +1,6 @@
+kind: Feature
+body: Make a calendar item on the 'mes rendez-vous' page clickable. Clicking will navigate to the edit page of the calendar item.
+time: 2025-11-12T10:32:24.916576945+01:00
+custom:
+    Issue: "461"
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App2.vue b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App2.vue
index 6e3d5b61c..40c3200b9 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App2.vue
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App2.vue
@@ -108,9 +108,12 @@
                     {{ formatDate(event.endStr, "time") }}:
                     {{ event.extendedProps.locationName }}</b
                 >
-                <b v-else-if="event.extendedProps.is === 'local'">{{
-                    event.title
-                }}</b>
+                <a
+                    :href="calendarLink(event.id)"
+                    v-else-if="event.extendedProps.is === 'local'"
+                >
+                    <b>{{ event.title }}</b>
+                </a>
                 <b v-else>no 'is'</b>
                 <a
                     v-if="event.extendedProps.is === 'range'"
@@ -486,6 +489,12 @@ function copyWeek() {
     });
 }
 
+const calendarLink = (calendarId: string) => {
+    const idStr = calendarId.match(/_(\d+)$/)?.[1];
+
+    return `/fr/calendar/calendar/${idStr}/edit`;
+};
+
 onMounted(() => {
     copyFromWeek.value = dateToISO(getMonday(0));
     copyToWeek.value = dateToISO(getMonday(1));

From a43181d60d47b561d4aa419da3bd020ab163db52 Mon Sep 17 00:00:00 2001
From: LenaertsJ <julie.lenaerts@champs-libres.coop>
Date: Mon, 17 Nov 2025 10:48:15 +0000
Subject: [PATCH 226/283] Remove the label if there is only one scope and no
 scope picking field is displayed.

---
 .changes/unreleased/UX-20251030-153126.yaml   |  6 ++
 .../ChillActivityBundle/Form/ActivityType.php |  2 +-
 .../Form/PersonDocumentType.php               |  5 +-
 .../Form/Type/ScopePickerType.php             | 56 +++++++++++++------
 .../Tests/Form/Type/ScopePickerTypeTest.php   | 15 +++--
 .../Service/DocGenerator/PersonContext.php    |  3 +-
 .../ChillTaskBundle/Form/SingleTaskType.php   |  8 ++-
 .../views/SingleTask/Person/list.html.twig    |  2 +-
 .../views/SingleTask/index.html.twig          |  2 +-
 9 files changed, 65 insertions(+), 34 deletions(-)
 create mode 100644 .changes/unreleased/UX-20251030-153126.yaml

diff --git a/.changes/unreleased/UX-20251030-153126.yaml b/.changes/unreleased/UX-20251030-153126.yaml
new file mode 100644
index 000000000..8deaf7701
--- /dev/null
+++ b/.changes/unreleased/UX-20251030-153126.yaml
@@ -0,0 +1,6 @@
+kind: UX
+body: Remove the label if there is only one scope and no scope picking field is displayed.
+time: 2025-10-30T15:31:26.807444365+01:00
+custom:
+    Issue: "449"
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillActivityBundle/Form/ActivityType.php b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
index 28c607acd..3b8f53303 100644
--- a/src/Bundle/ChillActivityBundle/Form/ActivityType.php
+++ b/src/Bundle/ChillActivityBundle/Form/ActivityType.php
@@ -88,8 +88,8 @@ class ActivityType extends AbstractType
 
         if (null !== $options['data']->getPerson()) {
             $builder->add('scope', ScopePickerType::class, [
-                'center' => $options['center'],
                 'role' => ActivityVoter::CREATE === (string) $options['role'] ? ActivityVoter::CREATE_PERSON : (string) $options['role'],
+                'center' => $options['center'],
                 'required' => true,
             ]);
         }
diff --git a/src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php b/src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php
index 0addd53cc..6e201165d 100644
--- a/src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php
+++ b/src/Bundle/ChillDocStoreBundle/Form/PersonDocumentType.php
@@ -17,7 +17,6 @@ use Chill\DocStoreBundle\Entity\PersonDocument;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\ChillTextareaType;
 use Chill\MainBundle\Form\Type\ScopePickerType;
-use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
 use Chill\MainBundle\Security\Resolver\ScopeResolverDispatcher;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Doctrine\ORM\EntityRepository;
@@ -30,7 +29,7 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class PersonDocumentType extends AbstractType
 {
-    public function __construct(private readonly TranslatableStringHelperInterface $translatableStringHelper, private readonly ScopeResolverDispatcher $scopeResolverDispatcher, private readonly ParameterBagInterface $parameterBag, private readonly CenterResolverDispatcher $centerResolverDispatcher) {}
+    public function __construct(private readonly TranslatableStringHelperInterface $translatableStringHelper, private readonly ScopeResolverDispatcher $scopeResolverDispatcher, private readonly ParameterBagInterface $parameterBag) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
@@ -57,8 +56,8 @@ class PersonDocumentType extends AbstractType
 
         if ($isScopeConcerned && $this->parameterBag->get('chill_main')['acl']['form_show_scopes']) {
             $builder->add('scope', ScopePickerType::class, [
-                'center' => $this->centerResolverDispatcher->resolveCenter($document),
                 'role' => $options['role'],
+                'subject' => $document,
             ]);
         }
     }
diff --git a/src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php b/src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php
index 6f10626c6..2367bc565 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/ScopePickerType.php
@@ -16,6 +16,7 @@ use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Form\DataMapper\ScopePickerDataMapper;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
+use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
 use Symfony\Component\Form\AbstractType;
@@ -32,65 +33,84 @@ use Symfony\Component\Security\Core\Security;
  * Allow to pick amongst available scope for the current
  * user.
  *
- * options :
- *
- * - `center`: the center of the entity
- * - `role`  : the role of the user
+ * Options:
+ * - `role`: string, the role to check permissions for
+ * - Either `subject`: object, entity to resolve centers from
+ * - Or `center`: Center|array|null, the center(s) to check
  */
 class ScopePickerType extends AbstractType
 {
     public function __construct(
+        private readonly TranslatableStringHelperInterface $translatableStringHelper,
         private readonly AuthorizationHelperInterface $authorizationHelper,
         private readonly Security $security,
-        private readonly TranslatableStringHelperInterface $translatableStringHelper,
+        private readonly CenterResolverManagerInterface $centerResolverManager,
     ) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
-        $items = array_values(
+        // Compute centers from subject
+        $centers = $options['center'] ?? null;
+        if (null === $centers && isset($options['subject'])) {
+            $centers = $this->centerResolverManager->resolveCenters($options['subject']);
+        }
+
+        if (null === $centers) {
+            throw new \RuntimeException('Either "center" or "subject" must be provided');
+        }
+
+        $reachableScopes = array_values(
             array_filter(
                 $this->authorizationHelper->getReachableScopes(
                     $this->security->getUser(),
                     $options['role'],
-                    $options['center']
+                    $centers
                 ),
                 static fn (Scope $s) => $s->isActive()
             )
         );
 
-        if (0 === \count($items)) {
-            throw new \RuntimeException('no scopes are reachable. This form should not be shown to user');
+        $builder->setAttribute('reachable_scopes_count', count($reachableScopes));
+
+        if (0 === count($reachableScopes)) {
+            $builder->setAttribute('has_scopes', false);
+
+            return;
         }
 
-        if (1 !== \count($items)) {
+        $builder->setAttribute('has_scopes', true);
+
+        if (1 !== count($reachableScopes)) {
             $builder->add('scope', EntityType::class, [
                 'class' => Scope::class,
                 'placeholder' => 'Choose the circle',
                 'choice_label' => fn (Scope $c) => $this->translatableStringHelper->localize($c->getName()),
-                'choices' => $items,
+                'choices' => $reachableScopes,
             ]);
             $builder->setDataMapper(new ScopePickerDataMapper());
         } else {
             $builder->add('scope', HiddenType::class, [
-                'data' => $items[0]->getId(),
+                'data' => $reachableScopes[0]->getId(),
             ]);
-            $builder->setDataMapper(new ScopePickerDataMapper($items[0]));
+            $builder->setDataMapper(new ScopePickerDataMapper($reachableScopes[0]));
         }
     }
 
     public function buildView(FormView $view, FormInterface $form, array $options)
     {
         $view->vars['fullWidth'] = true;
+        // display of label is handled by the EntityType
+        $view->vars['label'] = false;
     }
 
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver
-          // create `center` option
-            ->setRequired('center')
-            ->setAllowedTypes('center', [Center::class, 'array', 'null'])
-          // create ``role` option
             ->setRequired('role')
-            ->setAllowedTypes('role', ['string']);
+            ->setAllowedTypes('role', ['string'])
+            ->setDefined('subject')
+            ->setAllowedTypes('subject', ['object'])
+            ->setDefined('center')
+            ->setAllowedTypes('center', [Center::class, 'array', 'null']);
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Tests/Form/Type/ScopePickerTypeTest.php b/src/Bundle/ChillMainBundle/Tests/Form/Type/ScopePickerTypeTest.php
index 3d3813748..53ce413d2 100644
--- a/src/Bundle/ChillMainBundle/Tests/Form/Type/ScopePickerTypeTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Form/Type/ScopePickerTypeTest.php
@@ -11,11 +11,11 @@ declare(strict_types=1);
 
 namespace Form\Type;
 
-use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Form\Type\ScopePickerType;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
+use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\Mapping\Builder\ClassMetadataBuilder;
@@ -39,11 +39,11 @@ final class ScopePickerTypeTest extends TypeTestCase
 {
     use ProphecyTrait;
 
-    public function estBuildOneScopeIsSuccessful()
+    public function testBuildOneScopeIsSuccessful()
     {
         $form = $this->factory->create(ScopePickerType::class, null, [
-            'center' => new Center(),
             'role' => 'ONE_SCOPE',
+            'center' => [],
         ]);
 
         $view = $form->createView();
@@ -54,8 +54,8 @@ final class ScopePickerTypeTest extends TypeTestCase
     public function testBuildThreeScopesIsSuccessful()
     {
         $form = $this->factory->create(ScopePickerType::class, null, [
-            'center' => new Center(),
             'role' => 'THREE_SCOPE',
+            'center' => [],
         ]);
 
         $view = $form->createView();
@@ -66,8 +66,8 @@ final class ScopePickerTypeTest extends TypeTestCase
     public function testBuildTwoScopesIsSuccessful()
     {
         $form = $this->factory->create(ScopePickerType::class, null, [
-            'center' => new Center(),
             'role' => 'TWO_SCOPE',
+            'center' => [],
         ]);
 
         $view = $form->createView();
@@ -101,10 +101,13 @@ final class ScopePickerTypeTest extends TypeTestCase
             static fn ($args) => $args[0]['fr']
         );
 
+        $centerResolverManager = $this->prophesize(CenterResolverManagerInterface::class);
+
         $type = new ScopePickerType(
+            $translatableStringHelper->reveal(),
             $authorizationHelper->reveal(),
             $security->reveal(),
-            $translatableStringHelper->reveal()
+            $centerResolverManager->reveal()
         );
 
         // add the mocks for creating EntityType
diff --git a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
index eb588cdaf..0ac921277 100644
--- a/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
+++ b/src/Bundle/ChillPersonBundle/Service/DocGenerator/PersonContext.php
@@ -168,9 +168,8 @@ final readonly class PersonContext implements PersonContextInterface
 
         if ($this->isScopeNecessary($entity)) {
             $builder->add('scope', ScopePickerType::class, [
-                'center' => $this->centerResolverManager->resolveCenters($entity),
                 'role' => PersonDocumentVoter::CREATE,
-                'label' => 'Scope',
+                'subject' => $entity,
             ]);
         }
     }
diff --git a/src/Bundle/ChillTaskBundle/Form/SingleTaskType.php b/src/Bundle/ChillTaskBundle/Form/SingleTaskType.php
index 7e572e078..1883263a1 100644
--- a/src/Bundle/ChillTaskBundle/Form/SingleTaskType.php
+++ b/src/Bundle/ChillTaskBundle/Form/SingleTaskType.php
@@ -27,7 +27,11 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 
 class SingleTaskType extends AbstractType
 {
-    public function __construct(private readonly ParameterBagInterface $parameterBag, private readonly CenterResolverDispatcherInterface $centerResolverDispatcher, private readonly ScopeResolverDispatcher $scopeResolverDispatcher) {}
+    public function __construct(
+        private readonly ParameterBagInterface $parameterBag,
+        private readonly CenterResolverDispatcherInterface $centerResolverDispatcher,
+        private readonly ScopeResolverDispatcher $scopeResolverDispatcher,
+    ) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
@@ -64,8 +68,8 @@ class SingleTaskType extends AbstractType
         if ($isScopeConcerned && $this->parameterBag->get('chill_main')['acl']['form_show_scopes']) {
             $builder
                 ->add('circle', ScopePickerType::class, [
-                    'center' => $center,
                     'role' => $options['role'],
+                    'subject' => $task,
                     'required' => true,
                 ]);
         }
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/list.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/list.html.twig
index ffdd17a39..a4d5d81c9 100644
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/list.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/Person/list.html.twig
@@ -5,7 +5,7 @@
 {% block title 'Tasks for {{ name }}'|trans({ '{{ name }}' : person|chill_entity_render_string }) %}
 
 {% block content %}
-    <div class="col-md-10 col-xxl">
+    <div class="task-list"">
 
         <h1>{{ block('title') }}</h1>
 
diff --git a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig
index 02ab79664..658d9cba1 100644
--- a/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig
+++ b/src/Bundle/ChillTaskBundle/Resources/views/SingleTask/index.html.twig
@@ -37,7 +37,7 @@
 		{% endblock %}
 	{% else %}
 		{% block content %}
-			<div class="col-md-10 col-xxl tasks">
+			<div class="col-md-9 col-xxl tasks">
 				{% include '@ChillTask/SingleTask/AccompanyingCourse/list.html.twig' %}
 
 			</div>

From e1b91ebbfd12e515267f09c293689f22886bcd23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 17 Nov 2025 15:11:14 +0100
Subject: [PATCH 227/283] Release v4.8.0

---
 .changes/unreleased/Feature-20251112-103224.yaml |  6 ------
 .changes/unreleased/Fixed-20251112-170025.yaml   |  6 ------
 .changes/unreleased/Fixed-20251113-120125.yaml   |  7 -------
 .changes/unreleased/UX-20251030-153126.yaml      |  6 ------
 .changes/v4.8.0.md                               |  9 +++++++++
 CHANGELOG.md                                     | 10 ++++++++++
 6 files changed, 19 insertions(+), 25 deletions(-)
 delete mode 100644 .changes/unreleased/Feature-20251112-103224.yaml
 delete mode 100644 .changes/unreleased/Fixed-20251112-170025.yaml
 delete mode 100644 .changes/unreleased/Fixed-20251113-120125.yaml
 delete mode 100644 .changes/unreleased/UX-20251030-153126.yaml
 create mode 100644 .changes/v4.8.0.md

diff --git a/.changes/unreleased/Feature-20251112-103224.yaml b/.changes/unreleased/Feature-20251112-103224.yaml
deleted file mode 100644
index 44a7d4c60..000000000
--- a/.changes/unreleased/Feature-20251112-103224.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Feature
-body: Make a calendar item on the 'mes rendez-vous' page clickable. Clicking will navigate to the edit page of the calendar item.
-time: 2025-11-12T10:32:24.916576945+01:00
-custom:
-    Issue: "461"
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/Fixed-20251112-170025.yaml b/.changes/unreleased/Fixed-20251112-170025.yaml
deleted file mode 100644
index 6808564b5..000000000
--- a/.changes/unreleased/Fixed-20251112-170025.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Fixed
-body: Display calendar items for which an invite was accepted on the mes rendez-vous page
-time: 2025-11-12T17:00:25.58946528+01:00
-custom:
-    Issue: "463"
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/Fixed-20251113-120125.yaml b/.changes/unreleased/Fixed-20251113-120125.yaml
deleted file mode 100644
index a9bfc78ad..000000000
--- a/.changes/unreleased/Fixed-20251113-120125.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-kind: Fixed
-body: |
-    Improve accessibility on login page
-time: 2025-11-13T12:01:25.488478771+01:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/UX-20251030-153126.yaml b/.changes/unreleased/UX-20251030-153126.yaml
deleted file mode 100644
index 8deaf7701..000000000
--- a/.changes/unreleased/UX-20251030-153126.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: UX
-body: Remove the label if there is only one scope and no scope picking field is displayed.
-time: 2025-10-30T15:31:26.807444365+01:00
-custom:
-    Issue: "449"
-    SchemaChange: No schema change
diff --git a/.changes/v4.8.0.md b/.changes/v4.8.0.md
new file mode 100644
index 000000000..48583b6a2
--- /dev/null
+++ b/.changes/v4.8.0.md
@@ -0,0 +1,9 @@
+## v4.8.0 - 2025-11-17
+### Feature
+* ([#461](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/461)) Make a calendar item on the 'mes rendez-vous' page clickable. Clicking will navigate to the edit page of the calendar item.   
+### Fixed
+* ([#463](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/463)) Display calendar items for which an invite was accepted on the mes rendez-vous page   
+* Improve accessibility on login page
+   
+### UX
+* ([#449](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/449)) Remove the label if there is only one scope and no scope picking field is displayed.   
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e684bb689..2cc2b5aa5 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,16 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
+## v4.8.0 - 2025-11-17
+### Feature
+* ([#461](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/461)) Make a calendar item on the 'mes rendez-vous' page clickable. Clicking will navigate to the edit page of the calendar item.   
+### Fixed
+* ([#463](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/463)) Display calendar items for which an invite was accepted on the mes rendez-vous page   
+* Improve accessibility on login page
+   
+### UX
+* ([#449](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/449)) Remove the label if there is only one scope and no scope picking field is displayed.   
+
 ## v4.7.0 - 2025-11-10
 ### Feature
 * ([#385](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/385)) Create invitation list in user menu   

From 7eb895c0e1ba555738f439b4ced2cb6cb844770d Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 19 Nov 2025 13:33:51 +0100
Subject: [PATCH 228/283] Insert name of file as the document title when
 uploading

---
 .changes/unreleased/Fixed-20251119-133324.yaml              | 6 ++++++
 .../components/FormEvaluation.vue                           | 4 ++--
 2 files changed, 8 insertions(+), 2 deletions(-)
 create mode 100644 .changes/unreleased/Fixed-20251119-133324.yaml

diff --git a/.changes/unreleased/Fixed-20251119-133324.yaml b/.changes/unreleased/Fixed-20251119-133324.yaml
new file mode 100644
index 000000000..408863dfe
--- /dev/null
+++ b/.changes/unreleased/Fixed-20251119-133324.yaml
@@ -0,0 +1,6 @@
+kind: Fixed
+body: Insert name of file as the document title when uploading
+time: 2025-11-19T13:33:24.778116633+01:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
index c20c9eb9f..6f459daec 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
@@ -293,11 +293,11 @@ function onInputDocumentTitle(event) {
     });
 }
 
-function addDocument({ stored_object, stored_object_version }) {
+function addDocument({ stored_object, stored_object_version, file_name }) {
     let document = {
         type: "accompanying_period_work_evaluation_document",
         storedObject: stored_object,
-        title: "Nouveau document",
+        title: file_name,
     };
     store.commit("addDocument", {
         key: props.evaluation.key,

From c7d7c3ac6f0f5e9d4df90622e711ef3ae1a95dbc Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 19 Nov 2025 13:48:35 +0100
Subject: [PATCH 229/283] Add missing 'id' paramater in path

---
 .changes/unreleased/Fixed-20251119-134802.yaml              | 6 ++++++
 .../Resources/views/Participation/edit-multiple.html.twig   | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 .changes/unreleased/Fixed-20251119-134802.yaml

diff --git a/.changes/unreleased/Fixed-20251119-134802.yaml b/.changes/unreleased/Fixed-20251119-134802.yaml
new file mode 100644
index 000000000..8c9250c40
--- /dev/null
+++ b/.changes/unreleased/Fixed-20251119-134802.yaml
@@ -0,0 +1,6 @@
+kind: Fixed
+body: Add missing path paramater 'id' for editing multiple participations
+time: 2025-11-19T13:48:02.078949572+01:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Participation/edit-multiple.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Participation/edit-multiple.html.twig
index a01c51e49..a2cef3e53 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Participation/edit-multiple.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Participation/edit-multiple.html.twig
@@ -50,7 +50,7 @@
 
     <ul class="record_actions">
         <li>
-            <a href="{{ path('chill_event__event_show', { 'event_id' : event.id } ) }}" class="btn btn-cancel">
+            <a href="{{ path('chill_event__event_show', { 'id' : event.id } ) }}" class="btn btn-cancel">
                 {{ 'Back to the event'|trans }}
             </a>
         </li>

From 2f930ac138f406ca265dc6ea16e229742b37e224 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 19 Nov 2025 14:45:01 +0000
Subject: [PATCH 230/283] Add filtering tickets by person center

---
 .../ChillTicketBundle/chill.api.specs.yaml    |  26 ++
 .../CenterForTicketListApiController.php      |  52 ++++
 .../Controller/TicketListApiController.php    |  17 ++
 .../Repository/TicketACLAwareRepository.php   |  30 +++
 .../TicketACLAwareRepositoryInterface.php     |   3 +-
 ...tListApiControllerByAddresseeGroupTest.php |   4 +
 ...TicketListApiControllerByAddresseeTest.php |  13 +-
 ...etListApiControllerByAddresseeToMeTest.php |   4 +-
 ...ketListApiControllerByCreatedAfterTest.php |  11 +-
 ...etListApiControllerByCreatedBeforeTest.php |  11 +-
 .../TicketListApiControllerByCreatorTest.php  |  10 +-
 ...ketListApiControllerByPersonCenterTest.php | 240 ++++++++++++++++++
 ...piControllerByResponseTimeExceededTest.php |   7 +-
 .../TicketListApiControllerByTicketIdTest.php |   7 +-
 ...ApiControllerCurrentStateEmergencyTest.php |   7 +-
 ...icketListApiControllerCurrentStateTest.php |   7 +-
 .../TicketListApiControllerMotivesTest.php    |  14 +-
 .../TicketListApiControllerTest.php           |  13 +-
 .../TicketACLAwareRepositoryTest.php          |  16 ++
 19 files changed, 461 insertions(+), 31 deletions(-)
 create mode 100644 src/Bundle/ChillTicketBundle/src/Controller/CenterForTicketListApiController.php
 create mode 100644 src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByPersonCenterTest.php

diff --git a/src/Bundle/ChillTicketBundle/chill.api.specs.yaml b/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
index f0255fb19..b1bdc4269 100644
--- a/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillTicketBundle/chill.api.specs.yaml
@@ -54,6 +54,20 @@ paths:
             responses:
                 200:
                     description: "OK"
+    /1.0/ticket/search/authorized-centers:
+        get:
+            tags:
+                - ticket
+            summary: List of centers authorized for the current user
+            responses:
+                200:
+                    description: "OK"
+                    content:
+                        application/json:
+                            schema:
+                                type: array
+                                items:
+                                    $ref: '#/components/schemas/Center'
     /1.0/ticket/ticket/list:
         get:
             tags:
@@ -190,6 +204,18 @@ paths:
                           type: integer
                           format: integer
                           minimum: 1
+                - name: byPersonCenter
+                  in: query
+                  description: The id of the centers. The list of centers can be search through /api/1.0/ticket/search/authorized-centers endpoint.
+                  required: false
+                  style: form
+                  explode: false
+                  schema:
+                      type: array
+                      items:
+                          type: integer
+                          format: integer
+                          minimum: 1
             responses:
                 200:
                     description: OK
diff --git a/src/Bundle/ChillTicketBundle/src/Controller/CenterForTicketListApiController.php b/src/Bundle/ChillTicketBundle/src/Controller/CenterForTicketListApiController.php
new file mode 100644
index 000000000..11b2ac961
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Controller/CenterForTicketListApiController.php
@@ -0,0 +1,52 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Controller;
+
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Security\Authorization\AuthorizationHelperForCurrentUserInterface;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\SerializerInterface;
+
+/**
+ * Give a list of Centers usable for searching amongst tickets.
+ */
+final readonly class CenterForTicketListApiController
+{
+    public function __construct(
+        private AuthorizationHelperForCurrentUserInterface $authorizationHelperForCurrentUser,
+        private Security $security,
+        private SerializerInterface $serializer,
+    ) {}
+
+    #[Route(path: '/api/1.0/ticket/search/authorized-centers')]
+    public function __invoke(): JsonResponse
+    {
+        $user = $this->security->getUser();
+
+        if (!$user instanceof User) {
+            throw new AccessDeniedHttpException();
+        }
+
+        $centers = $this->authorizationHelperForCurrentUser->getReachableCenters(PersonVoter::SEE);
+
+        return new JsonResponse(
+            $this->serializer->serialize($centers, 'json', ['groups' => 'read']),
+            Response::HTTP_OK,
+            json: true
+        );
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Controller/TicketListApiController.php b/src/Bundle/ChillTicketBundle/src/Controller/TicketListApiController.php
index fd1db6e22..1a4e5ccdb 100644
--- a/src/Bundle/ChillTicketBundle/src/Controller/TicketListApiController.php
+++ b/src/Bundle/ChillTicketBundle/src/Controller/TicketListApiController.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\TicketBundle\Controller;
 
 use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
+use Chill\MainBundle\Repository\CenterRepositoryInterface;
 use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Repository\UserGroupRepositoryInterface;
 use Chill\MainBundle\Serializer\Model\Collection;
@@ -46,6 +47,7 @@ final readonly class TicketListApiController
         ParameterBagInterface $parameterBag,
         private UserRepositoryInterface $userRepository,
         private UserGroupRepositoryInterface $userGroupRepository,
+        private CenterRepositoryInterface $centerRepository,
     ) {
         $this->expectedTimeResponseDelay = new \DateInterval($parameterBag->get('chill_ticket')['ticket']['response_time_exceeded_delay']);
     }
@@ -191,6 +193,21 @@ final readonly class TicketListApiController
             }
         }
 
+        if ($request->query->has('byPersonCenter')) {
+            $centerIds = explode(',', $request->query->get('byPersonCenter'));
+            foreach ($centerIds as $id) {
+                if (!is_numeric($id) || 0 === ((int) $id)) {
+                    throw new BadRequestHttpException('Only numbers are allowed in by center parameter');
+                }
+
+                $center = $this->centerRepository->find($id);
+                if (null === $center) {
+                    throw new BadRequestHttpException('Center not found');
+                }
+                $params['byPersonCenter'][] = $center;
+            }
+        }
+
         $nb = $this->ticketRepository->countTickets($params);
         $paginator = $this->paginatorFactory->create($nb);
 
diff --git a/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepository.php b/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepository.php
index ad8fa1387..442fc077e 100644
--- a/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepository.php
+++ b/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepository.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\TicketBundle\Repository;
 
+use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
 use Chill\TicketBundle\Entity\AddresseeHistory;
 use Chill\TicketBundle\Entity\EmergencyStatusHistory;
 use Chill\TicketBundle\Entity\MotiveHistory;
@@ -203,6 +204,35 @@ final readonly class TicketACLAwareRepository implements TicketACLAwareRepositor
             $qb->andWhere($addresseeGroupOr);
         }
 
+        if (array_key_exists('byPersonCenter', $params)) {
+            $orx = $qb->expr()->orX();
+            foreach ($params['byPersonCenter'] as $userCenter) {
+                $orx->add(
+                    $qb->expr()->exists(sprintf(
+                        'SELECT 1 FROM %s ticket_person_%d
+                            JOIN %s person_center_%d WITH person_center_%d.person = ticket_person_%d.person AND TRUE = OVERLAPSI(ticket_person_%d.startDate, ticket_person_%d.startDate),(person_center_%d.startDate, person_center_%d.endDate)
+                            WHERE ticket_person_%d.ticket = t AND ticket_person_%d.endDate IS NULL AND person_center_%d.center = :center_%d',
+                        PersonHistory::class,
+                        ++$i,
+                        PersonCenterHistory::class,
+                        $i,
+                        $i,
+                        $i,
+                        $i,
+                        $i,
+                        $i,
+                        $i,
+                        $i,
+                        $i,
+                        $i,
+                        $i,
+                    ))
+                );
+                $qb->setParameter(sprintf('center_%d', $i), $userCenter);
+            }
+            $qb->andWhere($orx);
+        }
+
         return $qb;
     }
 }
diff --git a/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepositoryInterface.php b/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepositoryInterface.php
index 646ca3403..1887e7ffd 100644
--- a/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepositoryInterface.php
+++ b/src/Bundle/ChillTicketBundle/src/Repository/TicketACLAwareRepositoryInterface.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\TicketBundle\Repository;
 
+use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\UserGroup;
 use Chill\PersonBundle\Entity\Person;
@@ -22,7 +23,7 @@ use Chill\TicketBundle\Entity\Ticket;
 /**
  * Repository to find tickets, taking care of permissions.
  *
- * @phpstan-type TicketACLAwareRepositoryParam array{byPerson?: list<Person>, byCurrentState?: list<StateEnum>, byCurrentStateEmergency?: list<EmergencyStatusEnum>, byMotives?: list<Motive>, byCreatedBefore?: \DateTimeImmutable, byCreatedAfter?: \DateTimeImmutable, byAddressee?: list<User>, byAddresseeGroup?: list<UserGroup>, byCreator?: list<User>, byTicketId?: int}
+ * @phpstan-type TicketACLAwareRepositoryParam array{byPerson?: list<Person>, byCurrentState?: list<StateEnum>, byCurrentStateEmergency?: list<EmergencyStatusEnum>, byMotives?: list<Motive>, byCreatedBefore?: \DateTimeImmutable, byCreatedAfter?: \DateTimeImmutable, byAddressee?: list<User>, byAddresseeGroup?: list<UserGroup>, byCreator?: list<User>, byTicketId?: int, byPersonCenter?: list<Center>}
  */
 interface TicketACLAwareRepositoryInterface
 {
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByAddresseeGroupTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByAddresseeGroupTest.php
index 94c1bf705..afbe251d9 100644
--- a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByAddresseeGroupTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByAddresseeGroupTest.php
@@ -14,6 +14,7 @@ namespace Chill\TicketBundle\Tests\Controller;
 use Chill\MainBundle\Entity\UserGroup;
 use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
 use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Repository\CenterRepositoryInterface;
 use Chill\MainBundle\Repository\UserGroupRepositoryInterface;
 use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Serializer\Model\Collection;
@@ -93,6 +94,7 @@ final class TicketListApiControllerByAddresseeGroupTest extends TestCase
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
             $userRepository->reveal(),
             $groupRepository->reveal(),
+            $this->prophesize(CenterRepositoryInterface::class)->reveal(),
         );
 
         $request = new Request(query: ['byAddresseeGroup' => '10']);
@@ -159,6 +161,7 @@ final class TicketListApiControllerByAddresseeGroupTest extends TestCase
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
             $userRepository->reveal(),
             $groupRepository->reveal(),
+            $this->prophesize(CenterRepositoryInterface::class)->reveal(),
         );
 
         $request = new Request(query: ['byAddresseeGroup' => '10,20']);
@@ -201,6 +204,7 @@ final class TicketListApiControllerByAddresseeGroupTest extends TestCase
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
             $userRepository->reveal(),
             $groupRepository->reveal(),
+            $this->prophesize(CenterRepositoryInterface::class)->reveal(),
         );
 
         $request = new Request(query: ['byAddresseeGroup' => '10,20']);
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByAddresseeTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByAddresseeTest.php
index 3a4099fae..62fdcb278 100644
--- a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByAddresseeTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByAddresseeTest.php
@@ -14,6 +14,7 @@ namespace Chill\TicketBundle\Tests\Controller;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
 use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Repository\CenterRepositoryInterface;
 use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Repository\UserGroupRepositoryInterface;
 use Chill\MainBundle\Serializer\Model\Collection;
@@ -94,7 +95,8 @@ final class TicketListApiControllerByAddresseeTest extends TestCase
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
             $userRepository->reveal(),
-            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal(),
+            $this->prophesize(CenterRepositoryInterface::class)->reveal()
         );
 
         // Create request with byAddressee filter
@@ -168,7 +170,8 @@ final class TicketListApiControllerByAddresseeTest extends TestCase
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
             $userRepository->reveal(),
-            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal(),
+            $this->prophesize(CenterRepositoryInterface::class)->reveal()
         );
 
         // Create request with multiple byAddressee filter
@@ -216,7 +219,8 @@ final class TicketListApiControllerByAddresseeTest extends TestCase
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
             $userRepository->reveal(),
-            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal(),
+            $this->prophesize(CenterRepositoryInterface::class)->reveal()
         );
 
         // Create request with byAddressee filter with non-existent user
@@ -286,7 +290,8 @@ final class TicketListApiControllerByAddresseeTest extends TestCase
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
             $userRepository->reveal(),
-            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal(),
+            $this->prophesize(CenterRepositoryInterface::class)->reveal()
         );
 
         // Create request with both byAddressee and byAddresseeToMe filters
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByAddresseeToMeTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByAddresseeToMeTest.php
index ebc984e7e..c0054bd90 100644
--- a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByAddresseeToMeTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByAddresseeToMeTest.php
@@ -13,6 +13,7 @@ namespace Chill\TicketBundle\Tests\Controller;
 
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
+use Chill\MainBundle\Repository\CenterRepositoryInterface;
 use Chill\MainBundle\Repository\UserGroupRepositoryInterface;
 use Chill\MainBundle\Pagination\PaginatorInterface;
 use Chill\MainBundle\Repository\UserRepositoryInterface;
@@ -92,7 +93,8 @@ final class TicketListApiControllerByAddresseeToMeTest extends TestCase
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
             $userRepository->reveal(),
-            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal(),
+            $this->prophesize(CenterRepositoryInterface::class)->reveal()
         );
 
         // Create request with byAddresseeToMe filter
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByCreatedAfterTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByCreatedAfterTest.php
index c11de568d..3efd0bb8e 100644
--- a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByCreatedAfterTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByCreatedAfterTest.php
@@ -13,6 +13,7 @@ namespace Chill\TicketBundle\Tests\Controller;
 
 use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
 use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Repository\CenterRepositoryInterface;
 use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Repository\UserGroupRepositoryInterface;
 use Chill\MainBundle\Serializer\Model\Collection;
@@ -99,7 +100,8 @@ final class TicketListApiControllerByCreatedAfterTest extends TestCase
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
             $userRepository->reveal(),
-            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal(),
+            $this->prophesize(CenterRepositoryInterface::class)->reveal()
         );
 
         // Create request with byCreatedAfter filter in RFC3339 format
@@ -173,7 +175,8 @@ final class TicketListApiControllerByCreatedAfterTest extends TestCase
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
             $userRepository->reveal(),
-            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal(),
+            $this->prophesize(CenterRepositoryInterface::class)->reveal()
         );
 
         // Create request with byCreatedAfter filter in RFC3339_EXTENDED format
@@ -204,6 +207,7 @@ final class TicketListApiControllerByCreatedAfterTest extends TestCase
         $personRepository = $this->prophesize(PersonRepository::class);
         $motiveRepository = $this->prophesize(MotiveRepository::class);
         $userRepository = $this->prophesize(UserRepositoryInterface::class);
+        $centerRepository = $this->prophesize(CenterRepositoryInterface::class);
 
         // Create controller
         $controller = new TicketListApiController(
@@ -216,7 +220,8 @@ final class TicketListApiControllerByCreatedAfterTest extends TestCase
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
             $userRepository->reveal(),
-            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal(),
+            $centerRepository->reveal(),
         );
 
         // Create request with byCreatedAfter filter in invalid format
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByCreatedBeforeTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByCreatedBeforeTest.php
index da0f16e47..e02471866 100644
--- a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByCreatedBeforeTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByCreatedBeforeTest.php
@@ -13,6 +13,7 @@ namespace Chill\TicketBundle\Tests\Controller;
 
 use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
 use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Repository\CenterRepositoryInterface;
 use Chill\MainBundle\Repository\UserGroupRepositoryInterface;
 use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Serializer\Model\Collection;
@@ -99,7 +100,8 @@ final class TicketListApiControllerByCreatedBeforeTest extends TestCase
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
             $userRepository->reveal(),
-            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal(),
+            $this->prophesize(CenterRepositoryInterface::class)->reveal()
         );
 
         // Create request with byCreatedAfter filter in RFC3339 format
@@ -173,7 +175,8 @@ final class TicketListApiControllerByCreatedBeforeTest extends TestCase
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
             $userRepository->reveal(),
-            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal(),
+            $this->prophesize(CenterRepositoryInterface::class)->reveal()
         );
 
         // Create request with byCreatedAfter filter in RFC3339_EXTENDED format
@@ -204,6 +207,7 @@ final class TicketListApiControllerByCreatedBeforeTest extends TestCase
         $personRepository = $this->prophesize(PersonRepository::class);
         $motiveRepository = $this->prophesize(MotiveRepository::class);
         $userRepository = $this->prophesize(UserRepositoryInterface::class);
+        $centerRepository = $this->prophesize(CenterRepositoryInterface::class);
 
         // Create controller
         $controller = new TicketListApiController(
@@ -216,7 +220,8 @@ final class TicketListApiControllerByCreatedBeforeTest extends TestCase
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
             $userRepository->reveal(),
-            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal(),
+            $centerRepository->reveal(),
         );
 
         // Create request with byCreatedAfter filter in invalid format
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByCreatorTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByCreatorTest.php
index a8828f545..513e14014 100644
--- a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByCreatorTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByCreatorTest.php
@@ -14,6 +14,7 @@ namespace Chill\TicketBundle\Tests\Controller;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
 use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Repository\CenterRepositoryInterface;
 use Chill\MainBundle\Repository\UserGroupRepositoryInterface;
 use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Serializer\Model\Collection;
@@ -90,7 +91,8 @@ final class TicketListApiControllerByCreatorTest extends TestCase
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
             $userRepository->reveal(),
-            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal(),
+            $this->prophesize(CenterRepositoryInterface::class)->reveal()
         );
 
         $request = new Request(query: ['byCreator' => '1']);
@@ -151,7 +153,8 @@ final class TicketListApiControllerByCreatorTest extends TestCase
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
             $userRepository->reveal(),
-            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal(),
+            $this->prophesize(CenterRepositoryInterface::class)->reveal()
         );
 
         $request = new Request(query: ['byCreator' => '1,2']);
@@ -194,7 +197,8 @@ final class TicketListApiControllerByCreatorTest extends TestCase
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
             $userRepository->reveal(),
-            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal(),
+            $this->prophesize(CenterRepositoryInterface::class)->reveal()
         );
 
         $request = new Request(query: ['byCreator' => '99']);
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByPersonCenterTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByPersonCenterTest.php
new file mode 100644
index 000000000..a141029ba
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByPersonCenterTest.php
@@ -0,0 +1,240 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\TicketBundle\Tests\Controller;
+
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
+use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Repository\CenterRepositoryInterface;
+use Chill\MainBundle\Repository\UserGroupRepositoryInterface;
+use Chill\MainBundle\Repository\UserRepositoryInterface;
+use Chill\MainBundle\Serializer\Model\Collection;
+use Chill\PersonBundle\Repository\PersonRepository;
+use Chill\TicketBundle\Controller\TicketListApiController;
+use Chill\TicketBundle\Entity\Ticket;
+use Chill\TicketBundle\Repository\MotiveRepository;
+use Chill\TicketBundle\Repository\TicketACLAwareRepositoryInterface;
+use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Component\Clock\MockClock;
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\SerializerInterface;
+
+/**
+ * @internal
+ *
+ * @covers \Chill\TicketBundle\Controller\TicketListApiController
+ */
+final class TicketListApiControllerByPersonCenterTest extends TestCase
+{
+    use ProphecyTrait;
+
+    public function testListTicketWithSingleCenter(): void
+    {
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $center = new Center();
+
+        $centerRepository = $this->prophesize(CenterRepositoryInterface::class);
+        $centerRepository->find(10)->willReturn($center);
+
+        $ticketRepository = $this->prophesize(TicketACLAwareRepositoryInterface::class);
+        $tickets = [new Ticket(), new Ticket()];
+        $ticketRepository->countTickets(
+            Argument::that(fn ($params) => isset($params['byPersonCenter']) && in_array($center, $params['byPersonCenter'], true))
+        )->shouldBeCalled()->willReturn(2);
+        $ticketRepository->findTickets(
+            Argument::that(fn ($params) => isset($params['byPersonCenter']) && in_array($center, $params['byPersonCenter'], true)),
+            0,
+            10
+        )->shouldBeCalled()->willReturn($tickets);
+
+        $paginator = $this->prophesize(PaginatorInterface::class);
+        $paginator->getCurrentPageFirstItemNumber()->willReturn(0);
+        $paginator->getItemsPerPage()->willReturn(10);
+
+        $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
+        $paginatorFactory->create(2)->willReturn($paginator->reveal());
+
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $serializer->serialize(
+            Argument::that(fn (Collection $collection) => $collection->getItems() === $tickets),
+            'json',
+            ['groups' => 'read:simple']
+        )->willReturn('{"items":[{},{}],"pagination":{}}');
+
+        $personRepository = $this->prophesize(PersonRepository::class);
+        $motiveRepository = $this->prophesize(MotiveRepository::class);
+        $userRepository = $this->prophesize(UserRepositoryInterface::class);
+
+        $controller = new TicketListApiController(
+            $security->reveal(),
+            $ticketRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $serializer->reveal(),
+            $personRepository->reveal(),
+            $motiveRepository->reveal(),
+            new MockClock(),
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
+            $userRepository->reveal(),
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal(),
+            $centerRepository->reveal(),
+        );
+
+        $request = new Request(query: ['byPersonCenter' => '10']);
+
+        $response = $controller->listTicket($request);
+
+        self::assertInstanceOf(JsonResponse::class, $response);
+        self::assertSame('{"items":[{},{}],"pagination":{}}', $response->getContent());
+    }
+
+    public function testListTicketWithMultipleCenters(): void
+    {
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $center1 = new Center();
+        $center2 = new Center();
+
+        $centerRepository = $this->prophesize(CenterRepositoryInterface::class);
+        $centerRepository->find(10)->willReturn($center1);
+        $centerRepository->find(20)->willReturn($center2);
+
+        $ticketRepository = $this->prophesize(TicketACLAwareRepositoryInterface::class);
+        $tickets = [new Ticket(), new Ticket()];
+        $ticketRepository->countTickets(
+            Argument::that(fn ($params) => isset($params['byPersonCenter']) && in_array($center1, $params['byPersonCenter'], true) && in_array($center2, $params['byPersonCenter'], true))
+        )->willReturn(2);
+        $ticketRepository->findTickets(
+            Argument::that(fn ($params) => isset($params['byPersonCenter']) && in_array($center1, $params['byPersonCenter'], true) && in_array($center2, $params['byPersonCenter'], true)),
+            0,
+            10
+        )->willReturn($tickets);
+
+        $paginator = $this->prophesize(PaginatorInterface::class);
+        $paginator->getCurrentPageFirstItemNumber()->willReturn(0);
+        $paginator->getItemsPerPage()->willReturn(10);
+
+        $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
+        $paginatorFactory->create(2)->willReturn($paginator->reveal());
+
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $serializer->serialize(
+            Argument::that(fn (Collection $collection) => $collection->getItems() === $tickets),
+            'json',
+            ['groups' => 'read:simple']
+        )->willReturn('{"items":[{},{}],"pagination":{}}');
+
+        $personRepository = $this->prophesize(PersonRepository::class);
+        $motiveRepository = $this->prophesize(MotiveRepository::class);
+        $userRepository = $this->prophesize(UserRepositoryInterface::class);
+
+        $controller = new TicketListApiController(
+            $security->reveal(),
+            $ticketRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $serializer->reveal(),
+            $personRepository->reveal(),
+            $motiveRepository->reveal(),
+            new MockClock(),
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
+            $userRepository->reveal(),
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal(),
+            $centerRepository->reveal(),
+        );
+
+        $request = new Request(query: ['byPersonCenter' => '10,20']);
+
+        $response = $controller->listTicket($request);
+
+        self::assertInstanceOf(JsonResponse::class, $response);
+        self::assertSame('{"items":[{},{}],"pagination":{}}', $response->getContent());
+    }
+
+    public function testListTicketWithNonNumericCenterId(): void
+    {
+        self::expectException(BadRequestHttpException::class);
+        self::expectExceptionMessage('Only numbers are allowed in by center parameter');
+
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $ticketRepository = $this->prophesize(TicketACLAwareRepositoryInterface::class);
+        $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $personRepository = $this->prophesize(PersonRepository::class);
+        $motiveRepository = $this->prophesize(MotiveRepository::class);
+        $userRepository = $this->prophesize(UserRepositoryInterface::class);
+        $userGroupRepository = $this->prophesize(UserGroupRepositoryInterface::class);
+        $centerRepository = $this->prophesize(CenterRepositoryInterface::class);
+
+        $controller = new TicketListApiController(
+            $security->reveal(),
+            $ticketRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $serializer->reveal(),
+            $personRepository->reveal(),
+            $motiveRepository->reveal(),
+            new MockClock(),
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
+            $userRepository->reveal(),
+            $userGroupRepository->reveal(),
+            $centerRepository->reveal(),
+        );
+
+        $request = new Request(query: ['byPersonCenter' => 'foo']);
+        $controller->listTicket($request);
+    }
+
+    public function testListTicketWithCenterNotFound(): void
+    {
+        self::expectException(BadRequestHttpException::class);
+        self::expectExceptionMessage('Center not found');
+
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true);
+
+        $centerRepository = $this->prophesize(CenterRepositoryInterface::class);
+        $centerRepository->find(10)->willReturn(null);
+
+        $ticketRepository = $this->prophesize(TicketACLAwareRepositoryInterface::class);
+        $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
+        $serializer = $this->prophesize(SerializerInterface::class);
+        $personRepository = $this->prophesize(PersonRepository::class);
+        $motiveRepository = $this->prophesize(MotiveRepository::class);
+        $userRepository = $this->prophesize(UserRepositoryInterface::class);
+
+        $controller = new TicketListApiController(
+            $security->reveal(),
+            $ticketRepository->reveal(),
+            $paginatorFactory->reveal(),
+            $serializer->reveal(),
+            $personRepository->reveal(),
+            $motiveRepository->reveal(),
+            new MockClock(),
+            new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
+            $userRepository->reveal(),
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal(),
+            $centerRepository->reveal(),
+        );
+
+        $request = new Request(query: ['byPersonCenter' => '10']);
+        $controller->listTicket($request);
+    }
+}
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByResponseTimeExceededTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByResponseTimeExceededTest.php
index 54fae993b..17241547e 100644
--- a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByResponseTimeExceededTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByResponseTimeExceededTest.php
@@ -13,6 +13,7 @@ namespace Chill\TicketBundle\Tests\Controller;
 
 use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
 use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Repository\CenterRepositoryInterface;
 use Chill\MainBundle\Repository\UserGroupRepositoryInterface;
 use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Serializer\Model\Collection;
@@ -109,7 +110,8 @@ final class TicketListApiControllerByResponseTimeExceededTest extends TestCase
             $mockClock,
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
             $userRepository->reveal(),
-            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal(),
+            $this->prophesize(CenterRepositoryInterface::class)->reveal()
         );
 
         // Create request with byResponseTimeExceeded parameter only
@@ -194,7 +196,8 @@ final class TicketListApiControllerByResponseTimeExceededTest extends TestCase
             $mockClock,
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
             $userRepository->reveal(),
-            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal(),
+            $this->prophesize(CenterRepositoryInterface::class)->reveal()
         );
 
         // Create request with both byCreatedAfter and byResponseTimeExceeded parameters
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByTicketIdTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByTicketIdTest.php
index f3fb1c1eb..1bc10e078 100644
--- a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByTicketIdTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerByTicketIdTest.php
@@ -13,6 +13,7 @@ namespace Chill\TicketBundle\Tests\Controller;
 
 use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
 use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Repository\CenterRepositoryInterface;
 use Chill\MainBundle\Repository\UserGroupRepositoryInterface;
 use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Serializer\Model\Collection;
@@ -92,7 +93,8 @@ final class TicketListApiControllerByTicketIdTest extends TestCase
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
             $userRepository->reveal(),
-            $userGroupRepository->reveal()
+            $userGroupRepository->reveal(),
+            $this->prophesize(CenterRepositoryInterface::class)->reveal()
         );
 
         // Create request with byTicketId filter
@@ -135,7 +137,8 @@ final class TicketListApiControllerByTicketIdTest extends TestCase
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
             $userRepository->reveal(),
-            $userGroupRepository->reveal()
+            $userGroupRepository->reveal(),
+            $this->prophesize(CenterRepositoryInterface::class)->reveal()
         );
 
         // Use -1 to trigger the controller's validation error
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerCurrentStateEmergencyTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerCurrentStateEmergencyTest.php
index ea4636ffe..cee3b6119 100644
--- a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerCurrentStateEmergencyTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerCurrentStateEmergencyTest.php
@@ -13,6 +13,7 @@ namespace Chill\TicketBundle\Tests\Controller;
 
 use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
 use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Repository\CenterRepositoryInterface;
 use Chill\MainBundle\Repository\UserGroupRepositoryInterface;
 use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Serializer\Model\Collection;
@@ -89,7 +90,8 @@ final class TicketListApiControllerCurrentStateEmergencyTest extends TestCase
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
             $userRepository->reveal(),
-            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal(),
+            $this->prophesize(CenterRepositoryInterface::class)->reveal()
         );
 
         // Create request with emergency filter
@@ -131,7 +133,8 @@ final class TicketListApiControllerCurrentStateEmergencyTest extends TestCase
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
             $userRepository->reveal(),
-            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal(),
+            $this->prophesize(CenterRepositoryInterface::class)->reveal()
         );
 
         // Create request with invalid emergency filter
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerCurrentStateTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerCurrentStateTest.php
index 15c8bcf51..5813c85ae 100644
--- a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerCurrentStateTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerCurrentStateTest.php
@@ -13,6 +13,7 @@ namespace Chill\TicketBundle\Tests\Controller;
 
 use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
 use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Repository\CenterRepositoryInterface;
 use Chill\MainBundle\Repository\UserGroupRepositoryInterface;
 use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Serializer\Model\Collection;
@@ -89,7 +90,8 @@ final class TicketListApiControllerCurrentStateTest extends TestCase
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
             $userRepository->reveal(),
-            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal(),
+            $this->prophesize(CenterRepositoryInterface::class)->reveal()
         );
 
         // Create request with person filter
@@ -131,7 +133,8 @@ final class TicketListApiControllerCurrentStateTest extends TestCase
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
             $userRepository->reveal(),
-            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal(),
+            $this->prophesize(CenterRepositoryInterface::class)->reveal()
         );
 
         // Create request with person filter
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerMotivesTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerMotivesTest.php
index 858a352b3..846bb9bfb 100644
--- a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerMotivesTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerMotivesTest.php
@@ -13,6 +13,7 @@ namespace Chill\TicketBundle\Tests\Controller;
 
 use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
 use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Repository\CenterRepositoryInterface;
 use Chill\MainBundle\Repository\UserGroupRepositoryInterface;
 use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Serializer\Model\Collection;
@@ -94,7 +95,8 @@ final class TicketListApiControllerMotivesTest extends TestCase
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
             $userRepository->reveal(),
-            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal(),
+            $this->prophesize(CenterRepositoryInterface::class)->reveal()
         );
 
         // Create request with multiple motives filter
@@ -160,7 +162,8 @@ final class TicketListApiControllerMotivesTest extends TestCase
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
             $userRepository->reveal(),
-            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal(),
+            $this->prophesize(CenterRepositoryInterface::class)->reveal()
         );
 
         // Create request with single motive filter
@@ -204,7 +207,8 @@ final class TicketListApiControllerMotivesTest extends TestCase
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
             $userRepository->reveal(),
-            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal(),
+            $this->prophesize(CenterRepositoryInterface::class)->reveal()
         );
 
         // Create request with non-existent motive
@@ -231,6 +235,7 @@ final class TicketListApiControllerMotivesTest extends TestCase
         $personRepository = $this->prophesize(PersonRepository::class);
         $motiveRepository = $this->prophesize(MotiveRepository::class);
         $userRepository = $this->prophesize(UserRepositoryInterface::class);
+        $centerRepository = $this->prophesize(CenterRepositoryInterface::class);
 
         // Create controller
         $controller = new TicketListApiController(
@@ -243,7 +248,8 @@ final class TicketListApiControllerMotivesTest extends TestCase
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
             $userRepository->reveal(),
-            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal(),
+            $centerRepository->reveal(),
         );
 
         // Create request with non-integer motive parameter
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerTest.php
index d9b8dd697..17facdea4 100644
--- a/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Controller/TicketListApiControllerTest.php
@@ -13,6 +13,7 @@ namespace Chill\TicketBundle\Tests\Controller;
 
 use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
 use Chill\MainBundle\Pagination\PaginatorInterface;
+use Chill\MainBundle\Repository\CenterRepositoryInterface;
 use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Chill\MainBundle\Repository\UserGroupRepositoryInterface;
 use Chill\MainBundle\Serializer\Model\Collection;
@@ -83,7 +84,8 @@ final class TicketListApiControllerTest extends TestCase
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
             $userRepository->reveal(),
-            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal(),
+            $this->prophesize(CenterRepositoryInterface::class)->reveal()
         );
 
         // Create request
@@ -145,7 +147,8 @@ final class TicketListApiControllerTest extends TestCase
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
             $userRepository->reveal(),
-            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal(),
+            $this->prophesize(CenterRepositoryInterface::class)->reveal()
         );
 
         // Create request with person filter
@@ -185,7 +188,8 @@ final class TicketListApiControllerTest extends TestCase
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
             $userRepository->reveal(),
-            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal(),
+            $this->prophesize(CenterRepositoryInterface::class)->reveal()
         );
 
         // Create request
@@ -228,7 +232,8 @@ final class TicketListApiControllerTest extends TestCase
             new MockClock(),
             new ParameterBag(['chill_ticket' => ['ticket' => ['response_time_exceeded_delay' => 'PT12H']]]),
             $userRepository->reveal(),
-            $this->prophesize(UserGroupRepositoryInterface::class)->reveal()
+            $this->prophesize(UserGroupRepositoryInterface::class)->reveal(),
+            $this->prophesize(CenterRepositoryInterface::class)->reveal()
         );
 
         // Create request with person filter
diff --git a/src/Bundle/ChillTicketBundle/tests/Repository/TicketACLAwareRepositoryTest.php b/src/Bundle/ChillTicketBundle/tests/Repository/TicketACLAwareRepositoryTest.php
index 3635d3dc3..17684b06f 100644
--- a/src/Bundle/ChillTicketBundle/tests/Repository/TicketACLAwareRepositoryTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Repository/TicketACLAwareRepositoryTest.php
@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\TicketBundle\Tests\Repository;
 
+use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\UserGroup;
 use Chill\PersonBundle\DataFixtures\Helper\RandomPersonHelperTrait;
@@ -192,4 +193,19 @@ class TicketACLAwareRepositoryTest extends KernelTestCase
 
         self::assertIsArray($actual);
     }
+
+    public function testFindByPersonCenter(): void
+    {
+        $centers = $this->entityManager->createQuery('SELECT c FROM '.Center::class.' c')
+            ->setMaxResults(2)
+            ->getResult();
+
+        if ([] === $centers) {
+            throw new \UnexpectedValueException('No centers found');
+        }
+
+        $actual = $this->repository->findTickets(['byPersonCenter' => $centers]);
+
+        self::assertIsArray($actual);
+    }
 }

From 380d48c43a17f1a506a40e58e3a3e11e26f12e8a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 19 Nov 2025 15:19:25 +0000
Subject: [PATCH 231/283] Hide inactive user groups in API responses

---
 .changes/unreleased/Fixed-20251119-161233.yaml           | 7 +++++++
 .../Controller/UserGroupApiController.php                | 9 ++++++++-
 2 files changed, 15 insertions(+), 1 deletion(-)
 create mode 100644 .changes/unreleased/Fixed-20251119-161233.yaml

diff --git a/.changes/unreleased/Fixed-20251119-161233.yaml b/.changes/unreleased/Fixed-20251119-161233.yaml
new file mode 100644
index 000000000..186f95d67
--- /dev/null
+++ b/.changes/unreleased/Fixed-20251119-161233.yaml
@@ -0,0 +1,7 @@
+kind: Fixed
+body: |
+    Hide the display of inactive user groups in the api
+time: 2025-11-19T16:12:33.803084517+01:00
+custom:
+    Issue: "471"
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillMainBundle/Controller/UserGroupApiController.php b/src/Bundle/ChillMainBundle/Controller/UserGroupApiController.php
index 602b84ec5..0395812b3 100644
--- a/src/Bundle/ChillMainBundle/Controller/UserGroupApiController.php
+++ b/src/Bundle/ChillMainBundle/Controller/UserGroupApiController.php
@@ -12,5 +12,12 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Controller;
 
 use Chill\MainBundle\CRUD\Controller\ApiController;
+use Symfony\Component\HttpFoundation\Request;
 
-class UserGroupApiController extends ApiController {}
+class UserGroupApiController extends ApiController
+{
+    protected function customizeQuery(string $action, Request $request, $query): void
+    {
+        $query->andWhere('e.active = TRUE');
+    }
+}

From 26d9b55c6d5cfb39c1de3be283e99486b17ddb39 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 20 Nov 2025 16:19:52 +0100
Subject: [PATCH 232/283] Update to v4.8.1

---
 .changes/unreleased/Fixed-20251119-133324.yaml | 6 ------
 .changes/unreleased/Fixed-20251119-134802.yaml | 6 ------
 .changes/unreleased/Fixed-20251119-161233.yaml | 7 -------
 .changes/v4.8.1.md                             | 6 ++++++
 CHANGELOG.md                                   | 7 +++++++
 5 files changed, 13 insertions(+), 19 deletions(-)
 delete mode 100644 .changes/unreleased/Fixed-20251119-133324.yaml
 delete mode 100644 .changes/unreleased/Fixed-20251119-134802.yaml
 delete mode 100644 .changes/unreleased/Fixed-20251119-161233.yaml
 create mode 100644 .changes/v4.8.1.md

diff --git a/.changes/unreleased/Fixed-20251119-133324.yaml b/.changes/unreleased/Fixed-20251119-133324.yaml
deleted file mode 100644
index 408863dfe..000000000
--- a/.changes/unreleased/Fixed-20251119-133324.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Fixed
-body: Insert name of file as the document title when uploading
-time: 2025-11-19T13:33:24.778116633+01:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/Fixed-20251119-134802.yaml b/.changes/unreleased/Fixed-20251119-134802.yaml
deleted file mode 100644
index 8c9250c40..000000000
--- a/.changes/unreleased/Fixed-20251119-134802.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Fixed
-body: Add missing path paramater 'id' for editing multiple participations
-time: 2025-11-19T13:48:02.078949572+01:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/Fixed-20251119-161233.yaml b/.changes/unreleased/Fixed-20251119-161233.yaml
deleted file mode 100644
index 186f95d67..000000000
--- a/.changes/unreleased/Fixed-20251119-161233.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-kind: Fixed
-body: |
-    Hide the display of inactive user groups in the api
-time: 2025-11-19T16:12:33.803084517+01:00
-custom:
-    Issue: "471"
-    SchemaChange: No schema change
diff --git a/.changes/v4.8.1.md b/.changes/v4.8.1.md
new file mode 100644
index 000000000..81decc30c
--- /dev/null
+++ b/.changes/v4.8.1.md
@@ -0,0 +1,6 @@
+## v4.8.1 - 2025-11-20
+### Fixed
+* Insert name of file as the document title when uploading   
+* Add missing path paramater 'id' for editing multiple participations   
+* ([#471](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/471)) Hide the display of inactive user groups in the api
+   
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 2cc2b5aa5..705efb332 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,13 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
+## v4.8.1 - 2025-11-20
+### Fixed
+* Insert name of file as the document title when uploading   
+* Add missing path paramater 'id' for editing multiple participations   
+* ([#471](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/471)) Hide the display of inactive user groups in the api
+   
+
 ## v4.8.0 - 2025-11-17
 ### Feature
 * ([#461](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/461)) Make a calendar item on the 'mes rendez-vous' page clickable. Clicking will navigate to the edit page of the calendar item.   

From 5c0cb01fdcc754ccaeca3770ec707235a36d8473 Mon Sep 17 00:00:00 2001
From: LenaertsJ <julie.lenaerts@champs-libres.coop>
Date: Mon, 24 Nov 2025 09:18:03 +0000
Subject: [PATCH 233/283] Alphabetically order userJobs and mainLocations
 within user creation form

---
 .changes/unreleased/UX-20251119-153706.yaml  |  6 +++++
 src/Bundle/ChillMainBundle/Form/UserType.php | 25 ++++++++++++++------
 2 files changed, 24 insertions(+), 7 deletions(-)
 create mode 100644 .changes/unreleased/UX-20251119-153706.yaml

diff --git a/.changes/unreleased/UX-20251119-153706.yaml b/.changes/unreleased/UX-20251119-153706.yaml
new file mode 100644
index 000000000..e2d32d425
--- /dev/null
+++ b/.changes/unreleased/UX-20251119-153706.yaml
@@ -0,0 +1,6 @@
+kind: UX
+body: Alphabetically order userJobs and mainLocations within user creation form
+time: 2025-11-19T15:37:06.393470745+01:00
+custom:
+    Issue: "470"
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillMainBundle/Form/UserType.php b/src/Bundle/ChillMainBundle/Form/UserType.php
index 019839961..79f95c20e 100644
--- a/src/Bundle/ChillMainBundle/Form/UserType.php
+++ b/src/Bundle/ChillMainBundle/Form/UserType.php
@@ -18,6 +18,7 @@ use Chill\MainBundle\Entity\UserJob;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\ChillPhoneNumberType;
 use Chill\MainBundle\Form\Type\PickCivilityType;
+use Chill\MainBundle\Repository\UserJobRepository;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Doctrine\ORM\EntityRepository;
 use Symfony\Bridge\Doctrine\Form\Type\EntityType;
@@ -36,7 +37,7 @@ use Symfony\Component\Validator\Constraints\Regex;
 
 class UserType extends AbstractType
 {
-    public function __construct(private readonly TranslatableStringHelper $translatableStringHelper, protected ParameterBagInterface $parameterBag) {}
+    public function __construct(private readonly TranslatableStringHelper $translatableStringHelper, protected ParameterBagInterface $parameterBag, private readonly UserJobRepository $userJobRepository) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
@@ -80,12 +81,7 @@ class UserType extends AbstractType
                 'placeholder' => 'choose a job',
                 'class' => UserJob::class,
                 'choice_label' => fn (UserJob $c) => $this->translatableStringHelper->localize($c->getLabel()),
-                'query_builder' => static function (EntityRepository $er) {
-                    $qb = $er->createQueryBuilder('uj');
-                    $qb->where('uj.active = TRUE');
-
-                    return $qb;
-                },
+                'choices' => $this->loadAndSortUserJobs(),
             ])
             ->add('mainLocation', EntityType::class, [
                 'label' => 'Main location',
@@ -96,6 +92,7 @@ class UserType extends AbstractType
                 'query_builder' => static function (EntityRepository $er) {
                     $qb = $er->createQueryBuilder('l');
                     $qb->orderBy('l.locationType');
+                    $qb->orderBy('l.name', 'ASC');
                     $qb->where('l.availableForUsers = TRUE');
 
                     return $qb;
@@ -155,6 +152,20 @@ class UserType extends AbstractType
         }
     }
 
+    private function loadAndSortUserJobs(): array
+    {
+        $items = $this->userJobRepository->findBy(['active' => true]);
+
+        usort(
+            $items,
+            fn ($a, $b) => mb_strtolower((string) $this->translatableStringHelper->localize($a->getLabel()))
+            <=>
+            mb_strtolower((string) $this->translatableStringHelper->localize($b->getLabel()))
+        );
+
+        return $items;
+    }
+
     /**
      * @param OptionsResolverInterface $resolver
      */

From a96e9d5377b742eb7c68f333aa9c643d8bbcc7eb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Mon, 24 Nov 2025 09:23:12 +0000
Subject: [PATCH 234/283] Associate activity's creator as a participant by
 default, and retro-actively append the creator to each activity

---
 .../unreleased/Fixed-20251118-140559.yaml     |  7 +++
 .../Controller/ActivityController.php         |  1 +
 .../migrations/Version20251118124241.php      | 50 +++++++++++++++++++
 3 files changed, 58 insertions(+)
 create mode 100644 .changes/unreleased/Fixed-20251118-140559.yaml
 create mode 100644 src/Bundle/ChillActivityBundle/migrations/Version20251118124241.php

diff --git a/.changes/unreleased/Fixed-20251118-140559.yaml b/.changes/unreleased/Fixed-20251118-140559.yaml
new file mode 100644
index 000000000..70f081e55
--- /dev/null
+++ b/.changes/unreleased/Fixed-20251118-140559.yaml
@@ -0,0 +1,7 @@
+kind: Fixed
+body: |
+    Associate activity's creator as a participant by default, and retro-actively append the creator to each activity
+time: 2025-11-18T14:05:59.904993123+01:00
+custom:
+    Issue: "466"
+    SchemaChange: Add columns or tables
diff --git a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
index f248c6559..bc9adc698 100644
--- a/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
+++ b/src/Bundle/ChillActivityBundle/Controller/ActivityController.php
@@ -382,6 +382,7 @@ final class ActivityController extends AbstractController
 
         $entity = new Activity();
         $entity->setUser($this->security->getUser());
+        $entity->addUser($this->security->getUser());
 
         if ($person instanceof Person) {
             $entity->setPerson($person);
diff --git a/src/Bundle/ChillActivityBundle/migrations/Version20251118124241.php b/src/Bundle/ChillActivityBundle/migrations/Version20251118124241.php
new file mode 100644
index 000000000..c06f3e674
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/migrations/Version20251118124241.php
@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\Migrations\Activity;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Migration fixing the automatic association of users to activities (exchanges).
+ *
+ * Originally, the user who created an exchange was not automatically associated
+ * to it (the "TMS" column), which led to incomplete data and biased statistics.
+ *
+ * This migration:
+ *  - retroactively associates the creator of each exchange to the corresponding
+ *    activity;
+ *  - flags these backfilled associations with a temporary column so it is clear
+ *    they were added by this data correction and can be safely cleaned up later.
+ */
+final class Version20251118124241 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Insert the creator of activity into the activity_user table';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE activity_user ADD COLUMN by_migration BOOL DEFAULT FALSE');
+        $this->addSql("COMMENT ON COLUMN activity_user.by_migration IS 'For backup purpose - can be safely deleted after a while. See migration \\Chill\\Migrations\\Activity\\Version20251118124241'");
+
+        $this->addSql('INSERT INTO activity_user (activity_id, user_id, by_migration)
+            SELECT id, user_id, true FROM activity
+            ON CONFLICT DO NOTHING');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE activity_user DROP COLUMN by_migration');
+    }
+}

From 0d32810d0d2978fb5f79a0f1361de48b6dbb1ad9 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Mon, 24 Nov 2025 15:13:16 +0100
Subject: [PATCH 235/283] Change position and color of confirm parcours button

---
 .changes/unreleased/UX-20251124-151115.yaml   |  6 +++++
 .../AccompanyingCourse/components/Confirm.vue | 22 +++++++++----------
 2 files changed, 17 insertions(+), 11 deletions(-)
 create mode 100644 .changes/unreleased/UX-20251124-151115.yaml

diff --git a/.changes/unreleased/UX-20251124-151115.yaml b/.changes/unreleased/UX-20251124-151115.yaml
new file mode 100644
index 000000000..f29ec87af
--- /dev/null
+++ b/.changes/unreleased/UX-20251124-151115.yaml
@@ -0,0 +1,6 @@
+kind: UX
+body: Change position and color of confirm parcours button
+time: 2025-11-24T15:11:15.960279853+01:00
+custom:
+    Issue: "437"
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue
index 408852711..0e843023d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue
@@ -20,16 +20,16 @@
                     </ul>
                 </div>
                 <ul class="record_actions">
-                    <li>
-                        <button class="btn btn-save" disabled>
-                            {{ $t("confirm.ok") }}
-                        </button>
-                    </li>
                     <li>
                         <a class="btn btn-delete" :href="deleteLink">
                             {{ $t("confirm.delete") }}
                         </a>
                     </li>
+                    <li>
+                        <button class="btn btn-save" disabled>
+                            {{ $t("confirm.ok") }}
+                        </button>
+                    </li>
                 </ul>
             </div>
 
@@ -40,6 +40,11 @@
                     "
                 />
                 <ul class="record_actions">
+                    <li>
+                        <a class="btn btn-delete" :href="deleteLink">
+                            {{ $t("confirm.delete") }}
+                        </a>
+                    </li>
                     <li>
                         <button
                             class="btn btn-save"
@@ -48,11 +53,6 @@
                             {{ $t("confirm.ok") }}
                         </button>
                     </li>
-                    <li>
-                        <a class="btn btn-delete" :href="deleteLink">
-                            {{ $t("confirm.delete") }}
-                        </a>
-                    </li>
                 </ul>
             </div>
         </div>
@@ -112,7 +112,7 @@
                 </template>
                 <template #footer>
                     <button
-                        class="btn btn-danger"
+                        class="btn btn-save"
                         :disabled="disableConfirm"
                         @click="confirmCourse"
                     >

From 035028c81cf51d2e26b604924121777d7763bccd Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Thu, 30 Oct 2025 14:07:53 +0100
Subject: [PATCH 236/283] Add missing fixtures for proper loading of
 AccompanyingPeriods

---
 .changes/unreleased/DX-20251030-123732.yaml   |  6 +++
 .../ORM/LoadAdministrativeLocation.php        | 45 +++++++++++++++++++
 .../DataFixtures/ORM/LoadLocationType.php     |  6 ++-
 .../DataFixtures/ORM/LoadUserJob.php          | 41 +++++++++++++++++
 .../DataFixtures/ORM/LoadPeople.php           |  8 ++++
 5 files changed, 105 insertions(+), 1 deletion(-)
 create mode 100644 .changes/unreleased/DX-20251030-123732.yaml
 create mode 100644 src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAdministrativeLocation.php
 create mode 100644 src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUserJob.php

diff --git a/.changes/unreleased/DX-20251030-123732.yaml b/.changes/unreleased/DX-20251030-123732.yaml
new file mode 100644
index 000000000..db3ca64c2
--- /dev/null
+++ b/.changes/unreleased/DX-20251030-123732.yaml
@@ -0,0 +1,6 @@
+kind: DX
+body: Add missing fixtures for proper loading of AccompanyingPeriods
+time: 2025-10-30T12:37:32.824593456+01:00
+custom:
+    Issue: "280"
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAdministrativeLocation.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAdministrativeLocation.php
new file mode 100644
index 000000000..2620620e2
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAdministrativeLocation.php
@@ -0,0 +1,45 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\DataFixtures\ORM;
+
+use Chill\MainBundle\Entity\Location;
+use Chill\MainBundle\Entity\LocationType;
+use Doctrine\Common\DataFixtures\AbstractFixture;
+use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
+use Doctrine\Persistence\ObjectManager;
+
+class LoadAdministrativeLocation extends AbstractFixture implements OrderedFixtureInterface
+{
+    final public const ADMINISTRATIVE_LOCATION = 'administrative_location';
+
+    public function getOrder(): int
+    {
+        return 9000;
+    }
+
+    public function load(ObjectManager $manager): void
+    {
+        $o = new Location();
+        /** @var LocationType $locationType */
+        $locationType = $this->getReference(LoadLocationType::LOCATION_TYPE.'_0');
+        $o->setLocationType($locationType);
+        $o->setName('Commune de Bruxelles');
+        $o->setAvailableForUsers(true);
+
+        $manager->persist($o);
+
+        $this->addReference(self::ADMINISTRATIVE_LOCATION, $o);
+        echo "Adding one Administrative Location\n";
+
+        $manager->flush();
+    }
+}
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLocationType.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLocationType.php
index a1185c655..cc5297214 100644
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLocationType.php
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadLocationType.php
@@ -25,6 +25,8 @@ class LoadLocationType extends AbstractFixture implements ContainerAwareInterfac
 {
     private ?ContainerInterface $container = null;
 
+    final public const LOCATION_TYPE = 'location_type';
+
     public function getOrder(): int
     {
         return 52;
@@ -53,13 +55,15 @@ class LoadLocationType extends AbstractFixture implements ContainerAwareInterfac
             ],
         ];
 
-        foreach ($arr as $a) {
+        foreach ($arr as $index => $a) {
             $locationType = (new LocationType())
                 ->setTitle($a['name'])
                 ->setAvailableForUsers(true)
                 ->setActive(true)
                 ->setAddressRequired($a['address_required']);
             $manager->persist($locationType);
+
+            $this->addReference(self::LOCATION_TYPE.'_'.$index, $locationType);
         }
 
         $manager->flush();
diff --git a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUserJob.php b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUserJob.php
new file mode 100644
index 000000000..d12648993
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUserJob.php
@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\DataFixtures\ORM;
+
+use Chill\MainBundle\Entity\UserJob;
+use Doctrine\Common\DataFixtures\AbstractFixture;
+use Doctrine\Common\DataFixtures\OrderedFixtureInterface;
+use Doctrine\Persistence\ObjectManager;
+
+class LoadUserJob extends AbstractFixture implements OrderedFixtureInterface
+{
+    final public const USER_JOB = 'user_job';
+    private array $socialWorker = ['en' => 'social worker', 'fr' => 'travailleur social'];
+
+    public function getOrder(): int
+    {
+        return 9000;
+    }
+
+    public function load(ObjectManager $manager): void
+    {
+        $o = new UserJob();
+        $o->setLabel($this->socialWorker);
+
+        $manager->persist($o);
+
+        $this->addReference(self::USER_JOB, $o);
+        echo "Adding one AccompanyingPeriod User Job\n";
+
+        $manager->flush();
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php
index d5299af14..753094ec1 100644
--- a/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php
+++ b/src/Bundle/ChillPersonBundle/DataFixtures/ORM/LoadPeople.php
@@ -11,15 +11,19 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\DataFixtures\ORM;
 
+use Chill\MainBundle\DataFixtures\ORM\LoadAdministrativeLocation;
 use Chill\MainBundle\DataFixtures\ORM\LoadPostalCodes;
+use Chill\MainBundle\DataFixtures\ORM\LoadUserJob;
 use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Country;
 use Chill\MainBundle\Entity\Gender;
 use Chill\MainBundle\Entity\GenderEnum;
+use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\PostalCode;
 use Chill\MainBundle\Entity\Scope;
 use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Entity\UserJob;
 use Chill\MainBundle\Repository\CenterRepository;
 use Chill\MainBundle\Repository\CountryRepository;
 use Chill\MainBundle\Repository\GenderRepository;
@@ -362,6 +366,10 @@ class LoadPeople extends AbstractFixture implements ContainerAwareInterface, Ord
             $origin = $this->getReference(LoadAccompanyingPeriodOrigin::ACCOMPANYING_PERIOD_ORIGIN, AccompanyingPeriod\Origin::class);
             $accompanyingPeriod->setOrigin($origin);
             $accompanyingPeriod->setIntensity('regular');
+            $userJob = $this->getReference(LoadUserJob::USER_JOB, UserJob::class);
+            $accompanyingPeriod->setJob($userJob);
+            $administrativeLocation = $this->getReference(LoadAdministrativeLocation::ADMINISTRATIVE_LOCATION, Location::class);
+            $accompanyingPeriod->setAdministrativeLocation($administrativeLocation);
             $accompanyingPeriod->setAddressLocation($this->createAddress());
             $manager->persist($accompanyingPeriod->getAddressLocation());
             $workflow = $this->workflowRegistry->get($accompanyingPeriod);

From 7a80307de9a27d97fb776144c93cc49939daab59 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 26 Nov 2025 14:15:27 +0100
Subject: [PATCH 237/283] Fix template parameter for update_multiple route on
 event participations

---
 .changes/unreleased/Fixed-20251126-141505.yaml              | 6 ++++++
 .../ChillEventBundle/Controller/ParticipationController.php | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 .changes/unreleased/Fixed-20251126-141505.yaml

diff --git a/.changes/unreleased/Fixed-20251126-141505.yaml b/.changes/unreleased/Fixed-20251126-141505.yaml
new file mode 100644
index 000000000..4514e6b40
--- /dev/null
+++ b/.changes/unreleased/Fixed-20251126-141505.yaml
@@ -0,0 +1,6 @@
+kind: Fixed
+body: Fix template parameter for update_multiple route on event participations
+time: 2025-11-26T14:15:05.824128067+01:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillEventBundle/Controller/ParticipationController.php b/src/Bundle/ChillEventBundle/Controller/ParticipationController.php
index 7fac83bf5..b100e47cd 100644
--- a/src/Bundle/ChillEventBundle/Controller/ParticipationController.php
+++ b/src/Bundle/ChillEventBundle/Controller/ParticipationController.php
@@ -486,7 +486,7 @@ final class ParticipationController extends AbstractController
 
             return $this->redirectToRoute(
                 'chill_event__event_show',
-                ['event_id' => $event->getId()]
+                ['id' => $event->getId()]
             );
         }
 

From 0caad2b7cd6d386677ee6d1ed90089e0782040de Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 26 Nov 2025 14:17:13 +0100
Subject: [PATCH 238/283] Update chill bundles to v4.8.2

---
 .../unreleased/Fixed-20251118-140559.yaml     |   7 -
 .../unreleased/Fixed-20251126-141505.yaml     |   6 -
 .changes/unreleased/UX-20251119-153706.yaml   |   6 -
 .changes/unreleased/UX-20251124-151115.yaml   |   6 -
 .changes/v4.8.2.md                            |  10 +
 CHANGELOG.md                                  | 449 +++++++++---------
 6 files changed, 239 insertions(+), 245 deletions(-)
 delete mode 100644 .changes/unreleased/Fixed-20251118-140559.yaml
 delete mode 100644 .changes/unreleased/Fixed-20251126-141505.yaml
 delete mode 100644 .changes/unreleased/UX-20251119-153706.yaml
 delete mode 100644 .changes/unreleased/UX-20251124-151115.yaml
 create mode 100644 .changes/v4.8.2.md

diff --git a/.changes/unreleased/Fixed-20251118-140559.yaml b/.changes/unreleased/Fixed-20251118-140559.yaml
deleted file mode 100644
index 70f081e55..000000000
--- a/.changes/unreleased/Fixed-20251118-140559.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-kind: Fixed
-body: |
-    Associate activity's creator as a participant by default, and retro-actively append the creator to each activity
-time: 2025-11-18T14:05:59.904993123+01:00
-custom:
-    Issue: "466"
-    SchemaChange: Add columns or tables
diff --git a/.changes/unreleased/Fixed-20251126-141505.yaml b/.changes/unreleased/Fixed-20251126-141505.yaml
deleted file mode 100644
index 4514e6b40..000000000
--- a/.changes/unreleased/Fixed-20251126-141505.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Fixed
-body: Fix template parameter for update_multiple route on event participations
-time: 2025-11-26T14:15:05.824128067+01:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/UX-20251119-153706.yaml b/.changes/unreleased/UX-20251119-153706.yaml
deleted file mode 100644
index e2d32d425..000000000
--- a/.changes/unreleased/UX-20251119-153706.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: UX
-body: Alphabetically order userJobs and mainLocations within user creation form
-time: 2025-11-19T15:37:06.393470745+01:00
-custom:
-    Issue: "470"
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/UX-20251124-151115.yaml b/.changes/unreleased/UX-20251124-151115.yaml
deleted file mode 100644
index f29ec87af..000000000
--- a/.changes/unreleased/UX-20251124-151115.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: UX
-body: Change position and color of confirm parcours button
-time: 2025-11-24T15:11:15.960279853+01:00
-custom:
-    Issue: "437"
-    SchemaChange: No schema change
diff --git a/.changes/v4.8.2.md b/.changes/v4.8.2.md
new file mode 100644
index 000000000..309255feb
--- /dev/null
+++ b/.changes/v4.8.2.md
@@ -0,0 +1,10 @@
+## v4.8.2 - 2025-11-26
+### Fixed
+* ([#466](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/466)) Associate activity's creator as a participant by default, and retro-actively append the creator to each activity
+   
+
+  **Schema Change**: Add columns or tables
+* Fix template parameter for update_multiple route on event participations   
+### UX
+* ([#470](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/470)) Alphabetically order userJobs and mainLocations within user creation form   
+* ([#437](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/437)) Change position and color of confirm parcours button   
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 705efb332..7b83397f0 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,117 +6,126 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
+## v4.8.2 - 2025-11-26
+### Fixed
+* ([#466](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/466)) Associate activity's creator as a participant by default, and retro-actively append the creator to each activity
+  **Schema Change**: Add columns or tables
+* Fix template parameter for update_multiple route on event participations
+### UX
+* ([#470](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/470)) Alphabetically order userJobs and mainLocations within user creation form
+* ([#437](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/437)) Change position and color of confirm parcours button
+
 ## v4.8.1 - 2025-11-20
 ### Fixed
-* Insert name of file as the document title when uploading   
-* Add missing path paramater 'id' for editing multiple participations   
+* Insert name of file as the document title when uploading
+* Add missing path paramater 'id' for editing multiple participations
 * ([#471](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/471)) Hide the display of inactive user groups in the api
-   
+
 
 ## v4.8.0 - 2025-11-17
 ### Feature
-* ([#461](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/461)) Make a calendar item on the 'mes rendez-vous' page clickable. Clicking will navigate to the edit page of the calendar item.   
+* ([#461](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/461)) Make a calendar item on the 'mes rendez-vous' page clickable. Clicking will navigate to the edit page of the calendar item.
 ### Fixed
-* ([#463](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/463)) Display calendar items for which an invite was accepted on the mes rendez-vous page   
+* ([#463](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/463)) Display calendar items for which an invite was accepted on the mes rendez-vous page
 * Improve accessibility on login page
-   
+
 ### UX
-* ([#449](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/449)) Remove the label if there is only one scope and no scope picking field is displayed.   
+* ([#449](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/449)) Remove the label if there is only one scope and no scope picking field is displayed.
 
 ## v4.7.0 - 2025-11-10
 ### Feature
-* ([#385](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/385)) Create invitation list in user menu   
-* ([#404](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/404)) Add columns for comments linked to an activity in the activity list export   
+* ([#385](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/385)) Create invitation list in user menu
+* ([#404](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/404)) Add columns for comments linked to an activity in the activity list export
 ### Fixed
-* ([#451](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/451)) Fix: display also social actions linked to parents of the selected social issue   
-* ([#453](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/453)) Fix: export actions and their results in csv even when action does not have any goals attached to it.   
-* Fix the possibility to delete a workflow   
+* ([#451](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/451)) Fix: display also social actions linked to parents of the selected social issue
+* ([#453](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/453)) Fix: export actions and their results in csv even when action does not have any goals attached to it.
+* Fix the possibility to delete a workflow
 
   **Schema Change**: Drop or rename table or columns, or enforce new constraint that must be manually fixed
-* ([#457](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/457)) Fix the fusion of thirdparty properties that are located in another schema than public for TO_ONE relations + add extra loop for MANY_TO_MANY relations where thirdparty is the source instead of the target   
-* ([#428](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/428)) Fix suggestion of referrer when creating notification for accompanyingPeriodWorkDocument   
+* ([#457](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/457)) Fix the fusion of thirdparty properties that are located in another schema than public for TO_ONE relations + add extra loop for MANY_TO_MANY relations where thirdparty is the source instead of the target
+* ([#428](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/428)) Fix suggestion of referrer when creating notification for accompanyingPeriodWorkDocument
 ### DX
 * Send notifications log to dedicated channel, if it exists
-   
+
 ### UX
-* ([#425](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/425)) Change the terms 'cercle' and 'centre' to 'service', and 'territoire' respectively.   
-* ([#542](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/542)) Improve the ux for selecting whether user wants to be notified of the final step of a workflow or all steps   
-* Expand timeSpent choices for evaluation document and translate them to user locale or fallback 'fr'   
-* ([#455](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/455)) Change the order of display for results and objectives in the social work/action form   
-* Wrap text when it is too long within badges   
+* ([#425](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/425)) Change the terms 'cercle' and 'centre' to 'service', and 'territoire' respectively.
+* ([#542](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/542)) Improve the ux for selecting whether user wants to be notified of the final step of a workflow or all steps
+* Expand timeSpent choices for evaluation document and translate them to user locale or fallback 'fr'
+* ([#455](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/455)) Change the order of display for results and objectives in the social work/action form
+* Wrap text when it is too long within badges
 
 ## v4.6.1 - 2025-10-27
 ### Fixed
-* Fix export case where no 'reason' is picked within the PersonHavingActivityBetweenDateFilter.php   
+* Fix export case where no 'reason' is picked within the PersonHavingActivityBetweenDateFilter.php
 
 ## v4.6.0 - 2025-10-15
 ### Feature
-* ([#423](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/423)) Create environment banner that can be activated and configured depending on the image deployed   
-* ([#394](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/394)) Only show active workflow on the page "my tracked workflow"   
+* ([#423](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/423)) Create environment banner that can be activated and configured depending on the image deployed
+* ([#394](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/394)) Only show active workflow on the page "my tracked workflow"
 ### Fixed
-* Fix loading of classLists in SocialIssuesAcc.vue, ensure elements are present   
-* Fix the rendering of list of StoredObjectVersions, where there are kept version (before converting to pdf) and intermediate versions deleted   
-* ([#434](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/434)) Notification: fix editing of sent notification by removing form.addressesEmails, a field that no longer exists   
-* Fix loading of social issues and social actions within vue component   
-* ([#446](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/446)) Add unique condition on stored object filename, with cleaning step on existing duplicate filenames   
+* Fix loading of classLists in SocialIssuesAcc.vue, ensure elements are present
+* Fix the rendering of list of StoredObjectVersions, where there are kept version (before converting to pdf) and intermediate versions deleted
+* ([#434](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/434)) Notification: fix editing of sent notification by removing form.addressesEmails, a field that no longer exists
+* Fix loading of social issues and social actions within vue component
+* ([#446](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/446)) Add unique condition on stored object filename, with cleaning step on existing duplicate filenames
 
   **Schema Change**: Drop or rename table or columns, or enforce new constraint that must be manually fixed
-* [workflow] take permissions into account to delete the workflow attachment   
-* ([#448](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/448)) Fix the execution of daily cronjob notification, when the previous last execution storage was invalid   
+* [workflow] take permissions into account to delete the workflow attachment
+* ([#448](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/448)) Fix the execution of daily cronjob notification, when the previous last execution storage was invalid
 
 ## v4.5.1 - 2025-10-03
 ### Fixed
-* Add missing javascript dependency   
-* Add exception handling for conversion of attachment on sending external, when documens are already in pdf   
+* Add missing javascript dependency
+* Add exception handling for conversion of attachment on sending external, when documens are already in pdf
 
 ## v4.5.0 - 2025-10-03
 ### Feature
-* Only allow delete of attachment on workflows that are not final   
-* Move up signature buttons on index workflow page for easier access   
-* Filter out document from attachment list if it is the same as the workflow document   
-* Block edition on attached document on workflow, if the workflow is finalized or sent external   
-* Convert workflow's attached document to pdf while sending them external   
-* After a signature is canceled or rejected, going to a waiting page until the post-process routines apply a workflow transition   
+* Only allow delete of attachment on workflows that are not final
+* Move up signature buttons on index workflow page for easier access
+* Filter out document from attachment list if it is the same as the workflow document
+* Block edition on attached document on workflow, if the workflow is finalized or sent external
+* Convert workflow's attached document to pdf while sending them external
+* After a signature is canceled or rejected, going to a waiting page until the post-process routines apply a workflow transition
 ### Fixed
-* ([#426](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/426)) Increased the number of required characters when setting a new password in Chill from 9 to 14 - GDPR compliance   
-* Fix permissions on storedObject which are subject by a workflow   
+* ([#426](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/426)) Increased the number of required characters when setting a new password in Chill from 9 to 14 - GDPR compliance
+* Fix permissions on storedObject which are subject by a workflow
 ### DX
-* Introduce a WaitingScreen component to display a waiting screen   
+* Introduce a WaitingScreen component to display a waiting screen
 
 ## v4.4.2 - 2025-09-12
 ### Fixed
-* Fix document generation and workflow generation do not work on accompanying period work documents   
+* Fix document generation and workflow generation do not work on accompanying period work documents
 
 ## v4.4.1 - 2025-09-11
 ### Fixed
-* fix translations in duplicate evaluation document modal and realign close modal button   
+* fix translations in duplicate evaluation document modal and realign close modal button
 
 ## v4.4.0 - 2025-09-11
 ### Feature
-* ([#359](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/359)) Allow the merge of two accompanying period works   
-* ([#369](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/369)) Duplication of a document to another accompanying period work evaluation   
-* ([#359](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/359)) Fusion of two accompanying period works   
+* ([#359](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/359)) Allow the merge of two accompanying period works
+* ([#369](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/369)) Duplication of a document to another accompanying period work evaluation
+* ([#359](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/359)) Fusion of two accompanying period works
 ### Fixed
-* Fix display of 'duplicate' and 'merge' buttons in CRUD templates   
-* Fix saving notification preferences in user's profile   
+* Fix display of 'duplicate' and 'merge' buttons in CRUD templates
+* Fix saving notification preferences in user's profile
 
 ## v4.3.0 - 2025-09-08
 ### Feature
-* ([#409](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/409)) Add 45 and 60 min calendar ranges   
-* Add a command to generate a list of permissions   
-* ([#412](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/412)) Add an absence end date   
+* ([#409](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/409)) Add 45 and 60 min calendar ranges
+* Add a command to generate a list of permissions
+* ([#412](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/412)) Add an absence end date
 
   **Schema Change**: Add columns or tables
 ### Fixed
-* fix date formatting in calendar range display   
-* Change route URL to avoid clash with person duplicate controller method   
+* fix date formatting in calendar range display
+* Change route URL to avoid clash with person duplicate controller method
 
 ## v4.2.1 - 2025-09-03
 ### Fixed
-* Fix exports to work with DirectExportInterface   
+* Fix exports to work with DirectExportInterface
 ### DX
 * Improve error message when a stored object cannot be written on local disk
-   
+
 
 ## v4.2.0 - 2025-09-02
 ### Feature
@@ -131,26 +140,26 @@ and is generated by [Changie](https://github.com/miniscruff/changie).
 
 ## v4.1.0 - 2025-08-26
 ### Feature
-* ([#400](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/400)) Add filter to social actions list to filter out actions where current user intervenes   
-* ([#399](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/399)) Show filters on list pages unfolded by default   
-* Expansion of event module with new fields in the creation form: thematic, internal/external animator, responsable, and budget elements. Filtering options in the event list + adapted exports   
+* ([#400](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/400)) Add filter to social actions list to filter out actions where current user intervenes
+* ([#399](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/399)) Show filters on list pages unfolded by default
+* Expansion of event module with new fields in the creation form: thematic, internal/external animator, responsable, and budget elements. Filtering options in the event list + adapted exports
 
   **Schema Change**: Add columns or tables
 ### Fixed
-* ([#382](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/382)) adjust display logic for accompanying period dates, include closing date if period is closed.   
-* ([#384](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/384)) add min and step attributes to integer field in DateIntervalType   
+* ([#382](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/382)) adjust display logic for accompanying period dates, include closing date if period is closed.
+* ([#384](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/384)) add min and step attributes to integer field in DateIntervalType
 ### UX
-* Limit display of participations in event list   
+* Limit display of participations in event list
 
 ## v4.0.2 - 2025-07-09
 ### Fixed
-* Fix add missing translation   
-* Fix the transfer of evaluations and documents during of accompanyingperiodwork   
+* Fix add missing translation
+* Fix the transfer of evaluations and documents during of accompanyingperiodwork
 
 ## v4.0.1 - 2025-07-08
 ### Fixed
 * Fix package.json for compilation
-   
+
 
 ## v4.0.0 - 2025-07-08
 ### Feature
@@ -229,30 +238,30 @@ framework:
 
 ## v3.12.1 - 2025-06-30
 ### Fixed
-* Fix loading of the list of documents   
+* Fix loading of the list of documents
 
 ## v3.12.0 - 2025-06-30
 ### Feature
-* ([#377](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/377)) Add the document file name to the document title when a user upload a document, unless there is already a document title.   
-* Add desactivation date for social action and issue csv export   
-* Add Emoji and Fullscreen feature to ckeditor configuration   
-* ([#321](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/321)) Create editor which allow us to toggle between rich and simple text editor   
-* Do not remove workflow which are automatically canceled after staling for more than 30 days   
+* ([#377](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/377)) Add the document file name to the document title when a user upload a document, unless there is already a document title.
+* Add desactivation date for social action and issue csv export
+* Add Emoji and Fullscreen feature to ckeditor configuration
+* ([#321](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/321)) Create editor which allow us to toggle between rich and simple text editor
+* Do not remove workflow which are automatically canceled after staling for more than 30 days
 ### Fixed
-* ([#376](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/376)) trying to prevent bug of typeerror in doc-history + improved display of document history   
-* ([#381](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/381)) Display previous participation in acc course work even if the person has left the acc course   
-* ([#372](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/372)) Fix display of text in calendar events   
-* Add missing translation for user_group.no_user_groups   
-* Fix admin entity edit actions for event admin entities and activity reason (category) entities   
+* ([#376](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/376)) trying to prevent bug of typeerror in doc-history + improved display of document history
+* ([#381](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/381)) Display previous participation in acc course work even if the person has left the acc course
+* ([#372](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/372)) Fix display of text in calendar events
+* Add missing translation for user_group.no_user_groups
+* Fix admin entity edit actions for event admin entities and activity reason (category) entities
 * ([#392](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/392)) Allow null and cast as string to setContent method for NewsItem
-   
-* ([#393](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/393)) Doc Generation: the "dump only" method send the document as an email attachment.   
+
+* ([#393](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/393)) Doc Generation: the "dump only" method send the document as an email attachment.
 ### DX
-* ([#352](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/352)) Remove dead code for wopi-link module   
-* Replace library node-sass by sass, and upgrade bootstrap to version 5.3 (yarn upgrade / install is required)   
+* ([#352](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/352)) Remove dead code for wopi-link module
+* Replace library node-sass by sass, and upgrade bootstrap to version 5.3 (yarn upgrade / install is required)
 ### UX
-* ([#374](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/374)) Remove default filter in_progress for the page 'my tasks'; Allows for new tasks to be displayed upon opening of the page   
-* Improve labeling of fields in person resource creation form   
+* ([#374](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/374)) Remove default filter in_progress for the page 'my tasks'; Allows for new tasks to be displayed upon opening of the page
+* Improve labeling of fields in person resource creation form
 
 ## v3.11.0 - 2025-04-17
 ### Feature
@@ -276,11 +285,11 @@ framework:
 
 ## v3.10.3 - 2025-03-18
 ### DX
-* Eslint fixes   
+* Eslint fixes
 
 ## v3.10.2 - 2025-03-17
 ### Fixed
-* Replace a ts-expect-error with a ts-ignore   
+* Replace a ts-expect-error with a ts-ignore
 
 ## v3.10.1 - 2025-03-17
 ### DX
@@ -288,37 +297,37 @@ framework:
 
 ## v3.10.0 - 2025-03-17
 ### Feature
-* ([#363](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/363)) Display social actions grouped per social issue within activity form   
+* ([#363](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/363)) Display social actions grouped per social issue within activity form
 ### Fixed
-* ([#362](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/362)) Fix Dependency Injection, which prevented to save the CalendarRange   
-* ([#368](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/368)) fix search query for user groups   
+* ([#362](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/362)) Fix Dependency Injection, which prevented to save the CalendarRange
+* ([#368](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/368)) fix search query for user groups
 
 ## v3.9.2 - 2025-02-27
 ### Fixed
-* Use fetchResults method to fetch all social issues instead of only the first page   
+* Use fetchResults method to fetch all social issues instead of only the first page
 
 ## v3.9.1 - 2025-02-27
 ### Fixed
-* Fix post/patch request with missing 'type' property for gender   
+* Fix post/patch request with missing 'type' property for gender
 
 ## v3.9.0 - 2025-02-27
 ### Feature
-* ([#349](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/349)) Suggest all referrers within actions of the accompanying period when creating an activity   
-* ([#343](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/343)) Add possibility to export a csv with all social issues and social actions   
-* ([#360](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/360)) Restore document to previous kept version when a workflow is canceled   
-* ([#341](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/341)) Add a list of third parties from within the admin (csv download)   
+* ([#349](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/349)) Suggest all referrers within actions of the accompanying period when creating an activity
+* ([#343](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/343)) Add possibility to export a csv with all social issues and social actions
+* ([#360](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/360)) Restore document to previous kept version when a workflow is canceled
+* ([#341](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/341)) Add a list of third parties from within the admin (csv download)
 ### Fixed
-* fix generation of document with accompanying period context, and list of activities and works   
+* fix generation of document with accompanying period context, and list of activities and works
 ### DX
-* ([#333](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/333)) Create an unique source of trust for translations   
+* ([#333](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/333)) Create an unique source of trust for translations
 
 ## v3.8.2 - 2025-02-10
 ### Fixed
-* ([#358](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/358)) Remove "filter" button on list of documents in the workflow's "add attachement" modal   
+* ([#358](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/358)) Remove "filter" button on list of documents in the workflow's "add attachement" modal
 
 ## v3.8.1 - 2025-02-05
 ### Fixed
-* Fix household link in the parcours banner   
+* Fix household link in the parcours banner
 
 ## v3.8.0 - 2025-02-03
 ### Feature
@@ -334,7 +343,7 @@ framework:
 
 ## v3.7.1 - 2025-01-21
 ### Fixed
-* Fix legacy configuration processor for notifier component   
+* Fix legacy configuration processor for notifier component
 
 ## v3.7.0 - 2025-01-21
 ### Feature
@@ -401,33 +410,33 @@ chill_main:
 
 ## v3.6.0 - 2025-01-16
 ### Feature
-* Importer for addresses does not fails when the postal code is not found with some addresses, and compute a recap list of all addresses that could not be imported. This recap list can be send by email. 
+* Importer for addresses does not fails when the postal code is not found with some addresses, and compute a recap list of all addresses that could not be imported. This recap list can be send by email.
 * ([#346](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/346)) Create a driver for storing documents on disk (instead of openstack object store)
- 
-* Add address importer from french Base d'Adresse Nationale (BAN) 
-* ([#343](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/343)) Add csv export for social issues and social actions 
+
+* Add address importer from french Base d'Adresse Nationale (BAN)
+* ([#343](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/343)) Add csv export for social issues and social actions
 ### Fixed
-* Export: fix missing alias in activity between certain dates filter. Condition added for alias. 
+* Export: fix missing alias in activity between certain dates filter. Condition added for alias.
 
 ## v3.5.3 - 2025-01-07
 ### Fixed
-* Fix the EntityToJsonTransformer to return an empty array if the value is "" 
+* Fix the EntityToJsonTransformer to return an empty array if the value is ""
 
 ## v3.5.2 - 2024-12-19
 ### Fixed
-* ([#345](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/345)) Export: activity filtering of users that were associated to an activity between certain dates. Results contained activities that were not within the specified date range" 
+* ([#345](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/345)) Export: activity filtering of users that were associated to an activity between certain dates. Results contained activities that were not within the specified date range"
 
 ## v3.5.1 - 2024-12-16
 ### Fixed
-* Filiation: fix the display of the gender label in the graph 
-* Wrap handling of PdfSignedMessage into transactions 
+* Filiation: fix the display of the gender label in the graph
+* Wrap handling of PdfSignedMessage into transactions
 
 ## v3.5.0 - 2024-12-09
 ### Feature
-* ([#318](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/318)) Show all the pages of the documents in the signature app 
+* ([#318](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/318)) Show all the pages of the documents in the signature app
 ### Fixed
-* Wrap the signature's change state into a transaction, to avoid race conditions 
-* Fix display of gender label 
+* Wrap the signature's change state into a transaction, to avoid race conditions
+* Fix display of gender label
 
 ## v3.4.3 - 2024-12-05
 ### Fixed
@@ -436,76 +445,76 @@ chill_main:
 
 ## v3.4.2 - 2024-12-05
 ### Fixed
-* ([#329](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/329)) Fix the serialization of gender for the generation of documents 
-* ([#337](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/337)) Enforce unique contraint on activity storedobject 
+* ([#329](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/329)) Fix the serialization of gender for the generation of documents
+* ([#337](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/337)) Enforce unique contraint on activity storedobject
 ### DX
-* ([#310](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/310)) Clean migrations, to reduce the number of bloated migration when running diff on schema 
+* ([#310](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/310)) Clean migrations, to reduce the number of bloated migration when running diff on schema
 
 ## v3.4.1 - 2024-11-22
 ### Fixed
-* Set the workflow's title to notification content and subject 
+* Set the workflow's title to notification content and subject
 
 ## v3.4.0 - 2024-11-20
 ### Feature
 * ([#314](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/314)) Admin: improve document type admin form with a select field for related class.
-Admin: Allow administrator to assign multiple group centers in one go to a user. 
+Admin: Allow administrator to assign multiple group centers in one go to a user.
 
 ## v3.3.0 - 2024-11-20
 ### Feature
 * Electronic signature
 
-Implementation of the electronic signature for documents within chill. 
-* ([#286](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/286)) The behavoir of the voters for stored objects is adjusted so as to limit edit and delete possibilities to users related to the activity, social action or workflow entity. 
-* ([#288](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/288)) Metadata form added for person signatures 
-* Add a signature step in workflow, which allow to apply an electronic signature on documents 
-* Keep an history of each version of a stored object. 
-* Add a "send external" step in workflow, which allow to send stored objects and other elements to remote people, by sending them a public url 
+Implementation of the electronic signature for documents within chill.
+* ([#286](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/286)) The behavoir of the voters for stored objects is adjusted so as to limit edit and delete possibilities to users related to the activity, social action or workflow entity.
+* ([#288](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/288)) Metadata form added for person signatures
+* Add a signature step in workflow, which allow to apply an electronic signature on documents
+* Keep an history of each version of a stored object.
+* Add a "send external" step in workflow, which allow to send stored objects and other elements to remote people, by sending them a public url
 ### Fixed
-* Adjust household list export to include households even if their address is NULL 
-* Remove validation of date string on deathDate 
+* Adjust household list export to include households even if their address is NULL
+* Remove validation of date string on deathDate
 
 ## v3.2.4 - 2024-11-06
 ### Fixed
-* Fix compilation of chill assets 
+* Fix compilation of chill assets
 
 ## v3.2.3 - 2024-11-05
 ### Fixed
 * ([#315](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/315)) Fix display of accompanying period work referrers. Only current referrers should be displayed.
-Fix color of Chill footer 
+Fix color of Chill footer
 
 ## v3.2.2 - 2024-10-31
 ### Fixed
-* Fix gender translation for unknown 
+* Fix gender translation for unknown
 
 ## v3.2.1 - 2024-10-31
 ### Fixed
-* Add the possibility of unknown to the gender entity 
-* Fix the fusion of person doubles by excluding accompanyingPeriod work entities to be deleted. They are moved instead. 
+* Add the possibility of unknown to the gender entity
+* Fix the fusion of person doubles by excluding accompanyingPeriod work entities to be deleted. They are moved instead.
 
 ## v3.2.0 - 2024-10-30
 ### Feature
-* Introduce a gender entity 
+* Introduce a gender entity
 
 ## v3.1.1 - 2024-10-01
 ### Fixed
-* ([#308](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/308)) Show only the current referrer in the page "show" for an accompanying period workf 
+* ([#308](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/308)) Show only the current referrer in the page "show" for an accompanying period workf
 * ([#309](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/309)) Correctly compute the grouping by referrer aggregator
- 
-* Fixed typing of custom field long choice and custom field group 
+
+* Fixed typing of custom field long choice and custom field group
 
 ## v3.1.0 - 2024-08-30
 ### Feature
-* Add export aggregator to aggregate activities by household + filter persons that are not part of an accompanyingperiod during a certain timeframe. 
+* Add export aggregator to aggregate activities by household + filter persons that are not part of an accompanyingperiod during a certain timeframe.
 
 ## v3.0.0 - 2024-08-26
 ### Fixed
-* Fix delete action for accompanying periods in draft state 
-* Fix connection to azure when making an calendar event in chill 
-* CollectionType js fixes for remove button and adding multiple entries 
+* Fix delete action for accompanying periods in draft state
+* Fix connection to azure when making an calendar event in chill
+* CollectionType js fixes for remove button and adding multiple entries
 
 ## v2.24.0 - 2024-09-11
 ### Feature
-* ([#306](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/306)) When a document is converted or downloaded in the browser, this document is removed from the browser memory after 45s. Future click on the button re-download the document. 
+* ([#306](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/306)) When a document is converted or downloaded in the browser, this document is removed from the browser memory after 45s. Future click on the button re-download the document.
 
 ## v2.23.0 - 2024-07-23 & 2024-07-19
 ### Feature
@@ -540,13 +549,13 @@ Fix color of Chill footer
 
 ## v2.22.2 - 2024-07-03
 ### Fixed
-* Remove scope required for event participation stats 
+* Remove scope required for event participation stats
 
 ## v2.22.1 - 2024-07-01
 ### Fixed
-* Remove debug word 
+* Remove debug word
 ### DX
-* Add a command for reading official address DB from Luxembourg and update chill addresses 
+* Add a command for reading official address DB from Luxembourg and update chill addresses
 
 ## v2.22.0 - 2024-06-25
 ### Feature
@@ -589,7 +598,7 @@ Fix color of Chill footer
 
 ## v2.20.1 - 2024-06-05
 ### Fixed
-* Do not allow StoredObjectCreated for edit and convert buttons 
+* Do not allow StoredObjectCreated for edit and convert buttons
 
 ## v2.20.0 - 2024-06-05
 ### Fixed
@@ -636,96 +645,96 @@ Fix color of Chill footer
 
 ## v2.18.2 - 2024-04-12
 ### Fixed
-* ([#250](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/250)) Postal codes import : fix the source URL and the keys to handle each record 
+* ([#250](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/250)) Postal codes import : fix the source URL and the keys to handle each record
 
 ## v2.18.1 - 2024-03-26
 ### Fixed
-* Fix layout issue in document generation for admin (minor) 
+* Fix layout issue in document generation for admin (minor)
 
 ## v2.18.0 - 2024-03-26
 ### Feature
-* ([#268](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/268)) Improve admin UX to configure document templates for document generation 
+* ([#268](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/268)) Improve admin UX to configure document templates for document generation
 ### Fixed
-* ([#267](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/267)) Fix the join between job and user in the user list (admin): show only the current user job 
+* ([#267](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/267)) Fix the join between job and user in the user list (admin): show only the current user job
 
 ## v2.17.0 - 2024-03-19
 ### Feature
-* ([#237](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/237)) New export filter for social actions with an evaluation created between two dates 
-* ([#258](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/258)) In the list of accompangying period, add the list of person's centers and the duration of the course 
-* ([#238](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/238)) Allow to customize list person with new fields 
+* ([#237](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/237)) New export filter for social actions with an evaluation created between two dates
+* ([#258](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/258)) In the list of accompangying period, add the list of person's centers and the duration of the course
+* ([#238](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/238)) Allow to customize list person with new fields
 * ([#159](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/159)) Admin can publish news on the homepage
 ### Fixed
-* ([#264](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/264)) Fix languages: load the languages in all availables languages configured for Chill 
-* ([#259](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/259)) Keep a consistent behaviour between the filtering of activities within the document generation (model "accompanying period with activities"), and the same filter in the list of activities for an accompanying period 
+* ([#264](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/264)) Fix languages: load the languages in all availables languages configured for Chill
+* ([#259](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/259)) Keep a consistent behaviour between the filtering of activities within the document generation (model "accompanying period with activities"), and the same filter in the list of activities for an accompanying period
 
 ## v2.16.3 - 2024-02-26
 ### Fixed
-* ([#236](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/236)) Fix translation of user job -> 'service' must be 'métier' 
+* ([#236](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/236)) Fix translation of user job -> 'service' must be 'métier'
 ### UX
-* ([#232](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/232)) Order user jobs and services alphabetically in export filters 
+* ([#232](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/232)) Order user jobs and services alphabetically in export filters
 
 ## v2.16.2 - 2024-02-21
 ### Fixed
-* Check for null values in closing motive of parcours d'accompagnement for correct rendering of template 
+* Check for null values in closing motive of parcours d'accompagnement for correct rendering of template
 
 ## v2.16.1 - 2024-02-09
 ### Fixed
-* Force bootstrap version to avoid error in builds with newer version 
+* Force bootstrap version to avoid error in builds with newer version
 
 ## v2.16.0 - 2024-02-08
 ### Feature
-* ([#231](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/231)) Create new filter for persons having a participation in an accompanying period during a certain time span 
-* ([#241](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/241)) [Export][List of accompanyign period] Add two columns: the list of persons participating to the period, and their ids 
-* ([#244](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/244)) Add capability to generate export about change of steps of accompanying period, and generate exports for this 
-* ([#253](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/253)) Export: group accompanying period by person participating 
-* ([#243](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/243)) Export: add filter for courses not linked to a reference address 
-* ([#229](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/229)) Allow to group activities linked with accompanying period by reason 
-* ([#115](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/115)) Prevent social work to be saved when another user edited conccurently the social work 
-* Modernize the event bundle, with some new fields and multiple improvements 
+* ([#231](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/231)) Create new filter for persons having a participation in an accompanying period during a certain time span
+* ([#241](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/241)) [Export][List of accompanyign period] Add two columns: the list of persons participating to the period, and their ids
+* ([#244](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/244)) Add capability to generate export about change of steps of accompanying period, and generate exports for this
+* ([#253](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/253)) Export: group accompanying period by person participating
+* ([#243](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/243)) Export: add filter for courses not linked to a reference address
+* ([#229](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/229)) Allow to group activities linked with accompanying period by reason
+* ([#115](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/115)) Prevent social work to be saved when another user edited conccurently the social work
+* Modernize the event bundle, with some new fields and multiple improvements
 ### Fixed
-* ([#220](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/220)) Fix error in logs about wrong typing of eventArgs in onEditNotificationComment method 
-* ([#256](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/256)) Fix the conditions upon which social actions should be optional or required in relation to social issues within the activity creation form 
+* ([#220](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/220)) Fix error in logs about wrong typing of eventArgs in onEditNotificationComment method
+* ([#256](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/256)) Fix the conditions upon which social actions should be optional or required in relation to social issues within the activity creation form
 ### UX
-* ([#260](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/260)) Order list of centers alphabetically in dropdown 'user' section admin. 
+* ([#260](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/260)) Order list of centers alphabetically in dropdown 'user' section admin.
 
 ## v2.15.2 - 2024-01-11
 ### Fixed
-* Fix the id_seq used when creating a new accompanying period participation during fusion of two person files 
+* Fix the id_seq used when creating a new accompanying period participation during fusion of two person files
 ### DX
-* Set placeholder to False for expanded EntityType form fields where required is set to False. 
+* Set placeholder to False for expanded EntityType form fields where required is set to False.
 
 ## v2.15.1 - 2023-12-20
 ### Fixed
-* Fix the household export query to exclude accompanying periods that are in draft state. 
+* Fix the household export query to exclude accompanying periods that are in draft state.
 ### DX
-* ([#167](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/167)) Fixed readthedocs compilation by updating readthedocs config file and requirements for Sphinx 
+* ([#167](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/167)) Fixed readthedocs compilation by updating readthedocs config file and requirements for Sphinx
 
 ## v2.15.0 - 2023-12-11
 ### Feature
-* ([#191](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/191)) Add export "number of household associate with an exchange" 
-* ([#235](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/235)) Export: add dates on the filter "filter course by activity type" 
+* ([#191](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/191)) Add export "number of household associate with an exchange"
+* ([#235](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/235)) Export: add dates on the filter "filter course by activity type"
 ### Fixed
-* ([#214](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/214)) Fix error when posting an empty comment on an accompanying period. 
-* ([#233](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/233)) Fix "filter evaluation by evaluation type" (and add select2 to the list of evaluation types to pick) 
+* ([#214](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/214)) Fix error when posting an empty comment on an accompanying period.
+* ([#233](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/233)) Fix "filter evaluation by evaluation type" (and add select2 to the list of evaluation types to pick)
 * ([#234](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/234)) Fix "filter aside activity by date"
- 
-* ([#228](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/228)) Fix export of activity for people created before the introduction of the createdAt column on person (during v1) 
-* ([#246](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/246)) Do not show activities, evaluations and social work when associated to a confidential accompanying period, except for the users which are allowed to see them 
+
+* ([#228](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/228)) Fix export of activity for people created before the introduction of the createdAt column on person (during v1)
+* ([#246](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/246)) Do not show activities, evaluations and social work when associated to a confidential accompanying period, except for the users which are allowed to see them
 
 ## v2.14.1 - 2023-11-29
 ### Fixed
-* Export: fix list person with custom fields 
-* ([#100](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/100)) Add a paginator to budget elements (resource and charge types) in the admin 
-* Fix error in ListEvaluation when "handling agents" are alone 
+* Export: fix list person with custom fields
+* ([#100](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/100)) Add a paginator to budget elements (resource and charge types) in the admin
+* Fix error in ListEvaluation when "handling agents" are alone
 
 ## v2.14.0 - 2023-11-24
 ### Feature
-* ([#161](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/161)) Export: in filter "Filter accompanying period work (social action) by type, goal and result", order the items alphabetically or with the defined order 
+* ([#161](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/161)) Export: in filter "Filter accompanying period work (social action) by type, goal and result", order the items alphabetically or with the defined order
 ### Fixed
-* ([#141](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/141)) Export: on filter "action by type goals, and results", restore the fields when editing a saved export 
-* ([#219](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/219)) Export: fix the list of accompanying period work, when the "calc date" is null 
-* ([#222](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/222)) Fix rendering of custom fields 
-* Fix various errors in custom fields administration 
+* ([#141](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/141)) Export: on filter "action by type goals, and results", restore the fields when editing a saved export
+* ([#219](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/219)) Export: fix the list of accompanying period work, when the "calc date" is null
+* ([#222](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/222)) Fix rendering of custom fields
+* Fix various errors in custom fields administration
 
 ## v2.13.0 - 2023-11-21
 ### Feature
@@ -739,7 +748,7 @@ Fix color of Chill footer
 
 ## v2.12.1 - 2023-11-16
 ### Fixed
-* ([#208](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/208)) Export: fix loading of form for "filter action by type, goal and result" 
+* ([#208](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/208)) Export: fix loading of form for "filter action by type, goal and result"
 
 ## v2.12.0 - 2023-11-15
 ### Feature
@@ -770,36 +779,36 @@ Fix color of Chill footer
 
 ## v2.11.0 - 2023-11-07
 ### Feature
-* ([#194](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/194)) Export: add a filter "filter activity by creator job" 
+* ([#194](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/194)) Export: add a filter "filter activity by creator job"
 ### Fixed
-* ([#185](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/185)) Export: fix "group accompanying period by geographical unit": take into account the accompanying periods when the period is not located within an unit 
-* Fix "group activity by creator job" aggregator 
+* ([#185](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/185)) Export: fix "group accompanying period by geographical unit": take into account the accompanying periods when the period is not located within an unit
+* Fix "group activity by creator job" aggregator
 
 ## v2.10.6 - 2023-11-07
 ### Fixed
-* ([#182](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/182)) Fix merging of double person files. Adjustement relationship sql statement 
-* ([#185](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/185)) Export: fix aggregator by geographical unit on person: avoid inconsistencies 
+* ([#182](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/182)) Fix merging of double person files. Adjustement relationship sql statement
+* ([#185](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/185)) Export: fix aggregator by geographical unit on person: avoid inconsistencies
 
 ## v2.10.5 - 2023-11-05
 ### Fixed
-* ([#183](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/183)) Fix "problem during download" on some filters, which used a wrong data type 
-* ([#184](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/184)) Fix filter "activity by date" 
+* ([#183](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/183)) Fix "problem during download" on some filters, which used a wrong data type
+* ([#184](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/184)) Fix filter "activity by date"
 
 ## v2.10.4 - 2023-10-26
 ### Fixed
-* Fix null value constraint errors when merging relationships in doubles 
+* Fix null value constraint errors when merging relationships in doubles
 
 ## v2.10.3 - 2023-10-26
 ### Fixed
-* ([#175](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/175)) Replace old method of getting translator with injection of translatorInterface 
+* ([#175](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/175)) Replace old method of getting translator with injection of translatorInterface
 
 ## v2.10.2 - 2023-10-26
 ### Fixed
-* ([#175](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/175)) Use injection of translator instead of ->get(). 
+* ([#175](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/175)) Use injection of translator instead of ->get().
 
 ## v2.10.1 - 2023-10-24
 ### Fixed
-* Fix export controller when generating an export without any data in session 
+* Fix export controller when generating an export without any data in session
 
 ## v2.10.0 - 2023-10-24
 ### Feature
@@ -824,11 +833,11 @@ Fix color of Chill footer
 
 ## v2.9.2 - 2023-10-17
 ### Fixed
-* Fix possible null values in string's entities 
+* Fix possible null values in string's entities
 
 ## v2.9.1 - 2023-10-17
 ### Fixed
-* Fix the handling of activity form when editing or creating an activity in an accompanying period with multiple centers 
+* Fix the handling of activity form when editing or creating an activity in an accompanying period with multiple centers
 
 ## v2.9.0 - 2023-10-17
 ### Feature
@@ -876,57 +885,57 @@ But if you do not need this any more, you must ensure that the configuration key
 
 ## v2.7.0 - 2023-09-27
 ### Feature
-* ([#155](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/155)) The regulation list load accompanying periods by exact postal code (address associated with postal code), and not by the content of the postal code (postal code with same code's string) 
+* ([#155](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/155)) The regulation list load accompanying periods by exact postal code (address associated with postal code), and not by the content of the postal code (postal code with same code's string)
 ### Fixed
-* ([#142](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/142)) Fix the label of filter ActivityTypeFilter to a more obvious one 
-* ([#140](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/140)) [export] Fix association of filter "filter location by type" which did not appears on "list of activities" 
+* ([#142](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/142)) Fix the label of filter ActivityTypeFilter to a more obvious one
+* ([#140](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/140)) [export] Fix association of filter "filter location by type" which did not appears on "list of activities"
 
 ## v2.6.3 - 2023-09-19
 ### Fixed
-* Remove id property from document 
-mappedsuperclass 
+* Remove id property from document
+mappedsuperclass
 
 ## v2.6.2 - 2023-09-18
 ### Fixed
-* Fix doctrine mapping of AbstractTaskPlaceEvent and SingleTaskPlaceEvent: id property moved. 
+* Fix doctrine mapping of AbstractTaskPlaceEvent and SingleTaskPlaceEvent: id property moved.
 
 ## v2.6.1 - 2023-09-14
 ### Fixed
-* Filter out active centers in exports, which uses a different PickCenterType. 
+* Filter out active centers in exports, which uses a different PickCenterType.
 
 ## v2.6.0 - 2023-09-14
 ### Feature
-* ([#133](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/133)) Add locations in Aside Activity. By default, suggest user location, otherwise a select with all locations. 
-* ([#133](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/133)) Adapt Aside Activity exports: display location, filter by location, group by location 
-* Use the CRUD controller for center entity + add the isActive property to be able to mask instances of Center that are no longer in use. 
+* ([#133](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/133)) Add locations in Aside Activity. By default, suggest user location, otherwise a select with all locations.
+* ([#133](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/133)) Adapt Aside Activity exports: display location, filter by location, group by location
+* Use the CRUD controller for center entity + add the isActive property to be able to mask instances of Center that are no longer in use.
 ### Fixed
-* ([#107](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/107)) reinstate the fusion of duplicate persons 
-* Missing translation in Work Actions exports 
-* Reimplement the mission type filter on tasks, only for instances that have a config parameter indicating true for this. 
-* ([#135](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/135)) Corrects a typing error in 2 filters, which caused an 
+* ([#107](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/107)) reinstate the fusion of duplicate persons
+* Missing translation in Work Actions exports
+* Reimplement the mission type filter on tasks, only for instances that have a config parameter indicating true for this.
+* ([#135](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/135)) Corrects a typing error in 2 filters, which caused an
 error when trying to reedit a saved export
 
- 
-* ([#136](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/136)) [household] when moving a person to a sharing position to a not-sharing position on the same household on the same date, remove the previous household membership on the same household. This fix duplicate member. 
+
+* ([#136](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/136)) [household] when moving a person to a sharing position to a not-sharing position on the same household on the same date, remove the previous household membership on the same household. This fix duplicate member.
 * Add missing translation for comment field placeholder in repositionning household editor.
- 
-* Do not send an email to creator twice when adding a comment to a notification 
-* ([#107](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/107)) Fix gestion doublon functionality to work with chill bundles v2 
+
+* Do not send an email to creator twice when adding a comment to a notification
+* ([#107](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/107)) Fix gestion doublon functionality to work with chill bundles v2
 ### UX
 * Uniformize badge-person in household banner (background, size)
- 
+
 
 ## v2.5.3 - 2023-07-20
 ### Fixed
-* ([#132](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/132)) Rendez-vous documents created would appear in all documents lists of all persons with an accompanying period. Or statements are now added to the where clause to filter out documents that come from unrelated accompanying period/ or person rendez-vous. 
+* ([#132](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/132)) Rendez-vous documents created would appear in all documents lists of all persons with an accompanying period. Or statements are now added to the where clause to filter out documents that come from unrelated accompanying period/ or person rendez-vous.
 
 ## v2.5.2 - 2023-07-15
 ### Fixed
-* [Collate Address] when updating address point, do not use the point's address reference if the similarity is below the requirement for associating the address reference and the address (it uses the postcode's center instead) 
+* [Collate Address] when updating address point, do not use the point's address reference if the similarity is below the requirement for associating the address reference and the address (it uses the postcode's center instead)
 
 ## v2.5.1 - 2023-07-14
 ### Fixed
-* [collate addresses] block collating addresses to another address reference where the address reference is already the best match 
+* [collate addresses] block collating addresses to another address reference where the address reference is already the best match
 
 ## v2.5.0 - 2023-07-14
 ### Feature

From 0ba5cd849c9f68b73e19747e704d316925bde45f Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 3 Dec 2025 11:38:39 +0100
Subject: [PATCH 239/283] Remove double display of person id in the banner when
 there is a deathdate

---
 .changes/unreleased/Fixed-20251203-113832.yaml   |  6 ++++++
 .../Resources/views/Entity/person.html.twig      | 16 ++++++++--------
 2 files changed, 14 insertions(+), 8 deletions(-)
 create mode 100644 .changes/unreleased/Fixed-20251203-113832.yaml

diff --git a/.changes/unreleased/Fixed-20251203-113832.yaml b/.changes/unreleased/Fixed-20251203-113832.yaml
new file mode 100644
index 000000000..45adf3dc4
--- /dev/null
+++ b/.changes/unreleased/Fixed-20251203-113832.yaml
@@ -0,0 +1,6 @@
+kind: Fixed
+body: Remove double display of person id in the banner when there is a deathdate
+time: 2025-12-03T11:38:32.653635449+01:00
+custom:
+    Issue: "441"
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
index d8a930b40..5572bd7b1 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
@@ -81,25 +81,25 @@
         </div>
         {%- if options['addInfo'] -%}
             <p class="moreinfo">
-                {% if person.gender is not null %}{{ person.gender.icon|chill_entity_render_box }}{% endif %}
+                {% if person.gender is not null %}{{ person.gender.icon|chill_entity_render_box }} {% endif %}
             {%- if person.deathdate is not null -%}
                 {%- if person.birthdate is not null -%}
                     {# must be on one line to avoid spaces with dash #}
                     <time datetime="{{ person.birthdate|date('Y-m-d') }}" title="{{ 'birthdate'|trans|e('html_attr') }}">{{ person.birthdate|format_date("medium") }}</time>&#x2013;
                 {%- else -%}
-                    {{ 'Date of death'|trans }}:
+                    <span>{{ 'Date of death'|trans }}: </span>
                 {%- endif -%}
                 {#- must be on one line to avoid spaces with dash -#}
                 <time datetime="{{ person.deathdate|date('Y-m-d') }}" title="{{ 'deathdate'|trans }}">{{ person.deathdate|format_date("medium") }}</time>
                 {%- if options['addAge'] -%}
                     <span class="age">&nbsp;{{ 'years_old'|trans({ 'age': person.age }) }}</span>
                 {%- endif -%}
-                {%- if options['addId'] -%}
-                    {%- set personId = person|chill_person_id_render_text %}
-                    <span class="id-number" title="{{ 'Person'|trans ~ ' ' ~ personId }}">
-                    ({{ personId }})
-                </span>
-                {%- endif -%}
+{#                {%- if options['addId'] -%}#}
+{#                    {%- set personId = person|chill_person_id_render_text %}#}
+{#                    <span class="id-number" title="{{ 'Person'|trans ~ ' ' ~ personId }}">#}
+{#                    ({{ personId }})#}
+{#                </span>#}
+{#                {%- endif -%}#}
             {%- elseif person.birthdate is not null -%}
                 <time datetime="{{ person.birthdate|date('Y-m-d') }}" title="{{ 'Birthdate'|trans }}">
                 {{ 'Born the date'|trans({'gender': person.gender ? person.gender.genderTranslation.value : 'neutral',

From 7ad24bef8ae6c560835cfec44123cdcfb2ec282d Mon Sep 17 00:00:00 2001
From: LenaertsJ <julie.lenaerts@champs-libres.coop>
Date: Fri, 5 Dec 2025 11:33:14 +0000
Subject: [PATCH 240/283] =?UTF-8?q?Resolve=20"Documentation:=20utiliser=20?=
 =?UTF-8?q?mkdocs=20(avec=20l'extension=20mkdocs-material)=20plut=C3=B4t?=
 =?UTF-8?q?=20que=20Sphinx"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .changes/unreleased/DX-20251117-160650.yaml   |   6 +
 .readthedocs.yml                              |   8 +-
 docs/Makefile                                 | 181 +--------
 docs/README.md                                |  14 +-
 docs/mkdocs.yml                               | 137 +++++++
 docs/requirements.txt                         |  11 +-
 docs/source/bundles/activity.md               |  49 +++
 docs/source/bundles/activity.rst              |  71 ----
 .../{custom-fields.rst => custom-fields.md}   | 197 ++++------
 docs/source/bundles/{event.rst => event.md}   |  16 +-
 docs/source/bundles/group.md                  |  33 ++
 docs/source/bundles/group.rst                 |  49 ---
 docs/source/bundles/index.md                  |  23 ++
 docs/source/bundles/index.rst                 |  29 --
 docs/source/bundles/{ldap.rst => ldap.md}     | 109 ++----
 docs/source/bundles/{main.rst => main.md}     |  33 +-
 docs/source/bundles/{person.rst => person.md} | 138 +++----
 docs/source/bundles/report.md                 |  23 ++
 docs/source/bundles/report.rst                |  46 ---
 docs/source/development/FAQ.md                |  23 ++
 docs/source/development/FAQ.rst               |  36 --
 ...trol_model.rst => access_control_model.md} | 163 ++------
 docs/source/development/{api.rst => api.md}   | 246 +++++-------
 .../development/{assets.rst => assets.md}     |  54 +--
 docs/source/development/code-quality.md       |  23 ++
 docs/source/development/code-quality.rst      |  34 --
 ...-new-bundle.rst => create-a-new-bundle.md} |  21 +-
 .../development/{cronjob.rst => cronjob.md}   |  37 +-
 docs/source/development/{crud.rst => crud.md} | 153 +++-----
 .../source/development/database-principles.md |  70 ++++
 .../development/database-principles.rst       |  84 ----
 ...le-comments.rst => embeddable-comments.md} |  52 +--
 .../{entity-info.rst => entity-info.md}       |  63 ++-
 .../development/{es-lint.rst => es-lint.md}   |  27 +-
 docs/source/development/export-sequence.puml  |  84 ----
 .../development/{exports.rst => exports.md}   | 255 +++++-------
 docs/source/development/forms.md              |  25 ++
 docs/source/development/forms.rst             |  42 --
 docs/source/development/index.md              |  41 ++
 docs/source/development/index.rst             |  59 ---
 docs/source/development/localisation.md       |  30 ++
 docs/source/development/localisation.rst      |  49 ---
 .../development/{logging.rst => logging.md}   |  33 +-
 .../manual/{index.rst => index.md}            |  13 +-
 ...ing-and-menus.rst => routing-and-menus.md} | 114 ++----
 .../development/{menus.rst => menus.md}       |  84 ++--
 docs/source/development/messages-to-users.md  |  93 +++++
 docs/source/development/messages-to-users.rst | 136 -------
 docs/source/development/migrations.md         |  70 ++++
 docs/source/development/migrations.rst        | 101 -----
 docs/source/development/pagination.md         | 153 ++++++++
 docs/source/development/pagination.rst        | 191 ---------
 .../{render-entity.rst => render-entity.md}   |  70 ++--
 .../development/{routing.rst => routing.md}   |  37 +-
 docs/source/development/run-tests.md          |  58 +++
 docs/source/development/run-tests.rst         |  68 ----
 docs/source/development/searching.md          | 222 +++++++++++
 docs/source/development/searching.rst         | 276 -------------
 .../{timelines.rst => timelines.md}           | 127 ++----
 ...useful-snippets.rst => useful-snippets.md} |  47 +--
 .../development/user-interface/css-classes.md |  63 +++
 .../user-interface/js-functions.md            | 234 +++++++++++
 .../user-interface/layout-template-usage.md   | 196 ++++++++++
 .../user-interface/{ => rst}/css-classes.rst  |  12 +-
 .../user-interface/{ => rst}/js-functions.rst |   0
 .../{ => rst}/layout-template-usage.rst       |  38 +-
 .../user-interface/{ => rst}/widgets.rst      |  76 ++--
 .../development/user-interface/widgets.md     | 270 +++++++++++++
 docs/source/index.md                          |  54 +++
 docs/source/index.rst                         |  85 ----
 docs/source/installation/document-storage.md  |  74 ++++
 docs/source/installation/document-storage.rst |  84 ----
 .../installation/enable-collabora-for-dev.md  | 105 +++++
 .../installation/enable-collabora-for-dev.rst | 125 ------
 docs/source/installation/index.md             |  43 +++
 docs/source/installation/index.rst            |  67 ----
 .../installation/installation-development.md  |  89 +++++
 .../installation/installation-development.rst | 101 -----
 .../installation/installation-production.md   | 310 +++++++++++++++
 .../installation/installation-production.rst  | 365 ------------------
 docs/source/installation/load-addresses.md    |  47 +++
 docs/source/installation/load-addresses.rst   |  62 ---
 ...aph-configure.rst => msgraph-configure.md} | 168 +++-----
 .../installation/prod-calendar-sms-sending.md |  21 +
 .../prod-calendar-sms-sending.rst             |  27 --
 docs/source/installation/prod.md              |  62 +++
 docs/source/installation/prod.rst             |  71 ----
 87 files changed, 3500 insertions(+), 4086 deletions(-)
 create mode 100644 .changes/unreleased/DX-20251117-160650.yaml
 create mode 100644 docs/mkdocs.yml
 create mode 100644 docs/source/bundles/activity.md
 delete mode 100644 docs/source/bundles/activity.rst
 rename docs/source/bundles/{custom-fields.rst => custom-fields.md} (79%)
 rename docs/source/bundles/{event.rst => event.md} (63%)
 create mode 100644 docs/source/bundles/group.md
 delete mode 100644 docs/source/bundles/group.rst
 create mode 100644 docs/source/bundles/index.md
 delete mode 100644 docs/source/bundles/index.rst
 rename docs/source/bundles/{ldap.rst => ldap.md} (64%)
 rename docs/source/bundles/{main.rst => main.md} (57%)
 rename docs/source/bundles/{person.rst => person.md} (68%)
 create mode 100644 docs/source/bundles/report.md
 delete mode 100644 docs/source/bundles/report.rst
 create mode 100644 docs/source/development/FAQ.md
 delete mode 100644 docs/source/development/FAQ.rst
 rename docs/source/development/{access_control_model.rst => access_control_model.md} (91%)
 rename docs/source/development/{api.rst => api.md} (81%)
 rename docs/source/development/{assets.rst => assets.md} (79%)
 create mode 100644 docs/source/development/code-quality.md
 delete mode 100644 docs/source/development/code-quality.rst
 rename docs/source/development/{create-a-new-bundle.rst => create-a-new-bundle.md} (63%)
 rename docs/source/development/{cronjob.rst => cronjob.md} (73%)
 rename docs/source/development/{crud.rst => crud.md} (86%)
 create mode 100644 docs/source/development/database-principles.md
 delete mode 100644 docs/source/development/database-principles.rst
 rename docs/source/development/{embeddable-comments.rst => embeddable-comments.md} (63%)
 rename docs/source/development/{entity-info.rst => entity-info.md} (84%)
 rename docs/source/development/{es-lint.rst => es-lint.md} (81%)
 delete mode 100644 docs/source/development/export-sequence.puml
 rename docs/source/development/{exports.rst => exports.md} (60%)
 create mode 100644 docs/source/development/forms.md
 delete mode 100644 docs/source/development/forms.rst
 create mode 100644 docs/source/development/index.md
 delete mode 100644 docs/source/development/index.rst
 create mode 100644 docs/source/development/localisation.md
 delete mode 100644 docs/source/development/localisation.rst
 rename docs/source/development/{logging.rst => logging.md} (68%)
 rename docs/source/development/manual/{index.rst => index.md} (58%)
 rename docs/source/development/manual/{routing-and-menus.rst => routing-and-menus.md} (55%)
 rename docs/source/development/{menus.rst => menus.md} (52%)
 create mode 100644 docs/source/development/messages-to-users.md
 delete mode 100644 docs/source/development/messages-to-users.rst
 create mode 100644 docs/source/development/migrations.md
 delete mode 100644 docs/source/development/migrations.rst
 create mode 100644 docs/source/development/pagination.md
 delete mode 100644 docs/source/development/pagination.rst
 rename docs/source/development/{render-entity.rst => render-entity.md} (61%)
 rename docs/source/development/{routing.rst => routing.md} (52%)
 create mode 100644 docs/source/development/run-tests.md
 delete mode 100644 docs/source/development/run-tests.rst
 create mode 100644 docs/source/development/searching.md
 delete mode 100644 docs/source/development/searching.rst
 rename docs/source/development/{timelines.rst => timelines.md} (76%)
 rename docs/source/development/{useful-snippets.rst => useful-snippets.md} (69%)
 create mode 100644 docs/source/development/user-interface/css-classes.md
 create mode 100644 docs/source/development/user-interface/js-functions.md
 create mode 100644 docs/source/development/user-interface/layout-template-usage.md
 rename docs/source/development/user-interface/{ => rst}/css-classes.rst (90%)
 rename docs/source/development/user-interface/{ => rst}/js-functions.rst (100%)
 rename docs/source/development/user-interface/{ => rst}/layout-template-usage.rst (82%)
 rename docs/source/development/user-interface/{ => rst}/widgets.rst (81%)
 create mode 100644 docs/source/development/user-interface/widgets.md
 create mode 100644 docs/source/index.md
 delete mode 100644 docs/source/index.rst
 create mode 100644 docs/source/installation/document-storage.md
 delete mode 100644 docs/source/installation/document-storage.rst
 create mode 100644 docs/source/installation/enable-collabora-for-dev.md
 delete mode 100644 docs/source/installation/enable-collabora-for-dev.rst
 create mode 100644 docs/source/installation/index.md
 delete mode 100644 docs/source/installation/index.rst
 create mode 100644 docs/source/installation/installation-development.md
 delete mode 100644 docs/source/installation/installation-development.rst
 create mode 100644 docs/source/installation/installation-production.md
 delete mode 100644 docs/source/installation/installation-production.rst
 create mode 100644 docs/source/installation/load-addresses.md
 delete mode 100644 docs/source/installation/load-addresses.rst
 rename docs/source/installation/{msgraph-configure.rst => msgraph-configure.md} (60%)
 create mode 100644 docs/source/installation/prod-calendar-sms-sending.md
 delete mode 100644 docs/source/installation/prod-calendar-sms-sending.rst
 create mode 100644 docs/source/installation/prod.md
 delete mode 100644 docs/source/installation/prod.rst

diff --git a/.changes/unreleased/DX-20251117-160650.yaml b/.changes/unreleased/DX-20251117-160650.yaml
new file mode 100644
index 000000000..f555554bc
--- /dev/null
+++ b/.changes/unreleased/DX-20251117-160650.yaml
@@ -0,0 +1,6 @@
+kind: DX
+body: Use mkdocs with mkdocs-material instead of sphinx to build chill developer documentation
+time: 2025-11-17T16:06:50.46185765+01:00
+custom:
+    Issue: "386"
+    SchemaChange: No schema change
diff --git a/.readthedocs.yml b/.readthedocs.yml
index cd8f36eba..fc1abe247 100644
--- a/.readthedocs.yml
+++ b/.readthedocs.yml
@@ -4,11 +4,11 @@ version: 2
 build:
   os: ubuntu-22.04
   tools:
-    python: "3.7"
+    python: "3.11"
 
-sphinx:
-  configuration: docs/source/conf.py
+mkdocs:
+  configuration: docs/mkdocs.yml
 
 python:
   install:
-    - requirements: docs/requirements.txt
\ No newline at end of file
+    - requirements: docs/requirements.txt
diff --git a/docs/Makefile b/docs/Makefile
index ec37e687c..c35370d9d 100644
--- a/docs/Makefile
+++ b/docs/Makefile
@@ -1,177 +1,34 @@
-# Makefile for Sphinx documentation
+# Makefile for MkDocs documentation
 #
 
 # You can set these variables from the command line.
-SPHINXOPTS    =
-SPHINXBUILD   = sphinx-build
-PAPER         =
-BUILDDIR      = build
+MKDOCS       = mkdocs
+BUILDDIR     = site
 
-# User-friendly check for sphinx-build
-ifeq ($(shell which $(SPHINXBUILD) >/dev/null 2>&1; echo $$?), 1)
-$(error The '$(SPHINXBUILD)' command was not found. Make sure you have Sphinx installed, then set the SPHINXBUILD environment variable to point to the full path of the '$(SPHINXBUILD)' executable. Alternatively you can add the directory with the executable to your PATH. If you don't have Sphinx installed, grab it from http://sphinx-doc.org/)
+# User-friendly check for mkdocs
+ifeq ($(shell which $(MKDOCS) >/dev/null 2>&1; echo $$?), 1)
+$(error The '$(MKDOCS)' command was not found. Make sure you have MkDocs installed with 'pip install mkdocs mkdocs-material', then make sure the mkdocs executable is in your PATH.)
 endif
 
-# Internal variables.
-PAPEROPT_a4     = -D latex_paper_size=a4
-PAPEROPT_letter = -D latex_paper_size=letter
-ALLSPHINXOPTS   = -d $(BUILDDIR)/doctrees $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
-# the i18n builder cannot share the environment and doctrees with the others
-I18NSPHINXOPTS  = $(PAPEROPT_$(PAPER)) $(SPHINXOPTS) source
-
-.PHONY: help clean html dirhtml singlehtml pickle json htmlhelp qthelp devhelp epub latex latexpdf text man changes linkcheck doctest gettext
+.PHONY: help clean html build serve
 
 help:
 	@echo "Please use \`make <target>' where <target> is one of"
-	@echo "  html       to make standalone HTML files"
-	@echo "  dirhtml    to make HTML files named index.html in directories"
-	@echo "  singlehtml to make a single large HTML file"
-	@echo "  pickle     to make pickle files"
-	@echo "  json       to make JSON files"
-	@echo "  htmlhelp   to make HTML files and a HTML help project"
-	@echo "  qthelp     to make HTML files and a qthelp project"
-	@echo "  devhelp    to make HTML files and a Devhelp project"
-	@echo "  epub       to make an epub"
-	@echo "  latex      to make LaTeX files, you can set PAPER=a4 or PAPER=letter"
-	@echo "  latexpdf   to make LaTeX files and run them through pdflatex"
-	@echo "  latexpdfja to make LaTeX files and run them through platex/dvipdfmx"
-	@echo "  text       to make text files"
-	@echo "  man        to make manual pages"
-	@echo "  texinfo    to make Texinfo files"
-	@echo "  info       to make Texinfo files and run them through makeinfo"
-	@echo "  gettext    to make PO message catalogs"
-	@echo "  changes    to make an overview of all changed/added/deprecated items"
-	@echo "  xml        to make Docutils-native XML files"
-	@echo "  pseudoxml  to make pseudoxml-XML files for display purposes"
-	@echo "  linkcheck  to check all external links for integrity"
-	@echo "  doctest    to run all doctests embedded in the documentation (if enabled)"
+	@echo "  html       to build the documentation (same as build)"
+	@echo "  build      to build the documentation"
+	@echo "  serve      to start the development server"
+	@echo "  clean      to clean the build directory"
 
 clean:
 	rm -rf $(BUILDDIR)/*
 
-html:
-	$(SPHINXBUILD) -b html $(ALLSPHINXOPTS) $(BUILDDIR)/html
+html: build
+
+build:
+	$(MKDOCS) build
 	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/html."
+	@echo "Build finished. The HTML pages are in $(BUILDDIR)/."
 
-dirhtml:
-	$(SPHINXBUILD) -b dirhtml $(ALLSPHINXOPTS) $(BUILDDIR)/dirhtml
-	@echo
-	@echo "Build finished. The HTML pages are in $(BUILDDIR)/dirhtml."
-
-singlehtml:
-	$(SPHINXBUILD) -b singlehtml $(ALLSPHINXOPTS) $(BUILDDIR)/singlehtml
-	@echo
-	@echo "Build finished. The HTML page is in $(BUILDDIR)/singlehtml."
-
-pickle:
-	$(SPHINXBUILD) -b pickle $(ALLSPHINXOPTS) $(BUILDDIR)/pickle
-	@echo
-	@echo "Build finished; now you can process the pickle files."
-
-json:
-	$(SPHINXBUILD) -b json $(ALLSPHINXOPTS) $(BUILDDIR)/json
-	@echo
-	@echo "Build finished; now you can process the JSON files."
-
-htmlhelp:
-	$(SPHINXBUILD) -b htmlhelp $(ALLSPHINXOPTS) $(BUILDDIR)/htmlhelp
-	@echo
-	@echo "Build finished; now you can run HTML Help Workshop with the" \
-	      ".hhp project file in $(BUILDDIR)/htmlhelp."
-
-qthelp:
-	$(SPHINXBUILD) -b qthelp $(ALLSPHINXOPTS) $(BUILDDIR)/qthelp
-	@echo
-	@echo "Build finished; now you can run "qcollectiongenerator" with the" \
-	      ".qhcp project file in $(BUILDDIR)/qthelp, like this:"
-	@echo "# qcollectiongenerator $(BUILDDIR)/qthelp/chill-doc.qhcp"
-	@echo "To view the help file:"
-	@echo "# assistant -collectionFile $(BUILDDIR)/qthelp/chill-doc.qhc"
-
-devhelp:
-	$(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(BUILDDIR)/devhelp
-	@echo
-	@echo "Build finished."
-	@echo "To view the help file:"
-	@echo "# mkdir -p $$HOME/.local/share/devhelp/chill-doc"
-	@echo "# ln -s $(BUILDDIR)/devhelp $$HOME/.local/share/devhelp/chill-doc"
-	@echo "# devhelp"
-
-epub:
-	$(SPHINXBUILD) -b epub $(ALLSPHINXOPTS) $(BUILDDIR)/epub
-	@echo
-	@echo "Build finished. The epub file is in $(BUILDDIR)/epub."
-
-latex:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo
-	@echo "Build finished; the LaTeX files are in $(BUILDDIR)/latex."
-	@echo "Run \`make' in that directory to run these through (pdf)latex" \
-	      "(use \`make latexpdf' here to do that automatically)."
-
-latexpdf:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo "Running LaTeX files through pdflatex..."
-	$(MAKE) -C $(BUILDDIR)/latex all-pdf
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
-
-latexpdfja:
-	$(SPHINXBUILD) -b latex $(ALLSPHINXOPTS) $(BUILDDIR)/latex
-	@echo "Running LaTeX files through platex and dvipdfmx..."
-	$(MAKE) -C $(BUILDDIR)/latex all-pdf-ja
-	@echo "pdflatex finished; the PDF files are in $(BUILDDIR)/latex."
-
-text:
-	$(SPHINXBUILD) -b text $(ALLSPHINXOPTS) $(BUILDDIR)/text
-	@echo
-	@echo "Build finished. The text files are in $(BUILDDIR)/text."
-
-man:
-	$(SPHINXBUILD) -b man $(ALLSPHINXOPTS) $(BUILDDIR)/man
-	@echo
-	@echo "Build finished. The manual pages are in $(BUILDDIR)/man."
-
-texinfo:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo
-	@echo "Build finished. The Texinfo files are in $(BUILDDIR)/texinfo."
-	@echo "Run \`make' in that directory to run these through makeinfo" \
-	      "(use \`make info' here to do that automatically)."
-
-info:
-	$(SPHINXBUILD) -b texinfo $(ALLSPHINXOPTS) $(BUILDDIR)/texinfo
-	@echo "Running Texinfo files through makeinfo..."
-	make -C $(BUILDDIR)/texinfo info
-	@echo "makeinfo finished; the Info files are in $(BUILDDIR)/texinfo."
-
-gettext:
-	$(SPHINXBUILD) -b gettext $(I18NSPHINXOPTS) $(BUILDDIR)/locale
-	@echo
-	@echo "Build finished. The message catalogs are in $(BUILDDIR)/locale."
-
-changes:
-	$(SPHINXBUILD) -b changes $(ALLSPHINXOPTS) $(BUILDDIR)/changes
-	@echo
-	@echo "The overview file is in $(BUILDDIR)/changes."
-
-linkcheck:
-	$(SPHINXBUILD) -b linkcheck $(ALLSPHINXOPTS) $(BUILDDIR)/linkcheck
-	@echo
-	@echo "Link check complete; look for any errors in the above output " \
-	      "or in $(BUILDDIR)/linkcheck/output.txt."
-
-doctest:
-	$(SPHINXBUILD) -b doctest $(ALLSPHINXOPTS) $(BUILDDIR)/doctest
-	@echo "Testing of doctests in the sources finished, look at the " \
-	      "results in $(BUILDDIR)/doctest/output.txt."
-
-xml:
-	$(SPHINXBUILD) -b xml $(ALLSPHINXOPTS) $(BUILDDIR)/xml
-	@echo
-	@echo "Build finished. The XML files are in $(BUILDDIR)/xml."
-
-pseudoxml:
-	$(SPHINXBUILD) -b pseudoxml $(ALLSPHINXOPTS) $(BUILDDIR)/pseudoxml
-	@echo
-	@echo "Build finished. The pseudo-XML files are in $(BUILDDIR)/pseudoxml."
+serve:
+	$(MKDOCS) serve
+	@echo "Development server started at http://127.0.0.1:8000/"
diff --git a/docs/README.md b/docs/README.md
index 8ae7f650a..301ccfb6a 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -10,20 +10,26 @@ Compilation into HTML
 
 To compile this documentation :
 
-1. Install [sphinx-doc](http://sphinx-doc.org)
+1. Install [MkDocs](https://www.mkdocs.org/) and MkDocs Material
     ``` bash
             $ virtualenv .venv # creation of the virtual env (only the first time)
             $ source .venv/bin/activate # activate the virtual env
     (.venv) $ pip install -r requirements.txt
     ```
 2. Install submodules : $ git submodule update --init;
-3. run `make html` from the root directory
-4. The base file is located on build/html/index.html
+3. run `make html` or `mkdocs build` from the root directory
+4. The base file is located on site/index.html
     ``` bash
-    $ cd build/html
+    $ cd site
     $ python -m http.server 8888 # will serve the site on the port 8888
     ```
 
+Alternatively, you can use the built-in development server:
+``` bash
+(.venv) $ mkdocs serve
+```
+This will start a development server at http://127.0.0.1:8000/ with live reload.
+
 Contribute
 ===========
 
diff --git a/docs/mkdocs.yml b/docs/mkdocs.yml
new file mode 100644
index 000000000..c1faac741
--- /dev/null
+++ b/docs/mkdocs.yml
@@ -0,0 +1,137 @@
+site_name: Chill Documentation
+site_description: Documentation for Chill - A free software for social workers
+site_url: https://docs.chill.social
+repo_url: https://gitlab.com/Chill-project/chill-bundles
+repo_name: Chill-project/chill-bundles
+
+docs_dir: source
+
+copyright: Copyright &copy; 2014-2024 Champs-Libres Cooperative SCRLFS - GNU Free Documentation License v1.3
+
+theme:
+  name: material
+  language: en
+  features:
+    - navigation.tabs
+    - navigation.tabs.sticky
+    - navigation.sections
+    - navigation.expand
+    - navigation.path
+    - navigation.top
+    - search.highlight
+    - search.share
+    - search.suggest
+    - toc.follow
+    - content.code.copy
+    - content.code.annotate
+
+  palette:
+    # Palette toggle for light mode
+    - scheme: default
+      primary: blue
+      accent: blue
+      toggle:
+        icon: material/brightness-7
+        name: Switch to dark mode
+
+    # Palette toggle for dark mode
+    - scheme: slate
+      primary: blue
+      accent: blue
+      toggle:
+        icon: material/brightness-4
+        name: Switch to light mode
+
+  font:
+    text: Roboto
+    code: Roboto Mono
+
+plugins:
+  - search
+  - autorefs
+
+markdown_extensions:
+  - admonition
+  - pymdownx.details
+  - pymdownx.superfences
+  - pymdownx.highlight:
+      anchor_linenums: true
+      line_spans: __span
+      pygments_lang_class: true
+  - pymdownx.inlinehilite
+  - pymdownx.snippets
+  - pymdownx.tabbed:
+      alternate_style: true
+  - pymdownx.tasklist:
+      custom_checkbox: true
+  - toc:
+      permalink: true
+  - tables
+  - attr_list
+  - md_in_html
+
+nav:
+  - Home: index.md
+  - Installation:
+    - installation/index.md
+    - Development: installation/installation-development.md
+    - Production: installation/installation-production.md
+    - Document Storage: installation/document-storage.md
+    - Load Addresses: installation/load-addresses.md
+    - Production Setup: installation/prod.md
+    - Calendar SMS: installation/prod-calendar-sms-sending.md
+    - MS Graph Configuration: installation/msgraph-configure.md
+    - Enable Collabora: installation/enable-collabora-for-dev.md
+  - Development:
+    - development/index.md
+    - Access Control: development/access_control_model.md
+    - API: development/api.md
+    - Assets: development/assets.md
+    - Code Quality: development/code-quality.md
+    - Create Bundle: development/create-a-new-bundle.md
+    - Cronjobs: development/cronjob.md
+    - CRUD: development/crud.md
+    - Database Principles: development/database-principles.md
+    - Embeddable Comments: development/embeddable-comments.md
+    - Entity Info: development/entity-info.md
+    - ESLint: development/es-lint.md
+    - Exports: development/exports.md
+    - FAQ: development/FAQ.md
+    - Forms: development/forms.md
+    - Localisation: development/localisation.md
+    - Logging: development/logging.md
+    - Manual:
+      - development/manual/index.md
+      - Routing and Menus: development/manual/routing-and-menus.md
+    - Menus: development/menus.md
+    - Messages to Users: development/messages-to-users.md
+    - Migrations: development/migrations.md
+    - Pagination: development/pagination.md
+    - Render Entity: development/render-entity.md
+    - Routing: development/routing.md
+    - Run Tests: development/run-tests.md
+    - Searching: development/searching.md
+    - Timelines: development/timelines.md
+    - Useful Snippets: development/useful-snippets.md
+    - User Interface:
+      - CSS Classes: development/user-interface/css-classes.md
+      - JS Functions: development/user-interface/js-functions.md
+      - Layout Template: development/user-interface/layout-template-usage.md
+      - Widgets: development/user-interface/widgets.md
+  - Bundles:
+    - bundles/index.md
+    - Activity: bundles/activity.md
+    - Custom Fields: bundles/custom-fields.md
+    - Event: bundles/event.md
+    - Group: bundles/group.md
+    - LDAP: bundles/ldap.md
+    - Main: bundles/main.md
+    - Person: bundles/person.md
+    - Report: bundles/report.md
+
+extra:
+  social:
+    - icon: fontawesome/brands/gitlab
+      link: https://gitlab.com/Chill-project
+    - icon: fontawesome/solid/comments
+      link: https://app.element.io/#/room/#chill-social-admin:matrix.org
diff --git a/docs/requirements.txt b/docs/requirements.txt
index a8d979a2b..82fb39971 100644
--- a/docs/requirements.txt
+++ b/docs/requirements.txt
@@ -1,7 +1,4 @@
-docutils==0.13.1
-Pygments==2.2.0
-sphinx==1.8.5
-Jinja2<3.1
-git+https://github.com/fabpot/sphinx-php.git@v2.0.2#egg_name=sphinx-php
-jsx-lexer===0.0.8
-sphinx_rtd_theme==0.5.0
+mkdocs>=1.5.3
+mkdocs-material>=9.4.0
+pymdown-extensions>=10.3.0
+mkdocs-autorefs>=0.5.0
diff --git a/docs/source/bundles/activity.md b/docs/source/bundles/activity.md
new file mode 100644
index 000000000..f98f9b009
--- /dev/null
+++ b/docs/source/bundles/activity.md
@@ -0,0 +1,49 @@
+# Activity bundle
+
+This bundle provides the ability to record people in the software. This bundle is required by other bundle.
+
+###### Entities provided
+
+   Describe the entities provided.
+
+###### Configuration options
+
+Those options are available under `chill_activity` key.
+
+Example of configuration:
+
+```yaml
+   chill_activity:
+      form:
+         time_duration:
+            - { label: '12 minutes', seconds: 720 }
+            - { label: '30 minutes', seconds: 1800 }
+```
+
+form.time_duration *array*
+   The duration which might be suggested when the user create or update an activity. The value must be an array of object, where each object must have a `label` and a `seconds` key. The label provide which is shown to user (the label will be translated, if possible) and the seconds the duration.
+
+   Example: see the example above
+
+   Default value: the values available are 5, 10, 15, 20, 25, 30, 45 minutes, and 1 hour, 1 hour 15, 1 hour 30, 1 hour 45 and 2 hours.
+
+###### Macros
+
+## Activity reason sticker
+
+Macro file
+   `ChillActivityBundle:ActivityReason:macro.html.twig`
+Macro envelope
+   `reason(r)`
+
+   `p` is an instance of :class:`Chill\ActivityBundle\Entity\ActivityReason`
+
+When to use this macro ?
+   When you want to represent an activity reason.
+Example usage :
+
+   ```jinja
+   {% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
+
+   {{ m.reason(r) }}
+   ```
diff --git a/docs/source/bundles/activity.rst b/docs/source/bundles/activity.rst
deleted file mode 100644
index 011983e0a..000000000
--- a/docs/source/bundles/activity.rst
+++ /dev/null
@@ -1,71 +0,0 @@
-.. Copyright (C)  2014 Champs Libres Cooperative SCRLFS
-   Permission is granted to copy, distribute and/or modify this document
-   under the terms of the GNU Free Documentation License, Version 1.3
-   or any later version published by the Free Software Foundation;
-   with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-   A copy of the license is included in the section entitled "GNU
-   Free Documentation License".
-
-.. _activity-bundle:
-
-Activity bundle
-###############
-
-This bundle provides the ability to record people in the software. This bundle is required by other bundle.
-
-.. contents:: Table of content
-   :local:
-
-Entities provided
-*****************
-
-.. todo::
-
-   Describe the entities provided.
-
-
-Configuration options
-*********************
-
-Those options are available under `chill_activity` key.
-
-Example of configuration:
-
-.. code-block:: yaml
-
-   chill_activity:
-      form:
-         time_duration: 
-            - { label: '12 minutes', seconds: 720 }
-            - { label: '30 minutes', seconds: 1800 }
-
-form.time_duration *array*
-   The duration which might be suggested when the user create or update an activity. The value must be an array of object, where each object must have a :code:`label` and a :code:`seconds` key. The label provide which is shown to user (the label will be translated, if possible) and the seconds the duration.
-
-   Example: see the example above
-
-   Default value: the values available are 5, 10, 15, 20, 25, 30, 45 minutes, and 1 hour, 1 hour 15, 1 hour 30, 1 hour 45 and 2 hours.
-
-.. _activity-bundle-macros:
-
-Macros
-******
-
-Activity reason sticker
-=======================
-
-Macro file
-   `ChillActivityBundle:ActivityReason:macro.html.twig`
-Macro envelope
-   :code:`reason(r)`
-
-   :code:`p` is an instance of :class:`Chill\ActivityBundle\Entity\ActivityReason`
-
-When to use this macro ?
-   When you want to represent an activity reason.
-Example usage :
-   .. code-block:: html+jinja
-
-      {% import 'ChillActivityBundle:ActivityReason:macro.html.twig' as m %}
-
-      {{ m.reason(r) }}
diff --git a/docs/source/bundles/custom-fields.rst b/docs/source/bundles/custom-fields.md
similarity index 79%
rename from docs/source/bundles/custom-fields.rst
rename to docs/source/bundles/custom-fields.md
index f56b0dc23..646de34f6 100644
--- a/docs/source/bundles/custom-fields.rst
+++ b/docs/source/bundles/custom-fields.md
@@ -1,15 +1,4 @@
-.. Copyright (C)  2014 Champs Libres Cooperative SCRLFS
-   Permission is granted to copy, distribute and/or modify this document
-   under the terms of the GNU Free Documentation License, Version 1.3
-   or any later version published by the Free Software Foundation;
-   with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-   A copy of the license is included in the section entitled "GNU
-   Free Documentation License".
-   
-.. _custom-fields-bundle:
-
-Custom fields bundle
-====================
+## Custom fields bundle
 
 This bundle provides the ability to add custom fields to existing entities.
 
@@ -17,79 +6,63 @@ Those custom fields contains extra data and will be stored in the DB, along with
 
 In the database, custom fields are stored in json format.
 
-.. seealso::
+   The full specification discussed [here](https://redmine.champs-libres.coop/issues/239)
 
-   The full specification discussed `here. <https://redmine.champs-libres.coop/issues/239>`_
-   
-   `JSON Type on postgresql documentation <http://www.postgresql.org/docs/9.3/static/datatype-json.html>`_
+   [JSON Type on postgresql documentation](http://www.postgresql.org/docs/9.3/static/datatype-json.html)
       The documentation of json type, which is used to store data in the database.
-   
-.. contents:: Table of contents
-   :depth: 4
-   :local:
 
-Custom Fields concepts
-----------------------
+### Custom Fields concepts
 
 Custom fields are extra data which may be added to entities by user. If a developer implements custom fields on a entity, users will be able to add more fields on this entity.
 
-Example: the `person bundle` allows to record `firstname`, `lastname`, `date of birth` fields. But users need to store information about the kind of house he has (if he owns his house, if he rents it, ...). Custom fields allows to create those fields.
+Example: the [person bundle` allows to record `firstname`, `lastname`, `date of birth` fields. But users need to store information about the kind of house he has (if he owns his house, if he rents it, ...). Custom fields allows to create those fields.
 
 Automatically, those fields are added at the person form. They are also printed in the person view and in exports.
 
-Custom fields and custom fields group
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+##### Custom fields and custom fields group
 
-Custom fields are associated to a custom fields group. When a user want to add custom fields on an entity, he must first create a custom fields group and associate this field with an entity. Then he may add add custom fields to this groups. 
+Custom fields are associated to a custom fields group. When a user want to add custom fields on an entity, he must first create a custom fields group and associate this field with an entity. Then he may add add custom fields to this groups.
 
 Some entities needs a **default** custom fields group. For instance, the default custom fields group will be printed on the main form for person, and will be appended on the main person view. Some bundle does not use this feature (i.e. the `report` bundle).
 
-.. note::
-
    In the future of the `person bundle`, other custom fields group will be added in forms accessible from the menu, allowing users to completely customize and separate their entities.
-   
-Allow custom fields on an entity
---------------------------------
+
+### Allow custom fields on an entity
 
 As a developer, you must allow your users to add custom fields on your entities.
 
-.. warning::
     For having custom fields, the class of the entity must contain a variable for storing the custom data. **By convention this variable must be called $cFData**
 
-
-Create a json field on your entity
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+##### Create a json field on your entity
 
 Declare a json field in your database :
-
-.. code-block:: yaml
-
+```bash
    Chill\CustomFieldsBundle\Entity\BlopEntity:
       type: entity
       # ...
       fields:
          cFData:
             type: json_array
-            
+```
+
 Create the field accordingly in the class logic :
 
-.. code-block:: php
-
+```bash
    namespace Chill\CustomFieldsBundle\Entity;
-   
+
    /**
    * BlopEntity
    */
    class BlopEntity
    {
-   
+
    /**
    * @var array
    */
    private $cFData;
-   
+
    /**
-   * You must set a setter in order to save automatically custom 
+   * You must set a setter in order to save automatically custom
    * fields from forms, using Form Component
    *
    * @param array $cFData
@@ -100,9 +73,9 @@ Create the field accordingly in the class logic :
       $this->cFData = $cFData;
       return $this;
    }
-   
+
    /**
-   * You also must create a getter in order to let Form 
+   * You also must create a getter in order to let Form
    * component populate form fields
    *
    * @return array
@@ -111,9 +84,9 @@ Create the field accordingly in the class logic :
    {
       return $this->cFData;
    }
-            
-Declare your customizable entity in configuration
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+```
+
+##### Declare your customizable entity in configuration
 
 This step is necessary to allow user to create custom fields group associated with this entity.
 
@@ -130,26 +103,25 @@ This method is discouraged but explained first as it helps to undersand the reco
 
 Add those file under `chill_custom_fields` section :
 
-.. code-block:: yaml
-
+```yaml
    chill_custom_fields:
       customizables_entities:
          - { class: Chill\YourBundleBundle\Entity\BlopEntity, name: blop_entity }
-         
+```
+
 * The `name` allow you to define a string which is translatable. This string will appears when chill's admin will add/retrieve new customFieldsGroup.
 * The class, which is a full FQDN class path
 
 Automatically, in DependencyInjection/Extension class (recommended)
 """""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
 
-This is the recommended way for declaring customizable classes. 
+This is the recommended way for declaring customizable classes.
 
 You can prepend configuration of `custom fields bundle` from the class `YourBundle\DependencyInjection\YourBundleExtension`. **Note** that you also have to implements `Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface` on this class to make the `prepend` function being taken into account.
 
-Example here : 
-
-.. code-block:: php
+Example here :
 
+```php
     class ChillYourBundleExtension extends Extension implements PrependExtensionInterface
     {
         /**
@@ -163,48 +135,44 @@ Example here :
             }
 
             $container->prependExtensionConfig('chill_custom_fields',
-                array('customizables_entities' => 
+                array('customizables_entities' =>
                     array(
                         array(
-                            'class' => 'Chill\YourBundleBundle\Entity\BlopEntity', 
+                            'class' => 'Chill\YourBundleBundle\Entity\BlopEntity',
                             'name' => 'blop_entity',)
                    )
                )
             );
         }
     }
+```
 
 * The `name` allow you to define a string which is translatable. This string will appears when chill's admin will add/retrieve new customFieldsGroup.
 * The class, which is a full FQDN class path
 
-.. seealso::
-
-   `How to simplify configuration of multiple bundles <http://symfony.com/doc/current/cookbook/bundles/prepend_extension.html>`_
+   `How to simplify configuration of multiple bundles ](http://symfony.com/doc/current/cookbook/bundles/prepend_extension.html)
       A cookbook page about prepending configuration.
 
-
-Adding options to your custom fields groups
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+##### Adding options to your custom fields groups
 
 You may add options to the groups associated with an entity.
 
-In `config.yml` the declaration should be : 
-
-.. code-block:: yaml
+In `config.yml` the declaration should be :
 
+```yaml
    chill_custom_fields:
        customizables_entities:
-           - 
+           -
                class: Chill\YourBundleBundle\Entity\BlopEntity
                name: BlopEntity
                options:
                    # this will create a "myFieldKey" field as text, with a maxlength attribute to 150 (see http://symfony.com/doc/master/reference/forms/types/text.html)
-                   myFieldKey: {form_type: text, form_options: {attr: [maxlength: 150]}} 
+                   myFieldKey: {form_type: text, form_options: {attr: [maxlength: 150]}}
+```
 
-In the `PrependExtensionInterface::prepend` function, the options key will be added in the configuration definition : 
-
-.. code-block:: php
+In the `PrependExtensionInterface::prepend` function, the options key will be added in the configuration definition :
 
+```php
    class ChillYourBundleExtension extends Extension implements PrependExtensionInterface
    {
        /**
@@ -218,10 +186,10 @@ In the `PrependExtensionInterface::prepend` function, the options key will be ad
            }
 
            $container->prependExtensionConfig('chill_custom_fields',
-               array('customizables_entities' => 
+               array('customizables_entities' =>
                    array(
                        array(
-                          'class' => 'Chill\YourBundleBundle\Entity\BlopEntity', 
+                          'class' => 'Chill\YourBundleBundle\Entity\BlopEntity',
                           'name' => 'BlopEntity',
                           'options' => array(
                                 'myFieldKey' => [ 'form_type' => 'text', 'form_options' => [ 'attr' => [ 'maxlength' => 150 ] ]
@@ -231,16 +199,15 @@ In the `PrependExtensionInterface::prepend` function, the options key will be ad
            );
        }
    }
-               
-**Example :** the entity `Report` from **ReportBundle** has to pick some custom fields belonging to a group to print them in *summaries* the timeline page. The definition will use the special type `custom_fields_group_linked_custom_field` which will add a select input with all fields associated with the current custom fields group : 
+```
 
-.. code-block:: php
+**Example :** the entity `Report` from **ReportBundle** has to pick some custom fields belonging to a group to print them in *summaries* the timeline page. The definition will use the special type `custom_fields_group_linked_custom_field` which will add a select input with all fields associated with the current custom fields group :
 
+```php
    class ChillReportExtension extends Extension implements PrependExtensionInterface
    {
        /**
-        * 
-        * 
+###### *
         * @param ContainerBuilder $container
         */
        public function prepend(ContainerBuilder $container)
@@ -251,15 +218,15 @@ In the `PrependExtensionInterface::prepend` function, the options key will be ad
            }
 
            $container->prependExtensionConfig('chill_custom_fields',
-               array('customizables_entities' => 
+               array('customizables_entities' =>
                    array(
                        array(
-                          'class' => 'Chill\ReportBundle\Entity\Report', 
+                          'class' => 'Chill\ReportBundle\Entity\Report',
                           'name' => 'ReportEntity',
                           'options' => array(
                              'summary_fields' => array(
                                 'form_type' => 'custom_fields_group_linked_custom_fields',
-                                'form_options' => 
+                                'form_options' =>
                                    [
                                       'multiple' => true,
                                       'expanded' => false
@@ -271,14 +238,13 @@ In the `PrependExtensionInterface::prepend` function, the options key will be ad
            );
        }
    }
+```
 
 Note that `custom_fields_group_linked_custom_fields` does not create any input on `CustomFieldsGroup` creation : there aren't any fields associated with the custom fields just after the group creation... You have to add custom fields and associate them with the newly created group to see them appears.
 
-Rendering custom fields and custom fields group in a template
--------------------------------------------------------------
+### Rendering custom fields and custom fields group in a template
 
-.. warning::
-    Each custom field can be `active` or not. Only `active` custom fields has to be dislayed.
+Each custom field can be `active` or not. Only `active` custom fields has to be dislayed.
 
 For rendering custom fields, two function are available :
 
@@ -290,8 +256,7 @@ For rendering custom fields group, a function is available :
 
 * `chill_custom_fields_group_widget` to render the widget. It will display the custom fields of the group in a dd / dt structure.
 
-chill_custom_field_label
-^^^^^^^^^^^^^^^^^^^^^^^^
+##### chill_custom_field_label
 
 The signature is :
 
@@ -300,29 +265,23 @@ The signature is :
 
 Examples
 
-.. code-block:: jinja
-
    {{ chill_custom_field_label(customField) }}
 
-
-
-chill_custom_field_widget
-^^^^^^^^^^^^^^^^^^^^^^^^^
+##### chill_custom_field_widget
 
 The signature is :
 
 *  array **$fields** the array raw, as stored in the db
-*  CustomField **$customField** a customField instance 
+*  CustomField **$customField** a customField instance
 *  string **$documentType** the type of document. Default to `html`.
 
 Examples:
 
-.. code-block:: jinja
-
+```bash
    {{ chill_custom_field_widget(entity.customFields, customField) }}
+```
 
-chill_custom_field_is_empty
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
+##### chill_custom_field_is_empty
 
 The signature is :
 
@@ -331,13 +290,9 @@ The signature is :
 
 Examples :
 
-.. code-block:: jinja
-
    {%- if chill_custom_field_is_empty(cFData, customField) == false -%}
 
-
-chill_custom_fields_group_widget
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+##### chill_custom_fields_group_widget
 
 This function only display custom fields that are `active`.
 
@@ -346,19 +301,17 @@ The signature is :
 *  array **$fields** the array raw, as stored in the db
 *  CustomFieldsGroup **$customFieldsGroup** the custom field group to render
 
-.. code-block:: jinja
-
+```bash
    {{ chill_custom_fields_group_widget(entity.cFData, entity.customFieldsGroup) }}
+```
 
-Custom Fields's form
---------------------
+### Custom Fields's form
 
 You should simply use the 'custom_field' type in a template, with the group you would like to render in the `group` option's type.
 
-Example : 
-
-.. code-block:: php
+Example :
 
+```php
    namespace Chill\ReportBundle\Form;
 
    use Symfony\Component\Form\AbstractType;
@@ -377,14 +330,14 @@ Example :
 
            $builder
                ->add('user')
-               ->add('date', 'date', 
+               ->add('date', 'date',
                    array('required' => true, 'widget' => 'single_text', 'format' => 'dd-MM-yyyy'))
                #add the custom fields :
-               ->add('cFData', 'custom_field', 
+               ->add('cFData', 'custom_field',
                    array('attr' => array('class' => 'cf-fields'), 'group' => $options['cFGroup']))
            ;
        }
-       
+
        /**
         * @param OptionsResolverInterface $resolver
         */
@@ -413,29 +366,25 @@ Example :
            return 'chill_reportbundle_report';
        }
    }
+```
 
-
-Available configuration
-------------------------
+### Available configuration
 
 Those options are available in the configuration, under the `chill_custom_field` key.
 
 Example :
-
-.. code-block:: yaml
-
+```yaml
    chill_custom_field:
       show_empty_values_in_views:  false
+```
 
 show_empty_values_in_views *boolean*:
    Allow to hide / show empty values in views. The aim of this configuration parameter is to hide (or show) empty values when :term:`custom fields group` are rendered.
 
    Default value : `true`
 
-Glossary
---------
 
-.. glossary::
+### Glossary
 
    custom fields group
       A group of custom fields
diff --git a/docs/source/bundles/event.rst b/docs/source/bundles/event.md
similarity index 63%
rename from docs/source/bundles/event.rst
rename to docs/source/bundles/event.md
index b902ee444..2fdd77ee7 100644
--- a/docs/source/bundles/event.rst
+++ b/docs/source/bundles/event.md
@@ -1,24 +1,18 @@
-.. Copyright (C)  2016 Champs Libres Cooperative SCRLFS
-   Permission is granted to copy, distribute and/or modify this document
+Permission is granted to copy, distribute and/or modify this document
    under the terms of the GNU Free Documentation License, Version 1.3
    or any later version published by the Free Software Foundation;
    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
    A copy of the license is included in the section entitled "GNU
    Free Documentation License".
 
-.. _event-bundle:
+# Event bundle
 
-Event bundle
-############
-
-Template & Menu
-===============
+## Template & Menu
 
 The event bundle has a special template with a specific menu for actions on
 events. This menu is called `event`.
 
-ChillEventBundle::layout.html.twig
-----------------------------------
+### ChillEventBundle::layout.html.twig
 
 This layout extends `ChillMainBundle::layoutWithVerticalMenu.html.twig` and add the menu `event`
 
@@ -26,4 +20,4 @@ It proposes a new block :
 
 * event_content
 
-  * where to display content relative to the event.
+  * where to display content relative to the event.
\ No newline at end of file
diff --git a/docs/source/bundles/group.md b/docs/source/bundles/group.md
new file mode 100644
index 000000000..1a69b9cdc
--- /dev/null
+++ b/docs/source/bundles/group.md
@@ -0,0 +1,33 @@
+Permission is granted to copy, distribute and/or modify this document
+   under the terms of the GNU Free Documentation License, Version 1.3
+   or any later version published by the Free Software Foundation;
+   with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+   A copy of the license is included in the section entitled "GNU
+   Free Documentation License".
+
+# Group bundle
+
+Allow to group people in a group. This group may be a family, an activity group, ...
+
+###### Entities
+
+###### Macros
+
+## Group sticker
+
+Macro file
+   `ChillGroupBundle:Group:macro.html.twig`
+Macro name
+   `_render`
+Macro envelope
+   `group`, instance of :class:`Chill\GroupBundle\Entity\CGroup`
+
+When to use this macro ?
+   When you want to represent group.
+Example usage :
+
+   ```jinja
+   {% import 'ChillGroupBundle:Group:macro.html.twig' as m %}
+
+   {{ m._render(g) }}
+   ```
diff --git a/docs/source/bundles/group.rst b/docs/source/bundles/group.rst
deleted file mode 100644
index 5d601084d..000000000
--- a/docs/source/bundles/group.rst
+++ /dev/null
@@ -1,49 +0,0 @@
-.. Copyright (C)  2016 Champs Libres Cooperative SCRLFS
-   Permission is granted to copy, distribute and/or modify this document
-   under the terms of the GNU Free Documentation License, Version 1.3
-   or any later version published by the Free Software Foundation;
-   with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-   A copy of the license is included in the section entitled "GNU
-   Free Documentation License".
-
-.. _group-bundle:
-
-Group bundle
-############
-
-Allow to group people in a group. This group may be a family, an activity group, ...
-
-.. contents:: Table of content
-   :local:
-
-Entities
-********
-
-.. figure:: /_static/bundles/group/group_classes_uml.png
-
-
-.. _group-bundle-macros:
-
-Macros
-******
-
-Group sticker
-==============
-
-Macro file
-   `ChillGroupBundle:Group:macro.html.twig`
-Macro name
-   :code:`_render`
-Macro envelope
-   :code:`group`, instance of :class:`Chill\GroupBundle\Entity\CGroup`
-
-When to use this macro ?
-   When you want to represent group.
-Example usage :
-   .. code-block:: html+jinja
-
-      {% import 'ChillGroupBundle:Group:macro.html.twig' as m %}
-
-      {{ m._render(g) }}
-
-
diff --git a/docs/source/bundles/index.md b/docs/source/bundles/index.md
new file mode 100644
index 000000000..045223396
--- /dev/null
+++ b/docs/source/bundles/index.md
@@ -0,0 +1,23 @@
+Permission is granted to copy, distribute and/or modify this document
+   under the terms of the GNU Free Documentation License, Version 1.3
+   or any later version published by the Free Software Foundation;
+   with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+   A copy of the license is included in the section entitled "GNU
+   Free Documentation License".
+
+# Bundles documentation
+
+You will find here documentation about bundles working with Chill.
+
+- [Main bundle](main.md)
+- [Custom Fields bundle](custom-fields.md)
+- [Person bundle](person.md)
+- [Report bundle](report.md)
+- [Activity bundle](activity.md)
+- [Group bundle](group.md)
+- [Event bundle](event.md)
+- [Ldap bundle (synchronisation between ldap and database)](ldap.md)
+
+### Your bundle here ?
+
+The contributors still do not have a policy about those bundle integration, but we would like to be very open on this subject. Please write to us [or open an issue ](https://redmine.champs-libres.coop/projects/chill/issues).
diff --git a/docs/source/bundles/index.rst b/docs/source/bundles/index.rst
deleted file mode 100644
index 2c4f3f17e..000000000
--- a/docs/source/bundles/index.rst
+++ /dev/null
@@ -1,29 +0,0 @@
-.. Copyright (C)  2014 Champs Libres Cooperative SCRLFS
-   Permission is granted to copy, distribute and/or modify this document
-   under the terms of the GNU Free Documentation License, Version 1.3
-   or any later version published by the Free Software Foundation;
-   with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-   A copy of the license is included in the section entitled "GNU
-   Free Documentation License".
-
-Bundles documentation
-###############################
-
-You will find here documentation about bundles working with Chill.
-
-.. toctree::
-    :maxdepth: 2
-
-    Main bundle <main.rst>
-    Custom Fields bundle <custom-fields.rst>
-    Person bundle <person.rst>
-    Report bundle <report.rst>
-    Activity bundle <activity.rst>
-    Group bundle <group.rst>
-    Event bundle <event.rst>
-    Ldap bundle (synchronisation between ldap and database) <ldap.rst>
-
-Your bundle here ?
--------------------
-
-The contributors still do not have a policy about those bundle integration, but we would like to be very open on this subject. Please write to us `or open an issue <https://redmine.champs-libres.coop/projects/chill/issues>`_.
diff --git a/docs/source/bundles/ldap.rst b/docs/source/bundles/ldap.md
similarity index 64%
rename from docs/source/bundles/ldap.rst
rename to docs/source/bundles/ldap.md
index ccea046a8..69b84baff 100644
--- a/docs/source/bundles/ldap.rst
+++ b/docs/source/bundles/ldap.md
@@ -1,94 +1,70 @@
-.. Copyright (C)  2014 Champs Libres Cooperative SCRLFS
-   Permission is granted to copy, distribute and/or modify this document
+Permission is granted to copy, distribute and/or modify this document
    under the terms of the GNU Free Documentation License, Version 1.3
    or any later version published by the Free Software Foundation;
    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
    A copy of the license is included in the section entitled "GNU
    Free Documentation License".
 
-.. _ldap-bundle:
-
-LDAP bundle
-###########
+# LDAP bundle
 
 This bundle binds the database with an ldap directory.
 
 The bundle synchronize the ldap directory with users in the database. It also
 provides a way to check user credentials against the ldap directory.
 
-
-.. contents:: Table of content
    :local:
 
-Current limitations
-*******************
+###### Current limitations
 
 - The length of the ldap dn must be < 255 characters
 - if the username extracted from the ldap is updated, the changes are not reflected in the database and remains the same
 
+###### Entities provided
 
-Entities provided
-*****************
+This bundle provides only one entity : :class:[Chill\\LdapBundle\\Entity\\UserLdapBinding`
 
-This bundle provides only one entity : :class:`Chill\\LdapBundle\\Entity\\UserLdapBinding`
+###### How the synchronizer works ?
 
-How the synchronizer works ?
-****************************
-
-#. The synchronizer performs a query on :code:`dn` and :code:`query` defined in the :ref:`configuration <configuration>`.
-#. For each entry returned by the query, it looks if the :code:`dn` exists in the database
+#. The synchronizer performs a query on `dn` and `query` defined in the [configuration ](configuration.md).
+#. For each entry returned by the query, it looks if the `dn` exists in the database
 
    #. If the entry does not exists :
 
-      #. the synchronizer looks for user with same username as defined by :code:`username_attr`, and bind it with the :code:`dn` if it exists.
-      #. else, a user is created with username defined by :code:`username_attr` (if the ldap contains more than one attribute, the first attribute returned is used)
+      #. the synchronizer looks for user with same username as defined by `username_attr`, and bind it with the `dn` if it exists.
+      #. else, a user is created with username defined by `username_attr` (if the ldap contains more than one attribute, the first attribute returned is used)
 
-   #. if a user exists which is already binded with the :code:`dn`, the entry is ignored.
+   #. if a user exists which is already binded with the `dn`, the entry is ignored.
 
-#. The synchronizer looks for dn existing in database and which were not returned by the query performed in 1. 
+#. The synchronizer looks for dn existing in database and which were not returned by the query performed in 1.
 
-   #. If they exists, those user are set to :code:`enabled=false`: they are not allowed to login.
+   #. If they exists, those user are set to `enabled=false`: they are not allowed to login.
 
-Installation
-************
+###### Installation
 
-This bundle requires : 
+This bundle requires :
 
 - PHP LDAP ext
-- :code:`symfony/ldap` with minimal version 3.1. Note that, currently, Chill uses Symfony 2.8: you should add the dependency on this single package manually
+- `symfony/ldap` with minimal version 3.1. Note that, currently, Chill uses Symfony 2.8: you should add the dependency on this single package manually
 
-In your composer.json, for stable version : 
-
-.. code-block:: json
+In your composer.json, for stable version :
 
    "require": {
-           // .. other dependencies 
+           // .. other dependencies
            "symfony/ldap" : "~3.1",
            "chill-project/ldap": "~1.0"
    }
 
-
-
 And for dev version :
 
-.. code-block:: json
-
    "require": {
-           // .. other dependencies 
+           // .. other dependencies
            "symfony/ldap" : "~3.1",
            "chill-project/ldap": "dev-master@dev"
    }
 
+###### Configuration
 
-.. _configuration:
-
-Configuration
-**************
-
-Configuration of the bundle
-============================
-
-.. code-block:: yaml
+## Configuration of the bundle
 
    # Default configuration for extension with alias: "chill_ldap"
    chill_ldap:
@@ -125,10 +101,7 @@ Configuration of the bundle
            # The attribute which will provide username (=login)
            username_attr:        cn
 
-
-Example : 
-
-.. code-block:: yaml
+Example :
 
    chill_ldap:
        server:
@@ -140,16 +113,12 @@ Example :
            dn: dc=champs-libres,dc=coop
            query: "(&(objectClass=inetOrgPerson)(userPassword=*))"
 
-
-Configuration of the security part of chill
-============================================
+## Configuration of the security part of chill
 
 Simply add the following config in the firewall of the security bundle :
 `chill_ldap_form_login: ~`. This config is located in `app/config/security.yml`
 
-Example of a configuration : 
-
-.. code-block:: yaml
+Example of a configuration :
 
    # in app/config/security.yml
 
@@ -168,37 +137,23 @@ Example of a configuration :
                # enable the login check by a form, against the ldap
                chill_ldap_form_login: ~ # this is the line you should add
 
-
-Note that, if you enable the login check by form **and** by the ldap, 
+Note that, if you enable the login check by form **and** by the ldap,
 the password will be checked against the database **and** against the ldap.
 If one of them match, the login will succeed.
 
-If you want to completely disable login check against the database, 
-simply remove the :code:`form_login` entry and all his options.
+If you want to completely disable login check against the database,
+simply remove the `form_login` entry and all his options.
 
-.. _command-and-crontab:
+## Command and crontab
 
-Command and crontab
-===================
-
-Synchronize the database : 
-
-.. code-block:: bash
+Synchronize the database :
 
    php app/console chill:ldap:synchronize
 
-
-For getting more debug message : 
-
-.. code-block:: bash
+For getting more debug message :
 
    php app/console chill:ldap:synchronize -vvv
 
-
-
-You should run this command regularly (using crontab or 
-`systemd timer <https://www.freedesktop.org/software/systemd/man/systemd.timer.html#>`_)
+You should run this command regularly (using crontab or
+`systemd timer ](https://www.freedesktop.org/software/systemd/man/systemd.timer.html#))
 to synchronize ldap and database automatically.
-
-
-
diff --git a/docs/source/bundles/main.rst b/docs/source/bundles/main.md
similarity index 57%
rename from docs/source/bundles/main.rst
rename to docs/source/bundles/main.md
index da195c98e..4cadf32d5 100644
--- a/docs/source/bundles/main.rst
+++ b/docs/source/bundles/main.md
@@ -1,15 +1,12 @@
-.. Copyright (C)  2014 Champs Libres Cooperative SCRLFS
-   Permission is granted to copy, distribute and/or modify this document
+Permission is granted to copy, distribute and/or modify this document
    under the terms of the GNU Free Documentation License, Version 1.3
    or any later version published by the Free Software Foundation;
    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
    A copy of the license is included in the section entitled "GNU
    Free Documentation License".
 
-.. _main-bundle:
- 
-Main bundle
-###########
+
+# Main bundle
 
 This bundle is **required** for running Chill.
 
@@ -18,32 +15,24 @@ This bundle provide :
 * Access control model (users, groups, and all concepts)
 * ...
 
-
-.. warning::
-
    this section is incomplete.
 
-.. _main-bundle-macros:
+###### Macros
 
-Macros
-******
-
-Address sticker
-===============
+## Address sticker
 
 Macro file
    `ChillMainBundle:Address:macro.html.twig`
 Macro name
-   :code:`_render`
+   `_render`
 Macro envelope
-   :code:`address`, instance of :class:`Chill\MainBundle\Entity\Address`
+   `address`, instance of :class:`Chill\MainBundle\Entity\Address`
 
 When to use this macro ?
    When you want to represent an address.
 Example usage :
-   .. code-block:: html+jinja
-
-      {% import 'ChillMainBundle:Address:macro.html.twig' as m %}
-
-      {{ m._render(address) }}
+   ```jinja
+   {% import 'ChillMainBundle:Address:macro.html.twig' as m %}
 
+   {{ m._render(address) }}
+   ```
diff --git a/docs/source/bundles/person.rst b/docs/source/bundles/person.md
similarity index 68%
rename from docs/source/bundles/person.rst
rename to docs/source/bundles/person.md
index f4199e52f..1d9b0ad2c 100644
--- a/docs/source/bundles/person.rst
+++ b/docs/source/bundles/person.md
@@ -1,65 +1,41 @@
-.. Copyright (C)  2014 Champs Libres Cooperative SCRLFS
-   Permission is granted to copy, distribute and/or modify this document
-   under the terms of the GNU Free Documentation License, Version 1.3
-   or any later version published by the Free Software Foundation;
-   with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-   A copy of the license is included in the section entitled "GNU
-   Free Documentation License".
-
-.. _person-bundle:
-
-Person bundle
-#############
+# Person bundle
 
 This bundle provides the ability to record people in the software. This bundle is required by other bundle.
 
-.. contents:: Table of content
-   :local:
-
-Entities provided
-*****************
-
-.. todo::
+###### Entities provided
 
    describe entities provided by person bundle
-   
-   
-Search terms
-************
 
-The class `Chill\PersonBundle\Search\PersonSearch` provide the search module.
 
-Domain
-======
+###### Search terms
+
+The class [Chill\PersonBundle\Search\PersonSearch` provide the search module.
+
+## Domain
 
 The search upon "person" is provided by default. The `@person` domain search may be omitted.
 
 * `@person` is the domain search for people.
 
-
-Arguments
-=========
+## Arguments
 
 * `firstname` : provide the search on firstname. Example : `firstname:Depardieu`. May match part of the firstname (`firsname:dep` will match Depardieu)
 * `lastname` : provide the search on lastname. May match part of the lastname.
 * `birthdate` : provide the search on the birthdate. Example : `birthdate:1996-01-19`
 * `gender`: performs search on man/woman. The accepted values are `man` or `woman`.
-* `nationality` : performs search on nationality. Value must be a country code `as described in ISO 3166 <http://www.iso.org/iso/fr/home/standards/country_codes.htm>`_. Example : `nationality:FR`.
+* `nationality` : performs search on nationality. Value must be a country code `as described in ISO 3166 ](http://www.iso.org/iso/fr/home/standards/country_codes.htm). Example : [nationality:FR`.
 
-Default
-=======
+## Default
 
 The default search is performed on firstname and/or lastname. Both are concatened before search. If values are separated by spaces, the clause `AND` is used : the search `dep ge` will match 'Gérard Depardieu` or 'Jean Depagelles', but not 'Charline Depardieu' (missing 'Ge' in word).
 
-Configuration options
-*********************
+###### Configuration options
 
 Those options are available under `chill_person` key.
 
 Example of configuration:
 
-.. code-block:: yaml
-
+```yaml
    chill_person:
       validation:
          birthdate_not_after: P15Y
@@ -73,17 +49,18 @@ Example of configuration:
          marital_status: visible
          spoken_languages: hidden
          address: visible
+```
 
 birthdate_not_after *string*
-   The period duration before today during which encoding birthdate is not possible. The period is a string matching the format of `ISO_8601`, which is also use to build `DateInterval classes <http://php.net/manual/en/dateinterval.construct.php>`_.
+   The period duration before today during which encoding birthdate is not possible. The period is a string matching the format of `ISO_8601`, which is also use to build `DateInterval classes ](http://php.net/manual/en/dateinterval.construct.php).
 
-   Example: `P1D`, `P18Y`
+   Example: [P1D`, `P18Y`
 
    Default value: `P1D` which means that birthdate before the current day (= yesterday) are allowed.
 
 person_fields *array*
-   This define the visibility of some fields. By default, all fields are visible, but you can choose to hide some of them. Available keys are : 
-   
+   This define the visibility of some fields. By default, all fields are visible, but you can choose to hide some of them. Available keys are :
+
    * `nationality`
    * `country_of_birth`
    * `place_of_birth`
@@ -97,73 +74,62 @@ person_fields *array*
 
    Default value : `visible`, which means that all fields are visible.
 
-   Example: 
-
-   .. code-block:: yaml
+   Example:
 
+```yaml
       chill_person:
          person_fields:
             nationality: hidden
             email: hidden
             phonenumber: hidden
+```
 
-.. note:: 
    If all the field of a "box" are hidden, the whole box does not appears. Example: if the fields `phonenumber` and `email` are hidden, the title `Contact information` will be hidden in the UI.
 
-.. note:: 
-   If you hide multiple fields, for a better integration you may want to override the template, for a better appeareance. See `the symfony documentation <http://symfony.com/doc/current/book/templating.html#overriding-bundle-templates>`_ about this feature.
+   If you hide multiple fields, for a better integration you may want to override the template, for a better appeareance. See `the symfony documentation ](http://symfony.com/doc/current/book/templating.html#overriding-bundle-templates) about this feature.
 
-.. _person-bundle-macros:
+###### Macros
 
-Macros
-******
-
-Sticker for a person
-=====================
+## Sticker for a person
 
 Macro file
    `ChillPersonBundle:Person:macro.html.twig`
 Macro envelope
-   :code:`render(p, withLink=false)`
+   `render(p, withLink=false)`
 
-   :code:`p` is an instance of :class:`Chill\PersonBundle\Entity\Person`
+   `p` is an instance of `Chill\PersonBundle\Entity\Person`
 
-   :code:`withLink` :class:`boolean`
+   `withLink`: `boolean`
 When to use this macro ?
    When you want to represent a person.
 Example usage :
-   .. code-block:: html+jinja
+   ```jinja
+   {% import "ChillPersonBundle:Person:macro.html.twig" as person_ %}
 
-      {% import "ChillPersonBundle:Person:macro.html.twig" as person_ %}
+   {{ person_.render(person, true) }}
+   ```
 
-      {{ person_.render(person, true) }}
+###### Layout events and delegated blocks
 
-Layout events and delegated blocks
-***********************************
-
-:code:`chill_block.person_post_vertical_menu` event
-====================================================
+## `chill_block.person_post_vertical_menu` event
 
 This event is available to add content below of the vertical menu (on the right).
 
-The context is : 
+The context is :
 
-- :code:`person` : the current person which is rendered. Instance of :class:`Chill\PersonBundle\Entity\Person`
+- `person` : the current person which is rendered. Instance of `Chill\PersonBundle\Entity\Person`
 
-Widgets
-*******
+###### Widgets
 
-Add a list of person on homepage
-================================
+## Add a list of person on homepage
 
 The bundle provide a way to add a list of accompanyied person on the homepage:
 
-.. code-block:: yaml
-
+```yaml
    chill_main:
        widgets:
-           homepage: 
-               - 
+           homepage:
+               -
                    order: 10
                    widget_alias: person_list
                    person_list:
@@ -180,15 +146,11 @@ The bundle provide a way to add a list of accompanyied person on the homepage:
                        # when the view is overriden, you can add some custom fields
                        # to the view
                        custom_fields: [school-2fb5440e-192c-11e6-b2fd-74d02b0c9b55]
-  
-Commands
-********
+```
 
+###### Commands
 
-:code:`chill:person:move`
-=========================
-
-.. code-block:: txt
+## `chill:person:move`
 
 	Usage:
 		chill:person:move [options]
@@ -213,21 +175,17 @@ Commands
 
 Move all the entities associated to a person onto another one, and remove the old person.
 
-.. warning:: 
-
-  Some entities are ignored and will be deleted: 
+  Some entities are ignored and will be deleted:
 
   - the accompanying periods ;
   - the data attached to a person entity: name, address, date of birth, etc. Thos should be merge before the move.
 
-It is advised to run first the command with the :code:`dump-sql` option and, then, use the :code:`force` option.
+It is advised to run first the command with the `dump-sql` option and, then, use the `force` option.
 
 The moving and suppression is executed inside a transaction, ensuring no data loss if the migration fails.
 
-.. note::
+  Using bash and awk, it is easy to use a TSV file (values separated by a tab, not a comma) to create move commands. Assuming our file is named `twins.tsv` and contains two columns: the first one with `from` ids, and the second one with `to` ids:
 
-  Using bash and awk, it is easy to use a TSV file (values separated by a tab, not a comma) to create move commands. Assuming our file is named :code:`twins.tsv` and contains two columns: the first one with :code:`from` ids, and the second one with :code:`to` ids: 
-
-  .. code-block:: bash
-
-    awk '{ print "php app/console chill:person:move --dump-sql --from " $1 " --to " $2;}' twins.tsv 
+  ```bash
+    awk '{ print "php app/console chill:person:move --dump-sql --from " $1 " --to " $2;}' twins.tsv
+```
diff --git a/docs/source/bundles/report.md b/docs/source/bundles/report.md
new file mode 100644
index 000000000..717f9e9d6
--- /dev/null
+++ b/docs/source/bundles/report.md
@@ -0,0 +1,23 @@
+# Report bundle
+
+This bundle provides the ability to record report about people. We use custom fields to let user add fields to reports.
+
+The documentation about report is not written
+
+## Concepts
+
+## Search
+
+### Domain
+
+* `@report` is the domain search for reports.
+
+### Arguments
+
+* `date` : The date of the report
+
+### Default
+
+The report's date is the default value.
+
+An error is thrown if an argument `date` and a default is used.
diff --git a/docs/source/bundles/report.rst b/docs/source/bundles/report.rst
deleted file mode 100644
index d71caa0be..000000000
--- a/docs/source/bundles/report.rst
+++ /dev/null
@@ -1,46 +0,0 @@
-.. Copyright (C)  2014 Champs Libres Cooperative SCRLFS
-   Permission is granted to copy, distribute and/or modify this document
-   under the terms of the GNU Free Documentation License, Version 1.3
-   or any later version published by the Free Software Foundation;
-   with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-   A copy of the license is included in the section entitled "GNU
-   Free Documentation License".
-
-.. _report-bundle:
-
-Report bundle
-#############
-
-This bundle provides the ability to record report about people. We use custom fields to let user add fields to reports.
-
-.. contents:: Table of content
-   :local:
-
-.. todo::
-
-   The documentation about report is not writtend
-
-Concepts
-========
-
-
-Search
-======
-
-Domain
-------
-
-* `@report` is the domain search for reports.
-
-
-Arguments
----------
-
-* `date` : The date of the report
-
-Default
--------
-
-The report's date is the default value. 
-
-An error is thrown if an argument `date` and a default is used.
diff --git a/docs/source/development/FAQ.md b/docs/source/development/FAQ.md
new file mode 100644
index 000000000..ffda670b8
--- /dev/null
+++ b/docs/source/development/FAQ.md
@@ -0,0 +1,23 @@
+# Frequently asked questions
+
+## Continuous integration
+
+Pipeline fails, but php-cs-fixer doesn't alert me when running it locally?
+========================================
+
+It is possible that you run php-cs-fixer on your local instance of chill and no fixes are made.
+Everything seems fine, so you push. However, once the pipeline is run in gitlab, you're notified that it failed due to php
+cs errors.
+
+In this case it's likely that you have to update your version of php-cs-fixer.
+php-cs-fixer is installed when building the docker image: https://gitea.champs-libres.be/Chill-project/chill-skeleton-basic/src/branch/main/Dockerfile#L50
+
+Consequently, to update php-cs-fixer, we have to update the image by building it again.
+
+For this the following commands can be used.
+
+```
+    docker compose build --pull php
+    # replace existing containers
+    docker compose up -d --force-recreate php
+```
diff --git a/docs/source/development/FAQ.rst b/docs/source/development/FAQ.rst
deleted file mode 100644
index c0b7e37e8..000000000
--- a/docs/source/development/FAQ.rst
+++ /dev/null
@@ -1,36 +0,0 @@
-.. Copyright (C)  2014 Champs Libres Cooperative SCRLFS
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.3
-or any later version published by the Free Software Foundation;
-with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-A copy of the license is included in the section entitled "GNU
-Free Documentation License".
-
-.. _faq:
-
-
-Frequently asked questions
-####################
-
-Continuous integration
-***********
-
-Pipeline fails, but php-cs-fixer doesn't alert me when running it locally ?
-========================================
-
-It is possible that you run php-cs-fixer on your local instance of chill and no fixes are made.
-Everything seems fine, so you push. However once the pipeline is run in gitlab, you're notified that it failed due to php
-cs errors.
-
-In this case it's likely that you have to update your version of php-cs-fixer.
-php-cs-fixer is installed when building the docker image: https://gitea.champs-libres.be/Chill-project/chill-skeleton-basic/src/branch/main/Dockerfile#L50
-
-Consequently, to update php-cs-fixer we have to update the image by building it again.
-
-For this the following commands can be used,
-
-.. code-block:: php
-
-    docker compose build --pull php
-    # replace existing containers
-    docker compose up -d --force-recreate php
diff --git a/docs/source/development/access_control_model.rst b/docs/source/development/access_control_model.md
similarity index 91%
rename from docs/source/development/access_control_model.rst
rename to docs/source/development/access_control_model.md
index e159f7fb6..a05b84766 100644
--- a/docs/source/development/access_control_model.rst
+++ b/docs/source/development/access_control_model.md
@@ -1,19 +1,15 @@
-.. Copyright (C)  2015 Champs Libres Cooperative SCRLFS
-   Permission is granted to copy, distribute and/or modify this document
+Permission is granted to copy, distribute and/or modify this document
    under the terms of the GNU Free Documentation License, Version 1.3
    or any later version published by the Free Software Foundation;
    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
    A copy of the license is included in the section entitled "GNU
    Free Documentation License".
 
-Access controle model
-**********************
+###### Access controle model
 
-.. contents:: Table of content
     :local:
 
-Concepts
-========
+## Concepts
 
 Every time an entity is created, viewed or updated, the software check if the user has the permission to make this action. The decision is made with three parameters :
 
@@ -23,20 +19,15 @@ Every time an entity is created, viewed or updated, the software check if the us
 
 The user must be granted access to the action on this particular entity, with this scope and center.
 
-TL;DR
-=====
+## TL;DR
 
-Resolve scope and center
-------------------------
+### Resolve scope and center
 
 In a service, resolve the center and scope of an entity
 
-.. code-block:: php
-
    use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
    use Chill\MainBundle\Security\Resolver\ScopeResolverDispatcher;
 
-
    class MyService {
       private ScopeResolverDispatcher $scopeResolverDispatcher;
       private CenterResolverDispatcher $centerResolverDispatcher;
@@ -58,8 +49,6 @@ In a service, resolve the center and scope of an entity
 
 In twig template, resolve the center:
 
-.. code-block:: twig
-
    {# resolve a center #}
 
    {% if person|chill_resolve_center is not null%}
@@ -81,8 +70,6 @@ In twig template, resolve the center:
 
 In twig template, resolve the scope:
 
-.. code-block:: twig
-
    {% if entity|chill_is_scope_concerned %}
 
       {% if entity|chill_resolve_scope is iterable %}
@@ -98,10 +85,7 @@ In twig template, resolve the scope:
       {% endfor %}
    {%- endif -%}
 
-Build a ``Voter``
------------------
-
-.. code-block:: php
+### Build a ``Voter``
 
    <?php
 
@@ -151,7 +135,6 @@ Build a ``Voter``
                ->build();
        }
 
-
        protected function supports($attribute, $subject)
        {
            return $this->voterHelper->supports($attribute, $subject);
@@ -194,25 +177,19 @@ Build a ``Voter``
            return array();
        }
 
-
        public function getRolesWithHierarchy()
        {
            return ['PersonDocument' => $this->getRoles() ];
        }
    }
 
-
-
-
-From an user point of view
-==========================
+## From an user point of view
 
 The software is design to allow fine tuned access rights for complicated installation and team structure. The administrators may also decide that every user has the right to see all resources, where team have a more simple structure. 
 
 Here is an overview of the model.
 
-Chill can be multi-center
--------------------------
+### Chill can be multi-center
 
 Chill is designed to be installed once for social center who work with multiple teams separated, or for social services's federation who would like to share the same installation of the software for all their members. 
 
@@ -222,8 +199,7 @@ Otherwise, it is not required to create multiple center: Chill can also work for
 
 Obviously, users working in the different centers are not allowed to see the entities (_persons_, _reports_, _activities_) of other centers. But users may be attached to multiple centers: consequently they will be able to see the entities of the multiple centers they are attached to.
 
-Inside center, scope divide team
---------------------------------
+### Inside center, scope divide team
 
 Users are attached to one or more center and, inside to those center, there may exists differents scopes. The aim of those _scopes_ is to divide the whole team of social worker amongst different departement, for instance: the social team, the psychologist team, the nurse team, the administrative team, ... Each team is granted of different rights amongst scope. For instance, the social team may not see the _activities_ of the psychologist team. The administrative team may see the date & time's activities, but is not allowed to see the detail of those entities (the personal notes, ...).
 
@@ -233,9 +209,7 @@ As entities have only one scopes, if some entities must be shared across two dif
 
 Example: if some activities must be seen and updated between nurses and psychologists, the administrator will create a scope "nurse and psy" and add the ability for both team "nurse" and "psychologist" to "create", "see", and "update" the activities belonging to scope "nurse and psy".
 
-
-Where does the ``scope`` and ``center`` comes from ?
-====================================================
+## Where does the [`scope`` and ``center`` comes from ?
 
 Most often, scope and center comes from user's input:
 
@@ -256,30 +230,23 @@ But sometimes, this implementation does not fits the needs:
 
 For this reasons, associated center and scopes must be resolved programmatically. The default implementation rely on the model association, as described above. But it becomes possible to change the behaviour on different implementations.
 
-Is my entity "concerned" by scopes ?
-------------------------------------
+### Is my entity "concerned" by scopes ?
 
 Some entities are concerned by scope, some not.
 
 This is also programmatically resolved.
 
-The concepts translated into code
-===================================
+## The concepts translated into code
 
-.. figure:: /_static/access_control_model.png
    
    Schema of the access control model
 
 Chill handle **entities**, like *persons*, *reports* (associated to *persons*), *activities* (also associated to *_persons*), ... On creation, those entities are linked to one center and, eventually, to one scope. They implements the interface `HasCenterInterface`.
 
-.. note::
-
    Somes entities are linked to a center through the entity they are associated with. For instance, *activities* or *reports* are associated to a *person*, and the person is associated to a *center*. The *report*'s *center* is always the *person*'s *center*.
 
 Entities may be associated with a scope. In this case, they implement the `HasScopeInterface`.
 
-.. note::
-
    Currently, only the *person* entity is not associated with a scope. 
 
 At each step of his lifetime (creation, view of the entity and eventually of his details, update and, eventually, deletion), the right of the user are checked. To decide wether the user is granted right to execute the action, the software must decide with those elements :
@@ -291,13 +258,10 @@ At each step of his lifetime (creation, view of the entity and eventually of his
 
 All those action are executed through symfony voters and helpers. 
 
-How to check authorization ?
-============================
+## How to check authorization ?
 
 Just use the symfony way-of-doing, but do not forget to associate the entity you want to check access. For instance, in controller :  
 
-.. code-block:: php
-
    class MyController extends Controller 
    {
 
@@ -311,12 +275,9 @@ Just use the symfony way-of-doing, but do not forget to associate the entity you
 
 And in template :
 
-.. code-block:: twig
-
    {{ if is_granted('CHILL_ENTITY_SEE', entity) %}print something{% endif %}
 
-Retrieving reachable scopes and centers for a user
---------------------------------------------------
+### Retrieving reachable scopes and centers for a user
 
 The class :class:`Chill\\MainBundle\\Security\\Authorization\\AuthorizationHelperInterface` helps you to get centers and scope reachable by a user.
 
@@ -325,9 +286,7 @@ Those methods are intentionnaly build to give information about user rights:
 - getReachableCenters: to get reachable centers for a user
 - getReachableScopes : to get reachable scopes for a user
 
-
-Adding your own roles
----------------------
+### Adding your own roles
 
 Extending Chill will requires you to define your own roles and rules for your entities. You will have to define your own voter to do so.
 
@@ -336,28 +295,20 @@ To create your own roles, you should:
 * implement your own voter. This voter will have to extends the :class:`Chill\\MainBundle\\Security\\AbstractChillVoter`. As defined by Symfony, this voter must be declared as a service and tagged with `security.voter`;
 * declare the role through implementing a service tagged with `chill.role` and implementing :class:`Chill\\MainBundle\\Security\\ProvideRoleInterface`.
 
-.. note::
-
    Both operation may be done through a simple class: you can implements :class:`Chill\\MainBundle\\Security\\ProvideRoleInterface` and :class:`Chill\\MainBundle\\Security\\AbstractChillVoter` on the same class. See live example: :class:`Chill\\ActivityBundle\\Security\\Authorization\\ActivityVoter`, and similar examples in the `PersonBundle` and `ReportBundle`.
 
-.. seealso::
-
-   `How to Use Voters to Check User Permissions <http://symfony.com/doc/current/cookbook/security/voters_data_permission.html>`_
+   `How to Use Voters to Check User Permissions ](http://symfony.com/doc/current/cookbook/security/voters_data_permission.html)
 
    From the symfony cookbook
 
-   `New in Symfony 2.6: Simpler Security Voters <http://symfony.com/blog/new-in-symfony-2-6-simpler-security-voters>`_
+   [New in Symfony 2.6: Simpler Security Voters ](http://symfony.com/blog/new-in-symfony-2-6-simpler-security-voters)
 
    From the symfony blog
 
-
-Declare your role
-^^^^^^^^^^^^^^^^^^
+##### Declare your role
 
 To declare new role, implement the class :class:`Chill\\MainBundle\\Security\\ProvideRoleInterface`. 
 
-.. code-block:: php
-
    interface ProvideRoleInterface
    {
        /**
@@ -375,21 +326,15 @@ To declare new role, implement the class :class:`Chill\\MainBundle\\Security\\Pr
        public function getRolesWithoutScope();
    }
 
-
 Then declare your service with a tag `chill.role`. Example : 
 
-.. code-block:: yaml
-
        your_service:
            class: Chill\YourBundle\Security\Authorization\YourVoter
            tags:
                - { name: chill.role }
 
-
 Example of an implementation of :class:`Chill\\MainBundle\\Security\\ProvideRoleInterface`:
 
-.. code-block:: php
-
    namespace Chill\PersonBundle\Security\Authorization;
 
    use Chill\MainBundle\Security\ProvideRoleInterface;
@@ -412,13 +357,10 @@ Example of an implementation of :class:`Chill\\MainBundle\\Security\\ProvideRole
 
    }
 
-Adding role hierarchy
-^^^^^^^^^^^^^^^^^^^^^
+##### Adding role hierarchy
 
 You should prepend Symfony's security component directly from your code. 
 
-.. code-block:: php
-
    namespace Chill\ReportBundle\DependencyInjection;
    use Symfony\Component\DependencyInjection\ContainerBuilder;
    use Symfony\Component\Config\FileLocator;
@@ -450,10 +392,7 @@ You should prepend Symfony's security component directly from your code.
        }
    }
 
-
-
-Implement your voter
-^^^^^^^^^^^^^^^^^^^^
+##### Implement your voter
 
 Most of the time, Voter will check that:
 
@@ -464,7 +403,6 @@ Most of the time, Voter will check that:
 
 Thats what we call the "autorization logic". But this logic may be replace by a new one, and developers should take care of it.
 
-
 Then voter implementation should take care of:
 
 * check the access to associated entities. For instance, if an ``Activity`` is associated to a ``Person``, the voter should first check that the user can show the associated ``Person``;
@@ -472,9 +410,6 @@ Then voter implementation should take care of:
 
 This is an example of implementation:
 
-
-.. code-block:: php
-
    <?php
 
    namespace Chill\DocStoreBundle\Security\Authorization;
@@ -513,7 +448,6 @@ This is an example of implementation:
                ->build();
        }
 
-
        protected function supports($attribute, $subject)
        {
            return $this->voterHelper->supports($attribute, $subject);
@@ -553,7 +487,6 @@ This is an example of implementation:
            // ...
        }
 
-
        public function getRolesWithHierarchy()
        {
            // ...
@@ -562,8 +495,6 @@ This is an example of implementation:
 
 Then, you will have to declare the service and tag it as a voter :
 
-.. code-block:: yaml
-
    services:
        chill.report.security.authorization.report_voter:
            class: Chill\ReportBundle\Security\Authorization\ReportVoter
@@ -572,18 +503,13 @@ Then, you will have to declare the service and tag it as a voter :
            tags:
             - { name: security.voter }
 
-
-How to resolve scope and center programmatically ?
-==================================================
+## How to resolve scope and center programmatically ?
 
 In a service, resolve the center and scope of an entity
 
-.. code-block:: php
-
    use Chill\MainBundle\Security\Resolver\CenterResolverDispatcher;
    use Chill\MainBundle\Security\Resolver\ScopeResolverDispatcher;
 
-
    class MyService {
       private ScopeResolverDispatcher $scopeResolverDispatcher;
       private CenterResolverDispatcher $centerResolverDispatcher;
@@ -605,8 +531,6 @@ In a service, resolve the center and scope of an entity
 
 In twig template, resolve the center:
 
-.. code-block:: twig
-
    {# resolve a center #}
 
    {% if person|chill_resolve_center is not null%}
@@ -628,8 +552,6 @@ In twig template, resolve the center:
 
 In twig template, resolve the scope:
 
-.. code-block:: twig
-
    {% if entity|chill_is_scope_concerned %}
 
       {% if entity|chill_resolve_scope is iterable %}
@@ -645,8 +567,7 @@ In twig template, resolve the scope:
       {% endfor %}
    {%- endif -%}
 
-What is the default implementation of Scope and Center resolver ?
------------------------------------------------------------------
+### What is the default implementation of Scope and Center resolver ?
 
 By default, the implementation rely on association into entities.
 
@@ -657,16 +578,14 @@ By default, the implementation rely on association into entities.
 
 Then, the default implementation will resolve the center and scope based on the implementation in your model.
 
-How to change the default behaviour ?
--------------------------------------
+### How to change the default behaviour ?
 
 Implements those interface into services:
 
 * ``Chill\MainBundle\Security\Resolver\CenterResolverInterface``;
 * ``Chill\MainBundle\Security\Resolver\ScopeResolverInterface``;
 
-Authorization into lists and index pages
-========================================
+## Authorization into lists and index pages
 
 Due to the fact that authorization model may be overriden, "list" and "index" pages should not rely on center and scope from controller. This must be delegated to dedicated service, which will be aware of the authorization model. We call them ``ACLAwareRepository``. This service must implements an interface, in order to allow to change the implementation.
 
@@ -674,14 +593,11 @@ The controller **must not** performs any DQL or SQL query.
 
 Example in a controller:
 
-.. code-block:: php
-
    namespace Chill\TaskBundle\Controller;
 
    use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
    use Chill\TaskBundle\Repository\SingleTaskAclAwareRepositoryInterface;
 
-
    final class SingleTaskController extends AbstractController
    {
 
@@ -729,11 +645,9 @@ Example in a controller:
        }
    }
 
-Writing ``ACLAwareRepository``
-------------------------------
+### Writing ``ACLAwareRepository``
 
-The ACLAwareRepository should rely on interfaces
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+##### The ACLAwareRepository should rely on interfaces
 
 As described above, the ACLAwareRepository will perform the query for listing entities, and take care of authorization.
 
@@ -743,9 +657,6 @@ The service must rely on this interface, and not on the default implementation.
 
 Example: at first, we design an interface for listing ``SingleTask`` entities: 
 
-
-.. code-block:: php
-
    <?php
 
    namespace Chill\TaskBundle\Repository;
@@ -782,8 +693,6 @@ Example: at first, we design an interface for listing ``SingleTask`` entities:
 
 Implements this interface and register the interface as an alias for the implementation.
 
-.. code-block:: yaml
-
    services:
        Chill\TaskBundle\Repository\SingleTaskAclAwareRepository:
            autowire: true
@@ -791,8 +700,7 @@ Implements this interface and register the interface as an alias for the impleme
 
        Chill\TaskBundle\Repository\SingleTaskAclAwareRepositoryInterface: '@Chill\TaskBundle\Repository\SingleTaskAclAwareRepository'
 
-Write the basic implementation for re-use: separate authorization logic and search logic
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+##### Write the basic implementation for re-use: separate authorization logic and search logic
 
 The logic of such repository may be separated into two logic:
 
@@ -803,8 +711,6 @@ This logic should be separated into your implementation.
 
 Considering this simple interface:
 
-.. code-block:: php
-
    interface MyEntityACLAwareRepositoryInterface {
 
        public function countByAuthorized(array $criterias): int;
@@ -815,15 +721,11 @@ Considering this simple interface:
 
 The base implementation should separate the logic to allow an easy reuse. Here, the method ``buildQuery`` build a basic query without authorization logic, which can be re-used. The authorization logic is dedicated to a private method. For ease of user, the logic of adding ordering criterias and pagination parameters (``$start`` and ``$limit``) are also delegated to a public method.
 
-
-.. code-block:: php
-
    namespace Chill\MyBundle\Repository;
 
    use Doctrine\ORM\EntityManagerInterface;
    use Doctrine\ORM\QueryBuilder;
 
-
    final class MyEntityACLAwareRepository implements MyEntityACLAwareRepositoryInterface {
 
        private EntityManagerInterface $em;
@@ -875,15 +777,12 @@ The base implementation should separate the logic to allow an easy reuse. Here,
 
 Once this logic is executed, it becomes easy to make a new implementation of the repository:
 
-.. code-block:: php
-
    namespace Chill\MyOtherBundle\Repository;
 
    use Doctrine\ORM\EntityManagerInterface;
    use Doctrine\ORM\QueryBuilder;
    use Chill\MyBundle\Repository\MyEntityACLAwareRepository
 
-
    final class AnotherEntityACLAwareRepository implements MyEntityACLAwareRepositoryInterface {
 
        private EntityManagerInterface $em;
@@ -921,14 +820,8 @@ Once this logic is executed, it becomes easy to make a new implementation of the
 
 Then, register this service and decorates the old one:
 
-.. code-block:: yaml
-
    services:
        Chill\MyOtherBundle\Repository\AnotherEntityACLAwareRepository:
            autowire: true
            autoconfigure: true
-           decorates: Chill\MyBundle\Repository\MyEntityACLAwareRepositoryInterface:
-
-
-
-
+           decorates: Chill\MyBundle\Repository\MyEntityACLAwareRepositoryInterface:
\ No newline at end of file
diff --git a/docs/source/development/api.rst b/docs/source/development/api.md
similarity index 81%
rename from docs/source/development/api.rst
rename to docs/source/development/api.md
index a5fef2372..6fac67f66 100644
--- a/docs/source/development/api.rst
+++ b/docs/source/development/api.md
@@ -1,23 +1,10 @@
-.. Copyright (C)  2014 Champs Libres Cooperative SCRLFS
-   Permission is granted to copy, distribute and/or modify this document
-   under the terms of the GNU Free Documentation License, Version 1.3
-   or any later version published by the Free Software Foundation;
-   with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-   A copy of the license is included in the section entitled "GNU
-   Free Documentation License".
-
-.. _api:
-
-API
-###
+# API
 
 Chill provides a basic framework to build REST api.
 
-Basic configuration
-*******************
+###### Basic configuration
 
-Configure a route
-=================
+## Configure a route
 
 Follow those steps to build a REST api:
 
@@ -27,36 +14,29 @@ Follow those steps to build a REST api:
 You can also:
 
 * hook into the controller to customize some steps;
-* add more route and steps
-
-.. note::
+* add more routes and steps
 
     Useful links:
 
-    * `How to use annotation to configure serialization <https://symfony.com/doc/current/serializer.html>`_
-    * `How to create your custom normalizer <https://symfony.com/doc/current/serializer/custom_normalizer.html>`_
+    * [How to use annotation to configure serialization ](https://symfony.com/doc/current/serializer.html)
+    * [How to create your custom normalizer ](https://symfony.com/doc/current/serializer/custom_normalizer.html)
 
-Auto-loading the routes
-=======================
+## Autoloading the routes
 
 Ensure that those lines are present in your file `app/config/routing.yml`:
 
-
-.. code-block:: yaml
-
+```yaml
    chill_cruds:
        resource: 'chill_main_crud_route_loader:load'
        type: service
+```
 
+## Create your model
 
-Create your model
-=================
+Create your model in the usual way:
 
-Create your model on the usual way:
-
-.. code-block:: php
-
-   namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
+```php
+namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
 
    use Chill\PersonBundle\Entity\AccompanyingPeriod\OriginRepository;
    use Doctrine\ORM\Mapping as ORM;
@@ -87,16 +67,14 @@ Create your model on the usual way:
        // .. getters and setters
 
    }
+```
 
+## Configure api
 
-Configure api
-=============
+Configure the api using YAML (see the full configuration: [api_full_configuration](api_full_configuration.md)):
 
-Configure the api using Yaml (see the full configuration: :ref:`api_full_configuration`):
-
-.. code-block:: yaml
-
-   # config/packages/chill_main.yaml
+```yaml
+# config/packages/chill_main.yaml
    chill_main:
        apis:
            accompanying_period_origin:
@@ -113,15 +91,13 @@ Configure the api using Yaml (see the full configuration: :ref:`api_full_configu
                        methods:
                            GET: true
                            HEAD: true
+```
+   If you are working on a shared bundle (aka "The chill bundles"), you should define your configuration inside the class `ChillXXXXBundleExtension`, using the "prependConfig" feature:
 
-.. note::
-
-   If you are working on a shared bundle (aka "The chill bundles"), you should define your configuration inside the class :code:`ChillXXXXBundleExtension`, using the "prependConfig" feature:
-
-   .. code-block:: php
-
+```php
       namespace Chill\PersonBundle\DependencyInjection;
 
+
       use Symfony\Component\DependencyInjection\ContainerBuilder;
       use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
       use Symfony\Component\HttpFoundation\Request;
@@ -155,13 +131,13 @@ Configure the api using Yaml (see the full configuration: :ref:`api_full_configu
                           'base_role' => 'ROLE_USER',
                           'actions' => [
                               '_index' => [
-                                  'methods' => [ 
+                                  'methods' => [
                                       Request::METHOD_GET => true,
                                       Request::METHOD_HEAD => true
                                   ],
                               ],
                               '_entity' => [
-                                  'methods' => [ 
+                                  'methods' => [
                                       Request::METHOD_GET => true,
                                       Request::METHOD_HEAD => true
                                   ]
@@ -172,37 +148,35 @@ Configure the api using Yaml (see the full configuration: :ref:`api_full_configu
               ]);
           }
       }
+```
 
-The :code:`_index` and :code:`_entity` action
-*********************************************
+###### The `_index` and `_entity` action
 
-The :code:`_index` and :code:`_entity` action are default actions:
+The `_index` and `_entity` action are default actions:
 
 * they will call a specific method in the default controller;
 * they will generate defined routes:
 
 Index:
-   Name: :code:`chill_api_single_accompanying_period_origin__index`
+   Name: `chill_api_single_accompanying_period_origin__index`
 
-   Path: :code:`/api/1.0/person/accompanying-period/origin.{_format}`
+   Path: `/api/1.0/person/accompanying-period/origin.{_format}`
 
 Entity:
-   Name: :code:`chill_api_single_accompanying_period_origin__entity`
+   Name: `chill_api_single_accompanying_period_origin__entity`
 
-   Path: :code:`/api/1.0/person/accompanying-period/origin/{id}.{_format}`
+   Path: `/api/1.0/person/accompanying-period/origin/{id}.{_format}`
 
-Role
-****
+###### Role
 
-By default, the key `base_role` is used to check ACL. Take care of creating the :code:`Voter` required to take that into account.
+By default, the key `base_role` is used to check ACL. Take care of creating the `Voter` required to take that into account.
 
-For index action, the role will be called with :code:`NULL` as :code:`$subject`. The retrieved entity will be the subject for single queries.
+For index action, the role will be called with `NULL` as `$subject`. The retrieved entity will be the subject for single queries.
 
 You can also define a role for each method. In this case, this role is used for the given method, and, if any, the base role is taken into account.
 
-.. code-block:: yaml
-
-   # config/packages/chill_main.yaml
+```yaml
+# config/packages/chill_main.yaml
    chill_main:
        apis:
            accompanying_period_origin:
@@ -217,16 +191,13 @@ You can also define a role for each method. In this case, this role is used for
                        roles:
                            GET: MY_ROLE_SEE
                            HEAD: MY ROLE_SEE
+```
 
-Customize the controller
-************************
-
-You can customize the controller by hooking into the default actions. Take care of extending :code:`Chill\MainBundle\CRUD\Controller\ApiController`.
-
-
-.. code-block:: php
+###### Customize the controller
 
+You can customize the controller by hooking into the default actions. Take care of extending `Chill\MainBundle\CRUD\Controller\ApiController`.
 
+```php
    namespace Chill\PersonBundle\Controller;
 
    use Chill\MainBundle\CRUD\Controller\ApiController;
@@ -240,14 +211,14 @@ You can customize the controller by hooking into the default actions. Take care
            $qb->where($qb->expr()->gt('e.noActiveAfter', ':now'))
                ->orWhere($qb->expr()->isNull('e.noActiveAfter'));
            $qb->setParameter('now', new \DateTime('now'));
-       }     
+       }
    }
+```
 
 And set your controller in configuration:
 
-.. code-block:: yaml
-
-   chill_main:
+```yaml
+    chill_main:
        apis:
            accompanying_period_origin:
                base_path: '/api/1.0/person/accompanying-period/origin'
@@ -265,15 +236,15 @@ And set your controller in configuration:
                        methods:
                            GET: true
                            HEAD: true
+```
 
-Create your own actions
-***********************
+###### Create your own actions
 
 You can add your own actions:
 
-.. code-block:: yaml
+```yaml
 
-   chill_main:
+chill_main:
        apis:
            -
                class: Chill\PersonBundle\Entity\AccompanyingPeriod
@@ -281,7 +252,7 @@ You can add your own actions:
                base_path: /api/1.0/person/accompanying-course
                controller: Chill\PersonBundle\Controller\AccompanyingCourseApiController
                actions:
-                   # add a custom participation:
+                   # add custom participation:
                    participation:
                        methods:
                            POST: true
@@ -296,13 +267,13 @@ You can add your own actions:
                            HEAD: null
                            PUT: null
                        single-collection: single
+```
 
-The key :code:`single-collection` with value :code:`single` will add a :code:`/{id}/ + "action name"` (in this example, :code:`/{id}/participation`) into the path, after the base path. If the value is :code:`collection`, no id will be set, but the action name will be append to the path.
+The key `single-collection` with value `single` will add a `/{id}/ + "action name"` (in this example, `/{id}/participation`) into the path, after the base path. If the value is `collection`, no id will be set, but the action name will be append to the path.
 
 Then, create the corresponding action into your controller:
 
-.. code-block:: php
-
+```php
    namespace Chill\PersonBundle\Controller;
 
    use Chill\MainBundle\CRUD\Controller\ApiController;
@@ -326,10 +297,10 @@ Then, create the corresponding action into your controller:
            $this->eventDispatcher = $eventDispatcher;
            $this->validator = $validator;
        }
-       
+
        public function participationApi($id, Request $request, $_format)
        {
-           /** @var AccompanyingPeriod $accompanyingPeriod */ 
+           /** @var AccompanyingPeriod $accompanyingPeriod */
            $accompanyingPeriod = $this->getEntity('participation', $id, $request);
            $person = $this->getSerializer()
                ->deserialize($request->getContent(), Person::class, $_format, []);
@@ -363,20 +334,18 @@ Then, create the corresponding action into your controller:
            return $this->json($participation);
        }
    }
+```
 
-Managing association
-********************
+###### Managing association
 
-ManyToOne association
-=====================
+## ManyToOne association
 
-In ManyToOne association, you can add associated entities using the :code:`PATCH` request. By default, the serializer deserialize entities only with their id and discriminator type, if any.
+In ManyToOne association, you can add associated entities using the `PATCH` request. By default, the serializer deserialize entities only with their id and discriminator type, if any.
 
 Example:
 
-.. code-block:: bash
-
-   curl -X 'PATCH' \
+```
+curl -X 'PATCH' \
      'http://localhost:8001/api/1.0/person/accompanying-course/2668.json' \
      -H 'accept: */*' \
      -H 'Content-Type: application/json' \
@@ -386,16 +355,15 @@ Example:
      "id": 2668,
      "origin": { "id": 11 }
    }'
+```
 
-ManyToMany associations
-=======================
+## ManyToMany associations
 
-In OneToMany association, you can easily create route for adding and removing entities, using :code:`POST` and :code:`DELETE` requests.
+In OneToMany association, you can easily create route for adding and removing entities, using `POST` and `DELETE` requests.
 
-Prepare your entity, creating the methods :code:`addYourEntity` and :code:`removeYourEntity`:
-
-.. code-block:: php
+Prepare your entity, creating the methods `addYourEntity` and `removeYourEntity`:
 
+```php
    namespace Chill\PersonBundle\Entity;
 
    use Chill\MainBundle\Entity\Scope;
@@ -437,12 +405,12 @@ Prepare your entity, creating the methods :code:`addYourEntity` and :code:`remov
        {
            $this->scopes->removeElement($scope);
        }
-
+```
 
 Create your route into the configuration:
 
-.. code-block:: yaml
-
+```yaml
+   # config/packages/chill_main.yaml`
    chill_main:
        apis:
            -
@@ -469,14 +437,12 @@ Create your route into the configuration:
                        controller_action: null
                        path: null
                        single-collection: single
+```
 
 This will create a new route, which will accept two methods: DELETE and POST:
 
-.. code-block:: raw
-
    +--------------+---------------------------------------------------------------------------------------+
    | Property     | Value                                                                                 |
-   +--------------+---------------------------------------------------------------------------------------+
    | Route Name   | chill_api_single_accompanying_course_scope                                            |
    | Path         | /api/1.0/person/accompanying-course/{id}/scope.{_format}                              |
    | Path Regex   | {^/api/1\.0/person/accompanying\-course/(?P<id>[^/]++)/scope\.(?P<_format>[^/]++)$}sD |
@@ -488,14 +454,10 @@ This will create a new route, which will accept two methods: DELETE and POST:
    | Class        | Symfony\Component\Routing\Route                                                       |
    | Defaults     | _controller: csapi_accompanying_course_controller:scopeApi                            |
    | Options      | compiler_class: Symfony\Component\Routing\RouteCompiler                               |
-   +--------------+---------------------------------------------------------------------------------------+
-
-
 
 Then, create the controller action. Call the method:
 
-.. code-block:: php
-
+```php
    namespace Chill\PersonBundle\Controller;
 
    use Chill\MainBundle\CRUD\Controller\ApiController;
@@ -510,14 +472,14 @@ Then, create the controller action. Call the method:
            return $this->addRemoveSomething('scope', $id, $request, $_format, 'scope', Scope::class, [ 'groups' => [ 'read' ] ]);
        }
    }
+```
 
-This will allow to add a scope by his id, and delete them.
+This will allow adding a scope by his id and deleting them.
 
 Curl requests:
 
-.. code-block:: bash
-
-   # add a scope with id 5
+```
+# add a scope with id 5
    curl -X 'POST' \
      'http://localhost:8001/api/1.0/person/accompanying-course/2868/scope.json' \
      -H 'accept: */*' \
@@ -536,14 +498,13 @@ Curl requests:
      "id": 5,
      "type": "scope"
    }'
+```
 
-Deserializing an association where multiple types are allowed
-=============================================================
+## Deserializing an association where multiple types are allowed
 
-Sometimes, multiples types are allowed as association to one entity:
-
-.. code-block:: php
+Sometimes, multiple types are allowed as association to one entity:
 
+```php
    namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
 
    use Chill\PersonBundle\Entity\Person;
@@ -553,7 +514,6 @@ Sometimes, multiples types are allowed as association to one entity:
    class Resource
    {
 
-
        /**
         * @ORM\ManyToOne(targetEntity=ThirdParty::class)
         * @ORM\JoinColumn(nullable=true)
@@ -566,7 +526,6 @@ Sometimes, multiples types are allowed as association to one entity:
         */
        private $person;
 
-
        /**
         *
         * @param $resource Person|ThirdParty
@@ -575,8 +534,8 @@ Sometimes, multiples types are allowed as association to one entity:
        {
           // ...
        }
-       
-       
+
+
        /**
         * @return ThirdParty|Person
         * @Groups({"read", "write"})
@@ -586,13 +545,13 @@ Sometimes, multiples types are allowed as association to one entity:
            return $this->person ?? $this->thirdParty;
        }
    }
+```
 
 This is not well taken into account by the Symfony serializer natively.
 
 You must, then, create your own CustomNormalizer. You can help yourself using this:
 
-.. code-block:: php
-
+```php
    namespace Chill\PersonBundle\Serializer\Normalizer;
 
    use Chill\PersonBundle\Entity\Person;
@@ -606,7 +565,6 @@ You must, then, create your own CustomNormalizer. You can help yourself using th
    use Symfony\Component\Serializer\Exception;
    use Chill\MainBundle\Serializer\Normalizer\DiscriminatedObjectDenormalizer;
 
-
    class AccompanyingPeriodResourceNormalizer implements DenormalizerInterface, DenormalizerAwareInterface
    {
        use DenormalizerAwareTrait;
@@ -632,35 +590,34 @@ You must, then, create your own CustomNormalizer. You can help yourself using th
                    DiscriminatedObjectDenormalizer::TYPE,
                    $format,
                    // into the context, we add the list of allowed types:
-                   [ 
-                       DiscriminatedObjectDenormalizer::ALLOWED_TYPES => 
-                       [ 
+                   [
+                       DiscriminatedObjectDenormalizer::ALLOWED_TYPES =>
+                       [
                            Person::class, ThirdParty::class
                        ]
                    ]
                );
 
                $resource->setResource($res);
-           } 
+           }
 
            return $resource;
        }
-       
+
 
        public function supportsDenormalization($data, string $type, string $format = null)
        {
            return $type === Resource::class;
-       }  
+       }
    }
+```
 
-Serialization for collection
-****************************
+###### Serialization for collection
 
 A specific model has been defined for returning collection:
 
-.. code-block:: json
-
-   {
+```
+{
        "count": 49,
        "results": [
        ],
@@ -672,13 +629,13 @@ A specific model has been defined for returning collection:
            "items_per_page": 1
        }
    }
+```
 
 Where this is relevant, this model should be re-used in custom controller actions.
 
-In custom actions, this can be achieved quickly by assembling results into a :code:`Chill\MainBundle\Serializer\Model\Collection`. The pagination information is given by using :code:`Paginator` (see :ref:`Pagination <pagination-ref>`).
-
-.. code-block:: php
+In custom actions, this can be achieved quickly by assembling results into a `Chill\MainBundle\Serializer\Model\Collection`. The pagination information is given by using `Paginator` (see [Pagination ](pagination-ref.md)).
 
+```php
    use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
    use Chill\MainBundle\Pagination\PaginatorInterface;
 
@@ -692,15 +649,11 @@ In custom actions, this can be achieved quickly by assembling results into a :co
            return $this->json($model, Response::HTTP_OK, [], $context);
        }
    }
+```
 
+###### Full configuration example
 
-.. _api_full_configuration:
-
-Full configuration example
-**************************
-
-.. code-block:: yaml
-
+```yaml
        apis:
            -
                class: Chill\PersonBundle\Entity\AccompanyingPeriod
@@ -743,5 +696,4 @@ Full configuration example
                        path: null
                        single-collection: single
                base_role: null
-
-
+```
diff --git a/docs/source/development/assets.rst b/docs/source/development/assets.md
similarity index 79%
rename from docs/source/development/assets.rst
rename to docs/source/development/assets.md
index 3584ef3f6..e197fe7f0 100644
--- a/docs/source/development/assets.rst
+++ b/docs/source/development/assets.md
@@ -1,91 +1,61 @@
-
-.. Copyright (C)  2014 Champs Libres Cooperative SCRLFS
-   Permission is granted to copy, distribute and/or modify this document
+Permission is granted to copy, distribute and/or modify this document
    under the terms of the GNU Free Documentation License, Version 1.3
    or any later version published by the Free Software Foundation;
    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
    A copy of the license is included in the section entitled "GNU
    Free Documentation License".
 
-.. _forms:
-
-Assets
-#######
+# Assets
 
 The Chill assets (js, css, images, …) can be managed by `Webpack Encore`_, which is a thin wrapper for `Webpack`_ in Symfony applications.
 
-Installation
-************
+###### Installation
 
 Webpack Encore needs to be run in a Node.js environment, using the Yarn package manager. This Node.js environment can be set up using a node docker image. The bash script `docker-node.sh` set up a Node.js environment with an adequate configuration. Launch this container by typing:
 
-
-.. code-block:: bash
-
     $ bash docker-node.sh
 
 In this NodeJS environment, install all the assets required by Chill with:
 
-.. code-block:: bash
-
     node@b91cab4f7cfc:/app$ yarn install
 
 This command will install all the packages that are listed in `package.json`.
 
 Any further required dependencies can be installed using the Yarn package. For instance, jQuery is installed by:
 
-.. code-block:: bash
-
    node@b91cab4f7cfc:/app$ yarn add jquery --dev
 
+###### Usage
 
-Usage
-*****
-
-Organize your assets
---------------------
+### Organize your assets
 
 Chill assets usually lives under the `/Resources/public` folder of each Chill bundle. The Webpack configuration set up in `webpack.config.js` automatically loads the required assets from the Chill bundles that are used.
 
 For adding your own assets to Webpack, you must add an entry in the `webpack.config.js` file. For instance, the following entry will output a file `main.js` collecting the js code (and possibly css, image, etc.) from `./assets/main.js`.
 
-.. code-block:: js
-
    	.addEntry('main', './assets/main.js')
 
 To gather the css files, simply connect them to your js file, using `require`. The css file is seen as a dependency of your js file. :
 
-.. code-block:: js
-
     // assets/js/main.js
     require('../css/app.css');
 
 For finer configuration of webpack encore, we refer to the above-linked documentation.
 
-
-Compile the assets
-------------------
+### Compile the assets
 
 To compile the assets, run this line in the NodeJS container:
 
-.. code-block:: bash
-
    	node@b91cab4f7cfc:/app$ yarn run encore dev
 
 While developing, you can tell Webpack Encore to continuously watch the files you are modifying:
 
-.. code-block:: bash
-
     node@b91cab4f7cfc:/app$ yarn run encore dev --watch
 
-
-Use the assets in the templates
---------------------------------
+### Use the assets in the templates
 
 Any entry defined in the webpack.config.js file can be linked to your application using the symfony `asset` helper:
 
-.. code-block:: html
-
     <head>
         ...
         <link rel="stylesheet" href="{{ asset('build/app.css') }}">
@@ -93,12 +63,4 @@ Any entry defined in the webpack.config.js file can be linked to your applicatio
     <body>
         ...
         <script src="{{ asset('build/app.js') }}"></script>
-    </body>
-
-
-
-
-
-
-.. _Webpack Encore: https://www.npmjs.com/package/@symfony/webpack-encore
-.. _Webpack: https://webpack.js.org/
+    </body>
\ No newline at end of file
diff --git a/docs/source/development/code-quality.md b/docs/source/development/code-quality.md
new file mode 100644
index 000000000..6a43fe300
--- /dev/null
+++ b/docs/source/development/code-quality.md
@@ -0,0 +1,23 @@
+# Code style, code quality and other tools
+
+## PHP-cs-fixer
+
+For development, you will also have to install:
+
+- [php-cs-fixer ](https://cs.symfony.com/)
+
+We also encourage you to use tools like [phpstan ](https://phpstan.org) and [rector ](https://getrector.com).
+
+For running php-cs-fixer:
+
+   symfony composer php-cs-fixer
+
+## Execute tests
+
+   symfony composer exec phpunit -- /path/to_your_test.php
+
+Note that IDE like PhpStorm should be able to run tests, even KernelTestcase or WebTestCase, [from within their interfaces ](https://www.jetbrains.com/help/phpstorm/using-phpunit-framework.html#run_phpunit_tests).
+
+## Execute rector
+
+   symfony composer exec rector -- process
\ No newline at end of file
diff --git a/docs/source/development/code-quality.rst b/docs/source/development/code-quality.rst
deleted file mode 100644
index 7e37ebf25..000000000
--- a/docs/source/development/code-quality.rst
+++ /dev/null
@@ -1,34 +0,0 @@
-Code style, code quality and other tools
-########################################
-
-PHP-cs-fixer
-============
-
-For development, you will also have to install:
-
-- `php-cs-fixer <https://cs.symfony.com/>`_
-
-We also encourage you to use tools like `phpstan <https://phpstan.org>`_ and `rector <https://getrector.com>`_.
-
-For running php-cs-fixer:
-
-.. code-block:: bash
-
-   symfony composer php-cs-fixer
-
-Execute tests
-=============
-
-.. code-block:: bash
-
-   symfony composer exec phpunit -- /path/to_your_test.php
-
-Note that IDE like PhpStorm should be able to run tests, even KernelTestcase or WebTestCase, `from within their interfaces <https://www.jetbrains.com/help/phpstorm/using-phpunit-framework.html#run_phpunit_tests>`_.
-
-Execute rector
-==============
-
-.. code-block:: bash
-
-   symfony composer exec rector -- process
-
diff --git a/docs/source/development/create-a-new-bundle.rst b/docs/source/development/create-a-new-bundle.md
similarity index 63%
rename from docs/source/development/create-a-new-bundle.rst
rename to docs/source/development/create-a-new-bundle.md
index 087487ff0..c5d1412ba 100644
--- a/docs/source/development/create-a-new-bundle.rst
+++ b/docs/source/development/create-a-new-bundle.md
@@ -1,15 +1,11 @@
-.. Copyright (C)  2014 Champs Libres Cooperative SCRLFS
-   Permission is granted to copy, distribute and/or modify this document
+Permission is granted to copy, distribute and/or modify this document
    under the terms of the GNU Free Documentation License, Version 1.3
    or any later version published by the Free Software Foundation;
    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
    A copy of the license is included in the section entitled "GNU
    Free Documentation License".
 
-.. _create-new-bundle:
-
-Create a new bundle
-*******************
+###### Create a new bundle
 
 Create your own bundle is not a trivial task.
 
@@ -19,16 +15,9 @@ The easiest way to achieve this is seems to be :
 2. Create a new bundle in this project, in the src directory
 3. Initialize a git repository **at the root bundle**, and create your initial commit.
 4. Register the bundle with composer/packagist. If you do not plan to distribute your bundle with packagist, you may use a custom repository for achieve this [#f1]_
-5. Move to a development installation, made as described in the :ref:`installation-for-development` section, and add your new repository to the composer.json file
-6. Work as :ref:`usual <editing-code-and-commiting>`
-
-.. warning::
+5. Move to a development installation, made as described in the [installation-for-development` section, and add your new repository to the composer.json file
+6. Work as :ref:`usual ](editing-code-and-commiting.md)
 
     This part of the doc is not yet tested
 
-TODO
-
-
-.. rubric:: Footnotes
-
-.. [#f1] Be aware that we use the Affero GPL Licence, which ensure that all users must have access to derivative works done with this software.
+TODO
\ No newline at end of file
diff --git a/docs/source/development/cronjob.rst b/docs/source/development/cronjob.md
similarity index 73%
rename from docs/source/development/cronjob.rst
rename to docs/source/development/cronjob.md
index bda32b5c8..255802e4b 100644
--- a/docs/source/development/cronjob.rst
+++ b/docs/source/development/cronjob.md
@@ -1,37 +1,26 @@
-
-.. Copyright (C)  2014-2023 Champs Libres Cooperative SCRLFS
-    Permission is granted to copy, distribute and/or modify this document
+Permission is granted to copy, distribute and/or modify this document
     under the terms of the GNU Free Documentation License, Version 1.3
     or any later version published by the Free Software Foundation;
     with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
     A copy of the license is included in the section entitled "GNU
     Free Documentation License".
 
-.. _cronjob:
-
-Cron jobs
-*********
+###### Cron jobs
 
 Some tasks must be executed regularly: refresh some materialized views, remove old data, ...
 
 For this purpose, one can programmatically implements a "cron job", which will be scheduled by a specific command.
 
-The command :code:`chill:cron-job:execute`
-==========================================
+## The command `chill:cron-job:execute`
 
-The command :code:`chill:cron-job:execute` will schedule a task, one by one. In a classical implementation, it should
+The command `chill:cron-job:execute` will schedule a task, one by one. In a classical implementation, it should
 be executed every 15 minutes (more or less), to ensure that every task can be executed.
 
-.. warning::
-
    This command should not be executed in parallel. The installer should ensure that two job are executed concurrently.
 
-How to implements a cron job ?
-==============================
+## How to implements a cron job ?
 
-Implements a :code:`Chill\MainBundle\Cron\CronJobInterface`. Here is an example:
-
-.. code-block:: php
+Implements a `Chill\MainBundle\Cron\CronJobInterface`. Here is an example:
 
     namespace Chill\MainBundle\Service\Something;
 
@@ -83,19 +72,15 @@ Implements a :code:`Chill\MainBundle\Cron\CronJobInterface`. Here is an example:
        }
     }
 
-How are cron job scheduled ?
-============================
+## How are cron job scheduled ?
 
-If the command :code:`chill:cron-job:execute` is run with one or more :code:`job` argument, those jobs are run, **without checking that the job can run** (the method :code:`canRun` is not executed).
+If the command `chill:cron-job:execute` is run with one or more `job` argument, those jobs are run, **without checking that the job can run** (the method `canRun` is not executed).
 
-If any :code:`job` argument is given, the :code:`CronManager` schedule job with those steps:
+If any `job` argument is given, the `CronManager` schedule job with those steps:
 
 * the tasks are ordered, with:
    * a priority is given for tasks that weren't never executed;
    * then, the tasks are ordered, the last executed are the first in the list
-* then, for each tasks, and in the given order, the first task where :code:`canRun` return :code:`TRUE` will be executed.
-
-The command :code:`chill:cron-job:execute` execute **only one** task.
-
-
+* then, for each tasks, and in the given order, the first task where `canRun` return `TRUE` will be executed.
 
+The command `chill:cron-job:execute` execute **only one** task.
diff --git a/docs/source/development/crud.rst b/docs/source/development/crud.md
similarity index 86%
rename from docs/source/development/crud.rst
rename to docs/source/development/crud.md
index 1f666cade..2796dff8e 100644
--- a/docs/source/development/crud.rst
+++ b/docs/source/development/crud.md
@@ -1,15 +1,11 @@
-.. Copyright (C)  2014 Champs Libres Cooperative SCRLFS
-   Permission is granted to copy, distribute and/or modify this document
+Permission is granted to copy, distribute and/or modify this document
    under the terms of the GNU Free Documentation License, Version 1.3
    or any later version published by the Free Software Foundation;
    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
    A copy of the license is included in the section entitled "GNU
    Free Documentation License".
 
-.. _crud:
-
-CRUD
-####
+# CRUD
 
 Chill provide an API to create a basic CRUD.
 
@@ -20,30 +16,21 @@ One can follow those steps to create a CRUD for one entity:
 3. customize the templates if required ;
 4. customize some steps of the controller if required ;
 
+An example with the [`ClosingMotive`` (PersonBundle) in the admin part of Chill:
 
-An example with the ``ClosingMotive`` (PersonBundle) in the admin part of Chill: 
-
-Auto-loading the routes
-***********************
+###### Auto-loading the routes
 
 Ensure that those lines are present in your file `app/config/routing.yml`:
 
-
-.. code-block:: yaml
-
    chill_cruds:
        resource: 'chill_main_crud_route_loader:load'
        type: service
 
-
-
-Create your model
-*****************
+###### Create your model
 
 Create your model on the usual way (in this example, ORM informations are stored in yaml file):
 
-.. code-block:: php
-
+```php
    namespace Chill\PersonBundle\Entity\AccompanyingPeriod;
 
    use Doctrine\Common\Collections\Collection;
@@ -62,41 +49,40 @@ Create your model on the usual way (in this example, ORM informations are stored
         * @var array
         */
        private $name;
-       
+
        /**
         *
         * @var boolean
         */
        private $active = true;
-       
+
        /**
         *
         * @var self
         */
        private $parent = null;
-       
+
        /**
         * child Accompanying periods
         *
         * @var Collection
         */
        private $children;
-       
+
        /**
         *
         * @var float
         */
        private $ordering = 0.0;
 
-
        // getters and setters come here
 
    }
+```
 
 The form:
 
-.. code-block:: php
-
+```php
    namespace Chill\PersonBundle\Form;
 
    use Symfony\Component\Form\AbstractType;
@@ -108,7 +94,6 @@ The form:
    use Symfony\Component\Form\Extension\Core\Type\NumberType;
 
    /**
-    *
     *
     */
    class ClosingMotiveType extends AbstractType
@@ -145,22 +130,21 @@ The form:
                ;
        }
    }
+```
 
-Configure the crud
-******************
+###### Configure the crud
 
 The crud is configured using the key ``crud`` under ``chill_main``
 
-.. code-block:: yaml
-
+```yaml
    chill_main:
      cruds:
-       - 
+       -
          # the class which is concerned by the CRUD
          class: '\Chill\PersonBundle\Entity\AccompanyingPeriod\ClosingMotive::class'
          # give a name for the crud. This will be used internally
          name: closing_motive
-         # add a base path for the 
+         # add a base path for the
          base_path: /admin/closing-motive
          # this is the form class
          form_class: 'Chill\PersonBundle\Form\ClosingMotiveType::class'
@@ -170,8 +154,8 @@ The crud is configured using the key ``crud`` under ``chill_main``
          # this is a list of action you can configure
          # by default, the actions `index`, `view`, `new` and `edit` are automatically create
          # you can add more actions or configure some details about them
-         actions: 
-            index: 
+         actions:
+            index:
               # the default template for index is very poor,
               # you will need to override it
               template: '@ChillPerson/ClosingMotive/index.html.twig'
@@ -180,16 +164,16 @@ The crud is configured using the key ``crud`` under ``chill_main``
             new:
               role: ROLE_ADMIN
               # by default, the template will only show the form
-              # you can override it 
+              # you can override it
               template: '@ChillPerson/ClosingMotive/new.html.twig'
             edit:
               role: ROLE_ADMIN
               template: '@ChillPerson/ClosingMotive/edit.html.twig'
+```
 
-To leave the bundle auto-configure the ``chill_main`` bundle, you can `prepend the configuration of the ChillMain Bundle <https://symfony.com/doc/current/bundles/prepend_extension.html>`_:
-
-.. code-block:: php
+To leave the bundle autoconfigure the ``chill_main`` bundle, you can `prepend the configuration of the ChillMain Bundle ](https://symfony.com/doc/current/bundles/prepend_extension.html):
 
+```php
    namespace Chill\PersonBundle\DependencyInjection;
 
    use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -204,13 +188,13 @@ To leave the bundle auto-configure the ``chill_main`` bundle, you can `prepend t
        {
            // skipped here
        }
-       
-       
-       public function prepend(ContainerBuilder $container) 
+
+
+       public function prepend(ContainerBuilder $container)
        {
            $this->prependCruds($container);
        }
-       
+
        protected function prependCruds(ContainerBuilder $container)
        {
            $container->prependExtensionConfig('chill_main', [
@@ -240,20 +224,17 @@ To leave the bundle auto-configure the ``chill_main`` bundle, you can `prepend t
            ]);
        }
    }
+```
 
+###### Customize templates
 
-
-Customize templates
-*******************
-
-The current template are quite basic. You can override and extends them.
+The current template is quite basic. You can override and extends them.
 
 For a better inclusion, you can embed them instead of extending them.
 
 For index. Note that we extend here the `admin` layout, not the default one:
 
-.. code-block:: html+jinja
-
+```php
    {% extends '@ChillMain/Admin/layout.html.twig' %}
 
    {% block admin_content %}
@@ -288,11 +269,11 @@ For index. Note that we extend here the `admin` layout, not the default one:
            {% endblock %}
        {% endembed %}
    {% endblock %}
+```
 
 For edit template:
 
-.. code-block:: html+jinja
-
+```php
    {% extends '@ChillMain/Admin/layout.html.twig' %}
 
    {% block title %}
@@ -309,8 +290,6 @@ For edit template:
 
 For new template:
 
-.. code-block:: html+jinja
-
    {% extends '@ChillMain/Admin/layout.html.twig' %}
 
    {% block title %}
@@ -322,17 +301,16 @@ For new template:
        {% block content_form_actions_save_and_show %}{% endblock %}
    {% endembed %}
    {% endblock %}
+```
 
-Customize some steps in the controller
-**************************************
+###### Customize some steps in the controller
 
 Some steps may be customized by overriding the default controller and some methods. Here, we will override the way the entity is created, and the ordering of the "index" page:
 
 * we will associate a parent ClosingMotive to the element if a parameter `parent_id` is found ;
 * we will order the ClosingMotive by the ``ordering`` property
 
-.. code-block:: php
-
+```php
    namespace Chill\PersonBundle\Controller;
 
    use Chill\MainBundle\CRUD\Controller\CRUDController;
@@ -376,14 +354,13 @@ Some steps may be customized by overriding the default controller and some metho
            return $query->orderBy('e.ordering', 'ASC');
        }
    }
+```
 
-How-to and questions
-********************
+###### How-to and questions
 
-Which role is required for each action ?
-========================================
+## Which role is required for each action ?
 
-By default, each action will use: 
+By default, each action will use:
 
 1. the role defined under the action key ;
 2. the base role as upper, with the action name appended:
@@ -396,22 +373,21 @@ By default, each action will use:
 The entity will be passed to the role:
 
 * for the ``view`` and ``edit`` action: the entity fetched from database
-* for the ``new`` action: the entity which is created (you can override default values using 
-* for index action (or if you re-use the ``indexAction`` method: ``null``  
-  
-How to add some route and actions ?
-===================================
+* for the ``new`` action: the entity which is created (you can override default values using
+* for index action (or if you re-use the ``indexAction`` method: ``null``
+
+## How to add some route and actions ?
 
 Add them under the action key:
 
-.. code-block:: yaml
-
+```yaml
    chill_main:
      cruds:
-       - 
+       -
          # snipped
          actions:
            myaction: ~
+```
 
 The method `myactionAction` will be called by the parameter.
 
@@ -419,13 +395,12 @@ Inside this action, you can eventually call another internal method:
 
 * ``indexAction`` for a list of items ;
 * ``viewAction`` for a view
-* ``editFormAction`` for an edition 
+* ``editFormAction`` for an edition
 * ``createFormAction`` for a creation
 
 Example:
 
-.. code-block:: php
-
+```php
    namespace CSConnectes\SPBundle\Controller;
 
    use Chill\PersonBundle\CRUD\Controller\OneToOneEntityPersonCRUDController;
@@ -456,34 +431,29 @@ Example:
        }
 
    }
+```
 
-How to create a CRUD for entities associated to persons
-=======================================================
+## How to create a CRUD for entities associated to persons
 
 The bundle person provide some controller and template you can override, instead of the ones present in the mainbundle:
 
-* :code:`Chill\PersonBundle\CRUD\Controller\EntityPersonCRUDController` for entities linked with a one-to-may association to :code:`Person` class ;
-* :code:`Chill\PersonBundle\CRUD\Controller\OneToOneEntityPersonCRUDController` for entities linked with a one-to-one association to :code:`Person` class.
+* `Chill\PersonBundle\CRUD\Controller\EntityPersonCRUDController` for entities linked with a one-to-may association to `Person` class ;
+* `Chill\PersonBundle\CRUD\Controller\OneToOneEntityPersonCRUDController` for entities linked with a one-to-one association to `Person` class.
 
 There are also template defined under ``@ChillPerson/CRUD/`` namespace.
 
-Those controller assume that:
+Those controllers assume that:
 
-* the entity provide the method :code:`getPerson` and :code:`setPerson` ;
+* the entity provide the method `getPerson` and `setPerson` ;
 * the `index`'s id path will be the id of the person, and the ids in `view` and `edit` path will be the id of the entity ;
 
-This bundle also use by default the templates inside ``@ChillPerson/CRUD/``.
+This bundle also uses by default the templates inside ``@ChillPerson/CRUD/``.
 
+###### Reference
 
-Reference
-*********
-
-Configuration reference
-=======================
-
-
-.. code-block:: txt
+## Configuration reference
 
+```yaml
    chill_main:
        cruds:
 
@@ -514,9 +484,8 @@ Configuration reference
 
                        # the template to render the view
                        template:             null
+```
 
-Twig default block
-==================
+## Twig default block
 
 This part should be documented.
-
diff --git a/docs/source/development/database-principles.md b/docs/source/development/database-principles.md
new file mode 100644
index 000000000..c952ec584
--- /dev/null
+++ b/docs/source/development/database-principles.md
@@ -0,0 +1,70 @@
+# Database Principles
+
+This page provides a global understanding of the Chill database and explains some implementation details that help accelerate processing from the database or exploit it more easily.
+
+!!! warning "Database Schema Stability"
+    The stability of the database schema is not guaranteed.
+
+    However, it evolves relatively little. It is rare for tables or columns to be deleted or renamed, but it is not guaranteed that this cannot happen.
+
+## Overview
+
+A commented list of all tables is available in CSV format at `./database/table_list.csv`.
+
+### Schema and naming conventions
+
+At the beginning of Chill's history, PostgreSQL schemas were not used. Data was stored in the `public` schema.
+
+Later, new bundles appeared, and tables were classified into dedicated schemas.
+
+Currently:
+
+- for older bundles, those that already have tables in the public schema, new tables are added to this schema. They are prefixed with `chill_<bundle_name>_`;
+- for more recent bundles, tables are created in the dedicated schema
+
+### Historical data
+
+Some data is historized:
+
+- the referents of an accompanying period;
+- the statuses of an accompanying period;
+- the link between territories and users;
+- etc.
+
+In these cases, Chill generally creates two columns, which are usually named `startDate` and `endDate`. When the `endDate` column is `NULL`, it means that the period is not "closed". The `startDate` column is not nullable.
+
+In some cases, the current data (referent of an accompanying period, for example) is also repeated at the table level itself. For example, the accompanying periods table `chill_person_accompanying_period` has a `step` column (the status of the period) and `user_id` (referent id) in addition to the history. Although redundant, this simplifies processing.
+
+## Special relationships
+
+### Users, households, addresses
+
+Users have an address through households: in the interface, the address is recorded in the household file, and it is "given" to users who are members of the household, **and** who share the address of this household. Indeed, it is possible that users "belong" to a household without being domiciled there: this is the case, for example, for children in shared custody.
+
+The history of users' membership in the household is preserved, as well as the history of addresses for the same household.
+
+The tables involved are as follows:
+
+- the `chill_person_person` table lists the users;
+- the `chill_person_household_members` table lists household memberships: this is the junction between users and households:
+  - the `startDate` and `endDate` columns indicate the start and end date of membership;
+  - the `shareHousehold` column indicates whether the user shares the household address (if yes, its value is `TRUE`)
+- the `chill_person_household` table lists households
+- the `chill_person_household_to_addresses` table associates households with addresses;
+- the `chill_main_address` table contains addresses, indicating the validity start date (`validFrom`) and the validity end date (`validTo`).
+
+To simplify the resolution of addresses and users, two views have been implemented:
+
+- the `view_chill_person_household_address` view takes up, for each user, the history of household memberships broken down by the address history of a household.
+  In other words, a line is created each time a user changes household, or a household changes address. It is therefore possible to find the complete address history for a given user via this table.
+- the `view_chill_person_current_address` view takes up the current address of users.
+
+### Addresses and geographical units
+
+Chill provides statistics on the location of addresses relative to geographical zones (`chill_main_geographical_unit`).
+
+Since the geographical resolution of addresses is costly in CPU and processing time, a materialized view has been created: `view_chill_main_address_geographical_unit`. It is refreshed daily in the production database.
+
+## Table list and comments
+
+A commented list of all tables is available in CSV format at `./database/table_list.csv`.
diff --git a/docs/source/development/database-principles.rst b/docs/source/development/database-principles.rst
deleted file mode 100644
index 3b528ae22..000000000
--- a/docs/source/development/database-principles.rst
+++ /dev/null
@@ -1,84 +0,0 @@
-
-.. database-principles:
-
-Principes de la base de données
-###############################
-
-Cette page donne une compréhension globale de la base de donnée de Chill, et explique quelques détails d'implémentations qui permettent d'accélérer les traitements à partir de la base de donnée, ou de l'exploiter plus aisément.
-
-Cette page est rédigée en français.
-
-.. note::
-
-    La stabilité du schéma de la base de donnée n'est pas garantie.
-
-    Toutefois, ce dernier évolue relativement peu. Il est rare que des tables ou des colonnes soient supprimées ou renommées. Mais il n'est pas garanti que cela puisse arriver.
-
-Généralités
-===========
-
-Une liste commentée de toutes les tables :download:`est disponible au format CSV <./database/table_list.csv`.
-
-Schéma et conventions de nommage
---------------------------------
-
-Au début de l'histoire de Chill, les schémas postgresql n'étaient pas exploités. Les données étaient stockées dans le schéma :code:`public`.
-
-Par la suite, des nouveaux bundles sont apparus, et les tables ont été classées dans des schémas dédiés.
-
-A l'heure actuelle:
-
-- pour les anciens bundle, ceux qui ont déjà des tables dans le schéma public, les nouvelles tables sont ajoutées à ce schéma. Elles sont préfixées par :code:`chill_<nom du bundle>_`;
-- pour les bundles plus récents, les tables sont créées dans le schéma dédié
-
-Données avec de l'historicité
------------------------------
-
-Certaines données sont historisées:
-
-- les référents d'un parcours;
-- les statuts d'un parcours;
-- la liaison entre les territoires et les usagers;
-- etc.
-
-Dans ces cas-là, Chill crée généralement deux colonnes, qui sont habituellement nommées :code:`startDate` et :code:`endDate`. Lorsque la colonne :code:`endDate` est à :code:`NULL`, cela signifie que la période n'est pas "fermée". La colonne :code:`startDate` n'est pas nullable.
-
-Dans certains cas, la donnée actuelle (référent d'un parcours, par exemple) est également répétée au niveau de la table en elle-même. Par exemple, la table des parcours :code:`chill_person_accompanying_period` comporte une colonne :code:`step` (le statut du parcours) et :code:`user_id` (id du référent) en plus de l'historique. Bien que redondant, cela simplifie les traitements.
-
-Relations particulières
-=======================
-
-Usagers, ménages, adresses
---------------------------
-
-Les usagers ont une adresse au travers des ménages: dans l'interface, l'adresse est inscrite dans le dossier du ménage, et elle est "donnée" aux usagers membres du ménage, **et** qui partagent l'adresse de ce ménage. En effet, il est possible que des usagers "appartiennent" à un ménage sans y être domicilié: c'est le cas, par exemple, des enfants en garde alternée.
-
-L'historique de l'appartenance des usagers au ménage est conservée, de même que l'historique des adresses pour un même ménage.
-
-Les tables en jeu sont les suivantes:
-
-- la table :code:`chill_person_person` liste les usagers;
-- la table :code:`chill_person_household_members` liste les appartenances au ménage: il s'agit de la jointure entre les usagers et les ménages:
-  - les colonnes :code:`startDate` et :code:`endDate` indiquent la date de début et la date de fin de l'appartenance;
-  - la colonne :code:`shareHousehold` indique si l'utilisateur partage l'adresse du ménage (si oui, sa valeur est :code:`TRUE`)
-- la table :code:`chill_person_household` liste les ménages
-- la table :code:`chill_person_household_to_addresses` associe les ménages aux adresses;
-- la table :code:`chill_main_address` contient les adresses, en indiquant la date de début de validité (:code:`validFrom`) et la fin de validité (:code:`validTo`).
-
-Pour simplifier la résolution des adresses et des usagers, deux vues ont été mises en œuvre:
-
-- la vue :code:`view_chill_person_household_address` reprend, pour chaque usager, l'historique des appartenances au ménage découpée par l'historique des adresses d'un ménage.
-  Autrement dit, une ligne est créée à chaque fois qu'un usager change de ménage, ou qu'un ménage change d'adresse. Il est donc possible de retrouver l'historique complet des adresses pour un usager donné via cette table.
-- la vue :code:`view_chill_person_current_address` reprend l'adresse actuelle des usagers.
-
-Adresses et unités géographiques
---------------------------------
-
-Chill propose des statistiques sur la localisation des adresses par rapport à des zones géographiques (:code:`chill_main_geographical_unit`).
-
-Comme la résolution géographique des adresses est coûteuse en CPU et en temps de traitement, une vue matérialisée a été créée: :code:`view_chill_main_address_geographical_unit`. Elle est rafraichie quotidiennement dans la base de donnée de production.
-
-Liste des tables et commentaires
-================================
-
-Une liste commentée de toutes les tables :download:`est disponible au format CSV <./database/table_list.csv`.
diff --git a/docs/source/development/embeddable-comments.rst b/docs/source/development/embeddable-comments.md
similarity index 63%
rename from docs/source/development/embeddable-comments.rst
rename to docs/source/development/embeddable-comments.md
index e14e8e84b..ae1e70819 100644
--- a/docs/source/development/embeddable-comments.rst
+++ b/docs/source/development/embeddable-comments.md
@@ -1,30 +1,17 @@
-
-.. Copyright (C)  2016 Champs Libres Cooperative SCRLFS
-   Permission is granted to copy, distribute and/or modify this document
-   under the terms of the GNU Free Documentation License, Version 1.3
-   or any later version published by the Free Software Foundation;
-   with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-   A copy of the license is included in the section entitled "GNU
-   Free Documentation License".
-
-
-Embeddable comments
-###################
+# Embeddable comments
 
 Those embeddable comments is a comment with some metadata:
 
 * the one who updated the comment (the comment itself, and not the whole entity);
 * the date and time for the last update (again, the comment itself, and not the whole entity).
 
-We make usage of `embeddables <https://www.doctrine-project.org/projects/doctrine-orm/en/2.8/tutorials/embeddables.html>`_.
+We make usage of [embeddable ](https://www.doctrine-project.org/projects/doctrine-orm/en/2.8/tutorials/embeddables.html).
 
-Embed the comment
-=================
+## Embed the comment
 
 The comment may be embedded into the entity:
 
-.. code-block:: php
-
+```php
    namespace Chill\ActivityBundle\Entity;
 
    use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
@@ -51,7 +38,6 @@ The comment may be embedded into the entity:
         */
        private $comment;
 
-
        /**
         * @return \Chill\MainBundle\Entity\Embeddalbe\CommentEmbeddable
         */
@@ -68,27 +54,21 @@ The comment may be embedded into the entity:
            $this->comment = $comment;
        }
    }
+```
 
-Note on relation to :class:`User`
-=================================
+## Note on relation to :class:`User`
 
 The embeddable proposed by Doctrine does not support relationship to other entities. The entity Comment is able to render a user's id, but not an User object.
 
+   `$activity->getComment()->getUserId(); // return user id of the last author`
 
-.. code-block:: php
+   `$activity->getComment()->getUser(); // does not work !`
 
-   $activity->getComment()->getUserId(); // return user id of the last author
+## Usage into form
 
-   $activity->getComment()->getUser(); // does not work !
-
-
-Usage into form
-===============
-
-Use the :class:`Chill\MainBundle\Form\Type\CommentType` to load the form widget:
-
-.. code-block:: php
+Use the `Chill\MainBundle\Form\Type\CommentType` to load the form widget:
 
+```php
    namespace Chill\ActivityBundle\Form;
 
    use Chill\MainBundle\Form\Type\CommentType;
@@ -110,12 +90,8 @@ Use the :class:`Chill\MainBundle\Form\Type\CommentType` to load the form widget:
            ;
        }
    }
+```
 
-Render the comment
-==================
-
-.. code-block:: twig
-
-   {{ activity.comment|chill_entity_render_box }}
-
+## Render the comment
 
+   `{{ activity.comment|chill_entity_render_box }}`
diff --git a/docs/source/development/entity-info.rst b/docs/source/development/entity-info.md
similarity index 84%
rename from docs/source/development/entity-info.rst
rename to docs/source/development/entity-info.md
index 72d8b70ea..0e8e2b33b 100644
--- a/docs/source/development/entity-info.rst
+++ b/docs/source/development/entity-info.md
@@ -1,16 +1,4 @@
-
-.. Copyright (C)  2014 Champs Libres Cooperative SCRLFS
-Permission is granted to copy, distribute and/or modify this document
-under the terms of the GNU Free Documentation License, Version 1.3
-or any later version published by the Free Software Foundation;
-with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-A copy of the license is included in the section entitled "GNU
-Free Documentation License".
-
-.. _entity-info:
-
-Stats about event on entity in php world
-########################################
+# Stats about event on entity in php world
 
 It is necessary to be able to gather information about events for some entities:
 
@@ -18,11 +6,9 @@ It is necessary to be able to gather information about events for some entities:
 - who did it;
 - ...
 
-Those "infos" are not linked with right management, like describe in :ref:`timelines`.
+Those "infos" are not linked with right management, like describe in [timelines`.
 
-
-“infos” for some stats and info about an entity
------------------------------------------------
+### “infos” for some stats and info about an entity
 
 Building an info means:
 
@@ -32,10 +18,10 @@ Building an info means:
 A framework api is built to be able to build multiple “infos” entities
 through “union” views:
 
--  use a command ``bin/console chill:db:sync-views`` to synchronize view (create view if it does not exists, or update
+-  use a command ``bin/console chill:db:sync-views`` to synchronize view (create view if it does not exist, or update
    views when new SQL parts are added in the UNION query. Internally, this command call a new ``ViewEntityInfoManager``,
    which iterate over available views to build the SQL;
--  one can create a new “view entity info” by implementing a
+-  one can create new “view entity info” by implementing a
    ``ViewEntityInfoProviderInterface``
 -  this implementation of the interface is free to create another
    interface for building each part of the UNION query. This interface
@@ -45,14 +31,13 @@ through “union” views:
 So, converting new “events” into rows for ``AccompanyingPeriodInfo`` is
 just implementing this interface!
 
-Implementation for AccompanyingPeriod (``AccompanyingPeriod/AccompanyingPeriodInfo``)
--------------------------------------------------------------------------------------
+### Implementation for AccompanyingPeriod (``AccompanyingPeriod/AccompanyingPeriodInfo``)
 
 A class is created for computing some statistical info for an
 AccompanyingPeriod: ``AccompanyingPeriod/AccompanyingPeriodInfo``. This
 contains information about “something happens”, who did it and when.
 
-Having those info in table answer some questions like:
+Having that info in the table answers some questions like:
 
 -  when is the last and the first action (AccompanyingPeriodWork,
    Activity, AccompanyingPeriodWorkEvaluation, …) on the period;
@@ -60,46 +45,43 @@ Having those info in table answer some questions like:
    user.
 
 The AccompanyingPeriod info is mapped to a SQL view, not a table. The
-sql view is built dynamically (see below), and gather infos from
+SQL view is built dynamically (see below), and gathers info from
 ActivityBundle, PersonBundle, CalendarBundle, … It is possible to create
-custom bundle and add info on this view.
-
-.. code:: php
+ a custom bundle and add info on this view.
 
+```php
    /**
     *
     * @ORM\Entity()
-    * @ORM\Table(name="view_chill_person_accompanying_period_info") <==== THIS IS A VIEW, NOT A TABLE
+    * @ORM\Table(name="view_chill_person_accompanying_period_info") ](==== THIS IS A VIEW, NOT A TABLE
     */
    class AccompanyingPeriodInfo
    {
      // ...
    }
+```
 
-Why do we need this ?
-~~~~~~~~~~~~~~~~~~~~~
+#### Why do we need this?
 
-For multiple jobs in PHP world:
+For multiple jobs in a PHP world:
 
--  moving the accompanying period to another steps when inactive,
+-  moving the accompanying period to another step when inactive,
    automatically;
 -  listing all the users which are intervening on the action on a new
    “Liste des intervenants” page;
 -  filtering on exports
 
-Later, we will launch automatic anonymise for accompanying period and
+Later we will launch automatic anonymize for an accompanying period and
 all related entities through this information.
 
-How is built the SQL views which is mapped to “info” entities ?
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+#### How are the SQL views built that are mapped to “info” entities?
 
 The AccompanyingPeriodInfo entity is mapped by a SQL view (not a regular
 table).
 
-The sql view is built dynamically, it is a SQL view like this, for now (April 2023):
-
-.. code:: sql
+The SQL view is built dynamically; it is a SQL view like this, for now (April 2023):
 
+```sql
    create view view_chill_person_accompanying_period_info
                (accompanyingperiod_id, relatedentity, relatedentityid, user_id, infodate, discriminator, metadata) as
    SELECT w.accompanyingperiod_id,
@@ -191,13 +173,14 @@ The sql view is built dynamically, it is a SQL view like this, for now (April 20
    FROM activity
             LEFT JOIN activity_user au ON activity.id = au.activity_id
    WHERE activity.accompanyingperiod_id IS NOT NULL;
+```
 
-As you can see, the view gather multiple SELECT queries and bind them
+As you can see, the view gathers multiple SELECT queries and binds them
 with UNION.
 
 Each SELECT query is built dynamically, through a class implementing an
 interface: ``Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoUnionQueryPartInterface``, `like
-here <https://gitlab.com/Chill-Projet/chill-bundles/-/blob/master/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEndQueryPartForAccompanyingPeriodInfo.php>`__
+here <https://gitlab.com/Chill-Projet/chill-bundles/-/blob/master/src/Bundle/ChillPersonBundle/Service/EntityInfo/AccompanyingPeriodInfoQueryPart/AccompanyingPeriodWorkEndQueryPartForAccompanyingPeriodInfo.php.md)__
 
-To add new `SELECT` query in different `UNION` parts in the sql view, create a
+To add new `SELECT` query in different `UNION` parts in the SQL view, create a
 service and implements this interface: ``Chill\PersonBundle\Service\EntityInfo\AccompanyingPeriodInfoUnionQueryPartInterface``.
diff --git a/docs/source/development/es-lint.rst b/docs/source/development/es-lint.md
similarity index 81%
rename from docs/source/development/es-lint.rst
rename to docs/source/development/es-lint.md
index f8504e082..26e81a279 100644
--- a/docs/source/development/es-lint.rst
+++ b/docs/source/development/es-lint.md
@@ -1,12 +1,10 @@
-ESLint
-======
+## ESLint
 
 To improve the quality of our JS and VueJS code, ESLint and eslint-plugin-vue are implemented within the chill-bundles project.
 
-Commands
---------
+### Commands
 
-To run ESLint, you can simply use the ``eslint`` command within the chill-bundles directory.
+To run ESLint, you can simply use the [`eslint`` command within the chill-bundles directory.
 This runs eslint **not** taking the baseline into account, thus showing all existing errors in the project.
 
 A script was also added to package.json allowing you to execute ``yarn run eslint``.
@@ -19,20 +17,18 @@ Interesting options that can be used in combination with eslint are:
 - ``--quiet`` to only get errors and silence the warnings
 - ``--fix`` to have ESLint fix what it can, automatically. This will not fix everything.
 
-Baseline
---------
+### Baseline
 
-To allow us the time to fix linting errors/warnings a baseline has been created using the following command
+To allow us the time to fix linting errors/warnings, a baseline has been created using the following command
 - ``npx eslint-baseline "**/*.{js,vue}"``
 
-The baseline has been commited and the gitlab CI setup to only fail upon new errors/warnings being created.
+The baseline has been committed and the gitlab CI setup to only fail upon new errors/warnings being created.
 When fixing errors/warnings manually, please update the baseline.
 
 1. Delete the current baseline file
 2. Run the above command locally, this will automatically create a new baseline that should be commited
 
-Rules
------
+### Rules
 
 We use Vue 3, so the rules can be configured as follows within the ``eslint.config.mjs`` file:
 
@@ -45,17 +41,14 @@ Configurations for using Vue.js 3.x:
 - ``.configs["flat/recommended"]`` ... Above, plus rules to enforce subjective community defaults to ensure consistency.
 
 Detailed information about which rules each set includes can be found here:
-`https://eslint.vuejs.org/rules/ <https://eslint.vuejs.org/rules/>`_
+`https://eslint.vuejs.org/rules/ ](https://eslint.vuejs.org/rules/)
 
-Manual Rule Configuration
--------------------------
+### Manual Rule Configuration
 
 We can also manually configure certain rules or override rules that are part of the ruleset specified above.
 
 For example, if we want to turn off a certain rule, we can do so as follows:
 
-.. code-block:: javascript
-
     rules: {
       'vue/multi-word-component': 'off'
     }
@@ -64,8 +57,6 @@ We could also change the severity of a certain rule from 'error' to 'warning', f
 
 Within specific ``.js`` or ``.vue`` files, we can also override a certain rule only for that specific file by adding a comment:
 
-.. code-block:: javascript
-
     /* eslint multi-word-component: "off", no-child-content: "error"
     --------
     Here's a description about why this configuration is necessary. */
diff --git a/docs/source/development/export-sequence.puml b/docs/source/development/export-sequence.puml
deleted file mode 100644
index 0d0c77c14..000000000
--- a/docs/source/development/export-sequence.puml
+++ /dev/null
@@ -1,84 +0,0 @@
-@startuml
-'https://plantuml.com/sequence-diagram
-
-autonumber
-
-User -> ExportController: configure export using form
-activate ExportController
-ExportController -> ExportForm: build form
-activate ExportForm
-
-loop for every ExportElement (Filter, Aggregator)
-    ExportForm -> ExportElement: `buildForm`
-    activate ExportElement
-    ExportElement -> ExportForm: add form to builders
-    deactivate ExportElement
-end
-
-ExportForm -> ExportController
-deactivate ExportForm
-
-ExportController -> User: show form
-deactivate ExportController
-
-note left of User: Configure the export:\ncheck filters, aggregators, …
-
-User -> ExportController: post configuration of the export
-activate ExportController
-
-ExportController -> ExportForm: `getData`
-activate ExportForm
-ExportForm -> ExportController: return data: list of entities, etc.
-deactivate ExportForm
-
-loop for every ExportElement (Filter, Aggregator)
-    ExportController -> ExportElement: serializeData (data)
-    activate ExportElement
-    ExportElement -> ExportController: return serializedData (simple array with string, int, …)
-    deactivate ExportElement
-end
-
-ExportController -> Database: `INSERT INTO RequestGeneration_table` (insert new entity)
-ExportController -> MessageQueue: warn about a new request
-activate MessageQueue
-ExportController -> User: "ok, generation is in process"
-deactivate ExportController
-
-note left of User: The user see a waiting screen
-
-MessageQueue -> MessengerConsumer: forward the message to the MessengerConsumer
-deactivate MessageQueue
-activate MessengerConsumer
-MessengerConsumer -> Database: `SELECT * FROM RequestGeneration_table WHERE id = %s`
-activate Database
-Database -> MessengerConsumer: return RequestGeneration with serializedData
-deactivate Database
-
-loop for every ExportElement (Filter, Aggregator)
-    MessengerConsumer -> ExportElement: deserializeData
-    activate ExportElement
-    ExportElement -> MessengerConsumer: return data (list of entities, etc.) from the serialized array
-    deactivate ExportElement
-    MessengerConsumer -> ExportElement: alter the sql query (`ExportElement::alterQuery`)
-    activate ExportElement
-    ExportElement -> MessengerConsumer: return the query with WHERE and GROUP BY clauses
-    deactivate ExportElement
-end
-
-MessengerConsumer -> MessengerConsumer: prepare the export
-MessengerConsumer -> MessengerConsumer: save the export as a stored object
-MessengerConsumer -> Database: `UPDATE RequestGeneration_table SET ready = true`
-deactivate MessengerConsumer
-
-User -> ExportController: pull every 5s to know if the export is generated
-activate ExportController
-ExportController -> User: warn the export is generated
-deactivate ExportController
-
-User -> ExportController: download the export from object storage
-
-
-
-
-
-@enduml
diff --git a/docs/source/development/exports.rst b/docs/source/development/exports.md
similarity index 60%
rename from docs/source/development/exports.rst
rename to docs/source/development/exports.md
index 7cb04f32e..7335490f2 100644
--- a/docs/source/development/exports.rst
+++ b/docs/source/development/exports.md
@@ -1,66 +1,49 @@
-.. Copyright (C)  2014 Champs Libres Cooperative SCRLFS
-   Permission is granted to copy, distribute and/or modify this document
-   under the terms of the GNU Free Documentation License, Version 1.3
-   or any later version published by the Free Software Foundation;
-   with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-   A copy of the license is included in the section entitled "GNU
-   Free Documentation License".
-
-
-Exports
-*******
+###### Exports
 
 Export is an important issue within the Chill software : users should be able to :
 
 - compute statistics about their activity ;
 - list "things" which are a part of their activities.
 
-The `main bundle`_ provides a powerful framework to build custom queries with re-usable parts across differents bundles.
+The [main bundle`_ provides a powerful framework to build custom queries with re-usable parts across differents bundles.
 
-.. contents:: Table of content
    :local:
 
-.. seealso::
-
-   `The issue where this framework was discussed <https://git.framasoft.org/Chill-project/Chill-Main/issues/9>`_
+   `The issue where this framework was [discussed](https://git.framasoft.org/Chill-project/Chill-Main/issues/9)
       Provides some information about the pursued features and architecture.
 
-Concepts
-========
+## Concepts
 
-
-Some vocabulary: 3 "Export elements"
-------------------------------------
+### Some vocabulary: 3 "Export elements"
 
 Four terms are used for this framework :
 
 Exports
    provide some basic operation on the data. Two kinds of exports are available :
 
-   - computed data : it may be "the number of people", "the number of activities", "the duration of activities", ...
-   - list data : it may be "the list of people", "the list of activities", ...
+   - computed data: it may be "the number of people," "the number of activities," "the duration of activities," ...
+   - list data: it may be "the list of people," "the list of activities," ...
 
 Filters
    The filters create a filter on the data: it removes some information the user doesn't want to introduce in the computation done by the export.
 
-   Example of a filter: "people under 18 years olds", "activities between the 1st of June and the 31st December", ...
+   Example of a filter: "people under 18-year-olds," "activities between the 1st of June and the 31st December," ...
 
 Aggregators
    The aggregator aggregates the data into some group (some software use the term 'bucket').
 
-   Example of an aggregator : "group people by gender", "group people by nationality", "group activity by type", ...
+   Example of an aggregator: "group people by gender," "group people by nationality," "group activity by type," ...
 
 Formatters
    The formatters format the data into a :class:`Symfony\Component\HttpFoundation\Response`, which  will be returned "as is" by the controller to the web client.
 
-   Example of a formatter: "format data as CSV", "format data as an ods spreadsheet", ...
+   Example of a formatter: "format data as CSV", "format data as an ods spreadsheet," ...
 
-Anatomy of an export
----------------------
+### Anatomy of an export
 
 An export can be thought of as a sentence where each part of this sentence refers to one or multiple export elements. Examples :
 
-**Example 1**: Count the number of people having at least one activity in the last 12 month, and group them by nationality and gender, and format them in a CSV spreadsheet.
+**Example 1**: Count the number of people having at least one activity in the last month 12, and group them by nationality and gender, and format them in a CSV spreadsheet.
 
 Here :
 
@@ -73,21 +56,16 @@ Here :
 Note that :
 
 - Aggregators, filters, exports and formatters are cross-bundle. Here the bundle *activity* provides a filter which is applied on an export provided by the person bundle ;
-- Multiple aggregator or filter for one export may exist. Currently, only one export is allowed.
+- Multiple aggregators or filters for one export may exist. Currently, only one export is allowed.
 
 The result might be :
 
-+-----------------------+----------------+---------------------------+
-| Nationality           | Gender         | Number of people          |
-+=======================+================+===========================+
-| Russian               | Male           | 12                        |
-+-----------------------+----------------+---------------------------+
-| Russian               | Female         | 24                        |
-+-----------------------+----------------+---------------------------+
-| France                | Male           | 110                       |
-+-----------------------+----------------+---------------------------+
-| France                | Female         | 150                       |
-+-----------------------+----------------+---------------------------+
++-------------+--------+------------------+
+| Nationality | Gender | Number of people |
+| Russian | Male | 12 |
+| Russian | Female | 24 |
+| France | Male | 110 |
+| France | Female| 150 |
 
 **Example 2**: Count the average duration of an activity with type "meeting", which occurs between the 1st of June and the 31st of December, group them by week, and format the data in an OpenDocument spreadsheet.
 
@@ -103,122 +81,97 @@ The result might be :
 
 +-----------------------+----------------------+
 | Week                  | Number of activities |
-+=======================+======================+
 | 2015-10               | 10                   |
-+-----------------------+----------------------+
 | 2015-11               | 12                   |
-+-----------------------+----------------------+
 | 2015-12               | 10                   |
-+-----------------------+----------------------+
 | 2015-13               | 9                    |
-+-----------------------+----------------------+
 
-Authorization and exports
--------------------------
+### Authorization and exports
 
-Exports, filters and aggregators should not show data the user is not allowed to see within the application.
+Exports, filters, and aggregators should not show data the user is not allowed to see within the application.
 
 In other words, developers are required to take care of user authorization for each export.
 
 There should be a specific role that grants permission to users who are allowed to build exports. For more simplicity, this role should apply on a center, and should not require special circles.
 
-How does the magic work ?
-===========================
+## How does the magic work?
 
 To build an export, we rely on the capacity of the database to execute queries with aggregate (i.e. GROUP BY) and filter (i.e. WHERE) instructions.
 
-An export is an SQL query which is initiated by an export, and modified by aggregators and filters.
+An export is an SQL query that is initiated by an export and modified by aggregators and filters.
 
-.. note::
-
-   **Example**: Count the number of people having at least one activity in the last 12 month, and group them by nationality and gender
+   **Example**: Count the number of people having at least one activity in the last month 12, and group them by nationality and gender
 
    1. The report initiates the query
 
-   .. code-block:: SQL
-
+   ```SQL
       SELECT count(people.*) FROM people
+```
 
    2. The filter adds a where and join clause :
 
-   .. code-block:: SQL
-
+   ```SQL
       SELECT count(people.*) FROM people
          RIGHT JOIN activity
          WHERE activity.date IS BETWEEN now AND 6 month ago
+```
 
    3. The aggregator "nationality" adds a GROUP BY clause and a column in the SELECT statement:
 
-   .. code-block:: sql
-
+   ```sql
       SELECT people.nationality, count(people.*) FROM people
          RIGHT JOIN activity
          WHERE activity.date IS BETWEEN now AND 6 month ago
          GROUP BY nationality
+```
 
    4. The aggregator "gender" does the same job as the nationality aggregator : it adds a GROUP BY clause and a column in the SELECT statement :
 
-   .. code-block:: sql
-
+   ```sql
       SELECT people.nationality, people.gender, count(people.*)
          FROM people RIGHT JOIN activity
          WHERE activity.date IS BETWEEN now AND 6 month ago
          GROUP BY nationality, gender
+```
 
-Each filter, aggregator and filter may collect parameters from the user through a form. This form is appended to the export form. Here is an example.
-
-.. figure:: /_static/screenshots/development/export_form-fullpage.png
+Each filter, aggregator, and filter may collect parameters from the user through a form. This form is appended to the export form. Here is an example.
 
    The screenshot shows the export form for ``CountPeople`` (Nombre de personnes). The filter by date of birth is checked (*Filtrer par date de naissance de la personne*), which triggers a subform, which is provided by the :class:`Chill\PersonBundle\Export\Filter\BirthdateFilter`. The other unchecked filter does not show the subform.
 
-   Two aggregators are also checked : by Country of birth (*Aggréger les personnes par pays de naissance*, the corresponding class is :class:`Chill\PersonBundle\Export\Aggregator\CountryOfBirthAggregator`, which also triggers a subform. The aggregator by gender (*Aggréger les personnes par genre*) is also checked, but there is no corresponding subform.
+   Two aggregators are also checked: by Country of birth (*Aggréger les personnes par pays de naissance*, the corresponding class is :class:`Chill\PersonBundle\Export\Aggregator\CountryOfBirthAggregator`, which also triggers a subform. The aggregator by gender (*Aggréger les personnes par genre*) is also checked, but there is no corresponding subform.
 
-The Export Manager
-------------------
+### The Export Manager
 
-The Export manager (:class:`Chill\MainBundle\Export\ExportManager` is the central class which registers all exports, aggregators, filters and formatters.
+The Export manager (:class:`Chill\MainBundle\Export\ExportManager` is the central class which registers all exports, aggregators, filters, and formatters.
 
 The export manager is also responsible for orchestrating the whole export process, producing a :class:`Symfony\FrameworkBundle\HttpFoundation\Request` for each export request.
 
-
-The export form step
---------------------
+### The export form step
 
 The form step allows you to build a form, combining different parts of the module.
 
 The building of forms is split into different subforms, where each one is responsible for rendering their part of the form (aggregators, filters, and export).
 
-.. figure:: /_static/puml/exports/form_steps.png
    :scale: 40%
 
-The formatter form step
------------------------
+### The formatter form step
 
 The formatter form is processed *after* the user filled the export form. It is built the same way, but receives the data entered by the user on the previous step as parameters (i.e. export form). It may then adapt it accordingly (example: show a list of columns selected in aggregators).
 
-Processing the export
----------------------
+### Processing the export
 
-The export process can be explained by this schema :
+This schema can explain the export process :
 
-.. figure:: /_static/puml/exports/processing_export.png
    :scale: 40%
 
    (Click to enlarge)
 
+## Export, formatters, and filters explained
 
-Export, formatters and filters explained
-========================================
-
-Exports
--------
+### Exports
 
 This is an example of the ``CountPerson`` export :
 
-.. literalinclude:: /_static/code/exports/CountPerson.php
-   :language: php
-   :linenos:
-
 * **Line 36**: the ``getType`` function returns a string. This string will be used to find the aggregtors and filters which will apply to this export.
 * **Line 41**: a simple description to help users understand what your export does.
 * **Line 46**: The title of the export. A summary of what your export does.
@@ -226,26 +179,17 @@ This is an example of the ``CountPerson`` export :
 * **Line 56**: We initiate the query here...
 * **Line 59**: We have to filter the query with centers the users checked in the form. We process the $acl variable to get all ``Center`` objects in one array
 * **Line 63**: We create the query with a query builder.
-* **Line 74**: We return the result, but make sure to hydrate the results as an array.
+* **Line 74**: We return the result but make sure to hydrate the results as an array.
 * **Line 103**: return the list of formatter types which are allowed to be applied on this filter
 
-Filters
--------
+### Filters
 
-This is an example of the *filter by birthdate*. This filter asks some information through a form (`buildForm` is not empty), and this form must be validated. To perform this validation, we implement a new Interface: :class:`Chill\MainBundle\Export\ExportElementValidatedInterface`:
-
-.. literalinclude:: /_static/code/exports/BirthdateFilter.php
-   :language: php
-
-.. todo::
+This is an example of the *filter by birthdate*. This filter asks some information through a form (`buildForm` is not empty), and this form must be validated. To perform this validation, we implement a new Interface: `Chill\MainBundle\Export\ExportElementValidatedInterface`:
 
    Continue to explain the export framework
 
-.. _main bundle: https://git.framasoft.org/Chill-project/Chill-Main
-
-
-With many-to-* relationship, why should we set WHERE clauses in an EXISTS subquery instead of a JOIN ?
-``````````````````````````````````````````````````````````````````````````````````````````````````````
+With many-to-* relationship, why should we set WHERE clauses in an EXISTS subquery instead of a JOIN?
+-----------------------------------------------------------------------------------------------------
 
 As we described above, the doctrine builder is converted into a sql query. Let's see how to compute the "number of course
 which count at least one activity type with the id 7". For the purpose of this demonstration, we will restrict this on
@@ -253,79 +197,65 @@ two accompanying period only: the ones with id 329 and 334.
 
 Let's see the list of activities associated with those accompanying period:
 
-.. code-block:: sql
-
    SELECT id, accompanyingperiod_id, type_id FROM activity WHERE accompanyingperiod_id IN (329, 334) AND type_id = 7
        ORDER BY accompanyingperiod_id;
 
 We see that we have 6 activities for the accompanying period with id 329, and only one for the 334's one.
 
-.. csv-table::
-   :header: id, accompanyingperiod_id, type_id
-
-   990,329,7
-   986,329,7
-   987,329,7
-   993,329,7
-   991,329,7
-   992,329,7
-   1000,334,7
+| id   | accompanyingperiod_id | type_id |
+|------|----------------------|---------|
+| 990  | 329                  | 7       |
+| 986  | 329                  | 7       |
+| 987  | 329                  | 7       |
+| 993  | 329                  | 7       |
+| 991  | 329                  | 7       |
+| 992  | 329                  | 7       |
+| 1000 | 334                  | 7       |
 
 Let's calculate the average duration for those accompanying periods, and the number of period:
 
-.. code-block:: sql
-
    SELECT AVG(age(COALESCE(closingdate, CURRENT_DATE), openingdate)), COUNT(id) from chill_person_accompanying_period WHERE id IN (329, 334);
 
 The result of this query is:
 
-.. csv-table::
-   :header: AVG, COUNT
+| AVG                                              | COUNT |
+|--------------------------------------------------|-------|
+| 2 years 2 mons 21 days 12 hours 0 mins 0.0 secs | 2     |
 
-   2 years 2 mons 21 days 12 hours 0 mins 0.0 secs,2
-
-Now, we count the number of accompanying period, adding a :code:`JOIN` clause which make a link to the :code:`activity` table, and add a :code:`WHERE` clause to keep
+Now, we count the number of accompanying period, adding a `JOIN` clause which make a link to the `activity` table, and add a `WHERE` clause to keep
 only the accompanying period which contains the given activity type:
 
-.. code-block:: sql
-
    SELECT COUNT(chill_person_accompanying_period.id) from chill_person_accompanying_period
                  JOIN activity ON chill_person_accompanying_period.id = activity.accompanyingperiod_id
                  WHERE chill_person_accompanying_period.id IN (329, 334) AND activity.type_id = 7;
 
-What are the results here ?
+What are the results here?
 
-.. csv-table::
-   :header: COUNT
+| COUNT |
+|-------|
+| 7     |
 
-   7
-
-:code:`7` ! Why this result ? Because the number of lines is duplicated for each activity. Let's see the list of rows which
+`7` ! Why this result? Because the number of lines is duplicated for each activity. Let's see the list of rows which
 are taken into account for the computation:
 
-.. code-block:: sql
-
    SELECT chill_person_accompanying_period.id, activity.id from chill_person_accompanying_period
    JOIN activity ON chill_person_accompanying_period.id = activity.accompanyingperiod_id
    WHERE chill_person_accompanying_period.id IN (329, 334) AND activity.type_id = 7;
 
-.. csv-table::
-   :header: accompanyingperiod.id, activity.id
+| accompanyingperiod.id | activity.id |
+|----------------------|-------------|
+| 329                  | 993         |
+| 334                  | 1000        |
+| 329                  | 987         |
+| 329                  | 990         |
+| 329                  | 991         |
+| 329                  | 992         |
+| 329                  | 986         |
 
-   329,993
-   334,1000
-   329,987
-   329,990
-   329,991
-   329,992
-   329,986
-
-For each activity, a row is created and, as we count the number of non-null :code:`accompanyingperiod.id` columns, we
+For each activity, a row is created and, as we count the number of non-null `accompanyingperiod.id` columns, we
 count one entry for each activity (actually, we count the number of activities).
 
-So, let's use the :code:`DISTINCT` keyword to count only once the equal ids:
-
-.. code-block::
+So, let's use the `DISTINCT` keyword to count only once the equal ids:
 
    SELECT COUNT(DISTINCT chill_person_accompanying_period.id) from chill_person_accompanying_period
    JOIN activity ON chill_person_accompanying_period.id = activity.accompanyingperiod_id
@@ -333,38 +263,31 @@ So, let's use the :code:`DISTINCT` keyword to count only once the equal ids:
 
 Now, it works again...
 
-.. csv-table::
-   :header: COUNT
+| COUNT |
+|-------|
+| 2     |
 
-   2
+But, for the average duration, this won't work: the duration which are equals (because the `openingdate` is the same and
+`closingdate` is still `NULL`, for instance) will be counted only once, which will give unexpected result.
 
-But, for the average duration, this won't work: the duration which are equals (because the :code:`openingdate` is the same and
-:code:`closingdate` is still :code:`NULL`, for instance) will be counted only once, which will give unexpected result.
-
-The solution is to move the condition "having an activity with activity type with id 7" in a :code:`EXISTS` clause:
-
-.. code-block:: sql
+The solution is to move the condition "having an activity with activity type with id 7" in a `EXISTS` clause:
 
    SELECT COUNT(chill_person_accompanying_period.id) from chill_person_accompanying_period
    WHERE chill_person_accompanying_period.id IN (329, 334) AND EXISTS (SELECT 1 FROM activity WHERE type_id = 7 AND accompanyingperiod_id = chill_person_accompanying_period.id);
 
-The result is correct without :code:`DISTINCT` keyword:
+The result is correct without `DISTINCT` keyword:
 
-.. csv-table::
-   :header: COUNT
-
-   2
+| COUNT |
+|-------|
+| 2     |
 
 And we can now compute the average duration without fear:
 
-.. code-block:: sql
-
   SELECT AVG(age(COALESCE(closingdate, CURRENT_DATE), openingdate)) from chill_person_accompanying_period
   WHERE chill_person_accompanying_period.id IN (329, 334) AND EXISTS (SELECT 1 FROM activity WHERE type_id = 7 AND accompanyingperiod_id = chill_person_accompanying_period.id);
 
 Give the result:
 
-.. csv-table::
-   :header: AVG
-
-   2 years 2 mons 21 days 12 hours 0 mins 0.0 secs
+| AVG                                              |
+|--------------------------------------------------|
+| 2 years 2 mons 21 days 12 hours 0 mins 0.0 secs |
diff --git a/docs/source/development/forms.md b/docs/source/development/forms.md
new file mode 100644
index 000000000..40ed3d9e2
--- /dev/null
+++ b/docs/source/development/forms.md
@@ -0,0 +1,25 @@
+# Forms and form types
+
+###### Date picker
+
+Class
+   `Chill\MainBundle\Form\Type\ChillDateType`
+Extend
+   `Symfony\Component\Form\Extension\Core\Type\DateType`
+
+Usage :
+
+```
+   use Chill\MainBundle\Form\Type\ChillDateType;
+
+   $builder->add('date' ChillDateType::class);
+```
+
+###### Text editor
+
+Add a text editor (by default).
+
+Class
+   `Chill\MainBundle\Form\Type\ChillTextareaType`
+Options
+   * `disable_editor` to disable text editor
diff --git a/docs/source/development/forms.rst b/docs/source/development/forms.rst
deleted file mode 100644
index 038240664..000000000
--- a/docs/source/development/forms.rst
+++ /dev/null
@@ -1,42 +0,0 @@
-
-.. Copyright (C)  2014 Champs Libres Cooperative SCRLFS
-   Permission is granted to copy, distribute and/or modify this document
-   under the terms of the GNU Free Documentation License, Version 1.3
-   or any later version published by the Free Software Foundation;
-   with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-   A copy of the license is included in the section entitled "GNU
-   Free Documentation License".
-
-.. _forms:
-
-Forms and form types
-####################
-
-Date picker
-***********
-
-Class
-   :class:`Chill\MainBundle\Form\Type\ChillDateType`
-Extend
-   :class:`Symfony\Component\Form\Extension\Core\Type\DateType`
-
-
-Usage :
-
-.. code-block:: php
-
-   use Chill\MainBundle\Form\Type\ChillDateType;
-
-   $builder->add('date' ChillDateType::class);
-
-Text editor
-***********
-
-Add a text editor (by default).
-
-Class
-   :class:`Chill\MainBundle\Form\Type\ChillTextareaType`
-Options
-   * :code:`disable_editor` to disable text editor
-
-
diff --git a/docs/source/development/index.md b/docs/source/development/index.md
new file mode 100644
index 000000000..ab763538c
--- /dev/null
+++ b/docs/source/development/index.md
@@ -0,0 +1,41 @@
+# Development
+
+As Chill relies on the [symfony ](http://symfony.com) framework, reading the framework's documentation should answer most of your questions. We are explaining here some tips to work with Chill, and help with things we've encountered.
+
+- [Instructions to create a new bundle](create-a-new-bundle.md)
+- [CRUD (Create - Update - Delete) for one entity](crud.md)
+- [Helpers for building a REST API](api.md)
+- [Routing](routing.md)
+- [Menus](menus.md)
+- [Forms](forms.md)
+- [Access control model](access_control_model.md)
+- [Messages to users](messages-to-users.md)
+- [Pagination](pagination.md)
+- [Localisation](localisation.md)
+- [Logging](logging.md)
+- [Database migrations](migrations.md)
+- [Searching](searching.md)
+- [Timelines](timelines.md)
+- [Exports](exports.md)
+- [Embeddable comments](embeddable-comments.md)
+- [Run tests](run-tests.md)
+- [ESLint](es-lint.md)
+- [Useful snippets](useful-snippets.md)
+- [Manual](manual/index.md)
+- [Assets](assets.md)
+- [Cron Jobs](cronjob.md)
+- [Info about entities](entity-info.md)
+- [Info about database (in French)](database-principles.md)
+- [Developer FAQ](FAQ.md)
+
+###### Layout and UI
+
+- [Render entities automatically](render-entity.md)
+- [Layout / Template usage](user-interface/layout-template-usage.md)
+- [Classes and mixins](user-interface/css-classes.md)
+- [Widgets](user-interface/widgets.md)
+- [Javascript function](user-interface/js-functions.md)
+
+###### Help, I am lost!
+
+Write an email at info@champs-libres.coop, and we will help you!
diff --git a/docs/source/development/index.rst b/docs/source/development/index.rst
deleted file mode 100644
index d3aefc1b0..000000000
--- a/docs/source/development/index.rst
+++ /dev/null
@@ -1,59 +0,0 @@
-.. Copyright (C)  2014 Champs Libres Cooperative SCRLFS
-   Permission is granted to copy, distribute and/or modify this document
-   under the terms of the GNU Free Documentation License, Version 1.3
-   or any later version published by the Free Software Foundation;
-   with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-   A copy of the license is included in the section entitled "GNU
-   Free Documentation License".
-
-Development
-###########
-
-As Chill relies on the `symfony <http://symfony.com>`_ framework, reading the framework's documentation should answer most of your questions. We are explaining here some tips to work with Chill, and help with things we've encountered.
-
-.. toctree::
-    :maxdepth: 2
-
-    Instructions to create a new bundle <create-a-new-bundle.rst>
-    CRUD (Create - Update - Delete) for one entity <crud.rst>
-    Helpers for building a REST API <api.rst>
-    Routing <routing.rst>
-    Menus <menus.rst>
-    Forms <forms.rst>
-    Access control model <access_control_model.rst>
-    Messages to users <messages-to-users.rst>
-    Pagination <pagination.rst>
-    Localisation <localisation.rst>
-    Logging <logging.rst>
-    Database migrations <migrations.rst>
-    Searching <searching.rst>
-    Timelines <timelines.rst>
-    Exports <exports.rst>
-    Embeddable comments <embeddable-comments.rst>
-    Run tests <run-tests.rst>
-    ESLint <es-lint.rst>
-    Useful snippets <useful-snippets.rst>
-    manual/index.rst
-    Assets <assets.rst>
-    Cron Jobs <cronjob.rst>
-    Info about entities <entity-info.rst>
-    Info about database (in French) <database-principles.rst>
-    Developer FAQ <FAQ.rst>
-
-Layout and UI
-**************
-
-.. toctree::
-   :maxdepth: 2
-
-   Render entities automatically <render-entity.rst>
-   Layout / Template usage <user-interface/layout-template-usage.rst>
-   Classes and mixins <user-interface/css-classes.rst>
-   Widgets <user-interface/widgets.rst>
-   Javascript function <user-interface/js-functions.rst>
-
-
-Help, I am lost !
-*****************
-
-Write an email at info@champs-libres.coop, and we will help you !
diff --git a/docs/source/development/localisation.md b/docs/source/development/localisation.md
new file mode 100644
index 000000000..b412954d5
--- /dev/null
+++ b/docs/source/development/localisation.md
@@ -0,0 +1,30 @@
+###### Localisation
+
+## Language in url
+
+Language should be present in URL, conventionally as the first argument.
+
+   `/fr/your/url/here`
+
+This allows users to change from one language to another one on each page, which may be useful in multilanguages teams. If the installation is single-language, the language switcher will not appears.
+
+This is an example of routing defined in YAML :
+
+```yaml
+   chill_person_general_edit:
+       pattern: /{_locale}/person/{person_id}/general/edit
+       defaults: {_controller: ChillPersonBundle:Person:edit }
+```
+
+## Date and time
+
+The [Intl extension ](http://twig.sensiolabs.org/doc/extensions/intl.html) is enabled on the Chill application.
+
+You may format date and time using the [localizeddate` function :
+
+   `date|localizeddate('long', 'none')`
+
+By default, we prefer using the `long` format for date formatting.
+
+   [Documentation for Intl Extension](http://twig.sensiolabs.org/doc/extensions/intl.html)
+      Read the complete doc for the Intl extension.
diff --git a/docs/source/development/localisation.rst b/docs/source/development/localisation.rst
deleted file mode 100644
index fca5ad8ba..000000000
--- a/docs/source/development/localisation.rst
+++ /dev/null
@@ -1,49 +0,0 @@
-.. Copyright (C)  2014 Champs Libres Cooperative SCRLFS
-   Permission is granted to copy, distribute and/or modify this document
-   under the terms of the GNU Free Documentation License, Version 1.3
-   or any later version published by the Free Software Foundation;
-   with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-   A copy of the license is included in the section entitled "GNU
-   Free Documentation License".
-
-Localisation
-*************
-
-Language in url
-===============
-
-Language should be present in URL, conventionnaly as first argument. 
-
-.. code-block:: none
-
-   /fr/your/url/here
-
-This allow users to change from one language to another one on each page, which may be useful in multilanguages teams. If the installation is single-language, the language switcher will not appears.
-
-This is an example of routing defined in yaml : 
-
-.. code-block:: yaml
-
-   chill_person_general_edit:
-       pattern: /{_locale}/person/{person_id}/general/edit
-       defaults: {_controller: ChillPersonBundle:Person:edit }
-
-
-Date and time
-==============
-
-The `Intl extension <http://twig.sensiolabs.org/doc/extensions/intl.html>`_ is enabled on the Chill application. 
-
-You may format date and time using the `localizeddate` function : 
-
-.. code-block:: jinja
-
-   date|localizeddate('long', 'none')
-
-By default, we prefer using the `long` format for date formatting.
-
-.. seealso::
-
-   `Documentation for Intl Extension <http://twig.sensiolabs.org/doc/extensions/intl.html>`_
-      Read the complete doc for the Intl extension.
-   
diff --git a/docs/source/development/logging.rst b/docs/source/development/logging.md
similarity index 68%
rename from docs/source/development/logging.rst
rename to docs/source/development/logging.md
index 5cace02c7..6cd0b0a20 100644
--- a/docs/source/development/logging.rst
+++ b/docs/source/development/logging.md
@@ -1,50 +1,41 @@
-.. Copyright (C)  2016 Champs Libres Cooperative SCRLFS
-   Permission is granted to copy, distribute and/or modify this document
+Permission is granted to copy, distribute and/or modify this document
    under the terms of the GNU Free Documentation License, Version 1.3
    or any later version published by the Free Software Foundation;
    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
    A copy of the license is included in the section entitled "GNU
    Free Documentation License".
 
+###### Logging
 
-Logging
-*******
 
-.. seealso::
-   
-   Symfony documentation: `How to user Monolog to write logs <http://symfony.com/doc/current/cookbook/logging/monolog.html>`_
+   Symfony documentation: [How to user Monolog to write logs ](http://symfony.com/doc/current/cookbook/logging/monolog.html)
       The symfony cookbook page about logging.
 
+A channel for custom logging has been created to store sensitive data.
 
-A channel for custom logging has been created to store sensitive data. 
-
-The channel is named ``chill``. 
+The channel is named ``chill``.
 
 The installer of chill should be aware that this channel may contains sensitive data and encrypted during backup.
 
-Logging to channel `chill`
-============================
+## Logging to channel `chill`
 
-You should use the service named ``chill.main.logger``, as this : 
+You should use the service named ``chill.main.logger``, as this :
 
-.. code-block:: php
+   `$logger = $this->get('chill.main.logger');`
 
-   $logger = $this->get('chill.main.logger');
+You should store data into context, not in the log himself, which should remains the same for the action.
 
-You should store data into context, not in the log himself, which should remains the same for the action. 
-
-Example of usage : 
-
-.. code-block:: php
+Example of usage :
 
+```php
    $logger->info("An action has been performed about a person", array(
       'person_lastname' => $person->getLastName(),
       'person_firstname' => $person->getFirstName(),
       'person_id' => $person->getId(),
       'by_user' => $user->getUsername()
    ));
+```
 
 For further processing, it is a good idea to separate all fields (like firstname, lastname, ...) into different context keys.
 
 By convention, you should store the username of the user performing the action under the ``by_user`` key.
-
diff --git a/docs/source/development/manual/index.rst b/docs/source/development/manual/index.md
similarity index 58%
rename from docs/source/development/manual/index.rst
rename to docs/source/development/manual/index.md
index d93fa3a7e..070db381f 100644
--- a/docs/source/development/manual/index.rst
+++ b/docs/source/development/manual/index.md
@@ -1,17 +1,10 @@
-.. Copyright (C)  2014 Champs Libres Cooperative SCRLFS
-   Permission is granted to copy, distribute and/or modify this document
+Permission is granted to copy, distribute and/or modify this document
    under the terms of the GNU Free Documentation License, Version 1.3
    or any later version published by the Free Software Foundation;
    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
    A copy of the license is included in the section entitled "GNU
    Free Documentation License".
 
-Developer manual
-*****************
-
-.. toctree::
-   :maxdepth: 2
-
-   routing-and-menus.rst
-
+###### Developer manual
 
+- [Routing and Menus](routing-and-menus.md)
diff --git a/docs/source/development/manual/routing-and-menus.rst b/docs/source/development/manual/routing-and-menus.md
similarity index 55%
rename from docs/source/development/manual/routing-and-menus.rst
rename to docs/source/development/manual/routing-and-menus.md
index c3b8b61cb..36eb34b83 100644
--- a/docs/source/development/manual/routing-and-menus.rst
+++ b/docs/source/development/manual/routing-and-menus.md
@@ -1,143 +1,103 @@
-.. Copyright (C)  2014 Champs Libres Cooperative SCRLFS
-   Permission is granted to copy, distribute and/or modify this document
-   under the terms of the GNU Free Documentation License, Version 1.3
-   or any later version published by the Free Software Foundation;
-   with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-   A copy of the license is included in the section entitled "GNU
-   Free Documentation License".
+###### Routing and menus
 
-Routing and menus
-*****************
-
-
-The *Chill*'s architecture allows to choose bundle on each installation. This may lead to a huge diversity of installations, and a the developper challenge is to make his code working with all those possibles installations.
+The architecture of *Chill* allows choosing a bundle on each installation. This may lead to a huge diversity of installations, and the developper challenge is to make his code work with all those possibles installations.
 
 *Chill* uses menus to let users access easily to the most used functionalities. For instance, when you land on a "Person" page, you may access directly to his activities, notes, documents, ... in a single click on a side menu.
 
 For a developer, it is easy to extend this menu with his own entries.
 
-.. seealso::
-
-   `Symfony documentation about routing <http://symfony.com/doc/current/book/routing.html>`_
+   [Symfony documentation about routing ](http://symfony.com/doc/current/book/routing.html)
       This documentation should be read before diving into those lines
 
-   `Routes dans Chill <https://redmine.champs-libres.coop/issues/179>`_ (FR)
+   [Routes dans Chill ](https://redmine.champs-libres.coop/issues/179) (FR)
       The issue where we discussed routes. In French.
 
-Create routes 
-==============
+## Create routes
 
-.. note::
+   We recommend using `yaml` to define routes. We have not tested the existing other ways to create routes (annotations, ...). Help wanted.
 
-   We recommand using `yaml` to define routes. We have not tested the existing other ways to create routes (annotations, ...). Help wanted.
-
-The first step is as easy as create a route in symfony, and add some options in his description :
-
-.. code-block:: yaml
+The first step is as easy as creating a route in symfony, and add some options in his description :
 
+```yaml
+#src/CL/ChillBundle/Resources/config/routing.yml
    chill_main_dummy_0:
        pattern: /dummy/{personId}
        defaults: { _controller: CLChillMainBundle:Default:index }
        options:
            #we begin menu information here :
-           menus: 
-               foo: #must appears in menu named 'foo'
+           menus:
+               foo: #must appear in a menu named 'foo'
                    order: 500  #the order will be '500'
-                   label: foolabel #the label shown on menu. Will be translated
-                   otherkey: othervalue #you may add other informations, as needed by your layout
-               bar: #must also appears in menu named 'bar'
+                   label: foolabel #the label shown on a menu. Will be translated
+                   otherkey: othervalue #you may add other information, as needed by your layout
+               bar: #must also appear in a menu named 'bar'
                    order: 500
                    label: barlabel
+```
 
-The mandatory parameters under the `menus` definition are : 
+The mandatory parameters under the `menus` definition are :
 
-* `name`: the menu's name, defined as an key for the following entries
-* `order`. Note: if we have duplicate order's values, the order will be incremented. We recommand using big intervals within orders and publishing the orders in your documentation
-* `label`: the text which will be rendered inside the `<a>` tag. The label should be processed trough the `trans` filter (`{{ route.label|trans }}`)
+* `name`: the menu's name, defined as a key for the following entries
+* `order`. Note: if we have duplicate order's values, the order will be incremented. We recommend using big intervals within orders and publishing the orders in your documentation
+* `label`: the text which will be rendered inside the `<a>[ tag. The label should be processed trough the `trans` filter (`{{ route.label|trans }}`)
 
-You *may* also add other keys, which will be used optionally in the way the menu is rendered. See 
+You *may* also add other keys, which will be used optionally in the way the menu is rendered. See
 
-.. warning::
+   Although all keys will be kept from your `yaml` definition to your menu template, we recommend not using those keys, which are reserved for a future implementations of Chill :
 
-   Although all keys will be kept from your `yaml` definition to your menu template, we recommend not using those keys, which are reserved for a future implementations of Chill : 
+   * `helper`, a text to help user or add more information to him
+   * `access` : which will run a test with `Expression Langage ](http://symfony.com/doc/current/components/expression_language/index.html) to determine if the user has the ACL to show the menu entry ;
+   * `condition`, which will test with the menu context if the entry must appear
 
-   * `helper`, a text to help user or add more informations to him
-   * `access` : which will run a test with `Expression Langage <http://symfony.com/doc/current/components/expression_language/index.html>`_ to determine if the user has the ACL to show the menu entry ;
-   * `condition`, which will test with the menu context if the entry must appears
-
-Show menu in twig templates
-===========================
+## Show menu in twig templates
 
 To show our previous menu in the twig template, we invoke the `chill_menu` function. This will render the `foo` menu :
 
-.. code-block:: jinja
+   `{{ chill_menu('foo') }}`
 
-   {{ chill_menu('foo') }}
-
-Passing variables
-^^^^^^^^^^^^^^^^^
+##### Passing variables
 
 If your routes need arguments, i.e. an entity id, you should pass the as argument to the chill_menu function. If your route's pattern is `/person/{personId}`, your code become :
 
-.. code-block:: jinja
-
-   {{ chill_menu('foo', { 'args' : { 'personId' : person.id } } ) }}
+   `{{ chill_menu('foo', { 'args' : { 'personId' : person.id } } ) }}`
 
 Of course, `person` is a variable you must define in your code, which should have an `id` accessible property (i.e. : `$person->getId()`).
 
-.. note::
-
    Be aware that your arguments will be passed to all routes in a menu. If a route does not require `personId` in his pattern, the route will become `/pattern?personId=XYZ`. This should not cause problem in your application.
 
-.. warning::
-
-   It is a good idea to reuse the same parameter's name in your pattern, to avoid collision. Prefer `/person/{personId}` to `/person/{id}`. 
+   It is a good idea to reuse the same parameter's name in your pattern, to avoid collision. Prefer `/person/{personId}` to `/person/{id}`.
 
    If you don't do that and another developer create a bundle with  `person/{personId}/{id}` where `{id}` is the key for something else, this will cause a lot of trouble...
 
-Rendering active entry
-^^^^^^^^^^^^^^^^^^^^^^
+##### Rendering active entry
 
-Now, you want to render differently the *active* route of the menu [#f1]_. You should, in your controller or template, add the active route in your menu : 
+Now, you want to render differently the *active* route of the menu [#f1]_. You should, in your controller or template, add the active route in your menu :
 
-.. code-block:: jinja
-
-   {{ chill_menu('foo', { 'activeRouteKey' : 'chill_main_dummy_0' } ) }}
+   `{{ chill_menu('foo', { 'activeRouteKey' : 'chill_main_dummy_0' } ) }}`
 
 On menu creation, the route wich has the key `chill_main_dummy_0` will be rendered on a different manner.
 
-Define your own template
--------------------------
+### Define your own template
 
 By default, the menu is rendered with the default template, which is a simple `ul` list. You may create your own templates :
 
-.. code-block:: html+jinja
-
+```
    #MyBundle/Resources/views/Menu/MyMenu.html.twig
    <ul class="myMenu">
    {% for route in routes %}
        <li><a href="{{ path(route.key, args ) }}" class="{%- if activeRouteKey == route.key -%}active{%- endif -%}">{{ route.label|trans }}</a></li>
    {% endfor %}
    </ul>
+```
 
 Arguments available in your template :
 
 * The `args` value are the value passed in the 'args' arguments requested by the `chill_menu` function.
-* `activeRouteKey` is the key of the currently active route. 
+* `activeRouteKey` is the key of the currently active route.
 * `routes` is an array of routes. The array has this structure: `routes[order] = { 'key' : 'the_route_key', 'label' : 'the route label' }` The order is *resolved*: in case of collision (two routes from different bundles having the same order), the order will be incremented. You may find in the array your own keys (`{ 'otherkey' : 'othervalue'}` in the example above).
 
 Then, you will call your own template with the `layout` argument :
 
-.. code-block:: jinja
-
-   {{ chill_menu('foo', { 'layout' : 'MyBundle:Menu:MyMenu.html.twig' } ) }}
-
-.. note::
+   `{{ chill_menu('foo', { 'layout' : 'MyBundle:Menu:MyMenu.html.twig' } ) }}`
 
    Take care of specifying the absolute path to layout in the function.
-
-
-
-.. rubric:: Footnotes
-
-.. [#f1] In the default template, the currently active entry will be rendered with an "active" class : `<li class="active"> ... </li>`
diff --git a/docs/source/development/menus.rst b/docs/source/development/menus.md
similarity index 52%
rename from docs/source/development/menus.rst
rename to docs/source/development/menus.md
index 977591f1d..e4904ac54 100644
--- a/docs/source/development/menus.rst
+++ b/docs/source/development/menus.md
@@ -1,44 +1,25 @@
-.. Copyright (C)  2014 Champs Libres Cooperative SCRLFS
-   Permission is granted to copy, distribute and/or modify this document
-   under the terms of the GNU Free Documentation License, Version 1.3
-   or any later version published by the Free Software Foundation;
-   with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-   A copy of the license is included in the section entitled "GNU
-   Free Documentation License".
-
-.. _menus :
-
-Menus
-*****
+###### Menus
 
 Chill has created his own menu system
 
-.. seealso::
-
-   `Routes dans Chill [specification] <https://redmine.champs-libres.coop/issues/179>`_
+   [Routes dans Chill [specification] ](https://redmine.champs-libres.coop/issues/179)
        The issue wich discussed the implementation of routes.
 
-Concepts
-========
-
-.. warning:: 
+## Concepts
 
    to be written
 
-
-
-Add a menu in a template
-========================
+## Add a menu in a template
 
 In your twig template, use the `chill_menu` function :
 
-.. code-block:: html+jinja
-
+```php
    {{ chill_menu('person', {
 	     'layout': 'ChillPersonBundle::menu.html.twig',
-	     'args' : {'id': person.id },
+	     'args': {'id': person.id },
 	     'activeRouteKey': 'chill_person_view'
 	}) }}
+```
 
 The available arguments are:
 
@@ -46,78 +27,61 @@ The available arguments are:
 * `args` : those arguments will be passed through the url generator.
 * `activeRouteKey` must be the route key name.
 
-.. note:: 
-
    The argument `activeRouteKey` may be a twig variable, defined elsewhere in your template, even in child templates.
 
-
-
-Create an entry in an existing menu
-===================================
+## Create an entry in an existing menu
 
 If a route belongs to a menu, you simply add this to his definition in routing.yml :
 
-.. code-block:: yaml
-
+```yaml
    chill_person_history_list:
        pattern: /person/{person_id}/history
        defaults: { _controller: ChillPersonBundle:History:list }
        options:
            #declare menus
-           menus: 
-               # the route should be in 'person' menu : 
+           menus:
+               # the route should be in the 'person' menu :
                person:
                    #and have those arguments :
                    order: 100
                    label: menu.person.history
+```
 
-* `order` (mandatory) : the order in the menu. It is preferrable to increment by far more than 1.
-* `label` (mandatory) : a translatable string. 
-* `helper` (optional) : a text to help people to understand what does the menu do. Not used in default implementation.
-* `condition` (optional) : an `Expression Language <http://symfony.com/doc/current/components/expression_language/index.html> `_ which will make the menu appears or not. Typically, it may be used to say "show this menu only if the person concerned is more than 18". **Not implemented yet**.
-* `access` (optional) : an Expression Language to evalute the possibility, for the user, to show this menu according to Access Control Model. **Not implemented yet.**
+* `order` (mandatory): the order in the menu. It is preferrable to increment by far more than 1.
+* `label` (mandatory): a translatable string.
+* `helper` (optional): a text to help people to understand what does the menu do. Not used in default implementation.
+* `condition` (optional): an `Expression Language <http://symfony.com/doc/current/components/expression_language/index.html> `_ which will make the menu appears or not. Typically, it may be used to say "show this menu only if the person concerned is more than 18". **Not implemented yet**.
+* `access` (optional): an Expression Language to evalute the possibility, for the user, to show this menu according to Access Control Model. **Not implemented yet.**
 
 You may add additional keys, but should not use the keys described above.
 
 You may add the same route to multiple menus :
 
-.. code-block:: yaml
-
+```yaml
    chill_person_history_list:
        pattern: /person/{person_id}/history
        defaults: { _controller: ChillPersonBundle:History:list }
        options:
-           menus: 
+           menus:
                menu1:
                    order: 100
                    label: menu.person.history
                menu2:
                    order: 100
                    label: another.label
+```
 
-
-
-Customize menu rendering
-========================
+## Customize menu rendering
 
 You may customize menu rendering by using the `layout` option.
 
-.. warning ::
-   
-   TODO : this part should be written.
 
+   TODO: this part should be written.
 
-
-
-
-
-.. _caveats :
-
-Caveats
-=======
+## Caveats
 
 Currently, you may pass arguments globally to each menu, and they will be all passed to route url. This means that :
 
-* the argument name in the route entry must match the argument key in menu declaration in twig template
+* the argument name in the route entry must match the argument key in the menu declaration in the twig template
 * if an argument is missing to generate an url, the url generator will throw a `Symfony\Component\Routing\Exception\MissingMandatoryParametersException`
 * if the argument name is not declared in route entry, it will be added to the url, (example: `/my/route?additional=foo`)
diff --git a/docs/source/development/messages-to-users.md b/docs/source/development/messages-to-users.md
new file mode 100644
index 000000000..dabbf1ae5
--- /dev/null
+++ b/docs/source/development/messages-to-users.md
@@ -0,0 +1,93 @@
+###### Messages to users, flashbags, and buttons
+
+## Flashbags
+
+The four following levels are defined :
+
++-----------+----------------------------------------------------------------------------------------------+
+|Key|Intent |
+|success|The user action succeeds.                                                                     |
+|notice|A simple message to give information to the user. The message may be linked or not linked with |
+||the user action.                                                                              |
+|error|The user's action failed: he must correct something to process the action.                    |
+
+We can use [TranslatableMessage` (and other `TranslatableMessageInterface` instances) into the controller:
+
+```php
+   // in a controller action:
+   if (($session = $request->getSession()) instanceof Session) {
+       $session->getFlashBag()->add(
+           'success',
+           new TranslatableMessage('saved_export.Saved export is saved!')
+       );
+   }
+```
+
+   `Flash Messages on Symfony documentation ](http://symfony.com/doc/current/book/controller.html#flash-messages)
+      Learn how to use flash messages in a controller.
+
+## Buttons
+
+Some actions are available to decorate ``a`` links and ``buttons``.
+
+To add the action on button, use them as class along with ``sc-button`` :
+
+   <a class="sc-button bt-create">Create an entity</a>
+
+   <button class="sc-button bt-submit" type="submit">Submit</button>
+
++-----------+----------------+------------------------------------------------------------------------------+
+| Action    |  Class         | Description                                                                  |
+| Submit    | ``bt-submit``  | Submit a form. Use only if the action is not "save."                             |
+| Create    | ``bt-create``  | - Link to a form to create an entity (alias: ``bt-new``)                     |
+|           | or ``bt-new``  | - Submitting this form will create a new entity                              |
+| Reset     | ``bt-reset``   | Reset a form                                                                 |
+| Delete    | ``bt-delete``  | - Link to a form to delete an entity                                         |
+|           |                | - Submitting this form will remove the entity                                |
+| Edit      | ``bt-edit`` or | Link to a form to edit an entity                                             |
+|           | ``bt-update``  |                                                                              |
+| Save      | ``bt-save``    | Submitting this form will save change on the entity                          |
+| Action    | ``bt-action``  | Generic link to an action                                                    |
+| Cancel    | ``bt-cancel``  | Cancel an action and go back to another page                                 |
+
+### Styling buttons
+
+Small buttons, mainly to use inline
+
+   `<p><a class="sc-button bt-create bt-small">You button</a></p>`
+
+You can omit content and show a button with an icon only :
+
+   `<a class="sc-button bt-create"></a>`
+
+You can hide content and show it only on hover
+
+   `<a class="sc-button bt-create has-hidden"><span class="show-on-hover">Showed when mouse pass on</span></a>`
+
+You can customize the icon :
+
+  `<a class="sc-button bt-create change-icon"><i class="fa fa-icon"></i>Button with custom icon</a>`
+
+### Grouping buttons
+
+Grouping buttons can be done using ``ul.record_actions`` element (an ``ul`` list with class ``record_actions``):
+
+```html
+   <ul class="record_actions">
+
+      <li class="cancel">
+         <a class="sc-button bt-cancel">Cancel</a>
+      <li>
+
+      <li>
+         <a class="sc-button bt-save">Save</a>
+      </li>
+
+   </ul>
+```
+
+The element with the ``cancel`` class will be set in first position.
+
+Inside the table, the space between elements will be shorter.
+
+You can add the class ``record_actions_small`` if you want shorter space between elements.
diff --git a/docs/source/development/messages-to-users.rst b/docs/source/development/messages-to-users.rst
deleted file mode 100644
index 244638d0b..000000000
--- a/docs/source/development/messages-to-users.rst
+++ /dev/null
@@ -1,136 +0,0 @@
-.. Copyright (C)  2014 Champs Libres Cooperative SCRLFS
-   Permission is granted to copy, distribute and/or modify this document
-   under the terms of the GNU Free Documentation License, Version 1.3
-   or any later version published by the Free Software Foundation;
-   with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-   A copy of the license is included in the section entitled "GNU
-   Free Documentation License".
-
-Messages to users, flashbags and buttons
-****************************************
-
-
-.. _flashbags :
-
-Flashbags
-==========
-
-The four following levels are defined :
-
-+-----------+----------------------------------------------------------------------------------------------+
-|Key        |Intent                                                                                        |
-+===========+==============================================================================================+
-|success    |The user action succeeds.                                                                     |
-+-----------+----------------------------------------------------------------------------------------------+
-|notice     |A simple message to give information to the user. The message may be linked or not linked with|
-|           |the user action.                                                                              |
-+-----------+----------------------------------------------------------------------------------------------+
-|error      |The user's action failed: he must correct something to process the action.                    |
-+-----------+----------------------------------------------------------------------------------------------+
-
-We can use :code:`TranslatableMessage` (and other :code:`TranslatableMessageInterface` instances) into the controller:
-
-.. code-block:: php
-
-   // in a controller action:
-   if (($session = $request->getSession()) instanceof Session) {
-       $session->getFlashBag()->add(
-           'success',
-           new TranslatableMessage('saved_export.Saved export is saved!')
-       );
-   }
-
-.. seealso::
-
-   `Flash Messages on Symfony documentation <http://symfony.com/doc/current/book/controller.html#flash-messages>`_
-      Learn how to use flash messages in controller.
-
-
-Buttons
-========
-
-Some actions are available to decorate ``a`` links and ``buttons``.
-
-To add the action on button, use them as class along with ``sc-button`` :
-
-.. code-block:: html
-
-   <a class="sc-button bt-create">Create an entity</a>
-
-   <button class="sc-button bt-submit" type="submit">Submit</button>
-
-+-----------+----------------+------------------------------------------------------------------------------+
-| Action    |  Class         | Description                                                                  |
-+===========+================+==============================================================================+
-| Submit    | ``bt-submit``  | Submit a form. Use only if action is not "save".                             |
-+-----------+----------------+------------------------------------------------------------------------------+
-| Create    | ``bt-create``  | - Link to a form to create an entity (alias: ``bt-new``)                     |
-|           | or ``bt-new``  | - Submitting this form will create a new entity                              |
-+-----------+----------------+------------------------------------------------------------------------------+
-| Reset     | ``bt-reset``   | Reset a form                                                                 |
-+-----------+----------------+------------------------------------------------------------------------------+
-| Delete    | ``bt-delete``  | - Link to a form to delete an entity                                         |
-|           |                | - Submitting this form will remove the entity                                |
-+-----------+----------------+------------------------------------------------------------------------------+
-| Edit      | ``bt-edit`` or | Link to a form to edit an entity                                             |
-|           | ``bt-update``  |                                                                              |
-+-----------+----------------+------------------------------------------------------------------------------+
-| Save      | ``bt-save``    | Submitting this form will save change on the entity                          |
-+-----------+----------------+------------------------------------------------------------------------------+
-| Action    | ``bt-action``  | Generic link to an action                                                    |
-+-----------+----------------+------------------------------------------------------------------------------+
-| Cancel    | ``bt-cancel``  | Cancel an action and go back to another page                                 |
-+-----------+----------------+------------------------------------------------------------------------------+
-
-Styling buttons
----------------
-
-Small buttons, mainly to use inline
-
-.. code-block:: html
-
-   <p><a class="sc-button bt-create bt-small">You button</a></p>
-
-You can omit content and show a button with an icon only :
-
-.. code-block:: html
-
-   <a class="sc-button bt-create"></a>
-
-You can hide content and show it only on hover
-
-.. code-block:: html
-
-   <a class="sc-button bt-create has-hidden"><span class="show-on-hover">Showed when mouse pass on</span></a>
-
-You can customize the icon :
-
-.. code-block:: html
-
-  <a class="sc-button bt-create change-icon"><i class="fa fa-icon"></i>Button with custom icon</a>
-
-Grouping buttons
-----------------
-
-Grouping buttons can be done using ``ul.record_actions`` element (an ``ul`` list with class ``record_actions``):
-
-.. code-block:: html
-
-   <ul class="record_actions">
-
-      <li class="cancel">
-         <a class="sc-button bt-cancel">Cancel</a>
-      <li>
-
-      <li>
-         <a class="sc-button bt-save">Save</a>
-      </li>
-
-   </ul>
-
-The element with the ``cancel`` class will be set in first position.
-
-Inside table, the space between elements will be shorter.
-
-You can add the class ``record_actions_small`` if you want shorter space between elements.
-
diff --git a/docs/source/development/migrations.md b/docs/source/development/migrations.md
new file mode 100644
index 000000000..83ce52c67
--- /dev/null
+++ b/docs/source/development/migrations.md
@@ -0,0 +1,70 @@
+###### Database Migrations
+
+Every bundle potentially brings his own database operations: to persist entities, developers have to create database schema, creating indexes,...
+
+Those schemas might be changed (the less is the better) from time to time.
+
+Consequence: each bundle should bring his own migration files, which will bring the database consistent with the operation you will run in your code. They will be gathered into the app installation, ready to be executed by the chill's installer.
+
+Currently, we use `doctrine migration`_ to manage those migration files. A `composer`_ script located in the **chill standard** component will copy the migrations from your bundle to the doctrne migration's excepted directory after each install and/or update operation.
+
+   The `doctrine migration`_ documentation
+      Learn concepts about migration files and scripts and the doctrine ORM
+
+   The `doctrine migration bundle`_ documentation
+      Learn about doctrine migration integration with a Symfony framework
+
+## Shipping migration files
+
+Migration files should be shipped under the Resource/migrations directory. You could customize the migration directory by adding extra information in your composer.json:
+
+```
+   "extra": {
+           "migration-source": "path/to/my/dir"
+       }
+```
+
+The class namespace should be `Application\Migrations`, as expected by doctrine migration. Only the files which will be executed by doctrine migration will be moved: they must have the pattern `VersionYYYYMMDDHHMMSS.php` where YYYY is the year, MM the month, DD the day, HH the hour, MM the month and SS the second of creation.
+
+They will be moved automatically by composer when you install or update a bundle.
+
+## Executing migration files
+
+The installers will have to execute migration files manually, running
+
+    `php app/console doctrine:migrations:status #will give the current status of the database`
+    `php app/console doctrine:migrations:migrate #process the update`
+
+## Updating migration files
+
+   After an installation, migration files will be executed and registered as executed in the database (the version timestamp is recorded into the :title:`migrations_versions` table). If you update your migration file code, the file will still be considered as "executed" by doctrine migration, which will not offers the possibility to run the migration again.
+
+   Consequently, updating a migration file should only be considered during the development phase and not published on public git branches. If you want to edit your database schema, you should create a new migration file, with a new timestamp, which will proceed to your schema adaptations.
+
+Every time a migration file is discovered, the composer script will check if the migration exists in the local migration directory. If yes, the script will compare two file for changes (using a md5 hash). If migrations are discovered, the script will ask the installer to know if he must replace the file or ignore it.
+
+   You can manually run a composer script by launching `composer run-script post-update-cmd` from your root chill installation's directory.
+
+## Tips for development
+
+### Migration and data
+
+Each time you create a migration script, you should ensure that it will not lead to data losing. Eventually, feel free to use intermediate steps.
+
+### Generation
+
+You can generate a migration file from the command line, using those commands:
+
+* `php app/console doctrine:migrations:diff` to generate a migration file by comparing your current database to your mapping information
+* `php app/console doctrine:migrations:generate` to generate a blank migration file.
+
+Those files will be located into `app/DoctrineMigrations` directory. You will have to copy those file to your the directory `Resources/migrations` into your bundle directory.
+
+### Comments and documentation
+
+As files are copied from your bundle to the `app/DoctrineMigrations` directory, the link between your bundle and the copied file will be unclear. Please add all relevant documentation which will allow future developers to make a link between your file and your bundle.
+
+### Inside the script
+
+The script that moves the migration files to app directory `might be found here
+<https://github.com/Champs-Libres/ComposerBundleMigration/blob/master/Composer/Migrations.php>
diff --git a/docs/source/development/migrations.rst b/docs/source/development/migrations.rst
deleted file mode 100644
index db4745bd3..000000000
--- a/docs/source/development/migrations.rst
+++ /dev/null
@@ -1,101 +0,0 @@
-.. Copyright (C)  2014 Champs Libres Cooperative SCRLFS
-   Permission is granted to copy, distribute and/or modify this document
-   under the terms of the GNU Free Documentation License, Version 1.3
-   or any later version published by the Free Software Foundation;
-   with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-   A copy of the license is included in the section entitled "GNU
-   Free Documentation License".
-
-Database Migrations
-********************
-
-Every bundle potentially brings his own database operations : to persist entities, developers have to create database schema, creating indexes,... 
-
-Those schema might be changed (the less is the better) from time to time.
-
-Consequence: each bundle should bring his own migration files, which will bring the database consistent with the operation you will run in your code. They will be gathered into the app installation, ready to be executed by the chill's installer. 
-
-Currently, we use `doctrine migration`_ to manage those migration files. A `composer`_ script located in the **chill standard** component will copy the migrations from your bundle to the doctrne migration's excepted directory after each install and/or update operation.
-
-.. seealso::
-
-   The `doctrine migration`_ documentation
-      Learn concepts about migrations files and scripts and the doctrine ORM
-
-   The `doctrine migration bundle`_ documentation
-      Learn about doctrine migration integration with Symfony framework
-
-Shipping migration files
-========================
-
-Migrations files should be shipped under the Resource/migrations directory. You could customize the migration directory by adding extra information in your composer.json: 
-
-.. code-block:: json
-
-   "extra": {
-           "migration-source": "path/to/my/dir"
-       }
-
-The class namespace should be `Application\Migrations`, as expected by doctrine migration. Only the files which will be executed by doctrine migration will be moved: they must have the pattern `VersionYYYYMMDDHHMMSS.php` where YYYY is the year, MM the month, DD the day, HH the hour, MM the month and SS the second of creation.
-
-They will be moved automatically by composer when you install or update a bundle.
-
-Executing migration files
-==========================
-
-The installers will have to execute migrations files manually, running 
-
-.. code-block:: bash
-
-   php app/console doctrine:migrations:status #will give the current status of the database
-   php app/console doctrine:migrations:migrate #process the update
-
-
-Updating migration files
-=========================
-
-.. warning::
-
-   After an installation, migration files will be executed and registered as executed in the database (the version timestamp is recorded into the :title:`migrations_versions` table). If you update your migration file code, the file will still be considered as "executed" by doctrine migration, which will not offers the possibility to run the migration again.
-
-   Consequently, updating migration file should only be considered during development phase, and not published on public git branches. If you want to edit your database schema, you should create a new migration file, with a new timestamp, which will proceed to your schema adaptations.
-
-Every time a migration file is discovered, the composer'script will check if the migration exists in the local migration directory. If yes, the script will compare two file for changes (using a md5 hash). If migrations are discovered, the script will ask the installer to know if he must replace the file or ignore it.
-
-.. note::
-
-   You can manually run composer script by launching `composer run-script post-update-cmd` from your root chill installation's directory.
-
-
-.. _doctrine migration: http://www.doctrine-project.org/projects/migrations.html
-.. _doctrine migration bundle : http://symfony.com/doc/master/bundles/DoctrineMigrationsBundle/index.html
-.. _composer : https://getcomposer.org
-
-Tips for development
-====================
-
-Migration and data 
-------------------
-
-Each time you create a migration script, you should ensure that it will not lead to data losing. Eventually, feel free to use intermediate steps.
-
-Generation
-----------
-
-You can generate migration file from the command line, using those commands: 
-
-* `php app/console doctrine:migrations:diff` to generate a migration file by comparing your current database to your mapping information
-* `php app/console doctrine:migrations:generate` to generate a blank migration file.
-
-Those files will be located into `app/DoctrineMigrations` directory. You will have to copy those file to your the directory `Resources/migrations` into your bundle directory.
-
-Comments and documentation
---------------------------
-
-As files are copied from your bundle to the `app/DoctrineMigrations` directory, the link between your bundle and the copied file will be unclear. Please add all relevant documentation which will allow future developers to make a link between your file and your bundle.
-
-Inside the script
------------------
-
-The script which move the migrations files to app directory `might be found here 
-<https://github.com/Champs-Libres/ComposerBundleMigration/blob/master/Composer/Migrations.php>
diff --git a/docs/source/development/pagination.md b/docs/source/development/pagination.md
new file mode 100644
index 000000000..720678ccc
--- /dev/null
+++ b/docs/source/development/pagination.md
@@ -0,0 +1,153 @@
+# Pagination
+
+The Bundle `Chill\MainBundle` provides a **Pagination** api which allow you to easily divide result list on different pages.
+
+###### A simple example
+
+In the controller, get the `Chill\Main\Pagination\PaginatorFactory` from the `Container` and use this `PaginatorFactory` to create a `Paginator` instance.
+
+```php
+
+Then, render the pagination using the dedicated twig function.
+
+   {% extends "@ChillPerson/Person/layout.html.twig"  %}
+
+   {% block title 'Item list'|trans %}
+
+   {% block content %}
+
+   <table>
+
+   {# ... your items here... #}
+
+   </table>
+
+   {% if items|length < paginator.getTotalItems %}
+   {{ chill_pagination(paginator) }}
+   {% endif %}
+```
+
+The function `chill_pagination` will, by default, render a link to the 10 previous page (if they exists) and the 10 next pages (if they exists). Assuming that we are on page 5, the function will render a list to ::
+
+   Previous 1 2 3 4 **5** 6 7 8 9 10 11 12 13 14 Next
+
+## Understanding the magic
+
+### Where does the `$paginator` get the page number ?
+
+Internally, the `$paginator` object has a link to the `Request` object, and it reads the `page` parameter which contains the current page number. If this parameter is not present, the `$paginator` assumes that we are on page 1.
+
+   The `$paginator` get the current page from the request.
+
+### Where does the `$paginator` get the number of items per page ?
+
+As above, the `$paginator` can get the number of items per page from the `Request`. If none is provided, this is given by the configuration which is, by default, 50 items per page.
+
+###### `PaginatorFactory`, `Paginator` and `Page`
+
+## `PaginatorFactory`
+
+The `PaginatorFactory` may create more than one `Paginator` in a single action. Those `Paginator` instance may redirect to different routes and/or routes parameters.
+
+   // create a paginator for the route 'my_route' with some parameters (arg1 and arg2)
+    `$paginatorMyRoute = $paginatorFactory->create($total, 'my_route', array('arg1' => 'foo', 'arg2' => $bar);`
+Those parameters will override the current parameters.
+
+The `PaginatorFactory` has also some useful shortcuts :
+
+   // get current page number
+    `$paginatorFactory->getCurrentPageNumber()`
+   // get the number of items per page **for the current request**
+   `$paginatorFactory->getCurrentItemsPerPage()`
+   // get the number of the first item **for the current page**
+   `$paginatorFactory->getCurrentPageFirstItemNumber()`
+
+## Working with `Paginator` and `Page`
+
+The paginator has a function to give the number of pages that are required to display all the results and give some information about the number of items per page :
+
+   // how many page count this paginator ?
+   `$paginator->countPages(); // return 20 in our example`
+
+   // we may get the number of items per page
+   `$paginator->getItemsPerPage(); // return 20 in our example`
+
+A `Paginator` instance create instance of `Page`, each `Page`, which is responsible for generating the URL to the page number it represents. Here are some possibilities using `Page` and `Paginator` :
+
+   Get the current page
+   `$page = $paginator->getCurrentPage();`
+   On which page are we?
+   `$page->getNumber(); // return 5 in this example (we are on page 5)`
+   Generate the url for page 5
+   `$page->generateUrl(); // return '/<your route here>?page=5`
+   What is the first item number on this page ?
+   `$page->getFistItemNumber(); // return 101 in our example (20 items per page)`
+   What is the last item number on this page?
+   `$page->getLastItemNumber(); // return 120 in our example`
+
+   We can access directly the next and current page
+```
+if ($paginator->hasNextPage()) {
+       $next = $paginator->getNextPage();
+   }
+   if ($paginator->hasPreviousPage()) {
+       $previous = $paginator->getPreviousPage();
+   }
+```
+
+   We can access directly to a given page number
+```
+   $page10 = $paginator->getPage(10);``
+   if ($paginator->hasPage(10)) {
+      $page10 = $paginator->getPage(10);
+   }
+```
+
+   We can iterate over our pages through a generator
+```
+   foreach ($paginator->getPagesGenerator() as $page) {
+      $page->getNumber();
+   }
+```
+
+   Check that a page object is the current page
+
+   `$paginator->isCurrentPage($page); // return false`
+
+   When calling a page which does not exist, the [Paginator` will throw a `RuntimeException`. Example :
+
+    Our last page is 10
+
+    `$paginator->getPage(99); // out of range => throw RuntimeException`
+
+    Our current page is 1 (the first page)
+    `$paginator->getPreviousPage; // does not exists (the fist page is always 1) => throw RuntimeException`
+
+   When you create a `Paginator` for the current route and route parameters, the `Page` instances will keep the same parameters and routes :
+
+```php
+    // assuming our route is 'my_route', for the pattern '/my/{foo}/route',
+    // and the current route is '/my/value/route?arg2=bar'
+```
+
+Create a paginator for the current route and route parameters :
+      `$paginator = $paginatorFactory->create($total);`
+
+Get the next page
+```
+if ($paginator->hasNext()) {
+         $next = $paginator->getNextPage();
+
+         // get the route to the page
+         $page->generateUrl(); // will print 'my/value/route?arg2=bar&page=2'
+      }
+```
+Having a look at the `full classes' documentation may provide some [ useful information ](http://api.chill.social/Chill-Main/master/namespace-Chill.MainBundle.Pagination.html).
+
+###### Customizing the rendering of twig's [chill_pagination`
+
+You can provide your own layout for rendering the pagination: provides your twig template as a second argument :
+
+   {{ chill_pagination(paginator, 'MyBundle:Pagination:MyTemplate.html.twig') }}
+
+The template will receive the `$paginator` as `paginator` variable. Let's have a look `at the [ current template ](https://framagit.org/Chill-project/Chill-Main/blob/master/Resources/views/Pagination/long.html.twig).
diff --git a/docs/source/development/pagination.rst b/docs/source/development/pagination.rst
deleted file mode 100644
index a9df72805..000000000
--- a/docs/source/development/pagination.rst
+++ /dev/null
@@ -1,191 +0,0 @@
-.. Copyright (C)  2016 Champs Libres Cooperative SCRLFS
-   Permission is granted to copy, distribute and/or modify this document
-   under the terms of the GNU Free Documentation License, Version 1.3
-   or any later version published by the Free Software Foundation;
-   with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-   A copy of the license is included in the section entitled "GNU
-   Free Documentation License".
-
-
-.. _pagination-ref:
-
-Pagination
-##########
-
-The Bundle :code:`Chill\MainBundle` provides a **Pagination** api which allow you to easily divide results list on different pages.
-
-A simple example
-****************
-
-In the controller, get the :code:`Chill\Main\Pagination\PaginatorFactory` from the `Container` and use this :code:`PaginatorFactory` to create a :code:`Paginator` instance.
-
-
-.. literalinclude:: pagination/example.php
-   :language: php
-
-
-Then, render the pagination using the dedicated twig function.
-
-.. code-block:: html+twig
-
-   {% extends "@ChillPerson/Person/layout.html.twig"  %}
-
-   {% block title 'Item list'|trans %}
-
-   {% block content %}
-
-   <table>
-
-   {# ... your items here... #}
-
-   </table>
-
-   {% if items|length < paginator.getTotalItems %}
-   {{ chill_pagination(paginator) }}
-   {% endif %}
-
-
-The function :code:`chill_pagination` will, by default, render a link to the 10 previous page (if they exists) and the 10 next pages (if they exists). Assuming that we are on page 5, the function will render a list to ::
-
-   Previous 1 2 3 4 **5** 6 7 8 9 10 11 12 13 14 Next
-
-Understanding the magic
-=======================
-
-Where does the :code:`$paginator` get the page number ?
--------------------------------------------------------
-
-Internally, the :code:`$paginator` object has a link to the :code:`Request` object, and it reads the :code:`page` parameter which contains the current page number. If this parameter is not present, the :code:`$paginator` assumes that we are on page 1.
-
-.. figure:: /_static/puml/pagination-sequence.png
-
-   The :code:`$paginator` get the current page from the request.
-
-Where does the :code:`$paginator` get the number of items per page ?
---------------------------------------------------------------------
-
-As above, the :code:`$paginator` can get the number of items per page from the :code:`Request`. If none is provided, this is given by the configuration which is, by default, 50 items per page.
-
-:code:`PaginatorFactory`, :code:`Paginator` and :code:`Page`
-************************************************************
-
-:code:`PaginatorFactory`
-========================
-
-The :code:`PaginatorFactory` may create more than one :code:`Paginator` in a single action. Those :code:`Paginator` instance may redirect to different routes and/or routes parameters.
-
-.. code-block:: php
-
-   // create a paginator for the route 'my_route' with some parameters (arg1 and arg2)
-   $paginatorMyRoute = $paginatorFactory->create($total, 'my_route', array('arg1' => 'foo', 'arg2' => $bar);
-
-Those parameters will override the current parameters.
-
-The :code:`PaginatorFactory` has also some useful shortcuts : 
-
-.. code-block:: php
-
-   // get current page number
-   $paginatorFactory->getCurrentPageNumber( )
-   // get the number of items per page **for the current request**
-   $paginatorFactory->getCurrentItemsPerPage( )
-   // get the number of the first item **for the current page**
-   $paginatorFactory->getCurrentPageFirstItemNumber( )
-
-
-Working with :code:`Paginator` and :code:`Page`
-===============================================
-
-The paginator has some function to give the number of pages are required to displayed all the results, and give some information about the number of items per page :
-
-.. code-block:: php
-
-   // how many page count this paginator ?
-   $paginator->countPages(); // return 20 in our example
-
-   // we may get the number of items per page
-   $paginator->getItemsPerPage(); // return 20 in our example
-
-A :code:`Paginator` instance create instance of :code:`Page`, each :code:`Page`, which is responsible for generating the URL to the page number it represents. Here are some possibilities using :code:`Page` and :code:`Paginator` :
-
-.. code-block:: php
-
-   // get the current page
-   $page = $paginator->getCurrentPage();
-   // on which page are we ?
-   $page->getNumber(); // return 5 in this example (we are on page 5)
-   // generate the url for page 5
-   $page->generateUrl(); // return '/<your route here>?page=5
-   // what is the first item number on this page ?
-   $page->getFistItemNumber(); // return 101 in our example (20 items per page)
-   // what is the last item number on this page ?
-   $page->getLastItemNumber(); // return 120 in our example
-
-   // we can access directly the next and current page
-   if ($paginator->hasNextPage()) {
-       $next = $paginator->getNextPage();
-   }
-   if ($paginator->hasPreviousPage()) {
-       $previous = $paginator->getPreviousPage();
-   }
-
-   // we can access directly to a given page number
-   if ($paginator->hasPage(10)) {
-      $page10 = $paginator->getPage(10);
-   }
-
-   // we can iterate over our pages through a generator
-   foreach ($paginator->getPagesGenerator() as $page) {
-      $page->getNumber();
-   }
-
-   // check that a page object is the current page
-   $paginator->isCurrentPage($page); // return false
-
-.. warning:: 
-
-   When calling a page which does not exists, the :code:`Paginator` will throw a `RuntimeException`. Example :
-
-   .. code-block:: php
-
-      // our last page is 10
-      $paginator->getPage(99); // out of range => throw `RuntimeException`
-
-      // our current page is 1 (the first page)
-      $paginator->getPreviousPage; // does not exists (the fist page is always 1) => throw `RuntimeException`
-
-.. note::
-
-   When you create a :code:`Paginator` for the current route and route parameters, the :code:`Page` instances will keep the same parameters and routes :
-
-   .. code-block:: php
-
-      // assuming our route is 'my_route', for the pattern '/my/{foo}/route', 
-      // and the current route is '/my/value/route?arg2=bar'
-
-      // create a paginator for the current route and route parameters :
-      $paginator = $paginatorFactory->create($total);
-
-      // get the next page
-      if ($paginator->hasNext()) {
-         $next = $paginator->getNextPage();
-
-         // get the route to the page
-         $page->generateUrl(); // will print 'my/value/route?arg2=bar&page=2'
-      }
-
-
-Having a look to the `full classes documentation may provide some useful information <http://api.chill.social/Chill-Main/master/namespace-Chill.MainBundle.Pagination.html>`_.
-
-
-Customizing the rendering of twig's :code:`chill_pagination`
-************************************************************
-
-You can provide your own layout for rendering the pagination: provides your twig template as a second argument :
-
-.. code-block:: html+jinja
-
-   {{ chill_pagination(paginator, 'MyBundle:Pagination:MyTemplate.html.twig') }}
-
-The template will receive the :code:`$paginator` as :code:`paginator` variable. Let's have a look `at the current template <https://framagit.org/Chill-project/Chill-Main/blob/master/Resources/views/Pagination/long.html.twig>`_.
-
diff --git a/docs/source/development/render-entity.rst b/docs/source/development/render-entity.md
similarity index 61%
rename from docs/source/development/render-entity.rst
rename to docs/source/development/render-entity.md
index bfc579682..d1a4dad01 100644
--- a/docs/source/development/render-entity.rst
+++ b/docs/source/development/render-entity.md
@@ -1,36 +1,28 @@
-
-Rendering entity automatically
-##############################
+# Rendering entity automatically
 
 Some entity need to be rendered automatically for a couple of times: a person, a user, ...
 
 One can use some twig filter to render those entities:
 
-.. code-block:: twig
-
    {{ person|chill_entity_render_box }}
 
-Define a renderer
-=================
+## Define a renderer
 
-By default, the object passed through the renderer will be rendered using the :code:`__toString()` method. To customize this behaviour, you have to define a service and tag it using :code:`chill.render_entity`.
+By default, the object passed through the renderer will be rendered using the `__toString()` method. To customize this behaviour, you have to define a service and tag it using `chill.render_entity`.
 
 The rendered is implemented using :class:`Chill\MainBundle\Templating\Entity\ChillEntityRenderInterface`. This interface has 3 methods:
 
-* :code:`public function supports($entity, array $options): bool`: return true if the :code:`$entity` given in parameter, with custom options, is supported by this renderer;
-* :code:`public function renderString($entity, array $options): string`: render the entity as a single string, for instance in a select list;
-* :code:`public function renderBox($entity, array $options): string`: render the entity in an html box.
+* `public function supports($entity, array $options): bool`: return true if the `$entity` given in parameter, with custom options, is supported by this renderer;
+* `public function renderString($entity, array $options): string`: render the entity as a single string, for instance in a select list;
+* `public function renderBox($entity, array $options): string`: render the entity in a HTML box.
 
-.. warning::
+   The HTML returned by `renderBox` **MUST BE SAFE** of any XSS injection.
 
-   The HTML returned by :code:`renderBox` **MUST BE SAFE** of any XSS injection.
-
-:class:`Chill\MainBundle\Templating\Entity\AbstractChillEntityRender` provides some useful methods to get the opening and closing boxes that should be used.
+`Chill\MainBundle\Templating\Entity\AbstractChillEntityRender` provides some useful methods to get the opening and closing boxes that should be used.
 
 Usage about rendering comment:
 
-.. code-block:: php
-
+```php
    namespace Chill\MainBundle\Templating\Entity;
 
    use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
@@ -108,47 +100,41 @@ Usage about rendering comment:
            return $entity instanceof CommentEmbeddable;
        }
    }
+```
 
 Logic inside the template:
 
-.. code-block:: twig
-
+```twig
+   {# @var opening_box: string #}
+   {# @var closing_box: string #}
    {{ opening_box|raw }}
    <div>
       {# logic for rendering #}
-   </div> 
+   </div>
    {{ closing_box|raw }}
+```
 
-Usage in templates
-==================
+## Usage in templates
 
-For rendering entity as a box:
+For rendering an entity as a box:
 
-.. code-block:: twig
+   `{{ entity|chill_entity_render_box }}`
 
-   {{ entity|chill_entity_render_box }}
+For rendering an entity as a string:
 
-For rendering entity as a string:
+   `{{ entity|chill_entity_render_string }}`
 
-.. code-block:: twig
+## Available renderer and options
 
-   {{ entity|chill_entity_render_string }}
-
-Available renderer and options
-==============================
-
-:code:`Person` (Person Bundle)
-------------------------------
+### `Person` (Person Bundle)
 
 * no options
 
-:code:`CommentEmbeddable` (Main Bundle)
----------------------------------------
+### `CommentEmbeddable` (Main Bundle)
 
-Options:
-
-* :code:`user`: options which will be passed to "user" renderer
-* :code:`disable_markdown`: disable markdown renderer, default to :code:`FALSE`
-* :code:`limit_lines` (integer) limit the number of lines. Default to :code:`NULL`. May be an integer.
-* :code:`metadata` (boolean): show the last updating user and last updating date. Default to :code:`TRUE`.
+Options :
 
+* `user`: options, which will be passed to "user" renderer
+* `disable_markdown`: disable markdown renderer, default to `FALSE`
+* `limit_lines` (integer) limit the number of lines. Default to `NULL`. Can be an integer.
+* `metadata` (boolean): show the last updating user and last updating date. Default to `TRUE`.
diff --git a/docs/source/development/routing.rst b/docs/source/development/routing.md
similarity index 52%
rename from docs/source/development/routing.rst
rename to docs/source/development/routing.md
index 519490918..2d635d039 100644
--- a/docs/source/development/routing.rst
+++ b/docs/source/development/routing.md
@@ -1,40 +1,26 @@
-.. Copyright (C)  2014 Champs Libres Cooperative SCRLFS
-   Permission is granted to copy, distribute and/or modify this document
-   under the terms of the GNU Free Documentation License, Version 1.3
-   or any later version published by the Free Software Foundation;
-   with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-   A copy of the license is included in the section entitled "GNU
-   Free Documentation License".
+# Routing
 
+Our goal is to ease the installation of the different bundles. Users should not have to dive into complicated config files to install bundles.
 
-Routing
-#######
+## A routing loader is available for all bundles
 
-Our goal is to ease the installation of the different bundle. Users should not have to dive into complicated config files to install bundles.
-
-A routing loader available for all bundles
-===========================================
-
-A Chill bundle may rely on the Routing Loader defined in ChillMain. 
+A Chill bundle may rely on the Routing Loader defined in ChillMain.
 
 The loader will load `yml` or `xml` files. You simply have to add them into `chill_main` config
 
-.. code-block:: yaml
-
+```yaml
    chill_main:
    # ... other stuff here
       routing:
          resources:
             - @ChillMyBundle/Resources/config/routing.yml
+```
 
-Load routes automatically
--------------------------
+### Load routes automatically
 
-But this force users to modify config files. To avoid this, you may prepend config implementing the `PrependExtensionInterface` in the `YourBundleExtension` class. This is an example from **chill main** bundle : 
-
-
-.. code-block:: php
+But this forces users to modify config files. To avoid this, you may prepend config implementing the `PrependExtensionInterface` in the `YourBundleExtension` class. This is an example from **chill main** bundle :
 
+```php
    namespace Chill\MainBundle\DependencyInjection;
 
    use Symfony\Component\DependencyInjection\ContainerBuilder;
@@ -49,7 +35,7 @@ But this force users to modify config files. To avoid this, you may prepend conf
            // ...
        }
 
-       public function prepend(ContainerBuilder $container) 
+       public function prepend(ContainerBuilder $container)
        {
 
            //add current route to chill main
@@ -64,5 +50,4 @@ But this force users to modify config files. To avoid this, you may prepend conf
            ));
        }
    }
-
-
+```
diff --git a/docs/source/development/run-tests.md b/docs/source/development/run-tests.md
new file mode 100644
index 000000000..4c2ee7e16
--- /dev/null
+++ b/docs/source/development/run-tests.md
@@ -0,0 +1,58 @@
+Permission is granted to copy, distribute and/or modify this document
+   under the terms of the GNU Free Documentation License, Version 1.3
+   or any later version published by the Free Software Foundation;
+   with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+   A copy of the license is included in the section entitled "GNU
+   Free Documentation License".
+
+###### Run tests
+
+In reason of the Chill architecture, test should be runnable from the bundle's directory and works correctly: this will allow continuous integration tools to run tests automatically.
+
+## From chill app
+
+This is the most convenient method for developer: run test for chill bundle from the main app.
+
+```bash
+   # run into a container
+   `docker-compose exec --user $(id -u) php bash`
+   # execute all tests suites
+   `bin/phpunit`
+   # ... or execute a single test
+   `bin/phpunit vendor/chill-project/chill-bundles/src/Bundle/ChillMainBundle/Tests/path/to/FileTest.php`
+```
+
+You can also run tests in a single command:
+
+   `docker-compose exec --user $(id -u) php bin/phpunit`
+
+### Tests from a bundle (chill-bundles)
+
+Those tests need the whole symfony app to execute Application Tests (which test html page).
+
+For ease, the app is cloned using a `git submodule`, which clone the main app into `tests/app`, and tests are bootstrapped to this app. The dependencies are also installed into `tests/app/vendor` to ensure compliance with relative path from this symfony application.
+
+You may boostrap the tests for the chill bundle this way:
+
+```bash
+   # ensure to be located into the environment (provided by docker suits well)
+   `docker-compose exec --user $(id -u) php bash`
+   # go to chill subdirectory
+   `cd vendor/chill-project/chill-bundles`
+   # install submodule
+   `git submodule init`
+   `git submodule update`
+   # install composer and dependencies
+   `curl -sS https://getcomposer.org/installer | php`
+   # run tests
+   `bin/phpunit`
+```
+
+   If you are on a fresh installation, you will need to migrate database schema.
+
+   The path to the console tool must be adapted to the app. To load migration and add fixtures, one can execute the following commands:
+
+```bash
+    tests/app/bin/console doctrine:migrations:migrate
+    tests/app/bin/console doctrine:fixtures:load
+```
diff --git a/docs/source/development/run-tests.rst b/docs/source/development/run-tests.rst
deleted file mode 100644
index 1dd944e58..000000000
--- a/docs/source/development/run-tests.rst
+++ /dev/null
@@ -1,68 +0,0 @@
-.. Copyright (C)  2014 Champs Libres Cooperative SCRLFS
-   Permission is granted to copy, distribute and/or modify this document
-   under the terms of the GNU Free Documentation License, Version 1.3
-   or any later version published by the Free Software Foundation;
-   with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-   A copy of the license is included in the section entitled "GNU
-   Free Documentation License".
-
-Run tests
-*********
-
-In reason of the Chill architecture, test should be runnable from the bundle's directory and works correctly: this will allow continuous integration tools to run tests automatically. 
-
-From chill app
-==============
-
-This is the most convenient method for developer: run test for chill bundle from the main app.
-
-.. code-block:: bash
-
-   # run into a container
-   docker-compose exec --user $(id -u) php bash
-   # execute all tests suites
-   bin/phpunit
-   # .. or execute a single test
-   bin/phpunit vendor/chill-project/chill-bundles/src/Bundle/ChillMainBundle/Tests/path/to/FileTest.php
-
-You can also run tests in a single command:
-
-.. code-block:: bash
-
-   docker-compose exec --user $(id -u) php bin/phpunit
-
-
-Tests from a bundle (chill-bundles)
------------------------------------
-
-Those tests needs the whole symfony app to execute Application Tests (which test html page).
-
-For ease, the app is cloned using a :code:`git submodule`, which clone the main app into :code:`tests/app`, and tests are bootstrapped to this app. The dependencies are also installed into `tests/app/vendor` to ensure compliance with relative path from this symfony application.
-
-You may boostrap the tests fro the chill bundle this way:
-
-.. code-block:: bash
-
-   # ensure to be located into the environement (provided by docker suits well)
-   docker-compose exec --user $(id -u) php bash
-   # go to chill subdirectory
-   cd vendor/chill-project/chill-bundles
-   # install submodule
-   git submodule init
-   git submodule update
-   # install composer and dependencies
-   curl -sS https://getcomposer.org/installer | php
-   # run tests
-   bin/phpunit
-
-.. note::
-
-   If you are on a fresh install, you will need to migrate database schema. 
-
-   The path to console tool must be adapted to the app. To load migration and add fixtures, one can execute the following commands:
-
-   .. code-block:: bash
-      
-      tests/app/bin/console doctrine:migrations:migrate
-      tests/app/bin/console doctrine:fixtures:load
-
diff --git a/docs/source/development/searching.md b/docs/source/development/searching.md
new file mode 100644
index 000000000..d1e9d8dd3
--- /dev/null
+++ b/docs/source/development/searching.md
@@ -0,0 +1,222 @@
+###### Searching
+
+Chill should provide information needed by users when they need it. Searching within bundle, entities, ... is an important feature to achieve this goal.
+
+The Main Bundle provides interfaces to ease the developer's work. It will also attempt that search will work in the same way accross bundles.
+
+   :local:
+
+   [Our blog post about searching (in French) ](http://blog.champs-libres.coop/vie-des-champs/2015/01/06/va-chercher-chill-la-recherche-dans-chill-logiciel-libre-service-social.html)
+      This blog post gives some information for end-users about searching.
+
+   [The issue about search behaviour ](https://redmine.champs-libres.coop/issues/377)
+      Where the search behavior is defined.
+
+## Searching at a glance for developers
+
+Chill suggests using an easy-to-learn language search.
+
+   We are planning to provide a form to create an automatic search pattern according to this language. Watch the [issue regarding this feature ](https://redmine.champs-libres.coop/issues/389).
+
+The language is an association of search terms. Search terms may contain :
+
+- **a domain**: this is "the domain you want to search": it may some entities like people, reports, ... Example: [@person` to search accross people, `@report` to browse reports, ... The search pattern may have **a maximum of one** domain by search, providing more should throw an error, and trigger a warning for users.
+- **arguments and their values** : This is "what you search." Arguments narrow the search to specific fields: username, date of birth, nationality, ... The syntax is `argument:value`. I.e.: ` birthdate:2014-12-15`, `firstname:Depardieu`, ... **Arguments are optional**. If the value of an argument contains spaces or characters like punctuation, quotes ("), the value should be provided between parenthesis : `firstname:(Van de snoeck)`, `firstname:(M'bola)`, ...
+- **default value** : this the "rest" of the search, not linked with any arguments or domain. Example : `@person dep` (`dep` is the "default value"), or simply `dep` if any domain is provided (which is perfectly acceptable). If a string is not idenfied as argument or domain, it will be present in the "default" term.
+
+If a search pattern (provided by the user) does not contain any domain, the search must be run across default domain/search modules.
+
+A domain may be supported by different search modules. For instance, if you provide the domain `@person`, the end-user may receive results of exact firstname/lastname, but also result with spelling suggestion, ... **But** if results do not fit into the first page (if you have 75 results and the screen show only 50 results), the next page should contains only the results from the required module.
+
+For instance: a user searches across people by firstname/lastname, the exact spelling contains 10 results, the "spelling suggestion" results contain 75 names, but show only the first 50. If the user want to see the last 25, the next screen should not contains the results by firstname/lastname.
+
+## Allowed characters as arguments
+
+To execute regular expression, the allowed characters in arguments are a-z characters, numbers, and the sign '-'. Spaces and special characters like accents are note allowed (the accents are removed during parsing).
+
+## Special characters and uppercase
+
+The search should not care about lowercase/uppercase and accented characters. Currently, they are removed automatically by the `chill.main.search_provider`.
+
+## Implementing a search module for dev
+
+To implement a search module, you should :
+
+- create a class which implements the `Chill\MainBundle\Search\SearchInterface` class. An abstract class `Chill\MainBundle\Search\AbstractSearch` will provide useful assertions for parsing date string to `DateTime` objects, ...
+- register the class as a service, and tag the service with `chill.search` and an appropriate alias
+
+The search logic is provided under the  `/search` route.
+
+   `The implementation of a search module in the Person bundle ](https://github.com/Chill-project/Person/blob/master/Search/PersonSearch.php)
+      An example of implementation https://github.com/Chill-project/Main/blob/master/DependencyInjection/SearchableServicesCompilerPass.php
+
+   **Internals explained** : the services tagged with [chill.search` are gathered into the `chill.main.search_provider` service during compilation (`see the compiler pass ](https://github.com/Chill-project/Main/blob/master/DependencyInjection/SearchableServicesCompilerPass.php)).
+
+   The [chill.main.search_provider` service allows to :
+
+   - retrieve all results (as HTML string) for all search modules concerned by the search (according to the domain provided or modules marked as default)
+   - retrieve result for one search module
+
+### The SearchInterface class
+
+```php
+   namespace Chill\PersonBundle\Search;
+
+   use Chill\MainBundle\Search\AbstractSearch;
+   use Doctrine\ORM\EntityManagerInterface;
+   use Chill\PersonBundle\Entity\Person;
+   use Symfony\Component\DependencyInjection\ContainerInterface;
+   use Symfony\Component\DependencyInjection\ContainerAware;
+   use Symfony\Component\DependencyInjection\ContainerAwareTrait;
+   use Chill\MainBundle\Search\ParsingException;
+
+   class PersonSearch extends AbstractSearch
+   {
+
+       // indicate which domain you support
+       // you may respond TRUE to multiple domain, according to your logic
+       public function supports($domain, $format='html')
+       {
+           return 'person' === $domain;
+       }
+
+       // if your domain must be called when no domain is provided, should return true
+       public function isActiveByDefault()
+       {
+           return true;
+       }
+
+       // if multiple modules respond to the same domain, indicate an order for your search.
+       public function getOrder()
+       {
+           return 100;
+       }
+
+       // This is where your search logic should be executed.
+       // This method must return an HTML string (a string with HTML tags)
+       // see below about the structure of the $term array
+       public function renderResult(array $terms, $start = 0, $limit = 50, array $options = array(), $format = 'html')
+       {
+           return $this->container->get('templating')->render('ChillPersonBundle:Person:list.html.twig',
+                   array(
+                       // you should implement the `search` function somewhere :-)
+                       'persons' => $this->search($terms, $start, $limit, $options),
+                       // recomposePattern is available in AbstractSearch class
+                       'pattern' => $this->recomposePattern($terms, array('nationality',
+                           'firstname', 'lastname', 'birthdate', 'gender'), $terms['_domain']),
+                       // you should implement the `count` function somewhere :-)
+                       'total' => $this->count($terms)
+                   ));
+       }
+   }
+```
+
+##### Values for `$options`
+
+`$options` is an array with the following keys:
+
+- `SearchInterface::SEARCH_PREVIEW_OPTION` (bool): if the current view is a preview (the first 5 results) or not ;
+- `SearchInterface::REQUEST_QUERY_PARAMETERS` (bool): some parameters added to the query (under the key `SearchInterface::REQUEST_QUERY_KEY_ADD_PARAMETERS`) and that can be interpreted. Used, for instance, when calling a result in json format when searching for interactive picker form.
+
+##### Structure of array `$term`
+
+The array term is parsed automatically by the `main.chill.search_provider` service.
+
+   If you need to parse a search pattern, you may use the function `parse($pattern)` provided by the service.
+
+The array `$term` have the following structure after parsing :
+
+```php
+   array(
+      '_domain' => 'person', //the domain, without the '@'
+      'argument1' => 'value', //the argument1, with his value
+      'argument2' => 'my value with spaces', //the argument2
+      '_default' => 'abcde ef' // the default term
+   );
+```
+
+The original search would have been : `@person argument1:value argument2:(my value with spaces) abcde ef`
+
+   The search values are always unaccented.
+
+##### Returning a result in JSON
+
+The JSON format is mainly used by "select2" widgets.
+
+When returning a result in JSON, the SearchInterface should only return an array with following keys:
+
+- `more` (bool): if the search has more result than the current page ;
+- `results` (array): a list of a result, where:
+
+    - `text` (string): the text that should be displayed in browser ;
+    - `id` (string): the id of the entity.
+
+### Register the service
+
+You should add your service in the configuration, and add a `chill.search` tag and an alias.
+
+Example :
+
+```yaml
+   services:
+      chill.person.search_person:
+         class: Chill\PersonBundle\Search\PersonSearch
+         #your logic here
+         tags:
+            - { name: chill.search, alias: 'person_regular' }
+```
+
+The alias will be used to get the results narrowed to this search module, in case of pagination (see above).
+
+## Parsing date
+
+The class `Chill\MainBundle\Search\AbstractSearch` provides a method to parse date :
+
+   //from subclasses
+   `$date = $this->parseDate($string);`
+
+`$date` will be an instance of `DateTime ](http://php.net/manual/en/class.datetime.php).
+
+   [The possibility to add periods instead of date ](https://redmine.champs-libres.coop/issues/390)
+       Which may be a future improvement for search with date.
+
+## Exceptions
+
+The logic of the search is handled by the controller for the `/search` path.
+
+You should throw those Exceptions from your instance of `SearchInterface` if needed :
+
+Chill\MainBundle\Search\ParsingException
+   If the terms do not fit your search logic (for instance, conflicting terms)
+
+## Expected behaviour
+
+### Operators between multiple terms
+
+Multiple terms should be considered are "AND" instructions :
+
+@person nationality:RU firstname:dep
+   the people having the Russian nationality AND having DEP in their name
+
+@person birthdate:2015-12-12 charles
+   the people having 'charles' in their name or firstname AND born on December 12, 2015
+
+### Spaces in default
+
+Spaces in default terms should be considered as "AND" instruction
+
+@person charle dep
+   people have "dep" AND "charles" in their firstname or lastname. Match "Charles Depardieu" but not "Gérard Depardieu" ('charle' is not present)
+
+### Rendering
+
+The rendering should contain :
+
+- the total number of results ;
+- the search pattern in the search language. The aim of this is to let users learn the search language easily.
+- a title
+
+## Frequently Asked Questions (FAQ)
+
+Why does renderResults return an HTML string and not a structured array?
+   It seems that the form of results may vary (according to access-right logic, ...) and is not easily structurable
diff --git a/docs/source/development/searching.rst b/docs/source/development/searching.rst
deleted file mode 100644
index 023d16a6e..000000000
--- a/docs/source/development/searching.rst
+++ /dev/null
@@ -1,276 +0,0 @@
-.. Copyright (C)  2014 Champs Libres Cooperative SCRLFS
-   Permission is granted to copy, distribute and/or modify this document
-   under the terms of the GNU Free Documentation License, Version 1.3
-   or any later version published by the Free Software Foundation;
-   with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-   A copy of the license is included in the section entitled "GNU
-   Free Documentation License".
-
-
-Searching
-*********
-
-Chill should provide information needed by users when they need it. Searching within bundle, entities,... is an important feature to achieve this goal.
-
-The Main Bundle provide interfaces to ease the developer work. It will also attempt that search will work in the same way accross bundles.
-
-.. contents:: Table of content
-   :local:
-
-.. seealso::
-
-   `Our blog post about searching (in French) <http://blog.champs-libres.coop/vie-des-champs/2015/01/06/va-chercher-chill-la-recherche-dans-chill-logiciel-libre-service-social.html>`_
-      This blog post give some information for end-users about searching.
-
-   `The issue about search behaviour <https://redmine.champs-libres.coop/issues/377>`_
-      Where the search behaviour is defined.
-
-Searching in a glance for developers
-====================================
-
-Chill suggests to use an easy-to-learn language search.
-
-.. note::
-
-   We are planning to provide a form to create automatically search pattern according to this language. Watch the `issue regarding this feature <https://redmine.champs-libres.coop/issues/389>`_.
-
-The language is an association of search terms. Search terms may contains : 
-
-- **a domain**: this is "the domain you want to search" : it may some entities like people, reports, ... Example : `@person` to search accross people, `@report` to browse reports, ... The search pattern may have **a maximum of one** domain by search, providing more should throw an error, and trigger a warning for users.
-- **arguments and their values** : This is "what you search". Arguments narrow the search to specific fields : username, date of birth, nationality, ... The syntax is `argument:value`. I.e.: ` birthdate:2014-12-15`, `firstname:Depardieu`, ... **Arguments are optional**. If the value of an argument contains spaces or characters like punctuation, quotes ("), the value should be provided between parenthesis : `firstname:(Van de snoeck)`, `firstname:(M'bola)`, ...
-- **default value** : this the "rest" of the search, not linked with any arguments or domain. Example : `@person dep` (`dep` is the "default value"), or simply `dep` if any domain is provided (which is perfectly acceptable). If a string is not idenfied as argument or domain, it will be present in the "default" term.
-
-If a search pattern (provided by the user) does not contains any domain, the search must be run across default domain/search modules.
-
-A domain may be supported by different search modules. For instance, if you provide the domain `@person`, the end-user may receive results of exact firstname/lastname, but also result with spelling suggestion, ... **But** if results do not fit into the first page (if you have 75 results and the screen show only 50 results), the next page should contains only the results from the required module. 
-
-For instance : a user search across people by firstname/lastname, the exact spelling contains 10 results, the "spelling suggestion" results contains 75 names, but show only the first 50. If the user want to see the last 25, the next screen should not contains the results by firstname/lastname.
-
-Allowed characters as arguments
-===============================
-
-In order to execute regular expression, the allowed chararcters in arguments are a-z characters, numbers, and the sign '-'. Spaces and special characters like accents are note allowed (the accents are removed during parsing).
-
-Special characters and uppercase
-================================
-
-The search should not care about lowercase/uppercase and accentued characters. Currently, they are removed automatically by the `chill.main.search_provider`.
-
-Implementing search module for dev
-===================================
-
-To implement a search module, you should : 
-
-- create a class which implements the `Chill\MainBundle\Search\SearchInterface` class. An abstract class `Chill\MainBundle\Search\AbstractSearch` will provide useful assertions for parsing date string to `DateTime` objects, ...
-- register the class as a service, and tag the service with `chill.search` and an appropriate alias
-
-The search logic is provided under the  `/search` route.
-
-.. seealso::
-
-   `The implementation of a search module in Person bundle <https://github.com/Chill-project/Person/blob/master/Search/PersonSearch.php>`_
-      An example of implementationhttps://github.com/Chill-project/Main/blob/master/DependencyInjection/SearchableServicesCompilerPass.php
-
-.. note::
-
-   **Internals explained** : the services tagged with `chill.search` are gathered into the `chill.main.search_provider` service during compilation (`see the compiler pass <https://github.com/Chill-project/Main/blob/master/DependencyInjection/SearchableServicesCompilerPass.php>`_). 
-
-   The `chill.main.search_provider` service allow to : 
-  
-   - retrieve all results (as html string) for all search module concerned by the search (according to the domain provided or modules marked as default)
-   - retrieve result for one search module
-
-The SearchInterface class
--------------------------
-
-.. code-block:: php
-
-   namespace Chill\PersonBundle\Search;
-
-   use Chill\MainBundle\Search\AbstractSearch;
-   use Doctrine\ORM\EntityManagerInterface;
-   use Chill\PersonBundle\Entity\Person;
-   use Symfony\Component\DependencyInjection\ContainerInterface;
-   use Symfony\Component\DependencyInjection\ContainerAware;
-   use Symfony\Component\DependencyInjection\ContainerAwareTrait;
-   use Chill\MainBundle\Search\ParsingException;
-
-   class PersonSearch extends AbstractSearch
-   {
-
-       // indicate which domain you support
-       // you may respond TRUE to multiple domain, according to your logic
-       public function supports($domain, $format='html')
-       {
-           return 'person' === $domain;
-       }
-
-       // if your domain must be called when no domain is provided, should return true
-       public function isActiveByDefault()
-       {
-           return true;
-       }
-       
-       // if multiple module respond to the same domain, indicate an order for your search.
-       public function getOrder()
-       {
-           return 100;
-       }
-
-
-       // This is where your search logic should be executed. 
-       // This method must return an HTML string (a string with HTML tags)
-       // see below about the structure of the $term array
-       public function renderResult(array $terms, $start = 0, $limit = 50, array $options = array(), $format = 'html')
-       {  
-           return $this->container->get('templating')->render('ChillPersonBundle:Person:list.html.twig', 
-                   array( 
-                       // you should implements the `search` function somewhere :-)
-                       'persons' => $this->search($terms, $start, $limit, $options),
-                       // recomposePattern is available in AbstractSearch class
-                       'pattern' => $this->recomposePattern($terms, array('nationality',
-                           'firstname', 'lastname', 'birthdate', 'gender'), $terms['_domain']),
-                       // you should implement the `count` function somewhere :-)
-                       'total' => $this->count($terms)
-                   ));
-       }
-   }
-
-
-Values for :code:`$options`
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-:code:`$options` is an array with the following keys: 
-
-- :code:`SearchInterface::SEARCH_PREVIEW_OPTION` (bool): if the current view is a preview (the first 5 results) or not ;
-- :code:`SearchInterface::REQUEST_QUERY_PARAMETERS` (bool): some parameters added to the query (under the key :code:`SearchInterface::REQUEST_QUERY_KEY_ADD_PARAMETERS`) and that can be interpreted. Used, for instance, when calling a result in json format when searching for interactive picker form.
-
-
-
-
-Structure of array `$term`
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The array term is parsed automatically by the `main.chill.search_provider` service. 
-
-.. note::
-   If you need to parse a search pattern, you may use the function `parse($pattern)` provided by the service.
-
-The array `$term` have the following structure after parsing :
-
-.. code-block:: php
-
-   array(
-      '_domain' => 'person', //the domain, without the '@'
-      'argument1' => 'value', //the argument1, with his value
-      'argument2' => 'my value with spaces', //the argument2
-      '_default' => 'abcde ef' // the default term
-   );
-
-The original search would have been : `@person argument1:value argument2:(my value with spaces) abcde ef`
-
-.. warning::
-   The search values are always unaccented.
-
-Returning a result in json
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The json format is mainly used by "select2" widgets.
-
-When returning a result in json, the SearchInterface should only return an array with following keys:
-
-- :code:`more` (bool): if the search has more result than the current page ;
-- :code:`results` (array): a list of result, where: 
-
-    - :code:`text` (string): the text that should be displayed in browser ;
-    - :code:`id` (string): the id of the entity.
-
-
-
-Register the service
---------------------
-
-You should add your service in the configuration, and add a `chill.search` tag and an alias.
-
-Example : 
-
-.. code-block:: yaml
-
-   services:
-      chill.person.search_person:
-         class: Chill\PersonBundle\Search\PersonSearch
-         #your logic here
-         tags:
-            - { name: chill.search, alias: 'person_regular' }
-
-The alias will be used to get the results narrowed to this search module, in case of pagination (see above).
-
-Parsing date
-============
-
-The class `Chill\MainBundle\Search\AbstractSearch` provides a method to parse date :
-
-.. code-block:: php
-
-   //from subclasses
-   $date = $this->parseDate($string);
-
-`$date` will be an instance of `DateTime <http://php.net/manual/en/class.datetime.php>`_.
-
-.. seealso::
-
-   `The possibility to add periods instead of date <https://redmine.champs-libres.coop/issues/390>`_
-       Which may be a future improvement for search with date.
-
-Exceptions
-==========
-
-The logic of the search is handled by the controller for the `/search` path. 
-
-You should throw those Exception from your instance of `SearchInterface` if needed : 
-
-Chill\MainBundle\Search\ParsingException
-   If the terms does not fit your search logic (for instance, conflicting terms)
-
-Expected behaviour
-==================
-
-Operators between multiple terms
---------------------------------
-
-Multiple terms should be considered are "AND" instructions :
-
-@person nationality:RU firstname:dep 
-   the people having the Russian nationality AND having DEP in their name
-
-@person birthdate:2015-12-12 charles 
-   the people having 'charles' in their name or firstname AND born on December 12 2015
-
-Spaces in default
------------------
-
-Spaces in default terms should be considered as "AND" instruction
-
-@person charle dep 
-   people having "dep" AND "charles" in their firstname or lastname. Match "Charles Depardieu" but not "Gérard Depardieu" ('charle' is not present)
-
-Rendering
----------
-
-The rendering should contains :
-
-- the total number of results ;
-- the search pattern in the search language. The aim of this is to let users learn the search language easily.
-- a title
-
-Frequently Asked Questions (FAQ)
-================================
-
-Why renderResults returns an HTML string and not structured array ?
-   It seems that the form of results may vary (according to access-right logic, ...) and is not easily structurable
-
-
-
-
-
-
diff --git a/docs/source/development/timelines.rst b/docs/source/development/timelines.md
similarity index 76%
rename from docs/source/development/timelines.rst
rename to docs/source/development/timelines.md
index 51c0a1bad..c5dea7432 100644
--- a/docs/source/development/timelines.rst
+++ b/docs/source/development/timelines.md
@@ -1,49 +1,31 @@
-.. Copyright (C)  2015 Champs Libres Cooperative SCRLFS
-   Permission is granted to copy, distribute and/or modify this document
-   under the terms of the GNU Free Documentation License, Version 1.3
-   or any later version published by the Free Software Foundation;
-   with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-   A copy of the license is included in the section entitled "GNU
-   Free Documentation License".
+###### Timelines
 
-.. _timelines:
-
-Timelines
-*********
-
-.. contents:: Table of content
     :local:
 
-Concept
-=======
+## Concept
 
-From an user point of view
---------------------------
+### From a user point of view
 
-Chill has two objectives :
+Chill has two goals :
 
-* make the administrative tasks more lightweight ;
+* it makes the administrative tasks more lightweight ;
 * help social workers to have all information they need to work
 
-To reach this second objective, Chill provides a special view: **timeline**. On a timeline view, information is gathered and shown on a single page, from the most recent event to the oldest one.
+To reach this second goal, Chill provides a special view: **timeline**. On a timeline view, information is gathered and shown on a single page, from the most recent event to the oldest one.
 
 The information gathered is linked to a *context*. This *context* may be, for instance :
 
-* a person : events linked to this person are shown on the page ;
+* a person: events linked to this person are shown on the page ;
 * a center: events linked to a center are shown. They may concern different peoples ;
 * ...
 
-In other word, the *context* is the kind of argument that will be used in the event's query.
+In another word, the *context* is the kind of argument that will be used in the event's query.
 
 Let us recall that only the data the user has allowed to see should be shown.
 
-.. seealso::
+   [The issue where the subject was first discussed ](https://redmine.champs-libres.coop/issues/224)
 
-   `The issue where the subject was first discussed <https://redmine.champs-libres.coop/issues/224>`_
-
-
-For developers
---------------
+### For developers
 
 The `Main` bundle provides interfaces and services to help to build timelines.
 
@@ -51,45 +33,38 @@ If a bundle wants to *push* information in a timeline, it should be create a ser
 
 If a bundle wants to provide a new context for a timeline, the service `chill.main.timeline_builder` will helps to gather timeline's services supporting the defined context, and run queries across the models.
 
-.. _understanding-queries :
-
-Understanding queries
-^^^^^^^^^^^^^^^^^^^^^
+##### Understanding queries
 
 Due to the fact that timelines should show only the X last events from Y differents tables, queries for a timeline may consume a lot of resources: at first on the database, and then on the ORM part, which will have to deserialize DB data to PHP classes, which may not be used if they are not part of the "last X events".
 
-To avoid such load on database, the objects are queried in two steps :
+To avoid such a load on a database, the objects are queried in two steps :
 
-1. An UNION request which gather the last X events, ordered by date. The data retrieved are the ID, the date, and a string key: a type. This type discriminates the data type.
-2. The PHP objects are queried by ID, the type helps the program to link id with the kind of objects.
+1. A UNION request that gathers the last X events, ordered by date. The data retrieved are the ID, the date, and a string key: a type. This type discriminates the data type.
+2. ID queries the PHP objects, the type helps the program to link id with the kind of objects.
 
-Those methods should ensure that only X PHP objects will be gathered and build by the ORM.
+Those methods should ensure that only X PHP objects will be gathered and built by the ORM.
 
-What does the master timeline builder service ?
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+##### What does the master timeline builder service?
 
  When the service `chill.main.timeline_builder` is instanciated, the service is informed of each service taggued with `chill.timeline` tags. Then,
 
 1. The service build an UNION query by assembling column and tables names provided by the `fetchQuery` result ;
-2. The UNION query is run, the result contains an id and a type for each row (see :ref:`above <understanding-queries>`)
+2. The UNION query is run, the result contains an id and a type for each row (see [above ](understanding-queries.md))
 3. The master service gather all id with the same type. Then he searches for the `chill.timeline`'s service which will be able to get the entities. Then, the entities will be fetched using the `fetchEntities` function. All entities are gathered in one query ;
 4. The information to render entities in HTML is gathered by passing entity, one by one, on `getEntityTemplate` function.
 
-Pushing events to a timeline
-=============================
+## Pushing events to a timeline
 
 To push events on a timeline :
 
 1. Create a class which implements `Chill\MainBundle\Timeline\TimelineProviderInterface` ;
 2. Define the class as a service, and tag the service with `chill.timeline`, and define the context associated with this timeline (you may add multiple tags for different contexts).
 
-Implementing the TimelineProviderInterface
-------------------------------------------
+### Implementing the TimelineProviderInterface
 
 The has the following signature :
 
-.. code-block:: php
-
+```php
     namespace Chill\MainBundle\Timeline;
 
     interface TimelineProviderInterface
@@ -135,7 +110,6 @@ The has the following signature :
          * - `template` : the template FQDN
          * - `template_data`: the data required by the template
          *
-         *
          * Example:
          *
          * ```
@@ -160,51 +134,42 @@ The has the following signature :
         public function getEntityTemplate($entity, $context, array $args);
 
     }
+```
 
+##### The `fetchQuery` function
 
-The `fetchQuery` function
-^^^^^^^^^^^^^^^^^^^^^^^^^
-
-The fetchQuery function help to build the UNION query to gather events. This function should return an instance of :code:`TimelineSingleQuery`. For you convenience, this object may be build using an associative array with the following keys:
+The fetchQuery function helps to build the UNION query to gather events. This function should return an instance of `TimelineSingleQuery`. For you convenience, this object may be build using an associative array with the following keys:
 
 * `id` : the name of the id column
 * `type`: a string to indicate the type
 * `date`: the name of the datetime column, used to order entities by date
-* `FROM`: the FROM clause. May contains JOIN instructions
+* `FROM`: the FROM clause. May contain JOIN instructions
 * `WHERE`: the WHERE clause;
 * `parameters`: the parameters to pass to the query
 
-The parameters should be replaced into the query by :code:`?`. They will be replaced into the query using prepared statements.
+The parameters should be replaced into the query by `?`. They will be replaced into the query using prepared statements.
 
 `$context` and `$args` are defined by the bundle which will call the timeline rendering. You may use them to build a different query depending on this context.
 
 For instance, if the context is `'person'`, the args will be this array :
 
-.. code-block:: php
-
     array(
         'person' => $person //a \Chill\PersonBundle\Entity\Person entity
     );
 
-For the context :code:`center`, the args will be:
-
-.. code-block:: php
+For the context `center`, the args will be:
 
     array(
         'centers' => [ ]  // an array of \Chill\MainBundle\Entity\Center entities
     );
 
-
 You should find in the bundle documentation which contexts are arguments the bundle defines.
 
-.. note::
-
     We encourage to use `ClassMetaData` to define column names arguments. If you change your column names, changes will be reflected automatically during the execution of your code.
 
 Example of an implementation :
 
-.. code-block:: php
-
+```php
     namespace Chill\ReportBundle\Timeline;
 
     use Chill\MainBundle\Timeline\TimelineProviderInterface;
@@ -250,19 +215,16 @@ Example of an implementation :
 
         //....
 
-
     }
+```
 
-The `supportsType` function
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+##### The `supportsType` function
 
-This function indicate to the master `chill.main.timeline_builder` service (which orchestrate the build of UNION queries) that the service supports the type indicated in the result's array of the `fetchQuery` function.
+This function indicates to the master `chill.main.timeline_builder` service (which orchestrate the build of UNION queries) that the service supports the type indicated in the result's array of the `fetchQuery` function.
 
 The implementation of our previous example will be :
 
-.. code-block:: php
-
-
+```php
     namespace Chill\ReportBundle\Timeline;
 
     use Chill\MainBundle\Timeline\TimelineProviderInterface;
@@ -284,16 +246,15 @@ The implementation of our previous example will be :
 
         //...
     }
+```
 
-The `getEntities` function
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
+##### The `getEntities` function
 
 This is where the service must fetch entities from database and return them to the master service.
 
 The results **must be** an array where the id given by the UNION query (remember `fetchQuery`).
 
-.. code-block:: php
-
+```php
     namespace Chill\ReportBundle\Timeline;
 
     use Chill\MainBundle\Timeline\TimelineProviderInterface;
@@ -316,9 +277,9 @@ The results **must be** an array where the id given by the UNION query (remember
         }
 
     }
+```
 
-The `getEntityTemplate` function
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+##### The `getEntityTemplate` function
 
 This is where the master service will collect information to render the entity.
 
@@ -329,8 +290,7 @@ The result must be an associative array with :
 
 Example :
 
-.. code-block:: php
-
+```php
     array(
         'template' => 'ChillMyBundle:timeline:template.html.twig',
         'template_data' => array(
@@ -338,23 +298,19 @@ Example :
             'person' => $args['person']
             )
         );
+```
 
-The template must, obviously, exists. Example :
-
-.. code-block:: jinja
+The template must exist. Example :
 
     <p><i class="fa fa-folder-open"></i>&nbsp;{{ 'An accompanying period is opened for %person% on %date%'|trans({'%person%': person, '%date%': period.dateOpening|localizeddate('long', 'none') } ) }}</p>
 
-
-Create a timeline with his own context
-======================================
+## Create a timeline with his own context
 
 You have to create a Controller which will execute the service `chill.main.timeline_builder`. Using the `Chill\MainBundle\Timeline\TimelineBuilder::getTimelineHTML` function, you will get an HTML representation of the timeline, which you may include with twig `raw` filter.
 
 Example :
 
-.. code-block:: php
-
+```php
     namespace Chill\PersonBundle\Controller;
 
     use Symfony\Component\HttpFoundation\Response;
@@ -384,3 +340,4 @@ Example :
         }
 
     }
+```
diff --git a/docs/source/development/useful-snippets.rst b/docs/source/development/useful-snippets.md
similarity index 69%
rename from docs/source/development/useful-snippets.rst
rename to docs/source/development/useful-snippets.md
index 98d07a1d1..0fa9edb7d 100644
--- a/docs/source/development/useful-snippets.rst
+++ b/docs/source/development/useful-snippets.md
@@ -1,26 +1,17 @@
+# Useful snippets
 
+###### Dependency Injection
 
-
-
-Useful snippets
-###############
-
-Dependency Injection
-********************
-
-Configure route automatically
-=============================
+## Configure route automatically
 
 Add the route for the current bundle automatically on the main app.
 
-.. code-block:: php
-
+```php
     namespace Chill\MyBundle\DependencyInjection;
 
     use Symfony\Component\DependencyInjection\ContainerBuilder;
     use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
 
-
     class ChillMyExtension extends Extension implements PrependExtensionInterface
     {
         // ...
@@ -30,8 +21,8 @@ Add the route for the current bundle automatically on the main app.
             $this->prependRoutes($container);
 
         }
-            
-        public function prependRoutes(ContainerBuilder $container) 
+
+        public function prependRoutes(ContainerBuilder $container)
         {
             //add routes for custom bundle
              $container->prependExtensionConfig('chill_main', array(
@@ -42,32 +33,26 @@ Add the route for the current bundle automatically on the main app.
                )
             ));
         }
+```
 
+###### Security
 
-Security
-********
-
-Get the circles a user can reach
-================================
-
-.. code-block:: php
+## Get the circles a user can reach
 
+```php
    use Symfony\Component\Security\Core\Role\Role;
 
    $authorizationHelper = $this->get('chill.main.security.authorization.helper');
    $circles = $authorizationHelper
        ->getReachableCircles(
              $this->getUser(), # from a controller
-             new Role('CHILL_ROLE'), 
-             $center 
+             new Role('CHILL_ROLE'),
+             $center
        );
+```
 
+###### Controller
 
-Controller
-**********
+## Secured controller for person
 
-Secured controller for person
-=============================
-
-.. literalinclude:: useful-snippets/controller-secured-for-person.php
-   :language: php
+   [controller](useful-snippets/controller-secured-for-person.php)
diff --git a/docs/source/development/user-interface/css-classes.md b/docs/source/development/user-interface/css-classes.md
new file mode 100644
index 000000000..9ed5064a0
--- /dev/null
+++ b/docs/source/development/user-interface/css-classes.md
@@ -0,0 +1,63 @@
+Permission is granted to copy, distribute and/or modify this document
+   under the terms of the GNU Free Documentation License, Version 1.3
+   or any later version published by the Free Software Foundation;
+   with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+   A copy of the license is included in the section entitled "GNU
+   Free Documentation License".
+
+# CSS classes and mixins
+
+The stylesheet are based on the framework [ScratchCSS ](https://github.com/Champs-Libres/ScratchCSS).
+
+We added some useful classes and mixins for the Chill usage.
+
+###### CSS Classes
+
+## Statement "empty data"
+
+CSS Selector
+   `.chill-no-data-statement`
+In which case will you use this selector ?
+   When a list is empty, and a message fill the list to inform that the data is empty
+Example usage
+   ```jinja
+   <span class="chill-no-data-statement">{{ 'No reason associated'|trans }}</span>
+   ```
+
+## Quotation of user text
+
+CSS Selector
+   `blockquote.chill-user-quote`
+In which case will you use this selector ?
+   When you quote text that were filled by the user in a form.
+Example usage
+   ```jinja
+   <blockquote class="chill-user-quote">{{ entity.remark|nl2br }}</blockquote>
+   ```
+
+## Boxes
+
+CSS Selector
+   `chill__box`
+In which case will you use this selector ?
+   When displaying some data in a nice box
+Example usage
+   ```html
+   <span class="chill__box green">A nice box with green background</span>
+   <span class="chill__box red">A nice box with red background</span>
+   ```
+
+###### Mixins
+
+## Entity decorator
+
+Mixin
+   `@mixin entity($background-color, $color: white)`
+In which case including this mixin ?
+   When you create a `sticker`, a sort of label to represent a text in a way that the user can associate immediatly with a certain type of class / entity.
+Example usage
+   ```sass
+      span.entity.entity-activity.activity-reason {
+          @include entity($chill-pink, white);
+      }
+```
diff --git a/docs/source/development/user-interface/js-functions.md b/docs/source/development/user-interface/js-functions.md
new file mode 100644
index 000000000..88cb52d67
--- /dev/null
+++ b/docs/source/development/user-interface/js-functions.md
@@ -0,0 +1,234 @@
+Permission is granted to copy, distribute and/or modify this document
+   under the terms of the GNU Free Documentation License, Version 1.3
+   or any later version published by the Free Software Foundation;
+   with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+   A copy of the license is included in the section entitled "GNU
+   Free Documentation License".
+
+# Javascript functions
+
+Some function may be useful to manipulate elements on the page.
+
+###### Show-hide elements according to a form state
+
+The module ``ShowHide`` will allow you to show/hide part of your page using a specific test.
+
+This must be use inside a javascript module.
+
+## Usage
+
+In this module, the module will listen to all input given in the ``container_from`` div, and will show or hide the content of the ``container_target`` according to the result of the ``test`` function.
+
+		<div id="container_from">
+			{{ form_row(form.accompagnementRQTHDate) }}
+		</div>
+		
+		<div id="container_target">
+			{{ form_row(form.accompagnementComment) }}
+		</div>
+
+    import { ShowHide } from 'ShowHide/show_hide.js';
+
+    var 
+        from = document.getElementById("container_from"),
+        target = document.getElementById("container_target")
+        ;
+
+    new ShowHide({
+        froms: [from], // the value of from should be an iterable
+        container: [target], // the value of container should be an iterable
+        test: function(froms, event) {
+            // iterate over each element of froms
+            for (let f of froms.values()) {
+                // get all input inside froms
+                for (let input of f.querySelectorAll('input').values()) {
+                    if (input.value === 'autre') {
+                        return input.checked;
+                    }
+                }
+            }
+
+            return false;
+        }
+    });
+
+Once instantiated, the class ``ShowHide`` will:
+
+1. get all input from each element inside the ``froms`` values
+2. attach an event listener (by default, ``change``) to each input inside each entry in ``froms``
+3. each time the event is fired, launch the function ``test``
+4. show the element in the container given in ``container``, if the result of ``test`` is true, or hide them otherwise.
+
+The test is also launched when the page is loaded.
+
+## Show/hide while the user enter data: using the ``input`` event
+
+One can force to use another event on the input elements, instead of the default ``'change'`` event. 
+
+For achieving this, use the `event_name` option.
+
+    new ShowHide({
+        froms: froms,
+        test: test_function,
+        container: containers ,
+        // using this option, we use the event `input` instead of `change`
+        event_name: 'input'
+    });
+
+### Examples
+
+   :language: javascript
+
+## Using Show/Hide in collections forms
+
+Using show / hide in collection forms implies: 
+
+* to launch show/hide manually for each entry when the page is loaded ; 
+* to catch when an entry is added to the form ;
+
+As the show/hide is started manually and not on page load, we add the option ``load_event: null`` to the options: 
+
+   new ShowHide({
+     load_event: null,
+     froms: [ from ],
+     container: [ container ],
+     test: my_test_function
+   });
+
+   When using ``load_event: null`` inside the options, the value of event will be ``null`` as second argument for the test function.
+
+   ```javascript
+      my_test_function(froms, event) {
+          // event will be null on first launch
+      }
+```
+
+Example usage: here, we would like to catch for element inside a CV form, where the user may add multiple formation entries.
+
+   import { ShowHide } from 'ShowHide/show_hide.js';
+
+   // we factorize the creation of show hide element in this function.
+   var make_show_hide = function(entry) {
+       let
+           obtained = entry.querySelector('[data-diploma-obtained]'),
+           reconnue = entry.querySelector('[data-diploma-reconnue]')
+       ;
+       new ShowHide({
+           load_event: null,
+           froms: [ obtained ],
+           container: [ reconnue ],
+           test: my_test_function
+       });
+   };
+
+   // this code is fired when an entry is added on the page
+   window.addEventListener('collection-add-entry', function(e) {
+       // if the form contains multiple collection, we filter them here:
+       if (e.detail.collection.dataset.collectionName === 'formations') {
+           make_show_hide(e.detail.entry);
+       }
+   });
+
+   // on page load, we create a show/hide 
+   window.addEventListener('load', function(_e) {
+       let
+           formations = document.querySelectorAll('[data-formation-entry]')
+           ;
+
+       for (let f of formations.values()) {
+           make_show_hide(f);
+       }
+   });
+
+## Handling encapsulated show/hide elements
+
+This module allow to handle encapsulated show/hide elements. For instance :
+
+* in a first checkbox list, a second checkbox list is shown if some element is checked ;
+* in this second checkbox list, a third input is shown if some element is checked inside the second checkbox list.
+
+As a consequence, if the given element in the first checkbox list is unchecked, the third input must also be hidden.
+
+Example: when a situation professionnelle is ``en activite``, the second element ``type contrat`` must be shown if ``en_activite`` is checked. Inside ``type_contrat``, ``type_contrat_aide`` should be shown when ``contrat_aide`` is checked.
+
+        <div id="situation_prof">
+            <input type="radio" name="situationProfessionnelle" value="" checked="checked" />
+            <input type="radio" name="situationProfessionnelle" value="sans_emploi" />
+            <input type="radio" name="situationProfessionnelle" value="en_activite" />
+        </div>
+        
+        
+        <div id="type_contrat">
+            <input type="checkbox" name="typeContrat[]" value="cdd" /> 
+            <input type="checkbox" name="typeContrat[]" value="cdi" />
+            <input type="checkbox" name="typeContrat[]" value="contrat_aide" />
+        </div>
+        
+        <div id="type_contrat_aide">
+            <input type="text" name="typeContratAide" />
+        </div>
+
+The JS code will be:
+
+   import { ShowHide } from 'ShowHide/show_hide.js';
+   // we search for the element within the DOM
+   // NOTE: all the elements should be searched before instanciating the showHides. 
+   // if not, the elements **may** have disappeared from the DOM
+
+   var
+       situation_prof = document.getElementById('situation_prof'),
+       type_contrat = document.getElementById('type_contrat'),
+       type_contrat_aide = document.getElementById('type_contrat_aide'),
+       ;
+
+   // the first show/hide will apply on situation_prof
+   new ShowHide({
+       // the id will help us to keep a track of the element
+       id: 'situation_prof_type_contrat',
+       froms: [situation_prof],
+       container: [type_contrat],
+       test: function(froms) {
+           for (let f of froms.values()) {
+               for (let input of f.querySelectorAll('input').values()) {
+                   if (input.value === 'en_activite') {
+                       return input.checked;
+                   }
+               }
+           }
+           
+           return false;
+       }
+   });
+
+   // the show/hide will apply on "contrat aide"
+   var show_hide_contrat_aide = new ShowHide({
+       froms: [type_contrat],
+       container: [type_contrat_aide],
+       test: function(froms) {
+           for (let f of froms.values()) {
+               for (let input of f.querySelectorAll('input').values()) {
+                   if (input.value === 'contrat_aide') {
+                       return input.checked;
+                   }
+               }
+           }
+           
+           return false;
+       }
+   });
+
+   // we handle here the case when the first show-hide is changed: the third input must also disappears
+   window.addEventListener('show-hide-hide', function (e) {
+       if (e.detail.id = 'situation_prof_type_contrat') {
+           // we force the 3rd element to disappears
+           show_hide_contrat_aide.forceHide();
+       }
+   });
+
+   // when the first show-hide is changed, it makes appears the second one.
+   // we check here that the second show-hide is processed.
+   window.addEventListener('show-hide-show', function (e) {
+       if (e.detail.id = 'situation_prof_type_contrat') {
+           show_hide_contrat_aide.forceCompute();
+       }
+   });
\ No newline at end of file
diff --git a/docs/source/development/user-interface/layout-template-usage.md b/docs/source/development/user-interface/layout-template-usage.md
new file mode 100644
index 000000000..385833850
--- /dev/null
+++ b/docs/source/development/user-interface/layout-template-usage.md
@@ -0,0 +1,196 @@
+Permission is granted to copy, distribute and/or modify this document
+   under the terms of the GNU Free Documentation License, Version 1.3
+   or any later version published by the Free Software Foundation;
+   with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+   A copy of the license is included in the section entitled "GNU
+   Free Documentation License".
+
+# Layout / Template usage
+
+We recommand the use of the existing layouts to ensure the consistency of the design. This section explains the different templates and how to use it.
+
+The layouts are twig templates.
+
+## Twig templating helper
+
+### `chill_print_or_message`
+
+Print a value or use a default template if the value is empty.
+
+The template can be customized.
+
+Two default templates are registered:
+
+- `default`, do not decorate the value ;
+- `blockquote`: wrap the value into a blockquote if exists
+
+  {{ "This is a message"|chill_print_or_message("No message") }}
+  <!-- will print "This is a message" -->
+
+  {{ ""|chill_print_or_message("No message")}}
+  <!-- will print <span class="chill-no-data-statement">No message</span> -->
+
+  {{ "This is a comment\n with multiples lines"|chill_print_or_message("No comment", 'blockquote') }}
+  <!-- will print <blockquote class="chill-user-quote">This is a comment<br/>with multiples lines</blockquote> -->
+
+When customizing the template, two arguments are passed to the template:
+
+- `value`: the actual value ;
+- `message`: the message, given as argument
+
+### Routing with return path
+
+Three twig function are available for creating routes and handling "return path".
+
+**Rationale**: When building a "CRUD" (CReate, Update, Delete of an entity), you would like to allow people to go back on some custom cancel page when coming for another place of an application. For instance, if you are in the timeline and show an activity, you would like that the user go back to the timeline when pressing the "return" button at the bottom of the page, instead of going back to the "activity list" page.
+
+Using those function, a `returnPath` parameter will be added in the path generated. It will be used instead of the default one in the subsequente pages.
+
+- `chill_path_add_return_path(name, parameters = [], relative = false)`: will create a path with current page as return path (users will go back to the current page on the next page) ;
+- `chill_return_path_or(name, parameters = [], relative = false)`: will create a path to the return path if present, or build the path according to the given parameters ;
+- `chill_path_forward_return_path(name, parameters = [], relative = false)`: will create a path and adding the return path that is present for the current page, *forwarding* the return path to the next page. This is useful if you are on a "show" page with a return path (by instance, the "timeline" page), you place a link to the *edit* page and want users to go back to the "timeline" page on the edit page.
+
+- `chill_return_path_or`:
+
+## Organisation of the layouts
+
+### ChillMainBundle::layout.html.twig
+
+This is the base layout. It includes the most import css / js files. It display a page with
+
+* a horizontal navigation menu
+* a place for content
+* a footer
+
+The layout containts blocks, that are :
+
+* title
+
+  * to display title
+
+* css
+
+  * where to add some custom css
+
+* navigation_section_menu
+
+  * place where to insert the section menu in the navigation menu (by default the navigation menu is inserted)
+
+* navigation_search_bar
+
+  * place where to insert a search bar in the navigation menu (by default the search bar is inserted)
+
+* top_banner
+
+  * place where to display a banner below the navigation menu (this place is use to display the details of the person)
+
+* sublayout_containter
+
+  * place between the header and the footer that can be used to create a new layout (with vertical menu for example)
+
+* content
+
+  * place where to display the content (flash message are included outside of this block)
+
+* js
+
+  * where to add some custom javascript
+
+### ChillMainBundle::layoutWithVerticalMenu.html.twig
+
+This layout extends `ChillMainBundle::layout.html.twig`. It replaces the block `layout_content` and divides this block for displaying a vertical menu and some content.
+
+It proposes 2 new blocks :
+
+* layout_wvm_content
+
+  * where to display the page content
+
+* vertical_menu_content
+
+  * where to place the vertical menu
+
+### ChillMainBundle::Admin/layout.html.twig
+
+This layout extends `ChillMainBundle::layout.html.twig`. It hides the search bar, remplaces the `section menu` with the `admin section menu`.
+
+It proposes a new block :
+
+* admin_content
+
+  * where to display the admin content
+
+### ChillMainBundle::Admin/layoutWithVerticalMenu.html.twig
+
+This layout extends `ChillMainBundle::layoutWithVerticalMenu.html.twig`. It do the same changes than `ChillMainBundle::Admin/layout.html.twig` : hiding the search bar, remplacing the `section menu` with the `admin section menu`.
+
+It proposes a new block :
+
+* admin_content
+
+  * where to display the admin content
+
+@ChillPersonBundle/Person/layout.html.twig
+-----------------------------------
+
+This layout extend `ChillMainBundle::layoutWithVerticalMenu.html.twig` add the person details in the block `top_banner`, set the menu `person` as the vertical menu.
+
+It proposes 1 new block :
+
+* content
+
+  * where to display the information of the person
+
+### ChillMainBundle::Export/layout.html.twig
+
+This layout extends `ChillMainBundle::layoutWithVerticalMenu.html.twig` and set the menu `export` as the vertical menu.
+
+It proposes 1 new block :
+
+* export_content
+
+  * where to display the content of the export
+
+## Useful template and helpers
+
+### Macros
+
+Every bundle may bring their own macro to print resources with uniformized styles.
+
+See :
+
+- [Macros in person bundle ](person-bundle-macros.md) ;
+- [Macros in activity bundle ](activity-bundle-macros.md) ;
+- [Macros in group bundle ](group-bundle-macros.md) ;
+- [Macros in main bundle ](main-bundle-macros.md) ;
+
+### Templates
+
+##### ChillMainBundle::Util:confirmation_template.html.twig
+
+This template show a confirmation template before making dangerous things. You can add your own message and title, or define those message by yourself in another template.
+
+The accepted parameters are :
+
+- `title` (string) a title for the page. Not mandatory (it won't be rendered if not defined)
+- `confirm_question` (string) a confirmation question. This question will not be translated into the template, and may be printed as raw. Not mandatory (it won't be rendered if not defined)
+- `form` : (:class:`Symfony\Component\Form\FormView`) a form wich **must** contains an input named `submit`, which must be a :class:`Symfony\Component\Form\Extension\Core\Type\SubmitType`. Mandatory
+- `cancel_route` : (string) the name of a route if the user want to cancel the action
+- `cancel_parameters` (array) the parameters for the route defined in `cancel_route`
+
+Usage :
+
+       {{ include('ChillMainBundle:Util:confirmation_template.html.twig',
+           {
+               # a title, not mandatory
+               'title'             : 'Remove membership'|trans,
+               # a confirmation question, not mandatory
+               'confirm_question'  : 'Are you sure you want to remove membership ?'|trans
+               # a route for "cancel" button (mandatory)
+               'cancel_route'      : 'chill_group_membership_by_person',
+               # the parameters for 'cancel' route (default to {} )
+               'cancel_parameters' : { 'person_id' : membership.person.id },
+               # the form which will send the deletion. This form
+               # **must** contains a SubmitType
+               'form'              : form
+           } ) }}
diff --git a/docs/source/development/user-interface/css-classes.rst b/docs/source/development/user-interface/rst/css-classes.rst
similarity index 90%
rename from docs/source/development/user-interface/css-classes.rst
rename to docs/source/development/user-interface/rst/css-classes.rst
index 98252cca4..3a13fb186 100644
--- a/docs/source/development/user-interface/css-classes.rst
+++ b/docs/source/development/user-interface/rst/css-classes.rst
@@ -10,7 +10,7 @@
 CSS classes and mixins
 ######################
 
-The stylesheet are based on the framework `ScratchCSS <https://github.com/Champs-Libres/ScratchCSS>`_. 
+The stylesheet are based on the framework `ScratchCSS <https://github.com/Champs-Libres/ScratchCSS>`_.
 
 We added some useful classes and mixins for the Chill usage.
 
@@ -22,12 +22,12 @@ Statement "empty data"
 ======================
 
 CSS Selector
-   :code:`.chill-no-data-statement`
+   `.chill-no-data-statement`
 In which case will you use this selector ?
    When a list is empty, and a message fill the list to inform that the data is empty
 Example usage
    .. code-block:: html+jinja
-      
+
       <span class="chill-no-data-statement">{{ 'No reason associated'|trans }}</span>
 
 
@@ -35,7 +35,7 @@ Quotation of user text
 =======================
 
 CSS Selector
-   :code:`blockquote.chill-user-quote`
+   `blockquote.chill-user-quote`
 In which case will you use this selector ?
    When you quote text that were filled by the user in a form.
 Example usage
@@ -47,7 +47,7 @@ Boxes
 =====
 
 CSS Selector
-   :code:`chill__box`
+   `chill__box`
 In which case will you use this selector ?
    When displaying some data in a nice box
 Example usage
@@ -66,7 +66,7 @@ Entity decorator
 =================
 
 Mixin
-   :code:`@mixin entity($background-color, $color: white)`
+   `@mixin entity($background-color, $color: white)`
 In which case including this mixin ?
    When you create a `sticker`, a sort of label to represent a text in a way that the user can associate immediatly with a certain type of class / entity.
 Example usage
diff --git a/docs/source/development/user-interface/js-functions.rst b/docs/source/development/user-interface/rst/js-functions.rst
similarity index 100%
rename from docs/source/development/user-interface/js-functions.rst
rename to docs/source/development/user-interface/rst/js-functions.rst
diff --git a/docs/source/development/user-interface/layout-template-usage.rst b/docs/source/development/user-interface/rst/layout-template-usage.rst
similarity index 82%
rename from docs/source/development/user-interface/layout-template-usage.rst
rename to docs/source/development/user-interface/rst/layout-template-usage.rst
index 1ddbacafd..2d85253be 100644
--- a/docs/source/development/user-interface/layout-template-usage.rst
+++ b/docs/source/development/user-interface/rst/layout-template-usage.rst
@@ -22,28 +22,28 @@ Twig templating helper
 
 Print a value or use a default template if the value is empty.
 
-The template can be customized. 
+The template can be customized.
 
-Two default templates are registered: 
+Two default templates are registered:
 
-- :code:`default`, do not decorate the value ;
-- :code:`blockquote`: wrap the value into a blockquote if exists
+- `default`, do not decorate the value ;
+- `blockquote`: wrap the value into a blockquote if exists
 
 .. code-block:: html+twig
 
-  {{ "This is a message"|chill_print_or_message("No message") }} 
+  {{ "This is a message"|chill_print_or_message("No message") }}
   <!-- will print "This is a message" -->
 
-  {{ ""|chill_print_or_message("No message")}} 
+  {{ ""|chill_print_or_message("No message")}}
   <!-- will print <span class="chill-no-data-statement">No message</span> -->
 
-  {{ "This is a comment\n with multiples lines"|chill_print_or_message("No comment", 'blockquote') }} 
+  {{ "This is a comment\n with multiples lines"|chill_print_or_message("No comment", 'blockquote') }}
   <!-- will print <blockquote class="chill-user-quote">This is a comment<br/>with multiples lines</blockquote> -->
 
-When customizing the template, two arguments are passed to the template: 
+When customizing the template, two arguments are passed to the template:
 
-- :code:`value`: the actual value ;
-- :code:`message`: the message, given as argument
+- `value`: the actual value ;
+- `message`: the message, given as argument
 
 Routing with return path
 ------------------------
@@ -52,14 +52,14 @@ Three twig function are available for creating routes and handling "return path"
 
 **Rationale**: When building a "CRUD" (CReate, Update, Delete of an entity), you would like to allow people to go back on some custom cancel page when coming for another place of an application. For instance, if you are in the timeline and show an activity, you would like that the user go back to the timeline when pressing the "return" button at the bottom of the page, instead of going back to the "activity list" page.
 
-Using those function, a :code:`returnPath` parameter will be added in the path generated. It will be used instead of the default one in the subsequente pages. 
+Using those function, a `returnPath` parameter will be added in the path generated. It will be used instead of the default one in the subsequente pages.
 
-- :code:`chill_path_add_return_path(name, parameters = [], relative = false)`: will create a path with current page as return path (users will go back to the current page on the next page) ;
-- :code:`chill_return_path_or(name, parameters = [], relative = false)`: will create a path to the return path if present, or build the path according to the given parameters ;
-- :code:`chill_path_forward_return_path(name, parameters = [], relative = false)`: will create a path and adding the return path that is present for the current page, *forwarding* the return path to the next page. This is useful if you are on a "show" page with a return path (by instance, the "timeline" page), you place a link to the *edit* page and want users to go back to the "timeline" page on the edit page. 
+- `chill_path_add_return_path(name, parameters = [], relative = false)`: will create a path with current page as return path (users will go back to the current page on the next page) ;
+- `chill_return_path_or(name, parameters = [], relative = false)`: will create a path to the return path if present, or build the path according to the given parameters ;
+- `chill_path_forward_return_path(name, parameters = [], relative = false)`: will create a path and adding the return path that is present for the current page, *forwarding* the return path to the next page. This is useful if you are on a "show" page with a return path (by instance, the "timeline" page), you place a link to the *edit* page and want users to go back to the "timeline" page on the edit page.
 
 
-- :code:`chill_return_path_or`: 
+- `chill_return_path_or`:
 
 
 Organisation of the layouts
@@ -178,9 +178,9 @@ Useful template and helpers
 Macros
 ------
 
-Every bundle may bring their own macro to print resources with uniformized styles. 
+Every bundle may bring their own macro to print resources with uniformized styles.
 
-See : 
+See :
 
 - :ref:`Macros in person bundle <person-bundle-macros>` ;
 - :ref:`Macros in activity bundle <activity-bundle-macros>` ;
@@ -195,7 +195,7 @@ ChillMainBundle::Util:confirmation_template.html.twig
 
 This template show a confirmation template before making dangerous things. You can add your own message and title, or define those message by yourself in another template.
 
-The accepted parameters are : 
+The accepted parameters are :
 
 - `title` (string) a title for the page. Not mandatory (it won't be rendered if not defined)
 - `confirm_question` (string) a confirmation question. This question will not be translated into the template, and may be printed as raw. Not mandatory (it won't be rendered if not defined)
@@ -204,7 +204,7 @@ The accepted parameters are :
 - `cancel_parameters` (array) the parameters for the route defined in `cancel_route`
 
 
-Usage : 
+Usage :
 
 
 .. code-block:: html+twig
diff --git a/docs/source/development/user-interface/widgets.rst b/docs/source/development/user-interface/rst/widgets.rst
similarity index 81%
rename from docs/source/development/user-interface/widgets.rst
rename to docs/source/development/user-interface/rst/widgets.rst
index 1ce4bc591..e635e20e2 100644
--- a/docs/source/development/user-interface/widgets.rst
+++ b/docs/source/development/user-interface/rst/widgets.rst
@@ -15,12 +15,12 @@ Rationale
 Widgets are useful if you want to publish content on a page provided by another bundle.
 
 
-Examples : 
+Examples :
 
 - you want to publish a list of people on the homepage ;
 - you may want to show the group belonging (see :ref:`group-bundle`) below of the vertical menu, only if the bundle is installed.
 
-The administrator of the chill instance may configure the presence of widget. Although, some widget are defined by default (see :ref:`declaring-widget-by-default`). 
+The administrator of the chill instance may configure the presence of widget. Although, some widget are defined by default (see :ref:`declaring-widget-by-default`).
 
 Concepts
 ========
@@ -71,32 +71,32 @@ Example :
    class AddAPersonWidget implements WidgetInterface
    {
       public function render(
-	 \Twig_Environment $env, 
-	 $place, 
-	 array $context, 
+	 \Twig_Environment $env,
+	 $place,
+	 array $context,
 	 array $config
       ) {
           // this will render a link to the page "add a person"
 	  return $env->render("ChillPersonBundle:Widget:homepage_add_a_person.html.twig");
       }
-   } 
+   }
 
-Arguments are : 
+Arguments are :
 
-- :code:`$env` the :class:`\Twig_Environment`, which you can use to render your widget ;
-- :code:`$place` a string representing the place where the widget is rendered ;
-- :code:`$context` the context given by the template ;
-- :code:`$config` the configuration which is, in this case, always an empty array (see :ref:`creating-a-widget-with-config`).
+- `$env` the :class:`\Twig_Environment`, which you can use to render your widget ;
+- `$place` a string representing the place where the widget is rendered ;
+- `$context` the context given by the template ;
+- `$config` the configuration which is, in this case, always an empty array (see :ref:`creating-a-widget-with-config`).
 
 .. note::
 
-   The html returned by the :code:`render` function will be considered as html safe. You should strip html before returning it. See also `How to escape output in template <http://symfony.com/doc/current/templating/escaping.html>`_.
+   The html returned by the `render` function will be considered as html safe. You should strip html before returning it. See also `How to escape output in template <http://symfony.com/doc/current/templating/escaping.html>`_.
 
 
 Declare your widget
 -------------------
 
-Declare your widget as a service and add it the tag :code:`chill_widget`:
+Declare your widget as a service and add it the tag `chill_widget`:
 
 .. code-block:: yaml
 
@@ -107,17 +107,17 @@ Declare your widget as a service and add it the tag :code:`chill_widget`:
 	       - { name: chill_widget, alias: add_person, place: homepage }
 
 
-The tag must contains those arguments : 
+The tag must contains those arguments :
 
-- :code:`alias`: an alias, which will be used to reference the widget into the config
-- :code:`place`: a place where this widget is authorized
+- `alias`: an alias, which will be used to reference the widget into the config
+- `place`: a place where this widget is authorized
 
 If you want your widget to be available on multiple places, you should add one tag with each place.
 
 Conclusion
 ----------
 
-Once your widget is correctly declared, your widget should be available in configuration. 
+Once your widget is correctly declared, your widget should be available in configuration.
 
 .. code-block:: bash
 
@@ -134,14 +134,14 @@ Once your widget is correctly declared, your widget should be available in confi
 	       # the widget alias (see your installed bundles config). Possible values are (maybe incomplete) : person_list, add_person
 	       widget_alias:         ~ # Required
 
-If you want to add your widget by default, see :ref:`declaring-widget-by-default`. 
+If you want to add your widget by default, see :ref:`declaring-widget-by-default`.
 
 .. _creating-a-widget-with-config:
 
 Creating a widget **with** configuration
 ========================================
 
-You can declare some configuration with your widget, which allow administrators to add their own configuration. 
+You can declare some configuration with your widget, which allow administrators to add their own configuration.
 
 To add some configuration, you will :
 
@@ -153,7 +153,7 @@ To add some configuration, you will :
 Declare your widget class
 -------------------------
 
-Declare your widget. You can use some configuration elements in your process, as used here : 
+Declare your widget. You can use some configuration elements in your process, as used here :
 
 .. literalinclude:: ./widgets/ChillPersonAddAPersonWidget.php
    :language: php
@@ -161,7 +161,7 @@ Declare your widget. You can use some configuration elements in your process, as
 Declare your widget as a service
 --------------------------------
 
-You can declare your widget as a service. Not tag is required, as the service will be defined by the :code:`Factory` during next step.
+You can declare your widget as a service. Not tag is required, as the service will be defined by the `Factory` during next step.
 
 
 .. code-block:: yaml
@@ -187,7 +187,7 @@ The widget factory must implements `Chill\MainBundle\DependencyInjection\Widget\
    :language: php
 
 .. note::
-   You can declare your widget into the container by overriding the `createDefinition` method. By default, this method will return the already existing service definition with the id given by :code:`getServiceId`. But you can create or adapt programmatically the definition. `See the symfony doc on how to do it <http://symfony.com/doc/current/service_container/definitions.html#working-with-a-definition>`_.
+   You can declare your widget into the container by overriding the `createDefinition` method. By default, this method will return the already existing service definition with the id given by `getServiceId`. But you can create or adapt programmatically the definition. `See the symfony doc on how to do it <http://symfony.com/doc/current/service_container/definitions.html#working-with-a-definition>`_.
 
    .. code-block:: php
 
@@ -199,22 +199,22 @@ The widget factory must implements `Chill\MainBundle\DependencyInjection\Widget\
           return $definition;
       }
 
-You must then register your factory into the :code:`Extension` class which provide the place. This is done in the :code: `Bundle` class.
+You must then register your factory into the `Extension` class which provide the place. This is done in the  `Bundle` class.
 
 .. code-block:: php
 
-    # Chill/PersonBundle/ChillPersonBundle.php  
- 
+    # Chill/PersonBundle/ChillPersonBundle.php
+
     use Symfony\Component\HttpKernel\Bundle\Bundle;
     use Symfony\Component\DependencyInjection\ContainerBuilder;
     use Chill\PersonBundle\Widget\PersonListWidgetFactory;
 
     class ChillPersonBundle extends Bundle
     {
-	public function build(ContainerBuilder $container) 
+	public function build(ContainerBuilder $container)
 	{
 	    parent::build($container);
-	    
+
 	    $container->getExtension('chill_main')
 		->addWidgetFactory(new PersonListWidgetFactory());
 	}
@@ -225,7 +225,7 @@ You must then register your factory into the :code:`Extension` class which provi
 Declaring a widget by default
 =============================
 
-Use the ability `to prepend configuration of other bundle <http://symfony.com/doc/current/bundles/prepend_extension.html>`_. A living example here : 
+Use the ability `to prepend configuration of other bundle <http://symfony.com/doc/current/bundles/prepend_extension.html>`_. A living example here :
 
 .. literalinclude:: ./widgets/ChillPersonExtension.php
    :language: php
@@ -237,10 +237,10 @@ Defining a place
 Add your place in template
 --------------------------
 
-A place should be defined by using the :code:`chill_widget` function, which take as argument :
+A place should be defined by using the `chill_widget` function, which take as argument :
 
-- :code:`place` (string) a string defining the place ;
-- :code:`context` (array) an array defining the context.
+- `place` (string) a string defining the place ;
+- `context` (array) an array defining the context.
 
 The context should be documented by the bundle. It will give some information about the context of the page. Example: if the page concerns a people, the :class:`Chill\PersonBundle\Entity\Person` class will be in the context.
 
@@ -262,7 +262,7 @@ Declare configuration for you place
 
 In order to let other bundle, or user, to define the widgets inside the given place, you should open a configuration. You can use the Trait :class:`Chill\MainBundle\DependencyInjection\Widget\AddWidgetConfigurationTrait`, which provide the method `addWidgetConfiguration($place, ContainerBuilder $container)`.
 
-Example : 
+Example :
 
 .. literalinclude:: ./widgets/ChillMainConfiguration.php
    :language: php
@@ -285,11 +285,11 @@ You should also adapt the :class:`DependencyInjection\*Extension` class to add C
 Compile the possible widget using Compiler pass
 -----------------------------------------------
 
-For your convenience, simply extends :class:`Chill\MainBundle\DependencyInjection\Widget\AbstractWidgetsCompilerPass`. This class provides a `doProcess(ContainerBuildere $container, $extension, $parameterName)` method which will do the job for you: 
+For your convenience, simply extends :class:`Chill\MainBundle\DependencyInjection\Widget\AbstractWidgetsCompilerPass`. This class provides a `doProcess(ContainerBuildere $container, $extension, $parameterName)` method which will do the job for you:
 
-- :code:`$container` is the container builder
-- :code:`$extension` is the extension name 
-- :code:`$parameterName` is the name of the parameter which contains the configuration for widgets (see :ref:`the example with ChillMain above <example-chill-main-extension>`.
+- `$container` is the container builder
+- `$extension` is the extension name
+- `$parameterName` is the name of the parameter which contains the configuration for widgets (see :ref:`the example with ChillMain above <example-chill-main-extension>`.
 
 .. code-block:: php
 
@@ -300,10 +300,10 @@ For your convenience, simply extends :class:`Chill\MainBundle\DependencyInjectio
 
    /**
    * Compile the service definition to register widgets.
-   * 
+   *
    */
    class WidgetsCompilerPass extends AbstractWidgetsCompilerPass {
-    
+
        public function process(ContainerBuilder $container)
        {
   	   $this->doProcess($container, 'chill_main', 'chill_main.widgets');
diff --git a/docs/source/development/user-interface/widgets.md b/docs/source/development/user-interface/widgets.md
new file mode 100644
index 000000000..90be70ae8
--- /dev/null
+++ b/docs/source/development/user-interface/widgets.md
@@ -0,0 +1,270 @@
+Permission is granted to copy, distribute and/or modify this document
+   under the terms of the GNU Free Documentation License, Version 1.3
+   or any later version published by the Free Software Foundation;
+   with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+   A copy of the license is included in the section entitled "GNU
+   Free Documentation License".
+
+# Widgets
+
+## Rationale
+
+Widgets are useful if you want to publish content on a page provided by another bundle.
+
+Examples :
+
+- you want to publish a list of people on the homepage ;
+- you may want to show the group belonging (see [group-bundle[) below of the vertical menu, only if the bundle is installed.
+
+The administrator of the chill instance may configure the presence of widget. Although, some widget are defined by default (see [declaring-widget-by-default](declaring-widget-by-default.md)).
+
+## Concepts
+
+A bundle may define *place(s)* where a widget may be rendered.
+
+In a single *place*, zero, one or more *widget* may be displayed.
+
+Some *widget* may require some *configuration*, and some does not require any configuration.
+
+Example:
+
+===========================================  ========  =============================  =======================================
+Use case                                     place     place defined by...            widget provided by...
+===========================================  ========  =============================  =======================================
+Publishing a list of people on the homepage  homepage  defined by [main-bundle](main-bundle.md)  widget provided by [person-bundle](person-bundle.md)
+===========================================  ========  =============================  =======================================
+
+## Creating a widget without configuration
+
+To add a widget, you should :
+
+- define your widget, implementing :class:`Chill\MainBundle\Templating\Widget\WidgetInterface` ;
+- declare your widget with tag `chill_widget`.
+
+### Define the widget class
+
+Define your widget class by implemeting :class:`Chill\MainBundle\Templating\Widget\WidgetInterface`.
+
+Example :
+
+   namespace Chill\PersonBundle\Widget;
+
+   use Chill\MainBundle\Templating\Widget\WidgetInterface;
+
+   /**
+   * Add a button "add a person"
+   *
+   */
+   class AddAPersonWidget implements WidgetInterface
+   {
+      public function render(
+	 \Twig_Environment $env,
+	 $place,
+	 array $context,
+	 array $config
+      ) {
+          // this will render a link to the page "add a person"
+	  return $env->render("ChillPersonBundle:Widget:homepage_add_a_person.html.twig");
+      }
+   }
+
+Arguments are :
+
+- `$env` the :class:`\Twig_Environment`, which you can use to render your widget ;
+- `$place` a string representing the place where the widget is rendered ;
+- `$context` the context given by the template ;
+- `$config` the configuration which is, in this case, always an empty array (see [creating-a-widget-with-config](creating-a-widget-with-config.md)).
+
+   The html returned by the `render` function will be considered as html safe. You should strip html before returning it. See also `How to escape output in template ](http://symfony.com/doc/current/templating/escaping.html.md)_.
+
+### Declare your widget
+
+Declare your widget as a service and add it the tag `chill_widget`:
+
+   service:
+       chill_person.widget.add_person:
+	   class: Chill\PersonBundle\Widget\AddAPersonWidget
+	   tags:
+	       - { name: chill_widget, alias: add_person, place: homepage }
+
+The tag must contains those arguments :
+
+- `alias`: an alias, which will be used to reference the widget into the config
+- `place`: a place where this widget is authorized
+
+If you want your widget to be available on multiple places, you should add one tag with each place.
+
+### Conclusion
+
+Once your widget is correctly declared, your widget should be available in configuration.
+
+   $ php app/console config:dump-reference chill_main
+   # Default configuration for extension with alias: "chill_main"
+   chill_main:
+	   [...]
+	   # register widgets on place "homepage"
+	   homepage:
+
+	       # the ordering of the widget. May be a number with decimal
+	       order:                ~ # Required, Example: 10.58
+
+	       # the widget alias (see your installed bundles config). Possible values are (maybe incomplete) : person_list, add_person
+	       widget_alias:         ~ # Required
+
+If you want to add your widget by default, see [declaring-widget-by-default`.
+
+## Creating a widget **with** configuration
+
+You can declare some configuration with your widget, which allow administrators to add their own configuration.
+
+To add some configuration, you will :
+
+- declare a widget as defined above ;
+- optionnaly declare it as a service ;
+- add a widget factory, which will add configuration to the bundle which provide the place.
+
+### Declare your widget class
+
+Declare your widget. You can use some configuration elements in your process, as used here :
+
+   :language: php
+
+### Declare your widget as a service
+
+You can declare your widget as a service. Not tag is required, as the service will be defined by the `Factory` during next step.
+
+   services:
+      chill_person.widget.person_list:
+    	  class: Chill\PersonBundle\Widget\PersonListWidget
+	  arguments:
+	      - "@chill.person.repository.person"
+	      - "@doctrine.orm.entity_manager"
+	      - "@chill.main.security.authorization.helper"
+	      - "@security.token_storage"
+      # this widget is defined by the PersonListWidgetFactory
+
+You can eventually skip this step and declare your service into the container through the factory (see above).
+
+### Declare your widget factory
+
+The widget factory must implements `Chill\MainBundle\DependencyInjection\Widget\Factory\WidgetFactoryInterface`. For your convenience, an :class:`Chill\MainBundle\DependencyInjection\Widget\Factory\AbstractWidgetFactory` will already implements some easy method.
+
+   :language: php
+
+   You can declare your widget into the container by overriding the `createDefinition` method. By default, this method will return the already existing service definition with the id given by `getServiceId`. But you can create or adapt programmatically the definition. `See the symfony doc on how to do it ](http://symfony.com/doc/current/service_container/definitions.html#working-with-a-definition.md)_.
+
+   ```php
+      public function createDefinition(ContainerBuilder $containerBuilder, $place, $order, array $config)
+      {
+          $definition = new \Symfony\Component\DependencyInjection\Definition('my\Class');
+          // create or adapt your definition here
+```
+
+          return $definition;
+      }
+
+You must then register your factory into the `Extension` class which provide the place. This is done in the  `Bundle` class.
+
+    # Chill/PersonBundle/ChillPersonBundle.php
+
+    use Symfony\Component\HttpKernel\Bundle\Bundle;
+    use Symfony\Component\DependencyInjection\ContainerBuilder;
+    use Chill\PersonBundle\Widget\PersonListWidgetFactory;
+
+    class ChillPersonBundle extends Bundle
+    {
+	public function build(ContainerBuilder $container)
+	{
+	    parent::build($container);
+
+	    $container->getExtension('chill_main')
+		->addWidgetFactory(new PersonListWidgetFactory());
+	}
+    }
+
+## Declaring a widget by default
+
+Use the ability `to prepend configuration of other bundle ](http://symfony.com/doc/current/bundles/prepend_extension.html). A living example here :
+
+   :language: php
+
+## Defining a place
+
+### Add your place in template
+
+A place should be defined by using the [chill_widget` function, which take as argument :
+
+- `place` (string) a string defining the place ;
+- `context` (array) an array defining the context.
+
+The context should be documented by the bundle. It will give some information about the context of the page. Example: if the page concerns a people, the :class:`Chill\PersonBundle\Entity\Person` class will be in the context.
+
+Example :
+
+   {# an empty context on homepage #}
+   {{ chill_widget('homepage', {} }}
+
+   {# defining a place 'right column' with the person currently viewed
+   {{ chill_widget('right_column', { 'person' : person } }}
+
+### Declare configuration for you place
+
+In order to let other bundle, or user, to define the widgets inside the given place, you should open a configuration. You can use the Trait :class:`Chill\MainBundle\DependencyInjection\Widget\AddWidgetConfigurationTrait`, which provide the method `addWidgetConfiguration($place, ContainerBuilder $container)`.
+
+Example :
+
+   :language: php
+   :emphasize-lines: 17, 30, 32, 52
+   :linenos:
+
+You should also adapt the :class:`DependencyInjection\*Extension` class to add ContainerBuilder and WidgetFactories :
+
+   :language: php
+   :emphasize-lines: 25-39, 48-49, 56
+   :linenos:
+
+- line 25-39: we implements the method required by :class:`Chill\MainBundle\DependencyInjection\Widget\HasWidgetExtensionInterface` ;
+- line 48-49: we record the configuration of widget into container's parameter ;
+- line 56 : we create an instance of :class:`Configuration` (declared above)
+
+### Compile the possible widget using Compiler pass
+
+For your convenience, simply extends :class:`Chill\MainBundle\DependencyInjection\Widget\AbstractWidgetsCompilerPass`. This class provides a `doProcess(ContainerBuildere $container, $extension, $parameterName)` method which will do the job for you:
+
+- `$container` is the container builder
+- `$extension` is the extension name
+- `$parameterName` is the name of the parameter which contains the configuration for widgets (see [the example with ChillMain above ](example-chill-main-extension.md).
+
+   namespace Chill\MainBundle\DependencyInjection\CompilerPass;
+
+   use Symfony\Component\DependencyInjection\ContainerBuilder;
+   use Chill\MainBundle\DependencyInjection\Widget\AbstractWidgetsCompilerPass;
+
+   /**
+   * Compile the service definition to register widgets.
+   *
+   */
+   class WidgetsCompilerPass extends AbstractWidgetsCompilerPass {
+
+       public function process(ContainerBuilder $container)
+       {
+  	   $this->doProcess($container, 'chill_main', 'chill_main.widgets');
+       }
+   }
+
+As explained `in the symfony docs ](http://symfony.com/doc/current/service_container/compiler_passes.html), you should register your Compiler Pass into your bundle :
+
+   namespace Chill\MainBundle;
+
+   use Symfony\Component\HttpKernel\Bundle\Bundle;
+   use Symfony\Component\DependencyInjection\ContainerBuilder;
+   use Chill\MainBundle\DependencyInjection\CompilerPass\WidgetsCompilerPass;
+
+   class ChillMainBundle extends Bundle
+   {
+       public function build(ContainerBuilder $container)
+       {
+	   parent::build($container);
+	   $container->addCompilerPass(new WidgetsCompilerPass());
+       }
+   }
diff --git a/docs/source/index.md b/docs/source/index.md
new file mode 100644
index 000000000..59aaa87fc
--- /dev/null
+++ b/docs/source/index.md
@@ -0,0 +1,54 @@
+# Welcome to Chill documentation!
+
+Chill is a free software for social workers.
+
+Chill relies on the php framework [Symfony](http://symfony.com).
+
+## Let's talk together!
+
+You can talk to developers using the matrix room: [https://app.element.io/#/room/#chill-social-admin:matrix.org](https://app.element.io/#/room/#chill-social-admin:matrix.org)
+
+## Contribute
+
+* [Issue tracker](https://gitlab.com/groups/Chill-project/issues) You may want to dispatch an issue to multiple projects. If you do not know in which project your bug / feature request should be located, use the project Chill-Main.
+
+## User manual
+
+A user manual exists in French and currently focuses on describing the main concept of the software.
+
+[Read (and contribute) to the manual](https://fr.wikibooks.org/wiki/Chill)
+
+## Available bundles
+
+* Chill-app | https://gitlab.com/Chill-project/Chill-app This is the skeleton of the project. It contains only a bit of code but provides plenty of information on the configuration of your instance;
+* Chill-bundles: this repository contains all the main bundles. This means:
+  * MainBundle: the main framework,
+  * PersonBundle: to deal with persons,
+  * CustomFieldsBundle: to add custom fields to some entities,
+  * ActivityBundle: to add activities to people,
+  * AsideActivityBundle: to add annex activities such as meetings/trainings not related to a person,
+  * BudgetBundle: to add budget elements to a person's file,
+  * DocGeneratorBundle: to generate documents from templates,
+  * JobBundle: to add information related to employment/ professional training to a person's file,
+  * ReportBundle: to add a report to a person's file,
+  * EventBundle: to create events and add persons that will be participating,
+  * DocStoreBundle: to store documents to people, but also to other entities,
+  * TaskBundle: to register tasks within a person's file or accompanying course,
+  * ThirdPartyBundle: to register third parties,
+
+You will also found the following projects :
+
+* The website https://chill.social : https://gitlab.com/Chill-project/chill.social
+
+And various projects to build docker containers with Chill.
+
+## Licence
+
+The project is available under the [GNU AFFERO GENERAL PUBLIC LICENSE v3](http://www.gnu.org/licenses/agpl-3.0.html).
+
+This documentation is published under the [GNU Free Documentation License (FDL) v1.3](http://www.gnu.org/licenses/fdl-1.3.html)
+
+---
+
+*Copyright (C) 2014 Champs Libres Cooperative SC
+Permission is granted to copy, distribute and/or modify this document under the terms of the GNU Free Documentation License, Version 1.3 or any later version published by the Free Software Foundation; with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts. A copy of the license is included in the section entitled "GNU Free Documentation License".*
diff --git a/docs/source/index.rst b/docs/source/index.rst
deleted file mode 100644
index ddfa23e3b..000000000
--- a/docs/source/index.rst
+++ /dev/null
@@ -1,85 +0,0 @@
-.. chill-doc documentation master file, created by
-   sphinx-quickstart on Sun Sep 28 22:04:08 2014.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-.. Copyright (C)  2014 Champs Libres Cooperative SCRLFS
-   Permission is granted to copy, distribute and/or modify this document
-   under the terms of the GNU Free Documentation License, Version 1.3
-   or any later version published by the Free Software Foundation;
-   with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-   A copy of the license is included in the section entitled "GNU
-   Free Documentation License".
-
-Welcome to Chill documentation!
-=====================================
-
-Chill is a free software for social workers.
-
-Chill rely on the php framework `Symfony <http://symfony.com>`_.
-
-Contents of this documentation:
-
-.. toctree::
-   :maxdepth: 2
-
-   installation/index.rst
-   development/index.rst
-   Bundles <bundles/index.rst>
-
-Let's talk together !
-======================
-
-You may talk to developers using the matrix room: `https://app.element.io/#/room/#chill-social-admin:matrix.org`_
-
-Contribute
-==========
-
-
-* `Issue tracker <https://gitlab.com/groups/Chill-project/issues>`_ You may want to dispatch the issue in the multiple projects. If you do not know in which project is located your bug / feature request, use the project Chill-Main.
-
-
-User manual
-===========
-
-An user manual exists in French and currently focuses on describing the main concept of the software.
-
-`Read (and contribute) to the manual <https://fr.wikibooks.org/wiki/Chill>`_
-
-Available bundles
-=================
-
-* Chill-app | https://gitlab.com/Chill-project/Chill-app This is the skeleton of the project. It does contains only few code, but information about configuration of your instance ;
-* Chill-bundle: contains the main bundles, the most used in an instance. This means:
-  * chill-main, the main framework,
-  * Chill Person, to deal with persons,
-  * chill custom fields, to add custom fields to some entities,
-  * chill activity: to add activities to people,
-  * chill report: to add report to people,
-  * chill event: to gather people into events,
-  * chill docs store: to store documents to people, but also entities,
-  * chill task: to register task with people,
-  * chill third party: to register third parties,
-
-You will also found the following projects :
-
-* The website https://chill.social : https://gitlab.com/Chill-project/chill.social
-
-And various project to build docker containers with Chill.
-
-TODO in documentation
-=====================
-
-.. todolist::
-
-Licence
-========
-
-The project is available under the `GNU AFFERO GENERAL PUBLIC LICENSE v3`_.
-
-This documentation is published under the `GNU Free Documentation License (FDL) v1.3`_
-
-
-.. _GNU AFFERO GENERAL PUBLIC LICENSE v3: http://www.gnu.org/licenses/agpl-3.0.html
-.. _GNU Free Documentation License (FDL) v1.3: http://www.gnu.org/licenses/fdl-1.3.html
-
diff --git a/docs/source/installation/document-storage.md b/docs/source/installation/document-storage.md
new file mode 100644
index 000000000..7849f7662
--- /dev/null
+++ b/docs/source/installation/document-storage.md
@@ -0,0 +1,74 @@
+# Document storage
+
+You can store a document in two different ways:
+
+- on disk
+- in the cloud, using object storage: currently only [openstack swift ](https://docs.openstack.org/api-ref/object-store/index.html) is supported.
+
+## Comparison
+
+Storing documents within the cloud is particularly suitable for "portable" deployments, like in kubernetes, or within a container
+without having to manage volumes to store documents. But you'll have to subscribe to a commercial offer.
+
+Storing documents on disk is easier to configure but more challenging to manage: if you use container, you will have to
+manager volumes to attach documents on disk. You'll have to do some backup of the directory. If chill is load-balanced (and
+multiple instances of chill are run), you will have to find a way to share the directories in read-write mode for every instance.
+
+## On Disk
+
+Configure Chill like this:
+
+```yaml
+   # file config/packages/chill_doc_store.yaml
+   chill_doc_store:
+       use_driver: local_storage
+       local_storage:
+           storage_path: '%kernel.project_dir%/var/storage'
+```
+
+In this configuration, documents will be stored in [var/storage` within your app directory. But this path can be
+elsewhere on the disk. Be aware that the directory must be writable by the user executing the chill app (php-fpm or www-data).
+
+Documents will be stored in subpathes within that directory. The files will be encrypted, the key is stored in the database.
+
+# In the cloud, using openstack object store
+
+You must subscribe to a commercial offer for an object store.
+
+Chill uses some features to allow documents to be stored in the cloud without being uploaded first to the chill server:
+
+- `Form POST Middelware ](https://docs.openstack.org/swift/latest/api/form_post_middleware.html);
+- [Temporary URL Middelware ](https://docs.openstack.org/swift/latest/api/temporary_url_middleware.html).
+
+A secret key must be generated and configured, and CORS must be configured depending on the domain you will use to serve Chill.
+
+At first, create a container and get the base path to the container. For instance, on OVH, if you create a container named "mychill",
+you will be able to retrieve the base path of the container within the OVH interface, like this:
+
+- base_path: [https://storage.gra.cloud.ovh.net/v1/AUTH_123456789/mychill/` => will be variable `ASYNC_UPLOAD_TEMP_URL_BASE_PATH`
+- container: `mychill` => will be variable `ASYNC_UPLOAD_TEMP_URL_CONTAINER`
+
+You can also generate a key, which should have at least 20 characters. This key will go in the variable `ASYNC_UPLOAD_TEMP_URL_KEY`.
+
+   See the `documentation of symfony ](https://symfony.com/doc/current/configuration.html#config-env-vars) on how to store variables, and how to encrypt them if needed.
+
+Configure the storage like this:
+
+```yaml
+   # file config/packages/chill_doc_store.yaml
+   chill_doc_store:
+       use_driver: openstack
+       openstack:
+           temp_url:
+               temp_url_key:         '%env(resolve:ASYNC_UPLOAD_TEMP_URL_KEY)%'       # Required
+               container:            '%env(resolve:ASYNC_UPLOAD_TEMP_URL_CONTAINER)%' # Required
+               temp_url_base_path:   '%env(resolve:ASYNC_UPLOAD_TEMP_URL_BASE_PATH)%' # Required
+```
+
+Chill is able to configure the container to store a document. Grab an Openstack Token (for instance, using `openstack token issue` or
+the web interface of your openstack provider), and run this command:
+
+   `symfony console async-upload:configure --os_token=OPENSTACK_TOKEN -d https://mychill.mydomain.example`
+
+   # or, without symfony-cli
+   `bin/console async-upload:configure --os_token=OPENSTACK_TOKEN -d https://mychill.mydomain.example`
diff --git a/docs/source/installation/document-storage.rst b/docs/source/installation/document-storage.rst
deleted file mode 100644
index 0b87d9eb2..000000000
--- a/docs/source/installation/document-storage.rst
+++ /dev/null
@@ -1,84 +0,0 @@
-Document storage
-################
-
-You can store document on two different ways:
-
-- on disk
-- in the cloud, using object storage: currently only `openstack swift <https://docs.openstack.org/api-ref/object-store/index.html>`_ is supported.
-
-Comparison
-==========
-
-Storing documents within the cloud is particularily suitable for "portable" deployments, like in kubernetes, or within container
-without having to manage volumes to store documents. But you'll have to subscribe on a commercial offer.
-
-Storing documents on disk is more easy to configure, but more difficult to manage: if you use container, you will have to
-manager volumes to attach documents on disk. You'll have to do some backup of the directory. If chill is load-balanced (and
-multiple instances of chill are run), you will have to find a way to share the directories in read-write mode for every instance.
-
-On Disk
-=======
-
-Configure Chill like this:
-
-.. code-block:: yaml
-
-   # file config/packages/chill_doc_store.yaml
-   chill_doc_store:
-       use_driver: local_storage
-       local_storage:
-           storage_path: '%kernel.project_dir%/var/storage'
-
-In this configuration, documents will be stored in :code:`var/storage` within your app directory. But this path can be
-elsewhere on the disk. Be aware that the directory must be writable by the user executing the chill app (php-fpm or www-data).
-
-Documents will be stored in subpathes within that directory. The files will be encrypted, the key is stored in the database.
-
-In the cloud, using openstack object store
-##########################################
-
-You must subscribe to a commercial offer for object store.
-
-Chill use some features to allow documents to be stored in the cloud without being uploaded first to the chill server:
-
-- `Form POST Middelware <https://docs.openstack.org/swift/latest/api/form_post_middleware.html>`_;
-- `Temporary URL Middelware <https://docs.openstack.org/swift/latest/api/temporary_url_middleware.html>`_.
-
-A secret key must be generated and configured, and CORS must be configured depending on the domain you will use to serve Chill.
-
-At first, create a container and get the base path to the container. For instance, on OVH, if you create a container named "mychill",
-you will be able to retrieve the base path of the container within the OVH interface, like this:
-
-- base_path: :code:`https://storage.gra.cloud.ovh.net/v1/AUTH_123456789/mychill/` => will be variable :code:`ASYNC_UPLOAD_TEMP_URL_BASE_PATH`
-- container: :code:`mychill` => will be variable :code:`ASYNC_UPLOAD_TEMP_URL_CONTAINER`
-
-You can also generate a key, which should have at least 20 characters. This key will go in the variable :code:`ASYNC_UPLOAD_TEMP_URL_KEY`.
-
-.. note::
-
-   See the `documentation of symfony <https://symfony.com/doc/current/configuration.html#config-env-vars>`_ on how to store variables, and how to encrypt them if needed.
-
-Configure the storage like this:
-
-.. code-block:: yaml
-
-   # file config/packages/chill_doc_store.yaml
-   chill_doc_store:
-       use_driver: openstack
-       openstack:
-           temp_url:
-               temp_url_key:         '%env(resolve:ASYNC_UPLOAD_TEMP_URL_KEY)%'       # Required
-               container:            '%env(resolve:ASYNC_UPLOAD_TEMP_URL_CONTAINER)%' # Required
-               temp_url_base_path:   '%env(resolve:ASYNC_UPLOAD_TEMP_URL_BASE_PATH)%' # Required
-
-Chill is able to configure the container in order to store document. Grab an Openstack Token (for instance, using :code:`openstack token issue` or
-the web interface of your openstack provider), and run this command:
-
-.. code-block:: bash
-
-   symfony console async-upload:configure --os_token=OPENSTACK_TOKEN -d https://mychill.mydomain.example
-
-   # or, without symfony-cli
-   bin/console async-upload:configure --os_token=OPENSTACK_TOKEN -d https://mychill.mydomain.example
-
-
diff --git a/docs/source/installation/enable-collabora-for-dev.md b/docs/source/installation/enable-collabora-for-dev.md
new file mode 100644
index 000000000..8132b7aab
--- /dev/null
+++ b/docs/source/installation/enable-collabora-for-dev.md
@@ -0,0 +1,105 @@
+## Enable CODE for development
+
+For editing a document, there must be a way to communicate between the collabora server and the symfony server, in
+both directions. The domain name should also be the same for collabora server and for the browser which access to the
+online editor.
+
+### Using ngrok (or other http tunnel)
+
+One can configure a tunnel server to expose your local installation to the web and access to your local server using the
+tunnel url.
+
+##### Start ngrok
+
+This can be achieved using [ngrok ](https://ngrok.com/).
+
+   The configuration of ngrok is outside the scope of this document. Refers to the ngrok's documentation.
+
+   # ensuring that your server is running through http and port 8000
+   ngrok http 8000
+   # then open the link given by the ngrok utility, and you should reach your app
+
+At this step, ensure that you can reach your local app using the ngrok url.
+
+##### Configure Collabora
+
+The collabora server must be executed online and configured to access to your ngrok installation. Ensure that the aliasgroup
+exists for your ngrok application ([See the CODE documentation: ](https://sdk.collaboraonline.com/docs/installation/Configuration.html#multihost-configuration)).
+
+##### Configure your app
+
+Set the `EDITOR_SERVER` variable to point to your collabora server, this should be done in your `.env.local` file.
+
+At this point, everything must be fine. In case of errors, watch the log from your collabora server, use the [profiler](https://symfony.com/doc/current/profiler.html)
+to debug the requests.
+
+   In case of error while validating proof (you'll see those messages in the collabora's logs), you can temporarily disable
+   the proof validation adding this code snippet in `config/services.yaml`:
+
+```yaml
+      when@dev:
+          # add only in the dev environment to avoid security problems
+          services:
+              ChampsLibres\WopiLib\Contract\Service\ProofValidatorInterface:
+                  # this class will always validate proof
+                  alias: Chill\WopiBundle\Service\Wopi\NullProofValidator
+```
+
+### With a local CODE image
+
+   This configuration is not sure and must be refined. The documentation does not seem entirely valid.
+
+##### Use a local domain name and https for your app
+
+Use the proxy feature from the embedded symfony server to run your app. `See the dedicated doc <https://symfony.com/doc/current/setup/symfony_server.html#local-domain-names>[
+
+Configure also the `https certificate ](https://symfony.com/doc/current/setup/symfony_server.html#enabling-tls)
+
+In this example, your local domain name will be `my-domain` and the url will be `https://my-domain.wip`.
+
+Ensure that the proxy is running.
+
+##### Create a certificate database for collabora
+
+Collabora must validate your certificate generated by the symfony console. For that, you need [to create a NSS database](https://sdk.collaboraonline.com/docs/installation/Configuration.html#validating-digital-signatures)
+and configure collabora to use it.
+
+At first, export the certificate for symfony development. Use the graphical interface from your browser to get the
+certificate as a PEM file.
+
+```bash
+   # create your database in a custom directory
+   `mkdir /path/to/your/directory`
+   `certutil -N -d /path/to/your/directory`
+   `cat /path/to/your/ca.crt | certutil -d . -A symfony -t -t C,P,C,u,w -a`
+```
+
+Launch CODE properly configured
+
+```yaml
+     collabora:
+         image: collabora/code:latest
+         environment:
+             - SLEEPFORDEBUGGER=0
+             - DONT_GEN_SSL_CERT="True"
+             # add a path to the database
+             - extra_params=--o:ssl.enable=false --o:ssl.termination=false --o:logging.level=7 -o:certificates.database_path=/etc/custom-certificates/nss-database
+             - username=admin
+             - password=admin
+             - dictionaries=en_US
+             - aliasgroup1=https://my-domain.wip
+         ports:
+             - "127.0.0.1:9980:9980"
+         volumes:
+             - "/path/to/your/directory/nss-database:/etc/custom-certificates/nss-database"
+         extra_hosts:
+             - "my-domain.wip:host-gateway"
+```
+
+##### Configure your app
+
+In your `.env.local` file:
+
+   `EDITOR_SERVER=http://${COLLABORA_HOST}:${COLLABORA_PORT}`
+
+At this step, you should be able to edit a document through collabora.
diff --git a/docs/source/installation/enable-collabora-for-dev.rst b/docs/source/installation/enable-collabora-for-dev.rst
deleted file mode 100644
index 17a9ae1cc..000000000
--- a/docs/source/installation/enable-collabora-for-dev.rst
+++ /dev/null
@@ -1,125 +0,0 @@
-
-Enable CODE for development
-===========================
-
-For editing a document, there must be a way to communicate between the collabora server and the symfony server, in
-both direction. The domain name should also be the same for collabora server and for the browser which access to the
-online editor.
-
-Using ngrok (or other http tunnel)
-----------------------------------
-
-One can configure a tunnel server to expose your local install to the web, and access to your local server using the
-tunnel url.
-
-Start ngrok
-^^^^^^^^^^^
-
-This can be achieve using `ngrok <https://ngrok.com/>`_.
-
-.. note::
-
-   The configuration of ngrok is outside of the scope of this document. Refers to the ngrok's documentation.
-
-.. code-block:: bash
-
-   # ensuring that your server is running through http and port 8000
-   ngrok http 8000
-   # then open the link given by the ngrok utility and you should reach your app
-
-At this step, ensure that you can reach your local app using the ngrok url.
-
-Configure Collabora
-^^^^^^^^^^^^^^^^^^^
-
-The collabora server must be executed online and configure to access to your ngrok installation. Ensure that the aliasgroup
-exists for your ngrok application (`See the CODE documentation: <https://sdk.collaboraonline.com/docs/installation/Configuration.html#multihost-configuration>`_).
-
-Configure your app
-^^^^^^^^^^^^^^^^^^
-
-Set the :code:`EDITOR_SERVER` variable to point to your collabora server, this should be done in your :code:`.env.local` file.
-
-At this point, everything must be fine. In case of errors, watch the log from your collabora server, use the `profiler <https://symfony.com/doc/current/profiler.html>`_
-to debug the requests.
-
-.. note::
-
-   In case of error while validating proof (you'll see those message in the collabora's logs), you can temporarily disable
-   the proof validation adding this code snippet in `config/services.yaml`:
-
-   .. code-block:: yaml
-
-      when@dev:
-          # add only in dev environment, to avoid security problems
-          services:
-              ChampsLibres\WopiLib\Contract\Service\ProofValidatorInterface:
-                  # this class will always validate proof
-                  alias: Chill\WopiBundle\Service\Wopi\NullProofValidator
-
-With a local CODE image
------------------------
-
-.. warning::
-
-   This configuration is not sure, and must be refined. The documentation does not seems to be entirely valid.
-
-Use a local domain name and https for your app
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Use the proxy feature from embedded symfony server to run your app. `See the dedicated doc <https://symfony.com/doc/current/setup/symfony_server.html#local-domain-names>`
-
-Configure also the `https certificate <https://symfony.com/doc/current/setup/symfony_server.html#enabling-tls>`_
-
-In this example, your local domain name will be :code:`my-domain` and the url will be :code:`https://my-domain.wip`.
-
-Ensure that the proxy is running.
-
-Create a certificate database for collabora
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-Collabora must validate your certificate generated by symfony console. For that, you need `to create a NSS database <https://sdk.collaboraonline.com/docs/installation/Configuration.html#validating-digital-signatures>`
-and configure collabora to use it.
-
-At first, export the certificate for symfony development. Use the graphical interface from your browser to get the
-certificate as a PEM file.
-
-.. code-block:: bash
-
-   # create your database in a custom directory
-   mkdir /path/to/your/directory
-   certutil -N -d /path/to/your/directory
-   cat /path/to/your/ca.crt | certutil -d . -A symfony -t -t C,P,C,u,w -a
-
-Launch CODE properly configured
-
-.. code-block:: yaml
-
-     collabora:
-         image: collabora/code:latest
-         environment:
-             - SLEEPFORDEBUGGER=0
-             - DONT_GEN_SSL_CERT="True"
-             # add path to the database
-             - extra_params=--o:ssl.enable=false --o:ssl.termination=false --o:logging.level=7 -o:certificates.database_path=/etc/custom-certificates/nss-database
-             - username=admin
-             - password=admin
-             - dictionaries=en_US
-             - aliasgroup1=https://my-domain.wip
-         ports:
-             - "127.0.0.1:9980:9980"
-         volumes:
-             - "/path/to/your/directory/nss-database:/etc/custom-certificates/nss-database"
-         extra_hosts:
-             - "my-domain.wip:host-gateway"
-
-Configure your app
-^^^^^^^^^^^^^^^^^^
-
-Into your :code:`.env.local` file:
-
-.. code-block:: env
-
-   EDITOR_SERVER=http://${COLLABORA_HOST}:${COLLABORA_PORT}
-
-At this step, you should be able to edit a document through collabora.
diff --git a/docs/source/installation/index.md b/docs/source/installation/index.md
new file mode 100644
index 000000000..674f1525b
--- /dev/null
+++ b/docs/source/installation/index.md
@@ -0,0 +1,43 @@
+# Installation & Usage
+
+You will learn here how to install a new symfony project with chill, and configure it.
+
+## Which kind of installation do I need?
+
+### I want to run chill in production
+
+See the [instructions about installing Chill for production ](installation-production.md).
+
+### I want to add features to the main chill bundles
+
+If you want to add features to chill bundles itself, **and** you want those features to be merged into the chill bundles,
+you can use the "development" installation mode.
+
+See the [instruction for installation for development ](installation-for-dev.md).
+
+### I want to add features to Chill, but keep those features for my instance
+
+Follow the same instruction than for production, until the end.
+
+## Requirements
+
+The installation is tested on a Debian-like linux distribution. The installation on other operating systems is not documented.
+
+You have to install the following tools on your computer:
+
+- [PHP](https://www.php.net/): version 8.3+, with the following extensions: pdo_pgsql, intl, mbstring, zip, bcmath, exif, sockets, redis, ast, gd;
+- [composer ](https://getcomposer.org/);
+- [symfony cli ](https://symfony.com/download);
+- [node, we encourage you to use nvm to configure the correct version ](https://github.com/nvm-sh/nvm): The project contains a
+  `nvmrc` file which selects automatically the required version of node (if present).
+- [yarn](https://classic.yarnpkg.com/lang/en/docs/install/): We use version 1.22+ for now.
+- [docker and the plugin compose ](https://docker.com) to run the database
+
+Chill needs a redis server and a postgresql database, and a few other things like a "relatorio service" which will
+generate documents from templates. **All these things are available through docker using the plugin compose**. We do not provide
+information on how to run this without docker compose.
+
+## Instructions
+
+- [Installation for Development](installation-development.md)
+- [Installation for Production](installation-production.md)
diff --git a/docs/source/installation/index.rst b/docs/source/installation/index.rst
deleted file mode 100644
index fb4cb3cac..000000000
--- a/docs/source/installation/index.rst
+++ /dev/null
@@ -1,67 +0,0 @@
-.. chill-doc documentation master file, created by
-   sphinx-quickstart on Sun Sep 28 22:04:08 2014.
-   You can adapt this file completely to your liking, but it should at least
-   contain the root `toctree` directive.
-
-.. Copyright (C)  2014-2019 Champs Libres Cooperative SCRLFS
-   Permission is granted to copy, distribute and/or modify this document
-   under the terms of the GNU Free Documentation License, Version 1.3
-   or any later version published by the Free Software Foundation;
-   with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-   A copy of the license is included in the section entitled "GNU
-   Free Documentation License".
-
-Installation & Usage
-####################
-
-
-You will learn here how to install a new symfony project with chill, and configure it.
-
-Which can of installation do I need ?
-=====================================
-
-I want to run chill in production
----------------------------------
-
-See the :ref:`instructions about installing Chill for production <installation-production>`.
-
-I want to add features to the main chill bundles
-------------------------------------------------
-
-If you want to add features to chill bundles itself, **and** you want those features to be merged into the chill bundles,
-you can use the "development" installation mode.
-
-See the :ref:`instruction for installation for development <installation-for-dev>`.
-
-I want to add features to Chill, but keep those features for my instance
--------------------------------------------------------------------------
-
-Follow the same instruction than for production, until the end.
-
-Requirements
-============
-
-The installation is tested on a Debian-like linux distribution. The installation on other operating systems is not documented.
-
-You have to install the following tools on your computer:
-
-- `PHP <https://www.php.net/>`_, version 8.3+, with the following extensions: pdo_pgsql, intl, mbstring, zip, bcmath, exif, sockets, redis, ast, gd;
-- `composer <https://getcomposer.org/>`_;
-- `symfony cli <https://symfony.com/download>`_;
-- `node, we encourage you to use nvm to configure the correct version <https://github.com/nvm-sh/nvm>`_. The project contains an
-  :code:`.nvmrc` file which selects automatically the required version of node (if present).
-- `yarn <https://classic.yarnpkg.com/lang/en/docs/install/>`_. We use the version 1.22+ for now.
-- `docker and the plugin compose <https://docker.com>`_ to run the database
-
-Chill needs a redis server and a postgresql database, and a few other things like a "relatorio service" which will
-generate documents from templates. **All these things are available through docker using the plugin compose**. We do not provide
-information on how to run this without docker compose.
-
-Instructions
-============
-
-.. toctree::
-   :maxdepth: 2
-
-   installation-development.rst
-   installation-production.rst
diff --git a/docs/source/installation/installation-development.md b/docs/source/installation/installation-development.md
new file mode 100644
index 000000000..8c79bc8f5
--- /dev/null
+++ b/docs/source/installation/installation-development.md
@@ -0,0 +1,89 @@
+## Installation for development or testing purpose only
+
+⚠️ Use this method for development only. ⚠️
+
+You will need:
+
+- [Composer ](https://getcomposer.org);
+- [Symfony-cli tool ](https://symfony.com/download);
+- [docker ](https://docs.docker.com/engine/install/) and [docker-compose ](https://docs.docker.com/compose/)
+- node > 20 and yarn 1.22
+
+### First initialization
+
+1. clone the repository and move to the cloned directory:
+
+    ```bash
+    git clone https://gitlab.com/Chill-Projet/chill-bundles.git
+    cd chill-bundles
+    ```
+
+2. install dependencies using composer
+
+    ```bash
+    composer install
+    ```
+
+3. Install and compile assets:
+
+    ```bash
+    yarn install
+    yarn run encore production
+    ```
+
+    **note** double-check that you have the node version > 20 using the `node --version` command.
+
+4. Configure your project: create a `.env.local` file at the root, and add the admin password:
+
+    **note** for this installation mode, the environment should always be "dev"
+    ```
+    APP_ENV=dev
+    ADMIN_PASSWORD=\$2y\$13\$iyvJLuT4YEa6iWXyQV4/N.hNHpNG8kXlYDkkt5MkYy4FXcSwYAwmm
+    ```
+    **note**: if you copy-paste the line above, the password will be "admin".
+
+5. Start the stack using `docker compose up -d`, check the status of the start with `docker compose ps`
+
+6. Configure all the necessary third-party tools. On the first start, it may last a bit longer. You can always check with `docker compose ps`
+
+    ```bash
+    # Run migrations
+    symfony console doctrine:migrations:migrate
+
+    # Setup messenger
+    symfony console messenger:setup-transports
+
+    # Prepare some views
+    symfony console chill:db:sync-views
+
+    # Generate jwt token, required for some api features (webdav access, ...)
+    symfony console lexik:jwt:generate-keypair
+    ```
+
+7. Add some fixtures
+
+    This will truncate all the existing data of the database. But remember,
+    we are in dev mode!
+
+    ```bash
+    symfony console doctrine:fixtures:load
+    ```
+
+8. launch symfony dev-server
+
+    ```bash
+    symfony server:start -d
+    ```
+
+And visit the web page it suggests. You can log in with user
+`center a_social` and password `password`, or login `admin` with
+the password you set.
+
+### Stopping the server
+
+   `symfony server:stop`
+
+### Restart the webserver for a later start
+
+   `symfony server:start -d`
+   # this will automatically start the full docker compose services
diff --git a/docs/source/installation/installation-development.rst b/docs/source/installation/installation-development.rst
deleted file mode 100644
index 5977747c6..000000000
--- a/docs/source/installation/installation-development.rst
+++ /dev/null
@@ -1,101 +0,0 @@
-.. _installation-for-dev:
-
-Installation for development or testing purpose only
-====================================================
-
-⚠️ Use this method for development only. ⚠️
-
-You will need:
-
-- `Composer <https://getcomposer.org>`__;
-- `Symfony-cli tool <https://symfony.com/download>`__;
-- `docker <https://docs.docker.com/engine/install/>`__ and
-  `docker-compose <https://docs.docker.com/compose/>`__
-- node > 20 and yarn 1.22
-
-First initialization
---------------------
-
-1. clone the repository and move to the cloned directory:
-
-.. code:: bash
-
-   git clone https://gitlab.com/Chill-Projet/chill-bundles.git
-   cd chill-bundles
-
-2. install dependencies using composer
-
-.. code:: bash
-
-   composer install
-
-3. Install and compile assets:
-
-.. code:: bash
-
-   yarn install
-   yarn run encore production
-
-**note** double check that you have the node version > 20 using the
-``node --version`` command.
-
-4. configure your project: create a ``.env.local`` file at the root, and
-   add the admin password:
-
-.. code:: dotenv
-
-   # for this installation mode, the environment should always be "dev"
-   APP_ENV=dev
-   ADMIN_PASSWORD=\$2y\$13\$iyvJLuT4YEa6iWXyQV4/N.hNHpNG8kXlYDkkt5MkYy4FXcSwYAwmm
-   # note: if you copy-paste the line above, the password will be "admin".
-
-5. start the stack using ``docker compose up -d``, check the status of
-   the start with ``docker compose ps``
-
-6. configure all the needed third-party tools
-
-   .. code:: bash
-
-      # the first start, it may last some seconds, you can check with docker compose ps
-      # run migrations
-      symfony console doctrine:migrations:migrate
-      # setup messenger
-      symfony console messenger:setup-transports
-      # prepare some views
-      symfony console chill:db:sync-views
-      # generate jwt token, required for some api features (webdav access, ...)
-      symfony console lexik:jwt:generate-keypair
-
-7. add some fixtures
-
-This will truncate all the existing data of the database. But remember,
-we are in dev mode !
-
-.. code:: bash
-
-   symfony console doctrine:fixtures:load
-
-8. launch symfony dev-server
-
-.. code:: bash
-
-   symfony server:start -d
-
-And visit the web page it suggest. You can login with user
-``center a_social`` and password ``password``, or login ``admin`` with
-the password you set.
-
-Stopping the server
--------------------
-
-.. code:: bash
-
-   symfony server:stop
-
-Restart the webserver for subsequent start
-------------------------------------------
-
-.. code:: bash
-
-   symfony server:start -d
-   # this will automatically starts the full docker compose services
diff --git a/docs/source/installation/installation-production.md b/docs/source/installation/installation-production.md
new file mode 100644
index 000000000..b85deb7d4
--- /dev/null
+++ b/docs/source/installation/installation-production.md
@@ -0,0 +1,310 @@
+# Install Chill for production with or without adding personal features
+
+Chill is a set of "bundles" for a symfony app.
+
+To run Chill in production or add new features to it (without merging those features to the chill core), you must create
+a symfony app, and eventually add those features into your app.
+
+Once you are happy with the configuration, [you should follow the dedicated instructions of how to go into production for
+Symfony apps ](https://symfony.com/doc/current/deployment.html).
+
+## Install a new app
+
+### Install required dependencies:
+
+- `jq`: https://jqlang.org/ (install it through your package manager);
+- `php`, minimal version: 8.3;
+- `composer`: https://getcomposer.org/download/
+- `symfony-cli`: https://symfony.com/download
+- `docker` with the plugin `compose`: https://docs.docker.com/engine/install/ and https://docs.docker.com/compose/install/
+
+### Initialize the project and it's dependencies
+```bash
+   symfony new --version=5.4 my_chill_project
+   cd my_chill_project
+```
+
+We strongly encourage you to initialize a git repository at this step, to track further changes.
+```bash
+   # add the flex endpoints required for custom recipes
+   `cat <<< "$(jq '.extra.symfony += {"endpoint": ["flex://defaults", "https://gitlab.com/api/v4/projects/57371968/repository/files/index.json/raw?ref=main"]}' composer.json)" > composer.json`
+   # install chill and some dependencies
+   `symfony composer require -W chill-project/chill-bundles ^3.7.1 champs-libres/wopi-lib dev-master@dev champs-libres/wopi-bundle dev-master@dev symfony/amqp-messenger`
+```
+
+We encourage you to accept the inclusion of the "Docker configuration from recipes": this is the documented way to run the database.
+You must also accept to configure recipes from the contrib repository, unless you want to configure the bundles manually).
+
+```bash
+   # fix some configuration
+   ./post-install-chill.sh
+   # populate the cache for the first time. This is necessary to dump some translation files, required for the asset compilation
+   symfony console cache:clear
+   # install node dependencies
+   yarn install
+   # and compile assets
+   yarn run encore production
+```
+
+   If you encounter this error during asset compilation ([yarn run encore production`) (repeated multiple times):
+
+```bash
+  [tsl] ERROR in /tmp/chill/v1/public/bundles/chillcalendar/types.ts(2,65)
+    TS2307: Cannot find module '../../../ChillMainBundle/Resources/public/types' or its corresponding type declarations.
+```
+
+   run:
+
+```bash
+  rm -rf public/bundles/*
+```
+
+   Then restart the compilation of assets (```yarn run encore production```)
+
+### Configure your project
+
+You should read the configuration files in `chill/config/packages` carefully, especially if you have
+custom developments. But most of the time, this should be fine.
+
+You have to configure some local variables, which are described in the `.env` file. The secrets should not be stored
+in this `.env` file, but instead using the `secrets management tool ](https://symfony.com/doc/current/configuration/secrets.html)
+or in the `.env.local` file, which should not be committed to the git repository.
+
+You do not need to set variables for the smtp server, redis server and relatorio server, as they are generated automatically
+by the symfony server, from the docker compose services.
+
+The required variables are:
+
+- the `ADMIN_PASSWORD`;
+- the `OVHCLOUD_DSN` variable;
+
+##### `ADMIN_PASSWORD`
+
+You can generate a hashed and salted admin password using the command:
+`symfony console security:hash-password <your password> 'Symfony\Component\Security\Core\User\User'`
+
+Then, you can either:
+
+- add this password to the `.env.local` file, you must escape the character `$`: if the generated password
+  is `$2y$13$iyvJLuT4YEa6iWXyQV4/N.hNHpNG8kXlYDkkt5MkYy4FXcSwYAwmm`, your `.env.local` file will be:
+
+  ```bash
+     ADMIN_PASSWORD=\$2y\$13\$iyvJLuT4YEa6iWXyQV4/N.hNHpNG8kXlYDkkt5MkYy4FXcSwYAwmm
+     # note: if you copy-paste the line above, the password will be "admin".
+  ```
+
+- add the generated password to the secrets manager (**note**: you must add the generated hashed password to the secrets env,
+  not the password in clear text).
+
+##### `OVHCLOUD_DSN` and sending SMS messages
+
+This is a temporary dependency, for ensuring compatibility for previous behaviour.
+
+You can set it to `null://null` if you do not plan to use sending SMS.
+
+   OVHCLOUD_DSN=null://null
+
+If you plan to do it, you can configure the notifier component `as described in the [symfony documentation](https://symfony.com/doc/current/notifier.html#notifier-sms-channel).
+
+Some environment variables are available for the JWT authentication bundle in the `.env` file.
+
+### Prepare database, messenger queue, and other configuration
+
+To continue the installation process, you will have to run migrations:
+
+```bash
+   # start databases and other services
+   docker compose up -d
+   # the first start, it may last some seconds, you can check with docker compose ps
+   # run migrations
+   symfony console doctrine:migrations:migrate
+   # setup messenger
+   symfony console messenger:setup-transports
+   # prepare some views
+   symfony console chill:db:sync-views
+   # load languages data
+   symfony console chill:main:languages:populate
+   # generate jwt token, required for some api features (webdav access, ...)
+   symfony console lexik:jwt:generate-keypair
+```
+
+   If you encounter this error:
+
+```
+No transport supports the given Messenger DSN.
+```
+
+   Please check that you installed the package `symfony/amqp-messenger`.
+
+### Start your web server locally
+
+At this step, Chill will be ready to be served locally, but without any configuration. You can run the project
+locally using the `local symfony server ](https://symfony.com/doc/current/setup/symfony_server.html):
+
+```bash
+   # see the whole possibilities at https://symfony.com/doc/current/setup/symfony_server.html
+   symfony server:start -d
+```
+
+If you need to test the instance with accounts and some basic configuration, please install the fixtures (see below).
+
+## Add capabilities for dev
+
+If you need to add custom bundles, you can develop them in the `src/` directory, like for any other symfony project. You
+can rely on the whole chill framework, meaning there is no need to add them to the original `chill-bundles`.
+
+You will require some bundles to have the following development tools:
+
+- add fixtures
+- add profiler and debug bundle
+
+### Install fixtures
+
+```bash
+   # generate fixtures for chill
+   symfony composer require --dev doctrine/doctrine-fixtures-bundle nelmio/alice
+   # now, you can generate fixtures (this will reset your database)
+   symfony console doctrine:fixtures:load
+```
+
+This will generate user accounts, centers, and some basic configuration.
+
+The accounts created are: `center a_social`, `center b_social`, `center a_direction`, ...
+
+The full list is visible in the "users" table: `docker compose exec database psql -U app -c "SELECT username FROM users"`.
+
+The password is always `password`.
+
+The fixtures are not fully functional. See the `corresponding issue ](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/280).
+
+### Add web profiler and debugger
+
+```bash
+   symfony composer require --dev symfony/web-profiler-bundle symfony/debug-bundle
+```
+
+### Working on chill bundles
+
+If you plan to improve the chill-bundles repository, that's great!
+
+It would be better [to follow the instruction about development ](installation-for-dev.md). But if those features are
+deeply linked to some dev you made in the app, it can be easier to develop within the [vendor/` directory.
+
+You will have to download chill-bundles as a git repository (and not as an archive, which is barely editable).
+
+In your `composer.json` file, add these lines:
+
+```bash
+    {
+        "config": {
+   +        "preferred-install": {
+   +            "chill-project/chill-bundles": "source",
+                "*": "dist"
+   +         }
+        }
+```
+
+Then, run `symfony composer reinstall chill-project/chill-bundles` to re-install the package from source.
+
+## Update
+
+In order to update your app, you must update dependencies:
+
+- for chill-bundles, you can `set the last version ](https://gitlab.com/Chill-Projet/chill-bundles/-/releases) manually
+  in the [composer.json` file, or set the version to `^3.0.0` and run `symfony composer update` regularly
+- run `composer update` and `yarn update` to maintain your dependencies up-to-date.
+
+After each update, you must update your database schema:
+
+```bash
+   symfony console doctrine:migrations:migrate
+   symfony console chill:db:sync-views
+```
+
+## Commit and share your project
+
+If multiple developers work on a project, you can commit your symfony project and share it with other people.
+
+When another developer clones your project, they will have to:
+
+- run `symfony composer install` and `yarn install` to install the same dependencies as the initial developer;
+- run `yarn run encore production` to compile assets;
+- copy any possible variables from the `.env.local` files;
+- start the docker compose stack, using `docker compose`, and run migrations, set up transports, and prepare chill db views
+  (see the corresponding command above)
+
+## Operations
+
+### Build assets
+
+run those commands:
+
+```bash
+   # for production (or in dev, when you don't need to work on your assets and need some speed)
+   yarn run encore production
+   # in dev, when you want to reload the assets on each changes
+   yarn run encore dev --watch`
+```
+
+### How to execute the console ?
+
+```bash
+   # start the console with all required variables
+   symfony console
+   # you can add your command after that:
+   symfony console list
+```
+
+### How to generate documents
+
+Documents are generated asynchronously by [consuming messages](https://symfony.com/doc/current/messenger.html#consuming-messages-running-the-worker).
+
+You must generate them using a dedicated process:
+
+   `symfony console messenger:consume async priority`
+
+To avoid memory issues, we encourage you to also use the `--limit` parameter of the command.
+
+### How to read emails sent by the program ?
+
+In development, there is a built-in "mail catcher". Open it with `symfony open:local:webmail`
+
+### How to run cron-jobs ?
+
+Some commands must be executed in [cron jobs ](cronjob.md). To execute them:
+
+   `symfony console chill:cron-job:execute`
+
+### What about materialized views ?
+
+There are some materialized views in chill, to speed up some complex computations in the database.
+
+In order to refresh them, run a cron job or refresh them manually in your database.
+
+## Troubleshooting
+
+### Error `An exception has been thrown during the rendering of a template ("Asset manifest file "/var/www/app/web/build/manifest.json" does not exist.").` on first run
+
+Build assets, see above.
+
+## Go to production
+
+Currently, to run this software in production, the *state of the art* is the following :
+
+1. Run the software locally and tweak the configuration to your needs ;
+2. Build the image and store it in a private container registry.
+
+   In production, you **must** set these variables:
+
+   * ``APP_ENV`` to ``prod``
+   * ``APP_DEBUG`` to ``false``
+
+   There are security issues if you keep the same variables as for production.
+
+## Going further
+
+- [Production Setup](prod.md)
+- [Document Storage](document-storage.md)
+- [Load Addresses](load-addresses.md)
+- [Production Calendar SMS Sending](prod-calendar-sms-sending.md)
+- [Microsoft Graph Configuration](msgraph-configure.md)
diff --git a/docs/source/installation/installation-production.rst b/docs/source/installation/installation-production.rst
deleted file mode 100644
index 7169af5d8..000000000
--- a/docs/source/installation/installation-production.rst
+++ /dev/null
@@ -1,365 +0,0 @@
-.. _installation-production:
-
-Install Chill for production with or without adding personal features
-#####################################################################
-
-Chill is a set of "bundles" for a symfony app.
-
-To run Chill in production or add new features to it (without merging those features to the chill core), you must create
-a symfony app, and eventually add those features into your app.
-
-Once you are happy with the configuration, `you should follow the dedicated instructions of how to go into production for
-Symfony apps <https://symfony.com/doc/current/deployment.html>`_.
-
-Install a new app
-=================
-
-Install required dependencies:
-------------------------------
-
-- `jq`: https://jqlang.org/ (install it through your package manager);
-- `php`, minimal version: 8.3;
-- `composer`: https://getcomposer.org/download/
-- `symfony-cli`: https://symfony.com/download
-- `docker` with the plugin `compose`: https://docs.docker.com/engine/install/ and https://docs.docker.com/compose/install/
-
-
-Initialize project and dependencies
------------------------------------
-
-.. code-block:: bash
-
-   symfony new --version=5.4 my_chill_project
-   cd my_chill_project
-
-We strongly encourage you to initialize a git repository at this step, to track further changes.
-
-.. code-block:: bash
-
-   # add the flex endpoints required for custom recipes
-   cat <<< "$(jq '.extra.symfony += {"endpoint": ["flex://defaults", "https://gitlab.com/api/v4/projects/57371968/repository/files/index.json/raw?ref=main"]}' composer.json)" > composer.json
-   # install chill and some dependencies
-   symfony composer require -W chill-project/chill-bundles ^3.7.1 champs-libres/wopi-lib dev-master@dev champs-libres/wopi-bundle dev-master@dev symfony/amqp-messenger
-
-We encourage you to accept the inclusion of the "Docker configuration from recipes": this is the documented way to run the database.
-You must also accept to configure recipes from the contrib repository, unless you want to configure the bundles manually).
-
-.. code-block:: bash
-
-   # fix some configuration
-   ./post-install-chill.sh
-   # populate the cache for the first time. This is necessary to dump some translation files, required for the assets compilation
-   symfony console cache:clear
-   # install node dependencies
-   yarn install
-   # and compile assets
-   yarn run encore production
-
-.. note::
-
-   If you encounter this error during assets compilation (:code:`yarn run encore production`) (repeated multiple times):
-
-   .. code-block::
-
-      [tsl] ERROR in /tmp/chill/v1/public/bundles/chillcalendar/types.ts(2,65)
-            TS2307: Cannot find module '../../../ChillMainBundle/Resources/public/types' or its corresponding type declarations.
-
-   run:
-
-   .. code-block:: bash
-
-      rm -rf public/bundles/*
-
-   Then restart the compilation of assets (:code:```yarn run encore production```)
-
-Configure your project
-----------------------
-
-You should read the configuration files in :code:`chill/config/packages` carefully, especially if you have
-custom developments. But most of the time, this should be fine.
-
-You have to configure some local variables, which are described in the :code:`.env` file. The secrets should not be stored
-in this :code:`.env` file, but instead using the `secrets management tool <https://symfony.com/doc/current/configuration/secrets.html>`_
-or in the :code:`.env.local` file, which should not be committed to the git repository.
-
-You do not need to set variables for the smtp server, redis server and relatorio server, as they are generated automatically
-by the symfony server, from the docker compose services.
-
-The required variables are:
-
-- the :code:`ADMIN_PASSWORD`;
-- the :code:`OVHCLOUD_DSN` variable;
-
-:code:`ADMIN_PASSWORD`
-^^^^^^^^^^^^^^^^^^^^^^
-
-You can generate a hashed and salted admin password using the command
-:code:`symfony console security:hash-password <your password> 'Symfony\Component\Security\Core\User\User'`.Then,
-you can either:
-
-- add this password to the :code:`.env.local` file, you must escape the character :code:`$`: if the generated password
-  is :code:`$2y$13$iyvJLuT4YEa6iWXyQV4/N.hNHpNG8kXlYDkkt5MkYy4FXcSwYAwmm`, your :code:`.env.local` file will be:
-
-  .. code-block:: bash
-
-     ADMIN_PASSWORD=\$2y\$13\$iyvJLuT4YEa6iWXyQV4/N.hNHpNG8kXlYDkkt5MkYy4FXcSwYAwmm
-     # note: if you copy-paste the line above, the password will be "admin".
-
-- add the generated password to the secrets manager (**note**: you must add the generated hashed password to the secrets env,
-  not the password in clear text).
-
-:code:`OVHCLOUD_DSN` and sending SMS messages
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-This is a temporary dependency, for ensuring compatibility for previous behaviour.
-
-You can set it to :code:`null://null` if you do not plan to use sending SMS.
-
-.. code-block:: bash
-
-   OVHCLOUD_DSN=null://null
-
-If you plan to do it, you can configure the notifier component `as described in the symfony documentation <https://symfony.com/doc/current/notifier.html#notifier-sms-channel>`_.
-
-
-Some environment variables are available for the JWT authentication bundle in the :code:`.env` file.
-
-Prepare database, messenger queue, and other configuration
-----------------------------------------------------------
-
-To continue the installation process, you will have to run migrations:
-
-.. code-block:: bash
-
-   # start databases and other services
-   docker compose up -d
-   # the first start, it may last some seconds, you can check with docker compose ps
-   # run migrations
-   symfony console doctrine:migrations:migrate
-   # setup messenger
-   symfony console messenger:setup-transports
-   # prepare some views
-   symfony console chill:db:sync-views
-   # load languages data
-   symfony console chill:main:languages:populate
-   # generate jwt token, required for some api features (webdav access, ...)
-   symfony console lexik:jwt:generate-keypair
-
-.. note::
-
-   If you encounter this error:
-
-   .. code-block::
-
-     No transport supports the given Messenger DSN.
-
-   Please check that you installed the package `symfony/amqp-messenger`.
-
-
-
-Start your web server locally
------------------------------
-
-At this step, Chill will be ready to be served locally, but without any configuration. You can run the project
-locally using the `local symfony server <https://symfony.com/doc/current/setup/symfony_server.html>`_:
-
-.. code-block:: bash
-
-   # see the whole possibilities at https://symfony.com/doc/current/setup/symfony_server.html
-   symfony server:start -d
-
-
-If you need to test the instance with accounts and some basic configuration, please install the fixtures (see below).
-
-
-Add capabilities for dev
-========================
-
-If you need to add custom bundles, you can develop them in the `src/` directory, like for any other symfony project. You
-can rely on the whole chill framework, meaning there is no need to add them to the original `chill-bundles`.
-
-You will require some bundles to have the following development tools:
-
-- add fixtures
-- add profiler and debug bundle
-
-Install fixtures
-----------------
-
-.. code-block:: bash
-
-   # generate fixtures for chill
-   symfony composer require --dev doctrine/doctrine-fixtures-bundle nelmio/alice
-   # now, you can generate fixtures (this will reset your database)
-   symfony console doctrine:fixtures:load
-
-This will generate user accounts, centers, and some basic configuration.
-
-The accounts created are: :code:`center a_social`, :code:`center b_social`, :code:`center a_direction`, ...  The full list is
-visible in the "users" table: :code:`docker compose exec database psql -U app -c "SELECT username FROM users"`.
-
-The password is always :code:`password`.
-
-.. warning::
-
-   The fixtures are not fully functional. See the `corresponding issue <https://gitlab.com/Chill-Projet/chill-bundles/-/issues/280>`_.
-
-Add web profiler and debugger
------------------------------
-
-.. code-block:: bash
-
-   symfony composer require --dev symfony/web-profiler-bundle symfony/debug-bundle
-
-Working on chill bundles
-------------------------
-
-If you plan to improve the chill-bundles repository, that's great!
-
-It would be better :ref:`to follow the instruction about development <installation-for-dev>`. But if those features are
-deeply linked to some dev you made in the app, it can be easier to develop within the :code:`vendor/` directory.
-
-You will have to download chill-bundles as a git repository (and not as an archive, which is barely editable).
-
-In your :code:`composer.json` file, add these lines:
-
-.. code-block:: diff
-
-    {
-        "config": {
-   +        "preferred-install": {
-   +            "chill-project/chill-bundles": "source",
-                "*": "dist"
-   +         }
-        }
-
-Then, run :code:`symfony composer reinstall chill-project/chill-bundles` to re-install the package from source.
-
-
-Update
-======
-
-In order to update your app, you must update dependencies:
-
-- for chill-bundles, you can `set the last version <https://gitlab.com/Chill-Projet/chill-bundles/-/releases>`_ manually
-  in the :code:`composer.json` file, or set the version to `^3.0.0` and run :code:`symfony composer update` regularly
-- run :code:`composer update` and :code:`yarn update` to maintain your dependencies up-to-date.
-
-After each update, you must update your database schema:
-
-.. code-block:: bash
-
-   symfony console doctrine:migrations:migrate
-   symfony console chill:db:sync-views
-
-
-Commit and share your project
-=============================
-
-If multiple developers work on a project, you can commit your symfony project and share it with other people.
-
-When another developer clones your project, they will have to:
-
-- run :code:`symfony composer install` and :code:`yarn install` to install the same dependencies as the initial developer;
-- run :code:`yarn run encore production` to compile assets;
-- copy any possible variables from the :code:`.env.local` files;
-- start the docker compose stack, using :code:`docker compose`, and run migrations, set up transports, and prepare chill db views
-  (see the corresponding command above)
-
-Operations
-==========
-
-Build assets
-------------
-
-run those commands:
-
-.. code-block:: bash
-
-   # for production (or in dev, when you don't need to work on your assets and need some speed)
-   yarn run encore production
-   # in dev, when you wan't to reload the assets on each changes
-   yarn run encore dev --watch
-
-How to execute the console ?
-----------------------------
-
-.. code-block:: bash
-
-   # start the console with all required variables
-   symfony console
-   # you can add your command after that:
-   symfony console list
-
-How to generate documents
--------------------------
-
-Documents are generated asynchronously by `"consuming messages" <https://symfony.com/doc/current/messenger.html#consuming-messages-running-the-worker>`_.
-
-You must generate them using a dedicated process:
-
-.. code-block:: bash
-
-   symfony console messenger:consume async priority
-
-To avoid memory issues, we encourage you to also use the :code:`--limit` parameter of the command.
-
-How to read emails sent by the program ?
--------------------------------------------
-
-In development, there is a built-in "mail catcher". Open it with :code:`symfony open:local:webmail`
-
-How to run cron-jobs ?
-----------------------
-
-Some commands must be executed in :ref:`cron jobs <cronjob>`. To execute them:
-
-.. code-block:: bash
-
-   symfony console chill:cron-job:execute
-
-What about materialized views ?
--------------------------------
-
-There are some materialized views in chill, to speed up some complex computations in the database.
-
-In order to refresh them, run a cron job or refresh them manually in your database.
-
-
-Troubleshooting
-===============
-
-Error `An exception has been thrown during the rendering of a template ("Asset manifest file "/var/www/app/web/build/manifest.json" does not exist.").` on first run
---------------------------------------------------------------------------------------------------------------------------------------------------------------------
-
-Build assets, see above.
-
-Go to production
-================
-
-Currently, to run this software in production, the *state of the art* is the following :
-
-1. Run the software locally and tweak the configuration to your needs ;
-2. Build the image and store it in a private container registry.
-
-.. warning::
-
-   In production, you **must** set these variables:
-
-   * ``APP_ENV`` to ``prod``
-   * ``APP_DEBUG`` to ``false``
-
-   There are security issues if you keep the same variables as for production.
-
-
-Going further
-=============
-
-.. toctree::
-   :maxdepth: 2
-
-   prod.rst
-   document-storage.rst
-   load-addresses.rst
-   prod-calendar-sms-sending.rst
-   msgraph-configure.rst
diff --git a/docs/source/installation/load-addresses.md b/docs/source/installation/load-addresses.md
new file mode 100644
index 000000000..2e4b193f8
--- /dev/null
+++ b/docs/source/installation/load-addresses.md
@@ -0,0 +1,47 @@
+###### Addresses
+
+Chill can store a list of geolocated address references, which are used to suggest address and ensure that the data is correctly stored.
+
+Those addresses may be loaded from a dedicated source.
+
+## Countries
+
+To load addresses into the chill application we first have to make sure that a list of countries is present.
+To import, the countries run the following command.
+
+    bin/console chill:main:countries:populate
+
+## In France
+
+The address is loaded from the [BANO ](https://bano.openstreetmap.fr/). The postal codes are loaded from [the official list of
+postal codes ](https://datanova.laposte.fr/explore/dataset/laposte_hexasmal/information/)
+
+   # first, load postal codes
+   `bin/console chill:main:postal-code:load:FR`
+   # then, load all addresses by departement (multiple departements can be loaded by repeating the departement code
+   `bin/console chill:main:address-ref-from-bano 57 54 51`
+
+## In Belgium
+
+Addresses are prepared from the [BeST Address data ](https://www.geo.be/catalog/details/ca0fd5c0-8146-11e9-9012-482ae30f98d9).
+
+Postal code is loaded from this database. There is no need to load postal codes from another source (actually, this is strongly discouraged).
+
+The data are prepared for Chill ([See this repository ](https://gitea.champs-libres.be/Chill-project/belgian-bestaddresses-transform/releases)).
+One can select postal code by his first number (`1xxx` for postal codes from 1000 to 1999), or a limited list for development purpose.
+
+The command expects a language code as the first argument.
+
+   # load postal code from 1000 to 3999:
+   `bin/console chill:main:address-ref-from-best-addresse fr 1xxx 2xxx 3xxx`
+
+   # load only an extract (for dev purposes)
+   `bin/console chill:main:address-ref-from-best-addresse fr extract`
+
+   # load full addresses (discouraged)
+   `bin/console chill:main:address-ref-from-best-addresse fr full`
+
+   There is a possibility to load the full list of addresses is discouraged: the loading is optimized with smaller extracts.
+
+   Once you load the full list, it is not possible to load a smaller extract: each extract loaded **after** will not
+   delete the addresses loaded with the full extract (and some addresses will be present twice).
diff --git a/docs/source/installation/load-addresses.rst b/docs/source/installation/load-addresses.rst
deleted file mode 100644
index 641325dee..000000000
--- a/docs/source/installation/load-addresses.rst
+++ /dev/null
@@ -1,62 +0,0 @@
-
-.. _addresses:
-
-Addresses
-*********
-
-Chill can store a list of geolocated address references, which are used to suggest address and ensure that the data is correctly stored.
-
-Those addresses may be load from a dedicated source.
-
-Countries
-=========
-
-In order to load addresses into the chill application we first have to make sure that a list of countries is present.
-To import the countries run the following command.
-
-.. code-block:: bash
-
-    bin/console chill:main:countries:populate
-
-In France
-=========
-
-The address are loaded from the `BANO <https://bano.openstreetmap.fr/>`_. The postal codes are loaded from `the official list of
-postal codes <https://datanova.laposte.fr/explore/dataset/laposte_hexasmal/information/>`_
-
-.. code-block:: bash
-
-   # first, load postal codes
-   bin/console chill:main:postal-code:load:FR
-   # then, load all addresses, by departement (multiple departement can be loaded by repeating the departement code
-   bin/console chill:main:address-ref-from-bano 57 54 51
-
-In Belgium
-==========
-
-Addresses are prepared from the `BeST Address data <https://www.geo.be/catalog/details/ca0fd5c0-8146-11e9-9012-482ae30f98d9>`_.
-
-Postal code are loaded from this database. There is no need to load postal codes from another source (actually, this is strongly discouraged).
-
-The data are prepared for Chill (`See this repository <https://gitea.champs-libres.be/Chill-project/belgian-bestaddresses-transform/releases>`_).
-One can select postal code by his first number (:code:`1xxx` for postal codes from 1000 to 1999), or a limited list for development purpose.
-
-The command expects a language code as first argument.
-
-.. code-block:: bash
-
-   # load postal code from 1000 to 3999:
-   bin/console chill:main:address-ref-from-best-addresse fr 1xxx 2xxx 3xxx
-
-   # load only an extract (for dev purposes)
-   bin/console chill:main:address-ref-from-best-addresse fr extract
-
-   # load full addresses (discouraged)
-   bin/console chill:main:address-ref-from-best-addresse fr full
-
-.. note::
-
-   There is a possibility to load the full list of addresses is discouraged: the loading is optimized with smaller extracts.
-
-   Once you load the full list, it is not possible to load smaller extract: each extract loaded **after** will not
-   delete the addresses loaded with the full extract (and some addresses will be present twice).
diff --git a/docs/source/installation/msgraph-configure.rst b/docs/source/installation/msgraph-configure.md
similarity index 60%
rename from docs/source/installation/msgraph-configure.rst
rename to docs/source/installation/msgraph-configure.md
index 5655e9ff2..e6d6003a9 100644
--- a/docs/source/installation/msgraph-configure.rst
+++ b/docs/source/installation/msgraph-configure.md
@@ -1,70 +1,59 @@
-
-Configure Chill for calendar and absence synchronisation and SSO with Microsoft Graph (Outlook)
-===============================================================================================
+## Configure Chill for calendar and absence synchronisation and SSO with Microsoft Graph (Outlook)
 
 Chill offers the possibility to:
 
 * authenticate users using Microsoft Graph, with relatively small adaptations;
-* synchronize calendar in both ways (`see the user manual for a large description of the feature <https://gitea.champs-libres.be/Chill-project/manuals>`_).
+* synchronize calendar in both ways ([see the user manual for a large description of the feature ](https://gitea.champs-libres.be/Chill-project/manuals)).
 
-Both can be configured separately (synchronising calendars without SSO, or SSO without calendar).
+Both can be configured separately (synchronising calendars without SSO, or SSO without a calendar).
 
 Please note that the user's email address is the key to associate Chill's users with Microsoft's ones.
 
-Configure SSO
--------------
+### Configure SSO
 
-On Azure side
-*************
+###### On the Azure side
 
-Configure an app with the Azure interface, and give it the name of your choice.
+Configure an app with the Azure interface and give it the name of your choice.
 
 Grab the tenant's ID for your app, which is visible on the main tab "Vue d'ensemble":
 
-.. figure:: ./saml_login_id_general.png
+This is the variable which will be named `SAML_IDP_APP_UUID`.
 
-This the variable which will be named :code:`SAML_IDP_APP_UUID`.
+Go to the "Single sign-on" ("Authentication unique") section. Choose "SAML" as a protocol and fill those values:
 
-Go to the "Single sign-on" ("Authentication unique") section. Choose "SAML" as protocol, and fill those values:
+1. The `entityId` seems to be arbitrary. This will be your variable `SAML_ENTITY_ID`;
+2. The url response must be your Chill's URL appended by `/saml/acs`
+3. The only used attributes is `emailaddress`, which must match the user's email one.
 
-.. figure:: ./saml_login_1.png
+You must download the certificate, as base64. The format for the download is `cer`: you will remove the first and last line
 
-1. The :code:`entityId` seems to be arbitrary. This will be your variable :code:`SAML_ENTITY_ID`;
-2. The url response must be your Chill's URL appended by :code:`/saml/acs`
-3. The only used attributes is :code:`emailaddress`, which must match the user's email one.
+(the ones with `-----BEGIN CERTIFICATE-----` and `-----END CERTIFICATE-----`),
 
-.. figure:: ./saml_login_2.png
+and remove all the return line. The final result should be something as `MIIAbcdef...XyZA=`.
 
-You must download the certificate, as base64. The format for the download is :code:`cer`: you will remove the first and last line (the ones with :code:`-----BEGIN CERTIFICATE-----` and :code:`-----END CERTIFICATE-----`), and remove all the return line. The final result should be something as :code:`MIIAbcdef...XyZA=`.
-
-This certificat will be your :code:`SAML_IDP_X509_CERT` variable.
+This certificat will be your `SAML_IDP_X509_CERT` variable.
 
 The url login will be filled automatically with your tenant id.
 
-Do not forget to provider user's accesses to your app, using the "Utilisateurs et groupes" tab:
+Remember to provider user's access to your app, using the "Utilisateurs et groupes" tab:
 
-.. figure:: ./saml_login_appro.png
-
-
-You must know have gathered all the required variables for SSO:
-
-.. code-block::
+You must now have gathered all the required variables for SSO:
 
+```bash
    SAML_BASE_URL=https://test.chill.be # must be
    SAML_ENTITY_ID=https://test.chill.be # must match the one entered
    SAML_IDP_APP_UUID=42XXXXXX-xxxx-xxxx-xxxx-xxxxxxxxxxxx
    SAML_IDP_X509_CERT: MIIC...E8u3bk # truncated
+```
 
-Configure chill app
-*******************
+###### Configure chill app
 
-* add the bundle :code:`hslavich/oneloginsaml-bundle`
+* add the bundle `hslavich/oneloginsaml-bundle`
 * add the configuration file (see example above)
 * configure the security part (see example above)
 * add a user SAML factory into your src, and register it
 
-
-.. code-block:: yaml
+```yaml
 
    # config/packages/hslavich_onelogin.yaml
 
@@ -74,7 +63,6 @@ Configure chill app
      saml_idp_x509cert: '%env(resolve:SAML_IDP_X509_CERT)%'
      saml_idp_app_uuid: '%env(resolve:SAML_IDP_APP_UUID)%'
 
-
    hslavich_onelogin_saml:
      # Basic settings
      idp:
@@ -124,16 +112,14 @@ Configure chill app
          name: 'Example'
          displayname: 'Example'
          url: 'http://example.com'
+```
 
-
-.. code-block:: yaml
-
+```yaml
    # config/security.yaml
    # merge this with other existing configurations
 
    security:
 
-
        providers:
            saml_provider:
                # Loads user from user repository
@@ -143,7 +129,6 @@ Configure chill app
 
        firewalls:
 
-
            default:
                # saml part:
                saml:
@@ -158,10 +143,9 @@ Configure chill app
                    login_path: saml_login
                logout:
                    path: /saml/logout
+```
 
-
-.. code-block:: php
-
+```php
    // src/Security/SamlFactory.php
 
    namespace App\Security;
@@ -185,105 +169,86 @@ Configure chill app
            return $user;
        }
    }
+```
 
-
-
-Configure sync and calendar access
-----------------------------------
+### Configure sync and calendar access
 
 The purpose of this configuration is the following:
 
 - let user read their calendar and shared calendar within Chill (with the same permissions as the one configured in Outlook / Azure);
-- allow chill instance to write appointment ("Rendez-vous") into their calendar, and invite other users to their appointment;
-- allow chill instance to be notified if an appoint is added or removed by the user within another interface than Chill: if the appointment match another one created in the Chill interface, the date and time are updated in Chill;
+- allow chill instance to write appointment ("Rendez-vous") into their calendar and invite other users to their appointment;
+- allow chill instance to be notified if an appointment is added or removed by the user within another interface than Chill: if the appointment matches another one created in the Chill interface, the date and time are updated in Chill;
 - allow chill instance to read the absence of the user and, if set, mark the user as absent in Chill;
 
-The sync processe might be configured in the same app, or into a different app on the Azure side.
+The sync process might be configured in the same app, or into a different app on the Azure side.
 
 The synchronization processes use Oauth 2.0 / OpenID Connect for authentication and authorization.
 
-.. note::
-
    Two flows are in use:
 
-   * we authenticate "on behalf of a user", to allow users to see their own calendar or other user's calendar into the web interface.
+   * we authenticate "on behalf of a user", to allow users to see their own calendar or another user's calendar into the web interface.
 
-     Typically, when the page is loaded, Chill first check that an authorization token exists. If not, the user is redirected to Microsoft Azure for authentification and a new token is grabbed (most of the times, this is transparent for users).
+     Typically, when the page is loaded, Chill first checks that an authorization token exists. If not, the user is redirected to Microsoft Azure for authentification, and a new token is grabbed (most of the times, this is transparent for users).
 
    * Chill also acts "as a machine", to synchronize calendars with a daemon background.
 
 One can access the configuration using this screen (it is quite well hidden into the multiple of tabs):
 
-.. figure:: ./oauth_app_registration.png
+   You can find the oauth configuration on the "Securité > Autorisations" tab and click on "application registration" (not translated).
 
-   You can find the oauth configuration on the "Securité > Autorisations" tab, and click on "application registration" (not translated).
+Add a redirection URI for your authentification:
 
-Add a redirection URI for you authentification:
-
-.. figure:: ./oauth_api_authentification.png
-
-   The URI must be "your chill public url" with :code:`/connect/azure/check` at the end.
+   The URI must be "your chill public url" with `/connect/azure/check` at the end.
 
 Allow some authorizations for your app:
 
-.. figure:: ./oauth_api_autorisees.png
-
-Take care of the separation between autorization "on behalf of a user" (déléguée), or "for a machine" (application).
+Take care of the separation between authorization "on behalf of a user" (déléguée), or "for a machine" (application).
 
 Some explanation:
 
-* Users must be allowed to read their user profile (:code:`User.Read`), and the profile of other users (:code:`User.ReadBasicAll`);
-* They must be allowed to read their calendar (:code:`Calendars.Read`), and the calendars shared with them (:code:`Calendars.Read.Shared`);
+* Users must be allowed to read their user profile (`User.Read`), and the profile of other users (`User.ReadBasicAll`);
+* They must be allowed to read their calendar (`Calendars.Read`), and the calendars shared with them (`Calendars.Read.Shared`);
 
 The sync daemon must have write access:
 
-* the daemon must be allowed to read all users and their profile, to establish a link between them and the Chill's users: (:code:`Users.Read.All`);
-* it must also be allowed to read and write into the calendars (:code:`Calendars.ReadWrite.All`);
-* for sending invitation to other users, the permission (:code:`Mail.Send`) must be granted;
-* and, for reading the absence status of the user and sync it with chill, it must be able to read the mailboxSettings (:code:`MailboxSettings.Read`).
+* the daemon must be allowed to read all users and their profile, to establish a link between them and the Chill's users: (`Users.Read.All`);
+* it must also be allowed to read and write into the calendars (`Calendars.ReadWrite.All`);
+* for sending invitation to other users, the permission (`Mail.Send`) must be granted;
+* and, for reading the absence status of the user and sync it with chill, it must be able to read the mailboxSettings (`MailboxSettings.Read`).
 
-At this step, you might choose to accept those permissions for all users, or let them do it by yourself.
-
-Grab your client id:
-
-.. figure:: ./oauth_api_client_id.png
-
-This will be your :code:`OAUTH_AZURE_CLIENT_ID` variable.
+At this step, you might choose to accept those permissions for all users or let them do it by yourself.
 
 
-Generate a secret:
+Grab your client id: This will be your `OAUTH_AZURE_CLIENT_ID` variable.
 
-.. figure:: ./oauth_api_secret.png
+Generate a secret: This will be your `OAUTH_AZURE_CLIENT_SECRET` variable.
 
-This will be your :code:`OAUTH_AZURE_CLIENT_SECRET` variable.
-
-And get you azure's tenant id, which is the same as the :code:`SAML_IDP_APP_UUID` (see above).
+And get you azure's tenant id, which is the same as the `SAML_IDP_APP_UUID` (see above).
 
 Your variables will be:
 
-.. code-block::
-
+```bash
    OAUTH_AZURE_CLIENT_ID=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
    OAUTH_AZURE_CLIENT_TENANT=xxxxxxxx-xxxx-xxxx-xxxx-xxxxxxxxxxxx
    OAUTH_AZURE_CLIENT_SECRET: 3-xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+```
 
 Then, configure chill:
 
-Enable the calendar sync with microsoft azure:
-
-.. code-block:: yaml
+Enable the calendar sync with Microsoft Azure:
 
+```yaml
    # config/packages/chill_calendar.yaml
 
    chill_calendar:
        remote_calendars_sync:
            microsoft_graph:
                enabled: true
+```
 
 and configure the oauth client:
 
-.. code-block:: yaml
-
+```yaml
    # config/packages/knp_oauth2_client.yaml
    knpu_oauth2_client:
        clients:
@@ -296,35 +261,30 @@ and configure the oauth client:
                tenant: '%env(OAUTH_AZURE_CLIENT_TENANT)%'
                url_api: 'https://graph.microsoft.com/'
                default_end_point_version: '2.0'
+```
 
+You can now process for the first api authorization on the application side, (unless you did it in the Azure interface) and get the first token by using :
 
-You can now process for the first api authorization on the application side, (unless you did it in the Azure interface), and get a first token, by using :
+`bin/console chill:calendar:msgraph-grant-admin-consent`
 
-:code:`bin/console chill:calendar:msgraph-grant-admin-consent`
+This will generate an url that you can use to grant your app for your tenant. The redirection may fail in the browser, but this is not relevant: if you get an authorization token in the CLI, the authentication works.
 
-This will generate a url that you can use to grant your app for your tenant. The redirection may fails in the browser, but this is not relevant: if you get an authorization token in the CLI, the authentication works.
+### Run the processes to synchronize
 
-Run the processes to synchronize
---------------------------------
+The calendar synchronization is processed using symfony messenger. It seems to be interesting to configure a queue (in the postgresql database it is the simplest way), and to run a worker for synchronization, at least in production.
 
-The calendar synchronization is processed using symfony messenger. It seems to be intersting to configure a queue (in the postgresql database it is the most simple way), and to run a worker for synchronization, at least in production.
+This cli command does the association between chill's users and Microsoft's users:
 
-The association between chill's users and Microsoft's users is done by this cli command:
-
-.. code-block::
-
-   bin/console chill:calendar:msgraph-user-map-subscribe
+   `bin/console chill:calendar:msgraph-user-map-subscribe`
 
 This command:
 
 * will associate the Microsoft's user metadata in our database;
-* and, most important, create a subscription to get notification when the user alter his calendar, to sync chill's event and ranges in sync.
+* and, most important, create a subscription to get notification when the user alters his calendar, to sync chill's event and ranges in sync.
 
-The subscription least at most 3 days. This command should be runned:
+The subscription is at least at most 3 days. This command should be run:
 
 * at least each time a user is added;
 * and, at least, every three days.
 
-In production, we advise to run it at least every day to get the sync working.
-
-
+In production, we advise running it at least every day to get the sync working.
diff --git a/docs/source/installation/prod-calendar-sms-sending.md b/docs/source/installation/prod-calendar-sms-sending.md
new file mode 100644
index 000000000..2987fa56b
--- /dev/null
+++ b/docs/source/installation/prod-calendar-sms-sending.md
@@ -0,0 +1,21 @@
+## Send short messages (SMS) with the calendar bundle
+
+To activate the sending of messages, you should run this command on a regular basis (using, for instance, a cronjob):
+
+   `bin/console chill:calendar:send-short-messages`
+
+A transporter must be configured for the message to be effectively sent.
+
+### Configure OVH Transporter
+
+Currently, this is the only one transporter available.
+
+To configure this, add this config variable in your environment:
+
+```env
+SHORT_MESSAGE_DSN=ovh://applicationKey:applicationSecret@endpoint?consumerKey=xxxx&sender=yyyy&service_name=zzzz
+```
+
+To generate the application key, secret, and consumerKey, refers to their [documentation ](https://docs.ovh.com/gb/en/api/first-steps-with-ovh-api/).
+
+Before to be able to send your first sms, you must enable your account, grab some credits, and configure a sender. The service_name is an internal configuration generated by OVH.
diff --git a/docs/source/installation/prod-calendar-sms-sending.rst b/docs/source/installation/prod-calendar-sms-sending.rst
deleted file mode 100644
index 6529b95d9..000000000
--- a/docs/source/installation/prod-calendar-sms-sending.rst
+++ /dev/null
@@ -1,27 +0,0 @@
-
-Send short messages (SMS) with calendar bundle
-==============================================
-
-To activate the sending of messages, you should run this command on a regularly basis (using, for instance, a cronjob):
-
-.. code-block:: bash
-
-   bin/console chill:calendar:send-short-messages
-
-A transporter must be configured for the message to be effectively sent. 
-
-Configure OVH Transporter
--------------------------
-
-Currently, this is the only one transporter available.
-
-For configuring this, simply add this config variable in your environment:
-
-```env
-SHORT_MESSAGE_DSN=ovh://applicationKey:applicationSecret@endpoint?consumerKey=xxxx&sender=yyyy&service_name=zzzz
-```
-
-In order to generate the application key, secret, and consumerKey, refers to their `documentation <https://docs.ovh.com/gb/en/api/first-steps-with-ovh-api/>`_.
-
-Before to be able to send your first sms, you must enable your account, grab some credits, and configure a sender. The service_name is an internal configuration generated by OVH.
-
diff --git a/docs/source/installation/prod.md b/docs/source/installation/prod.md
new file mode 100644
index 000000000..50a51b378
--- /dev/null
+++ b/docs/source/installation/prod.md
@@ -0,0 +1,62 @@
+Permission is granted to copy, distribute and/or modify this document
+    under the terms of the GNU Free Documentation License, Version 1.3,
+    or any later version published by the Free Software Foundation;
+    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
+    A copy of the license is included in the section entitled "GNU
+    Free Documentation License".
+
+# Installation for production
+
+An installation uses these services, which are deployed using docker containers:
+
+* a php-fpm image, which runs the Php and Symfony code for Chill;
+* a nginx image, which serves the assets and usually proxies the php requests to the fpm image;
+* a redis server, which stores the cache, sessions (this is currently hardcoded in the php image), and some useful keys (like wopi locks);
+* a postgresql database. The use of postgresql is mandatory;
+* a relater service, which transforms odt templates to full documents (replacing the placeholders);
+
+Some external services:
+
+* (required) an openstack object store, configured with `temporary url <https://docs.openstack.org/swift/latest/api/temporary_url_middleware.html>` configured (no openstack users are required). This is currently the only way to store documents from chill;
+* a mailer service (SMTP)
+* (optional) a service for verifying phone number. Currently, only Twilio is possible;
+* (optional) a service for sending Short Messages (SMS). Currently, only Ovh is possible;
+
+The `docker-compose.yaml` file of chill app is a basis for a production install. The environment variable in the ```.env``` and ```.env.prod``` should be overridden by environment variables, or ```.env.local``` files.
+
+This should be adapted to your needs:
+
+* The images for php and nginx apps are pre-compiled images, with the default configuration and bundle. If they do not fullfill your needs, you should compile your own images.
+
+   .. TODO:
+
+      As the time of writing (2022-07-03) those images are not published yet.
+
+* Think about how you will back up your database. Some adminsys find it easier to store a database outside of docker, which might be easier to administrate or replicate.
+
+## Run migrations on each update
+
+Every time you start a new version, you should apply update the sql schema:
+
+- running ``bin/console doctrine:migration:migrate`` to run SQL migration;
+- synchronizing SQL views to the last state: ``bin/console chill:db:sync-views``
+
+## Cron jobs
+
+The command `chill:cron-job:execute` should be executed every 15 minutes (more or less).
+
+This command should never be executed concurrently. It should be not having more than one process for a single instance.
+
+## Post-install tasks
+
+- import addresses. See [addresses](addresses.md).
+
+## Tweak symfony messenger
+
+Calendar sync is processed using symfony messenger.
+
+You can tweak the configuration
+
+Going further:
+
+* Configure the saml login and synchronization with Outlook api
diff --git a/docs/source/installation/prod.rst b/docs/source/installation/prod.rst
deleted file mode 100644
index 21da15267..000000000
--- a/docs/source/installation/prod.rst
+++ /dev/null
@@ -1,71 +0,0 @@
-.. Copyright (C)  2014-2019 Champs Libres Cooperative SCRLFS
-    Permission is granted to copy, distribute and/or modify this document
-    under the terms of the GNU Free Documentation License, Version 1.3
-    or any later version published by the Free Software Foundation;
-    with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-    A copy of the license is included in the section entitled "GNU
-    Free Documentation License".
-
-.. _prod:
-
-Installation for production
-###########################
-
-An installation use these services, which are deployed using docker containers:
-
-* a php-fpm image, which run the Php and Symfony code for Chill;
-* a nginx image, which serves the assets, and usually proxy the php requests to the fpm image;
-* a redis server, which stores the cache, sessions (this is currently hardcoded in the php image), and some useful keys (like wopi locks);
-* a postgresql database. The use of postgresql is mandatory;
-* a relatorio service, which transform odt templates to full documents (replacing the placeholders);
-
-Some external services:
-
-* (required) an openstack object store, configured with `temporary url <https://docs.openstack.org/swift/latest/api/temporary_url_middleware.html>` configured (no openstack users is required). This is currently the only way to store documents from chill;
-* a mailer service (SMTP)
-* (optional) a service for verifying phone number. Currently, only Twilio is possible;
-* (optional) a service for sending Short Messages (SMS). Currently, only Ovh is possible;
-
-The `docker-compose.yaml` file of chill app is a basis for a production install. The environment variable in the ```.env``` and ```.env.prod``` should be overriden by environment variables, or ```.env.local``` files.
-
-This should be adapted to your needs:
-
-* The image for php and nginx apps are pre-compiled images, with the default configuration and bundle. If they do not fullfill your needs, you should compile your own images.
-
-   .. TODO:
-
-      As the time of writing (2022-07-03) those images are not published yet.
-
-* Think about how you will backup your database. Some adminsys find easier to store database outside of docker, which might be easier to administrate or replicate.
-
-Run migrations on each update
-=============================
-
-Every time you start a new version, you should apply update the sql schema:
-
-- running ``bin/console doctrine:migration:migrate`` to run sql migration;
-- synchonizing sql views to the last state: ``bin/console chill:db:sync-views``
-
-Cron jobs
-=========
-
-The command :code:`chill:cron-job:execute` should be executed every 15 minutes (more or less).
-
-This command should never be executed concurrently. It should be not have more than one process for a single instance.
-
-Post-install tasks
-==================
-
-- import addresses. See :ref:`addresses`.
-
-
-Tweak symfony messenger
-=======================
-
-Calendar sync is processed using symfony messenger.
-
-You can tweak the configuration
-
-Going further:
-
-* Configure the saml login and synchronisation with Outlook api

From 77e0911fc9a583acda77cd8a676c340c129d7b14 Mon Sep 17 00:00:00 2001
From: LenaertsJ <julie.lenaerts@champs-libres.coop>
Date: Fri, 5 Dec 2025 11:38:19 +0000
Subject: [PATCH 241/283] Display entire comment for activities in list
 overview

---
 .changes/unreleased/UX-20251125-150135.yaml                 | 6 ++++++
 .../Resources/views/Activity/_list_item.html.twig           | 1 -
 2 files changed, 6 insertions(+), 1 deletion(-)
 create mode 100644 .changes/unreleased/UX-20251125-150135.yaml

diff --git a/.changes/unreleased/UX-20251125-150135.yaml b/.changes/unreleased/UX-20251125-150135.yaml
new file mode 100644
index 000000000..f97ba7f0a
--- /dev/null
+++ b/.changes/unreleased/UX-20251125-150135.yaml
@@ -0,0 +1,6 @@
+kind: UX
+body: Display entire comment for activity item within list
+time: 2025-11-25T15:01:35.558013876+01:00
+custom:
+    Issue: "424"
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig b/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig
index 13dfa7461..5a322d630 100644
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig
@@ -136,7 +136,6 @@
                     <div class="wl-col list">
                         {{ activity.comment|chill_entity_render_box({
                             'disable_markdown': false,
-                            'limit_lines': 3,
                             'metadata': false,
                         }) }}
                     </div>

From 3aa4c49d006c6b3507cb9419ca6e283fe6340e88 Mon Sep 17 00:00:00 2001
From: LenaertsJ <julie.lenaerts@champs-libres.coop>
Date: Fri, 5 Dec 2025 11:47:33 +0000
Subject: [PATCH 242/283] =?UTF-8?q?Resolve=20"Lors=20de=20l'annulation=20d?=
 =?UTF-8?q?'un=20rendez-vous,=20obtenir=20des=20d=C3=A9tails=20sur=20le=20?=
 =?UTF-8?q?rendez-vous=20annul=C3=A9"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .changes/unreleased/UX-20251124-164723.yaml                 | 6 ++++++
 .../Resources/views/Calendar/_list.html.twig                | 3 ++-
 .../Calendar/cancelCalendarByAccompanyingCourse.html.twig   | 4 ++++
 .../views/Calendar/cancelCalendarByPerson.html.twig         | 4 ++++
 4 files changed, 16 insertions(+), 1 deletion(-)
 create mode 100644 .changes/unreleased/UX-20251124-164723.yaml

diff --git a/.changes/unreleased/UX-20251124-164723.yaml b/.changes/unreleased/UX-20251124-164723.yaml
new file mode 100644
index 000000000..298cbc5ee
--- /dev/null
+++ b/.changes/unreleased/UX-20251124-164723.yaml
@@ -0,0 +1,6 @@
+kind: UX
+body: Display calendar item info on cancel page
+time: 2025-11-24T16:47:23.020302054+01:00
+custom:
+    Issue: "460"
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig
index c827ca4f4..88ce1b6e5 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig
@@ -162,6 +162,7 @@
     {% endif %}
 
     <div class="item-row separator">
+        {% if show_record_actions is not defined or show_record_actions %}
         <ul class="record_actions">
                 {% if is_granted('CHILL_CALENDAR_DOC_EDIT', calendar) and calendar.status is not constant('STATUS_CANCELED', calendar) %}
                     {% if templates|length == 0 %}
@@ -245,7 +246,7 @@
                         </li>
                         {% endif %}
                     </ul>
-
+        {% endif %}
     </div>
 
 </div>
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByAccompanyingCourse.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByAccompanyingCourse.html.twig
index 2f6759725..a0d10273b 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByAccompanyingCourse.html.twig
@@ -6,6 +6,10 @@
 
 {% block content %}
 
+    <div class="flex-table list-records context-accompanyingCourse">
+        {{ include('@ChillCalendar/Calendar/_list.html.twig', {context: 'accompanying_course', show_record_actions: false}) }}
+    </div>
+
     {{ form_start(form) }}
 
     {{ form_row(form.cancelReason) }}
diff --git a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByPerson.html.twig b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByPerson.html.twig
index 76196b23e..4ef1c2e65 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByPerson.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByPerson.html.twig
@@ -6,6 +6,10 @@
 
 {% block content %}
 
+    <div class="flex-table list-records context-person">
+        {{ include('@ChillCalendar/Calendar/_list.html.twig', {context: 'person', show_record_actions: false}) }}
+    </div>
+
     {{ form_start(form) }}
 
     {{ form_row(form.cancelReason) }}

From 4c1690313b60c5273a33f31b41f2a841ca1e764c Mon Sep 17 00:00:00 2001
From: LenaertsJ <julie.lenaerts@champs-libres.coop>
Date: Fri, 5 Dec 2025 11:56:29 +0000
Subject: [PATCH 243/283] =?UTF-8?q?Resolve=20"Les=20utilisateurs=20d=C3=A9?=
 =?UTF-8?q?sactiv=C3=A9s=20apparaissent=20toujours=20dans=20les=20suggesti?=
 =?UTF-8?q?ons=20dans=20les=20=C3=A9changes"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .changes/unreleased/Fixed-20251201-185859.yaml    |  6 ++++++
 .../Resources/public/vuejs/Activity/store.js      |  2 +-
 .../Resources/public/types/generic_doc.ts         | 15 +++++----------
 .../Resources/public/types/index.ts               |  6 ++----
 .../Resources/public/lib/api/apiMethods.ts        |  9 +++------
 .../Serializer/Normalizer/UserNormalizer.php      |  2 ++
 .../Serializer/Normalizer/UserNormalizerTest.php  |  3 +++
 7 files changed, 22 insertions(+), 21 deletions(-)
 create mode 100644 .changes/unreleased/Fixed-20251201-185859.yaml

diff --git a/.changes/unreleased/Fixed-20251201-185859.yaml b/.changes/unreleased/Fixed-20251201-185859.yaml
new file mode 100644
index 000000000..989620ad9
--- /dev/null
+++ b/.changes/unreleased/Fixed-20251201-185859.yaml
@@ -0,0 +1,6 @@
+kind: Fixed
+body: Do not suggest a user that is no longer active in the activity form.
+time: 2025-12-01T18:58:59.410998029+01:00
+custom:
+    Issue: "475"
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.js b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.js
index acd616dc9..2e240b4ad 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.js
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/store.js
@@ -103,7 +103,7 @@ const store = createStore({
       }
       // console.log("suggested users", suggestedUsers);
 
-      return suggestedUsers;
+      return suggestedUsers.filter((u) => u.enabled === true);
     },
     suggestedResources(state) {
       // const resources = state.activity.accompanyingPeriod.resources;
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/types/generic_doc.ts b/src/Bundle/ChillDocStoreBundle/Resources/public/types/generic_doc.ts
index 04c324b4a..34cf2501d 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/types/generic_doc.ts
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/types/generic_doc.ts
@@ -52,36 +52,31 @@ interface BaseMetadataWithHtml extends BaseMetadata {
     html: string;
 }
 
-export interface GenericDocForAccompanyingCourseDocument
-    extends GenericDocForAccompanyingPeriod {
+export interface GenericDocForAccompanyingCourseDocument extends GenericDocForAccompanyingPeriod {
     key: "accompanying_course_document";
     metadata: BaseMetadataWithHtml;
     storedObject: StoredObject;
 }
 
-export interface GenericDocForAccompanyingCourseActivityDocument
-    extends GenericDocForAccompanyingPeriod {
+export interface GenericDocForAccompanyingCourseActivityDocument extends GenericDocForAccompanyingPeriod {
     key: "accompanying_course_activity_document";
     metadata: BaseMetadataWithHtml;
     storedObject: StoredObject;
 }
 
-export interface GenericDocForAccompanyingCourseCalendarDocument
-    extends GenericDocForAccompanyingPeriod {
+export interface GenericDocForAccompanyingCourseCalendarDocument extends GenericDocForAccompanyingPeriod {
     key: "accompanying_course_calendar_document";
     metadata: BaseMetadataWithHtml;
     storedObject: StoredObject;
 }
 
-export interface GenericDocForAccompanyingCoursePersonDocument
-    extends GenericDocForAccompanyingPeriod {
+export interface GenericDocForAccompanyingCoursePersonDocument extends GenericDocForAccompanyingPeriod {
     key: "person_document";
     metadata: BaseMetadataWithHtml;
     storedObject: StoredObject;
 }
 
-export interface GenericDocForAccompanyingCourseWorkEvaluationDocument
-    extends GenericDocForAccompanyingPeriod {
+export interface GenericDocForAccompanyingCourseWorkEvaluationDocument extends GenericDocForAccompanyingPeriod {
     key: "accompanying_period_work_evaluation_document";
     metadata: BaseMetadataWithHtml;
     storedObject: StoredObject;
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/types/index.ts b/src/Bundle/ChillDocStoreBundle/Resources/public/types/index.ts
index 5b34b8f73..4213d971a 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/types/index.ts
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/types/index.ts
@@ -46,8 +46,7 @@ export interface StoredObjectVersionCreated extends StoredObjectVersion {
     persisted: false;
 }
 
-export interface StoredObjectVersionPersisted
-    extends StoredObjectVersionCreated {
+export interface StoredObjectVersionPersisted extends StoredObjectVersionCreated {
     version: number;
     id: number;
     createdAt: DateTime | null;
@@ -61,8 +60,7 @@ export interface StoredObjectStatusChange {
     type: string;
 }
 
-export interface StoredObjectVersionWithPointInTime
-    extends StoredObjectVersionPersisted {
+export interface StoredObjectVersionWithPointInTime extends StoredObjectVersionPersisted {
     "point-in-times": StoredObjectPointInTime[];
     "from-restored": StoredObjectVersionPersisted | null;
 }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.ts b/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.ts
index e8256b348..97220f9c8 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.ts
@@ -20,8 +20,7 @@ export interface TransportExceptionInterface {
     name: string;
 }
 
-export interface ValidationExceptionInterface
-    extends TransportExceptionInterface {
+export interface ValidationExceptionInterface extends TransportExceptionInterface {
     name: "ValidationException";
     error: object;
     violations: string[];
@@ -41,8 +40,7 @@ export interface AccessExceptionInterface extends TransportExceptionInterface {
     violations: string[];
 }
 
-export interface NotFoundExceptionInterface
-    extends TransportExceptionInterface {
+export interface NotFoundExceptionInterface extends TransportExceptionInterface {
     name: "NotFoundException";
 }
 
@@ -53,8 +51,7 @@ export interface ServerExceptionInterface extends TransportExceptionInterface {
     body: string;
 }
 
-export interface ConflictHttpExceptionInterface
-    extends TransportExceptionInterface {
+export interface ConflictHttpExceptionInterface extends TransportExceptionInterface {
     name: "ConflictHttpException";
     violations: string[];
 }
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php
index e8b019bd6..3958b15f0 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php
@@ -41,6 +41,7 @@ class UserNormalizer implements ContextAwareNormalizerInterface, NormalizerAware
         'isAbsent' => false,
         'absenceStart' => null,
         'absenceEnd' => null,
+        'enabled' => true,
     ];
 
     public function __construct(private readonly UserRender $userRender, private readonly ClockInterface $clock) {}
@@ -108,6 +109,7 @@ class UserNormalizer implements ContextAwareNormalizerInterface, NormalizerAware
             'isAbsent' => $object->isAbsent(),
             'absenceStart' => $this->normalizer->normalize($object->getAbsenceStart(), $format, $absenceDatesContext),
             'absenceEnd' => $this->normalizer->normalize($object->getAbsenceEnd(), $format, $absenceDatesContext),
+            'enabled' => $object->isEnabled(),
         ];
 
         if ('docgen' === $format) {
diff --git a/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/UserNormalizerTest.php b/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/UserNormalizerTest.php
index c58b607e3..2139a44ef 100644
--- a/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/UserNormalizerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/UserNormalizerTest.php
@@ -103,6 +103,7 @@ final class UserNormalizerTest extends TestCase
                 'main_center' => ['context' => Center::class],
                 'absenceStart' => ['context' => \DateTimeImmutable::class],
                 'absenceEnd' => ['context' => \DateTimeImmutable::class],
+                'enabled' => true,
             ]];
 
         yield [$userNoPhone, 'docgen', ['docgen:expects' => User::class],
@@ -124,6 +125,7 @@ final class UserNormalizerTest extends TestCase
                 'main_center' => ['context' => Center::class],
                 'absenceStart' => ['context' => \DateTimeImmutable::class],
                 'absenceEnd' => ['context' => \DateTimeImmutable::class],
+                'enabled' => true,
             ]];
 
         yield [null, 'docgen', ['docgen:expects' => User::class], [
@@ -144,6 +146,7 @@ final class UserNormalizerTest extends TestCase
             'main_center' => ['context' => Center::class],
             'absenceStart' => null,
             'absenceEnd' => null,
+            'enabled' => true,
         ]];
     }
 }

From ec930348025cd1d39210ffb13e3646dd493ea68c Mon Sep 17 00:00:00 2001
From: LenaertsJ <julie.lenaerts@champs-libres.coop>
Date: Fri, 5 Dec 2025 11:58:24 +0000
Subject: [PATCH 244/283] Improve accessibility of event form

---
 .changes/unreleased/UX-20251126-133910.yaml   |  6 ++++
 .../Controller/ParticipationController.php    |  2 +-
 .../Resources/views/Event/edit.html.twig      |  1 -
 .../Form/Type/ChillDateTimeType.php           |  5 ++++
 .../Resources/views/Form/fields.html.twig     | 29 +++++++++++++++++++
 5 files changed, 41 insertions(+), 2 deletions(-)
 create mode 100644 .changes/unreleased/UX-20251126-133910.yaml

diff --git a/.changes/unreleased/UX-20251126-133910.yaml b/.changes/unreleased/UX-20251126-133910.yaml
new file mode 100644
index 000000000..474e52fac
--- /dev/null
+++ b/.changes/unreleased/UX-20251126-133910.yaml
@@ -0,0 +1,6 @@
+kind: UX
+body: Improve accessibility of event form
+time: 2025-11-26T13:39:10.462348982+01:00
+custom:
+    Issue: "474"
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillEventBundle/Controller/ParticipationController.php b/src/Bundle/ChillEventBundle/Controller/ParticipationController.php
index 7fac83bf5..b100e47cd 100644
--- a/src/Bundle/ChillEventBundle/Controller/ParticipationController.php
+++ b/src/Bundle/ChillEventBundle/Controller/ParticipationController.php
@@ -486,7 +486,7 @@ final class ParticipationController extends AbstractController
 
             return $this->redirectToRoute(
                 'chill_event__event_show',
-                ['event_id' => $event->getId()]
+                ['id' => $event->getId()]
             );
         }
 
diff --git a/src/Bundle/ChillEventBundle/Resources/views/Event/edit.html.twig b/src/Bundle/ChillEventBundle/Resources/views/Event/edit.html.twig
index 55c2fc21f..8fb9393a6 100644
--- a/src/Bundle/ChillEventBundle/Resources/views/Event/edit.html.twig
+++ b/src/Bundle/ChillEventBundle/Resources/views/Event/edit.html.twig
@@ -15,7 +15,6 @@
     {{ form_row(edit_form.circle) }}
     {{ form_row(edit_form.name) }}
     {{ form_row(edit_form.date) }}
-
     {{ form_row(edit_form.type, { label: "Event type" }) }}
     {{ form_row(edit_form.themes) }}
     {{ form_row(edit_form.moderator) }}
diff --git a/src/Bundle/ChillMainBundle/Form/Type/ChillDateTimeType.php b/src/Bundle/ChillMainBundle/Form/Type/ChillDateTimeType.php
index 0063ee7d9..e9e21fea2 100644
--- a/src/Bundle/ChillMainBundle/Form/Type/ChillDateTimeType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/ChillDateTimeType.php
@@ -37,4 +37,9 @@ class ChillDateTimeType extends AbstractType
     {
         return DateTimeType::class;
     }
+
+    public function getBlockPrefix(): string
+    {
+        return 'chill_datetime';
+    }
 }
diff --git a/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig b/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
index 5e3edca10..11fc00828 100644
--- a/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Form/fields.html.twig
@@ -311,3 +311,32 @@
         </div>
     </div>
 {% endblock %}
+
+{% block chill_datetime_label %}
+    <label for="{{ form.date.vars.id }}" class="col-form-label col-sm-4 required">
+        {{ "Date"|trans }}
+    </label>
+{% endblock %}
+
+{% block chill_datetime_widget %}
+    <div class="col-sm-8 d-flex align-items-start gap-2">
+        {#date#}
+        {{ form_widget(form.date, {
+            attr: { class: 'form-control', style: 'flex: 1 1 auto;' }
+        }) }}
+        {#time#}
+        {{ form_widget(form.time, {
+            attr: {
+                class: 'form-select',
+                style: 'flex: 0 0 200px; max-width: 200px; white-space: nowrap; padding:0;'
+            }
+        }) }}
+    </div>
+{% endblock %}
+
+{% block chill_datetime_row %}
+    <div class="mb-3 row">
+        {{ block('chill_datetime_label') }}
+        {{ block('chill_datetime_widget') }}
+    </div>
+{% endblock %}

From 92d5fe154e84ffc92f0a546493263bade62989a2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 5 Dec 2025 11:59:32 +0000
Subject: [PATCH 245/283] Create a connector to synchronize with zimbra
 calendars

---
 .gitlab-ci.yml                                |  52 +++++++
 .php-cs-fixer.dist.php                        |   1 +
 composer.json                                 |   8 +
 config/bundles.php                            |   1 +
 package.json                                  |   1 +
 packages/ChillZimbraBundle/README.md          |  40 +++++
 packages/ChillZimbraBundle/composer.json      |  22 +++
 .../Calendar/Connector/ZimbraConnector.php    | 147 ++++++++++++++++++
 .../Connector/ZimbraConnector/CreateEvent.php |  96 ++++++++++++
 .../ZimbraConnector/CreateZimbraComponent.php | 129 +++++++++++++++
 .../ZimbraConnector/DateConverter.php         |  37 +++++
 .../Connector/ZimbraConnector/DeleteEvent.php |  51 ++++++
 .../ZimbraConnector/SoapClientBuilder.php     |  78 ++++++++++
 .../Connector/ZimbraConnector/UpdateEvent.php |  97 ++++++++++++
 .../ZimbraConnector/ZimbraIdSerializer.php    |  67 ++++++++
 .../src/ChillZimbraBundle.php                 |  16 ++
 .../ChillZimbraExtension.php                  |  26 ++++
 .../CalendarWithoutMainUserException.php      |  14 ++
 ...mbraCalendarIdNotDeserializedException.php |  14 ++
 .../src/config/services.yaml                  |   7 +
 .../ZimbraComponent/calendar_content.txt.twig |  18 +++
 .../invitation_content.txt.twig               |  20 +++
 .../src/translations/messages+intl-icu.fr.yml |   9 ++
 phpstan.dist.neon                             |   1 +
 .../ChillCalendarExtension.php                |   2 +
 .../DependencyInjection/Configuration.php     |   3 +-
 .../Entity/CalendarRange.php                  |   5 +
 .../Handler/CalendarRemoveHandler.php         |  10 +-
 .../RemoteCalendarConnectorInterface.php      | 105 ++++++++++++-
 .../RemoteCalendarCompilerPass.php            |  49 ++++--
 .../translations/messages.fr.yml              |   2 +
 .../Templating/Entity/AddressRender.php       |   5 +-
 .../Templating/Entity/CommentRender.php       |   2 +-
 symfony.lock                                  |   3 +
 34 files changed, 1116 insertions(+), 22 deletions(-)
 create mode 100644 packages/ChillZimbraBundle/README.md
 create mode 100644 packages/ChillZimbraBundle/composer.json
 create mode 100644 packages/ChillZimbraBundle/src/Calendar/Connector/ZimbraConnector.php
 create mode 100644 packages/ChillZimbraBundle/src/Calendar/Connector/ZimbraConnector/CreateEvent.php
 create mode 100644 packages/ChillZimbraBundle/src/Calendar/Connector/ZimbraConnector/CreateZimbraComponent.php
 create mode 100644 packages/ChillZimbraBundle/src/Calendar/Connector/ZimbraConnector/DateConverter.php
 create mode 100644 packages/ChillZimbraBundle/src/Calendar/Connector/ZimbraConnector/DeleteEvent.php
 create mode 100644 packages/ChillZimbraBundle/src/Calendar/Connector/ZimbraConnector/SoapClientBuilder.php
 create mode 100644 packages/ChillZimbraBundle/src/Calendar/Connector/ZimbraConnector/UpdateEvent.php
 create mode 100644 packages/ChillZimbraBundle/src/Calendar/Connector/ZimbraConnector/ZimbraIdSerializer.php
 create mode 100644 packages/ChillZimbraBundle/src/ChillZimbraBundle.php
 create mode 100644 packages/ChillZimbraBundle/src/DependencyInjection/ChillZimbraExtension.php
 create mode 100644 packages/ChillZimbraBundle/src/Exception/CalendarWithoutMainUserException.php
 create mode 100644 packages/ChillZimbraBundle/src/Exception/ZimbraCalendarIdNotDeserializedException.php
 create mode 100644 packages/ChillZimbraBundle/src/config/services.yaml
 create mode 100644 packages/ChillZimbraBundle/src/templates/ZimbraComponent/calendar_content.txt.twig
 create mode 100644 packages/ChillZimbraBundle/src/templates/ZimbraComponent/invitation_content.txt.twig
 create mode 100644 packages/ChillZimbraBundle/src/translations/messages+intl-icu.fr.yml

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index 355524fa4..b9c532b29 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -38,15 +38,67 @@ variables:
     TZ: Europe/Brussels
     # avoid direct deprecations (using symfony phpunit bridge: https://symfony.com/doc/4.x/components/phpunit_bridge.html#internal-deprecations
     SYMFONY_DEPRECATIONS_HELPER: max[total]=99999999&max[self]=0&max[direct]=45&verbose=0
+    # consider the root package at the dev-master version
+    # this is required to work with packages
+    # see https://getcomposer.org/doc/articles/troubleshooting.md#dependencies-on-the-root-package
+    COMPOSER_ROOT_VERSION: dev-master
 
 stages:
+    - mirror
     - Composer install
     - Tests
     - Deploy
 
+mirror_chill_zimbra_bundle:
+    stage: mirror
+    image: alpine:latest
+
+    variables:
+        GIT_DEPTH: 0 # <-- access to the full git history
+
+    rules:
+        # 1) Allow manual run from GitLab UI, whatever the branch
+        -   if: '$CI_PIPELINE_SOURCE == "web"'
+
+        # 2) Auto-run on commits to master or 472-zimbra-connector
+        #    but only if relevant files changed
+        -   if: '$CI_COMMIT_BRANCH == "master" || $CI_COMMIT_BRANCH == "472-zimbra-connector"'
+            changes:
+                - packages/ChillZimbraBundle/**/*
+                - .gitlab-ci.yml
+
+        # 3) Otherwise: never run
+        -   when: never
+
+
+    before_script:
+        - apk add --no-cache git git-subtree openssh
+        # Config git
+        - git config --global user.email "ci@gitlab.com"
+        - git config --global user.name "GitLab CI"
+        # Préparation SSH
+        - mkdir -p ~/.ssh
+        - cp "$DEPLOY_KEY" ~/.ssh/id_ed25519
+        - printf '\n' >> ~/.ssh/id_ed25519
+        - chmod 600 ~/.ssh/id_ed25519
+        - ssh-keyscan gitlab.com >> ~/.ssh/known_hosts
+        # Ajout du remote vers le repo dédié
+        - git remote add chill-zimbra-connector git@gitlab.com:Chill-Projet/chill-zimbra-connector.git || true
+
+    script:
+        # On s'assure d'être sur la bonne branche (celle qui a déclenché le job, master)
+        - git checkout "$CI_COMMIT_REF_NAME"
+
+        # Crée une branche temporaire qui contient uniquement l'historique de packages/ChillZimbraBundle
+        - git subtree split --prefix=packages/ChillZimbraBundle -b chill_zimbra_temp
+
+        # Push vers le repo cible, branche master du repo chill-zimbra-connector
+        - git push --force chill-zimbra-connector chill_zimbra_temp:main
+
 build:
     stage: Composer install
     image: chill/base-image:8.3-edge
+    variables:
     before_script:
         - composer config -g cache-dir "$(pwd)/.cache"
     script:
diff --git a/.php-cs-fixer.dist.php b/.php-cs-fixer.dist.php
index 3360abe85..9e6e76238 100644
--- a/.php-cs-fixer.dist.php
+++ b/.php-cs-fixer.dist.php
@@ -14,6 +14,7 @@ $finder = PhpCsFixer\Finder::create();
 $finder
     ->in(__DIR__.'/src')
     ->in(__DIR__.'/utils')
+    ->in(__DIR__.'/packages')
     ->append([__FILE__])
     ->exclude(['docs/', 'tests/app'])
     ->notPath('tests/app')
diff --git a/composer.json b/composer.json
index c1e235670..2ccf95008 100644
--- a/composer.json
+++ b/composer.json
@@ -7,6 +7,13 @@
         "chill",
         "social worker"
     ],
+    "repositories": [{
+        "type": "path",
+        "url": "./packages/ChillZimbraBundle",
+        "options": {
+            "symlink": true
+        }
+    }],
     "require": {
         "php": "^8.2",
         "ext-dom": "*",
@@ -14,6 +21,7 @@
         "ext-openssl": "*",
         "ext-redis": "*",
         "ext-zlib": "*",
+        "chill-project/chill-zimbra-bundle": "@dev",
         "champs-libres/wopi-bundle": "dev-symfony-v5@dev",
         "champs-libres/wopi-lib": "dev-master@dev",
         "doctrine/data-fixtures": "^1.8",
diff --git a/config/bundles.php b/config/bundles.php
index 72b5e22f5..989338f3e 100644
--- a/config/bundles.php
+++ b/config/bundles.php
@@ -37,4 +37,5 @@ return [
     Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
     Symfony\UX\Translator\UxTranslatorBundle::class => ['all' => true],
     loophp\PsrHttpMessageBridgeBundle\PsrHttpMessageBridgeBundle::class => ['all' => true],
+    Chill\ZimbraBundle\ChillZimbraBundle::class => ['all' => true],
 ];
diff --git a/package.json b/package.json
index a013df3da..1b4c7df13 100644
--- a/package.json
+++ b/package.json
@@ -11,6 +11,7 @@
     "@hotwired/stimulus": "^3.0.0",
     "@luminateone/eslint-baseline": "^1.0.9",
     "@symfony/stimulus-bridge": "^3.2.0",
+    "@symfony/ux-translator": "file:vendor/symfony/ux-translator/assets",
     "@symfony/webpack-encore": "^4.1.0",
     "@tsconfig/node20": "^20.1.4",
     "@types/dompurify": "^3.0.5",
diff --git a/packages/ChillZimbraBundle/README.md b/packages/ChillZimbraBundle/README.md
new file mode 100644
index 000000000..521b31fd2
--- /dev/null
+++ b/packages/ChillZimbraBundle/README.md
@@ -0,0 +1,40 @@
+# Chill Zimbra Bundle
+
+This bundle provides integration with Zimbra email server for Chill application.
+
+## Source code
+
+This bundle should be modified within the chill-bundles repository. The code at
+https://gitlab.com/Chill-Projet/chill-zimbra-connector is a mirror of the main
+repository, and is intended to serve packagist information.
+
+## Configuration
+
+This bundle should be configured using a dsn scheme with a `zimbra+http` or `zimbra+https`
+scheme.
+
+```yaml
+chill_calendar:
+    # remember to url-encode username and password
+    remote_calendar_dsn: zimbra+https://chill%40zimbra.example.com:password@zimbra.example.com
+```
+
+## Development
+
+This bundles should be developed from within the chill-bundles repository.
+
+During development, you must use an inline alias, or a branch alias to
+be able to load the root package's master branch as a replacement for a version.
+
+Example of composer.json for chill-project/chill-zimbra-bundle:
+
+```json
+{
+    "require": {
+        "chill-project/chill-bundles": "dev-master as v4.6.1",
+        "zimbra-api/soap-api": "^3.2.2",
+        "psr/http-client": "^1.0",
+        "nyholm/psr7": "^1.0"
+    }
+}
+```
diff --git a/packages/ChillZimbraBundle/composer.json b/packages/ChillZimbraBundle/composer.json
new file mode 100644
index 000000000..f62e21125
--- /dev/null
+++ b/packages/ChillZimbraBundle/composer.json
@@ -0,0 +1,22 @@
+{
+    "name": "chill-project/chill-zimbra-bundle",
+    "description": "Provide connection between Zimbra agenda and Chill",
+    "minimum-stability": "stable",
+    "license": "AGPL-3.0",
+    "type": "library",
+    "keywords": [
+        "chill",
+        "social worker"
+    ],
+    "require": {
+        "chill-project/chill-bundles": "dev-master as v4.6.1",
+        "zimbra-api/soap-api": "^3.2.2",
+        "psr/http-client": "^1.0",
+        "nyholm/psr7": "^1.0"
+    },
+    "autoload": {
+        "psr-4": {
+            "Chill\\ZimbraBundle\\": "src/"
+        }
+    }
+}
diff --git a/packages/ChillZimbraBundle/src/Calendar/Connector/ZimbraConnector.php b/packages/ChillZimbraBundle/src/Calendar/Connector/ZimbraConnector.php
new file mode 100644
index 000000000..acb6bdd84
--- /dev/null
+++ b/packages/ChillZimbraBundle/src/Calendar/Connector/ZimbraConnector.php
@@ -0,0 +1,147 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ZimbraBundle\Calendar\Connector;
+
+use Chill\CalendarBundle\Entity\Calendar;
+use Chill\CalendarBundle\Entity\CalendarRange;
+use Chill\CalendarBundle\Entity\Invite;
+use Chill\CalendarBundle\RemoteCalendar\Connector\RemoteCalendarConnectorInterface;
+use Chill\MainBundle\Entity\User;
+use Chill\ZimbraBundle\Calendar\Connector\ZimbraConnector\CreateEvent;
+use Chill\ZimbraBundle\Calendar\Connector\ZimbraConnector\DeleteEvent;
+use Chill\ZimbraBundle\Calendar\Connector\ZimbraConnector\UpdateEvent;
+use Psr\Log\LoggerInterface;
+use Symfony\Component\HttpFoundation\Response;
+
+final readonly class ZimbraConnector implements RemoteCalendarConnectorInterface
+{
+    private const LOG_PREFIX = '[ZimbraConnector] ';
+
+    public function __construct(
+        private CreateEvent $createEvent,
+        private UpdateEvent $updateEvent,
+        private DeleteEvent $deleteEvent,
+        private LoggerInterface $logger,
+    ) {}
+
+    public function countEventsForUser(User $user, \DateTimeImmutable $startDate, \DateTimeImmutable $endDate): int
+    {
+        return 0;
+    }
+
+    public function getMakeReadyResponse(string $returnPath): Response
+    {
+        throw new \BadMethodCallException('Zimbra connector is always ready');
+    }
+
+    public function isReady(): bool
+    {
+        return true;
+    }
+
+    public function listEventsForUser(User $user, \DateTimeImmutable $startDate, \DateTimeImmutable $endDate, ?int $offset = 0, ?int $limit = 50): array
+    {
+        return [];
+    }
+
+    public function removeCalendar(string $remoteId, array $remoteAttributes, User $user, ?CalendarRange $associatedCalendarRange = null): void
+    {
+        if ('' === $remoteId) {
+            return;
+        }
+
+        ($this->deleteEvent)($user, $remoteId);
+
+        if (null !== $associatedCalendarRange) {
+            $this->logger->info(self::LOG_PREFIX.'Ask to re-create the previous calendar range', ['previous_calendar_range_id' => $associatedCalendarRange->getId()]);
+            $this->createCalendarRange($associatedCalendarRange);
+        }
+    }
+
+    public function removeCalendarRange(string $remoteId, array $remoteAttributes, User $user): void
+    {
+        if ('' === $remoteId) {
+            return;
+        }
+
+        ($this->deleteEvent)($user, $remoteId);
+    }
+
+    public function syncCalendar(Calendar $calendar, string $action, ?CalendarRange $previousCalendarRange, ?User $previousMainUser, ?array $oldInvites, ?array $newInvites): void
+    {
+        if (null !== $previousMainUser && $previousMainUser !== $calendar->getMainUser()) {
+            $this->removeCalendar($calendar->getRemoteId(), [], $previousMainUser);
+            $calendar->setRemoteId('');
+        }
+
+        if (!$calendar->hasRemoteId()) {
+            $calItemId = ($this->createEvent)($calendar);
+            $this->logger->info(self::LOG_PREFIX.'Calendar synced with Zimbra', ['calendar_id' => $calendar->getId(), 'action' => $action, 'calItemId' => $calItemId]);
+
+            $calendar->setRemoteId($calItemId);
+        } else {
+            ($this->updateEvent)($calendar);
+            $this->logger->info(self::LOG_PREFIX.'Calendar updated against zimbra', ['old_cal_remote_id' => $calendar->getRemoteId(), 'calendar_id' => $calendar->getId()]);
+        }
+
+        if (null !== $calendar->getCalendarRange()) {
+            $range = $calendar->getCalendarRange();
+            $this->removeCalendarRange($range->getRemoteId(), [], $range->getUser());
+            $range->setRemoteId('');
+        }
+
+        if (null !== $previousCalendarRange) {
+            $this->syncCalendarRange($previousCalendarRange);
+        }
+
+        foreach ($calendar->getInvites() as $invite) {
+            $this->syncInvite($invite);
+        }
+    }
+
+    public function syncCalendarRange(CalendarRange $calendarRange): void
+    {
+        if (!$calendarRange->hasRemoteId()) {
+            $this->createCalendarRange($calendarRange);
+        } else {
+            ($this->updateEvent)($calendarRange);
+            $this->logger->info(self::LOG_PREFIX.'Calendar range updated against zimbra', ['old_cal_remote_id' => $calendarRange->getRemoteId(), 'calendar_range_id' => $calendarRange->getId()]);
+        }
+    }
+
+    public function syncInvite(Invite $invite): void
+    {
+        if (Invite::ACCEPTED === $invite->getStatus()) {
+            if ($invite->hasRemoteId()) {
+                ($this->updateEvent)($invite);
+                $this->logger->info(self::LOG_PREFIX.'Invite range updated against zimbra', ['invite_id' => $invite->getId(), 'invite_remote_id', $invite->getRemoteId()]);
+            } else {
+                $remoteId = ($this->createEvent)($invite);
+                $invite->setRemoteId($remoteId);
+                $this->logger->info(self::LOG_PREFIX.'Invite range updated against zimbra', ['invite_id' => $invite->getId(), 'invite_remote_id', $invite->getRemoteId()]);
+            }
+        } elseif ($invite->hasRemoteId()) {
+            // case when the invite has been accepted in the past, and synchronized
+            ($this->deleteEvent)($invite->getUser(), $invite->getRemoteId());
+            $this->logger->info(self::LOG_PREFIX.'Invite range removed in zimbra', ['invite_id' => $invite->getId(), 'invite_remote_id', $invite->getRemoteId()]);
+            $invite->setRemoteId('');
+        }
+    }
+
+    private function createCalendarRange(CalendarRange $calendarRange): void
+    {
+        $calItemId = ($this->createEvent)($calendarRange);
+        $this->logger->info(self::LOG_PREFIX.'Calendar range created with Zimbra', ['calendar_range_id' => $calendarRange->getId(), 'calItemId' => $calItemId]);
+
+        $calendarRange->setRemoteId($calItemId);
+    }
+}
diff --git a/packages/ChillZimbraBundle/src/Calendar/Connector/ZimbraConnector/CreateEvent.php b/packages/ChillZimbraBundle/src/Calendar/Connector/ZimbraConnector/CreateEvent.php
new file mode 100644
index 000000000..0ada55760
--- /dev/null
+++ b/packages/ChillZimbraBundle/src/Calendar/Connector/ZimbraConnector/CreateEvent.php
@@ -0,0 +1,96 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ZimbraBundle\Calendar\Connector\ZimbraConnector;
+
+use Chill\CalendarBundle\Entity\Calendar;
+use Chill\CalendarBundle\Entity\CalendarRange;
+use Chill\CalendarBundle\Entity\Invite;
+use Chill\ZimbraBundle\Exception\CalendarWithoutMainUserException;
+use Symfony\Contracts\Translation\TranslatorInterface;
+use Zimbra\Mail\Struct\InvitationInfo;
+use Zimbra\Mail\Struct\InviteComponent;
+use Zimbra\Mail\Struct\MimePartInfo;
+use Zimbra\Mail\Struct\Msg;
+
+/**
+ * Creates a new calendar event in Zimbra.
+ *
+ * This class handles the creation of new calendar events in the Zimbra system.
+ * It uses the Zimbra SOAP API to create events and returns a serialized ID that
+ * can be used as remoteId for Calendar and CalendarRange.
+ */
+final readonly class CreateEvent
+{
+    public function __construct(
+        private SoapClientBuilder $soapClientBuilder,
+        private CreateZimbraComponent $createEvent,
+        private TranslatorInterface $translator,
+        private ZimbraIdSerializer $zimbraIdSerializer,
+    ) {}
+
+    /**
+     * Creates a new calendar event in Zimbra.
+     *
+     * @param Calendar|CalendarRange|Invite $calendar The calendar event to create
+     *
+     * @return string The serialized Zimbra ID for the created event
+     *
+     * @throws CalendarWithoutMainUserException When the calendar has no associated user email
+     */
+    public function __invoke(Calendar|CalendarRange|Invite $calendar): string
+    {
+        if ($calendar instanceof Calendar) {
+            $organizerEmail = $calendar->getMainUser()->getEmail();
+            $organizerLang = $calendar->getMainUser()->getLocale();
+        } elseif ($calendar instanceof Invite) {
+            $organizerEmail = $calendar->getUser()->getEmail();
+            $organizerLang = $calendar->getUser()->getLocale();
+        } else {
+            $organizerEmail = $calendar->getUser()->getEmail();
+            $organizerLang = $calendar->getUser()->getLocale();
+        }
+
+        if (null === $organizerEmail) {
+            throw new CalendarWithoutMainUserException();
+        }
+
+        $api = $this->soapClientBuilder->getApiForAccount($organizerEmail);
+
+        $comp = $this->createEvent->createZimbraInviteComponentFromCalendar($calendar);
+
+        $inv = new InvitationInfo();
+        $inv->setInviteComponent($comp);
+
+        $mp = new MimePartInfo();
+        $mp->addMimePart(new MimePartInfo('text/plain', $this->translator->trans('zimbra.event_created_by_chill', locale: $organizerLang)));
+
+        $msg = new Msg();
+        $msg->setSubject($this->translator->trans('zimbra.event_created_trough_soap', locale: $organizerLang))
+            ->setFolderId('10')
+            ->setInvite($inv)
+            ->setMimePart($mp);
+
+        $response = $api->createAppointment($msg, echo: true);
+
+        $echo = $response->getEcho();
+        $invite = $echo->getInvite();
+        $MPInviteInfo = $invite->getInvite();
+        /** @var InviteComponent $firstInvite */
+        $firstInvite = $MPInviteInfo->getInviteComponents()[0];
+
+        return $this->zimbraIdSerializer->serializeId(
+            $response->getCalItemId(),
+            $response->getCalInvId(),
+            $firstInvite->getUid(),
+        );
+    }
+}
diff --git a/packages/ChillZimbraBundle/src/Calendar/Connector/ZimbraConnector/CreateZimbraComponent.php b/packages/ChillZimbraBundle/src/Calendar/Connector/ZimbraConnector/CreateZimbraComponent.php
new file mode 100644
index 000000000..9fa14d75c
--- /dev/null
+++ b/packages/ChillZimbraBundle/src/Calendar/Connector/ZimbraConnector/CreateZimbraComponent.php
@@ -0,0 +1,129 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ZimbraBundle\Calendar\Connector\ZimbraConnector;
+
+use Chill\CalendarBundle\Entity\Calendar;
+use Chill\CalendarBundle\Entity\CalendarRange;
+use Chill\CalendarBundle\Entity\Invite;
+use Chill\MainBundle\Entity\Location;
+use Chill\MainBundle\Templating\Entity\AddressRender;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Templating\Entity\PersonRenderInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+use Twig\Environment;
+use Zimbra\Common\Enum\FreeBusyStatus;
+use Zimbra\Common\Enum\InviteClass;
+use Zimbra\Common\Enum\InviteStatus;
+use Zimbra\Common\Enum\Transparency;
+use Zimbra\Mail\Struct\InviteComponent;
+
+/**
+ * Class responsible for creating Zimbra invite components based on calendar data.
+ */
+final readonly class CreateZimbraComponent
+{
+    public function __construct(
+        private PersonRenderInterface $personRender,
+        private AddressRender $addressRender,
+        private DateConverter $dateConverter,
+        private TranslatorInterface $translator,
+        private Environment $twig,
+    ) {}
+
+    /**
+     * Creates a Zimbra invite component from the provided calendar object.
+     *
+     * The method initializes a new InviteComponent object, sets its properties
+     * including name, free/busy status, status, classification, transparency,
+     * all-day and draft status, as well as start and end times. If the calendar
+     * contains a location, it also sets the location for the invite component.
+     *
+     * @param Calendar|CalendarRange|Invite $calendar a calendar object containing event data
+     *
+     * @return InviteComponent the configured Zimbra invite component
+     */
+    public function createZimbraInviteComponentFromCalendar(Calendar|CalendarRange|Invite $calendar): InviteComponent
+    {
+        if ($calendar instanceof Calendar) {
+            $subject = '[Chill] '.
+                implode(
+                    ', ',
+                    $calendar->getPersons()->map(fn (Person $p) => $this->personRender->renderString($p, ['addAge' => false]))->toArray()
+                );
+            $content = $this->twig->render('@ChillZimbra/ZimbraComponent/calendar_content.txt.twig', ['calendar' => $calendar]);
+        } elseif ($calendar instanceof Invite) {
+            $subject = '[Chill] '.
+                '('.$this->translator->trans('remote_calendar.calendar_invite_statement_in_calendar').') '.
+                implode(
+                    ', ',
+                    $calendar->getCalendar()->getPersons()->map(fn (Person $p) => $this->personRender->renderString($p, ['addAge' => false]))->toArray()
+                );
+            $content = $this->twig->render('@ChillZimbra/ZimbraComponent/invitation_content.txt.twig', ['calendar' => $calendar->getCalendar()]);
+        } else {
+            // $calendar is an instanceof CalendarRange
+            $subject = $this->translator->trans('remote_calendar.calendar_range_title');
+            $content = '';
+        }
+
+        if ($calendar instanceof Invite) {
+            $startDate = $calendar->getCalendar()->getStartDate();
+            $endDate = $calendar->getCalendar()->getEndDate();
+            $location = $calendar->getCalendar()->getLocation();
+            $hasLocation = $calendar->getCalendar()->hasLocation();
+            $isPrivate = $calendar->getCalendar()->getAccompanyingPeriod()?->isConfidential() ?? false;
+        } else {
+            $startDate = $calendar->getStartDate();
+            $endDate = $calendar->getEndDate();
+            $location = $calendar->getLocation();
+            $hasLocation = $calendar->hasLocation();
+            $isPrivate = $calendar->getAccompanyingPeriod()?->isConfidential() ?? false;
+        }
+
+        $comp = new InviteComponent();
+        $comp->setName($subject);
+        $comp->setDescription($content);
+        $comp->setFreeBusy(FreeBusyStatus::BUSY);
+        $comp->setStatus(InviteStatus::CONFIRMED);
+        $comp->setCalClass($isPrivate ? InviteClass::PRI : InviteClass::PUB);
+        $comp->setTransparency(Transparency::OPAQUE);
+        $comp->setIsAllDay(false);
+        $comp->setIsDraft(false);
+        $comp->setDtStart($this->dateConverter->phpToZimbraDateTime($startDate));
+        $comp->setDtEnd($this->dateConverter->phpToZimbraDateTime($endDate));
+
+        if ($hasLocation) {
+            $comp
+                ->setLocation($this->createLocationString($location));
+        }
+
+        return $comp;
+    }
+
+    private function createLocationString(Location $location): string
+    {
+        $str = '';
+
+        if ('' !== ($loc = (string) $location->getName())) {
+            $str .= $loc;
+        }
+
+        if ($location->hasAddress()) {
+            if ('' !== $str) {
+                $str .= ', ';
+            }
+
+            $str .= $this->addressRender->renderString($location->getAddress(), ['separator' => ', ']);
+        }
+
+        return $str;
+    }
+}
diff --git a/packages/ChillZimbraBundle/src/Calendar/Connector/ZimbraConnector/DateConverter.php b/packages/ChillZimbraBundle/src/Calendar/Connector/ZimbraConnector/DateConverter.php
new file mode 100644
index 000000000..1fdea5040
--- /dev/null
+++ b/packages/ChillZimbraBundle/src/Calendar/Connector/ZimbraConnector/DateConverter.php
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ZimbraBundle\Calendar\Connector\ZimbraConnector;
+
+use Zimbra\Mail\Struct\DtTimeInfo;
+
+/**
+ * Class DateConverter.
+ *
+ * Provides methods for converting PHP DateTime objects
+ * into specific date-time formats or representations.
+ */
+final readonly class DateConverter
+{
+    public const FORMAT_DATE_TIME = 'Ymd\THis';
+
+    /**
+     * Converts a PHP DateTimeInterface object into a Zimbra-specific DtTimeInfo object.
+     *
+     * @param \DateTimeInterface $date the date to be converted
+     *
+     * @return DtTimeInfo the converted DtTimeInfo object
+     */
+    public function phpToZimbraDateTime(\DateTimeInterface $date): DtTimeInfo
+    {
+        return new DtTimeInfo($date->format(self::FORMAT_DATE_TIME), $date->getTimezone()->getName());
+    }
+}
diff --git a/packages/ChillZimbraBundle/src/Calendar/Connector/ZimbraConnector/DeleteEvent.php b/packages/ChillZimbraBundle/src/Calendar/Connector/ZimbraConnector/DeleteEvent.php
new file mode 100644
index 000000000..2e3ae5314
--- /dev/null
+++ b/packages/ChillZimbraBundle/src/Calendar/Connector/ZimbraConnector/DeleteEvent.php
@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ZimbraBundle\Calendar\Connector\ZimbraConnector;
+
+use Chill\MainBundle\Entity\User;
+use Chill\ZimbraBundle\Exception\CalendarWithoutMainUserException;
+
+/**
+ * Represents an action to delete an existing Appointment in the Zimbra calendar.
+ * The deletion is performed using the remoteId of the appointment.
+ */
+final readonly class DeleteEvent
+{
+    public function __construct(
+        private SoapClientBuilder $soapClientBuilder,
+        private ZimbraIdSerializer $zimbraIdSerializer,
+    ) {}
+
+    /**
+     * Delete an existing Appointment in the Zimbra calendar, from his remoteId.
+     *
+     * @param User   $user     The user who owns the calendar
+     * @param string $remoteId The remoteId of the appointment
+     */
+    public function __invoke(User $user, string $remoteId): void
+    {
+        $organizerEmail = $user->getEmail();
+
+        if (null === $organizerEmail) {
+            throw new CalendarWithoutMainUserException();
+        }
+
+        $api = $this->soapClientBuilder->getApiForAccount($organizerEmail);
+        ['calItemId' => $calItemId, 'calInvId' => $calInvId, 'inviteComponentCommonUid' => $inviteComponentCommonUid]
+            = $this->zimbraIdSerializer->deSerializeId($remoteId);
+
+        $api->cancelAppointment(
+            id: $calInvId,
+            componentNum: 0,
+        );
+    }
+}
diff --git a/packages/ChillZimbraBundle/src/Calendar/Connector/ZimbraConnector/SoapClientBuilder.php b/packages/ChillZimbraBundle/src/Calendar/Connector/ZimbraConnector/SoapClientBuilder.php
new file mode 100644
index 000000000..e66c45e85
--- /dev/null
+++ b/packages/ChillZimbraBundle/src/Calendar/Connector/ZimbraConnector/SoapClientBuilder.php
@@ -0,0 +1,78 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ZimbraBundle\Calendar\Connector\ZimbraConnector;
+
+use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+use Symfony\Component\HttpClient\Psr18Client;
+use Symfony\Contracts\HttpClient\HttpClientInterface;
+use Zimbra\Common\Enum\AccountBy;
+use Zimbra\Common\Soap\ClientFactory;
+use Zimbra\Common\Struct\Header\AccountInfo;
+use Zimbra\Mail\MailApi;
+
+final readonly class SoapClientBuilder
+{
+    private string $username;
+
+    private string $password;
+
+    private string $url;
+
+    public function __construct(private ParameterBagInterface $parameterBag, private HttpClientInterface $client)
+    {
+        $dsn = $this->parameterBag->get('chill_calendar.remote_calendar_dsn');
+        $url = parse_url($dsn);
+
+        $this->username = urldecode($url['user']);
+        $this->password = urldecode($url['pass']);
+        if ('zimbra+http' === $url['scheme']) {
+            $scheme = 'http://';
+            $port = $url['port'] ?? 80;
+        } elseif ('zimbra+https' === $url['scheme']) {
+            $scheme = 'https://';
+            $port = $url['port'] ?? 443;
+        } else {
+            throw new \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException('Unsupported remote calendar scheme: '.$url['scheme']);
+        }
+
+        $this->url = $scheme.$url['host'].':'.$port;
+    }
+
+    private function buildApi(): MailApi
+    {
+        $baseClient = $this->client->withOptions([
+            'base_uri' => $location = $this->url.'/service/soap',
+            'verify_host' => false,
+            'verify_peer' => false,
+        ]);
+        $psr18Client = new Psr18Client($baseClient);
+        $api = new MailApi();
+        $client = ClientFactory::create($location, $psr18Client);
+        $api->setClient($client);
+
+        return $api;
+    }
+
+    public function getApiForAccount(string $accountName): MailApi
+    {
+        $api = $this->buildApi();
+        $response = $api->authByAccountName($this->username, $this->password);
+
+        $token = $response->getAuthToken();
+
+        $apiBy = $this->buildApi();
+        $apiBy->setAuthToken($token);
+        $apiBy->setTargetAccount(new AccountInfo(AccountBy::NAME, $accountName));
+
+        return $apiBy;
+    }
+}
diff --git a/packages/ChillZimbraBundle/src/Calendar/Connector/ZimbraConnector/UpdateEvent.php b/packages/ChillZimbraBundle/src/Calendar/Connector/ZimbraConnector/UpdateEvent.php
new file mode 100644
index 000000000..9bd42b016
--- /dev/null
+++ b/packages/ChillZimbraBundle/src/Calendar/Connector/ZimbraConnector/UpdateEvent.php
@@ -0,0 +1,97 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ZimbraBundle\Calendar\Connector\ZimbraConnector;
+
+use Chill\CalendarBundle\Entity\Calendar;
+use Chill\CalendarBundle\Entity\CalendarRange;
+use Chill\CalendarBundle\Entity\Invite;
+use Chill\ZimbraBundle\Exception\CalendarWithoutMainUserException;
+use Symfony\Contracts\Translation\TranslatorInterface;
+use Zimbra\Mail\Struct\InvitationInfo;
+use Zimbra\Mail\Struct\MimePartInfo;
+use Zimbra\Mail\Struct\Msg;
+
+/**
+ * Updates an existing calendar event in Zimbra.
+ *
+ * This class handles the modification of existing calendar events in the Zimbra system.
+ * It uses the Zimbra SOAP API to update event details while maintaining the original
+ * event's metadata like IDs and sequences.
+ */
+final readonly class UpdateEvent
+{
+    public function __construct(
+        private SoapClientBuilder $soapClientBuilder,
+        private CreateZimbraComponent $createZimbraComponent,
+        private TranslatorInterface $translator,
+        private ZimbraIdSerializer $zimbraIdSerializer,
+    ) {}
+
+    /**
+     * Updates an existing calendar event in Zimbra.
+     *
+     * @param Calendar|CalendarRange $calendar The calendar event to update
+     *
+     * @throws CalendarWithoutMainUserException When the calendar has no associated user email
+     */
+    public function __invoke(Calendar|CalendarRange|Invite $calendar): void
+    {
+        if ($calendar instanceof Calendar) {
+            $organizerEmail = $calendar->getMainUser()->getEmail();
+            $organizerLang = $calendar->getMainUser()->getLocale();
+        } elseif ($calendar instanceof Invite) {
+            $organizerEmail = $calendar->getCalendar()->getMainUser()->getEmail();
+            $organizerLang = $calendar->getCalendar()->getMainUser()->getLocale();
+        } else {
+            $organizerEmail = $calendar->getUser()->getEmail();
+            $organizerLang = $calendar->getUser()->getLocale();
+        }
+
+        if (null === $organizerEmail) {
+            throw new CalendarWithoutMainUserException();
+        }
+
+        $api = $this->soapClientBuilder->getApiForAccount($organizerEmail);
+
+        ['calItemId' => $calItemId, 'calInvId' => $calInvId, 'inviteComponentCommonUid' => $inviteComponentCommonUid]
+            = $this->zimbraIdSerializer->deSerializeId($calendar->getRemoteId());
+
+        $existing = $api->getAppointment(sync: true, includeContent: true, includeInvites: true, id: $calItemId);
+        $appt = $existing->getApptItem();
+
+        $comp = $this->createZimbraComponent->createZimbraInviteComponentFromCalendar($calendar);
+        $comp->setUid($inviteComponentCommonUid);
+
+        $inv = new InvitationInfo();
+        $inv->setInviteComponent($comp)
+            ->setUid($calInvId);
+
+        $mp = new MimePartInfo();
+        $mp->addMimePart(new MimePartInfo('text/plain', $this->translator->trans('zimbra.event_created_by_chill', locale: $organizerLang)));
+
+        $msg = new Msg();
+        $msg->setSubject($this->translator->trans('zimbra.event_created_trough_soap', locale: $organizerLang))
+            ->setFolderId('10')
+            ->setInvite($inv)
+            ->setMimePart($mp)
+        ;
+
+        $response = $api->modifyAppointment(
+            id: $calInvId,
+            componentNum: 0,
+            modifiedSequence: $appt->getModifiedSequence(),
+            revision: $appt->getRevision(),
+            msg: $msg,
+            echo: true
+        );
+    }
+}
diff --git a/packages/ChillZimbraBundle/src/Calendar/Connector/ZimbraConnector/ZimbraIdSerializer.php b/packages/ChillZimbraBundle/src/Calendar/Connector/ZimbraConnector/ZimbraIdSerializer.php
new file mode 100644
index 000000000..ba9d9ab63
--- /dev/null
+++ b/packages/ChillZimbraBundle/src/Calendar/Connector/ZimbraConnector/ZimbraIdSerializer.php
@@ -0,0 +1,67 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ZimbraBundle\Calendar\Connector\ZimbraConnector;
+
+use Chill\ZimbraBundle\Exception\ZimbraCalendarIdNotDeserializedException;
+
+/**
+ * Serializes and deserializes Zimbra calendar event IDs.
+ *
+ * This class handles the conversion between Zimbra's individual ID components
+ * and a single serialized string format, allowing for consistent storage and retrieval
+ * of Zimbra calendar event identifiers.
+ */
+final readonly class ZimbraIdSerializer
+{
+    /**
+     * Serializes individual Zimbra calendar ID components into a single string.
+     *
+     * @param string $calItemId                The calendar item ID from Zimbra
+     * @param string $calInvId                 The calendar invitation ID from Zimbra
+     * @param string $inviteComponentCommonUid The common UID for the invite component
+     *
+     * @return string The serialized ID in format "calItemId|calInvId|inviteComponentCommonUid|v0"
+     */
+    public function serializeId(string $calItemId, string $calInvId, string $inviteComponentCommonUid): string
+    {
+        return sprintf(
+            '%s|%s|%s|v0',
+            $calItemId,
+            $calInvId,
+            $inviteComponentCommonUid,
+        );
+    }
+
+    /**
+     * Deserializes a Zimbra calendar ID string into its component parts.
+     *
+     * @param string $remoteId The serialized ID, as stored in the remoteId's Calendar or CalendarRange
+     *
+     * @return array{calItemId: string, calInvId: string, inviteComponentCommonUid: string} Associative array containing the ID components
+     *
+     * @throws ZimbraCalendarIdNotDeserializedException If the remote ID format is invalid or incompatible
+     */
+    public function deSerializeId(string $remoteId): array
+    {
+        if (!str_ends_with($remoteId, 'v0')) {
+            throw new ZimbraCalendarIdNotDeserializedException();
+        }
+
+        $exploded = explode('|', $remoteId);
+
+        return [
+            'calItemId' => $exploded[0],
+            'calInvId' => $exploded[1],
+            'inviteComponentCommonUid' => $exploded[2],
+        ];
+    }
+}
diff --git a/packages/ChillZimbraBundle/src/ChillZimbraBundle.php b/packages/ChillZimbraBundle/src/ChillZimbraBundle.php
new file mode 100644
index 000000000..b49e7e8af
--- /dev/null
+++ b/packages/ChillZimbraBundle/src/ChillZimbraBundle.php
@@ -0,0 +1,16 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ZimbraBundle;
+
+use Symfony\Component\HttpKernel\Bundle\Bundle;
+
+class ChillZimbraBundle extends Bundle {}
diff --git a/packages/ChillZimbraBundle/src/DependencyInjection/ChillZimbraExtension.php b/packages/ChillZimbraBundle/src/DependencyInjection/ChillZimbraExtension.php
new file mode 100644
index 000000000..0a5f84ed8
--- /dev/null
+++ b/packages/ChillZimbraBundle/src/DependencyInjection/ChillZimbraExtension.php
@@ -0,0 +1,26 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ZimbraBundle\DependencyInjection;
+
+use Symfony\Component\Config\FileLocator;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+use Symfony\Component\DependencyInjection\Extension\Extension;
+use Symfony\Component\DependencyInjection\Loader\YamlFileLoader;
+
+class ChillZimbraExtension extends Extension
+{
+    public function load(array $configs, ContainerBuilder $container)
+    {
+        $loader = new YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
+        $loader->load('services.yaml');
+    }
+}
diff --git a/packages/ChillZimbraBundle/src/Exception/CalendarWithoutMainUserException.php b/packages/ChillZimbraBundle/src/Exception/CalendarWithoutMainUserException.php
new file mode 100644
index 000000000..01314a62b
--- /dev/null
+++ b/packages/ChillZimbraBundle/src/Exception/CalendarWithoutMainUserException.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ZimbraBundle\Exception;
+
+class CalendarWithoutMainUserException extends \RuntimeException {}
diff --git a/packages/ChillZimbraBundle/src/Exception/ZimbraCalendarIdNotDeserializedException.php b/packages/ChillZimbraBundle/src/Exception/ZimbraCalendarIdNotDeserializedException.php
new file mode 100644
index 000000000..892ae2c3c
--- /dev/null
+++ b/packages/ChillZimbraBundle/src/Exception/ZimbraCalendarIdNotDeserializedException.php
@@ -0,0 +1,14 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ZimbraBundle\Exception;
+
+class ZimbraCalendarIdNotDeserializedException extends \RuntimeException {}
diff --git a/packages/ChillZimbraBundle/src/config/services.yaml b/packages/ChillZimbraBundle/src/config/services.yaml
new file mode 100644
index 000000000..fc3868477
--- /dev/null
+++ b/packages/ChillZimbraBundle/src/config/services.yaml
@@ -0,0 +1,7 @@
+services:
+    _defaults:
+        autoconfigure: true
+        autowire: true
+
+    Chill\ZimbraBundle\Calendar\:
+        resource: '../Calendar'
diff --git a/packages/ChillZimbraBundle/src/templates/ZimbraComponent/calendar_content.txt.twig b/packages/ChillZimbraBundle/src/templates/ZimbraComponent/calendar_content.txt.twig
new file mode 100644
index 000000000..bb1e4d081
--- /dev/null
+++ b/packages/ChillZimbraBundle/src/templates/ZimbraComponent/calendar_content.txt.twig
@@ -0,0 +1,18 @@
+{{ 'zimbra.content.appointment_created_by_chill'|trans }}
+
+{{ 'zimbra.content.link_to_edit'|trans }} : {{ absolute_url(path('chill_calendar_calendar_edit', {'id': calendar.id, '_locale': calendar.mainUser.locale })) }}
+
+{{ calendar.comment|chill_entity_render_string }}
+
+{{ 'zimbra.content.persons_and_professionnals_concerned'|trans }} :
+
+{% for e in calendar.persons %}
+- {{ e|chill_entity_render_string({'addAge': false}) }}
+{% endfor -%}
+{%- for e in calendar.professionals %}
+- {{ e|chill_entity_render_string }}
+{% endfor -%}
+{%- for e in calendar.users %}
+- {{ e|chill_entity_render_string }}
+{% endfor %}
+
diff --git a/packages/ChillZimbraBundle/src/templates/ZimbraComponent/invitation_content.txt.twig b/packages/ChillZimbraBundle/src/templates/ZimbraComponent/invitation_content.txt.twig
new file mode 100644
index 000000000..0fd4c4d21
--- /dev/null
+++ b/packages/ChillZimbraBundle/src/templates/ZimbraComponent/invitation_content.txt.twig
@@ -0,0 +1,20 @@
+{{ 'zimbra.content.appointment_created_by_chill'|trans }}
+
+{{ 'zimbra.content.you_were_invited_by'|trans }}: {{ calendar.mainUser|chill_entity_render_string }}
+
+{{ 'zimbra.content.link_to_edit'|trans }} : {{ absolute_url(path('chill_calendar_calendar_edit', {'id': calendar.id, '_locale': calendar.mainUser.locale })) }}
+
+{{ calendar.comment|chill_entity_render_string }}
+
+{{ 'zimbra.content.persons_and_professionnals_concerned'|trans }} :
+
+{% for e in calendar.persons %}
+- {{ e|chill_entity_render_string({'addAge': false}) }}
+{% endfor -%}
+{%- for e in calendar.professionals %}
+- {{ e|chill_entity_render_string }}
+{% endfor -%}
+{%- for e in calendar.users %}
+- {{ e|chill_entity_render_string }}
+{% endfor %}
+
diff --git a/packages/ChillZimbraBundle/src/translations/messages+intl-icu.fr.yml b/packages/ChillZimbraBundle/src/translations/messages+intl-icu.fr.yml
new file mode 100644
index 000000000..7e02592ae
--- /dev/null
+++ b/packages/ChillZimbraBundle/src/translations/messages+intl-icu.fr.yml
@@ -0,0 +1,9 @@
+zimbra:
+    event_created_by_chill: Événement créé par Chill
+    event_created_trough_soap: Événement créé via l'API SOAP
+
+    content:
+        appointment_created_by_chill: Ce rendez-vous a été créé par Chill
+        link_to_edit: Pour modifier ou supprimer ce rendez-vous, utilisez l’adresse suivante
+        persons_and_professionnals_concerned: Usagers et tiers concernés
+        you_were_invited_by: Vous avez été invité par
diff --git a/phpstan.dist.neon b/phpstan.dist.neon
index 60c36771e..38c3f7b61 100644
--- a/phpstan.dist.neon
+++ b/phpstan.dist.neon
@@ -3,6 +3,7 @@ parameters:
     paths:
         - src/
         - utils/
+        - packages/
     tmpDir: var/cache/phpstan
     reportUnmatchedIgnoredErrors: false
     excludePaths:
diff --git a/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php b/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php
index 5aa8d8507..1e37a7ebc 100644
--- a/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php
+++ b/src/Bundle/ChillCalendarBundle/DependencyInjection/ChillCalendarExtension.php
@@ -47,6 +47,8 @@ class ChillCalendarExtension extends Extension implements PrependExtensionInterf
         } else {
             $container->setParameter('chill_calendar.short_messages', null);
         }
+
+        $container->setParameter('chill_calendar.remote_calendar_dsn', $config['remote_calendar_dsn']);
     }
 
     public function prepend(ContainerBuilder $container)
diff --git a/src/Bundle/ChillCalendarBundle/DependencyInjection/Configuration.php b/src/Bundle/ChillCalendarBundle/DependencyInjection/Configuration.php
index a3e4ae391..e4ca96ca2 100644
--- a/src/Bundle/ChillCalendarBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillCalendarBundle/DependencyInjection/Configuration.php
@@ -32,9 +32,10 @@ class Configuration implements ConfigurationInterface
             ->canBeDisabled()
             ->children()->end()
             ->end() // end for short_messages
+            ->scalarNode('remote_calendar_dsn')->defaultValue('null://null')->cannotBeEmpty()->end()
             ->arrayNode('remote_calendars_sync')->canBeEnabled()
             ->children()
-            ->arrayNode('microsoft_graph')->canBeEnabled()
+            ->arrayNode('microsoft_graph')->canBeEnabled()->setDeprecated('chill-project/chill-bundles', '4.7.0', 'The child node %node% at path %path% is deprecated: use remote_calendar_dsn instead, with a "msgraph://default" value')
             ->children()
             ->end() // end of machine_access_token
             ->end() // end of microsoft_graph children
diff --git a/src/Bundle/ChillCalendarBundle/Entity/CalendarRange.php b/src/Bundle/ChillCalendarBundle/Entity/CalendarRange.php
index 12f3ed7e7..34cd5623a 100644
--- a/src/Bundle/ChillCalendarBundle/Entity/CalendarRange.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/CalendarRange.php
@@ -107,6 +107,11 @@ class CalendarRange implements TrackCreationInterface, TrackUpdateInterface
         return $this;
     }
 
+    public function hasLocation(): bool
+    {
+        return null !== $this->location;
+    }
+
     public function setLocation(?Location $location): self
     {
         $this->location = $location;
diff --git a/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarRemoveHandler.php b/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarRemoveHandler.php
index 73e8a0c37..9b3a054a0 100644
--- a/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarRemoveHandler.php
+++ b/src/Bundle/ChillCalendarBundle/Messenger/Handler/CalendarRemoveHandler.php
@@ -22,6 +22,7 @@ use Chill\CalendarBundle\Messenger\Message\CalendarRemovedMessage;
 use Chill\CalendarBundle\RemoteCalendar\Connector\RemoteCalendarConnectorInterface;
 use Chill\CalendarBundle\Repository\CalendarRangeRepository;
 use Chill\MainBundle\Repository\UserRepositoryInterface;
+use Doctrine\ORM\EntityManagerInterface;
 use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
 
 /**
@@ -31,7 +32,12 @@ use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
  */
 class CalendarRemoveHandler implements MessageHandlerInterface
 {
-    public function __construct(private readonly RemoteCalendarConnectorInterface $remoteCalendarConnector, private readonly CalendarRangeRepository $calendarRangeRepository, private readonly UserRepositoryInterface $userRepository) {}
+    public function __construct(
+        private readonly RemoteCalendarConnectorInterface $remoteCalendarConnector,
+        private readonly CalendarRangeRepository $calendarRangeRepository,
+        private readonly UserRepositoryInterface $userRepository,
+        private readonly EntityManagerInterface $entityManager,
+    ) {}
 
     public function __invoke(CalendarRemovedMessage $message)
     {
@@ -47,5 +53,7 @@ class CalendarRemoveHandler implements MessageHandlerInterface
             $this->userRepository->find($message->getCalendarUserId()),
             $associatedRange
         );
+
+        $this->entityManager->flush();
     }
 }
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/RemoteCalendarConnectorInterface.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/RemoteCalendarConnectorInterface.php
index 1e3c16845..644d22ae4 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/RemoteCalendarConnectorInterface.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/RemoteCalendarConnectorInterface.php
@@ -21,42 +21,137 @@ namespace Chill\CalendarBundle\RemoteCalendar\Connector;
 use Chill\CalendarBundle\Entity\Calendar;
 use Chill\CalendarBundle\Entity\CalendarRange;
 use Chill\CalendarBundle\Entity\Invite;
+use Chill\CalendarBundle\Messenger\Message\CalendarMessage;
 use Chill\CalendarBundle\RemoteCalendar\Model\RemoteEvent;
 use Chill\MainBundle\Entity\User;
 use Symfony\Component\HttpFoundation\Response;
 
+/**
+ * Contract for connectors that synchronize Chill calendars with a remote
+ * calendar provider (for example Microsoft 365/Graph, Zimbra, ...).
+ *
+ * Implementations act as an adapter between Chill domain objects
+ * (Calendar, CalendarRange, Invite) and the remote provider API. They must:
+ * - expose a readiness flow for per-user authorization when applicable
+ *   (see {@see getMakeReadyResponse()} and {@see isReady()});
+ * - list and count remote events in a time range for a given user;
+ * - mirror local lifecycle changes to the remote provider for calendars,
+ *   calendar ranges (availability/busy blocks) and invites/attendees.
+ *
+ * Use {@see MSGraphRemoteCalendarConnector} as a reference implementation for
+ * expected behaviours, error handling and parameter semantics.
+ */
 interface RemoteCalendarConnectorInterface
 {
     public function countEventsForUser(User $user, \DateTimeImmutable $startDate, \DateTimeImmutable $endDate): int;
 
     /**
-     * Return a response, more probably a RedirectResponse, where the user
-     * will be able to fullfill requirements to prepare this connector and
-     * make it ready.
+     * Returns a Response (typically a RedirectResponse) that lets the current
+     * user perform the steps required to make the connector usable (for
+     * example, OAuth consent or account linking). After completion, the user
+     * should be redirected back to the given path.
      */
     public function getMakeReadyResponse(string $returnPath): Response;
 
     /**
-     * Return true if the connector is ready to act as a proxy for reading
-     * remote calendars.
+     * Returns true when the connector is ready to access the remote provider
+     * on behalf of the current user (e.g. required tokens/consent exist).
      */
     public function isReady(): bool;
 
     /**
+     * Lists events from the remote provider for the given user and time range.
+     *
+     * Implementations should map provider-specific payloads to instances of
+     * {@see RemoteEvent}.
+     *
      * @return array|RemoteEvent[]
      */
     public function listEventsForUser(User $user, \DateTimeImmutable $startDate, \DateTimeImmutable $endDate, ?int $offset = 0, ?int $limit = 50): array;
 
+    /**
+     * Removes a calendar (single event) from the remote provider.
+     *
+     * **Note**: calendar (single event) which are canceled will appears in this
+     * method, and not in syncCalendar method.
+     *
+     * Parameters:
+     * - remoteId: the provider identifier of the remote event to delete. If
+     *   empty, implementations should no-op.
+     * - remoteAttributes: provider-specific metadata previously stored with the
+     *   local entity (e.g. change keys, etags) that can help perform safe
+     *   concurrency checks when deleting. Implementations may ignore unknown
+     *   keys.
+     * - user: the user in whose remote calendar the event lives and on whose
+     *   behalf the deletion must be performed.
+     * - associatedCalendarRange: when provided, the implementation should
+     *   update/synchronize the corresponding remote busy-time block after the
+     *   event removal so that availability stays consistent.
+     */
     public function removeCalendar(string $remoteId, array $remoteAttributes, User $user, ?CalendarRange $associatedCalendarRange = null): void;
 
+    /**
+     * Removes a remote busy-time block (calendar range) identified by
+     * provider-specific id and attributes for the given user.
+     *
+     * Implementations should no-op if the id is empty.
+     */
     public function removeCalendarRange(string $remoteId, array $remoteAttributes, User $user): void;
 
     /**
+     * Synchronizes a Calendar entity to the remote provider.
+     *
+     * Typical cases to support (see MSGraph implementation):
+     * - Creating the event on the remote calendar when it has no remote id.
+     * - Updating the existing remote event when details or attendees change.
+     * - Handling main user changes: cancel on the previous user's calendar,
+     *   (re)create associated ranges where needed, then create on the new
+     *   main user's calendar.
+     * - If the Calendar uses a CalendarRange that already exists remotely,
+     *   implementations should remove/update that remote range when the event
+     *   becomes the source of truth for busy times.
+     *
+     * The implementation should not expects to receive calendar which are canceled
+     * here.
+     *
+     * Parameters:
+     * - calendar: the domain Calendar to mirror remotely.
+     * - action: a hint about what triggered the sync; implementations should not rely
+     *   solely on this value and must base decisions on the Calendar state.
+     * - previousCalendarRange: if the Calendar was previously attached to a
+     *   different range, this contains the former range so it can be recreated
+     *   remotely to preserve availability history when applicable.
+     * - previousMainUser: the former main user, when the main user changed;
+     *   used to cancel the event in the previous user's calendar.
+     * - oldInvites: the attendee snapshot before the change. Each item is an
+     *   array with keys: inviteId, userId, userEmail, userLabel.
+     * - newInvites: the attendee snapshot after the change, same shape as
+     *   oldInvites. Implementations can compute diffs to add/remove attendees.
+     *
+     * The $action argument is a string tag indicating what happened to the
+     * calendar. It MUST be one of the constants defined on
+     * {@see CalendarMessage}:
+     * - {@see CalendarMessage::CALENDAR_PERSIST}
+     * - {@see CalendarMessage::CALENDAR_UPDATE}
+     *
      * @param array<array{inviteId: int, userId: int, userEmail: int, userLabel: string}> $oldInvites
+     *
+     * @phpstan-param (CalendarMessage::CALENDAR_PERSIST|CalendarMessage::CALENDAR_UPDATE) $action
      */
     public function syncCalendar(Calendar $calendar, string $action, ?CalendarRange $previousCalendarRange, ?User $previousMainUser, ?array $oldInvites, ?array $newInvites): void;
 
+    /**
+     * Creates or updates a remote busy-time block representing the provided
+     * CalendarRange. If the range has a remote id, it should be updated;
+     * otherwise it should be created remotely, and the range enriched with
+     * the new id/attributes by the caller.
+     */
     public function syncCalendarRange(CalendarRange $calendarRange): void;
 
+    /**
+     * Synchronizes a single Invite (attendee) change to the remote provider.
+     * Implementations may need to lookup the attendee's personal calendar to
+     * find provider-specific identifiers before patching the main event.
+     */
     public function syncInvite(Invite $invite): void;
 }
diff --git a/src/Bundle/ChillCalendarBundle/RemoteCalendar/DependencyInjection/RemoteCalendarCompilerPass.php b/src/Bundle/ChillCalendarBundle/RemoteCalendar/DependencyInjection/RemoteCalendarCompilerPass.php
index c52fc2866..3fb82ac6a 100644
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/DependencyInjection/RemoteCalendarCompilerPass.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/DependencyInjection/RemoteCalendarCompilerPass.php
@@ -35,25 +35,46 @@ use TheNetworg\OAuth2\Client\Provider\Azure;
 
 class RemoteCalendarCompilerPass implements CompilerPassInterface
 {
+    private const ZIMBRA_CONNECTOR = 'Chill\ZimbraBundle\Calendar\Connector\ZimbraConnector';
+
+    private const MS_GRAPH_SERVICES_TO_REMOVE = [
+        MapAndSubscribeUserCalendarCommand::class,
+        AzureGrantAdminConsentAndAcquireToken::class,
+        RemoteCalendarConnectAzureController::class,
+        MachineTokenStorage::class,
+        MachineHttpClient::class,
+        MSGraphRemoteCalendarConnector::class,
+        MSUserAbsenceReaderInterface::class,
+        MSUserAbsenceSync::class,
+    ];
+
     public function process(ContainerBuilder $container)
     {
-        $config = $container->getParameter('chill_calendar');
+        $config = $container->getParameter('chill_calendar.remote_calendar_dsn');
+        if (true === $container->getParameter('chill_calendar')['remote_calendars_sync']['microsoft_graph']['enabled']) {
+            $dsn = 'msgraph://default';
+        } else {
+            $dsn = $config;
+        }
 
-        if (true === $config['remote_calendars_sync']['microsoft_graph']['enabled']) {
+        $scheme = parse_url($dsn, PHP_URL_SCHEME);
+
+        if ('msgraph' === $scheme) {
             $connector = MSGraphRemoteCalendarConnector::class;
 
             $container->setAlias(HttpClientInterface::class.' $machineHttpClient', MachineHttpClient::class);
-        } else {
+        } elseif ('zimbra+http' === $scheme || 'zimbra+https' === $scheme) {
+            $connector = self::ZIMBRA_CONNECTOR;
+            foreach (self::MS_GRAPH_SERVICES_TO_REMOVE as $serviceId) {
+                $container->removeDefinition($serviceId);
+            }
+        } elseif ('null' === $scheme) {
             $connector = NullRemoteCalendarConnector::class;
-            // remove services which cannot be loaded
-            $container->removeDefinition(MapAndSubscribeUserCalendarCommand::class);
-            $container->removeDefinition(AzureGrantAdminConsentAndAcquireToken::class);
-            $container->removeDefinition(RemoteCalendarConnectAzureController::class);
-            $container->removeDefinition(MachineTokenStorage::class);
-            $container->removeDefinition(MachineHttpClient::class);
-            $container->removeDefinition(MSGraphRemoteCalendarConnector::class);
-            $container->removeDefinition(MSUserAbsenceReaderInterface::class);
-            $container->removeDefinition(MSUserAbsenceSync::class);
+            foreach (self::MS_GRAPH_SERVICES_TO_REMOVE as $serviceId) {
+                $container->removeDefinition($serviceId);
+            }
+        } else {
+            throw new \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException('Unsupported remote calendar scheme: '.$scheme);
         }
 
         if (!$container->hasAlias(Azure::class) && $container->hasDefinition('knpu.oauth2.client.azure')) {
@@ -62,7 +83,9 @@ class RemoteCalendarCompilerPass implements CompilerPassInterface
 
         foreach ([
             NullRemoteCalendarConnector::class,
-            MSGraphRemoteCalendarConnector::class, ] as $serviceId) {
+            MSGraphRemoteCalendarConnector::class,
+            self::ZIMBRA_CONNECTOR,
+        ] as $serviceId) {
             if ($connector === $serviceId) {
                 $container->getDefinition($serviceId)
                     ->setDecoratedService(RemoteCalendarConnectorInterface::class);
diff --git a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
index 8717dcd9f..b4bdd0679 100644
--- a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
@@ -87,6 +87,8 @@ remote_ms_graph:
 
 remote_calendar:
     calendar_range_title: Plage de disponibilité Chill
+    # small type-hint in remote calendar to says that the appointment is created through an invitation, and not as main referrer
+    calendar_invite_statement_in_calendar: Par invitation
 
 invite:
     accepted: Accepté
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/AddressRender.php b/src/Bundle/ChillMainBundle/Templating/Entity/AddressRender.php
index f59b1cd66..33ce83a83 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/AddressRender.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/AddressRender.php
@@ -26,6 +26,7 @@ class AddressRender implements ChillEntityRenderInterface
         'with_delimiter' => false,
         'has_no_address' => false,
         'multiline' => true,
+        'separator' => ' — ',
         /* deprecated */
         'extended_infos' => false,
     ];
@@ -114,7 +115,9 @@ class AddressRender implements ChillEntityRenderInterface
 
     public function renderString($addr, array $options): string
     {
-        return implode(' — ', $this->renderLines($addr));
+        $opts = [...self::DEFAULT_OPTIONS, ...$options];
+
+        return implode($opts['separator'], $this->renderLines($addr));
     }
 
     public function supports($entity, array $options): bool
diff --git a/src/Bundle/ChillMainBundle/Templating/Entity/CommentRender.php b/src/Bundle/ChillMainBundle/Templating/Entity/CommentRender.php
index a4d0f48e6..9a808da77 100644
--- a/src/Bundle/ChillMainBundle/Templating/Entity/CommentRender.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/CommentRender.php
@@ -52,7 +52,7 @@ class CommentRender implements ChillEntityRenderInterface
 
     public function renderString($entity, array $options): string
     {
-        return $entity->getComment();
+        return (string) $entity->getComment();
     }
 
     public function supports($entity, array $options): bool
diff --git a/symfony.lock b/symfony.lock
index 6409f0c1d..0feff9ebd 100644
--- a/symfony.lock
+++ b/symfony.lock
@@ -2,6 +2,9 @@
     "champs-libres/wopi-bundle": {
         "version": "dev-master"
     },
+    "chill-project/chill-zimbra-bundle": {
+        "version": "dev-472-zimbra-connector"
+    },
     "doctrine/annotations": {
         "version": "1.14",
         "recipe": {

From 7186fd9fb8530c11f8c8e3e6075c38dd4fb280cd Mon Sep 17 00:00:00 2001
From: LenaertsJ <julie.lenaerts@champs-libres.coop>
Date: Fri, 5 Dec 2025 12:00:56 +0000
Subject: [PATCH 246/283] Dutch translations

---
 .env                                          |    4 +
 composer.json                                 |    1 +
 config/packages/translation.yaml              |    9 +-
 config/packages/translation_chill.yaml        |    4 -
 .../development/translation_directives.rst    |  419 ++++++
 .../development/translation_provider.rst      |  148 +++
 .../translations/messages+intl-icu.nl.yml     |   18 +
 .../translations/messages.nl.yaml             |  614 ++++++---
 .../src/translations/messages.nl.yaml         |   57 +
 .../translations/messages.nl.yml              |   39 +
 .../translations/validators.nl.yml            |   10 +-
 .../translations/messages+intl-icu.nl.yml     |    8 +
 .../translations/messages.nl.yml              |  146 +++
 .../translations/validators.nl.yml            |    6 +
 .../translations/messages.nl.yml              |  102 +-
 .../translations/validators.nl.yml            |    3 +
 .../translations/messages+intl-icu.nl.yml     |    2 +
 .../translations/messages.nl.yml              |   51 +
 .../translations/messages+intl-icu.nl.yml     |   11 +
 .../translations/messages.nl.yml              |  130 +-
 .../translations/validators.nl.yml            |    2 +
 .../translations/messages+intl-icu.nl.yml     |   27 +
 .../translations/messages.nl.yml              |  198 +++
 .../translations/validators.nl.yml            |    3 +
 .../Resources/translations/messages.nl.yml    |  213 +++
 .../ChillMainBundle/translations/date.nl.yml  |    7 +
 .../translations/messages+intl-icu.nl.yaml    |  155 +++
 .../translations/messages.nl.yml              | 1152 ++++++++++++-----
 .../translations/validators.nl.yml            |   45 +
 .../translations/messages+intl-icu.nl.yaml    |  211 +++
 .../translations/messages.nl.yml              |  991 +++++++++++++-
 .../translations/validators.nl.yml            |   67 +-
 .../translations/messages.intl-icu.nl.yaml    |    7 +
 .../translations/messages.nl.yml              |   66 +-
 .../translations/messages+intl-icu.nl.yml     |   14 +
 .../translations/messages.nl.yml              |  117 ++
 .../translations/validators.nl.yml            |    4 +
 .../translations/messages.nl.yml              |  169 +++
 .../translations/validators.nl.yml            |    2 +
 .../src/translations/messages.nl.yml          |    2 +
 symfony.lock                                  |    9 +
 41 files changed, 4720 insertions(+), 523 deletions(-)
 delete mode 100644 config/packages/translation_chill.yaml
 create mode 100644 docs/source/development/translation_directives.rst
 create mode 100644 docs/source/development/translation_provider.rst
 create mode 100644 src/Bundle/ChillActivityBundle/translations/messages+intl-icu.nl.yml
 create mode 100644 src/Bundle/ChillCalendarBundle/translations/messages+intl-icu.nl.yml
 create mode 100644 src/Bundle/ChillCalendarBundle/translations/validators.nl.yml
 create mode 100644 src/Bundle/ChillCustomFieldsBundle/translations/validators.nl.yml
 create mode 100644 src/Bundle/ChillDocGeneratorBundle/translations/messages+intl-icu.nl.yml
 create mode 100644 src/Bundle/ChillDocGeneratorBundle/translations/messages.nl.yml
 create mode 100644 src/Bundle/ChillDocStoreBundle/translations/messages+intl-icu.nl.yml
 create mode 100644 src/Bundle/ChillDocStoreBundle/translations/validators.nl.yml
 create mode 100644 src/Bundle/ChillEventBundle/translations/messages+intl-icu.nl.yml
 create mode 100644 src/Bundle/ChillEventBundle/translations/messages.nl.yml
 create mode 100644 src/Bundle/ChillEventBundle/translations/validators.nl.yml
 create mode 100644 src/Bundle/ChillJobBundle/src/Resources/translations/messages.nl.yml
 create mode 100644 src/Bundle/ChillMainBundle/translations/date.nl.yml
 create mode 100644 src/Bundle/ChillMainBundle/translations/messages+intl-icu.nl.yaml
 create mode 100644 src/Bundle/ChillMainBundle/translations/validators.nl.yml
 create mode 100644 src/Bundle/ChillPersonBundle/translations/messages+intl-icu.nl.yaml
 create mode 100644 src/Bundle/ChillReportBundle/translations/messages.intl-icu.nl.yaml
 create mode 100644 src/Bundle/ChillTaskBundle/translations/messages+intl-icu.nl.yml
 create mode 100644 src/Bundle/ChillTaskBundle/translations/messages.nl.yml
 create mode 100644 src/Bundle/ChillTaskBundle/translations/validators.nl.yml
 create mode 100644 src/Bundle/ChillThirdPartyBundle/translations/messages.nl.yml
 create mode 100644 src/Bundle/ChillThirdPartyBundle/translations/validators.nl.yml
 create mode 100644 src/Bundle/ChillWopiBundle/src/translations/messages.nl.yml

diff --git a/.env b/.env
index cc23653bd..0a1168f39 100644
--- a/.env
+++ b/.env
@@ -92,3 +92,7 @@ REDIS_URL=redis://${REDIS_HOST}:${REDIS_PORT}
 ###> symfony/ovh-cloud-notifier ###
 # OVHCLOUD_DSN=ovhcloud://APPLICATION_KEY:APPLICATION_SECRET@default?consumer_key=CONSUMER_KEY&service_name=SERVICE_NAME
 ###< symfony/ovh-cloud-notifier ###
+
+###> symfony/loco-translation-provider ###
+#LOCO_DSN=loco://API_KEY@default
+###< symfony/loco-translation-provider ###
diff --git a/composer.json b/composer.json
index c1e235670..17da4e537 100644
--- a/composer.json
+++ b/composer.json
@@ -54,6 +54,7 @@
         "symfony/http-client": "^5.4",
         "symfony/http-foundation": "^5.4",
         "symfony/intl": "^5.4",
+        "symfony/loco-translation-provider": "^6.0",
         "symfony/mailer": "^5.4",
         "symfony/messenger": "^5.4",
         "symfony/mime": "^5.4",
diff --git a/config/packages/translation.yaml b/config/packages/translation.yaml
index b3f8f9cfe..928125aef 100644
--- a/config/packages/translation.yaml
+++ b/config/packages/translation.yaml
@@ -1,7 +1,12 @@
+# config/packages/translation.yaml
 framework:
-    default_locale: en
+    default_locale: '%env(resolve:LOCALE)%'   # LOCALE=fr in .env
     translator:
         default_path: '%kernel.project_dir%/translations'
         fallbacks:
-            - en
+            - '%env(resolve:LOCALE)%'        # fr
         providers:
+            loco:
+                dsn: '%env(LOCO_DSN)%'
+                domains: [ 'messages' ]
+                locales: [ 'fr', 'nl' ]
diff --git a/config/packages/translation_chill.yaml b/config/packages/translation_chill.yaml
deleted file mode 100644
index a0371ff10..000000000
--- a/config/packages/translation_chill.yaml
+++ /dev/null
@@ -1,4 +0,0 @@
-framework:
-    default_locale:  '%env(resolve:LOCALE)%'
-    translator:
-        fallbacks: [ '%env(resolve:LOCALE)%' ]
\ No newline at end of file
diff --git a/docs/source/development/translation_directives.rst b/docs/source/development/translation_directives.rst
new file mode 100644
index 000000000..106ffb3ab
--- /dev/null
+++ b/docs/source/development/translation_directives.rst
@@ -0,0 +1,419 @@
+============================================
+Directives for creating new translation keys
+============================================
+
+These directives are meant to ensure better consistency across bundles, avoid duplication, and make keys more predictable.
+
+
+General Principles
+==================
+
+1. **Use lowercase snake_case for all keys**
+
+2. **Use dot-separated namespaces**
+   The dot is used to reflect:
+   - bundle
+   - feature
+   - sub-feature
+   - key type
+
+3. **Do not use spaces in keys**
+
+4. **Avoid duplicating the same text in multiple places**
+   When a translation is needed, try a search for the translation value first and see if it exists elsewhere
+
+5. **If a key is used across multiple bundles, it must live in ChillMainBundle.**
+
+6. **If a key is used across multiple bundles and is a generic term, it must be placed in the ``common`` namespace.**
+
+
+Key Structure
+=============
+
+We use the following structure:
+
+.. code-block:: text
+
+    <scope>.<feature>.<sub-feature>.<key-type>
+
+Where:
+
+* ``<>`` identifies the bundle or shared context
+* ``<feature>`` identifies the part of the module using the translation
+* ``<element>`` describes the text purpose
+* ``<subelement>`` for a multi-level element ( eg. activity.export.person.count.description)
+
+Examples of scopes
+------------------
+
+* ``activity`` — ChillActivityBundle
+* ``person`` — ChillPersonBundle
+* ``common`` — neutral shared translation values
+
+
+Naming Scopes
+=============
+
+1. **Bundle-specific keys**
+
+   For most things inside a bundle:
+
+   .. code-block:: text
+
+       activity.<feature>.<element>
+
+   Example:
+
+   .. code-block:: text
+
+       activity.form.save
+       activity.list.title
+       activity.entity.type
+       activity.menu.activities
+       activity.controller.success_created
+
+2. **Shared UI elements (buttons, labels, generic text)**
+
+   These belong in the ``common`` namespace in ChillMainBundle:
+
+   .. code-block:: text
+
+       common.save
+       common.delete
+       common.edit
+       common.filter
+       common.duration_time
+
+Translation workflow
+====================
+
+Use the following workflow when deciding where a key belongs:
+
+1. **Is this text used in more than one bundle?**
+   → Place in ``main`` or ``common``
+
+2. **Is this text generic UI (button, label, pagination, yes/no)?**
+   → Place in ``common``
+
+3. **Is this text specific to one bundle and one feature?**
+   → Place in ``<bundle>.feature.<element>``
+
+4. **Is this text related to an entity or value object?**
+   → Place in ``<bundle>.entity.<entityname>.<field>``
+
+5. **Is this text used in forms?**
+   → ``<bundle>.form.<field>`` or ``<bundle>.form.<action>``
+
+6. **Is this text related to exports?**
+   → ``<bundle>.export.<feature>.<column>``
+
+7. **Is it related to filtering, searching or parameters?**
+   → ``<bundle>.filter.<name>`` or
+   → ``<bundle>.filter.<feature>.<field>`` for nested filters
+
+
+Examples based on translations within ChillActivityBundle
+=========================================================
+
+Below are concrete examples from ``ChillActivityBundle``,
+refactored according to the guidelines.
+
+
+General activity keys
+---------------------
+
+Instead of scattered keys like::
+
+    Show the activity
+    Edit the activity
+    Activity
+    Duration time
+    ...
+
+We use:
+
+.. code-block:: text
+
+    activity.general.show
+    activity.general.edit
+    activity.general.title
+    activity.general.duration
+    activity.general.travel_time
+    activity.general.attendee
+    activity.general.remark
+    activity.general.no_comments
+
+
+Forms
+-----
+
+Instead of keys like::
+
+    Activity creation
+    Save activity
+    Reset form
+    Choose a type
+
+Use:
+
+.. code-block:: text
+
+    activity.form.title_create
+    activity.form.save
+    activity.form.reset
+    activity.form.choose_type
+    activity.form.choose_duration
+
+Long lists (like durations) should be grouped:
+
+.. code-block:: text
+
+    activity.form.duration.5min
+    activity.form.duration.10min
+    activity.form.duration.15min
+    activity.form.duration.1h
+    activity.form.duration.1h30
+    activity.form.duration.2h
+    ...
+
+Entities
+--------
+
+Entity fields should follow:
+
+.. code-block:: text
+
+    activity.entity.activity.date
+    activity.entity.activity.comment
+    activity.entity.activity.deleted
+    activity.entity.location.name
+    activity.entity.location.type
+
+
+Controller messages
+-------------------
+
+Instead of strings as keys::
+
+    'Success : activity created!'
+    'The form is not valid. The activity has not been created !'
+
+Use:
+
+.. code-block:: text
+
+    activity.controller.success_created
+    activity.controller.error_invalid_create
+    activity.controller.success_updated
+    activity.controller.error_invalid_update
+
+
+Roles
+-----
+
+Access control keys should be:
+
+.. code-block:: text
+
+    activity.role.create
+    activity.role.update
+    activity.role.see
+    activity.role.see_details
+    activity.role.delete
+    activity.role.stats
+    activity.role.list
+
+
+Admin
+-----
+
+.. code-block:: text
+
+    activity.admin.configuration
+    activity.admin.types
+    activity.admin.reasons
+    activity.admin.reason_category
+    activity.admin.presence
+
+
+CRUD
+----
+
+.. code-block:: text
+
+    activity.crud.type.title_new
+    activity.crud.type.title_edit
+    activity.crud.presence.title_new
+
+
+Activity Reason
+---------------
+
+.. code-block:: text
+
+    activity.reason.list
+    activity.reason.create
+    activity.reason.active
+    activity.reason.category
+    activity.reason.entity_title
+
+
+Exports
+-------
+
+Group them logically:
+
+.. code-block:: text
+
+    activity.export.person.count.title
+    activity.export.person.count.description
+    activity.export.person.count.header
+
+    activity.export.period.sum_duration.title
+    activity.export.period.sum_duration.description
+    activity.export.period.sum_duration.header
+
+
+Filters
+-------
+
+Use hierarchical filters:
+
+.. code-block:: text
+
+    activity.filter.by_reason
+    activity.filter.by_type
+    activity.filter.by_date
+    activity.filter.by_location
+    activity.filter.by_sent_received
+    activity.filter.by_user
+
+
+Aggregators
+-----------
+
+.. code-block:: text
+
+    activity.aggregator.reason.by_category
+    activity.aggregator.reason.level
+    activity.aggregator.user.by_scope
+    activity.aggregator.user.by_job
+
+
+Global/Shared Keys
+==================
+
+Keys like the following **must not be redeclared** in each bundle:
+
+- First name
+- Last name
+- Username
+- ID
+- Type
+- Duration
+- Comment
+- Date
+- Location
+- Present / Not present
+- Add / Edit / Delete / Save / Update
+
+These belong in ``common`` or ``main``:
+
+.. code-block:: text
+
+    common.firstname
+    common.lastname
+    common.username
+    common.id
+    common.type
+    common.comment
+    common.date
+    common.location
+    common.present
+    common.absent
+    common.add
+    common.edit
+    common.delete
+    common.save
+    common.update
+
+
+Naming directives summary
+==========================
+
+* **snake_case**
+* **namespaced with dots**
+* **bundle prefix for bundle-specific concepts**
+* **common or main for shared concepts**
+* **avoid free-floating keys (without namespace)**
+* **reuse common keys wherever possible**
+
+
+Migration Strategy (Optional)
+=============================
+
+To apply this structure progressively:
+
+1. New keys must follow these guidelines.
+2. Existing keys may remain as-is until refactored.
+3. When refactoring:
+   - Move cross-bundle keys to ChillMainBundle and possible `common` namespace.
+   - Replace duplicated keys with shared ones.
+
+===========================================
+Avoiding duplicate translations
+===========================================
+
+1. Use Shared Namespaces
+========================
+
+Two namespaces must be used for shared translations:
+
+* ``common.*`` — generic UI concepts (save, delete, date, name, etc.)
+
+If a translation may be reused in multiple bundles, it must be placed
+in the ``common`` namespace or in ChillMainBundle.
+
+2. Bundle-Specific Keys
+=======================
+
+Keys belonging only to one bundle or one feature are namespaced inside that
+bundle:
+
+.. code-block:: text
+
+    activity.<feature>.<element>
+    person.<feature>.<element>
+
+3. Search Before Creating
+=========================
+
+Before adding a new translation key, developers must:
+
+1. For common translations like: "enregistrer/opslaan" look in the `common` namespace.
+3. Search in Loco or translations for existing values.
+
+If a suitable key exists, reuse it.
+
+4. Only Create a New Key When Necessary
+=======================================
+
+Create a new key only when the text is:
+
+* specific to the bundle
+* specific to the feature
+* not reusable elsewhere
+
+6. Progressive Cleanup
+======================
+
+Old duplicates may remain temporarily. When updating code in an area, clean
+duplicate values by moving them into ``common`` or ``main``.
+
+General workflow
+================
+
+* **Reuse shared keys** within ``common`` namespace.
+* **Search before creating** new keys.
+* **Namespace bundle-specific keys** under their bundle.
+* **Refactor progressively** when touching old code.
diff --git a/docs/source/development/translation_provider.rst b/docs/source/development/translation_provider.rst
new file mode 100644
index 000000000..98b117129
--- /dev/null
+++ b/docs/source/development/translation_provider.rst
@@ -0,0 +1,148 @@
+=======================================================================
+Managing translations within CHILL using Loco as a translation provider
+=======================================================================
+
+Within CHILL we make use of Symfony's translation component together with *Loco* as an external
+translation provider. Using this setup centralise translations in a single online
+location (Loco), while still allowing developers to create and update
+translation keys locally in the project (YAML files).
+
+Workflow
+========
+
+We use the following workflow:
+
+* Developers create translation keys in YAML files inside each bundle.
+* Keys are written in **English**.
+* Application UI defaults to **French**, with **Dutch** as an additional locale (other languages can be added in the future).
+* Loco acts as the central translation memory and synchronisation source.
+* Loco Symfony package was installed so that built-in translation commands can be used to push/pull content
+  between Loco and the local project.
+
+
+Translation directory structure
+===============================
+
+Each bundle contains its own ``translations`` directory, for example::
+
+    chill-bundles/
+        ChillCoreBundle/
+            translations/
+                messages.fr.yml
+                messages.nl.yml
+        ChillPersonBundle/
+            translations/
+                messages.fr.yml
+                messages.nl.yml
+        ...
+
+Configuration
+=============
+
+The translation configuration is defined in
+``config/packages/translation.yaml``::
+
+    framework:
+        default_locale: '%env(resolve:LOCALE)%'
+        translator:
+            default_path: '%kernel.project_dir%/translations'
+            fallbacks:
+                - '%env(resolve:LOCALE)%'
+                - 'en'
+            providers:
+                loco:
+                    dsn: '%env(LOCO_DSN)%'
+                    domains: [ 'messages' ]
+                    locales: [ 'fr', 'nl' ]
+
+Note:
+
+* ``en`` is the **source locale** in Loco.
+* ``fr`` and ``nl`` are the **application locales**.
+* ``domains: [messages]`` means only ``messages.*.yml`` files are pushed.
+
+
+Environment variables
+---------------------
+
+In ``.env``::
+
+    LOCALE=fr
+
+In ``.env.local``::
+
+    LOCO_DSN="loco://API_KEY@default"
+
+Replace ``API_KEY`` with the key provided by Loco.
+
+
+Working with Loco
+=================
+
+Loco shows all translation keys under three languages:
+
+* **English (source)** — keys are listed but remain “untranslated”
+* **French** — translated strings for French users
+* **Dutch** — translated strings for Dutch users
+
+Note: Don't add translations directly in the English column.
+This column simply represents the *key*.
+
+
+Pushing translations to Loco
+============================
+
+You can push local translations to Loco using:
+
+.. code-block:: bash
+
+    symfony console translation:push loco --locales=fr --locales=nl --force
+
+This will:
+
+* Upload all French and Dutch translation values from ``*.fr.yml`` and
+  ``*.nl.yml`` files
+* Ensures Loco stays in sync with local YAML files
+* Creates any missing keys in Loco
+
+
+Pulling translations from Loco
+==============================
+
+When translators update strings in Loco, developers can fetch updates with:
+
+.. code-block:: bash
+
+    symfony console translation:pull loco --locales=fr --locales=nl --force
+
+This will:
+
+* Download the latest French and Dutch translations
+* Overwrite the local YAML files with Loco’s content
+* Keep everything consistent across the team
+
+
+Adding new translation keys (Developer workflow)
+================================================
+
+1. Add a new key directly in the appropriate YAML file, for example::
+
+       chill-bundles/ChillPersonBundle/translations/messages.fr.yml
+
+   Example key::
+
+       person.form.submit: "Envoyer"
+
+2. Add Dutch translation as well if you can (otherwise leave empty to be translated within Loco later)::
+
+       person.form.submit: "Verzenden"
+
+3. Run a push to send the new key to Loco:
+
+.. code-block:: bash
+
+    symfony console translation:push loco --locales=fr --locales=nl --force
+
+4. The key will now appear in Loco for translation management.
+
+Note: English appears as “untranslated”, because it is merely the source language
diff --git a/src/Bundle/ChillActivityBundle/translations/messages+intl-icu.nl.yml b/src/Bundle/ChillActivityBundle/translations/messages+intl-icu.nl.yml
new file mode 100644
index 000000000..dc122576f
--- /dev/null
+++ b/src/Bundle/ChillActivityBundle/translations/messages+intl-icu.nl.yml
@@ -0,0 +1,18 @@
+export:
+    filter:
+        activity:
+            course_having_activity_between_date:
+                Only course having an activity between from and to: Alleen trajecten met een activiteit tussen {from, date, short} en {to, date, short}
+
+            acp_by_activity_type:
+                'acp_containing_at_least_one_activitytypes': >-
+                    Gefilterde trajecten: alleen die welke ten minste één activiteit bevatten van een van de volgende types: {activitytypes}
+                    {has_date_after, select, 1 {, na {date_after, date}} other {}}
+                    {has_date_before, select, 1 {, voor {date_before, date}} other {}}
+            describe_action_with_no_subject: >-
+                Gefilterd op persoon die een activiteit had tussen {date_from, date} en {date_to, date}
+            describe_action_with_subject: >-
+                Gefilterd op persoon die een activiteit had tussen {date_from, date} en {date_to, date}, en een van deze gekozen onderwerpen: {reasons}
+
+activity:
+    title: Activiteit van {date, date, long} - {type}
diff --git a/src/Bundle/ChillActivityBundle/translations/messages.nl.yaml b/src/Bundle/ChillActivityBundle/translations/messages.nl.yaml
index c7dc05f2b..9da8ffbd6 100644
--- a/src/Bundle/ChillActivityBundle/translations/messages.nl.yaml
+++ b/src/Bundle/ChillActivityBundle/translations/messages.nl.yaml
@@ -1,234 +1,500 @@
 #general
-Show the activity: Toon activiteit
-Edit the activity: Wijzig activiteit
-Activity: Activiteit
+Show the activity: Uitwisseling bekijken
+Edit the activity: Uitwisseling bewerken
+Activity: Uitwisseling
 Duration time: Duur
 Duration Time: Duur
-durationTime:  duur
-Travel time: Duur van verplaatsing
-Attendee: Aanwezigheden
-attendee: aanwezigheden
-list_reasons: Onderwerpen
-user_username: gebruikersnaam
-circle_name: naam kring
+durationTime: duur
+Travel time: Reisduur
+Attendee: Aanwezigheid van de gebruiker
+attendee: aanwezigheid van de gebruiker
+list_reasons: lijst van onderwerpen
+user_username: naam van de gebruiker
+circle_name: naam van de dienst
 Remark: Opmerking
-No comments: Geen opmerkingen
-Add a new activity: Voeg een nieuwe activiteit toe
-Activity list: Lijst van activiteiten
+No comments: Geen opmerking
+Add a new activity: Nieuwe uitwisseling toevoegen
+Activity list: Lijst van uitwisselingen
 present: aanwezig
 not present: afwezig
 Delete: Verwijderen
 Update: Bijwerken
-Update activity: Activieit bijwerken
-Scope: Werkingsgebied
-Activity data: Gegevens activiteit
-Activity location: Locatie activiteit
+Update activity: Uitwisseling bewerken
+Scope: Dienst
+Activity data: Gegevens van de uitwisseling
+Activity location: Locatie van de uitwisseling
 No reason associated: Geen onderwerp
-No social issues associated: Geen sociaal vraagstuk
-No social actions associated: Geen maatschappelijke actie
-There isn't any activities.: Er zijn geen activiteiten
-type_name: Soort activiteit
+No social issues associated: Geen sociale problematiek
+No social actions associated: Geen begeleidingsactie
+There isn't any activities.: Geen uitwisseling geregistreerd.
+type_name: type van de uitwisseling
 person_firstname: voornaam
-person_lastname: familienaam
-person_id: Identificatienummer persoon
-Type: Soort
+person_lastname: achternaam
+person_id: identificatie van de gebruiker
+Type: Type
 Invisible: Onzichtbaar
 Optional: Optioneel
 Required: Verplicht
-Persons: Personen
+Persons: Gebruikers
 Users: Gebruikers
-Emergency: Dringend
+Emergency: Urgent
 Sent received: Inkomend / Uitgaand
 Sent: Verzenden
 Received: Ontvangen
 by: 'Door '
 location: Plaats
 Reasons: Onderwerpen
+Private comment: Privé opmerking
+sent: Verzonden
+received: Ontvangen
 
 
 #forms
-Activity creation: Nouvel échange
-Create: Créer
-Back to the list: Retour à la liste
-Save activity: Sauver l'échange
-Reset form: Remise à zéro du formulaire
-Choose the duration: Choisir la durée
-Choose a type: Choisir un type
-5 minutes: 5 minutes
-10 minutes: 10 minutes
-15 minutes: 15 minutes
-20 minutes: 20 minutes
-25 minutes: 25 minutes
-30 minutes: 30 minutes
-45 minutes: 45 minutes
-1 hour: 1 heure
-1 hour 15: 1 heure 15
-1 hour 30: 1 heure 30
-1 hour 45: 1 heure 45
-2 hours: 2 heures
-Concerned groups: Parties concernées
-Persons in accompanying course: Usagers du parcours
-Third persons: Tiers non-pro.
-Others persons: Usagers
-Third parties: Tiers professionnels
+Activity creation: Nieuwe uitwisseling
+Create: Aanmaken
+Back to the list: Terug naar de lijst
+Save activity: Uitwisseling opslaan
+Reset form: Formulier resetten
+Choose the duration: Duur kiezen
+Choose a type: Type kiezen
+5 minutes: 5 minuten
+10 minutes: 10 minuten
+15 minutes: 15 minuten
+20 minutes: 20 minuten
+25 minutes: 25 minuten
+30 minutes: 30 minuten
+45 minutes: 45 minuten
+1 hour: 1 uur
+1 hour 15: 1 uur 15
+1 hour 30: 1 uur 30
+1 hour 45: 1 uur 45
+2 hours: 2 uur
+2 hours 15: 2 uur 15
+2 hours 30: 2 uur 30
+2 hours 45: 2 uur 45
+3 hours: 3 uur
+3 hours 30: 3 uur 30
+4 hours: 4 uur
+4 hours 30: 4 uur 30
+5 hours: 5 uur
+5 hours 30: 5 uur 30
+6 hours: 6 uur
+6 hours 30: 6 uur 30
+7 hours: 7 uur
+7 hours 30: 7 uur 30
+8 hours: 8 uur
+8 hours 30: 8 uur 30
+9 hours: 9 uur
+9 hours 30: 9 uur 30
+10 hours: 10 uur
+11 hours: 11 uur
+12 hours: 12 uur
+Concerned groups: Betrokken partijen bij de uitwisseling
+Persons in accompanying course: Gebruikers van het traject
+Third persons: Niet-prof. derden
+Others persons: Gebruikers
+Third parties: Professionele derden
 Users concerned: T(M)S
+
 activity:
-    Insert a document: Insérer un document
-    Remove a document: Supprimer le document
-    comment: Commentaire
-No documents: Aucun document
+    date: Datum van de uitwisseling
+    Insert a document: Document invoegen
+    Remove a document: Document verwijderen
+    comment: Opmerking
+    deleted: Uitwisseling verwijderd
+
+    errors: Het formulier bevat fouten
+    social_issues: Sociale problematieken
+    choose_other_social_issue: Andere sociale problematiek toevoegen...
+    social_actions: Begeleidingsacties
+    select_first_a_social_issue: Selecteer eerst een sociale problematiek
+    social_action_list_empty: Geen sociale actie beschikbaar
+    add_persons: Betrokken personen toevoegen
+    bloc_persons: Gebruikers
+    bloc_persons_associated: Gebruikers van het traject
+    bloc_persons_not_associated: Niet-prof. derden
+    bloc_thirdparty: Professionele derden
+    bloc_users: T(M)S
+    location: Locatie
+    choose_location: Kies een locatie
+    choose_location_type: Kies een type locatie
+    create_new_location: Nieuwe locatie aanmaken
+    location_fields:
+        name: Naam
+        type: Type
+        phonenumber1: Telefoon
+        phonenumber2: Andere telefoon
+        email: E-mailadres
+    create_address: Adres aanmaken
+    edit_address: Adres bewerken
+
+No documents: Geen document
+
+# activity filter in list page
+activity_filter:
+    My activities: Mijn uitwisselingen (waar ik aan deelneem)
+    Types: Op type uitwisseling
+    Jobs: Op betrokken beroep
 
 #timeline
-'%user% has done an %activity_type%': '%user% a effectué un échange de type "%activity_type%"'
+'%user% has done an %activity_type%': '%user% heeft een uitwisseling van type "%activity_type%" uitgevoerd'
 
 #controller
-'Success : activity created!': L'échange a été créé.
-'The form is not valid. The activity has not been created !': Le formulaire est invalide. L'échange n'a pas été créé.
-'Success : activity updated!': L'échange a été mis à jour.
-'The form is not valid. The activity has not been updated !': Le formulaire est invalide. L'échange n'a pas été mis à jour.
+'Success : activity created!': De uitwisseling is aangemaakt.
+'The form is not valid. The activity has not been created !': Het formulier is ongeldig. De uitwisseling is niet aangemaakt.
+'Success : activity updated!': De uitwisseling is bijgewerkt.
+'The form is not valid. The activity has not been updated !': Het formulier is ongeldig. De uitwisseling is niet bijgewerkt.
 
 # ROLES
-CHILL_ACTIVITY_CREATE: Créer un échange
-CHILL_ACTIVITY_UPDATE: Modifier un échange
-CHILL_ACTIVITY_SEE: Voir un échange
-CHILL_ACTIVITY_SEE_DETAILS: Voir le détail des échanges
-CHILL_ACTIVITY_DELETE: Supprimer un échange
-CHILL_ACTIVITY_STATS: Statistique des échanges
-CHILL_ACTIVITY_LIST: Liste des échanges
+CHILL_ACTIVITY_CREATE: Uitwisseling aanmaken
+CHILL_ACTIVITY_UPDATE: Uitwisseling bewerken
+CHILL_ACTIVITY_SEE: Uitwisseling bekijken
+CHILL_ACTIVITY_SEE_DETAILS: Detail van uitwisselingen bekijken
+CHILL_ACTIVITY_DELETE: Uitwisseling verwijderen
+CHILL_ACTIVITY_STATS: Statistieken van uitwisselingen
+CHILL_ACTIVITY_LIST: Lijst van uitwisselingen
+CHILL_ACTIVITY_CREATE_PERSON: Uitwisseling aanmaken gekoppeld aan een gebruiker
+CHILL_ACTIVITY_CREATE_ACCOMPANYING_COURSE: Uitwisseling aanmaken gekoppeld aan een traject
+CHILL_ACTIVITY_FULL: Details bekijken, aanmaken, verwijderen en bijwerken van een uitwisseling
 
 # admin
-Activities: Échanges
-Activity configuration: Configuration des échanges
-Activity configuration menu: Configuration des échanges
-Activity types: Types d'échange
-Activity type configuration: Configuration des categories d'échanges
-Activity Reasons: Sujets d'un échange
-Activity Reasons Category: Catégories de sujet d'échanges
-Activity Types Categories: Catégories des types d'échanges
-Activity Presences: Presences des échanges
+Activities: Uitwisselingen
+Activity configuration: Configuratie van uitwisselingen
+Activity configuration menu: Configuratie van uitwisselingen
+Activity types: Types uitwisseling
+Activity type configuration: Configuratie van categorieën van uitwisselingen
+Activity Reasons: Onderwerpen van een uitwisseling
+Activity Reasons Category: Categorieën van onderwerpen van uitwisselingen
+Activity Types Categories: Categorieën van types uitwisseling
+Activity Presences: Aanwezigheden bij uitwisselingen
+Associated activity reason category is inactive: De gekoppelde onderwerpscategorie is inactief
 
 
 # Crud
 crud:
-  activity_type:
-    title_new: Nouveau type d'échange
-    title_edit: Edition d'un type d'échange
-  activity_type_category:
-    title_new: Nouvelle catégorie de type d'échange
-    title_edit: Edition d'une catégorie de type d'échange
+    activity_type:
+        title_new: Nieuw type uitwisseling
+        title_edit: Type uitwisseling bewerken
+    activity_type_category:
+        title_new: Nieuwe categorie van type uitwisseling
+        title_edit: Categorie van type uitwisseling bewerken
+    activity_presence:
+        title_new: Nieuwe aanwezigheid bij uitwisselingen
+        title_edit: Aanwezigheid bij uitwisselingen bewerken
 
 # activity reason admin
-ActivityReason list: Liste des sujets
-Create a new activity reason: Créer un nouveau sujet
-Active: Actif
-Category: Catégorie
-ActivityReason creation: Nouveau sujet
-ActivityReason edit: Modification d'un sujet
-ActivityReason: Sujet d'échange
-The entity is inactive and won't be proposed: Le sujet est inactif et ne sera pas proposé
-The entity is active and will be proposed: Le sujet est actif et sera proposé
+ActivityReason list: Lijst van onderwerpen
+Create a new activity reason: Nieuw onderwerp aanmaken
+Active: Actief
+Category: Categorie
+ActivityReason creation: Nieuw onderwerp
+ActivityReason edit: Onderwerp bewerken
+ActivityReason: Onderwerp van uitwisseling
+The entity is inactive and won't be proposed: Het onderwerp is inactief en zal niet worden voorgesteld
+The entity is active and will be proposed: Het onderwerp is actief en zal worden voorgesteld
 
 #activity reason category admin
-ActivityReasonCategory list: Catégories de sujets
-Create a new activity category reason: Créer une nouvelle catégorie
-ActivityReasonCategory creation: Nouvelle catégorie de sujet
-ActivityReasonCategory edit: Modification d'une catégorie de sujet
-ActivityReasonCategory: Catégorie de sujet d'échange
-ActivityReasonCategory is active and will be proposed: La catégorie est active et sera proposée
-ActivityReasonCategory is inactive and won't be proposed: La catégorie est inactive et ne sera pas proposée
+ActivityReasonCategory list: Categorieën van onderwerpen
+Create a new activity category reason: Nieuwe categorie aanmaken
+ActivityReasonCategory creation: Nieuwe categorie van onderwerp
+ActivityReasonCategory edit: Categorie van onderwerp bewerken
+ActivityReasonCategory: Categorie van onderwerp van uitwisseling
+ActivityReasonCategory is active and will be proposed: De categorie is actief en zal worden voorgesteld
+ActivityReasonCategory is inactive and won't be proposed: De categorie is inactief en zal niet worden voorgesteld
+
+#activity presence admin
+ActivityPresence list: Lijst van aanwezigheden bij uitwisselingen
+Create a new activity presence: Nieuwe "Aanwezigheid bij uitwisselingen" aanmaken
 
 # activity type type admin
-ActivityType list: Types d'échanges
-Create a new activity type: Créer un nouveau type d'échange
-Persons visible: Visibilité du champ Personnes
-Persons label: Libellé du champ Personnes
-User visible: Visibilité du champ Utilisateur
-User label: Libellé du champ Utilisateur
-Date visible: Visibilité du champ Date
-Date label: Libellé du champ Date
-Location visible: Visibilité du champ Lieu
-Location label: Libellé du champ Lieu
-Third parties visible: Visibilité du champ Tiers
-Third parties label: Libellé du champ Tiers
-Duration time visible: Visibilité du champ Durée
-Duration time label: Libellé du champ Durée
-Travel time visible: Visibilité du champ Durée de déplacement
-Travel time label: Libellé du champ Durée de déplacement
-Attendee visible: Visibilité du champ Présence de l'usager
-Attendee label: Libellé du champ Présence de l'usager
-Reasons visible: Visibilité du champ Sujet
-Reasons label: Libellé du champ Sujet
-Comment visible: Visibilité du champ Commentaire
-Comment label: Libellé du champ Commentaire
-Emergency visible: Visibilité du champ Urgent
-Emergency label: Libellé du champ Urgent
-Accompanying period visible: Visibilité du champ Période d'accompagnement
-Accompanying period label: Libellé du champ Période d'accompagnement
-Social issues visible: Visibilité du champ Problématiques sociales
-Social issues label: Libellé du champ Problématiques sociales
-Social actions visible: Visibilité du champ Action sociale
-Social actions label: Libellé du champ Action sociale
-Users visible: Visibilité du champ Utilisateurs
-Users label: Libellé du champ Utilisateurs
-Sent received visible: Visibilité du champ Entrant / Sortant
-Sent received label: Libellé du champ Entrant / Sortant
-Documents visible: Visibilité du champ Documents
-Documents label: Libellé du champ Documents
+ActivityType list: Types uitwisselingen
+Create a new activity type: Nieuw type uitwisseling aanmaken
+Persons visible: Zichtbaarheid van het veld Gebruikers
+Persons label: Label van het veld Gebruikers
+User visible: Zichtbaarheid van het veld Gebruiker
+User label: Label van het veld Gebruiker
+Date visible: Zichtbaarheid van het veld Datum
+Date label: Label van het veld Datum
+Location visible: Zichtbaarheid van het veld Plaats
+Location label: Label van het veld Plaats
+Third parties visible: Zichtbaarheid van het veld Derden
+Third parties label: Label van het veld Derden
+Duration time visible: Zichtbaarheid van het veld Duur
+Duration time label: Label van het veld Duur
+Travel time visible: Zichtbaarheid van het veld Reisduur
+Travel time label: Label van het veld Reisduur
+Attendee visible: Zichtbaarheid van het veld Aanwezigheid van de gebruiker
+Attendee label: Label van het veld Aanwezigheid van de gebruiker
+Reasons visible: Zichtbaarheid van het veld Onderwerp
+Reasons label: Label van het veld Onderwerp
+Comment visible: Zichtbaarheid van het veld Opmerking
+Comment label: Label van het veld Opmerking
+Private comment visible: Zichtbaarheid van het veld Privé Opmerking
+Private comment label: Label van het veld Privé Opmerking
+Emergency visible: Zichtbaarheid van het veld Urgent
+Emergency label: Label van het veld Urgent
+Accompanying period visible: Zichtbaarheid van het veld begeleidingstraject
+Accompanying period label: Label van het veld begeleidingstraject
+Social issues visible: Zichtbaarheid van het veld Sociale problematieken
+Social issues label: Label van het veld Sociale problematieken
+Social actions visible: Zichtbaarheid van het veld Sociale actie
+Social actions label: Label van het veld Sociale actie
+Users visible: Zichtbaarheid van het veld Gebruikers
+Users label: Label van het veld Gebruikers
+Sent received visible: Zichtbaarheid van het veld Inkomend / Uitgaand
+Sent received label: Label van het veld Inkomend / Uitgaand
+Documents visible: Zichtbaarheid van het veld Documenten
+Documents label: Label van het veld Documenten
 
 # activity type category admin
-ActivityTypeCategory list: Liste des catégories des types d'activité
-Create a new activity type category: Créer une nouvelle catégorie de type d'échange
+ActivityTypeCategory list: Lijst van categorieën van types uitwisseling
+Create a new activity type category: Nieuwe categorie van type uitwisseling aanmaken
+Create a new activity in accompanying course: Uitwisseling aanmaken in het traject
 
 # activity delete
-Remove activity: Supprimer un échange
-Are you sure you want to remove the activity about "%name%" ?: Êtes-vous sûr de vouloir supprimer un échange qui concerne "%name%" ?
-The activity has been successfully removed.: L'échange a été supprimée.
+Remove activity: Uitwisseling verwijderen
+Are you sure you want to remove the activity about "%name%" ?: Weet u zeker dat u een uitwisseling wilt verwijderen die betrekking heeft op "%name%"?
+The activity has been successfully removed.: De uitwisseling is verwijderd.
 
 # exports
-Count activities: Nombre d'échanges
-Count activities by various parameters.: Compte le nombre d'échanges enregistrées en fonction de différents paramètres.
-Sum activity duration: Total de la durée des échanges
-Sum activities duration by various parameters.: Additionne la durée des échanges en fonction de différents paramètres.
-List activities: Liste les échanges
-Number of activities: Nombre d'échanges
+Exports of activities linked to a person: Exports van uitwisselingen gekoppeld aan een gebruiker
+Number of activities linked to a person: Aantal uitwisselingen gekoppeld aan een gebruiker
+Count activities linked to a person: Aantal uitwisselingen
+Count activities linked to a person by various parameters.: Telt het aantal geregistreerde uitwisselingen gekoppeld aan een gebruiker op basis van verschillende parameters.
+Sum activity linked to a person duration: Duur van uitwisselingen
+Sum activities linked to a person duration: Duur van uitwisselingen gekoppeld aan een gebruiker
+Sum activities linked to a person duration by various parameters.: Telt de duur van uitwisselingen op basis van verschillende parameters.
+List activity linked to a person: Uitwisselingen opsommen
+List activities linked to a person: Lijst van uitwisselingen gekoppeld aan een gebruiker
+List activities linked to a person description: Maakt de lijst van uitwisselingen op basis van verschillende parameters.
+
+Exports of activities linked to an accompanying period: Exports van uitwisselingen gekoppeld aan een traject
+Number of activities linked to an accompanying period: Aantal uitwisselingen gekoppeld aan een traject
+Count activities linked to an accompanying period: Aantal uitwisselingen
+Count activities linked to an accompanying period by various parameters.: Telt het aantal geregistreerde uitwisselingen gekoppeld aan een traject op basis van verschillende parameters.
+Sum activity linked to an accompanying period duration: Som van de duur van uitwisselingen
+Sum activities linked to an accompanying period duration: Som van de duur van uitwisselingen gekoppeld aan een traject
+Sum activities linked to an accompanying period duration by various parameters.: Telt de duur van uitwisselingen op basis van verschillende parameters.
+Sum activity linked to an accompanying period visit duration: Som van de reisduur van uitwisselingen
+Sum activities linked to an accompanying period visit duration: Som van de reisduur van uitwisselingen gekoppeld aan een traject
+Sum activities linked to an accompanying period visit duration by various parameters.: Telt de reisduur van uitwisselingen op basis van verschillende parameters.
+Average activity linked to an accompanying period duration: Gemiddelde van de duur van uitwisselingen
+Average activities linked to an accompanying period duration: Gemiddelde van de duur van uitwisselingen gekoppeld aan een traject
+Average activities linked to an accompanying period duration by various parameters.: Gemiddelde van de duur van uitwisselingen op basis van verschillende parameters.
+Average activity linked to an accompanying period visit duration: Gemiddelde van de reisduur van uitwisselingen
+Average activities linked to an accompanying period visit duration: Gemiddelde van de reisduur van uitwisselingen gekoppeld aan een traject
+Average activities linked to an accompanying period visit duration by various parameters.: Gemiddelde van de reisduur van uitwisselingen op basis van verschillende parameters.
 
 #filters
-Filter by reason: Filtrer par sujet d'activité
-'Filtered by reasons: only %list%': 'Filtré par sujet: seulement %list%'
-'Filtered by activity type: only %list%': "Filtré par type d'activity: uniquement %list%"
-Filtered by date activity: Filtrer par date d'activité
-Activities after this date: Activités après cette date
-Activities before this date: Activités avant cette date
-"Filtered by date of activity: only between %date_from% and %date_to%": "Filtré par date de l'activité: uniquement entre %date_from% et %date_to%"
-This date should be after the date given in "Implied in an activity after this date" field: Cette date devrait être postérieure à la date donnée dans le champ "activités après cette date"
+Filter by reason: Uitwisselingen filteren op onderwerp
+'Filtered by reasons: only %list%': 'Gefilterd op onderwerp: alleen %list%'
+'Filtered by activity type: only %list%': "Gefilterd op type uitwisseling: alleen %list%"
+Filtered by date activity: Uitwisselingen filteren op datum
+Activities after this date: Uitwisselingen na deze datum
+Activities before this date: Uitwisselingen vóór deze datum
+"Filtered by date of activity: only between %date_from% and %date_to%": "Gefilterd op datum van de uitwisseling: alleen tussen %date_from% en %date_to%"
+This date should be after the date given in "Implied in an activity after this date" field: Deze datum moet later zijn dan de datum in het veld "uitwisselingen na deze datum"
 
-Filtered by person having an activity in a period: Uniquement les personnes ayant eu une activité dans la période donnée
-Implied in an activity after this date: Impliqué dans une activité après cette date
-Implied in an activity before this date: Impliqué dans une activité avant cette date
-Filtered by person having an activity between %date_from% and %date_to% with reasons %reasons_name%: Filtré par personnes associées à une activité entre %date_from% et %date_to% avec les sujets %reasons_name%
-Activity reasons for those activities: Sujets de ces activités
 
-Filter by activity type: Filtrer par type d'activité
+Filter by activity type: Uitwisselingen filteren op type
+
+Filter activity by location: Uitwisselingen filteren op locatie
+'Filtered activity by location: only %locations%': "Gefilterd op locatie: alleen %locations%"
+Filter activity by locationtype: Uitwisselingen filteren op type locatie
+'Filtered activity by locationtype: only %types%': "Gefilterd op type locatie: alleen %types%"
+Accepted locationtype: Types locatie
+Accepted users: TMS(en)
+Filter activity by emergency: Uitwisselingen filteren op urgentie
+'Filtered activity by emergency: only %emergency%': "Gefilterd op urgentie: alleen als %emergency%"
+activity is emergency: de uitwisseling is urgent
+activity is not emergency: de uitwisseling is niet urgent
+Filter activity by sentreceived: Uitwisselingen filteren op verzonden/ontvangen
+'Filtered activity by sentreceived: only %sentreceived%': "Gefilterd op verzonden/ontvangen: alleen %sentreceived%"
+Accepted sentreceived: ''
+Filter activity by linked socialaction: Uitwisselingen filteren op gekoppelde actie
+'Filtered activity by linked socialaction: only %actions%': "Gefilterd op gekoppelde actie: alleen %actions%"
+Filter activity by linked socialissue: Uitwisselingen filteren op gekoppelde problematiek
+'Filtered activity by linked socialissue: only %issues%': "Gefilterd op gekoppelde problematiek: alleen %issues%"
+Filter activity by user: Uitwisselingen filteren op hoofdgebruiker
+Filter activity by users: Uitwisselingen filteren op deelnemende gebruiker
+Filter activity by creator: Uitwisselingen filteren op aanmaker van de uitwisseling
+'Filtered activity by user: only %users%': "Gefilterd op referent: alleen %users%"
+'Filtered activity by users: only %users%': "Gefilterd op deelnemende gebruikers: alleen %users%"
+'Filtered activity by creator: only %users%': "Gefilterd op aanmaker: alleen %users%"
+Creators: Aanmakers
+Accepted userscope: Diensten
+
+Filter acp which has no activity: Trajecten filteren die geen uitwisseling hebben
+Filtered acp which has no activities: Trajecten zonder gekoppelde uitwisseling filteren
+Group acp by activity number: Trajecten groeperen op aantal uitwisselingen
 
 #aggregators
-Activity type: Type d'activité
-Activity user: Utilisateur lié à l'activity
-By reason: Par sujet
-By category of reason: Par catégorie de sujet
-Reason's level: Niveau du sujet
-Group by reasons: Sujet d'activité
-Aggregate by activity user: Grouper par utilisateur lié à l'activité
-Aggregate by activity type: Grouper par type d'activité
-Aggregate by activity reason: Grouper par sujet de l'activité
+Activity type: Type uitwisseling
+Activity user: Gebruiker gekoppeld aan de uitwisseling
+By reason: Op onderwerp
+By category of reason: Op categorie van onderwerp
+Reason's level: Niveau van het onderwerp
+Group by reasons: Onderwerp van uitwisseling
+Aggregate by activity user: Uitwisselingen groeperen op referent
+Aggregate by activity users: Uitwisselingen groeperen op deelnemende gebruikers
+Aggregate by activity type: Uitwisselingen groeperen op type
+Aggregate by activity reason: Uitwisselingen groeperen op onderwerp
 
-Last activities: Les dernières activités
+Group activity by locationtype: Uitwisselingen groeperen op type locatie
+Group activity by date: Uitwisselingen groeperen op datum
+Frequency: Frequentie
+by month: Per maand
+by week: Per week
+for week: Week
+by year: Per jaar
+in year: In
+Group activity by creator: Uitwisselingen groeperen op aanmaker van de uitwisseling
+Group activity by linked thirdparties: Uitwisselingen groeperen op betrokken derde
+Accepted thirdparty: Betrokken derde
+Group activity by linked socialaction: Uitwisselingen groeperen op gekoppelde actie
+Group activity by linked socialissue: Uitwisselingen groeperen op gekoppelde problematiek
+Group activity by userscope: Uitwisselingen groeperen op dienst van de aanmaker
 
-See activity in accompanying course context: Voir l'activité dans le contexte du parcours d'accompagnement
+Last activities: De laatste uitwisselingen
 
-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°
+See activity in accompanying course context: Uitwisseling bekijken in de context van het begeleidingstraject
+
+You get notified of an activity which does not exists any more: Deze melding komt niet overeen met een geldige uitwisseling.
+you are not allowed to see it details: De melding verwijst naar een uitwisseling waartoe u geen toegang hebt.
+This is the minimal activity data: Uitwisseling nr.
 
 docgen:
-    Activity basic: Echange
-    A basic context for activity: Contexte pour les activités
+    Activity basic: Uitwisseling
+    A basic context for activity: Context voor uitwisselingen
+    Accompanying period with a list of activities: Begeleidingstraject met lijst van uitwisselingen
+    Accompanying period with a list of activities description: Deze context neemt de informatie van het traject over, en alle uitwisselingen voor een traject. De uitwisselingen worden niet gefilterd.
+    myActivitiesOnly: Alleen rekening houden met uitwisselingen waarin ik heb deelgenomen
+    myWorksOnly: Alleen rekening houden met begeleidingsacties waarvan ik referent ben
+
+export:
+    export:
+        count_person_on_activity:
+            title: Aantal betrokken gebruikers bij uitwisselingen
+            description: Telt het aantal betrokken gebruikers bij uitwisselingen. Als een gebruiker aanwezig is in meerdere uitwisselingen, wordt hij slechts één keer geteld.
+            header: Aantal betrokken gebruikers bij uitwisselingen
+        count_household_on_activity:
+            title: Aantal betrokken huishoudens bij uitwisselingen
+            description: Telt het aantal betrokken huishoudens bij uitwisselingen. Als een huishouden aanwezig is in meerdere uitwisselingen, wordt het slechts één keer geteld. Gebruikers zonder huishouden worden niet geteld.
+            header: Aantal betrokken huishoudens bij uitwisselingen
+        count_household_on_activity_person:
+            title: Aantal betrokken huishoudens bij uitwisselingen
+            description: Telt het aantal betrokken huishoudens bij uitwisselingen. Als een huishouden aanwezig is in meerdere uitwisselingen, wordt het slechts één keer geteld. Gebruikers zonder huishouden worden niet geteld. Wanneer een gebruiker van huishouden verandert, wordt elk huishouden één keer geteld.
+            header: Aantal betrokken huishoudens bij uitwisselingen
+    list:
+        activity:
+            users name: Naam van de gebruikers
+            users ids: Identificatie van de gebruikers
+            third parties ids: Identificatie van de derden
+            persons ids: Identificatie van de gebruikers
+            persons name: Naam van de gebruikers
+            thirds parties: Derden
+            date: Datum van de uitwisseling
+            locationName: Locatie
+            sent received: Verzonden of ontvangen
+            emergency: Urgentie
+            accompanying course id: Identificatie van het traject
+            course circles: Diensten van het traject
+            travelTime: Reisduur
+            durationTime: Duur
+            id: Identificatie
+            List activities linked to an accompanying course: Somt uitwisselingen op gekoppeld aan een traject op basis van verschillende filters.
+            List activity linked to a course: Lijst van uitwisselingen gekoppeld aan een traject
+            commentText: Opmerking
+            comment_date: Datum van de laatste bewerking van de opmerking
+            comment_user: Laatste bewerking door
+
+    filter:
+        activity:
+            by_users_job:
+                Filter by users job: Uitwisselingen filteren op beroep van ten minste één deelnemende gebruiker
+                'Filtered activity by users job: only %jobs%': 'Gefilterd op beroep van ten minste één deelnemende gebruiker: alleen %jobs%'
+            by_users_scope:
+                Filter by users scope: Uitwisselingen filteren op dienst van ten minste één deelnemende gebruiker
+                'Filtered activity by users scope: only %scopes%': 'Gefilterd op dienst van ten minste één deelnemende gebruiker: alleen %scopes%'
+            course_having_activity_between_date:
+                Title: Trajecten filteren die een uitwisseling hebben ontvangen tussen twee data
+                Receiving an activity after: Die een uitwisseling hebben ontvangen na
+                Receiving an activity before: Die een uitwisseling hebben ontvangen vóór
+            acp_by_activity_type:
+                'activity after': Uitwisselingen na
+                activity after help: Indien leeg gelaten, wordt er geen rekening mee gehouden
+                activity before: Uitwisselingen vóór
+                activity before help: Indien leeg gelaten, wordt er geen rekening mee gehouden
+            person_between_dates:
+                Implied in an activity after this date: Betrokken bij een uitwisseling na deze datum
+                Implied in an activity before this date: Betrokken bij een uitwisseling vóór deze datum
+                Activity reasons for those activities: Onderwerpen van deze uitwisselingen
+                if no reasons: Als geen enkel onderwerp is aangevinkt, worden alle onderwerpen in aanmerking genomen
+                title: Gebruikers filteren die gekoppeld zijn geweest aan een uitwisseling tijdens de periode
+                date mismatch: De einddatum van de periode moet later zijn dan de startdatum
+            by_creator_scope:
+                Filter activity by user scope: Uitwisselingen filteren op dienst van de aanmaker van de uitwisseling
+                'Filtered activity by user scope: only %scopes%': "Gefilterd op dienst van de aanmaker van de uitwisseling: alleen %scopes%"
+            by_creator_job:
+                job_form_label: Beroepen
+                Filter activity by user job: Uitwisselingen filteren op beroep van de aanmaker van de uitwisseling
+                'Filtered activity by user job: only %jobs%': "Gefilterd op beroep van de aanmaker van de uitwisseling: alleen %jobs%"
+            by_persons:
+                Filter activity by persons: Uitwisselingen filteren op deelnemende gebruiker
+                'Filtered activity by persons: only %persons%': 'Uitwisselingen gefilterd op deelnemende gebruikers: alleen %persons%'
+                persons taking part on the activity: Gebruikers deelnemend aan de uitwisseling
+            by_sent_received:
+                Sent or received: Verzonden of ontvangen
+                is sent: verzonden
+                is received: ontvangen
+            by_presence:
+                Filter activity by activity presence: Uitwisselingen filteren op aanwezigheid van de gebruiker
+                presences: Aanwezigheden
+                'Filtered by activity presence: only %presences%': 'Gefilterd op aanwezigheid van de gebruiker: alleen %presences%'
+
+    aggregator:
+        person:
+            by_person:
+                title: Uitwisselingen groeperen op gebruiker (gebruikersdossier waarin de uitwisseling is geregistreerd)
+                person: Gebruiker
+            by_household:
+                title: Uitwisselingen groeperen op huishouden
+                household: Identificatie huishouden
+        acp:
+            by_activity_type:
+                title: Trajecten groeperen op type uitwisseling
+                after_date: Alleen uitwisselingen na deze datum
+                before_date: Alleen uitwisselingen vóór deze datum
+                activity_type: Types uitwisseling
+        activity:
+            by_sent_received:
+                Sent or received: Verzonden of ontvangen
+                is sent: verzonden
+                is received: ontvangen
+                Group activity by sentreceived: Uitwisselingen groeperen op verzonden / ontvangen
+            by_location:
+                Activity Location: Locatie van de uitwisseling
+                Title: Uitwisselingen groeperen op locatie van de uitwisseling
+            by_user_job:
+                Users 's job: Beroep van de gebruikers deelnemend aan de uitwisseling
+                Aggregate by users job: Uitwisselingen groeperen op beroep van de deelnemende gebruikers
+            by_user_scope:
+                Users 's scope: Hoofddienst van de gebruikers deelnemend aan de uitwisseling
+                Aggregate by users scope: Uitwisselingen groeperen op hoofddienst van de gebruiker
+            by_creator_scope:
+                Group activity by creator scope: Uitwisselingen groeperen op dienst van de aanmaker van de uitwisseling
+                Calc date: Berekeningsdatum van de dienst van de aanmaker van de uitwisseling
+            by_creator_job:
+                Group activity by creator job: Uitwisselingen groeperen op beroep van de aanmaker van de uitwisseling
+                Calc date: Berekeningsdatum van het beroep van de aanmaker van de uitwisseling
+            by_persons:
+                Group activity by persons: Uitwisselingen groeperen op deelnemende gebruiker
+                Persons: Deelnemende gebruikers
+            by_activity_presence:
+                Group activity by presence: Uitwisselingen groeperen op aanwezigheid van de gebruiker
+                header: Aanwezigheid van gebruiker(s)
+
+generic_doc:
+    filter:
+        keys:
+            accompanying_period_activity_document: Document van uitwisselingen van trajecten
diff --git a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.nl.yaml b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.nl.yaml
index cae3cd059..14d1182be 100644
--- a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.nl.yaml
+++ b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.nl.yaml
@@ -165,3 +165,60 @@ Phonecall: "Telefoon oproep"
 Aside activities: Nevenactiviteiten
 Aside activity types: Types nevenactiviteiten
 Aside activity type configuration: Configuratie categorieën nevenactiviteiten
+
+# exports
+export:
+    aside_activity:
+        List of aside activities: Lijst van nevenactiviteiten
+        createdAt: Aanmaak
+        updatedAt: Laatste update
+        agent_id: Gebruiker
+        creator_id: Aanmaker
+        main_scope: Hoofddienst van de gebruiker
+        main_center: Hoofdterritorium van de gebruiker
+        aside_activity_type: Categorie nevenactiviteit
+        date: Datum
+        duration: Duur
+        note: Notitie
+        id: Identificatie
+        location: Locatie
+
+    Exports of aside activities: Exports van nevenactiviteiten
+    Count aside activities: Aantal nevenactiviteiten
+    Count aside activities by various parameters.: Telt het aantal nevenactiviteiten volgens diverse criteria
+    Average aside activities duration: Gemiddelde duur van nevenactiviteiten
+    Sum aside activities duration: Duur van nevenactiviteiten
+    Sum concerned persons count for aside activities: Aantal betrokken gebruikers bij nevenactiviteiten
+    filter:
+        Filter by aside activity date: Nevenactiviteiten filteren op datum
+        Filter by aside activity type: Nevenactiviteiten filteren op type activiteit
+        'Filtered by aside activity type: only %type%': "Gefilterd op type nevenactiviteit: alleen %type%"
+        Filtered by aside activities between %dateFrom% and %dateTo%: Gefilterd op datum van nevenactiviteit, tussen %dateFrom% en %dateTo%
+        This date should be after the date given in "Implied in an aside activity after this date" field: Deze datum moet later zijn dan de datum in het veld "nevenactiviteiten na deze datum"
+        Aside activities after this date: Nevenactiviteiten na deze datum
+        Aside activities before this date: Nevenactiviteiten vóór deze datum
+        'Filtered aside activity by user: only %users%': "Gefilterd op gebruiker: alleen %users%"
+        Filter aside activity by user: Filteren op gebruiker
+        by_user_job:
+            'Filtered aside activities by user jobs: only %jobs%': "Gefilterd op beroep van gebruikers: alleen %jobs%"
+            Filter by user jobs: Nevenactiviteiten filteren op beroep van gebruikers
+        by_user_scope:
+            'Filtered aside activities by user scope: only %scopes%': "Gefilterd op dienst van gebruikers: alleen %scopes%"
+            Filter by user scope: Nevenactiviteiten filteren op dienst van gebruiker
+        Filter by aside activity location: Nevenactiviteiten filteren op locatie
+        'Filtered by aside activity location: only %location%': "Gefilterd op locatie: alleen %location%"
+    aggregator:
+        Group by aside activity type: Nevenactiviteiten groeperen op type activiteit
+        Group by concerned persons count: Nevenactiviteiten groeperen op aantal betrokken gebruikers
+        Concerned persons count: Aantal betrokken gebruikers
+        Aside activity type: Type nevenactiviteit
+        by_user_job:
+            Aggregate by user job: Nevenactiviteiten groeperen op beroep van gebruikers
+        by_user_scope:
+            Aggregate by user scope: Nevenactiviteiten groeperen op dienst van gebruikers
+        Aside activity location: Locatie van nevenactiviteiten
+        Group by aside activity location: Nevenactiviteiten groeperen op locatie
+        Aside activity localisation: Locatie
+
+# ROLES
+CHILL_ASIDE_ACTIVITY_STATS: Statistieken voor nevenactiviteiten
diff --git a/src/Bundle/ChillBudgetBundle/translations/messages.nl.yml b/src/Bundle/ChillBudgetBundle/translations/messages.nl.yml
index de334f79f..113492864 100644
--- a/src/Bundle/ChillBudgetBundle/translations/messages.nl.yml
+++ b/src/Bundle/ChillBudgetBundle/translations/messages.nl.yml
@@ -74,3 +74,42 @@ The balance: Verschil tussen inkomsten en onkosten
 
 Valid since %startDate% until %endDate%: Geldig sinds %startDate% tot %endDate%
 Valid since %startDate%: Geldig sinds %startDate%
+
+budget:
+    admin:
+        form:
+            Charge_kind_key: Identificatiesleutel
+            Resource_kind_key: Identificatiesleutel
+            This kind must contains only alphabeticals characters, and dashes. This string is in use during document generation. Changes may have side effect on document: Deze sleutel dient om het type last of inkomen te identificeren bij het genereren van documenten. Alleen alfanumerieke tekens zijn toegestaan. Het wijzigen van deze sleutel kan een effect hebben bij het genereren van nieuwe documenten.
+
+# ROLES
+Budget elements: Budget
+CHILL_BUDGET_ELEMENT_CREATE: Inkomsten/last aanmaken
+CHILL_BUDGET_ELEMENT_DELETE: Inkomsten/last verwijderen
+CHILL_BUDGET_ELEMENT_SEE: Inkomstenen/lasten bekijken
+CHILL_BUDGET_ELEMENT_UPDATE: Inkomsten/last bewerken
+
+## admin
+
+crud:
+    resource_kind:
+        title_new: Nieuw type inkomsten
+        title_edit: Type inkomsten bewerken
+    charge_kind:
+        title_new: Nieuw type last
+        title_edit: Type last bewerken
+
+admin:
+    menu:
+        Resource types: Types inkomsten
+        Charge types: Types last
+    title:
+        Charge Type List: Lijst van types last
+        Resource Type List: Lijst van types inkomsten
+        Budget configuration: Configuratie van budgetelementen
+    new:
+        Create a new charge type: Nieuw type last aanmaken
+        Create a new resource type: Nieuw type inkomsten aanmaken
+    form:
+        Choose the type of resource: Kies een type inkomsten
+        Choose the type of charge: Kies een type last
diff --git a/src/Bundle/ChillBudgetBundle/translations/validators.nl.yml b/src/Bundle/ChillBudgetBundle/translations/validators.nl.yml
index 7281b6380..fa308eb67 100644
--- a/src/Bundle/ChillBudgetBundle/translations/validators.nl.yml
+++ b/src/Bundle/ChillBudgetBundle/translations/validators.nl.yml
@@ -1,2 +1,8 @@
-The amount cannot be empty: Le montant ne peut pas être vide ou égal à zéro
-The budget element's end date must be after the start date: La date de fin doit être après la date de début
\ No newline at end of file
+The amount cannot be empty: Het bedrag mag niet nul of leeg zijn
+The budget element's end date must be after the start date: De einddatum moet later vallen dan de begindatum
+
+budget:
+    admin:
+        form:
+            kind:
+                enkel_alphanumeriek
diff --git a/src/Bundle/ChillCalendarBundle/translations/messages+intl-icu.nl.yml b/src/Bundle/ChillCalendarBundle/translations/messages+intl-icu.nl.yml
new file mode 100644
index 000000000..6a2edf9c4
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/translations/messages+intl-icu.nl.yml
@@ -0,0 +1,8 @@
+chill_calendar:
+    There are count ignored calendars by date filter: >-
+        {nbIgnored, plural,
+            =0 {Er zijn geen afspraken genegeerd door de datumfilter.}
+            one {Er is een afspraak genegeerd door de datumfilter. Wijzig de datumfilter om deze te laten verschijnen.}
+            few {# afspraken zijn genegeerd door de datumfilter. Wijzig de datumfilter om deze te laten verschijnen.}
+            other {# afspraken zijn genegeerd door de datumfilter. Wijzig de datumfilter om deze te laten verschijnen.}
+        }
diff --git a/src/Bundle/ChillCalendarBundle/translations/messages.nl.yml b/src/Bundle/ChillCalendarBundle/translations/messages.nl.yml
index c832138a8..ec962afe6 100644
--- a/src/Bundle/ChillCalendarBundle/translations/messages.nl.yml
+++ b/src/Bundle/ChillCalendarBundle/translations/messages.nl.yml
@@ -26,3 +26,149 @@ The calendar item has been successfully removed.: De afspraak is verwijdert
 From the day: Vanaf
 to the day: tot
 Transform to activity: In activiteit omzetten
+Create a new calendar in accompanying course: Afspraak aanmaken in het traject
+Will send SMS: Er zal een herinnerings-sms worden verzonden
+Will not send SMS: Er wordt geen herinnerings-sms verzonden
+SMS already sent: Er is een sms verzonden
+
+Canceled by: Geannuleerd door
+Calendar configuration: Beheer van afspraken
+
+crud:
+    calendar_cancel-reason:
+        index:
+            title: Lijst van annuleringsredenen
+            add_new: Nieuwe toevoegen
+        title_new: Nieuwe annuleringsreden
+        title_edit: Annuleringsreden bewerken
+
+chill_calendar:
+    canceled: Geannuleerd
+    cancel_reason: Reden van annulering
+    cancel_calendar_item: Afspraak annuleren
+    calendar_canceled: De afspraak is geannuleerd
+    canceled_by:
+        user: Gebruiker
+        person: Gebruiker
+        other: Andere
+    Document: Document van een afspraak
+    form:
+        The main user is mandatory. He will organize the appointment.: De hoofdgebruiker is verplicht. Hij is de organisator van de gebeurtenis.
+    Create for referrer: Aanmaken voor de referent
+    start date filter: Begin van de afspraak
+    From: Van
+    To: Tot
+    Next calendars: Volgende afspraken
+    Add a document: Document toevoegen
+    Documents: Documenten
+    Create and add a document: Aanmaken en document toevoegen
+    Save and add a document: Opslaan en document toevoegen
+    Create for me: Afspraak aanmaken voor mezelf
+    Edit a document: Document bewerken
+    Document title: Titel
+    Document object: Document
+    Add a document from template: Document toevoegen vanaf sjabloon
+    Upload a document: Document uploaden
+    Remove a calendar document: Document van een afspraak verwijderen
+    Are you sure you want to remove the doc?: Weet u zeker dat u het gekoppelde document wilt verwijderen?
+    Document outdated: De datum en tijd van de afspraak zijn gewijzigd na het aanmaken van het document
+
+
+
+remote_ms_graph:
+    freebusy_statuses:
+        busy: Bezet
+        free: Vrij
+        tentative: In afwachting van bevestiging
+        oof: Buiten kantoor
+        workingElsewhere: Werkt elders
+        unknown: Onbekend
+    cancel_event_because_main_user_is_%label%: De gebeurtenis is overgedragen aan gebruiker %label%
+
+remote_calendar:
+    calendar_range_title: Chill-beschikbaarheidsperiode
+
+invite:
+    accepted: Geaccepteerd
+    declined: Geweigerd
+    pending: In afwachting
+    tentative: Voorlopig geaccepteerd
+    list:
+        none: Er is geen uitnodiging
+        title: Mijn uitnodigingen
+
+# exports
+Exports of calendar: Exports van afspraken
+Count calendars: Aantal afspraken
+Count calendars by various parameters.: Telt het aantal afspraken op basis van verschillende parameters.
+
+Average appointment duration: Gemiddelde duur van afspraken
+Get the average of appointment duration according to various filters: Berekent het gemiddelde van de duur van afspraken op basis van verschillende parameters.
+
+Sum of appointment durations: Som van de duur van afspraken
+Get the sum of appointment durations according to various filters: Berekent de som van de duur van afspraken op basis van verschillende parameters.
+
+'Filtered by agent: only %agents%': "Gefilterd op agenten: alleen %agents%"
+Filter calendars by agent: Afspraken filteren op agenten
+Filter calendars between certain dates: Afspraken filteren op datum van de afspraak
+'Filtered by calendars between %dateFrom% and %dateTo%': 'Gefilterd op afspraken tussen %dateFrom% en %dateTo%'
+'Filtered by calendar range: only %calendarRange%': 'Gefilterd op afspraken per beschikbaarheidsperiode: alleen de %calendarRange%'
+Filter by calendar range: Filteren op afspraken binnen een beschikbaarheidsperiode of niet
+
+Group calendars by agent: Afspraken groeperen op agent
+Group calendars by location type: Afspraken groeperen op type locatie
+Group calendars by location: Afspraken groeperen op afspraaklocatie
+Group calendars by cancel reason: Afspraken groeperen op annuleringsreden
+Group calendars by month and year: Afspraken groeperen op maand en jaar
+Group calendars by urgency: Afspraken groeperen op urgent of niet
+
+export:
+    aggregator.calendar:
+        agent_job:
+            Group calendars by agent job: Afspraken groeperen op beroep van de agent
+        agent_scope:
+            Group calendars by agent scope: Afspraken groeperen op dienst van de agent
+    filter.calendar:
+        agent_job:
+            Filter calendars by agent job: Afspraken filteren op beroepen van de agenten (hoofdgebruikers)
+            'Filtered by agent job: only %jobs%': 'Gefilterd op beroepen van de agenten (hoofdgebruikers): alleen de %jobs%'
+        agent_scope:
+            Filter calendars by agent scope: Afspraken filteren op diensten van de agenten (hoofdgebruikers)
+            'Filtered by agent scope: only %scopes%': 'Gefilterd op diensten van de agenten (hoofdgebruikers): alleen de diensten %scopes%'
+
+Scope: Dienst
+Job: Beroep
+Location type: Type locatie
+Location: Afspraaklocatie
+by month and year: Per maand en jaar
+
+is urgent: Urgent
+is not urgent: Niet urgent
+has calendar range: Binnen een beschikbaarheidsperiode?
+Not made within a calendar range: Afspraak binnen een beschikbaarheidsperiode
+Made within a calendar range: Afspraak buiten een beschikbaarheidsperiode
+
+docgen:
+    calendar:
+        Base context for calendar: 'Afspraak: basiscontext'
+        A base context for generating document on calendar: Context voor het genereren van documenten op basis van afspraken
+        Track changes on datetime and warn user if date time is updated after the doc generation: Wijzigingen in het document volgen en gebruikers waarschuwen dat de datum en tijd zijn gewijzigd na het genereren van het document
+        Ask main person: Vragen om een gebruiker te kiezen uit de deelnemers aan de afspraken
+        Main person label: Label om de gebruiker te kiezen
+        Ask third party: Vragen om een derde te kiezen uit de deelnemers aan de afspraken
+        Third party label: Label om de derde te kiezen
+        Destinee: Geadresseerde
+        None: Geen keuze
+        title of the generated document: Titel van het gegenereerde document
+
+CHILL_CALENDAR_CALENDAR_CREATE: Afspraken aanmaken
+CHILL_CALENDAR_CALENDAR_EDIT: Afspraken bewerken
+CHILL_CALENDAR_CALENDAR_DELETE: Afspraken verwijderen
+CHILL_CALENDAR_CALENDAR_SEE: Afspraken bekijken
+
+
+generic_doc:
+    filter:
+        keys:
+            accompanying_period_calendar_document: Document van afspraken van trajecten
+            person_calendar_document: Document van afspraken van de gebruiker
diff --git a/src/Bundle/ChillCalendarBundle/translations/validators.nl.yml b/src/Bundle/ChillCalendarBundle/translations/validators.nl.yml
new file mode 100644
index 000000000..d069ac73c
--- /dev/null
+++ b/src/Bundle/ChillCalendarBundle/translations/validators.nl.yml
@@ -0,0 +1,6 @@
+calendar:
+    At least {{ limit }} person is required.: Minimaal {{ limit }} persoon is vereist voor deze afspraak
+    An end date is required: Geef een einddatum en -tijd op
+    A start date is required: Geef een startdatum en -tijd op
+    A location is required: Geef een locatie op
+    A main user is mandator: Geef een hoofdgebruiker op
diff --git a/src/Bundle/ChillCustomFieldsBundle/translations/messages.nl.yml b/src/Bundle/ChillCustomFieldsBundle/translations/messages.nl.yml
index 5fdb3bafe..d75cbc8d2 100644
--- a/src/Bundle/ChillCustomFieldsBundle/translations/messages.nl.yml
+++ b/src/Bundle/ChillCustomFieldsBundle/translations/messages.nl.yml
@@ -1,3 +1,103 @@
 'Not available in your language': 'Vertaling niet mogelijk in het Nederlands'
 'Other value': 'Andere mogelijkheid'
-'None': 'Niet gespecifieerd'
\ No newline at end of file
+'None': 'Niet gespecifieerd'
+
+#customfieldsgroup rendering
+Empty data: Lege gegevens
+No data to show: Geen waarden om te tonen
+
+#customfieldsgroup administration
+CustomFieldsGroup list: Groepen van aangepaste velden
+CustomFieldsGroup creation: Nieuwe groep van aangepaste velden
+Entity: Entiteit
+"Is default ?": "Standaard?"
+"Some module select default groups for some usage. Example: the default person group is shown under person page.": "Sommige modules selecteren standaardgroepen voor bepaald gebruik. Voorbeeld: de standaard persoonsgroep wordt getoond op de persoonspagina"
+Make default: Groep standaard maken
+Create a new group: Nieuwe groep aanmaken
+CustomFieldsGroup details: Details van de groep aangepaste velden
+Fields associated with this group: Velden geassocieerd met deze groep
+Any field is currently associated with this group: Geen veld is momenteel geassocieerd met deze groep
+Create a new field: Nieuw aangepast veld aanmaken
+Add a new field: Aangepast veld toevoegen
+ordering: volgorde
+label_field: label van het veld
+active: actief
+No value defined for this option: Geen waarde gedefinieerd voor deze optie
+CustomFieldsGroup edit: Bewerken van een groep aangepaste velden
+type: type
+The custom fields group has been created: De groep aangepaste velden is aangemaakt
+The custom fields group has been updated: De groep aangepaste velden is bijgewerkt
+The custom fields group form contains errors: Het formulier bevat fouten
+The default custom fields group has been changed: De standaardgroep is gewijzigd
+
+
+#menu entries
+Custom fields configuration: Aangepaste velden
+CustomFields List: Lijst van aangepaste velden
+CustomFields Groups: Groep van aangepaste velden
+
+#customfield administration
+Custom fields: Aangepaste velden
+CustomFields configuration: Beheer van aangepaste velden
+CustomField edit: Wijziging van een aangepast veld
+CustomField creation: Nieuw aangepast veld
+General informations: Algemene informatie
+Options: Opties
+Custom fields group: Groep van aangepaste velden
+Ordering: Volgorde van verschijning
+Required field: Verplicht veld
+An answer is required: Een antwoord is vereist
+Any answer is required: Geen antwoord is vereist
+Back to the group: Terug naar de groep aangepaste velden
+Slug: Tekstuele identificatie
+The custom field has been created: Het aangepaste veld is aangemaakt
+The custom field form contains errors: Het formulier bevat fouten
+The custom field has been updated: Het aangepaste veld is bijgewerkt
+
+#custom field name
+choice: keuze
+Title: Titel
+text: tekst
+Text field: Tekstveld
+Date field: Datumveld
+
+#custom field choice
+Multiplicity: Multipliciteit
+Multiple: Meerdere
+Unique: Slechts één keuze mogelijk
+Choice display: Weergave van keuzes
+Expanded: Uitgebreide keuzes (radioknoppen)
+Non expanded: Gegroepeerde keuzes
+Allow other: Andere waarde toestaan
+No: Nee
+Yes: Ja
+Other value label (empty if use by default): Label van het veld "andere waarde"
+Choices: Keuzes
+Add an element: Element toevoegen
+
+#custom field text
+Max length: Maximale lengte
+Box appearance: Verschijning van het veld
+Multiple boxes on the line: Meerdere velden op de lijn
+One box on the line: Slechts één veld op de lijn
+
+#custom field title
+Title level: Titelniveau
+Main title: Hoofdtitel
+Subtitle: Ondertitel
+
+#custom field number
+Greater or equal than: Groter dan of gelijk aan
+Lesser or equal than: Kleiner dan of gelijk aan
+Precision: Precisie
+Text after the field: Tekst na het veld
+Number field: Nummerveld
+
+#custom field long choice
+Options key: Sleutel van opties
+Choose a value: Kies een waarde
+Long choice field: Veld met vooraf geregistreerde keuzes
+
+#Custom field date
+Greater or equal than (expression like 1 day ago, 2 years ago, +1 month, today, tomorrow, or date with format YYYY-mm-dd): Datum na (geef een PHP-expressie op zoals '1 day ago', '2 years ago', '+1 month', 'today', 'tomorrow', ...)
+Lesser or equal than (expression like 1 day ago, 2 years ago, +1 month, today, tomorrow, or date with format YYYY-mm-dd): Datum voor (geef een PHP-expressie op zoals '1 day ago', '2 years ago', '+1 month', 'today', 'tomorrow', ...)
diff --git a/src/Bundle/ChillCustomFieldsBundle/translations/validators.nl.yml b/src/Bundle/ChillCustomFieldsBundle/translations/validators.nl.yml
new file mode 100644
index 000000000..f105110e4
--- /dev/null
+++ b/src/Bundle/ChillCustomFieldsBundle/translations/validators.nl.yml
@@ -0,0 +1,3 @@
+Characters not allowed. Only lowercase letters, numbers and "-" are allowed.: Tekens niet toegestaan. Alleen kleine letters, cijfers en "-" zijn toegestaan.
+'This date must be after or equal to %date%': Deze datum moet gelijk zijn aan of na %date%
+'This date must be before or equal to %date%': Deze datum moet voor of gelijk zijn aan %date%
diff --git a/src/Bundle/ChillDocGeneratorBundle/translations/messages+intl-icu.nl.yml b/src/Bundle/ChillDocGeneratorBundle/translations/messages+intl-icu.nl.yml
new file mode 100644
index 000000000..7634a39df
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/translations/messages+intl-icu.nl.yml
@@ -0,0 +1,2 @@
+docgen:
+    # Geen ICU berichten nodig voor data_dump_email meer
diff --git a/src/Bundle/ChillDocGeneratorBundle/translations/messages.nl.yml b/src/Bundle/ChillDocGeneratorBundle/translations/messages.nl.yml
new file mode 100644
index 000000000..d9ef4206c
--- /dev/null
+++ b/src/Bundle/ChillDocGeneratorBundle/translations/messages.nl.yml
@@ -0,0 +1,51 @@
+docgen:
+    Generate a document: Document genereren
+    Generate: Genereren
+    Document generation: Documentgeneratie
+    Manage templates and document generation: Beheer van gegenereerde documenten en hun sjablonen
+    Pick template context: Context kiezen
+    Context: Context
+    New template: Nieuw sjabloon
+    Edit template: Sjabloon bewerken
+    test generate: Generatie testen
+    With context %name%: 'Met context "%name%"'
+
+    Doc generation failed: Het genereren van dit document is mislukt
+    Doc generation is pending: Het genereren van dit document is bezig
+    Come back later: Kom later terug
+
+    Send report to: Rapport verzenden naar
+    Send report errors to this email address: Foutrapporten worden verzonden naar het opgegeven e-mailadres
+    Generate as creator: Genereren als
+    The document will be generated as the given creator: Het document wordt gegenereerd namens de opgegeven gebruiker
+    Show data instead of generating: Gegevens tonen in plaats van document genereren
+
+    Any template configured: Geen documentsjabloon geconfigureerd
+
+    entity_id_placeholder: Identificatie van de entiteit
+
+    failure_email:
+        The generation of a document failed: Het genereren van een document is mislukt
+        The generation of the document %template_name% failed: Het genereren van een document op basis van sjabloon {{ template_name }} is mislukt.
+        The following errors were encoutered: De volgende fouten zijn opgetreden
+        Forward this email to your administrator for solving: Stuur dit bericht door naar uw beheerder voor probleemoplossing.
+        References: Referenties
+
+    data_dump_email:
+        subject: Inhoud van documentgeneratiegegevens beschikbaar
+        Dear: Beste
+        data_dump_ready_and_attached: >-
+            De inhoud van de gegevens is beschikbaar. U vindt deze als bijlage bij deze e-mail.
+        filename: >-
+            Bestandsnaam: %filename%
+
+
+
+crud:
+    docgen_template:
+        index:
+            title: Documentgeneratie
+            add_new: Aanmaken
+
+
+Template file: Sjabloonbestand
diff --git a/src/Bundle/ChillDocStoreBundle/translations/messages+intl-icu.nl.yml b/src/Bundle/ChillDocStoreBundle/translations/messages+intl-icu.nl.yml
new file mode 100644
index 000000000..91454bde0
--- /dev/null
+++ b/src/Bundle/ChillDocStoreBundle/translations/messages+intl-icu.nl.yml
@@ -0,0 +1,11 @@
+acc_course_document:
+    duplicated_at: >-
+        Gedupliceerd op {at, date, long} om {at, time, short}
+
+workflow:
+    public_link:
+        doc_shared_by_at_explanation: >-
+            Het document is met u gedeeld door {byUser}, op {at, date, long} om {at, time, short}.
+        doc_shared_automatically_at_explanation: >-
+            Het document is met u gedeeld op {at, date, long} om {at, time, short}
+
diff --git a/src/Bundle/ChillDocStoreBundle/translations/messages.nl.yml b/src/Bundle/ChillDocStoreBundle/translations/messages.nl.yml
index f4d8dd453..cbb10f702 100644
--- a/src/Bundle/ChillDocStoreBundle/translations/messages.nl.yml
+++ b/src/Bundle/ChillDocStoreBundle/translations/messages.nl.yml
@@ -1,2 +1,130 @@
+Document: Document
+Documents: Documenten
+Documents for %name%: Documenten van %name%
+Preparing: In voorbereiding
+Ready to show: Klaar om te bekijken
+Download: Downloaden
+Download existing file: Bestaand bestand downloaden
+Create new document: Nieuw document aanmaken
+New document for %name%: Nieuw document voor %name%
+Editing document for %name%: Document bewerken voor %name%
+Edit Document: Document bewerken
+Update document: Document bijwerken
+Edit attributes: Documenteigenschappen bewerken
+Existing document: Bestaand document
+No document to download: Geen document om te downloaden
+"Choose a document category": Kies een documentcategorie
+No document found: Geen document gevonden
+The document is successfully registered: Het document is geregistreerd
+The document is successfully updated: Het document is bijgewerkt
+Any description: Geen beschrijving
+Document from person %name%: Document van gebruiker %name%
+See the document: Document bekijken
+
+document:
+    Any title: Geen titel
+    replace: Vervangen
+    Add: Document toevoegen
+
+generic_doc:
+    filter:
+        keys:
+            accompanying_course_document: Document van het traject
+            person_document: Documenten van de gebruiker
+        date-range: Datum van het document
+
+# delete
+Delete document ?: Document verwijderen?
+Are you sure you want to remove this document ?: Weet u zeker dat u dit document wilt verwijderen?
+The document is successfully removed: Het document is verwijderd
+
+# dropzone upload
+File too big: Bestand te groot
+Drop your file or click here: Klik hier of sleep uw nieuwe bestand naar deze zone
+Remove file in order to upload a new one: Verwijder dit bestand om een nieuw bestand in te voegen
+Max files exceeded. Remove previous files: Maximum aantal bestanden bereikt. Verwijder de vorige
+Cancel upload: Upload annuleren
+Are you sure you want to cancel this upload ?: Weet u zeker dat u deze upload wilt annuleren?
+Upload canceled: Upload geannuleerd
+Remove existing file: Bestaand document verwijderen
+
+stored_object:
+    Insert a document: Document toevoegen
+
+# ROLES
+PersonDocument: Documenten
+CHILL_PERSON_DOCUMENT_CREATE: Document toevoegen
+CHILL_PERSON_DOCUMENT_DELETE: Document verwijderen
+CHILL_PERSON_DOCUMENT_SEE: Document bekijken
+CHILL_PERSON_DOCUMENT_SEE_DETAILS: Details van een document bekijken
+CHILL_PERSON_DOCUMENT_UPDATE: Document bewerken
+
+# Admin
+Documents configuration: Documentenconfiguratie
+Documents configuration menu: Documenten
+Documents categories: Documentcategorieën
+
+Document category list: Documentcategorieën
+Document category show: Documentcategorie bekijken
+Document category edit: Documentcategorie bewerken
+Creator bundle id: Module
+Bundle id: Module
+Internal id inside creator bundle: Identificatie
+Id inside bundle: Identificatie
+Document class: Documentklasse
+no records found:
+Create new category: Nieuwe categorie aanmaken
+Back to the category list: Terug naar de lijst
+Create new DocumentCategory: Nieuwe documentcategorie aanmaken
+Accompanying period document: Begeleidingstrajectdocument
+Person document: Persoonsdocument
+
+# WOPI EDIT
+online_edit_document: Online bewerken
+
+workflow:
+    Document deleted: Document verwijderd
+    public_link:
+        shared_doc: Gedeeld document
+        title: Gedeeld document
+        main_document: Hoofddocument
+        attachment: Bijlage
+
+# ROLES
+accompanyingCourseDocument: Documenten in begeleidingstrajecten
+CHILL_ACCOMPANYING_COURSE_DOCUMENT_CREATE: Document aanmaken
+CHILL_ACCOMPANYING_COURSE_DOCUMENT_DELETE: Document verwijderen
+CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE: Documenten bekijken
+CHILL_ACCOMPANYING_COURSE_DOCUMENT_SEE_DETAILS: Details van een document bekijken
+CHILL_ACCOMPANYING_COURSE_DOCUMENT_UPDATE: Document bewerken
+
 entity_display_title:
-    Doc for evaluation (n°%eval%): Evaluatiedocument (n°%eval%)
+    Document (n°%doc%): "Document (nr. %doc%)"
+    Doc for evaluation (n°%eval%): Document van evaluatie nr. %eval%
+
+
+# SIGNATURES
+
+signatures:
+    yes: Ja
+    are_you_sure: Weet u het zeker?
+    you_are_going_to_sign: U gaat het document ondertekenen
+    signature_confirmation: Bevestiging van de ondertekening
+    sign: Ondertekenen
+    choose_another_signature: Een andere zone kiezen
+    cancel: Annuleren
+    last_sign_zone: Vorige ondertekeningszone
+    next_sign_zone: Volgende ondertekeningszone
+    add_sign_zone: Ondertekeningszone toevoegen
+    click_on_document: Klik op het document
+    last_zone: Vorige zone
+    next_zone: Volgende zone
+    add_zone: Zone toevoegen
+    another_zone: Andere zone
+    electronic_signature_in_progress: Elektronische ondertekening bezig...
+    loading: Laden...
+    remove_sign_zone: Zone verwijderen
+    return: Terug
+    see_all_pages: Alle pagina's bekijken
+    all_pages: Alle pagina's
+    go_to_signature_unique: Naar de ondertekeningszone gaan
diff --git a/src/Bundle/ChillDocStoreBundle/translations/validators.nl.yml b/src/Bundle/ChillDocStoreBundle/translations/validators.nl.yml
new file mode 100644
index 000000000..4ae338763
--- /dev/null
+++ b/src/Bundle/ChillDocStoreBundle/translations/validators.nl.yml
@@ -0,0 +1,2 @@
+The file is not stored properly: Het bestand is niet correct geüpload
+Upload a document: Upload een document
diff --git a/src/Bundle/ChillEventBundle/translations/messages+intl-icu.nl.yml b/src/Bundle/ChillEventBundle/translations/messages+intl-icu.nl.yml
new file mode 100644
index 000000000..dab1e446a
--- /dev/null
+++ b/src/Bundle/ChillEventBundle/translations/messages+intl-icu.nl.yml
@@ -0,0 +1,27 @@
+total events match the search: >-
+    { total, plural,
+        =0 {Geen gebeurtenis komt overeen met de zoektermen}
+        one {Eén gebeurtenis komt overeen met de zoektermen}
+        other {# gebeurtenissen komen overeen met de zoektermen}
+    }
+
+count participations to this event: >-
+    { count, plural,
+        =0 {Geen deelnemer aan de gebeurtenis}
+        one {Eén deelnemer aan de gebeurtenis}
+        other {# deelnemers aan de gebeurtenis}
+    }
+
+events:
+    and_other_count_participants: >-
+        { count, plural,
+            =0 {Geen andere deelnemer}
+            one {en één andere deelnemer}
+            other {en # andere deelnemers}
+        }
+
+ignored_participations: >-
+    { count, plural,
+        one {De volgende persoon is genegeerd omdat hij/zij al deelneemt aan de gebeurtenis}
+        other {De volgende personen zijn genegeerd omdat zij al deelnemen aan de gebeurtenis}
+    }
diff --git a/src/Bundle/ChillEventBundle/translations/messages.nl.yml b/src/Bundle/ChillEventBundle/translations/messages.nl.yml
new file mode 100644
index 000000000..45c7d0698
--- /dev/null
+++ b/src/Bundle/ChillEventBundle/translations/messages.nl.yml
@@ -0,0 +1,198 @@
+#events
+Event type : Type evenement
+Event: Evenement
+Events: Evenementen
+'Event : %label%': Evenement "%label%"
+Participation: Deelname
+Participations: Deelnames
+Status: Status
+Last update: Laatste update
+Moderator: Verantwoordelijke
+Animators: Animatoren
+
+#CRUD event
+Details of an event: Details van een evenement
+See details of the event: Details van het evenement bekijken
+Back to details of the event: Terug naar details van het evenement
+New event: Nieuw evenement
+Back to the most recent events: Terug naar de laatste evenementen
+'Back to %person% events': Terug naar evenementen van %person%
+Event creation: Evenement aanmaken
+Add an event: Evenement toevoegen
+Event edit: Evenement bewerken
+Edit the event: Evenement bewerken
+The event was updated: Het evenement is bijgewerkt
+The event was created: Het evenement is aangemaakt
+List of events: Lijst van evenementen
+Any location for this event: Geen locatie voor dit evenement
+
+#crud participation
+Edit all the participations: Alle deelnames bewerken
+Edit the participation: Deelname aan het evenement bewerken
+Participation Edit: Deelname bewerken
+Add a participation: Deelnemer toevoegen
+Participation creation: Deelname toevoegen
+Associated person: Gekoppelde gebruiker
+Associated event: Gekoppeld evenement
+Back to the event: Terug naar het evenement
+The participation was created: De deelname is aangemaakt
+The participation was updated: De deelname is bijgewerkt
+'None of the requested people may participate the event: they are maybe already participating.': 'Geen van de aangegeven personen kan worden toegevoegd aan het evenement: zij nemen mogelijk al deel.'
+There are no participation to edit for this event: Er zijn geen deelnames voor dit evenement
+The participations have been successfully updated.: De deelnames zijn bijgewerkt.
+The participation has been sucessfully removed: De deelname is correct verwijderd.
+The event has been sucessfully removed: Het evenement en alle bijbehorende deelnames zijn correct verwijderd.
+The participations were created: De deelnames zijn aangemaakt
+Events participation: Deelname aan evenementen
+Remove participation: Deelname verwijderen
+Delete event: Evenement verwijderen
+Are you sure you want to remove that participation ?: Weet u zeker dat u deze deelname wilt verwijderen?
+Are you sure you want to remove that event ?: Weet u zeker dat u dit evenement en alle bijbehorende deelnames wilt verwijderen?
+Any participation for this person: Deze gebruiker neemt niet deel aan evenementen
+
+#search
+Event search: Evenementen zoeken
+
+CHILL_EVENT_UPDATE: Evenement bewerken
+CHILL_EVENT_CREATE: Evenement aanmaken
+CHILL_EVENT_SEE: Evenement bekijken
+CHILL_EVENT_SEE_DETAILS: Details van een evenement bekijken
+CHILL_EVENT_PARTICIPATION_CREATE: Deelname aanmaken
+CHILL_EVENT_PARTICIPATION_UPDATE: Deelname bewerken
+CHILL_EVENT_PARTICIPATION_SEE: Deelname bekijken
+CHILL_EVENT_PARTICIPATION_SEE_DETAILS: Details van een deelname bekijken
+
+# TODO check place to put this
+Next step: Volgende stap
+To which territory should the event be associated ?: Aan welk territorium moet het evenement worden gekoppeld?
+
+# timeline
+past: verleden
+futur: toekomst
+'subscribed by %user% to event "%event%" (%event_type%)': ingeschreven door %user% voor evenement "%event%" (%event_type%)
+Show the event: Evenement bekijken
+
+Subscribe an event: Evenement toevoegen
+Pick an event: Evenement kiezen
+Pick a type of event: Type evenement kiezen
+Pick a moderator: Verantwoordelijke kiezen
+
+# exports
+Select a format: Formaat kiezen
+Export: Exporteren
+
+Count events: Aantal evenementen
+Count events by various parameters.: Telt het aantal evenementen volgens diverse criteria
+Exports of events: Exports van evenementen
+
+Filtered by event date: Filteren op datum van evenement
+'Filtered by date of event: only between %date_from% and %date_to%': "Gefilterd op datum van evenement: alleen tussen %date_from% en %date_to%"
+Events after this date: Evenementen na deze datum
+Events before this date: Evenementen voor deze datum
+Filtered by event type: Filteren op type evenement
+'Filtered by event type: only %list%': "Gefilterd op type: alleen %list%"
+Group event by date: Groeperen op datum van evenement
+Group by event type: Groeperen op type evenement
+
+Count event participants: Aantal deelnames
+Count participants to an event by various parameters.: Telt het aantal deelnames volgens diverse criteria
+Exports of event participants: Exports van deelnames
+'Filtered by participant roles: only %list%': "Gefilterd op deelnemersrollen: alleen %list%"
+Filter by participant roles: Filteren op deelnemersrollen
+Part roles: Deelnemersrollen
+Group by participant role: Groeperen op deelnemersrol
+
+
+Events configuration: Configuratie van evenementen
+Events configuration menu: Menu van evenementen
+Event status: Statussen per type evenement
+Event roles: Rollen per type evenement
+Event types: Types evenementen
+EventType list: Lijst van types evenementen
+EventType: Types evenementen
+EventType creation: Nieuw type evenement
+EventType edit: Type evenement bewerken
+Status list: Lijst van statussen
+Status creation: Nieuwe status
+Status edit: Status bewerken
+Role list: Lijst van rollen
+Role: Rollen
+Role creation: Nieuwe rol
+Role edit: Rol bewerken
+
+xlsx: xlsx
+ods: ods
+csv: csv
+
+Create a new role: Nieuwe rol aanmaken
+Create a new type: Nieuw type aanmaken
+Create a new status: Nieuwe status aanmaken
+
+event:
+    admin:
+        title:
+            Event budget element list: Lijst van budgetelementen voor een evenement
+        Select budget type: Selecteer het type budgetelement
+        new:
+            Create a new budget kind: Nieuw budgetelement aanmaken
+    theme:
+        label: Thema's
+    fields:
+        organizationCost: Organisatiekosten
+        location: Locatie
+        documents: Documenten
+        internal animators: Interne animatoren
+        external animators: Externe animatoren
+    form:
+        organisationCost_help: Organisatiekosten voor de structuur. Nuttig voor statistieken.
+        add_document: Document toevoegen
+        remove_document: Document verwijderen
+        Select one or more themes: Selecteer één of meerdere thema's
+    filter:
+        event_types: Op types evenement
+        event_dates: Op datum van evenement
+        center: Op territorium
+        by_responsable: Op verantwoordelijke
+        pick_responsable: Filteren op verantwoordelijken
+    budget:
+        resources: Middelen
+        charges: Lasten
+        label: Budgetelementen van een evenement
+        Select a budget element kind: Selecteer een budgetelement
+        no elements: Er zijn geen elementen
+        resource type: Middel
+        charge type: Last
+        amount: Bedrag
+        comment: Opmerking
+    animators:
+        intern: Interne animatoren
+        extern: Externe animatoren
+
+crud:
+    event_theme:
+        title_new: Nieuw thema aanmaken
+        title_edit: Thema bewerken
+        index:
+            title: Lijst van thema's
+            add_new: Nieuw thema aanmaken
+    event_budget_kind:
+        title_new: Nieuw budgetelement aanmaken
+
+export:
+    event:
+        list:
+            title: Lijst van evenementen
+            description: Maakt de lijst van evenementen aan op basis van verschillende parameters.
+
+event_id: Identificatie
+event_name: Naam
+event_date: Datum
+event_type: Type evenement
+event_center: Territorium
+event_moderator: Verantwoordelijke
+event_participants_count: Aantal deelnemers
+event_location: Locatie
+event_budget_resources: Middelen
+event_budget_charges: Lasten
+event_animators: Animatoren
+event_themes: Thema's
diff --git a/src/Bundle/ChillEventBundle/translations/validators.nl.yml b/src/Bundle/ChillEventBundle/translations/validators.nl.yml
new file mode 100644
index 000000000..132185a18
--- /dev/null
+++ b/src/Bundle/ChillEventBundle/translations/validators.nl.yml
@@ -0,0 +1,3 @@
+event:
+    validation:
+        person_already_participate_to_event: De gebruiker is al ingeschreven voor dit evenement
diff --git a/src/Bundle/ChillJobBundle/src/Resources/translations/messages.nl.yml b/src/Bundle/ChillJobBundle/src/Resources/translations/messages.nl.yml
new file mode 100644
index 000000000..d83404a09
--- /dev/null
+++ b/src/Bundle/ChillJobBundle/src/Resources/translations/messages.nl.yml
@@ -0,0 +1,213 @@
+situation_logement:
+    proprietaire: Eigenaar
+    locataire: Huurder
+    heberge_chez_tiers: Gehuisvest bij een derde
+    heberge_chez_parents: Gehuisvest bij een ouder
+    hebergement_en_foyer: Gehuisvest in een tehuis
+    sans_domicile: Zonder vaste woonplaats
+niveau_maitrise_langue:
+    lu: Gelezen
+    ecrit: Geschreven
+    parle: Gesproken
+    aucun: Geen
+permis_conduire:
+    a: Rijbewijs A
+    b: Rijbewijs B
+    c: Rijbewijs C
+    d: Rijbewijs D
+    e: Rijbewijs E
+    en_cours: Bezig
+    pas_de_permis: Geen rijbewijs
+    caces: CACES
+    label: "Rijbewijs"
+situation_professionnelle:
+    sans_emploi: Zonder werk
+    en_activite: Actief
+    etudiant: Student
+    etudiant_descolarise: Student zonder school
+    label: "Professionele situatie"
+type_contrat:
+    cdd: Tijdelijk contract
+    cdi: Contract voor onbepaalde tijd
+    contrat_interim: Uitzendcontract
+    contrat_aide: Gesubsidieerd contract
+    cdd_insertion: Inschakelingscontract
+    contrat_extra: Extra contract
+    service_civique: Burgerdienst
+    label: "Type contract"
+ressource:
+    salaires: Salaris(sen)
+    ARE: ARE
+    are: ARE
+    ASS: ASS
+    ass: ASS
+    RSA: RSA
+    rsa: RSA
+    AAH: AAH
+    aah: AAH
+    autre: Andere
+    label: "Inkomen"
+accompagnement:
+    plie: PLIE
+    pole_emploi: Arbeidsbureau
+    referent_RSA: RSA-referent
+    mission_locale: Lokale missie
+    rqth: RQTH
+    autre: Andere
+    label: "Begeleiding"
+freins_perso:
+    situation_administrative: Administratieve situatie
+    situation_personnelle_et_familiale: Persoonlijke en familiale situatie
+    comportement: Gedrag
+    etat_de_sante: Gezondheidstoestand
+    precarite_situation_materielle: Precaire materiële situatie
+    condition_ou_absence_logement: Huisvestingsvoorwaarden of ontbreken daarvan
+    autres: Andere
+freins_emploi:
+    garde_d_enfants: Kinderopvang
+    sante: Gezondheid
+    famille: Familie
+    finances: Financiën
+    maitrise_de_la_langue: Taalbeheersing
+    autres: Andere
+neet_eligibility:
+    oui: Ja
+    non: Nee
+    en_attente: In afwachting
+    label: "NEET-geschiktheid"
+handicap_recommandation:
+    travail_esat: Werk in ESAT
+    milieu_ordinaire: Reguliere omgeving
+    entreprise_adaptee: Aangepast bedrijf
+moyen_transport:
+    transport_commun: Openbaar vervoer
+    scooter: Scooter
+    velo: Fiets
+    voiture: Auto
+    autre: Andere
+    label: "Vervoermiddel"
+formation_level:
+    sans_diplome: Zonder diploma
+    BEP_CAP: BEP CAP
+    BAC: BAC
+    BAC+2: BAC +2
+    BAC+3: BAC +3
+    BAC+4: BAC +4
+    BAC+5: BAC +5
+    BAC+8: BAC +8
+formation_type:
+    formation_initiale: Initiële opleiding
+    formation_continue: Permanente vorming
+diploma_obtained:
+    fr: In Frankrijk
+    non-fr: In het buitenland
+    aucun: Geen
+diploma_reconnu:
+    oui: Ja
+    non: Nee
+    nsp: Weet niet
+xp_contrat_type:
+    cddi: CDDI
+    cdd-6mois: Tijdelijk contract -6 maanden
+    cdd+6mois: Tijdelijk contract +6 maanden
+    interim: Uitzendwerk
+    apprentissage: Leercontract
+    contrat_prof: Professioneel contract
+    cui: CUI
+    cae: CAE
+    cdi: Contract voor onbepaalde tijd
+    stage: Stage
+    volontariat: Vrijwilligerswerk
+    benevolat: Vrijwilligerswerk
+    autres: Andere
+immersion_objectif:
+    'decouvrir_metier': "Een beroep of een activiteitensector ontdekken"
+    'confirmer_projet_prof': "Een professioneel project bevestigen"
+    'acquerir_experience': "Professionele ervaring opdoen"
+    'acquerir_competences': "Nieuwe vaardigheden verwerven"
+    'initier_demarche_recrutement': "Een wervingsprocedure initiëren"
+    'autre': "Andere"
+immersion_savoir_etre:
+    'assiduite': "Ijver"
+    'ponctualite': "Punctualiteit"
+    'respect_consigne_securite': "Respect voor veiligheidsinstructies"
+    'relation_hierarchie': "Relatie met de hiërarchie"
+    'capacite_adaptation': "Aanpassingsvermogen"
+    'motivation_travail': "Werkmotivatie"
+immersion_ponctualiteSalarie:
+    un: Eén vertraging
+    aucun: Geen vertraging
+    plusieurs: Meerdere vertragingen
+immersion_assiduite:
+    aucun: Geen afwezigheid
+    un: Eén afwezigheid
+    plusieurs: Meerdere afwezigheden
+immersion_integreRegle:
+    1_temps: Na een bepaalde tijd
+    rapidement: Snel
+    pas_encore: Heeft ze nog niet geïntegreerd
+immersion_nsp:
+    oui: Ja
+    non: Nee
+    nsp: Weet niet
+projet_prof:
+    type_contrat:
+        cdd: "Tijdelijk contract"
+        cdi: "Contract voor onbepaalde tijd"
+        contrat_insertion: "Inschakelingscontract"
+        interim: "Uitzendwerk"
+        indifferent: "Maakt niet uit"
+        label: "Gezochte type contract"
+        apprentissage: Leercontract
+        personnalisation: Personalisatie
+        creation_entreprise: Bedrijfsoprichting
+        note: "Opmerkingen gezocht contract"
+    volume_horaire:
+        temps_plein: "Voltijds"
+        temps_partiel: "Deeltijds"
+        label: "Uurvolume"
+        note: "Opmerkingen uurvolume"
+    idee: "Ideeën"
+    encoursdeconstruction: "In opbouw"
+    valide:
+        note: "Opmerkingen gevalideerd"
+        code: "Codes gevalideerd"
+    note: "Opmerkingen"
+    souhait:
+        code: "Codes wensen"
+
+
+chill_3party:
+    key_label:
+        prescripteur: Voorschrijver
+        entreprise: Bedrijf
+
+crud:
+    csfrein:
+        title_new: Nieuw rapport "belemmering" voor %person%
+        title_view: Rapport 'Belemmering' voor %person%
+        title_edit: Rapport "belemmering" bewerken
+        title_delete: Belemmering verwijderen
+        button_delete: Verwijderen
+        confirm_message_delete: %as_string% verwijderen?
+    cscv:
+        title_new: Nieuw CV voor %person%
+        title_view: CV voor %person%
+        title_edit: CV bewerken
+        title_delete: CV verwijderen
+        button_delete: Verwijderen
+        confirm_message_delete: %as_string% verwijderen?
+        no_date: Geen datum aangegeven
+        no_end_date: einddatum onbekend
+        no_start_date: startdatum onbekend
+    immersion:
+        title_new: Nieuwe immersie voor %person%
+        title_view: Immersie voor %person%
+        title_edit: Immersie bewerken
+        title_delete: Immersie verwijderen
+        button_delete: Verwijderen
+        confirm_message_delete: %as_string% verwijderen?
+    projet_prof:
+        title_new: Nieuw professioneel project voor %person%
+        title_view: Professioneel project voor %person%
+        title_edit: Professioneel project bewerken
diff --git a/src/Bundle/ChillMainBundle/translations/date.nl.yml b/src/Bundle/ChillMainBundle/translations/date.nl.yml
new file mode 100644
index 000000000..ad134564c
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/translations/date.nl.yml
@@ -0,0 +1,7 @@
+#diff ago. See doc here : http://twig.sensiolabs.org/doc/extensions/date.html
+diff.ago.second: '{0} Nu | {1} Een seconde geleden | ]1,Inf] %count% seconden geleden'
+diff.ago.minute: '{0} Nu | {1} Een minuut geleden | ]1,Inf] %count% minuten geleden'
+diff.ago.hour: '{1} Een uur geleden | ]1,Inf] %count% uur geleden'
+diff.ago.day: '{1} Gisteren | ]1,Inf] %count% dagen geleden'
+diff.ago.month: '{1} Vorige maand | ]1,Inf] %count% maanden geleden'
+diff.ago.year: '{1} Een jaar geleden | ]1,Inf] %count% jaar geleden'
diff --git a/src/Bundle/ChillMainBundle/translations/messages+intl-icu.nl.yaml b/src/Bundle/ChillMainBundle/translations/messages+intl-icu.nl.yaml
new file mode 100644
index 000000000..d95a19aab
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/translations/messages+intl-icu.nl.yaml
@@ -0,0 +1,155 @@
+years_old: >-
+    {age, plural,
+        one {# jaar}
+        many {# jaar}
+        other {# jaar}
+    }
+
+user_group:
+    with_count_users: >-
+        {count, plural,
+            =0 {Geen lid}
+            one {1 gebruiker}
+            many {# gebruikers}
+            other {# gebruikers}
+        }
+    user_removed: Gebruiker {user} is succesvol verwijderd uit groep {user_group}
+    user_added: Gebruiker {user} is succesvol toegevoegd aan groep {user_group}
+    label_related_to_user_job: Groep {job} (Beroepsgroep)
+
+notification:
+    My notifications with counter: >-
+        {nb, plural,
+            =0 {Mijn meldingen}
+            one {# melding}
+            few {# meldingen}
+            other {# meldingen}
+        }
+
+    counter total notifications: >-
+        {total, plural,
+            =0 {Geen melding}
+            one {# melding}
+            few {# meldingen}
+            other {# meldingen}
+        }
+
+    counter unread notifications: >-
+        {unread, plural,
+            =0 {Geen ongelezen}
+            one {# ongelezen}
+            few {# ongelezen}
+            other {# ongelezen}
+        }
+    counter comments: >-
+        {nb, plural,
+            =0 {Geen opmerking}
+            one {# opmerking}
+            few {# opmerkingen}
+            other {# opmerkingen}
+        }
+
+daily_notifications: >-
+    {notification_count, plural,
+         =1 {Hier is uw melding van de dag:}
+         other {Hier zijn uw # meldingen van de dag:}
+     }
+
+workflow:
+    My workflows with counter: >-
+        {wc, plural,
+            =0 {Mijn workflows}
+            one {# workflow}
+            few {# workflows}
+            other {# workflows}
+        }
+    signature:
+        signed_statement: 'Handtekening toegepast op {datetime, date, short} om {datetime, time, short}'
+        rejected_statement: 'Handtekening geweigerd op {datetime, date, short} om {datetime, time, short}'
+        canceled_statement: 'Handtekening geannuleerd op {datetime, date, short} om {datetime, time, short}'
+    On hold by: In afwachting door {by}
+    signature_required_title: >-
+        {nb_signatures, plural,
+            =0 {Geen handtekening gevraagd}
+            one {Handtekening gevraagd}
+            other {Handtekeningen gevraagd}
+        }
+    signatures_title: >-
+        {nb_signatures, plural,
+            =0 {Geen handtekening}
+            one {Handtekening}
+            other {Handtekeningen}
+        }
+    pending_signatures: >-
+        {nb_signatures, plural,
+            =0 {Geen handtekening gevraagd}
+            one {Eén handtekening gevraagd}
+            other {# handtekeningen gevraagd}
+        }
+    send_external_message:
+        document_available_until: De link is geldig tot {expiration, date, long} om {expiration, time, short}.
+        explanation: '{sender} stuurt u documenten.'
+        button_content: 'Documenten bekijken die zijn verzonden door {sender}'
+        confidentiality: Wij vestigen uw aandacht op het feit dat deze documenten vertrouwelijk zijn.
+        see_doc_action_description: 'Vertrouwelijke documenten bekijken die zijn verzonden door {sender}'
+
+    external_views:
+        title: >-
+            {numberOfSends, plural,
+                =0 {In afwachting van raadpleging}
+                =1 {In afwachting van raadpleging}
+                other {In afwachting van raadplegingen}
+            }
+        last_view_at: Laatst bekeken op {at, date, long} om {at, time, short}
+        number_of_views: >-
+            {numberOfViews, plural,
+                =0 {De deling is nooit bekeken}
+                =1 {De deling is één keer bekeken}
+                other {De deling is # keer bekeken}
+            }
+    public_link:
+        shared_explanation_until_remaining: >-
+            Deze deling is actief tot {expireAt, date, long} om {expireAt, time, short}. {viewsCount, plural,
+                =0 {Deze deling is nog niet bekeken}
+                one {Deze deling is één keer bekeken}
+                other {Deze deling is # keer bekeken}
+            }, {viewsRemaining, plural,
+                =0 {er zijn geen weergaven meer mogelijk.}
+                one {er is nog één weergave mogelijk.}
+                other {er zijn nog # weergaven mogelijk.}
+            }
+
+duration:
+    minute: >-
+        {m, plural,
+            =0 {Geen duur}
+            one {# minuut}
+            few {# minuten}
+            other {# minuten}
+        }
+    hour: >-
+        {h, plural,
+            =0 {Geen duur}
+            one {# uur}
+            few {# uur}
+            other {# uur}
+        }
+    day: >-
+        {d, plural,
+            =0 {Geen duur}
+            one {# dag}
+            few {# dagen}
+            other {# dagen}
+        }
+
+filter_order:
+    by_date:
+        From: Vanaf {from_date, date, long}
+        To: Tot {to_date, date, long}
+    By: Filteren op
+    Search: Zoeken in de lijst
+    By date: Filteren op datum
+    search_box: Filteren op inhoud
+
+absence:
+    You are listed as absent, as of {date, date, short}: Uw afwezigheid is aangegeven vanaf {date, date, short}
diff --git a/src/Bundle/ChillMainBundle/translations/messages.nl.yml b/src/Bundle/ChillMainBundle/translations/messages.nl.yml
index f545f7396..4cdf4f8a2 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.nl.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.nl.yml
@@ -1,63 +1,93 @@
-"This program is free software: you can redistribute it and/or modify it under the terms of the <strong>GNU Affero General Public License</strong>": "Ce programme est un logiciel libre: vous pouvez le redistribuer et/ou le modifier selon les termes de la licence <strong>GNU Affero GPL</strong>"
+"This program is free software: you can redistribute it and/or modify it under the terms of the <strong>GNU Affero General Public License</strong>": "Dit programma is vrije software: u kunt het herdistribueren en/of wijzigen onder de voorwaarden van de <strong>GNU Affero GPL</strong>-licentie"
 User manual: Gebruikershandleiding
 Search: Zoeken
-"Search persons, ...": "Zoek personen, ..."
-Person name: Naam / voornaam persoon
+"Search persons, ...": "Gebruikers zoeken, ..."
+Person name: Naam / Voornaam van de gebruiker
 Login: Inloggen
 Logout: Uitloggen
-Bad credentials.: Een verkeerd wachtwoord of gebruikersnaam werd opgegeven.
-Invalid CSRF token.: Uw sessie is verlopen.
+Bad credentials.: Het wachtwoord en de gebruikersnaam komen niet overeen.
+Invalid CSRF token.: Uw sessie is verlopen of ongeldig geworden.
 Username: Gebruikersnaam
 username: gebruikersnaam
 Password: Wachtwoord
 Welcome to %installation_name%: Welkom bij %installation_name%
 Login to %installation_name%: Inloggen op %installation_name%
-Enabled: Ingeschakeld
-enabled: ingeschakeld
-disabled: uitgeschakeld
-Disabled: Uitgeschakeld
-Id: Id
-Homepage: Hoofdpagina
+Enabled: Geactiveerd
+enabled: geactiveerd
+disabled: gedeactiveerd
+Disabled: Gedeactiveerd
+Id: identificatie
+Homepage: Startpagina
 Welcome: Welkom
 Export Menu: Export
-Admin Menu: Admin menu
+Admin Menu: Beheerdersmenu
 Details: Details
 yes: ja
 no: nee
 valid: geldig
 Valid: Geldig
-Not valid: Ongeldig
-not valid: ongeldig
+Not valid: Niet geldig
+not valid: niet geldig
 Confirm: Bevestigen
 Cancel: Annuleren
 Save: Opslaan
 This form contains errors: Dit formulier bevat fouten
-Choose an user: Kies een gebruiker
-"You are going to leave a page with unsubmitted data. Are you sure you want to leave ?": "U verlaat een pagina waarvan de gegevens niet werden opgeslagen. Bent u zeker deze pagina te willen verlaten?"
+Choose an user: Gebruiker kiezen
+"You are going to leave a page with unsubmitted data. Are you sure you want to leave ?": "U gaat de pagina verlaten terwijl gegevens niet zijn opgeslagen. Weet u zeker dat u wilt vertrekken?"
 No value: Geen informatie
 Last updated by: Laatste update door
 on: "op "
 Last updated on: Laatste update op
 by_user: "door "
-lifecycleUpdate: Updates en creatie gebeurtenissen
-address_fields: Gegevens gelinked aan het adres
+lifecycleUpdate: Gebeurtenissen van aanmaak en update
+address_fields: Gegevens gerelateerd aan het adres
 Datas: Gegevens
 No title: Geen titel
-User profile: Mijn gebruikersprofiel
-Phonenumber successfully updated!: Telefoonnummer bijgewerkt!
+icon: pictogram
+See: Bekijken
+Name: Naam
+Label: Naam
 
 user:
+    current_user: Huidige gebruiker
+    profile:
+        title: Mijn profiel
+        Profile successfully updated!: Uw profiel is bijgewerkt!
+        no job: Geen toegewezen beroep
+        no scope: Geen toegewezen dienst
+        notification_preferences: Voorkeuren voor mijn meldingen
     locale:
         label: Communicatietaal
         help: Taal gebruikt voor e-mailmeldingen en andere communicatie.
         placeholder: Kies een taal
-        choice:
-            french: Français
-            dutch: Nederlands
+
+user_group:
+    inactive: Inactief
+    with_users: Leden
+    no_users: Geen gekoppelde gebruiker
+    no_user_groups: Geen gebruikersgroep
+    no_admin_users: Geen beheerder
+    Label: Naam van de groep
+    BackgroundColor: Achtergrondkleur van de badge
+    ForegroundColor: Letterkleur van de badge
+    ExcludeKey: Uitsluitingssleutel
+    ExcludeKeyHelp: Indien relevant, sluiten groepen met dezelfde uitsluitingssleutel elkaar wederzijds uit.
+    Users: Leden van de groep
+    adminUsers: Beheerders van de groep
+    adminUsersHelp: Groepsbeheerders kunnen leden toevoegen of verwijderen uit de groep.
+    my_groups: Mijn groepen
+    me_and: Ik en
+    me_only: Alleen ik
+    me: Ik
+    append_users: Gebruikers toevoegen
+    Email: E-mailadres van de groep
+    EmailHelp: Indien ingevuld, worden aanvullende meldingen verzonden naar het e-mailadres van de groep (workflow in afwachting, enz.)
+
+inactive: inactief
 
 Edit: Bewerken
-Update: Updaten
-Back to the list: Terug naar overzicht
+Update: Bijwerken
+Back to the list: Terug naar de lijst
 
 #interval
 Years: Jaren
@@ -69,17 +99,26 @@ Until %date%: Tot %date%
 until %date%: tot %date%
 Since: Sinds
 Until: Tot
+
+updatedAt: Bijgewerkt op
+updatedBy: Bijgewerkt door
+createdAt: Aangemaakt op
+createdBy: Aangemaakt door
+
 #elements used in software
-centers: centra
-Centers: Centra
-comment: opmerkingen
-Comment: Opmerkingen
-Pinned comment: Gepinde opmerking
-Any comment: Geen opmerkingen
-Read more: Meer lezen
+centers: territoria
+Centers: Territoria
+center: territorium
+comment: opmerking
+Comment: Opmerking
+Comments: Opmerkingen
+Pinned comment: Vastgezette opmerking
+Any comment: Geen opmerking
+(more...): (vervolg...)
 
 # comment embeddable
-No comment associated: Geen opmerkingen
+No comment associated: Geen opmerking
+private comment: Privé notities
 
 #pagination
 Previous: Vorige
@@ -90,136 +129,195 @@ Street address1: Adres regel 1
 Street address2: Adres regel 2
 Postal code: Postcode
 Valid from: Geldig vanaf
-Choose a postal code: Kies een postcode
+Choose a postal code: Postcode kiezen
 address:
-  address_homeless: Betreft dit een domicilie adres ?
-  real address: Domicilie adres
-  consider homeless: Dit adres is onvolledig
+    address_homeless: Is het adres een vaste woonplaats?
+    real address: Adres van een woonplaats
+    consider homeless: Dit adres is onvolledig
+    add_an_address_title: Adres aanmaken
+    edit_an_address_title: Adres bewerken
+    create_a_new_address: Nieuw adres aanmaken
+    edit_address: Adres bewerken
+    select_an_address_title: Adres selecteren
+    fill_an_address: Adres aanvullen
+    select_country: Land kiezen
+    country: Land
+    select_city: Plaats kiezen
+    city: Plaats
+    other_city: Andere plaats
+    select_address: Adres kiezen
+    address: Adres
+    other_address: Ander adres
+    create_address: Adres onbekend. Klik hier om een nieuw adres aan te maken
+    isNoAddress: Geen volledig adres
+    isConfidential: Vertrouwelijk adres
+    street: Straatnaam
+    streetNumber: Nummer
+    floor: Verdieping
+    corridor: Gang
+    steps: Trap
+    flat: Appartement
+    buildingName: Wooncomplex
+    extra: Adrestoevoeging
+    distribution: Cedex
+    create_postal_code: Plaats onbekend. Klik hier om een nieuwe plaats aan te maken
+    postalCode_name: Naam
+    postalCode_code: Postcode
+    date: Datum van het nieuwe adres
+    valid_from: Het adres is geldig vanaf
+    valid_to: Het adres is geldig tot
+    back_to_the_list: Terug naar de lijst
+    loading: laden...
+    address_suggestions: Adressuggestie
+    address_new_success: Het nieuwe adres is opgeslagen.
+    address_edit_success: Het adres is bijgewerkt.
+    wait_redirection: De pagina wordt doorverwezen.
+    not_yet_address: Er is nog geen adres. Klik op '+ Adres aanmaken'
+    use_this_address: Dit adres gebruiken
+    household:
+        move_date: Verhuisdatum
+
 address more:
-  floor: verd.
-  corridor: gang
-  steps: trap
-  flat: appart.
-  buildingName: residentie
-  extra: ""
-  distribution: cedex
-Create a new address: Maak een nieuw adres aan
-Create an address: Maak een adres aan
-Update address: Bewerk het adres
+    floor: verd
+    corridor: gang
+    steps: trap
+    flat: app
+    buildingName: complex
+    extra: ""
+    distribution: cedex
+Create a new address: Nieuw adres aanmaken
+Create an address: Adres aanmaken
+Update address: Adres bewerken
 City or postal code: Stad of postcode
 
 # contact
 Part of the phonenumber: Deel van het telefoonnummer
 
 #serach
-Your search is empty. Please provide search terms.: De zoekopdracht is leeg. Gelieve een zoekterm op te geven.
-The domain %domain% is unknow. Please check your search.: Het zoekgebied "%domain%" is ongekend. Gelieve uw zoekopdracht te verifiëren.
+Your search is empty. Please provide search terms.: De zoekopdracht is leeg. Geef zoektermen op.
+The domain %domain% is unknow. Please check your search.: Het zoekdomein "%domain%" is onbekend. Controleer uw zoekopdracht.
 Invalid terms: Ongeldige zoekopdracht
-You should not have more than one domain.: Gelieve slechts één zoekgebied op te geven.
+You should not have more than one domain.: U mag niet meer dan één zoekdomein hebben.
 #used for page title
-Search %pattern%: Zoek "%pattern%"
+Search %pattern%: Zoeken naar "%pattern%"
 Results %start%-%end% of %total%: Resultaten %start%-%end% van %total%
-See all results: Alle resultaten zien
-Advanced search: Geavanceerde zoekopdracht
+See all results: Alle resultaten bekijken
+Advanced search: Geavanceerd zoeken
 results: resultaten
 
 # timeline
-Global timeline: Globale tijdslijn
+Global timeline: Globale geschiedenis
 
 #admin
 Create: Aanmaken
 show: bekijken
 Show: Bekijken
 edit: bewerken
-Main admin menu: Hoofdmenu admin
+Main admin menu: Hoofdmenu beheer
 Actions: Acties
 Users and permissions: Gebruikers en rechten
-Location and location type: Vestigingen en vestiging types
+Location and location type: Locaties en locatietypes
+Back to the admin: Beheermenu
+"Administration interface": Beheerinterface
+Welcome to the admin section !: >
+    Welkom in de beheerinterface!
 
 #permissions
-Permissions Menu: Beheer rechten
-Permissions management of your chill installation: Beheer rechten voor deze Chill installatie.
+Permissions Menu: Rechtenbeheer
+Permissions management of your chill installation: Rechtenbeheer van uw instantie
 
 #location
-Location Menu: Vestigingen en vestiging types
-Management of location: Beheer vestigingen en vestiging types
-
-#admin section
-"Administration interface": Admin paneel
-Welcome to the admin section !: >
-  Welkom op het admin paneel !
+Location Menu: Locaties en locatietypes
+Management of location: Beheer van locaties en locatietypes
 
 #admin section for center's administration
-Create a new center: Maak een nieuw centrum aan
-Center list: Overzicht centra
-Center edit: Bewerk een centrum
-Center creation: Aanmaak centrum
-New center: Nieuw centrum
-Center: Centrum
+Create a new center: Nieuw territorium aanmaken
+Center list: Lijst van territoria
+Center edit: Territorium bewerken
+Center creation: Territorium aanmaken
+New center: Nieuw territorium
+Center: Territorium
 
 #admin section for permissions group
-Permissions group list: Groepsrechten
-Create a new permissions group: Maak een nieuw groepsrecht aan
-Permission group "%name%": Groepsrecht "%name%"
-Grant those permissions: Rechten toekennen
-Which implies: Wat impliceert
-Permission group: Groepsrecht
-Permissionsgroup: Groepsrecht
-New permission group: Nieuw groepsrecht
-PermissionsGroup "%name%" edit: Bewerk groepsrecht '%name%'
+Permissions group list: Rechtengroepen
+Create a new permissions group: Nieuwe rechtengroep aanmaken
+Permission group "%name%": Rechtengroep "%name%"
+Grant those permissions: Kent deze rechten toe
+Which implies: Wat inhoudt
+Permission group: Rechtengroep
+Permissionsgroup: Rechtengroep
+New permission group: Nieuwe rechtengroep
+PermissionsGroup "%name%" edit: Rechtengroep '%name%' bewerken
 Role: Rol
-Choose amongst roles: Kies een rol
+Choose amongst roles: Rol kiezen
+Choose amongst scopes: Dienst kiezen
 Add permission: Rechten toevoegen
-This group does not provide any permission: Deze groep kent geen rechten toe.
-The role '%role%' has been removed: De rol "%role%" werd verwijdert uit dit groepsrecht.
-The role '%role%' on circle '%scope%' has been removed: De rol "%role%" binnen de cirkel "%scope%" werd verwijdert uit dit groepsrecht.
+This group does not provide any permission: Deze groep kent geen rechten toe
+The role '%role%' has been removed: De rol "%role%" is verwijderd uit deze rechtengroep
+The role '%role%' on circle '%scope%' has been removed: De rol "%role%" op dienst "%scope%" is verwijderd uit deze rechtengroep
+Unclassified: Niet geclassificeerd
+Help to pick role and scope: Sommige rollen vereisen geen dienst.
+The role need scope: Deze rol vereist een dienst.
+The role does not need scope: Deze rol vereist geen dienst!
 
 #admin section for users
+User configuration: Gebruikersbeheer
 User edit: Gebruiker bewerken
-User'status: Gebruikersstatuut
-Disabled, the user is not allowed to login: Uitgeschakeld, de gebruiker krijgt geen toestemming om in te loggen.
-Enabled, the user is active: Ingeschakeld, de gebruiker kan zich inloggen.
-Edit password: Wachtwoord aanpassen
+User'status: Status van de gebruiker
+Disabled, the user is not allowed to login: Gedeactiveerd, de gebruiker mag niet inloggen
+Enabled, the user is active: Actief, de gebruiker kan inloggen
+Edit password: Wachtwoord bewerken
 Repeat the password: Wachtwoord herhalen
-Permissions granted: Rechten toegekend
-Any permissions granted to this user: Geen enkele rechten werden toegekend aan deze gebruiker
+Permissions granted: Toegekende rechten
+Any permissions granted to this user: Geen rechten toegekend aan deze gebruiker
 Grant new permissions: Rechten toevoegen
 Add a new groupCenter: Rechten toevoegen
-The permissions have been successfully added to the user: De rechten werden toegekend aan de gebruiker
-The permissions where removed.: De rechten werden verwijdert voor dze gebruiker
-Center & groups: Centra en groepen
+The permissions have been successfully added to the user: De rechten zijn toegekend aan de gebruiker
+The permissions where removed.: De rechten zijn verwijderd.
+Center & groups: Territorium en groepen
 User %username%: Gebruiker %username%
 Add a new user: Nieuwe gebruiker toevoegen
-The permissions have been added: De rechten werden toegevoegd
-Edit password for %username%: Wachtwoord voor %username% aanpassen
-Change password: Wachtwoord aanpassen
-Back to the user edition: Terugkeren naar bewerkingsformulier
-Password successfully updated!: Wachtwoord opgeslagen
+The permissions have been added: De rechten zijn toegevoegd
+Edit password for %username%: Wachtwoord bewerken voor %username%
+Change password: Wachtwoord wijzigen
+Back to the user edition: Terug naar bewerkingsformulier
+Password successfully updated!: Wachtwoord bijgewerkt
 Flags: Vlaggen
+Main location: Hoofdlocatie
+Main scope: Dienst
+Main center: Territorium
+user job: Beroep van de gebruiker
+Job: Beroep
+Jobs: Beroepen
+Choose a main center: Territorium kiezen
+Choose a main scope: Dienst kiezen
+choose a job: Beroep kiezen
+choose a location: Locatie kiezen
 
 # admin section for users jobs
 User jobs: Beroepen
 
 # user page for current location
-Current location: Huidige vestiging
-Edit my current location: Mijn huidige vestiging bewerken
-Change current location: CMijn huidige vestiging vernanderen
-Set a location: Een vestiging instellen
-Current location successfully updated: Huidige vestiging werd opgeslagen
-Pick a location: Kies een vestiging.
+Current location: Huidige locatie
+Edit my current location: Mijn huidige locatie bewerken
+Change current location: Huidige locatie wijzigen
+Set a location: Locatie aangeven
+Current location successfully updated: Huidige locatie bijgewerkt
+Pick a location: Locatie kiezen
 
 #admin section for circles (old: scopes)
-List circles: Cirkels
-New circle: Nieuwe cirkel
-Circle: Cirkel
-Circle edit: Cirkel bewerken
-Circle creation: Cirkel aanmaken
-Create a new circle: Nieuwe cirkel aanmaken
+List circles: Diensten
+New circle: Nieuwe dienst
+Circle: Dienst
+Circle edit: Dienst bewerken
+Circle creation: Dienst aanmaken
+Create a new circle: Nieuwe dienst aanmaken
 
 #admin section for location
-Location: Vestigingen
-Location type list: Vestiging types
-Create a new location type: Nieuwe type vestiging aanmaken
+Location: Locatie
+pick location: Locatie
+Location type list: Lijst van locatietypes
+Create a new location type: Nieuw locatietype aanmaken
 Available for users: Beschikbaar voor gebruikers
 Editable by users: Bewerkbaar door gebruikers
 Address required: Adres vereist?
@@ -227,209 +325,352 @@ Contact data: Contactgegevens?
 optional: optioneel
 required: vereist
 never: nooit
-Create a new location: Nieuwe vestiging aanmaken
-Location list: Overzicht vestigingen
-Location type: Type vestiging
-Phonenumber1: Telefoonnummer 1
-Phonenumber2: Telefoonnummer 2
-Configure location and location type: Configureer vestigingen en types vestiging
-Default for: Standaard vestiging
+Create a new location: Nieuwe locatie aanmaken
+Location list: Lijst van locaties
+Location type: Locatietype
+Pick a location type: Locatietype kiezen
+Phonenumber1: Telefoonnummer
+Phonenumber2: Ander telefoonnummer
+Location configuration: Configuratie van locaties
+Default for: Standaard locatietype voor
 none: geen
 person: gebruiker
-thirdparty: externe partner
+thirdparty: derde
+civility: aanspreekvorm
+
+#admin section for civility
+abbreviation: afkorting
+
+#admin section for language and country
+Language and countries menu: Menu Talen & Landen
+Languages and countries: Talen & Landen
+Management of languages and countries: Beheer van talen & landen
+Language configuration: Configuratie van talen & landen
+Language list: Lijst van talen
+Country list: Lijst van landen
+Country code: Landcode
 
 # circles / scopes
-Choose the circle: Kies een cirkel
+Choose the circle: Dienst kiezen
+Scope: Dienst
 Scopes: Diensten
 
 #export
 
 # export creation step 0 : list of exports
-Exports list: Overzicht rapporten
-Create an export: Maak een rapport aan
+Exports list: Lijst van exports
+Create an export: Export aanmaken
 #export creation step 'center' : pick a center
-Pick centers: Kies centra
-Pick a center: Kies een centrum
-The export will contains only data from the picked centers.: het rapport zal enkel data bevatten voor het geselecteerde centrum.
-This will eventually restrict your possibilities in filtering the data.: De filterkeuzes zullen worden aangepast aan de rechten tot raadpleging van de geselecteerde centra.
-Go to export options: Ga naar de rapport opties
-Pick aggregated centers: Hergroepering centra
+Pick centers: Territoria kiezen
+Pick a center: Territorium kiezen
+The export will contains only data from the picked centers.: De export bevat alleen gegevens van de gekozen territoria.
+This will eventually restrict your possibilities in filtering the data.: De filtermogelijkheden worden aangepast aan de raadplegingsrechten voor de gekozen territoria.
+Go to export options: Naar de voorbereiding van de export
+Pick aggregated centers: Groepering van territoria
+uncheck all centers: Alle territoria deselecteren
+check all centers: Alle territoria selecteren
 # export creation step 'export' : choose aggregators, filtering and formatter
-Formatter: Formateren
-Choose the formatter: Kies het gewenste formaat voor dit rapport.
-Export parameters: Rapport parameters
+Formatter: Opmaak
+Choose the formatter: Kies het gewenste exportformaat.
+Export parameters: Exportparameters
 Filters: Filters
-Aggregators: Aggregaten
-Go to formatter options: Naar de formateeropties
-Choose a format: Kies een formaat
+Aggregators: Aggregators
+Go to formatter options: Naar de opmaakmogelijkheden
+Choose a format: Formaat kiezen
 #export creation step 'formatter' : choose formatter option
 Generate the report: Rapport genereren
-No options availables. Your report is fully configured.: Geen beschikbare opties. Dit rapport werd volledig geconfigureerd.
-Ungrouped exports: Overige expor
+No options availables. Your report is fully configured.: Geen opties beschikbaar. Uw rapport is al geconfigureerd.
+Ungrouped exports: Andere exports
 
 #export download
-Download export: Downloaden van rapport
-Waiting for your report: Wachten op je rapport
-Download your report: Télécharger votre rapport
-Problem during download: Problème durant le téléchargement
+Download export: Rapport downloaden
+Waiting for your report: Wachten op uw rapport
+Download your report: Uw rapport downloaden
+Problem during download: Probleem tijdens het downloaden
 # sans valeur
-without data: sans valeur
+without data: zonder waarde
 
 #CSV List Formatter
-Add a number on first column: La première colonne est un numéro
-Number: Numéro
+Add a number on first column: De eerste kolom is een nummer
+Number: Nummer
 # the label which appears in the UI
-CSV vertical list: Liste verticale au format CSV
-CSV horizontal list: Liste horizontale au format CSV
-Spreadsheet list formatter (.xlsx, .ods): Liste au format tableur (.xlsx, .ods)
-Order: Ordre
-Position: Position
-row: ligne
-column: colonne
-Comma separated values (CSV): Valeurs séparées par des virgules (CSV - tableur)
+CSV vertical list: Verticale lijst in CSV-formaat
+CSV horizontal list: Horizontale lijst in CSV-formaat
+Spreadsheet list formatter (.xlsx, .ods): Lijst in spreadsheetformaat (.xlsx, .ods)
+Order: Volgorde
+Position: Positie
+row: rij
+column: kolom
+Comma separated values (CSV): Kommagescheiden waarden (CSV - spreadsheet)
 
 # spreadsheet formatter
-Choose the format: Choisir le  format
+Choose the format: Formaat kiezen
 
 # select2
-"select2.no_results": Aucun résultat
-"select2.error_loading": Erreur de chargement des résultats
-"select2.searching": Recherche en cours...
+"select2.no_results": Geen resultaat
+"select2.error_loading": Fout bij het laden van de resultaten
+"select2.searching": Zoeken...
 
 # change password
-Change my password: Modification du mot de passe
-Your actual password: Mot de passe actuel
+Change my password: Wachtwoord wijzigen
+Your actual password: Huidig wachtwoord
 
 # recover password
-Forgot your password ?: Mot de passe oublié ?
-Recover password: Remplacement du mot de passe
-Username or email: Nom d'utilisateur ou email
-Request recover: Demande de remplacement
-Check your email: Vérifiez votre courriel
-An email has been sent to your address. Click on the link inside this email to confirm that you are the owner of this account.: Un courriel a été envoyé à votre adresse. Cliquez sur le lien de cet email pour confirmer que vous êtes bien le propriétaire de ce compte.
-You requested to recover your password: Vous avez demandé à renouveler votre mot de passe.
-Click on the link below to recover your password: Cliquez sur le lien ci-dessous pour re-générer votre mot de passe
-Regards,: Cordialement,
-Your administrator: Votre administrateur
-Recover your password: Regénération du mot de passe
-New password set: Le nouveau mot de passe est enregistré
-Your password has been set.: Votre mot de passe a été changé.
-Log in with your new password: Connectez-vous avec votre nouveau mot de passe
+Forgot your password ?: Wachtwoord vergeten?
+Recover password: Wachtwoord vervangen
+Username or email: Gebruikersnaam of e-mail
+Request recover: Verzoek tot vervanging
+Check your email: Controleer uw e-mail
+An email has been sent to your address. Click on the link inside this email to confirm that you are the owner of this account.: Er is een e-mail verzonden naar uw adres. Klik op de link in deze e-mail om te bevestigen dat u de eigenaar van dit account bent.
+You requested to recover your password: U hebt gevraagd om uw wachtwoord te vernieuwen.
+Click on the link below to recover your password: Klik op onderstaande link om uw wachtwoord te hergenereren
+Regards,: Met vriendelijke groet,
+Your administrator: Uw beheerder
+Recover your password: Wachtwoord hergenereren
+New password set: Het nieuwe wachtwoord is opgeslagen
+Your password has been set.: Uw wachtwoord is gewijzigd.
+Log in with your new password: Log in met uw nieuwe wachtwoord
 
 # impersonate
-Exit impersonation: Retour Administrateur
-Impersonate: Incarner l'utilisateur
-Impersonate mode: Mode fantôme
+Exit impersonation: Terug beheerder
+Impersonate: Gebruiker incarneren
+Impersonate mode: Fantoom-modus
 
 crud:
-  # general items
-  new:
-    button_action_form: Créer
-    link_edit: Modifier
-    save_and_close: Créer & fermer
-    save_and_show: Créer & voir
-    save_and_new: Créer & nouveau
-    success: Les données ont été créées
-  edit:
-    button_action_form: Enregistrer
-    back_to_view: Voir
-    save_and_close: Enregistrer & fermer
-    save_and_show: Enregistrer & voir
-    success: Les données ont été modifiées
-  delete:
-    success: Les données ont été supprimées
-    link_to_form: Supprimer
-  default:
-    success: Les données ont été enregistrées
-  view:
-    link_duplicate: Dupliquer
-  admin_user:
-    index:
-      title: Utilisateurs
-      add_new: Créer
-  admin_user_job:
-    index:
-      title: Métiers
-      add_new: Créer
-    title_new: Nouveau métier
-    title_edit: Modifier un métier
-  main_location_type:
-    title_new: Nouveau type de localisation
-    title_edit: Modifier un type de localisation
-  main_location:
-    title_new: Nouvelle localisation
-    title_edit: Modifier une localisation
+    # general items
+    new:
+        button_action_form: Aanmaken
+        link_edit: Bewerken
+        save_and_close: Aanmaken & sluiten
+        save_and_show: Aanmaken & bekijken
+        save_and_new: Aanmaken & nieuw
+        success: De gegevens zijn aangemaakt
+    edit:
+        button_action_form: Opslaan
+        back_to_view: Bekijken
+        save_and_close: Opslaan & sluiten
+        save_and_show: Opslaan & bekijken
+        success: De gegevens zijn gewijzigd
+    delete:
+        success: De gegevens zijn verwijderd
+        link_to_form: Verwijderen
+    default:
+        success: De gegevens zijn opgeslagen
+    view:
+        link_duplicate: Dupliceren
+    admin_user:
+        index:
+            title: Gebruikers
+            add_new: Aanmaken
+        title_edit: Gebruiker bewerken
+        title_new: Gebruiker aanmaken
+    admin_user_job:
+        index:
+            title: Beroepen
+            add_new: Aanmaken
+        title_new: Nieuw beroep
+        title_edit: Beroep bewerken
+    admin_user_group:
+        index:
+            title: Gebruikersgroepen
+            add_new: Aanmaken
+        title_edit: Gebruikersgroep bewerken
+        title_new: Nieuwe gebruikersgroep
+    main_location_type:
+        index:
+            title: Lijst van locatietypes
+            add_new: Locatietype toevoegen
+        title_new: Nieuw locatietype
+        title_edit: Locatietype bewerken
+    main_location:
+        index:
+            title: Lijst van locaties
+            add_new: Locatie toevoegen
+        title_new: Nieuwe locatie
+        title_edit: Locatie bewerken
+    main_language:
+        index:
+            title: Lijst van talen
+            add_new: Taal toevoegen
+        title_new: Nieuwe taal
+        title_edit: Taal bewerken
+    main_country:
+        index:
+            title: Lijst van landen
+            add_new: Land toevoegen
+        title_new: Nieuw land
+        title_edit: Land bewerken
+    main_civility:
+        index:
+            title: Lijst van aanspreekvormen
+            add_new: Aanspreekvorm toevoegen
+        title_new: Nieuwe aanspreekvorm
+        title_edit: Aanspreekvorm bewerken
+    regroupment:
+        index:
+            title: Lijst van groeperingen
+            add_new: Groepering toevoegen
+        title_new: Nieuwe groepering
+        title_edit: Groepering bewerken
+    center:
+        index:
+            title: Lijst van territoria
+            add_new: Territorium toevoegen
+        title_new: Nieuw territorium
+        title_edit: Territorium bewerken
+    news_item:
+        index:
+            title: Lijst van actualiteiten
+            add_new: Nieuwe actualiteit aanmaken
+        title_new: Nieuwe actualiteit
+        title_view: Actualiteit bekijken
+        title_edit: Actualiteit bewerken
+        title_delete: Actualiteit verwijderen
+        button_delete: Verwijderen
+        confirm_message_delete: Weet u zeker dat u de actualiteit "%as_string%" wilt verwijderen?
+    main_gender:
+        index:
+            title: Lijst van geslachten
+            add_new: Geslacht toevoegen
+        title_new: Nieuw geslacht
+        title_edit: Geslacht bewerken
 
-No entities: Aucun élément
+No entities: Geen element
 
-CHILL_FOO_SEE: Voir un élément
-CHILL_FOO_EDIT: Modifier un élément
+CHILL_FOO_SEE: Element bekijken
+CHILL_FOO_EDIT: Element bewerken
+chill_export: Exports (statistieken)
 
 #Show templates
-Date: Date
-By: Par
-For: Pour
-Created for: Créé pour
-Created by: Créé par
-Created on: Créé le
+Date: Datum
+By: Door
+For: Voor
+Created for: Aangemaakt voor
+Created by: Aangemaakt door
+Created on: Aangemaakt op
 
 
 # Workflows 💊
-Workflow: Workflow — chemin de décision
-Workflow n°%id%: 'Workflow (n°%id%)'
+Workflow: Workflow — beslissingspad
+Workflow n°%id%: 'Workflow (nr. %id%)'
 workflow_: Workflow
-target: ' (cible)'
-Decision: Décision
-Join a comment: Laisser un commentaire
-Follow workflow: Suivre la décision
-Workflow history: Historique de la décision
+target: ' (doel)'
+Decision: Beslissing
+Join a comment: Opmerking achterlaten
+Follow workflow: Beslissing volgen
+Workflow history: Beslissingsgeschiedenis
 
 workflow:
-    Created by: Créé par
-    My decision: Ma décision
-    Next step: Prochaine étape
-    cc for next steps: Utilisateurs en copie
-    dest for next steps: Utilisateurs qui valideront la prochaine étape
-    Freeze: Geler
-    Freezed: Gelé
-    freezed document: Le document est gelé
-    The associated element will be freezed: L'élément associé sera gelé et ne pourra plus être modifié après cette décision.
-    Finalize: Étape finale
-    The workflow will be finalized: Le suivi est clôturé lors de cette décision.
-    No transitions: Aucune transition
-    Comment added: Commentaire ajouté
-    This workflow is finalized: Ce suivi est finalisé.
-    You are not allowed to apply a transition on this workflow: Vous n'êtes pas autorisé à appliquer une décision pour ce suivi
-    Only those users are allowed: Seuls ces utilisateurs sont autorisés
-    My workflows: Mes workflows
-    No workflow: Aucun workflow
-    subscribed: Workflows suivis
-    dest: Workflows en attente d'action
-    cc: Workflows dont je suis en copie
-    you subscribed to all steps: Vous recevrez une notification à chaque étape
-    you subscribed to final step: Vous recevrez une notification à l'étape finale
-    Current step: Étape actuelle
-    Comment on last change: Commentaire à la transition précédente
-    Users allowed to apply transition: Utilisateurs pouvant valider cette étape
-    Users put in Cc: Utilisateurs mis en copie
-    Workflow deleted with success: Le workflow a été supprimé
-    Delete workflow ?: Supprimer le workflow ?
-    Are you sure you want to delete this workflow ?: Êtes-vous sûr·e de vouloir supprimer ce workflow ?
-    Delete workflow: Supprimer le workflow
-    Steps is not waiting for transition. Maybe someone apply the transition before you ?: L'étape que vous cherchez a déjà été modifiée par un autre utilisateur. Peut-être quelqu'un a-t-il modifié cette étape avant vous ?
-    You get access to this step: Vous avez acquis les droits pour appliquer une transition sur ce workflow.
-    Those users are also granted to apply a transition by using an access key: Ces utilisateurs peuvent également valider cette étape, grâce à un lien d'accès
-    dest by email: Liens d'autorisation par email
-    dest by email help: Les adresses email mentionnées ici recevront un lien d'accès. Ce lien d'accès permettra à l'utilisateur de valider cette étape.
-    Add an email: Ajouter une adresse email
-    Remove an email: Enlever cette adresse email
-    Any email: Aucune adresse email
-    Previous dest without reaction: Workflows clotûrés après action d'un autre utilisateur
-    Previous workflow without reaction help: Liste des workflows où vous avez été cité comme pouvant réagir à une étape, mais où un autre utilisateur a exécuté une action avant vous.
-    Previous transitionned: Anciens workflows
-    Previous workflow transitionned help: Workflows où vous avez exécuté une action.
-    For: Pour
+    list: Lijst van gekoppelde workflows
+    associated: gekoppelde workflow
+    deleted: Workflow verwijderd
+    Created by: Aangemaakt door
+    My decision: Mijn beslissing
+    Next step: Volgende stap
+    cc for next steps: Gebruikers in kopie
+    dest for next steps: Gebruikers die de volgende stap zullen valideren
+    Freeze: Bevriezen
+    Freezed: Bevroren
+    freezed document: Het document is bevroren
+    The associated element will be freezed: Het gekoppelde element wordt bevroren en kan na deze beslissing niet meer worden gewijzigd.
+    Finalize: Eindstap
+    The workflow will be finalized: De opvolging wordt afgesloten bij deze beslissing.
+    No transitions: Geen transitie
+    Comment added: Opmerking toegevoegd
+    This workflow is finalized: Deze opvolging is afgesloten.
+    You are not allowed to apply a transition on this workflow: U bent niet bevoegd om een beslissing toe te passen voor deze opvolging
+    Only those users are allowed: Alleen deze gebruikers zijn bevoegd
+    My workflows: Mijn workflows
+    No workflow: Geen workflow
+    subscribed: Gevolgde workflows
+    cc: Workflows waarvan ik in kopie ben
+    dest: Workflows in afwachting van actie
+    you subscribed to all steps: U ontvangt een melding bij elke stap
+    you subscribed to final step: U ontvangt een melding bij de eindstap
+    Current step: Huidige stap
+    Comment on last change: Opmerking bij de vorige transitie
+    Users allowed to apply transition: Gebruikers die deze stap kunnen valideren
+    Users put in Cc: Gebruikers in kopie gezet
+    Workflow deleted with success: De workflow is verwijderd
+    Delete workflow ?: Workflow verwijderen?
+    Are you sure you want to delete this workflow ?: Weet u zeker dat u deze workflow wilt verwijderen?
+    Delete workflow: Workflow verwijderen
+    Steps is not waiting for transition. Maybe someone apply the transition before you ?: De stap die u zoekt is al gewijzigd door een andere gebruiker. Misschien heeft iemand deze stap voor u gewijzigd?
+    You get access to this step: U hebt rechten verkregen om een transitie toe te passen op deze workflow.
+    dest by email: Autorisatielinks per e-mail
+    dest by email help: De hier vermelde e-mailadressen ontvangen een toegangslink. Deze toegangslink stelt de gebruiker in staat deze stap te valideren.
+    Add an email: E-mailadres toevoegen
+    Remove an email: Dit e-mailadres verwijderen
+    Any email: Geen e-mailadres
+    Previous dest without reaction: Workflows afgesloten na actie van een andere gebruiker
+    Previous workflow without reaction help: Lijst van workflows waar u werd genoemd als iemand die op een stap kon reageren, maar waar een andere gebruiker een actie heeft uitgevoerd voor u.
+    Previous transitionned: Oude workflows
+    Previous workflow transitionned help: Workflows waar u een actie hebt uitgevoerd.
+    For: Voor
     Cc: Cc
+    At: Op
+    You must select a next step, pick another decision if no next steps are available: Er is een volgende stap nodig. Kies indien nodig een andere beslissing.
+    An access key was also sent to those addresses: Een toegangslink is verzonden naar deze adressen
+    Those users are also granted to apply a transition by using an access key: Deze gebruikers hebben toegang verkregen dankzij de ontvangen link per e-mail
+    Access link copied: Toegangslink gekopieerd
+    This link grant any user to apply a transition: De volgende toegangslink maakt het mogelijk een transitie toe te passen
+    The workflow may be accssed through this link: Een transitie kan worden toegepast op deze workflow dankzij de volgende toegangslink
+    Put on hold: In wacht zetten
+    Remove hold: Wacht verwijderen
+    On hold: In afwachting
+    Automated transition: Automatische transitie
+    waiting_for_signature: In afwachting van handtekening
+    Permissions: Workflows (opvolging van beslissing)
+    transition_destinee_third_party: Geadresseerde uit externe derden
+    transition_destinee_third_party_help: Elke geadresseerde ontvangt een beveiligde link per e-mail.
+    transition_destinee_emails_label: Verzending per e-mail
+    transition_destinee_add_emails: E-mailadres toevoegen
+    transition_destinee_remove_emails: Verwijderen
+    transition_destinee_emails_help: De beveiligde link wordt naar elk aangegeven adres verzonden
+    sent_through_secured_link: Verzending via beveiligde link
+    public_views_by_ip: Weergave per IP-adres
+    May not associate a document: De workflow betreft geen document
+
+    subscribe_final: Melding ontvangen bij de eindstap
+    unsubscribe_final: Geen melding meer ontvangen bij de eindstap
+    subscribe_all_steps: Melding ontvangen bij elke stap van de opvolging
+    unsubscribe_all_steps: Geen melding meer ontvangen bij elke stap van de opvolging
+
+
+    public_link:
+        expired_link_title: Verlopen link
+        expired_link_explanation: De link is verlopen, u kunt dit document niet meer bekijken.
+
+    send_external_message:
+        greeting: Goedendag
+        or_see_link: 'Als het klikken op de knop niet werkt, kunt u de documenten raadplegen door onderstaande link te kopiëren en in uw browser te openen'
+        use_button: Om toegang te krijgen tot deze documenten, kunt u onderstaande knop gebruiken
+        see_docs_action_name: Vertrouwelijke documenten bekijken
+        sender_system_user: de Chill-software
+
+    signature_zone:
+        title: Elektronische handtekeningen
+        button_sign: Ondertekenen
+        button_cancel: Annuleren
+        button_reject: Weigeren
+        metadata:
+            sign_by: 'Handtekening voor %name%'
+            docType: Documenttype
+            docNumber: Documentnummer
+            docExpiration: Vervaldatum
+        type of signature: Type handtekening
+        person signatures: Gebruikers selecteren om te ondertekenen
+        user signature: Gebruiker selecteren om te ondertekenen
+        persons: Gebruikers
+        user: Gebruiker
+        already_signed_alert: De handtekening is al toegepast
+
+    signature:
+        cancel_signature_of: Annulering van de handtekening van %signer%
+        cancel_are_you_sure: Weet u zeker dat u de handtekening van %signer% wilt annuleren
+        reject_signature_of: Weigering van de handtekening van %signer%
+        reject_are_you_sure: Weet u zeker dat u de handtekening van %signer% wilt weigeren
+        waiting_for: In afwachting van wijziging van de handtekeningstatus
 
     notification:
         title:
@@ -437,52 +678,333 @@ workflow:
             new_step: "Nieuwe stap in workflow %workflow% (%place%) voor %title%"
         content:
             new_step_reached: "Een nieuwe stap is bereikt in workflow %workflow%."
-            workflow_title: "Workflow titel: %title%"
+            workflow_title: "Titel van de workflow: %title%"
             validation_needed: "Uw validatie is nodig voor deze stap."
-            view_workflow: "U kunt de workflow hier bekijken:"
-            regards: "Met vriendelijke groeten,"
+            view_workflow: "U kunt de workflow hier raadplegen:"
+            regards: "Met vriendelijke groet,"
+
+    attachments:
+        title: Bijlagen
+        no_attachment: Geen bijlage
+        Add_an_attachment: Bijlage toevoegen
+
+    wait:
+        title: In afwachting van verwerking
+        error_while_waiting: De verwerking is mislukt
+        success: Verwerking voltooid. Doorverwijzing bezig...
 
 
-Subscribe final: Recevoir une notification à l'étape finale
-Subscribe all steps: Recevoir une notification à chaque étape
+Subscribe final: Melding ontvangen bij de eindstap
+Subscribe all steps: Melding ontvangen bij elke stap
+CHILL_MAIN_WORKFLOW_APPLY_ALL_TRANSITION: Transities toepassen op alle workflows
 
 notification:
-    Notification: Notification
-    Notifications: Notifications
-    My own notifications: Mes notifications
-    Notify: Envoyer une notification
-    Send: Envoyer
-    Edit notification: Modifier une notification
-    Notification created: Notification envoyée
-    Notification updated: La notification a été mise à jour
-    Any notification received: Aucune notification reçue
-    Any notification sent: Aucune notification envoyée
-    Notifications received: Notifications reçues
-    Notifications sent: Notifications envoyées
-    comment_appended: Commentaire ajouté
-    append_comment: Ajouter un commentaire
-    comment_updated: Commentaire mis à jour
-    comments_list: Fil de commentaires
-    show notification from %sender%: Voir la notification de %sender%
-    is_unread: Non-lue
-    is_system: notification automatique
-    list: Notifications
-    Sent: Envoyé
-    to: À
+    Daily Notification Digest: Dagelijks overzicht van meldingen
+    Notification: Melding
+    Notifications: Meldingen
+    My own notifications: Mijn meldingen
+    Notify: Melding verzenden
+    Send: Verzenden
+    Edit notification: Melding bewerken
+    Notification created: Melding verzonden
+    Notification updated: De melding is bijgewerkt
+    Any notification received: Geen melding ontvangen
+    Any notification sent: Geen melding verzonden
+    Notifications received: Ontvangen meldingen
+    Notifications sent: Verzonden meldingen
+    comment_appended: Opmerking toegevoegd
+    append_comment: Opmerking toevoegen
+    comment_updated: Opmerking bijgewerkt
+    comments_list: Opmerkingendraad
+    show notification from %sender%: Melding bekijken van %sender%
+    is_unread: Ongelezen
+    is_system: automatische melding
+    list: Meldingen
+    Sent: Verzonden
+    to: Aan
     cc: Cc
-    sent_to: Destinataire(s)
-    sent_cc: En copie
-    from: De
-    received_from: Expéditeur
-    you were notified by %sender%:  Vous avez été notifié par %sender%
-    you were notified by system: Vous avez été notifié automatiquement
-    subject: Objet
-    see_comments_thread: Voir le fil de commentaires associé
-    object_prefix: "[CHILL] notification - "
-    dest by email: Lien d'accès par email
-    Any email: Aucun email
-    Add an email: Ajouter un email
-    dest by email help: Les adresses email mentionnées ici recevront un lien d'accès. Un compte utilisateur sera toujours nécessaire.
-    Remove an email: Supprimer l'adresse email
-    Email with access link: Adresse email ayant reçu un lien d'accès
+    sent_to: Ontvanger(s)
+    sent_cc: In kopie
+    from: Van
+    received_from: Afzender
+    you were notified by %sender%: U werd verwittigd door %sender%
+    you were notified by system: U werd automatisch verwittigd
+    subject: Onderwerp
+    see_comments_thread: Bijbehorende opmerkingendraad bekijken
+    object_prefix: "[CHILL] melding - "
+    dest by email: Toegang via e-mail
+    Any email: Geen e-mail
+    Add an email: E-mailadres toevoegen
+    dest by email help: De hier vermelde e-mailadressen ontvangen een toegangslink. Een gebruikersaccount blijft altijd nodig.
+    Remove an email: E-mailadres verwijderen
+    Email with access link: E-mailadres dat een toegangslink ontving
+    Pick user or user group: Gebruiker of gebruikersgroep selecteren
 
+    mark_as_read: Markeren als gelezen
+    mark_as_unread: Markeren als ongelezen
+
+    flags:
+        type: Type melding
+        by-user: Wanneer een gebruiker u een persoonlijke melding stuurt
+        referrer-acc-course: Wanneer een andere gebruiker u aanduidt als referent van een traject
+        person-address-move: Wanneer een andere gebruiker de verhuis registreert van een cliënt in een traject waarvoor u referent bent.
+        person: Melding over een cliënt
+        workflow-trans: Wanneer een andere gebruiker een transitie toepast op een workflow.
+        none selected message: Als u geen optie selecteert, ontvangt u geen e-mail over dit type melding.
+        preferences:
+            column_title: Voorkeuren
+            immediate_email: Onmiddellijke e-mail
+            daily_email: Dagelijks overzicht
+            no_email: Geen e-mail ontvangen
+
+    daily_digest:
+        title: "Dagelijks overzicht van meldingen"
+        greeting: "Hallo %user%"
+        intro: "U hebt %notification_count% nieuwe melding(en) ontvangen."
+        view_notification: "U kunt de melding hier bekijken en erop antwoorden:"
+        signature: "Het Chill-team"
+
+daily_notifications: "{1}U hebt 1 nieuwe melding.|]1,Inf[U hebt %notification_count% nieuwe meldingen."
+
+docgen:
+    failure_email:
+        "The generation of a document failed": "Het genereren van een document is mislukt"
+        "The generation of the document %template_name% failed": "Het genereren van document %template_name% is mislukt"
+        "Forward this email to your administrator for solving": "Stuur deze e-mail door naar uw beheerder voor een oplossing"
+        "References": "Referenties"
+        "The following errors were encoutered": "De volgende fouten zijn opgetreden"
+    data_dump_email:
+        subject: "Gegevensexport beschikbaar"
+        "Dear": "Beste gebruiker,"
+        "data_dump_ready_and_attached": "Uw gegevensexport is klaar en als bijlage bij deze e-mail toegevoegd."
+        "filename": "Bestandsnaam: %filename%"
+
+CHILL_MAIN_COMPOSE_EXPORT: Exports uitvoeren en opslaan
+CHILL_MAIN_GENERATE_SAVED_EXPORT: Opgeslagen exports uitvoeren en wijzigen
+
+
+export:
+    role:
+        export_role: Exports
+    generation:
+        Export generation is pending: Het aanmaken van de export is bezig
+        Export generation is pending_short: Bezig
+        Come back later: Terug naar het overzicht
+        Too many retries: Te veel pogingen om de beschikbaarheid van de export te controleren. Probeer de pagina te herladen.
+        Error while generating export: Interne fout tijdens het genereren van de export
+        Error_short: Fout
+        Export ready: De export is klaar om te downloaden
+    address_helper:
+        id: Adres-ID
+        street: Straat
+        streetNumber: Straatnummer
+        buildingName: Gebouwnaam
+        corridor: Gang
+        distribution: Distributie
+        extra: Extra
+        flat: Appartement
+        floor: Verdieping
+        postcode_code: Postcode
+        postcode_name: Postcodeomschrijving
+        country: Land
+        _as_string: Geformatteerd adres
+        confidential: Vertrouwelijk adres ?
+        isNoAddress: Onvolledig adres ?
+        steps: Trappen
+        _lat: Breedtegraad
+        _lon: Lengtegraad
+    social_action_list:
+        id: Actie-ID
+        social_issue_id: ID sociale problematiek
+        social_issue: Sociale problematiek
+        desactivation_date: Uitschakelingsdatum
+        social_issue_ordering: Volgorde van de sociale problematiek
+        action_label: Begeleidingsactie
+        action_ordering: Volgorde
+        goal_label: Doelstelling
+        goal_id: Doel-ID
+        goal_result_label: Resultaat
+        goal_result_id: Resultaat-ID
+        result_without_goal_label: Resultaat (zonder doelstelling)
+        result_without_goal_id: Resultaat-ID (zonder doelstelling)
+        evaluation_title: Evaluatie
+        evaluation_id: Evaluatie-ID
+        evaluation_url: Externe URL (evaluatie)
+        evaluation_delay_month: Meldingstermijn (maanden)
+        evaluation_delay_week: Meldingstermijn (weken)
+        evaluation_delay_day: Meldingstermijn (dagen)
+
+rolling_date:
+    year_previous_start: Begin van vorig jaar
+    quarter_previous_start: Begin van het vorige kwartaal
+    month_previous_start: Begin van vorige maand
+    week_previous_start: Begin van vorige week
+    year_current_start: Begin van het lopende jaar
+    quarter_current_start: Begin van het lopende kwartaal
+    month_current_start: Begin van deze maand
+    week_current_start: Begin van deze week
+    today: Vandaag (geen wijziging van de huidige datum)
+    year_next_start: Begin van volgend jaar
+    quarter_next_start: Begin van het volgende kwartaal
+    month_next_start: Begin van volgende maand
+    week_next_start: Begin van volgende week
+    fixed_date: Vaste datum
+    roll_movement: Wijziging ten opzichte van vandaag
+    fixed_date_date: Vaste datum
+
+saved_export:
+    Any saved export: Geen opgeslagen export
+    New: Nieuwe opgeslagen export
+    Edit: Opgeslagen export bewerken
+    Delete saved ?: Opgeslagen export verwijderen?
+    Are you sure you want to delete this saved ?: Weet u zeker dat u deze export wilt verwijderen?
+    Saved exports: Opgeslagen exports
+    Export is deleted: De export is verwijderd
+    Saved export is saved!: De export is opgeslagen
+    Created on %date%: Aangemaakt op %date%
+    update_title_and_description: Titel en beschrijving bijwerken
+    update_filters_aggregators_and_execute: Filters en groeperingen bijwerken en downloaden
+    execute: Genereren
+    Update existing: Bestaande opgeslagen export bijwerken
+    Owner: Eigenaar
+    Shared with others: Gedeeld
+    Save to new saved export: Opslaan als nieuwe opgeslagen export
+    Update current saved export: Configuratie van de bestaande export bijwerken
+    Duplicate: Dupliceren
+    Duplicated: Gekopieerd
+    Options updated successfully: De configuratie van de export is bijgewerkt
+    Share: Delen
+    Alert auto generated description: De onderstaande beschrijving werd automatisch gegenereerd alsof de export onmiddellijk werd uitgevoerd. Pas ze aan om rekening te houden met parameters die kunnen wijzigen (huidige gebruiker, rollende datums, enz.).
+
+absence:
+    # single letter for absence
+    A: A
+    My absence: Mijn afwezigheid
+    Unset absence: Mijn afwezigheidsdata verwijderen
+    Set absence date: Afwezigheidsdatum instellen
+    Absence start: Afwezig vanaf
+    Absence end: Tot
+    Absent: Afwezig
+    You are marked as being absent: U staat als afwezig genoteerd.
+    No absence listed: Geen afwezigheid opgegeven.
+    Is absent: Afwezig?
+
+admin:
+    users:
+        export_list_csv: Gebruikerslijst (CSV-formaat)
+        export_permissions_csv: Koppeling gebruikers - permissiegroepen - territorium (CSV-formaat)
+        export:
+            id: Identificatie
+            username: Gebruikersnaam
+            email: E-mail
+            enabled: Geactiveerd
+            civility_id: Aanhef-ID
+            civility_abbreviation: Afkorting aanhef
+            civility_name: Aanhef
+            label: Label
+            mainCenter_id: ID hoofdterritorium
+            mainCenter_name: Hoofdterritorium
+            mainScope_id: ID hoofddienst
+            mainScope_name: Hoofddienst
+            userJob_id: ID beroep
+            userJob_name: Beroep
+            currentLocation_id: ID huidige locatie
+            currentLocation_name: Huidige locatie
+            mainLocation_id: ID hoofdlocatie
+            mainLocation_name: Hoofdlocatie
+            absenceStart: Afwezig vanaf
+            center_id: Territorium-ID
+            center_name: Territorium
+            permissionsGroup_id: Permissiegroep-ID
+            permissionsGroup_name: Permissiegroep
+        job_scope_histories:
+            Show history: Historiek bekijken
+            index:
+                histories: Historiek van diensten en beroepen
+                Back to user job: Terug naar gebruiker
+                job_history:
+                    title: Historiek van beroepen
+                    start: Van
+                    end: Tot
+                    today: lopend
+                    undefined: niet gedefinieerd
+                    user: Gebruiker
+                    job: Beroep
+                scope_history:
+                    title: Historiek van diensten
+                    start: Van
+                    end: Tot
+                    today: lopend
+                    undefined: niet gedefinieerd
+                    user: Gebruiker
+                    scope: Dienst
+    dashboard:
+        title: Dashboard
+        news: Nieuws
+        description: Configuratie van het dashboard
+
+
+news:
+    noDate: Geen einddatum
+    startDate: Startdatum publicatie
+    endDate: Einddatum publicatie op de startpagina
+    title: Overzicht van nieuwsberichten
+    menu: Nieuws
+    no_data: Geen nieuwsbericht
+    read_more: Lees meer
+    show_details: Nieuwsbericht bekijken
+
+gender:
+    genderTranslation: Grammaticale vertaling
+    not defined: Niet gedefinieerd
+    pick gender: Kies een gender
+    Select gender translation: Grammaticale vertaling kiezen
+    Select gender icon: Te gebruiken pictogram kiezen
+
+wopi:
+    online_edit_document: Online bewerken
+    save_and_quit: Opslaan en afsluiten
+    loading: Online editor wordt geladen
+    invalid_title: Onverenigbaar formaat
+    invalid_message: Sorry, dit documentformaat kan niet online worden bewerkt.
+
+onthefly:
+    show:
+        person: Details van de cliënt
+        thirdparty: Details van de derde
+        file_person: Dossier van de cliënt openen
+        file_thirdparty: Derde bekijken
+    edit:
+        person: Cliënt bewerken
+        thirdparty: Derde bewerken
+    create:
+        button: Aanmaken {q}
+        title:
+            default: Aanmaak van een nieuwe cliënt of professionele derde
+            person: Aanmaak van een nieuwe cliënt
+            thirdparty: Aanmaak van een nieuwe professionele derde
+        person: een nieuwe cliënt
+        thirdparty: een nieuwe professionele derde
+    addContact:
+        title: Een contact aanmaken voor {q}
+    resource_comment_title: Er is een opmerking gekoppeld aan deze gesprekspartner
+
+modal:
+    action:
+        close: Sluiten
+
+multiselect:
+    placeholder: Kiezen
+    tag_placeholder: Nieuw element aanmaken
+    select_label: Enter of klik om te selecteren
+    deselect_label: Enter of klik om de selectie op te heffen
+    select_group_label: Druk op "Enter" om deze groep te selecteren
+    deselect_group_label: Druk op "Enter" om deze groep te deselecteren
+    selected_label: Geselecteerd
+
+editor:
+    switch_to_simple: Eenvoudige editor
+    switch_to_complex: Rijke editor
+
+login_page:
+    logo_alt: "Chill-logo"
diff --git a/src/Bundle/ChillMainBundle/translations/validators.nl.yml b/src/Bundle/ChillMainBundle/translations/validators.nl.yml
new file mode 100644
index 000000000..85d391ba1
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/translations/validators.nl.yml
@@ -0,0 +1,45 @@
+# role_scope constraint
+# scope presence
+The role "%role%" require to be associated with a scope.: De rol "%role%" moet gekoppeld zijn aan een dienst.
+The role "%role%" should not be associated with a scope.: De rol "%role%" mag niet gekoppeld zijn aan een dienst.
+"The password must contains one letter, one capitalized letter, one number and one special character as *[@#$%!,;:+\"'-/{}~=µ()£]). Other characters are allowed.": "Het wachtwoord moet een hoofdletter, een kleine letter en ten minste één speciaal teken bevatten uit *[@#$%!,;:+\"'-/{}~=µ()£]). Andere tekens zijn toegestaan."
+The password fields must match: De wachtwoorden moeten overeenkomen
+The password must be greater than {{ limit }} characters: "[1,Inf] Het wachtwoord moet minstens {{ limit }} tekens bevatten"
+
+A permission is already present for the same role and scope: Er bestaat al een toestemming voor dezelfde rol en dienst.
+
+#UserCircleConsistency
+"{{ username }} is not allowed to see entities published in this circle": "{{ username }} is niet bevoegd om het element te zien dat in deze dienst is gepubliceerd."
+
+The user in cc cannot be a dest user in the same workflow step: Een gebruiker in Cc kan geen gebruiker zijn die valideert.
+
+#password request
+This username or email does not exists: Deze gebruikersnaam of e-mail bestaat niet in de database
+
+#phonenumber
+This is not a landline phonenumber: Dit nummer is geen geldig vast telefoonnummer
+This is not a mobile phonenumber: Dit nummer is geen geldig mobiel nummer
+This is not a valid phonenumber: Dit telefoonnummer is niet geldig
+
+address:
+    street1-should-be-set: Er moet een adresregel aanwezig zijn
+    date-should-be-set: De begindatum van geldigheid moet aanwezig zijn
+    postcode-should-be-set: De postcode moet worden ingevuld
+
+notification:
+    At least one addressee: Geef ten minste één geadresseerde op
+    Title must be defined: Er moet een titel worden aangegeven
+    Comment content might not be blank: De opmerking kan niet leeg zijn
+
+workflow:
+    You must add at least one dest user or email: Geef ten minste één geadresseerde of een e-mailadres op
+    The user in cc cannot be a dest user in the same workflow step: De gebruiker in kopie kan niet aanwezig zijn in de gebruikers die de volgende stap zullen valideren
+    transition_has_destinee_if_sent_external: Geef een geadresseerde van de externe verzending op
+    transition_destinee_not_necessary: Voor deze transitie kunt u geen externe geadresseerden opgeven
+    You must add a destinee for signing: Geef een gebruiker of een gebruiker op voor ondertekening
+
+rolling_date:
+    When fixed date is selected, you must provide a date: Geef de gekozen vaste datum op
+
+user:
+    absence_end_requires_start: U kunt geen einddatum van afwezigheid invullen zonder begindatum.
diff --git a/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.nl.yaml b/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.nl.yaml
new file mode 100644
index 000000000..fd85afb8c
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.nl.yaml
@@ -0,0 +1,211 @@
+Born the date: >-
+    {gender, select,
+        man {Geboren op {birthdate}}
+        woman {Geboren op {birthdate}}
+        neutral {Geboren op {birthdate}}
+        other {Geboren op {birthdate}}
+    }
+
+Requestor: >-
+    {gender, select,
+        man {Aanvrager}
+        woman {Aanvraagster}
+        neutral {Aanvrager}
+    }
+
+accompanying_period:
+    Participants_without_count: >-
+        {count, plural,
+            =0 {Deelnemer}
+            =1 {Deelnemer}
+            other {Deelnemers}
+        }
+
+    number: >-
+        nr. {id}
+
+person:
+    from_the: sinds
+    And himself: >-
+        {gender, select,
+            man {en hijzelf}
+            woman {en zijzelf}
+            neutral {en zijzelf}
+            other {en zijzelf}
+        }
+
+household:
+    Household: Huishouden
+    Household number: Huishouden {household_num}
+    Household members: Leden van het huishouden
+    Household editor: Lidmaatschap invullen
+    Members at same time: Gelijktijdige leden
+    Any simultaneous members: Geen gelijktijdige leden
+    Select people to move: Gebruikers kiezen
+    Show future or past memberships: >-
+        {length, plural,
+            one {Oud lidmaatschap tonen}
+            many {# oude of toekomstige lidmaatschappen tonen}
+            other {# oude of toekomstige lidmaatschappen tonen}
+        }
+    Show accompanying periods of past or future memberships: >-
+        {length, plural,
+            one {De trajecten van een oud lidmaatschap tonen}
+            many {# trajecten van oude of toekomstige lidmaatschappen tonen}
+            other {# trajecten van oude of toekomstige lidmaatschappen tonen}
+        }
+    Hide memberships: Verbergen
+    Those members does not share address: Deze gebruikers delen het adres van het huishouden niet.
+    Any persons into this position: Geen persoon behoort tot het huishouden in deze positie.
+    Leave household: Huishouden verlaten
+    Leave: Loskoppelen
+    person:
+        leave: De gebruiker verlaat het huishouden
+    Join: Huishouden aansluiten
+    Change position: Herpositioneren
+    Household file: Huishoudendossier
+    Add a member: Lid toevoegen
+    Update membership: Bewerken
+    successfully saved member: Lid succesvol opgeslagen
+    Start date: Startdatum van het lidmaatschap van het huishouden
+    End date: Einddatum van het lidmaatschap van het huishouden
+    Comment: Opmerking
+    is holder: Is houder
+    is not holder: Is geen houder
+    holder: Houder
+    Edit member household: Lidmaatschap van het huishouden invullen
+    Edit his household: Zijn lidmaatschap van het huishouden bewerken
+    Current household members: Huidige leden
+    Household summary: Overzicht van het huishouden
+    Accompanying period: Begeleidingstraject
+    Addresses: Adresgeschiedenis
+    Relationship: Verwantschap
+    Budget: Budget
+    Household relationships: Verwantschappen in het huishouden
+    Current address: Huidig adres
+    Household does not have any address currently: Het huishouden heeft momenteel geen adres ingevuld
+    Edit household members: Lidmaatschap van het huishouden invullen
+    and x other persons: >-
+        {x, plural,
+            one {en één andere persoon}
+            many {en # andere personen}
+            other {en # andere personen}
+        }
+    Expecting for birth on date: Geboorte verwacht op {date}
+    Expecting for birth: Geboorte verwacht (datum onbekend)
+    Any expecting birth: Geen aanstaande geboorte ingevuld.
+    New comment and expecting birth: Opmerking schrijven
+    Edit comment and expecting birth: Opmerking bijwerken
+    Edit member metadata: Aanvullende gegevens
+    comment_membership: Algemene opmerking over leden
+    expecting_birth: Geboorte verwacht?
+    date_expecting_birth: Datum van de verwachte geboorte
+    data_saved: Gegevens opgeslagen
+    Household history: Geschiedenis van de huishoudens
+    Household history for person: Geschiedenis van de huishoudens van de persoon
+    Household history for %name%: Geschiedenis van de huishoudens voor {name}
+    Household shared: Woonhuishouden
+    Household not shared: Huishoudens buiten woonplaats
+    Members without position: Leden zonder positie
+    Never in any household: Lid van geen enkel huishouden
+    Membership currently running: Lopend
+    from: Sinds
+    to: Tot
+    person history: Huishoudens
+    As member: Als
+
+household_composition:
+    Since: >-
+        Sinds {startDate, date, long}
+    Still active: Nog steeds actief
+    Until: >-
+        Tot {endDate, date, long}
+    numberOfChildren children in household: >-
+        {numberOfChildren, plural,
+            =0 {Geen kind in het huishouden}
+            one {1 kind in het huishouden}
+            few {# kinderen in het huishouden}
+            other {# kinderen in het huishouden}
+        }
+    numberOfDependents adult dependents: >-
+        {numberOfDependents, plural,
+            =0 {Geen meerderjarige ten laste}
+            one {1 meerderjarige ten laste}
+            few {# meerderjarigen ten laste}
+            other {# meerderjarigen ten laste}
+        }
+    numberOfDependentsWithDisabilities dependents with disabilities: >-
+        {numberOfDependentsWithDisabilities, plural,
+            =0 {Geen ten laste erkend als persoon met beperking}
+            one {1 ten laste erkend als persoon met beperking}
+            few {# ten laste erkend als persoon met beperking}
+            other {# ten laste erkend als persoon met beperking}
+        }
+
+periods:
+    title: Begeleidingstraject (nr. {id})
+    show closed periods: >-
+        {nb_items, plural,
+            =0 {Geen afgesloten traject}
+            one {Eén afgesloten traject of oud traject tonen}
+            many {# afgesloten trajecten of oude trajecten tonen}
+            other {# afgesloten trajecten of oude trajecten tonen}
+        }
+    hide closed periods: >-
+        {nb_items, plural,
+            =0 {Geen afgesloten traject}
+            one {Eén afgesloten traject of oud traject verbergen}
+            many {# afgesloten trajecten of oude trajecten verbergen}
+            other {# afgesloten trajecten of oude trajecten verbergen}
+        }
+
+exports:
+    by_person:
+        Filtered by person\'s geographical unit (based on address) computed at date, only units:
+            "Gefilterd op geografische zone op basis van het adres, berekend op {datecalc, date, short}, alleen de volgende zones: {units}"
+    filter:
+        person:
+            without_participation_between_dates:
+                "Filtered by having no participations during period: between": "Alleen de gebruikers die door geen enkel traject zijn geraakt tussen {dateafter, date, short} en {datebefore, date, short}"
+        course:
+            not_having_address_reference:
+                describe: >-
+                    Alleen de trajecten die niet gelokaliseerd zijn op een referentieadres, op de datum van {date_calc, date, medium}
+            by_referrer_between_dates:
+                description: >-
+                    Gefilterd op referent van het traject, tussen twee data: vanaf {start_date, date, medium}, tot {end_date, date, medium}, alleen {agents}
+            by_user_job:
+                "Filtered by user job: only job": "Gefilterd op beroep van de referent tussen {startDate, date, short} en {endDate, date, short}: alleen {job}"
+            by_user_scope:
+                "Filtered by user main scope: only scopes": "Gefilterd op dienst van de referent tussen {startDate, date, short} en {endDate, date, short}: alleen {scopes}"
+        work:
+            by_treating_agent:
+                Filtered by treating agent at date: >-
+                    De behandelende agenten op { agent_at, date, medium }, alleen {agents}
+        step_history:
+            by_date:
+                description: >-
+                    Statuswijzigingen gefilterd op datum: na { start_date, date, medium } (inclusief), voor { end_date, date, medium }
+
+'total persons matching the search pattern': >-
+    { total, plural,
+        =0 {Geen gebruiker komt overeen met de zoektermen}
+        one {Eén gebruiker komt overeen met de zoektermen}
+        many {# gebruikers komen overeen met de zoektermen}
+        other {# gebruikers komen overeen met de zoektermen}
+    }
+
+'nb person with similar name. Please verify that this is a new person': >-
+    { nb, plural,
+        =0 {Geen gebruiker heeft een vergelijkbare naam}
+        one {Eén gebruiker heeft een vergelijkbare naam. Controleer dat het niet om hem/haar gaat.}
+        other {# gebruikers hebben een vergelijkbare naam. Controleer dat het niet om één van hen gaat}
+    }
+
+accompanying_course_evaluation_document:
+    title: Evaluatie (nr. {id}) - {doc_title}
+    duplicated_at: >-
+        Gedupliceerd op {at, date, long} om {at, time, short}
+
+accompanying_period_work:
+    title: Begeleidingsactie (nr. {id}) - {action_title}
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.nl.yml b/src/Bundle/ChillPersonBundle/translations/messages.nl.yml
index 94ddd51b5..c4e48bbaa 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.nl.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.nl.yml
@@ -1,4 +1,5 @@
 Edit: Wijzigen
+Select an option…: Kies een optie…
 'First name': Voornaam
 firstname: voornaam
 firstName: voornaam
@@ -61,6 +62,7 @@ Remove phone: Verwijderen
 'Unknown spoken languages': 'Gesproken talen ongekend'
 Male: Man
 Female: Vrouw
+neutral: Neutraal
 Both: Non-binair
 man: Man
 woman: Vrouw
@@ -86,6 +88,22 @@ Civility: Aanspreektitel
 choose civility: --
 All genders: alle genderkeuzes
 Any person selected: Geen persoon geselecteerd
+Create a household and add an address: Een adres toevoegen voor een niet-opgevolgde persoon die alleen woont
+A new household will be created. The person will be member of this household.: Er wordt een nieuw huishouden aangemaakt. De persoon wordt lid van dit huishouden.
+Comment on the gender: Commentaar over het gender
+genderComment: Commentaar over het gender
+maritalStatus: Burgerlijke staat
+maritalStatusComment: Commentaar over de burgerlijke staat
+maritalStatusDate: Datum van de burgerlijke staat
+memo: Commentaar
+numberOfChildren: Aantal kinderen
+contactInfo: Contactopmerkingen
+spokenLanguages: Gesproken talen
+Employment status: Beroepssituatie
+Administrative status: Administratieve situatie
+
+person:
+    Identifiers: Identificatoren
 
 # dédoublonnage
 Old person: Dubbel
@@ -112,6 +130,7 @@ not-duplicate: Vals-positief
 Switch to truefalse: Aanduiden als vals-positief
 Switch to duplicate: Aanduiden als een duplicaat
 No duplicate candidates: Er werden geen duplicaten of vals-positieve dossiers gedetecteerd
+Person1 cannot be the same as Person2: De geselecteerde persoon mag niet dezelfde zijn als dit dossier.
 
 # addresses part
 address_street_address_1: Adres regel 1
@@ -200,6 +219,9 @@ Associated peoples: Betrokken personen
 Resources: Hulpverlening partners
 Any requestor to this accompanying course: Er is geen aanvrager voor dit hulpverleningstraject
 Social actions: Ondersteuningsmaatregelen
+Social action: Ondersteuningsmaatregel
+Pick a social action: Kies een ondersteuningsmaatregel
+Pick a social issue: Kies een hulpvraag
 Last social actions: Laatste ondersteuningsmaatregelen
 Social issue: Hulpvraag
 Social issues: Hulpvragen
@@ -214,13 +236,22 @@ No requestor: Geen aanvrager
 No resources: "Geen hulpverlening partners"
 Persons associated: Betrokken personen
 Referrer: Doorverwijzer
+Referrer2: Behandelend medewerker
 Referrers: Doorverwijzers
 Some peoples does not belong to any household currently. Add them to an household soon: Sommige personen maken nog geen deel uit van een huishouden. Voeg ze zo snel mogelijk aan huishouden toe.
 Add to household now: Toevoegen aan een huishouden
 Any resource for this accompanying course: Geen enkele hulpverlening partner
 course.draft: Ontwerp
 course.closed: Afgesloten
+No referrer: Geen doorverwijzer
+course:
+    draft: Ontwerp
+    closed: Afgesloten
+    inactive_short: Buiten actieve lijst
+    inactive_long: Voor-archief
+    confirmed: Bevestigd
 Origin: Oorsprong van de aanvraag
+This course is closed: Dit traject is afgesloten
 Delete accompanying period: Hulpverleningstraject verwijderen
 Are you sure you want to remove the accompanying period "%id%" ?:  Bent u zeker het hulpverleningstraject %id% te willen verwijderen?
 The accompanying course has been successfully removed.: Het hulpverleningstraject werd verwijdert.
@@ -239,6 +270,10 @@ List of resources: "Overzicht steunfiguren"
 There are no available resources: "Nog geen steunfiguur"
 no comment found: "Geen enkele opmerking"
 Select a type: "Kies een type"
+person_resource:
+    person_non_prof: Gebruiker / niet-professionele derde
+    thirdparty_prof: Professionele derde
+    freetext: Vrije omschrijving
 Select a person: "Kies een persoon"
 Select a thirdparty: "Kies een externe partner"
 Contact person: "Kies een contactpersoon"
@@ -302,10 +337,35 @@ CHILL_PERSON_STATS: Statistieken van personen
 CHILL_PERSON_LISTS: Overzicht van personen
 CHILL_PERSON_DUPLICATE: Duplicaten persoon behandelen
 CHILL_PERSON_ACCOMPANYING_PERIOD_SEE: Hulpverleningstrajecten bekijken
+CHILL_PERSON_ACCOMPANYING_PERIOD_CONFIDENTIAL: Vertrouwelijke hulpverleningstrajecten bekijken en bewerken
+CHILL_PERSON_ACCOMPANYING_PERIOD_DELETE: Een hulpverleningstraject verwijderen
+CHILL_PERSON_ACCOMPANYING_PERIOD_RE_OPEN: Een afgesloten traject heropenen
+CHILL_PERSON_ACCOMPANYING_PERIOD_TOGGLE_CONFIDENTIAL_ALL: Vertrouwelijkheid van alle trajecten aanpassen
+CHILL_PERSON_ACCOMPANYING_PERIOD_CRUD_CONFIDENTIAL: Vertrouwelijke hulpverleningstrajecten bekijken
+CHILL_PERSON_ACCOMPANYING_PERIOD_CREATE: Een hulpverleningstraject aanmaken
+CHILL_PERSON_ACCOMPANYING_PERIOD_UPDATE: Een hulpverleningstraject bijwerken
+CHILL_PERSON_ACCOMPANYING_PERIOD_FULL: Details bekijken, aanmaken, verwijderen en bijwerken van een hulpverleningstraject
+CHILL_PERSON_ACCOMPANYING_COURSE_REASSIGN_BULK: Trajecten in bulk hertoewijzen
+CHILL_PERSON_ACCOMPANYING_PERIOD_SEE_DETAILS: Details van een hulpverleningstraject bekijken
+CHILL_PERSON_ACCOMPANYING_PERIOD_STATS: Statistieken over hulpverleningstrajecten
+CHILL_PERSON_ACCOMPANYING_PERIOD_SEE_CONFIDENTIAL: Vertrouwelijke trajecten bekijken
+CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_CREATE: Een ondersteuningsmaatregel aanmaken
+CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_DELETE: Een ondersteuningsmaatregel verwijderen
+CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_SEE: Ondersteuningsmaatregelen bekijken
+CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_UPDATE: Ondersteuningsmaatregelen bijwerken
+CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_STATS: Statistieken over ondersteuningsmaatregelen
+CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_EVALUATION_SHOW: Evaluaties bekijken
+CHILL_MAIN_ACCOMPANYING_PERIOD_WORK_EVALUATION_STATS: Statistieken over evaluaties
+CHILL_PERSON_HOUSEHOLD_SEE: Huishoudens bekijken
+CHILL_PERSON_HOUSEHOLD_EDIT: Huishoudens bewerken
+CHILL_PERSON_HOUSEHOLD_STATS: Statistieken over huishoudens
 
 #period
 Period closed!: Hulpverleningstraject afgesloten!
 Pediod closing form is not valide: Het formulier voor het afsluiten van het hulpverleningstraject is niet geldig.
+Consider canceled: Laat trajecten als geannuleerd tellen
+Canceled parcours help: Indien aangevinkt worden trajecten met dit sluitingsmotief beschouwd als geannuleerd en niet meegeteld in statistieken. De wijziging geldt ook voor alle onderliggende motieven.
+( Canceled period ): (geannuleerd)
 
 #widget
 
@@ -313,12 +373,40 @@ Pediod closing form is not valide: Het formulier voor het afsluiten van het hulp
 Accompanyied people: Begeleide personen
 
 ## exports
+Exports of persons: Exports van personen
+Count people by various parameters.: Het aantal personen tellen op basis van diverse filters.
+Count people: Aantal personen
 Count peoples by various parameters.: Aantal personen tellen die voldoen aan vershillende criteria.
 Count peoples: Aantal personen
 List peoples: Overzicht personen
 Create a list of people according to various filters.: Overzicht geven van personen die voldoen aan bepaalde criteria.
 Fields to include in export: Velden die toegevoegd moeten worden in de export van gegevens.
 Address valid at this date: Adres dat geldig is op deze datum.
+Data valid at this date: Gegevens geldig op deze datum
+Data regarding center, addresses, and so on will be computed at this date: Gegevens over territorium, adres en huishouden worden op deze datum berekend.
+List duplicates: Lijst van dubbels
+Create a list of duplicate people: Lijst aanmaken van als duplicaat gedetecteerde personen.
+Count people participating in an accompanying course: Aantal personen die een traject volgen
+Count people participating in an accompanying course by various parameters.: Het aantal trajectdeelnemers tellen op basis van diverse filters.
+
+Exports of accompanying courses: Exports van hulpverleningstrajecten
+Count accompanying courses: Aantal trajecten
+Count accompanying courses by various parameters: Het aantal trajecten tellen op basis van diverse filters.
+Accompanying courses participation duration and number of participations: Duur en aantal deelnames aan trajecten
+Create an average of accompanying courses duration of each person participation to accompanying course, according to filters on persons, accompanying course: Een rapport maken dat de gemiddelde duur van deelname van iedere persoon aan trajecten berekent, met filters op personen en trajecten.
+Closingdate to apply: Einddatum te gebruiken wanneer het traject nog niet afgesloten is
+
+Exports of social work actions: Exports van ondersteuningsmaatregelen
+Count social work actions: Aantal maatregelen
+Count social work actions by various parameters: Het aantal ondersteuningsmaatregelen tellen op basis van diverse filters.
+Average duration of social work actions: Gemiddelde duur van maatregelen
+Calculate the average duration of social work actions: Gemiddelde duur van de ondersteuningsmaatregelen berekenen.
+
+Exports of evaluations: Exports van evaluaties
+Count evaluations: Aantal evaluaties
+Count evaluation by various parameters.: Het aantal evaluaties tellen op basis van diverse filters.
+
+Exports of households: Exports van huishoudens
 
 ## filters
 Filter by person gender: Filteren op basis van gender
@@ -336,6 +424,43 @@ Born before this date: Geboren voor
 This field should not be empty: Dit veld mag niet leeg zijn
 This date should be after the date given in "born after" field: Deze datum moet vallen na de datum in het veld 'geboren na'
 "Filtered by person's birtdate: between %date_from% and %date_to%": "Filteren op basis van geboortedatum: enkel geboren tussen %date_from% en %date_to%"
+"Filtered by person's birthdate: between %date_from% and %date_to%": "Filteren op basis van geboortedatum: enkel geboren tussen %date_from% en %date_to%"
+
+Filter by person's deathdate: Personen filteren op overlijdensdatum.
+"Filtered by person's deathdate: between %date_from% and %date_to%": "Filteren op basis van overlijdensdatum: enkel overleden tussen %date_from% en %date_to%"
+Death after this date: Overleden na deze datum
+Deathdate before: Overleden voor deze datum
+Alive: Levend
+Deceased: Overleden
+Filter in relation to this date: Filteren ten opzichte van deze datum
+"Filtered by a state of %deadOrAlive%: at this date %date_calc%": "Gefilterd op personen die %deadOrAlive% zijn op datum %date_calc%"
+
+Filter by person's age: Personen filteren op leeftijd.
+"Filtered by person's age: between %min_age% and %max_age%": "Gefilterd op leeftijd: tussen %min_age% en %max_age%"
+Minimum age: Minimumleeftijd
+Maximum age: Maximumleeftijd
+The minimum age should be less than the maximum age.: De minimumleeftijd moet lager zijn dan de maximumleeftijd.
+
+Date during which residential address was valid: Datum waarop het domicilieadres geldig was
+
+Family composition: Gezins­samenstelling
+Family composition at this time: Gezins­samenstelling op dit moment
+
+Filter by person's marital status: Personen filteren op burgerlijke staat
+Filtered by person's marital status: Gefilterd op burgerlijke staat
+Marital status at this time: Burgerlijke staat op dit moment
+
+Filter by entrusted child status: Personen filteren op "toevertrouwd kind"
+Filtered by entrusted child status: Enkel personen die "toevertrouwd kind" zijn
+
+Filter by nomadic status: Personen filteren op "woonwagenbewoner"
+Filtered by nomadic status: Enkel personen die "woonwagenbewoner" zijn
+
+"Filter by person's who have a residential address located at another user": Personen filteren die een domicilieadres hebben bij een andere gebruiker
+"Filtered by person's who have a residential address located at another user": Enkel personen met een domicilieadres bij een andere gebruiker
+
+Filter by person's that are alive or have deceased at a certain date: Personen filteren op levend of overleden op een bepaalde datum
+Filtered by person's that are alive or have deceased at a certain date: Enkel personen die levend of overleden zijn op een bepaalde datum
 
 "Filter by accompanying period: active period": "Filteren op basis van actieve hulpverleningstrajecten"
 Having an accompanying period opened after this date: Met een hulpverleningstraject dat geopend werd na deze datum
@@ -351,7 +476,168 @@ Having an accompanying period closed after this date: Met een hulpverleningstraj
 "Having an accompanying period closed before this date": "Met een hulpverleningstraject afgesloten voor deze datum"
 "Filtered by accompanying period: persons having an accompanying period closed between the %date_from% and %date_to%": "Filteren op basis van hulpverleningstraject: met een traject dat afgesloten werd tussen %date_from% en %date_to%"
 
+Filter by person having an activity in a period: Personen filteren die een uitwisseling hadden in de opgegeven periode
+Filtered by person having an activity between %date_from% and %date_to% with reasons %reasons_name%: Enkel personen gelinkt aan een uitwisseling tussen %date_from% en %date_to% met de onderwerpen %reasons_name%
+
+Filter by social issue: Trajecten filteren op hulpvragen
+Accepted socialissues: Hulpvragen
+"Filtered by socialissues: only %socialissues%": "Gefilterd op hulpvraag: enkel %socialissues%"
+Group by social issue: Trajecten groeperen op hulpvraag
+
+Accepted steps: Statussen
+Step: Status
+"Filtered by steps: only %step%": "Gefilterd op trajectstatus: enkel %step%"
+Group by step: Trajecten groeperen op trajectstatus
+
+Filter by geographical unit: Trajecten filteren op geografische zone
+Group by geographical unit: Trajecten groeperen op geografische zone
+Compute geographical location at date: Datum waarop de geografische locatie wordt berekend
+Geographical unit: Geografische zone
+acp_geog_agg_unitname: Geografische zone
+acp_geog_agg_unitrefid: Sleutel van de geografische zone
+Geographical layer: Geografische laag
+Select a geographical layer: Kies een geografische laag
+Group people by geographical unit based on his address: Personen groeperen op geografische zone (op basis van het adres)
+Filter by person's geographical unit (based on address): Personen filteren op geografische zone (op basis van het adres)
+
+Group by social action: Trajecten groeperen op ondersteuningsmaatregel
+
+Filter by type of action, goals and results: Ondersteuningsmaatregelen filteren op type, doel en resultaat
+'Filtered actions by type, goals and results: %selected%': "Acties gefilterd op: %selected%"
+
+Filter by evaluation: Trajecten filteren op evaluatie
+Accepted evaluations: Evaluaties
+Evaluation: Evaluatie
+"Filtered by evaluations: only %evals%": "Gefilterd op evaluatie: enkel %evals%"
+Group by evaluation: Trajecten groeperen op evaluatie
+
+Filter accompanying course by activity type: Trajecten filteren op type uitwisseling
+Accepted activitytypes: Types uitwisselingen
+"Filtered by activity types: only %activitytypes%": "Gefilterd op uitwisselingstype: enkel %activitytypes%"
+
+Filter by origin: Trajecten filteren op oorsprong
+Accepted origins: Oorsprongen
+"Filtered by origins: only %origins%": "Gefilterd op oorsprong van het traject: enkel %origins%"
+Group by origin: Trajecten groeperen op oorsprong
+
+Filter by closing motive: Trajecten filteren op sluitingsmotief
+Accepted closingmotives: Sluitingsmotieven
+"Filtered by closingmotive: only %closingmotives%": "Gefilterd op sluitingsmotief: enkel %closingmotives%"
+Group by closing motive: Trajecten groeperen op sluitingsmotief
+
+Filter by administrative location: Trajecten filteren op administratieve locatie
+Accepted locations: Administratieve locaties
+Administrative location: Administratieve locatie
+"Filtered by administratives locations: only %locations%": "Gefilterd op administratieve locatie: enkel %locations%"
+Group by administrative location: Trajecten groeperen op administratieve locatie
+
+Filter by requestor: Trajecten filteren volgens de aard van de aanvrager
+Accepted choices: ''
+is person concerned: De aanvrager is een betrokken persoon
+is other person: De aanvrager is een persoon maar niet betrokken
+no requestor: Het traject heeft geen aanvrager
+"Filtered by requestor: only %choice%": "Gefilterd op aanwezigheid van aanvrager onder de betrokken personen: enkel indien %choice%"
+Group by requestor: Trajecten groeperen volgens de aard van de aanvrager
+
+Filter by confidential: Trajecten filteren op vertrouwelijkheid
+Accepted confidentials: ''
+is confidential: het traject is vertrouwelijk
+is not confidential: het traject is niet vertrouwelijk
+"Filtered by confidential: only %confidential%": "Gefilterd op vertrouwelijkheid: enkel indien %confidential%"
+Confidentiality: Vertrouwelijkheid
+Group by confidential: Trajecten groeperen op vertrouwelijkheid
+
+Filter by emergency: Trajecten filteren op urgentie
+Accepted emergency: ''
+is emergency: het traject is dringend
+is not emergency: het traject is niet dringend
+"Filtered by emergency: only %emergency%": "Gefilterd op urgentie: enkel indien %emergency%"
+Emergency: Dringend
+Group by emergency: Trajecten groeperen op urgentie
+
+Filter by intensity: Trajecten filteren op intensiteit
+Accepted intensities: ''
+is occasional: het traject is occasioneel
+is regular: het traject is regelmatig
+"Filtered by intensity: only %intensity%": "Gefilterd op intensiteit: enkel indien %intensity%"
+Intensity: Intensiteit
+Group by intensity: Trajecten groeperen op intensiteit
+
+Filter by active on date: Trajecten filteren die open zijn op een datum
+On date: Open op deze datum
+"Filtered by actives courses: active on %ondate%": "Trajecten gefilterd: actief op %ondate%"
+
+Filter by active at least one day between dates: Trajecten filteren die minstens één dag actief waren in de periode
+"Filtered by actives courses: at least one day between %datefrom% and %dateto%": "Trajecten gefilterd: minstens één dag actief tussen %datefrom% en %dateto%"
+
+Filter by referrers: Trajecten filteren op referent
+Accepted referrers: Referenten
+"Filtered by referrer: only %referrers%": "Gefilterd op referent: enkel %referrers%"
+Group by referrers: Trajecten groeperen op referent
+
+Filter by opened between dates: Trajecten filteren waarvan de openingsdatum tussen twee data ligt
+Date from: Startdatum
+Date to: Einddatum
+"Filtered by opening dates: between %datefrom% and %dateto%": "Trajecten gefilterd op openingsdatum: tussen %datefrom% en %dateto%"
+
+Filter by temporary location: Trajecten filteren met een tijdelijke locatie
+Filter by which has no referrer: Trajecten filteren zonder referent
+"Filtered acp which has no referrer on date: %date%": "Gefilterd: trajecten zonder referent op datum %date%"
+Has no referrer on this date: Heeft geen referent op deze datum
+Filter by which has no action: Trajecten filteren zonder acties
+Filtered acp which has no actions: "Gefilterd: enkel trajecten zonder acties"
+Group by number of actions: Trajecten groeperen op aantal acties
+Filter by creator: Trajecten filteren op aanmaker
+'Filtered by creator: only %creators%': 'Gefilterd op aanmaker: enkel %creators%'
+
+Filter actions without end date: Acties filteren zonder einddatum (open)
+Filtered actions without end date: "Gefilterd: enkel acties zonder einddatum (open)"
+Filter by start date evaluations: Evaluaties filteren op startdatum
+Filter by end date evaluations: Evaluaties filteren op einddatum
+start period date: Startdatum van de periode
+end period date: Einddatum van de periode
+"Filtered by start date: between %start_date% and %end_date%": "Gefilterd op startdatum: tussen %start_date% en %end_date%"
+"Filtered by end date: between %start_date% and %end_date%": "Gefilterd op einddatum: tussen %start_date% en %end_date%"
+Filter by current evaluations: Evaluaties filteren die lopen
+"Filtered by current evaluations": "Gefilterd: enkel lopende evaluaties"
+
+'Filtered by geographic unit: computed at %date%, only in %units%': 'Gefilterd op geografische eenheid: adres op %date%, enkel eenheden %units%'
+
+Filter by scope: Filteren op dienst
+
+Group social work actions by action type: Ondersteuningsmaatregelen groeperen op type
+Group social work actions by goal: Ondersteuningsmaatregelen groeperen op doel
+Group social work actions by result: Ondersteuningsmaatregelen groeperen op resultaat
+Group social work actions by goal and result: Ondersteuningsmaatregelen groeperen op doel en resultaat
+Goal Type: Doel
+Result Type: Resultaat
+Goal and result Type: Doel en resultaat
+
+Filter by evaluation type: Evaluaties filteren op type
+Accepted evaluationtype: Evaluaties
+"Filtered by evaluation type: only %evals%": "Gefilterd op evaluatietype: enkel %evals%"
+Group by evaluation type: Evaluaties groeperen op type
+Evaluation type: Evaluatietype
+
+Filter evaluations by maxdate mention: Evaluaties filteren met een vervaldatum
+Maxdate: ''
+maxdate is specified: de vervaldatum is opgegeven
+maxdate is not specified: de vervaldatum is niet opgegeven
+"Filtered by maxdate: only %choice%": "Gefilterd op vervaldatum: enkel indien %choice%"
+
+Filter by composition: Huishoudens filteren op gezins­samenstelling
+Accepted composition: Gezins­samenstelling
+"Filtered by composition: only %compositions% on %ondate%": "Gefilterd op gezins­samenstelling: enkel %compositions%, op datum %ondate%"
+Group by composition: Huishoudens groeperen op gezins­samenstelling
+
+Group by number of children: Huishoudens groeperen op aantal kinderen
+
 ## aggregators
+Group by duration: Trajecten groeperen op duur
+Rounded month duration: Duur in maanden (afgerond)
+current duration: lopend
+duration 0 month: 0 maanden (<15 dagen)
+' months': ' maanden'
 Group people by nationality: Personen groeperen per nationaliteit
 Group by level: Groeperen per niveau
 Group by continents: Groeperen per continent
@@ -359,13 +645,28 @@ Group by country: Groeperen per land
 
 Group people by gender: Groeperen op basis van gender
 
-Aggregate by age: Groeperen op basis van
-Calculate age in relation to this date: Leeftijd bereken relatief tot deze datum
+Group people by their professional situation: Personen groeperen op beroepssituatie
+Group people by marital status: Personen groeperen op burgerlijke staat
+Group people by administrative status: Personen groeperen op administratieve situatie
+Group people by employment status: Personen groeperen op beroepssituatie
+
+Aggregate by household position: Personen groeperen op positie in het huishouden
+Household position in relation to this date: Positie in het huishouden op deze datum
+Household position: Positie in het huishouden
+
+Aggregate by age: Personen groeperen op leeftijd
+Calculate age in relation to this date: Leeftijd berekenen ten opzichte van deze datum
 
 Group people by country of birth: Personen groeperen op bais van geboorteland
 Similar persons: Gelijkaardige personen
 
 crud:
+    administrative_status:
+        index:
+            title: Administratieve situaties
+            add_new: Een nieuwe toevoegen
+        title_new: Nieuwe administratieve situatie toevoegen
+        title_edit: Deze administratieve situatie bijwerken
     closing_motive:
         index:
             title: Overzicht redenen tot afsluiten
@@ -403,6 +704,122 @@ crud:
             add_new: Nieuw resultaat hulpverleningsmaatregel toevoegen
         title_new: Nieuw resultaat
         title_edit: Resultaat bijwerken
+    employment_status:
+        index:
+            title: Beroepssituaties
+            add_new: Een nieuwe toevoegen
+        title_new: Nieuwe beroepssituatie toevoegen
+        title_edit: Deze beroepssituatie bijwerken
+    origin:
+        index:
+            title: Overzicht herkomst van trajecten
+            add_new: Een nieuwe toevoegen
+        title_new: Nieuwe oorsprong
+        title_edit: Oorsprong bijwerken
+    person_marital-status:
+        index:
+            title: Overzicht burgerlijke staten
+            add_new: Een nieuwe toevoegen
+        title_new: Nieuwe burgerlijke staat
+        title_edit: Burgerlijke staat bijwerken
+    person_resource-kind:
+        index:
+            title: Types steunfiguren
+            add_new: Een nieuw type toevoegen
+        title_new: Nieuw type steunfiguur
+        title_edit: Type steunfiguur bijwerken
+    person_household_position:
+        index:
+            title: Posities
+            add_new: Een nieuwe toevoegen
+        title_new: Nieuwe positie
+        title_edit: Positie bijwerken
+    person_household_composition_type:
+        index:
+            title: Gezins­samenstellingen
+            add_new: Een nieuwe toevoegen
+        title_new: Nieuwe gezins­samenstelling
+        title_edit: Gezins­samenstelling bijwerken
+    person_relation:
+        index:
+            title: Verwantschapsrelaties
+            add_new: Een nieuwe toevoegen
+        title_new: Nieuwe verwantschapsrelatie
+        title_edit: Verwantschapsrelatie bijwerken
+    social_evaluation:
+        index:
+            title: Overzicht evaluaties
+            add_new: Een nieuwe evaluatie toevoegen
+        title_new: Nieuwe evaluatie
+        title_edit: Evaluatie bijwerken
+
+origin:
+    noActiveAfter: gedeactiveerd na
+
+evaluation:
+    deleted: Evaluatie verwijderd
+    delay: Vertraging
+    notificationDelay: Notificatietermijn
+    url: Internetlink
+    title: Een evaluatie schrijven
+    status: Status
+    choose_a_status: Kies een status
+    startdate: Startdatum
+    enddate: Einddatum
+    maxdate: Vervaldatum
+    warning_interval: Herinnering (dagen)
+    public_comment: Publieke nota
+    comment_placeholder: Begin te schrijven ...
+    generate_a_document: Een document genereren
+    choose_a_template: Kies een sjabloon
+    add_a_document: Een document toevoegen
+    add: Een evaluatie toevoegen
+    time_spent: Schrijftijd
+    select_time_spent: Geef de schrijftijd aan
+    Documents: Documenten
+    document_add: Een document genereren of uploaden
+    document_upload: Een document uploaden
+    document_title: Titel van het document
+    template_title: Naam van het sjabloon
+    browse: Een document toevoegen
+    replace: Vervangen
+    download: Het bestaande bestand downloaden
+    notification_notify_referrer: De referent verwittigen
+    notification_notify_any: Andere gebruikers verwittigen
+    notification_send: Een notificatie verzenden
+    document:
+        edit: Bijwerken
+        delete: Verwijderen
+        move: Verplaatsen
+        duplicate: Dupliceren
+        duplicate_here: Hier dupliceren
+        duplicate_to_other_evaluation: Dupliceren naar een andere evaluatie
+        duplicate_success: Het evaluatiedocument werd gedupliceerd
+        move_success: Het evaluatiedocument werd verplaatst
+
+goal:
+    desactivationDate: Deactiveringsdatum
+    results: Resultaten
+
+socialAction:
+    defaultNotificationDelay: Standaard notificatietermijn
+    socialIssue: Hulpvraag
+
+socialIssue:
+    isParent?: Ouder?
+    Parent id: ID van de ouder
+
+household_id: Identificatie van het huishouden
+household:
+    allowHolder: Kan titularis zijn
+    shareHousehold: Lid van het huishouden
+
+relation:
+    title: Eerste lid
+    reverseTitle: Tweede lid
+
+days: dagen
+years: jaren
 
 
 # specific to closing motive
@@ -410,31 +827,40 @@ closing_motive:
     any parent: Geen ouder
     new child: Nieuw kind
 
+Person configuration: Configuratie module "Persoon"
 Configuration of person bundle: Configuratie module "Persoon"
 person_admin:
+    accompanying_period: Hulpverleningstrajecten
     What would you like to configure ?: Wat wil u graag configureren ?
     closing motives: Redenen tot afsluiten
     closing motives list: Overzicht redenen tot afsluiten
     closing motive explanation: >
         De redenen tot afsluiten geven een indicatie over waarom een hulpverleningstraject werd afgesloten.
+    origin: Oorsprongen
     marital status: Burgerlijke staat
     marital status list: Overzicht burgerlijke staat
     marital status explanation: >
         Configureer lijst voor het aanduiden van de burgerlijke staat
+    person_resource_kind: Type steunfiguur
     social_issue: Hulpverleningsvragen
     social_action: Hulpverleningsmaatregelen
     social_goal: Doelen
     social_result: Resultaten
     social_evaluation: Evaluaties
+    social_work: Sociale begeleiding
+    relation: Verwantschapsrelaties
 
 # specific to accompanying period
 accompanying_period:
+    deleted: Hulpverleningstraject verwijderd
     dates: Periode
     dates_from_%opening_date%: Actief sinds %opening_date%
     dates_from_%opening_date%_to_%closing_date%: Actief van %opening_date% tot %closing_date%
     DRAFT: Ontwerp
     CONFIRMED: Bevestigd
     CLOSED: Afgesloten
+    CONFIRMED_INACTIVE_SHORT: Buiten actieve lijst
+    CONFIRMED_INACTIVE_LONG: Voor-archief
     emergency: Dringend
 occasional: éénmalig
 regular: regelmatig
@@ -464,12 +890,21 @@ fix it: Aanvullen
 accompanying_course:
     administrative_location: Administratieve locatie
     comment is pinned: Deze opmerking is gepinned
+    comment is unpinned: De opmerking is losgemaakt
+
+show: Tonen
+hide: Verbergen
+closed periods: afgesloten trajecten
+Accompanying course configuration: Beheer van hulpverleningstrajecten
+Social work configuration: Beheer van ondersteuningsmaatregelen
 
 # Accompanying Course comments
 Accompanying Course Comment: Opmerking
+Accompanying Course Comments: Opmerkingen
 Accompanying Course Comment list: Opmerkingen hulpverleningstraject
 pinned: pinnen
 Pin comment: Pinnen
+Unpin comment: Ontpinnen
 Post a new comment: Een nieuwe opmerking posten
 Write a new comment: Een nieuwe opmerking schrijven
 Edit a comment: Opmerking bijwerken
@@ -497,6 +932,9 @@ Concerns household n°%id%: Betrokken huishouden n°%id%
 Composition: huishoudenssamenstelling
 Budget: Budget
 The composition has been successfully removed.: De huishoudenssamenstelling werd verwijdert.
+edit address valid from: Datum van de verhuis aanpassen
+Edit household address valid from: Datum van de verhuis van het huishouden aanpassen
+Household configuration: Beheer van huishoudens
 
 # accompanying course work
 Accompanying Course Actions: Hulpverleningsmaatregelen
@@ -504,9 +942,11 @@ Accompanying Course Action: Hulpverleningsmaatregel
 Are you sure you want to remove this work of the accompanying period %name% ?: Bent u zeker de hulpverleningsmaatregel voor het traject %name% te willen verwijderen?
 The accompanying period work has been successfully removed.: De hulpverleningsmaatregel werd verwijdert
 accompanying_course_work:
+    deleted: Hulpverleningsmaatregel verwijderd
     create: Voeg een hulpverleningsmaatregel toe
     Create accompanying course work: Voeg een hulpverleningsmaatregel toe
     Edit accompanying course work: Hulpverleningsmaatregel bijwerken
+    Show accompanying course work: Hulpverleningsmaatregel
     List accompanying course work: Overzicht hulpverleningsmaatregelen
     action: Hulpverleningsmaatregel
     create_date: Aanmaakdatum
@@ -523,6 +963,13 @@ accompanying_course_work:
     Any work: Geen enkele hulpverleningsmaatregel
     remove: Hulpverleningsmaatregel verwijderen
     social_evaluation: Evaluatie
+    private_comment: Privéopmerking
+    timeSpent: Schrijftijd
+    date_filter: Filteren op datum
+    types_filter: Filteren op actietype
+    user_filter: Filteren op intervenant
+    On-going works over total: Lopende acties / totaal acties van het traject
+    my_actions_filter: Mijn acties (waar ik optreed)
 
 #
 Person addresses: Verblijfsadres
@@ -546,6 +993,8 @@ docgen:
     A context for accompanying period work evaluation: Context voor de evaluatie van de hulpverleningsmaatregel
     Person basic: Persoon (basis)
     A basic context for person: Context voor de personen
+    Label for third party: Label dat aan gebruikers wordt getoond
+    Document title: Titel van het gegenereerde document
 
 period_notification:
     period_designated_subject: U bent de doorverwijzer voor dit huplverleningstraject
@@ -570,6 +1019,8 @@ household_composition:
     Add a composition: Een huishoudenssamenstelling toevoegen
     Update composition: huishoudenssamenstelling bijwerken
     Create: Een nieuwe huishoudenssamenstelling toewijzen
+    numberOfDependents: Aantal personen ten laste
+    numberOfDependentsWithDisabilities: Aantal personen met een erkende handicap ten laste
 
 # docgen
 Linked evaluations: Gerelateerde evaluaties
@@ -577,8 +1028,544 @@ Linked evaluations: Gerelateerde evaluaties
 # Accompanying period per user
 My accompanying periods: Mijn hulpverleningstrajecten
 My accompanying periods in draft: Mijn hulpverleningstrajecten in ontwerp
+Display draft periods created by me: Toon de trajecten in ontwerp die ik heb gemaakt. Ze zijn enkel zichtbaar voor mij en worden 15 dagen na aanmaak automatisch verwijderd.
+Number of periods: Aantal trajecten
 
 period_by_user_list:
     Period by user: Hulpverleningstrajecten per gebruiker
     Pick a user: Selecteer een gebruiker om zijn/haar hulpverleningstrajecten te zien
     Any course or no authorization to see them: Deze gebruiker heeft geen hulpverleningstrajecten of geen waartoe u toegang heeft.
+
+workflow:
+    doc for evaluation deleted: Document verwijderd in een evaluatie
+    SocialAction deleted: Ondersteuningsmaatregel verwijderd
+    signature_list:
+        title: Handtekening in afwachting
+        menu: Handtekening in afwachting
+        no_signatures: Geen aangevraagde handtekeningen
+
+reassign:
+    Bulk reassign: Trajecten herverdelen
+    Current user: Trajecten per referent
+    Next user: Nieuwe referent
+    Choose a user and click on "Filter" to apply: Kies een gebruiker en klik op "Filteren" om de trajecten te tonen
+    All periods on this list will be reassigned to this user, excepted the one you manually reassigned before: Alle trajecten op deze pagina worden aan deze gebruiker toegewezen, behalve die u manueel anders toewijst.
+    Reassign: Referent toewijzen
+    List periods to be able to reassign them: Kies een gebruiker en klik op "Filteren" om zijn/haar trajecten te tonen. Daarna kunt u ze herverdelen.
+    Filter by postal code: Filteren op postcode
+    Filter course which are located inside a postal code: Alleen trajecten tonen die bij deze postcode gelokaliseerd zijn (een gemeente kan meerdere postcodes hebben).
+
+notification:
+    Notify referrer: Referent verwittigen
+    Notify any: Andere gebruikers verwittigen
+
+personId: Identificatie van de persoon
+
+export:
+    enum:
+        frequency:
+            YYYY-IW: per week
+            YYYY-MM: per maand
+            YYYY: per jaar
+    export:
+        acp_closing:
+            title: Aantal statuswijzigingen van trajecten
+            description: Telt het aantal statuswijzigingen van trajecten. Deze export is geschikt om het aantal trajecten te kennen die binnen een periode geopend of gesloten werden (een traject kan binnen de periode gesloten en opnieuw geopend worden).
+        acp_stats:
+            avg_duration: Gemiddelde duur van deelname van elke betrokken persoon
+            count_participations: Aantal afzonderlijke deelnames
+            count_persons: Aantal verschillende betrokken personen
+            count_acps: Aantal verschillende trajecten
+
+        nb_household_with_course:
+            Count households with accompanying course: Aantal huishoudens betrokken bij een traject
+            Count households: Aantal huishoudens
+            Count accompanying periods: Aantal trajecten
+            Count household with accompanying course by various parameters.: Telt het aantal huishoudens met een traject volgens diverse filters.
+            Date of calculation of household members: Datum waarop de leden van het huishouden worden berekend
+
+        count_accompanying_period_work_associate_person:
+            title: Aantal acties, filters en groeperingen op de personen van het traject
+            description: Telt het aantal ondersteuningsmaatregelen met filters en groeperingen op personen, trajecten en acties. De filters en groeperingen op personen werken op de betrokken personen van het traject van de actie.
+            header: Aantal acties
+
+        count_accompanying_period_work_associate_work:
+            title: Aantal acties, filters en groeperingen op de personen van de actie
+            description: Telt het aantal ondersteuningsmaatregelen met filters en groeperingen op personen, trajecten en acties. De filters en groeperingen op personen werken op de betrokken personen van de actie.
+            header: Aantal acties
+        count_person_on_acpw_associate_person_on_work:
+            title: Aantal personen betrokken bij een ondersteuningsmaatregel, filters en groeperingen op de personen van de actie
+            description: Telt het aantal personen betrokken bij een ondersteuningsmaatregel met filters en groeperingen op personen, trajecten en acties. De filters en groeperingen op personen werken op de betrokken personen van de actie. Als iemand bij meerdere acties betrokken is, wordt hij slechts eenmaal geteld.
+            header: Aantal personen betrokken bij een actie
+
+        avg_duration_acpw_associate_on_period:
+            title: Gemiddelde duur van ondersteuningsmaatregelen, filters en groeperingen op de personen van het traject
+            header: Gemiddelde duur van ondersteuningsmaatregelen (in dagen)
+            description: Berekent de gemiddelde duur van ondersteuningsmaatregelen met filters en groeperingen op personen, trajecten en acties. De filters en groeperingen werken op de betrokken personen van het traject van de actie.
+
+        avg_duration_acpw_associate_on_work:
+            title: Gemiddelde duur van ondersteuningsmaatregelen, filters en groeperingen op de personen van de actie
+            header: Gemiddelde duur van ondersteuningsmaatregelen (in dagen)
+            description: Berekent de gemiddelde duur van ondersteuningsmaatregelen met filters en groeperingen op personen, trajecten en acties. De filters en groeperingen werken op de betrokken personen van de actie.
+
+    aggregator:
+        person:
+            by_household_composition:
+                Household composition: Huishoudsamenstelling
+                Group course by household composition: Trajecten groeperen op huishoudsamenstelling
+                Calc date: Datum voor berekening van de huishoudsamenstelling
+            by_center:
+                title: Personen groeperen op territorium
+                at_date: Datum voor berekening van het territorium
+                center: Territorium van de persoon
+            by_postal_code:
+                title: Personen groeperen op postcode van het adres
+                at_date: Datum voor berekening van het adres
+                header: Postcode
+
+        step_history:
+            by_step:
+                title: Statuswijzigingen van traject groeperen per stap
+                header: Nieuwe trajectstatus
+            by_date:
+                title: Statuswijzigingen van traject groeperen per datum
+                header: Datum van statuswijziging van traject
+                date_grouping_label: Groeperen per
+            by_closing_motive:
+                title: Statuswijzigingen van traject groeperen per sluitingsmotief
+                header: Sluitingsmotief
+
+        course:
+            by-user:
+                title: Trajecten groeperen per betrokken persoon
+                header: Betrokken persoon
+            by_referrer:
+                Referrer after: Referent vanaf
+                Until: Tot
+            by_referrer_scope:
+                Referrer and scope after: Referent en dienst vanaf
+                Until: Tot
+            by_referrer_job:
+                Referrer and job after: Referent en beroep vanaf
+                Until: Tot
+            by_user_scope:
+                Group course by referrer's scope: Trajecten groeperen per dienst van de referent
+                Referrer's scope: Dienst van de trajectreferent
+            by_user_job:
+                Group by user job: Trajecten groeperen per beroep van de referent
+            duration:
+                day: Duur van het traject in dagen
+                week: Duur van het traject in weken
+                month: Duur van het traject in maanden
+                Precision: Eenheid van de duur
+            by_number_of_action:
+                Number of actions: Aantal acties
+            by_creator_job:
+                Creator's job: Beroep van de aanmaker
+                Group by creator job: Trajecten groeperen per beroep van de aanmaker
+            by_user_working:
+                title: Trajecten groeperen per intervenant
+                user: Intervenant
+            by_job_working:
+                title: Trajecten groeperen per beroep van de intervenant
+                job: Beroep van de intervenant
+                Calc date: Datum voor berekening van het beroep van de intervenant
+            by_scope_working:
+                title: Trajecten groeperen per dienst van de intervenant
+                scope: Dienst van de intervenant
+                Calc date: Datum voor berekening van de dienst van de intervenant
+            by_scope:
+                Group course by scope: Trajecten groeperen per dienst
+            by_opening_date:
+                title: Trajecten groeperen per openingsdatum
+                frequency: Groeperingsinterval
+                header: Openingsdatum van trajecten (periode)
+            by_closing_date:
+                title: Trajecten groeperen per sluitingsdatum
+                frequency: Groeperingsinterval
+                header: Sluitingsdatum van trajecten (periode)
+
+        course_work:
+            by_treating_agent:
+                Calc date: Referent op datum
+                Group by treating agent: Acties groeperen per behandelend medewerker
+            by_current_action:
+                Current action ?: Lopende actie?
+                Group by current actions: Acties groeperen op lopend
+                Current action: Lopende actie
+                Not current action: Afgeronde actie
+            by_agent_scope:
+                Group by treating agent scope: Acties groeperen per dienst van de behandelaar
+                Calc date: Datum voor berekening van de dienst van de behandelaar
+            by_agent_job:
+                Group by treating agent job: Acties groeperen per beroep van de behandelaar
+                Calc date: Datum voor berekening van het beroep van de behandelaar
+            by_handling_third_party:
+                title: Acties groeperen per behandelende derde
+                header: Behandelende derde
+            by_creator:
+                title: Acties groeperen per aanmaker
+                Creator: Aanmaker van de actie
+            by_creator_job:
+                title: Acties groeperen per beroep van de aanmaker
+                Creator's job: Beroep van de aanmaker
+            by_creator_scope:
+                title: Acties groeperen per dienst van de aanmaker
+                Creator's scope: Dienst van de aanmaker
+
+        eval:
+            by_end_date:
+                Has end date ?: Evaluatie in uitvoering?
+                Group evaluations having end date: Evaluaties groeperen (met of zonder einddatum)
+                enddate is specified: de einddatum is opgegeven
+                enddate is not specified: de einddatum is niet opgegeven
+                Group by end date evaluations: Evaluaties groeperen per week/maand/jaar van de einddatum
+                End date period: Einde (per periode)
+            by_start_date_period:
+                Start date period: Begin (per periode)
+                Group by start date evaluations: Evaluaties groeperen per week/maand/jaar van de startdatum
+            by_max_date:
+                Group by max date evaluations: Evaluaties groeperen per week/maand/jaar van de vervaldatum
+                Max date: Vervaldatum
+    filter:
+        by_geog_unit:
+            Filtered by person's geographical unit (based on address) computed at %datecalc%, only %units%: Gefilterd op geografische eenheid (op basis van adres), berekend op %datecalc%, enkel %units%
+
+        step_history:
+            by_step:
+                title: Statuswijzigingen van traject filteren per stap
+                pick_steps: Nieuwe stappen
+                description: "Gefilterd op stap: enkel %steps%"
+            by_date:
+                title: Statuswijzigingen van traject filteren per datum
+                start_date_label: Wijzigingen na
+                end_date_label: Wijzigingen voor
+
+        person:
+            by_composition:
+                Filter by household composition: Personen filteren op huishoudsamenstelling
+                Accepted compositions: Huishoudsamenstellingen
+                Date calc: Berekeningsdatum
+                'Filtered by composition at %date%: only %compositions%': 'Gefilterd op huishoudsamenstelling, op %date%, enkel %compositions%'
+            by_no_composition:
+                Filter persons without household composition: Personen filteren zonder huishoudsamenstelling (noch huishouden)
+                Persons filtered by no composition at %date%: Enkel personen zonder huishoudsamenstelling op %date%
+                Date calc: Berekeningsdatum
+            by_address_ref_status:
+                Filter by person's address ref status: Personen filteren via vergelijking met referentieadres
+                to_review: Verschilt van referentieadres
+                reviewed: Verschilt van referentieadres maar behouden door gebruiker
+                match: Identiek aan het referentieadres
+                "Filtered by person\\'s address status computed at %datecalc%, only %statuses%": Gefilterd op vergelijking met referentieadres, berekend op %datecalc%, enkel %statuses%
+                Filtered by person's address status computed at %datecalc%, only %statuses%: Gefilterd op vergelijking met referentieadres, berekend op %datecalc%, enkel %statuses%
+                Status: Status
+                Address at date: Adres op datum
+            with_participation_between_dates:
+                date_after: Betrokken bij een traject na
+                date_before: Betrokken bij een traject voor
+                title: Personen filteren die minstens één dag aan een traject verbonden waren in de opgegeven periode
+                'Filtered by participations during period: between %dateafter% and %datebefore%': 'Gefilterd op personen met een traject tussen %dateafter% en %datebefore%'
+            without_participation_between_dates:
+                date_after: Na
+                date_before: Voor
+                title: Personen filteren die aan geen enkel traject gekoppeld waren
+            gender:
+                no_gender: gender niet gespecificeerd
+
+        course:
+            not_having_address_reference:
+                title: Trajecten filteren zonder locatie op een referentieadres
+                adress_at: Adres op datum
+            having_info_within_interval:
+                title: Trajecten filteren die tussen twee data een interventie kregen
+                start_date: Begin van de periode
+                end_date: Einde van de periode
+                Only course with events between %startDate% and %endDate%: Alleen trajecten met een interventie tussen %startDate% en %endDate%
+            by_user_working:
+                title: Trajecten filteren per intervenant, tussen twee data
+                'Filtered by user working on course: only %users%, between %start_date% and %end_date%': 'Gefilterd op intervenanten van het traject: enkel %users%, tussen %start_date% en %end_date%'
+                User working after: Interventie na
+                User working before: Interventie voor
+            by_job_working:
+                title: Trajecten filteren per beroep van de intervenant, tussen twee data
+                'Filtered by job working on course: only %jobs%, between %start_date% and %end_date%': 'Gefilterd op beroep van intervenanten op het traject: enkel %jobs%, tussen %start_date% en %end_date%'
+                Job working after: Interventie na
+                Job working before: Interventie voor
+                Calc date: Berekeningsdatum
+            by_scope_working:
+                title: Trajecten filteren per dienst van de intervenant, tussen twee data
+                'Filtered by scope working on course: only %scopes%, between %start_date% and %end_date%': 'Gefilterd op dienst van intervenanten op het traject: enkel %scopes%, tussen %start_date% en %end_date%'
+                Scope working after: Interventie na
+                Scope working before: Interventie voor
+                Calc date: Berekeningsdatum
+            by_step:
+                Filter by step: Trajecten filteren op trajectstatus
+                Filter by step between dates: Trajecten filteren op trajectstatus tussen twee data
+                steps: Geselecteerde statussen
+                date_calc: Datum waarop de status geldt
+                date_from: Status behaald na deze datum
+                date_to: Status behaald voor deze datum
+                'Filtered by steps: only %step% and between %date_from% and %date_to%': 'Gefilterd op status: enkel %step%, tussen %date_from% en %date_to%'
+            by_user_scope:
+                Filter by user scope: Trajecten filteren op dienst van de referent
+                Start from: Referent en dienst vanaf
+                Until: Tot
+            by_referrer:
+                Computation date for referrer: Datum waarop de referent actief was
+            by_referrer_between_dates:
+                title: Trajecten filteren op referent (tussen twee data)
+                start date: De referent was actief na
+                end date: De referent was actief voor
+            having_temporarily:
+                label: Kwaliteit van de locatie
+                Having a temporarily location: Met een tijdelijke locatie
+                Having a person's location: Gelokaliseerd bij een persoon
+                Calculation date: Datum van de locatie
+            creator_job:
+                Filter by creator job: Trajecten filteren op beroep van de aanmaker
+                'Filtered by creator job: only %jobs%': 'Gefilterd op beroep van de aanmaker: enkel %jobs%'
+            by_user_job:
+                Filter by user job: Trajecten filteren op beroep van de referent
+                Start from: Referent en beroep vanaf
+                Until: Tot
+            by_social_action:
+                title: Trajecten filteren op ondersteuningsmaatregel
+                Accepted socialactions: Ondersteuningsmaatregelen
+                accepted socialations help: Indien leeg, worden alle actietypes meegenomen
+                "Filtered by socialactions: only %socialactions%": "Gefilterd op ondersteuningsmaatregel: enkel %socialactions%, startdatum na %start_date_after% en voor %start_date_before%, einddatum na %end_date_after% en voor %end_date_before%"
+                start date after: Startdatum van de actie na
+                start date after help: Wordt genegeerd indien leeg
+                start date before: Startdatum van de actie voor
+                start date before help: Wordt genegeerd indien leeg
+                end date after: Einddatum van de actie na
+                end date after help: Wordt genegeerd indien leeg. Acties zonder einddatum worden altijd meegenomen.
+                end date before: Einddatum van de actie voor
+                end date before help: Wordt genegeerd indien leeg. Acties zonder einddatum worden altijd meegenomen.
+                date ignored: datumclausule genegeerd
+
+        work:
+            start_between_dates:
+                title: Acties filteren waarvan de startdatum tussen twee data ligt
+                start_date: Startdatum
+                end_date: Einddatum
+                keep_null: Acties zonder startdatum behouden
+                keep_null_help: Indien aangevinkt worden acties zonder startdatum meegeteld. Indien niet, worden ze niet meegeteld.
+                Only where start date is between %startDate% and %endDate%: Enkel acties waarvan de startdatum tussen %startDate% en %endDate% ligt
+            end_between_dates:
+                title: Acties filteren waarvan de einddatum tussen twee data ligt (of actie nog loopt)
+                start_date: Startdatum
+                end_date: Einddatum
+                keep_null: Acties zonder einddatum behouden (lopende acties)
+                keep_null_help: Indien aangevinkt worden acties zonder einddatum meegeteld. Indien niet, worden ze niet meegeteld.
+                Only where start date is between %startDate% and %endDate%: Enkel acties waarvan de einddatum tussen %startDate% en %endDate% ligt
+            by_user_job:
+                Filter by treating agent job: Acties filteren op beroep van de behandelaar
+                "Filtered by treating agent job: only %jobs%": "Gefilterd op beroep van de behandelaar: enkel %jobs%"
+                Calc date: Datum voor berekening van het beroep van de behandelaar
+            by_user_scope:
+                Filter by treating agent scope: Acties filteren op dienst van de behandelaar
+                "Filtered by treating agent scope: only %scopes%": "Gefilterd op dienst van de behandelaar: enkel %scopes%"
+                Calc date: Datum voor berekening van de dienst van de behandelaar
+            by_treating_agent:
+                Filter by treating agent: Acties filteren op behandelend medewerker
+                Accepted agents: Behandelend medewerker
+                Calc date: Datum waarop de medewerker als behandelaar actief is
+                calc_date_help: Dit is de datum waarop de medewerker actief is als behandelaar, niet de datum van de toewijzing.
+                "Filtered by treating agent: only %agents%": "Gefilterd op behandelend medewerker: enkel %agents%"
+            by_handling3party:
+                title: Acties filteren op behandelende derde
+                Only 3 parties %3parties%: "Alleen acties met als behandelende derde: %3parties%"
+                pick_3parties: Behandelende derden van de acties
+            by_creator:
+                title: Acties filteren op aanmaker
+                Creators: Aanmaker van de actie
+                "Filtered by creator: only %creators%": "Gefilterd op aanmaker van de actie: enkel %creators%"
+            by_creator_job:
+                title: Acties filteren op beroep van de aanmaker
+                "Filtered by creator job: only %jobs%": "Gefilterd op beroep van de aanmaker: enkel %jobs%"
+            by_creator_scope:
+                title: Acties filteren op dienst van de aanmaker
+                "Filtered by creator scope: only %scopes%": "Gefilterd op dienst van de aanmaker: enkel %scopes%"
+            evaluation_between_dates:
+                title: Acties filteren die gekoppeld zijn aan een evaluatie tussen twee data
+                description: Enkel acties gekoppeld aan een evaluatie aangemaakt tussen %startDate% en %endDate%
+                start_date: Startdatum
+                end_date: Einddatum
+
+    list:
+        person_with_acp:
+            List peoples having an accompanying period: Lijst van personen met een hulpverleningstraject
+            List peoples having an accompanying period with period details: Lijst van betrokken personen met details per traject
+            Create a list of people having an accompaying periods, according to various filters.: Maak een lijst van personen met een traject, volgens diverse criteria over traject of persoon
+            Create a list of people having an accompaying periods with details of period, according to various filters.: Maak een lijst van personen met een traject, volgens diverse criteria, met trajectdetails toegevoegd.
+
+        acp:
+            List of accompanying periods: Lijst van hulpverleningstrajecten
+            Generate a list of accompanying periods, filtered on different parameters.: Genereer een lijst van trajecten, gefilterd op verschillende parameters.
+            Date of calculation for associated elements: Datum voor berekening van gekoppelde elementen
+            The associated referree, localisation, and other elements will be valid at this date: De gekoppelde referent, locatie en andere elementen zijn geldig op deze datum
+            acpId: Traject-ID
+            openingDate: Openingsdatum van het traject
+            closingDate: Sluitingsdatum van het traject
+            closingMotive: Sluitingsmotief
+            job: Beroep
+            confidential: Vertrouwelijk
+            emergency: Dringend
+            intensity: Intensiteit
+            acpCreatedAt: Aangemaakt op
+            acpUpdatedAt: Laatste update op
+            acpOrigin: Oorsprong van het traject
+            origin: Oorsprong van het traject
+            acpClosingMotive: Sluitingsmotief
+            acpJob: Beroep van het traject
+            acpCreatedBy_id: Aangemaakt door (ID)
+            acpCreatedBy: Aangemaakt door
+            acpUpdatedBy_id: Laatste wijziging door (ID)
+            acpUpdatedBy: Laatste wijziging door
+            administrativeLocation: Administratieve locatie
+            step: Stap
+            stepSince: Laatste wijziging van de stap
+            referrer: Referent
+            referrerSince: Referent sinds
+            locationIsPerson: Traject gelokaliseerd bij een betrokken persoon
+            locationIsTemp: Traject met tijdelijke locatie of gelokaliseerd bij een persoon
+            locationPersonName: Persoon bij wie het traject gelokaliseerd is
+            locationPersonId: ID van de persoon bij wie het traject gelokaliseerd is
+            acpaddress_fieldscountry: Land van het adres
+            isRequestorPerson: Is de aanvrager een persoon?
+            requestorPersonId: ID van de aanvrager (persoon)
+            acprequestorPerson: Naam van de aanvrager (persoon)
+            scopes: Diensten
+            socialIssues: Hulpvragen
+            requestorPerson: Aanvrager (persoon)
+            requestorThirdParty: Aanvrager (derde)
+            acpParticipantPersons: Betrokken personen
+            acpParticipantPersonsIds: Betrokken personen (ID's)
+            duration: Duur van het traject (in dagen)
+            centers: Territoria van de personen
+
+        eval:
+            List of evaluations: Lijst van evaluaties
+            Generate a list of evaluations, filtered on different parameters: Genereer een lijst van evaluaties, gefilterd op verschillende parameters.
+            Date of calculation for associated elements: Datum voor berekening van gekoppelde elementen
+            help_description: De gekoppelde elementen, zoals referent en adres, worden op deze datum geëvalueerd
+            id: Evaluatie-ID
+            startDate: Startdatum
+            endDate: Einddatum
+            maxDate: Vervaldatum
+            warningInterval: Herinnering
+            acpw_id: Actie-ID
+            acpw_startDate: Start van de actie
+            acpw_endDate: Einde van de actie
+            acpw_socialaction_id: Actie-ID
+            acpw_socialaction: Titel van de actie
+            acpw_socialissue: Hulpvraag
+            acpw_note: Opmerking over de actie
+            acpw_acp_id: Traject-ID
+            acpw_acp_user: Referent van het traject
+            acpw_referrers: Behandelend medewerker op de opgegeven datum
+            acpw_persons_id: ID van de betrokken personen
+            acpw_persons: Betrokken personen van de actie
+            comment: Opmerking bij de evaluatie
+            eval_title: Titel van de evaluatie
+            createdAt: Aanmaakdatum
+            updatedAt: Wijzigingsdatum
+            createdBy: Aangemaakt door
+            updatedBy: Gewijzigd door
+            timeSpent: Schrijftijd (minuten)
+
+        acpw_associate_work:
+            List of accompanying period works: Lijst van acties, filters op de personen van de actie
+            List description: Telt het aantal ondersteuningsmaatregelen met mogelijke filters op personen, trajecten en acties. De filters en groeperingen hebben betrekking op de betrokken personen van de actie.
+
+        acpw_associate_period:
+            List of accompanying period works: Lijst van acties, filters op de personen van het traject
+            List description: Genereer een lijst van ondersteuningsmaatregelen met mogelijke filters op personen, trajecten en acties. De personenfilters werken op de betrokken personen van het traject van de actie.
+
+        acpw:
+            List of accompanying period works: Lijst van acties
+            List description: Genereer een lijst van ondersteuningsmaatregelen, gefilterd op verschillende parameters.
+            Date of calculation for associated elements: Datum voor berekening van gekoppelde elementen
+            help_description: De behandelend medewerker van de actie is geldig op deze datum
+            id: Actie-ID
+            startDate: Startdatum
+            endDate: Einddatum
+            note: Opmerking over de actie
+            createdAt: Aanmaakdatum
+            updatedAt: Wijzigingsdatum
+            socialActionId: Actie-ID
+            socialAction: Titel van de actie
+            socialIssue: Hulpvraag
+            createdBy: Aangemaakt door
+            updatedBy: Gewijzigd door
+            acp_id: Traject-ID
+            acp_user: Referent van het traject
+            acpwReferrers: Behandelende medewerkers
+            referrer: Referent van het traject
+            personsId: ID's van de betrokken personen
+            personsName: Betrokken personen van de actie
+            goalsId: Doel-ID's
+            goalsTitle: Doelen
+            goalResultsId: Resultaat-ID's van doelen
+            goalResultsTitle: Resultaten van doelen
+            resultsId: Resultaat-ID's
+            resultsTitle: Resultaten
+            evaluationsId: Evaluatie-ID's
+            evaluationsTitle: Evaluaties
+
+        household:
+            List household associated with accompanying period title: Lijst van huishoudens betrokken bij een traject
+            List description: Genereer de lijst van huishoudens, gefilterd volgens diverse parameters.
+            Date of calculation for associated elements: Datum voor berekening van gekoppelde elementen
+            help_description: De gekoppelde elementen, zoals adres, leden en samenstelling van het huishouden, zijn geldig op deze datum
+            id: Huishouden-ID
+            address: Adres van het huishouden
+            membersId: ID's van de leden van het huishouden
+            membersName: Leden van het huishouden
+            membersCount: Aantal leden
+            compositionNumberOfChildren: Aantal kinderen in de samenstelling
+            compositionComment: Opmerking over de samenstelling
+            compositionType: Type samenstelling
+
+        acpaddress_fieldscountry: Land
+
+social_action:
+    and children: en afgeleiden
+
+social_issue:
+    and children: en afgeleiden
+
+generic_doc:
+    filter:
+        keys:
+            accompanying_period_work_evaluation_document: Document van ondersteuningsmaatregelen
+
+entity_display_title:
+    Evaluation (n°%eval%): Evaluatie (n°%eval%)
+    Work (n°%w%): Ondersteuningsmaatregel (n°%w%)
+    Accompanying Course (n°%w%): Hulpverleningstraject (n°%w%)
+
+acpw_duplicate:
+    title: Ondersteuningsmaatregelen samenvoegen
+    description: Deze samenvoeging bewaart de oudste startdatum, de meest recente einddatum, alle evaluaties, documenten en workflows. Behandelaars en derde partijen worden samengevoegd. Opmerkingen worden achter elkaar geplaatst.
+    Select accompanying period work: Een ondersteuningsmaatregel selecteren
+    Select an evaluation: Een evaluatie selecteren
+    Assign duplicate: Een dubbele ondersteuningsmaatregel aanduiden
+    Accompanying period work to delete: Ondersteuningsmaatregel te verwijderen
+    Accompanying period work to delete explanation: Deze ondersteuningsmaatregel wordt verwijderd.
+    Accompanying period work to keep: Ondersteuningsmaatregel te behouden
+    to keep: Te behouden ondersteuningsmaatregel
+    to delete: Te verwijderen ondersteuningsmaatregel
+    Successfully merged: Ondersteuningsmaatregel succesvol samengevoegd.
+    You cannot merge a accompanying period work with itself. Please choose a different one: U kunt een ondersteuningsmaatregel niet met zichzelf samenvoegen. Kies een andere.
+
+my_parcours_filters:
+    referrer_parcours_and_acpw: Behandelend medewerker of referent
+    referrer_acpw: Behandelend medewerker van een actie
+    referrer_parcours: Referent
+    parcours_intervening: Intervenant
+    is_open: Open trajecten
+    is_closed: Afgesloten trajecten
+
+document_duplicate:
+    to_evaluation_success: Het document werd gedupliceerd
diff --git a/src/Bundle/ChillPersonBundle/translations/validators.nl.yml b/src/Bundle/ChillPersonBundle/translations/validators.nl.yml
index 014fa0822..2ca6e1549 100644
--- a/src/Bundle/ChillPersonBundle/translations/validators.nl.yml
+++ b/src/Bundle/ChillPersonBundle/translations/validators.nl.yml
@@ -9,4 +9,69 @@
 'Opening date is not valid': 'Startdatum is ongeldig'
 'Opening date can not be null': 'Startdatum  kan niet  nul zijn'
 'Closing date is not valid': 'De datum van afsluiten is niet correct'
-'Closing date can not be null': 'De datum van afsluiten kan niet nul zijn'
\ No newline at end of file
+'Closing date can not be null': 'De datum van afsluiten kan niet nul zijn'
+The date of closing is before the date of opening: De sluitingsdatum ligt voor de openingsdatum
+The closing date must be later than the date of creation: De sluitingsdatum moet later zijn dan de aanmaakdatum van het traject
+The birthdate must be before %date%: De geboortedatum moet voor %date% zijn
+'Invalid phone number: it should begin with the international prefix starting with "+", hold only digits and be smaller than 20 characters. Ex: +33123456789': 'Ongeldig telefoonnummer: het moet beginnen met het internationale voorvoegsel voorafgegaan door "+", alleen cijfers bevatten en minder dan 20 tekens zijn. Bijv.: +31623456789'
+'Invalid phone number: it should begin with the international prefix starting with "+", hold only digits and be smaller than 20 characters. Ex: +33623456789': 'Ongeldig telefoonnummer: het moet beginnen met het internationale voorvoegsel voorafgegaan door "+", alleen cijfers bevatten en minder dan 20 tekens zijn. Bijv.: +33623456789'
+'The email is not valid': 'Het e-mailadres is niet geldig'
+Two addresses has the same validFrom date: De geldigheidsdatum is identiek aan die van een ander adres
+The firstname cannot be empty: De voornaam kan niet leeg zijn
+The lastname cannot be empty: De achternaam kan niet leeg zijn
+The gender must be set: Het geslacht moet worden ingevuld
+You are not allowed to perform this action: U heeft niet het recht om deze waarde te wijzigen.
+Sorry, but someone else has already changed this entity. Please refresh the page and apply the changes again: Sorry, maar iemand anders heeft deze entiteit al gewijzigd. Vernieuw de pagina en pas de wijzigingen opnieuw toe
+
+A center is required: Een territorium is vereist
+
+#export list
+You must select at least one element: U moet ten minste één element selecteren
+
+# filter by person birthdate
+The "date to" should not be empty: Het veld "geboren vóór deze datum" kan niet leeg zijn
+The "date from" should not be empty: Het veld "geboren na deze datum" kan niet leeg zijn
+The date "date to" should be after the date given in "date from" field: De datum "geboren vóór deze datum" moet eerder zijn dan de datum "geboren na deze datum".
+
+# filter by nationality
+A nationality must be selected: Een nationaliteit moet worden gekozen
+
+# aggregator by country, nationality
+You should select an option: Een optie moet worden gekozen.
+
+# aggregator by age
+The date should not be empty: De datum mag niet leeg zijn
+
+# household
+household:
+    max_holder_overflowed_infinity: Er kunnen niet meer dan twee houders tegelijk zijn. Met deze wijziging zal dit aantal vanaf {{ start }} worden overschreden.
+    max_holder_overflowed: Er kunnen niet meer dan twee houders tegelijk zijn. Met deze wijziging zal dit aantal tussen {{ start }} en {{ end }} worden overschreden.
+household_membership:
+    The end date must be after start date: De einddatum van het lidmaatschap moet later zijn dan de begindatum.
+    Person with membership covering: Een gebruiker kan niet tegelijkertijd tot twee huishoudens behoren. Met deze wijziging zou %person_name% vanaf %from% tot %nbHousehold% huishoudens behoren.
+
+# Accompanying period
+'{{ name }} is already associated to this accompanying course.': '{{ name }} is al gekoppeld aan dit traject.'
+A course must contains at least one social issue: 'Een traject moet aan ten minste één sociale problematiek worden gekoppeld'
+A course must be associated to at least one scope: 'Een traject moet aan ten minste één dienst worden gekoppeld'
+The social %name% issue cannot be deleted because it is associated with an activity or an action: 'De sociale problematiek "%name%" kan niet worden verwijderd omdat deze is gekoppeld aan een uitwisseling of een actie'
+A confidential parcours must have a referrer: 'Een vertrouwelijk traject moet een referent hebben'
+Only the referrer can change the confidentiality of a parcours: 'Alleen de referent kan de vertrouwelijkheid wijzigen'
+
+# resource
+You must associate at least one entity: Koppel een gebruiker, een derde of geef een vrije beschrijving op
+You cannot associate a resource with the same person: U kunt de gebruiker zelf niet als hulpbron toevoegen.
+
+#location
+The period must remain located: 'Een traject moet worden gelokaliseerd'
+The person where the course is located must be associated to the course. Change course's location before removing the person.: "Het traject is gelokaliseerd bij deze gebruiker. Wijzig de lokalisatie van het traject voordat u de gebruiker verwijdert"
+
+#relationship
+relationship:
+    duplicate: Er bestaat al een verwantschapsrelatie tussen deze 2 gebruikers
+
+person_creation:
+    If you want to create an household, an address is required: Voor het aanmaken van een huishouden is een adres vereist
+
+accompanying_course_work:
+    The endDate should be greater or equal than the start date: De einddatum moet gelijk zijn aan of later dan de begindatum
diff --git a/src/Bundle/ChillReportBundle/translations/messages.intl-icu.nl.yaml b/src/Bundle/ChillReportBundle/translations/messages.intl-icu.nl.yaml
new file mode 100644
index 000000000..3d7b67836
--- /dev/null
+++ b/src/Bundle/ChillReportBundle/translations/messages.intl-icu.nl.yaml
@@ -0,0 +1,7 @@
+total reports matching the search: >-
+    { total, plural,
+        =0 {Geen enkel rapport voldoet aan de zoekterm(en)}
+        one {Één rapport voldoet aan de zoekterm(en)}
+        many {# rapporten voldoen aan de zoekterm(en)}
+        other {# rapporten voldoen aan de zoekterm(en)}
+    }
diff --git a/src/Bundle/ChillReportBundle/translations/messages.nl.yml b/src/Bundle/ChillReportBundle/translations/messages.nl.yml
index 54bd178ff..77acf83ec 100644
--- a/src/Bundle/ChillReportBundle/translations/messages.nl.yml
+++ b/src/Bundle/ChillReportBundle/translations/messages.nl.yml
@@ -1,31 +1,55 @@
-'Report edit': Dossier uitgave
-'Save report': Bewaar consultatiegegevens
-'Reset report': Verwijder consultatiegegevens
-'Add a report': Voeg een consultatierapport toe
-'Add report': 'Voeg rapport toe'
-'Create a new report': 'Maak een nieuw consultatieblad aan'
-'Report view': "Details van de consultatiegegevens"
-'Update the report': 'Vul dossier aan'
-'Report list': 'Overzicht van de consultaties'
+'Report edit': "Rapport bewerken"
+'Save report': "Rapport opslaan"
+'Reset report': "Resetten"
+'Add a report': "Rapport toevoegen"
+'Add report': 'Rapport toevoegen'
+'Create a new report': 'Nieuw rapport aanmaken'
+'Report view': "Details van een rapport"
+'Update the report': 'Rapport bewerken'
+'Report list': 'Lijst van rapporten'
 Details: Details
-Person: Person
-Scope: Scope
+Person: Gebruiker
+Scope: Dienst
 Date: Datum
 User: Gebruiker
-'Report type': 'Soort of verslag'
-'View the report': "Bekijk de consultatiegegevens"
+'Report type': 'Type rapport'
+'View the report': "Rapport bekijken"
+Report data: Rapportgegevens
+'Report view : %name%': 'Rapport: %name%'
+Report: Rapport
+No report registered for this person.: Geen rapport voor deze gebruiker.
 
 #Flash messages
-'Success : report created!': "De consultatiegegevens zijn correct ingevuld!"
-'The form is not valid. The report has not been created !': "De gegevens zijn niet correct, er wordt geen rapport gemaakt"
-'Success : report updated!': "Update is gelukt"
-'The form is not valid. The report has not been updated !': "Update is mislukt, probeer opnieuw."
+'Success : report created!': "Succes: het rapport is aangemaakt!"
+'The form is not valid. The report has not been created !': "Het formulier bevat fouten, het rapport is niet aangemaakt"
+'Success : report updated!': "Succes: het rapport is bijgewerkt!"
+'The form is not valid. The report has not been updated !': "Het formulier bevat fouten, het rapport is niet bijgewerkt"
 
 #Exception messags
-'Unable to find this report.': Dossier is onvindbaar
-'This is not the report of the person.': "Dit is niet het dossier van deze person"
+'Unable to find this report.': Rapport niet gevonden.
+'This is not the report of the person.': "De persoon en het geselecteerde rapport zijn niet gekoppeld"
 
-'You are going to leave a page with unsubmitted data. Are you sure you want to leave ?': 'U bent aan te vertrekken een pagina die veranderdt datas behoudt. Bent u er zeker van dat u wil vertrekken ?'
+
+#search
+'You may not set a date argument and a date in default': U hebt twee datums ingevoerd, één met het datumargument en de andere in de standaard zoekzone. Geef één van beide op
+'You must provide either a date:YYYY-mm-dd argument or a YYYY-mm-dd default search': Geef ofwel een argument date:YYYY-mm-dd op, ofwel een datum in de standaardzoekopdracht.
+'Reports search results': Zoeken in de rapporten
 
 #timeline
-'%user% has filled a %report_label% report on %date%': "%user% heeft een rapport '%report_label%' toegevoegd om %date%"
+'%user% has filled a %report_label% report': "%user% heeft een rapport '%report_label%' toegevoegd"
+
+#roles
+CHILL_REPORT_UPDATE: Rapporten bewerken
+CHILL_REPORT_SEE: Rapporten bekijken
+CHILL_REPORT_CREATE: Rapporten aanmaken
+CHILL_REPORT_LISTS: Lijst van rapporten
+
+
+#exports
+"List for report '%type%'": Lijst van rapporten "%type%"
+"Generate list of report '%type%'": Genereert een lijst van rapporten "%type%"
+"Report's question": Vraag van het rapport
+Filter by report's date: Filteren op rapportdatum
+Report is after this date: Rapporten na deze datum
+Report is before this date: Rapporten vóór deze datum
+"Filtered by report's date: between %date_from% and %date_to%": "Gefilterd op rapportdatum: tussen %date_from% en %date_to%"
diff --git a/src/Bundle/ChillTaskBundle/translations/messages+intl-icu.nl.yml b/src/Bundle/ChillTaskBundle/translations/messages+intl-icu.nl.yml
new file mode 100644
index 000000000..80fd7e219
--- /dev/null
+++ b/src/Bundle/ChillTaskBundle/translations/messages+intl-icu.nl.yml
@@ -0,0 +1,14 @@
+#widget
+nb tasks over deadline: >-
+    {nb, plural,
+        =0 {Geen taak met overschreden deadline}
+        one {Eén taak met overschreden deadline}
+        other {# taken met overschreden deadline}
+    }
+
+nb tasks near deadline: >-
+    {nb, plural,
+        =0 {Geen taak in herinnering}
+        one {Eén taak in herinnering}
+        other {# taken in herinnering}
+    }
diff --git a/src/Bundle/ChillTaskBundle/translations/messages.nl.yml b/src/Bundle/ChillTaskBundle/translations/messages.nl.yml
new file mode 100644
index 000000000..d90de6f1d
--- /dev/null
+++ b/src/Bundle/ChillTaskBundle/translations/messages.nl.yml
@@ -0,0 +1,117 @@
+Tasks: "Taken"
+"New task": "Nieuwe taak"
+"Add a new task": "Nieuwe taak toevoegen"
+Title: Titel
+Description: Beschrijving
+Assignee: "Toegewezen persoon"
+Scope: Dienst
+"Start date": "Startdatum"
+"End date": "Einddatum"
+"Warning date": "Waarschuwingsdatum"
+"Warning interval": "Waarschuwingstermijn vóór de einddatum"
+"Unknown dates": "Data niet gespecificeerd"
+"N": ""
+"Unit": ""
+Task: Taak
+Details: Details
+Person: Gebruiker
+Date: Datum
+Dates: Data
+User: Gebruiker
+"Task list": "Takenlijst"
+"Tasks with expired deadline": "Taken met een overschreden einddatum"
+"Tasks with warning deadline reached": "Taken met een bereikte waarschuwingsdatum"
+"Current tasks": "Lopende taken"
+"Closed tasks": Afgesloten taken
+"Tasks not started": "Niet-begonnen taken"
+"Task start date": "Startdatum"
+"Task warning date": "Waarschuwingsdatum"
+"Task end date": "Einddatum"
+"Start": "Start"
+"Warning": "Waarschuwing"
+"End": "Einddatum"
+"Task type": "Type"
+"Task status": "Status"
+"Edit the task": "Taak bewerken"
+"Edit task": "Taak bewerken"
+"Save task": "Taak opslaan"
+"View the task": "Taak bekijken"
+"Update the task": "Taak bijwerken"
+"Remove task": "Taak verwijderen"
+"Delete": "Verwijderen"
+"Change task status": "Status wijzigen"
+'Are you sure you want to remove the task about "%name%" ?': 'Weet u zeker dat u de taak van "%name%" wilt verwijderen?'
+'Are you sure you want to remove the task "%title%" ?': 'Weet u zeker dat u de taak "%title%" wilt verwijderen?'
+"See more": "Meer zien"
+"Associated tasks": "Gekoppelde taken"
+"My tasks": "Mijn taken"
+"Tasks for this accompanying period": "Taken voor dit begeleidingstraject"
+"Tasks for {{ name }}": "Taken voor {{ name }}"
+"No description": "Geen beschrijving"
+"No dates specified": "Data niet gespecificeerd"
+"No one assignee": "Geen toegewezen gebruiker"
+"Task types": Taaktypes
+Days: Dag(en)
+Weeks: Week/Weken
+Months: Maand(en)
+Year: Jaar/Jaren
+Filter the tasks: Taken filteren
+Filter: Filteren
+Any user: Alle gebruikers
+Unassigned: Niet toegewezen
+Associated person: Gekoppelde gebruiker
+Default task: Standaardtaak
+Not assigned: Geen toegewezen gebruiker
+For person: Voor
+By: Door
+Any tasks: Geen taak
+Filter by user: Filteren op gebruiker(s)
+
+# transitions - default task definition
+"new": "nieuw"
+"in_progress": "bezig"
+"closed": "gesloten"
+"canceled": "verwijderd"
+start: starten
+close: afsluiten
+cancel: annuleren
+Start_verb: Starten
+Close_verb: Afsluiten
+Set this task to cancel state: Deze taak markeren als geannuleerd
+"%user% has closed the task": "%user% heeft de taak gesloten"
+"%user% has canceled the task": "%user% heeft de taak geannuleerd"
+"%user% has started the task": "%user% heeft de taak gestart"
+"%user% has created the task": "%user% heeft de taak ingevoerd"
+Are you sure you want to close this task ?: Weet u zeker dat u deze taak wilt afsluiten?
+Are you sure you want to cancel this task ?: Weet u zeker dat u deze taak wilt annuleren?
+Are you sure you want to start this task ?: Weet u zeker dat u deze taak wilt starten?
+
+#Flash messages
+"The task is created": "De taak is aangemaakt"
+"There is no tasks.": Geen taak.
+"The task has been successfully removed.": "De taak is succesvol verwijderd"
+"This form contains errors": "Dit formulier bevat fouten"
+"The task has been updated": "De taak is bijgewerkt"
+"The transition is successfully applied": "De transitie is succesvol toegepast"
+"The transition could not be applied": "De transitie kon niet worden toegepast"
+
+Tasks near deadline: Taken met naderende einddatum
+Tasks over deadline: Taken met overschreden einddatum
+Tasks without alert: Taken met toekomstige of zonder einddatum
+
+#title
+My tasks near deadline: Mijn taken met naderende einddatum
+My tasks over deadline: Mijn taken met overschreden einddatum
+
+#transition page
+Apply transition on task <em>%title%</em>: Transitie toepassen op taak <em>%title%</em>
+
+All centers: Alle territoria
+
+# ROLES
+CHILL_TASK_TASK_CREATE: Taak toevoegen
+CHILL_TASK_TASK_DELETE: Taak verwijderen
+CHILL_TASK_TASK_SHOW: Taak bekijken
+CHILL_TASK_TASK_UPDATE: Taak bewerken
+CHILL_TASK_TASK_CREATE_FOR_COURSE: Taak aanmaken voor een traject
+CHILL_TASK_TASK_CREATE_FOR_PERSON: Taak aanmaken voor een gebruiker
diff --git a/src/Bundle/ChillTaskBundle/translations/validators.nl.yml b/src/Bundle/ChillTaskBundle/translations/validators.nl.yml
new file mode 100644
index 000000000..cb2ab7fe5
--- /dev/null
+++ b/src/Bundle/ChillTaskBundle/translations/validators.nl.yml
@@ -0,0 +1,4 @@
+The start date must be before the end date: De startdatum moet voor de einddatum liggen
+This form contains errors: Het formulier bevat fouten
+The start date must be before warning date: De startdatum moet voor de waarschuwingsdatum liggen
+An end date is required if a warning interval is set: Een einddatum is vereist wanneer een herinneringsinterval is ingesteld
diff --git a/src/Bundle/ChillThirdPartyBundle/translations/messages.nl.yml b/src/Bundle/ChillThirdPartyBundle/translations/messages.nl.yml
new file mode 100644
index 000000000..213997522
--- /dev/null
+++ b/src/Bundle/ChillThirdPartyBundle/translations/messages.nl.yml
@@ -0,0 +1,169 @@
+Third party: Externe partner
+Third parties: Externe partners
+third parties: externe partners
+firstname: Voornaam
+name: Naam
+telephone: Telefoon
+telephone2: Ander telefoonnummer
+adress: Adres
+email: E-mail
+comment: Opmerking
+thirdparty.type: type
+thirdparty.Type: Type
+thirdparty.No_phonenumber: Geen telefoonnummer
+thirdparty.No_email: Geen e-mail
+thirdparty.No_comment: Geen opmerking
+
+thirdparty.NameCompany: Dienst/Afdeling
+thirdparty.Acronym: Afkorting
+thirdparty.Categories: Categorieën
+thirdparty.no_categories: Geen categorie
+thirdparty.Child: Contactpersoon
+thirdparty.child: Contactpersoon
+thirdparty.Children: Contactpersonen
+thirdparty.children: Contactpersonen
+thirdparty.Parent: Institutionele externe partner
+thirdparty.Parents: Institutionele externe partners
+thirdparty.Civility: Aanspreekvorm
+thirdparty.choose civility: --
+thirdparty.Profession: Hoedanigheid
+thirdparty.choose profession: --
+thirdparty.CreatedAt.short: 'Aangemaakt op '
+thirdparty.UpdatedAt.short: 'Gewijzigd op '
+thirdparty.UpdateBy.short: ' door '
+thirdparty.CreatedAt.long: Aanmaakdatum
+thirdparty.UpdatedAt.long: Datum van de laatste wijziging
+thirdparty.UpdateBy.long: Gebruiker die de laatste wijziging heeft uitgevoerd
+thirdparty.A company: Een rechtspersoon
+thirdparty.company: Rechtspersoon
+thirdparty.A contact: Een natuurlijk persoon
+thirdparty.contact: Natuurlijk persoon
+thirdparty.Contact of: Contact van
+thirdparty.a_company_explanation: >-
+    Rechtspersonen kunnen één of meerdere contacten hebben, intern aan de instelling. Het is ook mogelijk om
+    hen een afkorting en de naam van een dienst toe te kennen.
+thirdparty.a_contact_explanation: >-
+    Natuurlijke personen hebben geen afkorting, dienst of onderliggende contacten. Het is mogelijk om hen
+    een aanspreekvorm en een beroep toe te kennen.
+thirdparty.Which kind of third party ?: Welk type externe partner wilt u aanmaken?
+thirdparty.Contact data are confidential: Contactgegevens zijn vertrouwelijk
+
+New third party: Nieuwe externe partner toevoegen
+Show third party %name%: Externe partner "%name%"
+Create third party: Externe partner aanmaken
+Update third party %name%: Externe partner "%name%" bijwerken
+List of third parties: Lijst van externe partners
+Third party updated: De externe partner is bijgewerkt
+Third party created: De externe partner is aangemaakt
+thirdparty.Status: Status
+Active, shown to users: Actief, zichtbaar voor gebruikers
+Active: Actief
+shown to users: zichtbaar voor gebruikers
+Inactive, not shown to users: Inactief, onzichtbaar voor gebruikers
+Inactive: Inactief
+not shown to users: onzichtbaar voor gebruikers
+Show thirdparty: Externe partner bekijken
+Add a contact: Contact toevoegen
+Remove a contact: Verwijderen
+Contacts: Contacten
+No contacts associated: Geen contact
+
+No nameCompany given: Geen bedrijfsnaam ingevuld
+No acronym given: Geen afkorting ingevuld
+No phone given: Geen telefoon ingevuld
+No email given: Geen e-mailadres ingevuld
+
+The party is visible in those centers: De externe partner is zichtbaar in deze territoria
+The party is not visible in any center: De externe partner is niet gekoppeld aan een territorium
+No third parties: Geen externe partners
+Any third party selected: Geen externe partner geselecteerd
+
+Thirdparty handling: Behandelende externe partner
+Thirdparty workers: Tussenkomende externe partners
+Third party category: Categorieën van externe partners
+
+Third party configuration: Beheer van externe partners
+
+# person resource
+Select a thirdparty: "Kies een externe partner"
+Contact person: "Contactpersoon"
+
+# Residential address
+The address of a third party: Het adres van een externe partner
+residential_address_third_party_explanation: Het adres zal worden gekoppeld aan dat van een externe partner.
+Host third party: Het adres van een externe partner kiezen
+
+# ROLES
+CHILL_3PARTY_3PARTY_CREATE: Externe partner toevoegen
+CHILL_3PARTY_3PARTY_SHOW: Externe partner bekijken
+CHILL_3PARTY_3PARTY_UPDATE: Externe partner bewerken
+
+# crud:
+crud:
+    3party_3party:
+        index:
+            add_new: Aanmaken
+    thirdparty_thirdparty-category:
+        index:
+            title: Lijst van categorieën van externe partners
+            add_new: Nieuwe toevoegen
+        title_new: Nieuwe categorie van externe partners
+        title_edit: Categorie van externe partners bewerken
+
+# docgen
+docgen:
+    A context for person with a third party (for sending mail): Een context van een persoon met een externe partner (om bijvoorbeeld een brief naar deze externe partner te sturen)
+    Person with third party: Persoon met keuze van een externe partner
+    Ask for thirdParty: Vragen aan de gebruiker om een externe partner te specificeren
+    thirdParty label: Benaming van de externe partner
+
+# exports
+export:
+    list:
+        acp:
+            isRequestorThirdParty: Is de aanvrager een externe partner?
+            requestorThirdPartyId: Identificatie van de externe partner
+            acprequestorThirdPaty: Naam van de aanvragende externe partner
+        acpw:
+            handlingThierParty: Behandelende externe partner
+            thirdParties: Tussenkomende externe partner
+
+# exports filters/aggregators
+Filtered by person\'s who have a residential address located at a thirdparty of type %thirparty_type%: Alleen de gebruikers die een woonadres hebben bij een externe partner van categorie %thirdparty_type%
+is thirdparty: De aanvrager is een externe partner
+
+Filter by person's who have a residential address located at a thirdparty of type: Gebruikers filteren die een woonadres hebben bij een externe partner
+"Filtered by person's who have a residential address located at a thirdparty of type %thirdparty_type% and valid on %date_calc%": "Alleen de gebruikers die een woonadres hebben bij een externe partner van categorie %thirdparty_type% en geldig op datum %date_calc%"
+
+# admin
+admin:
+    export_description: Lijst van externe partners (CSV-formaat)
+
+Profession: Beroep
+Firstname: Voornaam
+Name_company: Dienst/Afdeling
+Address: Adres
+Civility: Aanspreekvorm
+Id: Identificatie
+Contact id: Identificatie van het contact
+Contact name: Naam van het contact
+Contact  firstname: Voornaam van het contact
+Contact phone: Telefoon van het contact
+Contact phone2: Andere telefoon van het contact
+Telephone2: Andere telefoon
+Contact email: E-mail van het contact
+Contact address: Adres van het contact
+Contact profession: Beroep van het contact
+
+thirdparty_duplicate:
+    title: Dubbele externe partners samenvoegen
+    find: Een dubbele externe partner aanwijzen
+    Thirdparty to keep: Te behouden externe partner
+    Thirdparty to delete: Te verwijderen externe partner
+    Thirdparty to delete explanation: Deze externe partner zal worden verwijderd. Alleen de contacten van deze externe partner, hieronder opgesomd, zullen worden overgedragen.
+    Thirdparty to keep explanation: Deze externe partner zal worden behouden
+    Data to keep: Bewaarde gegevens
+    You cannot merge a thirdparty with itself. Please choose a different thirdparty: U kunt een externe partner niet met zichzelf samenvoegen. Kies een andere externe partner.
+    A thirdparty can only be merged with a thirdparty of the same kind: Een externe partner kan alleen worden samengevoegd met een externe partner van hetzelfde type.
+    Two child thirdparties must have the same parent: Twee externe partners van het type "contact" moeten gelinked zijn aan dezelfde hiërarchische "ouder".
+    Merge successful: Het samenvoegen is succesvol uitgevoerd
diff --git a/src/Bundle/ChillThirdPartyBundle/translations/validators.nl.yml b/src/Bundle/ChillThirdPartyBundle/translations/validators.nl.yml
new file mode 100644
index 000000000..1dc2fd7da
--- /dev/null
+++ b/src/Bundle/ChillThirdPartyBundle/translations/validators.nl.yml
@@ -0,0 +1,2 @@
+thirdParty:
+    thirdParty_has_no_email: De externe partner {{ thirdParty }} heeft geen e-mail adres.
diff --git a/src/Bundle/ChillWopiBundle/src/translations/messages.nl.yml b/src/Bundle/ChillWopiBundle/src/translations/messages.nl.yml
new file mode 100644
index 000000000..410e80dc5
--- /dev/null
+++ b/src/Bundle/ChillWopiBundle/src/translations/messages.nl.yml
@@ -0,0 +1,2 @@
+wopi_editor:
+    document unsupported for edition: Dit formaat van document is niet bewerkbaar.
diff --git a/symfony.lock b/symfony.lock
index 6409f0c1d..532c9ec98 100644
--- a/symfony.lock
+++ b/symfony.lock
@@ -260,6 +260,15 @@
             "src/Kernel.php"
         ]
     },
+    "symfony/loco-translation-provider": {
+        "version": "6.0",
+        "recipe": {
+            "repo": "github.com/symfony/recipes",
+            "branch": "main",
+            "version": "5.3",
+            "ref": "500b568fcdf2de12ac18e157e11820114db89986"
+        }
+    },
     "symfony/mailer": {
         "version": "5.4",
         "recipe": {

From 4cbb4c3ae32bc4207b143fc526674a64f821abec Mon Sep 17 00:00:00 2001
From: LenaertsJ <julie.lenaerts@champs-libres.coop>
Date: Fri, 5 Dec 2025 12:39:12 +0000
Subject: [PATCH 247/283] Show whether doc generation template is active or not
 + order alphabetically

---
 .changes/unreleased/UX-20251103-161910.yaml        |  6 ++++++
 .../AdminDocGeneratorTemplateController.php        |  2 +-
 .../views/DocGeneratorTemplate/index.html.twig     | 14 +++++++++++++-
 .../translations/messages.fr.yml                   |  4 ++++
 4 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 .changes/unreleased/UX-20251103-161910.yaml

diff --git a/.changes/unreleased/UX-20251103-161910.yaml b/.changes/unreleased/UX-20251103-161910.yaml
new file mode 100644
index 000000000..5ef8ff4e9
--- /dev/null
+++ b/.changes/unreleased/UX-20251103-161910.yaml
@@ -0,0 +1,6 @@
+kind: UX
+body: Display whether doc generation template is active or not in admin and order templates alphabetically
+time: 2025-11-03T16:19:10.051947925+01:00
+custom:
+    Issue: "456"
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php b/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php
index 04fa9ce07..8a45ff963 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Controller/AdminDocGeneratorTemplateController.php
@@ -87,7 +87,7 @@ class AdminDocGeneratorTemplateController extends CRUDController
      */
     protected function orderQuery(string $action, $query, Request $request, PaginatorInterface $paginator)
     {
-        return $query->addSelect('JSON_EXTRACT(e.name, :lang) AS HIDDEN name_lang')
+        return $query->addSelect('REPLACE(JSON_EXTRACT(e.name, :lang), \' \', \'~\') AS HIDDEN name_lang')
             ->setParameter('lang', $request->getLocale())
             ->addOrderBy('name_lang', 'ASC');
     }
diff --git a/src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/index.html.twig b/src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/index.html.twig
index ee167bcf7..24bc94d1c 100644
--- a/src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/index.html.twig
+++ b/src/Bundle/ChillDocGeneratorBundle/Resources/views/DocGeneratorTemplate/index.html.twig
@@ -25,12 +25,24 @@
                             <div class="item-bloc">
                                 <div class="item-row">
                                     <div class="item-col" style="flex-basis:100%;">
-                                        <h2>{{ entity.name|localize_translatable_string }}</h2>
+                                        <h2>{{ entity.name|localize_translatable_string }} </h2>
+                                        <p style="margin-left: 1rem;"><span class="badge bg-chill-gray">
+                                            {% if entity.active %}
+                                                {{ 'admin.active'|trans }}
+                                            {% else %}
+                                                {{ 'admin.not active'|trans }}
+                                            {% endif %}
+                                        </span></p>
                                     </div>
                                 </div>
                                 <div class="item-row">
                                     <p><span class="badge bg-chill-green-dark">{{ contextManager.getContextByKey(entity.context).name|trans }}</span></p>
                                 </div>
+{#                                <div class="item-row">#}
+{#                                    <div class="item-col" style="flex-basis:100%;">#}
+{##}
+{#                                    </div>#}
+{#                                </div>#}
                                 <div class="item-row">
                                     <div class="item-col"></div>
                                     <ul class="record_actions item-col flex-shrink-1">
diff --git a/src/Bundle/ChillDocGeneratorBundle/translations/messages.fr.yml b/src/Bundle/ChillDocGeneratorBundle/translations/messages.fr.yml
index c1601ea6e..f883ce3d0 100644
--- a/src/Bundle/ChillDocGeneratorBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillDocGeneratorBundle/translations/messages.fr.yml
@@ -49,3 +49,7 @@ crud:
 
 
 Template file: Fichier modèle
+
+admin:
+    active: Actif
+    not active: Non-actif

From 2ef789a794ec0a199a9734325647770c793e40db Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 5 Dec 2025 15:01:21 +0100
Subject: [PATCH 248/283] fix eslint

---
 .../Resources/public/types/generic_doc.ts         | 15 ++++++++++-----
 .../Resources/public/types/index.ts               |  6 ++++--
 .../Resources/public/lib/api/apiMethods.ts        |  9 ++++++---
 3 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/types/generic_doc.ts b/src/Bundle/ChillDocStoreBundle/Resources/public/types/generic_doc.ts
index 34cf2501d..04c324b4a 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/types/generic_doc.ts
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/types/generic_doc.ts
@@ -52,31 +52,36 @@ interface BaseMetadataWithHtml extends BaseMetadata {
     html: string;
 }
 
-export interface GenericDocForAccompanyingCourseDocument extends GenericDocForAccompanyingPeriod {
+export interface GenericDocForAccompanyingCourseDocument
+    extends GenericDocForAccompanyingPeriod {
     key: "accompanying_course_document";
     metadata: BaseMetadataWithHtml;
     storedObject: StoredObject;
 }
 
-export interface GenericDocForAccompanyingCourseActivityDocument extends GenericDocForAccompanyingPeriod {
+export interface GenericDocForAccompanyingCourseActivityDocument
+    extends GenericDocForAccompanyingPeriod {
     key: "accompanying_course_activity_document";
     metadata: BaseMetadataWithHtml;
     storedObject: StoredObject;
 }
 
-export interface GenericDocForAccompanyingCourseCalendarDocument extends GenericDocForAccompanyingPeriod {
+export interface GenericDocForAccompanyingCourseCalendarDocument
+    extends GenericDocForAccompanyingPeriod {
     key: "accompanying_course_calendar_document";
     metadata: BaseMetadataWithHtml;
     storedObject: StoredObject;
 }
 
-export interface GenericDocForAccompanyingCoursePersonDocument extends GenericDocForAccompanyingPeriod {
+export interface GenericDocForAccompanyingCoursePersonDocument
+    extends GenericDocForAccompanyingPeriod {
     key: "person_document";
     metadata: BaseMetadataWithHtml;
     storedObject: StoredObject;
 }
 
-export interface GenericDocForAccompanyingCourseWorkEvaluationDocument extends GenericDocForAccompanyingPeriod {
+export interface GenericDocForAccompanyingCourseWorkEvaluationDocument
+    extends GenericDocForAccompanyingPeriod {
     key: "accompanying_period_work_evaluation_document";
     metadata: BaseMetadataWithHtml;
     storedObject: StoredObject;
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/types/index.ts b/src/Bundle/ChillDocStoreBundle/Resources/public/types/index.ts
index 4213d971a..5b34b8f73 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/types/index.ts
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/types/index.ts
@@ -46,7 +46,8 @@ export interface StoredObjectVersionCreated extends StoredObjectVersion {
     persisted: false;
 }
 
-export interface StoredObjectVersionPersisted extends StoredObjectVersionCreated {
+export interface StoredObjectVersionPersisted
+    extends StoredObjectVersionCreated {
     version: number;
     id: number;
     createdAt: DateTime | null;
@@ -60,7 +61,8 @@ export interface StoredObjectStatusChange {
     type: string;
 }
 
-export interface StoredObjectVersionWithPointInTime extends StoredObjectVersionPersisted {
+export interface StoredObjectVersionWithPointInTime
+    extends StoredObjectVersionPersisted {
     "point-in-times": StoredObjectPointInTime[];
     "from-restored": StoredObjectVersionPersisted | null;
 }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.ts b/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.ts
index 97220f9c8..e8256b348 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.ts
@@ -20,7 +20,8 @@ export interface TransportExceptionInterface {
     name: string;
 }
 
-export interface ValidationExceptionInterface extends TransportExceptionInterface {
+export interface ValidationExceptionInterface
+    extends TransportExceptionInterface {
     name: "ValidationException";
     error: object;
     violations: string[];
@@ -40,7 +41,8 @@ export interface AccessExceptionInterface extends TransportExceptionInterface {
     violations: string[];
 }
 
-export interface NotFoundExceptionInterface extends TransportExceptionInterface {
+export interface NotFoundExceptionInterface
+    extends TransportExceptionInterface {
     name: "NotFoundException";
 }
 
@@ -51,7 +53,8 @@ export interface ServerExceptionInterface extends TransportExceptionInterface {
     body: string;
 }
 
-export interface ConflictHttpExceptionInterface extends TransportExceptionInterface {
+export interface ConflictHttpExceptionInterface
+    extends TransportExceptionInterface {
     name: "ConflictHttpException";
     violations: string[];
 }

From e47c23c9030c65be2703b97902f7c6a159045d2e Mon Sep 17 00:00:00 2001
From: LenaertsJ <julie.lenaerts@champs-libres.coop>
Date: Fri, 5 Dec 2025 14:24:58 +0000
Subject: [PATCH 249/283] Add a counter for invitations awaiting reply

---
 .../unreleased/Feature-20251125-165811.yaml   |  6 +++++
 .../Menu/UserMenuBuilder.php                  | 23 +++++++++++++------
 .../Repository/InviteRepository.php           | 19 +++++++++++++++
 .../translations/messages+intl-icu.fr.yml     |  8 +++++++
 .../translations/messages.fr.yml              |  1 +
 5 files changed, 50 insertions(+), 7 deletions(-)
 create mode 100644 .changes/unreleased/Feature-20251125-165811.yaml

diff --git a/.changes/unreleased/Feature-20251125-165811.yaml b/.changes/unreleased/Feature-20251125-165811.yaml
new file mode 100644
index 000000000..3cea3958e
--- /dev/null
+++ b/.changes/unreleased/Feature-20251125-165811.yaml
@@ -0,0 +1,6 @@
+kind: Feature
+body: Add a counter for invitations awaiting reply
+time: 2025-11-25T16:58:11.780678466+01:00
+custom:
+    Issue: "459"
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php b/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php
index 672b53460..df04e9bf0 100644
--- a/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php
+++ b/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php
@@ -11,17 +11,24 @@ declare(strict_types=1);
 
 namespace Chill\CalendarBundle\Menu;
 
+use Chill\CalendarBundle\Repository\InviteRepository;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Chill\MainBundle\Security\ChillSecurity;
 use Knp\Menu\MenuItem;
-use Symfony\Component\Security\Core\Security;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-class UserMenuBuilder implements LocalMenuBuilderInterface
+final readonly class UserMenuBuilder implements LocalMenuBuilderInterface
 {
-    public function __construct(private readonly Security $security, public TranslatorInterface $translator) {}
+    public function __construct(
+        private ChillSecurity $security,
+        private TranslatorInterface $translator,
+        private InviteRepository $inviteRepository,
+    ) {}
 
-    public function buildMenu($menuId, MenuItem $menu, array $parameters)
+    public function buildMenu($menuId, MenuItem $menu, array $parameters): void
     {
+        $invitationsPending = $this->inviteRepository->countPendingInvitesByUser($this->security->getUser());
+
         if ($this->security->isGranted('ROLE_USER')) {
             $menu->addChild('My calendar list', [
                 'route' => 'chill_calendar_calendar_list_my',
@@ -30,12 +37,14 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
                     'order' => 8,
                     'icon' => 'tasks',
                 ]);
-            $menu->addChild('invite.list.title', [
-                'route' => 'chill_calendar_invitations_list_my',
-            ])
+            $menu->addChild(
+                $this->translator->trans('invite.menu with counter', ['nb' => $invitationsPending]),
+                ['route' => 'chill_calendar_invitations_list_my']
+            )
                 ->setExtras([
                     'order' => 9,
                     'icon' => 'tasks',
+                    'counter' => 0 < $invitationsPending ? $invitationsPending : null,
                 ]);
         }
     }
diff --git a/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php b/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php
index 8fe28f500..6ba967871 100644
--- a/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php
+++ b/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php
@@ -75,6 +75,25 @@ class InviteRepository implements ObjectRepository
             ->getSingleScalarResult();
     }
 
+    public function countPendingInvitesByUser(User $user): int
+    {
+        $qb = $this->entityRepository->createQueryBuilder('i');
+
+        $qb->select('COUNT(i)')
+            ->where(
+                $qb->expr()->andX(
+                    $qb->expr()->eq('i.user', ':user'),
+                    $qb->expr()->eq('i.status', ':status')
+                )
+            )
+            ->setParameters([
+                'user' => $user,
+                'status' => Invite::PENDING,
+            ]);
+
+        return $qb->getQuery()->getSingleScalarResult();
+    }
+
     public function buildAcceptedInviteByUserAndDateRangeQuery(User $user, \DateTimeImmutable $from, \DateTimeImmutable $to)
     {
         $qb = $this->entityRepository->createQueryBuilder('i');
diff --git a/src/Bundle/ChillCalendarBundle/translations/messages+intl-icu.fr.yml b/src/Bundle/ChillCalendarBundle/translations/messages+intl-icu.fr.yml
index 4bbc105b9..7c8e59231 100644
--- a/src/Bundle/ChillCalendarBundle/translations/messages+intl-icu.fr.yml
+++ b/src/Bundle/ChillCalendarBundle/translations/messages+intl-icu.fr.yml
@@ -6,3 +6,11 @@ chill_calendar:
             few {# rendez-vous sont ignorés par le filtre de date. Modifiez le filtre de date pour les voir apparaitre.}
             other {# rendez-vous sont ignorés par le filtre de date. Modifiez le filtre de date pour les voir apparaitre.}
         }
+invite:
+    menu with counter: >-
+            {nb, plural,
+                =0 {Mes invitations}
+                one {# invitation}
+                few {# invitations}
+                other {# invitations}
+            }
diff --git a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
index b4bdd0679..60ac1d5f7 100644
--- a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
@@ -98,6 +98,7 @@ invite:
     list:
         none: Il n'y aucun invitation
         title: Mes invitations
+    number of invitations waiting: Invitations en attente
 
 # exports
 Exports of calendar: Exports des rendez-vous

From 2f1445a3f39ccdb200975f6d07e48fd16e2200e5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 5 Dec 2025 14:50:06 +0000
Subject: [PATCH 250/283] Refactor `UserMenuBuilder` to include `User` type
 check for better type safety

---
 .../Menu/UserMenuBuilder.php                  | 45 ++++++++++---------
 1 file changed, 25 insertions(+), 20 deletions(-)

diff --git a/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php b/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php
index df04e9bf0..b6f16d06b 100644
--- a/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php
+++ b/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php
@@ -12,40 +12,45 @@ declare(strict_types=1);
 namespace Chill\CalendarBundle\Menu;
 
 use Chill\CalendarBundle\Repository\InviteRepository;
+use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
-use Chill\MainBundle\Security\ChillSecurity;
 use Knp\Menu\MenuItem;
+use Symfony\Component\Security\Core\Security;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
 final readonly class UserMenuBuilder implements LocalMenuBuilderInterface
 {
     public function __construct(
-        private ChillSecurity $security,
+        private Security $security,
         private TranslatorInterface $translator,
         private InviteRepository $inviteRepository,
     ) {}
 
     public function buildMenu($menuId, MenuItem $menu, array $parameters): void
     {
-        $invitationsPending = $this->inviteRepository->countPendingInvitesByUser($this->security->getUser());
+        $user = $this->security->getUser();
 
-        if ($this->security->isGranted('ROLE_USER')) {
-            $menu->addChild('My calendar list', [
-                'route' => 'chill_calendar_calendar_list_my',
-            ])
-                ->setExtras([
-                    'order' => 8,
-                    'icon' => 'tasks',
-                ]);
-            $menu->addChild(
-                $this->translator->trans('invite.menu with counter', ['nb' => $invitationsPending]),
-                ['route' => 'chill_calendar_invitations_list_my']
-            )
-                ->setExtras([
-                    'order' => 9,
-                    'icon' => 'tasks',
-                    'counter' => 0 < $invitationsPending ? $invitationsPending : null,
-                ]);
+        if ($user instanceof User) {
+            $invitationsPending = $this->inviteRepository->countPendingInvitesByUser($user);
+
+            if ($this->security->isGranted('ROLE_USER')) {
+                $menu->addChild('My calendar list', [
+                    'route' => 'chill_calendar_calendar_list_my',
+                ])
+                    ->setExtras([
+                        'order' => 8,
+                        'icon' => 'tasks',
+                    ]);
+                $menu->addChild(
+                    $this->translator->trans('invite.menu with counter', ['nb' => $invitationsPending]),
+                    ['route' => 'chill_calendar_invitations_list_my']
+                )
+                    ->setExtras([
+                        'order' => 9,
+                        'icon' => 'tasks',
+                        'counter' => 0 < $invitationsPending ? $invitationsPending : null,
+                    ]);
+            }
         }
     }
 

From 98e0f51603b88fc71976233397062a90a4fdc419 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 5 Dec 2025 15:03:01 +0000
Subject: [PATCH 251/283] Add package metadata to ChillZimbrabundle

---
 .gitlab-ci.yml                                |   2 +-
 packages/ChillZimbraBundle/.changes/1.0.0.md  |   3 +
 .../ChillZimbraBundle/.changes/header.tpl.md  |   6 +
 .../.changes/unreleased/.gitkeep              |   0
 packages/ChillZimbraBundle/.changie.yaml      |  26 +
 packages/ChillZimbraBundle/CHANGELOG.md       |  11 +
 packages/ChillZimbraBundle/LICENSE            | 661 ++++++++++++++++++
 packages/ChillZimbraBundle/README.md          |   6 +-
 8 files changed, 711 insertions(+), 4 deletions(-)
 create mode 100644 packages/ChillZimbraBundle/.changes/1.0.0.md
 create mode 100644 packages/ChillZimbraBundle/.changes/header.tpl.md
 create mode 100644 packages/ChillZimbraBundle/.changes/unreleased/.gitkeep
 create mode 100644 packages/ChillZimbraBundle/.changie.yaml
 create mode 100644 packages/ChillZimbraBundle/CHANGELOG.md
 create mode 100644 packages/ChillZimbraBundle/LICENSE

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index b9c532b29..68a7caaa0 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -93,7 +93,7 @@ mirror_chill_zimbra_bundle:
         - git subtree split --prefix=packages/ChillZimbraBundle -b chill_zimbra_temp
 
         # Push vers le repo cible, branche master du repo chill-zimbra-connector
-        - git push --force chill-zimbra-connector chill_zimbra_temp:main
+        - git push chill-zimbra-connector chill_zimbra_temp:main
 
 build:
     stage: Composer install
diff --git a/packages/ChillZimbraBundle/.changes/1.0.0.md b/packages/ChillZimbraBundle/.changes/1.0.0.md
new file mode 100644
index 000000000..c01d2b008
--- /dev/null
+++ b/packages/ChillZimbraBundle/.changes/1.0.0.md
@@ -0,0 +1,3 @@
+## 1.0.0 - 2025-12-05
+### Added
+* First version of the zimbra connector
diff --git a/packages/ChillZimbraBundle/.changes/header.tpl.md b/packages/ChillZimbraBundle/.changes/header.tpl.md
new file mode 100644
index 000000000..df8faa7b2
--- /dev/null
+++ b/packages/ChillZimbraBundle/.changes/header.tpl.md
@@ -0,0 +1,6 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
+and is generated by [Changie](https://github.com/miniscruff/changie).
diff --git a/packages/ChillZimbraBundle/.changes/unreleased/.gitkeep b/packages/ChillZimbraBundle/.changes/unreleased/.gitkeep
new file mode 100644
index 000000000..e69de29bb
diff --git a/packages/ChillZimbraBundle/.changie.yaml b/packages/ChillZimbraBundle/.changie.yaml
new file mode 100644
index 000000000..78ab6e36f
--- /dev/null
+++ b/packages/ChillZimbraBundle/.changie.yaml
@@ -0,0 +1,26 @@
+changesDir: .changes
+unreleasedDir: unreleased
+headerPath: header.tpl.md
+changelogPath: CHANGELOG.md
+versionExt: md
+versionFormat: '## {{.Version}} - {{.Time.Format "2006-01-02"}}'
+kindFormat: '### {{.Kind}}'
+changeFormat: '* {{.Body}}'
+kinds:
+    - label: Added
+      auto: minor
+    - label: Changed
+      auto: major
+    - label: Deprecated
+      auto: minor
+    - label: Removed
+      auto: major
+    - label: Fixed
+      auto: patch
+    - label: Security
+      auto: patch
+newlines:
+    afterChangelogHeader: 1
+    beforeChangelogVersion: 1
+    endOfVersion: 1
+envPrefix: CHANGIE_
diff --git a/packages/ChillZimbraBundle/CHANGELOG.md b/packages/ChillZimbraBundle/CHANGELOG.md
new file mode 100644
index 000000000..3ff246416
--- /dev/null
+++ b/packages/ChillZimbraBundle/CHANGELOG.md
@@ -0,0 +1,11 @@
+# Changelog
+All notable changes to this project will be documented in this file.
+
+The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
+adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
+and is generated by [Changie](https://github.com/miniscruff/changie).
+
+
+## 1.0.0 - 2025-12-05
+### Added
+* First version of the zimbra connector
diff --git a/packages/ChillZimbraBundle/LICENSE b/packages/ChillZimbraBundle/LICENSE
new file mode 100644
index 000000000..be3f7b28e
--- /dev/null
+++ b/packages/ChillZimbraBundle/LICENSE
@@ -0,0 +1,661 @@
+                    GNU AFFERO GENERAL PUBLIC LICENSE
+                       Version 3, 19 November 2007
+
+ Copyright (C) 2007 Free Software Foundation, Inc. <https://fsf.org/>
+ Everyone is permitted to copy and distribute verbatim copies
+ of this license document, but changing it is not allowed.
+
+                            Preamble
+
+  The GNU Affero General Public License is a free, copyleft license for
+software and other kinds of works, specifically designed to ensure
+cooperation with the community in the case of network server software.
+
+  The licenses for most software and other practical works are designed
+to take away your freedom to share and change the works.  By contrast,
+our General Public Licenses are intended to guarantee your freedom to
+share and change all versions of a program--to make sure it remains free
+software for all its users.
+
+  When we speak of free software, we are referring to freedom, not
+price.  Our General Public Licenses are designed to make sure that you
+have the freedom to distribute copies of free software (and charge for
+them if you wish), that you receive source code or can get it if you
+want it, that you can change the software or use pieces of it in new
+free programs, and that you know you can do these things.
+
+  Developers that use our General Public Licenses protect your rights
+with two steps: (1) assert copyright on the software, and (2) offer
+you this License which gives you legal permission to copy, distribute
+and/or modify the software.
+
+  A secondary benefit of defending all users' freedom is that
+improvements made in alternate versions of the program, if they
+receive widespread use, become available for other developers to
+incorporate.  Many developers of free software are heartened and
+encouraged by the resulting cooperation.  However, in the case of
+software used on network servers, this result may fail to come about.
+The GNU General Public License permits making a modified version and
+letting the public access it on a server without ever releasing its
+source code to the public.
+
+  The GNU Affero General Public License is designed specifically to
+ensure that, in such cases, the modified source code becomes available
+to the community.  It requires the operator of a network server to
+provide the source code of the modified version running there to the
+users of that server.  Therefore, public use of a modified version, on
+a publicly accessible server, gives the public access to the source
+code of the modified version.
+
+  An older license, called the Affero General Public License and
+published by Affero, was designed to accomplish similar goals.  This is
+a different license, not a version of the Affero GPL, but Affero has
+released a new version of the Affero GPL which permits relicensing under
+this license.
+
+  The precise terms and conditions for copying, distribution and
+modification follow.
+
+                       TERMS AND CONDITIONS
+
+  0. Definitions.
+
+  "This License" refers to version 3 of the GNU Affero General Public License.
+
+  "Copyright" also means copyright-like laws that apply to other kinds of
+works, such as semiconductor masks.
+
+  "The Program" refers to any copyrightable work licensed under this
+License.  Each licensee is addressed as "you".  "Licensees" and
+"recipients" may be individuals or organizations.
+
+  To "modify" a work means to copy from or adapt all or part of the work
+in a fashion requiring copyright permission, other than the making of an
+exact copy.  The resulting work is called a "modified version" of the
+earlier work or a work "based on" the earlier work.
+
+  A "covered work" means either the unmodified Program or a work based
+on the Program.
+
+  To "propagate" a work means to do anything with it that, without
+permission, would make you directly or secondarily liable for
+infringement under applicable copyright law, except executing it on a
+computer or modifying a private copy.  Propagation includes copying,
+distribution (with or without modification), making available to the
+public, and in some countries other activities as well.
+
+  To "convey" a work means any kind of propagation that enables other
+parties to make or receive copies.  Mere interaction with a user through
+a computer network, with no transfer of a copy, is not conveying.
+
+  An interactive user interface displays "Appropriate Legal Notices"
+to the extent that it includes a convenient and prominently visible
+feature that (1) displays an appropriate copyright notice, and (2)
+tells the user that there is no warranty for the work (except to the
+extent that warranties are provided), that licensees may convey the
+work under this License, and how to view a copy of this License.  If
+the interface presents a list of user commands or options, such as a
+menu, a prominent item in the list meets this criterion.
+
+  1. Source Code.
+
+  The "source code" for a work means the preferred form of the work
+for making modifications to it.  "Object code" means any non-source
+form of a work.
+
+  A "Standard Interface" means an interface that either is an official
+standard defined by a recognized standards body, or, in the case of
+interfaces specified for a particular programming language, one that
+is widely used among developers working in that language.
+
+  The "System Libraries" of an executable work include anything, other
+than the work as a whole, that (a) is included in the normal form of
+packaging a Major Component, but which is not part of that Major
+Component, and (b) serves only to enable use of the work with that
+Major Component, or to implement a Standard Interface for which an
+implementation is available to the public in source code form.  A
+"Major Component", in this context, means a major essential component
+(kernel, window system, and so on) of the specific operating system
+(if any) on which the executable work runs, or a compiler used to
+produce the work, or an object code interpreter used to run it.
+
+  The "Corresponding Source" for a work in object code form means all
+the source code needed to generate, install, and (for an executable
+work) run the object code and to modify the work, including scripts to
+control those activities.  However, it does not include the work's
+System Libraries, or general-purpose tools or generally available free
+programs which are used unmodified in performing those activities but
+which are not part of the work.  For example, Corresponding Source
+includes interface definition files associated with source files for
+the work, and the source code for shared libraries and dynamically
+linked subprograms that the work is specifically designed to require,
+such as by intimate data communication or control flow between those
+subprograms and other parts of the work.
+
+  The Corresponding Source need not include anything that users
+can regenerate automatically from other parts of the Corresponding
+Source.
+
+  The Corresponding Source for a work in source code form is that
+same work.
+
+  2. Basic Permissions.
+
+  All rights granted under this License are granted for the term of
+copyright on the Program, and are irrevocable provided the stated
+conditions are met.  This License explicitly affirms your unlimited
+permission to run the unmodified Program.  The output from running a
+covered work is covered by this License only if the output, given its
+content, constitutes a covered work.  This License acknowledges your
+rights of fair use or other equivalent, as provided by copyright law.
+
+  You may make, run and propagate covered works that you do not
+convey, without conditions so long as your license otherwise remains
+in force.  You may convey covered works to others for the sole purpose
+of having them make modifications exclusively for you, or provide you
+with facilities for running those works, provided that you comply with
+the terms of this License in conveying all material for which you do
+not control copyright.  Those thus making or running the covered works
+for you must do so exclusively on your behalf, under your direction
+and control, on terms that prohibit them from making any copies of
+your copyrighted material outside their relationship with you.
+
+  Conveying under any other circumstances is permitted solely under
+the conditions stated below.  Sublicensing is not allowed; section 10
+makes it unnecessary.
+
+  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
+
+  No covered work shall be deemed part of an effective technological
+measure under any applicable law fulfilling obligations under article
+11 of the WIPO copyright treaty adopted on 20 December 1996, or
+similar laws prohibiting or restricting circumvention of such
+measures.
+
+  When you convey a covered work, you waive any legal power to forbid
+circumvention of technological measures to the extent such circumvention
+is effected by exercising rights under this License with respect to
+the covered work, and you disclaim any intention to limit operation or
+modification of the work as a means of enforcing, against the work's
+users, your or third parties' legal rights to forbid circumvention of
+technological measures.
+
+  4. Conveying Verbatim Copies.
+
+  You may convey verbatim copies of the Program's source code as you
+receive it, in any medium, provided that you conspicuously and
+appropriately publish on each copy an appropriate copyright notice;
+keep intact all notices stating that this License and any
+non-permissive terms added in accord with section 7 apply to the code;
+keep intact all notices of the absence of any warranty; and give all
+recipients a copy of this License along with the Program.
+
+  You may charge any price or no price for each copy that you convey,
+and you may offer support or warranty protection for a fee.
+
+  5. Conveying Modified Source Versions.
+
+  You may convey a work based on the Program, or the modifications to
+produce it from the Program, in the form of source code under the
+terms of section 4, provided that you also meet all of these conditions:
+
+    a) The work must carry prominent notices stating that you modified
+    it, and giving a relevant date.
+
+    b) The work must carry prominent notices stating that it is
+    released under this License and any conditions added under section
+    7.  This requirement modifies the requirement in section 4 to
+    "keep intact all notices".
+
+    c) You must license the entire work, as a whole, under this
+    License to anyone who comes into possession of a copy.  This
+    License will therefore apply, along with any applicable section 7
+    additional terms, to the whole of the work, and all its parts,
+    regardless of how they are packaged.  This License gives no
+    permission to license the work in any other way, but it does not
+    invalidate such permission if you have separately received it.
+
+    d) If the work has interactive user interfaces, each must display
+    Appropriate Legal Notices; however, if the Program has interactive
+    interfaces that do not display Appropriate Legal Notices, your
+    work need not make them do so.
+
+  A compilation of a covered work with other separate and independent
+works, which are not by their nature extensions of the covered work,
+and which are not combined with it such as to form a larger program,
+in or on a volume of a storage or distribution medium, is called an
+"aggregate" if the compilation and its resulting copyright are not
+used to limit the access or legal rights of the compilation's users
+beyond what the individual works permit.  Inclusion of a covered work
+in an aggregate does not cause this License to apply to the other
+parts of the aggregate.
+
+  6. Conveying Non-Source Forms.
+
+  You may convey a covered work in object code form under the terms
+of sections 4 and 5, provided that you also convey the
+machine-readable Corresponding Source under the terms of this License,
+in one of these ways:
+
+    a) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by the
+    Corresponding Source fixed on a durable physical medium
+    customarily used for software interchange.
+
+    b) Convey the object code in, or embodied in, a physical product
+    (including a physical distribution medium), accompanied by a
+    written offer, valid for at least three years and valid for as
+    long as you offer spare parts or customer support for that product
+    model, to give anyone who possesses the object code either (1) a
+    copy of the Corresponding Source for all the software in the
+    product that is covered by this License, on a durable physical
+    medium customarily used for software interchange, for a price no
+    more than your reasonable cost of physically performing this
+    conveying of source, or (2) access to copy the
+    Corresponding Source from a network server at no charge.
+
+    c) Convey individual copies of the object code with a copy of the
+    written offer to provide the Corresponding Source.  This
+    alternative is allowed only occasionally and noncommercially, and
+    only if you received the object code with such an offer, in accord
+    with subsection 6b.
+
+    d) Convey the object code by offering access from a designated
+    place (gratis or for a charge), and offer equivalent access to the
+    Corresponding Source in the same way through the same place at no
+    further charge.  You need not require recipients to copy the
+    Corresponding Source along with the object code.  If the place to
+    copy the object code is a network server, the Corresponding Source
+    may be on a different server (operated by you or a third party)
+    that supports equivalent copying facilities, provided you maintain
+    clear directions next to the object code saying where to find the
+    Corresponding Source.  Regardless of what server hosts the
+    Corresponding Source, you remain obligated to ensure that it is
+    available for as long as needed to satisfy these requirements.
+
+    e) Convey the object code using peer-to-peer transmission, provided
+    you inform other peers where the object code and Corresponding
+    Source of the work are being offered to the general public at no
+    charge under subsection 6d.
+
+  A separable portion of the object code, whose source code is excluded
+from the Corresponding Source as a System Library, need not be
+included in conveying the object code work.
+
+  A "User Product" is either (1) a "consumer product", which means any
+tangible personal property which is normally used for personal, family,
+or household purposes, or (2) anything designed or sold for incorporation
+into a dwelling.  In determining whether a product is a consumer product,
+doubtful cases shall be resolved in favor of coverage.  For a particular
+product received by a particular user, "normally used" refers to a
+typical or common use of that class of product, regardless of the status
+of the particular user or of the way in which the particular user
+actually uses, or expects or is expected to use, the product.  A product
+is a consumer product regardless of whether the product has substantial
+commercial, industrial or non-consumer uses, unless such uses represent
+the only significant mode of use of the product.
+
+  "Installation Information" for a User Product means any methods,
+procedures, authorization keys, or other information required to install
+and execute modified versions of a covered work in that User Product from
+a modified version of its Corresponding Source.  The information must
+suffice to ensure that the continued functioning of the modified object
+code is in no case prevented or interfered with solely because
+modification has been made.
+
+  If you convey an object code work under this section in, or with, or
+specifically for use in, a User Product, and the conveying occurs as
+part of a transaction in which the right of possession and use of the
+User Product is transferred to the recipient in perpetuity or for a
+fixed term (regardless of how the transaction is characterized), the
+Corresponding Source conveyed under this section must be accompanied
+by the Installation Information.  But this requirement does not apply
+if neither you nor any third party retains the ability to install
+modified object code on the User Product (for example, the work has
+been installed in ROM).
+
+  The requirement to provide Installation Information does not include a
+requirement to continue to provide support service, warranty, or updates
+for a work that has been modified or installed by the recipient, or for
+the User Product in which it has been modified or installed.  Access to a
+network may be denied when the modification itself materially and
+adversely affects the operation of the network or violates the rules and
+protocols for communication across the network.
+
+  Corresponding Source conveyed, and Installation Information provided,
+in accord with this section must be in a format that is publicly
+documented (and with an implementation available to the public in
+source code form), and must require no special password or key for
+unpacking, reading or copying.
+
+  7. Additional Terms.
+
+  "Additional permissions" are terms that supplement the terms of this
+License by making exceptions from one or more of its conditions.
+Additional permissions that are applicable to the entire Program shall
+be treated as though they were included in this License, to the extent
+that they are valid under applicable law.  If additional permissions
+apply only to part of the Program, that part may be used separately
+under those permissions, but the entire Program remains governed by
+this License without regard to the additional permissions.
+
+  When you convey a copy of a covered work, you may at your option
+remove any additional permissions from that copy, or from any part of
+it.  (Additional permissions may be written to require their own
+removal in certain cases when you modify the work.)  You may place
+additional permissions on material, added by you to a covered work,
+for which you have or can give appropriate copyright permission.
+
+  Notwithstanding any other provision of this License, for material you
+add to a covered work, you may (if authorized by the copyright holders of
+that material) supplement the terms of this License with terms:
+
+    a) Disclaiming warranty or limiting liability differently from the
+    terms of sections 15 and 16 of this License; or
+
+    b) Requiring preservation of specified reasonable legal notices or
+    author attributions in that material or in the Appropriate Legal
+    Notices displayed by works containing it; or
+
+    c) Prohibiting misrepresentation of the origin of that material, or
+    requiring that modified versions of such material be marked in
+    reasonable ways as different from the original version; or
+
+    d) Limiting the use for publicity purposes of names of licensors or
+    authors of the material; or
+
+    e) Declining to grant rights under trademark law for use of some
+    trade names, trademarks, or service marks; or
+
+    f) Requiring indemnification of licensors and authors of that
+    material by anyone who conveys the material (or modified versions of
+    it) with contractual assumptions of liability to the recipient, for
+    any liability that these contractual assumptions directly impose on
+    those licensors and authors.
+
+  All other non-permissive additional terms are considered "further
+restrictions" within the meaning of section 10.  If the Program as you
+received it, or any part of it, contains a notice stating that it is
+governed by this License along with a term that is a further
+restriction, you may remove that term.  If a license document contains
+a further restriction but permits relicensing or conveying under this
+License, you may add to a covered work material governed by the terms
+of that license document, provided that the further restriction does
+not survive such relicensing or conveying.
+
+  If you add terms to a covered work in accord with this section, you
+must place, in the relevant source files, a statement of the
+additional terms that apply to those files, or a notice indicating
+where to find the applicable terms.
+
+  Additional terms, permissive or non-permissive, may be stated in the
+form of a separately written license, or stated as exceptions;
+the above requirements apply either way.
+
+  8. Termination.
+
+  You may not propagate or modify a covered work except as expressly
+provided under this License.  Any attempt otherwise to propagate or
+modify it is void, and will automatically terminate your rights under
+this License (including any patent licenses granted under the third
+paragraph of section 11).
+
+  However, if you cease all violation of this License, then your
+license from a particular copyright holder is reinstated (a)
+provisionally, unless and until the copyright holder explicitly and
+finally terminates your license, and (b) permanently, if the copyright
+holder fails to notify you of the violation by some reasonable means
+prior to 60 days after the cessation.
+
+  Moreover, your license from a particular copyright holder is
+reinstated permanently if the copyright holder notifies you of the
+violation by some reasonable means, this is the first time you have
+received notice of violation of this License (for any work) from that
+copyright holder, and you cure the violation prior to 30 days after
+your receipt of the notice.
+
+  Termination of your rights under this section does not terminate the
+licenses of parties who have received copies or rights from you under
+this License.  If your rights have been terminated and not permanently
+reinstated, you do not qualify to receive new licenses for the same
+material under section 10.
+
+  9. Acceptance Not Required for Having Copies.
+
+  You are not required to accept this License in order to receive or
+run a copy of the Program.  Ancillary propagation of a covered work
+occurring solely as a consequence of using peer-to-peer transmission
+to receive a copy likewise does not require acceptance.  However,
+nothing other than this License grants you permission to propagate or
+modify any covered work.  These actions infringe copyright if you do
+not accept this License.  Therefore, by modifying or propagating a
+covered work, you indicate your acceptance of this License to do so.
+
+  10. Automatic Licensing of Downstream Recipients.
+
+  Each time you convey a covered work, the recipient automatically
+receives a license from the original licensors, to run, modify and
+propagate that work, subject to this License.  You are not responsible
+for enforcing compliance by third parties with this License.
+
+  An "entity transaction" is a transaction transferring control of an
+organization, or substantially all assets of one, or subdividing an
+organization, or merging organizations.  If propagation of a covered
+work results from an entity transaction, each party to that
+transaction who receives a copy of the work also receives whatever
+licenses to the work the party's predecessor in interest had or could
+give under the previous paragraph, plus a right to possession of the
+Corresponding Source of the work from the predecessor in interest, if
+the predecessor has it or can get it with reasonable efforts.
+
+  You may not impose any further restrictions on the exercise of the
+rights granted or affirmed under this License.  For example, you may
+not impose a license fee, royalty, or other charge for exercise of
+rights granted under this License, and you may not initiate litigation
+(including a cross-claim or counterclaim in a lawsuit) alleging that
+any patent claim is infringed by making, using, selling, offering for
+sale, or importing the Program or any portion of it.
+
+  11. Patents.
+
+  A "contributor" is a copyright holder who authorizes use under this
+License of the Program or a work on which the Program is based.  The
+work thus licensed is called the contributor's "contributor version".
+
+  A contributor's "essential patent claims" are all patent claims
+owned or controlled by the contributor, whether already acquired or
+hereafter acquired, that would be infringed by some manner, permitted
+by this License, of making, using, or selling its contributor version,
+but do not include claims that would be infringed only as a
+consequence of further modification of the contributor version.  For
+purposes of this definition, "control" includes the right to grant
+patent sublicenses in a manner consistent with the requirements of
+this License.
+
+  Each contributor grants you a non-exclusive, worldwide, royalty-free
+patent license under the contributor's essential patent claims, to
+make, use, sell, offer for sale, import and otherwise run, modify and
+propagate the contents of its contributor version.
+
+  In the following three paragraphs, a "patent license" is any express
+agreement or commitment, however denominated, not to enforce a patent
+(such as an express permission to practice a patent or covenant not to
+sue for patent infringement).  To "grant" such a patent license to a
+party means to make such an agreement or commitment not to enforce a
+patent against the party.
+
+  If you convey a covered work, knowingly relying on a patent license,
+and the Corresponding Source of the work is not available for anyone
+to copy, free of charge and under the terms of this License, through a
+publicly available network server or other readily accessible means,
+then you must either (1) cause the Corresponding Source to be so
+available, or (2) arrange to deprive yourself of the benefit of the
+patent license for this particular work, or (3) arrange, in a manner
+consistent with the requirements of this License, to extend the patent
+license to downstream recipients.  "Knowingly relying" means you have
+actual knowledge that, but for the patent license, your conveying the
+covered work in a country, or your recipient's use of the covered work
+in a country, would infringe one or more identifiable patents in that
+country that you have reason to believe are valid.
+
+  If, pursuant to or in connection with a single transaction or
+arrangement, you convey, or propagate by procuring conveyance of, a
+covered work, and grant a patent license to some of the parties
+receiving the covered work authorizing them to use, propagate, modify
+or convey a specific copy of the covered work, then the patent license
+you grant is automatically extended to all recipients of the covered
+work and works based on it.
+
+  A patent license is "discriminatory" if it does not include within
+the scope of its coverage, prohibits the exercise of, or is
+conditioned on the non-exercise of one or more of the rights that are
+specifically granted under this License.  You may not convey a covered
+work if you are a party to an arrangement with a third party that is
+in the business of distributing software, under which you make payment
+to the third party based on the extent of your activity of conveying
+the work, and under which the third party grants, to any of the
+parties who would receive the covered work from you, a discriminatory
+patent license (a) in connection with copies of the covered work
+conveyed by you (or copies made from those copies), or (b) primarily
+for and in connection with specific products or compilations that
+contain the covered work, unless you entered into that arrangement,
+or that patent license was granted, prior to 28 March 2007.
+
+  Nothing in this License shall be construed as excluding or limiting
+any implied license or other defenses to infringement that may
+otherwise be available to you under applicable patent law.
+
+  12. No Surrender of Others' Freedom.
+
+  If conditions are imposed on you (whether by court order, agreement or
+otherwise) that contradict the conditions of this License, they do not
+excuse you from the conditions of this License.  If you cannot convey a
+covered work so as to satisfy simultaneously your obligations under this
+License and any other pertinent obligations, then as a consequence you may
+not convey it at all.  For example, if you agree to terms that obligate you
+to collect a royalty for further conveying from those to whom you convey
+the Program, the only way you could satisfy both those terms and this
+License would be to refrain entirely from conveying the Program.
+
+  13. Remote Network Interaction; Use with the GNU General Public License.
+
+  Notwithstanding any other provision of this License, if you modify the
+Program, your modified version must prominently offer all users
+interacting with it remotely through a computer network (if your version
+supports such interaction) an opportunity to receive the Corresponding
+Source of your version by providing access to the Corresponding Source
+from a network server at no charge, through some standard or customary
+means of facilitating copying of software.  This Corresponding Source
+shall include the Corresponding Source for any work covered by version 3
+of the GNU General Public License that is incorporated pursuant to the
+following paragraph.
+
+  Notwithstanding any other provision of this License, you have
+permission to link or combine any covered work with a work licensed
+under version 3 of the GNU General Public License into a single
+combined work, and to convey the resulting work.  The terms of this
+License will continue to apply to the part which is the covered work,
+but the work with which it is combined will remain governed by version
+3 of the GNU General Public License.
+
+  14. Revised Versions of this License.
+
+  The Free Software Foundation may publish revised and/or new versions of
+the GNU Affero General Public License from time to time.  Such new versions
+will be similar in spirit to the present version, but may differ in detail to
+address new problems or concerns.
+
+  Each version is given a distinguishing version number.  If the
+Program specifies that a certain numbered version of the GNU Affero General
+Public License "or any later version" applies to it, you have the
+option of following the terms and conditions either of that numbered
+version or of any later version published by the Free Software
+Foundation.  If the Program does not specify a version number of the
+GNU Affero General Public License, you may choose any version ever published
+by the Free Software Foundation.
+
+  If the Program specifies that a proxy can decide which future
+versions of the GNU Affero General Public License can be used, that proxy's
+public statement of acceptance of a version permanently authorizes you
+to choose that version for the Program.
+
+  Later license versions may give you additional or different
+permissions.  However, no additional obligations are imposed on any
+author or copyright holder as a result of your choosing to follow a
+later version.
+
+  15. Disclaimer of Warranty.
+
+  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
+APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
+HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
+OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
+THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
+IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
+ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
+
+  16. Limitation of Liability.
+
+  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
+THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
+GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
+USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
+DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
+PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
+EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
+SUCH DAMAGES.
+
+  17. Interpretation of Sections 15 and 16.
+
+  If the disclaimer of warranty and limitation of liability provided
+above cannot be given local legal effect according to their terms,
+reviewing courts shall apply local law that most closely approximates
+an absolute waiver of all civil liability in connection with the
+Program, unless a warranty or assumption of liability accompanies a
+copy of the Program in return for a fee.
+
+                     END OF TERMS AND CONDITIONS
+
+            How to Apply These Terms to Your New Programs
+
+  If you develop a new program, and you want it to be of the greatest
+possible use to the public, the best way to achieve this is to make it
+free software which everyone can redistribute and change under these terms.
+
+  To do so, attach the following notices to the program.  It is safest
+to attach them to the start of each source file to most effectively
+state the exclusion of warranty; and each file should have at least
+the "copyright" line and a pointer to where the full notice is found.
+
+    <one line to give the program's name and a brief idea of what it does.>
+    Copyright (C) <year>  <name of author>
+
+    This program is free software: you can redistribute it and/or modify
+    it under the terms of the GNU Affero General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    This program is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU Affero General Public License for more details.
+
+    You should have received a copy of the GNU Affero General Public License
+    along with this program.  If not, see <https://www.gnu.org/licenses/>.
+
+Also add information on how to contact you by electronic and paper mail.
+
+  If your software can interact with users remotely through a computer
+network, you should also make sure that it provides a way for users to
+get its source.  For example, if your program is a web application, its
+interface could display a "Source" link that leads users to an archive
+of the code.  There are many ways you could offer source, and different
+solutions will be better for different programs; see section 13 for the
+specific requirements.
+
+  You should also get your employer (if you work as a programmer) or school,
+if any, to sign a "copyright disclaimer" for the program, if necessary.
+For more information on this, and how to apply and follow the GNU AGPL, see
+<https://www.gnu.org/licenses/>.
diff --git a/packages/ChillZimbraBundle/README.md b/packages/ChillZimbraBundle/README.md
index 521b31fd2..7b51e52db 100644
--- a/packages/ChillZimbraBundle/README.md
+++ b/packages/ChillZimbraBundle/README.md
@@ -4,9 +4,9 @@ This bundle provides integration with Zimbra email server for Chill application.
 
 ## Source code
 
-This bundle should be modified within the chill-bundles repository. The code at
-https://gitlab.com/Chill-Projet/chill-zimbra-connector is a mirror of the main
-repository, and is intended to serve packagist information.
+This bundle should be modified within [the chill-bundles repository](https://gitlab.com/Chill-Projet/chill-bundles).
+The code at https://gitlab.com/Chill-Projet/chill-zimbra-connector is a mirror of this main
+repository and is intended to serve packagist packages.
 
 ## Configuration
 

From 4919c03660b342f95c0ab1c2eeaa7e7e69a78e76 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 5 Dec 2025 15:09:15 +0000
Subject: [PATCH 252/283] Eslint fixes

---
 .../Resources/public/types/generic_doc.ts         | 15 +++++----------
 .../Resources/public/types/index.ts               |  6 ++----
 .../Resources/public/lib/api/apiMethods.ts        |  9 +++------
 3 files changed, 10 insertions(+), 20 deletions(-)

diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/types/generic_doc.ts b/src/Bundle/ChillDocStoreBundle/Resources/public/types/generic_doc.ts
index 04c324b4a..34cf2501d 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/types/generic_doc.ts
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/types/generic_doc.ts
@@ -52,36 +52,31 @@ interface BaseMetadataWithHtml extends BaseMetadata {
     html: string;
 }
 
-export interface GenericDocForAccompanyingCourseDocument
-    extends GenericDocForAccompanyingPeriod {
+export interface GenericDocForAccompanyingCourseDocument extends GenericDocForAccompanyingPeriod {
     key: "accompanying_course_document";
     metadata: BaseMetadataWithHtml;
     storedObject: StoredObject;
 }
 
-export interface GenericDocForAccompanyingCourseActivityDocument
-    extends GenericDocForAccompanyingPeriod {
+export interface GenericDocForAccompanyingCourseActivityDocument extends GenericDocForAccompanyingPeriod {
     key: "accompanying_course_activity_document";
     metadata: BaseMetadataWithHtml;
     storedObject: StoredObject;
 }
 
-export interface GenericDocForAccompanyingCourseCalendarDocument
-    extends GenericDocForAccompanyingPeriod {
+export interface GenericDocForAccompanyingCourseCalendarDocument extends GenericDocForAccompanyingPeriod {
     key: "accompanying_course_calendar_document";
     metadata: BaseMetadataWithHtml;
     storedObject: StoredObject;
 }
 
-export interface GenericDocForAccompanyingCoursePersonDocument
-    extends GenericDocForAccompanyingPeriod {
+export interface GenericDocForAccompanyingCoursePersonDocument extends GenericDocForAccompanyingPeriod {
     key: "person_document";
     metadata: BaseMetadataWithHtml;
     storedObject: StoredObject;
 }
 
-export interface GenericDocForAccompanyingCourseWorkEvaluationDocument
-    extends GenericDocForAccompanyingPeriod {
+export interface GenericDocForAccompanyingCourseWorkEvaluationDocument extends GenericDocForAccompanyingPeriod {
     key: "accompanying_period_work_evaluation_document";
     metadata: BaseMetadataWithHtml;
     storedObject: StoredObject;
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/types/index.ts b/src/Bundle/ChillDocStoreBundle/Resources/public/types/index.ts
index 5b34b8f73..4213d971a 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/types/index.ts
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/types/index.ts
@@ -46,8 +46,7 @@ export interface StoredObjectVersionCreated extends StoredObjectVersion {
     persisted: false;
 }
 
-export interface StoredObjectVersionPersisted
-    extends StoredObjectVersionCreated {
+export interface StoredObjectVersionPersisted extends StoredObjectVersionCreated {
     version: number;
     id: number;
     createdAt: DateTime | null;
@@ -61,8 +60,7 @@ export interface StoredObjectStatusChange {
     type: string;
 }
 
-export interface StoredObjectVersionWithPointInTime
-    extends StoredObjectVersionPersisted {
+export interface StoredObjectVersionWithPointInTime extends StoredObjectVersionPersisted {
     "point-in-times": StoredObjectPointInTime[];
     "from-restored": StoredObjectVersionPersisted | null;
 }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.ts b/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.ts
index e8256b348..97220f9c8 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.ts
@@ -20,8 +20,7 @@ export interface TransportExceptionInterface {
     name: string;
 }
 
-export interface ValidationExceptionInterface
-    extends TransportExceptionInterface {
+export interface ValidationExceptionInterface extends TransportExceptionInterface {
     name: "ValidationException";
     error: object;
     violations: string[];
@@ -41,8 +40,7 @@ export interface AccessExceptionInterface extends TransportExceptionInterface {
     violations: string[];
 }
 
-export interface NotFoundExceptionInterface
-    extends TransportExceptionInterface {
+export interface NotFoundExceptionInterface extends TransportExceptionInterface {
     name: "NotFoundException";
 }
 
@@ -53,8 +51,7 @@ export interface ServerExceptionInterface extends TransportExceptionInterface {
     body: string;
 }
 
-export interface ConflictHttpExceptionInterface
-    extends TransportExceptionInterface {
+export interface ConflictHttpExceptionInterface extends TransportExceptionInterface {
     name: "ConflictHttpException";
     violations: string[];
 }

From 14b891b33dbcec419f2611c4abb302f5d172960c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 5 Dec 2025 16:54:35 +0100
Subject: [PATCH 253/283] Release v4.9.0

---
 .changes/unreleased/DX-20251030-123732.yaml   |   6 -
 .changes/unreleased/DX-20251117-160650.yaml   |   6 -
 .../unreleased/Feature-20251125-165811.yaml   |   6 -
 .../unreleased/Fixed-20251201-185859.yaml     |   6 -
 .../unreleased/Fixed-20251203-113832.yaml     |   6 -
 .changes/unreleased/UX-20251103-161910.yaml   |   6 -
 .changes/unreleased/UX-20251124-164723.yaml   |   6 -
 .changes/unreleased/UX-20251125-150135.yaml   |   6 -
 .changes/unreleased/UX-20251126-133910.yaml   |   6 -
 .changes/v4.9.0.md                            |  14 +
 CHANGELOG.md                                  | 463 +++++++++---------
 11 files changed, 254 insertions(+), 277 deletions(-)
 delete mode 100644 .changes/unreleased/DX-20251030-123732.yaml
 delete mode 100644 .changes/unreleased/DX-20251117-160650.yaml
 delete mode 100644 .changes/unreleased/Feature-20251125-165811.yaml
 delete mode 100644 .changes/unreleased/Fixed-20251201-185859.yaml
 delete mode 100644 .changes/unreleased/Fixed-20251203-113832.yaml
 delete mode 100644 .changes/unreleased/UX-20251103-161910.yaml
 delete mode 100644 .changes/unreleased/UX-20251124-164723.yaml
 delete mode 100644 .changes/unreleased/UX-20251125-150135.yaml
 delete mode 100644 .changes/unreleased/UX-20251126-133910.yaml
 create mode 100644 .changes/v4.9.0.md

diff --git a/.changes/unreleased/DX-20251030-123732.yaml b/.changes/unreleased/DX-20251030-123732.yaml
deleted file mode 100644
index db3ca64c2..000000000
--- a/.changes/unreleased/DX-20251030-123732.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: DX
-body: Add missing fixtures for proper loading of AccompanyingPeriods
-time: 2025-10-30T12:37:32.824593456+01:00
-custom:
-    Issue: "280"
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/DX-20251117-160650.yaml b/.changes/unreleased/DX-20251117-160650.yaml
deleted file mode 100644
index f555554bc..000000000
--- a/.changes/unreleased/DX-20251117-160650.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: DX
-body: Use mkdocs with mkdocs-material instead of sphinx to build chill developer documentation
-time: 2025-11-17T16:06:50.46185765+01:00
-custom:
-    Issue: "386"
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/Feature-20251125-165811.yaml b/.changes/unreleased/Feature-20251125-165811.yaml
deleted file mode 100644
index 3cea3958e..000000000
--- a/.changes/unreleased/Feature-20251125-165811.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Feature
-body: Add a counter for invitations awaiting reply
-time: 2025-11-25T16:58:11.780678466+01:00
-custom:
-    Issue: "459"
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/Fixed-20251201-185859.yaml b/.changes/unreleased/Fixed-20251201-185859.yaml
deleted file mode 100644
index 989620ad9..000000000
--- a/.changes/unreleased/Fixed-20251201-185859.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Fixed
-body: Do not suggest a user that is no longer active in the activity form.
-time: 2025-12-01T18:58:59.410998029+01:00
-custom:
-    Issue: "475"
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/Fixed-20251203-113832.yaml b/.changes/unreleased/Fixed-20251203-113832.yaml
deleted file mode 100644
index 45adf3dc4..000000000
--- a/.changes/unreleased/Fixed-20251203-113832.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Fixed
-body: Remove double display of person id in the banner when there is a deathdate
-time: 2025-12-03T11:38:32.653635449+01:00
-custom:
-    Issue: "441"
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/UX-20251103-161910.yaml b/.changes/unreleased/UX-20251103-161910.yaml
deleted file mode 100644
index 5ef8ff4e9..000000000
--- a/.changes/unreleased/UX-20251103-161910.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: UX
-body: Display whether doc generation template is active or not in admin and order templates alphabetically
-time: 2025-11-03T16:19:10.051947925+01:00
-custom:
-    Issue: "456"
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/UX-20251124-164723.yaml b/.changes/unreleased/UX-20251124-164723.yaml
deleted file mode 100644
index 298cbc5ee..000000000
--- a/.changes/unreleased/UX-20251124-164723.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: UX
-body: Display calendar item info on cancel page
-time: 2025-11-24T16:47:23.020302054+01:00
-custom:
-    Issue: "460"
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/UX-20251125-150135.yaml b/.changes/unreleased/UX-20251125-150135.yaml
deleted file mode 100644
index f97ba7f0a..000000000
--- a/.changes/unreleased/UX-20251125-150135.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: UX
-body: Display entire comment for activity item within list
-time: 2025-11-25T15:01:35.558013876+01:00
-custom:
-    Issue: "424"
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/UX-20251126-133910.yaml b/.changes/unreleased/UX-20251126-133910.yaml
deleted file mode 100644
index 474e52fac..000000000
--- a/.changes/unreleased/UX-20251126-133910.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: UX
-body: Improve accessibility of event form
-time: 2025-11-26T13:39:10.462348982+01:00
-custom:
-    Issue: "474"
-    SchemaChange: No schema change
diff --git a/.changes/v4.9.0.md b/.changes/v4.9.0.md
new file mode 100644
index 000000000..89ba9de33
--- /dev/null
+++ b/.changes/v4.9.0.md
@@ -0,0 +1,14 @@
+## v4.9.0 - 2025-12-05
+### Feature
+* ([#459](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/459)) Add a counter for invitations awaiting reply   
+### Fixed
+* ([#475](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/475)) Do not suggest a user that is no longer active in the activity form.   
+* ([#441](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/441)) Remove double display of person id in the banner when there is a deathdate   
+### DX
+* ([#280](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/280)) Add missing fixtures for proper loading of AccompanyingPeriods   
+* ([#386](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/386)) Use mkdocs with mkdocs-material instead of sphinx to build chill developer documentation   
+### UX
+* ([#456](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/456)) Display whether doc generation template is active or not in admin and order templates alphabetically   
+* ([#460](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/460)) Display calendar item info on cancel page   
+* ([#424](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/424)) Display entire comment for activity item within list   
+* ([#474](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/474)) Improve accessibility of event form   
diff --git a/CHANGELOG.md b/CHANGELOG.md
index 7b83397f0..e4669a037 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,126 +6,143 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
+## v4.9.0 - 2025-12-05
+### Feature
+* ([#459](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/459)) Add a counter for invitations awaiting reply   
+### Fixed
+* ([#475](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/475)) Do not suggest a user that is no longer active in the activity form.   
+* ([#441](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/441)) Remove double display of person id in the banner when there is a deathdate   
+### DX
+* ([#280](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/280)) Add missing fixtures for proper loading of AccompanyingPeriods   
+* ([#386](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/386)) Use mkdocs with mkdocs-material instead of sphinx to build chill developer documentation   
+### UX
+* ([#456](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/456)) Display whether doc generation template is active or not in admin and order templates alphabetically   
+* ([#460](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/460)) Display calendar item info on cancel page   
+* ([#424](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/424)) Display entire comment for activity item within list   
+* ([#474](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/474)) Improve accessibility of event form   
+
 ## v4.8.2 - 2025-11-26
 ### Fixed
 * ([#466](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/466)) Associate activity's creator as a participant by default, and retro-actively append the creator to each activity
+   
+
   **Schema Change**: Add columns or tables
-* Fix template parameter for update_multiple route on event participations
+* Fix template parameter for update_multiple route on event participations   
 ### UX
-* ([#470](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/470)) Alphabetically order userJobs and mainLocations within user creation form
-* ([#437](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/437)) Change position and color of confirm parcours button
+* ([#470](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/470)) Alphabetically order userJobs and mainLocations within user creation form   
+* ([#437](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/437)) Change position and color of confirm parcours button   
 
 ## v4.8.1 - 2025-11-20
 ### Fixed
-* Insert name of file as the document title when uploading
-* Add missing path paramater 'id' for editing multiple participations
+* Insert name of file as the document title when uploading   
+* Add missing path paramater 'id' for editing multiple participations   
 * ([#471](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/471)) Hide the display of inactive user groups in the api
-
+   
 
 ## v4.8.0 - 2025-11-17
 ### Feature
-* ([#461](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/461)) Make a calendar item on the 'mes rendez-vous' page clickable. Clicking will navigate to the edit page of the calendar item.
+* ([#461](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/461)) Make a calendar item on the 'mes rendez-vous' page clickable. Clicking will navigate to the edit page of the calendar item.   
 ### Fixed
-* ([#463](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/463)) Display calendar items for which an invite was accepted on the mes rendez-vous page
+* ([#463](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/463)) Display calendar items for which an invite was accepted on the mes rendez-vous page   
 * Improve accessibility on login page
-
+   
 ### UX
-* ([#449](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/449)) Remove the label if there is only one scope and no scope picking field is displayed.
+* ([#449](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/449)) Remove the label if there is only one scope and no scope picking field is displayed.   
 
 ## v4.7.0 - 2025-11-10
 ### Feature
-* ([#385](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/385)) Create invitation list in user menu
-* ([#404](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/404)) Add columns for comments linked to an activity in the activity list export
+* ([#385](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/385)) Create invitation list in user menu   
+* ([#404](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/404)) Add columns for comments linked to an activity in the activity list export   
 ### Fixed
-* ([#451](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/451)) Fix: display also social actions linked to parents of the selected social issue
-* ([#453](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/453)) Fix: export actions and their results in csv even when action does not have any goals attached to it.
-* Fix the possibility to delete a workflow
+* ([#451](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/451)) Fix: display also social actions linked to parents of the selected social issue   
+* ([#453](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/453)) Fix: export actions and their results in csv even when action does not have any goals attached to it.   
+* Fix the possibility to delete a workflow   
 
   **Schema Change**: Drop or rename table or columns, or enforce new constraint that must be manually fixed
-* ([#457](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/457)) Fix the fusion of thirdparty properties that are located in another schema than public for TO_ONE relations + add extra loop for MANY_TO_MANY relations where thirdparty is the source instead of the target
-* ([#428](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/428)) Fix suggestion of referrer when creating notification for accompanyingPeriodWorkDocument
+* ([#457](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/457)) Fix the fusion of thirdparty properties that are located in another schema than public for TO_ONE relations + add extra loop for MANY_TO_MANY relations where thirdparty is the source instead of the target   
+* ([#428](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/428)) Fix suggestion of referrer when creating notification for accompanyingPeriodWorkDocument   
 ### DX
 * Send notifications log to dedicated channel, if it exists
-
+   
 ### UX
-* ([#425](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/425)) Change the terms 'cercle' and 'centre' to 'service', and 'territoire' respectively.
-* ([#542](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/542)) Improve the ux for selecting whether user wants to be notified of the final step of a workflow or all steps
-* Expand timeSpent choices for evaluation document and translate them to user locale or fallback 'fr'
-* ([#455](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/455)) Change the order of display for results and objectives in the social work/action form
-* Wrap text when it is too long within badges
+* ([#425](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/425)) Change the terms 'cercle' and 'centre' to 'service', and 'territoire' respectively.   
+* ([#542](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/542)) Improve the ux for selecting whether user wants to be notified of the final step of a workflow or all steps   
+* Expand timeSpent choices for evaluation document and translate them to user locale or fallback 'fr'   
+* ([#455](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/455)) Change the order of display for results and objectives in the social work/action form   
+* Wrap text when it is too long within badges   
 
 ## v4.6.1 - 2025-10-27
 ### Fixed
-* Fix export case where no 'reason' is picked within the PersonHavingActivityBetweenDateFilter.php
+* Fix export case where no 'reason' is picked within the PersonHavingActivityBetweenDateFilter.php   
 
 ## v4.6.0 - 2025-10-15
 ### Feature
-* ([#423](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/423)) Create environment banner that can be activated and configured depending on the image deployed
-* ([#394](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/394)) Only show active workflow on the page "my tracked workflow"
+* ([#423](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/423)) Create environment banner that can be activated and configured depending on the image deployed   
+* ([#394](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/394)) Only show active workflow on the page "my tracked workflow"   
 ### Fixed
-* Fix loading of classLists in SocialIssuesAcc.vue, ensure elements are present
-* Fix the rendering of list of StoredObjectVersions, where there are kept version (before converting to pdf) and intermediate versions deleted
-* ([#434](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/434)) Notification: fix editing of sent notification by removing form.addressesEmails, a field that no longer exists
-* Fix loading of social issues and social actions within vue component
-* ([#446](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/446)) Add unique condition on stored object filename, with cleaning step on existing duplicate filenames
+* Fix loading of classLists in SocialIssuesAcc.vue, ensure elements are present   
+* Fix the rendering of list of StoredObjectVersions, where there are kept version (before converting to pdf) and intermediate versions deleted   
+* ([#434](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/434)) Notification: fix editing of sent notification by removing form.addressesEmails, a field that no longer exists   
+* Fix loading of social issues and social actions within vue component   
+* ([#446](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/446)) Add unique condition on stored object filename, with cleaning step on existing duplicate filenames   
 
   **Schema Change**: Drop or rename table or columns, or enforce new constraint that must be manually fixed
-* [workflow] take permissions into account to delete the workflow attachment
-* ([#448](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/448)) Fix the execution of daily cronjob notification, when the previous last execution storage was invalid
+* [workflow] take permissions into account to delete the workflow attachment   
+* ([#448](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/448)) Fix the execution of daily cronjob notification, when the previous last execution storage was invalid   
 
 ## v4.5.1 - 2025-10-03
 ### Fixed
-* Add missing javascript dependency
-* Add exception handling for conversion of attachment on sending external, when documens are already in pdf
+* Add missing javascript dependency   
+* Add exception handling for conversion of attachment on sending external, when documens are already in pdf   
 
 ## v4.5.0 - 2025-10-03
 ### Feature
-* Only allow delete of attachment on workflows that are not final
-* Move up signature buttons on index workflow page for easier access
-* Filter out document from attachment list if it is the same as the workflow document
-* Block edition on attached document on workflow, if the workflow is finalized or sent external
-* Convert workflow's attached document to pdf while sending them external
-* After a signature is canceled or rejected, going to a waiting page until the post-process routines apply a workflow transition
+* Only allow delete of attachment on workflows that are not final   
+* Move up signature buttons on index workflow page for easier access   
+* Filter out document from attachment list if it is the same as the workflow document   
+* Block edition on attached document on workflow, if the workflow is finalized or sent external   
+* Convert workflow's attached document to pdf while sending them external   
+* After a signature is canceled or rejected, going to a waiting page until the post-process routines apply a workflow transition   
 ### Fixed
-* ([#426](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/426)) Increased the number of required characters when setting a new password in Chill from 9 to 14 - GDPR compliance
-* Fix permissions on storedObject which are subject by a workflow
+* ([#426](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/426)) Increased the number of required characters when setting a new password in Chill from 9 to 14 - GDPR compliance   
+* Fix permissions on storedObject which are subject by a workflow   
 ### DX
-* Introduce a WaitingScreen component to display a waiting screen
+* Introduce a WaitingScreen component to display a waiting screen   
 
 ## v4.4.2 - 2025-09-12
 ### Fixed
-* Fix document generation and workflow generation do not work on accompanying period work documents
+* Fix document generation and workflow generation do not work on accompanying period work documents   
 
 ## v4.4.1 - 2025-09-11
 ### Fixed
-* fix translations in duplicate evaluation document modal and realign close modal button
+* fix translations in duplicate evaluation document modal and realign close modal button   
 
 ## v4.4.0 - 2025-09-11
 ### Feature
-* ([#359](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/359)) Allow the merge of two accompanying period works
-* ([#369](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/369)) Duplication of a document to another accompanying period work evaluation
-* ([#359](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/359)) Fusion of two accompanying period works
+* ([#359](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/359)) Allow the merge of two accompanying period works   
+* ([#369](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/369)) Duplication of a document to another accompanying period work evaluation   
+* ([#359](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/359)) Fusion of two accompanying period works   
 ### Fixed
-* Fix display of 'duplicate' and 'merge' buttons in CRUD templates
-* Fix saving notification preferences in user's profile
+* Fix display of 'duplicate' and 'merge' buttons in CRUD templates   
+* Fix saving notification preferences in user's profile   
 
 ## v4.3.0 - 2025-09-08
 ### Feature
-* ([#409](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/409)) Add 45 and 60 min calendar ranges
-* Add a command to generate a list of permissions
-* ([#412](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/412)) Add an absence end date
+* ([#409](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/409)) Add 45 and 60 min calendar ranges   
+* Add a command to generate a list of permissions   
+* ([#412](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/412)) Add an absence end date   
 
   **Schema Change**: Add columns or tables
 ### Fixed
-* fix date formatting in calendar range display
-* Change route URL to avoid clash with person duplicate controller method
+* fix date formatting in calendar range display   
+* Change route URL to avoid clash with person duplicate controller method   
 
 ## v4.2.1 - 2025-09-03
 ### Fixed
-* Fix exports to work with DirectExportInterface
+* Fix exports to work with DirectExportInterface   
 ### DX
 * Improve error message when a stored object cannot be written on local disk
-
+   
 
 ## v4.2.0 - 2025-09-02
 ### Feature
@@ -140,26 +157,26 @@ and is generated by [Changie](https://github.com/miniscruff/changie).
 
 ## v4.1.0 - 2025-08-26
 ### Feature
-* ([#400](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/400)) Add filter to social actions list to filter out actions where current user intervenes
-* ([#399](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/399)) Show filters on list pages unfolded by default
-* Expansion of event module with new fields in the creation form: thematic, internal/external animator, responsable, and budget elements. Filtering options in the event list + adapted exports
+* ([#400](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/400)) Add filter to social actions list to filter out actions where current user intervenes   
+* ([#399](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/399)) Show filters on list pages unfolded by default   
+* Expansion of event module with new fields in the creation form: thematic, internal/external animator, responsable, and budget elements. Filtering options in the event list + adapted exports   
 
   **Schema Change**: Add columns or tables
 ### Fixed
-* ([#382](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/382)) adjust display logic for accompanying period dates, include closing date if period is closed.
-* ([#384](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/384)) add min and step attributes to integer field in DateIntervalType
+* ([#382](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/382)) adjust display logic for accompanying period dates, include closing date if period is closed.   
+* ([#384](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/384)) add min and step attributes to integer field in DateIntervalType   
 ### UX
-* Limit display of participations in event list
+* Limit display of participations in event list   
 
 ## v4.0.2 - 2025-07-09
 ### Fixed
-* Fix add missing translation
-* Fix the transfer of evaluations and documents during of accompanyingperiodwork
+* Fix add missing translation   
+* Fix the transfer of evaluations and documents during of accompanyingperiodwork   
 
 ## v4.0.1 - 2025-07-08
 ### Fixed
 * Fix package.json for compilation
-
+   
 
 ## v4.0.0 - 2025-07-08
 ### Feature
@@ -238,30 +255,30 @@ framework:
 
 ## v3.12.1 - 2025-06-30
 ### Fixed
-* Fix loading of the list of documents
+* Fix loading of the list of documents   
 
 ## v3.12.0 - 2025-06-30
 ### Feature
-* ([#377](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/377)) Add the document file name to the document title when a user upload a document, unless there is already a document title.
-* Add desactivation date for social action and issue csv export
-* Add Emoji and Fullscreen feature to ckeditor configuration
-* ([#321](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/321)) Create editor which allow us to toggle between rich and simple text editor
-* Do not remove workflow which are automatically canceled after staling for more than 30 days
+* ([#377](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/377)) Add the document file name to the document title when a user upload a document, unless there is already a document title.   
+* Add desactivation date for social action and issue csv export   
+* Add Emoji and Fullscreen feature to ckeditor configuration   
+* ([#321](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/321)) Create editor which allow us to toggle between rich and simple text editor   
+* Do not remove workflow which are automatically canceled after staling for more than 30 days   
 ### Fixed
-* ([#376](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/376)) trying to prevent bug of typeerror in doc-history + improved display of document history
-* ([#381](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/381)) Display previous participation in acc course work even if the person has left the acc course
-* ([#372](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/372)) Fix display of text in calendar events
-* Add missing translation for user_group.no_user_groups
-* Fix admin entity edit actions for event admin entities and activity reason (category) entities
+* ([#376](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/376)) trying to prevent bug of typeerror in doc-history + improved display of document history   
+* ([#381](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/381)) Display previous participation in acc course work even if the person has left the acc course   
+* ([#372](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/372)) Fix display of text in calendar events   
+* Add missing translation for user_group.no_user_groups   
+* Fix admin entity edit actions for event admin entities and activity reason (category) entities   
 * ([#392](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/392)) Allow null and cast as string to setContent method for NewsItem
-
-* ([#393](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/393)) Doc Generation: the "dump only" method send the document as an email attachment.
+   
+* ([#393](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/393)) Doc Generation: the "dump only" method send the document as an email attachment.   
 ### DX
-* ([#352](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/352)) Remove dead code for wopi-link module
-* Replace library node-sass by sass, and upgrade bootstrap to version 5.3 (yarn upgrade / install is required)
+* ([#352](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/352)) Remove dead code for wopi-link module   
+* Replace library node-sass by sass, and upgrade bootstrap to version 5.3 (yarn upgrade / install is required)   
 ### UX
-* ([#374](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/374)) Remove default filter in_progress for the page 'my tasks'; Allows for new tasks to be displayed upon opening of the page
-* Improve labeling of fields in person resource creation form
+* ([#374](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/374)) Remove default filter in_progress for the page 'my tasks'; Allows for new tasks to be displayed upon opening of the page   
+* Improve labeling of fields in person resource creation form   
 
 ## v3.11.0 - 2025-04-17
 ### Feature
@@ -285,11 +302,11 @@ framework:
 
 ## v3.10.3 - 2025-03-18
 ### DX
-* Eslint fixes
+* Eslint fixes   
 
 ## v3.10.2 - 2025-03-17
 ### Fixed
-* Replace a ts-expect-error with a ts-ignore
+* Replace a ts-expect-error with a ts-ignore   
 
 ## v3.10.1 - 2025-03-17
 ### DX
@@ -297,37 +314,37 @@ framework:
 
 ## v3.10.0 - 2025-03-17
 ### Feature
-* ([#363](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/363)) Display social actions grouped per social issue within activity form
+* ([#363](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/363)) Display social actions grouped per social issue within activity form   
 ### Fixed
-* ([#362](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/362)) Fix Dependency Injection, which prevented to save the CalendarRange
-* ([#368](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/368)) fix search query for user groups
+* ([#362](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/362)) Fix Dependency Injection, which prevented to save the CalendarRange   
+* ([#368](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/368)) fix search query for user groups   
 
 ## v3.9.2 - 2025-02-27
 ### Fixed
-* Use fetchResults method to fetch all social issues instead of only the first page
+* Use fetchResults method to fetch all social issues instead of only the first page   
 
 ## v3.9.1 - 2025-02-27
 ### Fixed
-* Fix post/patch request with missing 'type' property for gender
+* Fix post/patch request with missing 'type' property for gender   
 
 ## v3.9.0 - 2025-02-27
 ### Feature
-* ([#349](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/349)) Suggest all referrers within actions of the accompanying period when creating an activity
-* ([#343](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/343)) Add possibility to export a csv with all social issues and social actions
-* ([#360](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/360)) Restore document to previous kept version when a workflow is canceled
-* ([#341](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/341)) Add a list of third parties from within the admin (csv download)
+* ([#349](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/349)) Suggest all referrers within actions of the accompanying period when creating an activity   
+* ([#343](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/343)) Add possibility to export a csv with all social issues and social actions   
+* ([#360](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/360)) Restore document to previous kept version when a workflow is canceled   
+* ([#341](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/341)) Add a list of third parties from within the admin (csv download)   
 ### Fixed
-* fix generation of document with accompanying period context, and list of activities and works
+* fix generation of document with accompanying period context, and list of activities and works   
 ### DX
-* ([#333](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/333)) Create an unique source of trust for translations
+* ([#333](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/333)) Create an unique source of trust for translations   
 
 ## v3.8.2 - 2025-02-10
 ### Fixed
-* ([#358](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/358)) Remove "filter" button on list of documents in the workflow's "add attachement" modal
+* ([#358](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/358)) Remove "filter" button on list of documents in the workflow's "add attachement" modal   
 
 ## v3.8.1 - 2025-02-05
 ### Fixed
-* Fix household link in the parcours banner
+* Fix household link in the parcours banner   
 
 ## v3.8.0 - 2025-02-03
 ### Feature
@@ -343,7 +360,7 @@ framework:
 
 ## v3.7.1 - 2025-01-21
 ### Fixed
-* Fix legacy configuration processor for notifier component
+* Fix legacy configuration processor for notifier component   
 
 ## v3.7.0 - 2025-01-21
 ### Feature
@@ -410,33 +427,33 @@ chill_main:
 
 ## v3.6.0 - 2025-01-16
 ### Feature
-* Importer for addresses does not fails when the postal code is not found with some addresses, and compute a recap list of all addresses that could not be imported. This recap list can be send by email.
+* Importer for addresses does not fails when the postal code is not found with some addresses, and compute a recap list of all addresses that could not be imported. This recap list can be send by email. 
 * ([#346](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/346)) Create a driver for storing documents on disk (instead of openstack object store)
-
-* Add address importer from french Base d'Adresse Nationale (BAN)
-* ([#343](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/343)) Add csv export for social issues and social actions
+ 
+* Add address importer from french Base d'Adresse Nationale (BAN) 
+* ([#343](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/343)) Add csv export for social issues and social actions 
 ### Fixed
-* Export: fix missing alias in activity between certain dates filter. Condition added for alias.
+* Export: fix missing alias in activity between certain dates filter. Condition added for alias. 
 
 ## v3.5.3 - 2025-01-07
 ### Fixed
-* Fix the EntityToJsonTransformer to return an empty array if the value is ""
+* Fix the EntityToJsonTransformer to return an empty array if the value is "" 
 
 ## v3.5.2 - 2024-12-19
 ### Fixed
-* ([#345](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/345)) Export: activity filtering of users that were associated to an activity between certain dates. Results contained activities that were not within the specified date range"
+* ([#345](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/345)) Export: activity filtering of users that were associated to an activity between certain dates. Results contained activities that were not within the specified date range" 
 
 ## v3.5.1 - 2024-12-16
 ### Fixed
-* Filiation: fix the display of the gender label in the graph
-* Wrap handling of PdfSignedMessage into transactions
+* Filiation: fix the display of the gender label in the graph 
+* Wrap handling of PdfSignedMessage into transactions 
 
 ## v3.5.0 - 2024-12-09
 ### Feature
-* ([#318](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/318)) Show all the pages of the documents in the signature app
+* ([#318](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/318)) Show all the pages of the documents in the signature app 
 ### Fixed
-* Wrap the signature's change state into a transaction, to avoid race conditions
-* Fix display of gender label
+* Wrap the signature's change state into a transaction, to avoid race conditions 
+* Fix display of gender label 
 
 ## v3.4.3 - 2024-12-05
 ### Fixed
@@ -445,76 +462,76 @@ chill_main:
 
 ## v3.4.2 - 2024-12-05
 ### Fixed
-* ([#329](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/329)) Fix the serialization of gender for the generation of documents
-* ([#337](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/337)) Enforce unique contraint on activity storedobject
+* ([#329](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/329)) Fix the serialization of gender for the generation of documents 
+* ([#337](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/337)) Enforce unique contraint on activity storedobject 
 ### DX
-* ([#310](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/310)) Clean migrations, to reduce the number of bloated migration when running diff on schema
+* ([#310](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/310)) Clean migrations, to reduce the number of bloated migration when running diff on schema 
 
 ## v3.4.1 - 2024-11-22
 ### Fixed
-* Set the workflow's title to notification content and subject
+* Set the workflow's title to notification content and subject 
 
 ## v3.4.0 - 2024-11-20
 ### Feature
 * ([#314](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/314)) Admin: improve document type admin form with a select field for related class.
-Admin: Allow administrator to assign multiple group centers in one go to a user.
+Admin: Allow administrator to assign multiple group centers in one go to a user. 
 
 ## v3.3.0 - 2024-11-20
 ### Feature
 * Electronic signature
 
-Implementation of the electronic signature for documents within chill.
-* ([#286](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/286)) The behavoir of the voters for stored objects is adjusted so as to limit edit and delete possibilities to users related to the activity, social action or workflow entity.
-* ([#288](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/288)) Metadata form added for person signatures
-* Add a signature step in workflow, which allow to apply an electronic signature on documents
-* Keep an history of each version of a stored object.
-* Add a "send external" step in workflow, which allow to send stored objects and other elements to remote people, by sending them a public url
+Implementation of the electronic signature for documents within chill. 
+* ([#286](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/286)) The behavoir of the voters for stored objects is adjusted so as to limit edit and delete possibilities to users related to the activity, social action or workflow entity. 
+* ([#288](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/288)) Metadata form added for person signatures 
+* Add a signature step in workflow, which allow to apply an electronic signature on documents 
+* Keep an history of each version of a stored object. 
+* Add a "send external" step in workflow, which allow to send stored objects and other elements to remote people, by sending them a public url 
 ### Fixed
-* Adjust household list export to include households even if their address is NULL
-* Remove validation of date string on deathDate
+* Adjust household list export to include households even if their address is NULL 
+* Remove validation of date string on deathDate 
 
 ## v3.2.4 - 2024-11-06
 ### Fixed
-* Fix compilation of chill assets
+* Fix compilation of chill assets 
 
 ## v3.2.3 - 2024-11-05
 ### Fixed
 * ([#315](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/315)) Fix display of accompanying period work referrers. Only current referrers should be displayed.
-Fix color of Chill footer
+Fix color of Chill footer 
 
 ## v3.2.2 - 2024-10-31
 ### Fixed
-* Fix gender translation for unknown
+* Fix gender translation for unknown 
 
 ## v3.2.1 - 2024-10-31
 ### Fixed
-* Add the possibility of unknown to the gender entity
-* Fix the fusion of person doubles by excluding accompanyingPeriod work entities to be deleted. They are moved instead.
+* Add the possibility of unknown to the gender entity 
+* Fix the fusion of person doubles by excluding accompanyingPeriod work entities to be deleted. They are moved instead. 
 
 ## v3.2.0 - 2024-10-30
 ### Feature
-* Introduce a gender entity
+* Introduce a gender entity 
 
 ## v3.1.1 - 2024-10-01
 ### Fixed
-* ([#308](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/308)) Show only the current referrer in the page "show" for an accompanying period workf
+* ([#308](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/308)) Show only the current referrer in the page "show" for an accompanying period workf 
 * ([#309](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/309)) Correctly compute the grouping by referrer aggregator
-
-* Fixed typing of custom field long choice and custom field group
+ 
+* Fixed typing of custom field long choice and custom field group 
 
 ## v3.1.0 - 2024-08-30
 ### Feature
-* Add export aggregator to aggregate activities by household + filter persons that are not part of an accompanyingperiod during a certain timeframe.
+* Add export aggregator to aggregate activities by household + filter persons that are not part of an accompanyingperiod during a certain timeframe. 
 
 ## v3.0.0 - 2024-08-26
 ### Fixed
-* Fix delete action for accompanying periods in draft state
-* Fix connection to azure when making an calendar event in chill
-* CollectionType js fixes for remove button and adding multiple entries
+* Fix delete action for accompanying periods in draft state 
+* Fix connection to azure when making an calendar event in chill 
+* CollectionType js fixes for remove button and adding multiple entries 
 
 ## v2.24.0 - 2024-09-11
 ### Feature
-* ([#306](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/306)) When a document is converted or downloaded in the browser, this document is removed from the browser memory after 45s. Future click on the button re-download the document.
+* ([#306](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/306)) When a document is converted or downloaded in the browser, this document is removed from the browser memory after 45s. Future click on the button re-download the document. 
 
 ## v2.23.0 - 2024-07-23 & 2024-07-19
 ### Feature
@@ -549,13 +566,13 @@ Fix color of Chill footer
 
 ## v2.22.2 - 2024-07-03
 ### Fixed
-* Remove scope required for event participation stats
+* Remove scope required for event participation stats 
 
 ## v2.22.1 - 2024-07-01
 ### Fixed
-* Remove debug word
+* Remove debug word 
 ### DX
-* Add a command for reading official address DB from Luxembourg and update chill addresses
+* Add a command for reading official address DB from Luxembourg and update chill addresses 
 
 ## v2.22.0 - 2024-06-25
 ### Feature
@@ -598,7 +615,7 @@ Fix color of Chill footer
 
 ## v2.20.1 - 2024-06-05
 ### Fixed
-* Do not allow StoredObjectCreated for edit and convert buttons
+* Do not allow StoredObjectCreated for edit and convert buttons 
 
 ## v2.20.0 - 2024-06-05
 ### Fixed
@@ -645,96 +662,96 @@ Fix color of Chill footer
 
 ## v2.18.2 - 2024-04-12
 ### Fixed
-* ([#250](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/250)) Postal codes import : fix the source URL and the keys to handle each record
+* ([#250](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/250)) Postal codes import : fix the source URL and the keys to handle each record 
 
 ## v2.18.1 - 2024-03-26
 ### Fixed
-* Fix layout issue in document generation for admin (minor)
+* Fix layout issue in document generation for admin (minor) 
 
 ## v2.18.0 - 2024-03-26
 ### Feature
-* ([#268](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/268)) Improve admin UX to configure document templates for document generation
+* ([#268](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/268)) Improve admin UX to configure document templates for document generation 
 ### Fixed
-* ([#267](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/267)) Fix the join between job and user in the user list (admin): show only the current user job
+* ([#267](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/267)) Fix the join between job and user in the user list (admin): show only the current user job 
 
 ## v2.17.0 - 2024-03-19
 ### Feature
-* ([#237](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/237)) New export filter for social actions with an evaluation created between two dates
-* ([#258](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/258)) In the list of accompangying period, add the list of person's centers and the duration of the course
-* ([#238](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/238)) Allow to customize list person with new fields
+* ([#237](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/237)) New export filter for social actions with an evaluation created between two dates 
+* ([#258](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/258)) In the list of accompangying period, add the list of person's centers and the duration of the course 
+* ([#238](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/238)) Allow to customize list person with new fields 
 * ([#159](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/159)) Admin can publish news on the homepage
 ### Fixed
-* ([#264](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/264)) Fix languages: load the languages in all availables languages configured for Chill
-* ([#259](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/259)) Keep a consistent behaviour between the filtering of activities within the document generation (model "accompanying period with activities"), and the same filter in the list of activities for an accompanying period
+* ([#264](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/264)) Fix languages: load the languages in all availables languages configured for Chill 
+* ([#259](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/259)) Keep a consistent behaviour between the filtering of activities within the document generation (model "accompanying period with activities"), and the same filter in the list of activities for an accompanying period 
 
 ## v2.16.3 - 2024-02-26
 ### Fixed
-* ([#236](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/236)) Fix translation of user job -> 'service' must be 'métier'
+* ([#236](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/236)) Fix translation of user job -> 'service' must be 'métier' 
 ### UX
-* ([#232](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/232)) Order user jobs and services alphabetically in export filters
+* ([#232](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/232)) Order user jobs and services alphabetically in export filters 
 
 ## v2.16.2 - 2024-02-21
 ### Fixed
-* Check for null values in closing motive of parcours d'accompagnement for correct rendering of template
+* Check for null values in closing motive of parcours d'accompagnement for correct rendering of template 
 
 ## v2.16.1 - 2024-02-09
 ### Fixed
-* Force bootstrap version to avoid error in builds with newer version
+* Force bootstrap version to avoid error in builds with newer version 
 
 ## v2.16.0 - 2024-02-08
 ### Feature
-* ([#231](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/231)) Create new filter for persons having a participation in an accompanying period during a certain time span
-* ([#241](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/241)) [Export][List of accompanyign period] Add two columns: the list of persons participating to the period, and their ids
-* ([#244](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/244)) Add capability to generate export about change of steps of accompanying period, and generate exports for this
-* ([#253](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/253)) Export: group accompanying period by person participating
-* ([#243](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/243)) Export: add filter for courses not linked to a reference address
-* ([#229](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/229)) Allow to group activities linked with accompanying period by reason
-* ([#115](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/115)) Prevent social work to be saved when another user edited conccurently the social work
-* Modernize the event bundle, with some new fields and multiple improvements
+* ([#231](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/231)) Create new filter for persons having a participation in an accompanying period during a certain time span 
+* ([#241](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/241)) [Export][List of accompanyign period] Add two columns: the list of persons participating to the period, and their ids 
+* ([#244](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/244)) Add capability to generate export about change of steps of accompanying period, and generate exports for this 
+* ([#253](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/253)) Export: group accompanying period by person participating 
+* ([#243](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/243)) Export: add filter for courses not linked to a reference address 
+* ([#229](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/229)) Allow to group activities linked with accompanying period by reason 
+* ([#115](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/115)) Prevent social work to be saved when another user edited conccurently the social work 
+* Modernize the event bundle, with some new fields and multiple improvements 
 ### Fixed
-* ([#220](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/220)) Fix error in logs about wrong typing of eventArgs in onEditNotificationComment method
-* ([#256](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/256)) Fix the conditions upon which social actions should be optional or required in relation to social issues within the activity creation form
+* ([#220](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/220)) Fix error in logs about wrong typing of eventArgs in onEditNotificationComment method 
+* ([#256](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/256)) Fix the conditions upon which social actions should be optional or required in relation to social issues within the activity creation form 
 ### UX
-* ([#260](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/260)) Order list of centers alphabetically in dropdown 'user' section admin.
+* ([#260](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/260)) Order list of centers alphabetically in dropdown 'user' section admin. 
 
 ## v2.15.2 - 2024-01-11
 ### Fixed
-* Fix the id_seq used when creating a new accompanying period participation during fusion of two person files
+* Fix the id_seq used when creating a new accompanying period participation during fusion of two person files 
 ### DX
-* Set placeholder to False for expanded EntityType form fields where required is set to False.
+* Set placeholder to False for expanded EntityType form fields where required is set to False. 
 
 ## v2.15.1 - 2023-12-20
 ### Fixed
-* Fix the household export query to exclude accompanying periods that are in draft state.
+* Fix the household export query to exclude accompanying periods that are in draft state. 
 ### DX
-* ([#167](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/167)) Fixed readthedocs compilation by updating readthedocs config file and requirements for Sphinx
+* ([#167](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/167)) Fixed readthedocs compilation by updating readthedocs config file and requirements for Sphinx 
 
 ## v2.15.0 - 2023-12-11
 ### Feature
-* ([#191](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/191)) Add export "number of household associate with an exchange"
-* ([#235](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/235)) Export: add dates on the filter "filter course by activity type"
+* ([#191](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/191)) Add export "number of household associate with an exchange" 
+* ([#235](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/235)) Export: add dates on the filter "filter course by activity type" 
 ### Fixed
-* ([#214](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/214)) Fix error when posting an empty comment on an accompanying period.
-* ([#233](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/233)) Fix "filter evaluation by evaluation type" (and add select2 to the list of evaluation types to pick)
+* ([#214](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/214)) Fix error when posting an empty comment on an accompanying period. 
+* ([#233](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/233)) Fix "filter evaluation by evaluation type" (and add select2 to the list of evaluation types to pick) 
 * ([#234](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/234)) Fix "filter aside activity by date"
-
-* ([#228](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/228)) Fix export of activity for people created before the introduction of the createdAt column on person (during v1)
-* ([#246](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/246)) Do not show activities, evaluations and social work when associated to a confidential accompanying period, except for the users which are allowed to see them
+ 
+* ([#228](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/228)) Fix export of activity for people created before the introduction of the createdAt column on person (during v1) 
+* ([#246](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/246)) Do not show activities, evaluations and social work when associated to a confidential accompanying period, except for the users which are allowed to see them 
 
 ## v2.14.1 - 2023-11-29
 ### Fixed
-* Export: fix list person with custom fields
-* ([#100](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/100)) Add a paginator to budget elements (resource and charge types) in the admin
-* Fix error in ListEvaluation when "handling agents" are alone
+* Export: fix list person with custom fields 
+* ([#100](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/100)) Add a paginator to budget elements (resource and charge types) in the admin 
+* Fix error in ListEvaluation when "handling agents" are alone 
 
 ## v2.14.0 - 2023-11-24
 ### Feature
-* ([#161](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/161)) Export: in filter "Filter accompanying period work (social action) by type, goal and result", order the items alphabetically or with the defined order
+* ([#161](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/161)) Export: in filter "Filter accompanying period work (social action) by type, goal and result", order the items alphabetically or with the defined order 
 ### Fixed
-* ([#141](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/141)) Export: on filter "action by type goals, and results", restore the fields when editing a saved export
-* ([#219](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/219)) Export: fix the list of accompanying period work, when the "calc date" is null
-* ([#222](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/222)) Fix rendering of custom fields
-* Fix various errors in custom fields administration
+* ([#141](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/141)) Export: on filter "action by type goals, and results", restore the fields when editing a saved export 
+* ([#219](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/219)) Export: fix the list of accompanying period work, when the "calc date" is null 
+* ([#222](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/222)) Fix rendering of custom fields 
+* Fix various errors in custom fields administration 
 
 ## v2.13.0 - 2023-11-21
 ### Feature
@@ -748,7 +765,7 @@ Fix color of Chill footer
 
 ## v2.12.1 - 2023-11-16
 ### Fixed
-* ([#208](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/208)) Export: fix loading of form for "filter action by type, goal and result"
+* ([#208](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/208)) Export: fix loading of form for "filter action by type, goal and result" 
 
 ## v2.12.0 - 2023-11-15
 ### Feature
@@ -779,36 +796,36 @@ Fix color of Chill footer
 
 ## v2.11.0 - 2023-11-07
 ### Feature
-* ([#194](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/194)) Export: add a filter "filter activity by creator job"
+* ([#194](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/194)) Export: add a filter "filter activity by creator job" 
 ### Fixed
-* ([#185](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/185)) Export: fix "group accompanying period by geographical unit": take into account the accompanying periods when the period is not located within an unit
-* Fix "group activity by creator job" aggregator
+* ([#185](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/185)) Export: fix "group accompanying period by geographical unit": take into account the accompanying periods when the period is not located within an unit 
+* Fix "group activity by creator job" aggregator 
 
 ## v2.10.6 - 2023-11-07
 ### Fixed
-* ([#182](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/182)) Fix merging of double person files. Adjustement relationship sql statement
-* ([#185](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/185)) Export: fix aggregator by geographical unit on person: avoid inconsistencies
+* ([#182](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/182)) Fix merging of double person files. Adjustement relationship sql statement 
+* ([#185](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/185)) Export: fix aggregator by geographical unit on person: avoid inconsistencies 
 
 ## v2.10.5 - 2023-11-05
 ### Fixed
-* ([#183](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/183)) Fix "problem during download" on some filters, which used a wrong data type
-* ([#184](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/184)) Fix filter "activity by date"
+* ([#183](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/183)) Fix "problem during download" on some filters, which used a wrong data type 
+* ([#184](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/184)) Fix filter "activity by date" 
 
 ## v2.10.4 - 2023-10-26
 ### Fixed
-* Fix null value constraint errors when merging relationships in doubles
+* Fix null value constraint errors when merging relationships in doubles 
 
 ## v2.10.3 - 2023-10-26
 ### Fixed
-* ([#175](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/175)) Replace old method of getting translator with injection of translatorInterface
+* ([#175](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/175)) Replace old method of getting translator with injection of translatorInterface 
 
 ## v2.10.2 - 2023-10-26
 ### Fixed
-* ([#175](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/175)) Use injection of translator instead of ->get().
+* ([#175](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/175)) Use injection of translator instead of ->get(). 
 
 ## v2.10.1 - 2023-10-24
 ### Fixed
-* Fix export controller when generating an export without any data in session
+* Fix export controller when generating an export without any data in session 
 
 ## v2.10.0 - 2023-10-24
 ### Feature
@@ -833,11 +850,11 @@ Fix color of Chill footer
 
 ## v2.9.2 - 2023-10-17
 ### Fixed
-* Fix possible null values in string's entities
+* Fix possible null values in string's entities 
 
 ## v2.9.1 - 2023-10-17
 ### Fixed
-* Fix the handling of activity form when editing or creating an activity in an accompanying period with multiple centers
+* Fix the handling of activity form when editing or creating an activity in an accompanying period with multiple centers 
 
 ## v2.9.0 - 2023-10-17
 ### Feature
@@ -885,57 +902,57 @@ But if you do not need this any more, you must ensure that the configuration key
 
 ## v2.7.0 - 2023-09-27
 ### Feature
-* ([#155](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/155)) The regulation list load accompanying periods by exact postal code (address associated with postal code), and not by the content of the postal code (postal code with same code's string)
+* ([#155](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/155)) The regulation list load accompanying periods by exact postal code (address associated with postal code), and not by the content of the postal code (postal code with same code's string) 
 ### Fixed
-* ([#142](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/142)) Fix the label of filter ActivityTypeFilter to a more obvious one
-* ([#140](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/140)) [export] Fix association of filter "filter location by type" which did not appears on "list of activities"
+* ([#142](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/142)) Fix the label of filter ActivityTypeFilter to a more obvious one 
+* ([#140](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/140)) [export] Fix association of filter "filter location by type" which did not appears on "list of activities" 
 
 ## v2.6.3 - 2023-09-19
 ### Fixed
-* Remove id property from document
-mappedsuperclass
+* Remove id property from document 
+mappedsuperclass 
 
 ## v2.6.2 - 2023-09-18
 ### Fixed
-* Fix doctrine mapping of AbstractTaskPlaceEvent and SingleTaskPlaceEvent: id property moved.
+* Fix doctrine mapping of AbstractTaskPlaceEvent and SingleTaskPlaceEvent: id property moved. 
 
 ## v2.6.1 - 2023-09-14
 ### Fixed
-* Filter out active centers in exports, which uses a different PickCenterType.
+* Filter out active centers in exports, which uses a different PickCenterType. 
 
 ## v2.6.0 - 2023-09-14
 ### Feature
-* ([#133](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/133)) Add locations in Aside Activity. By default, suggest user location, otherwise a select with all locations.
-* ([#133](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/133)) Adapt Aside Activity exports: display location, filter by location, group by location
-* Use the CRUD controller for center entity + add the isActive property to be able to mask instances of Center that are no longer in use.
+* ([#133](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/133)) Add locations in Aside Activity. By default, suggest user location, otherwise a select with all locations. 
+* ([#133](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/133)) Adapt Aside Activity exports: display location, filter by location, group by location 
+* Use the CRUD controller for center entity + add the isActive property to be able to mask instances of Center that are no longer in use. 
 ### Fixed
-* ([#107](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/107)) reinstate the fusion of duplicate persons
-* Missing translation in Work Actions exports
-* Reimplement the mission type filter on tasks, only for instances that have a config parameter indicating true for this.
-* ([#135](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/135)) Corrects a typing error in 2 filters, which caused an
+* ([#107](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/107)) reinstate the fusion of duplicate persons 
+* Missing translation in Work Actions exports 
+* Reimplement the mission type filter on tasks, only for instances that have a config parameter indicating true for this. 
+* ([#135](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/135)) Corrects a typing error in 2 filters, which caused an 
 error when trying to reedit a saved export
 
-
-* ([#136](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/136)) [household] when moving a person to a sharing position to a not-sharing position on the same household on the same date, remove the previous household membership on the same household. This fix duplicate member.
+ 
+* ([#136](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/136)) [household] when moving a person to a sharing position to a not-sharing position on the same household on the same date, remove the previous household membership on the same household. This fix duplicate member. 
 * Add missing translation for comment field placeholder in repositionning household editor.
-
-* Do not send an email to creator twice when adding a comment to a notification
-* ([#107](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/107)) Fix gestion doublon functionality to work with chill bundles v2
+ 
+* Do not send an email to creator twice when adding a comment to a notification 
+* ([#107](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/107)) Fix gestion doublon functionality to work with chill bundles v2 
 ### UX
 * Uniformize badge-person in household banner (background, size)
-
+ 
 
 ## v2.5.3 - 2023-07-20
 ### Fixed
-* ([#132](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/132)) Rendez-vous documents created would appear in all documents lists of all persons with an accompanying period. Or statements are now added to the where clause to filter out documents that come from unrelated accompanying period/ or person rendez-vous.
+* ([#132](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/132)) Rendez-vous documents created would appear in all documents lists of all persons with an accompanying period. Or statements are now added to the where clause to filter out documents that come from unrelated accompanying period/ or person rendez-vous. 
 
 ## v2.5.2 - 2023-07-15
 ### Fixed
-* [Collate Address] when updating address point, do not use the point's address reference if the similarity is below the requirement for associating the address reference and the address (it uses the postcode's center instead)
+* [Collate Address] when updating address point, do not use the point's address reference if the similarity is below the requirement for associating the address reference and the address (it uses the postcode's center instead) 
 
 ## v2.5.1 - 2023-07-14
 ### Fixed
-* [collate addresses] block collating addresses to another address reference where the address reference is already the best match
+* [collate addresses] block collating addresses to another address reference where the address reference is already the best match 
 
 ## v2.5.0 - 2023-07-14
 ### Feature

From e82cee2ce115b240452cecec6252a01d7242e55a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 5 Dec 2025 17:11:23 +0100
Subject: [PATCH 254/283] convert content to markdown

---
 .../source/development/create-a-new-bundle.md | 134 ++++++++----------
 1 file changed, 60 insertions(+), 74 deletions(-)

diff --git a/docs/source/development/create-a-new-bundle.md b/docs/source/development/create-a-new-bundle.md
index 8206acee8..7d942ac28 100644
--- a/docs/source/development/create-a-new-bundle.md
+++ b/docs/source/development/create-a-new-bundle.md
@@ -1,104 +1,90 @@
-.. Copyright (C)  2014 Champs Libres Cooperative SCRLFS
-   Permission is granted to copy, distribute and/or modify this document
-   under the terms of the GNU Free Documentation License, Version 1.3
-   or any later version published by the Free Software Foundation;
-   with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-   A copy of the license is included in the section entitled "GNU
-   Free Documentation License".
+# Create a new bundle {#create-new-bundle}
 
-.. _create-new-bundle:
+:::: warning
+::: title
+Warning
+:::
 
-Create a new bundle
-*******************
+This part of the doc is not yet tested
+::::
 
-.. warning::
+## Create a new directory with Bundle class
 
-    This part of the doc is not yet tested
-
-Create a new directory with Bundle class
-----------------------------------------
-
-.. code-block:: bash
-
-   mkdir -p src/Bundle/ChillSomeBundle/src/config
-   mkdir -p src/Bundle/ChillSomeBundle/src/Controller
+``` bash
+mkdir -p src/Bundle/ChillSomeBundle/src/config
+mkdir -p src/Bundle/ChillSomeBundle/src/Controller
+```
 
 Add a bundle file
 
-.. code-block:: php
+``` php
+<?php
 
-    <?php
+declare(strict_types=1);
 
-    declare(strict_types=1);
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
 
-    /*
-     * Chill is a software for social workers
-     *
-     * For the full copyright and license information, please view
-     * the LICENSE file that was distributed with this source code.
-     */
+namespace Chill\SomeBundle;
 
-    namespace Chill\SomeBundle;
+use Symfony\Component\HttpKernel\Bundle\Bundle;
 
-    use Symfony\Component\HttpKernel\Bundle\Bundle;
-
-    class ChillSomeBundle extends Bundle {}
+class ChillSomeBundle extends Bundle {}
+```
 
 And a route file:
 
-.. code-block:: yaml
+``` yaml
+chill_ticket_controller:
+    resource: '@ChillTicketBundle/Controller/'
+    type: annotation
+```
 
-   chill_ticket_controller:
-       resource: '@ChillTicketBundle/Controller/'
-       type: annotation
-
-Register the new psr-4 namespace
---------------------------------
+## Register the new psr-4 namespace
 
 In composer.json, add the new psr4 namespace
 
-.. code-block:: diff
-
-    {
-    "autoload": {
-        "psr-4": {
-    +        "Chill\\SomeBundle\\": "src/Bundle/ChillSomeBundle/src",
-        }
-    }
+``` diff
+{
+"autoload": {
+    "psr-4": {
++        "Chill\\SomeBundle\\": "src/Bundle/ChillSomeBundle/src",
     }
+}
+}
+```
 
+## Register the bundle
 
-Register the bundle
--------------------
+Register in the file `config/bundles.php`:
 
-Register in the file :code:`config/bundles.php`:
+``` php
+Vendor\Bundle\YourBundle\YourBundle::class => ['all' => true],
+```
 
-.. code-block:: php
+And import routes in `config/routes/chill_some_bundle.yaml`:
 
-    Vendor\Bundle\YourBundle\YourBundle::class => ['all' => true],
+``` yaml
+chill_ticket_bundle:
+    resource: '@ChillSomeBundle/config/routes.yaml'
+```
 
-And import routes in :code:`config/routes/chill_some_bundle.yaml`:
+## Add the doctrine_migration namespace
 
-.. code-block:: yaml
+Add the namespace to `config/packages/doctrine_migrations_chill.yaml`
 
-   chill_ticket_bundle:
-       resource: '@ChillSomeBundle/config/routes.yaml'
+``` diff
+doctrine_migrations:
+    migrations_paths:
++        'Chill\Some\Ticket': '@ChillSomeBundle/migrations'
+```
 
-Add the doctrine_migration namespace
-------------------------------------
-
-Add the namespace to :code:`config/packages/doctrine_migrations_chill.yaml`
-
-.. code-block:: diff
-
-   doctrine_migrations:
-       migrations_paths:
-   +        'Chill\Some\Ticket': '@ChillSomeBundle/migrations'
-
-Dump autoloading
-----------------
-
-.. code-block:: bash
-
-   symfony composer dump-autoload
+## Dump autoloading
 
+``` bash
+symfony composer dump-autoload
+```

From df15c2fee7ec119f5ea0550fd979b73e20cf8fb1 Mon Sep 17 00:00:00 2001
From: Boris Waaub <boris.waaub@digitalternative.be>
Date: Fri, 5 Dec 2025 16:27:12 +0000
Subject: [PATCH 255/283] Fix mobile layout, update Peloton display, and change
 comment display

---
 .../vuejs/StoredObjectButton/helpers.ts       |   1 +
 .../Resources/public/vuejs/TicketApp/App.vue  |  30 +++---
 .../components/ActionToolbarComponent.vue     | 102 +++++++++---------
 .../TicketApp/components/BannerComponent.vue  |  20 ++--
 .../Emergency/EmergencyComponent.vue          |   2 +-
 .../TicketApp/components/PelotonComponent.vue |  63 ++++++++---
 .../components/State/StateComponent.vue       |   2 +-
 .../Resources/public/vuejs/TicketApp/index.ts |   1 +
 .../public/vuejs/TicketApp/scss/reactive.scss |  42 ++++++++
 .../components/TicketHistoryListComponent.vue |  14 ++-
 .../components/TicketListItemComponent.vue    | 100 ++++++++---------
 .../src/Resources/views/Ticket/edit.html.twig |   2 +
 .../src/translations/messages+intl-icu.fr.yml |   2 +-
 13 files changed, 230 insertions(+), 151 deletions(-)
 create mode 100644 src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/scss/reactive.scss

diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/helpers.ts b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/helpers.ts
index 3941683cb..8dbad34b7 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/helpers.ts
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/helpers.ts
@@ -267,6 +267,7 @@ async function is_object_ready(
 export {
   build_convert_link,
   build_wopi_editor_link,
+  download_info_link,
   download_and_decrypt_doc,
   download_doc,
   download_doc_as_pdf,
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
index 40923f853..b2abb8276 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
@@ -3,17 +3,10 @@
   <div class="container-xxl pt-1" style="padding-bottom: 55px" v-if="!loading">
     <div class="row">
       <div class="col">
-        <div class="form-check">
-          <input
-            v-model="showOnlyHistoryComments"
-            class="form-check-input"
-            type="checkbox"
-            id="showOnlyCommentsCheckbox"
-          />
-          <label class="form-check-label" for="showOnlyCommentsCheckbox">
-            {{ trans(CHILL_TICKET_LIST_SHOW_ONLY_HISTORY_COMMENTS) }}
-          </label>
-        </div>
+        <label class="form-label pe-2" for="showAllHistory">
+          {{ trans(CHILL_TICKET_LIST_SHOW_ALL_HISTORY) }}
+        </label>
+        <toggle-component v-model="showAllHistory" id="showAllHistory" />
       </div>
       <div class="col d-flex justify-content-end">
         <previous-tickets-component :key="refreshKey" />
@@ -24,6 +17,7 @@
       :key="ticketHistory.length"
     />
   </div>
+
   <div v-else class="text-center p-4">
     <div class="spinner-border" role="status">
       <span class="visually-hidden">
@@ -72,6 +66,7 @@ import TicketHistoryListComponent from "../TicketList/components/TicketHistoryLi
 import ActionToolbarComponent from "./components/ActionToolbarComponent.vue";
 import BannerComponent from "./components/BannerComponent.vue";
 import TicketInitFormComponent from "./components/TicketInitFormComponent.vue";
+import ToggleComponent from "../TicketList/components/ToggleComponent.vue";
 
 // Translations
 import {
@@ -81,19 +76,19 @@ import {
   CHILL_TICKET_TICKET_INIT_FORM_ERROR,
   CHILL_TICKET_TICKET_INIT_FORM_WARNING,
   CHILL_TICKET_LIST_LOADING_TICKET_DETAILS,
-  CHILL_TICKET_LIST_SHOW_ONLY_HISTORY_COMMENTS,
+  CHILL_TICKET_LIST_SHOW_ALL_HISTORY,
 } from "translator";
 
 const store = useStore();
 const toast = useToast();
 
 store.commit("setTicket", JSON.parse(window.initialTicket) as Ticket);
-const showOnlyHistoryComments = ref(false);
+const showAllHistory = ref(false);
 const ticket = computed(() => store.getters.getTicket as Ticket);
 const ticketHistory = computed(() =>
-  showOnlyHistoryComments.value
-    ? store.getters.getTicketHistoryComments
-    : store.getters.getTicketHistory,
+  showAllHistory.value
+    ? store.getters.getTicketHistory
+    : store.getters.getTicketHistoryComments,
 );
 const motives = computed(() => store.getters.getMotives as Motive[]);
 const suggestedPersons = computed(() => store.getters.getPersons as Person[]);
@@ -169,4 +164,7 @@ onMounted(() => {
   font-size: 2rem;
   color: #333;
 }
+.form-label {
+  font-weight: bold;
+}
 </style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
index 69569f304..999c82c6d 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
@@ -1,5 +1,5 @@
 <template>
-  <div class="fixed-bottom">
+  <teleport to="#actionToolbar">
     <div class="footer-ticket-details" v-if="activeTab">
       <div class="tab-content p-2">
         <button
@@ -86,52 +86,56 @@
       </div>
     </div>
     <div class="footer-ticket-main">
-      <ul class="nav nav-tabs justify-content-end">
-        <li v-if="hasReturnPath" class="nav-item p-2 go-back">
-          <a :href="returnPath" class="btn btn-cancel">Annuler</a>
-        </li>
-        <li v-else class="nav-item p-2 go-back">
-          <button
-            type="button"
-            class="btn btn-light"
-            @click="closeAllActions"
-            aria-label="Fermer"
-            title="Fermer"
-          >
-            <i class="fa fa-arrow-left"></i>
-            {{ trans(CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CANCEL) }}
-          </button>
-        </li>
-        <li v-for="btn in actionButtons" :key="btn.key" class="nav-item p-2">
-          <button
-            type="button"
-            :class="`btn ${activeTab === btn.key ? 'btn-primary' : 'btn-light'}`"
-            @click="
-              activeTab === btn.key ? (activeTab = '') : (activeTab = btn.key)
-            "
-            :disabled="btn.disabled.value"
-          >
-            <i :class="actionIcons[btn.key]" />
-            {{ trans(btn.label) }}
-          </button>
-        </li>
-        <li class="nav-item p-2">
-          <button
-            type="button"
-            class="btn btn-light"
-            @click="isOpen ? closeTicket() : reopenTicket()"
-          >
-            <i :class="actionIcons['state_change']"></i>
-            {{
-              isOpen
-                ? trans(CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CLOSE)
-                : trans(CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_REOPEN)
-            }}
-          </button>
-        </li>
-      </ul>
+      <div class="d-flex w-100">
+        <ul class="nav nav-tabs flex-grow-1 justify-content-start">
+          <li v-if="hasReturnPath" class="nav-item p-2 go-back">
+            <a :href="returnPath" class="btn btn-cancel">
+              <span class="hide-on-sm">
+                {{ trans(CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CANCEL) }}
+              </span>
+            </a>
+          </li>
+        </ul>
+        <ul class="nav nav-tabs flex-grow-1 justify-content-center">
+          <template v-for="btn in actionButtons" :key="btn.key">
+            <li class="nav-item p-2">
+              <button
+                type="button"
+                :class="`btn ${activeTab === btn.key ? 'btn-primary' : 'btn-light'}`"
+                @click="
+                  activeTab === btn.key
+                    ? (activeTab = '')
+                    : (activeTab = btn.key)
+                "
+                :disabled="btn.disabled.value"
+              >
+                <i :class="actionIcons[btn.key]" />
+                <span class="hide-on-sm ms-2">{{ trans(btn.label) }}</span>
+              </button>
+            </li>
+          </template>
+        </ul>
+        <ul class="nav nav-tabs flex-grow-1 justify-content-end">
+          <li class="nav-item p-2">
+            <button
+              type="button"
+              class="btn bg-chill-green text-white"
+              @click="isOpen ? closeTicket() : reopenTicket()"
+            >
+              <i :class="isOpen ? 'fa fa-lock' : 'fa fa-unlock'"></i>
+              <span class="hide-on-sm ms-2">
+                {{
+                  isOpen
+                    ? trans(CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_CLOSE)
+                    : trans(CHILL_TICKET_TICKET_ACTIONS_TOOLBAR_REOPEN)
+                }}
+              </span>
+            </button>
+          </li>
+        </ul>
+      </div>
     </div>
-  </div>
+  </teleport>
 </template>
 
 <script setup lang="ts">
@@ -365,10 +369,4 @@ div.footer-ticket-main {
 div.footer-ticket-details {
   background: none repeat scroll 0 0 #efe2ca;
 }
-
-.fixed-bottom {
-  position: sticky;
-  top: 0;
-  overflow: visible;
-}
 </style>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
index 8915514ec..fd3c0af2b 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
@@ -2,11 +2,11 @@
   <Teleport to="#header-ticket-main">
     <div class="container-xxl text-primary">
       <div class="row">
-        <div class="col-md-6 col-sm-12 ps-md-5 ps-xxl-0">
+        <div class="col-md-12 col-sm-12 ps-md-5 ps-xxl-0">
           <div class="small text-muted">
             {{ motiveHierarchyLabel(ticket.currentMotive) }}
           </div>
-          <h1>
+          <h1 class="responsive-title-h1">
             {{ getTicketTitle(ticket) }}
             <peloton-component
               :stored-objects="
@@ -15,12 +15,12 @@
             />
           </h1>
 
-          <h2 v-if="ticket.caller">
+          <h2 v-if="ticket.caller" class="responsive-title-h2">
             {{ ticket.caller.text }}
           </h2>
         </div>
 
-        <div class="col-md-6 col-sm-12">
+        <div class="col-md-12 col-sm-12">
           <div class="d-flex justify-content-end">
             <emergency-toggle-component
               v-model="isEmergency"
@@ -45,10 +45,10 @@
     <div class="container-xxl">
       <div class="row justify-content-between">
         <div
-          class="col-md-4 col-sm-12 d-flex flex-column align-items-start"
+          class="col-4 d-flex flex-column align-items-start"
           v-if="ticket.caller"
         >
-          <h3 class="text-primary">
+          <h3 class="text-primary responsive-title-h3">
             {{
               trans(CHILL_TICKET_TICKET_BANNER_CALLER, {
                 count: ticket.caller ? 1 : 0,
@@ -58,10 +58,10 @@
           <person-component :entities="[ticket.caller] as Person[]" />
         </div>
         <div
-          class="col-md-4 col-sm-12 d-flex flex-column align-items-start"
+          class="col-4 d-flex flex-column align-items-start"
           v-if="ticket.currentPersons.length"
         >
-          <h3 class="text-primary">
+          <h3 class="text-primary responsive-title-h3">
             {{
               trans(CHILL_TICKET_TICKET_BANNER_PERSON, {
                 count: ticket.currentPersons.length,
@@ -71,10 +71,10 @@
           <person-component :entities="ticket.currentPersons" />
         </div>
         <div
-          class="col-md-4 col-sm-12 d-flex flex-column align-items-start"
+          class="col-4 d-flex flex-column align-items-start"
           v-if="ticket.currentAddressees.length"
         >
-          <h3 class="text-primary">
+          <h3 class="text-primary responsive-title-h3">
             {{
               trans(CHILL_TICKET_TICKET_BANNER_SPEAKER, {
                 count: ticket.currentAddressees.length,
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Emergency/EmergencyComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Emergency/EmergencyComponent.vue
index 6e861a53f..22234fec8 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Emergency/EmergencyComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/Emergency/EmergencyComponent.vue
@@ -1,6 +1,6 @@
 <template>
   <span
-    class="badge rounded-pill me-1 mx-2"
+    class="badge rounded-pill me-1"
     :class="{
       'bg-warning': new_emergency === 'yes',
       'bg-secondary': new_emergency === 'no',
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PelotonComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PelotonComponent.vue
index 577f054dc..9cc2f75b5 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PelotonComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PelotonComponent.vue
@@ -93,7 +93,6 @@ import {
   CHILL_TICKET_PELOTON_LOADING_DOCUMENT,
   CHILL_TICKET_PELOTON_LOADING,
   CHILL_TICKET_PELOTON_ERROR_LOADING,
-  CHILL_TICKET_PELOTON_ERROR_NOT_READY,
   CHILL_TICKET_PELOTON_UNSUPPORTED_TYPE,
   CHILL_TICKET_PELOTON_OPEN_NEW_TAB,
   CHILL_TICKET_PELOTON_IFRAME_NOT_SUPPORTED,
@@ -101,11 +100,11 @@ import {
   trans,
 } from "translator";
 // Type
-import { StoredObject } from "ChillDocStoreAssets/types";
+import { StoredObject, StoredObjectVersion } from "ChillDocStoreAssets/types";
 
 // Utils
 import {
-  download_and_decrypt_doc,
+  download_info_link,
   is_object_ready,
 } from "ChillDocStoreAssets/vuejs/StoredObjectButton/helpers";
 
@@ -156,22 +155,61 @@ async function onSelectionChange() {
   try {
     const document = await is_object_ready(selectedStoredObject.value);
 
-    if (!document) {
-      error.value = trans(CHILL_TICKET_PELOTON_ERROR_NOT_READY);
-      return;
-    }
-
-    const doc = await download_and_decrypt_doc(
+    const algo = "AES-CBC";
+    const atVersionToDownload = selectedStoredObject.value
+      .currentVersion as StoredObjectVersion;
+    const downloadInfo = await download_info_link(
       selectedStoredObject.value,
       selectedStoredObject.value.currentVersion,
     );
+    console.log("downloadInfo", downloadInfo);
+    const rawResponse = await window.fetch(downloadInfo.url);
+
+    if (!rawResponse.ok) {
+      throw new Error(
+        "error while downloading raw file " +
+          rawResponse.status +
+          " " +
+          rawResponse.statusText,
+      );
+    }
+
+    let blob: Blob;
+    if (atVersionToDownload.iv.length === 0) {
+      blob = await rawResponse.blob();
+    } else {
+      const rawBuffer = await rawResponse.arrayBuffer();
+      try {
+        const key = await window.crypto.subtle.importKey(
+          "jwk",
+          atVersionToDownload.keyInfos,
+          { name: algo },
+          false,
+          ["decrypt"],
+        );
+        const iv = Uint8Array.from(atVersionToDownload.iv);
+        const decrypted = await window.crypto.subtle.decrypt(
+          { name: algo, iv: iv },
+          key,
+          rawBuffer,
+        );
+
+        blob = new Blob([decrypted], { type: document.type });
+
+        documentUrl.value = URL.createObjectURL(blob);
+      } catch (e) {
+        console.error("encounter error while keys and decrypt operations");
+        console.error(e);
+        throw e;
+      }
+    }
 
-    const blob = new Blob([doc], { type: document.type });
     documentUrl.value = URL.createObjectURL(blob);
 
-    if (document.type.startsWith("image/")) {
+    const mimeType = blob.type;
+    if (mimeType.startsWith("image/")) {
       documentType.value = "image";
-    } else if (document.type === "application/pdf") {
+    } else if (mimeType === "application/pdf") {
       documentType.value = "pdf";
     } else {
       documentType.value = "other";
@@ -183,7 +221,6 @@ async function onSelectionChange() {
     isLoading.value = false;
   }
 }
-
 // Nettoyer les URLs blob précédentes
 function cleanupPrevious() {
   if (documentUrl.value) {
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/State/StateComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/State/StateComponent.vue
index 773c78d43..f3f7bd5c4 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/State/StateComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/State/StateComponent.vue
@@ -1,6 +1,6 @@
 <template>
   <span
-    class="badge rounded-pill me-1 mx-2"
+    class="badge rounded-pill me-1"
     :class="{
       'bg-chill-red': props.new_state == 'closed',
       'bg-chill-green': props.new_state == 'open',
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts
index a33de7b50..501bf7c20 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/index.ts
@@ -3,6 +3,7 @@ import { createApp } from "vue";
 
 import VueToast from "vue-toast-notification";
 import "vue-toast-notification/dist/theme-sugar.css";
+import "./scss/reactive.scss";
 
 import { store } from "./store";
 
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/scss/reactive.scss b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/scss/reactive.scss
new file mode 100644
index 000000000..dbda9bb70
--- /dev/null
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/scss/reactive.scss
@@ -0,0 +1,42 @@
+
+.responsive-title-h1 {
+  font-size: 2.5rem;
+  @media (max-width: 1200px) {
+    font-size: 2rem;
+  }
+  @media (max-width: 900px) {
+    font-size: 1.7rem;
+  }
+  @media (max-width: 768px) {
+    font-size: 1.3rem;
+  }
+}
+.responsive-title-h2 {
+  font-size: 2rem;
+  @media (max-width: 1200px) {
+    font-size: 1.5rem;
+  }
+  @media (max-width: 900px) {
+    font-size: 1.2rem;
+  }
+  @media (max-width: 768px) {
+    font-size: 1rem;
+  }
+}
+.responsive-title-h3 {
+  font-size: 1.5rem;
+  @media (max-width: 1200px) {
+    font-size: 1.2rem;
+  }
+  @media (max-width: 900px) {
+    font-size: 1rem;
+  }
+  @media (max-width: 768px) {
+    font-size: 1rem;
+  }
+}
+.hide-on-sm {
+  @media (max-width: 900px) {
+    display: none !important;
+  }
+}
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketHistoryListComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketHistoryListComponent.vue
index af36d0ca5..51ff87f00 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketHistoryListComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketHistoryListComponent.vue
@@ -5,12 +5,10 @@
     :key="history.indexOf(history_line)"
   >
     <div class="card-header">
-      <div
-        class="history-header d-flex align-items-center justify-content-between"
-      >
-        <div class="d-flex align-items-center fw-bold">
+      <div class="history-header row align-items-center gx-0">
+        <div class="col d-flex align-items-center">
           <i :class="`${actionIcons[history_line.event_type]} me-1`"></i>
-          <span>{{ explainSentence(history_line) }}</span>
+          <span class="fw-bold">{{ explainSentence(history_line) }}</span>
           <state-component
             :new_state="history_line.data.new_state"
             v-if="history_line.event_type == 'state_change'"
@@ -20,11 +18,11 @@
             :new_emergency="history_line.data.new_emergency"
           />
         </div>
-        <div>
-          <span class="badge-user">
+        <div class="col-auto d-flex justify-content-end align-items-center">
+          <span class="badge-user d-flex">
             <user-render-box-badge :user="history_line.by" />
           </span>
-          <span class="fst-italic mx-2">
+          <span class="fst-italic mx-2 d-flex">
             {{ formatDate(history_line.at) }}
           </span>
         </div>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListItemComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListItemComponent.vue
index a7e7fd277..5ac4b4d7d 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListItemComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListItemComponent.vue
@@ -2,13 +2,19 @@
   <div class="card mb-3 text-primary border-primary">
     <div class="card-body">
       <div class="wrap-header">
-        <div class="wh-row d-flex justify-content-between align-items-top">
-          <div v-if="null !== ticket.currentMotive && null !== ticket.currentMotive.parent" class="wh-col">
+        <div class="row align-items-top">
+          <div
+            v-if="
+              null !== ticket.currentMotive &&
+              null !== ticket.currentMotive.parent
+            "
+            class="col-6"
+          >
             <div class="small text-muted">
               {{ motiveHierarchyLabel(ticket.currentMotive) }}
             </div>
           </div>
-          <div class="wh-col">
+          <div class="col-6 text-end">
             <emergency-component
               :new_emergency="ticket.emergency"
               v-if="ticket.emergency == 'yes'"
@@ -19,59 +25,55 @@
             />
           </div>
         </div>
-        <div class="wh-row">
-          <div class="wh-col">
-            <span
-              class="h2"
-              style="color: var(--bs-chill-blue); font-variant: all-small-caps"
-            >
-              {{ getTicketTitle(ticket) }}
-            </span>
-          </div>
-          <div class="wh-col">
-            <span
-              v-if="ticket.createdAt"
-              :title="formatDateTime(ticket.createdAt.datetime, 'long', 'long')"
-              style="font-style: italic"
-            >
-              {{ getSinceCreated(ticket.createdAt.datetime, new Date()) }}
-            </span>
-          </div>
+      </div>
+      <div class="row align-items-top">
+        <div class="col-md-6 col-12">
+          <span
+            class="h2"
+            style="color: var(--bs-chill-blue); font-variant: all-small-caps"
+          >
+            {{ getTicketTitle(ticket) }}
+          </span>
+        </div>
+        <div class="col-md-6 col-12 text-md-end text-start">
+          <span
+            v-if="ticket.createdAt"
+            :title="formatDateTime(ticket.createdAt.datetime, 'long', 'long')"
+            style="font-style: italic"
+          >
+            {{ getSinceCreated(ticket.createdAt.datetime, new Date()) }}
+          </span>
         </div>
       </div>
     </div>
 
     <div class="card-body pt-0">
-      <div class="wrap-list">
-        <div class="wl-row" v-if="ticket.currentAddressees.length">
-          <div class="wl-col title text-end">
-            <h3>{{ trans(CHILL_TICKET_LIST_ADDRESSEES) }}</h3>
-          </div>
-          <div class="wl-col list">
-            <addressee-component :addressees="ticket.currentAddressees" />
-          </div>
+      <div class="row" v-if="ticket.currentAddressees.length">
+        <div class="col-12 title text-start">
+          <h3>{{ trans(CHILL_TICKET_LIST_ADDRESSEES) }}</h3>
         </div>
-        <div class="wl-row" v-if="ticket.currentPersons.length">
-          <div class="wl-col title text-end">
-            <h3>{{ trans(CHILL_TICKET_LIST_PERSONS) }}</h3>
-          </div>
-          <div class="wl-col list">
-            <person-component :entities="ticket.currentPersons" />
-          </div>
+        <div class="col-12 list">
+          <addressee-component :addressees="ticket.currentAddressees" />
         </div>
-        <div class="wl-row" v-if="ticket.caller">
-          <div class="wl-col title text-end">
-            <h3>{{ trans(CHILL_TICKET_LIST_CALLERS) }}</h3>
-          </div>
-          <div class="wl-col list">
-            <person-component
-              :entities="
-                ticket.caller
-                  ? ([ticket.caller] as Person[] | Thirdparty[])
-                  : []
-              "
-            />
-          </div>
+      </div>
+      <div class="row" v-if="ticket.currentPersons.length">
+        <div class="col-12 title text-start">
+          <h3>{{ trans(CHILL_TICKET_LIST_PERSONS) }}</h3>
+        </div>
+        <div class="col-12 list">
+          <person-component :entities="ticket.currentPersons" />
+        </div>
+      </div>
+      <div class="row" v-if="ticket.caller">
+        <div class="col-12 title text-start">
+          <h3>{{ trans(CHILL_TICKET_LIST_CALLERS) }}</h3>
+        </div>
+        <div class="col-12 list">
+          <person-component
+            :entities="
+              ticket.caller ? ([ticket.caller] as Person[] | Thirdparty[]) : []
+            "
+          />
         </div>
       </div>
     </div>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/edit.html.twig b/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/edit.html.twig
index 48e620a74..34e23fd0d 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/edit.html.twig
+++ b/src/Bundle/ChillTicketBundle/src/Resources/views/Ticket/edit.html.twig
@@ -16,4 +16,6 @@
 
 {% block content %}
     <div id="ticketRoot"></div>
+    <div class="sticky-form-buttons" id="actionToolbar" style="display: block;text-align: start;padding: inherit;">
+    </div>
 {% endblock %}
diff --git a/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml b/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
index a6436ea9f..71d75e4f5 100644
--- a/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
+++ b/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
@@ -4,7 +4,7 @@ chill_ticket:
     title: "Tickets"
     title_with_name: "{name, select, null {Tickets} undefined {Tickets} other {Tickets de {name}}}"
     title_menu: "Tickets de l'usager"
-    show_only_history_comments: "Afficher uniquement les commentaires"
+    show_all_history: "Afficher tout l'historique"
     title_previous_tickets: "{name, select, other {Précédent ticket de {name}} undefined {Précédent ticket}}"
     no_tickets: "Aucun ticket"
     loading_ticket: "Chargement des tickets..."

From 387bf55b11882005d5dec2e6e54d82f652473655 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 5 Dec 2025 16:32:30 +0000
Subject: [PATCH 256/283] fix version constraint in chill-zimbra-bundle

---
 packages/ChillZimbraBundle/composer.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/packages/ChillZimbraBundle/composer.json b/packages/ChillZimbraBundle/composer.json
index f62e21125..4a53b3ed5 100644
--- a/packages/ChillZimbraBundle/composer.json
+++ b/packages/ChillZimbraBundle/composer.json
@@ -9,7 +9,7 @@
         "social worker"
     ],
     "require": {
-        "chill-project/chill-bundles": "dev-master as v4.6.1",
+        "chill-project/chill-bundles": "^4.9.0",
         "zimbra-api/soap-api": "^3.2.2",
         "psr/http-client": "^1.0",
         "nyholm/psr7": "^1.0"

From 6d93b2b1b60e80331250625e417fce882504b576 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Fri, 5 Dec 2025 17:02:26 +0000
Subject: [PATCH 257/283] Add Person's external identifiers to creation and
 edit form

---
 .junie/guidelines.md                          |    6 +-
 .../Resources/public/vuejs/App.vue            |   10 +-
 .../ChillJobBundle/src/Entity/Immersion.php   |    5 +-
 .../ChillMainBundle/Entity/Location.php       |    6 +-
 src/Bundle/ChillMainBundle/Entity/User.php    |    2 +-
 .../PhoneNumberHelperInterface.php            |    2 +
 .../Phonenumber/PhonenumberHelper.php         |    8 +-
 .../Resources/public/chill/js/date.ts         |   15 +
 .../Resources/public/chill/scss/buttons.scss  |    3 -
 .../Resources/public/chill/scss/forms.scss    |   14 +-
 .../Resources/public/lib/api/apiMethods.ts    |  320 +-
 .../Resources/public/lib/api/genderHelper.ts  |   17 +
 .../ChillMainBundle/Resources/public/types.ts |  150 +-
 .../vuejs/Address/components/AddAddress.vue   |   83 +-
 .../components/AddAddress/AddressMore.vue     |   59 +-
 .../AddAddress/AddressSelection.vue           |   43 +-
 .../components/AddAddress/CitySelection.vue   |   39 +-
 .../AddAddress/CountrySelection.vue           |   31 +-
 .../vuejs/Address/components/EditPane.vue     |   23 +-
 .../vuejs/Address/components/ShowPane.vue     |   60 +-
 .../vuejs/OnTheFly/components/Create.vue      |   97 +-
 .../vuejs/OnTheFly/components/CreateModal.vue |   71 +
 .../vuejs/OnTheFly/components/OnTheFly.vue    |  333 +-
 .../public/vuejs/PickEntity/PickEntity.vue    |   20 +-
 .../Entity/GenderIconRenderBox.vue            |   36 +-
 .../public/vuejs/_components/Modal.vue        |   18 +-
 .../vuejs/_composables/violationList.ts       |   57 +
 .../Utils/ExtractPhonenumberFromPattern.php   |    4 +-
 .../Serializer/Normalizer/DateNormalizer.php  |    4 +-
 .../Normalizer/PhonenumberNormalizer.php      |    7 +-
 .../ExtractPhonenumberFromPatternTest.php     |   16 +-
 .../Constraint/PhonenumberConstraint.php      |    3 +
 .../Validation/Validator/ValidPhonenumber.php |    3 +
 .../translations/messages+intl-icu.fr.yaml    |   28 -
 .../translations/messages.fr.yml              |    3 +-
 .../Actions/PersonCreate/PersonCreateDTO.php  |   70 +
 .../Service/PersonCreateDTOFactory.php        |   96 +
 .../Actions/PersonEdit/PersonEditDTO.php      |  108 +
 .../Service/PersonEditDTOFactory.php          |  130 +
 .../Config/ConfigPersonAltNamesHelper.php     |    2 +
 .../Controller/PersonController.php           |  165 -
 .../Controller/PersonCreateController.php     |  205 +
 .../Controller/PersonEditController.php       |    7 +-
 .../PersonIdentifierListApiController.php     |   47 +
 .../ChillPersonExtension.php                  |    1 -
 .../Identifier/IdentifierPresenceEnum.php     |   42 +
 .../Entity/Identifier/PersonIdentifier.php    |   15 +-
 .../Identifier/PersonIdentifierDefinition.php |   45 +-
 .../ChillPersonBundle/Entity/Person.php       |    9 +-
 .../Form/CreationPersonType.php               |   23 +-
 .../DataMapper/PersonAltNameDataMapper.php    |   57 +-
 .../PersonIdentifiersDataMapper.php           |   59 +-
 .../Form/PersonIdentifiersType.php            |   18 +-
 .../ChillPersonBundle/Form/PersonType.php     |    4 +-
 .../Form/Type/PersonAltNameType.php           |    1 +
 .../Identifier/StringIdentifier.php           |   43 +-
 .../IdentifierViolationDTO.php                |   31 +
 .../PersonIdentifierWorkerNormalizer.php      |   39 +
 .../PersonIdentifierEngineInterface.php       |   20 +
 .../PersonIdentifierManager.php               |   11 +-
 .../PersonIdentifierManagerInterface.php      |    9 +-
 .../PersonIdentifierWorker.php                |   23 +-
 .../RequiredIdentifierConstraint.php          |   28 +
 .../RequiredIdentifierConstraintValidator.php |   53 +
 .../Validator/UniqueIdentifierConstraint.php  |   25 +
 .../UniqueIdentifierConstraintValidator.php   |   53 +
 .../Validator/ValidIdentifierConstraint.php   |   23 +
 .../ValidIdentifierConstraintValidator.php    |   47 +
 .../Identifier/PersonIdentifierRepository.php |   42 +
 .../Repository/PersonACLAwareRepository.php   |   76 +-
 .../Resources/public/types.ts                 |  149 +-
 .../components/PersonsAssociated.vue          |    7 +-
 .../components/Requestor.vue                  |   10 +-
 .../components/Resources.vue                  |    7 +-
 .../Resources/public/vuejs/_api/OnTheFly.js   |   88 -
 .../Resources/public/vuejs/_api/OnTheFly.ts   |  116 +
 .../public/vuejs/_components/AddPersons.vue   |  619 +--
 .../AddPersons/PersonChooseModal.vue          |  345 ++
 .../AddPersons/PersonSuggestion.vue           |   64 +-
 .../_components/AddPersons/TypeHousehold.vue  |    3 +-
 .../_components/AddPersons/TypePerson.vue     |    6 +-
 .../_components/AddPersons/TypeThirdParty.vue |   60 +-
 .../vuejs/_components/AddPersons/TypeUser.vue |   12 +-
 .../_components/AddPersons/TypeUserGroup.vue  |    2 +-
 .../_components/Entity/PersonRenderBox.vue    |  311 +-
 .../vuejs/_components/Entity/PersonText.vue   |   18 +-
 .../vuejs/_components/OnTheFly/Person.vue     |  461 +-
 .../vuejs/_components/OnTheFly/PersonEdit.vue |  695 +++
 .../Resources/views/Person/create.html.twig   |    9 +
 .../Resources/views/Person/edit.html.twig     |    4 +-
 .../Normalizer/PersonJsonDenormalizer.php     |  155 +
 .../Normalizer/PersonJsonNormalizer.php       |  149 +-
 .../Normalizer/PersonJsonReadDenormalizer.php |   51 +
 .../Service/PersonEditDTOFactoryTest.php      |  146 +
 .../PersonIdentifierListApiControllerTest.php |  157 +
 .../StringIdentifierValidationTest.php        |  111 +
 .../PersonIdentifierWorkerNormalizerTest.php  |  133 +
 .../Rendering/PersonIdRenderingTest.php       |   15 +
 ...uiredIdentifierConstraintValidatorTest.php |  131 +
 ...niqueIdentifierConstraintValidatorTest.php |  158 +
 ...ValidIdentifierConstraintValidatorTest.php |  115 +
 .../PersonIdentifierRepositoryTest.php        |   76 +
 .../PersonACLAwareRepositoryTest.php          |   14 +-
 .../Normalizer/PersonJsonDenormalizerTest.php |  312 ++
 .../PersonJsonNormalizerIntegrationTest.php   |   63 +
 .../Normalizer/PersonJsonNormalizerTest.php   |  196 +-
 .../PersonJsonReadDenormalizerTest.php        |   86 +
 .../ChillPersonBundle/chill.api.specs.yaml    | 3875 +++++++++--------
 .../ChillPersonBundle/config/services.yaml    |    6 +
 .../config/services/actions.yaml              |    6 +
 .../config/services/serializer.yaml           |   11 -
 .../migrations/Version20250918095044.php      |   37 +
 .../migrations/Version20250922151020.php      |   33 +
 .../migrations/Version20250924101621.php      |   53 +
 .../migrations/Version20250926124024.php      |   33 +
 .../translations/messages+intl-icu.fr.yaml    |   35 +
 .../translations/messages.fr.yml              |   10 +-
 .../translations/validators+intl-icu.fr.yaml  |    7 +
 .../translations/validators.fr.yml            |    4 +
 .../Entity/ThirdParty.php                     |   10 +-
 .../Resources/public/types.ts                 |  138 +-
 .../Resources/public/vuejs/_api/OnTheFly.js   |   52 -
 .../Resources/public/vuejs/_api/OnTheFly.ts   |   75 +
 .../Entity/ThirdPartyRenderBox.vue            |  115 +-
 .../vuejs/_components/OnTheFly/ThirdParty.vue |  417 +-
 .../_components/OnTheFly/ThirdPartyEdit.vue   |  562 +++
 .../translations/messages.fr.yml              |    6 +-
 .../src/Controller/FindCallerController.php   |   58 -
 .../PostTicketUpdateMessageHandler.php        |    7 +-
 .../TicketApp/components/BannerComponent.vue  |   14 +-
 .../Controller/FindCallerControllerTest.php   |  128 -
 131 files changed, 9015 insertions(+), 4954 deletions(-)
 create mode 100644 src/Bundle/ChillMainBundle/Resources/public/lib/api/genderHelper.ts
 create mode 100644 src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/CreateModal.vue
 create mode 100644 src/Bundle/ChillMainBundle/Resources/public/vuejs/_composables/violationList.ts
 create mode 100644 src/Bundle/ChillPersonBundle/Actions/PersonCreate/PersonCreateDTO.php
 create mode 100644 src/Bundle/ChillPersonBundle/Actions/PersonCreate/Service/PersonCreateDTOFactory.php
 create mode 100644 src/Bundle/ChillPersonBundle/Actions/PersonEdit/PersonEditDTO.php
 create mode 100644 src/Bundle/ChillPersonBundle/Actions/PersonEdit/Service/PersonEditDTOFactory.php
 create mode 100644 src/Bundle/ChillPersonBundle/Controller/PersonCreateController.php
 create mode 100644 src/Bundle/ChillPersonBundle/Controller/PersonIdentifierListApiController.php
 create mode 100644 src/Bundle/ChillPersonBundle/Entity/Identifier/IdentifierPresenceEnum.php
 create mode 100644 src/Bundle/ChillPersonBundle/PersonIdentifier/IdentifierViolationDTO.php
 create mode 100644 src/Bundle/ChillPersonBundle/PersonIdentifier/Normalizer/PersonIdentifierWorkerNormalizer.php
 create mode 100644 src/Bundle/ChillPersonBundle/PersonIdentifier/Validator/RequiredIdentifierConstraint.php
 create mode 100644 src/Bundle/ChillPersonBundle/PersonIdentifier/Validator/RequiredIdentifierConstraintValidator.php
 create mode 100644 src/Bundle/ChillPersonBundle/PersonIdentifier/Validator/UniqueIdentifierConstraint.php
 create mode 100644 src/Bundle/ChillPersonBundle/PersonIdentifier/Validator/UniqueIdentifierConstraintValidator.php
 create mode 100644 src/Bundle/ChillPersonBundle/PersonIdentifier/Validator/ValidIdentifierConstraint.php
 create mode 100644 src/Bundle/ChillPersonBundle/PersonIdentifier/Validator/ValidIdentifierConstraintValidator.php
 create mode 100644 src/Bundle/ChillPersonBundle/Repository/Identifier/PersonIdentifierRepository.php
 delete mode 100644 src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/OnTheFly.js
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/OnTheFly.ts
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonChooseModal.vue
 create mode 100644 src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/PersonEdit.vue
 create mode 100644 src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonDenormalizer.php
 create mode 100644 src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonReadDenormalizer.php
 create mode 100644 src/Bundle/ChillPersonBundle/Tests/Action/PersonEdit/Service/PersonEditDTOFactoryTest.php
 create mode 100644 src/Bundle/ChillPersonBundle/Tests/Controller/PersonIdentifierListApiControllerTest.php
 create mode 100644 src/Bundle/ChillPersonBundle/Tests/PersonIdentifier/Identifier/StringIdentifierValidationTest.php
 create mode 100644 src/Bundle/ChillPersonBundle/Tests/PersonIdentifier/Normalizer/PersonIdentifierWorkerNormalizerTest.php
 create mode 100644 src/Bundle/ChillPersonBundle/Tests/PersonIdentifier/Validator/RequiredIdentifierConstraintValidatorTest.php
 create mode 100644 src/Bundle/ChillPersonBundle/Tests/PersonIdentifier/Validator/UniqueIdentifierConstraintValidatorTest.php
 create mode 100644 src/Bundle/ChillPersonBundle/Tests/PersonIdentifier/Validator/ValidIdentifierConstraintValidatorTest.php
 create mode 100644 src/Bundle/ChillPersonBundle/Tests/Repository/Identifier/PersonIdentifierRepositoryTest.php
 create mode 100644 src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonJsonDenormalizerTest.php
 create mode 100644 src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonJsonNormalizerIntegrationTest.php
 create mode 100644 src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonJsonReadDenormalizerTest.php
 delete mode 100644 src/Bundle/ChillPersonBundle/config/services/serializer.yaml
 create mode 100644 src/Bundle/ChillPersonBundle/migrations/Version20250918095044.php
 create mode 100644 src/Bundle/ChillPersonBundle/migrations/Version20250922151020.php
 create mode 100644 src/Bundle/ChillPersonBundle/migrations/Version20250924101621.php
 create mode 100644 src/Bundle/ChillPersonBundle/migrations/Version20250926124024.php
 create mode 100644 src/Bundle/ChillPersonBundle/translations/validators+intl-icu.fr.yaml
 delete mode 100644 src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_api/OnTheFly.js
 create mode 100644 src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_api/OnTheFly.ts
 create mode 100644 src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdPartyEdit.vue
 delete mode 100644 src/Bundle/ChillTicketBundle/src/Controller/FindCallerController.php
 delete mode 100644 src/Bundle/ChillTicketBundle/tests/Controller/FindCallerControllerTest.php

diff --git a/.junie/guidelines.md b/.junie/guidelines.md
index 170050780..ad355eac7 100644
--- a/.junie/guidelines.md
+++ b/.junie/guidelines.md
@@ -236,13 +236,15 @@ This must be a decision made by a human, not by an AI. Every AI task must abort
 
 The tests are run from the project's root (not from the bundle's root: so, do not change the directory to any bundle directory before running tests).
 
+Tests must be run using the `symfony` command:
+
 ```bash
 
 # Run a specific test file
-vendor/bin/phpunit path/to/TestFile.php
+symfony composer exec phpunit -- path/to/TestFile.php
 
 # Run a specific test method
-vendor/bin/phpunit --filter methodName path/to/TestFile.php
+symfony composer exec phpunit -- --filter methodName path/to/TestFile.php
 ```
 
 When writing tests, only test specific files. Do not run all tests or the full
diff --git a/src/Bundle/ChillEventBundle/Resources/public/vuejs/App.vue b/src/Bundle/ChillEventBundle/Resources/public/vuejs/App.vue
index 89158d742..02d64f838 100644
--- a/src/Bundle/ChillEventBundle/Resources/public/vuejs/App.vue
+++ b/src/Bundle/ChillEventBundle/Resources/public/vuejs/App.vue
@@ -1,14 +1,14 @@
 <template>
-    <location />
+  <location />
 </template>
 
 <script>
 import Location from "ChillActivityAssets/vuejs/Activity/components/Location.vue";
 
 export default {
-    name: "App",
-    components: {
-        Location,
-    },
+  name: "App",
+  components: {
+    Location,
+  },
 };
 </script>
diff --git a/src/Bundle/ChillJobBundle/src/Entity/Immersion.php b/src/Bundle/ChillJobBundle/src/Entity/Immersion.php
index 5ae19a365..80d05062e 100644
--- a/src/Bundle/ChillJobBundle/src/Entity/Immersion.php
+++ b/src/Bundle/ChillJobBundle/src/Entity/Immersion.php
@@ -19,7 +19,6 @@ use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\Address;
 use libphonenumber\PhoneNumber;
 use Symfony\Component\Validator\Constraints as Assert;
-use Chill\MainBundle\Validation\Constraint\PhonenumberConstraint;
 
 /**
  * Immersion.
@@ -86,14 +85,14 @@ class Immersion implements \Stringable
      * @Assert\NotBlank()
      */
     #[ORM\Column(name: 'tuteurPhoneNumber', type: 'phone_number', nullable: true)]
-    #[PhonenumberConstraint(type: 'any')]
+    #[\Misd\PhoneNumberBundle\Validator\Constraints\PhoneNumber]
     private ?PhoneNumber $tuteurPhoneNumber = null;
 
     #[ORM\Column(name: 'structureAccName', type: \Doctrine\DBAL\Types\Types::TEXT, nullable: true)]
     private ?string $structureAccName = null;
 
     #[ORM\Column(name: 'structureAccPhonenumber', type: 'phone_number', nullable: true)]
-    #[PhonenumberConstraint(type: 'any')]
+    #[\Misd\PhoneNumberBundle\Validator\Constraints\PhoneNumber]
     private ?PhoneNumber $structureAccPhonenumber = null;
 
     #[ORM\Column(name: 'structureAccEmail', type: \Doctrine\DBAL\Types\Types::TEXT, nullable: true)]
diff --git a/src/Bundle/ChillMainBundle/Entity/Location.php b/src/Bundle/ChillMainBundle/Entity/Location.php
index 5705e6a1a..e2605f9a1 100644
--- a/src/Bundle/ChillMainBundle/Entity/Location.php
+++ b/src/Bundle/ChillMainBundle/Entity/Location.php
@@ -14,9 +14,9 @@ namespace Chill\MainBundle\Entity;
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Repository\LocationRepository;
-use Chill\MainBundle\Validation\Constraint\PhonenumberConstraint;
 use Doctrine\ORM\Mapping as ORM;
 use libphonenumber\PhoneNumber;
+use Misd\PhoneNumberBundle\Validator\Constraints\PhoneNumber as MisdPhoneNumberConstraint;
 use Symfony\Component\Serializer\Annotation as Serializer;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 
@@ -67,12 +67,12 @@ class Location implements TrackCreationInterface, TrackUpdateInterface
 
     #[Serializer\Groups(['read', 'write', 'docgen:read'])]
     #[ORM\Column(type: 'phone_number', nullable: true)]
-    #[PhonenumberConstraint(type: 'any')]
+    #[MisdPhoneNumberConstraint(type: [MisdPhoneNumberConstraint::ANY])]
     private ?PhoneNumber $phonenumber1 = null;
 
     #[Serializer\Groups(['read', 'write', 'docgen:read'])]
     #[ORM\Column(type: 'phone_number', nullable: true)]
-    #[PhonenumberConstraint(type: 'any')]
+    #[MisdPhoneNumberConstraint(type: [MisdPhoneNumberConstraint::ANY])]
     private ?PhoneNumber $phonenumber2 = null;
 
     #[Serializer\Groups(['read'])]
diff --git a/src/Bundle/ChillMainBundle/Entity/User.php b/src/Bundle/ChillMainBundle/Entity/User.php
index 70b032238..979837ae8 100644
--- a/src/Bundle/ChillMainBundle/Entity/User.php
+++ b/src/Bundle/ChillMainBundle/Entity/User.php
@@ -119,7 +119,7 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter
      * The user's mobile phone number.
      */
     #[ORM\Column(type: 'phone_number', nullable: true)]
-    #[PhonenumberConstraint]
+    #[\Misd\PhoneNumberBundle\Validator\Constraints\PhoneNumber]
     private ?PhoneNumber $phonenumber = null;
 
     /**
diff --git a/src/Bundle/ChillMainBundle/Phonenumber/PhoneNumberHelperInterface.php b/src/Bundle/ChillMainBundle/Phonenumber/PhoneNumberHelperInterface.php
index c7cf1ddfd..ca0e3e8e0 100644
--- a/src/Bundle/ChillMainBundle/Phonenumber/PhoneNumberHelperInterface.php
+++ b/src/Bundle/ChillMainBundle/Phonenumber/PhoneNumberHelperInterface.php
@@ -31,6 +31,8 @@ interface PhoneNumberHelperInterface
 
     /**
      * Return true if the validation is configured and available.
+     *
+     * @deprecated this is an internal behaviour of the helper and should not be taken into account outside of the implementation
      */
     public function isPhonenumberValidationConfigured(): bool;
 
diff --git a/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php b/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
index 8a7574ac0..9b103f275 100644
--- a/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
+++ b/src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php
@@ -122,7 +122,7 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
      */
     public function isValidPhonenumberAny($phonenumber): bool
     {
-        if (false === $this->isPhonenumberValidationConfigured()) {
+        if (false === $this->isConfigured) {
             return true;
         }
         $validation = $this->performTwilioLookup($phonenumber);
@@ -142,7 +142,7 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
      */
     public function isValidPhonenumberLandOrVoip($phonenumber): bool
     {
-        if (false === $this->isPhonenumberValidationConfigured()) {
+        if (false === $this->isConfigured) {
             return true;
         }
 
@@ -163,7 +163,7 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
      */
     public function isValidPhonenumberMobile($phonenumber): bool
     {
-        if (false === $this->isPhonenumberValidationConfigured()) {
+        if (false === $this->isConfigured) {
             return true;
         }
 
@@ -178,7 +178,7 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
 
     private function performTwilioLookup($phonenumber)
     {
-        if (false === $this->isPhonenumberValidationConfigured()) {
+        if (false === $this->isConfigured) {
             return null;
         }
 
diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/js/date.ts b/src/Bundle/ChillMainBundle/Resources/public/chill/js/date.ts
index 8e9d56695..ce0a9ea7b 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/js/date.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/js/date.ts
@@ -166,3 +166,18 @@ export const intervalISOToDays = (str: string | null): number | null => {
 
     return days;
 };
+
+export function getTimezoneOffsetString(date: Date, timeZone: string): string {
+  const utcDate = new Date(date.toLocaleString("en-US", { timeZone: "UTC" }));
+  const tzDate  = new Date(date.toLocaleString("en-US", { timeZone }));
+  const offsetMinutes = (utcDate.getTime() - tzDate.getTime()) / (60 * 1000);
+
+  // Inverser le signe pour avoir la convention ±HH:MM
+  const sign = offsetMinutes <= 0 ? "+" : "-";
+  const absMinutes = Math.abs(offsetMinutes);
+  const hours = String(Math.floor(absMinutes / 60)).padStart(2, "0");
+  const minutes = String(absMinutes % 60).padStart(2, "0");
+
+  return `${sign}${hours}:${minutes}`;
+}
+
diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss
index 248b32cfc..f7ccb0d8d 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/buttons.scss
@@ -54,7 +54,6 @@ $chill-theme-buttons: (
    &.btn-unlink,
    &.btn-action,
    &.btn-edit,
-   &.btn-tpchild,
    &.btn-wopilink,
    &.btn-update {
        &, &:hover {
@@ -82,7 +81,6 @@ $chill-theme-buttons: (
    &.btn-remove::before,
    &.btn-choose::before,
    &.btn-notify::before,
-   &.btn-tpchild::before,
    &.btn-download::before,
    &.btn-search::before,
    &.btn-cancel::before {
@@ -112,7 +110,6 @@ $chill-theme-buttons: (
    &.btn-choose::before    { content: "\f00c"; } // fa-check  // f046 fa-check-square-o
    &.btn-unlink::before    { content: "\f127"; } // fa-chain-broken
    &.btn-notify::before    { content: "\f1d8"; } // fa-paper-plane
-   &.btn-tpchild::before   { content: "\f007"; } // fa-user
    &.btn-download::before  { content: "\f019"; } // fa-download
    &.btn-search::before    { content: "\f002"; } // fa-search
 }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/forms.scss b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/forms.scss
index 28c597bc0..daa22170f 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/scss/forms.scss
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/scss/forms.scss
@@ -29,10 +29,14 @@ form {
 
     label {
         display: inline;
-        &.required:after {
-            content: " *";
-            color: $red;
-        }
+    }
+}
+
+label {
+    display: inline;
+    &.required:after {
+        content: " *";
+        color: $red;
     }
 }
 
@@ -45,4 +49,4 @@ form {
 
 .chill_filter_order {
     background: $gray-100;
-}
\ No newline at end of file
+}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.ts b/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.ts
index 887a376f3..43ae42613 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.ts
@@ -1,8 +1,14 @@
-import { Scope } from "../../types";
+import {
+  DynamicKeys,
+  Scope,
+  ValidationExceptionInterface,
+  ValidationProblemFromMap,
+  ViolationFromMap
+} from "../../types";
 
 export type body = Record<string, boolean | string | number | null>;
 export type fetchOption = Record<string, boolean | string | number | null>;
-
+export type Primitive = string | number | boolean | null;
 export type Params = Record<string, number | string>;
 
 export interface Pagination {
@@ -25,20 +31,115 @@ export interface TransportExceptionInterface {
   name: string;
 }
 
-export interface ValidationExceptionInterface
-  extends TransportExceptionInterface {
-  name: "ValidationException";
-  error: object;
-  violations: string[];
-  titles: string[];
-  propertyPaths: string[];
+export class ValidationException<
+    M extends Record<string, Record<string, string|number>> = Record<
+      string,
+      Record<string, string|number>
+    >,
+  >
+  extends Error
+  implements ValidationExceptionInterface<M>
+{
+  public readonly name = "ValidationException" as const;
+  public readonly problems: ValidationProblemFromMap<M>;
+  public readonly violations: string[];
+  public readonly violationsList: ViolationFromMap<M>[];
+  public readonly titles: string[];
+  public readonly propertyPaths: DynamicKeys<M> & string[];
+  public readonly byProperty: Record<Extract<keyof M, string>, string[]>;
+
+  constructor(problem: ValidationProblemFromMap<M>) {
+    const message = [problem.title, problem.detail].filter(Boolean).join(" — ");
+    super(message);
+    Object.setPrototypeOf(this, new.target.prototype);
+
+    this.problems = problem;
+
+    this.violationsList = problem.violations;
+    this.violations = problem.violations.map(
+      (v) => `${v.title}: ${v.propertyPath}`,
+    );
+
+    this.titles = problem.violations.map((v) => v.title);
+
+    this.propertyPaths = problem.violations.map(
+      (v) => v.propertyPath,
+    ) as DynamicKeys<M> & string[];
+
+    this.byProperty = problem.violations.reduce(
+      (acc, v) => {
+        const key = v.propertyPath.replace('/\[\d+\]$/', "") as Extract<keyof M, string>;
+        (acc[key] ||= []).push(v.title);
+        return acc;
+      },
+      {} as Record<Extract<keyof M, string>, string[]>,
+    );
+
+    if (Error.captureStackTrace) {
+      Error.captureStackTrace(this, ValidationException);
+    }
+  }
+
+  violationsByNormalizedProperty(property: Extract<keyof M, string>): ViolationFromMap<M>[] {
+    return this.violationsList.filter((v) => v.propertyPath.replace(/\[\d+\]$/, "") === property);
+  }
+
+  violationsByNormalizedPropertyAndParams<
+    P extends Extract<keyof M, string>,
+    K extends Extract<keyof M[P], string>
+  >(
+    property: P,
+    param: K,
+    param_value: M[P][K]
+  ): ViolationFromMap<M>[]
+  {
+    const list = this.violationsByNormalizedProperty(property);
+
+    return  list.filter(
+      (v): boolean =>
+        !!v.parameters &&
+        // `with_parameter in v.parameters` check indexing
+        param in v.parameters &&
+        // the cast is safe, because we have overloading that bind the types
+        (v.parameters as M[P])[param] === param_value
+    );
+  }
 }
 
-export interface ValidationErrorResponse extends TransportExceptionInterface {
-  violations: {
-    title: string;
-    propertyPath: string;
-  }[];
+/**
+ * Check that the exception is a ValidationExceptionInterface
+ * @param x
+ */
+export function isValidationException<M extends Record<string, Record<string, string|number>>>(
+  x: unknown,
+): x is ValidationExceptionInterface<M> {
+  return (
+    x instanceof ValidationException ||
+    (typeof x === "object" &&
+      x !== null &&
+      (x as any).name === "ValidationException")
+  );
+}
+
+export function isValidationProblem(x: unknown): x is {
+  type: string;
+  title: string;
+  violations: { propertyPath: string; title: string }[];
+} {
+  if (!x || typeof x !== "object") return false;
+  const o = x as any;
+  return (
+    typeof o.type === "string" &&
+    typeof o.title === "string" &&
+    Array.isArray(o.violations) &&
+    o.violations.every(
+      (v: any) =>
+        v &&
+        typeof v === "object" &&
+        typeof v.propertyPath === "string" &&
+        typeof v.title === "string",
+    )
+  );
 }
 
 export interface AccessExceptionInterface extends TransportExceptionInterface {
@@ -65,12 +166,151 @@ export interface ConflictHttpExceptionInterface
 }
 
 /**
- * Generic api method that can be adapted to any fetch request
+ * Generic api method that can be adapted to any fetch request.
  *
- * This method is suitable make a single fetch. When performing a GET to fetch a list of elements, always consider pagination
- * and use of the @link{fetchResults} method.
+ * What this does
+ * - Performs a single HTTP request using fetch and returns the parsed JSON as Output.
+ * - Interprets common API errors and throws typed exceptions you can catch in your UI.
+ * - When the server returns a Symfony validation problem (HTTP 422), the error is
+ *   rethrown as a typed ValidationException that is aware of your Violation Map (see below).
+ *
+ * Important: For GET endpoints that return lists, prefer using fetchResults, which
+ * handles pagination and aggregation for you.
+ *
+ * Violation Map (M): make your 422 errors strongly typed
+ * ------------------------------------------------------
+ * Symfony’s validation problem+json payload looks like this (simplified):
+ *
+ *   {
+ *     "type": "https://symfony.com/errors/validation",
+ *     "title": "Validation Failed",
+ *     "violations": [
+ *       {
+ *         "propertyPath": "mobilenumber",
+ *         "title": "This value is not a valid phone number.",
+ *         "parameters": {
+ *           "{{ value }}": "+33 1 02 03 04 05",
+ *           "{{ types }}": "mobile number"
+ *         },
+ *         "type": "urn:uuid:..."
+ *       }
+ *     ]
+ *   }
+ *
+ * The makeFetch generic type parameter M lets you describe, field by field, which
+ * parameters may appear for each propertyPath. Doing so gives you full type-safety when
+ * consuming ValidationException in your UI code.
+ *
+ * How to build M (Violation Map)
+ * - M is a map where each key is a server-side propertyPath (string), and the value is a
+ *   record describing the allowed keys in the parameters object for that property.
+ * - Keys in parameters are the exact strings you receive from Symfony, including the
+ *   curly-braced placeholders such as "{{ value }}", "{{ types }}", etc.
+ *
+ * Example from Person creation (WritePersonViolationMap)
+ * -----------------------------------------------------
+ * In ChillPersonBundle/Resources/public/vuejs/_api/OnTheFly.ts you’ll find:
+ *
+ *   export type WritePersonViolationMap = {
+ *     gender: {
+ *       "{{ value }}": string | null;
+ *     };
+ *     mobilenumber: {
+ *       "{{ types }}": string;          // ex: "mobile number"
+ *       "{{ value }}": string;          // ex: "+33 1 02 03 04 05"
+ *     };
+ *   };
+ *
+ * This means:
+ * - If the server reports a violation for propertyPath "gender", the parameters object
+ *   is expected to contain a key "{{ value }}" with a string or null value.
+ * - If the server reports a violation for propertyPath "mobilenumber", the parameters
+ *   may include "{{ value }}" and "{{ types }}" as strings.
+ *
+ * How makeFetch uses M
+ * - When the response has status 422 and the payload matches a Symfony validation
+ *   problem, makeFetch casts it to ValidationProblemFromMap<M> and throws a
+ *   ValidationException<M>.
+ * - The ValidationException exposes helpful, pre-computed fields:
+ *   - exception.problem: the full typed payload
+ *   - exception.violations: ["Title: propertyPath", ...]
+ *   - exception.titles: ["Title 1", "Title 2", ...]
+ *   - exception.propertyPaths: ["gender", "mobilenumber", ...] (typed from M)
+ *   - exception.byProperty: { gender: [titles...], mobilenumber: [titles...] }
+ *
+ * Typical usage patterns
+ * ----------------------
+ * 1) GET without Validation Map (no 422 expected):
+ *
+ *   const centers = await makeFetch<null, { showCenters: boolean; centers: Center[] }>(
+ *     "GET",
+ *     "/api/1.0/person/creation/authorized-centers",
+ *     null
+ *   );
+ *
+ * 2) POST with body and Violation Map:
+ *
+ *   type WritePersonViolationMap = {
+ *     gender: { "{{ value }}": string | null };
+ *     mobilenumber: { "{{ types }}": string; "{{ value }}": string };
+ *   };
+ *
+ *   try {
+ *     const created = await makeFetch<PersonWrite, Person, WritePersonViolationMap>(
+ *       "POST",
+ *       "/api/1.0/person/person.json",
+ *       personPayload
+ *     );
+ *     // Success path
+ *   } catch (e) {
+ *     if (isValidationException(e)) {
+ *       // Fully typed:
+ *       e.propertyPaths.includes("mobilenumber");
+ *       const firstTitleForMobile = e.byProperty.mobilenumber?.[0];
+ *       // You can also inspect parameter values:
+ *       const v = e.problem.violations.find(v => v.propertyPath === "mobilenumber");
+ *       const rawValue = v?.parameters?.["{{ value }}"]; // typed as string
+ *     } else {
+ *       // Other error handling (AccessException, ConflictHttpException, etc.)
+ *     }
+ *   }
+ *
+ * Tips to design your Violation Map
+ * - Use exact propertyPath strings as exposed by the API (they usually match your
+ *   DTO field names or entity property paths used by the validator).
+ * - Inside each property, list only the placeholders that you actually read in the UI
+ *   (you can always add more later). This keeps your types strict but pragmatic.
+ * - If a field may not include parameters at all, you can set it to an empty object {}.
+ * - If you don’t care about parameter typing, you can omit M entirely and rely on the
+ *   default loose typing (Record<string, Primitive>), but you’ll lose safety.
+ *
+ * Error taxonomy thrown by makeFetch
+ * - ValidationException<M> when status = 422 and payload is a validation problem.
+ * - AccessException when status = 403.
+ * - ConflictHttpException when status = 409.
+ * - A generic error object for other non-ok statuses.
+ *
+ * @typeParam Input  - Shape of the request body you send (if any)
+ * @typeParam Output - Shape of the successful JSON response you expect
+ * @typeParam M      - Violation Map describing the per-field parameters you expect
+ *                     in Symfony validation violations. See examples above.
+ *
+ * @param method  The HTTP method to use (POST, GET, PUT, PATCH, DELETE)
+ * @param url     The absolute or relative URL to call
+ * @param body    The request payload. If null/undefined, no body is sent
+ * @param options Extra fetch options/headers merged into the request
+ *
+ * @returns The parsed JSON response typed as Output. For 204 No Content, resolves
+ *          with undefined (void).
  */
-export const makeFetch = <Input, Output>(
+export const makeFetch = async <
+  Input,
+  Output,
+  M extends Record<string, Record<string, string|number>> = Record<
+    string,
+    Record<string, string|number>
+  >,
+>(
   method: "POST" | "GET" | "PUT" | "PATCH" | "DELETE",
   url: string,
   body?: body | Input | null,
@@ -90,7 +330,8 @@ export const makeFetch = <Input, Output>(
   if (typeof options !== "undefined") {
     opts = Object.assign(opts, options);
   }
-  return fetch(url, opts).then((response) => {
+
+  return fetch(url, opts).then(async (response) => {
     if (response.status === 204) {
       return Promise.resolve();
     }
@@ -100,9 +341,20 @@ export const makeFetch = <Input, Output>(
     }
 
     if (response.status === 422) {
-      return response.json().then((response) => {
-        throw ValidationException(response);
-      });
+      // Unprocessable Entity -> payload de validation Symfony
+      const json = await response.json().catch(() => undefined);
+
+      if (isValidationProblem(json)) {
+        // On ré-interprète le payload selon M (ParamMap) pour typer les violations
+        const problem = json as unknown as ValidationProblemFromMap<M>;
+        throw new ValidationException<M>(problem);
+      }
+
+      const err = new Error(
+        "Validation failed but payload is not a ValidationProblem",
+      );
+      (err as any).raw = json;
+      throw err;
     }
 
     if (response.status === 403) {
@@ -167,12 +419,6 @@ function _fetchAction<T>(
         throw NotFoundException(response);
       }
 
-      if (response.status === 422) {
-        return response.json().then((response) => {
-          throw ValidationException(response);
-        });
-      }
-
       if (response.status === 403) {
         throw AccessException(response);
       }
@@ -231,24 +477,6 @@ export const fetchScopes = (): Promise<Scope[]> => {
   return fetchResults("/api/1.0/main/scope.json");
 };
 
-/**
- * Error objects to be thrown
- */
-const ValidationException = (
-  response: ValidationErrorResponse,
-): ValidationExceptionInterface => {
-  const error = {} as ValidationExceptionInterface;
-  error.name = "ValidationException";
-  error.violations = response.violations.map(
-    (violation) => `${violation.title}: ${violation.propertyPath}`,
-  );
-  error.titles = response.violations.map((violation) => violation.title);
-  error.propertyPaths = response.violations.map(
-    (violation) => violation.propertyPath,
-  );
-  return error;
-};
-
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const AccessException = (response: Response): AccessExceptionInterface => {
   const error = {} as AccessExceptionInterface;
diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/api/genderHelper.ts b/src/Bundle/ChillMainBundle/Resources/public/lib/api/genderHelper.ts
new file mode 100644
index 000000000..f913fd194
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/api/genderHelper.ts
@@ -0,0 +1,17 @@
+import {Gender, GenderTranslation} from "ChillMainAssets/types";
+
+/**
+ * Translates a given gender object into its corresponding gender translation string.
+ *
+ * @param {Gender|null} gender - The gender object to be translated, null values are also supported
+ * @return {GenderTranslation} Returns the gender translation string corresponding to the provided gender,
+ *                             or "unknown" if the gender is null.
+ */
+export function toGenderTranslation(gender: Gender|null): GenderTranslation
+{
+  if (null === gender) {
+    return "unknown";
+  }
+
+  return gender.genderTranslation;
+}
diff --git a/src/Bundle/ChillMainBundle/Resources/public/types.ts b/src/Bundle/ChillMainBundle/Resources/public/types.ts
index 2c4288e8f..251953679 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/types.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/types.ts
@@ -3,6 +3,8 @@ import {
     isGenericDocWithStoredObject,
 } from "ChillDocStoreAssets/types/generic_doc";
 import { StoredObject, StoredObjectStatus } from "ChillDocStoreAssets/types";
+import { CreatableEntityType } from "ChillPersonAssets/types";
+import {ThirdpartyCompany} from "../../../ChillThirdPartyBundle/Resources/public/types";
 import { Person } from "../../../ChillPersonBundle/Resources/public/types";
 
 export interface DateTime {
@@ -10,9 +12,58 @@ export interface DateTime {
   datetime8601: string;
 }
 
+/**
+ * A date representation to use when we create or update a date
+ */
+export interface DateTimeWrite {
+  /**
+   * Must be a string in format Y-m-d\TH:i:sO
+   */
+  datetime: string;
+}
+
 export interface Civility {
+  type: "chill_main_civility";
+  id: number;
+  abbreviation: TranslatableString;
+  active: boolean;
+  name: TranslatableString;
+}
+
+/**
+ * Lightweight reference to Civility, to use in POST or PUT requests.
+ */
+export interface SetCivility {
+  type: "chill_main_civility";
+  id: number;
+}
+
+
+/**
+ * Gender translation.
+ *
+ * Match the GenderEnum in PHP code.
+ */
+export type GenderTranslation = "male" | "female" | "neutral" | "unknown";
+
+/**
+ * A gender
+ *
+ * See also
+ */
+export interface Gender {
+  type: "chill_main_gender";
+  id: number;
+  label: TranslatableString;
+  genderTranslation: GenderTranslation;
+}
+
+/**
+ * Lightweight reference to a Gender, used in POST / PUT requests.
+ */
+export interface SetGender {
+  type: "chill_main_gender";
   id: number;
-  // TODO
 }
 
 export interface Household {
@@ -32,6 +83,18 @@ export interface Center {
   id: number;
   type: "center";
   name: string;
+  isActive: boolean;
+}
+
+/**
+ * SetCenter is a lightweight reference used in POST/PUT requests to associate an existing center with a resource.
+ * It links by id only and does not create or modify centers.
+ * Expected shape: { type: "center", id: number }.
+ * Requests will fail if the id is invalid, the center doesn't exist, or permissions are insufficient.
+ */
+export interface SetCenter {
+  id: number;
+  type: "center";
 }
 
 export interface Scope {
@@ -123,6 +186,13 @@ export interface Address {
   isNoAddress: boolean;
 }
 
+/**
+ * Associate an existing address in write operations.
+ */
+export interface SetAddress {
+  id: number;
+}
+
 export interface AddressWithPoint extends Address {
   point: Point;
 }
@@ -301,13 +371,63 @@ export interface TransportExceptionInterface {
   name: string;
 }
 
-export interface ValidationExceptionInterface
-  extends TransportExceptionInterface {
+type IndexedKey<Base extends string> = `${Base}[${number}]`;
+type BaseKeys<M> = Extract<keyof M, string>;
+
+export type DynamicKeys<M extends Record<string, Record<string, unknown>>> =
+  | BaseKeys<M>
+  | { [K in BaseKeys<M> as IndexedKey<K>]: K }[IndexedKey<BaseKeys<M>>];
+
+type NormalizeKey<K extends string> = K extends `${infer B}[${number}]` ? B : K;
+
+export type ViolationFromMap<M extends Record<string, Record<string, unknown>>> = {
+  [K in DynamicKeys<M> & string]: { // <- note le "& string" ici
+    propertyPath: K;
+    title: string;
+    parameters?: M[NormalizeKey<K>];
+    type?: string;
+  }
+}[DynamicKeys<M> & string];
+
+export type ValidationProblemFromMap<
+  M extends Record<string, Record<string, string|number>>,
+> = {
+  type: string;
+  title: string;
+  detail?: string;
+  violations: ViolationFromMap<M>[];
+} & Record<string, unknown>;
+
+export interface ValidationExceptionInterface<
+  M extends Record<string, Record<string, string|number>> = Record<
+    string,
+    Record<string, string|number>
+  >,
+> extends Error {
   name: "ValidationException";
-  error: object;
+  /** Full server payload copy  */
+  problems: ValidationProblemFromMap<M>;
+  /** A list of all violations, with property key */
+  violationsList: ViolationFromMap<M>[];
+  /** Compact list "Title: path" */
   violations: string[];
+  /** Only titles */
   titles: string[];
-  propertyPaths: string[];
+  /** Only property paths */
+  propertyPaths: DynamicKeys<M> & string[];
+  /** Indexing by property (useful for display by field) */
+  byProperty: Record<Extract<keyof M, string>, string[]>;
+
+  violationsByNormalizedProperty(property: Extract<keyof M, string>): ViolationFromMap<M>[];
+
+  violationsByNormalizedPropertyAndParams<
+    P extends Extract<keyof M, string>,
+    K extends Extract<keyof M[P], string>
+  >(
+    property: P,
+    param: K,
+    param_value: M[P][K]
+  ): ViolationFromMap<M>[];
 }
 
 export interface AccessExceptionInterface extends TransportExceptionInterface {
@@ -376,6 +496,26 @@ export interface TabDefinition {
   counter: () => number;
 }
 
+export type CreateComponentConfigGeneral = {
+  action: 'create';
+  allowedTypes: CreatableEntityType[];
+  query: string;
+  parent: null;
+}
+
+export type CreateComponentThirdPartyAddContact = {
+  action: 'addContact';
+  allowedTypes: readonly ['thirdparty'];
+  query: string;
+  parent: ThirdpartyCompany;
+}
+
+/**
+ * Configuration for the CreateModal and Create component
+ */
+export type CreateComponentConfig = CreateComponentConfigGeneral | CreateComponentThirdPartyAddContact;
+
+
 /**
  * Possible states for the WaitingScreen Component.
  */
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
index 76de138d0..0b3a42e69 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress.vue
@@ -12,24 +12,22 @@
     ref="showAddress"
   />
 
-    <!-- step 1 -->
-    <teleport to="body" v-if="inModal">
-        <modal
-            v-if="flag.suggestPane"
-            modal-dialog-class="modal-dialog-scrollable modal-xl"
-            @close="resetPane"
-        >
-            <template #header>
-                <h2 class="modal-title">
-                    {{ trans(getTextTitle) }}
-                    <span v-if="flag.loading" class="loading">
-                        <i class="fa fa-circle-o-notch fa-spin fa-fw" />
-                        <span class="sr-only">{{
-                            trans(ADDRESS_LOADING)
-                        }}</span>
-                    </span>
-                </h2>
-            </template>
+  <!-- step 1 -->
+  <teleport to="body" v-if="inModal">
+    <modal
+      v-if="flag.suggestPane"
+      modal-dialog-class="modal-dialog-scrollable modal-xl"
+      @close="resetPane"
+    >
+      <template #header>
+        <h2 class="modal-title">
+          {{ trans(getTextTitle) }}
+          <span v-if="flag.loading" class="loading">
+            <i class="fa fa-circle-o-notch fa-spin fa-fw" />
+            <span class="sr-only">{{ trans(ADDRESS_LOADING) }}</span>
+          </span>
+        </h2>
+      </template>
 
       <template #body>
         <suggest-pane
@@ -90,9 +88,7 @@
           {{ trans(getTextTitle) }}
           <span v-if="flag.loading" class="loading">
             <i class="fa fa-circle-o-notch fa-spin fa-fw" />
-            <span class="sr-only">{{
-                            trans(ADDRESS_LOADING)
-                        }}</span>
+            <span class="sr-only">{{ trans(ADDRESS_LOADING) }}</span>
           </span>
         </h2>
       </template>
@@ -175,9 +171,7 @@
           {{ trans(getTextTitle) }}
           <span v-if="flag.loading" class="loading">
             <i class="fa fa-circle-o-notch fa-spin fa-fw" />
-            <span class="sr-only">{{
-                            trans(ADDRESS_LOADING)
-                        }}</span>
+            <span class="sr-only">{{ trans(ADDRESS_LOADING) }}</span>
           </span>
         </h2>
       </template>
@@ -248,14 +242,14 @@ import {
 } from "../api";
 import {
   CREATE_A_NEW_ADDRESS,
-    ADDRESS_LOADING,
-    ACTIVITY_CREATE_ADDRESS,
-    ACTIVITY_EDIT_ADDRESS,
+  ADDRESS_LOADING,
+  ACTIVITY_CREATE_ADDRESS,
+  ACTIVITY_EDIT_ADDRESS,
   CANCEL,
-    SAVE,
-    PREVIOUS,
-    NEXT,
-    trans,
+  SAVE,
+  PREVIOUS,
+  NEXT,
+  trans,
 } from "translator";
 import ShowPane from "./ShowPane.vue";
 import SuggestPane from "./SuggestPane.vue";
@@ -265,16 +259,17 @@ import DatePane from "./DatePane.vue";
 export default {
   name: "AddAddress",
   setup() {
-        return {
-            trans,
-            CREATE_A_NEW_ADDRESS,
-            ADDRESS_LOADING,
-            CANCEL,
-            SAVE,
-            PREVIOUS,
-            NEXT,
-        };
-    },props: ["context", "options", "addressChangedCallback"],
+    return {
+      trans,
+      CREATE_A_NEW_ADDRESS,
+      ADDRESS_LOADING,
+      CANCEL,
+      SAVE,
+      PREVIOUS,
+      NEXT,
+    };
+  },
+  props: ["context", "options", "addressChangedCallback"],
   components: {
     Modal,
     ShowPane,
@@ -394,9 +389,9 @@ export default {
       ) {
         console.log("this.options.title", this.options.title);
 
-                return this.context.edit
-                    ? ACTIVITY_EDIT_ADDRESS
-                    : ACTIVITY_CREATE_ADDRESS;
+        return this.context.edit
+          ? ACTIVITY_EDIT_ADDRESS
+          : ACTIVITY_CREATE_ADDRESS;
       }
       return this.context.edit
         ? this.defaultz.title.edit
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue
index f90db6d05..bfa10fe3a 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressMore.vue
@@ -55,9 +55,7 @@
           :placeholder="trans(ADDRESS_BUILDING_NAME)"
           v-model="buildingName"
         />
-        <label for="buildingName">{{
-                    trans(ADDRESS_BUILDING_NAME)
-                }}</label>
+        <label for="buildingName">{{ trans(ADDRESS_BUILDING_NAME) }}</label>
       </div>
       <div class="form-floating my-1">
         <input
@@ -79,9 +77,7 @@
           :placeholder="trans(ADDRESS_DISTRIBUTION)"
           v-model="distribution"
         />
-        <label for="distribution">{{
-                    trans(ADDRESS_DISTRIBUTION)
-                }}</label>
+        <label for="distribution">{{ trans(ADDRESS_DISTRIBUTION) }}</label>
       </div>
     </div>
   </div>
@@ -89,35 +85,36 @@
 
 <script>
 import {
-    ADDRESS_STREET,
-    ADDRESS_STREET_NUMBER,
-    ADDRESS_FLOOR,
-    ADDRESS_CORRIDOR,
-    ADDRESS_STEPS,
-    ADDRESS_FLAT,
-    ADDRESS_BUILDING_NAME,
-    ADDRESS_DISTRIBUTION,
-    ADDRESS_EXTRA,
-    ADDRESS_FILL_AN_ADDRESS,
-    trans,
+  ADDRESS_STREET,
+  ADDRESS_STREET_NUMBER,
+  ADDRESS_FLOOR,
+  ADDRESS_CORRIDOR,
+  ADDRESS_STEPS,
+  ADDRESS_FLAT,
+  ADDRESS_BUILDING_NAME,
+  ADDRESS_DISTRIBUTION,
+  ADDRESS_EXTRA,
+  ADDRESS_FILL_AN_ADDRESS,
+  trans,
 } from "translator";
 export default {
   name: "AddressMore",
   setup() {
-        return {
-            ADDRESS_STREET,
-            ADDRESS_STREET_NUMBER,
-            ADDRESS_FLOOR,
-            ADDRESS_CORRIDOR,
-            ADDRESS_STEPS,
-            ADDRESS_FLAT,
-            ADDRESS_BUILDING_NAME,
-            ADDRESS_DISTRIBUTION,
-            ADDRESS_EXTRA,
-            ADDRESS_FILL_AN_ADDRESS,
-            trans,
-        };
-    },props: ["entity", "isNoAddress"],
+    return {
+      ADDRESS_STREET,
+      ADDRESS_STREET_NUMBER,
+      ADDRESS_FLOOR,
+      ADDRESS_CORRIDOR,
+      ADDRESS_STEPS,
+      ADDRESS_FLAT,
+      ADDRESS_BUILDING_NAME,
+      ADDRESS_DISTRIBUTION,
+      ADDRESS_EXTRA,
+      ADDRESS_FILL_AN_ADDRESS,
+      trans,
+    };
+  },
+  props: ["entity", "isNoAddress"],
   computed: {
     floor: {
       set(value) {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue
index 195ec55fc..df10b1468 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/AddressSelection.vue
@@ -57,9 +57,7 @@
           :placeholder="trans(ADDRESS_STREET_NUMBER)"
           v-model="streetNumber"
         />
-        <label for="streetNumber">{{
-                    trans(ADDRESS_STREET_NUMBER)
-                }}</label>
+        <label for="streetNumber">{{ trans(ADDRESS_STREET_NUMBER) }}</label>
       </div>
     </div>
   </div>
@@ -72,31 +70,32 @@ import {
   fetchReferenceAddresses,
 } from "../../api.js";
 import {
-    ADDRESS_STREET,
-    ADDRESS_STREET_NUMBER,
-    ADDRESS_ADDRESS,
-    MULTISELECT_SELECTED_LABEL,
-    MULTISELECT_SELECT_LABEL,
-    ADDRESS_SELECT_ADDRESS,
-    ADDRESS_CREATE_ADDRESS,
-    trans,
+  ADDRESS_STREET,
+  ADDRESS_STREET_NUMBER,
+  ADDRESS_ADDRESS,
+  MULTISELECT_SELECTED_LABEL,
+  MULTISELECT_SELECT_LABEL,
+  ADDRESS_SELECT_ADDRESS,
+  ADDRESS_CREATE_ADDRESS,
+  trans,
 } from "translator";
 
 export default {
   name: "AddressSelection",
   components: { VueMultiselect },
   setup() {
-        return {
-            ADDRESS_STREET,
-            ADDRESS_STREET_NUMBER,
-            ADDRESS_ADDRESS,
-            MULTISELECT_SELECTED_LABEL,
-            MULTISELECT_SELECT_LABEL,
-            ADDRESS_SELECT_ADDRESS,
-            ADDRESS_CREATE_ADDRESS,
-            trans,
-        };
-    },props: ["entity", "context", "updateMapCenter", "flag", "checkErrors"],
+    return {
+      ADDRESS_STREET,
+      ADDRESS_STREET_NUMBER,
+      ADDRESS_ADDRESS,
+      MULTISELECT_SELECTED_LABEL,
+      MULTISELECT_SELECT_LABEL,
+      ADDRESS_SELECT_ADDRESS,
+      ADDRESS_CREATE_ADDRESS,
+      trans,
+    };
+  },
+  props: ["entity", "context", "updateMapCenter", "flag", "checkErrors"],
   data() {
     return {
       value: this.context.edit ? this.entity.address.addressReference : null,
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue
index b5de1639e..459b20831 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CitySelection.vue
@@ -61,31 +61,32 @@
 import VueMultiselect from "vue-multiselect";
 import { searchCities, fetchCities } from "../../api.js";
 import {
-    MULTISELECT_SELECTED_LABEL,
-    MULTISELECT_SELECT_LABEL,
-    ADDRESS_POSTAL_CODE_CODE,
-    ADDRESS_POSTAL_CODE_NAME,
-    ADDRESS_CREATE_POSTAL_CODE,
-    ADDRESS_CITY,
-    ADDRESS_SELECT_CITY,
-    trans,
+  MULTISELECT_SELECTED_LABEL,
+  MULTISELECT_SELECT_LABEL,
+  ADDRESS_POSTAL_CODE_CODE,
+  ADDRESS_POSTAL_CODE_NAME,
+  ADDRESS_CREATE_POSTAL_CODE,
+  ADDRESS_CITY,
+  ADDRESS_SELECT_CITY,
+  trans,
 } from "translator";
 
 export default {
   name: "CitySelection",
   components: { VueMultiselect },
   setup() {
-        return {
-            MULTISELECT_SELECTED_LABEL,
-            MULTISELECT_SELECT_LABEL,
-            ADDRESS_CITY,
-            ADDRESS_SELECT_CITY,
-            ADDRESS_POSTAL_CODE_CODE,
-            ADDRESS_POSTAL_CODE_NAME,
-            ADDRESS_CREATE_POSTAL_CODE,
-            trans,
-        };
-    },props: [
+    return {
+      MULTISELECT_SELECTED_LABEL,
+      MULTISELECT_SELECT_LABEL,
+      ADDRESS_CITY,
+      ADDRESS_SELECT_CITY,
+      ADDRESS_POSTAL_CODE_CODE,
+      ADDRESS_POSTAL_CODE_NAME,
+      ADDRESS_CREATE_POSTAL_CODE,
+      trans,
+    };
+  },
+  props: [
     "entity",
     "context",
     "focusOnAddress",
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CountrySelection.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CountrySelection.vue
index 97b11d73d..886eab581 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CountrySelection.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/AddAddress/CountrySelection.vue
@@ -24,27 +24,28 @@
 import VueMultiselect from "vue-multiselect";
 import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
 import {
-    MULTISELECT_SELECTED_LABEL,
-    MULTISELECT_SELECT_LABEL,
-    MULTISELECT_DESELECT_LABEL,
-    ADDRESS_COUNTRY,
-    ADDRESS_SELECT_COUNTRY,
-    trans,
+  MULTISELECT_SELECTED_LABEL,
+  MULTISELECT_SELECT_LABEL,
+  MULTISELECT_DESELECT_LABEL,
+  ADDRESS_COUNTRY,
+  ADDRESS_SELECT_COUNTRY,
+  trans,
 } from "translator";
 
 export default {
   name: "CountrySelection",
   components: { VueMultiselect },
   setup() {
-        return {
-            MULTISELECT_SELECTED_LABEL,
-            MULTISELECT_SELECT_LABEL,
-            MULTISELECT_DESELECT_LABEL,
-            ADDRESS_COUNTRY,
-            ADDRESS_SELECT_COUNTRY,
-            trans,
-        };
-    },props: ["context", "entity", "flag", "checkErrors"],
+    return {
+      MULTISELECT_SELECTED_LABEL,
+      MULTISELECT_SELECT_LABEL,
+      MULTISELECT_DESELECT_LABEL,
+      ADDRESS_COUNTRY,
+      ADDRESS_SELECT_COUNTRY,
+      trans,
+    };
+  },
+  props: ["context", "entity", "flag", "checkErrors"],
   emits: ["getCities"],
   data() {
     return {
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
index 63bd319ab..0e6ef77c5 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/EditPane.vue
@@ -106,10 +106,10 @@ import AddressMap from "./AddAddress/AddressMap";
 import AddressMore from "./AddAddress/AddressMore";
 import ActionButtons from "./ActionButtons.vue";
 import {
-    ADDRESS_SELECT_AN_ADDRESS_TITLE,
-    ADDRESS_IS_CONFIDENTIAL,
-    ADDRESS_IS_NO_ADDRESS,
-    trans,
+  ADDRESS_SELECT_AN_ADDRESS_TITLE,
+  ADDRESS_IS_CONFIDENTIAL,
+  ADDRESS_IS_NO_ADDRESS,
+  trans,
 } from "translator";
 
 export default {
@@ -123,13 +123,14 @@ export default {
     ActionButtons,
   },
   setup() {
-        return {
-            trans,
-            ADDRESS_SELECT_AN_ADDRESS_TITLE,
-            ADDRESS_IS_CONFIDENTIAL,
-            ADDRESS_IS_NO_ADDRESS,
-        };
-    },props: [
+    return {
+      trans,
+      ADDRESS_SELECT_AN_ADDRESS_TITLE,
+      ADDRESS_IS_CONFIDENTIAL,
+      ADDRESS_IS_NO_ADDRESS,
+    };
+  },
+  props: [
     "context",
     "options",
     "defaultz",
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
index cbdb0659f..035341180 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/Address/components/ShowPane.vue
@@ -11,9 +11,7 @@
 
     <div v-if="flag.success" class="alert alert-success">
       {{ trans(getSuccessText) }}
-      <span v-if="forceRedirect">{{
-                trans(ADDRESS_WAIT_REDIRECTION)
-            }}</span>
+      <span v-if="forceRedirect">{{ trans(ADDRESS_WAIT_REDIRECTION) }}</span>
     </div>
 
     <div
@@ -101,34 +99,36 @@
 import AddressRenderBox from "ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue";
 import ActionButtons from "./ActionButtons.vue";
 import {
-    ACTIVITY_CREATE_ADDRESS,
-    ACTIVITY_EDIT_ADDRESS,
-    ADDRESS_NOT_YET_ADDRESS,
-    ADDRESS_WAIT_REDIRECTION,
-    ADDRESS_LOADING,
-    ADDRESS_ADDRESS_EDIT_SUCCESS,
-    ADDRESS_ADDRESS_NEW_SUCCESS,
-    trans,
+  ACTIVITY_CREATE_ADDRESS,
+  ACTIVITY_EDIT_ADDRESS,
+  ADDRESS_NOT_YET_ADDRESS,
+  ADDRESS_WAIT_REDIRECTION,
+  ADDRESS_LOADING,
+  ADDRESS_ADDRESS_EDIT_SUCCESS,
+  ADDRESS_ADDRESS_NEW_SUCCESS,
+  trans,
 } from "translator";
 
 export default {
   name: "ShowPane",
-  methods: {},components: {
+  methods: {},
+  components: {
     AddressRenderBox,
     ActionButtons,
   },
   setup() {
-        return {
-            trans,
-            ACTIVITY_CREATE_ADDRESS,
-            ACTIVITY_EDIT_ADDRESS,
-            ADDRESS_NOT_YET_ADDRESS,
-            ADDRESS_WAIT_REDIRECTION,
-            ADDRESS_LOADING,
-            ADDRESS_ADDRESS_NEW_SUCCESS,
-            ADDRESS_ADDRESS_EDIT_SUCCESS,
-        };
-    },props: [
+    return {
+      trans,
+      ACTIVITY_CREATE_ADDRESS,
+      ACTIVITY_EDIT_ADDRESS,
+      ADDRESS_NOT_YET_ADDRESS,
+      ADDRESS_WAIT_REDIRECTION,
+      ADDRESS_LOADING,
+      ADDRESS_ADDRESS_NEW_SUCCESS,
+      ADDRESS_ADDRESS_EDIT_SUCCESS,
+    };
+  },
+  props: [
     "context",
     "defaultz",
     "options",
@@ -169,17 +169,19 @@ export default {
           this.options.button.text.create !== null)
       ) {
         // console.log('this.options.button.text', this.options.button.text)
-                return this.context.edit
-      ? ACTIVITY_CREATE_ADDRESS
-                    : ACTIVITY_EDIT_ADDRESS;
-            }
-            console.log("defaultz", this.defaultz);
+        return this.context.edit
+          ? ACTIVITY_CREATE_ADDRESS
+          : ACTIVITY_EDIT_ADDRESS;
+      }
+      console.log("defaultz", this.defaultz);
       return this.context.edit
         ? this.defaultz.button.text.edit
         : this.defaultz.button.text.create;
     },
     getSuccessText() {
-      return this.context.edit ? ADDRESS_ADDRESS_EDIT_SUCCESS : ADDRESS_ADDRESS_NEW_SUCCESS;
+      return this.context.edit
+        ? ADDRESS_ADDRESS_EDIT_SUCCESS
+        : ADDRESS_ADDRESS_NEW_SUCCESS;
     },
     onlyButton() {
       return typeof this.options.onlyButton !== "undefined"
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/Create.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/Create.vue
index b4f972b2c..e000b6fac 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/Create.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/Create.vue
@@ -1,6 +1,6 @@
 <template>
   <ul class="nav nav-tabs">
-    <li v-if="allowedTypes.includes('person')" class="nav-item">
+    <li v-if="containsPerson" class="nav-item">
       <a class="nav-link" :class="{ active: isActive('person') }">
         <label for="person">
           <input
@@ -14,7 +14,7 @@
         </label>
       </a>
     </li>
-    <li v-if="allowedTypes.includes('thirdparty')" class="nav-item">
+    <li v-if="containsThirdParty" class="nav-item">
       <a class="nav-link" :class="{ active: isActive('thirdparty') }">
         <label for="thirdparty">
           <input
@@ -31,49 +31,65 @@
   </ul>
 
   <div class="my-4">
-    <on-the-fly-person
+    <PersonEdit
       v-if="type === 'person'"
-      :action="action"
+      action="create"
       :query="query"
       ref="castPerson"
+      @onPersonCreated="onPersonCreated"
     />
 
-    <on-the-fly-thirdparty
+    <ThirdPartyEdit
       v-if="type === 'thirdparty'"
       :action="action"
       :query="query"
+      :parent="parent"
       ref="castThirdparty"
+      @onThirdPartyCreated="onThirdPartyCreated"
+      type=""
     />
   </div>
 </template>
-<script setup>
-import { ref, computed, onMounted } from "vue";
-import OnTheFlyPerson from "ChillPersonAssets/vuejs/_components/OnTheFly/Person.vue";
-import OnTheFlyThirdparty from "ChillThirdPartyAssets/vuejs/_components/OnTheFly/ThirdParty.vue";
+<script setup lang="ts">
+import { computed, onMounted, ref } from "vue";
 import {
-  trans,
   ONTHEFLY_CREATE_PERSON,
   ONTHEFLY_CREATE_THIRDPARTY,
+  trans,
 } from "translator";
+import { CreatableEntityType, Person } from "ChillPersonAssets/types";
+import { CreateComponentConfig } from "ChillMainAssets/types";
+import PersonEdit from "ChillPersonAssets/vuejs/_components/OnTheFly/PersonEdit.vue";
+import ThirdPartyEdit from "ChillThirdPartyAssets/vuejs/_components/OnTheFly/ThirdPartyEdit.vue";
+import {Thirdparty} from "../../../../../../ChillThirdPartyBundle/Resources/public/types";
 
-const props = defineProps({
-  action: String,
-  allowedTypes: Array,
-  query: String,
+const props = withDefaults(defineProps<CreateComponentConfig>(), {
+  action: "create",
+  query: "",
+  parent: null,
 });
 
-const type = ref(null);
+const emit =
+  defineEmits<{
+    (e: "onPersonCreated", payload: { person: Person }): void,
+    (e: "onThirdPartyCreated", payload: { thirdParty: Thirdparty }): void,
+  }>();
 
-const radioType = computed({
+const type = ref<CreatableEntityType | null>(null);
+
+const radioType = computed<CreatableEntityType | null>({
   get: () => type.value,
-  set: (val) => {
+  set: (val: CreatableEntityType | null) => {
     type.value = val;
     console.log("## type:", val, ", action:", props.action);
   },
 });
 
-const castPerson = ref(null);
-const castThirdparty = ref(null);
+type PersonEditComponent = InstanceType<typeof PersonEdit>;
+type ThirdPartyEditComponent = InstanceType<typeof ThirdPartyEdit>;
+
+const castPerson = ref<PersonEditComponent|null>(null);
+const castThirdparty = ref<ThirdPartyEditComponent|null>(null);
 
 onMounted(() => {
   type.value =
@@ -82,30 +98,37 @@ onMounted(() => {
       : "person";
 });
 
-function isActive(tab) {
+function isActive(tab: CreatableEntityType) {
   return type.value === tab;
 }
 
-function castDataByType() {
-  switch (radioType.value) {
-    case "person":
-      return castPerson.value.$data.person;
-    case "thirdparty":
-      let data = castThirdparty.value.$data.thirdparty;
-      if (data.address !== undefined && data.address !== null) {
-        data.address = { id: data.address.address_id };
-      } else {
-        data.address = null;
-      }
-      return data;
-    default:
-      throw Error("Invalid type of entity");
+const containsThirdParty = computed<boolean>(() =>
+  props.allowedTypes.includes("thirdparty"),
+);
+const containsPerson = computed<boolean>(() => {
+  if (props.action === 'addContact') {
+    return false;
+  }
+  return props.allowedTypes.includes("person");
+});
+
+function save(): void {
+  if (radioType.value === "person" && castPerson.value !== null) {
+    castPerson.value.postPerson();
+  } else if (radioType.value === "thirdparty" && castThirdparty.value !== null) {
+    castThirdparty.value.postThirdParty();
   }
 }
 
-defineExpose({
-  castDataByType,
-});
+function onThirdPartyCreated(payload: { thirdParty: Thirdparty }) {
+  emit("onThirdPartyCreated", payload);
+}
+
+function onPersonCreated(payload: { person: Person }) {
+  emit("onPersonCreated", payload);
+}
+
+defineExpose({ save });
 </script>
 
 <style lang="css" scoped>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/CreateModal.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/CreateModal.vue
new file mode 100644
index 000000000..f89e40b36
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/CreateModal.vue
@@ -0,0 +1,71 @@
+<script setup lang="ts">
+import Modal from "ChillMainAssets/vuejs/_components/Modal.vue";
+import Create from "ChillMainAssets/vuejs/OnTheFly/components/Create.vue";
+import { CreateComponentConfig } from "ChillMainAssets/types";
+import { trans, SAVE } from "translator";
+import { useTemplateRef } from "vue";
+import { Person } from "ChillPersonAssets/types";
+import {Thirdparty} from "../../../../../../ChillThirdPartyBundle/Resources/public/types";
+
+const emit = defineEmits<{
+  (e: "onPersonCreated", payload: { person: Person }): void;
+  (e: "onThirdPartyCreated", payload: { thirdParty: Thirdparty }): void;
+  (e: "close"): void;
+}>();
+
+const props = defineProps<CreateComponentConfig & {modalTitle: string}>();
+const modalDialogClass = { "modal-xl": true, "modal-scrollable": true };
+
+type CreateComponentType = InstanceType<typeof Create>;
+
+const create = useTemplateRef<CreateComponentType>("create");
+
+const onPersonCreated = ({person}: {person: Person}): void => {
+  emit("onPersonCreated", {person});
+};
+
+const onThirdPartyCreated = ({thirdParty}: {thirdParty: Thirdparty}): void => {
+  emit("onThirdPartyCreated", {thirdParty: thirdParty});
+}
+
+function save(): void {
+  console.log("save from CreateModal");
+  create.value?.save();
+}
+
+defineExpose({ save });
+</script>
+
+<template>
+  <teleport to="body">
+    <modal
+      @close="() => emit('close')"
+      :modal-dialog-class="modalDialogClass"
+      :hide-footer="false"
+    >
+      <template #header>
+        <h3 class="modal-title">{{ modalTitle }}</h3>
+      </template>
+      <template #body-head>
+        <div class="modal-body">
+          <Create
+            ref="create"
+            :allowedTypes="props.allowedTypes"
+            :action="props.action"
+            :query="props.query"
+            :parent="props.parent"
+            @onPersonCreated="onPersonCreated"
+            @onThirdPartyCreated="onThirdPartyCreated"
+          ></Create>
+        </div>
+      </template>
+      <template #footer>
+        <button class="btn btn-save" type="button" @click.prevent="save">
+          {{ trans(SAVE) }}
+        </button>
+      </template>
+    </modal>
+  </teleport>
+</template>
+
+<style scoped lang="scss"></style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
index dc66a0000..93457ccbf 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
@@ -9,7 +9,7 @@
     class="btn btn-sm"
     target="_blank"
     :class="classAction"
-    :title="trans(titleAction)"
+    :title="titleAction"
     @click="openModal"
   >
     {{ buttonText }}<span v-if="isDead"> (‡)</span>
@@ -23,68 +23,89 @@
     >
       <template #header>
         <h3 v-if="parent" class="modal-title">
-          {{ trans(titleModal, { q: parent.text }) }}
+          {{ titleModal }}
         </h3>
         <h3 v-else class="modal-title">
-          {{ trans(titleModal) }}
+          {{ titleModal }}
         </h3>
       </template>
 
-      <template #body v-if="type === 'person'">
-        <on-the-fly-person
-          :id="id"
-          :type="type"
-          :action="action"
-          ref="castPerson"
-        />
-        <div v-if="hasResourceComment">
-          <h3>{{ trans(ONTHEFLY_RESOURCE_COMMENT_TITLE) }}</h3>
-          <blockquote class="chill-user-quote">
-            {{ parent.comment }}
-          </blockquote>
-        </div>
-      </template>
+      <template #body>
+        <!-- person / show -->
+        <template v-if="type === 'person' && action === 'show'">
+          <on-the-fly-person
+            :id="id"
+            :type="type"
+            :action="action"
+            ref="castPerson"
+          />
+          <div v-if="hasResourceComment">
+            <h3>{{ trans(ONTHEFLY_RESOURCE_COMMENT_TITLE) }}</h3>
+            <blockquote class="chill-user-quote">
+              {{ parent?.comment }}
+            </blockquote>
+          </div>
+        </template>
 
-      <template #body v-else-if="type === 'thirdparty'">
-        <on-the-fly-thirdparty
-          :id="id"
-          :type="type"
-          :action="action"
-          ref="castThirdparty"
-        />
-        <div v-if="hasResourceComment">
-          <h3>{{ trans(ONTHEFLY_RESOURCE_COMMENT_TITLE) }}</h3>
-          <blockquote class="chill-user-quote">
-            {{ parent.comment }}
-          </blockquote>
-        </div>
-      </template>
+        <!-- person / edit -->
+        <template v-else-if="type === 'person' && action === 'edit'">
+          <PersonEdit
+            :id="id"
+            :action="'edit'"
+            :query="''"
+            ref="castEditPerson"
+          />
+        </template>
 
-      <template #body v-else-if="parent">
-        <on-the-fly-thirdparty
-          :parent="parent"
-          :action="action"
-          type="thirdparty"
-          ref="castThirdparty"
-        />
-      </template>
+        <!-- thirdparty / show -->
+        <template v-else-if="type === 'thirdparty' && action === 'show'">
+          <on-the-fly-thirdparty
+            :id="id"
+            :type="type"
+            :action="action"
+            ref="castThirdparty"
+          />
+          <div v-if="hasResourceComment">
+            <h3>{{ trans(ONTHEFLY_RESOURCE_COMMENT_TITLE) }}</h3>
+            <blockquote class="chill-user-quote">
+              {{ parent?.comment }}
+            </blockquote>
+          </div>
+        </template>
 
-      <template #body v-else>
-        <on-the-fly-create
-          :action="action"
-          :allowed-types="allowedTypes"
-          :query="query"
-          ref="castNew"
-        />
+        <!-- thirdparty / edit -->
+        <template v-else-if="type === 'thirdparty' && action === 'edit'">
+          <ThirdPartyEdit ref="castEditThirdParty" action="edit" :id="id" />
+        </template>
+
+        <!-- parent provided (thirdparty create with parent) -->
+        <template v-else-if="parent">
+          <on-the-fly-thirdparty
+            :parent="parent"
+            :action="action"
+            type="thirdparty"
+            ref="castThirdparty"
+          />
+        </template>
+
+        <!-- default: creation wizard -->
+        <template v-else>
+          <on-the-fly-create
+            :action="action"
+            :allowed-types="allowedTypes"
+            :query="query || ''"
+            ref="castNew"
+          />
+        </template>
       </template>
 
       <template #footer>
         <a
           v-if="action === 'show'"
           :href="buildLocation(id, type)"
-          :title="trans(titleMessage)"
+          :title="titleMessage"
           class="btn btn-show"
-          >{{ trans(buttonMessage) }}
+          >{{ buttonMessage }}
         </a>
         <a v-else class="btn btn-save" @click="saveAction">
           {{ trans(ACTION_SAVE) }}
@@ -93,8 +114,8 @@
     </modal>
   </teleport>
 </template>
-<script setup>
-import { ref, computed, defineEmits, defineProps } from "vue";
+<script setup lang="ts">
+import {ref, computed, defineEmits, defineProps, useTemplateRef} from "vue";
 import Modal from "ChillMainAssets/vuejs/_components/Modal.vue";
 import OnTheFlyCreate from "./Create.vue";
 import OnTheFlyPerson from "ChillPersonAssets/vuejs/_components/OnTheFly/Person.vue";
@@ -104,7 +125,7 @@ import {
   ACTION_SHOW,
   ACTION_EDIT,
   ACTION_CREATE,
-  ACTION_ADDCONTACT,
+  ACTION_SAVE,
   ONTHEFLY_CREATE_TITLE_DEFAULT,
   ONTHEFLY_CREATE_TITLE_PERSON,
   ONTHEFLY_CREATE_TITLE_THIRDPARTY,
@@ -112,40 +133,65 @@ import {
   ONTHEFLY_SHOW_THIRDPARTY,
   ONTHEFLY_EDIT_PERSON,
   ONTHEFLY_EDIT_THIRDPARTY,
-  ONTHEFLY_ADDCONTACT_TITLE,
   ACTION_REDIRECT_PERSON,
   ACTION_REDIRECT_THIRDPARTY,
   ONTHEFLY_SHOW_FILE_PERSON,
   ONTHEFLY_SHOW_FILE_THIRDPARTY,
   ONTHEFLY_SHOW_FILE_DEFAULT,
   ONTHEFLY_RESOURCE_COMMENT_TITLE,
-  ACTION_SAVE,
+  THIRDPARTY_ADDCONTACT,
+  THIRDPARTY_ADDCONTACT_TITLE,
 } from "translator";
+import PersonEdit from "ChillPersonAssets/vuejs/_components/OnTheFly/PersonEdit.vue";
+import ThirdPartyEdit from "ChillThirdPartyAssets/vuejs/_components/OnTheFly/ThirdPartyEdit.vue";
 
-const props = defineProps({
-  type: String,
-  id: [String, Number],
-  action: String,
-  buttonText: String,
-  displayBadge: Boolean,
-  isDead: Boolean,
-  parent: Object,
-  allowedTypes: Array,
-  query: String,
+// Types
+type EntityType = "person" | "thirdparty";
+type ActionType = "show" | "edit" | "create" | "addContact";
+
+interface ParentRef {
+  type: string;
+  id: string | number;
+  text?: string;
+  comment?: string | null;
+}
+
+interface OnTheFlyComponentProps {
+  type: EntityType;
+  id: number;
+  action: ActionType;
+  buttonText?: string | null;
+  displayBadge?: boolean;
+  isDead?: boolean;
+  parent?: ParentRef | null;
+  allowedTypes?: EntityType[];
+  query?: string;
+}
+
+const props = withDefaults(defineProps<OnTheFlyComponentProps>(), {
+  buttonText: null,
+  displayBadge: false,
+  isDead: false,
+  parent: null,
+  allowedTypes: () => ["person", "thirdparty"] as EntityType[],
+  query: "",
 });
 
-const emit = defineEmits(["saveFormOnTheFly"]);
+const emit = defineEmits<{
+  (e: "saveFormOnTheFly", payload: { type: string | undefined; data: any }): void;
+}>();
 
-const modal = ref({
+type castEditPersonType = InstanceType<typeof PersonEdit>;
+type castEditThirdPartyType = InstanceType<typeof ThirdPartyEdit>;
+const castEditPerson = useTemplateRef<castEditPersonType>('castEditPerson')
+const castEditThirdParty = useTemplateRef<castEditThirdPartyType>('castEditThirdParty');
+
+const modal = ref<{ showModal: boolean; modalDialogClass: string }>({
   showModal: false,
   modalDialogClass: "modal-dialog-scrollable modal-xl",
 });
 
-const castPerson = ref();
-const castThirdparty = ref();
-const castNew = ref();
-
-const hasResourceComment = computed(() => {
+const hasResourceComment = computed<boolean>(() => {
   return (
     typeof props.parent !== "undefined" &&
     props.parent !== null &&
@@ -156,7 +202,7 @@ const hasResourceComment = computed(() => {
   );
 });
 
-const classAction = computed(() => {
+const classAction = computed<string>(() => {
   switch (props.action) {
     case "show":
       return "btn-show";
@@ -171,174 +217,127 @@ const classAction = computed(() => {
   }
 });
 
-const titleAction = computed(() => {
+const titleAction = computed<string>(() => {
   switch (props.action) {
     case "show":
-      return ACTION_SHOW;
+      return ACTION_SHOW as unknown as string;
     case "edit":
-      return ACTION_EDIT;
+      return ACTION_EDIT as unknown as string;
     case "create":
-      return ACTION_CREATE;
+      return ACTION_CREATE as unknown as string;
     case "addContact":
-      return ACTION_ADDCONTACT;
+      return THIRDPARTY_ADDCONTACT as unknown as string;
     default:
       return "";
   }
 });
 
-const titleCreate = computed(() => {
+const titleCreate = computed<string>(() => {
   if (typeof props.allowedTypes === "undefined") {
-    return ONTHEFLY_CREATE_TITLE_DEFAULT;
+    return trans(ONTHEFLY_CREATE_TITLE_DEFAULT)
   }
-  return props.allowedTypes.every((t) => t === "person")
-    ? ONTHEFLY_CREATE_TITLE_PERSON
-    : props.allowedTypes.every((t) => t === "thirdparty")
-      ? ONTHEFLY_CREATE_TITLE_THIRDPARTY
-      : ONTHEFLY_CREATE_TITLE_DEFAULT;
+  return props.allowedTypes.every((t: EntityType) => t === "person")
+    ? (trans(ONTHEFLY_CREATE_TITLE_PERSON))
+    : props.allowedTypes.every((t: EntityType) => t === "thirdparty")
+      ? (trans(ONTHEFLY_CREATE_TITLE_THIRDPARTY))
+      : (trans(ONTHEFLY_CREATE_TITLE_DEFAULT));
 });
 
-const titleModal = computed(() => {
+const titleModal = computed<string>(() => {
   switch (props.action) {
     case "show":
       if (props.type == "person") {
-        return ONTHEFLY_SHOW_PERSON;
+        return trans(ONTHEFLY_SHOW_PERSON)
       } else if (props.type == "thirdparty") {
-        return ONTHEFLY_SHOW_THIRDPARTY;
+        return trans(ONTHEFLY_SHOW_THIRDPARTY)
       }
       break;
     case "edit":
       if (props.type == "person") {
-        return ONTHEFLY_EDIT_PERSON;
+        return trans(ONTHEFLY_EDIT_PERSON)
       } else if (props.type == "thirdparty") {
-        return ONTHEFLY_EDIT_THIRDPARTY;
+        return trans(ONTHEFLY_EDIT_THIRDPARTY)
       }
       break;
     case "create":
       return titleCreate.value;
     case "addContact":
-      return ONTHEFLY_ADDCONTACT_TITLE;
+      return trans(THIRDPARTY_ADDCONTACT_TITLE)
     default:
       break;
   }
   return "";
 });
 
-const titleMessage = computed(() => {
+const titleMessage = computed<string>(() => {
   switch (props.type) {
     case "person":
-      return ACTION_REDIRECT_PERSON;
+      return trans(ACTION_REDIRECT_PERSON);
     case "thirdparty":
-      return ACTION_REDIRECT_THIRDPARTY;
+      return trans(ACTION_REDIRECT_THIRDPARTY);
     default:
       return "";
   }
 });
 
-const buttonMessage = computed(() => {
+const buttonMessage = computed<string>(() => {
   switch (props.type) {
     case "person":
-      return ONTHEFLY_SHOW_FILE_PERSON;
+      return trans(ONTHEFLY_SHOW_FILE_PERSON);
     case "thirdparty":
-      return ONTHEFLY_SHOW_FILE_THIRDPARTY;
+      return trans(ONTHEFLY_SHOW_FILE_THIRDPARTY);
     default:
-      return ONTHEFLY_SHOW_FILE_DEFAULT;
+      return trans(ONTHEFLY_SHOW_FILE_DEFAULT);
   }
 });
 
-const isDisplayBadge = computed(() => {
-  return props.displayBadge === true && props.buttonText !== null;
+const isDisplayBadge = computed<boolean>(() => {
+  return props.displayBadge && props.buttonText !== null;
 });
 
-const badgeType = computed(() => {
-  return "entity-" + props.type + " badge-" + props.type;
+const badgeType = computed<string>(() => {
+  return "entity-" + (props.type ?? "") + " badge-" + (props.type ?? "");
 });
 
-const getReturnPath = computed(() => {
+const getReturnPath = computed<string>(() => {
   return `?returnPath=${window.location.pathname}${window.location.search}${window.location.hash}`;
 });
 
-function closeModal() {
+function closeModal(): void {
   modal.value.showModal = false;
 }
 
-function openModal() {
+function openModal(): void {
   modal.value.showModal = true;
 }
 
-function changeActionTo(action) {
-  console.log(action);
-  // Not reactive in setup, but you can emit or use a ref if needed
-}
-
-function saveAction() {
-  let type = props.type,
-    data = {};
-  switch (type) {
-    case "person":
-      data = castPerson.value?.$data.person;
-      break;
-    case "thirdparty":
-      data = castThirdparty.value?.$data.thirdparty;
-      break;
-    default:
-      if (typeof props.type === "undefined") {
-        if (props.action === "addContact") {
-          type = "thirdparty";
-          data = castThirdparty.value?.$data.thirdparty;
-          data.parent = {
-            type: "thirdparty",
-            id: props.parent.id,
-          };
-          data.civility =
-            data.civility !== null
-              ? {
-                  type: "chill_main_civility",
-                  id: data.civility.id,
-                }
-              : null;
-          data.profession = data.profession !== "" ? data.profession : "";
-        } else {
-          type = castNew.value.radioType;
-          data = castNew.value.castDataByType();
-          if (typeof data.civility !== "undefined" && null !== data.civility) {
-            data.civility =
-              data.civility !== null
-                ? {
-                    type: "chill_main_civility",
-                    id: data.civility.id,
-                  }
-                : null;
-          }
-          if (
-            typeof data.profession !== "undefined" &&
-            "" !== data.profession
-          ) {
-            data.profession = data.profession !== "" ? data.profession : "";
-          }
-        }
-      } else {
-        throw "error with object type";
-      }
-  }
-  emit("saveFormOnTheFly", { type: type, data: data });
-}
-
-function buildLocation(id, type) {
+function buildLocation(id: string | number | undefined, type: EntityType | undefined): string | undefined {
   if (type === "person") {
     return encodeURI(`/fr/person/${id}/general${getReturnPath.value}`);
   } else if (type === "thirdparty") {
     return encodeURI(`/fr/3party/3party/${id}/view${getReturnPath.value}`);
   }
+  return undefined;
 }
 
+async function saveAction() {
+  if (props.type === "person") {
+    const person = await castEditPerson.value?.postPerson();
+    if (null !== person) {
+      emit("saveFormOnTheFly", {type: props.type, data: person})
+    }
+  } else if (props.type === 'thirdparty') {
+    const thirdParty = await castEditThirdParty.value?.postThirdParty();
+    if (null !== thirdParty) {
+      emit("saveFormOnTheFly", {type: props.type, data: thirdParty })
+    }
+  }
+}
+
+
 defineExpose({
   openModal,
   closeModal,
-  changeActionTo,
-  saveAction,
-  castPerson,
-  castThirdparty,
-  castNew,
   hasResourceComment,
   modal,
   isDisplayBadge,
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
index 98c0d0034..b92f47319 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
@@ -12,13 +12,20 @@
           >{{ trans(USER_CURRENT_USER) }}</span
         >
         <span
-          v-else
+          v-else-if="!isEntityHousehold(p)"
           :class="getBadgeClass(p)"
           class="chill_denomination"
           :style="getBadgeStyle(p)"
         >
           {{ p.text }}
         </span>
+        <span v-else
+              :class="getBadgeClass(p)"
+              class="chill_denomination"
+              :style="getBadgeStyle(p)"
+        >
+          Ménage n°{{ p.id }}
+        </span>
       </li>
     </ul>
     <ul class="record_actions mb-0">
@@ -40,6 +47,7 @@
           :key="uniqid"
           :buttonTitle="translatedListOfTypes"
           :modalTitle="translatedListOfTypes"
+          :allowCreate="true"
           @addNewPersons="addNewEntity"
         >
         </add-persons>
@@ -53,9 +61,12 @@
         @click="addNewSuggested(s)"
         style="margin: 0"
       >
-        <span :class="getBadgeClass(s)" :style="getBadgeStyle(s)">
+        <span v-if="!isEntityHousehold(s)" :class="getBadgeClass(s)" :style="getBadgeStyle(s)">
           {{ s.text }}
         </span>
+        <span v-else>
+          Ménage n°{{ s.id }}
+        </span>
       </li>
     </ul>
   </div>
@@ -74,8 +85,9 @@ import AddPersons from "ChillPersonAssets/vuejs/_components/AddPersons.vue";
 import {
   Entities,
   EntitiesOrMe,
-  EntityType,
+  EntityType, isEntityHousehold,
   SearchOptions,
+  Suggestion,
 } from "ChillPersonAssets/types";
 import {
   PICK_ENTITY_MODAL_TITLE,
@@ -182,7 +194,7 @@ function addNewSuggested(entity: EntitiesOrMe) {
   emits("addNewEntity", { entity });
 }
 
-function addNewEntity({ selected }: addNewEntities) {
+function addNewEntity({ selected }: { selected: Suggestion[] }) {
   Object.values(selected).forEach((item) => {
     emits("addNewEntity", { entity: item.result });
   });
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/GenderIconRenderBox.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/GenderIconRenderBox.vue
index 794771014..6b11d400f 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/GenderIconRenderBox.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/GenderIconRenderBox.vue
@@ -1,28 +1,28 @@
 <template>
-  <i :class="['fa', genderClass, 'px-1']" />
+  <i :class="['bi', genderClass]"></i>
 </template>
 
-<script setup>
+<script setup lang="ts">
 import { computed } from "vue";
-const props = defineProps({
-  gender: {
-    type: Object,
-    required: true,
-  },
-});
+import type { Gender } from "ChillMainAssets/types";
+import {toGenderTranslation} from "ChillMainAssets/lib/api/genderHelper";
 
-const genderClass = computed(() => {
-  switch (props.gender.genderTranslation) {
-    case "woman":
-      return "fa-venus";
-    case "man":
-      return "fa-mars";
-    case "both":
-      return "fa-neuter";
+interface GenderIconRenderBoxProps {
+  gender: Gender;
+}
+
+const props = defineProps<GenderIconRenderBoxProps>();
+
+const genderClass = computed<string>(() => {
+  switch (toGenderTranslation(props.gender)) {
+    case "female":
+      return "bi-gender-female";
+    case "male":
+      return "bi-gender-male";
+    case "neutral":
     case "unknown":
-      return "fa-genderless";
     default:
-      return "fa-genderless";
+      return "bi-gender-neuter";
   }
 });
 </script>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
index 7ec7f47e2..5df424de7 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
@@ -52,15 +52,23 @@
 import { trans, MODAL_ACTION_CLOSE } from "translator";
 import { defineProps } from "vue";
 
+defineSlots<{
+  header?: () => any,
+  body?: () => any,
+  footer?: () => any,
+  "body-head"?: () => any,
+}>();
+
 export interface ModalProps {
-    modalDialogClass: object | null;
-    hideFooter: boolean;
+  modalDialogClass?: string | Record<string, boolean>;
+  hideFooter?: boolean;
+  show?: boolean;
 }
 
-// Define the props
 const props = withDefaults(defineProps<ModalProps>(), {
-    hideFooter: false,
-    modalDialogClass: null,
+  modalDialogClass: "",
+  hideFooter: false,
+  show: true,
 });
 
 const emits = defineEmits<{
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_composables/violationList.ts b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_composables/violationList.ts
new file mode 100644
index 000000000..328972e1b
--- /dev/null
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_composables/violationList.ts
@@ -0,0 +1,57 @@
+import {ref} from "vue";
+import {ValidationExceptionInterface} from "ChillMainAssets/types";
+
+export function useViolationList<T extends Record<string, Record<string, string>>>() {
+  type ViolationKey = Extract<keyof T, string>;
+  const violationsList = ref<ValidationExceptionInterface<T>|null>(null);
+
+  function violationTitles<P extends ViolationKey>(property: P): string[] {
+    if (null === violationsList.value) {
+      return [];
+    }
+    const r = violationsList.value.violationsByNormalizedProperty(property).map((v) => v.title);
+
+
+    return r;
+
+  }
+  function violationTitlesWithParameter<
+    P extends ViolationKey,
+    Param extends Extract<keyof T[P], string>
+  >(
+    property: P,
+    with_parameter: Param,
+    with_parameter_value: T[P][Param],
+  ): string[] {
+    if (violationsList.value === null) {
+      return [];
+    }
+    return violationsList.value.violationsByNormalizedPropertyAndParams(property, with_parameter, with_parameter_value)
+      .map((v) => v.title);
+  }
+
+
+  function hasViolation<P extends ViolationKey>(property: P): boolean {
+    return violationTitles(property).length > 0;
+  }
+  function hasViolationWithParameter<
+    P extends ViolationKey,
+    Param extends Extract<keyof T[P], string>
+  >(
+    property: P,
+    with_parameter: Param,
+    with_parameter_value: T[P][Param],
+  ): boolean {
+    return violationTitlesWithParameter(property, with_parameter, with_parameter_value).length > 0;
+  }
+
+  function setValidationException<V extends ValidationExceptionInterface<T>>(validationException: V): void {
+    violationsList.value = validationException;
+  }
+
+  function cleanException(): void {
+    violationsList.value = null;
+  }
+
+  return {violationTitles, violationTitlesWithParameter, setValidationException, cleanException, hasViolationWithParameter, hasViolation};
+}
diff --git a/src/Bundle/ChillMainBundle/Search/Utils/ExtractPhonenumberFromPattern.php b/src/Bundle/ChillMainBundle/Search/Utils/ExtractPhonenumberFromPattern.php
index 2be3d54db..9f36c0a4d 100644
--- a/src/Bundle/ChillMainBundle/Search/Utils/ExtractPhonenumberFromPattern.php
+++ b/src/Bundle/ChillMainBundle/Search/Utils/ExtractPhonenumberFromPattern.php
@@ -80,9 +80,7 @@ class ExtractPhonenumberFromPattern
             }
 
             if (5 < $length) {
-                $filtered = \trim(\strtr($subject, [$matches[0] => '']));
-
-                return new SearchExtractionResult($filtered, [\implode('', $phonenumber)]);
+                return new SearchExtractionResult($subject, [\implode('', $phonenumber)]);
             }
         }
 
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/DateNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/DateNormalizer.php
index 2493b1794..187199432 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/DateNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/DateNormalizer.php
@@ -22,7 +22,7 @@ class DateNormalizer implements ContextAwareNormalizerInterface, DenormalizerInt
 {
     public function __construct(private readonly RequestStack $requestStack, private readonly ParameterBagInterface $parameterBag) {}
 
-    public function denormalize($data, $type, $format = null, array $context = [])
+    public function denormalize($data, $type, $format = null, array $context = []): ?\DateTimeInterface
     {
         if (null === $data) {
             return null;
@@ -51,7 +51,7 @@ class DateNormalizer implements ContextAwareNormalizerInterface, DenormalizerInt
         return $result;
     }
 
-    public function normalize($date, $format = null, array $context = [])
+    public function normalize($date, $format = null, array $context = []): array
     {
         /* @var DateTimeInterface $date */
         switch ($format) {
diff --git a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
index 28d7c623d..33ba52c44 100644
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/PhonenumberNormalizer.php
@@ -45,8 +45,11 @@ class PhonenumberNormalizer implements ContextAwareNormalizerInterface, Denormal
 
         try {
             return $this->phoneNumberUtil->parse($data, $this->defaultCarrierCode);
-        } catch (NumberParseException $e) {
-            throw new UnexpectedValueException($e->getMessage(), $e->getCode(), $e);
+        } catch (NumberParseException) {
+            $phonenumber = new PhoneNumber();
+            $phonenumber->setRawInput($data);
+
+            return $phonenumber;
         }
     }
 
diff --git a/src/Bundle/ChillMainBundle/Tests/Search/Utils/ExtractPhonenumberFromPatternTest.php b/src/Bundle/ChillMainBundle/Tests/Search/Utils/ExtractPhonenumberFromPatternTest.php
index 3f5950a4c..1cb66738e 100644
--- a/src/Bundle/ChillMainBundle/Tests/Search/Utils/ExtractPhonenumberFromPatternTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Search/Utils/ExtractPhonenumberFromPatternTest.php
@@ -43,20 +43,20 @@ final class ExtractPhonenumberFromPatternTest extends KernelTestCase
 
         yield ['BE', 'Diallo 15/06/2021', 0, [], 'Diallo 15/06/2021', 'no phonenumber and a date'];
 
-        yield ['BE', 'Diallo 0486 123 456', 1, ['+32486123456'], 'Diallo', 'a phonenumber and a name'];
+        yield ['BE', 'Diallo 0486 123 456', 1, ['+32486123456'], 'Diallo 0486 123 456', 'a phonenumber and a name'];
 
-        yield ['BE', 'Diallo 123 456', 1, ['123456'], 'Diallo', 'a number and a name, without leadiing 0'];
+        yield ['BE', 'Diallo 123 456', 1, ['123456'], 'Diallo 123 456', 'a number and a name, without leadiing 0'];
 
-        yield ['BE', '123 456', 1, ['123456'], '', 'only phonenumber'];
+        yield ['BE', '123 456', 1, ['123456'], '123 456', 'only phonenumber'];
 
-        yield ['BE', '0123 456', 1, ['+32123456'], '', 'only phonenumber with a leading 0'];
+        yield ['BE', '0123 456', 1, ['+32123456'], '0123 456', 'only phonenumber with a leading 0'];
 
-        yield ['FR', '123 456', 1, ['123456'], '', 'only phonenumber'];
+        yield ['FR', '123 456', 1, ['123456'], '123 456', 'only phonenumber'];
 
-        yield ['FR', '0123 456', 1, ['+33123456'], '', 'only phonenumber with a leading 0'];
+        yield ['FR', '0123 456', 1, ['+33123456'], '0123 456', 'only phonenumber with a leading 0'];
 
-        yield ['FR', 'Diallo 0486 123 456', 1, ['+33486123456'], 'Diallo', 'a phonenumber and a name'];
+        yield ['FR', 'Diallo 0486 123 456', 1, ['+33486123456'], 'Diallo 0486 123 456', 'a phonenumber and a name'];
 
-        yield ['FR', 'Diallo +32486 123 456', 1, ['+32486123456'], 'Diallo', 'a phonenumber and a name'];
+        yield ['FR', 'Diallo +32486 123 456', 1, ['+32486123456'], 'Diallo +32486 123 456', 'a phonenumber and a name'];
     }
 }
diff --git a/src/Bundle/ChillMainBundle/Validation/Constraint/PhonenumberConstraint.php b/src/Bundle/ChillMainBundle/Validation/Constraint/PhonenumberConstraint.php
index 2c20de854..6b5be58b8 100644
--- a/src/Bundle/ChillMainBundle/Validation/Constraint/PhonenumberConstraint.php
+++ b/src/Bundle/ChillMainBundle/Validation/Constraint/PhonenumberConstraint.php
@@ -13,6 +13,9 @@ namespace Chill\MainBundle\Validation\Constraint;
 
 use Symfony\Component\Validator\Constraint;
 
+/**
+ * @deprecated use odolbeau/phonenumber validator instead
+ */
 #[\Attribute(\Attribute::TARGET_PROPERTY | \Attribute::TARGET_METHOD)]
 class PhonenumberConstraint extends Constraint
 {
diff --git a/src/Bundle/ChillMainBundle/Validation/Validator/ValidPhonenumber.php b/src/Bundle/ChillMainBundle/Validation/Validator/ValidPhonenumber.php
index 0c02885ad..594429b15 100644
--- a/src/Bundle/ChillMainBundle/Validation/Validator/ValidPhonenumber.php
+++ b/src/Bundle/ChillMainBundle/Validation/Validator/ValidPhonenumber.php
@@ -16,6 +16,9 @@ use Psr\Log\LoggerInterface;
 use Symfony\Component\Validator\Constraint;
 use Symfony\Component\Validator\ConstraintValidator;
 
+/**
+ * @deprecated use https://github.com/odolbeau/phone-number-bundle/blob/master/src/Validator/Constraints/PhoneNumberValidator.php instead
+ */
 final class ValidPhonenumber extends ConstraintValidator
 {
     public function __construct(private readonly LoggerInterface $logger, private readonly PhoneNumberHelperInterface $phonenumberHelper) {}
diff --git a/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml b/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml
index f411f3289..fc8c7a48e 100644
--- a/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml
+++ b/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml
@@ -150,34 +150,6 @@ filter_order:
     Search: Chercher dans la liste
     By date: Filtrer par date
     search_box: Filtrer par contenu
-renderbox:
-    person: "Usager"
-    birthday:
-        man: "Né le"
-        woman: "Née le"
-        neutral: "Né·e le"
-        unknown: "Né·e le"
-    deathdate: "Date de décès"
-    household_without_address: "Le ménage de l'usager est sans adresse"
-    no_data: "Aucune information renseignée"
-    type:
-        thirdparty: "Tiers"
-        person: "Usager"
-    holder: "Titulaire"
-    years_old: >-
-        {n, plural,
-            =0 {0 an}
-            one {1 an}
-            other {# ans}
-        }
-    residential_address: "Adresse de résidence"
-    located_at: "réside chez"
-    household_number: "Ménage n°{number}"
-    current_members: "Membres actuels"
-    no_current_address: "Sans adresse actuellement"
-    new_household: "Nouveau ménage"
-    no_members_yet: "Aucun membre actuellement"
-
 pick_entity:
     add: "Ajouter"
     modal_title: >-
diff --git a/src/Bundle/ChillMainBundle/translations/messages.fr.yml b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
index 500c298a5..8ce58c110 100644
--- a/src/Bundle/ChillMainBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillMainBundle/translations/messages.fr.yml
@@ -944,11 +944,12 @@ onthefly:
         thirdparty: Détails du tiers
         file_person: Ouvrir la fiche de l'usager
         file_thirdparty: Voir le Tiers
+        file_default: Voir
     edit:
         person: Modifier un usager
         thirdparty: Modifier un tiers
     create:
-        button: Créer {q}
+        button: Créer "q"
         title:
             default: Création d'un nouvel usager ou d'un tiers professionnel
             person: Création d'un nouvel usager
diff --git a/src/Bundle/ChillPersonBundle/Actions/PersonCreate/PersonCreateDTO.php b/src/Bundle/ChillPersonBundle/Actions/PersonCreate/PersonCreateDTO.php
new file mode 100644
index 000000000..bb8d4f79c
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Actions/PersonCreate/PersonCreateDTO.php
@@ -0,0 +1,70 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\Actions\PersonCreate;
+
+use Chill\MainBundle\Entity\Address;
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\Civility;
+use Chill\MainBundle\Entity\Gender;
+use Chill\PersonBundle\Entity\Identifier\PersonIdentifier;
+use Chill\PersonBundle\Entity\PersonAltName;
+use libphonenumber\PhoneNumber;
+use Misd\PhoneNumberBundle\Validator\Constraints\PhoneNumber as MisdPhoneNumberConstraint;
+use Symfony\Component\Validator\Constraints as Assert;
+use Chill\PersonBundle\Validator\Constraints\Person\Birthdate;
+
+class PersonCreateDTO
+{
+    #[Assert\NotBlank(message: 'The firstname cannot be empty')]
+    #[Assert\Length(max: 255)]
+    public string $firstName;
+
+    #[Assert\NotBlank(message: 'The lastname cannot be empty')]
+    #[Assert\Length(max: 255)]
+    public string $lastName;
+
+    #[Birthdate]
+    public ?\DateTime $birthdate = null;
+
+    #[Assert\NotNull(message: 'The gender must be set')]
+    public ?Gender $gender = null;
+
+    public ?Civility $civility = null;
+
+    #[MisdPhoneNumberConstraint(type: [MisdPhoneNumberConstraint::FIXED_LINE, MisdPhoneNumberConstraint::VOIP, MisdPhoneNumberConstraint::PERSONAL_NUMBER])]
+    public ?PhoneNumber $phonenumber = null;
+
+    #[MisdPhoneNumberConstraint(type: [MisdPhoneNumberConstraint::MOBILE])]
+    public ?PhoneNumber $mobilenumber = null;
+
+    #[Assert\Email]
+    public ?string $email = '';
+
+    // Checkbox that indicates whether the address form was checked in creation form
+    public bool $addressForm = false;
+
+    // Selected address value (unmapped in Person entity during creation)
+    public ?Address $address = null;
+
+    public ?Center $center = null;
+
+    /**
+     * @var array<string, PersonAltName> where the key is the altname's key
+     */
+    public array $altNames = [];
+
+    /**
+     * @var array<string, PersonIdentifier>
+     */
+    #[Assert\Valid(traverse: true)]
+    public array $identifiers = [];
+}
diff --git a/src/Bundle/ChillPersonBundle/Actions/PersonCreate/Service/PersonCreateDTOFactory.php b/src/Bundle/ChillPersonBundle/Actions/PersonCreate/Service/PersonCreateDTOFactory.php
new file mode 100644
index 000000000..2259e345a
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Actions/PersonCreate/Service/PersonCreateDTOFactory.php
@@ -0,0 +1,96 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\Actions\PersonCreate\Service;
+
+use Chill\PersonBundle\Actions\PersonCreate\PersonCreateDTO;
+use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
+use Chill\PersonBundle\Entity\Identifier\PersonIdentifier;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Entity\PersonAltName;
+use Chill\PersonBundle\PersonIdentifier\PersonIdentifierManagerInterface;
+
+class PersonCreateDTOFactory
+{
+    public function __construct(
+        private readonly ConfigPersonAltNamesHelper $configPersonAltNamesHelper,
+        private readonly PersonIdentifierManagerInterface $personIdentifierManager,
+    ) {}
+
+    public function createPersonCreateDTO(Person $person): PersonCreateDTO
+    {
+        $dto = new PersonCreateDTO();
+        $dto->firstName = $person->getFirstName();
+        $dto->lastName = $person->getLastName();
+        $dto->birthdate = $person->getBirthdate();
+        $dto->gender = $person->getGender();
+        $dto->civility = $person->getCivility();
+        $dto->phonenumber = $person->getPhonenumber();
+        $dto->mobilenumber = $person->getMobilenumber();
+        $dto->email = $person->getEmail();
+        $dto->center = $person->getCenter();
+        // address/addressForm are not mapped on Person entity; left to defaults
+
+        foreach ($this->configPersonAltNamesHelper->getChoices() as $key => $labels) {
+            $altName = $person->getAltNames()->findFirst(fn (int $k, PersonAltName $altName) => $altName->getKey() === $key);
+            if (null === $altName) {
+                $altName = new PersonAltName();
+                $altName->setKey($key);
+            }
+            $dto->altNames[$key] = $altName;
+        }
+
+        foreach ($this->personIdentifierManager->getWorkers() as $worker) {
+            $identifier = $person
+                ->getIdentifiers()
+                ->findFirst(fn (int $key, PersonIdentifier $identifier) => $worker->getDefinition() === $identifier->getDefinition());
+            if (null === $identifier) {
+                $identifier = new PersonIdentifier($worker->getDefinition());
+                $person->addIdentifier($identifier);
+            }
+            $dto->identifiers['identifier_'.$worker->getDefinition()->getId()] = $identifier;
+        }
+
+        return $dto;
+    }
+
+    public function mapPersonCreateDTOtoPerson(PersonCreateDTO $personCreateDTO, Person $person): void
+    {
+        $person
+            ->setFirstName($personCreateDTO->firstName)
+            ->setLastName($personCreateDTO->lastName)
+            ->setBirthdate($personCreateDTO->birthdate)
+            ->setGender($personCreateDTO->gender)
+            ->setCivility($personCreateDTO->civility)
+            ->setPhonenumber($personCreateDTO->phonenumber)
+            ->setMobilenumber($personCreateDTO->mobilenumber)
+            ->setEmail($personCreateDTO->email)
+            ->setCenter($personCreateDTO->center);
+
+        foreach ($personCreateDTO->altNames as $altName) {
+            if ('' === $altName->getLabel()) {
+                $person->removeAltName($altName);
+            } else {
+                $person->addAltName($altName);
+            }
+        }
+
+        foreach ($personCreateDTO->identifiers as $identifier) {
+            $worker = $this->personIdentifierManager->buildWorkerByPersonIdentifierDefinition($identifier->getDefinition());
+            if ($worker->isEmpty($identifier)) {
+                $person->removeIdentifier($identifier);
+            } else {
+                $person->addIdentifier($identifier);
+            }
+        }
+        // Note: address and addressForm are handled by controller/form during creation, not mapped here
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Actions/PersonEdit/PersonEditDTO.php b/src/Bundle/ChillPersonBundle/Actions/PersonEdit/PersonEditDTO.php
new file mode 100644
index 000000000..ed19e581d
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Actions/PersonEdit/PersonEditDTO.php
@@ -0,0 +1,108 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\Actions\PersonEdit;
+
+use Chill\MainBundle\Entity\Civility;
+use Chill\MainBundle\Entity\Country;
+use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
+use Chill\MainBundle\Entity\Gender;
+use Chill\MainBundle\Entity\Language;
+use Chill\PersonBundle\Entity\AdministrativeStatus;
+use Chill\PersonBundle\Entity\EmploymentStatus;
+use Chill\PersonBundle\Entity\Identifier\PersonIdentifier;
+use Chill\PersonBundle\Entity\MaritalStatus;
+use Chill\PersonBundle\Entity\PersonAltName;
+use Chill\PersonBundle\Validator\Constraints\Person\Birthdate;
+use Doctrine\Common\Collections\Collection;
+use libphonenumber\PhoneNumber;
+use Misd\PhoneNumberBundle\Validator\Constraints\PhoneNumber as MisdPhoneNumberConstraint;
+use Symfony\Component\Validator\Constraints as Assert;
+
+class PersonEditDTO
+{
+    #[Assert\NotBlank(message: 'The firstname cannot be empty')]
+    #[Assert\Length(max: 255)]
+    public string $firstName;
+
+    #[Assert\NotBlank(message: 'The lastname cannot be empty')]
+    #[Assert\Length(max: 255)]
+    public string $lastName;
+
+    #[Birthdate]
+    public ?\DateTime $birthdate = null;
+
+    #[Assert\GreaterThanOrEqual(propertyPath: 'birthdate')]
+    #[Assert\LessThanOrEqual('today')]
+    public ?\DateTimeImmutable $deathdate = null;
+
+    #[Assert\NotNull(message: 'The gender must be set')]
+    public ?Gender $gender = null;
+
+    #[Assert\Valid]
+    public CommentEmbeddable $genderComment;
+
+    public ?int $numberOfChildren = null;
+
+    /**
+     * @var array<string, PersonAltName> where the key is the altname's key
+     */
+    public array $altNames = [];
+
+    public string $memo = '';
+
+    public ?EmploymentStatus $employmentStatus = null;
+
+    public ?AdministrativeStatus $administrativeStatus = null;
+
+    public string $placeOfBirth = '';
+
+    public ?string $contactInfo = '';
+
+    #[MisdPhoneNumberConstraint(type: [MisdPhoneNumberConstraint::FIXED_LINE, MisdPhoneNumberConstraint::VOIP, MisdPhoneNumberConstraint::PERSONAL_NUMBER])]
+    public ?PhoneNumber $phonenumber = null;
+
+    #[MisdPhoneNumberConstraint(type: [MisdPhoneNumberConstraint::MOBILE])]
+    public ?PhoneNumber $mobilenumber = null;
+
+    public ?bool $acceptSms = false;
+
+    #[Assert\Valid(traverse: true)]
+    public Collection $otherPhonenumbers; // Collection<int, \Chill\PersonBundle\Entity\PersonPhone>
+
+    #[Assert\Email]
+    public ?string $email = '';
+
+    public ?bool $acceptEmail = false;
+
+    public ?Country $countryOfBirth = null;
+
+    public ?Country $nationality = null;
+
+    public Collection $spokenLanguages; // Collection<int, Language>
+
+    public ?Civility $civility = null;
+
+    public ?MaritalStatus $maritalStatus = null;
+
+    public ?\DateTimeInterface $maritalStatusDate = null;
+
+    #[Assert\Valid]
+    public CommentEmbeddable $maritalStatusComment;
+
+    public ?array $cFData = null;
+
+    /**
+     * @var array<string, PersonIdentifier>
+     */
+    #[Assert\Valid(traverse: true)]
+    public array $identifiers = [];
+}
diff --git a/src/Bundle/ChillPersonBundle/Actions/PersonEdit/Service/PersonEditDTOFactory.php b/src/Bundle/ChillPersonBundle/Actions/PersonEdit/Service/PersonEditDTOFactory.php
new file mode 100644
index 000000000..e25cd0ad2
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Actions/PersonEdit/Service/PersonEditDTOFactory.php
@@ -0,0 +1,130 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\Actions\PersonEdit\Service;
+
+use Chill\PersonBundle\Actions\PersonEdit\PersonEditDTO;
+use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
+use Chill\PersonBundle\Entity\Identifier\PersonIdentifier;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Entity\PersonAltName;
+use Chill\PersonBundle\PersonIdentifier\PersonIdentifierManagerInterface;
+
+class PersonEditDTOFactory
+{
+    public function __construct(
+        private readonly ConfigPersonAltNamesHelper $configPersonAltNamesHelper,
+        private readonly PersonIdentifierManagerInterface $personIdentifierManager,
+    ) {}
+
+    public function createPersonEditDTO(Person $person): PersonEditDTO
+    {
+        $dto = new PersonEditDTO();
+        $dto->firstName = $person->getFirstName();
+        $dto->lastName = $person->getLastName();
+        $dto->birthdate = $person->getBirthdate();
+        $dto->deathdate = (null !== $deathDate = $person->getDeathdate()) ? \DateTimeImmutable::createFromInterface($deathDate) : null;
+        $dto->gender = $person->getGender();
+        $dto->genderComment = $person->getGenderComment();
+        $dto->numberOfChildren = $person->getNumberOfChildren();
+        $dto->memo = $person->getMemo() ?? '';
+        $dto->employmentStatus = $person->getEmploymentStatus();
+        $dto->administrativeStatus = $person->getAdministrativeStatus();
+        $dto->placeOfBirth = $person->getPlaceOfBirth() ?? '';
+        $dto->contactInfo = $person->getcontactInfo();
+        $dto->phonenumber = $person->getPhonenumber();
+        $dto->mobilenumber = $person->getMobilenumber();
+        $dto->acceptSms = $person->getAcceptSMS();
+        $dto->otherPhonenumbers = $person->getOtherPhoneNumbers();
+        $dto->email = $person->getEmail();
+        $dto->acceptEmail = $person->getAcceptEmail();
+        $dto->countryOfBirth = $person->getCountryOfBirth();
+        $dto->nationality = $person->getNationality();
+        $dto->spokenLanguages = $person->getSpokenLanguages();
+        $dto->civility = $person->getCivility();
+        $dto->maritalStatus = $person->getMaritalStatus();
+        $dto->maritalStatusDate = $person->getMaritalStatusDate();
+        $dto->maritalStatusComment = $person->getMaritalStatusComment();
+        $dto->cFData = $person->getCFData();
+
+
+        foreach ($this->configPersonAltNamesHelper->getChoices() as $key => $labels) {
+            $altName = $person->getAltNames()->findFirst(fn (int $k, PersonAltName $altName) => $altName->getKey() === $key);
+            if (null === $altName) {
+                $altName = new PersonAltName();
+                $altName->setKey($key);
+            }
+            $dto->altNames[$key] = $altName;
+        }
+
+        foreach ($this->personIdentifierManager->getWorkers() as $worker) {
+            $identifier = $person
+                ->getIdentifiers()
+                ->findFirst(fn (int $key, PersonIdentifier $identifier) => $worker->getDefinition() === $identifier->getDefinition());
+            if (null === $identifier) {
+                $identifier = new PersonIdentifier($worker->getDefinition());
+                $person->addIdentifier($identifier);
+            }
+            $dto->identifiers['identifier_'.$worker->getDefinition()->getId()] = $identifier;
+        }
+
+        return $dto;
+    }
+
+    public function mapPersonEditDTOtoPerson(PersonEditDTO $personEditDTO, Person $person): void
+    {
+        // Copy all editable fields from the DTO back to the Person entity
+        $person
+            ->setFirstName($personEditDTO->firstName)
+            ->setLastName($personEditDTO->lastName)
+            ->setBirthdate($personEditDTO->birthdate)
+            ->setDeathdate($personEditDTO->deathdate)
+            ->setGender($personEditDTO->gender)
+            ->setGenderComment($personEditDTO->genderComment)
+            ->setNumberOfChildren($personEditDTO->numberOfChildren)
+            ->setMemo($personEditDTO->memo)
+            ->setEmploymentStatus($personEditDTO->employmentStatus)
+            ->setAdministrativeStatus($personEditDTO->administrativeStatus)
+            ->setPlaceOfBirth($personEditDTO->placeOfBirth)
+            ->setcontactInfo($personEditDTO->contactInfo)
+            ->setPhonenumber($personEditDTO->phonenumber)
+            ->setMobilenumber($personEditDTO->mobilenumber)
+            ->setAcceptSMS($personEditDTO->acceptSms ?? false)
+            ->setOtherPhoneNumbers($personEditDTO->otherPhonenumbers)
+            ->setEmail($personEditDTO->email)
+            ->setAcceptEmail($personEditDTO->acceptEmail ?? false)
+            ->setCountryOfBirth($personEditDTO->countryOfBirth)
+            ->setNationality($personEditDTO->nationality)
+            ->setSpokenLanguages($personEditDTO->spokenLanguages)
+            ->setCivility($personEditDTO->civility)
+            ->setMaritalStatus($personEditDTO->maritalStatus)
+            ->setMaritalStatusDate($personEditDTO->maritalStatusDate)
+            ->setMaritalStatusComment($personEditDTO->maritalStatusComment)
+            ->setCFData($personEditDTO->cFData);
+
+        foreach ($personEditDTO->altNames as $altName) {
+            if ('' === $altName->getLabel()) {
+                $person->removeAltName($altName);
+            } else {
+                $person->addAltName($altName);
+            }
+        }
+
+        foreach ($personEditDTO->identifiers as $identifier) {
+            $worker = $this->personIdentifierManager->buildWorkerByPersonIdentifierDefinition($identifier->getDefinition());
+            if ($worker->isEmpty($identifier)) {
+                $person->removeIdentifier($identifier);
+            } else {
+                $person->addIdentifier($identifier);
+            }
+        }
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Config/ConfigPersonAltNamesHelper.php b/src/Bundle/ChillPersonBundle/Config/ConfigPersonAltNamesHelper.php
index 4be480442..bac53aa23 100644
--- a/src/Bundle/ChillPersonBundle/Config/ConfigPersonAltNamesHelper.php
+++ b/src/Bundle/ChillPersonBundle/Config/ConfigPersonAltNamesHelper.php
@@ -28,6 +28,8 @@ class ConfigPersonAltNamesHelper
 
     /**
      * get the choices as key => values.
+     *
+     * @return array<string, array<string, string>> where the key is the altName's key, and the value is an array of TranslatableString
      */
     public function getChoices(): array
     {
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonController.php b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
index 4698373f1..3b5cabd95 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonController.php
@@ -11,36 +11,22 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Controller;
 
-use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
 use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
-use Chill\PersonBundle\Entity\Household\Household;
-use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Form\CreationPersonType;
 use Chill\PersonBundle\Privacy\PrivacyEvent;
 use Chill\PersonBundle\Repository\PersonRepository;
-use Chill\PersonBundle\Search\SimilarPersonMatcher;
-use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Doctrine\ORM\EntityManagerInterface;
 use Sensio\Bundle\FrameworkExtraBundle\Configuration\ParamConverter;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
 use Symfony\Component\EventDispatcher\EventDispatcherInterface;
-use Symfony\Component\Form\Extension\Core\Type\SubmitType;
-use Symfony\Component\Form\Form;
 use Symfony\Component\HttpFoundation\Request;
 use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpFoundation\Session\SessionInterface;
 use Symfony\Component\Routing\Annotation\Route;
 use Symfony\Component\Validator\Validator\ValidatorInterface;
-use Symfony\Contracts\Translation\TranslatorInterface;
-use function hash;
 
 final class PersonController extends AbstractController
 {
     public function __construct(
-        private readonly AuthorizationHelperInterface $authorizationHelper,
-        private readonly SimilarPersonMatcher $similarPersonMatcher,
-        private readonly TranslatorInterface $translator,
         private readonly EventDispatcherInterface $eventDispatcher,
         private readonly PersonRepository $personRepository,
         private readonly ConfigPersonAltNamesHelper $configPersonAltNameHelper,
@@ -85,110 +71,6 @@ final class PersonController extends AbstractController
         );
     }
 
-    /**
-     * Method for creating a new person.
-     *
-     * The controller register data from a previous post on the form, and
-     * register it in the session.
-     *
-     * The next post compare the data with previous one and, if yes, show a
-     * review page if there are "alternate persons".
-     */
-    #[Route(path: '/{_locale}/person/new', name: 'chill_person_new')]
-    public function newAction(Request $request): Response
-    {
-        $person = new Person();
-
-        $authorizedCenters = $this->authorizationHelper->getReachableCenters($this->getUser(), PersonVoter::CREATE);
-
-        if (1 === \count($authorizedCenters)) {
-            $person->setCenter($authorizedCenters[0]);
-        }
-
-        $form = $this->createForm(CreationPersonType::class, $person)
-            ->add('editPerson', SubmitType::class, [
-                'label' => 'Add the person',
-            ])->add('createPeriod', SubmitType::class, [
-                'label' => 'Add the person and create an accompanying period',
-            ])->add('createHousehold', SubmitType::class, [
-                'label' => 'Add the person and create a household',
-            ]);
-
-        $form->handleRequest($request);
-
-        if (Request::METHOD_GET === $request->getMethod()) {
-            $this->lastPostDataReset();
-        } elseif (
-            Request::METHOD_POST === $request->getMethod()
-            && $form->isValid()
-        ) {
-            $alternatePersons = $this->similarPersonMatcher
-                ->matchPerson($person);
-
-            if (
-                false === $this->isLastPostDataChanges($form, $request, true)
-                || 0 === \count($alternatePersons)
-            ) {
-                $this->em->persist($person);
-
-                $this->em->flush();
-                $this->lastPostDataReset();
-
-                $address = $form->get('address')->getData();
-                $addressForm = (bool) $form->get('addressForm')->getData();
-
-                if (null !== $address && $addressForm) {
-                    $household = new Household();
-
-                    $member = new HouseholdMember();
-                    $member->setPerson($person);
-                    $member->setStartDate(new \DateTimeImmutable());
-
-                    $household->addMember($member);
-                    $household->setForceAddress($address);
-
-                    $this->em->persist($member);
-                    $this->em->persist($household);
-                    $this->em->flush();
-
-                    if ($form->get('createHousehold')->isClicked()) {
-                        return $this->redirectToRoute('chill_person_household_members_editor', [
-                            'persons' => [$person->getId()],
-                            'household' => $household->getId(),
-                        ]);
-                    }
-                }
-
-                if ($form->get('createPeriod')->isClicked()) {
-                    return $this->redirectToRoute('chill_person_accompanying_course_new', [
-                        'person_id' => [$person->getId()],
-                    ]);
-                }
-
-                if ($form->get('createHousehold')->isClicked()) {
-                    return $this->redirectToRoute('chill_person_household_members_editor', [
-                        'persons' => [$person->getId()],
-                    ]);
-                }
-
-                return $this->redirectToRoute(
-                    'chill_person_general_edit',
-                    ['person_id' => $person->getId()]
-                );
-            }
-        } elseif (Request::METHOD_POST === $request->getMethod() && !$form->isValid()) {
-            $this->addFlash('error', $this->translator->trans('This form contains errors'));
-        }
-
-        return $this->render(
-            '@ChillPerson/Person/create.html.twig',
-            [
-                'form' => $form->createView(),
-                'alternatePersons' => $alternatePersons ?? [],
-            ]
-        );
-    }
-
     #[Route(path: '/{_locale}/person/{person_id}/general', name: 'chill_person_view')]
     public function viewAction(int $person_id)
     {
@@ -250,51 +132,4 @@ final class PersonController extends AbstractController
 
         return $errors;
     }
-
-    private function isLastPostDataChanges(Form $form, Request $request, bool $replace = false): bool
-    {
-        /** @var SessionInterface $session */
-        $session = $this->get('session');
-
-        if (!$session->has('last_person_data')) {
-            return true;
-        }
-
-        $newPost = $this->lastPostDataBuildHash($form, $request);
-
-        $isChanged = $session->get('last_person_data') !== $newPost;
-
-        if ($replace) {
-            $session->set('last_person_data', $newPost);
-        }
-
-        return $isChanged;
-    }
-
-    /**
-     * build the hash for posted data.
-     *
-     * For privacy reasons, the data are hashed using sha512
-     */
-    private function lastPostDataBuildHash(Form $form, Request $request): string
-    {
-        $fields = [];
-        $ignoredFields = ['form_status', '_token'];
-
-        foreach ($request->request->all()[$form->getName()] as $field => $value) {
-            if (\in_array($field, $ignoredFields, true)) {
-                continue;
-            }
-            $fields[$field] = \is_array($value) ?
-                \implode(',', $value) : $value;
-        }
-        ksort($fields);
-
-        return \hash('sha512', \implode('&', $fields));
-    }
-
-    private function lastPostDataReset(): void
-    {
-        $this->get('session')->set('last_person_data', '');
-    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonCreateController.php b/src/Bundle/ChillPersonBundle/Controller/PersonCreateController.php
new file mode 100644
index 000000000..7ddd883d7
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonCreateController.php
@@ -0,0 +1,205 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\Controller;
+
+use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
+use Chill\PersonBundle\Actions\PersonCreate\Service\PersonCreateDTOFactory;
+use Chill\PersonBundle\Entity\Household\Household;
+use Chill\PersonBundle\Entity\Household\HouseholdMember;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Form\CreationPersonType;
+use Chill\PersonBundle\Search\SimilarPersonMatcher;
+use Chill\PersonBundle\Security\Authorization\PersonVoter;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
+use Symfony\Component\Form\ClickableInterface;
+use Symfony\Component\Form\Extension\Core\Type\SubmitType;
+use Symfony\Component\Form\Form;
+use Symfony\Component\Form\FormInterface;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\Session\SessionInterface;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Contracts\Translation\TranslatorInterface;
+
+final class PersonCreateController extends AbstractController
+{
+    public function __construct(
+        private readonly AuthorizationHelperInterface $authorizationHelper,
+        private readonly SimilarPersonMatcher $similarPersonMatcher,
+        private readonly TranslatorInterface $translator,
+        private readonly EntityManagerInterface $em,
+        private readonly PersonCreateDTOFactory $personCreateDTOFactory,
+    ) {}
+
+    /**
+     * Method for creating a new person.
+     *
+     * The controller registers data from a previous post on the form and
+     * registers it in the session.
+     *
+     * The next post compares the data with the previous one and, if yes, shows a
+     * review page if there are "alternate persons".
+     */
+    #[Route(path: '/{_locale}/person/new', name: 'chill_person_new')]
+    public function newAction(Request $request, SessionInterface $session): Response
+    {
+        $person = new Person();
+
+        $authorizedCenters = $this->authorizationHelper->getReachableCenters($this->getUser(), PersonVoter::CREATE);
+
+        $dto = $this->personCreateDTOFactory->createPersonCreateDTO($person);
+
+        if (1 === \count($authorizedCenters)) {
+            $dto->center = $authorizedCenters[0];
+        }
+
+        $form = $this->createForm(CreationPersonType::class, $dto)
+            ->add('editPerson', SubmitType::class, [
+                'label' => 'Add the person',
+            ])->add('createPeriod', SubmitType::class, [
+                'label' => 'Add the person and create an accompanying period',
+            ])->add('createHousehold', SubmitType::class, [
+                'label' => 'Add the person and create a household',
+            ]);
+
+        $form->handleRequest($request);
+
+        if (Request::METHOD_GET === $request->getMethod()) {
+            $this->lastPostDataReset($session);
+        } elseif (
+            Request::METHOD_POST === $request->getMethod()
+            && $form->isValid()
+        ) {
+            $alternatePersons = $this->similarPersonMatcher
+                ->matchPerson($person);
+
+            $createHouseholdButton = $form->get('createHousehold');
+            $createPeriodButton = $form->get('createPeriod');
+            $editPersonButton = $form->get('editPerson');
+
+            if (!$createHouseholdButton instanceof ClickableInterface) {
+                throw new \UnexpectedValueException();
+            }
+            if (!$createPeriodButton instanceof ClickableInterface) {
+                throw new \UnexpectedValueException();
+            }
+            if (!$editPersonButton instanceof ClickableInterface) {
+                throw new \UnexpectedValueException();
+            }
+
+            if (
+                false === $this->isLastPostDataChanges($form, $request, $session)
+                || 0 === \count($alternatePersons)
+            ) {
+                $this->personCreateDTOFactory->mapPersonCreateDTOtoPerson($dto, $person);
+                $this->em->persist($person);
+
+                $this->em->flush();
+                $this->lastPostDataReset($session);
+
+                $address = $dto->address;
+                $addressForm = $dto->addressForm;
+
+                if (null !== $address && $addressForm) {
+                    $household = new Household();
+
+                    $member = new HouseholdMember();
+                    $member->setPerson($person);
+                    $member->setStartDate(new \DateTimeImmutable());
+
+                    $household->addMember($member);
+                    $household->setForceAddress($address);
+
+                    $this->em->persist($member);
+                    $this->em->persist($household);
+                    $this->em->flush();
+
+                    if ($createHouseholdButton->isClicked()) {
+                        return $this->redirectToRoute('chill_person_household_members_editor', [
+                            'persons' => [$person->getId()],
+                            'household' => $household->getId(),
+                        ]);
+                    }
+                }
+
+                if ($createPeriodButton->isClicked()) {
+                    return $this->redirectToRoute('chill_person_accompanying_course_new', [
+                        'person_id' => [$person->getId()],
+                    ]);
+                }
+
+                if ($createHouseholdButton->isClicked()) {
+                    return $this->redirectToRoute('chill_person_household_members_editor', [
+                        'persons' => [$person->getId()],
+                    ]);
+                }
+
+                return $this->redirectToRoute(
+                    'chill_person_general_edit',
+                    ['person_id' => $person->getId()]
+                );
+            }
+        } elseif (Request::METHOD_POST === $request->getMethod() && !$form->isValid()) {
+            $this->addFlash('error', $this->translator->trans('This form contains errors'));
+        }
+
+        return $this->render(
+            '@ChillPerson/Person/create.html.twig',
+            [
+                'form' => $form->createView(),
+                'alternatePersons' => $alternatePersons ?? [],
+            ]
+        );
+    }
+
+    private function isLastPostDataChanges(FormInterface $form, Request $request, SessionInterface $session): bool
+    {
+        if (!$session->has('last_person_data')) {
+            return true;
+        }
+
+        $newPost = $this->lastPostDataBuildHash($form, $request);
+
+        $isChanged = $session->get('last_person_data') !== $newPost;
+        $session->set('last_person_data', $newPost);
+
+        return $isChanged;
+    }
+
+    /**
+     * build the hash for posted data.
+     *
+     * For privacy reasons, the data are hashed using sha512
+     */
+    private function lastPostDataBuildHash(FormInterface $form, Request $request): string
+    {
+        $fields = [];
+        $ignoredFields = ['form_status', '_token', 'identifiers'];
+
+        foreach ($request->request->all()[$form->getName()] as $field => $value) {
+            if (\in_array($field, $ignoredFields, true)) {
+                continue;
+            }
+            $fields[$field] = \is_array($value) ?
+                \implode(',', $value) : $value;
+        }
+        ksort($fields);
+
+        return \hash('sha512', \implode('&', $fields));
+    }
+
+    private function lastPostDataReset(SessionInterface $session): void
+    {
+        $session->set('last_person_data', '');
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonEditController.php b/src/Bundle/ChillPersonBundle/Controller/PersonEditController.php
index be5b87bc3..e09bb97b6 100644
--- a/src/Bundle/ChillPersonBundle/Controller/PersonEditController.php
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonEditController.php
@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Controller;
 
 use Chill\CustomFieldsBundle\EntityRepository\CustomFieldsDefaultGroupRepository;
+use Chill\PersonBundle\Actions\PersonEdit\Service\PersonEditDTOFactory;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Form\PersonType;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
@@ -38,6 +39,7 @@ final readonly class PersonEditController
         private EntityManagerInterface $entityManager,
         private UrlGeneratorInterface $urlGenerator,
         private Environment $twig,
+        private PersonEditDTOFactory $personEditDTOFactory,
     ) {}
 
     /**
@@ -50,9 +52,11 @@ final readonly class PersonEditController
             throw new AccessDeniedHttpException('You are not allowed to edit this person.');
         }
 
+        $dto = $this->personEditDTOFactory->createPersonEditDTO($person);
+
         $form = $this->formFactory->create(
             PersonType::class,
-            $person,
+            $dto,
             ['cFGroup' => $this->customFieldsDefaultGroupRepository->findOneByEntity(Person::class)?->getCustomFieldsGroup()]
         );
 
@@ -62,6 +66,7 @@ final readonly class PersonEditController
             $session
                 ->getFlashBag()->add('error', new TranslatableMessage('This form contains errors'));
         } elseif ($form->isSubmitted() && $form->isValid()) {
+            $this->personEditDTOFactory->mapPersonEditDTOtoPerson($dto, $person);
             $this->entityManager->flush();
 
             $session->getFlashBag()->add('success', new TranslatableMessage('The person data has been updated'));
diff --git a/src/Bundle/ChillPersonBundle/Controller/PersonIdentifierListApiController.php b/src/Bundle/ChillPersonBundle/Controller/PersonIdentifierListApiController.php
new file mode 100644
index 000000000..2f0b3af28
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Controller/PersonIdentifierListApiController.php
@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\Controller;
+
+use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
+use Chill\MainBundle\Serializer\Model\Collection;
+use Chill\PersonBundle\PersonIdentifier\PersonIdentifierManagerInterface;
+use Symfony\Component\HttpFoundation\JsonResponse;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\Routing\Annotation\Route;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\SerializerInterface;
+
+final readonly class PersonIdentifierListApiController
+{
+    public function __construct(
+        private Security $security,
+        private SerializerInterface $serializer,
+        private PersonIdentifierManagerInterface $personIdentifierManager,
+        private PaginatorFactoryInterface $paginatorFactory,
+    ) {}
+
+    #[Route('/api/1.0/person/identifiers/workers', name: 'person_person_identifiers_worker_list')]
+    public function list(): Response
+    {
+        if (!$this->security->isGranted('ROLE_USER')) {
+            throw new AccessDeniedHttpException();
+        }
+
+        $workers = $this->personIdentifierManager->getWorkers();
+        $paginator = $this->paginatorFactory->create(count($workers));
+        $paginator->setItemsPerPage(count($workers));
+        $collection = new Collection($workers, $paginator);
+
+        return new JsonResponse($this->serializer->serialize($collection, 'json'), json: true);
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
index ffff789c2..095566b91 100644
--- a/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
+++ b/src/Bundle/ChillPersonBundle/DependencyInjection/ChillPersonExtension.php
@@ -96,7 +96,6 @@ class ChillPersonExtension extends Extension implements PrependExtensionInterfac
         // We can get rid of this file when the service 'chill.person.repository.person' is no more used.
         // We should use the PersonRepository service instead of a custom service name.
         $loader->load('services/repository.yaml');
-        $loader->load('services/serializer.yaml');
         $loader->load('services/security.yaml');
         $loader->load('services/doctrineEventListener.yaml');
         $loader->load('services/accompanyingPeriodConsistency.yaml');
diff --git a/src/Bundle/ChillPersonBundle/Entity/Identifier/IdentifierPresenceEnum.php b/src/Bundle/ChillPersonBundle/Entity/Identifier/IdentifierPresenceEnum.php
new file mode 100644
index 000000000..120fed3f0
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Entity/Identifier/IdentifierPresenceEnum.php
@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\Entity\Identifier;
+
+enum IdentifierPresenceEnum: string
+{
+    /**
+     * The person identifier is not editable by any user.
+     *
+     * The identifier is intended to be added by an import script, for instance.
+     */
+    case NOT_EDITABLE = 'NOT_EDITABLE';
+
+    /**
+     * The person identifier is present on the edit form only.
+     */
+    case ON_EDIT = 'ON_EDIT';
+
+    /**
+     * The person identifier is present on both person's creation form, and edit form.
+     */
+    case ON_CREATION = 'ON_CREATION';
+
+    /**
+     * The person identifier is required to create the person. It should not be empty.
+     */
+    case REQUIRED = 'REQUIRED';
+
+    public function isEditableByUser(): bool
+    {
+        return IdentifierPresenceEnum::NOT_EDITABLE !== $this;
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Entity/Identifier/PersonIdentifier.php b/src/Bundle/ChillPersonBundle/Entity/Identifier/PersonIdentifier.php
index f0dea00b4..a6840f285 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Identifier/PersonIdentifier.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Identifier/PersonIdentifier.php
@@ -12,15 +12,24 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Entity\Identifier;
 
 use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\PersonIdentifier\Validator\UniqueIdentifierConstraint;
+use Chill\PersonBundle\PersonIdentifier\Validator\ValidIdentifierConstraint;
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation as Serializer;
 
 #[ORM\Entity]
 #[ORM\Table(name: 'chill_person_identifier')]
+#[ORM\UniqueConstraint(name: 'chill_person_identifier_unique', columns: ['definition_id', 'canonical'])]
+#[ORM\UniqueConstraint(name: 'chill_person_identifier_unique_person_definition', columns: ['definition_id', 'person_id'])]
+#[UniqueIdentifierConstraint]
+#[ValidIdentifierConstraint]
+#[Serializer\DiscriminatorMap('type', ['person_identifier' => PersonIdentifier::class])]
 class PersonIdentifier
 {
     #[ORM\Id]
     #[ORM\Column(name: 'id', type: \Doctrine\DBAL\Types\Types::INTEGER)]
     #[ORM\GeneratedValue]
+    #[Serializer\Groups(['read'])]
     private ?int $id = null;
 
     #[ORM\ManyToOne(targetEntity: Person::class)]
@@ -28,14 +37,16 @@ class PersonIdentifier
     private ?Person $person = null;
 
     #[ORM\Column(name: 'value', type: \Doctrine\DBAL\Types\Types::JSON, nullable: false, options: ['default' => '[]', 'jsonb' => true])]
+    #[Serializer\Groups(['read'])]
     private array $value = [];
 
-    #[ORM\Column(name: 'canonical', type: \Doctrine\DBAL\Types\Types::TEXT, nullable: false, options: ['default' => '[]'])]
+    #[ORM\Column(name: 'canonical', type: \Doctrine\DBAL\Types\Types::TEXT, nullable: false, options: ['default' => ''])]
     private string $canonical = '';
 
     public function __construct(
         #[ORM\ManyToOne(targetEntity: PersonIdentifierDefinition::class)]
-        #[ORM\JoinColumn(name: 'definition_id', referencedColumnName: 'id', nullable: false, onDelete: 'CASCADE')]
+        #[ORM\JoinColumn(name: 'definition_id', referencedColumnName: 'id', nullable: false, onDelete: 'RESTRICT')]
+        #[Serializer\Groups(['read'])]
         private PersonIdentifierDefinition $definition,
     ) {}
 
diff --git a/src/Bundle/ChillPersonBundle/Entity/Identifier/PersonIdentifierDefinition.php b/src/Bundle/ChillPersonBundle/Entity/Identifier/PersonIdentifierDefinition.php
index 6d6112569..8b60c7814 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Identifier/PersonIdentifierDefinition.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Identifier/PersonIdentifierDefinition.php
@@ -11,30 +11,35 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Entity\Identifier;
 
+use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\Mapping as ORM;
+use Symfony\Component\Serializer\Annotation as Serializer;
 
 #[ORM\Entity]
 #[ORM\Table(name: 'chill_person_identifier_definition')]
+#[Serializer\DiscriminatorMap('type', ['person_identifier_definition' => PersonIdentifierDefinition::class])]
 class PersonIdentifierDefinition
 {
     #[ORM\Id]
-    #[ORM\Column(name: 'id', type: \Doctrine\DBAL\Types\Types::INTEGER)]
+    #[ORM\Column(name: 'id', type: Types::INTEGER)]
     #[ORM\GeneratedValue]
+    #[Serializer\Groups(['read'])]
     private ?int $id = null;
 
-    #[ORM\Column(name: 'active', type: \Doctrine\DBAL\Types\Types::BOOLEAN, nullable: false, options: ['default' => true])]
+    #[ORM\Column(name: 'active', type: Types::BOOLEAN, nullable: false, options: ['default' => true])]
     private bool $active = true;
 
     public function __construct(
-        #[ORM\Column(name: 'label', type: \Doctrine\DBAL\Types\Types::JSON, nullable: false, options: ['default' => '[]'])]
+        #[ORM\Column(name: 'label', type: Types::JSON, nullable: false, options: ['default' => '[]'])]
         private array $label,
-        #[ORM\Column(name: 'engine', type: \Doctrine\DBAL\Types\Types::STRING, length: 100)]
+        #[ORM\Column(name: 'engine', type: Types::STRING, length: 100)]
+        #[Serializer\Groups(['read'])]
         private string $engine,
-        #[ORM\Column(name: 'is_searchable', type: \Doctrine\DBAL\Types\Types::BOOLEAN, options: ['default' => false])]
+        #[ORM\Column(name: 'is_searchable', type: Types::BOOLEAN, options: ['default' => false])]
         private bool $isSearchable = false,
-        #[ORM\Column(name: 'is_editable_by_users', type: \Doctrine\DBAL\Types\Types::BOOLEAN, nullable: false, options: ['default' => false])]
-        private bool $isEditableByUsers = false,
-        #[ORM\Column(name: 'data', type: \Doctrine\DBAL\Types\Types::JSON, nullable: false, options: ['default' => '[]', 'jsonb' => true])]
+        #[ORM\Column(name: 'presence', type: Types::STRING, nullable: false, enumType: IdentifierPresenceEnum::class, options: ['default' => IdentifierPresenceEnum::ON_EDIT])]
+        private IdentifierPresenceEnum $presence = IdentifierPresenceEnum::ON_EDIT,
+        #[ORM\Column(name: 'data', type: Types::JSON, nullable: false, options: ['default' => '[]', 'jsonb' => true])]
         private array $data = [],
     ) {}
 
@@ -58,11 +63,6 @@ class PersonIdentifierDefinition
         return $this->engine;
     }
 
-    public function setEngine(string $engine): void
-    {
-        $this->engine = $engine;
-    }
-
     public function isSearchable(): bool
     {
         return $this->isSearchable;
@@ -75,12 +75,7 @@ class PersonIdentifierDefinition
 
     public function isEditableByUsers(): bool
     {
-        return $this->isEditableByUsers;
-    }
-
-    public function setIsEditableByUsers(bool $isEditableByUsers): void
-    {
-        $this->isEditableByUsers = $isEditableByUsers;
+        return $this->presence->isEditableByUser();
     }
 
     public function isActive(): bool
@@ -104,4 +99,16 @@ class PersonIdentifierDefinition
     {
         $this->data = $data;
     }
+
+    public function getPresence(): IdentifierPresenceEnum
+    {
+        return $this->presence;
+    }
+
+    public function setPresence(IdentifierPresenceEnum $presence): self
+    {
+        $this->presence = $presence;
+
+        return $this;
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php
index aa78774b6..af9135177 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person.php
@@ -27,7 +27,6 @@ use Chill\MainBundle\Entity\Language;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\Workflow\EntityWorkflowSignatureStateEnum;
 use Chill\MainBundle\Entity\Workflow\EntityWorkflowStepSignature;
-use Chill\MainBundle\Validation\Constraint\PhonenumberConstraint;
 use Chill\PersonBundle\Entity\Household\Household;
 use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Entity\Household\PersonHouseholdAddress;
@@ -36,6 +35,7 @@ use Chill\PersonBundle\Entity\Person\PersonCenterCurrent;
 use Chill\PersonBundle\Entity\Person\PersonCenterHistory;
 use Chill\PersonBundle\Entity\Person\PersonCurrentAddress;
 use Chill\PersonBundle\Entity\Person\PersonResource;
+use Chill\PersonBundle\PersonIdentifier\Validator\RequiredIdentifierConstraint;
 use Chill\PersonBundle\Validator\Constraints\Household\HouseholdMembershipSequential;
 use Chill\PersonBundle\Validator\Constraints\Person\Birthdate;
 use Chill\PersonBundle\Validator\Constraints\Person\PersonHasCenter;
@@ -47,6 +47,7 @@ use Doctrine\Common\Collections\ReadableCollection;
 use Doctrine\Common\Collections\Selectable;
 use Doctrine\ORM\Mapping as ORM;
 use libphonenumber\PhoneNumber;
+use Misd\PhoneNumberBundle\Validator\Constraints\PhoneNumber as MisdPhoneNumberConstraint;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 use Symfony\Component\Validator\Constraints as Assert;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
@@ -273,6 +274,8 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     private ?int $id = null;
 
     #[ORM\OneToMany(mappedBy: 'person', targetEntity: PersonIdentifier::class, cascade: ['persist', 'remove'], orphanRemoval: true)]
+    #[RequiredIdentifierConstraint]
+    #[Assert\Valid]
     private Collection $identifiers;
 
     /**
@@ -319,7 +322,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * The person's mobile phone number.
      */
     #[ORM\Column(type: 'phone_number', nullable: true)]
-    #[PhonenumberConstraint(type: 'mobile')]
+    #[MisdPhoneNumberConstraint(type: [MisdPhoneNumberConstraint::MOBILE])]
     private ?PhoneNumber $mobilenumber = null;
 
     /**
@@ -359,7 +362,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
      * The person's phonenumber.
      */
     #[ORM\Column(type: 'phone_number', nullable: true)]
-    #[PhonenumberConstraint(type: 'landline')]
+    #[MisdPhoneNumberConstraint(type: [MisdPhoneNumberConstraint::FIXED_LINE, MisdPhoneNumberConstraint::VOIP, MisdPhoneNumberConstraint::PERSONAL_NUMBER])]
     private ?PhoneNumber $phonenumber = null;
 
     /**
diff --git a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
index bb40c6c35..7be6a50b1 100644
--- a/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
+++ b/src/Bundle/ChillPersonBundle/Form/CreationPersonType.php
@@ -11,15 +11,14 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Form;
 
-use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Form\Event\CustomizeFormEvent;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\ChillPhoneNumberType;
 use Chill\MainBundle\Form\Type\PickAddressType;
 use Chill\MainBundle\Form\Type\PickCenterType;
 use Chill\MainBundle\Form\Type\PickCivilityType;
+use Chill\PersonBundle\Actions\PersonCreate\PersonCreateDTO;
 use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
-use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Form\Type\PersonAltNameType;
 use Chill\PersonBundle\Form\Type\PickGenderType;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
@@ -33,6 +32,7 @@ use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 use Symfony\Component\Validator\Constraints\Callback;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use Symfony\Component\Validator\Exception\UnexpectedTypeException;
 
 final class CreationPersonType extends AbstractType
 {
@@ -80,15 +80,18 @@ final class CreationPersonType extends AbstractType
             ->add('addressForm', CheckboxType::class, [
                 'label' => 'Create a household and add an address',
                 'required' => false,
-                'mapped' => false,
                 'help' => 'A new household will be created. The person will be member of this household.',
             ])
             ->add('address', PickAddressType::class, [
                 'required' => false,
-                'mapped' => false,
                 'label' => false,
             ]);
 
+        $builder->add('identifiers', PersonIdentifiersType::class, [
+            'by_reference' => false,
+            'step' => 'on_create',
+        ]);
+
         if ($this->askCenters) {
             $builder
                 ->add('center', PickCenterType::class, [
@@ -112,7 +115,7 @@ final class CreationPersonType extends AbstractType
     public function configureOptions(OptionsResolver $resolver)
     {
         $resolver->setDefaults([
-            'data_class' => Person::class,
+            'data_class' => PersonCreateDTO::class,
             'constraints' => [
                 new Callback($this->validateCheckedAddress(...)),
             ],
@@ -129,10 +132,12 @@ final class CreationPersonType extends AbstractType
 
     public function validateCheckedAddress($data, ExecutionContextInterface $context, $payload): void
     {
-        /** @var bool $addressFrom */
-        $addressFrom = $context->getObject()->get('addressForm')->getData();
-        /** @var ?Address $address */
-        $address = $context->getObject()->get('address')->getData();
+        if (!$data instanceof PersonCreateDTO) {
+            throw new UnexpectedTypeException($data, PersonCreateDTO::class);
+        }
+
+        $addressFrom = $data->addressForm;
+        $address = $data->address;
 
         if ($addressFrom && null === $address) {
             $context->buildViolation('person_creation.If you want to create an household, an address is required')
diff --git a/src/Bundle/ChillPersonBundle/Form/DataMapper/PersonAltNameDataMapper.php b/src/Bundle/ChillPersonBundle/Form/DataMapper/PersonAltNameDataMapper.php
index 3a2a61cad..00986bddd 100644
--- a/src/Bundle/ChillPersonBundle/Form/DataMapper/PersonAltNameDataMapper.php
+++ b/src/Bundle/ChillPersonBundle/Form/DataMapper/PersonAltNameDataMapper.php
@@ -12,10 +12,7 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Form\DataMapper;
 
 use Chill\PersonBundle\Entity\PersonAltName;
-use Doctrine\Common\Collections\ArrayCollection;
-use Doctrine\Common\Collections\Collection;
 use Symfony\Component\Form\DataMapperInterface;
-use Symfony\Component\Form\Exception\UnexpectedTypeException;
 
 class PersonAltNameDataMapper implements DataMapperInterface
 {
@@ -25,62 +22,24 @@ class PersonAltNameDataMapper implements DataMapperInterface
             return;
         }
 
-        if (!$viewData instanceof Collection) {
-            throw new UnexpectedTypeException($viewData, Collection::class);
-        }
-
-        $mapIndexToKey = [];
-
-        foreach ($viewData->getIterator() as $key => $altName) {
-            /* @var PersonAltName $altName */
-            $mapIndexToKey[$altName->getKey()] = $key;
+        if (!is_array($viewData)) {
+            throw new \InvalidArgumentException('View data must be an array');
         }
 
         foreach ($forms as $key => $form) {
-            if (\array_key_exists($key, $mapIndexToKey)) {
-                $form->setData($viewData->get($mapIndexToKey[$key])->getLabel());
+            $personAltName = $viewData[$key];
+            if (!$personAltName instanceof PersonAltName) {
+                throw new \InvalidArgumentException('PersonAltName must be an instance of PersonAltName');
             }
+            $form->setData($personAltName->getLabel());
         }
     }
 
     public function mapFormsToData(\Traversable $forms, &$viewData): void
     {
-        $mapIndexToKey = [];
-
-        if (\is_array($viewData)) {
-            $dataIterator = $viewData;
-        } else {
-            $dataIterator = $viewData instanceof ArrayCollection ?
-                 $viewData->toArray() : $viewData->getIterator();
-        }
-
-        foreach ($dataIterator as $key => $altName) {
-            /* @var PersonAltName $altName */
-            $mapIndexToKey[$altName->getKey()] = $key;
-        }
-
         foreach ($forms as $key => $form) {
-            $isEmpty = empty($form->getData());
-
-            if (\array_key_exists($key, $mapIndexToKey)) {
-                if ($isEmpty) {
-                    $viewData->remove($mapIndexToKey[$key]);
-                } else {
-                    $viewData->get($mapIndexToKey[$key])->setLabel($form->getData());
-                }
-            } else {
-                if (!$isEmpty) {
-                    $altName = (new PersonAltName())
-                        ->setKey($key)
-                        ->setLabel($form->getData());
-
-                    if (\is_array($viewData)) {
-                        $viewData[] = $altName;
-                    } else {
-                        $viewData->add($altName);
-                    }
-                }
-            }
+            $personAltName = array_find($viewData, fn (PersonAltName $altName) => $altName->getKey() === $key);
+            $personAltName->setLabel($form->getData());
         }
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Form/DataMapper/PersonIdentifiersDataMapper.php b/src/Bundle/ChillPersonBundle/Form/DataMapper/PersonIdentifiersDataMapper.php
index eea151865..bae359e34 100644
--- a/src/Bundle/ChillPersonBundle/Form/DataMapper/PersonIdentifiersDataMapper.php
+++ b/src/Bundle/ChillPersonBundle/Form/DataMapper/PersonIdentifiersDataMapper.php
@@ -14,60 +14,51 @@ namespace Chill\PersonBundle\Form\DataMapper;
 use Chill\PersonBundle\Entity\Identifier\PersonIdentifier;
 use Chill\PersonBundle\PersonIdentifier\Exception\UnexpectedTypeException;
 use Chill\PersonBundle\PersonIdentifier\PersonIdentifierManagerInterface;
-use Chill\PersonBundle\Repository\Identifier\PersonIdentifierDefinitionRepository;
-use Doctrine\Common\Collections\Collection;
 use Symfony\Component\Form\DataMapperInterface;
-use Symfony\Component\Form\FormInterface;
 
 final readonly class PersonIdentifiersDataMapper implements DataMapperInterface
 {
     public function __construct(
         private PersonIdentifierManagerInterface $identifierManager,
-        private PersonIdentifierDefinitionRepository $identifierDefinitionRepository,
     ) {}
 
+    /**
+     * @pure
+     */
     public function mapDataToForms($viewData, \Traversable $forms): void
     {
-        if (!$viewData instanceof Collection) {
-            throw new UnexpectedTypeException($viewData, Collection::class);
+        if (!$viewData instanceof PersonIdentifier) {
+            throw new UnexpectedTypeException($viewData, PersonIdentifier::class);
         }
-        /** @var array<string, FormInterface> $formsByKey */
-        $formsByKey = iterator_to_array($forms);
 
-        foreach ($this->identifierManager->getWorkers() as $worker) {
-            if (!$worker->getDefinition()->isEditableByUsers()) {
-                continue;
-            }
-            $form = $formsByKey['identifier_'.$worker->getDefinition()->getId()];
-            $identifier = $viewData->findFirst(fn (int $key, PersonIdentifier $identifier) => $worker->getDefinition()->getId() === $identifier->getId());
-            if (null === $identifier) {
-                $identifier = new PersonIdentifier($worker->getDefinition());
-            }
-            $form->setData($identifier->getValue());
+        $worker = $this->identifierManager->buildWorkerByPersonIdentifierDefinition($viewData->getDefinition());
+        if (!$worker->getDefinition()->isEditableByUsers()) {
+            return;
+        }
+        foreach ($forms as $key => $form) {
+            $form->setData($viewData->getValue()[$key] ?? $worker->getDefaultValue()[$key] ?? '');
         }
     }
 
+    /**
+     * @pure
+     */
     public function mapFormsToData(\Traversable $forms, &$viewData): void
     {
-        if (!$viewData instanceof Collection) {
-            throw new UnexpectedTypeException($viewData, Collection::class);
+        if (!$viewData instanceof PersonIdentifier) {
+            throw new UnexpectedTypeException($viewData, PersonIdentifier::class);
+        }
+        $worker = $this->identifierManager->buildWorkerByPersonIdentifierDefinition($viewData->getDefinition());
+        if (!$worker->getDefinition()->isEditableByUsers()) {
+            return;
         }
 
+        $values = [];
         foreach ($forms as $name => $form) {
-            $identifierId = (int) substr((string) $name, 11);
-            $identifier = $viewData->findFirst(fn (int $key, PersonIdentifier $identifier) => $identifier->getId() === $identifierId);
-            $definition = $this->identifierDefinitionRepository->find($identifierId);
-            if (null === $identifier) {
-                $identifier = new PersonIdentifier($definition);
-                $viewData->add($identifier);
-            }
-            if (!$identifier->getDefinition()->isEditableByUsers()) {
-                continue;
-            }
-
-            $worker = $this->identifierManager->buildWorkerByPersonIdentifierDefinition($definition);
-            $identifier->setValue($form->getData());
-            $identifier->setCanonical($worker->canonicalizeValue($identifier->getValue()));
+            $values[$name] = $form->getData();
         }
+
+        $viewData->setValue($values);
+        $viewData->setCanonical($worker->canonicalizeValue($viewData->getValue()));
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Form/PersonIdentifiersType.php b/src/Bundle/ChillPersonBundle/Form/PersonIdentifiersType.php
index ea077f626..199b89bc8 100644
--- a/src/Bundle/ChillPersonBundle/Form/PersonIdentifiersType.php
+++ b/src/Bundle/ChillPersonBundle/Form/PersonIdentifiersType.php
@@ -12,10 +12,12 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Form;
 
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Entity\Identifier\IdentifierPresenceEnum;
 use Chill\PersonBundle\Form\DataMapper\PersonIdentifiersDataMapper;
 use Chill\PersonBundle\PersonIdentifier\PersonIdentifierManagerInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
 
 final class PersonIdentifiersType extends AbstractType
 {
@@ -27,22 +29,34 @@ final class PersonIdentifiersType extends AbstractType
 
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
-        foreach ($this->identifierManager->getWorkers() as $worker) {
+        foreach ($this->identifierManager->getWorkers() as $k => $worker) {
             if (!$worker->getDefinition()->isEditableByUsers()) {
                 continue;
             }
 
+            // skip some on creation
+            if ('on_create' === $options['step']
+                && IdentifierPresenceEnum::ON_EDIT === $worker->getDefinition()->getPresence()) {
+                continue;
+            }
+
             $subBuilder = $builder->create(
                 'identifier_'.$worker->getDefinition()->getId(),
                 options: [
                     'compound' => true,
                     'label' => $this->translatableStringHelper->localize($worker->getDefinition()->getLabel()),
+                    'error_bubbling' => false,
                 ]
             );
+            $subBuilder->setDataMapper($this->identifiersDataMapper);
             $worker->buildForm($subBuilder);
             $builder->add($subBuilder);
         }
+    }
 
-        $builder->setDataMapper($this->identifiersDataMapper);
+    public function configureOptions(OptionsResolver $resolver): void
+    {
+        $resolver->setDefault('step', 'on_edit')
+            ->setAllowedValues('step', ['on_edit', 'on_create']);
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Form/PersonType.php b/src/Bundle/ChillPersonBundle/Form/PersonType.php
index 09ab04b01..60b75f325 100644
--- a/src/Bundle/ChillPersonBundle/Form/PersonType.php
+++ b/src/Bundle/ChillPersonBundle/Form/PersonType.php
@@ -21,8 +21,8 @@ use Chill\MainBundle\Form\Type\PickCivilityType;
 use Chill\MainBundle\Form\Type\Select2CountryType;
 use Chill\MainBundle\Form\Type\Select2LanguageType;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Actions\PersonEdit\PersonEditDTO;
 use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
-use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\PersonPhone;
 use Chill\PersonBundle\Form\Type\PersonAltNameType;
 use Chill\PersonBundle\Form\Type\PersonPhoneType;
@@ -242,7 +242,7 @@ class PersonType extends AbstractType
     public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
-            'data_class' => Person::class,
+            'data_class' => PersonEditDTO::class,
         ]);
 
         $resolver->setRequired([
diff --git a/src/Bundle/ChillPersonBundle/Form/Type/PersonAltNameType.php b/src/Bundle/ChillPersonBundle/Form/Type/PersonAltNameType.php
index 6d983be37..5ee8830e0 100644
--- a/src/Bundle/ChillPersonBundle/Form/Type/PersonAltNameType.php
+++ b/src/Bundle/ChillPersonBundle/Form/Type/PersonAltNameType.php
@@ -32,6 +32,7 @@ class PersonAltNameType extends AbstractType
                 [
                     'label' => $label,
                     'required' => false,
+                    'empty_data' => '',
                 ]
             );
         }
diff --git a/src/Bundle/ChillPersonBundle/PersonIdentifier/Identifier/StringIdentifier.php b/src/Bundle/ChillPersonBundle/PersonIdentifier/Identifier/StringIdentifier.php
index 0801d4947..68620d869 100644
--- a/src/Bundle/ChillPersonBundle/PersonIdentifier/Identifier/StringIdentifier.php
+++ b/src/Bundle/ChillPersonBundle/PersonIdentifier/Identifier/StringIdentifier.php
@@ -13,20 +13,26 @@ namespace Chill\PersonBundle\PersonIdentifier\Identifier;
 
 use Chill\PersonBundle\Entity\Identifier\PersonIdentifier;
 use Chill\PersonBundle\Entity\Identifier\PersonIdentifierDefinition;
+use Chill\PersonBundle\PersonIdentifier\IdentifierViolationDTO;
 use Chill\PersonBundle\PersonIdentifier\PersonIdentifierEngineInterface;
 use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 
 final readonly class StringIdentifier implements PersonIdentifierEngineInterface
 {
+    public const NAME = 'chill-person-bundle.string-identifier';
+
+    private const ONLY_NUMBERS = 'only_numbers';
+    private const FIXED_LENGTH = 'fixed_length';
+
     public static function getName(): string
     {
-        return 'chill-person-bundle.string-identifier';
+        return self::NAME;
     }
 
     public function canonicalizeValue(array $value, PersonIdentifierDefinition $definition): ?string
     {
-        return $value['content'] ?? '';
+        return trim($value['content'] ?? '');
     }
 
     public function buildForm(FormBuilderInterface $builder, PersonIdentifierDefinition $personIdentifierDefinition): void
@@ -36,6 +42,37 @@ final readonly class StringIdentifier implements PersonIdentifierEngineInterface
 
     public function renderAsString(?PersonIdentifier $identifier, PersonIdentifierDefinition $definition): string
     {
-        return $identifier?->getValue()['content'] ?? '';
+        return trim($identifier?->getValue()['content'] ?? '');
+    }
+
+    public function isEmpty(PersonIdentifier $identifier): bool
+    {
+        return '' === trim($identifier->getValue()['content'] ?? '');
+    }
+
+    public function validate(PersonIdentifier $identifier, PersonIdentifierDefinition $definition): array
+    {
+        $config = $definition->getData();
+        $content = (string) ($identifier->getValue()['content'] ?? '');
+        $violations = [];
+
+        if (($config[self::ONLY_NUMBERS] ?? false) && !preg_match('/^[0-9]+$/', $content)) {
+            $violations[] = new IdentifierViolationDTO('person_identifier.only_number', '2a3352c0-a2b9-11f0-a767-b7a3f80e52f1');
+        }
+
+        if (null !== ($config[self::FIXED_LENGTH] ?? null) && strlen($content) !== $config[self::FIXED_LENGTH]) {
+            $violations[] = new IdentifierViolationDTO(
+                'person_identifier.fixed_length',
+                '2b02a8fe-a2b9-11f0-bfe5-033300972783',
+                ['limit' => (string) $config[self::FIXED_LENGTH]]
+            );
+        }
+
+        return $violations;
+    }
+
+    public function getDefaultValue(PersonIdentifierDefinition $definition): array
+    {
+        return ['content' => ''];
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/PersonIdentifier/IdentifierViolationDTO.php b/src/Bundle/ChillPersonBundle/PersonIdentifier/IdentifierViolationDTO.php
new file mode 100644
index 000000000..3a74a4b34
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/PersonIdentifier/IdentifierViolationDTO.php
@@ -0,0 +1,31 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\PersonIdentifier;
+
+/**
+ * Data Transfer Object to create a ConstraintViolationListInterface.
+ */
+class IdentifierViolationDTO
+{
+    public function __construct(
+        public string $message,
+        /**
+         * @var string an UUID
+         */
+        public string $code,
+        /**
+         * @var array<string, string>
+         */
+        public array $parameters = [],
+        public string $messageDomain = 'validators',
+    ) {}
+}
diff --git a/src/Bundle/ChillPersonBundle/PersonIdentifier/Normalizer/PersonIdentifierWorkerNormalizer.php b/src/Bundle/ChillPersonBundle/PersonIdentifier/Normalizer/PersonIdentifierWorkerNormalizer.php
new file mode 100644
index 000000000..432dea50c
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/PersonIdentifier/Normalizer/PersonIdentifierWorkerNormalizer.php
@@ -0,0 +1,39 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\PersonIdentifier\Normalizer;
+
+use Chill\PersonBundle\PersonIdentifier\PersonIdentifierWorker;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
+
+final readonly class PersonIdentifierWorkerNormalizer implements NormalizerInterface
+{
+    public function normalize($object, ?string $format = null, array $context = []): array
+    {
+        if (!$object instanceof PersonIdentifierWorker) {
+            throw new \Symfony\Component\Serializer\Exception\UnexpectedValueException();
+        }
+
+        return [
+            'type' => 'person_identifier_worker',
+            'definition_id' => $object->getDefinition()->getId(),
+            'engine' => $object->getDefinition()->getEngine(),
+            'label' => $object->getDefinition()->getLabel(),
+            'isActive' => $object->getDefinition()->isActive(),
+            'presence' => $object->getDefinition()->getPresence()->value,
+        ];
+    }
+
+    public function supportsNormalization($data, ?string $format = null): bool
+    {
+        return $data instanceof PersonIdentifierWorker;
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/PersonIdentifier/PersonIdentifierEngineInterface.php b/src/Bundle/ChillPersonBundle/PersonIdentifier/PersonIdentifierEngineInterface.php
index 6c75f263e..a29172958 100644
--- a/src/Bundle/ChillPersonBundle/PersonIdentifier/PersonIdentifierEngineInterface.php
+++ b/src/Bundle/ChillPersonBundle/PersonIdentifier/PersonIdentifierEngineInterface.php
@@ -19,9 +19,29 @@ interface PersonIdentifierEngineInterface
 {
     public static function getName(): string;
 
+    /**
+     * @phpstan-pure
+     */
     public function canonicalizeValue(array $value, PersonIdentifierDefinition $definition): ?string;
 
     public function buildForm(FormBuilderInterface $builder, PersonIdentifierDefinition $personIdentifierDefinition): void;
 
     public function renderAsString(?PersonIdentifier $identifier, PersonIdentifierDefinition $definition): string;
+
+    /**
+     * Return true if the identifier must be considered as empty.
+     *
+     * This is in use when the identifier is validated and must be required. If the identifier is empty and is required
+     * by the definition, the validation will fails.
+     */
+    public function isEmpty(PersonIdentifier $identifier): bool;
+
+    /**
+     * Return a list of @see{IdentifierViolationDTO} to generatie violation errors.
+     *
+     * @return list<IdentifierViolationDTO>
+     */
+    public function validate(PersonIdentifier $identifier, PersonIdentifierDefinition $definition): array;
+
+    public function getDefaultValue(PersonIdentifierDefinition $definition): array;
 }
diff --git a/src/Bundle/ChillPersonBundle/PersonIdentifier/PersonIdentifierManager.php b/src/Bundle/ChillPersonBundle/PersonIdentifier/PersonIdentifierManager.php
index 3cbc2c621..83e883fe4 100644
--- a/src/Bundle/ChillPersonBundle/PersonIdentifier/PersonIdentifierManager.php
+++ b/src/Bundle/ChillPersonBundle/PersonIdentifier/PersonIdentifierManager.php
@@ -13,6 +13,7 @@ namespace Chill\PersonBundle\PersonIdentifier;
 
 use Chill\PersonBundle\Entity\Identifier\PersonIdentifierDefinition;
 use Chill\PersonBundle\PersonIdentifier\Exception\EngineNotFoundException;
+use Chill\PersonBundle\PersonIdentifier\Exception\PersonIdentifierDefinitionNotFoundException;
 use Chill\PersonBundle\Repository\Identifier\PersonIdentifierDefinitionRepository;
 
 final readonly class PersonIdentifierManager implements PersonIdentifierManagerInterface
@@ -44,8 +45,16 @@ final readonly class PersonIdentifierManager implements PersonIdentifierManagerI
         return $workers;
     }
 
-    public function buildWorkerByPersonIdentifierDefinition(PersonIdentifierDefinition $personIdentifierDefinition): PersonIdentifierWorker
+    public function buildWorkerByPersonIdentifierDefinition(int|PersonIdentifierDefinition $personIdentifierDefinition): PersonIdentifierWorker
     {
+        if (is_int($personIdentifierDefinition)) {
+            $id = $personIdentifierDefinition;
+            $personIdentifierDefinition = $this->personIdentifierDefinitionRepository->find($id);
+            if (null === $personIdentifierDefinition) {
+                throw new PersonIdentifierDefinitionNotFoundException($id);
+            }
+        }
+
         return new PersonIdentifierWorker($this->getEngine($personIdentifierDefinition->getEngine()), $personIdentifierDefinition);
     }
 
diff --git a/src/Bundle/ChillPersonBundle/PersonIdentifier/PersonIdentifierManagerInterface.php b/src/Bundle/ChillPersonBundle/PersonIdentifier/PersonIdentifierManagerInterface.php
index 9bec7d1fd..b28fba7b6 100644
--- a/src/Bundle/ChillPersonBundle/PersonIdentifier/PersonIdentifierManagerInterface.php
+++ b/src/Bundle/ChillPersonBundle/PersonIdentifier/PersonIdentifierManagerInterface.php
@@ -18,9 +18,16 @@ interface PersonIdentifierManagerInterface
     /**
      * Build PersonIdentifierWorker's for all active definition.
      *
+     * Only active definition are returned.
+     *
      * @return list<PersonIdentifierWorker>
      */
     public function getWorkers(): array;
 
-    public function buildWorkerByPersonIdentifierDefinition(PersonIdentifierDefinition $personIdentifierDefinition): PersonIdentifierWorker;
+    /**
+     * @param int|PersonIdentifierDefinition $personIdentifierDefinition an instance of PersonIdentifierDefinition, or his id
+     *
+     * @throw PersonIdentifierNotFoundException
+     */
+    public function buildWorkerByPersonIdentifierDefinition(int|PersonIdentifierDefinition $personIdentifierDefinition): PersonIdentifierWorker;
 }
diff --git a/src/Bundle/ChillPersonBundle/PersonIdentifier/PersonIdentifierWorker.php b/src/Bundle/ChillPersonBundle/PersonIdentifier/PersonIdentifierWorker.php
index 94702b8eb..529a98e84 100644
--- a/src/Bundle/ChillPersonBundle/PersonIdentifier/PersonIdentifierWorker.php
+++ b/src/Bundle/ChillPersonBundle/PersonIdentifier/PersonIdentifierWorker.php
@@ -15,7 +15,7 @@ use Chill\PersonBundle\Entity\Identifier\PersonIdentifier;
 use Chill\PersonBundle\Entity\Identifier\PersonIdentifierDefinition;
 use Symfony\Component\Form\FormBuilderInterface;
 
-final readonly class PersonIdentifierWorker
+readonly class PersonIdentifierWorker
 {
     public function __construct(
         private PersonIdentifierEngineInterface $identifierEngine,
@@ -46,4 +46,25 @@ final readonly class PersonIdentifierWorker
     {
         return $this->identifierEngine->renderAsString($identifier, $this->definition);
     }
+
+    /**
+     * Return true if the identifier must be considered as empty.
+     */
+    public function isEmpty(PersonIdentifier $identifier): bool
+    {
+        return $this->identifierEngine->isEmpty($identifier);
+    }
+
+    /**
+     * @return list<IdentifierViolationDTO>
+     */
+    public function validate(PersonIdentifier $identifier, PersonIdentifierDefinition $definition): array
+    {
+        return $this->identifierEngine->validate($identifier, $definition);
+    }
+
+    public function getDefaultValue(): array
+    {
+        return $this->identifierEngine->getDefaultValue($this->definition);
+    }
 }
diff --git a/src/Bundle/ChillPersonBundle/PersonIdentifier/Validator/RequiredIdentifierConstraint.php b/src/Bundle/ChillPersonBundle/PersonIdentifier/Validator/RequiredIdentifierConstraint.php
new file mode 100644
index 000000000..68a75c7cf
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/PersonIdentifier/Validator/RequiredIdentifierConstraint.php
@@ -0,0 +1,28 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\PersonIdentifier\Validator;
+
+use Symfony\Component\Validator\Constraint;
+
+/**
+ * Test that the required constraints are present.
+ */
+#[\Attribute]
+class RequiredIdentifierConstraint extends Constraint
+{
+    public string $message = 'person_identifier.This identifier must be set';
+
+    public function getTargets(): string
+    {
+        return self::PROPERTY_CONSTRAINT;
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/PersonIdentifier/Validator/RequiredIdentifierConstraintValidator.php b/src/Bundle/ChillPersonBundle/PersonIdentifier/Validator/RequiredIdentifierConstraintValidator.php
new file mode 100644
index 000000000..240fe3a33
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/PersonIdentifier/Validator/RequiredIdentifierConstraintValidator.php
@@ -0,0 +1,53 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\PersonIdentifier\Validator;
+
+use Chill\PersonBundle\Entity\Identifier\IdentifierPresenceEnum;
+use Chill\PersonBundle\Entity\Identifier\PersonIdentifier;
+use Chill\PersonBundle\PersonIdentifier\PersonIdentifierManagerInterface;
+use Doctrine\Common\Collections\Collection;
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\ConstraintValidator;
+use Symfony\Component\Validator\Exception\UnexpectedTypeException;
+use Symfony\Component\Validator\Exception\UnexpectedValueException;
+
+final class RequiredIdentifierConstraintValidator extends ConstraintValidator
+{
+    public function __construct(private readonly PersonIdentifierManagerInterface $identifierManager) {}
+
+    public function validate($value, Constraint $constraint)
+    {
+        if (!$constraint instanceof RequiredIdentifierConstraint) {
+            throw new UnexpectedTypeException($constraint, RequiredIdentifierConstraint::class);
+        }
+
+        if (!$value instanceof Collection) {
+            throw new UnexpectedValueException($value, Collection::class);
+        }
+
+        foreach ($this->identifierManager->getWorkers() as $worker) {
+            if (IdentifierPresenceEnum::REQUIRED !== $worker->getDefinition()->getPresence()) {
+                continue;
+            }
+
+            $identifier = $value->findFirst(fn (int $key, PersonIdentifier $identifier) => $identifier->getDefinition() === $worker->getDefinition());
+
+            if (null === $identifier || $worker->isEmpty($identifier)) {
+                $this->context->buildViolation($constraint->message)
+                    ->setParameter('{{ value }}', $worker->renderAsString($identifier))
+                    ->setParameter('definition_id', (string) $worker->getDefinition()->getId())
+                    ->setCode('c08b7b32-947f-11f0-8608-9b8560e9bf05')
+                    ->addViolation();
+            }
+        }
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/PersonIdentifier/Validator/UniqueIdentifierConstraint.php b/src/Bundle/ChillPersonBundle/PersonIdentifier/Validator/UniqueIdentifierConstraint.php
new file mode 100644
index 000000000..b15c4a8b2
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/PersonIdentifier/Validator/UniqueIdentifierConstraint.php
@@ -0,0 +1,25 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\PersonIdentifier\Validator;
+
+use Symfony\Component\Validator\Constraint;
+
+#[\Attribute]
+class UniqueIdentifierConstraint extends Constraint
+{
+    public string $message = 'person_identifier.Identifier must be unique. The same identifier already exists for {{ persons }}';
+
+    public function getTargets(): string
+    {
+        return self::CLASS_CONSTRAINT;
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/PersonIdentifier/Validator/UniqueIdentifierConstraintValidator.php b/src/Bundle/ChillPersonBundle/PersonIdentifier/Validator/UniqueIdentifierConstraintValidator.php
new file mode 100644
index 000000000..929fba2e4
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/PersonIdentifier/Validator/UniqueIdentifierConstraintValidator.php
@@ -0,0 +1,53 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\PersonIdentifier\Validator;
+
+use Chill\PersonBundle\Entity\Identifier\PersonIdentifier;
+use Chill\PersonBundle\Repository\Identifier\PersonIdentifierRepository;
+use Chill\PersonBundle\Templating\Entity\PersonRenderInterface;
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\ConstraintValidator;
+use Symfony\Component\Validator\Exception\UnexpectedTypeException;
+use Symfony\Component\Validator\Exception\UnexpectedValueException;
+
+class UniqueIdentifierConstraintValidator extends ConstraintValidator
+{
+    public function __construct(
+        private readonly PersonIdentifierRepository $personIdentifierRepository,
+        private readonly PersonRenderInterface $personRender,
+    ) {}
+
+    public function validate($value, Constraint $constraint): void
+    {
+        if (!$constraint instanceof UniqueIdentifierConstraint) {
+            throw new UnexpectedTypeException($constraint, UniqueIdentifierConstraint::class);
+        }
+
+        if (!$value instanceof PersonIdentifier) {
+            throw new UnexpectedValueException($value, PersonIdentifier::class);
+        }
+
+        $identifiers = $this->personIdentifierRepository->findByDefinitionAndCanonical($value->getDefinition(), $value->getValue());
+
+        if (count($identifiers) > 0) {
+            if (count($identifiers) > 1 || $identifiers[0]->getPerson() !== $value->getPerson()) {
+                $persons = array_map(fn (PersonIdentifier $idf): string => $this->personRender->renderString($idf->getPerson(), []), $identifiers);
+
+                $this->context->buildViolation($constraint->message)
+                    ->setParameter('{{ persons }}', implode(', ', $persons))
+                    ->setParameter('definition_id', (string) $value->getDefinition()->getId())
+                    ->addViolation();
+
+            }
+        }
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/PersonIdentifier/Validator/ValidIdentifierConstraint.php b/src/Bundle/ChillPersonBundle/PersonIdentifier/Validator/ValidIdentifierConstraint.php
new file mode 100644
index 000000000..24b3551b1
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/PersonIdentifier/Validator/ValidIdentifierConstraint.php
@@ -0,0 +1,23 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\PersonIdentifier\Validator;
+
+use Symfony\Component\Validator\Constraint;
+
+#[\Attribute]
+class ValidIdentifierConstraint extends Constraint
+{
+    public function getTargets(): string
+    {
+        return self::CLASS_CONSTRAINT;
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/PersonIdentifier/Validator/ValidIdentifierConstraintValidator.php b/src/Bundle/ChillPersonBundle/PersonIdentifier/Validator/ValidIdentifierConstraintValidator.php
new file mode 100644
index 000000000..296f5e3ee
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/PersonIdentifier/Validator/ValidIdentifierConstraintValidator.php
@@ -0,0 +1,47 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\PersonIdentifier\Validator;
+
+use Chill\PersonBundle\Entity\Identifier\PersonIdentifier;
+use Chill\PersonBundle\PersonIdentifier\PersonIdentifierManagerInterface;
+use Symfony\Component\Validator\Constraint;
+use Symfony\Component\Validator\ConstraintValidator;
+use Symfony\Component\Validator\Exception\UnexpectedTypeException;
+use Symfony\Component\Validator\Exception\UnexpectedValueException;
+
+final class ValidIdentifierConstraintValidator extends ConstraintValidator
+{
+    public function __construct(private readonly PersonIdentifierManagerInterface $personIdentifierManager) {}
+
+    public function validate($value, Constraint $constraint): void
+    {
+        if (!$constraint instanceof ValidIdentifierConstraint) {
+            throw new UnexpectedTypeException($constraint, ValidIdentifierConstraint::class);
+        }
+
+        if (!$value instanceof PersonIdentifier) {
+            throw new UnexpectedValueException($value, PersonIdentifier::class);
+        }
+
+        $worker = $this->personIdentifierManager->buildWorkerByPersonIdentifierDefinition($value->getDefinition());
+
+        $violations = $worker->validate($value, $value->getDefinition());
+
+        foreach ($violations as $violation) {
+            $this->context->buildViolation($violation->message)
+                ->setParameters($violation->parameters)
+                ->setParameter('{{ code }}', $violation->code)
+                ->setParameter('definition_id', (string) $value->getDefinition()->getId())
+                ->addViolation();
+        }
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Repository/Identifier/PersonIdentifierRepository.php b/src/Bundle/ChillPersonBundle/Repository/Identifier/PersonIdentifierRepository.php
new file mode 100644
index 000000000..e3af66e31
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Repository/Identifier/PersonIdentifierRepository.php
@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\Repository\Identifier;
+
+use Chill\PersonBundle\Entity\Identifier\PersonIdentifier;
+use Chill\PersonBundle\Entity\Identifier\PersonIdentifierDefinition;
+use Chill\PersonBundle\PersonIdentifier\PersonIdentifierManagerInterface;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
+
+class PersonIdentifierRepository extends ServiceEntityRepository
+{
+    public function __construct(ManagerRegistry $registry, private readonly PersonIdentifierManagerInterface $personIdentifierManager)
+    {
+        parent::__construct($registry, PersonIdentifier::class);
+    }
+
+    public function findByDefinitionAndCanonical(PersonIdentifierDefinition $definition, array|string $valueOrCanonical): array
+    {
+        return $this->createQueryBuilder('p')
+            ->where('p.definition = :definition')
+            ->andWhere('p.canonical = :canonical')
+            ->setParameter('definition', $definition)
+            ->setParameter(
+                'canonical',
+                is_string($valueOrCanonical) ?
+                    $valueOrCanonical :
+                    $this->personIdentifierManager->buildWorkerByPersonIdentifierDefinition($definition)->canonicalizeValue($valueOrCanonical),
+            )
+            ->getQuery()
+            ->getResult();
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
index 0d972914d..0aab3faf3 100644
--- a/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
+++ b/src/Bundle/ChillPersonBundle/Repository/PersonACLAwareRepository.php
@@ -17,6 +17,8 @@ use Chill\MainBundle\Search\ParsingException;
 use Chill\MainBundle\Search\SearchApiQuery;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
 use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\PersonIdentifier\PersonIdentifierManagerInterface;
+use Chill\PersonBundle\PersonIdentifier\PersonIdentifierWorker;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\NonUniqueResultException;
@@ -27,7 +29,13 @@ use Symfony\Component\Security\Core\Security;
 
 final readonly class PersonACLAwareRepository implements PersonACLAwareRepositoryInterface
 {
-    public function __construct(private Security $security, private EntityManagerInterface $em, private CountryRepository $countryRepository, private AuthorizationHelperInterface $authorizationHelper) {}
+    public function __construct(
+        private Security $security,
+        private EntityManagerInterface $em,
+        private CountryRepository $countryRepository,
+        private AuthorizationHelperInterface $authorizationHelper,
+        private PersonIdentifierManagerInterface $personIdentifierManager,
+    ) {}
 
     public function buildAuthorizedQuery(
         ?string $default = null,
@@ -107,6 +115,15 @@ final readonly class PersonACLAwareRepository implements PersonACLAwareRepositor
         $query
             ->setFromClause('chill_person_person AS person');
 
+        $idDefinitionWorkers = array_map(
+            fn (PersonIdentifierWorker $worker) => $worker->getDefinition()->getId(),
+            array_filter(
+                $this->personIdentifierManager->getWorkers(),
+                fn (PersonIdentifierWorker $worker) => $worker->getDefinition()->isSearchable()
+            )
+        );
+        $idDefinitionWorkerQuestionMarks = implode(', ', array_fill(0, count($idDefinitionWorkers), '?'));
+
         $pertinence = [];
         $pertinenceArgs = [];
         $andWhereSearchClause = [];
@@ -124,20 +141,53 @@ final readonly class PersonACLAwareRepository implements PersonACLAwareRepositor
                     '(starts_with(LOWER(UNACCENT(lastname)), UNACCENT(LOWER(?))))::int';
                 \array_push($pertinenceArgs, $str, $str, $str, $str);
 
-                $andWhereSearchClause[] =
-                    '(LOWER(UNACCENT(?)) <<% person.fullnamecanonical OR '.
-                    "person.fullnamecanonical LIKE '%' || LOWER(UNACCENT(?)) || '%' )";
-                \array_push($andWhereSearchClauseArgs, $str, $str);
+                $q = [
+                    'LOWER(UNACCENT(?)) <<% person.fullnamecanonical',
+                    "person.fullnamecanonical LIKE '%' || LOWER(UNACCENT(?)) || '%' ",
+                ];
+                $qArguments = [$str, $str];
+
+                if (count($idDefinitionWorkers) > 0) {
+                    $q[] = $mq = "EXISTS (
+                        SELECT 1 FROM chill_person_identifier AS identifier
+                        WHERE identifier.canonical LIKE LOWER(UNACCENT(?)) || '%' AND identifier.definition_id IN ({$idDefinitionWorkerQuestionMarks})
+                        AND person.id = identifier.person_id
+                    )";
+                    $pertinence[] = "({$mq})::int * 1000000";
+                    $qArguments = [...$qArguments, $str, ...$idDefinitionWorkers];
+                    $pertinenceArgs = [...$pertinenceArgs, $str, ...$idDefinitionWorkers];
+                }
+
+                $andWhereSearchClause[] = '('.implode(' OR ', $q).')';
+                $andWhereSearchClauseArgs = [...$andWhereSearchClauseArgs, ...$qArguments];
             }
 
-            $query->andWhereClause(
-                \implode(' AND ', $andWhereSearchClause),
-                $andWhereSearchClauseArgs
-            );
         } else {
             $pertinence = ['1'];
             $pertinenceArgs = [];
         }
+
+        if (null !== $phonenumber) {
+            $personPhoneClause = "person.phonenumber LIKE '%' || ? || '%' OR person.mobilenumber LIKE '%' || ? || '%' OR EXISTS (SELECT 1 FROM chill_person_phone where person_id = person.id AND phonenumber LIKE '%' || ? || '%')";
+            if (count($andWhereSearchClauseArgs) > 0) {
+                $initialSearchClause = '(('.\implode(' AND ', $andWhereSearchClause).') OR '.$personPhoneClause.')';
+            }
+            $andWhereSearchClauseArgs = [...$andWhereSearchClauseArgs, $phonenumber, $phonenumber, $phonenumber];
+
+            // drastically increase pertinence
+            $pertinence[] = "(person.phonenumber LIKE '%' || ? || '%' OR person.mobilenumber LIKE '%' || ? || '%' OR EXISTS (SELECT 1 FROM chill_person_phone where person_id = person.id AND phonenumber LIKE '%' || ? || '%'))::int * 1000000";
+            $pertinenceArgs = [...$pertinenceArgs, $phonenumber, $phonenumber, $phonenumber];
+        } else {
+            $initialSearchClause = \implode(' AND ', $andWhereSearchClause);
+        }
+
+        if (isset($initialSearchClause)) {
+            $query->andWhereClause(
+                $initialSearchClause,
+                $andWhereSearchClauseArgs
+            );
+        }
+
         $query
             ->setSelectPertinence(\implode(' + ', $pertinence), $pertinenceArgs);
 
@@ -176,14 +226,6 @@ final readonly class PersonACLAwareRepository implements PersonACLAwareRepositor
             );
         }
 
-        if (null !== $phonenumber) {
-            $query->andWhereClause(
-                "person.phonenumber LIKE '%' || ? || '%' OR person.mobilenumber LIKE '%' || ? || '%' OR pp.phonenumber LIKE '%' || ? || '%'",
-                [$phonenumber, $phonenumber, $phonenumber]
-            );
-            $query->setFromClause($query->getFromClause().' LEFT JOIN chill_person_phone pp ON pp.person_id = person.id');
-        }
-
         if (null !== $city) {
             $query->setFromClause($query->getFromClause().' '.
                 'JOIN view_chill_person_current_address vcpca ON vcpca.person_id = person.id '.
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/types.ts b/src/Bundle/ChillPersonBundle/Resources/public/types.ts
index 6dfd732e2..4523325e8 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/types.ts
+++ b/src/Bundle/ChillPersonBundle/Resources/public/types.ts
@@ -10,16 +10,40 @@ import {
   Scope,
   Job,
   PrivateCommentEmbeddable,
+  TranslatableString,
+  DateTimeWrite,
+  SetGender,
+  SetCenter,
+  SetCivility, Gender,
 } from "ChillMainAssets/types";
 import { StoredObject } from "ChillDocStoreAssets/types";
 import { Thirdparty } from "../../../ChillThirdPartyBundle/Resources/public/types";
 import { Calendar } from "../../../ChillCalendarBundle/Resources/public/types";
-import Person from "./vuejs/_components/OnTheFly/Person.vue";
 
+/**
+ * An alternative name, as configured locally
+ */
 export interface AltName {
-  label: string;
+  labels: TranslatableString;
   key: string;
 }
+
+export interface PersonAltNameWrite {
+  key: string;
+  value: string;
+}
+
+/**
+ * An altname for a person
+ */
+export interface PersonAltName {
+  label: string;
+  /**
+   * will match a key in @link{AltName}
+   */
+  key: string;
+}
+
 export interface Person {
   id: number;
   type: "person";
@@ -27,7 +51,7 @@ export interface Person {
   textAge: string;
   firstName: string;
   lastName: string;
-  altNames: AltName[];
+  altNames: PersonAltName[];
   suffixText: string;
   current_household_address: Address | null;
   birthdate: DateTime | null;
@@ -36,11 +60,63 @@ export interface Person {
   phonenumber: string;
   mobilenumber: string;
   email: string;
-  gender: "woman" | "man" | "other";
+  gender: Gender;
   centers: Center[];
   civility: Civility | null;
   current_household_id: number;
-  current_residential_addresses: Address[];
+  current_residential_addresses: ResidentialAddress[];
+  /**
+   * The person id as configured by the user
+   */
+  personId: string;
+  identifiers: PersonIdentifier[];
+}
+
+export interface PersonIdentifier {
+  id: number;
+  type: "person_identifier";
+  value: object;
+  definition: PersonIdentifierDefinition;
+}
+
+export interface PersonIdentifierDefinition {
+  id: number;
+  type: "person_identifier_definition";
+  engine: string;
+}
+
+export interface ResidentialAddress {
+  address: Address | null;
+  endDate: DateTime | null;
+  hostPerson: Person | null;
+  hostThirdParty: Thirdparty | null;
+  startDate: DateTime | null;
+}
+
+export interface PersonIdentifierWrite {
+  type: "person_identifier";
+  definition_id: number;
+  value: object;
+}
+
+/**
+ * Person representation to create or update a Person
+ */
+export interface PersonWrite {
+  type: "person";
+  firstName: string;
+  lastName: string;
+  altNames: PersonAltNameWrite[];
+  addressId: number | null;
+  birthdate: DateTimeWrite | null;
+  deathdate: DateTimeWrite | null;
+  phonenumber: string;
+  mobilenumber: string;
+  email: string;
+  gender: SetGender | null;
+  center: SetCenter | null;
+  civility: SetCivility | null;
+  identifiers: PersonIdentifierWrite[];
 }
 
 export interface AccompanyingPeriod {
@@ -342,22 +418,50 @@ export interface AccompanyingPeriodWorkEvaluationDocument {
   workflows: object[];
 }
 
+/**
+ * Entity types that a user can create through AddPersons component
+ */
+export type CreatableEntityType = "person" | "thirdparty";
+
+/**
+ * Entities that can be search and selected by a user
+ */
 export type EntityType =
+  | CreatableEntityType
   | "user_group"
   | "user"
-  | "person"
-  | "thirdparty"
   | "household";
 
-export type Entities = (UserGroup | User | Person | Thirdparty | Household) & {
-  address?: Address | null;
-  kind?: string;
-  text?: string;
-  profession?: string;
-};
+export type Entities = (UserGroup | User | Person | Thirdparty | Household);
+
+export function isEntityHousehold(e: Entities): e is Household {
+  return e.type === "household";
+}
 
 export type EntitiesOrMe = "me" | Entities;
 
+
+// Type guards to discriminate Suggestions by their result kind
+export function isSuggestionForUserGroup(s: Suggestion): s is Suggestion & { result: UserGroup } {
+  return (s as any)?.result?.type === "user_group";
+}
+
+export function isSuggestionForUser(s: Suggestion): s is Suggestion & { result: User } {
+  return (s as any)?.result?.type === "user";
+}
+
+export function isSuggestionForPerson(s: Suggestion): s is Suggestion & { result: Person } {
+  return (s as any)?.result?.type === "person";
+}
+
+export function isSuggestionForThirdParty(s: Suggestion): s is Suggestion & { result: Thirdparty } {
+  return (s as any)?.result?.type === "thirdparty";
+}
+
+export function isSuggestionForHousehold(s: Suggestion): s is Suggestion & { result: Household } {
+  return (s as any)?.result?.type === "household";
+}
+
 export type AddPersonResult = Entities & {
   parent?: Entities | null;
 };
@@ -365,9 +469,8 @@ export type AddPersonResult = Entities & {
 export interface Suggestion {
   key: string;
   relevance: number;
-  result: AddPersonResult;
+  result: Entities;
 }
-
 export interface SearchPagination {
   first: number;
   items_per_page: number;
@@ -379,12 +482,13 @@ export interface SearchPagination {
 export interface Search {
   count: number;
   pagination: SearchPagination;
-  results: Suggestion[];
+  results: {relevance: number, result: Entities}[];
 }
 
 export interface SearchOptions {
   uniq: boolean;
-  type: string[];
+  /** @deprecated */
+  type: EntityType[];
   priority: number | null;
   button: {
     size: string;
@@ -394,6 +498,17 @@ export interface SearchOptions {
   };
 }
 
+type PersonIdentifierPresence = 'NOT_EDITABLE' | 'ON_EDIT' | 'ON_CREATION' | 'REQUIRED';
+
+export interface PersonIdentifierWorker {
+  type: "person_identifier_worker";
+  definition_id: number;
+  engine: string;
+  label: TranslatableString;
+  isActive: boolean;
+  presence: PersonIdentifierPresence;
+}
+
 export class MakeFetchException extends Error {
   sta: number;
   txt: string;
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
index b4e0e70b8..e023c227b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
@@ -84,8 +84,8 @@
       <ul class="record_actions">
         <li class="add-persons">
           <add-persons
-            button-title="persons_associated.add_persons"
-            modal-title="add_persons.title"
+            :button-title="trans(ACCOMPANYING_COURSE_PERSONS_ASSOCIATED_ADD_PERSON)"
+            :modal-title="trans(ACCOMPANYING_COURSE_PERSONS_ASSOCIATED_ADD_PERSON)"
             :key="addPersons.key"
             :options="addPersons.options"
             @add-new-persons="addNewPersons"
@@ -108,6 +108,7 @@ import { mapGetters, mapState } from "vuex";
 import ParticipationItem from "./PersonsAssociated/ParticipationItem.vue";
 import AddPersons from "ChillPersonAssets/vuejs/_components/AddPersons.vue";
 import PersonText from "ChillPersonAssets/vuejs/_components/Entity/PersonText.vue";
+import {ACCOMPANYING_COURSE_PERSONS_ASSOCIATED_ADD_PERSON, trans} from "translator";
 
 export default {
   name: "PersonsAssociated",
@@ -118,6 +119,7 @@ export default {
   },
   data() {
     return {
+      ACCOMPANYING_COURSE_PERSONS_ASSOCIATED_ADD_PERSON,
       addPersons: {
         key: "persons_associated",
         options: {
@@ -176,6 +178,7 @@ export default {
     },
   },
   methods: {
+    trans,
     removeParticipation(item) {
       this.$store
         .dispatch("removeParticipation", item)
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
index 5858cdb00..254d527e9 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
@@ -221,8 +221,8 @@
         <li class="add-persons">
           <add-persons
             v-if="accompanyingCourse.requestor === null"
-            button-title="requestor.add_requestor"
-            modal-title="requestor.add_requestor"
+            :button-title="trans(ACCOMPANYING_COURSE_REQUESTOR_ADD)"
+            :modal-title="trans(ACCOMPANYING_COURSE_REQUESTOR_ADD)"
             :key="addPersons.key"
             :options="addPersons.options"
             @add-new-persons="addNewPersons"
@@ -245,6 +245,7 @@ import Confidential from "ChillMainAssets/vuejs/_components/Confidential.vue";
 import { mapState } from "vuex";
 import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
 import PersonText from "ChillPersonAssets/vuejs/_components/Entity/PersonText.vue";
+import {ACCOMPANYING_COURSE_REQUESTOR_ADD, trans} from "translator";
 
 export default {
   name: "Requestor",
@@ -259,6 +260,7 @@ export default {
   props: ["isAnonymous"],
   data() {
     return {
+      ACCOMPANYING_COURSE_REQUESTOR_ADD,
       addPersons: {
         key: "requestor",
         options: {
@@ -310,6 +312,7 @@ export default {
     },
   },
   methods: {
+    trans,
     removeRequestor() {
       //console.log('@@ CLICK remove requestor: item');
       this.$store.dispatch("removeRequestor").catch(({ name, violations }) => {
@@ -322,7 +325,7 @@ export default {
         }
       });
     },
-    addNewPersons({ selected, modal }) {
+    addNewPersons({ selected }) {
       //console.log('@@@ CLICK button addNewPersons', selected);
       this.$store
         .dispatch("addRequestor", selected.shift())
@@ -337,7 +340,6 @@ export default {
         });
 
       this.$refs.addPersons.resetSearch(); // to cast child method
-      modal.showModal = false;
     },
     saveFormOnTheFly(payload) {
       console.log(
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
index fa600bfdd..d09bc4fd7 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
@@ -39,8 +39,8 @@
       <ul class="record_actions">
         <li class="add-persons">
           <add-persons
-            button-title="resources.add_resources"
-            modal-title="resources.add_resources"
+            :button-title="trans(ACCOMPANYING_COURSE_RESOURCES_ADD_RESOURCES)"
+            :modal-title="trans(ACCOMPANYING_COURSE_RESOURCES_ADD_RESOURCES)"
             :key="addPersons.key"
             :options="addPersons.options"
             @add-new-persons="addNewPersons"
@@ -59,6 +59,7 @@ import { mapState } from "vuex";
 import AddPersons from "ChillPersonAssets/vuejs/_components/AddPersons.vue";
 import ResourceItem from "./Resources/ResourceItem.vue";
 import PersonText from "ChillPersonAssets/vuejs/_components/Entity/PersonText.vue";
+import {ACCOMPANYING_COURSE_RESOURCES_ADD_RESOURCES, trans} from "translator";
 
 export default {
   name: "Resources",
@@ -69,6 +70,7 @@ export default {
   },
   data() {
     return {
+      ACCOMPANYING_COURSE_RESOURCES_ADD_RESOURCES,
       addPersons: {
         key: "resources",
         options: {
@@ -116,6 +118,7 @@ export default {
         }),
   }),
   methods: {
+    trans,
     removeResource(item) {
       //console.log('@@ CLICK remove resource: item', item);
       this.$store
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/OnTheFly.js b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/OnTheFly.js
deleted file mode 100644
index 51dedec98..000000000
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/OnTheFly.js
+++ /dev/null
@@ -1,88 +0,0 @@
-import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
-
-/*
- * GET a person by id
- */
-const getPerson = (id) => {
-  const url = `/api/1.0/person/person/${id}.json`;
-  return fetch(url).then((response) => {
-    if (response.ok) {
-      return response.json();
-    }
-    throw Error("Error with request resource response");
-  });
-};
-
-const getPersonAltNames = () =>
-  fetch("/api/1.0/person/config/alt_names.json").then((response) => {
-    if (response.ok) {
-      return response.json();
-    }
-    throw Error("Error with request resource response");
-  });
-
-const getCivilities = () =>
-  fetch("/api/1.0/main/civility.json").then((response) => {
-    if (response.ok) {
-      return response.json();
-    }
-    throw Error("Error with request resource response");
-  });
-
-const getGenders = () => makeFetch("GET", "/api/1.0/main/gender.json");
-// .then(response => {
-//     console.log(response)
-//     if (response.ok) { return response.json(); }
-//     throw Error('Error with request resource response');
-// });
-
-const getCentersForPersonCreation = () =>
-  makeFetch("GET", "/api/1.0/person/creation/authorized-centers", null);
-
-/*
- * POST a new person
- */
-const postPerson = (body) => {
-  const url = `/api/1.0/person/person.json`;
-  return fetch(url, {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json;charset=utf-8",
-    },
-    body: JSON.stringify(body),
-  }).then((response) => {
-    if (response.ok) {
-      return response.json();
-    }
-    throw Error("Error with request resource response");
-  });
-};
-
-/*
- * PATCH an existing person
- */
-const patchPerson = (id, body) => {
-  const url = `/api/1.0/person/person/${id}.json`;
-  return fetch(url, {
-    method: "PATCH",
-    headers: {
-      "Content-Type": "application/json;charset=utf-8",
-    },
-    body: JSON.stringify(body),
-  }).then((response) => {
-    if (response.ok) {
-      return response.json();
-    }
-    throw Error("Error with request resource response");
-  });
-};
-
-export {
-  getCentersForPersonCreation,
-  getPerson,
-  getPersonAltNames,
-  getCivilities,
-  getGenders,
-  postPerson,
-  patchPerson,
-};
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/OnTheFly.ts b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/OnTheFly.ts
new file mode 100644
index 000000000..44114a67f
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/OnTheFly.ts
@@ -0,0 +1,116 @@
+import { fetchResults, makeFetch } from "ChillMainAssets/lib/api/apiMethods";
+import {Center, Civility, Gender, SetCenter} from "ChillMainAssets/types";
+import {
+  AltName,
+  Person, PersonIdentifier,
+  PersonIdentifierWorker,
+  PersonWrite,
+} from "ChillPersonAssets/types";
+import person from "ChillPersonAssets/vuejs/_components/OnTheFly/Person.vue";
+
+/*
+ * GET a person by id
+ */
+export const getPerson = async (id: number): Promise<Person> => {
+  const url = `/api/1.0/person/person/${id}.json`;
+  return fetch(url).then((response) => {
+    if (response.ok) {
+      return response.json();
+    }
+    throw Error("Error with request resource response");
+  });
+};
+
+export const personToWritePerson = (person: Person): PersonWrite => {
+  return {
+    type: "person",
+    firstName: person.firstName,
+    lastName: person.lastName,
+    altNames: person.altNames.map((altName) => ({key: altName.key, value: altName.label})),
+    addressId: null,
+    birthdate: null === person.birthdate ? null : {datetime: person.birthdate.datetime8601},
+    deathdate: null === person.deathdate ? null : {datetime: person.deathdate.datetime8601},
+    phonenumber: person.phonenumber,
+    mobilenumber: person.mobilenumber,
+    center: null === person.centers ? null : person.centers
+      .map((center): SetCenter => ({id: center.id, type: "center"}))
+      .find(() => true) || null,
+    email: person.email,
+    civility: null === person.civility ? null : {id: person.civility.id, type: "chill_main_civility"},
+    gender: null === person.gender ? null : {id: person.gender.id, type: "chill_main_gender"},
+    identifiers: person.identifiers.map((identifier: PersonIdentifier) => ({type: "person_identifier", definition_id: identifier.definition.id, value: identifier.value})),
+  }
+}
+
+export const getPersonAltNames = async (): Promise<AltName[]> =>
+  fetch("/api/1.0/person/config/alt_names.json").then((response) => {
+    if (response.ok) {
+      return response.json();
+    }
+    throw Error("Error with request resource response");
+  });
+
+export const getCivilities = async (): Promise<Civility[]> =>
+  fetchResults("/api/1.0/main/civility.json");
+
+export const getGenders = async (): Promise<Gender[]> =>
+  fetchResults("/api/1.0/main/gender.json");
+
+export const getCentersForPersonCreation = async (): Promise<{
+  showCenters: boolean;
+  centers: Center[];
+}> => makeFetch("GET", "/api/1.0/person/creation/authorized-centers", null);
+
+export const getPersonIdentifiers = async (): Promise<
+  PersonIdentifierWorker[]
+> => fetchResults("/api/1.0/person/identifiers/workers");
+
+export interface WritePersonViolationMap
+  extends Record<string, Record<string, string>> {
+  firstName: {
+    "{{ value }}": string
+  };
+  lastName: {
+    "{{ value }}": string;
+  };
+  gender: {
+    "{{ value }}": string;
+  };
+  mobilenumber: {
+    "{{ types }}": string; // ex: "mobile number"
+    "{{ value }}": string; // ex: "+33 1 02 03 04 05"
+  };
+  phonenumber: {
+    "{{ types }}": string; // ex: "mobile number"
+    "{{ value }}": string; // ex: "+33 1 02 03 04 05"
+  };
+  email: {
+    "{{ value }}": string;
+  };
+  center: {
+    "{{ value }}": string;
+  };
+  civility: {
+    "{{ value }}": string;
+  };
+  birthdate: {};
+  identifiers: {
+    "{{ value }}": string;
+    "definition_id": string;
+  };
+}
+export const createPerson = async (person: PersonWrite): Promise<Person> => {
+  return makeFetch<PersonWrite, Person, WritePersonViolationMap>(
+    "POST",
+    "/api/1.0/person/person.json",
+    person,
+  );
+};
+
+export const editPerson = async (person: PersonWrite, personId: number): Promise<Person> => {
+  return makeFetch<PersonWrite, Person, WritePersonViolationMap>(
+    "PATCH",
+    `/api/1.0/person/person/${personId}.json`,
+    person,
+  );
+}
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
index 24cdca24e..417ef4b7a 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
@@ -3,487 +3,242 @@
     class="btn"
     :class="getClassButton"
     :title="buttonTitle"
-    @click="openModal"
+    @click="openModalChoose"
   >
     <span v-if="displayTextButton">{{ buttonTitle }}</span>
   </a>
 
-  <teleport to="body">
-    <modal
-      v-if="showModal"
-      @close="closeModal"
-      :modal-dialog-class="modalDialogClass"
-      :show="showModal"
-      :hide-footer="false"
-    >
-      <template #header>
-        <h3 class="modal-title">
-          {{ modalTitle }}
-        </h3>
-      </template>
+  <person-choose-modal
+    v-if="showModalChoose"
+    ref="personChooseModal"
+    :modal-title="modalTitle"
+    :options="options"
+    :selected="selected"
+    :modal-dialog-class="'modal-dialog-scrollable modal-xl'"
+    :allow-create="props.allowCreate"
+    @close="closeModalChoose"
+    @onPickEntities="onPickEntities"
+    @onAskForCreate="onAskForCreate"
+    @triggerAddContact="triggerAddContact"
+    @updateSelected="updateSelected"
+    @cleanSelected="emptySelected"
+  />
 
-      <template #body-head>
-        <div class="modal-body">
-          <div class="search">
-            <label class="col-form-label" style="float: right">
-              {{
-                trans(ADD_PERSONS_SUGGESTED_COUNTER, {
-                  count: suggestedCounter,
-                })
-              }}
-            </label>
+  <CreateModal
+    v-if="creatableEntityTypes.length > 0 && showModalCreate && null == thirdPartyParentAddContact"
+    action="create"
+    :allowed-types="creatableEntityTypes"
+    :query="query"
+    :parent="null"
+    modalTitle="test"
+    @close="closeModalCreate"
+    @onPersonCreated="onPersonCreated"
+    @onThirdPartyCreated="onThirdPartyCreated"
+  ></CreateModal>
 
-            <input
-              id="search-persons"
-              name="query"
-              v-model="query"
-              :placeholder="trans(ADD_PERSONS_SEARCH_SOME_PERSONS)"
-              ref="searchRef"
-            />
-            <i class="fa fa-search fa-lg" />
-            <i
-              class="fa fa-times"
-              v-if="queryLength >= 3"
-              @click="resetSuggestion"
-            />
-          </div>
-        </div>
-        <div class="modal-body" v-if="checkUniq === 'checkbox'">
-          <div class="count">
-            <span>
-              <a v-if="suggestedCounter > 2" @click="selectAll">
-                {{ trans(ACTION_CHECK_ALL) }}
-              </a>
-              <a v-if="selectedCounter > 0" @click="resetSelection">
-                <i v-if="suggestedCounter > 2"> • </i>
-                {{ trans(ACTION_RESET) }}
-              </a>
-            </span>
-            <span v-if="selectedCounter > 0">
-              {{
-                trans(ADD_PERSONS_SELECTED_COUNTER, {
-                  count: selectedCounter,
-                })
-              }}
-            </span>
-          </div>
-        </div>
-      </template>
-
-      <template #body>
-        <div class="results">
-          <person-suggestion
-            v-for="item in selectedAndSuggested.slice().reverse()"
-            :key="itemKey(item)"
-            :item="item"
-            :search="search"
-            :type="checkUniq"
-            @save-form-on-the-fly="saveFormOnTheFly"
-            @new-prior-suggestion="newPriorSuggestion"
-            @update-selected="updateSelected"
-          />
-
-          <div class="create-button">
-            <on-the-fly
-              v-if="
-                queryLength >= 3 &&
-                (options.type.includes('person') ||
-                  options.type.includes('thirdparty'))
-              "
-              :button-text="trans(ONTHEFLY_CREATE_BUTTON, { q: query })"
-              :allowed-types="options.type"
-              :query="query"
-              action="create"
-              @save-form-on-the-fly="saveFormOnTheFly"
-              ref="onTheFly"
-            />
-          </div>
-        </div>
-      </template>
-
-      <template #footer>
-        <button
-          class="btn btn-create"
-          @click.prevent="
-            () => {
-              $emit('addNewPersons', {
-                selected: selectedComputed,
-              });
-              query = '';
-              closeModal();
-            }
-          "
-        >
-          {{ trans(ACTION_ADD) }}
-        </button>
-      </template>
-    </modal>
-  </teleport>
+  <CreateModal
+    v-if="showModalCreate && thirdPartyParentAddContact !== null"
+    :allowed-types="['thirdparty']"
+    action="addContact"
+    modalTitle="test"
+    :parent="thirdPartyParentAddContact"
+    :query="''"
+    @close="closeModalCreate"
+    @onPersonCreated="onPersonCreated"
+    @onThirdPartyCreated="onThirdPartyCreated"
+  ></CreateModal>
 </template>
 
 <script setup lang="ts">
-// eslint-disable-next-line @typescript-eslint/no-unused-vars
-import Modal from "ChillMainAssets/vuejs/_components/Modal.vue";
-import { ref, reactive, computed, nextTick, watch, shallowRef } from "vue";
-import PersonSuggestion from "./AddPersons/PersonSuggestion.vue";
-import { searchEntities } from "ChillPersonAssets/vuejs/_api/AddPersons";
-import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue";
-
-import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
-
-import {
-  trans,
-  ADD_PERSONS_SUGGESTED_COUNTER,
-  ADD_PERSONS_SEARCH_SOME_PERSONS,
-  ADD_PERSONS_SELECTED_COUNTER,
-  ONTHEFLY_CREATE_BUTTON,
-  ACTION_CHECK_ALL,
-  ACTION_RESET,
-  ACTION_ADD,
-} from "translator";
-import {
+import {ref, computed, nextTick, useTemplateRef} from "vue";
+import PersonChooseModal from "./AddPersons/PersonChooseModal.vue";
+import type {
   Suggestion,
-  Search,
-  AddPersonResult as OriginalResult,
   SearchOptions,
+  CreatableEntityType,
+  EntityType,
+  Person,
 } from "ChillPersonAssets/types";
+import { marked } from "marked";
+import options = marked.options;
+import CreateModal from "ChillMainAssets/vuejs/OnTheFly/components/CreateModal.vue";
+import {Thirdparty, ThirdpartyCompany} from "../../../../../ChillThirdPartyBundle/Resources/public/types";
 
-// Extend Result type to include optional addressId
-type Result = OriginalResult & { addressId?: number };
+interface AddPersonsConfig {
+  suggested?: Suggestion[];
+  buttonTitle: string;
+  modalTitle: string;
+  options: SearchOptions;
+  allowCreate?: boolean;
+  types?: EntityType[] | undefined;
+}
 
-const props = defineProps({
-  suggested: { type: Array as () => Suggestion[], default: () => [] },
-  selected: { type: Array as () => Suggestion[], default: () => [] },
-  buttonTitle: { type: String, required: true },
-  modalTitle: { type: String, required: true },
-  options: { type: Object as () => SearchOptions, required: true },
+const props = withDefaults(defineProps<AddPersonsConfig>(), {
+  suggested: () => [],
+  allowCreate: () => true,
+  types: () => ["person"],
 });
 
-defineEmits(["addNewPersons"]);
+const emit =
+  defineEmits<{
+    (e: "addNewPersons", payload: { selected: Suggestion[] }): void;
+  }
+  >();
 
-const showModal = ref(false);
-const modalDialogClass = ref("modal-dialog-scrollable modal-xl");
+type PersonChooseModalType = InstanceType<typeof PersonChooseModal>;
+const personChooseModal = useTemplateRef<PersonChooseModalType>('personChooseModal');
 
-const modal = shallowRef({
-  showModal: false,
-  modalDialogClass: "modal-dialog-scrollable modal-xl",
-});
+/**
+ * Flag to show/hide the modal "choose".
+ */
+const showModalChoose = ref(false);
 
-const search = reactive({
-  query: "" as string,
-  previousQuery: "" as string,
-  currentSearchQueryController: null as AbortController | null,
-  suggested: props.suggested as Suggestion[],
-  selected: props.selected as Suggestion[],
-  priorSuggestion: {} as Partial<Suggestion>,
-});
+/**
+ * Flag to show/hide the modal "create".
+ */
+const showModalCreate = ref(false);
 
-const searchRef = ref<HTMLInputElement | null>(null);
-const onTheFly = ref<InstanceType<typeof OnTheFly> | null>(null);
+/**
+ * Store the previous search query, stored while going from "search" state to "create"
+ */
+const query = ref("");
 
-const query = computed({
-  get: () => search.query,
-  set: (val) => setQuery(val),
-});
-const queryLength = computed(() => search.query.length);
-const suggestedCounter = computed(() => search.suggested.length);
-const selectedComputed = computed(() => search.selected);
-const selectedCounter = computed(() => search.selected.length);
+/**
+ * Temporarily store the thirdparty company when calling "addContact"
+ */
+const thirdPartyParentAddContact = ref<ThirdpartyCompany|null>(null);
+
+/**
+ * Contains the selected elements.
+ *
+ * If the property option.uniq is true, this will contains only one element.
+ *
+ * Suggestion must be added/removed using the @link{addSuggestionToSelected} and @link{removeSuggestionFromSelected}
+ * methods.
+ */
+const selected = ref<Map<string, Suggestion>>(new Map());
 
 const getClassButton = computed(() => {
-  let size = props.options?.button?.size ?? "";
-  let type = props.options?.button?.type ?? "btn-create";
-  return size ? size + " " + type : type;
+  const size = props.options?.button?.size ?? "";
+  const type = props.options?.button?.type ?? "btn-create";
+  return size ? `${size} ${type}` : type;
 });
+
 const displayTextButton = computed(() =>
   props.options?.button?.display !== undefined
     ? props.options.button.display
     : true,
 );
 
-const checkUniq = computed(() =>
-  props.options.uniq === true ? "radio" : "checkbox",
-);
-
-const priorSuggestion = computed(() => search.priorSuggestion);
-const hasPriorSuggestion = computed(() => !!search.priorSuggestion.key);
-
-const itemKey = (item: Suggestion) => item.result.type + item.result.id;
-
-function addPriorSuggestion() {
-  if (hasPriorSuggestion.value) {
-    // Type assertion is safe here due to the checks above
-    search.suggested.unshift(priorSuggestion.value as Suggestion);
-    search.selected.unshift(priorSuggestion.value as Suggestion);
-    newPriorSuggestion(null);
+const creatableEntityTypes = computed<CreatableEntityType[]>(() => {
+  if (typeof props.options.type !== "undefined") {
+    return props.options.type.filter(
+      (e: EntityType) => e === "thirdparty" || e === "person",
+    );
   }
-}
-
-const selectedAndSuggested = computed(() => {
-  addPriorSuggestion();
-  const uniqBy = (a: Suggestion[], key: (item: Suggestion) => string) => [
-    ...new Map(a.map((x) => [key(x), x])).values(),
-  ];
-  let union = [
-    ...new Set([
-      ...search.suggested.slice().reverse(),
-      ...search.selected.slice().reverse(),
-    ]),
-  ];
-  return uniqBy(union, (k: Suggestion) => k.key);
+  return props.types.filter(
+    (e: EntityType) => e === "thirdparty" || e === "person",
+  );
 });
 
-function openModal() {
-  showModal.value = true;
-  nextTick(() => {
-    if (searchRef.value) searchRef.value.focus();
-  });
-}
-function closeModal() {
-  showModal.value = false;
+function onAskForCreate(payload: { query: string }): void {
+  query.value = payload.query;
+  closeModalChoose();
+  showModalCreate.value = true;
 }
 
-function setQuery(q: string) {
-  search.query = q;
+function openModalChoose(): void {
+  showModalChoose.value = true;
+}
 
-  // Clear previous search if any
-  if (search.currentSearchQueryController) {
-    search.currentSearchQueryController.abort();
-    search.currentSearchQueryController = null;
+function closeModalChoose(): void {
+  showModalChoose.value = false;
+}
+
+function closeModalCreate(): void {
+  if (null !== thirdPartyParentAddContact) {
+    thirdPartyParentAddContact.value = null;
   }
-
-  if (q === "") {
-    loadSuggestions([]);
-    return;
-  }
-
-  // Debounce delay based on query length
-  const delay = q.length > 3 ? 300 : 700;
-
-  setTimeout(() => {
-    // Only search if query hasn't changed in the meantime
-    if (q !== search.query) return;
-
-    search.currentSearchQueryController = new AbortController();
-
-    searchEntities(
-      { query: q, options: props.options },
-      search.currentSearchQueryController.signal,
-    )
-      .then((suggested: Search) => {
-        loadSuggestions(suggested.results);
-      })
-      .catch((error: DOMException) => {
-        if (error instanceof DOMException && error.name === "AbortError") {
-          // Request was aborted, ignore
-          return;
-        }
-        throw error;
-      });
-  }, delay);
+  showModalCreate.value = false;
 }
 
-function loadSuggestions(suggestedArr: Suggestion[]) {
-  search.suggested = suggestedArr;
-  search.suggested.forEach((item) => {
-    item.key = itemKey(item);
-  });
-}
-
-function updateSelected(value: Suggestion[]) {
-  search.selected = value;
-}
-
-function resetSuggestion() {
-  search.query = "";
-  search.suggested = [];
-}
-
-function resetSelection() {
-  search.selected = [];
-}
-
-function resetSearch() {
-  resetSelection();
-  resetSuggestion();
-}
-
-function selectAll() {
-  search.suggested.forEach((item) => {
-    search.selected.push(item);
-  });
-}
-
-function newPriorSuggestion(entity: Result | null) {
-  if (entity !== null) {
-    let suggestion = {
-      key: entity.type + entity.id,
-      relevance: 0.5,
-      result: entity,
-    };
-    search.priorSuggestion = suggestion;
+/**
+ * Called by PersonSuggestion's updateSelection event, when an element is checked/unchecked
+ */
+function updateSelected(payload: {suggestion: Suggestion, isSelected: boolean}): void {
+  if (payload.isSelected) {
+    addSuggestionToSelected(payload.suggestion);
   } else {
-    search.priorSuggestion = {};
+    removeSuggestionFromSelected(payload.suggestion);
   }
 }
 
-async function saveFormOnTheFly({
-  type,
-  data,
-}: {
-  type: string;
-  data: Result;
-}) {
-  try {
-    if (type === "person") {
-      const responsePerson: Result = await makeFetch(
-        "POST",
-        "/api/1.0/person/person.json",
-        data,
-      );
-      newPriorSuggestion(responsePerson);
-      if (onTheFly.value) onTheFly.value.closeModal();
+function addSuggestionToSelected(suggestion: Suggestion): void {
+  if (props.options.uniq) {
+    selected.value.clear();
+  }
+  selected.value.set(suggestion.key, suggestion);
+}
 
-      if (data.addressId != null) {
-        const household = { type: "household" };
-        const address = { id: data.addressId };
-        try {
-          const responseHousehold: Result = await makeFetch(
-            "POST",
-            "/api/1.0/person/household.json",
-            household,
-          );
-          const member = {
-            concerned: [
-              {
-                person: {
-                  type: "person",
-                  id: responsePerson.id,
-                },
-                start_date: {
-                  datetime: `${new Date().toISOString().split("T")[0]}T00:00:00+02:00`,
-                },
-                holder: false,
-                comment: null,
-              },
-            ],
-            destination: {
-              type: "household",
-              id: responseHousehold.id,
-            },
-            composition: null,
-          };
-          await makeFetch(
-            "POST",
-            "/api/1.0/person/household/members/move.json",
-            member,
-          );
-          try {
-            const _response = await makeFetch(
-              "POST",
-              `/api/1.0/person/household/${responseHousehold.id}/address.json`,
-              address,
-            );
-            console.log(_response);
-          } catch (error) {
-            console.error(error);
-          }
-        } catch (error) {
-          console.error(error);
-        }
-      }
-    } else if (type === "thirdparty") {
-      const response: Result = await makeFetch(
-        "POST",
-        "/api/1.0/thirdparty/thirdparty.json",
-        data,
-      );
-      newPriorSuggestion(response);
-      if (onTheFly.value) onTheFly.value.closeModal();
-    }
-  } catch (error) {
-    console.error(error);
+function removeSuggestionFromSelected(suggestion: Suggestion): void {
+  selected.value.delete(suggestion.key);
+}
+
+function emptySelected(): void {
+  selected.value = new Map();
+}
+
+function onPickEntities(): void {
+  const alls = Array.from(selected.value.values());
+  emit("addNewPersons", { selected: alls });
+  closeModalChoose();
+}
+
+function triggerAddContact({parent}: {parent: ThirdpartyCompany}): void {
+  closeModalChoose();
+  openModalChoose();
+  thirdPartyParentAddContact.value = parent;
+  showModalCreate.value = true;
+}
+
+function onPersonCreated(payload: { person: Person }): void {
+  showModalCreate.value = false;
+  const suggestion = {
+    result: payload.person,
+    relevance: 999999,
+    key: "person",
+  };
+  addSuggestionToSelected(suggestion);
+  if (props.options.uniq) {
+    emit("addNewPersons", { selected: [suggestion] });
+  } else {
+    openModalChoose();
   }
 }
 
-watch(
-  () => props.selected,
-  (newSelected) => {
-    search.selected = newSelected;
-  },
-  { deep: true },
-);
+function onThirdPartyCreated(payload: {thirdParty: Thirdparty}): void {
+  showModalCreate.value = false;
+  const suggestion = {
+    result: payload.thirdParty,
+    relevance: 999999,
+    key: "thirdparty",
+  };
+  addSuggestionToSelected(suggestion);
+  if (props.options.uniq) {
+    emit("addNewPersons", { selected: [suggestion] });
+  } else {
+    openModalChoose();
+  }
+}
 
-watch(
-  () => props.suggested,
-  (newSuggested) => {
-    search.suggested = newSuggested;
-  },
-  { deep: true },
-);
+function resetSearch(): void {
+  selected.value = new Map();
+  personChooseModal.value?.resetSearch();
+}
 
-watch(
-  () => modal,
-  (val) => {
-    showModal.value = val.value.showModal;
-    modalDialogClass.value = val.value.modalDialogClass;
-  },
-  { deep: true },
-);
-
-defineExpose({
-  resetSearch,
-  showModal,
-});
+defineExpose({resetSearch})
 </script>
 
-<style lang="scss">
-li.add-persons {
-  a {
-    cursor: pointer;
-  }
-}
-div.body-head {
-  overflow-y: unset;
-  div.modal-body:first-child {
-    margin: auto 4em;
-    div.search {
-      position: relative;
-      input {
-        width: 100%;
-        padding: 1.2em 1.5em 1.2em 2.5em;
-        //margin: 1em 0;
-      }
-      i {
-        position: absolute;
-        opacity: 0.5;
-        padding: 0.65em 0;
-        top: 50%;
-      }
-      i.fa-search {
-        left: 0.5em;
-      }
-      i.fa-times {
-        right: 1em;
-        padding: 0.75em 0;
-        cursor: pointer;
-      }
-    }
-  }
-  div.modal-body:last-child {
-    padding-bottom: 0;
-  }
-  div.count {
-    margin: -0.5em 0 0.7em;
-    display: flex;
-    justify-content: space-between;
-    a {
-      cursor: pointer;
-    }
-  }
-}
-.create-button > a {
-  margin-top: 0.5em;
-  margin-left: 2.6em;
-}
+<style lang="scss" scoped>
+/* Button styles can remain here if needed */
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonChooseModal.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonChooseModal.vue
new file mode 100644
index 000000000..8c0ddb802
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonChooseModal.vue
@@ -0,0 +1,345 @@
+<template>
+  <teleport to="body">
+    <modal
+      @close="() => emit('close')"
+      :modal-dialog-class="modalDialogClass"
+      :hide-footer="false"
+    >
+      <template #header>
+        <h3 class="modal-title">{{ modalTitle }}</h3>
+      </template>
+
+      <template #body-head>
+        <div class="modal-body">
+          <div class="search">
+            <label class="col-form-label" style="float: right">
+              {{
+                trans(ADD_PERSONS_SUGGESTED_COUNTER, {
+                  count: suggestedCounter,
+                })
+              }}
+            </label>
+
+            <input
+              id="search-persons"
+              name="query"
+              v-model="query"
+              :placeholder="trans(ADD_PERSONS_SEARCH_SOME_PERSONS)"
+              ref="searchRef"
+            />
+            <i class="fa fa-search fa-lg" />
+            <i
+              class="fa fa-times"
+              v-if="queryLength >= 3"
+              @click="resetSuggestion"
+            />
+          </div>
+        </div>
+
+        <div class="modal-body" v-if="checkUniq === 'checkbox'">
+          <div class="count">
+            <span>
+              <a v-if="suggestedCounter > 2" @click="selectAll">
+                {{ trans(ACTION_CHECK_ALL) }}
+              </a>
+              <a v-if="selectedCounter > 0" @click="resetSelection">
+                <i v-if="suggestedCounter > 2"> • </i>
+                {{ trans(ACTION_RESET) }}
+              </a>
+            </span>
+            <span v-if="selectedCounter > 0">
+              {{
+                trans(ADD_PERSONS_SELECTED_COUNTER, { count: selectedCounter })
+              }}
+            </span>
+          </div>
+        </div>
+      </template>
+
+      <template #body>
+        <div class="results">
+          <person-suggestion
+            v-for="item in selectedAndSuggested"
+            :key="item.key"
+            :item="item"
+            :isSelected="item.isSelected"
+            :type="checkUniq"
+            @update-selected="(payload) => emit('updateSelected', payload)"
+            @trigger-add-contact="triggerAddContact"
+          />
+
+          <div v-if="hasNoResult">
+            <div class="noResult chill-no-data-statement">
+              {{
+                trans(ADD_PERSONS_SUGGESTED_COUNTER, {
+                  count: suggestedCounter,
+                })
+              }}
+            </div>
+          </div>
+
+          <div
+            v-if="props.allowCreate && query.length > 0"
+            class="create-button"
+          >
+            <button type="button" class="btn btn-submit" @click="emit('onAskForCreate', { query })">
+              {{ trans(ONTHEFLY_CREATE_BUTTON, { q: query }) }}
+            </button>
+          </div>
+        </div>
+      </template>
+
+      <template #footer>
+        <button
+          type="button"
+          class="btn btn-create"
+          @click.prevent="pickEntities"
+        >
+          {{ trans(ACTION_ADD) }}
+        </button>
+      </template>
+    </modal>
+  </teleport>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, computed, nextTick, watch, onMounted } from "vue";
+import Modal from "ChillMainAssets/vuejs/_components/Modal.vue";
+import PersonSuggestion from "./PersonSuggestion.vue";
+import { searchEntities } from "ChillPersonAssets/vuejs/_api/AddPersons";
+
+import {
+  trans,
+  ADD_PERSONS_SUGGESTED_COUNTER,
+  ADD_PERSONS_SEARCH_SOME_PERSONS,
+  ADD_PERSONS_SELECTED_COUNTER,
+  ONTHEFLY_CREATE_BUTTON,
+  ACTION_CHECK_ALL,
+  ACTION_RESET,
+  ACTION_ADD,
+} from "translator";
+
+import type {
+  Suggestion,
+  Search,
+  SearchOptions,
+  Entities,
+} from "ChillPersonAssets/types";
+import {ThirdpartyCompany} from "../../../../../../ChillThirdPartyBundle/Resources/public/types";
+
+interface Props {
+  modalTitle: string;
+  options: SearchOptions;
+  suggested?: Suggestion[];
+  selected: Map<string, Suggestion>;
+  modalDialogClass?: string;
+  allowCreate?: boolean;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  suggested: () => [],
+  modalDialogClass: "modal-dialog-scrollable modal-xl",
+  allowCreate: () => true,
+});
+
+const emit = defineEmits<{
+  (e: "close"): void;
+  (e: "onPickEntities"): void;
+  (e: "onAskForCreate", payload: { query: string }): void;
+  (e: "triggerAddContact", payload: { parent: ThirdpartyCompany }): void;
+  (e: "updateSelected", payload: {suggestion: Suggestion, isSelected: boolean}): void;
+  (e: "cleanSelected"): void;
+}>();
+
+const searchRef = ref<HTMLInputElement | null>(null);
+
+onMounted(() => {
+  // give the focus on the search bar
+  searchRef.value?.focus();
+});
+
+const search = reactive({
+  query: "" as string,
+  previousQuery: "" as string,
+  currentSearchQueryController: null as AbortController | null,
+  priorSuggestion: {} as Partial<Suggestion>,
+  hasPreviousQuery: false,
+});
+
+/**
+ * Contains the suggested entities from the search results.
+ *
+ * In other words, those entities are displayed and selectable by the user
+ */
+const suggested = ref<Suggestion[]>([]);
+
+const query = computed({
+  get: () => search.query,
+  set: (val: string) => setQuery(val),
+});
+const queryLength = computed(() => search.query.length);
+const suggestedCounter = computed(() => suggested.value.length);
+const selectedCounter = computed(() => props.selected.size);
+
+const checkUniq = computed(() =>
+  props.options.uniq ? "radio" : "checkbox",
+);
+
+const selectedAndSuggested = computed<(Suggestion & {isSelected: boolean})[]>(() => {
+  const selectedAndSuggested = [];
+
+  // add selected that are not in the search results
+  for (const selected of props.selected.values()) {
+    if (!suggested.value.some((s: Suggestion) => s.key === selected.key)) {
+      selectedAndSuggested.push({...selected, isSelected: false});
+    }
+  }
+  for (const suggestion of suggested.value) {
+    selectedAndSuggested.push({...suggestion, isSelected: props.selected.has(suggestion.key)})
+  }
+
+  return selectedAndSuggested;
+});
+
+const hasNoResult = computed(() => search.hasPreviousQuery && suggested.value.length === 0);
+
+function setQuery(q: string) {
+  search.query = q;
+
+  if (search.currentSearchQueryController) {
+    search.currentSearchQueryController.abort();
+    search.currentSearchQueryController = null;
+  }
+
+  if (q === "") {
+    loadSuggestions([]);
+    return;
+  }
+
+  const delay = q.length > 3 ? 300 : 700;
+
+  setTimeout(() => {
+    if (q !== search.query) return;
+
+    search.currentSearchQueryController = new AbortController();
+
+    searchEntities(
+      { query: q, options: props.options },
+      search.currentSearchQueryController.signal,
+    )
+      .then((suggested: Search) => {
+        loadSuggestions(suggested.results);
+        search.hasPreviousQuery = true;
+      })
+      .catch((error: DOMException) => {
+        if (error instanceof DOMException && error.name === "AbortError") {
+          return;
+        }
+        throw error;
+      });
+  }, delay);
+}
+
+
+function loadSuggestions(suggestedArr: {relevance: number, result: Entities}[]): void {
+  suggested.value = suggestedArr.map((item) => {
+    return {
+      key: item.result.type + item.result.id,
+      relevance: item.relevance,
+      result: item.result
+    }
+  });
+}
+
+function resetSuggestion() {
+  search.query = "";
+  suggested.value = [];
+}
+
+function resetSelection() {
+  emit("cleanSelected");
+}
+
+function resetSearch() {
+  resetSelection();
+  resetSuggestion();
+}
+
+function selectAll() {
+  suggested.value.forEach((suggestion: Suggestion) => {
+    emit("updateSelected", {suggestion, isSelected: true})
+  });
+}
+
+function triggerAddContact(payload: {parent: ThirdpartyCompany}) {
+  emit("triggerAddContact", payload);
+}
+
+/**
+ * Triggered when the user clicks on the "add" button.
+ */
+function pickEntities(): void {
+  emit("onPickEntities", );
+  search.query = "";
+  emit("close");
+}
+
+defineExpose({ resetSearch });
+</script>
+
+<style lang="scss" scoped>
+li.add-persons {
+  a {
+    cursor: pointer;
+  }
+}
+
+div.body-head {
+  overflow-y: unset;
+  div.modal-body:first-child {
+    margin: auto 4em;
+    div.search {
+      position: relative;
+      input {
+        width: 100%;
+        padding: 1.2em 1.5em 1.2em 2.5em;
+      }
+      i {
+        position: absolute;
+        opacity: 0.5;
+        padding: 0.65em 0;
+        top: 50%;
+      }
+      i.fa-search {
+        left: 0.5em;
+      }
+      i.fa-times {
+        right: 1em;
+        padding: 0.75em 0;
+        cursor: pointer;
+      }
+    }
+  }
+  div.modal-body:last-child {
+    padding-bottom: 0;
+  }
+  div.count {
+    margin: -0.5em 0 0.7em;
+    display: flex;
+    justify-content: space-between;
+    a {
+      cursor: pointer;
+    }
+  }
+}
+
+.create-button > button {
+  margin-top: 0.5em;
+  margin-left: 0.6em;
+}
+.noResult {
+  text-align: center;
+  margin: 2em;
+  font-size: large;
+}
+</style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonSuggestion.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonSuggestion.vue
index 4499b40c8..aeb8dcac3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonSuggestion.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonSuggestion.vue
@@ -1,39 +1,38 @@
 <template>
-  <div class="list-item" :class="{ checked: isChecked }">
+  <div class="list-item" :class="{ checked: props.isSelected }">
     <label>
-      <div>
         <input
           :type="type"
-          v-model="selected"
+          :value="props.item.key"
           name="item"
-          :id="item.key"
-          :value="setValueByType(item, type)"
+          :id="props.item.key"
+          :checked="props.isSelected"
+          @click="onUpdateValue"
         />
-      </div>
 
       <suggestion-person
-        v-if="item.result.type === 'person'"
+        v-if="isSuggestionForPerson(item)"
         :item="item"
       ></suggestion-person>
 
       <suggestion-third-party
-        v-if="item.result.type === 'thirdparty'"
-        @newPriorSuggestion="newPriorSuggestion"
+        v-if="isSuggestionForThirdParty(item)"
+        @trigger-add-contact="triggerAddContact"
         :item="item"
       ></suggestion-third-party>
 
       <suggestion-user
-        v-if="item.result.type === 'user'"
+        v-if="isSuggestionForUser(item)"
         :item="item"
       ></suggestion-user>
 
       <suggestion-user-group
-        v-if="item.result.type === 'user_group'"
+        v-if="isSuggestionForUserGroup(item)"
         :item="item"
       ></suggestion-user-group>
 
       <suggestion-household
-        v-if="item.result.type === 'household'"
+        v-if="isSuggestionForHousehold(item)"
         :item="item"
       ></suggestion-household>
     </label>
@@ -51,31 +50,38 @@ import SuggestionHousehold from "./TypeHousehold.vue";
 import SuggestionUserGroup from "./TypeUserGroup.vue";
 
 // Types
-import { Result, Suggestion } from "ChillPersonAssets/types";
+import {
+  isSuggestionForHousehold,
+  isSuggestionForPerson,
+  isSuggestionForThirdParty, isSuggestionForUser,
+  isSuggestionForUserGroup,
+  Suggestion
+} from "ChillPersonAssets/types";
+import {ThirdpartyCompany} from "../../../../../../ChillThirdPartyBundle/Resources/public/types";
 
 const props = defineProps<{
   item: Suggestion;
-  search: { selected: Suggestion[] };
-  type: string;
+  isSelected: boolean;
+  type: "radio"|"checkbox";
+}>();
+const emit = defineEmits<{
+  (e: "updateSelected", payload: {suggestion: Suggestion, isSelected: boolean}): void;
+  (e: "triggerAddContact", payload: { parent: ThirdpartyCompany }): void;
 }>();
-const emit = defineEmits(["updateSelected", "newPriorSuggestion"]);
 
-// v-model for selected
-const selected = computed({
-  get: () => props.search.selected,
-  set: (value) => emit("updateSelected", value),
-});
+const isChecked = computed<boolean>(() => props.isSelected)
 
-const isChecked = computed(
-  () => props.search.selected.indexOf(props.item) !== -1,
-);
-
-function setValueByType(value: Suggestion, type: string) {
-  return type === "radio" ? [value] : value;
+const onUpdateValue = (event: Event) => {
+  const target = event?.target;
+  if (!(target instanceof HTMLInputElement)) {
+    console.error("the value of checked is not an HTMLInputElement");
+    return;
+  }
+  emit("updateSelected", {suggestion: props.item, isSelected: props.type === "radio" ? true : target.checked});
 }
 
-function newPriorSuggestion(response: Result) {
-  emit("newPriorSuggestion", response);
+function triggerAddContact(payload: {parent: ThirdpartyCompany}) {
+  emit("triggerAddContact", payload);
 }
 </script>
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeHousehold.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeHousehold.vue
index a1e33c4de..4a99dcaac 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeHousehold.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeHousehold.vue
@@ -16,9 +16,10 @@ import { defineProps } from "vue";
 import BadgeEntity from "ChillMainAssets/vuejs/_components/BadgeEntity.vue";
 import HouseholdRenderBox from "ChillPersonAssets/vuejs/_components/Entity/HouseholdRenderBox.vue";
 import { Suggestion } from "ChillPersonAssets/types";
+import {Household} from "ChillMainAssets/types";
 
 interface TypeHouseholdProps {
-  item: Suggestion;
+  item: Suggestion & {result: Household};
 }
 
 defineProps<TypeHouseholdProps>();
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypePerson.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypePerson.vue
index 98119bd8e..adba7af03 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypePerson.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypePerson.vue
@@ -23,7 +23,7 @@ import { computed, defineProps } from "vue";
 import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue";
 import BadgeEntity from "ChillMainAssets/vuejs/_components/BadgeEntity.vue";
 import PersonText from "ChillPersonAssets/vuejs/_components/Entity/PersonText.vue";
-import { Person } from "ChillPersonAssets/types";
+import {Person, Suggestion} from "ChillPersonAssets/types";
 
 function formatDate(dateString: string | undefined, format: string) {
   if (!dateString) return "";
@@ -36,9 +36,7 @@ function formatDate(dateString: string | undefined, format: string) {
 }
 
 const props = defineProps<{
-  item: {
-    result: Person; // add other fields as needed
-  };
+  item: Suggestion & { result: Person },
 }>();
 
 const hasBirthdate = computed(() => props.item.result.birthdate !== null);
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue
index 28be7c119..d665118cd 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="container tpartycontainer">
     <div class="tparty-identification">
-      <span v-if="item.result.profession" class="profession">{{
+      <span v-if="(isThirdpartyChild(item.result) || isThirdpartyContact(item.result)) && item.result.profession" class="profession">{{
         item.result.profession
       }}</span>
       <span class="name"> {{ item.result.text }}&nbsp; </span>
@@ -12,20 +12,18 @@
         </template>
       </span>
     </div>
-    <div class="tpartyparent" v-if="hasParent">
-      <span class="name"> &gt; {{ item.result.parent?.text }} </span>
+    <div class="tpartyparent" v-if="isThirdpartyChild(item.result) && null !== item.result.parent">
+      <span class="name"> &gt; {{ item.result.parent.text }} </span>
     </div>
   </div>
 
   <div class="right_actions">
     <badge-entity :entity="item.result" :options="{ displayLong: true }" />
-    <on-the-fly
-      v-if="item.result.kind === 'company'"
-      :parent="item.result"
-      @save-form-on-the-fly="saveFormOnTheFly"
-      action="addContact"
-      ref="onTheFly"
-    />
+    <a
+      v-if="item.result.type === 'thirdparty' && item.result.kind === 'company'"
+      class="btn btn-tpchild"
+      @click="emit('triggerAddContact', {parent: item.result})"
+    ><i class="bi bi-person-fill-add"></i></a>
     <on-the-fly type="thirdparty" :id="item.result.id" action="show" />
   </div>
 </template>
@@ -37,15 +35,19 @@ import BadgeEntity from "ChillMainAssets/vuejs/_components/BadgeEntity.vue";
 import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
 import { useToast } from "vue-toast-notification";
 import { Result, Suggestion } from "ChillPersonAssets/types";
-import { Thirdparty } from "src/Bundle/ChillThirdPartyBundle/Resources/public/types";
+import {
+  isThirdpartyChild,
+  isThirdpartyContact,
+  Thirdparty, ThirdpartyCompany
+} from "./../../../../../../ChillThirdPartyBundle/Resources/public/types";
 
 interface TypeThirdPartyProps {
-  item: Suggestion;
+  item: Suggestion & {result: Thirdparty};
 }
 
 const props = defineProps<TypeThirdPartyProps>();
 
-const emit = defineEmits<(e: "newPriorSuggestion", payload: unknown) => void>();
+const emit = defineEmits<(e: "triggerAddContact", payload: {parent: ThirdpartyCompany}) => void>();
 
 const onTheFly = ref<InstanceType<typeof OnTheFly> | null>(null);
 const toast = useToast();
@@ -54,47 +56,23 @@ const hasAddress = computed(() => {
   if (props.item.result.address !== null) {
     return true;
   }
-  if (props.item.result.parent !== null) {
-    if (props.item.result.parent) {
-      return props.item.result.parent.address !== null;
-    }
+  if (isThirdpartyChild(props.item.result) && props.item.result.parent !== null) {
+    return props.item.result.parent.address !== null;
   }
-  return false;
-});
 
-const hasParent = computed(() => {
-  return props.item.result.parent !== null;
+  return false;
 });
 
 const getAddress = computed(() => {
   if (props.item.result.address !== null) {
     return props.item.result.address;
   }
-  if (props.item.result.parent && props.item.result.parent.address !== null) {
+  if (isThirdpartyChild(props.item.result) && props.item.result.parent !== null && props.item.result.parent.address !== null) {
     return props.item.result.parent.address;
   }
   return null;
 });
 
-function saveFormOnTheFly({ data }: { data: Thirdparty }) {
-  makeFetch("POST", "/api/1.0/thirdparty/thirdparty.json", data)
-    .then((response: unknown) => {
-      const result = response as Result;
-      emit("newPriorSuggestion", result);
-      if (onTheFly.value) onTheFly.value.closeModal();
-    })
-    .catch((error: unknown) => {
-      const errorResponse = error as { name: string; violations: string[] };
-      if (errorResponse.name === "ValidationException") {
-        for (let v of errorResponse.violations) {
-          if (toast) toast.open({ message: v });
-        }
-      } else {
-        if (toast) toast.open({ message: "An error occurred" });
-      }
-    });
-}
-
 // i18n config (if needed elsewhere)
 const i18n = {
   messages: {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUser.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUser.vue
index 74f80c321..9daf3219f 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUser.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUser.vue
@@ -1,11 +1,11 @@
 <template>
   <div class="container usercontainer">
     <div class="user-identification">
-      <UserRenderBoxBadge :user="item.result" />
+      <UserRenderBoxBadge :user="props.item.result" />
     </div>
   </div>
   <div class="right_actions">
-    <BadgeEntity :entity="item.result" :options="{ displayLong: true }" />
+    <BadgeEntity :entity="props.item.result" :options="{ displayLong: true }" />
   </div>
 </template>
 
@@ -14,18 +14,14 @@ import { computed, defineProps } from "vue";
 import BadgeEntity from "ChillMainAssets/vuejs/_components/BadgeEntity.vue";
 import UserRenderBoxBadge from "ChillMainAssets/vuejs/_components/Entity/UserRenderBoxBadge.vue";
 import { Suggestion } from "ChillPersonAssets/types";
+import {User} from "ChillMainAssets/types";
 
 interface TypeUserProps {
-  item: Suggestion;
+  item: Suggestion & {result: User};
 }
 
 const props = defineProps<TypeUserProps>();
 
-const hasParent = computed(() => props.item.result.parent !== null);
-
-defineExpose({
-  hasParent,
-});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUserGroup.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUserGroup.vue
index ca3aa2cb8..cbf212646 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUserGroup.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUserGroup.vue
@@ -15,7 +15,7 @@ import UserGroupRenderBox from "ChillMainAssets/vuejs/_components/Entity/UserGro
 import { Suggestion } from "ChillPersonAssets/types";
 
 interface TypeUserGroupProps {
-  item: Suggestion;
+  item: Suggestion & {result: UserGroup};
 }
 
 const props = defineProps<TypeUserGroupProps>();
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
index 8995506a9..fd181d0ba 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -5,46 +5,16 @@
         <div class="item-col">
           <div class="entity-label">
             <div :class="'denomination h' + options.hLevel">
-              <a v-if="options.addLink === true" :href="getUrl">
-                <!-- use person-text here to avoid code duplication ? TODO -->
-                <span class="firstname">{{ person.firstName }}</span>
-                <span class="lastname">{{ person.lastName }}</span>
-                <span v-if="person.suffixText" class="suffixtext"
-                  >&nbsp;{{ person.suffixText }}</span
-                >
-                <span
-                  v-if="person.altNames && options.addAltNames == true"
-                  class="altnames"
-                >
-                  <span :class="'altname altname-' + altNameKey">{{
-                    altNameLabel
-                  }}</span>
-                </span>
-              </a>
-
-              <!-- use person-text here to avoid code duplication ? TODO -->
-              <span class="firstname">{{ person.firstName + " " }}</span>
-              <span class="lastname">{{ person.lastName }}</span>
-              <span v-if="person.suffixText" class="suffixtext"
-                >&nbsp;{{ person.suffixText }}</span
-              >
-              <span v-if="person.deathdate" class="deathdate"> (‡)</span>
-              <span
-                v-if="person.altNames && options.addAltNames == true"
-                class="altnames"
-              >
-                <span :class="'altname altname-' + altNameKey">{{
-                  altNameLabel
-                }}</span>
-              </span>
-
-              <span
-                v-if="options.addId == true"
-                class="id-number"
-                :title="'n° ' + person.id"
-                >{{ person.id }}</span
-              >
-
+              <template v-if="options.addLink === true">
+                <a v-if="options.addLink === true" :href="getUrl">
+                  <span>{{ person.text }}</span>
+                  <span v-if="person.deathdate" class="deathdate"> (‡)</span>
+                </a>
+              </template>
+              <template v-else>
+                <span>{{ person.text }}</span>
+                <span v-if="person.deathdate" class="deathdate"> (‡)</span>
+              </template>
               <badge-entity
                 v-if="options.addEntity === true"
                 :entity="person"
@@ -52,61 +22,36 @@
               />
             </div>
 
+            <p>
+                <span
+                  v-if="options.addId == true"
+                  :title="person.personId"
+                ><i class="bi bi-info-circle"></i> {{ person.personId }}</span
+                >
+            </p>
+
             <p v-if="options.addInfo === true" class="moreinfo">
               <gender-icon-render-box
                 v-if="person.gender"
                 :gender="person.gender"
-              />
-              <time
-                v-if="person.birthdate && !person.deathdate"
-                :datetime="person.birthdate"
-                :title="birthdate"
+              /> <span
+                v-if="person.birthdate"
               >
-                {{
-                  trans(birthdateTranslation) +
-                  " " +
-                  new Intl.DateTimeFormat("fr-FR", {
-                    dateStyle: "long",
-                  }).format(birthdate)
-                }}
-              </time>
-
-              <time
-                v-else-if="person.birthdate && person.deathdate"
-                :datetime="person.deathdate"
-                :title="person.deathdate"
-              >
-                {{
-                  new Intl.DateTimeFormat("fr-FR", {
-                    dateStyle: "long",
-                  }).format(birthdate)
-                }}
-                -
-                {{
-                  new Intl.DateTimeFormat("fr-FR", {
-                    dateStyle: "long",
-                  }).format(deathdate)
-                }}
-              </time>
-
-              <time
-                v-else-if="person.deathdate"
-                :datetime="person.deathdate"
-                :title="person.deathdate"
-              >
-                {{
-                  trans(RENDERBOX_DEATHDATE) +
-                  " " +
-                  new Intl.DateTimeFormat("fr-FR", {
-                    dateStyle: "long",
-                  }).format(deathdate)
-                }}
-              </time>
-
+                {{ trans(RENDERBOX_BIRTHDAY_STATEMENT, {gender: toGenderTranslation(person.gender), birthdate: ISOToDate(person.birthdate?.datetime)}) }}
+              </span>
               <span v-if="options.addAge && person.birthdate" class="age">
-                ({{ trans(RENDERBOX_YEARS_OLD, { n: person.age }) }})
+                ({{ trans(RENDERBOX_YEARS_OLD, {n: person.age}) }})
               </span>
             </p>
+
+            <p>
+              <span
+                v-if="person.deathdate"
+              >
+                {{ trans(RENDERBOX_DEATHDATE_STATEMENT, {gender: toGenderTranslation(person.gender), deathdate: ISOToDate(person.deathdate?.datetime)}) }}
+              </span>
+            </p>
+
           </div>
         </div>
 
@@ -114,11 +59,11 @@
           <div class="float-button bottom">
             <div class="box">
               <div class="action">
-                <slot name="record-actions" />
+                <slot name="record-actions"/>
               </div>
               <ul class="list-content fa-ul">
                 <li v-if="person.current_household_id">
-                  <i class="fa fa-li fa-map-marker" />
+                  <i class="fa fa-li fa-map-marker"/>
                   <address-render-box
                     v-if="person.current_household_address"
                     :address="person.current_household_address"
@@ -130,11 +75,6 @@
                   <a
                     v-if="options.addHouseholdLink === true"
                     :href="getCurrentHouseholdUrl"
-                    :title="
-                      trans(PERSONS_ASSOCIATED_SHOW_HOUSEHOLD_NUMBER, {
-                        id: person.current_household_id,
-                      })
-                    "
                   >
                     <span class="badge rounded-pill bg-chill-beige">
                       <i
@@ -144,7 +84,7 @@
                   </a>
                 </li>
                 <li v-else-if="options.addNoData">
-                  <i class="fa fa-li fa-map-marker" />
+                  <i class="fa fa-li fa-map-marker"/>
                   <p class="chill-no-data-statement">
                     {{ trans(RENDERBOX_NO_DATA) }}
                   </p>
@@ -160,7 +100,7 @@
                     v-for="(addr, i) in person.current_residential_addresses"
                     :key="i"
                   >
-                    <i class="fa fa-li fa-map-marker" />
+                    <i class="fa fa-li fa-map-marker"/>
                     <div v-if="addr.address">
                       <span class="item-key">
                         {{ trans(RENDERBOX_RESIDENTIAL_ADDRESS) }}:
@@ -180,9 +120,10 @@
                           :person="addr.hostPerson"
                         />
                       </span>
+
                       <address-render-box
-                        v-if="addr.hostPerson.address"
-                        :address="addr.hostPerson.address"
+                        v-if="addr.hostPerson?.current_household_address"
+                        :address="addr.hostPerson.current_household_address"
                         :is-multiline="isMultiline"
                       />
                     </div>
@@ -204,36 +145,36 @@
                 </template>
 
                 <li v-if="person.email">
-                  <i class="fa fa-li fa-envelope-o" />
+                  <i class="fa fa-li fa-envelope-o"/>
                   <a :href="'mailto: ' + person.email">{{ person.email }}</a>
                 </li>
                 <li v-else-if="options.addNoData">
-                  <i class="fa fa-li fa-envelope-o" />
+                  <i class="fa fa-li fa-envelope-o"/>
                   <p class="chill-no-data-statement">
                     {{ trans(RENDERBOX_NO_DATA) }}
                   </p>
                 </li>
 
                 <li v-if="person.mobilenumber">
-                  <i class="fa fa-li fa-mobile" />
+                  <i class="fa fa-li fa-mobile"/>
                   <a :href="'tel: ' + person.mobilenumber">
                     {{ person.mobilenumber }}
                   </a>
                 </li>
                 <li v-else-if="options.addNoData">
-                  <i class="fa fa-li fa-mobile" />
+                  <i class="fa fa-li fa-mobile"/>
                   <p class="chill-no-data-statement">
                     {{ trans(RENDERBOX_NO_DATA) }}
                   </p>
                 </li>
                 <li v-if="person.phonenumber">
-                  <i class="fa fa-li fa-phone" />
+                  <i class="fa fa-li fa-phone"/>
                   <a :href="'tel: ' + person.phonenumber">
                     {{ person.phonenumber }}
                   </a>
                 </li>
                 <li v-else-if="options.addNoData">
-                  <i class="fa fa-li fa-phone" />
+                  <i class="fa fa-li fa-phone"/>
                   <p class="chill-no-data-statement">
                     {{ trans(RENDERBOX_NO_DATA) }}
                   </p>
@@ -246,25 +187,25 @@
                     options.addCenter
                   "
                 >
-                  <i class="fa fa-li fa-long-arrow-right" />
+                  <i class="fa fa-li fa-long-arrow-right"/>
                   <template v-for="c in person.centers">
                     {{ c.name }}
                   </template>
                 </li>
                 <li v-else-if="options.addNoData">
-                  <i class="fa fa-li fa-long-arrow-right" />
+                  <i class="fa fa-li fa-long-arrow-right"/>
                   <p class="chill-no-data-statement">
                     {{ trans(RENDERBOX_NO_DATA) }}
                   </p>
                 </li>
-                <slot name="custom-zone" />
+                <slot name="custom-zone"/>
               </ul>
             </div>
           </div>
         </div>
       </div>
 
-      <slot name="end-bloc" />
+      <slot name="end-bloc"/>
     </section>
   </div>
 
@@ -278,11 +219,11 @@
         class="fa-stack fa-holder"
         :title="trans(RENDERBOX_HOLDER)"
       >
-        <i class="fa fa-circle fa-stack-1x text-success" />
+        <i class="fa fa-circle fa-stack-1x text-success"/>
         <i class="fa fa-stack-1x">T</i>
       </span>
 
-      <person-text :person="person" />
+      <person-text :person="person"/>
     </a>
     <span v-else>
       <span
@@ -290,18 +231,18 @@
         class="fa-stack fa-holder"
         :title="trans(RENDERBOX_HOLDER)"
       >
-        <i class="fa fa-circle fa-stack-1x text-success" />
+        <i class="fa fa-circle fa-stack-1x text-success"/>
         <i class="fa fa-stack-1x">T</i>
       </span>
-      <person-text :person="person" />
+      <person-text :person="person"/>
     </span>
-    <slot name="post-badge" />
+    <slot name="post-badge"/>
   </span>
 </template>
 
-<script setup>
-import { computed } from "vue";
-import { ISOToDate } from "ChillMainAssets/chill/js/date";
+<script setup lang="ts">
+import {computed} from "vue";
+import {ISOToDate} from "ChillMainAssets/chill/js/date";
 import AddressRenderBox from "ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue";
 import GenderIconRenderBox from "ChillMainAssets/vuejs/_components/Entity/GenderIconRenderBox.vue";
 import BadgeEntity from "ChillMainAssets/vuejs/_components/BadgeEntity.vue";
@@ -311,108 +252,70 @@ import {
   trans,
   RENDERBOX_HOLDER,
   RENDERBOX_NO_DATA,
-  RENDERBOX_DEATHDATE,
+  RENDERBOX_DEATHDATE_STATEMENT,
   RENDERBOX_HOUSEHOLD_WITHOUT_ADDRESS,
   RENDERBOX_RESIDENTIAL_ADDRESS,
   RENDERBOX_LOCATED_AT,
-  RENDERBOX_BIRTHDAY_MAN,
-  RENDERBOX_BIRTHDAY_WOMAN,
-  RENDERBOX_BIRTHDAY_UNKNOWN,
-  RENDERBOX_BIRTHDAY_NEUTRAL,
-  PERSONS_ASSOCIATED_SHOW_HOUSEHOLD_NUMBER,
+  RENDERBOX_BIRTHDAY_STATEMENT,
+  // PERSONS_ASSOCIATED_SHOW_HOUSEHOLD_NUMBER,
   RENDERBOX_YEARS_OLD,
 } from "translator";
+import {Person} from "ChillPersonAssets/types";
+import {toGenderTranslation} from "ChillMainAssets/lib/api/genderHelper";
 
-const props = defineProps({
-  person: {
-    required: true,
-  },
-  options: {
-    type: Object,
-    required: false,
-  },
-  render: {
-    type: String,
-  },
-  returnPath: {
-    type: String,
-  },
-  showResidentialAddresses: {
-    type: Boolean,
-    default: false,
-  },
+interface RenderOptions {
+  addInfo?: boolean;
+  addEntity?: boolean;
+  addAltNames?: boolean;
+  addAge?: boolean;
+  addId?: boolean;
+  addLink?: boolean;
+  hLevel?: number;
+  entityDisplayLong?: boolean;
+  addCenter?: boolean;
+  addNoData?: boolean;
+  isMultiline?: boolean;
+  isHolder?: boolean;
+  addHouseholdLink?: boolean;
+}
+
+interface Props {
+  person: Person;
+  options?: RenderOptions;
+  render?: "bloc" | "badge";
+  returnPath?: string;
+  showResidentialAddresses?: boolean;
+}
+
+const props = withDefaults(defineProps<Props>(), {
+  render: "bloc",
+  options: () => ({
+    addInfo: true,
+    addEntity: false,
+    addAltNames: true,
+    addAge: true,
+    addId: true,
+    addLink: false,
+    hLevel: 3,
+    entityDisplayLong: true,
+    addCenter: true,
+    addNoData: true,
+    isMultiline: true,
+    isHolder: false,
+    addHouseholdLink: true
+  }),
 });
 
-const birthdateTranslation = computed(() => {
-  if (props.person.gender) {
-    const { genderTranslation } = props.person.gender;
-    switch (genderTranslation) {
-      case "man":
-        return RENDERBOX_BIRTHDAY_MAN;
-      case "woman":
-        return RENDERBOX_BIRTHDAY_WOMAN;
-      case "neutral":
-        return RENDERBOX_BIRTHDAY_NEUTRAL;
-      case "unknown":
-        return RENDERBOX_BIRTHDAY_UNKNOWN;
-      default:
-        return RENDERBOX_BIRTHDAY_UNKNOWN;
-    }
-  } else {
-    return RENDERBOX_BIRTHDAY_UNKNOWN;
-  }
-});
-
-const isMultiline = computed(() => {
+const isMultiline = computed<boolean>(() => {
   return props.options?.isMultiline || false;
 });
 
-const birthdate = computed(() => {
-  if (
-    props.person.birthdate !== null &&
-    props.person.birthdate !== undefined &&
-    props.person.birthdate.datetime
-  ) {
-    return ISOToDate(props.person.birthdate.datetime);
-  } else {
-    return "";
-  }
-});
-
-const deathdate = computed(() => {
-  if (
-    props.person.deathdate !== null &&
-    props.person.deathdate !== undefined &&
-    props.person.deathdate.datetime
-  ) {
-    return new Date(props.person.deathdate.datetime);
-  } else {
-    return "";
-  }
-});
-
-const altNameLabel = computed(() => {
-  let altNameLabel = "";
-  (props.person.altNames || []).forEach(
-    (altName) => (altNameLabel += altName.label),
-  );
-  return altNameLabel;
-});
-
-const altNameKey = computed(() => {
-  let altNameKey = "";
-  (props.person.altNames || []).forEach(
-    (altName) => (altNameKey += altName.key),
-  );
-  return altNameKey;
-});
-
-const getUrl = computed(() => {
+const getUrl = computed<string>(() => {
   return `/fr/person/${props.person.id}/general`;
 });
 
-const getCurrentHouseholdUrl = computed(() => {
-  let returnPath = props.returnPath ? `?returnPath=${props.returnPath}` : ``;
+const getCurrentHouseholdUrl = computed<string>(() => {
+  const returnPath = props.returnPath ? `?returnPath=${props.returnPath}` : ``;
   return `/fr/person/household/${props.person.current_household_id}/summary${returnPath}`;
 });
 </script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonText.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonText.vue
index 10302ee30..69cbba082 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonText.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonText.vue
@@ -1,13 +1,7 @@
 <template>
   <span v-if="isCut">{{ cutText }}</span>
   <span v-else class="person-text">
-    <span class="firstname">{{ person.firstName }}</span>
-    <span class="lastname">&nbsp;{{ person.lastName }}</span>
-    <span v-if="person.altNames && person.altNames.length > 0" class="altnames">
-      <span :class="'altname altname-' + altNameKey"
-        >&nbsp;({{ altNameLabel }})</span
-      >
-    </span>
+    <span>{{ person.text }}</span>
     <span v-if="person.suffixText" class="suffixtext"
       >&nbsp;{{ person.suffixText }}</span
     >
@@ -33,16 +27,6 @@ const props = defineProps<{
 
 const { person, isCut = false, addAge = true } = toRefs(props);
 
-const altNameLabel = computed(() => {
-  if (!person.value.altNames) return "";
-  return person.value.altNames.map((a: AltName) => a.label).join("");
-});
-
-const altNameKey = computed(() => {
-  if (!person.value.altNames) return "";
-  return person.value.altNames.map((a: AltName) => a.key).join("");
-});
-
 const cutText = computed(() => {
   if (!person.value.text) return "";
   const more = person.value.text.length > 15 ? "…" : "";
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
index 3a93a305d..d2f9d33a5 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="action === 'show'">
+  <div v-if="action === 'show' && person !== null">
     <div class="flex-table">
       <person-render-box
         render="bloc"
@@ -21,446 +21,49 @@
     </div>
   </div>
 
-  <div v-else-if="action === 'edit' || action === 'create'">
-    <div class="form-floating mb-3">
-      <input
-        class="form-control form-control-lg"
-        id="lastname"
-        v-model="lastName"
-        :placeholder="trans(PERSON_MESSAGES_PERSON_LASTNAME)"
-        @change="checkErrors"
-      />
-      <label for="lastname">{{ trans(PERSON_MESSAGES_PERSON_LASTNAME) }}</label>
-    </div>
-
-    <div v-if="queryItems">
-      <ul class="list-suggest add-items inline">
-        <li
-          v-for="(qi, i) in queryItems"
-          :key="i"
-          @click="addQueryItem('lastName', qi)"
-        >
-          <span class="person-text">{{ qi }}</span>
-        </li>
-      </ul>
-    </div>
-
-    <div class="form-floating mb-3">
-      <input
-        class="form-control form-control-lg"
-        id="firstname"
-        v-model="firstName"
-        :placeholder="trans(PERSON_MESSAGES_PERSON_FIRSTNAME)"
-        @change="checkErrors"
-      />
-      <label for="firstname">{{
-        trans(PERSON_MESSAGES_PERSON_FIRSTNAME)
-      }}</label>
-    </div>
-
-    <div v-if="queryItems">
-      <ul class="list-suggest add-items inline">
-        <li
-          v-for="(qi, i) in queryItems"
-          :key="i"
-          @click="addQueryItem('firstName', qi)"
-        >
-          <span class="person-text">{{ qi }}</span>
-        </li>
-      </ul>
-    </div>
-
-    <div
-      v-for="(a, i) in config.altNames"
-      :key="a.key"
-      class="form-floating mb-3"
-    >
-      <input
-        class="form-control form-control-lg"
-        :id="a.key"
-        :value="personAltNamesLabels[i]"
-        @input="onAltNameInput"
-      />
-      <label :for="a.key">{{ localizeString(a.labels) }}</label>
-    </div>
-
-    <!--  TODO fix placeholder if undefined
-   -->
-    <div class="form-floating mb-3">
-      <select class="form-select form-select-lg" id="gender" v-model="gender">
-        <option selected disabled>
-          {{ trans(PERSON_MESSAGES_PERSON_GENDER_PLACEHOLDER) }}
-        </option>
-        <option v-for="g in config.genders" :value="g.id" :key="g.id">
-          {{ g.label }}
-        </option>
-      </select>
-      <label>{{ trans(PERSON_MESSAGES_PERSON_GENDER_TITLE) }}</label>
-    </div>
-
-    <div
-      class="form-floating mb-3"
-      v-if="showCenters && config.centers.length > 1"
-    >
-      <select class="form-select form-select-lg" id="center" v-model="center">
-        <option selected disabled>
-          {{ trans(PERSON_MESSAGES_PERSON_CENTER_PLACEHOLDER) }}
-        </option>
-        <option v-for="c in config.centers" :value="c" :key="c.id">
-          {{ c.name }}
-        </option>
-      </select>
-      <label>{{ trans(PERSON_MESSAGES_PERSON_CENTER_TITLE) }}</label>
-    </div>
-
-    <div class="form-floating mb-3">
-      <select
-        class="form-select form-select-lg"
-        id="civility"
-        v-model="civility"
-      >
-        <option selected disabled>
-          {{ trans(PERSON_MESSAGES_PERSON_CIVILITY_PLACEHOLDER) }}
-        </option>
-        <option v-for="c in config.civilities" :value="c.id" :key="c.id">
-          {{ localizeString(c.name) }}
-        </option>
-      </select>
-      <label>{{ trans(PERSON_MESSAGES_PERSON_CIVILITY_TITLE) }}</label>
-    </div>
-
-    <div class="input-group mb-3">
-      <span class="input-group-text" id="phonenumber">
-        <i class="fa fa-fw fa-phone"></i>
-      </span>
-      <input
-        class="form-control form-control-lg"
-        v-model="phonenumber"
-        :placeholder="trans(PERSON_MESSAGES_PERSON_PHONENUMBER)"
-        :aria-label="trans(PERSON_MESSAGES_PERSON_PHONENUMBER)"
-        aria-describedby="phonenumber"
-      />
-    </div>
-
-    <div class="input-group mb-3">
-      <span class="input-group-text" id="mobilenumber">
-        <i class="fa fa-fw fa-mobile"></i>
-      </span>
-      <input
-        class="form-control form-control-lg"
-        v-model="mobilenumber"
-        :placeholder="trans(PERSON_MESSAGES_PERSON_MOBILENUMBER)"
-        :aria-label="trans(PERSON_MESSAGES_PERSON_MOBILENUMBER)"
-        aria-describedby="mobilenumber"
-      />
-    </div>
-
-    <div class="input-group mb-3">
-      <span class="input-group-text" id="email">
-        <i class="fa fa-fw fa-at"></i>
-      </span>
-      <input
-        class="form-control form-control-lg"
-        v-model="email"
-        :placeholder="trans(PERSON_MESSAGES_PERSON_EMAIL)"
-        :aria-label="trans(PERSON_MESSAGES_PERSON_EMAIL)"
-        aria-describedby="email"
-      />
-    </div>
-
-    <div v-if="action === 'create'" class="input-group mb-3 form-check">
-      <input
-        class="form-check-input"
-        type="checkbox"
-        v-model="showAddressForm"
-        name="showAddressForm"
-      />
-      <label class="form-check-label">
-        {{ trans(PERSON_MESSAGES_PERSON_ADDRESS_SHOW_ADDRESS_FORM) }}
-      </label>
-    </div>
-    <div
-      v-if="action === 'create' && showAddressFormValue"
-      class="form-floating mb-3"
-    >
-      <p>{{ trans(PERSON_MESSAGES_PERSON_ADDRESS_WARNING) }}</p>
-      <AddAddress
-        :context="addAddress.context"
-        :options="addAddress.options"
-        :addressChangedCallback="submitNewAddress"
-        ref="addAddress"
-      />
-    </div>
-
-    <div class="alert alert-warning" v-if="errors.length">
-      <ul>
-        <li v-for="(e, i) in errors" :key="i">{{ e }}</li>
-      </ul>
-    </div>
+  <div v-else-if="props.action === 'edit' || props.action === 'create'">
+    <PersonEdit
+      :id="props.id"
+      :type="props.type"
+      :action="props.action"
+      :query="props.query"
+    />
   </div>
 </template>
-<script setup>
-import { ref, reactive, computed, onMounted } from "vue";
-import {
-  getCentersForPersonCreation,
-  getCivilities,
-  getGenders,
-  getPerson,
-  getPersonAltNames,
-} from "../../_api/OnTheFly";
+<script setup lang="ts">
+import { ref, onMounted } from "vue";
+import { getPerson } from "../../_api/OnTheFly";
 import PersonRenderBox from "../Entity/PersonRenderBox.vue";
-import AddAddress from "ChillMainAssets/vuejs/Address/components/AddAddress.vue";
-import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
-import {
-  trans,
-  PERSON_MESSAGES_PERSON_LASTNAME,
-  PERSON_MESSAGES_PERSON_FIRSTNAME,
-  PERSON_MESSAGES_PERSON_GENDER_PLACEHOLDER,
-  PERSON_MESSAGES_PERSON_GENDER_TITLE,
-  PERSON_MESSAGES_PERSON_CENTER_PLACEHOLDER,
-  PERSON_MESSAGES_PERSON_CENTER_TITLE,
-  PERSON_MESSAGES_PERSON_CIVILITY_PLACEHOLDER,
-  PERSON_MESSAGES_PERSON_CIVILITY_TITLE,
-  PERSON_MESSAGES_PERSON_PHONENUMBER,
-  PERSON_MESSAGES_PERSON_MOBILENUMBER,
-  PERSON_MESSAGES_PERSON_EMAIL,
-  PERSON_MESSAGES_PERSON_ADDRESS_SHOW_ADDRESS_FORM,
-  PERSON_MESSAGES_PERSON_ADDRESS_WARNING,
-} from "translator";
+import PersonEdit from "./PersonEdit.vue";
+import type { Person } from "ChillPersonAssets/types";
 
-const props = defineProps({
-  id: [String, Number],
-  type: String,
-  action: String,
-  query: String,
-});
-
-const person = reactive({
-  type: "person",
-  lastName: "",
-  firstName: "",
-  altNames: [],
-  addressId: null,
-  center: null,
-  gender: null,
-  civility: null,
-  birthdate: null,
-  phonenumber: "",
-  mobilenumber: "",
-  email: "",
-});
-
-const config = reactive({
-  altNames: [],
-  civilities: [],
-  centers: [],
-  genders: [],
-});
-
-const showCenters = ref(false);
-const showAddressFormValue = ref(false);
-const errors = ref([]);
-
-const addAddress = reactive({
-  options: {
-    button: {
-      text: { create: "person.address.create_address" },
-      size: "btn-sm",
-    },
-    title: { create: "person.address.create_address" },
-  },
-  context: {
-    target: {},
-    edit: false,
-    addressId: null,
-    defaults: window.addaddress,
-  },
-});
-
-const firstName = computed({
-  get: () => person.firstName,
-  set: (value) => {
-    person.firstName = value;
-  },
-});
-const lastName = computed({
-  get: () => person.lastName,
-  set: (value) => {
-    person.lastName = value;
-  },
-});
-const gender = computed({
-  get: () => (person.gender ? person.gender.id : null),
-  set: (value) => {
-    person.gender = { id: value, type: "chill_main_gender" };
-  },
-});
-const civility = computed({
-  get: () => (person.civility ? person.civility.id : null),
-  set: (value) => {
-    person.civility = { id: value, type: "chill_main_civility" };
-  },
-});
-const birthDate = computed({
-  get: () => (person.birthdate ? person.birthdate.datetime.split("T")[0] : ""),
-  set: (value) => {
-    if (person.birthdate) {
-      person.birthdate.datetime = value + "T00:00:00+0100";
-    } else {
-      person.birthdate = { datetime: value + "T00:00:00+0100" };
-    }
-  },
-});
-const phonenumber = computed({
-  get: () => person.phonenumber,
-  set: (value) => {
-    person.phonenumber = value;
-  },
-});
-const mobilenumber = computed({
-  get: () => person.mobilenumber,
-  set: (value) => {
-    person.mobilenumber = value;
-  },
-});
-const email = computed({
-  get: () => person.email,
-  set: (value) => {
-    person.email = value;
-  },
-});
-const showAddressForm = computed({
-  get: () => showAddressFormValue.value,
-  set: (value) => {
-    showAddressFormValue.value = value;
-  },
-});
-const center = computed({
-  get: () => {
-    const c = config.centers.find(
-      (c) => person.center !== null && person.center.id === c.id,
-    );
-    return typeof c === "undefined" ? null : c;
-  },
-  set: (value) => {
-    person.center = { id: value.id, type: value.type };
-  },
-});
-
-const genderClass = computed(() => {
-  switch (person.gender && person.gender.id) {
-    case "woman":
-      return "fa-venus";
-    case "man":
-      return "fa-mars";
-    case "both":
-      return "fa-neuter";
-    case "unknown":
-      return "fa-genderless";
-    default:
-      return "fa-genderless";
-  }
-});
-
-const genderTranslation = computed(() => {
-  switch (person.gender && person.gender.genderTranslation) {
-    case "woman":
-      return PERSON_MESSAGES_PERSON_GENDER_WOMAN;
-    case "man":
-      return PERSON_MESSAGES_PERSON_GENDER_MAN;
-    case "neutral":
-      return PERSON_MESSAGES_PERSON_GENDER_NEUTRAL;
-    case "unknown":
-      return PERSON_MESSAGES_PERSON_GENDER_UNKNOWN;
-    default:
-      return PERSON_MESSAGES_PERSON_GENDER_UNKNOWN;
-  }
-});
-const feminized = computed(() =>
-  person.gender && person.gender.id === "woman" ? "e" : "",
-);
-const personAltNamesLabels = computed(() =>
-  person.altNames.map((a) => (a ? a.label : "")),
-);
-const queryItems = computed(() =>
-  props.query ? props.query.split(" ") : null,
-);
-
-function checkErrors() {
-  errors.value = [];
-  if (person.lastName === "") {
-    errors.value.push("Le nom ne doit pas être vide.");
-  }
-  if (person.firstName === "") {
-    errors.value.push("Le prénom ne doit pas être vide.");
-  }
-  if (!person.gender) {
-    errors.value.push("Le genre doit être renseigné");
-  }
-  if (showCenters.value && person.center === null) {
-    errors.value.push("Le centre doit être renseigné");
-  }
+interface Props {
+  id: number;
+  type?: string;
+  action: "show" | "edit" | "create";
+  query?: string;
 }
 
-function loadData() {
-  getPerson(props.id).then((p) => {
-    Object.assign(person, p);
+const props = withDefaults(defineProps<Props>(), {query: ""});
+
+const person = ref<Person | null>(null);
+
+function loadData(): void {
+  if (props.id === undefined || props.id === null) {
+    return;
+  }
+  const idNum = props.id;
+  if (!Number.isFinite(idNum)) {
+    return;
+  }
+  getPerson(idNum as number).then((p) => {
+    person.value = p;
   });
 }
 
-function onAltNameInput(event) {
-  const key = event.target.id;
-  const label = event.target.value;
-  let updateAltNames = person.altNames.filter((a) => a.key !== key);
-  updateAltNames.push({ key: key, label: label });
-  person.altNames = updateAltNames;
-}
-
-function addQueryItem(field, queryItem) {
-  switch (field) {
-    case "lastName":
-      person.lastName = person.lastName
-        ? (person.lastName += ` ${queryItem}`)
-        : queryItem;
-      break;
-    case "firstName":
-      person.firstName = person.firstName
-        ? (person.firstName += ` ${queryItem}`)
-        : queryItem;
-      break;
-  }
-}
-
-function submitNewAddress(payload) {
-  person.addressId = payload.addressId;
-}
-
 onMounted(() => {
-  getPersonAltNames().then((altNames) => {
-    config.altNames = altNames;
-  });
-  getCivilities().then((civilities) => {
-    if ("results" in civilities) {
-      config.civilities = civilities.results;
-    }
-  });
-  getGenders().then((genders) => {
-    if ("results" in genders) {
-      config.genders = genders.results;
-    }
-  });
   if (props.action !== "create") {
     loadData();
-  } else {
-    getCentersForPersonCreation().then((params) => {
-      config.centers = params.centers.filter((c) => c.isActive);
-      showCenters.value = params.showCenters;
-      if (showCenters.value && config.centers.length === 1) {
-        person.center = config.centers[0];
-      }
-    });
   }
 });
-
-defineExpose(genderClass, genderTranslation, feminized, birthDate);
 </script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/PersonEdit.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/PersonEdit.vue
new file mode 100644
index 000000000..f131b4c6f
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/PersonEdit.vue
@@ -0,0 +1,695 @@
+<template>
+  <div v-if="action === 'create' || (action === 'edit' && dataLoaded)">
+    <div class="mb-3">
+      <div class="input-group has-validation">
+        <div class="form-floating">
+          <input
+            class="form-control form-control-lg"
+            :class="{ 'is-invalid': violations.hasViolation('lastName') }"
+            id="lastname"
+            v-model="lastName"
+            :placeholder="trans(PERSON_MESSAGES_PERSON_LASTNAME)"
+          />
+          <label for="lastname" class="required">{{
+            trans(PERSON_MESSAGES_PERSON_LASTNAME)
+          }}</label>
+        </div>
+      </div>
+      <div
+        v-for="err in violations.violationTitles('lastName')"
+        class="invalid-feedback was-validated-force"
+      >
+        {{ err }}
+      </div>
+    </div>
+
+    <div v-if="queryItems">
+      <ul class="list-suggest add-items inline">
+        <li
+          v-for="(qi, i) in queryItems"
+          :key="i"
+          @click="addQueryItem('lastName', qi)"
+        >
+          <span class="person-text">{{ qi }}</span>
+        </li>
+      </ul>
+    </div>
+
+    <div class="mb-3">
+      <div class="input-group has-validation">
+        <div class="form-floating">
+          <input
+            class="form-control form-control-lg"
+            :class="{ 'is-invalid': violations.hasViolation('firstName') }"
+            id="firstname"
+            v-model="firstName"
+            :placeholder="trans(PERSON_MESSAGES_PERSON_FIRSTNAME)"
+          />
+          <label for="firstname" class="required">{{
+            trans(PERSON_MESSAGES_PERSON_FIRSTNAME)
+          }}</label>
+        </div>
+      </div>
+      <div
+        v-for="err in violations.violationTitles('firstName')"
+        class="invalid-feedback was-validated-force"
+      >
+        {{ err }}
+      </div>
+    </div>
+
+    <div v-if="queryItems">
+      <ul class="list-suggest add-items inline">
+        <li
+          v-for="(qi, i) in queryItems"
+          :key="i"
+          @click="addQueryItem('firstName', qi)"
+        >
+          <span class="person-text">{{ qi }}</span>
+        </li>
+      </ul>
+    </div>
+
+    <template v-if="action === 'create'">
+      <div v-for="(a, i) in config.altNames" :key="a.key" class="mb-3">
+        <div class="input-group has-validation">
+          <div class="form-floating">
+            <input
+              class="form-control form-control-lg"
+              :id="a.key"
+              :name="'label_' + a.key"
+              value=""
+              @input="onAltNameInput($event, a.key)"
+            />
+            <label :for="'label_' + a.key">{{ localizeString(a.labels) }}</label>
+          </div>
+        </div>
+      </div>
+
+    </template>
+
+    <template v-if="action === 'create'">
+      <div
+        v-for="worker in config.identifiers"
+        :key="worker.definition_id"
+        class="mb-3"
+      >
+        <div class="input-group has-validation">
+          <div class="form-floating">
+            <input
+              class="form-control form-control-lg"
+              :class="{'is-invalid': violations.hasViolationWithParameter('identifiers', 'definition_id', worker.definition_id.toString())}"
+              type="text"
+              :name="'worker_' + worker.definition_id"
+              :placeholder="localizeString(worker.label)"
+              @input="onIdentifierInput($event, worker.definition_id)"
+            />
+            <label :for="'worker_' + worker.definition_id" :class="{required: worker.presence == 'REQUIRED'}">{{
+                localizeString(worker.label)
+              }}</label>
+          </div>
+          <div
+            v-for="err in violations.violationTitlesWithParameter('identifiers', 'definition_id', worker.definition_id.toString())"
+            class="invalid-feedback was-validated-force"
+          >
+            {{ err }}
+          </div>
+        </div>
+      </div>
+    </template>
+
+    <div class="mb-3">
+      <div class="input-group has-validation">
+        <div class="form-floating">
+          <select
+            class="form-select form-select-lg"
+            :class="{ 'is-invalid': violations.hasViolation('gender') }"
+            id="gender"
+            v-model="gender"
+          >
+            <option selected disabled>
+              {{ trans(PERSON_MESSAGES_PERSON_GENDER_PLACEHOLDER) }}
+            </option>
+            <option v-for="g in config.genders" :value="g.id" :key="g.id">
+              {{ g.label }}
+            </option>
+          </select>
+          <label for="gender" class="required">{{
+            trans(PERSON_MESSAGES_PERSON_GENDER_TITLE)
+          }}</label>
+        </div>
+        <div
+          v-for="err in violations.violationTitles('gender')"
+          class="invalid-feedback was-validated-force"
+        >
+          {{ err }}
+        </div>
+      </div>
+    </div>
+
+    <div class="mb-3" v-if="showCenters && config.centers.length > 1">
+      <div class="input-group">
+        <div class="form-floating">
+          <select
+            class="form-select form-select-lg"
+            :class="{ 'is-invalid': violations.hasViolation('center') }"
+            id="center"
+            v-model="center"
+          >
+            <option selected disabled>
+              {{ trans(PERSON_MESSAGES_PERSON_CENTER_PLACEHOLDER) }}
+            </option>
+            <option v-for="c in config.centers" :value="c" :key="c.id">
+              {{ c.name }}
+            </option>
+          </select>
+          <label for="center" class="required">{{ trans(PERSON_MESSAGES_PERSON_CENTER_TITLE) }}</label>
+        </div>
+        <div
+          v-for="err in violations.violationTitles('center')"
+          class="invalid-feedback was-validated-force"
+        >
+          {{ err }}
+        </div>
+      </div>
+    </div>
+
+    <div class="mb-3">
+      <div class="input-group has-validation">
+        <div class="form-floating">
+          <select
+            class="form-select form-select-lg"
+            :class="{ 'is-invalid': violations.hasViolation('civility') }"
+            id="civility"
+            v-model="civility"
+          >
+            <option selected disabled>
+              {{ trans(PERSON_MESSAGES_PERSON_CIVILITY_PLACEHOLDER) }}
+            </option>
+            <option v-for="c in config.civilities" :value="c.id" :key="c.id">
+              {{ localizeString(c.name) }}
+            </option>
+          </select>
+          <label for="civility">{{ trans(PERSON_MESSAGES_PERSON_CIVILITY_TITLE) }}</label>
+        </div>
+        <div
+          v-for="err in violations.violationTitles('civility')"
+          class="invalid-feedback was-validated-force"
+        >
+          {{ err }}
+        </div>
+      </div>
+    </div>
+
+    <div class="mb-3">
+      <div class="input-group has-validation">
+        <span class="input-group-text">
+          <i class="bi bi-cake2-fill"></i>
+        </span>
+        <div class="form-floating">
+          <input
+            class="form-control form-control-lg"
+            :class="{ 'is-invalid': violations.hasViolation('birthdate') }"
+            name="birthdate"
+            type="date"
+            v-model="birthDate"
+            :placeholder="trans(BIRTHDATE)"
+            :aria-label="trans(BIRTHDATE)"
+            />
+          <label for="birthdate">{{ trans(BIRTHDATE) }}</label>
+        </div>
+        <div
+          v-for="err in violations.violationTitles('birthdate')"
+          class="invalid-feedback was-validated-force"
+        >
+          {{ err }}
+        </div>
+      </div>
+    </div>
+
+    <div class="mb-3">
+      <div class="input-group has-validation">
+        <span class="input-group-text" id="phonenumber">
+          <i class="fa fa-fw fa-phone"></i>
+        </span>
+        <div class="form-floating">
+          <input
+            class="form-control form-control-lg"
+            :class="{ 'is-invalid': violations.hasViolation('phonenumber') }"
+            v-model="phonenumber"
+            :placeholder="trans(PERSON_MESSAGES_PERSON_PHONENUMBER)"
+            :aria-label="trans(PERSON_MESSAGES_PERSON_PHONENUMBER)"
+            aria-describedby="phonenumber"
+          />
+          <label for="phonenumber">{{ trans(PERSON_MESSAGES_PERSON_PHONENUMBER) }}</label>
+        </div>
+        <div
+          v-for="err in violations.violationTitles('phonenumber')"
+          class="invalid-feedback was-validated-force"
+        >
+          {{ err }}
+        </div>
+      </div>
+    </div>
+
+    <div class="mb-3">
+      <div class="input-group has-validation">
+        <span class="input-group-text" id="mobilenumber">
+          <i class="fa fa-fw fa-mobile"></i>
+        </span>
+        <div class="form-floating">
+          <input
+            class="form-control form-control-lg"
+            :class="{ 'is-invalid': violations.hasViolation('mobilenumber') }"
+            v-model="mobilenumber"
+            :placeholder="trans(PERSON_MESSAGES_PERSON_MOBILENUMBER)"
+            :aria-label="trans(PERSON_MESSAGES_PERSON_MOBILENUMBER)"
+            aria-describedby="mobilenumber"
+          />
+          <label for="mobilenumber">{{ trans(PERSON_MESSAGES_PERSON_MOBILENUMBER) }}</label>
+        </div>
+        <div
+          v-for="err in violations.violationTitles('mobilenumber')"
+          class="invalid-feedback was-validated-force"
+        >
+          {{ err }}
+        </div>
+      </div>
+    </div>
+
+    <div class="mb-3">
+      <div class="input-group has-validation">
+        <span class="input-group-text" id="email">
+          <i class="fa fa-fw fa-at"></i>
+        </span>
+        <div class="form-floating">
+          <input
+            class="form-control form-control-lg"
+            :class="{ 'is-invalid': violations.hasViolation('email') }"
+            v-model="email"
+            :placeholder="trans(PERSON_MESSAGES_PERSON_EMAIL)"
+            :aria-label="trans(PERSON_MESSAGES_PERSON_EMAIL)"
+            aria-describedby="email"
+          />
+          <label for="email">{{ trans(PERSON_MESSAGES_PERSON_EMAIL) }}</label>
+        </div>
+        <div
+          v-for="err in violations.violationTitles('email')"
+          class="invalid-feedback was-validated-force"
+        >
+          {{ err }}
+        </div>
+      </div>
+    </div>
+
+    <div v-if="action === 'create'" class="input-group mb-3 form-check">
+      <input
+        class="form-check-input"
+        type="checkbox"
+        v-model="showAddressForm"
+        name="showAddressForm"
+      />
+      <label class="form-check-label">
+        {{ trans(PERSON_MESSAGES_PERSON_ADDRESS_SHOW_ADDRESS_FORM) }}
+      </label>
+    </div>
+
+    <div
+      v-if="action === 'create' && showAddressFormValue"
+      class="form-floating mb-3"
+    >
+      <p>{{ trans(PERSON_MESSAGES_PERSON_ADDRESS_WARNING) }}</p>
+      <AddAddress
+        :context="addAddress.context"
+        :options="addAddress.options"
+        :addressChangedCallback="submitNewAddress"
+        ref="addAddress"
+      />
+    </div>
+
+  </div>
+  <div v-else>
+
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ref, reactive, computed, onMounted } from "vue";
+import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
+import AddAddress from "ChillMainAssets/vuejs/Address/components/AddAddress.vue";
+import {
+  createPerson, editPerson,
+  getCentersForPersonCreation,
+  getCivilities,
+  getGenders,
+  getPerson,
+  getPersonAltNames,
+  getPersonIdentifiers,
+  personToWritePerson,
+  WritePersonViolationMap,
+} from "../../_api/OnTheFly";
+import {
+  trans,
+  BIRTHDATE,
+  PERSON_EDIT_ERROR_WHILE_SAVING,
+  PERSON_MESSAGES_PERSON_LASTNAME,
+  PERSON_MESSAGES_PERSON_FIRSTNAME,
+  PERSON_MESSAGES_PERSON_GENDER_PLACEHOLDER,
+  PERSON_MESSAGES_PERSON_GENDER_TITLE,
+  PERSON_MESSAGES_PERSON_CENTER_PLACEHOLDER,
+  PERSON_MESSAGES_PERSON_CENTER_TITLE,
+  PERSON_MESSAGES_PERSON_CIVILITY_PLACEHOLDER,
+  PERSON_MESSAGES_PERSON_CIVILITY_TITLE,
+  PERSON_MESSAGES_PERSON_PHONENUMBER,
+  PERSON_MESSAGES_PERSON_MOBILENUMBER,
+  PERSON_MESSAGES_PERSON_EMAIL,
+  PERSON_MESSAGES_PERSON_ADDRESS_SHOW_ADDRESS_FORM,
+  PERSON_MESSAGES_PERSON_ADDRESS_WARNING,
+} from "translator";
+import {
+  Center,
+  Civility,
+  Gender,
+} from "ChillMainAssets/types";
+import {
+  AltName,
+  Person,
+  PersonWrite,
+  PersonIdentifierWorker,
+} from "ChillPersonAssets/types";
+import {
+  isValidationException,
+} from "ChillMainAssets/lib/api/apiMethods";
+import {useToast} from "vue-toast-notification";
+import {getTimezoneOffsetString, ISOToDate} from "ChillMainAssets/chill/js/date";
+import {useViolationList} from "ChillMainAssets/vuejs/_composables/violationList";
+
+interface PersonEditComponentConfig {
+  id?: number | null;
+  action: "edit" | "create";
+  query: string;
+}
+
+const props = withDefaults(defineProps<PersonEditComponentConfig>(), {
+  id: null,
+});
+
+const emit =
+  defineEmits<(e: "onPersonCreated", payload: { person: Person }) => void>();
+
+defineExpose({ postPerson });
+
+const toast = useToast();
+
+const person = reactive<PersonWrite>({
+  type: "person",
+  firstName: "",
+  lastName: "",
+  altNames: [],
+  addressId: null,
+  birthdate: null,
+  deathdate: null,
+  phonenumber: "",
+  mobilenumber: "",
+  email: "",
+  gender: null,
+  center: null,
+  civility: null,
+  identifiers: [],
+});
+
+const config = reactive<{
+  altNames: AltName[];
+  civilities: Civility[];
+  centers: Center[];
+  genders: Gender[];
+  identifiers: PersonIdentifierWorker[];
+}>({
+  altNames: [],
+  civilities: [],
+  centers: [],
+  genders: [],
+  identifiers: [],
+});
+
+const showCenters = ref(false);
+const showAddressFormValue = ref(false);
+
+const addAddress = reactive({
+  options: {
+    button: {
+      text: { create: "person.address.create_address" },
+      size: "btn-sm",
+    },
+    title: { create: "person.address.create_address" },
+  },
+  context: {
+    target: {},
+    edit: false,
+    addressId: null as number | null,
+    defaults: (window as any).addaddress,
+  },
+});
+
+const firstName = computed({
+  get: () => person.firstName,
+  set: (value: string) => {
+    person.firstName = value;
+  },
+});
+const lastName = computed({
+  get: () => person.lastName,
+  set: (value: string) => {
+    person.lastName = value;
+  },
+});
+const gender = computed({
+  get: () => (person.gender ? person.gender.id : null),
+  set: (value: string | null) => {
+    person.gender = value
+      ? { id: Number.parseInt(value), type: "chill_main_gender" }
+      : null;
+  },
+});
+const civility = computed({
+  get: () => (person.civility ? person.civility.id : null),
+  set: (value: number | null) => {
+    person.civility =
+      value !== null ? { id: value, type: "chill_main_civility" } : null;
+  },
+});
+const birthDate = computed({
+  get: () => (person.birthdate ? person.birthdate.datetime.split("T")[0] : ""),
+  set: (value: string) => {
+    const date = ISOToDate(value);
+    if (null === date) {
+      person.birthdate = null;
+      return;
+    }
+    const offset = getTimezoneOffsetString(date, Intl.DateTimeFormat().resolvedOptions().timeZone);
+    if (person.birthdate) {
+      person.birthdate.datetime = value + "T00:00:00" + offset;
+    } else {
+      person.birthdate = { datetime: value + "T00:00:00" + offset };
+    }
+  }
+});
+const phonenumber = computed({
+  get: () => person.phonenumber,
+  set: (value: string) => {
+    person.phonenumber = value;
+  },
+});
+const mobilenumber = computed({
+  get: () => person.mobilenumber,
+  set: (value: string) => {
+    person.mobilenumber = value;
+  },
+});
+const email = computed({
+  get: () => person.email,
+  set: (value: string) => {
+    person.email = value;
+  },
+});
+const showAddressForm = computed({
+  get: () => showAddressFormValue.value,
+  set: (value: boolean) => {
+    showAddressFormValue.value = value;
+  },
+});
+const center = computed({
+  get: () => {
+    const c = config.centers.find(
+      (c) => person.center !== null && person.center.id === c.id,
+    );
+    return typeof c === "undefined" ? null : c;
+  },
+  set: (value: Center | null) => {
+    if (null !== value) {
+      person.center = {
+        id: value.id,
+        type: value.type,
+      };
+    } else {
+      person.center = null;
+    }
+  },
+});
+
+/**
+ * Find the query items to display for suggestion
+ */
+const queryItems = computed(() => {
+  const words: null | string[] = props.query ? props.query.split(" ") : null;
+
+  if (null === words) {
+    return null;
+  }
+
+  const firstNameWords = (person.firstName || "")
+    .trim()
+    .toLowerCase()
+    .split(" ");
+  const lastNameWords = (person.lastName || "").trim().toLowerCase().split(" ");
+
+  return words
+    .filter((word) => !firstNameWords.includes(word.toLowerCase()))
+    .filter((word) => !lastNameWords.includes(word.toLowerCase()));
+});
+
+const dataLoaded = ref<boolean>(false);
+
+async function loadData() {
+  if (props.id !== undefined && props.id !== null) {
+    const p = await getPerson(props.id);
+    const w = personToWritePerson(p);
+    person.firstName = w.firstName;
+    person.lastName = w.lastName;
+    person.altNames.push(...w.altNames)
+    person.civility = w.civility;
+    person.addressId = w.addressId;
+    person.birthdate = w.birthdate;
+    person.deathdate = w.deathdate;
+    person.phonenumber = w.phonenumber;
+    person.mobilenumber = w.mobilenumber;
+    person.email = w.email;
+    person.gender = w.gender;
+    person.center = w.center;
+    person.civility = w.civility;
+    person.identifiers.push(...w.identifiers);
+    dataLoaded.value = true;
+  }
+}
+
+function onAltNameInput(event: Event, key: string): void {
+  const target = event.target as HTMLInputElement;
+  const value = target.value;
+  const updateAltNamesKey = person.altNames.findIndex((a) => a.key === key);
+  if (-1 === updateAltNamesKey) {
+    person.altNames.push({ key, value });
+  } else {
+    person.altNames[updateAltNamesKey].value = value;
+  }
+}
+
+function onIdentifierInput(event: Event, definition_id: number): void {
+  const target = event.target as HTMLInputElement;
+  const value = target.value;
+  const updateIdentifierKey = person.identifiers.findIndex(
+    (w) => w.definition_id === definition_id,
+  );
+  if (-1 === updateIdentifierKey) {
+    person.identifiers.push({
+      type: "person_identifier",
+      definition_id,
+      value: { content: value },
+    });
+  } else {
+    person.identifiers[updateIdentifierKey].value = { content: value };
+  }
+}
+
+function addQueryItem(field: "lastName" | "firstName", queryItem: string) {
+  switch (field) {
+    case "lastName":
+      person.lastName = person.lastName
+        ? (person.lastName += ` ${queryItem}`)
+        : queryItem;
+      break;
+    case "firstName":
+      person.firstName = person.firstName
+        ? (person.firstName += ` ${queryItem}`)
+        : queryItem;
+      break;
+  }
+}
+
+const violations = useViolationList<WritePersonViolationMap>();
+
+function submitNewAddress(payload: { addressId: number }) {
+  person.addressId = payload.addressId;
+}
+
+async function postPerson(): Promise<Person> {
+  try {
+    if (props.action === 'create') {
+      const createdPerson = await createPerson(person);
+      emit("onPersonCreated", { person: createdPerson });
+
+      return Promise.resolve(createdPerson);
+    } else if (props.id !== null) {
+      const updatedPerson = await editPerson(person, props.id);
+      emit("onPersonCreated", { person: updatedPerson });
+
+      return Promise.resolve(updatedPerson);
+    }
+  } catch (e: unknown) {
+    if (isValidationException<WritePersonViolationMap>(e)) {
+      violations.setValidationException(e);
+    } else {
+      toast.error(trans(PERSON_EDIT_ERROR_WHILE_SAVING));
+    }
+  }
+  throw "'action' is not create, or edit with a not-null id";
+}
+
+onMounted(() => {
+  getPersonAltNames().then((altNames) => {
+    config.altNames = altNames;
+  });
+  getCivilities().then((civilities) => {
+    config.civilities = civilities;
+  });
+  getGenders().then((genders) => {
+    config.genders = genders;
+  });
+  getPersonIdentifiers().then((identifiers) => {
+    config.identifiers = identifiers.filter(
+      (w: PersonIdentifierWorker) =>
+        w.presence === 'ON_CREATION' || w.presence === 'REQUIRED'
+      );
+  });
+  if (props.action !== "create") {
+    loadData();
+  } else {
+    getCentersForPersonCreation().then((params) => {
+      config.centers = params.centers.filter((c: Center) => c.isActive);
+      showCenters.value = params.showCenters;
+      if (showCenters.value && config.centers.length === 1) {
+        // if there is only one center, preselect it
+        person.center = {
+          id: config.centers[0].id,
+          type: config.centers[0].type ?? "center",
+        };
+      }
+    });
+  }
+});
+</script>
+
+<style lang="scss" scoped>
+.was-validated-force {
+  display: block;
+}
+</style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
index 1ceb84395..5a17acf18 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/create.html.twig
@@ -88,6 +88,15 @@
             <div data-suggest-container="{{ altName.vars.full_name|e('html_attr') }}" class="col-sm-8" style="margin-left: auto;"></div>
         {% endfor %}
     {% endif %}
+    {% if form.identifiers|length > 0 %}
+        {% for f in form.identifiers %}
+            <div class="row mb-1" style="display:flex;">
+                {{ form_row(f) }}
+            </div>
+        {% endfor %}
+    {% else %}
+        {{ form_widget(form.identifiers) }}
+    {% endif %}
 
     {{ form_row(form.gender, { 'label' : 'Gender'|trans }) }}
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig
index fe5dde242..169479854 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/edit.html.twig
@@ -140,9 +140,7 @@
         <fieldset>
             <legend><h2>{{ 'person.Identifiers'|trans }}</h2></legend>
             <div>
-                {% for f in form.identifiers %}
-                    {{ form_row(f) }}
-                {% endfor %}
+                {{ form_widget(form.identifiers) }}
             </div>
         </fieldset>
     {% else %}
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonDenormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonDenormalizer.php
new file mode 100644
index 000000000..9f0464a71
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonDenormalizer.php
@@ -0,0 +1,155 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\Serializer\Normalizer;
+
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\Civility;
+use Chill\MainBundle\Entity\Gender;
+use Chill\PersonBundle\Entity\Identifier\PersonIdentifier;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Entity\PersonAltName;
+use Chill\PersonBundle\PersonIdentifier\PersonIdentifierManagerInterface;
+use libphonenumber\PhoneNumber;
+use Symfony\Component\Serializer\Exception\UnexpectedValueException;
+use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
+use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\ObjectToPopulateTrait;
+
+/**
+ * Denormalize a Person entity from a JSON-like array structure, creating or updating an existing instance.
+ *
+ * To find an existing instance by his id, see the @see{PersonJsonReadDenormalizer}.
+ */
+final class PersonJsonDenormalizer implements DenormalizerInterface, DenormalizerAwareInterface
+{
+    use DenormalizerAwareTrait;
+    use ObjectToPopulateTrait;
+
+    public function __construct(private readonly PersonIdentifierManagerInterface $personIdentifierManager) {}
+
+    public function denormalize($data, string $type, ?string $format = null, array $context = []): Person
+    {
+        $person = $this->extractObjectToPopulate($type, $context);
+
+        if (null === $person) {
+            $person = new Person();
+        }
+
+        // Setters applied directly per known field for readability
+        if (\array_key_exists('firstName', $data)) {
+            $person->setFirstName($data['firstName']);
+        }
+
+        if (\array_key_exists('lastName', $data)) {
+            $person->setLastName($data['lastName']);
+        }
+
+        if (\array_key_exists('phonenumber', $data)) {
+            $person->setPhonenumber($this->denormalizer->denormalize($data['phonenumber'], PhoneNumber::class, $format, $context));
+        }
+
+        if (\array_key_exists('mobilenumber', $data)) {
+            $person->setMobilenumber($this->denormalizer->denormalize($data['mobilenumber'], PhoneNumber::class, $format, $context));
+        }
+
+        if (\array_key_exists('gender', $data) && null !== $data['gender']) {
+            $gender = $this->denormalizer->denormalize($data['gender'], Gender::class, $format, []);
+            $person->setGender($gender);
+        }
+
+        if (\array_key_exists('birthdate', $data)) {
+            $object = $this->denormalizer->denormalize($data['birthdate'], \DateTime::class, $format, $context);
+            $person->setBirthdate($object);
+        }
+
+        if (\array_key_exists('deathdate', $data)) {
+            $object = $this->denormalizer->denormalize($data['deathdate'], \DateTimeImmutable::class, $format, $context);
+            $person->setDeathdate($object);
+        }
+
+        if (\array_key_exists('center', $data)) {
+            $object = $this->denormalizer->denormalize($data['center'], Center::class, $format, $context);
+            $person->setCenter($object);
+        }
+
+        if (\array_key_exists('altNames', $data)) {
+            foreach ($data['altNames'] as $altNameData) {
+                if (!array_key_exists('key', $altNameData)
+                    || !array_key_exists('value', $altNameData)
+                    || '' === trim((string) $altNameData['key'])
+                ) {
+                    throw new UnexpectedValueException('format for alt name is not correct');
+                }
+                $altNameKey = $altNameData['key'];
+                $altNameValue = $altNameData['value'];
+
+                $altName = $person->getAltNames()->findFirst(fn (int $key, PersonAltName $personAltName) => $personAltName->getKey() === $altNameKey);
+                if (null === $altName) {
+                    $altName = new PersonAltName();
+                    $person->addAltName($altName);
+                }
+                $altName->setKey($altNameKey)->setLabel($altNameValue);
+            }
+        }
+
+        if (\array_key_exists('identifiers', $data)) {
+            foreach ($data['identifiers'] as $identifierData) {
+                if (!array_key_exists('definition_id', $identifierData)
+                    || !array_key_exists('value', $identifierData)
+                    || !is_int($identifierData['definition_id'])
+                    || !is_array($identifierData['value'])
+                ) {
+                    throw new UnexpectedValueException('format for identifiers is not correct');
+                }
+
+                $definitionId = $identifierData['definition_id'];
+                $value = $identifierData['value'];
+
+                $worker = $this->personIdentifierManager->buildWorkerByPersonIdentifierDefinition($definitionId);
+
+                if (!$worker->getDefinition()->isEditableByUsers()) {
+                    continue;
+                }
+
+                $personIdentifier = $person->getIdentifiers()->findFirst(fn (int $key, PersonIdentifier $personIdentifier) => $personIdentifier->getDefinition()->getId() === $definitionId);
+                if (null === $personIdentifier) {
+                    $personIdentifier = new PersonIdentifier($worker->getDefinition());
+                    $person->addIdentifier($personIdentifier);
+                }
+
+                $personIdentifier->setValue($value);
+                $personIdentifier->setCanonical($worker->canonicalizeValue($value));
+
+                if ($worker->isEmpty($personIdentifier)) {
+                    $person->removeIdentifier($personIdentifier);
+                }
+            }
+        }
+
+        if (\array_key_exists('email', $data)) {
+            $person->setEmail($data['email']);
+        }
+
+        if (\array_key_exists('civility', $data) && null !== $data['civility']) {
+            $civility = $this->denormalizer->denormalize($data['civility'], Civility::class, $format, []);
+            $person->setCivility($civility);
+        }
+
+        return $person;
+    }
+
+    public function supportsDenormalization($data, $type, $format = null): bool
+    {
+        return Person::class === $type && 'person' === ($data['type'] ?? null) && !isset($data['id']);
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
index 88c38cfbb..2dcc5bdd9 100644
--- a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonNormalizer.php
@@ -11,169 +11,33 @@ declare(strict_types=1);
 
 namespace Chill\PersonBundle\Serializer\Normalizer;
 
-use Chill\MainBundle\Entity\Center;
-use Chill\MainBundle\Entity\Civility;
-use Chill\MainBundle\Entity\Gender;
 use Chill\MainBundle\Phonenumber\PhoneNumberHelperInterface;
 use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 use Chill\MainBundle\Templating\Entity\ChillEntityRenderExtension;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\PersonAltName;
-use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Repository\ResidentialAddressRepository;
 use Doctrine\Common\Collections\Collection;
-use libphonenumber\PhoneNumber;
-use Symfony\Component\Serializer\Exception\UnexpectedValueException;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
-use Symfony\Component\Serializer\Normalizer\DenormalizerAwareInterface;
-use Symfony\Component\Serializer\Normalizer\DenormalizerAwareTrait;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
-use Symfony\Component\Serializer\Normalizer\ObjectToPopulateTrait;
+use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
  * Serialize a Person entity.
  */
-class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwareInterface, PersonJsonNormalizerInterface
+class PersonJsonNormalizer implements NormalizerAwareInterface, NormalizerInterface
 {
-    use DenormalizerAwareTrait;
-
     use NormalizerAwareTrait;
 
-    use ObjectToPopulateTrait;
-
     public function __construct(
         private readonly ChillEntityRenderExtension $render,
-        /* TODO: replace by PersonRenderInterface, as sthis is the only one required */
-        private readonly PersonRepository $repository,
         private readonly CenterResolverManagerInterface $centerResolverManager,
         private readonly ResidentialAddressRepository $residentialAddressRepository,
         private readonly PhoneNumberHelperInterface $phoneNumberHelper,
+        private readonly \Chill\PersonBundle\PersonIdentifier\Rendering\PersonIdRenderingInterface $personIdRendering,
     ) {}
 
-    public function denormalize($data, $type, $format = null, array $context = [])
-    {
-        $person = $this->extractObjectToPopulate($type, $context);
-
-        if (\array_key_exists('id', $data) && null === $person) {
-            $person = $this->repository->find($data['id']);
-
-            if (null === $person) {
-                throw new UnexpectedValueException("The person with id \"{$data['id']}\" does ".'not exists');
-            }
-
-            // currently, not allowed to update a person through api
-            // if instantiated with id
-            return $person;
-        }
-
-        if (null === $person) {
-            $person = new Person();
-        }
-
-        $fields = [
-            'firstName',
-            'lastName',
-            'phonenumber',
-            'mobilenumber',
-            'gender',
-            'birthdate',
-            'deathdate',
-            'center',
-            'altNames',
-            'email',
-            'civility',
-        ];
-
-        $fields = array_filter(
-            $fields,
-            static fn (string $field): bool => \array_key_exists($field, $data)
-        );
-
-        foreach ($fields as $item) {
-            switch ($item) {
-                case 'firstName':
-                    $person->setFirstName($data[$item]);
-
-                    break;
-
-                case 'lastName':
-                    $person->setLastName($data[$item]);
-
-                    break;
-
-                case 'phonenumber':
-                    $person->setPhonenumber($this->denormalizer->denormalize($data[$item], PhoneNumber::class, $format, $context));
-
-                    break;
-
-                case 'mobilenumber':
-                    $person->setMobilenumber($this->denormalizer->denormalize($data[$item], PhoneNumber::class, $format, $context));
-
-                    break;
-
-                case 'gender':
-                    $gender = $this->denormalizer->denormalize($data[$item], Gender::class, $format, []);
-
-                    $person->setGender($gender);
-
-                    break;
-
-                case 'birthdate':
-                    $object = $this->denormalizer->denormalize($data[$item], \DateTime::class, $format, $context);
-
-                    $person->setBirthdate($object);
-
-                    break;
-
-                case 'deathdate':
-                    $object = $this->denormalizer->denormalize($data[$item], \DateTimeImmutable::class, $format, $context);
-
-                    $person->setDeathdate($object);
-
-                    break;
-
-                case 'center':
-                    $object = $this->denormalizer->denormalize($data[$item], Center::class, $format, $context);
-                    $person->setCenter($object);
-
-                    break;
-
-                case 'altNames':
-                    foreach ($data[$item] as $altName) {
-                        $oldAltName = $person
-                            ->getAltNames()
-                            ->filter(static fn (PersonAltName $n): bool => $n->getKey() === $altName['key'])->first();
-
-                        if (false === $oldAltName) {
-                            $newAltName = new PersonAltName();
-                            $newAltName->setKey($altName['key']);
-                            $newAltName->setLabel($altName['label']);
-                            $person->addAltName($newAltName);
-                        } else {
-                            $oldAltName->setLabel($altName['label']);
-                        }
-                    }
-
-                    break;
-
-                case 'email':
-                    $person->setEmail($data[$item]);
-
-                    break;
-
-                case 'civility':
-                    $civility = $this->denormalizer->denormalize($data[$item], Civility::class, $format, []);
-
-                    $person->setCivility($civility);
-
-                    break;
-            }
-        }
-
-        return $person;
-    }
-
     /**
      * @param Person      $person
      * @param string|null $format
@@ -204,6 +68,8 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
             'email' => $person->getEmail(),
             'gender' => $this->normalizer->normalize($person->getGender(), $format, $context),
             'civility' => $this->normalizer->normalize($person->getCivility(), $format, $context),
+            'personId' => $this->personIdRendering->renderPersonId($person),
+            'identifiers' => $this->normalizer->normalize($person->getIdentifiers(), $format, $context),
         ];
 
         if (\in_array('minimal', $groups, true) && 1 === \count($groups)) {
@@ -215,11 +81,6 @@ class PersonJsonNormalizer implements DenormalizerAwareInterface, NormalizerAwar
             null];
     }
 
-    public function supportsDenormalization($data, $type, $format = null)
-    {
-        return Person::class === $type && 'person' === ($data['type'] ?? null);
-    }
-
     public function supportsNormalization($data, $format = null): bool
     {
         return $data instanceof Person && 'json' === $format;
diff --git a/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonReadDenormalizer.php b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonReadDenormalizer.php
new file mode 100644
index 000000000..ce8e5ce48
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Serializer/Normalizer/PersonJsonReadDenormalizer.php
@@ -0,0 +1,51 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\Serializer\Normalizer;
+
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Repository\PersonRepository;
+use Symfony\Component\Serializer\Exception\InvalidArgumentException;
+use Symfony\Component\Serializer\Exception\LogicException;
+use Symfony\Component\Serializer\Exception\UnexpectedValueException;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+
+/**
+ * Find a Person entity by his id during the denormalization process.
+ */
+readonly class PersonJsonReadDenormalizer implements DenormalizerInterface
+{
+    public function __construct(private PersonRepository $repository) {}
+
+    public function denormalize($data, string $type, ?string $format = null, array $context = []): Person
+    {
+        if (!is_array($data)) {
+            throw new InvalidArgumentException();
+        }
+
+        if (\array_key_exists('id', $data)) {
+            $person = $this->repository->find($data['id']);
+
+            if (null === $person) {
+                throw new UnexpectedValueException("The person with id \"{$data['id']}\" does ".'not exists');
+            }
+
+            return $person;
+        }
+
+        throw new LogicException();
+    }
+
+    public function supportsDenormalization($data, string $type, ?string $format = null)
+    {
+        return is_array($data) && Person::class === $type && 'person' === ($data['type'] ?? null) && isset($data['id']);
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Action/PersonEdit/Service/PersonEditDTOFactoryTest.php b/src/Bundle/ChillPersonBundle/Tests/Action/PersonEdit/Service/PersonEditDTOFactoryTest.php
new file mode 100644
index 000000000..28241b14a
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Action/PersonEdit/Service/PersonEditDTOFactoryTest.php
@@ -0,0 +1,146 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Action\PersonEdit\Service;
+
+use Chill\MainBundle\Entity\Civility;
+use Chill\MainBundle\Entity\Country;
+use Chill\MainBundle\Entity\Embeddable\CommentEmbeddable;
+use Chill\MainBundle\Entity\Gender;
+use Chill\MainBundle\Entity\Language;
+use Chill\PersonBundle\Actions\PersonEdit\PersonEditDTO;
+use Chill\PersonBundle\Actions\PersonEdit\Service\PersonEditDTOFactory;
+use Chill\PersonBundle\Config\ConfigPersonAltNamesHelper;
+use Chill\PersonBundle\Entity\AdministrativeStatus;
+use Chill\PersonBundle\Entity\EmploymentStatus;
+use Chill\PersonBundle\Entity\MaritalStatus;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Entity\PersonAltName;
+use Chill\PersonBundle\PersonIdentifier\PersonIdentifierManagerInterface;
+use Doctrine\Common\Collections\ArrayCollection;
+use libphonenumber\PhoneNumber;
+use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class PersonEditDTOFactoryTest extends TestCase
+{
+    use ProphecyTrait;
+
+    public function testMapPersonEditDTOtoPersonCopiesAllFields(): void
+    {
+        $configHelper = $this->createMock(ConfigPersonAltNamesHelper::class);
+        $identifierManager = $this->createMock(PersonIdentifierManagerInterface::class);
+        $factory = new PersonEditDTOFactory($configHelper, $identifierManager);
+
+        $dto = new PersonEditDTO();
+        $dto->firstName = 'John';
+        $dto->lastName = 'Doe';
+        $dto->birthdate = new \DateTime('1980-05-10');
+        $dto->deathdate = new \DateTimeImmutable('2050-01-01');
+        $dto->gender = new Gender();
+        $dto->genderComment = new CommentEmbeddable('gender comment');
+        $dto->numberOfChildren = 2;
+        $dto->memo = 'Some memo';
+        $dto->employmentStatus = new EmploymentStatus();
+        $dto->administrativeStatus = new AdministrativeStatus();
+        $dto->placeOfBirth = 'Cityville';
+        $dto->contactInfo = 'Some contact info';
+        $phone = new PhoneNumber();
+        $dto->phonenumber = $phone;
+        $mobile = new PhoneNumber();
+        $dto->mobilenumber = $mobile;
+        $dto->acceptSms = true;
+        $dto->otherPhonenumbers = new ArrayCollection();
+        $dto->email = 'john.doe@example.org';
+        $dto->acceptEmail = true;
+        $dto->countryOfBirth = new Country();
+        $dto->nationality = new Country();
+        $dto->spokenLanguages = new ArrayCollection([new Language()]);
+        $dto->civility = new Civility();
+        $dto->maritalStatus = new MaritalStatus();
+        $dto->maritalStatusDate = new \DateTime('2010-01-01');
+        $dto->maritalStatusComment = new CommentEmbeddable('married');
+        $dto->cFData = ['foo' => 'bar'];
+
+        $person = new Person();
+
+        $factory->mapPersonEditDTOtoPerson($dto, $person);
+
+        self::assertSame('John', $person->getFirstName());
+        self::assertSame('Doe', $person->getLastName());
+        self::assertSame($dto->birthdate, $person->getBirthdate());
+        self::assertSame($dto->deathdate, $person->getDeathdate());
+        self::assertSame($dto->gender, $person->getGender());
+        self::assertSame($dto->genderComment, $person->getGenderComment());
+        self::assertSame($dto->numberOfChildren, $person->getNumberOfChildren());
+        self::assertSame('Some memo', $person->getMemo());
+        self::assertSame($dto->employmentStatus, $person->getEmploymentStatus());
+        self::assertSame($dto->administrativeStatus, $person->getAdministrativeStatus());
+        self::assertSame('Cityville', $person->getPlaceOfBirth());
+        self::assertSame('Some contact info', $person->getcontactInfo());
+        self::assertSame($phone, $person->getPhonenumber());
+        self::assertSame($mobile, $person->getMobilenumber());
+        self::assertTrue($person->getAcceptSMS());
+        self::assertSame($dto->otherPhonenumbers, $person->getOtherPhoneNumbers());
+        self::assertSame('john.doe@example.org', $person->getEmail());
+        self::assertTrue($person->getAcceptEmail());
+        self::assertSame($dto->countryOfBirth, $person->getCountryOfBirth());
+        self::assertSame($dto->nationality, $person->getNationality());
+        self::assertSame($dto->spokenLanguages, $person->getSpokenLanguages());
+        self::assertSame($dto->civility, $person->getCivility());
+        self::assertSame($dto->maritalStatus, $person->getMaritalStatus());
+        self::assertSame($dto->maritalStatusDate, $person->getMaritalStatusDate());
+        self::assertSame($dto->maritalStatusComment, $person->getMaritalStatusComment());
+        self::assertSame($dto->cFData, $person->getCFData());
+    }
+
+    public function testAltNamesHandlingWithConfigHelper(): void
+    {
+        $configHelper = $this->createMock(ConfigPersonAltNamesHelper::class);
+        $configHelper->method('getChoices')->willReturn([
+            'aka' => ['en' => 'Also Known As'],
+            'nickname' => ['en' => 'Nickname'],
+        ]);
+
+        $identifierManager = $this->createMock(PersonIdentifierManagerInterface::class);
+        $identifierManager->method('getWorkers')->willReturn([]);
+
+        $factory = new PersonEditDTOFactory($configHelper, $identifierManager);
+        $person = new Person();
+
+        $dto = $factory->createPersonEditDTO($person);
+
+        // Assert DTO has two altNames keys from helper
+        self::assertCount(2, $dto->altNames);
+        self::assertContainsOnlyInstancesOf(PersonAltName::class, $dto->altNames);
+        self::assertSame(['aka', 'nickname'], array_keys($dto->altNames));
+        self::assertSame(['aka' => 'aka', 'nickname' => 'nickname'], array_map(fn (PersonAltName $altName) => $altName->getKey(), $dto->altNames));
+
+        // Fill only one label and leave the other empty
+        $dto->altNames['aka']->setLabel('The Boss');
+        // 'nickname' remains empty by default
+
+        // Map DTO back to person
+        $factory->mapPersonEditDTOtoPerson($dto, $person);
+
+        // Assert only the filled alt name is persisted on the person
+        $altNames = $person->getAltNames();
+        self::assertCount(1, $altNames);
+        $altNameArray = $altNames->toArray();
+        self::assertSame('aka', $altNameArray[0]->getKey());
+        self::assertSame('The Boss', $altNameArray[0]->getLabel());
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Controller/PersonIdentifierListApiControllerTest.php b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonIdentifierListApiControllerTest.php
new file mode 100644
index 000000000..e4df5446a
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Controller/PersonIdentifierListApiControllerTest.php
@@ -0,0 +1,157 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\Tests\Controller;
+
+use Chill\MainBundle\Pagination\PaginatorFactoryInterface;
+use Chill\MainBundle\Serializer\Normalizer\CollectionNormalizer;
+use Chill\PersonBundle\Controller\PersonIdentifierListApiController;
+use Chill\PersonBundle\Entity\Identifier\PersonIdentifier;
+use Chill\PersonBundle\Entity\Identifier\PersonIdentifierDefinition;
+use Chill\PersonBundle\PersonIdentifier\Normalizer\PersonIdentifierWorkerNormalizer;
+use Chill\PersonBundle\PersonIdentifier\PersonIdentifierEngineInterface;
+use Chill\PersonBundle\PersonIdentifier\PersonIdentifierManagerInterface;
+use Chill\PersonBundle\PersonIdentifier\PersonIdentifierWorker;
+use PHPUnit\Framework\TestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\Security\Core\Security;
+use Symfony\Component\Serializer\Encoder\JsonEncoder;
+use Symfony\Component\Serializer\Serializer;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class PersonIdentifierListApiControllerTest extends TestCase
+{
+    use ProphecyTrait;
+
+    public function testListAccessDenied(): void
+    {
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(false)->shouldBeCalledOnce();
+
+        $serializer = new Serializer([new PersonIdentifierWorkerNormalizer(), new CollectionNormalizer()], [new JsonEncoder()]);
+
+        $personIdentifierManager = $this->prophesize(PersonIdentifierManagerInterface::class);
+        $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
+
+        $controller = new PersonIdentifierListApiController(
+            $security->reveal(),
+            $serializer,
+            $personIdentifierManager->reveal(),
+            $paginatorFactory->reveal(),
+        );
+
+        $this->expectException(AccessDeniedHttpException::class);
+        $controller->list();
+    }
+
+    public function testListSuccess(): void
+    {
+        // Build 3 workers
+        $engine = new class () implements PersonIdentifierEngineInterface {
+            public static function getName(): string
+            {
+                return 'dummy';
+            }
+
+            public function canonicalizeValue(array $value, PersonIdentifierDefinition $definition): ?string
+            {
+                return null;
+            }
+
+            public function buildForm(\Symfony\Component\Form\FormBuilderInterface $builder, PersonIdentifierDefinition $personIdentifierDefinition): void {}
+
+            public function renderAsString(?PersonIdentifier $identifier, PersonIdentifierDefinition $definition): string
+            {
+                return '';
+            }
+
+            public function isEmpty(PersonIdentifier $identifier): bool
+            {
+                return false;
+            }
+
+            public function validate(PersonIdentifier $identifier, PersonIdentifierDefinition $definition): array
+            {
+                return [];
+            }
+
+            public function getDefaultValue(PersonIdentifierDefinition $definition): array
+            {
+                return [];
+            }
+        };
+
+        $definition1 = new PersonIdentifierDefinition(['en' => 'Label 1'], 'dummy');
+        $definition2 = new PersonIdentifierDefinition(['en' => 'Label 2'], 'dummy');
+        $definition3 = new PersonIdentifierDefinition(['en' => 'Label 3'], 'dummy');
+        // simulate persisted ids
+        $r = new \ReflectionProperty(PersonIdentifierDefinition::class, 'id');
+        $r->setAccessible(true);
+        $r->setValue($definition1, 1);
+        $r->setValue($definition2, 2);
+        $r->setValue($definition3, 3);
+
+        $workers = [
+            new PersonIdentifierWorker($engine, $definition1),
+            new PersonIdentifierWorker($engine, $definition2),
+            new PersonIdentifierWorker($engine, $definition3),
+        ];
+
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('ROLE_USER')->willReturn(true)->shouldBeCalledOnce();
+
+        $personIdentifierManager = $this->prophesize(PersonIdentifierManagerInterface::class);
+        $personIdentifierManager->getWorkers()->willReturn($workers)->shouldBeCalledOnce();
+
+        $paginator = $this->prophesize(\Chill\MainBundle\Pagination\PaginatorInterface::class);
+        $paginator->setItemsPerPage(3)->shouldBeCalledOnce();
+        $paginator->getCurrentPageFirstItemNumber()->willReturn(0);
+        $paginator->getItemsPerPage()->willReturn(count($workers));
+        $paginator->getTotalItems()->willReturn(count($workers));
+        $paginator->hasNextPage()->willReturn(false);
+        $paginator->hasPreviousPage()->willReturn(false);
+
+        $paginatorFactory = $this->prophesize(PaginatorFactoryInterface::class);
+        $paginatorFactory->create(3)->willReturn($paginator->reveal())->shouldBeCalledOnce();
+
+        $serializer = new Serializer([
+            new PersonIdentifierWorkerNormalizer(),
+            new CollectionNormalizer(),
+        ], [new JsonEncoder()]);
+
+        $controller = new PersonIdentifierListApiController(
+            $security->reveal(),
+            $serializer,
+            $personIdentifierManager->reveal(),
+            $paginatorFactory->reveal(),
+        );
+
+        $response = $controller->list();
+        self::assertSame(200, $response->getStatusCode());
+        $body = json_decode($response->getContent(), true, 512, JSON_THROW_ON_ERROR);
+        self::assertIsArray($body);
+        self::assertArrayHasKey('count', $body);
+        self::assertArrayHasKey('pagination', $body);
+        self::assertArrayHasKey('results', $body);
+        self::assertSame(3, $body['count']);
+        self::assertCount(3, $body['results']);
+        // spot check one item
+        self::assertSame('person_identifier_worker', $body['results'][0]['type']);
+        self::assertSame(1, $body['results'][0]['id']);
+        self::assertSame('dummy', $body['results'][0]['engine']);
+        self::assertSame(['en' => 'Label 1'], $body['results'][0]['label']);
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/PersonIdentifier/Identifier/StringIdentifierValidationTest.php b/src/Bundle/ChillPersonBundle/Tests/PersonIdentifier/Identifier/StringIdentifierValidationTest.php
new file mode 100644
index 000000000..436c15589
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/PersonIdentifier/Identifier/StringIdentifierValidationTest.php
@@ -0,0 +1,111 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\Tests\PersonIdentifier\Identifier;
+
+use Chill\PersonBundle\Entity\Identifier\PersonIdentifier;
+use Chill\PersonBundle\Entity\Identifier\PersonIdentifierDefinition;
+use Chill\PersonBundle\PersonIdentifier\Identifier\StringIdentifier;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class StringIdentifierValidationTest extends TestCase
+{
+    private function makeDefinition(array $data = []): PersonIdentifierDefinition
+    {
+        $definition = new PersonIdentifierDefinition(label: ['en' => 'Test'], engine: StringIdentifier::NAME);
+        if ([] !== $data) {
+            $definition->setData($data);
+        }
+
+        return $definition;
+    }
+
+    private function makeIdentifier(PersonIdentifierDefinition $definition, ?string $content): PersonIdentifier
+    {
+        $identifier = new PersonIdentifier($definition);
+        $identifier->setValue(['content' => $content]);
+
+        return $identifier;
+    }
+
+    public function testValidateWithoutOptionsHasNoViolations(): void
+    {
+        $definition = $this->makeDefinition();
+        $identifier = $this->makeIdentifier($definition, 'AB-123');
+
+        $engine = new StringIdentifier();
+        $violations = $engine->validate($identifier, $definition);
+
+        self::assertIsArray($violations);
+        self::assertCount(0, $violations);
+    }
+
+    public function testValidateOnlyNumbersOption(): void
+    {
+        $definition = $this->makeDefinition(['only_numbers' => true]);
+        $engine = new StringIdentifier();
+
+        // valid numeric content
+        $identifierOk = $this->makeIdentifier($definition, '123456');
+        $violationsOk = $engine->validate($identifierOk, $definition);
+        self::assertCount(0, $violationsOk);
+
+        // invalid alphanumeric content
+        $identifierBad = $this->makeIdentifier($definition, '12AB');
+        $violationsBad = $engine->validate($identifierBad, $definition);
+        self::assertCount(1, $violationsBad);
+        self::assertSame('person_identifier.only_number', $violationsBad[0]->message);
+        self::assertSame('2a3352c0-a2b9-11f0-a767-b7a3f80e52f1', $violationsBad[0]->code);
+    }
+
+    public function testValidateFixedLengthOption(): void
+    {
+        $definition = $this->makeDefinition(['fixed_length' => 5]);
+        $engine = new StringIdentifier();
+
+        // valid exact length
+        $identifierOk = $this->makeIdentifier($definition, 'ABCDE');
+        $violationsOk = $engine->validate($identifierOk, $definition);
+        self::assertCount(0, $violationsOk);
+
+        // invalid length (too short)
+        $identifierBad = $this->makeIdentifier($definition, 'AB');
+        $violationsBad = $engine->validate($identifierBad, $definition);
+        self::assertCount(1, $violationsBad);
+        self::assertSame('person_identifier.fixed_length', $violationsBad[0]->message);
+        self::assertSame('2b02a8fe-a2b9-11f0-bfe5-033300972783', $violationsBad[0]->code);
+        self::assertSame(['limit' => '5'], $violationsBad[0]->parameters);
+    }
+
+    public function testValidateOnlyNumbersAndFixedLengthTogether(): void
+    {
+        $definition = $this->makeDefinition(['only_numbers' => true, 'fixed_length' => 4]);
+        $engine = new StringIdentifier();
+
+        // valid: numeric and correct length
+        $identifierOk = $this->makeIdentifier($definition, '1234');
+        $violationsOk = $engine->validate($identifierOk, $definition);
+        self::assertCount(0, $violationsOk);
+
+        // invalid: non-numeric and wrong length -> two violations expected
+        $identifierBad = $this->makeIdentifier($definition, 'AB');
+        $violationsBad = $engine->validate($identifierBad, $definition);
+        self::assertCount(2, $violationsBad);
+        // Order is defined by implementation: numbers check first, then length
+        self::assertSame('person_identifier.only_number', $violationsBad[0]->message);
+        self::assertSame('person_identifier.fixed_length', $violationsBad[1]->message);
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/PersonIdentifier/Normalizer/PersonIdentifierWorkerNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/PersonIdentifier/Normalizer/PersonIdentifierWorkerNormalizerTest.php
new file mode 100644
index 000000000..c54d360d3
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/PersonIdentifier/Normalizer/PersonIdentifierWorkerNormalizerTest.php
@@ -0,0 +1,133 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\Tests\PersonIdentifier\Normalizer;
+
+use Chill\PersonBundle\Entity\Identifier\PersonIdentifier;
+use Chill\PersonBundle\Entity\Identifier\PersonIdentifierDefinition;
+use Chill\PersonBundle\PersonIdentifier\Normalizer\PersonIdentifierWorkerNormalizer;
+use Chill\PersonBundle\PersonIdentifier\PersonIdentifierEngineInterface;
+use Chill\PersonBundle\PersonIdentifier\PersonIdentifierWorker;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Serializer\Exception\UnexpectedValueException;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class PersonIdentifierWorkerNormalizerTest extends TestCase
+{
+    public function testSupportsNormalization(): void
+    {
+        $engine = new class () implements PersonIdentifierEngineInterface {
+            public static function getName(): string
+            {
+                return 'dummy';
+            }
+
+            public function canonicalizeValue(array $value, PersonIdentifierDefinition $definition): ?string
+            {
+                return null;
+            }
+
+            public function buildForm(\Symfony\Component\Form\FormBuilderInterface $builder, PersonIdentifierDefinition $personIdentifierDefinition): void {}
+
+            public function renderAsString(?PersonIdentifier $identifier, PersonIdentifierDefinition $definition): string
+            {
+                return '';
+            }
+
+            public function isEmpty(PersonIdentifier $identifier): bool
+            {
+                return false;
+            }
+
+            public function validate(PersonIdentifier $identifier, PersonIdentifierDefinition $definition): array
+            {
+                return [];
+            }
+
+            public function getDefaultValue(PersonIdentifierDefinition $definition): array
+            {
+                return [];
+            }
+        };
+
+        $definition = new PersonIdentifierDefinition(label: ['en' => 'SSN'], engine: 'string');
+        $worker = new PersonIdentifierWorker($engine, $definition);
+
+        $normalizer = new PersonIdentifierWorkerNormalizer();
+
+        self::assertTrue($normalizer->supportsNormalization($worker));
+        self::assertFalse($normalizer->supportsNormalization(new \stdClass()));
+    }
+
+    public function testNormalizeReturnsExpectedArray(): void
+    {
+        $engine = new class () implements PersonIdentifierEngineInterface {
+            public static function getName(): string
+            {
+                return 'dummy';
+            }
+
+            public function canonicalizeValue(array $value, PersonIdentifierDefinition $definition): ?string
+            {
+                return null;
+            }
+
+            public function buildForm(\Symfony\Component\Form\FormBuilderInterface $builder, PersonIdentifierDefinition $personIdentifierDefinition): void {}
+
+            public function renderAsString(?PersonIdentifier $identifier, PersonIdentifierDefinition $definition): string
+            {
+                return '';
+            }
+
+            public function isEmpty(PersonIdentifier $identifier): bool
+            {
+                return false;
+            }
+
+            public function getDefaultValue(PersonIdentifierDefinition $definition): array
+            {
+                return [];
+            }
+
+            public function validate(PersonIdentifier $identifier, PersonIdentifierDefinition $definition): array
+            {
+                return [];
+            }
+        };
+
+        $definition = new PersonIdentifierDefinition(label: ['en' => 'SSN'], engine: 'string');
+        $definition->setActive(false);
+        $worker = new PersonIdentifierWorker($engine, $definition);
+
+        $normalizer = new PersonIdentifierWorkerNormalizer();
+        $normalized = $normalizer->normalize($worker);
+
+        self::assertSame([
+            'type' => 'person_identifier_worker',
+            'definition_id' => null,
+            'engine' => 'string',
+            'label' => ['en' => 'SSN'],
+            'isActive' => false,
+            'presence' => 'ON_EDIT',
+        ], $normalized);
+    }
+
+    public function testNormalizeThrowsOnInvalidObject(): void
+    {
+        $normalizer = new PersonIdentifierWorkerNormalizer();
+        $this->expectException(UnexpectedValueException::class);
+        $normalizer->normalize(new \stdClass());
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/PersonIdentifier/Rendering/PersonIdRenderingTest.php b/src/Bundle/ChillPersonBundle/Tests/PersonIdentifier/Rendering/PersonIdRenderingTest.php
index ce1df3f9d..8f2592665 100644
--- a/src/Bundle/ChillPersonBundle/Tests/PersonIdentifier/Rendering/PersonIdRenderingTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/PersonIdentifier/Rendering/PersonIdRenderingTest.php
@@ -71,6 +71,21 @@ class PersonIdRenderingTest extends TestCase
                         // same behavior as StringIdentifier::renderAsString
                         return $identifier?->getValue()['content'] ?? '';
                     }
+
+                    public function isEmpty(PersonIdentifier $identifier): bool
+                    {
+                        return false;
+                    }
+
+                    public function validate(PersonIdentifier $identifier, PersonIdentifierDefinition $definition): array
+                    {
+                        return [];
+                    }
+
+                    public function getDefaultValue(PersonIdentifierDefinition $definition): array
+                    {
+                        return [];
+                    }
                 };
 
                 return new PersonIdentifierWorker($engine, $definition);
diff --git a/src/Bundle/ChillPersonBundle/Tests/PersonIdentifier/Validator/RequiredIdentifierConstraintValidatorTest.php b/src/Bundle/ChillPersonBundle/Tests/PersonIdentifier/Validator/RequiredIdentifierConstraintValidatorTest.php
new file mode 100644
index 000000000..86201b6fb
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/PersonIdentifier/Validator/RequiredIdentifierConstraintValidatorTest.php
@@ -0,0 +1,131 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\Tests\PersonIdentifier\Validator;
+
+use Chill\PersonBundle\Entity\Identifier\IdentifierPresenceEnum;
+use Chill\PersonBundle\Entity\Identifier\PersonIdentifier;
+use Chill\PersonBundle\Entity\Identifier\PersonIdentifierDefinition;
+use Chill\PersonBundle\PersonIdentifier\PersonIdentifierEngineInterface;
+use Chill\PersonBundle\PersonIdentifier\PersonIdentifierManagerInterface;
+use Chill\PersonBundle\PersonIdentifier\PersonIdentifierWorker;
+use Chill\PersonBundle\PersonIdentifier\Validator\RequiredIdentifierConstraint;
+use Chill\PersonBundle\PersonIdentifier\Validator\RequiredIdentifierConstraintValidator;
+use Doctrine\Common\Collections\ArrayCollection;
+use PHPUnit\Framework\Attributes\CoversClass;
+use Symfony\Component\Validator\Constraints\NotBlank;
+use Symfony\Component\Validator\Exception\UnexpectedTypeException;
+use Symfony\Component\Validator\Exception\UnexpectedValueException;
+use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Prophecy\Argument;
+
+/**
+ * @internal
+ */
+#[CoversClass(RequiredIdentifierConstraintValidator::class)]
+final class RequiredIdentifierConstraintValidatorTest extends ConstraintValidatorTestCase
+{
+    use ProphecyTrait;
+
+    private PersonIdentifierDefinition $requiredDefinition;
+
+    protected function createValidator(): RequiredIdentifierConstraintValidator
+    {
+        $this->requiredDefinition = new PersonIdentifierDefinition(
+            label: ['fr' => 'Identifiant requis'],
+            engine: 'test.engine',
+        );
+        $this->requiredDefinition->setPresence(IdentifierPresenceEnum::REQUIRED);
+        $reflection = new \ReflectionClass($this->requiredDefinition);
+        $id = $reflection->getProperty('id');
+        $id->setValue($this->requiredDefinition, 1);
+
+        // Mock only the required methods of the engine used by the validator through the worker
+        $engineProphecy = $this->prophesize(PersonIdentifierEngineInterface::class);
+        $engineProphecy->isEmpty(Argument::type(PersonIdentifier::class))
+            ->will(function (array $args): bool {
+                /** @var PersonIdentifier $identifier */
+                $identifier = $args[0];
+
+                return '' === trim($identifier->getValue()['content'] ?? '');
+            });
+        $engineProphecy->renderAsString(Argument::any(), Argument::any())
+            ->will(function (array $args): string {
+                /** @var PersonIdentifier|null $identifier */
+                $identifier = $args[0] ?? null;
+
+                return $identifier?->getValue()['content'] ?? '';
+            });
+
+        $worker = new PersonIdentifierWorker($engineProphecy->reveal(), $this->requiredDefinition);
+
+        // Mock only the required method used by the validator
+        $managerProphecy = $this->prophesize(PersonIdentifierManagerInterface::class);
+        $managerProphecy->getWorkers()->willReturn([$worker]);
+
+        return new RequiredIdentifierConstraintValidator($managerProphecy->reveal());
+    }
+
+    public function testThrowsOnNonCollectionValue(): void
+    {
+        $this->expectException(UnexpectedValueException::class);
+        $this->validator->validate(new \stdClass(), new RequiredIdentifierConstraint());
+    }
+
+    public function testThrowsOnInvalidConstraintType(): void
+    {
+        $this->expectException(UnexpectedTypeException::class);
+        // Provide a valid Collection value so the type check reaches the constraint check
+        $this->validator->validate(new ArrayCollection(), new NotBlank());
+    }
+
+    public function testNoViolationWhenRequiredIdentifierPresentAndNotEmpty(): void
+    {
+        $identifier = new PersonIdentifier($this->requiredDefinition);
+        $identifier->setValue(['content' => 'ABC']);
+
+        $collection = new ArrayCollection([$identifier]);
+
+        $this->validator->validate($collection, new RequiredIdentifierConstraint());
+
+        $this->assertNoViolation();
+    }
+
+    public function testViolationWhenRequiredIdentifierMissing(): void
+    {
+        $collection = new ArrayCollection();
+
+        $this->validator->validate($collection, new RequiredIdentifierConstraint());
+
+        $this->buildViolation('person_identifier.This identifier must be set')
+            ->setParameter('{{ value }}', '')
+            ->setParameter('definition_id', '1')
+            ->setCode('c08b7b32-947f-11f0-8608-9b8560e9bf05')
+            ->assertRaised();
+    }
+
+    public function testViolationWhenRequiredIdentifierIsEmpty(): void
+    {
+        $identifier = new PersonIdentifier($this->requiredDefinition);
+        $identifier->setValue(['content' => '   ']);
+
+        $collection = new ArrayCollection([$identifier]);
+
+        $this->validator->validate($collection, new RequiredIdentifierConstraint());
+
+        $this->buildViolation('person_identifier.This identifier must be set')
+            ->setParameter('{{ value }}', '   ')
+            ->setParameter('definition_id', '1')
+            ->setCode('c08b7b32-947f-11f0-8608-9b8560e9bf05')
+            ->assertRaised();
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/PersonIdentifier/Validator/UniqueIdentifierConstraintValidatorTest.php b/src/Bundle/ChillPersonBundle/Tests/PersonIdentifier/Validator/UniqueIdentifierConstraintValidatorTest.php
new file mode 100644
index 000000000..d872bfc56
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/PersonIdentifier/Validator/UniqueIdentifierConstraintValidatorTest.php
@@ -0,0 +1,158 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\Tests\PersonIdentifier\Validator;
+
+use Chill\PersonBundle\Entity\Identifier\PersonIdentifier;
+use Chill\PersonBundle\Entity\Identifier\PersonIdentifierDefinition;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\PersonIdentifier\Validator\UniqueIdentifierConstraint;
+use Chill\PersonBundle\PersonIdentifier\Validator\UniqueIdentifierConstraintValidator;
+use Chill\PersonBundle\Repository\Identifier\PersonIdentifierRepository;
+use Chill\PersonBundle\Templating\Entity\PersonRenderInterface;
+use PHPUnit\Framework\Attributes\CoversClass;
+use Prophecy\Argument;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Prophecy\Prophecy\ObjectProphecy;
+use Symfony\Component\Validator\Constraints\NotBlank;
+use Symfony\Component\Validator\Exception\UnexpectedTypeException;
+use Symfony\Component\Validator\Exception\UnexpectedValueException;
+use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
+
+/**
+ * @internal
+ */
+#[CoversClass(UniqueIdentifierConstraintValidator::class)]
+final class UniqueIdentifierConstraintValidatorTest extends ConstraintValidatorTestCase
+{
+    use ProphecyTrait;
+
+    /**
+     * @var ObjectProphecy|PersonIdentifierRepository
+     */
+    private ObjectProphecy $repository;
+
+    /**
+     * @var ObjectProphecy|PersonRenderInterface
+     */
+    private ObjectProphecy $personRender;
+
+    protected function setUp(): void
+    {
+        $this->repository = $this->prophesize(PersonIdentifierRepository::class);
+        $this->personRender = $this->prophesize(PersonRenderInterface::class);
+        parent::setUp();
+    }
+
+    protected function createValidator(): UniqueIdentifierConstraintValidator
+    {
+        return new UniqueIdentifierConstraintValidator($this->repository->reveal(), $this->personRender->reveal());
+    }
+
+    public function testThrowsOnInvalidConstraintType(): void
+    {
+        $this->expectException(UnexpectedTypeException::class);
+
+        // Provide a valid value so execution reaches the constraint type check
+        $definition = new PersonIdentifierDefinition(['en' => 'Test'], 'string');
+        $identifier = new PersonIdentifier($definition);
+        $identifier->setValue(['value' => 'ABC']);
+
+        $this->validator->validate($identifier, new NotBlank());
+    }
+
+    public function testThrowsOnInvalidValueType(): void
+    {
+        $this->expectException(UnexpectedValueException::class);
+        $this->validator->validate(new \stdClass(), new UniqueIdentifierConstraint());
+    }
+
+    public function testNoViolationWhenNoDuplicate(): void
+    {
+        $definition = new PersonIdentifierDefinition(['en' => 'Test'], 'string');
+        $identifier = new PersonIdentifier($definition);
+        $identifier->setValue(['value' => 'UNIQ']);
+
+        // Configure repository mock to return empty array
+        $this->repository->findByDefinitionAndCanonical($definition, ['value' => 'UNIQ'])->willReturn([]);
+
+        $this->validator->validate($identifier, new UniqueIdentifierConstraint());
+        $this->assertNoViolation();
+    }
+
+    public function testViolationWhenDuplicateFound(): void
+    {
+        $definition = new PersonIdentifierDefinition(['en' => 'SSN'], 'string');
+        $reflectionClass = new \ReflectionClass($definition);
+        $reflectionId = $reflectionClass->getProperty('id');
+        $reflectionId->setValue($definition, 1);
+
+        $personA = new Person();
+        $personA->setFirstName('Alice')->setLastName('Anderson');
+        $personB = new Person();
+        $personB->setFirstName('Bob')->setLastName('Brown');
+
+        $dup1 = new PersonIdentifier($definition);
+        $dup1->setPerson($personA);
+        $dup1->setValue(['value' => '123']);
+        $dup2 = new PersonIdentifier($definition);
+        $dup2->setPerson($personB);
+        $dup2->setValue(['value' => '123']);
+
+        // Repository returns duplicates
+        $this->repository->findByDefinitionAndCanonical($definition, ['value' => '123'])->willReturn([$dup1, $dup2]);
+
+        // Person renderer returns names
+        $this->personRender->renderString($personA, Argument::type('array'))->willReturn('Alice Anderson');
+        $this->personRender->renderString($personB, Argument::type('array'))->willReturn('Bob Brown');
+
+        $identifier = new PersonIdentifier($definition);
+        $identifier->setPerson(new Person());
+        $identifier->setValue(['value' => '123']);
+
+        $constraint = new UniqueIdentifierConstraint();
+
+        $this->validator->validate($identifier, $constraint);
+
+        $this->buildViolation($constraint->message)
+            ->setParameter('{{ persons }}', 'Alice Anderson, Bob Brown')
+            ->setParameter('definition_id', '1')
+            ->assertRaised();
+    }
+
+    public function testViolationWhenDuplicateFoundButForSamePerson(): void
+    {
+        $definition = new PersonIdentifierDefinition(['en' => 'SSN'], 'string');
+        $reflectionClass = new \ReflectionClass($definition);
+        $reflectionId = $reflectionClass->getProperty('id');
+        $reflectionId->setValue($definition, 1);
+
+        $personA = new Person();
+        $personA->setFirstName('Alice')->setLastName('Anderson');
+
+        $dup1 = new PersonIdentifier($definition);
+        $dup1->setPerson($personA);
+        $dup1->setValue(['value' => '123']);
+
+        // Repository returns duplicates
+        $this->repository->findByDefinitionAndCanonical($definition, ['value' => '123'])->willReturn([$dup1]);
+
+        $identifier = new PersonIdentifier($definition);
+        $identifier->setPerson($personA);
+        $identifier->setValue(['value' => '123']);
+
+        $constraint = new UniqueIdentifierConstraint();
+
+        $this->validator->validate($identifier, $constraint);
+
+        $this->assertNoViolation();
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/PersonIdentifier/Validator/ValidIdentifierConstraintValidatorTest.php b/src/Bundle/ChillPersonBundle/Tests/PersonIdentifier/Validator/ValidIdentifierConstraintValidatorTest.php
new file mode 100644
index 000000000..9e4abff3b
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/PersonIdentifier/Validator/ValidIdentifierConstraintValidatorTest.php
@@ -0,0 +1,115 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\Tests\PersonIdentifier\Validator;
+
+use Chill\PersonBundle\Entity\Identifier\PersonIdentifier;
+use Chill\PersonBundle\Entity\Identifier\PersonIdentifierDefinition;
+use Chill\PersonBundle\PersonIdentifier\IdentifierViolationDTO;
+use Chill\PersonBundle\PersonIdentifier\PersonIdentifierEngineInterface;
+use Chill\PersonBundle\PersonIdentifier\PersonIdentifierManagerInterface;
+use Chill\PersonBundle\PersonIdentifier\PersonIdentifierWorker;
+use Chill\PersonBundle\PersonIdentifier\Validator\ValidIdentifierConstraint;
+use Chill\PersonBundle\PersonIdentifier\Validator\ValidIdentifierConstraintValidator;
+use PHPUnit\Framework\Attributes\CoversClass;
+use Prophecy\PhpUnit\ProphecyTrait;
+use Prophecy\Prophecy\ObjectProphecy;
+use Symfony\Component\Validator\Test\ConstraintValidatorTestCase;
+
+/**
+ * @internal
+ */
+#[CoversClass(ValidIdentifierConstraintValidator::class)]
+final class ValidIdentifierConstraintValidatorTest extends ConstraintValidatorTestCase
+{
+    use ProphecyTrait;
+
+    /**
+     * @var ObjectProphecy|PersonIdentifierManagerInterface
+     */
+    private ObjectProphecy $manager;
+
+    protected function setUp(): void
+    {
+        $this->manager = $this->prophesize(PersonIdentifierManagerInterface::class);
+        parent::setUp();
+    }
+
+    protected function createValidator(): ValidIdentifierConstraintValidator
+    {
+        return new ValidIdentifierConstraintValidator($this->manager->reveal());
+    }
+
+    public function testAddsViolationFromWorker(): void
+    {
+        $definition = new PersonIdentifierDefinition(['en' => 'SSN'], 'string');
+        // set definition id via reflection for definition_id parameter
+        $ref = new \ReflectionClass($definition);
+        $prop = $ref->getProperty('id');
+        $prop->setValue($definition, 1);
+
+        $identifier = new PersonIdentifier($definition);
+        $identifier->setValue(['value' => 'bad']);
+
+        $violation = new IdentifierViolationDTO('Invalid Identifier', '0000-1111-2222-3333', ['{{ foo }}' => 'bar']);
+
+        // engine that returns one violation
+        $engine = new class ([$violation]) implements PersonIdentifierEngineInterface {
+            public function __construct(private readonly array $violations) {}
+
+            public static function getName(): string
+            {
+                return 'dummy';
+            }
+
+            public function canonicalizeValue(array $value, PersonIdentifierDefinition $definition): ?string
+            {
+                return null;
+            }
+
+            public function buildForm(\Symfony\Component\Form\FormBuilderInterface $builder, PersonIdentifierDefinition $personIdentifierDefinition): void {}
+
+            public function renderAsString(?PersonIdentifier $identifier, PersonIdentifierDefinition $definition): string
+            {
+                return '';
+            }
+
+            public function isEmpty(PersonIdentifier $identifier): bool
+            {
+                return false;
+            }
+
+            public function validate(PersonIdentifier $identifier, PersonIdentifierDefinition $definition): array
+            {
+                return $this->violations;
+            }
+
+            public function getDefaultValue(PersonIdentifierDefinition $definition): array
+            {
+                return [];
+            }
+        };
+        $worker = new PersonIdentifierWorker($engine, $definition);
+
+        $this->manager
+            ->buildWorkerByPersonIdentifierDefinition($definition)
+            ->willReturn($worker);
+
+        $constraint = new ValidIdentifierConstraint();
+        $this->validator->validate($identifier, $constraint);
+
+        $this->buildViolation('Invalid Identifier')
+            ->setParameters(['{{ foo }}' => 'bar'])
+            ->setParameter('{{ code }}', '0000-1111-2222-3333')
+            ->setParameter('definition_id', '1')
+            ->assertRaised();
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Repository/Identifier/PersonIdentifierRepositoryTest.php b/src/Bundle/ChillPersonBundle/Tests/Repository/Identifier/PersonIdentifierRepositoryTest.php
new file mode 100644
index 000000000..ab36fd872
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Repository/Identifier/PersonIdentifierRepositoryTest.php
@@ -0,0 +1,76 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\Tests\Repository\Identifier;
+
+use Chill\PersonBundle\Entity\Identifier\PersonIdentifier;
+use Chill\PersonBundle\Entity\Identifier\PersonIdentifierDefinition;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\PersonIdentifier\Identifier\StringIdentifier;
+use Chill\PersonBundle\PersonIdentifier\PersonIdentifierManagerInterface;
+use Chill\PersonBundle\Repository\Identifier\PersonIdentifierRepository;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class PersonIdentifierRepositoryTest extends KernelTestCase
+{
+    public function testFindByDefinitionAndCanonical(): void
+    {
+        self::bootKernel();
+        $container = self::getContainer();
+        /** @var PersonIdentifierManagerInterface $personIdentifierManager */
+        $personIdentifierManager = $container->get(PersonIdentifierManagerInterface::class);
+
+        /** @var EntityManagerInterface $em */
+        $em = $container->get(EntityManagerInterface::class);
+
+        // Get a random existing person from fixtures
+        /** @var Person|null $person */
+        $person = $em->getRepository(Person::class)->findOneBy([]);
+        self::assertNotNull($person, 'An existing Person is required for this integration test.');
+
+        // Create a definition
+        $definition = new PersonIdentifierDefinition(['en' => 'Test Identifier'], StringIdentifier::NAME);
+        $em->persist($definition);
+        $em->flush();
+
+        // Create an identifier attached to the person
+        $value = ['content' => 'ABC-'.bin2hex(random_bytes(4))];
+        $identifier = new PersonIdentifier($definition);
+        $identifier->setPerson($person);
+        $identifier->setValue($value);
+        $identifier->setCanonical($personIdentifierManager->buildWorkerByPersonIdentifierDefinition($definition)->canonicalizeValue($identifier->getValue()));
+        $em->persist($identifier);
+        $em->flush();
+
+        // Use the repository to find by definition and value
+        /** @var PersonIdentifierRepository $repo */
+        $repo = $container->get(PersonIdentifierRepository::class);
+        $results = $repo->findByDefinitionAndCanonical($definition, $value);
+
+        self::assertNotEmpty($results, 'Repository should return at least one result.');
+        self::assertContainsOnlyInstancesOf(PersonIdentifier::class, $results);
+        self::assertTrue(in_array($identifier->getId(), array_map(static fn (PersonIdentifier $pi) => $pi->getId(), $results), true));
+
+        // Cleanup
+        foreach ($results as $res) {
+            $em->remove($res);
+        }
+        $em->flush();
+        $em->remove($definition);
+        $em->flush();
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Repository/PersonACLAwareRepositoryTest.php b/src/Bundle/ChillPersonBundle/Tests/Repository/PersonACLAwareRepositoryTest.php
index 667242111..20401c1b1 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Repository/PersonACLAwareRepositoryTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Repository/PersonACLAwareRepositoryTest.php
@@ -18,6 +18,7 @@ use Chill\MainBundle\Repository\CountryRepository;
 use Chill\MainBundle\Security\Authorization\AuthorizationHelperInterface;
 use Chill\PersonBundle\Entity\Person;
 use Chill\PersonBundle\Entity\PersonPhone;
+use Chill\PersonBundle\PersonIdentifier\PersonIdentifierManagerInterface;
 use Chill\PersonBundle\Repository\PersonACLAwareRepository;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Doctrine\ORM\EntityManagerInterface;
@@ -42,6 +43,8 @@ final class PersonACLAwareRepositoryTest extends KernelTestCase
 
     private EntityManagerInterface $entityManager;
 
+    private PersonIdentifierManagerInterface $personIdentifierManager;
+
     protected function setUp(): void
     {
         self::bootKernel();
@@ -49,6 +52,8 @@ final class PersonACLAwareRepositoryTest extends KernelTestCase
         $this->entityManager = self::getContainer()->get(EntityManagerInterface::class);
         $this->countryRepository = self::getContainer()->get(CountryRepository::class);
         $this->centerRepository = self::getContainer()->get(CenterRepositoryInterface::class);
+        $this->personIdentifierManager = self::getContainer()->get(PersonIdentifierManagerInterface::class);
+
     }
 
     public function testCountByCriteria()
@@ -66,7 +71,8 @@ final class PersonACLAwareRepositoryTest extends KernelTestCase
             $security->reveal(),
             $this->entityManager,
             $this->countryRepository,
-            $authorizationHelper->reveal()
+            $authorizationHelper->reveal(),
+            $this->personIdentifierManager,
         );
 
         $number = $repository->countBySearchCriteria('diallo');
@@ -89,7 +95,8 @@ final class PersonACLAwareRepositoryTest extends KernelTestCase
             $security->reveal(),
             $this->entityManager,
             $this->countryRepository,
-            $authorizationHelper->reveal()
+            $authorizationHelper->reveal(),
+            $this->personIdentifierManager,
         );
 
         $results = $repository->findBySearchCriteria(0, 5, false, 'diallo');
@@ -120,7 +127,8 @@ final class PersonACLAwareRepositoryTest extends KernelTestCase
             $security->reveal(),
             $this->entityManager,
             $this->countryRepository,
-            $authorizationHelper->reveal()
+            $authorizationHelper->reveal(),
+            $this->personIdentifierManager,
         );
 
         $actual = $repository->findByPhone($phoneNumber, 0, 10);
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonJsonDenormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonJsonDenormalizerTest.php
new file mode 100644
index 000000000..aef5ee584
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonJsonDenormalizerTest.php
@@ -0,0 +1,312 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\Tests\Serializer\Normalizer;
+
+use Chill\MainBundle\Entity\Center;
+use Chill\MainBundle\Entity\Civility;
+use Chill\MainBundle\Entity\Gender;
+use Chill\PersonBundle\Entity\Identifier\PersonIdentifier;
+use Chill\PersonBundle\Entity\Identifier\PersonIdentifierDefinition;
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\PersonIdentifier\PersonIdentifierEngineInterface;
+use Chill\PersonBundle\PersonIdentifier\PersonIdentifierManagerInterface;
+use Chill\PersonBundle\PersonIdentifier\PersonIdentifierWorker;
+use Chill\PersonBundle\Serializer\Normalizer\PersonJsonDenormalizer;
+use libphonenumber\PhoneNumber;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Serializer\Normalizer\DenormalizerInterface;
+use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
+
+/**
+ * @internal
+ *
+ * @covers \Chill\PersonBundle\Serializer\Normalizer\PersonJsonDenormalizer
+ */
+final class PersonJsonDenormalizerTest extends TestCase
+{
+    private function createIdentifierManager(): PersonIdentifierManagerInterface
+    {
+        return new class () implements PersonIdentifierManagerInterface {
+            public function getWorkers(): array
+            {
+                return [];
+            }
+
+            public function buildWorkerByPersonIdentifierDefinition(int|PersonIdentifierDefinition $personIdentifierDefinition): PersonIdentifierWorker
+            {
+                if (is_int($personIdentifierDefinition)) {
+                    $definition = new PersonIdentifierDefinition(['en' => 'Test'], 'dummy');
+                    // Force the id for testing purposes
+                    $r = new \ReflectionProperty(PersonIdentifierDefinition::class, 'id');
+                    $r->setAccessible(true);
+                    $r->setValue($definition, $personIdentifierDefinition);
+                } else {
+                    $definition = $personIdentifierDefinition;
+                }
+
+                $engine = new class () implements PersonIdentifierEngineInterface {
+                    public static function getName(): string
+                    {
+                        return 'dummy';
+                    }
+
+                    public function canonicalizeValue(array $value, PersonIdentifierDefinition $definition): ?string
+                    {
+                        // trivial canonicalization for tests
+                        return isset($value['content']) ? (string) $value['content'] : null;
+                    }
+
+                    public function buildForm(\Symfony\Component\Form\FormBuilderInterface $builder, PersonIdentifierDefinition $personIdentifierDefinition): void {}
+
+                    public function renderAsString(?PersonIdentifier $identifier, PersonIdentifierDefinition $definition): string
+                    {
+                        return '';
+                    }
+
+                    public function isEmpty(PersonIdentifier $identifier): bool
+                    {
+                        $value = $identifier->getValue();
+                        $content = isset($value['content']) ? trim((string) $value['content']) : '';
+
+                        return '' === $content;
+                    }
+
+                    public function validate(PersonIdentifier $identifier, PersonIdentifierDefinition $definition): array
+                    {
+                        return [];
+                    }
+
+                    public function getDefaultValue(PersonIdentifierDefinition $definition): array
+                    {
+                        return [];
+                    }
+                };
+
+                return new PersonIdentifierWorker($engine, $definition);
+            }
+        };
+    }
+
+    public function testSupportsDenormalizationReturnsTrueForValidData(): void
+    {
+        $denormalizer = new PersonJsonDenormalizer($this->createIdentifierManager());
+
+        $data = [
+            'type' => 'person',
+            // important: new Person (creation) must not contain an id
+        ];
+
+        self::assertTrue($denormalizer->supportsDenormalization($data, Person::class));
+    }
+
+    public function testSupportsDenormalizationReturnsFalseForInvalidData(): void
+    {
+        $denormalizer = new PersonJsonDenormalizer($this->createIdentifierManager());
+
+        // not an array
+        self::assertFalse($denormalizer->supportsDenormalization('not-an-array', Person::class));
+
+        // missing type
+        self::assertFalse($denormalizer->supportsDenormalization([], Person::class));
+
+        // wrong type value
+        self::assertFalse($denormalizer->supportsDenormalization(['type' => 'not-person'], Person::class));
+
+        // id present means it's not a create payload for this denormalizer
+        self::assertFalse($denormalizer->supportsDenormalization(['type' => 'person', 'id' => 123], Person::class));
+
+        // wrong target class
+        self::assertFalse($denormalizer->supportsDenormalization(['type' => 'person'], \stdClass::class));
+    }
+
+    public function testDenormalizeMapsPayloadToPersonProperties(): void
+    {
+        $json = <<<'JSON'
+            {
+              "type": "person",
+              "firstName": "Jérome",
+              "lastName": "diallo",
+              "altNames": [
+                {
+                  "key": "jeune_fille",
+                  "value": "FJ"
+                }
+              ],
+              "birthdate": null,
+              "deathdate": null,
+              "phonenumber": "",
+              "mobilenumber": "",
+              "email": "",
+              "gender": {
+                "id": 5,
+                "type": "chill_main_gender"
+              },
+              "center": {
+                "id": 1,
+                "type": "center"
+              },
+              "civility": null,
+              "identifiers": [
+                {
+                  "type": "person_identifier",
+                  "value": {
+                    "content": "789456"
+                  },
+                  "definition_id": 5
+                }
+              ]
+            }
+            JSON;
+        $data = json_decode($json, true, 512, JSON_THROW_ON_ERROR);
+
+        $inner = new class () implements DenormalizerInterface {
+            public ?Gender $gender = null;
+            public ?Center $center = null;
+
+            public function denormalize($data, $type, $format = null, array $context = [])
+            {
+                if (PhoneNumber::class === $type) {
+                    return '' === $data ? null : new PhoneNumber();
+                }
+                if (\DateTime::class === $type || \DateTimeImmutable::class === $type) {
+                    return null === $data ? null : new \DateTimeImmutable((string) $data);
+                }
+                if (Gender::class === $type) {
+                    return $this->gender ??= new Gender();
+                }
+                if (Center::class === $type) {
+                    return $this->center ??= new Center();
+                }
+                if (Civility::class === $type) {
+                    return null; // input is null in our payload
+                }
+
+                return null;
+            }
+
+            public function supportsDenormalization($data, $type, $format = null)
+            {
+                return true;
+            }
+        };
+
+        $denormalizer = new PersonJsonDenormalizer($this->createIdentifierManager());
+        $denormalizer->setDenormalizer($inner);
+
+        $person = $denormalizer->denormalize($data, Person::class);
+
+        self::assertInstanceOf(Person::class, $person);
+        self::assertSame('Jérome', $person->getFirstName());
+        self::assertSame('diallo', $person->getLastName());
+
+        // phone numbers: empty strings map to null via the inner denormalizer stub
+        self::assertNull($person->getPhonenumber());
+        self::assertNull($person->getMobilenumber());
+
+        // email passes through as is
+        self::assertSame('', $person->getEmail());
+
+        // nested objects are provided by our inner denormalizer and must be set back on the Person
+        self::assertSame($inner->gender, $person->getGender());
+        self::assertSame($inner->center, $person->getCenter());
+
+        // dates are null in the provided payload
+        self::assertNull($person->getBirthdate());
+        self::assertNull($person->getDeathdate());
+
+        // civility is null as provided
+        self::assertNull($person->getCivility());
+
+        // altNames: make sure the alt name with key jeune_fille has label FJ
+        $found = false;
+        foreach ($person->getAltNames() as $altName) {
+            if ('jeune_fille' === $altName->getKey()) {
+                $found = true;
+                self::assertSame('FJ', $altName->getLabel());
+            }
+        }
+        self::assertTrue($found, 'Expected altNames to contain key "jeune_fille"');
+
+        $found = false;
+        foreach ($person->getIdentifiers() as $identifier) {
+            if (5 === $identifier->getDefinition()->getId()) {
+                $found = true;
+                self::assertSame(['content' => '789456'], $identifier->getValue());
+            }
+        }
+        self::assertTrue($found, 'Expected identifiers with definition id 5');
+    }
+
+    public function testDenormalizeRemovesEmptyIdentifier(): void
+    {
+        $data = [
+            'type' => 'person',
+            'firstName' => 'Alice',
+            'lastName' => 'Smith',
+            'identifiers' => [
+                [
+                    'type' => 'person_identifier',
+                    'value' => ['content' => ''],
+                    'definition_id' => 7,
+                ],
+            ],
+        ];
+
+        $denormalizer = new PersonJsonDenormalizer($this->createIdentifierManager());
+
+        $person = $denormalizer->denormalize($data, Person::class);
+
+        // The identifier with empty content must be considered empty and removed
+        self::assertSame(0, $person->getIdentifiers()->count(), 'Expected no identifiers to remain on the person');
+    }
+
+    public function testDenormalizeRemovesPreviouslyExistingIdentifierWhenIncomingValueIsEmpty(): void
+    {
+        // Prepare an existing Person with a pre-existing identifier (definition id = 9)
+        $definition = new PersonIdentifierDefinition(['en' => 'Test'], 'dummy');
+        $ref = new \ReflectionProperty(PersonIdentifierDefinition::class, 'id');
+        $ref->setValue($definition, 9);
+
+        $existingIdentifier = new PersonIdentifier($definition);
+        $existingIdentifier->setValue(['content' => 'ABC']);
+
+        $person = new Person();
+        $person->addIdentifier($existingIdentifier);
+
+        // Also set the identifier's own id = 9 so that the denormalizer logic matches it
+        // (the current denormalizer matches by PersonIdentifier->getId() === definition_id)
+        $refId = new \ReflectionProperty(PersonIdentifier::class, 'id');
+        $refId->setValue($existingIdentifier, 9);
+
+        // Incoming payload sets the same definition id with an empty value
+        $data = [
+            'type' => 'person',
+            'identifiers' => [
+                [
+                    'type' => 'person_identifier',
+                    'value' => ['content' => ''],
+                    'definition_id' => 9,
+                ],
+            ],
+        ];
+
+        $denormalizer = new PersonJsonDenormalizer($this->createIdentifierManager());
+
+        // Use AbstractNormalizer::OBJECT_TO_POPULATE to update the existing person
+        $result = $denormalizer->denormalize($data, Person::class, null, [
+            AbstractNormalizer::OBJECT_TO_POPULATE => $person,
+        ]);
+
+        self::assertSame($person, $result, 'Denormalizer should update and return the provided Person instance');
+        self::assertSame(0, $person->getIdentifiers()->count(), 'The previously existing identifier should be removed when incoming value is empty');
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonJsonNormalizerIntegrationTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonJsonNormalizerIntegrationTest.php
new file mode 100644
index 000000000..3fff8aa97
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonJsonNormalizerIntegrationTest.php
@@ -0,0 +1,63 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Serializer\Normalizer;
+
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Repository\PersonRepository;
+use PHPUnit\Framework\Assert;
+use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
+use Symfony\Component\Serializer\SerializerInterface;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+final class PersonJsonNormalizerIntegrationTest extends KernelTestCase
+{
+    public function testNormalizeExistingPersonFromDatabase(): void
+    {
+        self::bootKernel();
+        $container = self::getContainer();
+
+        /** @var PersonRepository $repo */
+        $repo = $container->get(PersonRepository::class);
+        $person = $repo->findOneBy([]);
+
+        if (!$person instanceof Person) {
+            self::markTestSkipped('No person found in test database. Load fixtures to enable this test.');
+        }
+
+        /** @var SerializerInterface $serializer */
+        $serializer = $container->get(SerializerInterface::class);
+
+        // Should not throw
+        $data = $serializer->normalize($person, 'json');
+        Assert::assertIsArray($data);
+
+        // Spot check some expected keys exist
+        foreach ([
+            'type', 'id', 'text', 'textAge', 'firstName', 'lastName', 'birthdate', 'age', 'gender', 'civility',
+        ] as $key) {
+            Assert::assertArrayHasKey($key, $data, sprintf('Expected key %s in normalized payload', $key));
+        }
+
+        // Minimal group should also work
+        $minimal = $serializer->normalize($person, 'json', ['groups' => 'minimal']);
+        Assert::assertIsArray($minimal);
+        foreach ([
+            'type', 'id', 'text', 'textAge', 'firstName', 'lastName',
+        ] as $key) {
+            Assert::assertArrayHasKey($key, $minimal, sprintf('Expected key %s in minimal normalized payload', $key));
+        }
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonJsonNormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonJsonNormalizerTest.php
index af78e2475..41aadf4fb 100644
--- a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonJsonNormalizerTest.php
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonJsonNormalizerTest.php
@@ -11,74 +11,186 @@ declare(strict_types=1);
 
 namespace Serializer\Normalizer;
 
+use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Phonenumber\PhoneNumberHelperInterface;
 use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 use Chill\MainBundle\Templating\Entity\ChillEntityRenderExtension;
 use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Repository\PersonRepository;
+use Chill\PersonBundle\Entity\PersonAltName;
 use Chill\PersonBundle\Repository\ResidentialAddressRepository;
 use Chill\PersonBundle\Serializer\Normalizer\PersonJsonNormalizer;
+use Chill\PersonBundle\PersonIdentifier\Rendering\PersonIdRenderingInterface;
+use Doctrine\Common\Collections\ArrayCollection;
+use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
 use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
 
 /**
  * @internal
  *
- * @coversNothing
+ * @covers \Chill\PersonBundle\Serializer\Normalizer\PersonJsonNormalizer
  */
-final class PersonJsonNormalizerTest extends KernelTestCase
+final class PersonJsonNormalizerTest extends TestCase
 {
     use ProphecyTrait;
 
-    private PersonJsonNormalizer $normalizer;
-
-    protected function setUp(): void
+    public function testSupportsNormalization(): void
     {
-        self::bootKernel();
+        $normalizer = $this->createNormalizer();
 
-        $residentialAddressRepository = $this->prophesize(ResidentialAddressRepository::class);
-        $residentialAddressRepository
-            ->findCurrentResidentialAddressByPerson(Argument::type(Person::class), Argument::any())
-            ->willReturn([]);
-
-        $this->normalizer = $this->buildPersonJsonNormalizer(
-            self::getContainer()->get(ChillEntityRenderExtension::class),
-            self::getContainer()->get(PersonRepository::class),
-            self::getContainer()->get(CenterResolverManagerInterface::class),
-            $residentialAddressRepository->reveal(),
-            self::getContainer()->get(PhoneNumberHelperInterface::class),
-            self::getContainer()->get(NormalizerInterface::class)
-        );
+        self::assertTrue($normalizer->supportsNormalization(new Person(), 'json'));
+        self::assertFalse($normalizer->supportsNormalization(new \stdClass(), 'json'));
+        self::assertFalse($normalizer->supportsNormalization(new Person(), 'xml'));
     }
 
-    public function testNormalization()
+    public function testNormalizeWithMinimalGroupReturnsOnlyBaseKeys(): void
     {
-        $person = new Person();
-        $result = $this->normalizer->normalize($person, 'json', [AbstractNormalizer::GROUPS => ['read']]);
+        $person = $this->createSamplePerson();
 
-        $this->assertIsArray($result);
+        $normalizer = $this->createNormalizer();
+        $data = $normalizer->normalize($person, 'json', [AbstractNormalizer::GROUPS => 'minimal']);
+
+        // Expected base keys
+        $expectedKeys = [
+            'type',
+            'id',
+            'text',
+            'textAge',
+            'firstName',
+            'lastName',
+            'current_household_address',
+            'birthdate',
+            'deathdate',
+            'age',
+            'phonenumber',
+            'mobilenumber',
+            'email',
+            'gender',
+            'civility',
+            'personId',
+        ];
+
+        foreach ($expectedKeys as $key) {
+            self::assertArrayHasKey($key, $data, sprintf('Key %s should be present', $key));
+        }
+        self::assertSame('PERSON-ID-RENDER', $data['personId']);
+
+        // Ensure extended keys are not present in minimal mode
+        foreach (['centers', 'altNames', 'current_household_id', 'current_residential_addresses'] as $key) {
+            self::assertArrayNotHasKey($key, $data, sprintf('Key %s should NOT be present in minimal group', $key));
+        }
     }
 
-    private function buildPersonJsonNormalizer(
-        ChillEntityRenderExtension $render,
-        PersonRepository $repository,
-        CenterResolverManagerInterface $centerResolverManager,
-        ResidentialAddressRepository $residentialAddressRepository,
-        PhoneNumberHelperInterface $phoneNumberHelper,
-        NormalizerInterface $normalizer,
-    ): PersonJsonNormalizer {
-        $personJsonNormalizer = new PersonJsonNormalizer(
-            $render,
-            $repository,
-            $centerResolverManager,
-            $residentialAddressRepository,
-            $phoneNumberHelper
-        );
-        $personJsonNormalizer->setNormalizer($normalizer);
+    public function testNormalizeWithoutGroupsIncludesExtendedKeys(): void
+    {
+        $person = $this->createSamplePerson(withAltNames: true);
 
-        return $personJsonNormalizer;
+        $center1 = (new Center())->setName('c1');
+        $center2 = (new Center())->setName('c2');
+
+
+        $normalizer = $this->createNormalizer(
+            centers: [$center1, $center2],
+            currentResidentialAddresses: [['addr' => 1]],
+        );
+
+        $data = $normalizer->normalize($person, 'json');
+
+        // Base keys
+        $baseKeys = [
+            'type', 'id', 'text', 'textAge', 'firstName', 'lastName', 'current_household_address', 'birthdate', 'deathdate', 'age', 'phonenumber', 'mobilenumber', 'email', 'gender', 'civility', 'personId',
+        ];
+        foreach ($baseKeys as $key) {
+            self::assertArrayHasKey($key, $data, sprintf('Key %s should be present', $key));
+        }
+
+        // Extended keys
+        foreach (['centers', 'altNames', 'current_household_id', 'current_residential_addresses'] as $key) {
+            self::assertArrayHasKey($key, $data, sprintf('Key %s should be present', $key));
+        }
+
+        self::assertSame(['c1', 'c2'], $data['centers']);
+        self::assertIsArray($data['altNames']);
+        self::assertSame([['key' => 'aka', 'label' => 'Johnny']], $data['altNames']);
+        self::assertNull($data['current_household_id'], 'No household set so id should be null');
+        self::assertSame([['addr' => 1]], $data['current_residential_addresses']);
+    }
+
+    private function createNormalizer(array $centers = [], array $currentResidentialAddresses = []): PersonJsonNormalizer
+    {
+        $render = $this->prophesize(ChillEntityRenderExtension::class);
+        $render->renderString(Argument::type(Person::class), ['addAge' => false])->willReturn('John Doe');
+        $render->renderString(Argument::type(Person::class), ['addAge' => true])->willReturn('John Doe (25)');
+
+        $centerResolver = $this->prophesize(CenterResolverManagerInterface::class);
+        $centerResolver->resolveCenters(Argument::type(Person::class))->willReturn($centers);
+
+        $raRepo = $this->prophesize(ResidentialAddressRepository::class);
+        $raRepo->findCurrentResidentialAddressByPerson(Argument::type(Person::class))->willReturn($currentResidentialAddresses);
+
+        $phoneHelper = $this->prophesize(PhoneNumberHelperInterface::class);
+
+        $personIdRendering = $this->prophesize(PersonIdRenderingInterface::class);
+        $personIdRendering->renderPersonId(Argument::type(Person::class))->willReturn('PERSON-ID-RENDER');
+
+        $normalizer = new PersonJsonNormalizer(
+            $render->reveal(),
+            $centerResolver->reveal(),
+            $raRepo->reveal(),
+            $phoneHelper->reveal(),
+            $personIdRendering->reveal(),
+        );
+
+        // Inner normalizer that echoes values or simple conversions
+        $inner = new class () implements NormalizerInterface {
+            public function supportsNormalization($data, $format = null): bool
+            {
+                return true;
+            }
+
+            public function normalize($object, $format = null, array $context = [])
+            {
+                // For scalars and arrays, return as-is; for objects, return string or id when possible
+                if (\is_scalar($object) || null === $object) {
+                    return $object;
+                }
+                if ($object instanceof \DateTimeInterface) {
+                    return $object->format('Y-m-d');
+                }
+                if ($object instanceof Center) {
+                    return $object->getName();
+                }
+                if (is_array($object)) {
+                    return array_map(fn ($o) => $this->normalize($o, $format, $context), $object);
+                }
+
+                // default stub
+                return (string) (method_exists($object, 'getId') ? $object->getId() : 'normalized');
+            }
+        };
+
+        $normalizer->setNormalizer($inner);
+
+        return $normalizer;
+    }
+
+    private function createSamplePerson(bool $withAltNames = false): Person
+    {
+        $p = new Person();
+        $p->setFirstName('John');
+        $p->setLastName('Doe');
+        $p->setBirthdate(new \DateTime('2000-01-01'));
+        $p->setEmail('john@example.test');
+
+        if ($withAltNames) {
+            $alt = new PersonAltName();
+            $alt->setKey('aka');
+            $alt->setLabel('Johnny');
+            $p->setAltNames(new ArrayCollection([$alt]));
+        }
+
+        return $p;
     }
 }
diff --git a/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonJsonReadDenormalizerTest.php b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonJsonReadDenormalizerTest.php
new file mode 100644
index 000000000..e019a41c6
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/Tests/Serializer/Normalizer/PersonJsonReadDenormalizerTest.php
@@ -0,0 +1,86 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\PersonBundle\Tests\Serializer\Normalizer;
+
+use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Repository\PersonRepository;
+use Chill\PersonBundle\Serializer\Normalizer\PersonJsonReadDenormalizer;
+use PHPUnit\Framework\TestCase;
+
+/**
+ * @internal
+ *
+ * @covers \Chill\PersonBundle\Serializer\Normalizer\PersonJsonReadDenormalizer
+ */
+final class PersonJsonReadDenormalizerTest extends TestCase
+{
+    public function testSupportsDenormalizationReturnsTrueForValidData(): void
+    {
+        $repository = $this->getMockBuilder(PersonRepository::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $denormalizer = new PersonJsonReadDenormalizer($repository);
+
+        $data = [
+            'type' => 'person',
+            'id' => 123,
+        ];
+
+        self::assertTrue($denormalizer->supportsDenormalization($data, Person::class));
+    }
+
+    public function testSupportsDenormalizationReturnsFalseForInvalidData(): void
+    {
+        $repository = $this->getMockBuilder(PersonRepository::class)
+            ->disableOriginalConstructor()
+            ->getMock();
+
+        $denormalizer = new PersonJsonReadDenormalizer($repository);
+
+        // not an array
+        self::assertFalse($denormalizer->supportsDenormalization('not-an-array', Person::class));
+
+        // missing type
+        self::assertFalse($denormalizer->supportsDenormalization(['id' => 1], Person::class));
+
+        // wrong type value
+        self::assertFalse($denormalizer->supportsDenormalization(['type' => 'not-person', 'id' => 1], Person::class));
+
+        // missing id
+        self::assertFalse($denormalizer->supportsDenormalization(['type' => 'person'], Person::class));
+
+        // wrong target class
+        self::assertFalse($denormalizer->supportsDenormalization(['type' => 'person', 'id' => 1], \stdClass::class));
+    }
+
+    public function testDenormalizeReturnsPersonFromRepository(): void
+    {
+        $person = new Person();
+
+        $repository = $this->getMockBuilder(PersonRepository::class)
+            ->disableOriginalConstructor()
+            ->onlyMethods(['find'])
+            ->getMock();
+
+        $repository->expects(self::once())
+            ->method('find')
+            ->with(123)
+            ->willReturn($person);
+
+        $denormalizer = new PersonJsonReadDenormalizer($repository);
+
+        $result = $denormalizer->denormalize(['id' => 123], Person::class);
+
+        self::assertSame($person, $result);
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/chill.api.specs.yaml b/src/Bundle/ChillPersonBundle/chill.api.specs.yaml
index c5f244525..1d1a2b1e2 100644
--- a/src/Bundle/ChillPersonBundle/chill.api.specs.yaml
+++ b/src/Bundle/ChillPersonBundle/chill.api.specs.yaml
@@ -1,1998 +1,1998 @@
 components:
-  schemas:
-    # should go to main
-    Date:
-      type: object
-      properties:
-        datetime:
-          type: string
-          format: date-time
-    Scope:
-      type: object
-      properties:
-        id:
-          type: integer
-        type:
-          type: string
-          enum:
-            - scope
-        name:
-          type: object
-          additionalProperties:
-            type: string
-          example:
-            fr: Social
-    ScopeById:
-      type: object
-      properties:
-        id:
-          type: integer
-        type:
-          type: string
-          enum:
-            - scope
-      required:
-        - id
-        - scope
+    schemas:
+        # should go to main
+        Date:
+            type: object
+            properties:
+                datetime:
+                    type: string
+                    format: date-time
+        Scope:
+            type: object
+            properties:
+                id:
+                    type: integer
+                type:
+                    type: string
+                    enum:
+                        - scope
+                name:
+                    type: object
+                    additionalProperties:
+                        type: string
+                    example:
+                        fr: Social
+        ScopeById:
+            type: object
+            properties:
+                id:
+                    type: integer
+                type:
+                    type: string
+                    enum:
+                        - scope
+            required:
+                - id
+                - scope
 
-    # ok to stay here
-    Person:
-      type: object
-      properties:
-        id:
-          type: integer
-          readOnly: true
-        type:
-          type: string
-          enum:
-            - "person"
-        firstName:
-          type: string
-        lastName:
-          type: string
-        text:
-          type: string
-          description: a canonical representation for the person name
-          readOnly: true
-        birthdate:
-          $ref: "#/components/schemas/Date"
-        deathdate:
-          $ref: "#/components/schemas/Date"
-        phonenumber:
-          type: string
-        mobilenumber:
-          type: string
-        gender:
-          type: string
-          enum:
-            - man
-            - woman
-            - both
-        gender_numeric:
-          type: integer
-          description: a numerical representation of gender
-          readOnly: true
-    PersonById:
-      type: object
-      properties:
-        id:
-          type: integer
-        type:
-          type: string
-          enum:
-            - "person"
-      required:
-        - id
-        - type
-    # should go to third party
-    ThirdParty:
-      type: object
-      properties:
-        text:
-          type: string
-    ThirdPartyById:
-      type: object
-      properties:
-        id:
-          type: integer
-        type:
-          type: string
-          enum:
-            - "thirdparty"
-      required:
-        - id
-        - type
+        # ok to stay here
+        Person:
+            type: object
+            properties:
+                id:
+                    type: integer
+                    readOnly: true
+                type:
+                    type: string
+                    enum:
+                        - "person"
+                firstName:
+                    type: string
+                lastName:
+                    type: string
+                text:
+                    type: string
+                    description: a canonical representation for the person name
+                    readOnly: true
+                birthdate:
+                    $ref: "#/components/schemas/Date"
+                deathdate:
+                    $ref: "#/components/schemas/Date"
+                phonenumber:
+                    type: string
+                mobilenumber:
+                    type: string
+                gender:
+                    type: string
+                    enum:
+                        - man
+                        - woman
+                        - both
+                gender_numeric:
+                    type: integer
+                    description: a numerical representation of gender
+                    readOnly: true
+        PersonById:
+            type: object
+            properties:
+                id:
+                    type: integer
+                type:
+                    type: string
+                    enum:
+                        - "person"
+            required:
+                - id
+                - type
+        # should go to third party
+        ThirdParty:
+            type: object
+            properties:
+                text:
+                    type: string
+        ThirdPartyById:
+            type: object
+            properties:
+                id:
+                    type: integer
+                type:
+                    type: string
+                    enum:
+                        - "thirdparty"
+            required:
+                - id
+                - type
 
-    # ok to stay here
-    AccompanyingPeriod:
-      type: object
-      properties:
-        type:
-          type: string
-          enum:
-            - accompanying_period
-        id:
-          type: integer
-        requestorAnonymous:
-          type: boolean
-    Resource:
-      type: object
-      properties:
-        type:
-          type: string
-          enum:
-            - "accompanying_period_resource"
-          readOnly: true
-        id:
-          type: integer
-          readOnly: true
-        resource:
-          anyOf:
-            - $ref: "#/components/schemas/PersonById"
-            - $ref: "#/components/schemas/ThirdPartyById"
-    ResourceById:
-      type: object
-      properties:
-        id:
-          type: integer
-        type:
-          type: string
-          enum:
-            - "accompanying_period_resource"
-      required:
-        - id
-        - type
-    Comment:
-      type: object
-      properties:
-        type:
-          type: string
-          enum:
-            - "accompanying_period_comment"
-          readOnly: true
-        id:
-          type: integer
-          readOnly: true
-        content:
-          type: string
-    CommentById:
-      type: object
-      properties:
-        id:
-          type: integer
-        type:
-          type: string
-          enum:
-            - "accompanying_period_comment"
-      required:
-        - id
-        - type
-    SocialIssue:
-      type: object
-      properties:
-        id:
-          type: integer
-        type:
-          type: string
-          enum:
-            - "social_issue"
-        parent_id:
-          type: integer
-          readOnly: true
-        children_ids:
-          type: array
-          items:
-            type: integer
-          readOnly: true
-        title:
-          type: object
-          additionalProperties:
-            type: string
-          example:
-            fr: Accompagnement Social Adulte
-          readOnly: true
-        text:
-          type: string
-          readOnly: true
-    Household:
-      type: object
-      properties:
-        id:
-          type: integer
-        type:
-          type: string
-          enum:
-            - "household"
-    HouseholdPosition:
-      type: object
-      properties:
-        id:
-          type: integer
-        type:
-          type: string
-          enum:
-            - "household_position"
-    AccompanyingCourseWork:
-      type: object
-      properties:
-        id:
-          type: integer
-        type:
-          type: string
-          enum:
-            - "accompanying_period_work"
-        note:
-          type: string
-        privateComment:
-          type: string
-        startDate:
-          $ref: "#/components/schemas/Date"
-        endDate:
-          $ref: "#/components/schemas/Date"
-        handlingThirdParty:
-          $ref: "#/components/schemas/ThirdPartyById"
-        goals:
-          type: array
-          items:
-            $ref: "#/components/schemas/AccompanyingCourseWorkGoal"
-        results:
-          type: array
-          items:
-            $ref: "#/components/schemas/SocialWorkResultById"
-    AccompanyingCourseWorkGoal:
-      type: object
-      properties:
-        id:
-          type: integer
-        type:
-          type: string
-          enum:
-            - "accompanying_period_work_goal"
-        note:
-          type: string
-        goal:
-          $ref: "#/components/schemas/SocialWorkGoalById"
-        results:
-          type: array
-          items:
-            $ref: "#/components/schemas/SocialWorkGoalById"
+        # ok to stay here
+        AccompanyingPeriod:
+            type: object
+            properties:
+                type:
+                    type: string
+                    enum:
+                        - accompanying_period
+                id:
+                    type: integer
+                requestorAnonymous:
+                    type: boolean
+        Resource:
+            type: object
+            properties:
+                type:
+                    type: string
+                    enum:
+                        - "accompanying_period_resource"
+                    readOnly: true
+                id:
+                    type: integer
+                    readOnly: true
+                resource:
+                    anyOf:
+                        -   $ref: "#/components/schemas/PersonById"
+                        -   $ref: "#/components/schemas/ThirdPartyById"
+        ResourceById:
+            type: object
+            properties:
+                id:
+                    type: integer
+                type:
+                    type: string
+                    enum:
+                        - "accompanying_period_resource"
+            required:
+                - id
+                - type
+        Comment:
+            type: object
+            properties:
+                type:
+                    type: string
+                    enum:
+                        - "accompanying_period_comment"
+                    readOnly: true
+                id:
+                    type: integer
+                    readOnly: true
+                content:
+                    type: string
+        CommentById:
+            type: object
+            properties:
+                id:
+                    type: integer
+                type:
+                    type: string
+                    enum:
+                        - "accompanying_period_comment"
+            required:
+                - id
+                - type
+        SocialIssue:
+            type: object
+            properties:
+                id:
+                    type: integer
+                type:
+                    type: string
+                    enum:
+                        - "social_issue"
+                parent_id:
+                    type: integer
+                    readOnly: true
+                children_ids:
+                    type: array
+                    items:
+                        type: integer
+                    readOnly: true
+                title:
+                    type: object
+                    additionalProperties:
+                        type: string
+                    example:
+                        fr: Accompagnement Social Adulte
+                    readOnly: true
+                text:
+                    type: string
+                    readOnly: true
+        Household:
+            type: object
+            properties:
+                id:
+                    type: integer
+                type:
+                    type: string
+                    enum:
+                        - "household"
+        HouseholdPosition:
+            type: object
+            properties:
+                id:
+                    type: integer
+                type:
+                    type: string
+                    enum:
+                        - "household_position"
+        AccompanyingCourseWork:
+            type: object
+            properties:
+                id:
+                    type: integer
+                type:
+                    type: string
+                    enum:
+                        - "accompanying_period_work"
+                note:
+                    type: string
+                privateComment:
+                    type: string
+                startDate:
+                    $ref: "#/components/schemas/Date"
+                endDate:
+                    $ref: "#/components/schemas/Date"
+                handlingThirdParty:
+                    $ref: "#/components/schemas/ThirdPartyById"
+                goals:
+                    type: array
+                    items:
+                        $ref: "#/components/schemas/AccompanyingCourseWorkGoal"
+                results:
+                    type: array
+                    items:
+                        $ref: "#/components/schemas/SocialWorkResultById"
+        AccompanyingCourseWorkGoal:
+            type: object
+            properties:
+                id:
+                    type: integer
+                type:
+                    type: string
+                    enum:
+                        - "accompanying_period_work_goal"
+                note:
+                    type: string
+                goal:
+                    $ref: "#/components/schemas/SocialWorkGoalById"
+                results:
+                    type: array
+                    items:
+                        $ref: "#/components/schemas/SocialWorkGoalById"
 
-    SocialWorkResultById:
-      type: object
-      properties:
-        id:
-          type: integer
-        type:
-          type: string
-          enum:
-            - "social_work_result"
-    SocialWorkGoalById:
-      type: object
-      properties:
-        id:
-          type: integer
-        type:
-          type: string
-          enum:
-            - "social_work_goal"
+        SocialWorkResultById:
+            type: object
+            properties:
+                id:
+                    type: integer
+                type:
+                    type: string
+                    enum:
+                        - "social_work_result"
+        SocialWorkGoalById:
+            type: object
+            properties:
+                id:
+                    type: integer
+                type:
+                    type: string
+                    enum:
+                        - "social_work_goal"
 
-    RelationById:
-      type: object
-      properties:
-        id:
-          type: integer
-        type:
-          type: string
-          enum:
-            - "relation"
-      required:
-        - id
-        - type
-    Relationship:
-      type: object
-      properties:
-        type:
-          type: string
-          enum:
-            - "relationship"
-        id:
-          type: integer
-          readOnly: true
-        fromPerson:
-          anyOf:
-            - $ref: "#/components/schemas/PersonById"
-        toPerson:
-          anyOf:
-            - $ref: "#/components/schemas/PersonById"
-        relation:
-          anyOf:
-            - $ref: "#/components/schemas/RelationById"
-        reverse:
-          type: boolean
+        RelationById:
+            type: object
+            properties:
+                id:
+                    type: integer
+                type:
+                    type: string
+                    enum:
+                        - "relation"
+            required:
+                - id
+                - type
+        Relationship:
+            type: object
+            properties:
+                type:
+                    type: string
+                    enum:
+                        - "relationship"
+                id:
+                    type: integer
+                    readOnly: true
+                fromPerson:
+                    anyOf:
+                        -   $ref: "#/components/schemas/PersonById"
+                toPerson:
+                    anyOf:
+                        -   $ref: "#/components/schemas/PersonById"
+                relation:
+                    anyOf:
+                        -   $ref: "#/components/schemas/RelationById"
+                reverse:
+                    type: boolean
 
 
 paths:
-  /1.0/person/person/{id}.json:
-    get:
-      tags:
-        - person
-      summary: Get a single person
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The person's id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      responses:
-        200:
-          description: "OK"
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/Person"
-        403:
-          description: "Unauthorized"
-    patch:
-      tags:
-        - person
-      summary: "Alter a person"
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The person's id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      requestBody:
-        description: "A person"
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: "#/components/schemas/Person"
-            examples:
-              Update a person:
-                value:
-                  type: "person"
-                  firstName: "string"
-                  lastName: "string"
-                  birthdate:
-                    datetime: "2016-06-01T00:00:00+02:00"
-                  deathdate:
-                    datetime: "2021-06-01T00:00:00+02:00"
-                  phonenumber: "string"
-                  mobilenumber: "string"
-                  gender: "male"
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
-        422:
-          description: "Object with validation errors"
+    /1.0/person/person/{id}.json:
+        get:
+            tags:
+                - person
+            summary: Get a single person
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The person's id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            responses:
+                200:
+                    description: "OK"
+                    content:
+                        application/json:
+                            schema:
+                                $ref: "#/components/schemas/Person"
+                403:
+                    description: "Unauthorized"
+        patch:
+            tags:
+                - person
+            summary: "Alter a person"
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The person's id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            requestBody:
+                description: "A person"
+                required: true
+                content:
+                    application/json:
+                        schema:
+                            $ref: "#/components/schemas/Person"
+                        examples:
+                            Update a person:
+                                value:
+                                    type: "person"
+                                    firstName: "string"
+                                    lastName: "string"
+                                    birthdate:
+                                        datetime: "2016-06-01T00:00:00+02:00"
+                                    deathdate:
+                                        datetime: "2021-06-01T00:00:00+02:00"
+                                    phonenumber: "string"
+                                    mobilenumber: "string"
+                                    gender: "male"
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
+                422:
+                    description: "Object with validation errors"
 
-  /1.0/person/person.json:
-    post:
-      tags:
-        - person
-      summary: Create a single person
-      requestBody:
-        description: "A person"
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: "#/components/schemas/Person"
-            examples:
-              Create a new person:
-                value:
-                  type: "person"
-                  firstName: "string"
-                  lastName: "string"
-                  birthdate:
-                    datetime: "2016-06-01T00:00:00+02:00"
-                  deathdate:
-                    datetime: "2021-06-01T00:00:00+02:00"
-                  phonenumber: "string"
-                  mobilenumber: "string"
-                  gender: "male"
-      responses:
-        200:
-          description: "OK"
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/Person"
-        403:
-          description: "Unauthorized"
-        422:
-          description: "Invalid data: the data is a valid json, could be deserialized, but does not pass validation"
+    /1.0/person/person.json:
+        post:
+            tags:
+                - person
+            summary: Create a single person
+            requestBody:
+                description: "A person"
+                required: true
+                content:
+                    application/json:
+                        schema:
+                            $ref: "#/components/schemas/Person"
+                        examples:
+                            Create a new person:
+                                value:
+                                    type: "person"
+                                    firstName: "string"
+                                    lastName: "string"
+                                    birthdate:
+                                        datetime: "2016-06-01T00:00:00+02:00"
+                                    deathdate:
+                                        datetime: "2021-06-01T00:00:00+02:00"
+                                    phonenumber: "string"
+                                    mobilenumber: "string"
+                                    gender: "male"
+            responses:
+                200:
+                    description: "OK"
+                    content:
+                        application/json:
+                            schema:
+                                $ref: "#/components/schemas/Person"
+                403:
+                    description: "Unauthorized"
+                422:
+                    description: "Invalid data: the data is a valid json, could be deserialized, but does not pass validation"
 
-  /1.0/person/person/{id}/address.json:
-    post:
-      tags:
-        - person
-      summary: post an address to a person
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The person id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              type: object
-              properties:
-                id:
-                  type: integer
-                  description: The address id to attach to the person
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
-        422:
-          description: "Unprocessable entity (validation errors)"
+    /1.0/person/person/{id}/address.json:
+        post:
+            tags:
+                - person
+            summary: post an address to a person
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The person id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            requestBody:
+                required: true
+                content:
+                    application/json:
+                        schema:
+                            type: object
+                            properties:
+                                id:
+                                    type: integer
+                                    description: The address id to attach to the person
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
+                422:
+                    description: "Unprocessable entity (validation errors)"
 
-  /1.0/person/address/suggest/by-person/{id}.json:
-    get:
-      tags:
-        - address
-      summary: get a list of suggested address for a person
-      description: >
-        The address are computed from various source. Currently:
+    /1.0/person/address/suggest/by-person/{id}.json:
+        get:
+            tags:
+                - address
+            summary: get a list of suggested address for a person
+            description: >
+                The address are computed from various source. Currently:
 
-        - the address of course to which the person is participating
+                - the address of course to which the person is participating
 
-        The current person's address is always ignored.
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The person id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
+                The current person's address is always ignored.
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The person id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
 
-  /1.0/person/address/suggest/by-household/{id}.json:
-    get:
-      tags:
-        - address
-      summary: get a list of suggested address for a household
-      description: >
-        The address are computed from various source. Currently:
+    /1.0/person/address/suggest/by-household/{id}.json:
+        get:
+            tags:
+                - address
+            summary: get a list of suggested address for a household
+            description: >
+                The address are computed from various source. Currently:
 
-        - the address of course to which the members is participating
+                - the address of course to which the members is participating
 
-        The current household address is always ignored.
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The household id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
+                The current household address is always ignored.
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The household id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
 
-  /1.0/person/accompanying-course/{id}.json:
-    get:
-      tags:
-        - accompanying-course
-      summary: "Return the description for an accompanying course (accompanying period)"
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The accompanying period's id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
-    patch:
-      tags:
-        - person
-      summary: "Alter an accompanying course (accompanying period)"
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The accompanying period's id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      requestBody:
-        description: "An accompanying period"
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: "#/components/schemas/AccompanyingPeriod"
-            examples:
-              Set the requestor as anonymous:
-                value:
-                  type: accompanying_period
-                  id: 12345
-                  requestorAnonymous: true
-              Adding an initial comment:
-                value:
-                  type: accompanying_period
-                  id: 2668,
-                  pinnedComment:
-                    type: accompanying_period_comment
-                    content: >
-                      This is my an initial comment.
+    /1.0/person/accompanying-course/{id}.json:
+        get:
+            tags:
+                - accompanying-course
+            summary: "Return the description for an accompanying course (accompanying period)"
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The accompanying period's id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
+        patch:
+            tags:
+                - person
+            summary: "Alter an accompanying course (accompanying period)"
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The accompanying period's id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            requestBody:
+                description: "An accompanying period"
+                required: true
+                content:
+                    application/json:
+                        schema:
+                            $ref: "#/components/schemas/AccompanyingPeriod"
+                        examples:
+                            Set the requestor as anonymous:
+                                value:
+                                    type: accompanying_period
+                                    id: 12345
+                                    requestorAnonymous: true
+                            Adding an initial comment:
+                                value:
+                                    type: accompanying_period
+                                    id: 2668,
+                                    pinnedComment:
+                                        type: accompanying_period_comment
+                                        content: >
+                                            This is my an initial comment.
 
-                      Say hello to the new "parcours"!
-              Setting person with id 8405 as locator:
-                value:
-                  type: accompanying_period
-                  id: 0
-                  personLocation:
-                    type: person
-                    id: 8405
-              Removing person location for both person and address:
-                value:
-                  type: accompanying_period
-                  id: 0
-                  personLocation: null
-                  addressLocation: null
-              Adding address with id 7960 as temporarily address:
-                value:
-                  type: accompanying_period
-                  id: 0
-                  personLocation: null
-                  addressLocation:
-                    id: 7960
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
-        422:
-          description: "object with validation errors"
+                                            Say hello to the new "parcours"!
+                            Setting person with id 8405 as locator:
+                                value:
+                                    type: accompanying_period
+                                    id: 0
+                                    personLocation:
+                                        type: person
+                                        id: 8405
+                            Removing person location for both person and address:
+                                value:
+                                    type: accompanying_period
+                                    id: 0
+                                    personLocation: null
+                                    addressLocation: null
+                            Adding address with id 7960 as temporarily address:
+                                value:
+                                    type: accompanying_period
+                                    id: 0
+                                    personLocation: null
+                                    addressLocation:
+                                        id: 7960
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
+                422:
+                    description: "object with validation errors"
 
-  /1.0/person/accompanying-course/{id}/requestor.json:
-    post:
-      tags:
-        - accompanying-course
-      summary: "Add a requestor to the accompanying course"
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The accompanying period's id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      requestBody:
-        description: "A person or thirdparty"
-        required: true
-        content:
-          application/json:
-            schema:
-              oneOf:
-                - $ref: "#/components/schemas/PersonById"
-                - $ref: "#/components/schemas/ThirdPartyById"
-            examples:
-              add person with id 50:
-                summary: "a person with id 50"
-                value:
-                  type: person
-                  id: 50
-              add thirdparty with id 100:
-                summary: "a third party with id 100"
-                value:
-                  type: thirdparty
-                  id: 100
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
-        422:
-          description: "object with validation errors"
-    delete:
-      tags:
-        - accompanying-course
-      summary: "Remove the requestor for the accompanying course"
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The accompanying period's id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
-        422:
-          description: "object with validation errors"
+    /1.0/person/accompanying-course/{id}/requestor.json:
+        post:
+            tags:
+                - accompanying-course
+            summary: "Add a requestor to the accompanying course"
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The accompanying period's id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            requestBody:
+                description: "A person or thirdparty"
+                required: true
+                content:
+                    application/json:
+                        schema:
+                            oneOf:
+                                -   $ref: "#/components/schemas/PersonById"
+                                -   $ref: "#/components/schemas/ThirdPartyById"
+                        examples:
+                            add person with id 50:
+                                summary: "a person with id 50"
+                                value:
+                                    type: person
+                                    id: 50
+                            add thirdparty with id 100:
+                                summary: "a third party with id 100"
+                                value:
+                                    type: thirdparty
+                                    id: 100
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
+                422:
+                    description: "object with validation errors"
+        delete:
+            tags:
+                - accompanying-course
+            summary: "Remove the requestor for the accompanying course"
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The accompanying period's id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
+                422:
+                    description: "object with validation errors"
 
-  /1.0/person/accompanying-course/{id}/participation.json:
-    post:
-      tags:
-        - accompanying-course
-      summary: "Add a participant to the accompanying course"
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The accompanying period's id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      requestBody:
-        description: "A person"
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: "#/components/schemas/PersonById"
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
-        422:
-          description: "object with validation errors"
-    delete:
-      tags:
-        - accompanying-course
-      summary: "Remove the participant for the accompanying course"
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The accompanying period's id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      requestBody:
-        description: "A person"
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: "#/components/schemas/PersonById"
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
-        422:
-          description: "object with validation errors"
+    /1.0/person/accompanying-course/{id}/participation.json:
+        post:
+            tags:
+                - accompanying-course
+            summary: "Add a participant to the accompanying course"
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The accompanying period's id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            requestBody:
+                description: "A person"
+                required: true
+                content:
+                    application/json:
+                        schema:
+                            $ref: "#/components/schemas/PersonById"
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
+                422:
+                    description: "object with validation errors"
+        delete:
+            tags:
+                - accompanying-course
+            summary: "Remove the participant for the accompanying course"
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The accompanying period's id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            requestBody:
+                description: "A person"
+                required: true
+                content:
+                    application/json:
+                        schema:
+                            $ref: "#/components/schemas/PersonById"
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
+                422:
+                    description: "object with validation errors"
 
-  /1.0/person/accompanying-course/{id}/resource.json:
-    post:
-      tags:
-        - accompanying-course
-      summary: "Add a resource to the accompanying course"
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The accompanying period's id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      requestBody:
-        description: "A resource"
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: "#/components/schemas/Resource"
-            examples:
-              add person with id 50:
-                summary: "a person with id 50"
-                value:
-                  type: accompanying_period_resource
-                  resource:
-                    type: person
-                    id: 50
-              add thirdparty with id 100:
-                summary: "a third party with id 100"
-                value:
-                  type: accompanying_period_resource
-                  resource:
-                    type: thirdparty
-                    id: 100
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
-        422:
-          description: "object with validation errors"
-    delete:
-      tags:
-        - accompanying-course
-      summary: "Remove the resource"
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The accompanying period's id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      requestBody:
-        description: "A resource"
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: "#/components/schemas/ResourceById"
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
-        422:
-          description: "object with validation errors"
+    /1.0/person/accompanying-course/{id}/resource.json:
+        post:
+            tags:
+                - accompanying-course
+            summary: "Add a resource to the accompanying course"
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The accompanying period's id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            requestBody:
+                description: "A resource"
+                required: true
+                content:
+                    application/json:
+                        schema:
+                            $ref: "#/components/schemas/Resource"
+                        examples:
+                            add person with id 50:
+                                summary: "a person with id 50"
+                                value:
+                                    type: accompanying_period_resource
+                                    resource:
+                                        type: person
+                                        id: 50
+                            add thirdparty with id 100:
+                                summary: "a third party with id 100"
+                                value:
+                                    type: accompanying_period_resource
+                                    resource:
+                                        type: thirdparty
+                                        id: 100
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
+                422:
+                    description: "object with validation errors"
+        delete:
+            tags:
+                - accompanying-course
+            summary: "Remove the resource"
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The accompanying period's id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            requestBody:
+                description: "A resource"
+                required: true
+                content:
+                    application/json:
+                        schema:
+                            $ref: "#/components/schemas/ResourceById"
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
+                422:
+                    description: "object with validation errors"
 
-  /1.0/person/accompanying-course/{id}/comment.json:
-    post:
-      tags:
-        - accompanying-course
-      summary: "Add a comment to the accompanying course"
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The accompanying period's id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      requestBody:
-        description: "A comment"
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: "#/components/schemas/Comment"
-            examples:
-              a single comment:
-                summary: "a simple comment"
-                value:
-                  type: accompanying_period_comment
-                  content: |
-                    This is a funny comment I would like to share with you.
+    /1.0/person/accompanying-course/{id}/comment.json:
+        post:
+            tags:
+                - accompanying-course
+            summary: "Add a comment to the accompanying course"
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The accompanying period's id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            requestBody:
+                description: "A comment"
+                required: true
+                content:
+                    application/json:
+                        schema:
+                            $ref: "#/components/schemas/Comment"
+                        examples:
+                            a single comment:
+                                summary: "a simple comment"
+                                value:
+                                    type: accompanying_period_comment
+                                    content: |
+                                        This is a funny comment I would like to share with you.
 
-                    Thank you for reading this !
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
-        422:
-          description: "object with validation errors"
-    delete:
-      tags:
-        - accompanying-course
-      summary: "Remove the comment"
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The accompanying period's id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      requestBody:
-        description: "A comment"
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: "#/components/schemas/CommentById"
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
-        422:
-          description: "object with validation errors"
+                                        Thank you for reading this !
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
+                422:
+                    description: "object with validation errors"
+        delete:
+            tags:
+                - accompanying-course
+            summary: "Remove the comment"
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The accompanying period's id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            requestBody:
+                description: "A comment"
+                required: true
+                content:
+                    application/json:
+                        schema:
+                            $ref: "#/components/schemas/CommentById"
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
+                422:
+                    description: "object with validation errors"
 
-  /1.0/person/accompanying-course/{id}/scope.json:
-    post:
-      tags:
-        - accompanying-course
-      summary: "Add a scope to the accompanying course"
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The accompanying period's id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      requestBody:
-        description: "A comment"
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: "#/components/schemas/Scope"
-            examples:
-              add a scope:
-                value:
-                  type: scope
-                  id: 5
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
-        422:
-          description: "object with validation errors"
-    delete:
-      tags:
-        - accompanying-course
-      summary: "Remove the scope"
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The accompanying period's id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      requestBody:
-        description: "A scope with his id"
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: "#/components/schemas/ScopeById"
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
-        422:
-          description: "object with validation errors"
+    /1.0/person/accompanying-course/{id}/scope.json:
+        post:
+            tags:
+                - accompanying-course
+            summary: "Add a scope to the accompanying course"
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The accompanying period's id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            requestBody:
+                description: "A comment"
+                required: true
+                content:
+                    application/json:
+                        schema:
+                            $ref: "#/components/schemas/Scope"
+                        examples:
+                            add a scope:
+                                value:
+                                    type: scope
+                                    id: 5
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
+                422:
+                    description: "object with validation errors"
+        delete:
+            tags:
+                - accompanying-course
+            summary: "Remove the scope"
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The accompanying period's id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            requestBody:
+                description: "A scope with his id"
+                required: true
+                content:
+                    application/json:
+                        schema:
+                            $ref: "#/components/schemas/ScopeById"
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
+                422:
+                    description: "object with validation errors"
 
-  /1.0/person/accompanying-course/{id}/socialissue.json:
-    post:
-      tags:
-        - accompanying-course
-      summary: "Add a social issue to the accompanying course"
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The accompanying period's id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      requestBody:
-        description: "A social issue by id"
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: "#/components/schemas/SocialIssue"
-            examples:
-              add a social issue:
-                value:
-                  type: social_issue
-                  id: 5
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
-        422:
-          description: "object with validation errors"
-    delete:
-      tags:
-        - accompanying-course
-      summary: "Remove the social issue"
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The accompanying period's id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      requestBody:
-        description: "A social issue with his id"
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: "#/components/schemas/SocialIssue"
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
-        422:
-          description: "object with validation errors"
-  /1.0/person/accompanying-course/{id}/referrers-suggested.json:
-    get:
-      tags:
-        - accompanying-course
-      summary: "get a list of available referral for a given accompanying cours"
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The accompanying period's id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
+    /1.0/person/accompanying-course/{id}/socialissue.json:
+        post:
+            tags:
+                - accompanying-course
+            summary: "Add a social issue to the accompanying course"
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The accompanying period's id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            requestBody:
+                description: "A social issue by id"
+                required: true
+                content:
+                    application/json:
+                        schema:
+                            $ref: "#/components/schemas/SocialIssue"
+                        examples:
+                            add a social issue:
+                                value:
+                                    type: social_issue
+                                    id: 5
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
+                422:
+                    description: "object with validation errors"
+        delete:
+            tags:
+                - accompanying-course
+            summary: "Remove the social issue"
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The accompanying period's id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            requestBody:
+                description: "A social issue with his id"
+                required: true
+                content:
+                    application/json:
+                        schema:
+                            $ref: "#/components/schemas/SocialIssue"
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
+                422:
+                    description: "object with validation errors"
+    /1.0/person/accompanying-course/{id}/referrers-suggested.json:
+        get:
+            tags:
+                - accompanying-course
+            summary: "get a list of available referral for a given accompanying cours"
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The accompanying period's id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
 
-  /1.0/person/accompanying-course/{id}/works.json:
-    get:
-      tags:
-        - accompanying-course
-      summary: List of accompanying period works for an accompanying period
-      description: Gets a list of accompanying period works for an accompanying period
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The accompanying period id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
+    /1.0/person/accompanying-course/{id}/works.json:
+        get:
+            tags:
+                - accompanying-course
+            summary: List of accompanying period works for an accompanying period
+            description: Gets a list of accompanying period works for an accompanying period
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The accompanying period id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
 
-  /1.0/person/accompanying-course/{id}/work.json:
-    post:
-      tags:
-        - accompanying-course-work
-      summary: "Add a work (AccompanyingPeriodwork) to the accompanying course"
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The accompanying period's id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      requestBody:
-        description: "A new work"
-        required: true
-        content:
-          application/json:
-            schema:
-              type: object
-              properties:
-                type:
-                  type: string
-                  enum:
-                    - "accompanying_period_work"
-                startDate:
-                  $ref: "#/components/schemas/Date"
-                endDate:
-                  $ref: "#/components/schemas/Date"
-            examples:
-              create a work:
-                value:
-                  type: accompanying_period_work
-                  social_action:
-                    id: 0
-                    type: social_work_social_action
-                  startDate:
-                    datetime: 2021-06-20T15:00:00+0200
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
-        422:
-          description: "object with validation errors"
+    /1.0/person/accompanying-course/{id}/work.json:
+        post:
+            tags:
+                - accompanying-course-work
+            summary: "Add a work (AccompanyingPeriodwork) to the accompanying course"
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The accompanying period's id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            requestBody:
+                description: "A new work"
+                required: true
+                content:
+                    application/json:
+                        schema:
+                            type: object
+                            properties:
+                                type:
+                                    type: string
+                                    enum:
+                                        - "accompanying_period_work"
+                                startDate:
+                                    $ref: "#/components/schemas/Date"
+                                endDate:
+                                    $ref: "#/components/schemas/Date"
+                        examples:
+                            create a work:
+                                value:
+                                    type: accompanying_period_work
+                                    social_action:
+                                        id: 0
+                                        type: social_work_social_action
+                                    startDate:
+                                        datetime: 2021-06-20T15:00:00+0200
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
+                422:
+                    description: "object with validation errors"
 
-  /1.0/person/accompanying-course/work/{id}.json:
-    get:
-      tags:
-        - accompanying-course-work
-      summary: edit an existing accompanying course work
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The accompanying course social work's id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
-        400:
-          description: "Bad Request"
+    /1.0/person/accompanying-course/work/{id}.json:
+        get:
+            tags:
+                - accompanying-course-work
+            summary: edit an existing accompanying course work
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The accompanying course social work's id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
+                400:
+                    description: "Bad Request"
 
-    put:
-      tags:
-        - accompanying-course-work
-      summary: edit an existing accompanying course work
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The accompanying course social work's id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: "#/components/schemas/AccompanyingCourseWork"
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
-        422:
-          description: "Unprocessable entity (validation errors)"
-        400:
-          description: "Bad Request"
+        put:
+            tags:
+                - accompanying-course-work
+            summary: edit an existing accompanying course work
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The accompanying course social work's id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            requestBody:
+                required: true
+                content:
+                    application/json:
+                        schema:
+                            $ref: "#/components/schemas/AccompanyingCourseWork"
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
+                422:
+                    description: "Unprocessable entity (validation errors)"
+                400:
+                    description: "Bad Request"
 
-  /1.0/person/accompanying-course/{id}/confirm.json:
-    post:
-      tags:
-        - person
-      summary: confirm an accompanying course
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The accompanying period's id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
-        400:
-          description: "transition cannot be applied"
+    /1.0/person/accompanying-course/{id}/confirm.json:
+        post:
+            tags:
+                - person
+            summary: confirm an accompanying course
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The accompanying period's id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
+                400:
+                    description: "transition cannot be applied"
 
-  /1.0/person/accompanying-course/{id}/confidential.json:
-    post:
-      tags:
-        - person
-      summary: "Toggle confidentiality of accompanying course"
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The accompanying period's id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      requestBody:
-        description: "Confidentiality toggle"
-        required: true
-        content:
-          application/json:
-            schema:
-              type: object
-              properties:
-                type:
-                  type: string
-                  enum:
-                    - "accompanying_period"
-                confidential:
-                  type: boolean
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
-        422:
-          description: "object with validation errors"
+    /1.0/person/accompanying-course/{id}/confidential.json:
+        post:
+            tags:
+                - person
+            summary: "Toggle confidentiality of accompanying course"
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The accompanying period's id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            requestBody:
+                description: "Confidentiality toggle"
+                required: true
+                content:
+                    application/json:
+                        schema:
+                            type: object
+                            properties:
+                                type:
+                                    type: string
+                                    enum:
+                                        - "accompanying_period"
+                                confidential:
+                                    type: boolean
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
+                422:
+                    description: "object with validation errors"
 
-  /1.0/person/accompanying-course/{id}/intensity.json:
-    post:
-      tags:
-        - person
-      summary: "Toggle intensity status of accompanying course"
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The accompanying period's id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      requestBody:
-        description: "Intensity toggle"
-        required: true
-        content:
-          application/json:
-            schema:
-              type: object
-              properties:
-                type:
-                  type: string
-                  enum:
-                    - "accompanying_period"
-                intensity:
-                  type: string
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
-        422:
-          description: "object with validation errors"
+    /1.0/person/accompanying-course/{id}/intensity.json:
+        post:
+            tags:
+                - person
+            summary: "Toggle intensity status of accompanying course"
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The accompanying period's id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            requestBody:
+                description: "Intensity toggle"
+                required: true
+                content:
+                    application/json:
+                        schema:
+                            type: object
+                            properties:
+                                type:
+                                    type: string
+                                    enum:
+                                        - "accompanying_period"
+                                intensity:
+                                    type: string
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
+                422:
+                    description: "object with validation errors"
 
-  /1.0/person/accompanying-course/by-person/{person_id}.json:
-    get:
-      tags:
-        - accompanying period
-      summary: get a list of accompanying periods for a person
-      description: Returns a list of the current accompanying periods for a person
-      parameters:
-        - name: person_id
-          in: path
-          required: true
-          description: The person id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
+    /1.0/person/accompanying-course/by-person/{person_id}.json:
+        get:
+            tags:
+                - accompanying period
+            summary: get a list of accompanying periods for a person
+            description: Returns a list of the current accompanying periods for a person
+            parameters:
+                -   name: person_id
+                    in: path
+                    required: true
+                    description: The person id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
 
-  /1.0/person/accompanying-period/origin.json:
-    get:
-      tags:
-        - person
-      summary: Return a list of all origins
-      responses:
-        200:
-          description: "ok"
+    /1.0/person/accompanying-period/origin.json:
+        get:
+            tags:
+                - person
+            summary: Return a list of all origins
+            responses:
+                200:
+                    description: "ok"
 
-  /1.0/person/accompanying-period/origin/{id}.json:
-    get:
-      tags:
-        - person
-      summary: Return an origin by id
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The origin id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      responses:
-        200:
-          description: "ok"
-        400:
-          description: "Bad Request"
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
+    /1.0/person/accompanying-period/origin/{id}.json:
+        get:
+            tags:
+                - person
+            summary: Return an origin by id
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The origin id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            responses:
+                200:
+                    description: "ok"
+                400:
+                    description: "Bad Request"
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
 
-  /1.0/person/accompanying-period/resource/{id}.json:
-    patch:
-      tags:
-        - accompanying-course-resource
-      summary: "Alter the resource"
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The resource's id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      requestBody:
-        description: "A resource"
-        required: true
-        content:
-          application/json:
-            schema:
-              type: object
-              properties:
-                type:
-                  type: string
-                  enum:
-                    - "accompanying_period_resource"
-                #id:
-                #  type: integer
-                comment:
-                  type: string
-              required:
-                - type
-            examples:
-              Set the resource comment:
-                value:
-                  type: accompanying_period_resource
-                  #id: 0
-                  comment: my judicious comment
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
-        422:
-          description: "object with validation errors"
+    /1.0/person/accompanying-period/resource/{id}.json:
+        patch:
+            tags:
+                - accompanying-course-resource
+            summary: "Alter the resource"
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The resource's id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            requestBody:
+                description: "A resource"
+                required: true
+                content:
+                    application/json:
+                        schema:
+                            type: object
+                            properties:
+                                type:
+                                    type: string
+                                    enum:
+                                        - "accompanying_period_resource"
+                                #id:
+                                #  type: integer
+                                comment:
+                                    type: string
+                            required:
+                                - type
+                        examples:
+                            Set the resource comment:
+                                value:
+                                    type: accompanying_period_resource
+                                    #id: 0
+                                    comment: my judicious comment
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
+                422:
+                    description: "object with validation errors"
 
-  /1.0/person/household.json:
-    get:
-      tags:
-        - household
-      summary: Return a list of all household
-      responses:
-        200:
-          description: "ok"
-    post:
-      tags:
-        - household
-      requestBody:
-        description: "A household"
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: "#/components/schemas/Household"
-      summary: Post a new household
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
-        422:
-          description: "Unprocessable entity (validation errors)"
-        400:
-          description: "transition cannot be applied"
+    /1.0/person/household.json:
+        get:
+            tags:
+                - household
+            summary: Return a list of all household
+            responses:
+                200:
+                    description: "ok"
+        post:
+            tags:
+                - household
+            requestBody:
+                description: "A household"
+                required: true
+                content:
+                    application/json:
+                        schema:
+                            $ref: "#/components/schemas/Household"
+            summary: Post a new household
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
+                422:
+                    description: "Unprocessable entity (validation errors)"
+                400:
+                    description: "transition cannot be applied"
 
-  /1.0/person/household/{id}.json:
-    get:
-      tags:
-        - household
-      summary: Return a household by id
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The household id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      responses:
-        200:
-          description: "ok"
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/Household"
-        404:
-          description: "not found"
-        401:
-          description: "Unauthorized"
+    /1.0/person/household/{id}.json:
+        get:
+            tags:
+                - household
+            summary: Return a household by id
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The household id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            responses:
+                200:
+                    description: "ok"
+                    content:
+                        application/json:
+                            schema:
+                                $ref: "#/components/schemas/Household"
+                404:
+                    description: "not found"
+                401:
+                    description: "Unauthorized"
 
-  /1.0/person/household/by-address-reference/{address_id}.json:
-    get:
-      tags:
-        - household
-      summary: Return a list of household which are sharing the same address reference
-      parameters:
-        - name: address_id
-          in: path
-          required: true
-          description: the address reference id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      responses:
-        200:
-          description: "ok"
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/Household"
-        404:
-          description: "not found"
-        401:
-          description: "Unauthorized"
+    /1.0/person/household/by-address-reference/{address_id}.json:
+        get:
+            tags:
+                - household
+            summary: Return a list of household which are sharing the same address reference
+            parameters:
+                -   name: address_id
+                    in: path
+                    required: true
+                    description: the address reference id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            responses:
+                200:
+                    description: "ok"
+                    content:
+                        application/json:
+                            schema:
+                                $ref: "#/components/schemas/Household"
+                404:
+                    description: "not found"
+                401:
+                    description: "Unauthorized"
 
-  /1.0/person/household/suggest/by-person/{person_id}/through-accompanying-period-participation.json:
-    get:
-      tags:
-        - household
-      summary: Return households associated with the given person through accompanying periods
-      description: |
-        Return households associated with the given person throught accompanying periods participation.
+    /1.0/person/household/suggest/by-person/{person_id}/through-accompanying-period-participation.json:
+        get:
+            tags:
+                - household
+            summary: Return households associated with the given person through accompanying periods
+            description: |
+                Return households associated with the given person throught accompanying periods participation.
 
-        The current household of the given person is excluded.
-      parameters:
-        - name: person_id
-          in: path
-          required: true
-          description: The person's id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      responses:
-        200:
-          description: "ok"
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/Household"
-        404:
-          description: "not found"
-        401:
-          description: "Unauthorized"
+                The current household of the given person is excluded.
+            parameters:
+                -   name: person_id
+                    in: path
+                    required: true
+                    description: The person's id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            responses:
+                200:
+                    description: "ok"
+                    content:
+                        application/json:
+                            schema:
+                                $ref: "#/components/schemas/Household"
+                404:
+                    description: "not found"
+                401:
+                    description: "Unauthorized"
 
-  /1.0/person/household/members/move.json:
-    post:
-      tags:
-        - household
-      summary: move one or multiple person from a household to another
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              type: object
-              properties:
-                concerned:
-                  type: array
-                  items:
-                    type: object
-                    properties:
-                      person:
-                        $ref: "#/components/schemas/PersonById"
-                      start_date:
-                        $ref: "#/components/schemas/Date"
-                      position:
-                        $ref: "#/components/schemas/HouseholdPosition"
-                      holder:
-                        type: boolean
-                      comment:
-                        type: string
-                destination:
-                  $ref: "#/components/schemas/Household"
-            examples:
-              Moving person to a new household:
-                value:
-                  concerned:
-                    - person:
-                        id: 0
-                        type: person
-                      position:
-                        type: household_position
-                        id: 1
-                      start_date:
-                        datetime: "2021-06-01T00:00:00+02:00"
-                      comment: "This is my comment for moving"
-                      holder: false
-                  destination:
-                    type: household
-              Moving person to a new household and set an address to this household:
-                value:
-                  concerned:
-                    - person:
-                        id: 0
-                        type: person
-                      position:
-                        type: household_position
-                        id: 1
-                      start_date:
-                        datetime: "2021-06-01T00:00:00+02:00"
-                      comment: "This is my comment for moving"
-                      holder: false
-                  destination:
-                    type: household
-                    forceAddress:
-                      id: 0
-              Moving person to an existing household:
-                value:
-                  concerned:
-                    - person:
-                        id: 0
-                        type: person
-                      position:
-                        type: household_position
-                        id: 1
-                      start_date:
-                        datetime: 2021-06-01T00:00:00+02:00
-                      comment: "This is my comment for moving"
-                      holder: false
-                  destination:
-                    type: household
-                    id: 54
-              Removing a person from any household:
-                value:
-                  concerned:
-                    - person:
-                        id: 0
-                        type: person
-                      start_date:
-                        datetime: 2021-06-01T00:00:00+02:00
-                  destination: null
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
-        422:
-          description: "Unprocessable entity (validation errors)"
-        400:
-          description: "transition cannot be applied"
+    /1.0/person/household/members/move.json:
+        post:
+            tags:
+                - household
+            summary: move one or multiple person from a household to another
+            requestBody:
+                required: true
+                content:
+                    application/json:
+                        schema:
+                            type: object
+                            properties:
+                                concerned:
+                                    type: array
+                                    items:
+                                        type: object
+                                        properties:
+                                            person:
+                                                $ref: "#/components/schemas/PersonById"
+                                            start_date:
+                                                $ref: "#/components/schemas/Date"
+                                            position:
+                                                $ref: "#/components/schemas/HouseholdPosition"
+                                            holder:
+                                                type: boolean
+                                            comment:
+                                                type: string
+                                destination:
+                                    $ref: "#/components/schemas/Household"
+                        examples:
+                            Moving person to a new household:
+                                value:
+                                    concerned:
+                                        -   person:
+                                                id: 0
+                                                type: person
+                                            position:
+                                                type: household_position
+                                                id: 1
+                                            start_date:
+                                                datetime: "2021-06-01T00:00:00+02:00"
+                                            comment: "This is my comment for moving"
+                                            holder: false
+                                    destination:
+                                        type: household
+                            Moving person to a new household and set an address to this household:
+                                value:
+                                    concerned:
+                                        -   person:
+                                                id: 0
+                                                type: person
+                                            position:
+                                                type: household_position
+                                                id: 1
+                                            start_date:
+                                                datetime: "2021-06-01T00:00:00+02:00"
+                                            comment: "This is my comment for moving"
+                                            holder: false
+                                    destination:
+                                        type: household
+                                        forceAddress:
+                                            id: 0
+                            Moving person to an existing household:
+                                value:
+                                    concerned:
+                                        -   person:
+                                                id: 0
+                                                type: person
+                                            position:
+                                                type: household_position
+                                                id: 1
+                                            start_date:
+                                                datetime: 2021-06-01T00:00:00+02:00
+                                            comment: "This is my comment for moving"
+                                            holder: false
+                                    destination:
+                                        type: household
+                                        id: 54
+                            Removing a person from any household:
+                                value:
+                                    concerned:
+                                        -   person:
+                                                id: 0
+                                                type: person
+                                            start_date:
+                                                datetime: 2021-06-01T00:00:00+02:00
+                                    destination: null
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
+                422:
+                    description: "Unprocessable entity (validation errors)"
+                400:
+                    description: "transition cannot be applied"
 
-  /1.0/person/household/{id}/address.json:
-    post:
-      tags:
-        - household
-      summary: post an address to a household
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The household id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      requestBody:
-        required: true
-        content:
-          application/json:
-            schema:
-              type: object
-              properties:
-                id:
-                  type: integer
-                  description: The address id to attach to the household
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
-        422:
-          description: "Unprocessable entity (validation errors)"
-        400:
-          description: "transition cannot be applied"
+    /1.0/person/household/{id}/address.json:
+        post:
+            tags:
+                - household
+            summary: post an address to a household
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The household id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            requestBody:
+                required: true
+                content:
+                    application/json:
+                        schema:
+                            type: object
+                            properties:
+                                id:
+                                    type: integer
+                                    description: The address id to attach to the household
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
+                422:
+                    description: "Unprocessable entity (validation errors)"
+                400:
+                    description: "transition cannot be applied"
 
-  /1.0/person/social/social-action.json:
-    get:
-      tags:
-        - social-work-social-action
-      summary: get a list of social action
-      responses:
-        401:
-          description: "Unauthorized"
-        200:
-          description: "OK"
+    /1.0/person/social/social-action.json:
+        get:
+            tags:
+                - social-work-social-action
+            summary: get a list of social action
+            responses:
+                401:
+                    description: "Unauthorized"
+                200:
+                    description: "OK"
 
-  /1.0/person/social/social-action/{id}.json:
-    get:
-      tags:
-        - social-work-social-action
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The social action's id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
-        400:
-          description: "Bad Request"
+    /1.0/person/social/social-action/{id}.json:
+        get:
+            tags:
+                - social-work-social-action
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The social action's id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
+                400:
+                    description: "Bad Request"
 
-  /1.0/person/social/social-action/by-social-issue/{id}.json:
-    get:
-      tags:
-        - social-work-social-action
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The social action's id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
-        400:
-          description: "Bad Request"
+    /1.0/person/social/social-action/by-social-issue/{id}.json:
+        get:
+            tags:
+                - social-work-social-action
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The social action's id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
+                400:
+                    description: "Bad Request"
 
-  /1.0/person/social-work/evaluation/by-social-action/{social_action_id}.json:
-    get:
-      tags:
-        - social-work-evaluation
-      summary: return a list of evaluation which are available for a given social action
-      parameters:
-        - name: social_action_id
-          in: path
-          required: true
-          description: The social action's id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      responses:
-        200:
-          description: ok
-        404:
-          description: not found
+    /1.0/person/social-work/evaluation/by-social-action/{social_action_id}.json:
+        get:
+            tags:
+                - social-work-evaluation
+            summary: return a list of evaluation which are available for a given social action
+            parameters:
+                -   name: social_action_id
+                    in: path
+                    required: true
+                    description: The social action's id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            responses:
+                200:
+                    description: ok
+                404:
+                    description: not found
 
-  /1.0/person/social-work/social-issue.json:
-    get:
-      tags:
-        - social-issue
-      summary: Return a list of social work
-      responses:
-        200:
-          description: "ok"
+    /1.0/person/social-work/social-issue.json:
+        get:
+            tags:
+                - social-issue
+            summary: Return a list of social work
+            responses:
+                200:
+                    description: "ok"
 
-  /1.0/person/social-work/social-issue/{id}.json:
-    get:
-      tags:
-        - social-issue
-      summary: Return a social issue by id
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The social issue's id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      responses:
-        200:
-          description: "ok"
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/SocialIssue"
-        404:
-          description: "not found"
-        401:
-          description: "Unauthorized"
+    /1.0/person/social-work/social-issue/{id}.json:
+        get:
+            tags:
+                - social-issue
+            summary: Return a social issue by id
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The social issue's id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            responses:
+                200:
+                    description: "ok"
+                    content:
+                        application/json:
+                            schema:
+                                $ref: "#/components/schemas/SocialIssue"
+                404:
+                    description: "not found"
+                401:
+                    description: "Unauthorized"
 
-  /1.0/person/social-work/result.json:
-    get:
-      tags:
-        - accompanying-course-work
-      summary: get a list of social work result
-      responses:
-        401:
-          description: "Unauthorized"
-        200:
-          description: "OK"
+    /1.0/person/social-work/result.json:
+        get:
+            tags:
+                - accompanying-course-work
+            summary: get a list of social work result
+            responses:
+                401:
+                    description: "Unauthorized"
+                200:
+                    description: "OK"
 
-  /1.0/person/social-work/result/{id}.json:
-    get:
-      tags:
-        - accompanying-course-work
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The result's id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
-        400:
-          description: "Bad Request"
+    /1.0/person/social-work/result/{id}.json:
+        get:
+            tags:
+                - accompanying-course-work
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The result's id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
+                400:
+                    description: "Bad Request"
 
-  /1.0/person/social-work/result/by-goal/{id}.json:
-    get:
-      tags:
-        - accompanying-course-work
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The goal's id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
-        400:
-          description: "Bad Request"
+    /1.0/person/social-work/result/by-goal/{id}.json:
+        get:
+            tags:
+                - accompanying-course-work
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The goal's id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
+                400:
+                    description: "Bad Request"
 
-  /1.0/person/social-work/result/by-social-action/{id}.json:
-    get:
-      tags:
-        - accompanying-course-work
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The social action's id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
-        400:
-          description: "Bad Request"
+    /1.0/person/social-work/result/by-social-action/{id}.json:
+        get:
+            tags:
+                - accompanying-course-work
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The social action's id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
+                400:
+                    description: "Bad Request"
 
-  /1.0/person/social-work/goal.json:
-    get:
-      tags:
-        - accompanying-course-work
-      summary: get a list of social work goal
-      responses:
-        401:
-          description: "Unauthorized"
-        200:
-          description: "OK"
+    /1.0/person/social-work/goal.json:
+        get:
+            tags:
+                - accompanying-course-work
+            summary: get a list of social work goal
+            responses:
+                401:
+                    description: "Unauthorized"
+                200:
+                    description: "OK"
 
-  /1.0/person/social-work/goal/{id}.json:
-    get:
-      tags:
-        - accompanying-course-work
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The goal's id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
-        400:
-          description: "Bad Request"
+    /1.0/person/social-work/goal/{id}.json:
+        get:
+            tags:
+                - accompanying-course-work
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The goal's id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
+                400:
+                    description: "Bad Request"
 
-  /1.0/person/social-work/goal/by-social-action/{id}.json:
-    get:
-      tags:
-        - accompanying-course-work
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The social action's id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
-        400:
-          description: "Bad Request"
+    /1.0/person/social-work/goal/by-social-action/{id}.json:
+        get:
+            tags:
+                - accompanying-course-work
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The social action's id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
+                400:
+                    description: "Bad Request"
 
-  /1.0/relations/relationship/by-person/{id}.json:
-    get:
-      tags:
-        - relationships
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The person's id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
-        400:
-          description: "Bad Request"
+    /1.0/relations/relationship/by-person/{id}.json:
+        get:
+            tags:
+                - relationships
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The person's id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
+                400:
+                    description: "Bad Request"
 
-  /1.0/relations/relationship.json:
-    post:
-      tags:
-        - relationships
-      summary: Create a new relationship
-      requestBody:
-        description: "A relationship"
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: "#/components/schemas/Relationship"
-      responses:
-        200:
-          description: "OK"
-          content:
-            application/json:
-              schema:
-                $ref: "#/components/schemas/Relationship"
-        403:
-          description: "Unauthorized"
-        422:
-          description: "Invalid data: the data is a valid json, could be deserialized, but does not pass validation"
+    /1.0/relations/relationship.json:
+        post:
+            tags:
+                - relationships
+            summary: Create a new relationship
+            requestBody:
+                description: "A relationship"
+                required: true
+                content:
+                    application/json:
+                        schema:
+                            $ref: "#/components/schemas/Relationship"
+            responses:
+                200:
+                    description: "OK"
+                    content:
+                        application/json:
+                            schema:
+                                $ref: "#/components/schemas/Relationship"
+                403:
+                    description: "Unauthorized"
+                422:
+                    description: "Invalid data: the data is a valid json, could be deserialized, but does not pass validation"
 
-  /1.0/relations/relationship/{id}.json:
-    patch:
-      tags:
-        - relationships
-      summary: "Alter a relationship"
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The relationship's id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      requestBody:
-        description: "A relationship"
-        required: true
-        content:
-          application/json:
-            schema:
-              $ref: "#/components/schemas/Relationship"
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
-        422:
-          description: "Object with validation errors"
-    delete:
-      tags:
-        - relationships
-      summary: "Remove the relationship"
-      parameters:
-        - name: id
-          in: path
-          required: true
-          description: The relationship's id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      responses:
-        401:
-          description: "Unauthorized"
-        404:
-          description: "Not found"
-        200:
-          description: "OK"
-        422:
-          description: "object with validation errors"
+    /1.0/relations/relationship/{id}.json:
+        patch:
+            tags:
+                - relationships
+            summary: "Alter a relationship"
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The relationship's id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            requestBody:
+                description: "A relationship"
+                required: true
+                content:
+                    application/json:
+                        schema:
+                            $ref: "#/components/schemas/Relationship"
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
+                422:
+                    description: "Object with validation errors"
+        delete:
+            tags:
+                - relationships
+            summary: "Remove the relationship"
+            parameters:
+                -   name: id
+                    in: path
+                    required: true
+                    description: The relationship's id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            responses:
+                401:
+                    description: "Unauthorized"
+                404:
+                    description: "Not found"
+                200:
+                    description: "OK"
+                422:
+                    description: "object with validation errors"
 
 
-  /1.0/relations/relation.json:
-    get:
-      tags:
-        - relations
-      summary: get a list of relations
-      responses:
-        401:
-          description: "Unauthorized"
-        200:
-          description: "OK"
+    /1.0/relations/relation.json:
+        get:
+            tags:
+                - relations
+            summary: get a list of relations
+            responses:
+                401:
+                    description: "Unauthorized"
+                200:
+                    description: "OK"
 
-  /1.0/person/config/alt_names.json:
-    get:
-      tags:
-        - person
-      summary: Return a list of possible altNames that are defined in the config
-      responses:
-        200:
-          description: "OK"
+    /1.0/person/config/alt_names.json:
+        get:
+            tags:
+                - person
+            summary: Return a list of possible altNames that are defined in the config
+            responses:
+                200:
+                    description: "OK"
 
-  /1.0/person/creation/authorized-centers:
-    get:
-      tags:
-        - person
-        - permissions
-      summary: Return a list of possible centers for person creation
-      responses:
-        200:
-          description: "OK"
+    /1.0/person/creation/authorized-centers:
+        get:
+            tags:
+                - person
+                - permissions
+            summary: Return a list of possible centers for person creation
+            responses:
+                200:
+                    description: "OK"
 
-  /1.0/person/accompanying-course-work-evaluation-document/{id}/duplicate:
-    post:
-      tags:
-        - accompanying-course-work-evaluation-document
-      summary: Dupliate an an accompanying period work evaluation document
-      parameters:
-        - in: path
-          name: id
-          required: true
-          description: The document's id
-          schema:
-            type: integer
-            format: integer
-            minimum: 1
-      responses:
-        200:
-          description: "OK"
-          content:
-            application/json:
-              schema:
-                type: object
+    /1.0/person/accompanying-course-work-evaluation-document/{id}/duplicate:
+        post:
+            tags:
+                - accompanying-course-work-evaluation-document
+            summary: Dupliate an an accompanying period work evaluation document
+            parameters:
+                -   in: path
+                    name: id
+                    required: true
+                    description: The document's id
+                    schema:
+                        type: integer
+                        format: integer
+                        minimum: 1
+            responses:
+                200:
+                    description: "OK"
+                    content:
+                        application/json:
+                            schema:
+                                type: object
 
   /1.0/person/accompanying-course-work-evaluation-document/{document_id}/evaluation/{evaluation_id}/duplicate:
     post:
@@ -2023,3 +2023,16 @@ paths:
             application/json:
               schema:
                 type: object
+
+    /1.0/person/identifiers/workers:
+        get:
+            tags:
+                - person
+            summary: List the person identifiers
+            responses:
+                200:
+                    description: "OK"
+                    content:
+                            application/json:
+                                schema:
+                                    type: object
diff --git a/src/Bundle/ChillPersonBundle/config/services.yaml b/src/Bundle/ChillPersonBundle/config/services.yaml
index 1b57721ff..5d258f029 100644
--- a/src/Bundle/ChillPersonBundle/config/services.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services.yaml
@@ -108,3 +108,9 @@ services:
 
     Chill\PersonBundle\PersonIdentifier\Rendering\:
         resource: '../PersonIdentifier/Rendering'
+
+    Chill\PersonBundle\PersonIdentifier\Normalizer\:
+        resource: '../PersonIdentifier/Normalizer'
+
+    Chill\PersonBundle\PersonIdentifier\Validator\:
+        resource: '../PersonIdentifier/Validator'
diff --git a/src/Bundle/ChillPersonBundle/config/services/actions.yaml b/src/Bundle/ChillPersonBundle/config/services/actions.yaml
index d6e2c80a5..220a7483e 100644
--- a/src/Bundle/ChillPersonBundle/config/services/actions.yaml
+++ b/src/Bundle/ChillPersonBundle/config/services/actions.yaml
@@ -11,3 +11,9 @@ services:
 
     Chill\PersonBundle\Actions\Remove\Handler\:
         resource: '../../Actions/Remove/Handler'
+
+    Chill\PersonBundle\Actions\PersonEdit\Service\:
+        resource: '../../Actions/PersonEdit/Service'
+
+    Chill\PersonBundle\Actions\PersonCreate\Service\:
+        resource: '../../Actions/PersonCreate/Service'
diff --git a/src/Bundle/ChillPersonBundle/config/services/serializer.yaml b/src/Bundle/ChillPersonBundle/config/services/serializer.yaml
deleted file mode 100644
index 5a1e54400..000000000
--- a/src/Bundle/ChillPersonBundle/config/services/serializer.yaml
+++ /dev/null
@@ -1,11 +0,0 @@
----
-services:
-    # note: normalizers are loaded from ../services.yaml
-
-    Chill\PersonBundle\Serializer\Normalizer\:
-        autowire: true
-        autoconfigure: true
-        resource: '../../Serializer/Normalizer'
-        tags:
-            - { name: 'serializer.normalizer', priority: 64 }
-
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20250918095044.php b/src/Bundle/ChillPersonBundle/migrations/Version20250918095044.php
new file mode 100644
index 000000000..9ec97e337
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20250918095044.php
@@ -0,0 +1,37 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20250918095044 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add more details about presence in PersonIdentifier';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_identifier_definition ADD presence VARCHAR(255) DEFAULT \'ON_EDIT\' NOT NULL');
+        $this->addSql('UPDATE chill_person_identifier_definition SET presence = \'NOT_EDITABLE\' WHERE is_editable_by_users IS FALSE');
+        $this->addSql('ALTER TABLE chill_person_identifier_definition DROP is_editable_by_users');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_person_identifier_definition ADD is_editable_by_users BOOLEAN DEFAULT false NOT NULL');
+        $this->addSql('UPDATE chill_person_identifier_definition SET is_editable_by_users = true WHERE presence <> \'NOT_EDITABLE\' ');
+        $this->addSql('ALTER TABLE chill_person_identifier_definition DROP presence');
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20250922151020.php b/src/Bundle/ChillPersonBundle/migrations/Version20250922151020.php
new file mode 100644
index 000000000..709ecbf54
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20250922151020.php
@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20250922151020 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add unique constraint for person identifiers';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('CREATE UNIQUE INDEX chill_person_identifier_unique ON chill_person_identifier (definition_id, canonical)');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP INDEX chill_person_identifier_unique');
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20250924101621.php b/src/Bundle/ChillPersonBundle/migrations/Version20250924101621.php
new file mode 100644
index 000000000..e6f9fff54
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20250924101621.php
@@ -0,0 +1,53 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Restrict the deletion of identifier_definition to avoid risk of error.
+ *
+ * An identifier definition can only be removed if there aren't any identifier defined.
+ */
+final class Version20250924101621 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Restrict the deletion of identifier_definition';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql(<<<'SQL'
+            ALTER TABLE chill_person_identifier DROP CONSTRAINT fk_bca5a36bd11ea911
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE chill_person_identifier ADD CONSTRAINT fk_bca5a36bd11ea911
+            FOREIGN KEY (definition_id) REFERENCES chill_person_identifier_definition (id)
+            on delete restrict
+        SQL);
+
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql(<<<'SQL'
+            ALTER TABLE chill_person_identifier DROP CONSTRAINT fk_bca5a36bd11ea911
+        SQL);
+        $this->addSql(<<<'SQL'
+            ALTER TABLE chill_person_identifier ADD CONSTRAINT fk_bca5a36bd11ea911
+            FOREIGN KEY (definition_id) REFERENCES chill_person_identifier_definition (id)
+            on delete cascade
+        SQL);
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/migrations/Version20250926124024.php b/src/Bundle/ChillPersonBundle/migrations/Version20250926124024.php
new file mode 100644
index 000000000..71630d0ad
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/migrations/Version20250926124024.php
@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\Migrations\Person;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20250926124024 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add unique constraint on person_identifier: only one identifier of each kind by person';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('CREATE UNIQUE INDEX chill_person_identifier_unique_person_definition ON chill_person_identifier (definition_id, person_id)');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('DROP INDEX chill_person_identifier_unique_person_definition');
+    }
+}
diff --git a/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml b/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
index c5e8e097c..795d2ddf9 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
+++ b/src/Bundle/ChillPersonBundle/translations/messages+intl-icu.fr.yaml
@@ -265,3 +265,38 @@ add_persons:
             title: "Centre"
 
     error_only_one_person: "Une seule personne peut être sélectionnée !"
+
+renderbox:
+    person: "Usager"
+    birthday_statement: >-
+        {gender, select,
+            man {Né le {birthdate, date}}
+            woman {Née le {birthdate, date}}
+            other {Né·e le {birthdate, date}}
+        }
+    deathdate_statement: >-
+        {gender, select,
+            man {Décédé le {deathdate, date}}
+            woman {Décédée le {deathdate, date}}
+            other {Décédé·e le {deathdate, date}}
+        }
+    household_without_address: "Le ménage de l'usager est sans adresse"
+    no_data: "Aucune information renseignée"
+    type:
+        thirdparty: "Tiers"
+        person: "Usager"
+    holder: "Titulaire"
+    years_old: >-
+        {n, plural,
+            =0 {0 an}
+            one {1 an}
+            other {# ans}
+        }
+    residential_address: "Adresse de résidence"
+    located_at: "réside chez"
+    household_number: "Ménage n°{number}"
+    current_members: "Membres actuels"
+    no_current_address: "Sans adresse actuellement"
+    new_household: "Nouveau ménage"
+    no_members_yet: "Aucun membre actuellement"
+
diff --git a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
index 917d9e2cf..2159f32db 100644
--- a/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/messages.fr.yml
@@ -105,6 +105,8 @@ Administrative status: Situation administrative
 person:
     Identifiers: Identifiants
 
+person_edit:
+    Error while saving: Erreur lors de l'enregistrement
 
 # dédoublonnage
 Old person: Doublon
@@ -885,6 +887,12 @@ accompanying_course:
     administrative_location: Localisation administrative
     comment is pinned: Le commentaire est épinglé
     comment is unpinned: Le commentaire est désépinglé
+    requestor:
+        add: Ajouter un demandeur
+    persons_associated:
+        add_person: Ajouter des usagers
+    resources:
+        add_resources: Ajouter des interlocuteurs
 
 show: Montrer
 hide: Masquer
@@ -1583,7 +1591,7 @@ person_messages:
         center_id: "Identifiant du centre"
         center_type: "Type de centre"
         center_name: "Territoire"
-        phonenumber: "Téléphone"
+        phonenumber: "Téléphone fixe"
         mobilenumber: "Mobile"
         altnames: "Autres noms"
         email: "Courriel"
diff --git a/src/Bundle/ChillPersonBundle/translations/validators+intl-icu.fr.yaml b/src/Bundle/ChillPersonBundle/translations/validators+intl-icu.fr.yaml
new file mode 100644
index 000000000..3b65462e1
--- /dev/null
+++ b/src/Bundle/ChillPersonBundle/translations/validators+intl-icu.fr.yaml
@@ -0,0 +1,7 @@
+person_identifier:
+    fixed_length: >-
+        {limit, plural,
+            =1 {L'identifier doit contenir exactement 1 caractère}
+            other {L'identifiant doit contenir exactement # caractères}
+        }
+    only_number: "L'identifiant ne doit contenir que des chiffres"
diff --git a/src/Bundle/ChillPersonBundle/translations/validators.fr.yml b/src/Bundle/ChillPersonBundle/translations/validators.fr.yml
index c6fe0f912..02ad95de7 100644
--- a/src/Bundle/ChillPersonBundle/translations/validators.fr.yml
+++ b/src/Bundle/ChillPersonBundle/translations/validators.fr.yml
@@ -73,5 +73,9 @@ relationship:
 person_creation:
     If you want to create an household, an address is required: Pour la création d'un ménage, une adresse est requise
 
+person_identifier:
+    This identifier must be set: Cet identifiant doit être présent.
+    Identifier must be unique. The same identifier already exists for {{ persons }}: Identifiant déjà utilisé pour {{ persons }}
+
 accompanying_course_work:
     The endDate should be greater or equal than the start date: La date de fin doit être égale ou supérieure à la date de début
diff --git a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
index e65a06515..480e67cfc 100644
--- a/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
+++ b/src/Bundle/ChillThirdPartyBundle/Entity/ThirdParty.php
@@ -17,7 +17,6 @@ use Chill\MainBundle\Entity\Address;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Civility;
 use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Validation\Constraint\PhonenumberConstraint;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\ReadableCollection;
@@ -70,6 +69,11 @@ use Symfony\Component\Validator\Constraints as Assert;
  *
  * The difference between categories and types is transparent for user: they choose the same fields into the UI, without
  * noticing a difference.
+ *
+ * ## Validation
+ *
+ * When a validation is inserted / updated, do not forget to update the related ThirdPartyEdit.vue component and the associated
+ * list of possible violations.
  */
 #[ORM\Entity]
 #[ORM\Table(name: 'chill_3party.third_party')]
@@ -206,12 +210,12 @@ class ThirdParty implements TrackCreationInterface, TrackUpdateInterface, \Strin
 
     #[Groups(['read', 'write', 'docgen:read', 'docgen:read:3party:parent'])]
     #[ORM\Column(name: 'telephone', type: 'phone_number', nullable: true)]
-    #[PhonenumberConstraint(type: 'any')]
+    #[\Misd\PhoneNumberBundle\Validator\Constraints\PhoneNumber]
     private ?PhoneNumber $telephone = null;
 
     #[Groups(['read', 'write', 'docgen:read', 'docgen:read:3party:parent'])]
     #[ORM\Column(name: 'telephone2', type: 'phone_number', nullable: true)]
-    #[PhonenumberConstraint(type: 'any')]
+    #[\Misd\PhoneNumberBundle\Validator\Constraints\PhoneNumber]
     private ?PhoneNumber $telephone2 = null;
 
     #[ORM\Column(name: 'types', type: \Doctrine\DBAL\Types\Types::JSON, nullable: true)]
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/types.ts b/src/Bundle/ChillThirdPartyBundle/Resources/public/types.ts
index 2d2acc42b..a17797e6a 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/types.ts
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/types.ts
@@ -2,39 +2,123 @@ import {
   Address,
   Center,
   Civility,
-  DateTime,
+  DateTime, SetAddress, SetCivility,
   User,
 } from "ChillMainAssets/types";
 
-export interface Thirdparty {
+export type ThirdPartyKind = "contact" | "child" | "company";
+
+export interface BaseThirdParty {
   type: "thirdparty";
+  kind: ""|ThirdPartyKind;
   text: string;
   acronym: string | null;
   active: boolean;
   address: Address | null;
-  canonicalized: string | null;
-  categories: ThirdpartyCategory[];
-  centers: Center[];
-  children: Thirdparty[];
-  civility: Civility | null;
-  comment: string | null;
   contactDataAnonymous: boolean;
   createdAt: DateTime;
   createdBy: User | null;
   email: string | null;
   firstname: string | null;
-  id: number | null;
-  kind: string;
-  name: string;
+  id: number;
   nameCompany: string | null;
-  parent: Thirdparty | null;
-  profession: string;
   telephone: string | null;
-  thirdPartyTypes: ThirdpartyType[] | null;
+  telephone2: string | null;
   updatedAt: DateTime | null;
   updatedBy: User | null;
 }
 
+function isBaseThirdParty(t: unknown): t is BaseThirdParty {
+  if (typeof t !== "object" || t === null) return false;
+  const o = t as Partial<BaseThirdParty>;
+  return (
+    (o as any).type === "thirdparty" &&
+    typeof o.id === "number" &&
+    typeof o.text === "string" &&
+    (o.kind === "" || o.kind === "contact" || o.kind === "child" || o.kind === "company") &&
+    typeof o.active === "boolean"
+  );
+}
+
+export interface ThirdpartyCompany extends BaseThirdParty {
+  kind: "company";
+  text: string;
+  acronym: string | null;
+  children: Thirdparty[];
+  category: ThirdpartyCategory[];
+  thirdPartyTypes: ThirdpartyType[] | null;
+  address: Address | null;
+}
+
+// Type guard to distinguish a ThirdpartyCompany
+export function isThirdpartyCompany(
+  t: BaseThirdParty
+): t is ThirdpartyCompany {
+  return (
+    t.type === "thirdparty" &&
+    t.kind === "company"
+  );
+}
+
+export interface ThirdpartyChild extends BaseThirdParty {
+  kind: "child";
+  civility: Civility | null;
+  contactDataAnonymous: boolean;
+  parent: ThirdpartyCompany;
+  profession: string;
+  firstname: string;
+  /**
+   * the lastname for "Contact" and "Child", the name
+   */
+  name: string;
+  comment: string | null;
+}
+
+// Type guard to distinguish a ThirdpartyChild
+export function isThirdpartyChild(
+  t: BaseThirdParty
+): t is ThirdpartyChild {
+  return (
+    t.type === "thirdparty" &&
+    t.kind === "child"
+  );
+}
+
+export interface ThirdpartyContact extends BaseThirdParty {
+  kind: "contact";
+  civility: Civility | null;
+  category: ThirdpartyCategory[];
+  thirdPartyTypes: ThirdpartyType[] | null;
+  profession: string;
+  firstname: string;
+  /**
+   * the lastname for "Contact" and "Child", the name
+   */
+  name: string;
+  address: Address | null;
+}
+
+// Type guard to distinguish a ThirdpartyContact
+export function isThirdpartyContact(
+  t: BaseThirdParty
+): t is ThirdpartyContact {
+  return (
+    t.type === "thirdparty" &&
+    t.kind === "contact"
+  );
+}
+
+export type Thirdparty = ThirdpartyCompany | ThirdpartyContact | ThirdpartyChild;
+
+
+export function isThirdparty(t: unknown): t is Thirdparty {
+  if (!isBaseThirdParty(t)) {
+    return false;
+  }
+
+  return (isThirdpartyCompany(t) || isThirdpartyContact(t) || isThirdpartyChild(t));
+}
+
 interface ThirdpartyType {
   key: string;
   value: string;
@@ -47,3 +131,29 @@ export interface ThirdpartyCategory {
     fr: string;
   };
 }
+
+/**
+ * Associate an existing ThirdParty during write operation.
+ */
+export interface SetThirdParty {
+  readonly type: "thirdparty";
+  id: number;
+}
+
+export interface ThirdPartyWrite {
+  readonly type: "thirdparty";
+  kind: ThirdPartyKind;
+  civility: SetCivility | null;
+  profession: string;
+  firstname: string;
+  /**
+   * the lastname
+   */
+  name: string;
+  email: string;
+  telephone: string;
+  telephone2: string;
+  address: null|SetAddress;
+  comment: string;
+  parent: SetThirdParty|null;
+}
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_api/OnTheFly.js b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_api/OnTheFly.js
deleted file mode 100644
index eb8f11ef8..000000000
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_api/OnTheFly.js
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * GET a thirdparty by id
- */
-const getThirdparty = (id) => {
-  const url = `/api/1.0/thirdparty/thirdparty/${id}.json`;
-  return fetch(url).then((response) => {
-    if (response.ok) {
-      return response.json();
-    }
-    throw Error("Error with request resource response");
-  });
-};
-
-/*
- * POST a new thirdparty
- */
-const postThirdparty = (body) => {
-  const url = `/api/1.0/thirdparty/thirdparty.json`;
-  return fetch(url, {
-    method: "POST",
-    headers: {
-      "Content-Type": "application/json;charset=utf-8",
-    },
-    body: JSON.stringify(body),
-  }).then((response) => {
-    if (response.ok) {
-      return response.json();
-    }
-    throw Error("Error with request resource response");
-  });
-};
-
-/*
- * PATCH an existing thirdparty
- */
-const patchThirdparty = (id, body) => {
-  const url = `/api/1.0/thirdparty/thirdparty/${id}.json`;
-  return fetch(url, {
-    method: "PATCH",
-    headers: {
-      "Content-Type": "application/json;charset=utf-8",
-    },
-    body: JSON.stringify(body),
-  }).then((response) => {
-    if (response.ok) {
-      return response.json();
-    }
-    throw Error("Error with request resource response");
-  });
-};
-
-export { getThirdparty, postThirdparty, patchThirdparty };
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_api/OnTheFly.ts b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_api/OnTheFly.ts
new file mode 100644
index 000000000..2e9f40f00
--- /dev/null
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_api/OnTheFly.ts
@@ -0,0 +1,75 @@
+/*
+ * GET a thirdparty by id
+ */
+import {isThirdpartyChild, isThirdpartyCompany, isThirdpartyContact, Thirdparty, ThirdPartyWrite} from '../../types';
+import {makeFetch} from "ChillMainAssets/lib/api/apiMethods";
+
+export const getThirdparty = async (id: number) : Promise<Thirdparty> => {
+  const url = `/api/1.0/thirdparty/thirdparty/${id}.json`;
+  return fetch(url).then((response) => {
+    if (response.ok) {
+      return response.json();
+    }
+    throw Error("Error with request resource response");
+  });
+};
+
+export const thirdpartyToWriteThirdParty = (t: Thirdparty): ThirdPartyWrite => {
+  // Determine kind-specific fields using available type guards
+  const isCompany = isThirdpartyCompany(t);
+  const isContact = isThirdpartyContact(t);
+  const isChild = isThirdpartyChild(t);
+
+  return {
+    type: 'thirdparty',
+    kind: t.kind,
+    civility:
+      (isContact || isChild) && t.civility
+        ? { type: 'chill_main_civility', id: t.civility.id }
+        : null,
+    profession: (isContact || isChild) ? (t.profession ?? '') : '',
+    firstname: isCompany ? '' : (t.firstname ?? ''),
+    name: isCompany
+      ? (t.nameCompany ?? '')
+      : (t.name ?? ''),
+    email: t.email ?? '',
+    telephone: t.telephone ?? '',
+    telephone2: t.telephone2 ?? '',
+    address: null,
+    comment: isChild ? (t.comment ?? '') : '',
+    parent: isChild && t.parent ? { type: 'thirdparty', id: t.parent.id } : null,
+  };
+};
+
+export interface WriteThirdPartyViolationMap
+extends Record<string, Record<string, string>> {
+  email: {
+    "{{ value }}": string;
+  },
+  name: {
+    "{{ value }}": string;
+  },
+  telephone: {
+    "{{ value }}": string;
+  }
+  telephone2: {
+    "{{ value }}": string;
+  }
+}
+
+/*
+ * POST a new thirdparty
+ */
+export const createThirdParty = async (body: ThirdPartyWrite) => {
+  const url = `/api/1.0/thirdparty/thirdparty.json`;
+
+  return makeFetch<ThirdPartyWrite, Thirdparty>('POST', url, body);
+};
+
+/*
+ * PATCH an existing thirdparty
+ */
+export const patchThirdparty = async (id: number, body: ThirdPartyWrite): Promise<Thirdparty> => {
+  const url = `/api/1.0/thirdparty/thirdparty/${id}.json`;
+  return makeFetch('PATCH', url, body);
+};
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
index 3413861ae..fb4bf2071 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
@@ -5,7 +5,7 @@
         <div class="item-col">
           <div class="entity-label">
             <div :class="'denomination h' + options.hLevel">
-              <a v-if="this.options.addLink === true" href="#">
+              <a v-if="options.addLink === true" href="#">
                 <span class="name">{{ thirdparty.text }}</span>
               </a>
               <span class="name" v-else>{{ thirdparty.text }}</span>
@@ -27,7 +27,7 @@
               />
             </div>
 
-            <p v-if="this.options.addInfo === true" class="moreinfo" />
+            <p v-if="options.addInfo === true" class="moreinfo" />
           </div>
         </div>
 
@@ -44,13 +44,13 @@
                     <span>{{ getProfession[0] }}</span>
                   </p>
                 </li>
-                <li v-if="hasParent">
+                <li v-if="isThirdpartyChild(props.thirdparty)">
                   <i class="fa fa-li fa-hand-o-right" />
-                  <b class="me-2">{{ $t("child_of") }}</b>
+                  <b class="me-2">{{ trans(THIRDPARTY_MESSAGES_CHILD_OF)}}</b>
                   <on-the-fly
-                    :type="thirdparty.parent.type"
-                    :id="thirdparty.parent.id"
-                    :button-text="thirdparty.parent.text"
+                    :type="props.thirdparty.parent.type"
+                    :id="props.thirdparty.parent.id"
+                    :button-text="props.thirdparty.parent.text"
                     :display-badge="'true' === 'true'"
                     action="show"
                   />
@@ -128,65 +128,60 @@
   </div>
 </template>
 
-<script>
+<script setup lang="ts">
+import { computed, defineAsyncComponent } from "vue";
 import AddressRenderBox from "ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue";
 import Confidential from "ChillMainAssets/vuejs/_components/Confidential.vue";
 import BadgeEntity from "ChillMainAssets/vuejs/_components/BadgeEntity.vue";
+import {isThirdpartyChild, isThirdpartyCompany, Thirdparty} from "../../../types";
+import {localizeString} from "ChillMainAssets/lib/localizationHelper/localizationHelper";
+import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue";
+import {
+  THIRDPARTY_MESSAGES_CHILD_OF,
+  trans
+} from "translator";
 
-export default {
-  name: "ThirdPartyRenderBox",
-  components: {
-    AddressRenderBox,
-    Confidential,
-    BadgeEntity,
-  },
-  // To avoid components recursively invoking eachother resolve OnTheFly component here
-  beforeCreate() {
-    this.$options.components.OnTheFly =
-      require("ChillMainAssets/vuejs/OnTheFly/components/OnTheFly").default;
-  },
-  i18n: {
-    messages: {
-      fr: {
-        children: "Personnes de contact: ",
-        child_of: "Contact de: ",
-      },
-    },
-  },
-  props: ["thirdparty", "options"],
-  computed: {
-    isMultiline: function () {
-      if (this.options.isMultiline) {
-        return this.options.isMultiline;
-      } else {
-        return false;
-      }
-    },
-    hasParent() {
-      return !(
-        this.thirdparty.parent === null || this.thirdparty.parent === undefined
-      );
-    },
-    getProfession() {
-      let profession = [];
-      if (this.hasParent && this.thirdparty.profession) {
-        profession.push(this.thirdparty.profession);
-        return profession;
-      }
+// Async to avoid recursive resolution issues
+/*
+const OnTheFly = defineAsyncComponent(() =>
+  import("ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue")
+);
+ */
 
-      if (!this.hasParent && this.thirdparty.category) {
-        profession = this.thirdparty.category.map((category) => category.text);
-      }
+interface RenderOptions {
+  addInfo?: boolean;
+  addEntity?: boolean;
+  addId?: boolean;
+  addLink?: boolean;
+  hLevel?: number;
+  entityDisplayLong?: boolean;
+  isMultiline?: boolean;
+}
 
-      return profession;
-    },
-    /* TODO need backend normalizer to serve children without circular reference
-    hasChildren() {
-        //console.log(this.thirdparty.activeChildren.length > 0)
-        return false
-    } */
-  },
-};
+const props = defineProps<{ thirdparty: Thirdparty; options: RenderOptions }>();
+
+const isMultiline = computed<boolean>(() => props.options?.isMultiline ?? false);
+
+const hasParent = computed<boolean>(() => {
+  return isThirdpartyChild(props.thirdparty);
+});
+
+const getProfession = computed<string[]>(() => {
+  const t = props.thirdparty;
+  const prof: string[] = [];
+
+  if (!isThirdpartyCompany(t)) {
+    prof.push(t.profession);
+  }
+
+  if (!isThirdpartyChild(t)) {
+    for (const c of t.category) {
+      prof.push(localizeString(c.name));
+    }
+  }
+
+  return prof;
+});
 </script>
 
 <style lang="scss">
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
index e3b2338bd..dd67587e5 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
@@ -1,5 +1,5 @@
 <template>
-  <div v-if="action === 'show'">
+  <div v-if="action === 'show' && thirdparty !== null">
     <div class="flex-table">
       <third-party-render-box
         :thirdparty="thirdparty"
@@ -7,13 +7,9 @@
           addInfo: true,
           addEntity: true,
           entityDisplayLong: true,
-          addAltNames: true,
           addId: true,
           addLink: false,
-          addAge: false,
           hLevel: 3,
-          addCenter: true,
-          addNoData: true,
           isMultiline: true,
         }"
       />
@@ -24,401 +20,48 @@
       action === 'edit' || action === 'create' || action === 'addContact'
     "
   >
-    <div v-if="parent">
-      <div class="parent-info">
-        <i class="fa fa-li fa-hand-o-right" />
-        <b class="me-2">{{ trans(THIRDPARTY_MESSAGES_CHILD_OF) }}</b>
-        <span class="chill-entity badge-thirdparty">{{ parent.text }}</span>
-      </div>
-    </div>
-    <div class="form-floating mb-3" v-else-if="kind.value !== 'child'">
-      <div class="form-check">
-        <input
-          class="form-check-input mt-0"
-          type="radio"
-          v-model="kind.value"
-          value="company"
-          id="tpartyKindInstitution"
-        />
-        <label for="tpartyKindInstitution" class="required">
-          <badge-entity
-            :entity="{ type: 'thirdparty', kind: 'company' }"
-            :options="{ displayLong: true }"
-          />
-        </label>
-      </div>
-      <div class="form-check">
-        <input
-          class="form-check-input mt-0"
-          type="radio"
-          v-model="kind.value"
-          value="contact"
-          id="tpartyKindContact"
-        />
-        <label for="tpartyKindContact" class="required">
-          <badge-entity
-            :entity="{ type: 'thirdparty', kind: 'contact' }"
-            :options="{ displayLong: true }"
-          />
-        </label>
-      </div>
-    </div>
-    <div v-else>
-      <p>Contact de&nbsp;:</p>
-      <third-party-render-box
-        :thirdparty="thirdparty.parent"
-        :options="{
-          addInfo: true,
-          addEntity: false,
-          addAltNames: true,
-          addId: false,
-          addLink: false,
-          addAge: false,
-          hLevel: 4,
-          addCenter: false,
-          addNoData: true,
-          isMultiline: false,
-        }"
-      />
-    </div>
-
-    <div v-if="thirdparty.kind === 'child' || thirdparty.kind === 'contact'">
-      <div class="child-info">
-        <div class="input-group mb-3 input-section">
-          <select
-            class="form-select form-select-lg"
-            id="civility"
-            v-model="thirdparty.civility"
-          >
-            <option selected disabled :value="null">
-              {{ trans(THIRDPARTY_MESSAGES_THIRDPARTY_CIVILITY) }}
-            </option>
-            <option
-              v-for="civility in civilities"
-              :key="civility.id"
-              :value="civility"
-            >
-              {{ localizeString(civility.name) }}
-            </option>
-          </select>
-        </div>
-        <div class="input-group mb-3 input-section">
-          <input
-            class="form-control form-control-lg"
-            v-model="thirdparty.profession"
-            :placeholder="trans(THIRDPARTY_MESSAGES_THIRDPARTY_PROFESSION)"
-            :aria-label="trans(THIRDPARTY_MESSAGES_THIRDPARTY_PROFESSION)"
-            aria-describedby="profession"
-          />
-        </div>
-      </div>
-      <div class="child-info">
-        <div class="input-section">
-          <div class="form-floating mb-3">
-            <input
-              class="form-control form-control-lg"
-              id="firstname"
-              v-model="thirdparty.firstname"
-              :placeholder="trans(THIRDPARTY_MESSAGES_THIRDPARTY_FIRSTNAME)"
-            />
-            <label for="firstname">{{
-              trans(THIRDPARTY_MESSAGES_THIRDPARTY_FIRSTNAME)
-            }}</label>
-          </div>
-          <div v-if="queryItems">
-            <ul class="list-suggest add-items inline">
-              <li
-                v-for="(qi, i) in queryItems"
-                :key="i"
-                @click="addQueryItem('firstName', qi)"
-              >
-                <span class="person-text">{{ qi }}</span>
-              </li>
-            </ul>
-          </div>
-        </div>
-        <div class="input-section">
-          <div class="form-floating mb-3">
-            <input
-              class="form-control form-control-lg"
-              id="name"
-              v-model="thirdparty.name"
-              :placeholder="trans(THIRDPARTY_MESSAGES_THIRDPARTY_LASTNAME)"
-            />
-            <label for="name">{{
-              trans(THIRDPARTY_MESSAGES_THIRDPARTY_LASTNAME)
-            }}</label>
-          </div>
-          <div v-if="queryItems">
-            <ul class="list-suggest add-items inline">
-              <li
-                v-for="(qi, i) in queryItems"
-                :key="i"
-                @click="addQueryItem('name', qi)"
-              >
-                <span class="person-text">{{ qi }}</span>
-              </li>
-            </ul>
-          </div>
-        </div>
-      </div>
-    </div>
-
-    <div v-if="thirdparty.kind === 'company'">
-      <div class="form-floating mb-3">
-        <input
-          class="form-control form-control-lg"
-          id="name"
-          v-model="thirdparty.name"
-          :placeholder="trans(THIRDPARTY_MESSAGES_THIRDPARTY_NAME)"
-        />
-        <label for="name">{{
-          trans(THIRDPARTY_MESSAGES_THIRDPARTY_NAME)
-        }}</label>
-      </div>
-      <div v-if="query">
-        <ul class="list-suggest add-items inline">
-          <li @click="addQuery(query)">
-            <span class="person-text">{{ query }}</span>
-          </li>
-        </ul>
-      </div>
-    </div>
-
-    <template v-if="thirdparty.kind !== 'child'">
-      <AddAddress
-        key="thirdparty"
-        :context="context"
-        :options="addAddress.options"
-        :address-changed-callback="submitAddress"
-        ref="addAddress"
-      />
-    </template>
-
-    <div class="input-group mb-3">
-      <span class="input-group-text" id="email"
-        ><i class="fa fa-fw fa-envelope"
-      /></span>
-      <input
-        class="form-control form-control-lg"
-        v-model="thirdparty.email"
-        :placeholder="trans(THIRDPARTY_MESSAGES_THIRDPARTY_EMAIL)"
-        :aria-label="trans(THIRDPARTY_MESSAGES_THIRDPARTY_EMAIL)"
-        aria-describedby="email"
-      />
-    </div>
-
-    <div class="input-group mb-3">
-      <span class="input-group-text" id="phonenumber"
-        ><i class="fa fa-fw fa-phone"
-      /></span>
-      <input
-        class="form-control form-control-lg"
-        v-model="thirdparty.telephone"
-        :placeholder="trans(THIRDPARTY_MESSAGES_THIRDPARTY_PHONENUMBER)"
-        :aria-label="trans(THIRDPARTY_MESSAGES_THIRDPARTY_PHONENUMBER)"
-        aria-describedby="phonenumber"
-      />
-    </div>
-
-    <div class="input-group mb-3">
-      <span class="input-group-text" id="phonenumber2"
-        ><i class="fa fa-fw fa-phone"
-      /></span>
-      <input
-        class="form-control form-control-lg"
-        v-model="thirdparty.telephone2"
-        :placeholder="trans(THIRDPARTY_MESSAGES_THIRDPARTY_PHONENUMBER2)"
-        :aria-label="trans(THIRDPARTY_MESSAGES_THIRDPARTY_PHONENUMBER2)"
-        aria-describedby="phonenumber2"
-      />
-    </div>
-
-    <div v-if="parent">
-      <div class="input-group mb-3">
-        <span class="input-group-text" id="comment"
-          ><i class="fa fa-fw fa-pencil"
-        /></span>
-        <textarea
-          class="form-control form-control-lg"
-          :placeholder="trans(THIRDPARTY_MESSAGES_THIRDPARTY_COMMENT)"
-          v-model="thirdparty.comment"
-        />
-      </div>
-    </div>
+    <ThirdPartyEdit :id="id" :type="type" :action="action" :query="query" :parent="parent" />
   </div>
+
 </template>
 
-<script setup>
-import { ref, reactive, computed, onMounted, getCurrentInstance } from "vue";
-import ThirdPartyRenderBox from "../Entity/ThirdPartyRenderBox.vue";
-import AddAddress from "ChillMainAssets/vuejs/Address/components/AddAddress";
-import { getThirdparty } from "../../_api/OnTheFly";
-import BadgeEntity from "ChillMainAssets/vuejs/_components/BadgeEntity.vue";
-import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
-import { localizeString as _localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
-import {
-  trans,
-  THIRDPARTY_MESSAGES_THIRDPARTY_FIRSTNAME,
-  THIRDPARTY_MESSAGES_THIRDPARTY_LASTNAME,
-  THIRDPARTY_MESSAGES_THIRDPARTY_NAME,
-  THIRDPARTY_MESSAGES_THIRDPARTY_EMAIL,
-  THIRDPARTY_MESSAGES_THIRDPARTY_PHONENUMBER,
-  THIRDPARTY_MESSAGES_THIRDPARTY_PHONENUMBER2,
-  THIRDPARTY_MESSAGES_THIRDPARTY_COMMENT,
-  THIRDPARTY_MESSAGES_THIRDPARTY_PROFESSION,
-  THIRDPARTY_MESSAGES_THIRDPARTY_CIVILITY,
-  THIRDPARTY_MESSAGES_CHILD_OF,
-} from "translator";
-// Props
-const props = defineProps(["id", "type", "action", "query", "parent"]);
+<script setup lang="ts">
+import {onMounted, ref} from 'vue'
+import ThirdPartyRenderBox from '../Entity/ThirdPartyRenderBox.vue'
+import ThirdPartyEdit from './ThirdPartyEdit.vue'
+import { getThirdparty } from '../../_api/OnTheFly'
+import {Thirdparty, ThirdpartyCompany} from '../../../types'
 
-// Instance for $t and $toast
-const { proxy } = getCurrentInstance();
+type ThirdPartyProp = {
+  id: number,
+  type: 'thirdparty',
+  action: 'show'|'edit'|'create',
+  parent?: null,
+}
+type ThirdPartyAddContact = {
+  id: number,
+  type: 'thirdparty',
+  action: 'addContact',
+  parent: ThirdpartyCompany,
+}
 
-// State
-const thirdparty = reactive({
-  type: "thirdparty",
-  address: null,
-  kind: "company",
-  firstname: "",
-  name: "",
-  telephone: "",
-  telephone2: "",
-  civility: null,
-  profession: "",
-  comment: "",
-  parent: props.parent ? props.parent : undefined,
-});
-const civilities = ref([]);
-const addAddress = reactive({
-  options: {
-    openPanesInModal: true,
-    onlyButton: false,
-    button: {
-      size: "btn-sm",
-    },
-    title: {
-      create: "add_an_address_title",
-      edit: "edit_address",
-    },
-  },
-});
-const addAddressRef = ref(null);
+type ThirdPartyProps = ThirdPartyProp|ThirdPartyAddContact;
 
-// Kind as computed ref
-const kind = computed({
-  get() {
-    return thirdparty.kind !== undefined ? thirdparty.kind : "company";
-  },
-  set(v) {
-    thirdparty.kind = v;
-  },
+const props = withDefaults(defineProps<ThirdPartyProps>(), {
+  parent: null,
 });
 
-// Context as computed
-const context = computed(() => {
-  let ctx = {
-    target: {
-      name: props.type,
-      id: props.id,
-    },
-    edit: false,
-    addressId: null,
-    defaults: window.addaddress,
-  };
-  if (
-    !(thirdparty.address === undefined || thirdparty.address === null) &&
-    thirdparty.address.address_id !== null
-  ) {
-    ctx.addressId = thirdparty.address.address_id;
-    ctx.edit = true;
-  }
-  return ctx;
-});
+const thirdparty = ref<Thirdparty|null>(null);
 
-// Query items
-const queryItems = computed(() =>
-  props.query ? props.query.split(" ") : null,
-);
-
-// Methods
-function localizeString(str) {
-  return _localizeString(str);
+async function loadData() {
+  thirdparty.value = await getThirdparty(props.id);
 }
 
-function loadData() {
-  return getThirdparty(props.id).then(
-    (tp) =>
-      new Promise((resolve) => {
-        Object.assign(thirdparty, tp);
-        thirdparty.kind = tp.kind;
-        if (props.action !== "show") {
-          if (tp.address !== null && addAddressRef.value) {
-            addAddressRef.value.getInitialAddress(tp.address.address_id);
-          }
-        }
-        resolve();
-      }),
-  );
-}
-
-function loadCivilities() {
-  const url = `/api/1.0/main/civility.json`;
-  return makeFetch("GET", url)
-    .then((response) => {
-      civilities.value = response.results;
-      return Promise.resolve();
-    })
-    .catch((error) => {
-      console.log(error);
-      proxy.$toast.open({ message: error.body });
-    });
-}
-
-function submitAddress(payload) {
-  if (typeof payload.addressId !== "undefined") {
-    context.value.edit = true;
-    context.value.addressId = payload.addressId;
-    thirdparty.address = payload.address;
-  }
-}
-
-function addQueryItem(field, queryItem) {
-  switch (field) {
-    case "name":
-      if (thirdparty.name) {
-        thirdparty.name += ` ${queryItem}`;
-      } else {
-        thirdparty.name = queryItem;
-      }
-      break;
-    case "firstName":
-      thirdparty.firstname = queryItem;
-      break;
-  }
-}
-
-function addQuery(query) {
-  thirdparty.name = query;
-}
-
-// Lifecycle
 onMounted(() => {
-  let dependencies = [];
-  dependencies.push(loadCivilities());
-  if (props.action !== "create") {
-    if (props.id) {
-      dependencies.push(loadData());
-    }
-    if (props.action === "addContact") {
-      thirdparty.kind = "child";
-      thirdparty.address = null;
-    }
-  } else {
-    thirdparty.kind = "company";
+  if (props.action === 'show' && props.id) {
+    loadData()
   }
-});
+})
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdPartyEdit.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdPartyEdit.vue
new file mode 100644
index 000000000..027dd99f1
--- /dev/null
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdPartyEdit.vue
@@ -0,0 +1,562 @@
+<template>
+  <div>
+    <div v-if="resolvedParent">
+      <div class="parent-info">
+        <i class="fa fa-li fa-hand-o-right"/>
+        <b class="me-2">{{ trans(THIRDPARTY_MESSAGES_CHILD_OF) }}</b>
+        <span class="chill-entity badge-thirdparty">{{ resolvedParent.text }}</span>
+      </div>
+    </div>
+    <div class="form-floating mb-3" v-else-if="props.action === 'create'">
+      <div class="form-check">
+        <input
+          class="form-check-input mt-0"
+          type="radio"
+          v-model="kind"
+          value="company"
+          id="tpartyKindInstitution"
+        />
+        <label for="tpartyKindInstitution" class="required">
+          <badge-entity
+            :entity="{ type: 'thirdparty', kind: 'company' }"
+            :options="{ displayLong: true }"
+          />
+        </label>
+      </div>
+      <div class="form-check">
+        <input
+          class="form-check-input mt-0"
+          type="radio"
+          v-model="kind"
+          value="contact"
+          id="tpartyKindContact"
+        />
+        <label for="tpartyKindContact" class="required">
+          <badge-entity
+            :entity="{ type: 'thirdparty', kind: 'contact' }"
+            :options="{ displayLong: true }"
+          />
+        </label>
+      </div>
+    </div>
+    <div v-else-if="resolvedParent">
+      <p>Contact de&nbsp;:</p>
+      <third-party-render-box
+        :thirdparty="resolvedParent"
+        :options="{
+          addInfo: true,
+          addEntity: false,
+          addId: false,
+          addLink: false,
+          hLevel: 4,
+          isMultiline: false,
+        }"
+      />
+    </div>
+
+    <div v-if="thirdParty.kind === 'child' || thirdParty.kind === 'contact'">
+      <div class="child-info">
+        <div class="input-section">
+          <div class="mb-3">
+            <div class="input-group">
+              <div class="form-floating">
+                <select
+                  class="form-select form-select-lg"
+                  name="civility"
+                  id="civility"
+                  v-model="civility"
+                >
+                  <option selected disabled :value="null">
+                    {{ trans(THIRDPARTY_MESSAGES_THIRDPARTY_CIVILITY) }}
+                  </option>
+                  <option
+                    v-for="civility in civilities"
+                    :key="civility.id"
+                    :value="civility.id"
+                  >
+                    {{ localizeString(civility.name) }}
+                  </option>
+                </select>
+                <label for="civility">{{ trans(THIRDPARTY_MESSAGES_THIRDPARTY_CIVILITY) }}</label>
+              </div>
+            </div>
+          </div>
+        </div>
+        <div class="input-section">
+          <div class="mb-3">
+            <div class="form-floating">
+              <input
+                class="form-control form-control-lg"
+                name="profession"
+                v-model="thirdParty.profession"
+                :placeholder="trans(THIRDPARTY_MESSAGES_THIRDPARTY_PROFESSION)"
+                :aria-label="trans(THIRDPARTY_MESSAGES_THIRDPARTY_PROFESSION)"
+                aria-describedby="profession"
+              />
+              <label for="profession">{{ trans(THIRDPARTY_MESSAGES_THIRDPARTY_PROFESSION) }}</label>
+            </div>
+          </div>
+        </div>
+      </div>
+      <div class="child-info">
+        <div class="input-section">
+          <div class="mb-3">
+            <div class="input-group">
+              <div class="form-floating">
+                <input
+                  class="form-control form-control-lg"
+                  id="firstname"
+                  v-model="thirdParty.firstname"
+                  :placeholder="trans(THIRDPARTY_MESSAGES_THIRDPARTY_FIRSTNAME)"
+                />
+                <label for="firstname">{{
+                    trans(THIRDPARTY_MESSAGES_THIRDPARTY_FIRSTNAME)
+                  }}</label>
+              </div>
+            </div>
+            <div v-if="queryItems">
+              <ul class="list-suggest add-items inline">
+                <li
+                  v-for="(qi, i) in queryItems"
+                  :key="i"
+                  @click="addQueryItem('firstName', qi)"
+                >
+                  <span class="person-text">{{ qi }}</span>
+                </li>
+              </ul>
+            </div>
+          </div>
+        </div>
+        <div class="input-section">
+          <div class="mb3">
+            <div class="input-group has-validation">
+              <div class="form-floating">
+                <input
+                  class="form-control form-control-lg"
+                  :class="{ 'is-invalid': violations.hasViolation('name') }"
+                  id="name"
+                  v-model="thirdParty.name"
+                  :placeholder="trans(THIRDPARTY_MESSAGES_THIRDPARTY_LASTNAME)"
+                />
+                <label for="name">{{
+                    trans(THIRDPARTY_MESSAGES_THIRDPARTY_LASTNAME)
+                  }}</label>
+              </div>
+            </div>
+            <div
+              v-for="err in violations.violationTitles('name')"
+              class="invalid-feedback was-validated-force"
+            >
+              {{ err }}
+            </div>
+            <div v-if="queryItems">
+              <ul class="list-suggest add-items inline">
+                <li
+                  v-for="(qi, i) in queryItems"
+                  :key="i"
+                  @click="addQueryItem('name', qi)"
+                >
+                  <span class="person-text">{{ qi }}</span>
+                </li>
+              </ul>
+            </div>
+          </div>
+        </div>
+      </div>
+    </div>
+
+    <div v-if="thirdParty.kind === 'company'">
+      <div class="mb-3">
+        <div class="input-group">
+          <div class="form-floating">
+            <input
+              class="form-control form-control-lg"
+              :class="{ 'is-invalid': violations.hasViolation('name') }"
+              id="name"
+              v-model="thirdParty.name"
+              :placeholder="trans(THIRDPARTY_MESSAGES_THIRDPARTY_NAME)"
+            />
+            <label for="name">{{
+                trans(THIRDPARTY_MESSAGES_THIRDPARTY_NAME)
+              }}</label>
+          </div>
+        </div>
+
+        <div
+          v-for="err in violations.violationTitles('name')"
+          class="invalid-feedback was-validated-force"
+        >
+          {{ err }}
+        </div>
+
+        <div v-if="query">
+          <ul class="list-suggest add-items inline">
+            <li @click="addQuery(query)">
+              <span class="person-text">{{ query }}</span>
+            </li>
+          </ul>
+        </div>
+      </div>
+    </div>
+
+    <template v-if="thirdParty.kind !== 'child'">
+      <AddAddress
+        key="thirdparty"
+        :context="context"
+        :options="addAddress.options"
+        :address-changed-callback="submitAddress"
+        ref="addAddressRef"
+      />
+    </template>
+
+    <div class="mb-3">
+      <div class="input-group has-validation">
+        <span id="email" class="input-group-text">
+          <i class="fa fa-fw fa-at"/>
+        </span>
+        <div class="form-floating">
+          <input
+            class="form-control form-control-lg"
+            :class="{ 'is-invalid': violations.hasViolation('email') }"
+            name="email"
+            v-model="thirdParty.email"
+            :placeholder="trans(THIRDPARTY_MESSAGES_THIRDPARTY_EMAIL)"
+            :aria-label="trans(THIRDPARTY_MESSAGES_THIRDPARTY_EMAIL)"
+            aria-describedby="email"
+          />
+          <label for="email">{{ trans(THIRDPARTY_MESSAGES_THIRDPARTY_EMAIL) }}</label>
+        </div>
+      </div>
+      <div
+        v-for="err in violations.violationTitles('email')"
+        class="invalid-feedback was-validated-force"
+      >
+        {{ err }}
+      </div>
+    </div>
+
+    <div class="mb-3">
+      <div class="input-group has-validation">
+        <span class="input-group-text" id="phonenumber">
+          <i class="fa fa-fw fa-phone"/>
+        </span>
+        <div class="form-floating">
+          <input
+            class="form-control form-control-lg"
+            :class="{'is-invalid': violations.hasViolation('telephone') }"
+            name="phonenumber"
+            v-model="thirdParty.telephone"
+            :placeholder="trans(THIRDPARTY_MESSAGES_THIRDPARTY_PHONENUMBER)"
+            :aria-label="trans(THIRDPARTY_MESSAGES_THIRDPARTY_PHONENUMBER)"
+            aria-describedby="phonenumber"
+          />
+          <label for="phonenumber">{{ trans(THIRDPARTY_MESSAGES_THIRDPARTY_PHONENUMBER) }}</label>
+        </div>
+      </div>
+      <div
+        v-for="err in violations.violationTitles('telephone')"
+        class="invalid-feedback was-validated-force"
+      >
+        {{ err }}
+      </div>
+    </div>
+
+    <div class="mb-3">
+      <div class="input-group has-validation">
+        <span class="input-group-text" id="phonenumber2"><i class="fa fa-fw fa-phone"/></span>
+        <div class="form-floating">
+          <input
+            class="form-control form-control-lg"
+            :class="{ 'is-invalid': violations.hasViolation('telephone2') }"
+            name="phonenumber2"
+            v-model="thirdParty.telephone2"
+            :placeholder="trans(THIRDPARTY_MESSAGES_THIRDPARTY_PHONENUMBER2)"
+            :aria-label="trans(THIRDPARTY_MESSAGES_THIRDPARTY_PHONENUMBER2)"
+            aria-describedby="phonenumber2"
+          />
+          <label for="phonenumber2">{{ trans(THIRDPARTY_MESSAGES_THIRDPARTY_PHONENUMBER2) }}</label>
+        </div>
+      </div>
+      <div
+        v-for="err in violations.violationTitles('telephone2')"
+        class="invalid-feedback was-validated-force"
+      >
+        {{ err }}
+      </div>
+    </div>
+
+    <div v-if="props.action !== 'addContact'">
+      <div class="input-group mb-3">
+        <span class="input-group-text" id="comment"
+        ><i class="fa fa-fw fa-pencil"
+        /></span>
+        <textarea
+          class="form-control form-control-lg"
+          :placeholder="trans(THIRDPARTY_MESSAGES_THIRDPARTY_COMMENT)"
+          v-model="thirdParty.comment"
+        />
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import {ref, reactive, computed, onMounted, getCurrentInstance} from 'vue'
+import ThirdPartyRenderBox from '../Entity/ThirdPartyRenderBox.vue'
+import AddAddress from "ChillMainAssets/vuejs/Address/components/AddAddress.vue";
+import {
+  createThirdParty,
+  getThirdparty, patchThirdparty,
+  thirdpartyToWriteThirdParty,
+  WriteThirdPartyViolationMap
+} from '../../_api/OnTheFly'
+import BadgeEntity from 'ChillMainAssets/vuejs/_components/BadgeEntity.vue'
+import {localizeString as _localizeString} from 'ChillMainAssets/lib/localizationHelper/localizationHelper'
+import {
+  trans,
+  THIRDPARTY_MESSAGES_THIRDPARTY_FIRSTNAME,
+  THIRDPARTY_MESSAGES_THIRDPARTY_LASTNAME,
+  THIRDPARTY_MESSAGES_THIRDPARTY_NAME,
+  THIRDPARTY_MESSAGES_THIRDPARTY_EMAIL,
+  THIRDPARTY_MESSAGES_THIRDPARTY_PHONENUMBER,
+  THIRDPARTY_MESSAGES_THIRDPARTY_PHONENUMBER2,
+  THIRDPARTY_MESSAGES_THIRDPARTY_COMMENT,
+  THIRDPARTY_MESSAGES_THIRDPARTY_PROFESSION,
+  THIRDPARTY_MESSAGES_THIRDPARTY_CIVILITY,
+  THIRDPARTY_MESSAGES_CHILD_OF, PERSON_EDIT_ERROR_WHILE_SAVING,
+} from 'translator'
+import {
+  createPerson,
+  getCivilities, WritePersonViolationMap,
+} from "ChillPersonAssets/vuejs/_api/OnTheFly";
+import {
+  isThirdpartyChild,
+  isThirdpartyCompany,
+  Thirdparty,
+  ThirdpartyCompany,
+  ThirdPartyKind,
+  ThirdPartyWrite
+} from "../../../types";
+import {Civility, SetCivility} from "ChillMainAssets/types";
+import {isValidationException} from "ChillMainAssets/lib/api/apiMethods";
+import {useViolationList} from "ChillMainAssets/vuejs/_composables/violationList";
+import {useToast} from "vue-toast-notification";
+
+
+interface ThirdPartyEditWriteProps {
+  id?: number;
+  type?: 'thirdparty';
+  action: 'edit' | 'create'
+  query?: string;
+  parent?: null;
+}
+
+interface ThirdPartyAddContactProps {
+  id?: null;
+  type?: 'thirdparty';
+  action: 'addContact';
+  query?: "";
+  parent: ThirdpartyCompany;
+}
+
+type ThirdPartyEditProps = ThirdPartyAddContactProps | ThirdPartyEditWriteProps;
+
+const props = withDefaults(defineProps<ThirdPartyEditProps>(), {type: 'thirdparty', query: "", parent: null});
+
+const emit =
+  defineEmits<(e: "onThirdPartyCreated", payload: { thirdParty: Thirdparty }) => void>();
+
+defineExpose({postThirdParty});
+
+const toast = useToast();
+
+const thirdParty = ref<ThirdPartyWrite>({
+  type: "thirdparty",
+  kind: 'company',
+  address: null,
+  civility: null,
+  email: "",
+  firstname: "",
+  name: "",
+  profession: "",
+  telephone: "",
+  telephone2: "",
+  comment: "",
+  parent: null,
+});
+
+const originalThirdParty = ref<Thirdparty|null>(null);
+
+const civility = computed<number | null>({
+  get: () => {
+    if (thirdParty.value.civility !== null) {
+      return thirdParty.value.civility.id;
+    }
+
+    return null;
+  },
+  set: (value: number | null) => {
+    thirdParty.value.civility =
+      value !== null ? {id: value, type: "chill_main_civility"} : null;
+  },
+});
+
+const civilities = ref<Civility[]>([])
+
+const addAddress = reactive({
+  options: {
+    openPanesInModal: true,
+    onlyButton: false,
+    button: {size: 'btn-sm'},
+    title: {create: 'add_an_address_title', edit: 'edit_address'},
+  },
+})
+const addAddressRef = ref<any>(null)
+
+/**
+ * We need a specific computed for the kind
+ */
+const kind = computed<ThirdPartyKind>({
+  get() {
+    return thirdParty.value.kind;
+  },
+  set(v) {
+    thirdParty.value.kind = v
+  },
+});
+
+const context = computed(() => {
+  const ctx: any = {
+    target: {name: props.type, id: props.id},
+    edit: false,
+    addressId: null as number | null,
+    defaults: (window as any).addaddress,
+  }
+  if (thirdParty.value.address) {
+    ctx.addressId = thirdParty.value.address.id
+    ctx.edit = true
+  }
+  return ctx
+})
+
+const resolvedParent = computed<null|ThirdpartyCompany>(() => {
+  if (null !== originalThirdParty.value && isThirdpartyChild(originalThirdParty.value)) {
+    return originalThirdParty.value.parent;
+  }
+
+  return props.parent ?? null;
+})
+
+/**
+ * Find the query items to display for suggestion
+ */
+const queryItems = computed(() => {
+  const words: null | string[] = props.query ? props.query.split(" ") : null;
+
+  if (null === words) {
+    return null;
+  }
+
+  const firstNameWords = (thirdParty.value.firstname || "")
+    .trim()
+    .toLowerCase()
+    .split(" ");
+  const lastNameWords = (thirdParty.value.name || "").trim().toLowerCase().split(" ");
+
+  return words
+    .filter((word) => !firstNameWords.includes(word.toLowerCase()))
+    .filter((word) => !lastNameWords.includes(word.toLowerCase()));
+});
+
+function localizeString(str: any) {
+  return _localizeString(str)
+}
+
+
+onMounted(() => {
+  getCivilities().then((cv) => {
+    civilities.value = cv;
+  });
+  if (props.action === "edit") {
+    loadData();
+  } else if (props.action === 'addContact') {
+    thirdParty.value.kind = 'child';
+    thirdParty.value.address = null;
+    thirdParty.value.parent = {id: props.parent.id, type: 'thirdparty'};
+  }
+});
+
+async function loadData(): Promise<void> {
+  if (!props.id) return Promise.resolve();
+  const t = await getThirdparty(props.id);
+  originalThirdParty.value = t;
+  thirdParty.value = thirdpartyToWriteThirdParty(t);
+}
+
+function submitAddress(payload: { addressId: number }) {
+  console.log(payload);
+  thirdParty.value.address = {id: payload.addressId};
+}
+
+function addQueryItem(field: 'name' | 'firstName', queryItem: string) {
+  switch (field) {
+    case 'name':
+      if (thirdParty.value.name) {
+        thirdParty.value.name += ` ${queryItem}`
+      } else {
+        thirdParty.value.name = queryItem
+      }
+      break
+    case 'firstName':
+      thirdParty.value.firstname = queryItem
+      break
+  }
+}
+
+function addQuery(query: string) {
+  thirdParty.value.name = query
+}
+
+const violations = useViolationList<WriteThirdPartyViolationMap>();
+
+async function postThirdParty(): Promise<Thirdparty> {
+  try {
+    if (props.action === 'edit' && props.id) {
+      const tp = await patchThirdparty(props.id, thirdParty.value);
+      return Promise.resolve(tp);
+    } else if (props.action === 'addContact' || props.action === 'create') {
+      const tp = await createThirdParty(thirdParty.value);
+      emit('onThirdPartyCreated', {thirdParty: tp});
+      return Promise.resolve(tp);
+    }
+  } catch (e: unknown) {
+    if (isValidationException<WriteThirdPartyViolationMap>(e)) {
+      violations.setValidationException(e);
+    } else {
+      toast.error("An error occurred while creating the third party");
+    }
+    throw e;
+  }
+  throw "'action' is not edit with and id, or addContact or create";
+}
+
+</script>
+
+<style scoped lang="scss">
+.was-validated-force {
+  display: block;
+}
+
+.parent-info {
+  margin-bottom: 1rem;
+}
+
+.child-info {
+  display: flex;
+  justify-content: space-between;
+
+  .input-section {
+    width: 49%;
+  }
+}
+</style>
diff --git a/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml b/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
index 806547a04..6e6e96d7a 100644
--- a/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillThirdPartyBundle/translations/messages.fr.yml
@@ -68,6 +68,10 @@ Remove a contact: Supprimer
 Contacts: Contacts
 No contacts associated: Aucun contact
 
+thirdparty:
+    addcontact: Ajouter un contact
+    addcontact_title: Ajouter un contact
+
 No nameCompany given: Aucune raison sociale renseignée
 No acronym given: Aucun sigle renseigné
 No phone given: Aucun téléphone renseigné
@@ -165,7 +169,7 @@ thirdpartyMessages:
       comment: "Commentaire"
       profession: "Qualité"
       civility: "Civilité"
-    child_of: "Contact de: "
+    child_of: "Contact d'une institution"
     children: "Personnes de contact: "
 
 thirdparty_duplicate:
diff --git a/src/Bundle/ChillTicketBundle/src/Controller/FindCallerController.php b/src/Bundle/ChillTicketBundle/src/Controller/FindCallerController.php
deleted file mode 100644
index c5d476361..000000000
--- a/src/Bundle/ChillTicketBundle/src/Controller/FindCallerController.php
+++ /dev/null
@@ -1,58 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\TicketBundle\Controller;
-
-use Chill\MainBundle\Phonenumber\PhonenumberHelper;
-use Chill\PersonBundle\Repository\PersonRepository;
-use Chill\PersonBundle\Templating\Entity\PersonRenderInterface;
-use libphonenumber\NumberParseException;
-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;
-
-/**
- * Controller for a rest api to find a caller for a given phonenumber.
- *
- * TODO: currently, this rest api is not secured
- */
-class FindCallerController
-{
-    public function __construct(private readonly PhonenumberHelper $phonenumberHelper, private readonly PersonRepository $personRepository, private readonly PersonRenderInterface $personRender) {}
-
-    #[Route('/public/api/1.0/ticket/find-caller', name: 'find-caller', methods: ['GET'])]
-    public function findCaller(Request $request): Response
-    {
-        $caller = $request->query->get('caller', '');
-
-        if ('' === $caller) {
-            throw new BadRequestHttpException('Missing "caller" query parameter');
-        }
-
-        try {
-            $phoneNumber = $this->phonenumberHelper->parse($caller);
-        } catch (NumberParseException $e) {
-            throw new BadRequestHttpException('Unable to parse number', $e);
-        }
-
-        $persons = $this->personRepository->findByPhoneNumber($phoneNumber, 0, 2);
-
-        $asArray = match (count($persons)) {
-            0 => ['found' => false, 'name' => null],
-            1 => ['found' => true, 'name' => $this->personRender->renderString($persons[0], ['addAge' => false])],
-            default => ['found' => true, 'name' => 'multiple'],
-        };
-
-        return new JsonResponse($asArray);
-    }
-}
diff --git a/src/Bundle/ChillTicketBundle/src/Messenger/Handler/PostTicketUpdateMessageHandler.php b/src/Bundle/ChillTicketBundle/src/Messenger/Handler/PostTicketUpdateMessageHandler.php
index 9424203e9..88f082b58 100644
--- a/src/Bundle/ChillTicketBundle/src/Messenger/Handler/PostTicketUpdateMessageHandler.php
+++ b/src/Bundle/ChillTicketBundle/src/Messenger/Handler/PostTicketUpdateMessageHandler.php
@@ -14,12 +14,13 @@ namespace Chill\TicketBundle\Messenger\Handler;
 use Chill\TicketBundle\Event\PostTicketUpdateEvent;
 use Chill\TicketBundle\Messenger\PostTicketUpdateMessage;
 use Chill\TicketBundle\Repository\TicketRepositoryInterface;
-use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException;
-use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 use Symfony\Component\Messenger\Attribute\AsMessageHandler;
+use Symfony\Component\Messenger\Exception\UnrecoverableMessageHandlingException;
+use Symfony\Component\Messenger\Handler\MessageHandlerInterface;
+use Symfony\Contracts\EventDispatcher\EventDispatcherInterface;
 
 #[AsMessageHandler]
-final readonly class PostTicketUpdateMessageHandler
+final readonly class PostTicketUpdateMessageHandler implements MessageHandlerInterface
 {
     public function __construct(
         private EventDispatcherInterface $eventDispatcher,
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
index 8915514ec..2ec1fe723 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
@@ -55,7 +55,7 @@
               })
             }}
           </h3>
-          <person-component :entities="[ticket.caller] as Person[]" />
+          <person-component :entities="caller" />
         </div>
         <div
           class="col-md-4 col-sm-12 d-flex flex-column align-items-start"
@@ -131,6 +131,7 @@ import { useStore } from "vuex";
 
 // Utils
 import { getTicketTitle, motiveHierarchyLabel } from "../utils/utils";
+import {isThirdparty, Thirdparty} from "../../../../../../../ChillThirdPartyBundle/Resources/public/types";
 
 const props = defineProps<{
   ticket: Ticket;
@@ -196,6 +197,17 @@ const isEmergency = computed({
     }
   },
 });
+const caller = computed<Person[]|Thirdparty[]>(() => {
+  if (null === props.ticket.caller) {
+    return [];
+  }
+
+  if (isThirdparty(props.ticket.caller)) {
+    return [props.ticket.caller];
+  } else {
+    return [props.ticket.caller];
+  }
+})
 
 const since = computed(() => {
   return store.getters.getSinceCreated(today.value);
diff --git a/src/Bundle/ChillTicketBundle/tests/Controller/FindCallerControllerTest.php b/src/Bundle/ChillTicketBundle/tests/Controller/FindCallerControllerTest.php
deleted file mode 100644
index 997017e97..000000000
--- a/src/Bundle/ChillTicketBundle/tests/Controller/FindCallerControllerTest.php
+++ /dev/null
@@ -1,128 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\TicketBundle\Tests\Controller;
-
-use Chill\MainBundle\Phonenumber\PhonenumberHelper;
-use Chill\PersonBundle\Entity\Person;
-use Chill\PersonBundle\Repository\PersonRepository;
-use Chill\PersonBundle\Templating\Entity\PersonRenderInterface;
-use Chill\TicketBundle\Controller\FindCallerController;
-use PHPUnit\Framework\TestCase;
-use Prophecy\Argument;
-use Prophecy\PhpUnit\ProphecyTrait;
-use Psr\Log\NullLogger;
-use Symfony\Component\Cache\Adapter\ArrayAdapter;
-use Symfony\Component\DependencyInjection\ParameterBag\ParameterBag;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Exception\BadRequestHttpException;
-
-/**
- * @internal
- *
- * @coversNothing
- */
-class FindCallerControllerTest extends TestCase
-{
-    use ProphecyTrait;
-
-    /**
-     * @dataProvider provideFindCaller
-     */
-    public function testFindCaller(string $caller, array $persons, array $expected): void
-    {
-        $controller = $this->buildController($persons);
-
-        $request = new Request(query: ['caller' => $caller]);
-
-        $response = $controller->findCaller($request);
-
-        $actual = json_decode($response->getContent(), true);
-
-        self::assertEqualsCanonicalizing($expected, $actual);
-    }
-
-    public static function provideFindCaller(): iterable
-    {
-        yield [
-            '32486540600',
-            [],
-            ['found' => false, 'name' => null],
-        ];
-
-        yield [
-            '32486540600',
-            [new Person()],
-            ['found' => true, 'name' => 'pppp'],
-        ]
-        ;
-        yield [
-            '32486540600',
-            [new Person(), new Person()],
-            ['found' => true, 'name' => 'multiple'],
-        ];
-    }
-
-    public function testFindCallerWithoutCallerArgument(): void
-    {
-        self::expectException(BadRequestHttpException::class);
-
-        $controller = $this->buildController([]);
-
-        $request = new Request(query: []);
-
-        $controller->findCaller($request);
-    }
-
-    public function testFindCallerWithEmptyCallerArgument(): void
-    {
-        self::expectException(BadRequestHttpException::class);
-
-        $controller = $this->buildController([]);
-
-        $request = new Request(query: ['caller' => '']);
-
-        $controller->findCaller($request);
-    }
-
-    public function testFindCallerWithInvalidCaller(): void
-    {
-        self::expectException(BadRequestHttpException::class);
-
-        $controller = $this->buildController([]);
-
-        $request = new Request(query: ['caller' => 'abcde']);
-
-        $controller->findCaller($request);
-    }
-
-    private function buildController(array $personsFound): FindCallerController
-    {
-        $phonenumberHelper =
-        $subject = new PhonenumberHelper(
-            new ArrayAdapter(),
-            new ParameterBag([
-                'chill_main.phone_helper' => [
-                    'default_carrier_code' => 'BE',
-                ],
-            ]),
-            new NullLogger()
-        );
-
-        $personRepository = $this->prophesize(PersonRepository::class);
-        $personRepository->findByPhoneNumber(Argument::any(), Argument::type('int'), Argument::type('int'))->willReturn($personsFound);
-
-        $personRender = $this->prophesize(PersonRenderInterface::class);
-        $personRender->renderString(Argument::type(Person::class), Argument::type('array'))->willReturn('pppp');
-
-        return new FindCallerController($phonenumberHelper, $personRepository->reveal(), $personRender->reveal());
-    }
-}

From 53b02a0ced150bc098484b681aa9d00ecfdaa546 Mon Sep 17 00:00:00 2001
From: LenaertsJ <julie.lenaerts@champs-libres.coop>
Date: Mon, 8 Dec 2025 12:45:01 +0000
Subject: [PATCH 258/283] Improve the display of upcoming calendar items within
 the person render box

---
 .../ChillPersonBundle/Entity/Person.php       | 36 +++++++++++++++-
 .../Resources/views/Entity/person.html.twig   |  1 -
 .../views/Person/list_with_period.html.twig   | 41 +++++++++++++++++++
 3 files changed, 75 insertions(+), 3 deletions(-)

diff --git a/src/Bundle/ChillPersonBundle/Entity/Person.php b/src/Bundle/ChillPersonBundle/Entity/Person.php
index aa78774b6..2cdb99c54 100644
--- a/src/Bundle/ChillPersonBundle/Entity/Person.php
+++ b/src/Bundle/ChillPersonBundle/Entity/Person.php
@@ -43,6 +43,7 @@ use DateTime;
 use Doctrine\Common\Collections\ArrayCollection;
 use Doctrine\Common\Collections\Collection;
 use Doctrine\Common\Collections\Criteria;
+use Doctrine\Common\Collections\Order;
 use Doctrine\Common\Collections\ReadableCollection;
 use Doctrine\Common\Collections\Selectable;
 use Doctrine\ORM\Mapping as ORM;
@@ -139,6 +140,12 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     #[ORM\ManyToMany(targetEntity: Calendar::class, mappedBy: 'persons')]
     private Collection $calendars;
 
+    /**
+     * @var Collection<int, Calendar>&Selectable<int, Calendar>
+     */
+    #[ORM\OneToMany(mappedBy: 'person', targetEntity: Calendar::class)]
+    private Collection $directCalendars;
+
     /**
      * The person's center.
      *
@@ -406,6 +413,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
     public function __construct()
     {
         $this->calendars = new ArrayCollection();
+        $this->directCalendars = new ArrayCollection();
         $this->accompanyingPeriodParticipations = new ArrayCollection();
         $this->spokenLanguages = new ArrayCollection();
         $this->addresses = new ArrayCollection();
@@ -866,6 +874,30 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
         return $this->calendars;
     }
 
+    /**
+     * Get next calendars for this person (calendars with start date after today).
+     * Only returns calendars that are directly linked to this person via the person property,
+     * not those linked through AccompanyingPeriods.
+     *
+     * @param int|null $limit Optional limit for the number of results
+     *
+     * @return array<Calendar>
+     */
+    public function getNextCalendarsForPerson(?int $limit = null): array
+    {
+        $today = new \DateTimeImmutable('today');
+
+        $criteria = Criteria::create()
+            ->where(Criteria::expr()->gte('startDate', $today))
+            ->orderBy(['startDate' => Order::Ascending]);
+
+        if (null !== $limit) {
+            $criteria->setMaxResults($limit);
+        }
+
+        return $this->directCalendars->matching($criteria)->toArray();
+    }
+
     public function getCenter(): ?Center
     {
         if (null !== $this->centerCurrent) {
@@ -1119,7 +1151,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
             ->where(
                 $expr->eq('shareHousehold', false)
             )
-            ->orderBy(['startDate' => \Doctrine\Common\Collections\Order::Descending]);
+            ->orderBy(['startDate' => Order::Descending]);
 
         return $this->getHouseholdParticipations()
             ->matching($criteria);
@@ -1141,7 +1173,7 @@ class Person implements HasCenterInterface, TrackCreationInterface, TrackUpdateI
             ->where(
                 $expr->eq('shareHousehold', true)
             )
-            ->orderBy(['startDate' => \Doctrine\Common\Collections\Order::Descending, 'id' => \Doctrine\Common\Collections\Order::Descending]);
+            ->orderBy(['startDate' => Order::Descending, 'id' => Order::Descending]);
 
         return $this->getHouseholdParticipations()
             ->matching($criteria);
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
index 5572bd7b1..c373fd58b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Entity/person.html.twig
@@ -212,4 +212,3 @@
     </div>
 </div>
 {%- endif -%}
-
diff --git a/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig b/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig
index 0840cecb6..cf7fb1466 100644
--- a/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig
+++ b/src/Bundle/ChillPersonBundle/Resources/views/Person/list_with_period.html.twig
@@ -301,6 +301,47 @@
                         'customButtons': { 'after': _self.button_person_after(person), 'before': _self.button_person_before((person)) }
                     }) }}
 
+                    {% set calendars = [] %}
+                    {% for c in person.getNextCalendarsForPerson(10) %}
+                        {% if is_granted('CHILL_CALENDAR_CALENDAR_SEE', c) %}
+                            {% set calendars = calendars|merge([c]) %}
+                        {% endif %}
+                    {% endfor %}
+
+                    {% if calendars|length > 0 %}
+                        <div class="wrap-list periods-list">
+                            <div class="wl-row">
+                                <div class="wl-col title">
+                                    <h3>{{ 'chill_calendar.Next calendars'|trans }}</h3>
+                                </div>
+                                <div class="wl-col list">
+                                    <div class="calendar-list">
+                                        <ul class="calendar-list">
+                                            {% for c in calendars %}
+                                                <li>
+                                                    {% if is_granted('CHILL_CALENDAR_CALENDAR_EDIT', c) %}
+                                                        <a href="{{ chill_path_add_return_path('chill_calendar_calendar_edit', { id: c.id }) }}">
+                                                            <span class="badge bg-secondary">
+                                                                {{ c.startDate|format_datetime('long', 'short') }}
+                                                            </span>
+                                                        </a>
+                                                    {% else %}
+                                                        <span class="badge bg-secondary">
+                                                            {{ c.startDate|format_datetime('long', 'short') }}
+                                                        </span>
+                                                    {% endif %}
+                                                </li>
+                                            {% endfor %}
+                                        </ul>
+                                        {% if is_granted('CHILL_CALENDAR_CALENDAR_SEE', person) %}
+                                            <a href="{{ chill_path_add_return_path('chill_calendar_calendar_list_by_person', {'id': person.id}) }}" class="calendar-list__global"><i class="fa fa-list"></i></a>
+                                        {% endif %}
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    {% endif %}
+
                     {#- 'acps' is for AcCompanyingPeriodS #}
                     {%- set acps = [] %}
                     {%- set acpsClosed = [] %}

From fc66d0e07020cd332e6bdc59f83334ef7fdcb0f5 Mon Sep 17 00:00:00 2001
From: Boris Waaub <boris.waaub@digitalternative.be>
Date: Tue, 9 Dec 2025 10:42:36 +0100
Subject: [PATCH 259/283] =?UTF-8?q?FIX:=20Dans=20la=20modale=20d'accueil?=
 =?UTF-8?q?=20du=20ticket,=20les=20boutons=20doivent=20=C3=AAtre=20dans=20?=
 =?UTF-8?q?le=20footer?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Resources/public/vuejs/TicketApp/App.vue  |  40 ++-
 .../components/TicketInitFormComponent.vue    | 185 +++++------
 .../src/translations/messages+intl-icu.fr.yml | 301 +++++++++---------
 3 files changed, 255 insertions(+), 271 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
index b2abb8276..0128d8866 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
@@ -41,12 +41,18 @@
 
     <template #body>
       <ticket-init-form-component
+        v-model="ticketForm"
         :ticket="ticket"
         :motives="motives"
         :suggested-persons="suggestedPersons"
         @submit="handleFormSubmit"
       />
     </template>
+    <template #footer>
+      <button class="btn btn-primary" @click="handleFormSubmit">
+        {{ trans(CHILL_TICKET_TICKET_INIT_FORM_SUBMIT) }}
+      </button>
+    </template>
   </Modal>
 </template>
 
@@ -71,6 +77,7 @@ import ToggleComponent from "../TicketList/components/ToggleComponent.vue";
 // Translations
 import {
   trans,
+  CHILL_TICKET_TICKET_INIT_FORM_SUBMIT,
   CHILL_TICKET_TICKET_INIT_FORM_TITLE,
   CHILL_TICKET_TICKET_INIT_FORM_SUCCESS,
   CHILL_TICKET_TICKET_INIT_FORM_ERROR,
@@ -96,26 +103,39 @@ const showTicketInitFormModal = ref(false);
 const loading = ref(true);
 const refreshKey = ref(0);
 
-async function handleFormSubmit(ticketForm: TicketInitForm) {
+// ticketForm réactif pour v-model
+const ticketForm = ref({
+  content: "",
+  addressees: ticket.value?.currentAddressees,
+  motive: ticket.value?.currentMotive,
+  persons: ticket.value?.currentPersons,
+  caller: ticket.value?.caller,
+  emergency: ticket.value?.emergency,
+} as TicketInitForm);
+
+async function handleFormSubmit() {
   try {
-    if (!ticketForm.motive || ticketForm.content.trim() === "") {
+    if (!ticketForm.value.motive || ticketForm.value.content.trim() === "") {
       toast.warning(trans(CHILL_TICKET_TICKET_INIT_FORM_WARNING));
       return;
     }
-    if (ticketForm.motive) {
-      await store.dispatch("createMotive", ticketForm.motive);
+    if (ticketForm.value.motive) {
+      await store.dispatch("createMotive", ticketForm.value.motive);
     }
-    if (ticketForm.content.trim() !== "") {
-      await store.dispatch("createComment", ticketForm.content);
+    if (ticketForm.value.content.trim() !== "") {
+      await store.dispatch("createComment", ticketForm.value.content);
     }
 
     // Ne pas mettre à jour emergency si le motif force l'état d'urgence
-    if (ticketForm.motive && !ticketForm.motive.makeTicketEmergency) {
-      await store.dispatch("setEmergency", ticketForm.emergency);
+    if (
+      ticketForm.value.motive &&
+      !ticketForm.value.motive.makeTicketEmergency
+    ) {
+      await store.dispatch("setEmergency", ticketForm.value.emergency);
     }
 
-    await store.dispatch("setAddressees", ticketForm.addressees);
-    await store.dispatch("setPersons", ticketForm.persons);
+    await store.dispatch("setAddressees", ticketForm.value.addressees);
+    await store.dispatch("setPersons", ticketForm.value.persons);
 
     // Forcer le rafraîchissement des composants
     refreshKey.value++;
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketInitFormComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketInitFormComponent.vue
index 7a3066251..463209f1a 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketInitFormComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketInitFormComponent.vue
@@ -1,84 +1,73 @@
 <template>
   <div class="card mb-4">
     <div class="card-body">
-      <form @submit.prevent="submitForm">
-        <div class="mb-3">
-          <label class="form-label pe-2" for="emergency">
-            {{ trans(CHILL_TICKET_LIST_FILTER_EMERGENCY) }}
-          </label>
-          <emergency-toggle-component v-model="isEmergency" class="float-end" />
-        </div>
+      <div class="mb-3">
+        <label class="form-label pe-2" for="emergency">
+          {{ trans(CHILL_TICKET_LIST_FILTER_EMERGENCY) }}
+        </label>
+        <emergency-toggle-component v-model="isEmergency" class="float-end" />
+      </div>
 
-        <!-- Sélection du motif -->
-        <div class="mb-3">
-          <label class="form-label">{{
-            trans(CHILL_TICKET_TICKET_SET_MOTIVE_TITLE)
-          }}</label>
-          <motive-selector-component
-            v-model="ticketForm.motive"
-            :motives="motives"
-          />
-        </div>
+      <!-- Sélection du motif -->
+      <div class="mb-3">
+        <label class="form-label">{{
+          trans(CHILL_TICKET_TICKET_SET_MOTIVE_TITLE)
+        }}</label>
+        <motive-selector-component
+          v-model="ticketForm.motive"
+          :motives="motives"
+        />
+      </div>
 
-        <!-- Sélection des personnes -->
-        <div class="row mb-3">
-          <div class="col-md-6">
-            <label class="form-label">
-              {{ trans(CHILL_TICKET_TICKET_SET_PERSONS_TITLE_CALLER) }}
-            </label>
-            <persons-selector-component
-              v-model="ticketForm.caller"
-              :suggested="[]"
-              :multiple="false"
-              :types="['person', 'thirdparty']"
-              :label="trans(CHILL_TICKET_TICKET_SET_PERSONS_CALLER_LABEL)"
-            />
-          </div>
-          <div class="col-md-6">
-            <label class="form-label">
-              {{ trans(CHILL_TICKET_TICKET_SET_PERSONS_TITLE_PERSON) }}
-            </label>
-            <persons-selector-component
-              v-model="ticketForm.persons"
-              :suggested="suggestedPersons"
-              :multiple="true"
-              :types="['person']"
-              :label="trans(CHILL_TICKET_TICKET_SET_PERSONS_USER_LABEL)"
-            />
-          </div>
-        </div>
-
-        <!-- Éditeur de commentaire -->
-        <div class="mb-3">
-          <label class="form-label">{{
-            trans(CHILL_TICKET_TICKET_ADD_COMMENT_TITLE)
-          }}</label>
-          <comment-editor-component
-            v-model="ticketForm.content"
-            :motive="ticketForm.motive ? ticketForm.motive : null"
-          />
-        </div>
-
-        <!-- Attribution des tickets -->
-        <div class="mb-3">
+      <!-- Sélection des personnes -->
+      <div class="row mb-3">
+        <div class="col-md-6">
           <label class="form-label">
-            {{ trans(CHILL_TICKET_TICKET_ADD_ADDRESSEE_TITLE) }}
+            {{ trans(CHILL_TICKET_TICKET_SET_PERSONS_TITLE_CALLER) }}
           </label>
-          <addressee-selector-component
-            v-model="ticketForm.addressees"
-            :suggested="userGroups"
+          <persons-selector-component
+            v-model="ticketForm.caller"
+            :suggested="[]"
+            :multiple="false"
+            :types="['person', 'thirdparty']"
+            :label="trans(CHILL_TICKET_TICKET_SET_PERSONS_CALLER_LABEL)"
           />
         </div>
-        <!-- Boutons d'action -->
-        <div class="d-flex justify-content-end gap-2 mt-4">
-          <button type="button" class="btn btn-secondary" @click="resetForm">
-            {{ trans(CHILL_TICKET_TICKET_INIT_FORM_RESET) }}
-          </button>
-          <button type="submit" class="btn btn-primary">
-            {{ trans(CHILL_TICKET_TICKET_INIT_FORM_SUBMIT) }}
-          </button>
+        <div class="col-md-6">
+          <label class="form-label">
+            {{ trans(CHILL_TICKET_TICKET_SET_PERSONS_TITLE_PERSON) }}
+          </label>
+          <persons-selector-component
+            v-model="ticketForm.persons"
+            :suggested="suggestedPersons"
+            :multiple="true"
+            :types="['person']"
+            :label="trans(CHILL_TICKET_TICKET_SET_PERSONS_USER_LABEL)"
+          />
         </div>
-      </form>
+      </div>
+
+      <!-- Éditeur de commentaire -->
+      <div class="mb-3">
+        <label class="form-label">{{
+          trans(CHILL_TICKET_TICKET_ADD_COMMENT_TITLE)
+        }}</label>
+        <comment-editor-component
+          v-model="ticketForm.content"
+          :motive="ticketForm.motive ? ticketForm.motive : null"
+        />
+      </div>
+
+      <!-- Attribution des tickets -->
+      <div class="mb-3">
+        <label class="form-label">
+          {{ trans(CHILL_TICKET_TICKET_ADD_ADDRESSEE_TITLE) }}
+        </label>
+        <addressee-selector-component
+          v-model="ticketForm.addressees"
+          :suggested="userGroups"
+        />
+      </div>
     </div>
   </div>
 </template>
@@ -94,20 +83,12 @@ import PersonsSelectorComponent from "./Person/PersonsSelectorComponent.vue";
 import AddresseeSelectorComponent from "./Addressee/AddresseeSelectorComponent.vue";
 import EmergencyToggleComponent from "./Emergency/EmergencyToggleComponent.vue";
 // Types
-import {
-  Motive,
-  MotiveWithParent,
-  Ticket,
-  TicketEmergencyState,
-  TicketInitForm,
-} from "../../../types";
+import { Motive, TicketInitForm } from "../../../types";
 import { Person } from "ChillPersonAssets/types";
 
 // Translations
 import {
   trans,
-  CHILL_TICKET_TICKET_INIT_FORM_SUBMIT,
-  CHILL_TICKET_TICKET_INIT_FORM_RESET,
   CHILL_TICKET_TICKET_SET_MOTIVE_TITLE,
   CHILL_TICKET_TICKET_ADD_COMMENT_TITLE,
   CHILL_TICKET_TICKET_SET_PERSONS_TITLE_CALLER,
@@ -117,32 +98,23 @@ import {
   CHILL_TICKET_LIST_FILTER_EMERGENCY,
   CHILL_TICKET_TICKET_ADD_ADDRESSEE_TITLE,
 } from "translator";
-import { UserGroup, UserGroupOrUser } from "ChillMainAssets/types";
+import { UserGroup } from "ChillMainAssets/types";
 
 const props = defineProps<{
-  ticket: Ticket;
+  modelValue: TicketInitForm;
   motives: Motive[];
   suggestedPersons: Person[];
 }>();
 
 const emit = defineEmits<{
   "update:modelValue": [value: TicketInitForm];
-  submit: [formData: TicketInitForm];
 }>();
 
 const store = useStore();
 
-const ticketForm = reactive({
-  content: "",
-  addressees: props.ticket.currentAddressees as UserGroupOrUser[],
-  motive: props.ticket.currentMotive as MotiveWithParent | null,
-  persons: props.ticket.currentPersons as Person[],
-  caller: props.ticket.caller as Person | null,
-  emergency: props.ticket.emergency as TicketEmergencyState,
-} as TicketInitForm);
-
+const ticketForm = reactive({ ...props.modelValue });
 const isEmergency = ref<boolean>(
-  props.ticket.emergency == "yes" ? true : false,
+  props.modelValue.emergency == "yes" ? true : false,
 );
 
 const userGroups = computed(() => store.getters.getUserGroups as UserGroup[]);
@@ -155,23 +127,16 @@ watch(
   },
 );
 
-function submitForm() {
-  emit("submit", {
-    content: ticketForm.content,
-    motive: ticketForm.motive,
-    addressees: [...ticketForm.addressees],
-    persons: [...ticketForm.persons],
-    caller: ticketForm.caller,
-    emergency: isEmergency.value ? "yes" : "no",
-  });
-}
-function resetForm() {
-  ticketForm.content = "";
-  ticketForm.motive = null;
-  ticketForm.persons = [];
-  ticketForm.caller = null;
-  ticketForm.emergency = props.ticket.emergency as TicketEmergencyState;
-}
+watch(
+  ticketForm,
+  (newVal) => {
+    emit("update:modelValue", {
+      ...newVal,
+      emergency: isEmergency.value ? "yes" : "no",
+    });
+  },
+  { deep: true },
+);
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml b/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
index 71d75e4f5..095595fea 100644
--- a/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
+++ b/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
@@ -1,156 +1,155 @@
 restore: Restaurer
 chill_ticket:
-  list:
-    title: "Tickets"
-    title_with_name: "{name, select, null {Tickets} undefined {Tickets} other {Tickets de {name}}}"
-    title_menu: "Tickets de l'usager"
-    show_all_history: "Afficher tout l'historique"
-    title_previous_tickets: "{name, select, other {Précédent ticket de {name}} undefined {Précédent ticket}}"
-    no_tickets: "Aucun ticket"
-    loading_ticket: "Chargement des tickets..."
-    loading_ticket_details: "Chargement de l'historique du ticket..."
-    error_loading_ticket: "Erreur lors du chargement des ticket"
-    load_more: "Voir plus..."
-    addressees: "Destinataires"
-    persons: "Usager concernés"
-    callers: "Appelants"
-    filter:
-      to_me: Tickets qui me sont destinés
-      in_alert: Tickets en alerte (délai de résolution dépassé)
-      created_between: Créés entre
-      state_change: État actuel
-      title: "Filtres des tickets"
-      persons_concerned: "Usagers concernés"
-      by_person: "Par personne"
-      creators: "Créateurs"
-      by_creator: "Par créateur"
-      addressees: "Par destinataire"
-      by_addressees: "Par destinataire"
-      by_motives: "Par motifs"
-      by_ticket_id: "Par numéro de ticket"
-      ticket_id: "Numéro de ticket"
-      current_state: "État actuel"
-      open: "Ouvert"
-      closed: "Clôturé"
-      emergency: "Urgent"
-      no_emergency: "Non urgent"
-      created_after: "Créé après"
-      created_before: "Créé avant"
-      response_time_exceeded: "Temps de réponse dépassé"
-      response_time_warning: 'Attention : ce filtre désactive les filtres "par dates" et affiche uniquement les tickets ouverts'
-      reset: "Réinitialiser"
-      apply: "Appliquer les filtres"
-      remove: "Supprimer"
-      result: "{count, plural, =0 {Aucun résultat} =1 {resultat} other {resultats}}"
+    list:
+        title: "Tickets"
+        title_with_name: "{name, select, null {Tickets} undefined {Tickets} other {Tickets de {name}}}"
+        title_menu: "Tickets de l'usager"
+        show_all_history: "Afficher tout l'historique"
+        title_previous_tickets: "{name, select, other {Précédent ticket de {name}} undefined {Précédent ticket}}"
+        no_tickets: "Aucun ticket"
+        loading_ticket: "Chargement des tickets..."
+        loading_ticket_details: "Chargement de l'historique du ticket..."
+        error_loading_ticket: "Erreur lors du chargement des ticket"
+        load_more: "Voir plus..."
+        addressees: "Destinataires"
+        persons: "Usager concernés"
+        callers: "Appelants"
+        filter:
+            to_me: Tickets qui me sont destinés
+            in_alert: Tickets en alerte (délai de résolution dépassé)
+            created_between: Créés entre
+            state_change: État actuel
+            title: "Filtres des tickets"
+            persons_concerned: "Usagers concernés"
+            by_person: "Par personne"
+            creators: "Créateurs"
+            by_creator: "Par créateur"
+            addressees: "Par destinataire"
+            by_addressees: "Par destinataire"
+            by_motives: "Par motifs"
+            by_ticket_id: "Par numéro de ticket"
+            ticket_id: "Numéro de ticket"
+            current_state: "État actuel"
+            open: "Ouvert"
+            closed: "Clôturé"
+            emergency: "Urgent"
+            no_emergency: "Non urgent"
+            created_after: "Créé après"
+            created_before: "Créé avant"
+            response_time_exceeded: "Temps de réponse dépassé"
+            response_time_warning: 'Attention : ce filtre désactive les filtres "par dates" et affiche uniquement les tickets ouverts'
+            reset: "Réinitialiser"
+            apply: "Appliquer les filtres"
+            remove: "Supprimer"
+            result: "{count, plural, =0 {Aucun résultat} =1 {resultat} other {resultats}}"
 
-  ticket:
-    init_form:
-      title: "Ajouter des informations sur le ticket"
-      submit: "Mettre à jour le ticket"
-      reset: "Réinitialiser"
-      success: "Ticket mis à jour avec succès"
-      error: "Veuillez remplir tous les champs obligatoires"
-      warning: "Veuillez remplir au minimum le motif et le commentaire"
-    history:
-      add_comment: "Commentaire ajouté"
-      addressees_state: "{count, plural, =0 {Destinataire supprimé} =1 {Destinataire ajouté} other {Destinataire ajoutés}}"
-      persons_state: "{count, plural, =0 {Usagers supprimés} =1 {Usager concerné ajouté} other {Usagers concernés ajoutés}}"
-      set_caller: "{id, select, null {Appelant supprimé} other {Appelant ajouté}}"
-      set_motive: "Motif ajouté"
-      create_ticket: "Ticket créé"
-      state_change: ""
-      emergency_change: ""
-      mask_comment: "Supprimer"
-    previous_tickets: "Précédents tickets"
-    actions_toolbar:
-      cancel: "Annuler"
-      save: "Enregistrer"
-      close: "Clôturer"
-      close_success: "Ticket clôturé"
-      close_error: "Erreur lors de la clotûre du ticket"
-      reopen: "Rouvrir"
-      reopen_success: "Rouverture du ticket réussie"
-      reopen_error: "Erreur lors de la rouverture du ticket"
-    visible_comment:
-      success: "Commentaire restauré"
-    mask_comment:
-      success: "Commentaire supprimé"
-      hint: "Ce commentaire a été supprimé."
-    edit_comment:
-      title: "Éditer le commentaire"
-      success: "Commentaire modifié"
-    add_comment:
-      title: "Commentaire"
-      label: "Ajouter un commentaire"
-      success: "Commentaire enregistré"
-      content: "Ajouter un commentaire"
-      error: "Aucun commentaire ajouté"
-    set_motive:
-      title: "Motif"
-      label: "Choisir un motif"
-      success: "Motif enregistré"
-      error: "Aucun motif sélectionné"
-    add_addressee:
-      title: "Attribuer"
-      user_group_label: "Attribuer à un groupe"
-      user_label: "Attribuer à un ou plusieurs utilisateurs"
-      success: "Attribution effectuée"
-      error: "Aucun destinataire sélectionné"
-    set_persons:
-      title: "Appelant et usager(s)"
-      title_person: "Usager(s)"
-      title_caller: "Appelant"
-      user_label: "Ajouter un usager"
-      caller_label: "Ajouter un appelant"
-      success: "Appelants et usagers mis à jour"
-      error: "Aucun usager sélectionné"
-    banner:
-      person: "{count, plural, =0 {Aucun usager impliqué} =1 {Usager impliqué} other {Usagers impliqués}}"
-      speaker: "{count, plural, =0 {Aucun destinataire} =1 {Destinataire} other {Destinataires}}"
-      caller: "{count, plural, =0 {Aucun appelant} =1 {Appelant} other {Appelants}}"
-      open: "Ouvert"
-      closed: "Clôturé"
-      since: "Depuis {time}"
-      and: "et"
-      days: >-
-        {count, plural,
-                =0    {aucun jour}
-                =1    {1 jour}
-                other {# jours}
-        }
-      hours: >-
-        {count, plural,
-                =0    {aucune heure}
-                =1    {1 heure}
-                other {# heures}
-        }
-      minutes: >-
-        {count, plural,
-                =0    {aucune minute}
-                =1    {1 minute}
-                other {# minutes}
-        }
-      seconds: >-
-        {count, plural,
-                =0    {aucune seconde}
-                =1    {1 seconde}
-                other {# secondes}
-        }
-      no_motive: "Aucun motif"
-      emergency: "URGENT"
-      emergency_success: "Ticket marqué comme urgent"
-      emergency_error: "Erreur lors de la tentative de marquage du ticket comme urgent"
-      no_emergency_success: "Ticket marqué comme non urgent"
-      no_emergency_error: "Erreur lors de la tentative de marquage du ticket comme non urgent"
-  peloton:
-    loading: "Chargement..."
-    loading_document: "Chargement du document..."
-    error_loading: "Erreur lors du chargement du document."
-    error_not_ready: "Le document n'est pas prêt ou accessible."
-    unsupported_type: "Type de document non supporté pour l'affichage."
-    open_new_tab: "Ouvrir dans un nouvel onglet"
-    iframe_not_supported: "Votre navigateur ne supporte pas les iframes."
-    click_to_open_pdf: "Cliquez ici pour ouvrir le PDF"
+    ticket:
+        init_form:
+            title: "Ajouter des informations sur le ticket"
+            submit: "Mettre à jour le ticket"
+            success: "Ticket mis à jour avec succès"
+            error: "Veuillez remplir tous les champs obligatoires"
+            warning: "Veuillez remplir au minimum le motif et le commentaire"
+        history:
+            add_comment: "Commentaire ajouté"
+            addressees_state: "{count, plural, =0 {Destinataire supprimé} =1 {Destinataire ajouté} other {Destinataire ajoutés}}"
+            persons_state: "{count, plural, =0 {Usagers supprimés} =1 {Usager concerné ajouté} other {Usagers concernés ajoutés}}"
+            set_caller: "{id, select, null {Appelant supprimé} other {Appelant ajouté}}"
+            set_motive: "Motif ajouté"
+            create_ticket: "Ticket créé"
+            state_change: ""
+            emergency_change: ""
+            mask_comment: "Supprimer"
+        previous_tickets: "Précédents tickets"
+        actions_toolbar:
+            cancel: "Annuler"
+            save: "Enregistrer"
+            close: "Clôturer"
+            close_success: "Ticket clôturé"
+            close_error: "Erreur lors de la clotûre du ticket"
+            reopen: "Rouvrir"
+            reopen_success: "Rouverture du ticket réussie"
+            reopen_error: "Erreur lors de la rouverture du ticket"
+        visible_comment:
+            success: "Commentaire restauré"
+        mask_comment:
+            success: "Commentaire supprimé"
+            hint: "Ce commentaire a été supprimé."
+        edit_comment:
+            title: "Éditer le commentaire"
+            success: "Commentaire modifié"
+        add_comment:
+            title: "Commentaire"
+            label: "Ajouter un commentaire"
+            success: "Commentaire enregistré"
+            content: "Ajouter un commentaire"
+            error: "Aucun commentaire ajouté"
+        set_motive:
+            title: "Motif"
+            label: "Choisir un motif"
+            success: "Motif enregistré"
+            error: "Aucun motif sélectionné"
+        add_addressee:
+            title: "Attribuer"
+            user_group_label: "Attribuer à un groupe"
+            user_label: "Attribuer à un ou plusieurs utilisateurs"
+            success: "Attribution effectuée"
+            error: "Aucun destinataire sélectionné"
+        set_persons:
+            title: "Appelant et usager(s)"
+            title_person: "Usager(s)"
+            title_caller: "Appelant"
+            user_label: "Ajouter un usager"
+            caller_label: "Ajouter un appelant"
+            success: "Appelants et usagers mis à jour"
+            error: "Aucun usager sélectionné"
+        banner:
+            person: "{count, plural, =0 {Aucun usager impliqué} =1 {Usager impliqué} other {Usagers impliqués}}"
+            speaker: "{count, plural, =0 {Aucun destinataire} =1 {Destinataire} other {Destinataires}}"
+            caller: "{count, plural, =0 {Aucun appelant} =1 {Appelant} other {Appelants}}"
+            open: "Ouvert"
+            closed: "Clôturé"
+            since: "Depuis {time}"
+            and: "et"
+            days: >-
+                {count, plural,
+                        =0    {aucun jour}
+                        =1    {1 jour}
+                        other {# jours}
+                }
+            hours: >-
+                {count, plural,
+                        =0    {aucune heure}
+                        =1    {1 heure}
+                        other {# heures}
+                }
+            minutes: >-
+                {count, plural,
+                        =0    {aucune minute}
+                        =1    {1 minute}
+                        other {# minutes}
+                }
+            seconds: >-
+                {count, plural,
+                        =0    {aucune seconde}
+                        =1    {1 seconde}
+                        other {# secondes}
+                }
+            no_motive: "Aucun motif"
+            emergency: "URGENT"
+            emergency_success: "Ticket marqué comme urgent"
+            emergency_error: "Erreur lors de la tentative de marquage du ticket comme urgent"
+            no_emergency_success: "Ticket marqué comme non urgent"
+            no_emergency_error: "Erreur lors de la tentative de marquage du ticket comme non urgent"
+    peloton:
+        loading: "Chargement..."
+        loading_document: "Chargement du document..."
+        error_loading: "Erreur lors du chargement du document."
+        error_not_ready: "Le document n'est pas prêt ou accessible."
+        unsupported_type: "Type de document non supporté pour l'affichage."
+        open_new_tab: "Ouvrir dans un nouvel onglet"
+        iframe_not_supported: "Votre navigateur ne supporte pas les iframes."
+        click_to_open_pdf: "Cliquez ici pour ouvrir le PDF"
 
 admin:
     ticket:
@@ -168,7 +167,7 @@ crud:
         title_new: Nouveau motif
         title_edit: Modifier le motif
         new:
-          "Create a new motive": "Créer un nouveau motif"
+            "Create a new motive": "Créer un nouveau motif"
 
 "Label": "Libellé"
 "Active": "Actif"

From d3d2c0634872619f116c6d2d8a27d93b0f42338d Mon Sep 17 00:00:00 2001
From: Boris Waaub <boris.waaub@digitalternative.be>
Date: Tue, 9 Dec 2025 11:12:21 +0100
Subject: [PATCH 260/283] =?UTF-8?q?FIX:=20Dans=20les=20petits=20=C3=A9cran?=
 =?UTF-8?q?s,=20la=20modale=20d'accueil=20pourrait=20=C3=AAtre=20plus=20la?=
 =?UTF-8?q?rge?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Resources/public/vuejs/TicketApp/App.vue   | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
index 0128d8866..c9f2352b1 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
@@ -30,7 +30,7 @@
   <Modal
     v-if="showTicketInitFormModal"
     :show="showTicketInitFormModal"
-    modal-dialog-class="modal-lg"
+    :modal-dialog-class="modalDialogClass"
     @close="closeModal"
   >
     <template #header>
@@ -58,7 +58,7 @@
 
 <script setup lang="ts">
 import { useToast } from "vue-toast-notification";
-import { computed, onMounted, ref } from "vue";
+import { computed, onMounted, onUnmounted, ref } from "vue";
 import { useStore } from "vuex";
 
 // Types
@@ -113,6 +113,16 @@ const ticketForm = ref({
   emergency: ticket.value?.emergency,
 } as TicketInitForm);
 
+const modalDialogClass = ref(
+  window.innerWidth < 990 ? "modal-fullscreen" : "modal-lg",
+);
+
+function updateModalClass() {
+  modalDialogClass.value =
+    window.innerWidth < 990 ? "modal-fullscreen" : "modal-lg";
+}
+window.addEventListener("resize", updateModalClass);
+
 async function handleFormSubmit() {
   try {
     if (!ticketForm.value.motive || ticketForm.value.content.trim() === "") {
@@ -167,6 +177,10 @@ onMounted(() => {
     loading.value = false;
   }
 });
+
+onUnmounted(() => {
+  window.removeEventListener("resize", updateModalClass);
+});
 </script>
 
 <style lang="scss" scoped>

From c92467b284c77a249934518183ca51a485382dd4 Mon Sep 17 00:00:00 2001
From: Boris Waaub <boris.waaub@digitalternative.be>
Date: Tue, 9 Dec 2025 11:15:50 +0100
Subject: [PATCH 261/283] =?UTF-8?q?FIX:=20Frontend:=20Probl=C3=A8me=20d'af?=
 =?UTF-8?q?fichage=20quand=20il=20n'y=20a=20pas=20de=20parent=20au=20motif?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TicketList/components/TicketListItemComponent.vue     | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListItemComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListItemComponent.vue
index 5ac4b4d7d..7255c0c5d 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListItemComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListItemComponent.vue
@@ -3,13 +3,7 @@
     <div class="card-body">
       <div class="wrap-header">
         <div class="row align-items-top">
-          <div
-            v-if="
-              null !== ticket.currentMotive &&
-              null !== ticket.currentMotive.parent
-            "
-            class="col-6"
-          >
+          <div class="col-6">
             <div class="small text-muted">
               {{ motiveHierarchyLabel(ticket.currentMotive) }}
             </div>

From 74d133e739ca420d9081159910510c87abeb0a51 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 9 Dec 2025 15:25:11 +0100
Subject: [PATCH 262/283] eslint: automatic fixes

---
 package.json                                  |    1 -
 .../Activity/components/SocialIssuesAcc.vue   |  494 +++--
 .../SocialIssuesAcc/CheckSocialAction.vue     |   25 +-
 .../SocialIssuesAcc/CheckSocialIssue.vue      |   28 +-
 .../Resources/public/vuejs/Calendar/App.vue   |  679 +++---
 .../public/vuejs/MyCalendarRange/App2.vue     |  700 +++---
 .../Resources/public/types/generic_doc.ts     |   62 +-
 .../Resources/public/types/index.ts           |    6 +-
 .../vuejs/DropFileWidget/DropFileModal.vue    |  104 +-
 .../HistoryButton/HistoryButtonListItem.vue   |  270 ++-
 .../Resources/public/chill/js/date.ts         |  219 +-
 .../Resources/public/lib/api/apiMethods.ts    |   54 +-
 .../Resources/public/lib/api/genderHelper.ts  |    5 +-
 .../lib/return_path/returnPathHelper.ts       |    6 +-
 .../Resources/public/lib/workflow/api.ts      |   20 +-
 .../ChillMainBundle/Resources/public/types.ts |  135 +-
 .../public/vuejs/DownloadExport/App.vue       |  130 +-
 .../vuejs/OnTheFly/components/Create.vue      |   22 +-
 .../vuejs/OnTheFly/components/CreateModal.vue |   18 +-
 .../vuejs/OnTheFly/components/OnTheFly.vue    |   47 +-
 .../public/vuejs/PickEntity/PickEntity.vue    |   22 +-
 .../vuejs/WaitPostProcessWorkflow/App.vue     |   94 +-
 .../vuejs/WaitPostProcessWorkflow/index.ts    |   72 +-
 .../public/vuejs/WorkflowAttachment/App.vue   |   88 +-
 .../Component/AttachmentList.vue              |   86 +-
 .../Component/GenericDocItemBox.vue           |   10 +-
 .../Component/PickGenericDoc.vue              |  443 ++--
 .../Component/PickGenericDocModal.vue         |  132 +-
 .../Entity/GenderIconRenderBox.vue            |    2 +-
 .../EntityWorkflowVueSubscriber.vue           |  110 +-
 .../public/vuejs/_components/Modal.vue        |  119 +-
 .../vuejs/_components/WaitingScreen.vue       |   88 +-
 .../vuejs/_composables/violationList.ts       |   49 +-
 .../Resources/public/types.ts                 |  272 +--
 .../AccompanyingCourse/components/Confirm.vue |    4 +-
 .../components/PersonsAssociated.vue          |   13 +-
 .../components/Requestor.vue                  |    2 +-
 .../components/Resources.vue                  |    2 +-
 .../vuejs/AccompanyingCourseWorkEdit/App.vue  | 1889 ++++++++---------
 .../components/CommentInput.vue               |   34 +-
 .../components/DateInputs.vue                 |  114 +-
 .../components/DocumentActions.vue            |   98 +-
 .../components/DocumentsList.vue              |  685 +++---
 .../components/FormEvaluation.vue             |  608 +++---
 .../components/TimeSpentInput.vue             |   44 +-
 .../Resources/public/vuejs/_api/OnTheFly.ts   |   66 +-
 ...ccompanyingCourseWorkEvaluationDocument.ts |   24 +-
 .../AccompanyingPeriodWorkEvaluationItem.vue  |   96 +-
 .../AccompanyingPeriodWorkEvaluationList.vue  |   42 +-
 .../AccompanyingPeriodWorkList.vue            |   16 +-
 .../AccompanyingPeriodWorkSelectorModal.vue   |  137 +-
 .../public/vuejs/_components/AddPersons.vue   |   36 +-
 .../AddPersons/PersonChooseModal.vue          |   71 +-
 .../AddPersons/PersonSuggestion.vue           |   41 +-
 .../_components/AddPersons/TypeHousehold.vue  |    4 +-
 .../_components/AddPersons/TypePerson.vue     |    4 +-
 .../_components/AddPersons/TypeThirdParty.vue |   43 +-
 .../vuejs/_components/AddPersons/TypeUser.vue |    5 +-
 .../_components/AddPersons/TypeUserGroup.vue  |    2 +-
 .../_components/Entity/PersonRenderBox.vue    |   80 +-
 .../vuejs/_components/OnTheFly/Person.vue     |    2 +-
 .../vuejs/_components/OnTheFly/PersonEdit.vue |   85 +-
 .../Resources/public/vuejs/_js/i18n.ts        |  117 +-
 .../Resources/public/types.ts                 |   52 +-
 .../Resources/public/vuejs/_api/OnTheFly.ts   |   58 +-
 .../Entity/ThirdPartyRenderBox.vue            |   19 +-
 .../vuejs/_components/OnTheFly/ThirdParty.vue |   49 +-
 .../_components/OnTheFly/ThirdPartyEdit.vue   |  184 +-
 .../src/Resources/public/types.ts             |    5 +-
 .../TicketApp/components/BannerComponent.vue  |    9 +-
 70 files changed, 4649 insertions(+), 4703 deletions(-)

diff --git a/package.json b/package.json
index cd4f23a07..12a5fee26 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,6 @@
     "@hotwired/stimulus": "^3.0.0",
     "@luminateone/eslint-baseline": "^1.0.9",
     "@symfony/stimulus-bridge": "^3.2.0",
-    "@symfony/ux-translator": "file:vendor/symfony/ux-translator/assets",
     "@symfony/webpack-encore": "^4.1.0",
     "@tsconfig/node20": "^20.1.4",
     "@types/dompurify": "^3.0.5",
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue
index 210f8092f..42df15f8b 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue
@@ -1,103 +1,98 @@
 <template>
-    <teleport to="#social-issues-acc">
-        <div class="mb-3 row">
-            <div class="col-4">
-                <label :class="socialIssuesClassList">{{
-                    trans(ACTIVITY_SOCIAL_ISSUES)
-                }}</label>
-            </div>
-            <div class="col-8">
-                <check-social-issue
-                    v-for="issue in socialIssuesList"
-                    :key="issue.id"
-                    :issue="issue"
-                    :selection="socialIssuesSelected"
-                    @updateSelected="updateIssuesSelected"
-                >
-                </check-social-issue>
+  <teleport to="#social-issues-acc">
+    <div class="mb-3 row">
+      <div class="col-4">
+        <label :class="socialIssuesClassList">{{
+          trans(ACTIVITY_SOCIAL_ISSUES)
+        }}</label>
+      </div>
+      <div class="col-8">
+        <check-social-issue
+          v-for="issue in socialIssuesList"
+          :key="issue.id"
+          :issue="issue"
+          :selection="socialIssuesSelected"
+          @updateSelected="updateIssuesSelected"
+        >
+        </check-social-issue>
 
-                <div class="my-3">
-                    <VueMultiselect
-                        name="otherIssues"
-                        label="text"
-                        track-by="id"
-                        open-direction="bottom"
-                        :close-on-select="true"
-                        :preserve-search="false"
-                        :reset-after="true"
-                        :hide-selected="true"
-                        :taggable="false"
-                        :multiple="false"
-                        :searchable="true"
-                        :allow-empty="true"
-                        :show-labels="false"
-                        :loading="issueIsLoading"
-                        :placeholder="trans(ACTIVITY_CHOOSE_OTHER_SOCIAL_ISSUE)"
-                        :options="socialIssuesOther"
-                        @select="addIssueInList"
-                    >
-                    </VueMultiselect>
-                </div>
-            </div>
+        <div class="my-3">
+          <VueMultiselect
+            name="otherIssues"
+            label="text"
+            track-by="id"
+            open-direction="bottom"
+            :close-on-select="true"
+            :preserve-search="false"
+            :reset-after="true"
+            :hide-selected="true"
+            :taggable="false"
+            :multiple="false"
+            :searchable="true"
+            :allow-empty="true"
+            :show-labels="false"
+            :loading="issueIsLoading"
+            :placeholder="trans(ACTIVITY_CHOOSE_OTHER_SOCIAL_ISSUE)"
+            :options="socialIssuesOther"
+            @select="addIssueInList"
+          >
+          </VueMultiselect>
+        </div>
+      </div>
+    </div>
+
+    <div class="mb-3 row">
+      <div class="col-4">
+        <label :class="socialActionsClassList">{{
+          trans(ACTIVITY_SOCIAL_ACTIONS)
+        }}</label>
+      </div>
+      <div class="col-8">
+        <div v-if="actionIsLoading === true">
+          <i class="chill-green fa fa-circle-o-notch fa-spin fa-lg"></i>
         </div>
 
-        <div class="mb-3 row">
-            <div class="col-4">
-                <label :class="socialActionsClassList">{{
-                    trans(ACTIVITY_SOCIAL_ACTIONS)
-                }}</label>
-            </div>
-            <div class="col-8">
-                <div v-if="actionIsLoading === true">
-                    <i
-                        class="chill-green fa fa-circle-o-notch fa-spin fa-lg"
-                    ></i>
-                </div>
+        <span
+          v-else-if="socialIssuesSelected.length === 0"
+          class="inline-choice chill-no-data-statement mt-3"
+        >
+          {{ trans(ACTIVITY_SELECT_FIRST_A_SOCIAL_ISSUE) }}
+        </span>
 
-                <span
-                    v-else-if="socialIssuesSelected.length === 0"
-                    class="inline-choice chill-no-data-statement mt-3"
-                >
-                    {{ trans(ACTIVITY_SELECT_FIRST_A_SOCIAL_ISSUE) }}
-                </span>
+        <template
+          v-else-if="
+            socialActionsList.length > 0 &&
+            (socialIssuesSelected.length || socialActionsSelected.length)
+          "
+        >
+          <div
+            id="actionsList"
+            v-for="group in socialActionsList"
+            :key="group.issue"
+          >
+            <span class="badge bg-chill-l-gray text-dark">{{
+              group.issue
+            }}</span>
+            <check-social-action
+              v-for="action in group.actions"
+              :key="action.id"
+              :action="action"
+              :selection="socialActionsSelected"
+              @updateSelected="updateActionsSelected"
+            >
+            </check-social-action>
+          </div>
+        </template>
 
-                <template
-                    v-else-if="
-                        socialActionsList.length > 0 &&
-                        (socialIssuesSelected.length ||
-                            socialActionsSelected.length)
-                    "
-                >
-                    <div
-                        id="actionsList"
-                        v-for="group in socialActionsList"
-                        :key="group.issue"
-                    >
-                        <span class="badge bg-chill-l-gray text-dark">{{
-                            group.issue
-                        }}</span>
-                        <check-social-action
-                            v-for="action in group.actions"
-                            :key="action.id"
-                            :action="action"
-                            :selection="socialActionsSelected"
-                            @updateSelected="updateActionsSelected"
-                        >
-                        </check-social-action>
-                    </div>
-                </template>
-
-                <span
-                    v-else-if="
-                        actionAreLoaded && socialActionsList.length === 0
-                    "
-                    class="inline-choice chill-no-data-statement mt-3"
-                >
-                    {{ trans(ACTIVITY_SOCIAL_ACTION_LIST_EMPTY) }}
-                </span>
-            </div>
-        </div>
-    </teleport>
+        <span
+          v-else-if="actionAreLoaded && socialActionsList.length === 0"
+          class="inline-choice chill-no-data-statement mt-3"
+        >
+          {{ trans(ACTIVITY_SOCIAL_ACTION_LIST_EMPTY) }}
+        </span>
+      </div>
+    </div>
+  </teleport>
 </template>
 
 <script>
@@ -106,175 +101,174 @@ import CheckSocialIssue from "./SocialIssuesAcc/CheckSocialIssue.vue";
 import CheckSocialAction from "./SocialIssuesAcc/CheckSocialAction.vue";
 import { getSocialIssues, getSocialActionByIssue } from "../api.js";
 import {
-    ACTIVITY_SOCIAL_ACTION_LIST_EMPTY,
-    ACTIVITY_SELECT_FIRST_A_SOCIAL_ISSUE,
-    ACTIVITY_SOCIAL_ACTIONS,
-    ACTIVITY_SOCIAL_ISSUES,
-    ACTIVITY_CHOOSE_OTHER_SOCIAL_ISSUE,
-    trans,
+  ACTIVITY_SOCIAL_ACTION_LIST_EMPTY,
+  ACTIVITY_SELECT_FIRST_A_SOCIAL_ISSUE,
+  ACTIVITY_SOCIAL_ACTIONS,
+  ACTIVITY_SOCIAL_ISSUES,
+  ACTIVITY_CHOOSE_OTHER_SOCIAL_ISSUE,
+  trans,
 } from "translator";
 
 export default {
-    name: "SocialIssuesAcc",
-    components: {
-        CheckSocialIssue,
-        CheckSocialAction,
-        VueMultiselect,
+  name: "SocialIssuesAcc",
+  components: {
+    CheckSocialIssue,
+    CheckSocialAction,
+    VueMultiselect,
+  },
+  setup() {
+    return {
+      trans,
+      ACTIVITY_SOCIAL_ACTION_LIST_EMPTY,
+      ACTIVITY_SELECT_FIRST_A_SOCIAL_ISSUE,
+      ACTIVITY_SOCIAL_ACTIONS,
+      ACTIVITY_SOCIAL_ISSUES,
+      ACTIVITY_CHOOSE_OTHER_SOCIAL_ISSUE,
+    };
+  },
+  data() {
+    return {
+      issueIsLoading: false,
+      actionIsLoading: false,
+      actionAreLoaded: false,
+      socialIssuesClassList: {
+        "col-form-label": true,
+        required: false,
+      },
+      socialActionsClassList: {
+        "col-form-label": true,
+        required: false,
+      },
+    };
+  },
+  computed: {
+    socialIssuesList() {
+      return this.$store.state.activity.accompanyingPeriod.socialIssues;
     },
-    setup() {
-        return {
-            trans,
-            ACTIVITY_SOCIAL_ACTION_LIST_EMPTY,
-            ACTIVITY_SELECT_FIRST_A_SOCIAL_ISSUE,
-            ACTIVITY_SOCIAL_ACTIONS,
-            ACTIVITY_SOCIAL_ISSUES,
-            ACTIVITY_CHOOSE_OTHER_SOCIAL_ISSUE,
-        };
+    socialIssuesSelected() {
+      return this.$store.state.activity.socialIssues;
     },
-    data() {
-        return {
-            issueIsLoading: false,
-            actionIsLoading: false,
-            actionAreLoaded: false,
-            socialIssuesClassList: {
-                "col-form-label": true,
-                required: false,
-            },
-            socialActionsClassList: {
-                "col-form-label": true,
-                required: false,
-            },
-        };
+    socialIssuesOther() {
+      return this.$store.state.socialIssuesOther;
     },
-    computed: {
-        socialIssuesList() {
-            return this.$store.state.activity.accompanyingPeriod.socialIssues;
-        },
-        socialIssuesSelected() {
-            return this.$store.state.activity.socialIssues;
-        },
-        socialIssuesOther() {
-            return this.$store.state.socialIssuesOther;
-        },
-        socialActionsList() {
-            return this.$store.getters.socialActionsListSorted;
-        },
-        socialActionsSelected() {
-            return this.$store.state.activity.socialActions;
-        },
+    socialActionsList() {
+      return this.$store.getters.socialActionsListSorted;
     },
-    mounted() {
-        /* Load classNames after element is present */
-        const socialActionsEl = document.querySelector(
-            "input#chill_activitybundle_activity_socialActions",
-        );
-        if (socialActionsEl && socialActionsEl.hasAttribute("required")) {
-            this.socialActionsClassList.required = true;
+    socialActionsSelected() {
+      return this.$store.state.activity.socialActions;
+    },
+  },
+  mounted() {
+    /* Load classNames after element is present */
+    const socialActionsEl = document.querySelector(
+      "input#chill_activitybundle_activity_socialActions",
+    );
+    if (socialActionsEl && socialActionsEl.hasAttribute("required")) {
+      this.socialActionsClassList.required = true;
+    }
+
+    const socialIssuesEl = document.querySelector(
+      "input#chill_activitybundle_activity_socialIssues",
+    );
+    if (socialIssuesEl && socialIssuesEl.hasAttribute("required")) {
+      this.socialIssuesClassList.required = true;
+    }
+
+    /* Load other issues in multiselect */
+    this.issueIsLoading = true;
+    this.actionAreLoaded = false;
+
+    getSocialIssues().then((response) => {
+      /* Add issues to the store */
+      this.$store.commit("updateIssuesOther", response);
+
+      /* Add in list the issues already associated (if not yet listed) */
+      this.socialIssuesSelected.forEach((issue) => {
+        if (
+          this.socialIssuesList.filter((i) => i.id === issue.id).length !== 1
+        ) {
+          this.$store.commit("addIssueInList", issue);
         }
+      });
 
-        const socialIssuesEl = document.querySelector(
-            "input#chill_activitybundle_activity_socialIssues",
-        );
-        if (socialIssuesEl && socialIssuesEl.hasAttribute("required")) {
-            this.socialIssuesClassList.required = true;
-        }
+      /* Remove from multiselect the issues that are not yet in the checkbox list */
+      this.socialIssuesList.forEach((issue) => {
+        this.$store.commit("removeIssueInOther", issue);
+      });
 
-        /* Load other issues in multiselect */
-        this.issueIsLoading = true;
-        this.actionAreLoaded = false;
+      /* Filter issues */
+      this.$store.commit("filterList", "issues");
 
-        getSocialIssues().then((response) => {
-            /* Add issues to the store */
-            this.$store.commit("updateIssuesOther", response);
+      /* Add in list the actions already associated (if not yet listed) */
+      this.socialActionsSelected.forEach((action) => {
+        this.$store.commit("addActionInList", action);
+      });
 
-            /* Add in list the issues already associated (if not yet listed) */
-            this.socialIssuesSelected.forEach((issue) => {
-                if (
-                    this.socialIssuesList.filter((i) => i.id === issue.id)
-                        .length !== 1
-                ) {
-                    this.$store.commit("addIssueInList", issue);
-                }
-            });
+      /* Filter actions */
+      this.$store.commit("filterList", "actions");
 
-            /* Remove from multiselect the issues that are not yet in the checkbox list */
-            this.socialIssuesList.forEach((issue) => {
-                this.$store.commit("removeIssueInOther", issue);
-            });
-
-            /* Filter issues */
-            this.$store.commit("filterList", "issues");
-
-            /* Add in list the actions already associated (if not yet listed) */
-            this.socialActionsSelected.forEach((action) => {
-                this.$store.commit("addActionInList", action);
-            });
-
-            /* Filter actions */
-            this.$store.commit("filterList", "actions");
-
-            this.issueIsLoading = false;
-            this.actionAreLoaded = true;
-            this.updateActionsList();
-        });
-    },
-    methods: {
-        /* When choosing an issue in multiselect, add it in checkboxes (as selected),
+      this.issueIsLoading = false;
+      this.actionAreLoaded = true;
+      this.updateActionsList();
+    });
+  },
+  methods: {
+    /* When choosing an issue in multiselect, add it in checkboxes (as selected),
          remove it from multiselect, and add socialActions concerned
       */
-        addIssueInList(value) {
-            //console.log('addIssueInList', value);
-            this.$store.commit("addIssueInList", value);
-            this.$store.commit("removeIssueInOther", value);
-            this.$store.dispatch("addIssueSelected", value);
-            this.updateActionsList();
-        },
-        /* Update value for selected issues checkboxes
-         */
-        updateIssuesSelected(issues) {
-            //console.log('updateIssuesSelected', issues);
-            this.$store.dispatch("updateIssuesSelected", issues);
-            this.updateActionsList();
-        },
-        /* Update value for selected actions checkboxes
-         */
-        updateActionsSelected(actions) {
-            //console.log('updateActionsSelected', actions);
-            this.$store.dispatch("updateActionsSelected", actions);
-        },
-        /* Add socialActions concerned: after reset, loop on each issue selected
+    addIssueInList(value) {
+      //console.log('addIssueInList', value);
+      this.$store.commit("addIssueInList", value);
+      this.$store.commit("removeIssueInOther", value);
+      this.$store.dispatch("addIssueSelected", value);
+      this.updateActionsList();
+    },
+    /* Update value for selected issues checkboxes
+     */
+    updateIssuesSelected(issues) {
+      //console.log('updateIssuesSelected', issues);
+      this.$store.dispatch("updateIssuesSelected", issues);
+      this.updateActionsList();
+    },
+    /* Update value for selected actions checkboxes
+     */
+    updateActionsSelected(actions) {
+      //console.log('updateActionsSelected', actions);
+      this.$store.dispatch("updateActionsSelected", actions);
+    },
+    /* Add socialActions concerned: after reset, loop on each issue selected
          to get social actions concerned
       */
-        updateActionsList() {
-            this.resetActionsList();
-            this.socialIssuesSelected.forEach((item) => {
-                this.actionIsLoading = true;
-                getSocialActionByIssue(item.id).then(
-                    (actions) =>
-                        new Promise((resolve) => {
-                            actions.results.forEach((action) => {
-                                this.$store.commit("addActionInList", action);
-                            }, this);
+    updateActionsList() {
+      this.resetActionsList();
+      this.socialIssuesSelected.forEach((item) => {
+        this.actionIsLoading = true;
+        getSocialActionByIssue(item.id).then(
+          (actions) =>
+            new Promise((resolve) => {
+              actions.results.forEach((action) => {
+                this.$store.commit("addActionInList", action);
+              }, this);
 
-                            this.$store.commit("filterList", "actions");
+              this.$store.commit("filterList", "actions");
 
-                            this.actionIsLoading = false;
-                            this.actionAreLoaded = true;
-                            resolve();
-                        }),
-                );
-            }, this);
-        },
-        /* Reset socialActions List: flush list and restore selected actions
-         */
-        resetActionsList() {
-            this.$store.commit("resetActionsList");
-            this.actionAreLoaded = false;
-            this.socialActionsSelected.forEach((item) => {
-                this.$store.commit("addActionInList", item);
-            }, this);
-        },
+              this.actionIsLoading = false;
+              this.actionAreLoaded = true;
+              resolve();
+            }),
+        );
+      }, this);
     },
+    /* Reset socialActions List: flush list and restore selected actions
+     */
+    resetActionsList() {
+      this.$store.commit("resetActionsList");
+      this.actionAreLoaded = false;
+      this.socialActionsSelected.forEach((item) => {
+        this.$store.commit("addActionInList", item);
+      }, this);
+    },
+  },
 };
 </script>
 
@@ -284,18 +278,18 @@ export default {
 @import "ChillMainAssets/chill/scss/chill_variables";
 
 span.multiselect__single {
-    display: none !important;
+  display: none !important;
 }
 
 #actionsList {
-    border-radius: 0.5rem;
-    padding: 1rem;
-    margin: 0.5rem;
-    background-color: whitesmoke;
+  border-radius: 0.5rem;
+  padding: 1rem;
+  margin: 0.5rem;
+  background-color: whitesmoke;
 }
 
 span.badge {
-    margin-bottom: 0.5rem;
-    @include badge_social($social-issue-color);
+  margin-bottom: 0.5rem;
+  @include badge_social($social-issue-color);
 }
 </style>
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialAction.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialAction.vue
index 4b3c210f2..895e3e55b 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialAction.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialAction.vue
@@ -44,20 +44,21 @@ span.badge {
   @include badge_social($social-action-color);
   font-size: 95%;
   white-space: normal;
-    word-wrap: break-word;
-    word-break: break-word;
-    display: inline-block;
-    max-width: 100%;margin-bottom: 5px;
+  word-wrap: break-word;
+  word-break: break-word;
+  display: inline-block;
+  max-width: 100%;
+  margin-bottom: 5px;
   margin-right: 1em;
   text-align: left;
-    line-height: 1.2em;
+  line-height: 1.2em;
   &::before {
-  position: absolute;
-  left: 11px;
-        top: 0;
-        margin: 0 0.3em 0 -0.75em;
-    }
-    position: relative;
-    padding-left: 1.5em;
+    position: absolute;
+    left: 11px;
+    top: 0;
+    margin: 0 0.3em 0 -0.75em;
+  }
+  position: relative;
+  padding-left: 1.5em;
 }
 </style>
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialIssue.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialIssue.vue
index c8b87f8c9..63fad09fc 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialIssue.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialIssue.vue
@@ -42,19 +42,21 @@ span.badge {
   @include badge_social($social-issue-color);
   font-size: 95%;
   white-space: normal;
-    word-wrap: break-word;
-    word-break: break-word;
-    display: inline-block;
-    max-width: 100%;margin-bottom: 5px;
-  margin-right: 1em;text-align: left;
+  word-wrap: break-word;
+  word-break: break-word;
+  display: inline-block;
+  max-width: 100%;
+  margin-bottom: 5px;
+  margin-right: 1em;
+  text-align: left;
 
-    &::before {
-        position: absolute;
-        left: 11px;
-        top: 0;
-        margin: 0 0.3em 0 -0.75em;
-    }
-    position: relative;
-    padding-left: 1.5em;
+  &::before {
+    position: absolute;
+    left: 11px;
+    top: 0;
+    margin: 0 0.3em 0 -0.75em;
+  }
+  position: relative;
+  padding-left: 1.5em;
 }
 </style>
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/App.vue b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/App.vue
index 27acb901a..d1374714b 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/App.vue
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/App.vue
@@ -1,166 +1,148 @@
 <template>
-    <teleport to="#mainUser">
-        <h2 class="chill-red">Utilisateur principal</h2>
-        <div>
-            <div>
-                <div v-if="null !== this.$store.getters.getMainUser">
-                    <calendar-active :user="this.$store.getters.getMainUser" />
-                </div>
-                <pick-entity
-                    :multiple="false"
-                    :types="['user']"
-                    :uniqid="'main_user_calendar'"
-                    :picked="
-                        null !== this.$store.getters.getMainUser
-                            ? [this.$store.getters.getMainUser]
-                            : []
-                    "
-                    :removable-if-set="false"
-                    :display-picked="false"
-                    :suggested="this.suggestedUsers"
-                    :label="'main_user'"
-                    @add-new-entity="setMainUser"
-                />
-            </div>
+  <teleport to="#mainUser">
+    <h2 class="chill-red">Utilisateur principal</h2>
+    <div>
+      <div>
+        <div v-if="null !== this.$store.getters.getMainUser">
+          <calendar-active :user="this.$store.getters.getMainUser" />
         </div>
-    </teleport>
+        <pick-entity
+          :multiple="false"
+          :types="['user']"
+          :uniqid="'main_user_calendar'"
+          :picked="
+            null !== this.$store.getters.getMainUser
+              ? [this.$store.getters.getMainUser]
+              : []
+          "
+          :removable-if-set="false"
+          :display-picked="false"
+          :suggested="this.suggestedUsers"
+          :label="'main_user'"
+          @add-new-entity="setMainUser"
+        />
+      </div>
+    </div>
+  </teleport>
 
-    <concerned-groups />
+  <concerned-groups />
 
-    <teleport to="#schedule">
-        <div class="row mb-3" v-if="activity.startDate !== null">
-            <label class="col-form-label col-sm-4">Date</label>
-            <div class="col-sm-8">
-                {{ $d(activity.startDate, "long") }} -
-                {{ $d(activity.endDate, "hoursOnly") }}
-                <span v-if="activity.calendarRange === null"
-                    >(Pas de plage de disponibilité sélectionnée)</span
-                >
-                <span v-else>(Une plage de disponibilité sélectionnée)</span>
-            </div>
-        </div>
-    </teleport>
-
-    <location />
-
-    <teleport to="#fullCalendar">
-        <div class="calendar-actives">
-            <template v-for="u in getActiveUsers" :key="u.id">
-                <calendar-active
-                    :user="u"
-                    :invite="this.$store.getters.getInviteForUser(u)"
-                />
-            </template>
-        </div>
-        <div
-            class="display-options row justify-content-between"
-            style="margin-top: 1rem"
+  <teleport to="#schedule">
+    <div class="row mb-3" v-if="activity.startDate !== null">
+      <label class="col-form-label col-sm-4">Date</label>
+      <div class="col-sm-8">
+        {{ $d(activity.startDate, "long") }} -
+        {{ $d(activity.endDate, "hoursOnly") }}
+        <span v-if="activity.calendarRange === null"
+          >(Pas de plage de disponibilité sélectionnée)</span
         >
-            <div class="col-sm-9 col-xs-12">
-                <div class="input-group mb-3">
-                    <label class="input-group-text" for="slotDuration"
-                        >Durée des créneaux</label
-                    >
-                    <select
-                        v-model="slotDuration"
-                        id="slotDuration"
-                        class="form-select"
-                    >
-                        <option value="00:05:00">5 minutes</option>
-                        <option value="00:10:00">10 minutes</option>
-                        <option value="00:15:00">15 minutes</option>
-                        <option value="00:30:00">30 minutes</option>
-                        <option value="00:45:00">45 minutes</option>
-                        <option value="00:60:00">60 minutes</option>
-                    </select>
-                    <label class="input-group-text" for="slotMinTime">De</label>
-                    <select
-                        v-model="slotMinTime"
-                        id="slotMinTime"
-                        class="form-select"
-                    >
-                        <option value="00:00:00">0h</option>
-                        <option value="01:00:00">1h</option>
-                        <option value="02:00:00">2h</option>
-                        <option value="03:00:00">3h</option>
-                        <option value="04:00:00">4h</option>
-                        <option value="05:00:00">5h</option>
-                        <option value="06:00:00">6h</option>
-                        <option value="07:00:00">7h</option>
-                        <option value="08:00:00">8h</option>
-                        <option value="09:00:00">9h</option>
-                        <option value="10:00:00">10h</option>
-                        <option value="11:00:00">11h</option>
-                        <option value="12:00:00">12h</option>
-                    </select>
-                    <label class="input-group-text" for="slotMaxTime">À</label>
-                    <select
-                        v-model="slotMaxTime"
-                        id="slotMaxTime"
-                        class="form-select"
-                    >
-                        <option value="12:00:00">12h</option>
-                        <option value="13:00:00">13h</option>
-                        <option value="14:00:00">14h</option>
-                        <option value="15:00:00">15h</option>
-                        <option value="16:00:00">16h</option>
-                        <option value="17:00:00">17h</option>
-                        <option value="18:00:00">18h</option>
-                        <option value="19:00:00">19h</option>
-                        <option value="20:00:00">20h</option>
-                        <option value="21:00:00">21h</option>
-                        <option value="22:00:00">22h</option>
-                        <option value="23:00:00">23h</option>
-                        <option value="23:59:59">24h</option>
-                    </select>
-                </div>
-            </div>
-            <div class="col-sm-3 col-xs-12">
-                <div class="float-end">
-                    <div class="form-check input-group">
-                        <span class="input-group-text">
-                            <input
-                                id="showHideWE"
-                                class="mt-0"
-                                type="checkbox"
-                                v-model="hideWeekends"
-                            />
-                        </span>
-                        <label
-                            for="showHideWE"
-                            class="form-check-label input-group-text"
-                            >Week-ends</label
-                        >
-                    </div>
-                </div>
-            </div>
+        <span v-else>(Une plage de disponibilité sélectionnée)</span>
+      </div>
+    </div>
+  </teleport>
+
+  <location />
+
+  <teleport to="#fullCalendar">
+    <div class="calendar-actives">
+      <template v-for="u in getActiveUsers" :key="u.id">
+        <calendar-active
+          :user="u"
+          :invite="this.$store.getters.getInviteForUser(u)"
+        />
+      </template>
+    </div>
+    <div
+      class="display-options row justify-content-between"
+      style="margin-top: 1rem"
+    >
+      <div class="col-sm-9 col-xs-12">
+        <div class="input-group mb-3">
+          <label class="input-group-text" for="slotDuration"
+            >Durée des créneaux</label
+          >
+          <select v-model="slotDuration" id="slotDuration" class="form-select">
+            <option value="00:05:00">5 minutes</option>
+            <option value="00:10:00">10 minutes</option>
+            <option value="00:15:00">15 minutes</option>
+            <option value="00:30:00">30 minutes</option>
+            <option value="00:45:00">45 minutes</option>
+            <option value="00:60:00">60 minutes</option>
+          </select>
+          <label class="input-group-text" for="slotMinTime">De</label>
+          <select v-model="slotMinTime" id="slotMinTime" class="form-select">
+            <option value="00:00:00">0h</option>
+            <option value="01:00:00">1h</option>
+            <option value="02:00:00">2h</option>
+            <option value="03:00:00">3h</option>
+            <option value="04:00:00">4h</option>
+            <option value="05:00:00">5h</option>
+            <option value="06:00:00">6h</option>
+            <option value="07:00:00">7h</option>
+            <option value="08:00:00">8h</option>
+            <option value="09:00:00">9h</option>
+            <option value="10:00:00">10h</option>
+            <option value="11:00:00">11h</option>
+            <option value="12:00:00">12h</option>
+          </select>
+          <label class="input-group-text" for="slotMaxTime">À</label>
+          <select v-model="slotMaxTime" id="slotMaxTime" class="form-select">
+            <option value="12:00:00">12h</option>
+            <option value="13:00:00">13h</option>
+            <option value="14:00:00">14h</option>
+            <option value="15:00:00">15h</option>
+            <option value="16:00:00">16h</option>
+            <option value="17:00:00">17h</option>
+            <option value="18:00:00">18h</option>
+            <option value="19:00:00">19h</option>
+            <option value="20:00:00">20h</option>
+            <option value="21:00:00">21h</option>
+            <option value="22:00:00">22h</option>
+            <option value="23:00:00">23h</option>
+            <option value="23:59:59">24h</option>
+          </select>
         </div>
-        <FullCalendar ref="fullCalendar" :options="calendarOptions">
-            <template #eventContent="arg">
-                <span>
-                    <b v-if="arg.event.extendedProps.is === 'remote'">{{
-                        arg.event.title
-                    }}</b>
-                    <b v-else-if="arg.event.extendedProps.is === 'range'"
-                        >{{ arg.timeText }}
-                        {{ arg.event.extendedProps.locationName }}
-                        <small>{{
-                            arg.event.extendedProps.userLabel
-                        }}</small></b
-                    >
-                    <b v-else-if="arg.event.extendedProps.is === 'current'"
-                        >{{ arg.timeText }} {{ $t("current_selected") }}
-                    </b>
-                    <b v-else-if="arg.event.extendedProps.is === 'local'">{{
-                        arg.event.title
-                    }}</b>
-                    <b v-else
-                        >{{ arg.timeText }} {{ $t("current_selected") }}
-                    </b>
-                </span>
-            </template>
-        </FullCalendar>
-    </teleport>
+      </div>
+      <div class="col-sm-3 col-xs-12">
+        <div class="float-end">
+          <div class="form-check input-group">
+            <span class="input-group-text">
+              <input
+                id="showHideWE"
+                class="mt-0"
+                type="checkbox"
+                v-model="hideWeekends"
+              />
+            </span>
+            <label for="showHideWE" class="form-check-label input-group-text"
+              >Week-ends</label
+            >
+          </div>
+        </div>
+      </div>
+    </div>
+    <FullCalendar ref="fullCalendar" :options="calendarOptions">
+      <template #eventContent="arg">
+        <span>
+          <b v-if="arg.event.extendedProps.is === 'remote'">{{
+            arg.event.title
+          }}</b>
+          <b v-else-if="arg.event.extendedProps.is === 'range'"
+            >{{ arg.timeText }}
+            {{ arg.event.extendedProps.locationName }}
+            <small>{{ arg.event.extendedProps.userLabel }}</small></b
+          >
+          <b v-else-if="arg.event.extendedProps.is === 'current'"
+            >{{ arg.timeText }} {{ $t("current_selected") }}
+          </b>
+          <b v-else-if="arg.event.extendedProps.is === 'local'">{{
+            arg.event.title
+          }}</b>
+          <b v-else>{{ arg.timeText }} {{ $t("current_selected") }} </b>
+        </span>
+      </template>
+    </FullCalendar>
+  </teleport>
 </template>
 
 <script>
@@ -177,219 +159,210 @@ import PickEntity from "ChillMainAssets/vuejs/PickEntity/PickEntity.vue";
 import { mapGetters, mapState } from "vuex";
 
 export default {
-    name: "App",
-    components: {
-        ConcernedGroups,
-        Location,
-        FullCalendar,
-        CalendarActive,
-        PickEntity,
+  name: "App",
+  components: {
+    ConcernedGroups,
+    Location,
+    FullCalendar,
+    CalendarActive,
+    PickEntity,
+  },
+  data() {
+    return {
+      errorMsg: [],
+      showMyCalendar: false,
+      slotDuration: "00:05:00",
+      slotMinTime: "09:00:00",
+      slotMaxTime: "18:00:00",
+      hideWeekEnds: true,
+      previousUser: [],
+    };
+  },
+  computed: {
+    ...mapGetters(["getMainUser"]),
+    ...mapState(["activity"]),
+    events() {
+      return this.$store.getters.getEventSources;
     },
-    data() {
-        return {
-            errorMsg: [],
-            showMyCalendar: false,
-            slotDuration: "00:05:00",
-            slotMinTime: "09:00:00",
-            slotMaxTime: "18:00:00",
-            hideWeekEnds: true,
-            previousUser: [],
-        };
+    calendarOptions() {
+      return {
+        locale: frLocale,
+        plugins: [
+          dayGridPlugin,
+          interactionPlugin,
+          timeGridPlugin,
+          dayGridPlugin,
+          listPlugin,
+        ],
+        initialView: "timeGridWeek",
+        initialDate: this.$store.getters.getInitialDate,
+        eventSources: this.events,
+        selectable: true,
+        slotMinTime: this.slotMinTime,
+        slotMaxTime: this.slotMaxTime,
+        scrollTimeReset: false,
+        datesSet: this.onDatesSet,
+        select: this.onDateSelect,
+        eventChange: this.onEventChange,
+        eventClick: this.onEventClick,
+        selectMirror: true,
+        editable: true,
+        weekends: !this.hideWeekEnds,
+        headerToolbar: {
+          left: "prev,next today",
+          center: "title",
+          right: "timeGridWeek,timeGridDay,listWeek",
+        },
+        views: {
+          timeGrid: {
+            slotEventOverlap: false,
+            slotDuration: this.slotDuration,
+          },
+        },
+      };
     },
-    computed: {
-        ...mapGetters(["getMainUser"]),
-        ...mapState(["activity"]),
-        events() {
-            return this.$store.getters.getEventSources;
-        },
-        calendarOptions() {
-            return {
-                locale: frLocale,
-                plugins: [
-                    dayGridPlugin,
-                    interactionPlugin,
-                    timeGridPlugin,
-                    dayGridPlugin,
-                    listPlugin,
-                ],
-                initialView: "timeGridWeek",
-                initialDate: this.$store.getters.getInitialDate,
-                eventSources: this.events,
-                selectable: true,
-                slotMinTime: this.slotMinTime,
-                slotMaxTime: this.slotMaxTime,
-                scrollTimeReset: false,
-                datesSet: this.onDatesSet,
-                select: this.onDateSelect,
-                eventChange: this.onEventChange,
-                eventClick: this.onEventClick,
-                selectMirror: true,
-                editable: true,
-                weekends: !this.hideWeekEnds,
-                headerToolbar: {
-                    left: "prev,next today",
-                    center: "title",
-                    right: "timeGridWeek,timeGridDay,listWeek",
-                },
-                views: {
-                    timeGrid: {
-                        slotEventOverlap: false,
-                        slotDuration: this.slotDuration,
-                    },
-                },
-            };
-        },
-        getActiveUsers() {
-            const users = [];
-            for (const id of this.$store.state.currentView.users.keys()) {
-                users.push(this.$store.getters.getUserDataById(id).user);
-            }
-            return users;
-        },
-        suggestedUsers() {
-            const suggested = [];
-
-            this.$data.previousUser.forEach((u) => {
-                if (u.id !== this.$store.getters.getMainUser.id) {
-                    suggested.push(u);
-                }
-            });
-
-            return suggested;
-        },
+    getActiveUsers() {
+      const users = [];
+      for (const id of this.$store.state.currentView.users.keys()) {
+        users.push(this.$store.getters.getUserDataById(id).user);
+      }
+      return users;
     },
-    methods: {
-        setMainUser({ entity }) {
-            const user = entity;
-            console.log("setMainUser APP", entity);
+    suggestedUsers() {
+      const suggested = [];
 
-            if (
-                user.id !== this.$store.getters.getMainUser &&
-                (this.$store.state.activity.calendarRange !== null ||
-                    this.$store.state.activity.startDate !== null ||
-                    this.$store.state.activity.endDate !== null)
-            ) {
-                if (
-                    !window.confirm(
-                        this.$t("change_main_user_will_reset_event_data"),
-                    )
-                ) {
-                    return;
-                }
-            }
+      this.$data.previousUser.forEach((u) => {
+        if (u.id !== this.$store.getters.getMainUser.id) {
+          suggested.push(u);
+        }
+      });
 
-            // add the previous user, if any, in the previous user list (in use for suggestion)
-            if (null !== this.$store.getters.getMainUser) {
-                const suggestedUids = new Set(
-                    this.$data.previousUser.map((u) => u.id),
-                );
-                if (!suggestedUids.has(this.$store.getters.getMainUser.id)) {
-                    this.$data.previousUser.push(
-                        this.$store.getters.getMainUser,
-                    );
-                }
-            }
-
-            this.$store.dispatch("setMainUser", user);
-            this.$store.commit("showUserOnCalendar", {
-                user,
-                ranges: true,
-                remotes: true,
-            });
-        },
-        removeMainUser(user) {
-            console.log("removeMainUser APP", user);
-
-            window.alert(this.$t("main_user_is_mandatory"));
-            return;
-        },
-        onDatesSet(event) {
-            console.log("onDatesSet", event);
-            this.$store.dispatch("setCurrentDatesView", {
-                start: event.start,
-                end: event.end,
-            });
-        },
-        onDateSelect(payload) {
-            console.log("onDateSelect", payload);
-
-            // show an alert if changing mainUser
-            if (
-                (this.$store.getters.getMainUser !== null &&
-                    this.$store.state.me.id !==
-                        this.$store.getters.getMainUser.id) ||
-                this.$store.getters.getMainUser === null
-            ) {
-                if (!window.confirm(this.$t("will_change_main_user_for_me"))) {
-                    return;
-                } else {
-                    this.$store.commit("showUserOnCalendar", {
-                        user: this.$store.state.me,
-                        remotes: true,
-                        ranges: true,
-                    });
-                }
-            }
-
-            this.$store.dispatch("setEventTimes", {
-                start: payload.start,
-                end: payload.end,
-            });
-        },
-        onEventChange(payload) {
-            console.log("onEventChange", payload);
-            if (this.$store.state.activity.calendarRange !== null) {
-                throw new Error(
-                    "not allowed to edit a calendar associated with a calendar range",
-                );
-            }
-            this.$store.dispatch("setEventTimes", {
-                start: payload.event.start,
-                end: payload.event.end,
-            });
-        },
-        onEventClick(payload) {
-            if (payload.event.extendedProps.is !== "range") {
-                // do nothing when clicking on remote
-                return;
-            }
-
-            // show an alert if changing mainUser
-            if (
-                this.$store.getters.getMainUser !== null &&
-                payload.event.extendedProps.userId !==
-                    this.$store.getters.getMainUser.id
-            ) {
-                if (
-                    !window.confirm(
-                        this.$t("this_calendar_range_will_change_main_user"),
-                    )
-                ) {
-                    return;
-                }
-            }
-
-            this.$store.dispatch("associateCalendarToRange", {
-                range: payload.event,
-            });
-        },
+      return suggested;
     },
+  },
+  methods: {
+    setMainUser({ entity }) {
+      const user = entity;
+      console.log("setMainUser APP", entity);
+
+      if (
+        user.id !== this.$store.getters.getMainUser &&
+        (this.$store.state.activity.calendarRange !== null ||
+          this.$store.state.activity.startDate !== null ||
+          this.$store.state.activity.endDate !== null)
+      ) {
+        if (
+          !window.confirm(this.$t("change_main_user_will_reset_event_data"))
+        ) {
+          return;
+        }
+      }
+
+      // add the previous user, if any, in the previous user list (in use for suggestion)
+      if (null !== this.$store.getters.getMainUser) {
+        const suggestedUids = new Set(this.$data.previousUser.map((u) => u.id));
+        if (!suggestedUids.has(this.$store.getters.getMainUser.id)) {
+          this.$data.previousUser.push(this.$store.getters.getMainUser);
+        }
+      }
+
+      this.$store.dispatch("setMainUser", user);
+      this.$store.commit("showUserOnCalendar", {
+        user,
+        ranges: true,
+        remotes: true,
+      });
+    },
+    removeMainUser(user) {
+      console.log("removeMainUser APP", user);
+
+      window.alert(this.$t("main_user_is_mandatory"));
+      return;
+    },
+    onDatesSet(event) {
+      console.log("onDatesSet", event);
+      this.$store.dispatch("setCurrentDatesView", {
+        start: event.start,
+        end: event.end,
+      });
+    },
+    onDateSelect(payload) {
+      console.log("onDateSelect", payload);
+
+      // show an alert if changing mainUser
+      if (
+        (this.$store.getters.getMainUser !== null &&
+          this.$store.state.me.id !== this.$store.getters.getMainUser.id) ||
+        this.$store.getters.getMainUser === null
+      ) {
+        if (!window.confirm(this.$t("will_change_main_user_for_me"))) {
+          return;
+        } else {
+          this.$store.commit("showUserOnCalendar", {
+            user: this.$store.state.me,
+            remotes: true,
+            ranges: true,
+          });
+        }
+      }
+
+      this.$store.dispatch("setEventTimes", {
+        start: payload.start,
+        end: payload.end,
+      });
+    },
+    onEventChange(payload) {
+      console.log("onEventChange", payload);
+      if (this.$store.state.activity.calendarRange !== null) {
+        throw new Error(
+          "not allowed to edit a calendar associated with a calendar range",
+        );
+      }
+      this.$store.dispatch("setEventTimes", {
+        start: payload.event.start,
+        end: payload.event.end,
+      });
+    },
+    onEventClick(payload) {
+      if (payload.event.extendedProps.is !== "range") {
+        // do nothing when clicking on remote
+        return;
+      }
+
+      // show an alert if changing mainUser
+      if (
+        this.$store.getters.getMainUser !== null &&
+        payload.event.extendedProps.userId !==
+          this.$store.getters.getMainUser.id
+      ) {
+        if (
+          !window.confirm(this.$t("this_calendar_range_will_change_main_user"))
+        ) {
+          return;
+        }
+      }
+
+      this.$store.dispatch("associateCalendarToRange", {
+        range: payload.event,
+      });
+    },
+  },
 };
 </script>
 
 <style>
 .calendar-actives {
-    display: flex;
-    flex-direction: row;
-    flex-wrap: wrap;
+  display: flex;
+  flex-direction: row;
+  flex-wrap: wrap;
 }
 
 .display-options {
-    margin-top: 1rem;
+  margin-top: 1rem;
 }
 
 /* for events which are range */
 .fc-event.isrange {
-    border-width: 3px;
+  border-width: 3px;
 }
 </style>
diff --git a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App2.vue b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App2.vue
index 40c3200b9..e35db74ad 100644
--- a/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App2.vue
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App2.vue
@@ -1,231 +1,185 @@
 <template>
-    <div class="row">
-        <div class="col-sm">
-            <label class="form-label">{{ $t("created_availabilities") }}</label>
-            <vue-multiselect
-                v-model="pickedLocation"
-                :options="locations"
-                :label="'name'"
-                :track-by="'id'"
-                :selectLabel="'Presser \'Entrée\' pour choisir'"
-                :selectedLabel="'Choisir'"
-                :deselectLabel="'Presser \'Entrée\' pour enlever'"
-                :placeholder="'Choisir'"
-            ></vue-multiselect>
-        </div>
+  <div class="row">
+    <div class="col-sm">
+      <label class="form-label">{{ $t("created_availabilities") }}</label>
+      <vue-multiselect
+        v-model="pickedLocation"
+        :options="locations"
+        :label="'name'"
+        :track-by="'id'"
+        :selectLabel="'Presser \'Entrée\' pour choisir'"
+        :selectedLabel="'Choisir'"
+        :deselectLabel="'Presser \'Entrée\' pour enlever'"
+        :placeholder="'Choisir'"
+      ></vue-multiselect>
     </div>
-    <div
-        class="display-options row justify-content-between"
-        style="margin-top: 1rem"
-    >
-        <div class="col-sm-9 col-xs-12">
-            <div class="input-group mb-3">
-                <label class="input-group-text" for="slotDuration"
-                    >Durée des créneaux</label
-                >
-                <select
-                    v-model="slotDuration"
-                    id="slotDuration"
-                    class="form-select"
-                >
-                    <option value="00:05:00">5 minutes</option>
-                    <option value="00:10:00">10 minutes</option>
-                    <option value="00:15:00">15 minutes</option>
-                    <option value="00:30:00">30 minutes</option>
-                    <option value="00:45:00">45 minutes</option>
-                    <option value="00:60:00">60 minutes</option>
-                </select>
-                <label class="input-group-text" for="slotMinTime">De</label>
-                <select
-                    v-model="slotMinTime"
-                    id="slotMinTime"
-                    class="form-select"
-                >
-                    <option value="00:00:00">0h</option>
-                    <option value="01:00:00">1h</option>
-                    <option value="02:00:00">2h</option>
-                    <option value="03:00:00">3h</option>
-                    <option value="04:00:00">4h</option>
-                    <option value="05:00:00">5h</option>
-                    <option value="06:00:00">6h</option>
-                    <option value="07:00:00">7h</option>
-                    <option value="08:00:00">8h</option>
-                    <option value="09:00:00">9h</option>
-                    <option value="10:00:00">10h</option>
-                    <option value="11:00:00">11h</option>
-                    <option value="12:00:00">12h</option>
-                </select>
-                <label class="input-group-text" for="slotMaxTime">À</label>
-                <select
-                    v-model="slotMaxTime"
-                    id="slotMaxTime"
-                    class="form-select"
-                >
-                    <option value="12:00:00">12h</option>
-                    <option value="13:00:00">13h</option>
-                    <option value="14:00:00">14h</option>
-                    <option value="15:00:00">15h</option>
-                    <option value="16:00:00">16h</option>
-                    <option value="17:00:00">17h</option>
-                    <option value="18:00:00">18h</option>
-                    <option value="19:00:00">19h</option>
-                    <option value="20:00:00">20h</option>
-                    <option value="21:00:00">21h</option>
-                    <option value="22:00:00">22h</option>
-                    <option value="23:00:00">23h</option>
-                    <option value="23:59:59">24h</option>
-                </select>
-            </div>
-        </div>
-        <div class="col-xs-12 col-sm-3">
-            <div class="float-end">
-                <div class="form-check input-group">
-                    <span class="input-group-text">
-                        <input
-                            id="showHideWE"
-                            class="mt-0"
-                            type="checkbox"
-                            v-model="showWeekends"
-                        />
-                    </span>
-                    <label
-                        for="showHideWE"
-                        class="form-check-label input-group-text"
-                        >Week-ends</label
-                    >
-                </div>
-            </div>
-        </div>
+  </div>
+  <div
+    class="display-options row justify-content-between"
+    style="margin-top: 1rem"
+  >
+    <div class="col-sm-9 col-xs-12">
+      <div class="input-group mb-3">
+        <label class="input-group-text" for="slotDuration"
+          >Durée des créneaux</label
+        >
+        <select v-model="slotDuration" id="slotDuration" class="form-select">
+          <option value="00:05:00">5 minutes</option>
+          <option value="00:10:00">10 minutes</option>
+          <option value="00:15:00">15 minutes</option>
+          <option value="00:30:00">30 minutes</option>
+          <option value="00:45:00">45 minutes</option>
+          <option value="00:60:00">60 minutes</option>
+        </select>
+        <label class="input-group-text" for="slotMinTime">De</label>
+        <select v-model="slotMinTime" id="slotMinTime" class="form-select">
+          <option value="00:00:00">0h</option>
+          <option value="01:00:00">1h</option>
+          <option value="02:00:00">2h</option>
+          <option value="03:00:00">3h</option>
+          <option value="04:00:00">4h</option>
+          <option value="05:00:00">5h</option>
+          <option value="06:00:00">6h</option>
+          <option value="07:00:00">7h</option>
+          <option value="08:00:00">8h</option>
+          <option value="09:00:00">9h</option>
+          <option value="10:00:00">10h</option>
+          <option value="11:00:00">11h</option>
+          <option value="12:00:00">12h</option>
+        </select>
+        <label class="input-group-text" for="slotMaxTime">À</label>
+        <select v-model="slotMaxTime" id="slotMaxTime" class="form-select">
+          <option value="12:00:00">12h</option>
+          <option value="13:00:00">13h</option>
+          <option value="14:00:00">14h</option>
+          <option value="15:00:00">15h</option>
+          <option value="16:00:00">16h</option>
+          <option value="17:00:00">17h</option>
+          <option value="18:00:00">18h</option>
+          <option value="19:00:00">19h</option>
+          <option value="20:00:00">20h</option>
+          <option value="21:00:00">21h</option>
+          <option value="22:00:00">22h</option>
+          <option value="23:00:00">23h</option>
+          <option value="23:59:59">24h</option>
+        </select>
+      </div>
     </div>
-    <FullCalendar :options="calendarOptions" ref="calendarRef">
-        <template v-slot:eventContent="{ event }: { event: EventApi }">
-            <span :class="eventClasses">
-                <b v-if="event.extendedProps.is === 'remote'">{{
-                    event.title
-                }}</b>
-                <b v-else-if="event.extendedProps.is === 'range'"
-                    >{{ formatDate(event.startStr, "time") }} -
-                    {{ formatDate(event.endStr, "time") }}:
-                    {{ event.extendedProps.locationName }}</b
-                >
-                <a
-                    :href="calendarLink(event.id)"
-                    v-else-if="event.extendedProps.is === 'local'"
-                >
-                    <b>{{ event.title }}</b>
-                </a>
-                <b v-else>no 'is'</b>
-                <a
-                    v-if="event.extendedProps.is === 'range'"
-                    class="fa fa-fw fa-times delete"
-                    @click.prevent="onClickDelete(event)"
-                >
-                </a>
-            </span>
+    <div class="col-xs-12 col-sm-3">
+      <div class="float-end">
+        <div class="form-check input-group">
+          <span class="input-group-text">
+            <input
+              id="showHideWE"
+              class="mt-0"
+              type="checkbox"
+              v-model="showWeekends"
+            />
+          </span>
+          <label for="showHideWE" class="form-check-label input-group-text"
+            >Week-ends</label
+          >
+        </div>
+      </div>
+    </div>
+  </div>
+  <FullCalendar :options="calendarOptions" ref="calendarRef">
+    <template v-slot:eventContent="{ event }: { event: EventApi }">
+      <span :class="eventClasses">
+        <b v-if="event.extendedProps.is === 'remote'">{{ event.title }}</b>
+        <b v-else-if="event.extendedProps.is === 'range'"
+          >{{ formatDate(event.startStr, "time") }} -
+          {{ formatDate(event.endStr, "time") }}:
+          {{ event.extendedProps.locationName }}</b
+        >
+        <a
+          :href="calendarLink(event.id)"
+          v-else-if="event.extendedProps.is === 'local'"
+        >
+          <b>{{ event.title }}</b>
+        </a>
+        <b v-else>no 'is'</b>
+        <a
+          v-if="event.extendedProps.is === 'range'"
+          class="fa fa-fw fa-times delete"
+          @click.prevent="onClickDelete(event)"
+        >
+        </a>
+      </span>
+    </template>
+  </FullCalendar>
+
+  <div id="copy-widget">
+    <div class="container mt-2 mb-2">
+      <div class="row justify-content-between align-items-center mb-4">
+        <div class="col-xs-12 col-sm-3 col-md-2">
+          <h6 class="chill-red">{{ $t("copy_range_from_to") }}</h6>
+        </div>
+        <div class="col-xs-12 col-sm-9 col-md-2">
+          <select v-model="dayOrWeek" id="dayOrWeek" class="form-select">
+            <option value="day">{{ $t("from_day_to_day") }}</option>
+            <option value="week">
+              {{ $t("from_week_to_week") }}
+            </option>
+          </select>
+        </div>
+        <template v-if="dayOrWeek === 'day'">
+          <div class="col-xs-12 col-sm-3 col-md-3">
+            <input class="form-control" type="date" v-model="copyFrom" />
+          </div>
+          <div class="col-xs-12 col-sm-1 col-md-1 copy-chevron">
+            <i class="fa fa-angle-double-right"></i>
+          </div>
+          <div class="col-xs-12 col-sm-3 col-md-3">
+            <input class="form-control" type="date" v-model="copyTo" />
+          </div>
+          <div class="col-xs-12 col-sm-5 col-md-1">
+            <button class="btn btn-action float-end" @click="copyDay">
+              {{ $t("copy_range") }}
+            </button>
+          </div>
         </template>
-    </FullCalendar>
-
-    <div id="copy-widget">
-        <div class="container mt-2 mb-2">
-            <div class="row justify-content-between align-items-center mb-4">
-                <div class="col-xs-12 col-sm-3 col-md-2">
-                    <h6 class="chill-red">{{ $t("copy_range_from_to") }}</h6>
-                </div>
-                <div class="col-xs-12 col-sm-9 col-md-2">
-                    <select
-                        v-model="dayOrWeek"
-                        id="dayOrWeek"
-                        class="form-select"
-                    >
-                        <option value="day">{{ $t("from_day_to_day") }}</option>
-                        <option value="week">
-                            {{ $t("from_week_to_week") }}
-                        </option>
-                    </select>
-                </div>
-                <template v-if="dayOrWeek === 'day'">
-                    <div class="col-xs-12 col-sm-3 col-md-3">
-                        <input
-                            class="form-control"
-                            type="date"
-                            v-model="copyFrom"
-                        />
-                    </div>
-                    <div class="col-xs-12 col-sm-1 col-md-1 copy-chevron">
-                        <i class="fa fa-angle-double-right"></i>
-                    </div>
-                    <div class="col-xs-12 col-sm-3 col-md-3">
-                        <input
-                            class="form-control"
-                            type="date"
-                            v-model="copyTo"
-                        />
-                    </div>
-                    <div class="col-xs-12 col-sm-5 col-md-1">
-                        <button
-                            class="btn btn-action float-end"
-                            @click="copyDay"
-                        >
-                            {{ $t("copy_range") }}
-                        </button>
-                    </div>
-                </template>
-                <template v-else>
-                    <div class="col-xs-12 col-sm-3 col-md-3">
-                        <select
-                            v-model="copyFromWeek"
-                            id="copyFromWeek"
-                            class="form-select"
-                        >
-                            <option
-                                v-for="w in lastWeeks"
-                                :value="w.value"
-                                :key="w.value"
-                            >
-                                {{ w.text }}
-                            </option>
-                        </select>
-                    </div>
-                    <div class="col-xs-12 col-sm-1 col-md-1 copy-chevron">
-                        <i class="fa fa-angle-double-right"></i>
-                    </div>
-                    <div class="col-xs-12 col-sm-3 col-md-3">
-                        <select
-                            v-model="copyToWeek"
-                            id="copyToWeek"
-                            class="form-select"
-                        >
-                            <option
-                                v-for="w in nextWeeks"
-                                :value="w.value"
-                                :key="w.value"
-                            >
-                                {{ w.text }}
-                            </option>
-                        </select>
-                    </div>
-                    <div class="col-xs-12 col-sm-5 col-md-1">
-                        <button
-                            class="btn btn-action float-end"
-                            @click="copyWeek"
-                        >
-                            {{ $t("copy_range") }}
-                        </button>
-                    </div>
-                </template>
-            </div>
-        </div>
+        <template v-else>
+          <div class="col-xs-12 col-sm-3 col-md-3">
+            <select
+              v-model="copyFromWeek"
+              id="copyFromWeek"
+              class="form-select"
+            >
+              <option v-for="w in lastWeeks" :value="w.value" :key="w.value">
+                {{ w.text }}
+              </option>
+            </select>
+          </div>
+          <div class="col-xs-12 col-sm-1 col-md-1 copy-chevron">
+            <i class="fa fa-angle-double-right"></i>
+          </div>
+          <div class="col-xs-12 col-sm-3 col-md-3">
+            <select v-model="copyToWeek" id="copyToWeek" class="form-select">
+              <option v-for="w in nextWeeks" :value="w.value" :key="w.value">
+                {{ w.text }}
+              </option>
+            </select>
+          </div>
+          <div class="col-xs-12 col-sm-5 col-md-1">
+            <button class="btn btn-action float-end" @click="copyWeek">
+              {{ $t("copy_range") }}
+            </button>
+          </div>
+        </template>
+      </div>
     </div>
+  </div>
 
-    <!-- not directly seen, but include in a modal -->
-    <edit-location ref="editLocation"></edit-location>
+  <!-- not directly seen, but include in a modal -->
+  <edit-location ref="editLocation"></edit-location>
 </template>
 
 <script setup lang="ts">
 import type {
-    CalendarOptions,
-    DatesSetArg,
-    EventInput,
+  CalendarOptions,
+  DatesSetArg,
+  EventInput,
 } from "@fullcalendar/core";
 import { computed, ref, onMounted } from "vue";
 import { useStore } from "vuex";
@@ -233,14 +187,14 @@ import { key } from "./store";
 import FullCalendar from "@fullcalendar/vue3";
 import frLocale from "@fullcalendar/core/locales/fr";
 import interactionPlugin, {
-    EventResizeDoneArg,
+  EventResizeDoneArg,
 } from "@fullcalendar/interaction";
 import timeGridPlugin from "@fullcalendar/timegrid";
 import {
-    EventApi,
-    DateSelectArg,
-    EventDropArg,
-    EventClickArg,
+  EventApi,
+  DateSelectArg,
+  EventDropArg,
+  EventClickArg,
 } from "@fullcalendar/core";
 import { dateToISO, ISOToDate } from "ChillMainAssets/chill/js/date";
 import VueMultiselect from "vue-multiselect";
@@ -261,113 +215,113 @@ const copyFromWeek = ref<string | null>(null);
 const copyToWeek = ref<string | null>(null);
 
 interface Weeks {
-    value: string | null;
-    text: string;
+  value: string | null;
+  text: string;
 }
 
 const getMonday = (week: number): Date => {
-    const lastMonday = new Date();
-    lastMonday.setDate(
-        lastMonday.getDate() - ((lastMonday.getDay() + 6) % 7) + week * 7,
-    );
-    return lastMonday;
+  const lastMonday = new Date();
+  lastMonday.setDate(
+    lastMonday.getDate() - ((lastMonday.getDay() + 6) % 7) + week * 7,
+  );
+  return lastMonday;
 };
 
 const dateOptions: Intl.DateTimeFormatOptions = {
-    weekday: "long",
-    year: "numeric",
-    month: "long",
-    day: "numeric",
+  weekday: "long",
+  year: "numeric",
+  month: "long",
+  day: "numeric",
 };
 
 const lastWeeks = computed((): Weeks[] =>
-    Array.from(Array(30).keys()).map((w) => {
-        const lastMonday = getMonday(15 - w);
-        return {
-            value: dateToISO(lastMonday),
-            text: `Semaine du ${lastMonday.toLocaleDateString("fr-FR", dateOptions)}`,
-        };
-    }),
+  Array.from(Array(30).keys()).map((w) => {
+    const lastMonday = getMonday(15 - w);
+    return {
+      value: dateToISO(lastMonday),
+      text: `Semaine du ${lastMonday.toLocaleDateString("fr-FR", dateOptions)}`,
+    };
+  }),
 );
 
 const nextWeeks = computed((): Weeks[] =>
-    Array.from(Array(52).keys()).map((w) => {
-        const nextMonday = getMonday(w + 1);
-        return {
-            value: dateToISO(nextMonday),
-            text: `Semaine du ${nextMonday.toLocaleDateString("fr-FR", dateOptions)}`,
-        };
-    }),
+  Array.from(Array(52).keys()).map((w) => {
+    const nextMonday = getMonday(w + 1);
+    return {
+      value: dateToISO(nextMonday),
+      text: `Semaine du ${nextMonday.toLocaleDateString("fr-FR", dateOptions)}`,
+    };
+  }),
 );
 
 const formatDate = (datetime: string, format: null | "time" = null) => {
-    const date = ISOToDate(datetime);
-    if (!date) return "";
+  const date = ISOToDate(datetime);
+  if (!date) return "";
 
-    if (format === "time") {
-        return date.toLocaleTimeString("fr-FR", {
-            hour: "2-digit",
-            minute: "2-digit",
-        });
-    }
-
-    // French date formatting
-    return date.toLocaleDateString("fr-FR", {
-        weekday: "short",
-        year: "numeric",
-        month: "short",
-        day: "numeric",
-        hour: "2-digit",
-        minute: "2-digit",
+  if (format === "time") {
+    return date.toLocaleTimeString("fr-FR", {
+      hour: "2-digit",
+      minute: "2-digit",
     });
+  }
+
+  // French date formatting
+  return date.toLocaleDateString("fr-FR", {
+    weekday: "short",
+    year: "numeric",
+    month: "short",
+    day: "numeric",
+    hour: "2-digit",
+    minute: "2-digit",
+  });
 };
 
 const baseOptions = ref<CalendarOptions>({
-    locale: frLocale,
-    plugins: [interactionPlugin, timeGridPlugin],
-    initialView: "timeGridWeek",
-    initialDate: new Date(),
-    scrollTimeReset: false,
-    selectable: true,
-    // when the dates are changes in the fullcalendar view OR when new events are added
-    datesSet: onDatesSet,
-    // when a date is selected
-    select: onDateSelect,
-    // when a event is resized
-    eventResize: onEventDropOrResize,
-    // when an event is moved
-    eventDrop: onEventDropOrResize,
-    // when an event si clicked
-    eventClick: onEventClick,
-    selectMirror: false,
-    editable: true,
-    headerToolbar: {
-        left: "prev,next today",
-        center: "title",
-        right: "timeGridWeek,timeGridDay",
-    },
+  locale: frLocale,
+  plugins: [interactionPlugin, timeGridPlugin],
+  initialView: "timeGridWeek",
+  initialDate: new Date(),
+  scrollTimeReset: false,
+  selectable: true,
+  // when the dates are changes in the fullcalendar view OR when new events are added
+  datesSet: onDatesSet,
+  // when a date is selected
+  select: onDateSelect,
+  // when a event is resized
+  eventResize: onEventDropOrResize,
+  // when an event is moved
+  eventDrop: onEventDropOrResize,
+  // when an event si clicked
+  eventClick: onEventClick,
+  selectMirror: false,
+  editable: true,
+  headerToolbar: {
+    left: "prev,next today",
+    center: "title",
+    right: "timeGridWeek,timeGridDay",
+  },
 });
 
 const ranges = computed<EventInput[]>(() => {
-    return store.state.calendarRanges.ranges;
+  return store.state.calendarRanges.ranges;
 });
 
 const locations = computed<Location[]>(() => {
-    return store.state.locations.locations;
+  return store.state.locations.locations;
 });
 
 const pickedLocation = computed<Location | null>({
-    get(): Location | null {
-        return (
-            store.state.locations.locationPicked ||
-            store.state.locations.currentLocation
-        );
-    },
-    set(newLocation: Location | null): void {
-        store.commit("locations/setLocationPicked", newLocation, {
-            root: true,
-        });
-    },
+  get(): Location | null {
+    return (
+      store.state.locations.locationPicked ||
+      store.state.locations.currentLocation
+    );
+  },
+  set(newLocation: Location | null): void {
+    store.commit("locations/setLocationPicked", newLocation, {
+      root: true,
+    });
+  },
 });
 
 /**
@@ -396,122 +350,122 @@ const sources = computed<EventSourceInput[]>(() => {
 */
 
 const calendarOptions = computed((): CalendarOptions => {
-    return {
-        ...baseOptions.value,
-        weekends: showWeekends.value,
-        slotDuration: slotDuration.value,
-        events: ranges.value,
-        slotMinTime: slotMinTime.value,
-        slotMaxTime: slotMaxTime.value,
-    };
+  return {
+    ...baseOptions.value,
+    weekends: showWeekends.value,
+    slotDuration: slotDuration.value,
+    events: ranges.value,
+    slotMinTime: slotMinTime.value,
+    slotMaxTime: slotMaxTime.value,
+  };
 });
 
 /**
  * launched when the calendar range date change
  */
 function onDatesSet(event: DatesSetArg): void {
-    store.dispatch("fullCalendar/setCurrentDatesView", {
-        start: event.start,
-        end: event.end,
-    });
+  store.dispatch("fullCalendar/setCurrentDatesView", {
+    start: event.start,
+    end: event.end,
+  });
 }
 
 function onDateSelect(event: DateSelectArg): void {
-    if (null === pickedLocation.value) {
-        window.alert(
-            "Indiquez une localisation avant de créer une période de disponibilité.",
-        );
-        return;
-    }
+  if (null === pickedLocation.value) {
+    window.alert(
+      "Indiquez une localisation avant de créer une période de disponibilité.",
+    );
+    return;
+  }
 
-    store.dispatch("calendarRanges/createRange", {
-        start: event.start,
-        end: event.end,
-        location: pickedLocation.value,
-    });
+  store.dispatch("calendarRanges/createRange", {
+    start: event.start,
+    end: event.end,
+    location: pickedLocation.value,
+  });
 }
 
 /**
  * When a calendar range is deleted
  */
 function onClickDelete(event: EventApi): void {
-    if (event.extendedProps.is !== "range") {
-        return;
-    }
+  if (event.extendedProps.is !== "range") {
+    return;
+  }
 
-    store.dispatch(
-        "calendarRanges/deleteRange",
-        event.extendedProps.calendarRangeId,
-    );
+  store.dispatch(
+    "calendarRanges/deleteRange",
+    event.extendedProps.calendarRangeId,
+  );
 }
 
 function onEventDropOrResize(payload: EventDropArg | EventResizeDoneArg) {
-    if (payload.event.extendedProps.is !== "range") {
-        return;
-    }
+  if (payload.event.extendedProps.is !== "range") {
+    return;
+  }
 
-    store.dispatch("calendarRanges/patchRangeTime", {
-        calendarRangeId: payload.event.extendedProps.calendarRangeId,
-        start: payload.event.start,
-        end: payload.event.end,
-    });
+  store.dispatch("calendarRanges/patchRangeTime", {
+    calendarRangeId: payload.event.extendedProps.calendarRangeId,
+    start: payload.event.start,
+    end: payload.event.end,
+  });
 }
 
 function onEventClick(payload: EventClickArg): void {
-    // @ts-ignore TS does not recognize the target. But it does exists.
-    if (payload.jsEvent.target.classList.contains("delete")) {
-        return;
-    }
-    if (payload.event.extendedProps.is !== "range") {
-        return;
-    }
+  // @ts-ignore TS does not recognize the target. But it does exists.
+  if (payload.jsEvent.target.classList.contains("delete")) {
+    return;
+  }
+  if (payload.event.extendedProps.is !== "range") {
+    return;
+  }
 
-    editLocation.value?.startEdit(payload.event);
+  editLocation.value?.startEdit(payload.event);
 }
 
 function copyDay() {
-    if (null === copyFrom.value || null === copyTo.value) {
-        return;
-    }
-    store.dispatch("calendarRanges/copyFromDayToAnotherDay", {
-        from: ISOToDate(copyFrom.value),
-        to: ISOToDate(copyTo.value),
-    });
+  if (null === copyFrom.value || null === copyTo.value) {
+    return;
+  }
+  store.dispatch("calendarRanges/copyFromDayToAnotherDay", {
+    from: ISOToDate(copyFrom.value),
+    to: ISOToDate(copyTo.value),
+  });
 }
 
 function copyWeek() {
-    if (null === copyFromWeek.value || null === copyToWeek.value) {
-        return;
-    }
-    store.dispatch("calendarRanges/copyFromWeekToAnotherWeek", {
-        fromMonday: ISOToDate(copyFromWeek.value),
-        toMonday: ISOToDate(copyToWeek.value),
-    });
+  if (null === copyFromWeek.value || null === copyToWeek.value) {
+    return;
+  }
+  store.dispatch("calendarRanges/copyFromWeekToAnotherWeek", {
+    fromMonday: ISOToDate(copyFromWeek.value),
+    toMonday: ISOToDate(copyToWeek.value),
+  });
 }
 
 const calendarLink = (calendarId: string) => {
-    const idStr = calendarId.match(/_(\d+)$/)?.[1];
+  const idStr = calendarId.match(/_(\d+)$/)?.[1];
 
-    return `/fr/calendar/calendar/${idStr}/edit`;
+  return `/fr/calendar/calendar/${idStr}/edit`;
 };
 
 onMounted(() => {
-    copyFromWeek.value = dateToISO(getMonday(0));
-    copyToWeek.value = dateToISO(getMonday(1));
+  copyFromWeek.value = dateToISO(getMonday(0));
+  copyToWeek.value = dateToISO(getMonday(1));
 });
 </script>
 
 <style scoped>
 #copy-widget {
-    position: sticky;
-    bottom: 0px;
-    background-color: white;
-    z-index: 9999999999;
-    padding: 0.25rem 0 0.25rem;
+  position: sticky;
+  bottom: 0px;
+  background-color: white;
+  z-index: 9999999999;
+  padding: 0.25rem 0 0.25rem;
 }
 div.copy-chevron {
-    text-align: center;
-    font-size: x-large;
-    width: 2rem;
+  text-align: center;
+  font-size: x-large;
+  width: 2rem;
 }
 </style>
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/types/generic_doc.ts b/src/Bundle/ChillDocStoreBundle/Resources/public/types/generic_doc.ts
index 34cf2501d..a571c2335 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/types/generic_doc.ts
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/types/generic_doc.ts
@@ -2,7 +2,7 @@ import { DateTime } from "ChillMainAssets/types";
 import { StoredObject } from "ChillDocStoreAssets/types/index";
 
 export interface GenericDocMetadata {
-    isPresent: boolean;
+  isPresent: boolean;
 }
 
 /**
@@ -15,69 +15,69 @@ export interface EmptyMetadata extends GenericDocMetadata {}
  * Minimal Metadata for a GenericDoc with a normalizer
  */
 export interface BaseMetadata extends GenericDocMetadata {
-    title: string;
+  title: string;
 }
 
 /**
  * A generic doc is a document attached to a Person or an AccompanyingPeriod.
  */
 export interface GenericDoc {
-    type: "doc_store_generic_doc";
-    uniqueKey: string;
-    key: string;
-    identifiers: { id: number };
-    context: "person" | "accompanying-period";
-    doc_date: DateTime;
-    metadata: GenericDocMetadata;
-    storedObject: StoredObject | null;
+  type: "doc_store_generic_doc";
+  uniqueKey: string;
+  key: string;
+  identifiers: { id: number };
+  context: "person" | "accompanying-period";
+  doc_date: DateTime;
+  metadata: GenericDocMetadata;
+  storedObject: StoredObject | null;
 }
 
 export interface GenericDocForAccompanyingPeriod extends GenericDoc {
-    context: "accompanying-period";
+  context: "accompanying-period";
 }
 
 export function isGenericDocForAccompanyingPeriod(
-    doc: GenericDoc,
+  doc: GenericDoc,
 ): doc is GenericDocForAccompanyingPeriod {
-    return doc.context === "accompanying-period";
+  return doc.context === "accompanying-period";
 }
 
 export function isGenericDocWithStoredObject(
-    doc: GenericDoc,
+  doc: GenericDoc,
 ): doc is GenericDoc & { storedObject: StoredObject } {
-    return doc.storedObject !== null;
+  return doc.storedObject !== null;
 }
 
 interface BaseMetadataWithHtml extends BaseMetadata {
-    html: string;
+  html: string;
 }
 
 export interface GenericDocForAccompanyingCourseDocument extends GenericDocForAccompanyingPeriod {
-    key: "accompanying_course_document";
-    metadata: BaseMetadataWithHtml;
-    storedObject: StoredObject;
+  key: "accompanying_course_document";
+  metadata: BaseMetadataWithHtml;
+  storedObject: StoredObject;
 }
 
 export interface GenericDocForAccompanyingCourseActivityDocument extends GenericDocForAccompanyingPeriod {
-    key: "accompanying_course_activity_document";
-    metadata: BaseMetadataWithHtml;
-    storedObject: StoredObject;
+  key: "accompanying_course_activity_document";
+  metadata: BaseMetadataWithHtml;
+  storedObject: StoredObject;
 }
 
 export interface GenericDocForAccompanyingCourseCalendarDocument extends GenericDocForAccompanyingPeriod {
-    key: "accompanying_course_calendar_document";
-    metadata: BaseMetadataWithHtml;
-    storedObject: StoredObject;
+  key: "accompanying_course_calendar_document";
+  metadata: BaseMetadataWithHtml;
+  storedObject: StoredObject;
 }
 
 export interface GenericDocForAccompanyingCoursePersonDocument extends GenericDocForAccompanyingPeriod {
-    key: "person_document";
-    metadata: BaseMetadataWithHtml;
-    storedObject: StoredObject;
+  key: "person_document";
+  metadata: BaseMetadataWithHtml;
+  storedObject: StoredObject;
 }
 
 export interface GenericDocForAccompanyingCourseWorkEvaluationDocument extends GenericDocForAccompanyingPeriod {
-    key: "accompanying_period_work_evaluation_document";
-    metadata: BaseMetadataWithHtml;
-    storedObject: StoredObject;
+  key: "accompanying_period_work_evaluation_document";
+  metadata: BaseMetadataWithHtml;
+  storedObject: StoredObject;
 }
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/types/index.ts b/src/Bundle/ChillDocStoreBundle/Resources/public/types/index.ts
index f71ed0350..688f52865 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/types/index.ts
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/types/index.ts
@@ -46,8 +46,7 @@ export interface StoredObjectVersionCreated extends StoredObjectVersion {
   persisted: false;
 }
 
-export interface StoredObjectVersionPersisted
-  extends StoredObjectVersionCreated {
+export interface StoredObjectVersionPersisted extends StoredObjectVersionCreated {
   version: number;
   id: number;
   createdAt: DateTime | null;
@@ -61,8 +60,7 @@ export interface StoredObjectStatusChange {
   type: string;
 }
 
-export interface StoredObjectVersionWithPointInTime
-  extends StoredObjectVersionPersisted {
+export interface StoredObjectVersionWithPointInTime extends StoredObjectVersionPersisted {
   "point-in-times": StoredObjectPointInTime[];
   "from-restored": StoredObjectVersionPersisted | null;
 }
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DropFileWidget/DropFileModal.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DropFileWidget/DropFileModal.vue
index ef6846828..6ef37e7e8 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DropFileWidget/DropFileModal.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DropFileWidget/DropFileModal.vue
@@ -7,24 +7,24 @@ import { useToast } from "vue-toast-notification";
 import { DOCUMENT_ADD, trans } from "translator";
 
 interface DropFileConfig {
-    allowRemove: boolean;
-    existingDoc?: StoredObject;
+  allowRemove: boolean;
+  existingDoc?: StoredObject;
 }
 
 const props = withDefaults(defineProps<DropFileConfig>(), {
-    allowRemove: false,
+  allowRemove: false,
 });
 
 const emit = defineEmits<{
-    (
-        e: "addDocument",
-        {
-            stored_object: StoredObject,
-            stored_object_version: StoredObjectVersion,
-            file_name: string,
-        },
-    ): void;
-    (e: "removeDocument"): void;
+  (
+    e: "addDocument",
+    {
+      stored_object: StoredObject,
+      stored_object_version: StoredObjectVersion,
+      file_name: string,
+    },
+  ): void;
+  (e: "removeDocument"): void;
 }>();
 
 const $toast = useToast();
@@ -34,65 +34,65 @@ const state = reactive({ showModal: false });
 const modalClasses = { "modal-dialog-centered": true, "modal-md": true };
 
 const buttonState = computed<"add" | "replace">(() => {
-    if (props.existingDoc === undefined || props.existingDoc === null) {
-        return "add";
-    }
+  if (props.existingDoc === undefined || props.existingDoc === null) {
+    return "add";
+  }
 
-    return "replace";
+  return "replace";
 });
 
 function onAddDocument({
-    stored_object,
-    stored_object_version,
-    file_name,
+  stored_object,
+  stored_object_version,
+  file_name,
 }: {
-    stored_object: StoredObject;
-    stored_object_version: StoredObjectVersion;
-    file_name: string;
+  stored_object: StoredObject;
+  stored_object_version: StoredObjectVersion;
+  file_name: string;
 }): void {
-    const message =
-        buttonState.value === "add" ? "Document ajouté" : "Document remplacé";
-    $toast.success(message);
-    emit("addDocument", { stored_object_version, stored_object, file_name });
-    state.showModal = false;
+  const message =
+    buttonState.value === "add" ? "Document ajouté" : "Document remplacé";
+  $toast.success(message);
+  emit("addDocument", { stored_object_version, stored_object, file_name });
+  state.showModal = false;
 }
 
 function onRemoveDocument(): void {
-    emit("removeDocument");
+  emit("removeDocument");
 }
 
 function openModal(): void {
-    state.showModal = true;
+  state.showModal = true;
 }
 
 function closeModal(): void {
-    state.showModal = false;
+  state.showModal = false;
 }
 </script>
 
 <template>
-    <button
-        v-if="buttonState === 'add'"
-        @click="openModal"
-        class="btn btn-create"
-    >
-        {{ trans(DOCUMENT_ADD) }}
-    </button>
-    <button v-else @click="openModal" class="btn btn-edit"></button>
-    <modal
-        v-if="state.showModal"
-        :modal-dialog-class="modalClasses"
-        @close="closeModal"
-    >
-        <template v-slot:body>
-            <drop-file-widget
-                :existing-doc="existingDoc"
-                :allow-remove="allowRemove"
-                @add-document="onAddDocument"
-                @remove-document="onRemoveDocument"
-            ></drop-file-widget>
-        </template>
-    </modal>
+  <button
+    v-if="buttonState === 'add'"
+    @click="openModal"
+    class="btn btn-create"
+  >
+    {{ trans(DOCUMENT_ADD) }}
+  </button>
+  <button v-else @click="openModal" class="btn btn-edit"></button>
+  <modal
+    v-if="state.showModal"
+    :modal-dialog-class="modalClasses"
+    @close="closeModal"
+  >
+    <template v-slot:body>
+      <drop-file-widget
+        :existing-doc="existingDoc"
+        :allow-remove="allowRemove"
+        @add-document="onAddDocument"
+        @remove-document="onRemoveDocument"
+      ></drop-file-widget>
+    </template>
+  </modal>
 </template>
 
 <style scoped lang="scss"></style>
diff --git a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton/HistoryButtonListItem.vue b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton/HistoryButtonListItem.vue
index bd8502e96..2edb6b714 100644
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton/HistoryButtonListItem.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton/HistoryButtonListItem.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
 import {
-    StoredObject,
-    StoredObjectPointInTime,
-    StoredObjectVersionWithPointInTime,
+  StoredObject,
+  StoredObjectPointInTime,
+  StoredObjectVersionWithPointInTime,
 } from "ChillDocStoreAssets/types";
 import UserRenderBoxBadge from "ChillMainAssets/vuejs/_components/Entity/UserRenderBoxBadge.vue";
 import { ISOToDatetime } from "ChillMainAssets/chill/js/date";
@@ -12,185 +12,173 @@ import DownloadButton from "ChillDocStoreAssets/vuejs/StoredObjectButton/Downloa
 import { computed } from "vue";
 
 interface HistoryButtonListItemConfig {
-    version: StoredObjectVersionWithPointInTime;
-    storedObject: StoredObject;
-    canEdit: boolean;
-    isCurrent: boolean;
+  version: StoredObjectVersionWithPointInTime;
+  storedObject: StoredObject;
+  canEdit: boolean;
+  isCurrent: boolean;
 }
 
 const emit = defineEmits<{
-    restoreVersion: [newVersion: StoredObjectVersionWithPointInTime];
+  restoreVersion: [newVersion: StoredObjectVersionWithPointInTime];
 }>();
 
 const props = defineProps<HistoryButtonListItemConfig>();
 
 const onRestore = ({
-    newVersion,
+  newVersion,
 }: {
-    newVersion: StoredObjectVersionWithPointInTime;
+  newVersion: StoredObjectVersionWithPointInTime;
 }) => {
-    emit("restoreVersion", { newVersion });
+  emit("restoreVersion", { newVersion });
 };
 
 const isKeptBeforeConversion = computed<boolean>(() => {
-    if ("point-in-times" in props.version) {
-        return props.version["point-in-times"].reduce(
-            (accumulator: boolean, pit: StoredObjectPointInTime) =>
-                accumulator || "keep-before-conversion" === pit.reason,
-            false,
-        );
-    } else {
-        return false;
-    }
+  if ("point-in-times" in props.version) {
+    return props.version["point-in-times"].reduce(
+      (accumulator: boolean, pit: StoredObjectPointInTime) =>
+        accumulator || "keep-before-conversion" === pit.reason,
+      false,
+    );
+  } else {
+    return false;
+  }
 });
 
 const isRestored = computed<boolean>(
-    () => props.version.version > 0 && null !== props.version["from-restored"],
+  () => props.version.version > 0 && null !== props.version["from-restored"],
 );
 
 const isDuplicated = computed<boolean>(
-    () =>
-        props.version.version === 0 && null !== props.version["from-restored"],
+  () => props.version.version === 0 && null !== props.version["from-restored"],
 );
 
 const classes = computed<{
-    row: true;
-    "row-hover": true;
-    "blinking-1": boolean;
-    "blinking-2": boolean;
+  row: true;
+  "row-hover": true;
+  "blinking-1": boolean;
+  "blinking-2": boolean;
 }>(() => ({
-    row: true,
-    "row-hover": true,
-    "blinking-1": props.isRestored && 0 === props.version.version % 2,
-    "blinking-2": props.isRestored && 1 === props.version.version % 2,
+  row: true,
+  "row-hover": true,
+  "blinking-1": props.isRestored && 0 === props.version.version % 2,
+  "blinking-2": props.isRestored && 1 === props.version.version % 2,
 }));
 </script>
 
 <template>
-    <div :class="classes">
-        <div
-            class="col-12 tags"
-            v-if="
-                isCurrent ||
-                isKeptBeforeConversion ||
-                isRestored ||
-                isDuplicated
-            "
-        >
-            <span class="badge bg-success" v-if="isCurrent"
-                >Version actuelle</span
-            >
-            <span class="badge bg-info" v-if="isKeptBeforeConversion"
-                >Conservée avant conversion dans un autre format</span
-            >
-            <span class="badge bg-info" v-if="isRestored"
-                >Restaurée depuis la version
-                {{ version["from-restored"]?.version + 1 }}</span
-            >
-            <span class="badge bg-info" v-if="isDuplicated"
-                >Dupliqué depuis un autre document</span
-            >
-        </div>
-        <div class="col-12">
-            <file-icon :type="version.type"></file-icon>
-            <span
-                ><strong>&nbsp;#{{ version.version + 1 }}&nbsp;</strong></span
-            >
-            <template
-                v-if="version.createdBy !== null && version.createdAt !== null"
-                ><strong v-if="version.version == 0">créé par</strong
-                ><strong v-else>modifié par</strong>
-                <span class="badge-user"
-                    ><UserRenderBoxBadge
-                        :user="version.createdBy"
-                    ></UserRenderBoxBadge
-                ></span>
-                <strong>à</strong>
-                {{
-                    $d(ISOToDatetime(version.createdAt.datetime8601), "long")
-                }}</template
-            ><template
-                v-if="version.createdBy === null && version.createdAt !== null"
-                ><strong v-if="version.version == 0">Créé le</strong
-                ><strong v-else>modifié le</strong>
-                {{
-                    $d(ISOToDatetime(version.createdAt.datetime8601), "long")
-                }}</template
-            >
-        </div>
-        <div class="col-12">
-            <ul class="record_actions small slim on-version-actions">
-                <li v-if="canEdit && !isCurrent">
-                    <restore-version-button
-                        :stored-object-version="props.version"
-                        @restore-version="onRestore"
-                    ></restore-version-button>
-                </li>
-                <li>
-                    <download-button
-                        :stored-object="storedObject"
-                        :at-version="version"
-                        :classes="{
-                            btn: true,
-                            'btn-outline-primary': true,
-                            'btn-sm': true,
-                        }"
-                        :display-action-string-in-button="false"
-                    ></download-button>
-                </li>
-            </ul>
-        </div>
+  <div :class="classes">
+    <div
+      class="col-12 tags"
+      v-if="isCurrent || isKeptBeforeConversion || isRestored || isDuplicated"
+    >
+      <span class="badge bg-success" v-if="isCurrent">Version actuelle</span>
+      <span class="badge bg-info" v-if="isKeptBeforeConversion"
+        >Conservée avant conversion dans un autre format</span
+      >
+      <span class="badge bg-info" v-if="isRestored"
+        >Restaurée depuis la version
+        {{ version["from-restored"]?.version + 1 }}</span
+      >
+      <span class="badge bg-info" v-if="isDuplicated"
+        >Dupliqué depuis un autre document</span
+      >
     </div>
+    <div class="col-12">
+      <file-icon :type="version.type"></file-icon>
+      <span
+        ><strong>&nbsp;#{{ version.version + 1 }}&nbsp;</strong></span
+      >
+      <template v-if="version.createdBy !== null && version.createdAt !== null"
+        ><strong v-if="version.version == 0">créé par</strong
+        ><strong v-else>modifié par</strong>
+        <span class="badge-user"
+          ><UserRenderBoxBadge :user="version.createdBy"></UserRenderBoxBadge
+        ></span>
+        <strong>à</strong>
+        {{
+          $d(ISOToDatetime(version.createdAt.datetime8601), "long")
+        }}</template
+      ><template v-if="version.createdBy === null && version.createdAt !== null"
+        ><strong v-if="version.version == 0">Créé le</strong
+        ><strong v-else>modifié le</strong>
+        {{
+          $d(ISOToDatetime(version.createdAt.datetime8601), "long")
+        }}</template
+      >
+    </div>
+    <div class="col-12">
+      <ul class="record_actions small slim on-version-actions">
+        <li v-if="canEdit && !isCurrent">
+          <restore-version-button
+            :stored-object-version="props.version"
+            @restore-version="onRestore"
+          ></restore-version-button>
+        </li>
+        <li>
+          <download-button
+            :stored-object="storedObject"
+            :at-version="version"
+            :classes="{
+              btn: true,
+              'btn-outline-primary': true,
+              'btn-sm': true,
+            }"
+            :display-action-string-in-button="false"
+          ></download-button>
+        </li>
+      </ul>
+    </div>
+  </div>
 </template>
 
 <style scoped lang="scss">
 div.tags {
-    span.badge:not(:last-child) {
-        margin-right: 0.5rem;
-    }
+  span.badge:not(:last-child) {
+    margin-right: 0.5rem;
+  }
 }
 // to make the animation restart, we have the same animation twice,
 // and alternate between both
 .blinking-1 {
-    animation-name: backgroundColorPalette-1;
-    animation-duration: 8s;
-    animation-iteration-count: 1;
-    animation-direction: normal;
-    animation-timing-function: linear;
+  animation-name: backgroundColorPalette-1;
+  animation-duration: 8s;
+  animation-iteration-count: 1;
+  animation-direction: normal;
+  animation-timing-function: linear;
 }
 @keyframes backgroundColorPalette-1 {
-    0% {
-        background: var(--bs-chill-green-dark);
-    }
-    25% {
-        background: var(--bs-chill-green);
-    }
-    65% {
-        background: var(--bs-chill-beige);
-    }
-    100% {
-        background: unset;
-    }
+  0% {
+    background: var(--bs-chill-green-dark);
+  }
+  25% {
+    background: var(--bs-chill-green);
+  }
+  65% {
+    background: var(--bs-chill-beige);
+  }
+  100% {
+    background: unset;
+  }
 }
 .blinking-2 {
-    animation-name: backgroundColorPalette-2;
-    animation-duration: 8s;
-    animation-iteration-count: 1;
-    animation-direction: normal;
-    animation-timing-function: linear;
+  animation-name: backgroundColorPalette-2;
+  animation-duration: 8s;
+  animation-iteration-count: 1;
+  animation-direction: normal;
+  animation-timing-function: linear;
 }
 @keyframes backgroundColorPalette-2 {
-    0% {
-        background: var(--bs-chill-green-dark);
-    }
-    25% {
-        background: var(--bs-chill-green);
-    }
-    65% {
-        background: var(--bs-chill-beige);
-    }
-    100% {
-        background: unset;
-    }
+  0% {
+    background: var(--bs-chill-green-dark);
+  }
+  25% {
+    background: var(--bs-chill-green);
+  }
+  65% {
+    background: var(--bs-chill-beige);
+  }
+  100% {
+    background: unset;
+  }
 }
 </style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/chill/js/date.ts b/src/Bundle/ChillMainBundle/Resources/public/chill/js/date.ts
index ce0a9ea7b..17db591e1 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/js/date.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/js/date.ts
@@ -13,15 +13,15 @@
  *
  */
 export const dateToISO = (date: Date | null): string | null => {
-    if (null === date) {
-        return null;
-    }
+  if (null === date) {
+    return null;
+  }
 
-    return [
-        date.getFullYear(),
-        (date.getMonth() + 1).toString().padStart(2, "0"),
-        date.getDate().toString().padStart(2, "0"),
-    ].join("-");
+  return [
+    date.getFullYear(),
+    (date.getMonth() + 1).toString().padStart(2, "0"),
+    date.getDate().toString().padStart(2, "0"),
+  ].join("-");
 };
 
 /**
@@ -30,21 +30,21 @@ export const dateToISO = (date: Date | null): string | null => {
  * **Experimental**
  */
 export const ISOToDate = (str: string | null): Date | null => {
-    if (null === str) {
-        return null;
-    }
-    if ("" === str.trim()) {
-        return null;
-    }
+  if (null === str) {
+    return null;
+  }
+  if ("" === str.trim()) {
+    return null;
+  }
 
-    // If the string already contains time info, use it directly
-    if (str.includes("T") || str.includes(" ")) {
-        return new Date(str);
-    }
+  // If the string already contains time info, use it directly
+  if (str.includes("T") || str.includes(" ")) {
+    return new Date(str);
+  }
 
-    // Otherwise, parse date only
-    const [year, month, day] = str.split("-").map((p) => parseInt(p));
-    return new Date(year, month - 1, day, 0, 0, 0, 0);
+  // Otherwise, parse date only
+  const [year, month, day] = str.split("-").map((p) => parseInt(p));
+  return new Date(year, month - 1, day, 0, 0, 0, 0);
 };
 
 /**
@@ -52,21 +52,19 @@ export const ISOToDate = (str: string | null): Date | null => {
  *
  */
 export const ISOToDatetime = (str: string | null): Date | null => {
-    if (null === str) {
-        return null;
-    }
+  if (null === str) {
+    return null;
+  }
 
-    const [cal, times] = str.split("T"),
-        [year, month, date] = cal.split("-").map((s) => parseInt(s)),
-        [time, timezone] = times.split(times.charAt(8)),
-        [hours, minutes, seconds] = time.split(":").map((s) => parseInt(s));
-    if ("0000" === timezone) {
-        return new Date(
-            Date.UTC(year, month - 1, date, hours, minutes, seconds),
-        );
-    }
+  const [cal, times] = str.split("T"),
+    [year, month, date] = cal.split("-").map((s) => parseInt(s)),
+    [time, timezone] = times.split(times.charAt(8)),
+    [hours, minutes, seconds] = time.split(":").map((s) => parseInt(s));
+  if ("0000" === timezone) {
+    return new Date(Date.UTC(year, month - 1, date, hours, minutes, seconds));
+  }
 
-    return new Date(year, month - 1, date, hours, minutes, seconds);
+  return new Date(year, month - 1, date, hours, minutes, seconds);
 };
 
 /**
@@ -74,102 +72,100 @@ export const ISOToDatetime = (str: string | null): Date | null => {
  *
  */
 export const datetimeToISO = (date: Date): string => {
-    const cal = [
-        date.getFullYear(),
-        (date.getMonth() + 1).toString().padStart(2, "0"),
-        date.getDate().toString().padStart(2, "0"),
-    ].join("-");
+  const cal = [
+    date.getFullYear(),
+    (date.getMonth() + 1).toString().padStart(2, "0"),
+    date.getDate().toString().padStart(2, "0"),
+  ].join("-");
 
-    const time = [
-        date.getHours().toString().padStart(2, "0"),
-        date.getMinutes().toString().padStart(2, "0"),
-        date.getSeconds().toString().padStart(2, "0"),
-    ].join(":");
+  const time = [
+    date.getHours().toString().padStart(2, "0"),
+    date.getMinutes().toString().padStart(2, "0"),
+    date.getSeconds().toString().padStart(2, "0"),
+  ].join(":");
 
-    const offset = [
-        date.getTimezoneOffset() <= 0 ? "+" : "-",
-        Math.abs(Math.floor(date.getTimezoneOffset() / 60))
-            .toString()
-            .padStart(2, "0"),
-        ":",
-        Math.abs(date.getTimezoneOffset() % 60)
-            .toString()
-            .padStart(2, "0"),
-    ].join("");
+  const offset = [
+    date.getTimezoneOffset() <= 0 ? "+" : "-",
+    Math.abs(Math.floor(date.getTimezoneOffset() / 60))
+      .toString()
+      .padStart(2, "0"),
+    ":",
+    Math.abs(date.getTimezoneOffset() % 60)
+      .toString()
+      .padStart(2, "0"),
+  ].join("");
 
-    const x = cal + "T" + time + offset;
+  const x = cal + "T" + time + offset;
 
-    return x;
+  return x;
 };
 
 export const intervalDaysToISO = (days: number | string | null): string => {
-    if (null === days) {
-        return "P0D";
-    }
+  if (null === days) {
+    return "P0D";
+  }
 
-    return `P${days}D`;
+  return `P${days}D`;
 };
 
 export const intervalISOToDays = (str: string | null): number | null => {
-    if (null === str) {
-        return null;
-    }
+  if (null === str) {
+    return null;
+  }
 
-    if ("" === str.trim()) {
-        return null;
-    }
+  if ("" === str.trim()) {
+    return null;
+  }
 
-    let days = 0;
-    let isDate = true;
-    let vstring = "";
-    for (let i = 0; i < str.length; i = i + 1) {
-        if (!isDate) {
-            continue;
-        }
-        switch (str.charAt(i)) {
-            case "P":
-                isDate = true;
-                break;
-            case "T":
-                isDate = false;
-                break;
-            case "0":
-            case "1":
-            case "2":
-            case "3":
-            case "4":
-            case "5":
-            case "6":
-            case "7":
-            case "8":
-            case "9":
-                vstring = vstring + str.charAt(i);
-                break;
-            case "Y":
-                days = days + Number.parseInt(vstring) * 365;
-                vstring = "";
-                break;
-            case "M":
-                days = days + Number.parseInt(vstring) * 30;
-                vstring = "";
-                break;
-            case "D":
-                days = days + Number.parseInt(vstring);
-                vstring = "";
-                break;
-            default:
-                throw Error(
-                    "this character should not appears: " + str.charAt(i),
-                );
-        }
+  let days = 0;
+  let isDate = true;
+  let vstring = "";
+  for (let i = 0; i < str.length; i = i + 1) {
+    if (!isDate) {
+      continue;
     }
+    switch (str.charAt(i)) {
+      case "P":
+        isDate = true;
+        break;
+      case "T":
+        isDate = false;
+        break;
+      case "0":
+      case "1":
+      case "2":
+      case "3":
+      case "4":
+      case "5":
+      case "6":
+      case "7":
+      case "8":
+      case "9":
+        vstring = vstring + str.charAt(i);
+        break;
+      case "Y":
+        days = days + Number.parseInt(vstring) * 365;
+        vstring = "";
+        break;
+      case "M":
+        days = days + Number.parseInt(vstring) * 30;
+        vstring = "";
+        break;
+      case "D":
+        days = days + Number.parseInt(vstring);
+        vstring = "";
+        break;
+      default:
+        throw Error("this character should not appears: " + str.charAt(i));
+    }
+  }
 
-    return days;
+  return days;
 };
 
 export function getTimezoneOffsetString(date: Date, timeZone: string): string {
   const utcDate = new Date(date.toLocaleString("en-US", { timeZone: "UTC" }));
-  const tzDate  = new Date(date.toLocaleString("en-US", { timeZone }));
+  const tzDate = new Date(date.toLocaleString("en-US", { timeZone }));
   const offsetMinutes = (utcDate.getTime() - tzDate.getTime()) / (60 * 1000);
 
   // Inverser le signe pour avoir la convention ±HH:MM
@@ -180,4 +176,3 @@ export function getTimezoneOffsetString(date: Date, timeZone: string): string {
 
   return `${sign}${hours}:${minutes}`;
 }
-
diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.ts b/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.ts
index 43ae42613..2083f9260 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.ts
@@ -3,7 +3,7 @@ import {
   Scope,
   ValidationExceptionInterface,
   ValidationProblemFromMap,
-  ViolationFromMap
+  ViolationFromMap,
 } from "../../types";
 
 export type body = Record<string, boolean | string | number | null>;
@@ -32,11 +32,11 @@ export interface TransportExceptionInterface {
 }
 
 export class ValidationException<
-    M extends Record<string, Record<string, string|number>> = Record<
-      string,
-      Record<string, string|number>
-    >,
-  >
+  M extends Record<string, Record<string, string | number>> = Record<
+    string,
+    Record<string, string | number>
+  >,
+>
   extends Error
   implements ValidationExceptionInterface<M>
 {
@@ -68,7 +68,10 @@ export class ValidationException<
 
     this.byProperty = problem.violations.reduce(
       (acc, v) => {
-        const key = v.propertyPath.replace('/\[\d+\]$/', "") as Extract<keyof M, string>;
+        const key = v.propertyPath.replace("/\[\d+\]$/", "") as Extract<
+          keyof M,
+          string
+        >;
         (acc[key] ||= []).push(v.title);
         return acc;
       },
@@ -80,28 +83,27 @@ export class ValidationException<
     }
   }
 
-  violationsByNormalizedProperty(property: Extract<keyof M, string>): ViolationFromMap<M>[] {
-    return this.violationsList.filter((v) => v.propertyPath.replace(/\[\d+\]$/, "") === property);
+  violationsByNormalizedProperty(
+    property: Extract<keyof M, string>,
+  ): ViolationFromMap<M>[] {
+    return this.violationsList.filter(
+      (v) => v.propertyPath.replace(/\[\d+\]$/, "") === property,
+    );
   }
 
   violationsByNormalizedPropertyAndParams<
     P extends Extract<keyof M, string>,
-    K extends Extract<keyof M[P], string>
-  >(
-    property: P,
-    param: K,
-    param_value: M[P][K]
-  ): ViolationFromMap<M>[]
-  {
+    K extends Extract<keyof M[P], string>,
+  >(property: P, param: K, param_value: M[P][K]): ViolationFromMap<M>[] {
     const list = this.violationsByNormalizedProperty(property);
 
-    return  list.filter(
+    return list.filter(
       (v): boolean =>
         !!v.parameters &&
         // `with_parameter in v.parameters` check indexing
         param in v.parameters &&
         // the cast is safe, because we have overloading that bind the types
-        (v.parameters as M[P])[param] === param_value
+        (v.parameters as M[P])[param] === param_value,
     );
   }
 }
@@ -110,9 +112,9 @@ export class ValidationException<
  * Check that the exception is a ValidationExceptionInterface
  * @param x
  */
-export function isValidationException<M extends Record<string, Record<string, string|number>>>(
-  x: unknown,
-): x is ValidationExceptionInterface<M> {
+export function isValidationException<
+  M extends Record<string, Record<string, string | number>>,
+>(x: unknown): x is ValidationExceptionInterface<M> {
   return (
     x instanceof ValidationException ||
     (typeof x === "object" &&
@@ -147,8 +149,7 @@ export interface AccessExceptionInterface extends TransportExceptionInterface {
   violations: string[];
 }
 
-export interface NotFoundExceptionInterface
-  extends TransportExceptionInterface {
+export interface NotFoundExceptionInterface extends TransportExceptionInterface {
   name: "NotFoundException";
 }
 
@@ -159,8 +160,7 @@ export interface ServerExceptionInterface extends TransportExceptionInterface {
   body: string;
 }
 
-export interface ConflictHttpExceptionInterface
-  extends TransportExceptionInterface {
+export interface ConflictHttpExceptionInterface extends TransportExceptionInterface {
   name: "ConflictHttpException";
   violations: string[];
 }
@@ -306,9 +306,9 @@ export interface ConflictHttpExceptionInterface
 export const makeFetch = async <
   Input,
   Output,
-  M extends Record<string, Record<string, string|number>> = Record<
+  M extends Record<string, Record<string, string | number>> = Record<
     string,
-    Record<string, string|number>
+    Record<string, string | number>
   >,
 >(
   method: "POST" | "GET" | "PUT" | "PATCH" | "DELETE",
diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/api/genderHelper.ts b/src/Bundle/ChillMainBundle/Resources/public/lib/api/genderHelper.ts
index f913fd194..0e4b38a06 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/lib/api/genderHelper.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/api/genderHelper.ts
@@ -1,4 +1,4 @@
-import {Gender, GenderTranslation} from "ChillMainAssets/types";
+import { Gender, GenderTranslation } from "ChillMainAssets/types";
 
 /**
  * Translates a given gender object into its corresponding gender translation string.
@@ -7,8 +7,7 @@ import {Gender, GenderTranslation} from "ChillMainAssets/types";
  * @return {GenderTranslation} Returns the gender translation string corresponding to the provided gender,
  *                             or "unknown" if the gender is null.
  */
-export function toGenderTranslation(gender: Gender|null): GenderTranslation
-{
+export function toGenderTranslation(gender: Gender | null): GenderTranslation {
   if (null === gender) {
     return "unknown";
   }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/return_path/returnPathHelper.ts b/src/Bundle/ChillMainBundle/Resources/public/lib/return_path/returnPathHelper.ts
index e4316329d..468716a14 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/lib/return_path/returnPathHelper.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/return_path/returnPathHelper.ts
@@ -6,8 +6,8 @@
  * @return {string} The "returnPath" from the query string, or the fallback path if "returnPath" is not present.
  */
 export function returnPathOr(fallbackPath: string): string {
-    const urlParams = new URLSearchParams(window.location.search);
-    const returnPath = urlParams.get("returnPath");
+  const urlParams = new URLSearchParams(window.location.search);
+  const returnPath = urlParams.get("returnPath");
 
-    return returnPath ?? fallbackPath;
+  return returnPath ?? fallbackPath;
 }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/lib/workflow/api.ts b/src/Bundle/ChillMainBundle/Resources/public/lib/workflow/api.ts
index 773abbfaf..e75eed4aa 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/lib/workflow/api.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/lib/workflow/api.ts
@@ -2,15 +2,15 @@ import { EntityWorkflow } from "ChillMainAssets/types";
 import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
 
 export const fetchWorkflow = async (
-    workflowId: number,
+  workflowId: number,
 ): Promise<EntityWorkflow> => {
-    try {
-        return await makeFetch<null, EntityWorkflow>(
-            "GET",
-            `/api/1.0/main/workflow/${workflowId}.json`,
-        );
-    } catch (error) {
-        console.error(`Failed to fetch workflow ${workflowId}:`, error);
-        throw error;
-    }
+  try {
+    return await makeFetch<null, EntityWorkflow>(
+      "GET",
+      `/api/1.0/main/workflow/${workflowId}.json`,
+    );
+  } catch (error) {
+    console.error(`Failed to fetch workflow ${workflowId}:`, error);
+    throw error;
+  }
 };
diff --git a/src/Bundle/ChillMainBundle/Resources/public/types.ts b/src/Bundle/ChillMainBundle/Resources/public/types.ts
index 251953679..a28204936 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/types.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/types.ts
@@ -1,10 +1,10 @@
 import {
-    GenericDoc,
-    isGenericDocWithStoredObject,
+  GenericDoc,
+  isGenericDocWithStoredObject,
 } from "ChillDocStoreAssets/types/generic_doc";
 import { StoredObject, StoredObjectStatus } from "ChillDocStoreAssets/types";
 import { CreatableEntityType } from "ChillPersonAssets/types";
-import {ThirdpartyCompany} from "../../../ChillThirdPartyBundle/Resources/public/types";
+import { ThirdpartyCompany } from "../../../ChillThirdPartyBundle/Resources/public/types";
 import { Person } from "../../../ChillPersonBundle/Resources/public/types";
 
 export interface DateTime {
@@ -38,7 +38,6 @@ export interface SetCivility {
   id: number;
 }
 
-
 /**
  * Gender translation.
  *
@@ -282,74 +281,74 @@ export interface WorkflowAttachment {
 }
 
 export type AttachmentWithDocAndStored = WorkflowAttachment & {
-    genericDoc: GenericDoc & { storedObject: StoredObject };
+  genericDoc: GenericDoc & { storedObject: StoredObject };
 };
 
 export function isAttachmentWithDocAndStored(
-    a: WorkflowAttachment,
+  a: WorkflowAttachment,
 ): a is AttachmentWithDocAndStored {
-    return (
-        isWorkflowAttachmentWithGenericDoc(a) &&
-        isGenericDocWithStoredObject(a.genericDoc)
-    );
+  return (
+    isWorkflowAttachmentWithGenericDoc(a) &&
+    isGenericDocWithStoredObject(a.genericDoc)
+  );
 }
 
 export function isWorkflowAttachmentWithGenericDoc(
-    attachment: WorkflowAttachment,
+  attachment: WorkflowAttachment,
 ): attachment is WorkflowAttachment & { genericDoc: GenericDoc } {
-    return attachment.genericDoc !== null;
+  return attachment.genericDoc !== null;
 }
 
 export interface Workflow {
-    name: string;
-    text: string;
+  name: string;
+  text: string;
 }
 
 export interface EntityWorkflowStep {
-    type: "entity_workflow_step";
-    id: number;
-    comment: string;
-    currentStep: StepDefinition;
-    isFinal: boolean;
-    isFreezed: boolean;
-    isFinalized: boolean;
-    transitionPrevious: Transition | null;
-    transitionAfter: Transition | null;
-    previousId: number | null;
-    nextId: number | null;
-    transitionPreviousBy: User | null;
-    transitionPreviousAt: DateTime | null;
+  type: "entity_workflow_step";
+  id: number;
+  comment: string;
+  currentStep: StepDefinition;
+  isFinal: boolean;
+  isFreezed: boolean;
+  isFinalized: boolean;
+  transitionPrevious: Transition | null;
+  transitionAfter: Transition | null;
+  previousId: number | null;
+  nextId: number | null;
+  transitionPreviousBy: User | null;
+  transitionPreviousAt: DateTime | null;
 }
 
 export interface Transition {
-    name: string;
-    text: string;
-    isForward: boolean;
+  name: string;
+  text: string;
+  isForward: boolean;
 }
 
 export interface StepDefinition {
-    name: string;
-    text: string;
+  name: string;
+  text: string;
 }
 
 export interface EntityWorkflow {
-    type: "entity_workflow";
-    id: number;
-    relatedEntityClass: string;
-    relatedEntityId: number;
-    workflow: Workflow;
-    currentStep: EntityWorkflowStep;
-    steps: EntityWorkflowStep[];
-    datas: WorkflowData;
-    title: string;
-    isOnHoldAtCurrentStep: boolean;
-    _permissions: {
-        CHILL_MAIN_WORKFLOW_ATTACHMENT_EDIT: boolean;
-    };
+  type: "entity_workflow";
+  id: number;
+  relatedEntityClass: string;
+  relatedEntityId: number;
+  workflow: Workflow;
+  currentStep: EntityWorkflowStep;
+  steps: EntityWorkflowStep[];
+  datas: WorkflowData;
+  title: string;
+  isOnHoldAtCurrentStep: boolean;
+  _permissions: {
+    CHILL_MAIN_WORKFLOW_ATTACHMENT_EDIT: boolean;
+  };
 }
 
 export interface WorkflowData {
-    persons: Person[];
+  persons: Person[];
 }
 
 export interface ExportGeneration {
@@ -380,17 +379,20 @@ export type DynamicKeys<M extends Record<string, Record<string, unknown>>> =
 
 type NormalizeKey<K extends string> = K extends `${infer B}[${number}]` ? B : K;
 
-export type ViolationFromMap<M extends Record<string, Record<string, unknown>>> = {
-  [K in DynamicKeys<M> & string]: { // <- note le "& string" ici
+export type ViolationFromMap<
+  M extends Record<string, Record<string, unknown>>,
+> = {
+  [K in DynamicKeys<M> & string]: {
+    // <- note le "& string" ici
     propertyPath: K;
     title: string;
     parameters?: M[NormalizeKey<K>];
     type?: string;
-  }
+  };
 }[DynamicKeys<M> & string];
 
 export type ValidationProblemFromMap<
-  M extends Record<string, Record<string, string|number>>,
+  M extends Record<string, Record<string, string | number>>,
 > = {
   type: string;
   title: string;
@@ -399,9 +401,9 @@ export type ValidationProblemFromMap<
 } & Record<string, unknown>;
 
 export interface ValidationExceptionInterface<
-  M extends Record<string, Record<string, string|number>> = Record<
+  M extends Record<string, Record<string, string | number>> = Record<
     string,
-    Record<string, string|number>
+    Record<string, string | number>
   >,
 > extends Error {
   name: "ValidationException";
@@ -418,15 +420,17 @@ export interface ValidationExceptionInterface<
   /** Indexing by property (useful for display by field) */
   byProperty: Record<Extract<keyof M, string>, string[]>;
 
-  violationsByNormalizedProperty(property: Extract<keyof M, string>): ViolationFromMap<M>[];
+  violationsByNormalizedProperty(
+    property: Extract<keyof M, string>,
+  ): ViolationFromMap<M>[];
 
   violationsByNormalizedPropertyAndParams<
     P extends Extract<keyof M, string>,
-    K extends Extract<keyof M[P], string>
+    K extends Extract<keyof M[P], string>,
   >(
     property: P,
     param: K,
-    param_value: M[P][K]
+    param_value: M[P][K],
   ): ViolationFromMap<M>[];
 }
 
@@ -435,8 +439,7 @@ export interface AccessExceptionInterface extends TransportExceptionInterface {
   violations: string[];
 }
 
-export interface NotFoundExceptionInterface
-  extends TransportExceptionInterface {
+export interface NotFoundExceptionInterface extends TransportExceptionInterface {
   name: "NotFoundException";
 }
 
@@ -447,8 +450,7 @@ export interface ServerExceptionInterface extends TransportExceptionInterface {
   body: string;
 }
 
-export interface ConflictHttpExceptionInterface
-  extends TransportExceptionInterface {
+export interface ConflictHttpExceptionInterface extends TransportExceptionInterface {
   name: "ConflictHttpException";
   violations: string[];
 }
@@ -496,16 +498,16 @@ export interface TabDefinition {
   counter: () => number;
 }
 
-export type CreateComponentConfigGeneral = {
-  action: 'create';
+export interface CreateComponentConfigGeneral {
+  action: "create";
   allowedTypes: CreatableEntityType[];
   query: string;
   parent: null;
 }
 
-export type CreateComponentThirdPartyAddContact = {
-  action: 'addContact';
-  allowedTypes: readonly ['thirdparty'];
+export interface CreateComponentThirdPartyAddContact {
+  action: "addContact";
+  allowedTypes: readonly ["thirdparty"];
   query: string;
   parent: ThirdpartyCompany;
 }
@@ -513,8 +515,9 @@ export type CreateComponentThirdPartyAddContact = {
 /**
  * Configuration for the CreateModal and Create component
  */
-export type CreateComponentConfig = CreateComponentConfigGeneral | CreateComponentThirdPartyAddContact;
-
+export type CreateComponentConfig =
+  | CreateComponentConfigGeneral
+  | CreateComponentThirdPartyAddContact;
 
 /**
  * Possible states for the WaitingScreen Component.
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/DownloadExport/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/DownloadExport/App.vue
index b9ffeff34..d0cdc170f 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/DownloadExport/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/DownloadExport/App.vue
@@ -1,10 +1,10 @@
 <script setup lang="ts">
 import {
-    trans,
-    EXPORT_GENERATION_EXPORT_GENERATION_IS_PENDING,
-    EXPORT_GENERATION_TOO_MANY_RETRIES,
-    EXPORT_GENERATION_ERROR_WHILE_GENERATING_EXPORT,
-    EXPORT_GENERATION_EXPORT_READY,
+  trans,
+  EXPORT_GENERATION_EXPORT_GENERATION_IS_PENDING,
+  EXPORT_GENERATION_TOO_MANY_RETRIES,
+  EXPORT_GENERATION_ERROR_WHILE_GENERATING_EXPORT,
+  EXPORT_GENERATION_EXPORT_READY,
 } from "translator";
 import { computed, onMounted, ref } from "vue";
 import { StoredObject, StoredObjectStatus } from "ChillDocStoreAssets/types";
@@ -14,9 +14,9 @@ import WaitingScreen from "../_components/WaitingScreen.vue";
 import { ExportGeneration, WaitingScreenState } from "ChillMainAssets/types";
 
 interface AppProps {
-    exportGenerationId: string;
-    title: string;
-    createdDate: string;
+  exportGenerationId: string;
+  title: string;
+  createdDate: string;
 }
 
 const props = defineProps<AppProps>();
@@ -24,25 +24,25 @@ const props = defineProps<AppProps>();
 const exportGeneration = ref<ExportGeneration | null>(null);
 
 const status = computed<StoredObjectStatus>(
-    () => exportGeneration.value?.status ?? "pending",
+  () => exportGeneration.value?.status ?? "pending",
 );
 const storedObject = computed<null | StoredObject>(() => {
-    if (exportGeneration.value === null) {
-        return null;
-    }
+  if (exportGeneration.value === null) {
+    return null;
+  }
 
-    return exportGeneration.value?.storedObject;
+  return exportGeneration.value?.storedObject;
 });
 
 const isPending = computed<boolean>(() => status.value === "pending");
 const filename = computed<string>(() => `${props.title}-${props.createdDate}`);
 
 const state = computed<WaitingScreenState>((): WaitingScreenState => {
-    if (status.value === "empty") {
-        return "pending";
-    }
+  if (status.value === "empty") {
+    return "pending";
+  }
 
-    return status.value;
+  return status.value;
 });
 
 /**
@@ -56,69 +56,69 @@ let tryiesForReady = ref<number>(0);
 const maxTryiesForReady = 120;
 
 const checkForReady = function (): void {
-    if (
-        "ready" === status.value ||
-        "empty" === status.value ||
-        "failure" === status.value ||
-        // stop reloading if the page stays opened for a long time
-        tryiesForReady.value > maxTryiesForReady
-    ) {
-        return;
-    }
+  if (
+    "ready" === status.value ||
+    "empty" === status.value ||
+    "failure" === status.value ||
+    // stop reloading if the page stays opened for a long time
+    tryiesForReady.value > maxTryiesForReady
+  ) {
+    return;
+  }
 
-    tryiesForReady.value = tryiesForReady.value + 1;
-    setTimeout(onObjectNewStatusCallback, 5000);
+  tryiesForReady.value = tryiesForReady.value + 1;
+  setTimeout(onObjectNewStatusCallback, 5000);
 };
 
 const onObjectNewStatusCallback = async function (): Promise<void> {
-    exportGeneration.value = await fetchExportGenerationStatus(
-        props.exportGenerationId,
-    );
-
-    if (isPending.value) {
-        checkForReady();
-        return Promise.resolve();
-    }
+  exportGeneration.value = await fetchExportGenerationStatus(
+    props.exportGenerationId,
+  );
 
+  if (isPending.value) {
+    checkForReady();
     return Promise.resolve();
+  }
+
+  return Promise.resolve();
 };
 
 onMounted(() => {
-    onObjectNewStatusCallback();
+  onObjectNewStatusCallback();
 });
 </script>
 
 <template>
-    <WaitingScreen :state="state">
-        <template v-slot:pending>
-            <p>
-                {{ trans(EXPORT_GENERATION_EXPORT_GENERATION_IS_PENDING) }}
-            </p>
-        </template>
+  <WaitingScreen :state="state">
+    <template v-slot:pending>
+      <p>
+        {{ trans(EXPORT_GENERATION_EXPORT_GENERATION_IS_PENDING) }}
+      </p>
+    </template>
 
-        <template v-slot:stopped>
-            <p>
-                {{ trans(EXPORT_GENERATION_TOO_MANY_RETRIES) }}
-            </p>
-        </template>
+    <template v-slot:stopped>
+      <p>
+        {{ trans(EXPORT_GENERATION_TOO_MANY_RETRIES) }}
+      </p>
+    </template>
 
-        <template v-slot:failure>
-            <p>
-                {{ trans(EXPORT_GENERATION_ERROR_WHILE_GENERATING_EXPORT) }}
-            </p>
-        </template>
+    <template v-slot:failure>
+      <p>
+        {{ trans(EXPORT_GENERATION_ERROR_WHILE_GENERATING_EXPORT) }}
+      </p>
+    </template>
 
-        <template v-slot:ready>
-            <p>
-                {{ trans(EXPORT_GENERATION_EXPORT_READY) }}
-            </p>
+    <template v-slot:ready>
+      <p>
+        {{ trans(EXPORT_GENERATION_EXPORT_READY) }}
+      </p>
 
-            <p v-if="storedObject !== null">
-                <document-action-buttons-group
-                    :stored-object="storedObject"
-                    :filename="filename"
-                ></document-action-buttons-group>
-            </p>
-        </template>
-    </WaitingScreen>
+      <p v-if="storedObject !== null">
+        <document-action-buttons-group
+          :stored-object="storedObject"
+          :filename="filename"
+        ></document-action-buttons-group>
+      </p>
+    </template>
+  </WaitingScreen>
 </template>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/Create.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/Create.vue
index e000b6fac..d4899fa42 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/Create.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/Create.vue
@@ -61,7 +61,7 @@ import { CreatableEntityType, Person } from "ChillPersonAssets/types";
 import { CreateComponentConfig } from "ChillMainAssets/types";
 import PersonEdit from "ChillPersonAssets/vuejs/_components/OnTheFly/PersonEdit.vue";
 import ThirdPartyEdit from "ChillThirdPartyAssets/vuejs/_components/OnTheFly/ThirdPartyEdit.vue";
-import {Thirdparty} from "../../../../../../ChillThirdPartyBundle/Resources/public/types";
+import { Thirdparty } from "../../../../../../ChillThirdPartyBundle/Resources/public/types";
 
 const props = withDefaults(defineProps<CreateComponentConfig>(), {
   action: "create",
@@ -69,11 +69,10 @@ const props = withDefaults(defineProps<CreateComponentConfig>(), {
   parent: null,
 });
 
-const emit =
-  defineEmits<{
-    (e: "onPersonCreated", payload: { person: Person }): void,
-    (e: "onThirdPartyCreated", payload: { thirdParty: Thirdparty }): void,
-  }>();
+const emit = defineEmits<{
+  (e: "onPersonCreated", payload: { person: Person }): void;
+  (e: "onThirdPartyCreated", payload: { thirdParty: Thirdparty }): void;
+}>();
 
 const type = ref<CreatableEntityType | null>(null);
 
@@ -88,8 +87,8 @@ const radioType = computed<CreatableEntityType | null>({
 type PersonEditComponent = InstanceType<typeof PersonEdit>;
 type ThirdPartyEditComponent = InstanceType<typeof ThirdPartyEdit>;
 
-const castPerson = ref<PersonEditComponent|null>(null);
-const castThirdparty = ref<ThirdPartyEditComponent|null>(null);
+const castPerson = ref<PersonEditComponent | null>(null);
+const castThirdparty = ref<ThirdPartyEditComponent | null>(null);
 
 onMounted(() => {
   type.value =
@@ -106,7 +105,7 @@ const containsThirdParty = computed<boolean>(() =>
   props.allowedTypes.includes("thirdparty"),
 );
 const containsPerson = computed<boolean>(() => {
-  if (props.action === 'addContact') {
+  if (props.action === "addContact") {
     return false;
   }
   return props.allowedTypes.includes("person");
@@ -115,7 +114,10 @@ const containsPerson = computed<boolean>(() => {
 function save(): void {
   if (radioType.value === "person" && castPerson.value !== null) {
     castPerson.value.postPerson();
-  } else if (radioType.value === "thirdparty" && castThirdparty.value !== null) {
+  } else if (
+    radioType.value === "thirdparty" &&
+    castThirdparty.value !== null
+  ) {
     castThirdparty.value.postThirdParty();
   }
 }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/CreateModal.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/CreateModal.vue
index f89e40b36..0357b8a57 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/CreateModal.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/CreateModal.vue
@@ -5,7 +5,7 @@ import { CreateComponentConfig } from "ChillMainAssets/types";
 import { trans, SAVE } from "translator";
 import { useTemplateRef } from "vue";
 import { Person } from "ChillPersonAssets/types";
-import {Thirdparty} from "../../../../../../ChillThirdPartyBundle/Resources/public/types";
+import { Thirdparty } from "../../../../../../ChillThirdPartyBundle/Resources/public/types";
 
 const emit = defineEmits<{
   (e: "onPersonCreated", payload: { person: Person }): void;
@@ -13,20 +13,24 @@ const emit = defineEmits<{
   (e: "close"): void;
 }>();
 
-const props = defineProps<CreateComponentConfig & {modalTitle: string}>();
+const props = defineProps<CreateComponentConfig & { modalTitle: string }>();
 const modalDialogClass = { "modal-xl": true, "modal-scrollable": true };
 
 type CreateComponentType = InstanceType<typeof Create>;
 
 const create = useTemplateRef<CreateComponentType>("create");
 
-const onPersonCreated = ({person}: {person: Person}): void => {
-  emit("onPersonCreated", {person});
+const onPersonCreated = ({ person }: { person: Person }): void => {
+  emit("onPersonCreated", { person });
 };
 
-const onThirdPartyCreated = ({thirdParty}: {thirdParty: Thirdparty}): void => {
-  emit("onThirdPartyCreated", {thirdParty: thirdParty});
-}
+const onThirdPartyCreated = ({
+  thirdParty,
+}: {
+  thirdParty: Thirdparty;
+}): void => {
+  emit("onThirdPartyCreated", { thirdParty: thirdParty });
+};
 
 function save(): void {
   console.log("save from CreateModal");
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
index 93457ccbf..2378da64e 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue
@@ -115,7 +115,7 @@
   </teleport>
 </template>
 <script setup lang="ts">
-import {ref, computed, defineEmits, defineProps, useTemplateRef} from "vue";
+import { ref, computed, defineEmits, defineProps, useTemplateRef } from "vue";
 import Modal from "ChillMainAssets/vuejs/_components/Modal.vue";
 import OnTheFlyCreate from "./Create.vue";
 import OnTheFlyPerson from "ChillPersonAssets/vuejs/_components/OnTheFly/Person.vue";
@@ -177,14 +177,19 @@ const props = withDefaults(defineProps<OnTheFlyComponentProps>(), {
   query: "",
 });
 
-const emit = defineEmits<{
-  (e: "saveFormOnTheFly", payload: { type: string | undefined; data: any }): void;
-}>();
+const emit =
+  defineEmits<
+    (
+      e: "saveFormOnTheFly",
+      payload: { type: string | undefined; data: any },
+    ) => void
+  >();
 
 type castEditPersonType = InstanceType<typeof PersonEdit>;
 type castEditThirdPartyType = InstanceType<typeof ThirdPartyEdit>;
-const castEditPerson = useTemplateRef<castEditPersonType>('castEditPerson')
-const castEditThirdParty = useTemplateRef<castEditThirdPartyType>('castEditThirdParty');
+const castEditPerson = useTemplateRef<castEditPersonType>("castEditPerson");
+const castEditThirdParty =
+  useTemplateRef<castEditThirdPartyType>("castEditThirdParty");
 
 const modal = ref<{ showModal: boolean; modalDialogClass: string }>({
   showModal: false,
@@ -234,35 +239,35 @@ const titleAction = computed<string>(() => {
 
 const titleCreate = computed<string>(() => {
   if (typeof props.allowedTypes === "undefined") {
-    return trans(ONTHEFLY_CREATE_TITLE_DEFAULT)
+    return trans(ONTHEFLY_CREATE_TITLE_DEFAULT);
   }
   return props.allowedTypes.every((t: EntityType) => t === "person")
-    ? (trans(ONTHEFLY_CREATE_TITLE_PERSON))
+    ? trans(ONTHEFLY_CREATE_TITLE_PERSON)
     : props.allowedTypes.every((t: EntityType) => t === "thirdparty")
-      ? (trans(ONTHEFLY_CREATE_TITLE_THIRDPARTY))
-      : (trans(ONTHEFLY_CREATE_TITLE_DEFAULT));
+      ? trans(ONTHEFLY_CREATE_TITLE_THIRDPARTY)
+      : trans(ONTHEFLY_CREATE_TITLE_DEFAULT);
 });
 
 const titleModal = computed<string>(() => {
   switch (props.action) {
     case "show":
       if (props.type == "person") {
-        return trans(ONTHEFLY_SHOW_PERSON)
+        return trans(ONTHEFLY_SHOW_PERSON);
       } else if (props.type == "thirdparty") {
-        return trans(ONTHEFLY_SHOW_THIRDPARTY)
+        return trans(ONTHEFLY_SHOW_THIRDPARTY);
       }
       break;
     case "edit":
       if (props.type == "person") {
-        return trans(ONTHEFLY_EDIT_PERSON)
+        return trans(ONTHEFLY_EDIT_PERSON);
       } else if (props.type == "thirdparty") {
-        return trans(ONTHEFLY_EDIT_THIRDPARTY)
+        return trans(ONTHEFLY_EDIT_THIRDPARTY);
       }
       break;
     case "create":
       return titleCreate.value;
     case "addContact":
-      return trans(THIRDPARTY_ADDCONTACT_TITLE)
+      return trans(THIRDPARTY_ADDCONTACT_TITLE);
     default:
       break;
   }
@@ -311,7 +316,10 @@ function openModal(): void {
   modal.value.showModal = true;
 }
 
-function buildLocation(id: string | number | undefined, type: EntityType | undefined): string | undefined {
+function buildLocation(
+  id: string | number | undefined,
+  type: EntityType | undefined,
+): string | undefined {
   if (type === "person") {
     return encodeURI(`/fr/person/${id}/general${getReturnPath.value}`);
   } else if (type === "thirdparty") {
@@ -324,17 +332,16 @@ async function saveAction() {
   if (props.type === "person") {
     const person = await castEditPerson.value?.postPerson();
     if (null !== person) {
-      emit("saveFormOnTheFly", {type: props.type, data: person})
+      emit("saveFormOnTheFly", { type: props.type, data: person });
     }
-  } else if (props.type === 'thirdparty') {
+  } else if (props.type === "thirdparty") {
     const thirdParty = await castEditThirdParty.value?.postThirdParty();
     if (null !== thirdParty) {
-      emit("saveFormOnTheFly", {type: props.type, data: thirdParty })
+      emit("saveFormOnTheFly", { type: props.type, data: thirdParty });
     }
   }
 }
 
-
 defineExpose({
   openModal,
   closeModal,
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
index b92f47319..eaf891e75 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue
@@ -19,10 +19,11 @@
         >
           {{ p.text }}
         </span>
-        <span v-else
-              :class="getBadgeClass(p)"
-              class="chill_denomination"
-              :style="getBadgeStyle(p)"
+        <span
+          v-else
+          :class="getBadgeClass(p)"
+          class="chill_denomination"
+          :style="getBadgeStyle(p)"
         >
           Ménage n°{{ p.id }}
         </span>
@@ -61,12 +62,14 @@
         @click="addNewSuggested(s)"
         style="margin: 0"
       >
-        <span v-if="!isEntityHousehold(s)" :class="getBadgeClass(s)" :style="getBadgeStyle(s)">
+        <span
+          v-if="!isEntityHousehold(s)"
+          :class="getBadgeClass(s)"
+          :style="getBadgeStyle(s)"
+        >
           {{ s.text }}
         </span>
-        <span v-else>
-          Ménage n°{{ s.id }}
-        </span>
+        <span v-else> Ménage n°{{ s.id }} </span>
       </li>
     </ul>
   </div>
@@ -85,7 +88,8 @@ import AddPersons from "ChillPersonAssets/vuejs/_components/AddPersons.vue";
 import {
   Entities,
   EntitiesOrMe,
-  EntityType, isEntityHousehold,
+  EntityType,
+  isEntityHousehold,
   SearchOptions,
   Suggestion,
 } from "ChillPersonAssets/types";
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WaitPostProcessWorkflow/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WaitPostProcessWorkflow/App.vue
index 578cb6558..88401213b 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WaitPostProcessWorkflow/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WaitPostProcessWorkflow/App.vue
@@ -6,15 +6,15 @@ import { ref } from "vue";
 import WaitingScreen from "ChillMainAssets/vuejs/_components/WaitingScreen.vue";
 import { WaitingScreenState } from "ChillMainAssets/types";
 import {
-    trans,
-    WORKFLOW_WAIT_TITLE,
-    WORKFLOW_WAIT_ERROR_WHILE_WAITING,
-    WORKFLOW_WAIT_SUCCESS,
+  trans,
+  WORKFLOW_WAIT_TITLE,
+  WORKFLOW_WAIT_ERROR_WHILE_WAITING,
+  WORKFLOW_WAIT_SUCCESS,
 } from "translator";
 
 interface WaitPostProcessWorkflowComponentProps {
-    workflowId: number;
-    expectedStep: string;
+  workflowId: number;
+  expectedStep: string;
 }
 
 const props = defineProps<WaitPostProcessWorkflowComponentProps>();
@@ -24,52 +24,52 @@ const MAX_TRYIES = 50;
 const state = ref<WaitingScreenState>("pending");
 
 const { pause, resume } = useIntervalFn(
-    async () => {
-        try {
-            const workflow = await fetchWorkflow(props.workflowId);
-            counter.value++;
-            if (workflow.currentStep.currentStep.name === props.expectedStep) {
-                window.location.assign(
-                    returnPathOr("/fr/main/workflow" + workflow.id + "/show"),
-                );
-                resume();
-                state.value = "ready";
-            }
+  async () => {
+    try {
+      const workflow = await fetchWorkflow(props.workflowId);
+      counter.value++;
+      if (workflow.currentStep.currentStep.name === props.expectedStep) {
+        window.location.assign(
+          returnPathOr("/fr/main/workflow" + workflow.id + "/show"),
+        );
+        resume();
+        state.value = "ready";
+      }
 
-            if (counter.value > MAX_TRYIES) {
-                pause();
-                state.value = "failure";
-            }
-        } catch (error) {
-            console.error(error);
-            pause();
-        }
-    },
-    2000,
-    { immediate: true },
+      if (counter.value > MAX_TRYIES) {
+        pause();
+        state.value = "failure";
+      }
+    } catch (error) {
+      console.error(error);
+      pause();
+    }
+  },
+  2000,
+  { immediate: true },
 );
 </script>
 
 <template>
-    <div class="container">
-        <WaitingScreen :state="state">
-            <template v-slot:pending>
-                <p>
-                    {{ trans(WORKFLOW_WAIT_TITLE) }}
-                </p>
-            </template>
-            <template v-slot:failure>
-                <p>
-                    {{ trans(WORKFLOW_WAIT_ERROR_WHILE_WAITING) }}
-                </p>
-            </template>
-            <template v-slot:ready>
-                <p>
-                    {{ trans(WORKFLOW_WAIT_SUCCESS) }}
-                </p>
-            </template>
-        </WaitingScreen>
-    </div>
+  <div class="container">
+    <WaitingScreen :state="state">
+      <template v-slot:pending>
+        <p>
+          {{ trans(WORKFLOW_WAIT_TITLE) }}
+        </p>
+      </template>
+      <template v-slot:failure>
+        <p>
+          {{ trans(WORKFLOW_WAIT_ERROR_WHILE_WAITING) }}
+        </p>
+      </template>
+      <template v-slot:ready>
+        <p>
+          {{ trans(WORKFLOW_WAIT_SUCCESS) }}
+        </p>
+      </template>
+    </WaitingScreen>
+  </div>
 </template>
 
 <style scoped lang="scss"></style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WaitPostProcessWorkflow/index.ts b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WaitPostProcessWorkflow/index.ts
index ac52a90cd..55b0a4331 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WaitPostProcessWorkflow/index.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WaitPostProcessWorkflow/index.ts
@@ -2,50 +2,50 @@ import { createApp } from "vue";
 import App from "./App.vue";
 
 function mountApp(): void {
-    const el = document.querySelector<HTMLDivElement>(".screen-wait");
-    if (!el) {
-        console.error(
-            "WaitPostProcessWorkflow: mount element .screen-wait not found",
-        );
-        return;
-    }
+  const el = document.querySelector<HTMLDivElement>(".screen-wait");
+  if (!el) {
+    console.error(
+      "WaitPostProcessWorkflow: mount element .screen-wait not found",
+    );
+    return;
+  }
 
-    const workflowIdAttr = el.getAttribute("data-workflow-id");
-    const expectedStep = el.getAttribute("data-expected-step") || "";
+  const workflowIdAttr = el.getAttribute("data-workflow-id");
+  const expectedStep = el.getAttribute("data-expected-step") || "";
 
-    if (!workflowIdAttr) {
-        console.error(
-            "WaitPostProcessWorkflow: data-workflow-id attribute missing on mount element",
-        );
-        return;
-    }
+  if (!workflowIdAttr) {
+    console.error(
+      "WaitPostProcessWorkflow: data-workflow-id attribute missing on mount element",
+    );
+    return;
+  }
 
-    if (!expectedStep) {
-        console.error(
-            "WaitPostProcessWorkflow: data-expected-step attribute missing on mount element",
-        );
-        return;
-    }
+  if (!expectedStep) {
+    console.error(
+      "WaitPostProcessWorkflow: data-expected-step attribute missing on mount element",
+    );
+    return;
+  }
 
-    const workflowId = Number(workflowIdAttr);
-    if (Number.isNaN(workflowId)) {
-        console.error(
-            "WaitPostProcessWorkflow: data-workflow-id is not a valid number:",
-            workflowIdAttr,
-        );
-        return;
-    }
+  const workflowId = Number(workflowIdAttr);
+  if (Number.isNaN(workflowId)) {
+    console.error(
+      "WaitPostProcessWorkflow: data-workflow-id is not a valid number:",
+      workflowIdAttr,
+    );
+    return;
+  }
 
-    const app = createApp(App, {
-        workflowId,
-        expectedStep,
-    });
+  const app = createApp(App, {
+    workflowId,
+    expectedStep,
+  });
 
-    app.mount(el);
+  app.mount(el);
 }
 
 if (document.readyState === "loading") {
-    document.addEventListener("DOMContentLoaded", mountApp);
+  document.addEventListener("DOMContentLoaded", mountApp);
 } else {
-    mountApp();
+  mountApp();
 }
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/App.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/App.vue
index af319580d..a9a201275 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/App.vue
@@ -9,17 +9,17 @@ import { fetchWorkflow } from "ChillMainAssets/lib/workflow/api";
 import { trans, WORKFLOW_ATTACHMENTS_ADD_AN_ATTACHMENT } from "translator";
 
 interface AppConfig {
-    workflowId: number;
-    accompanyingPeriodId: number;
-    attachments: WorkflowAttachment[];
+  workflowId: number;
+  accompanyingPeriodId: number;
+  attachments: WorkflowAttachment[];
 }
 
 const emit = defineEmits<{
-    (
-        e: "pickGenericDoc",
-        payload: { genericDoc: GenericDocForAccompanyingPeriod },
-    ): void;
-    (e: "removeAttachment", payload: { attachment: WorkflowAttachment }): void;
+  (
+    e: "pickGenericDoc",
+    payload: { genericDoc: GenericDocForAccompanyingPeriod },
+  ): void;
+  (e: "removeAttachment", payload: { attachment: WorkflowAttachment }): void;
 }>();
 
 type PickGenericModalType = InstanceType<typeof PickGenericDocModal>;
@@ -28,66 +28,66 @@ const pickDocModal = useTemplateRef<PickGenericModalType>("pickDocModal");
 const props = defineProps<AppConfig>();
 
 const attachedGenericDoc = computed<GenericDocForAccompanyingPeriod[]>(
-    () =>
-        props.attachments
-            .map((a: WorkflowAttachment) => a.genericDoc)
-            .filter(
-                (g: GenericDoc | null) => g !== null,
-            ) as GenericDocForAccompanyingPeriod[],
+  () =>
+    props.attachments
+      .map((a: WorkflowAttachment) => a.genericDoc)
+      .filter(
+        (g: GenericDoc | null) => g !== null,
+      ) as GenericDocForAccompanyingPeriod[],
 );
 
 const workflow = ref<EntityWorkflow | null>(null);
 
 onMounted(async () => {
-    workflow.value = await fetchWorkflow(Number(props.workflowId));
-    console.log("workflow", workflow.value);
+  workflow.value = await fetchWorkflow(Number(props.workflowId));
+  console.log("workflow", workflow.value);
 });
 
 const openModal = function () {
-    pickDocModal.value?.openModal();
+  pickDocModal.value?.openModal();
 };
 
 const onPickGenericDoc = ({
-    genericDoc,
+  genericDoc,
 }: {
-    genericDoc: GenericDocForAccompanyingPeriod;
+  genericDoc: GenericDocForAccompanyingPeriod;
 }) => {
-    emit("pickGenericDoc", { genericDoc });
+  emit("pickGenericDoc", { genericDoc });
 };
 
 const onRemoveAttachment = (payload: { attachment: WorkflowAttachment }) => {
-    emit("removeAttachment", payload);
+  emit("removeAttachment", payload);
 };
 
 const canEditAttachement = computed<boolean>(() => {
-    if (null === workflow.value) {
-        return false;
-    }
+  if (null === workflow.value) {
+    return false;
+  }
 
-    return workflow.value._permissions.CHILL_MAIN_WORKFLOW_ATTACHMENT_EDIT;
+  return workflow.value._permissions.CHILL_MAIN_WORKFLOW_ATTACHMENT_EDIT;
 });
 </script>
 
 <template>
-    <pick-generic-doc-modal
-        :workflow="workflow"
-        :accompanying-period-id="props.accompanyingPeriodId"
-        :to-remove="attachedGenericDoc"
-        ref="pickDocModal"
-        @pickGenericDoc="onPickGenericDoc"
-    ></pick-generic-doc-modal>
-    <attachment-list
-        :workflow="workflow"
-        :attachments="props.attachments"
-        @removeAttachment="onRemoveAttachment"
-    ></attachment-list>
-    <ul v-if="canEditAttachement" class="record_actions">
-        <li>
-            <button type="button" class="btn btn-create" @click="openModal">
-                {{ trans(WORKFLOW_ATTACHMENTS_ADD_AN_ATTACHMENT) }}
-            </button>
-        </li>
-    </ul>
+  <pick-generic-doc-modal
+    :workflow="workflow"
+    :accompanying-period-id="props.accompanyingPeriodId"
+    :to-remove="attachedGenericDoc"
+    ref="pickDocModal"
+    @pickGenericDoc="onPickGenericDoc"
+  ></pick-generic-doc-modal>
+  <attachment-list
+    :workflow="workflow"
+    :attachments="props.attachments"
+    @removeAttachment="onRemoveAttachment"
+  ></attachment-list>
+  <ul v-if="canEditAttachement" class="record_actions">
+    <li>
+      <button type="button" class="btn btn-create" @click="openModal">
+        {{ trans(WORKFLOW_ATTACHMENTS_ADD_AN_ATTACHMENT) }}
+      </button>
+    </li>
+  </ul>
 </template>
 
 <style scoped lang="scss"></style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/AttachmentList.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/AttachmentList.vue
index d12496266..f9d29d1b6 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/AttachmentList.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/AttachmentList.vue
@@ -1,9 +1,9 @@
 <script setup lang="ts">
 import {
-    AttachmentWithDocAndStored,
-    EntityWorkflow,
-    isAttachmentWithDocAndStored,
-    WorkflowAttachment,
+  AttachmentWithDocAndStored,
+  EntityWorkflow,
+  isAttachmentWithDocAndStored,
+  WorkflowAttachment,
 } from "ChillMainAssets/types";
 import GenericDocItemBox from "ChillMainAssets/vuejs/WorkflowAttachment/Component/GenericDocItemBox.vue";
 import DocumentActionButtonsGroup from "ChillDocStoreAssets/vuejs/DocumentActionButtonsGroup.vue";
@@ -11,63 +11,61 @@ import { computed } from "vue";
 import { trans, WORKFLOW_ATTACHMENTS_NO_ATTACHMENT } from "translator";
 
 interface AttachmentListProps {
-    attachments: WorkflowAttachment[];
-    workflow: EntityWorkflow | null;
+  attachments: WorkflowAttachment[];
+  workflow: EntityWorkflow | null;
 }
 
 const emit = defineEmits<{
-    // eslint-disable-next-line @typescript-eslint/prefer-function-type
-    (e: "removeAttachment", payload: { attachment: WorkflowAttachment }): void;
+  // eslint-disable-next-line @typescript-eslint/prefer-function-type
+  (e: "removeAttachment", payload: { attachment: WorkflowAttachment }): void;
 }>();
 
 const props = defineProps<AttachmentListProps>();
 
 const notNullAttachments = computed<AttachmentWithDocAndStored[]>(() =>
-    props.attachments.filter(
-        (a: WorkflowAttachment): a is AttachmentWithDocAndStored =>
-            isAttachmentWithDocAndStored(a),
-    ),
+  props.attachments.filter(
+    (a: WorkflowAttachment): a is AttachmentWithDocAndStored =>
+      isAttachmentWithDocAndStored(a),
+  ),
 );
 
 const canRemove = computed<boolean>((): boolean => {
-    if (null === props.workflow) {
-        return false;
-    }
+  if (null === props.workflow) {
+    return false;
+  }
 
-    return props.workflow._permissions.CHILL_MAIN_WORKFLOW_ATTACHMENT_EDIT;
+  return props.workflow._permissions.CHILL_MAIN_WORKFLOW_ATTACHMENT_EDIT;
 });
 </script>
 
 <template>
-    <p
-        v-if="notNullAttachments.length === 0"
-        class="chill-no-data-statement text-center"
-    >
-        {{ trans(WORKFLOW_ATTACHMENTS_NO_ATTACHMENT) }}
-    </p>
-    <div v-else class="flex-table">
-        <div v-for="a in notNullAttachments" :key="a.id" class="item-bloc">
-            <generic-doc-item-box
-                :generic-doc="a.genericDoc"
-            ></generic-doc-item-box>
-            <div class="item-row separator">
-                <ul class="record_actions">
-                    <li>
-                        <document-action-buttons-group
-                            :stored-object="a.genericDoc.storedObject"
-                        ></document-action-buttons-group>
-                    </li>
-                    <li v-if="canRemove">
-                        <button
-                            type="button"
-                            class="btn btn-delete"
-                            @click="emit('removeAttachment', { attachment: a })"
-                        ></button>
-                    </li>
-                </ul>
-            </div>
-        </div>
+  <p
+    v-if="notNullAttachments.length === 0"
+    class="chill-no-data-statement text-center"
+  >
+    {{ trans(WORKFLOW_ATTACHMENTS_NO_ATTACHMENT) }}
+  </p>
+  <div v-else class="flex-table">
+    <div v-for="a in notNullAttachments" :key="a.id" class="item-bloc">
+      <generic-doc-item-box :generic-doc="a.genericDoc"></generic-doc-item-box>
+      <div class="item-row separator">
+        <ul class="record_actions">
+          <li>
+            <document-action-buttons-group
+              :stored-object="a.genericDoc.storedObject"
+            ></document-action-buttons-group>
+          </li>
+          <li v-if="canRemove">
+            <button
+              type="button"
+              class="btn btn-delete"
+              @click="emit('removeAttachment', { attachment: a })"
+            ></button>
+          </li>
+        </ul>
+      </div>
     </div>
+  </div>
 </template>
 
 <style scoped lang="scss"></style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/GenericDocItemBox.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/GenericDocItemBox.vue
index d57a99475..2d769121f 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/GenericDocItemBox.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/GenericDocItemBox.vue
@@ -2,17 +2,17 @@
 import { GenericDoc } from "ChillDocStoreAssets/types/generic_doc";
 
 interface GenericDocItemBoxProps {
-    genericDoc: GenericDoc;
+  genericDoc: GenericDoc;
 }
 
 const props = defineProps<GenericDocItemBoxProps>();
 </script>
 
 <template>
-    <div
-        v-if="'html' in props.genericDoc.metadata"
-        v-html="props.genericDoc.metadata.html"
-    ></div>
+  <div
+    v-if="'html' in props.genericDoc.metadata"
+    v-html="props.genericDoc.metadata.html"
+  ></div>
 </template>
 
 <style scoped lang="scss"></style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/PickGenericDoc.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/PickGenericDoc.vue
index 717b8a62b..ec0296da4 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/PickGenericDoc.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/PickGenericDoc.vue
@@ -1,7 +1,7 @@
 <script setup lang="ts">
 import {
-    GenericDoc,
-    GenericDocForAccompanyingPeriod,
+  GenericDoc,
+  GenericDocForAccompanyingPeriod,
 } from "ChillDocStoreAssets/types/generic_doc";
 import PickGenericDocItem from "ChillMainAssets/vuejs/WorkflowAttachment/Component/PickGenericDocItem.vue";
 import { fetch_generic_docs_by_accompanying_period } from "ChillDocStoreAssets/js/generic-doc-api";
@@ -9,51 +9,50 @@ import { computed, onMounted, ref } from "vue";
 import { EntityWorkflow } from "ChillMainAssets/types";
 
 interface PickGenericDocProps {
-    workflow: EntityWorkflow | null;
-    accompanyingPeriodId: number;
-    pickedList: GenericDocForAccompanyingPeriod[];
-    toRemove: GenericDocForAccompanyingPeriod[];
+  workflow: EntityWorkflow | null;
+  accompanyingPeriodId: number;
+  pickedList: GenericDocForAccompanyingPeriod[];
+  toRemove: GenericDocForAccompanyingPeriod[];
 }
 
 const props = defineProps<PickGenericDocProps>();
 const emit = defineEmits<{
-    (
-        e: "pickGenericDoc",
-        payload: { genericDoc: GenericDocForAccompanyingPeriod },
-    ): void;
+  (
+    e: "pickGenericDoc",
+    payload: { genericDoc: GenericDocForAccompanyingPeriod },
+  ): void;
 
-    (
-        e: "removeGenericDoc",
-        payload: { genericDoc: GenericDocForAccompanyingPeriod },
-    ): void;
+  (
+    e: "removeGenericDoc",
+    payload: { genericDoc: GenericDocForAccompanyingPeriod },
+  ): void;
 }>();
 
 const genericDocs = ref<GenericDocForAccompanyingPeriod[]>([]);
 const loaded = ref(false);
 
 const isPicked = (genericDoc: GenericDocForAccompanyingPeriod): boolean =>
-    props.pickedList.findIndex(
-        (element: GenericDocForAccompanyingPeriod) =>
-            element.uniqueKey === genericDoc.uniqueKey,
-    ) !== -1;
+  props.pickedList.findIndex(
+    (element: GenericDocForAccompanyingPeriod) =>
+      element.uniqueKey === genericDoc.uniqueKey,
+  ) !== -1;
 
 onMounted(async () => {
-    const fetchedGenericDocs = await fetch_generic_docs_by_accompanying_period(
-        props.accompanyingPeriodId,
-    );
-    const documentClasses = [
-        "Chill\\DocStoreBundle\\Entity\\AccompanyingCourseDocument",
-        "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument",
-        "Chill\\DocStoreBundle\\Entity\\PersonDocument",
-    ];
+  const fetchedGenericDocs = await fetch_generic_docs_by_accompanying_period(
+    props.accompanyingPeriodId,
+  );
+  const documentClasses = [
+    "Chill\\DocStoreBundle\\Entity\\AccompanyingCourseDocument",
+    "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument",
+    "Chill\\DocStoreBundle\\Entity\\PersonDocument",
+  ];
 
-    genericDocs.value = fetchedGenericDocs.filter(
-        (doc) =>
-            !documentClasses.includes(
-                props.workflow?.relatedEntityClass || "",
-            ) || props.workflow?.relatedEntityId !== doc.identifiers.id,
-    );
-    loaded.value = true;
+  genericDocs.value = fetchedGenericDocs.filter(
+    (doc) =>
+      !documentClasses.includes(props.workflow?.relatedEntityClass || "") ||
+      props.workflow?.relatedEntityId !== doc.identifiers.id,
+  );
+  loaded.value = true;
 });
 
 const textFilter = ref<string>("");
@@ -62,229 +61,213 @@ const dateToFilter = ref<string | null>(null);
 const placesFilter = ref<string[]>([]);
 
 const availablePlaces = computed<string[]>(() => {
-    const places = new Set<string>(
-        genericDocs.value.map((genericDoc: GenericDoc) => genericDoc.key),
-    );
+  const places = new Set<string>(
+    genericDocs.value.map((genericDoc: GenericDoc) => genericDoc.key),
+  );
 
-    return Array.from(places).sort((a, b) => (a < b ? -1 : a === b ? 0 : 1));
+  return Array.from(places).sort((a, b) => (a < b ? -1 : a === b ? 0 : 1));
 });
 
 const placeTrans = (str: string): string => {
-    switch (str) {
-        case "accompanying_course_document":
-            return "Documents du parcours";
-        case "person_document":
-            return "Documents de l'usager";
-        case "accompanying_period_calendar_document":
-            return "Document des rendez-vous des parcours";
-        case "accompanying_period_activity_document":
-            return "Document des échanges des parcours";
-        case "accompanying_period_work_evaluation_document":
-            return "Document des actions d'accompagnement";
-        default:
-            return str;
-    }
+  switch (str) {
+    case "accompanying_course_document":
+      return "Documents du parcours";
+    case "person_document":
+      return "Documents de l'usager";
+    case "accompanying_period_calendar_document":
+      return "Document des rendez-vous des parcours";
+    case "accompanying_period_activity_document":
+      return "Document des échanges des parcours";
+    case "accompanying_period_work_evaluation_document":
+      return "Document des actions d'accompagnement";
+    default:
+      return str;
+  }
 };
 
 const onPickDocument = (payload: {
-    genericDoc: GenericDocForAccompanyingPeriod;
+  genericDoc: GenericDocForAccompanyingPeriod;
 }) => emit("pickGenericDoc", payload);
 
 const onRemoveGenericDoc = (payload: {
-    genericDoc: GenericDocForAccompanyingPeriod;
+  genericDoc: GenericDocForAccompanyingPeriod;
 }) => emit("removeGenericDoc", payload);
 
 const filteredDocuments = computed<GenericDocForAccompanyingPeriod[]>(() => {
-    if (false === loaded.value) {
-        return [];
-    }
+  if (false === loaded.value) {
+    return [];
+  }
 
-    return genericDocs.value
-        .filter(
-            (genericDoc: GenericDocForAccompanyingPeriod) =>
-                !props.toRemove
-                    .map((g: GenericDocForAccompanyingPeriod) => g.uniqueKey)
-                    .includes(genericDoc.uniqueKey),
-        )
-        .filter((genericDoc: GenericDocForAccompanyingPeriod) => {
-            if (textFilter.value === "") {
-                return true;
-            }
+  return genericDocs.value
+    .filter(
+      (genericDoc: GenericDocForAccompanyingPeriod) =>
+        !props.toRemove
+          .map((g: GenericDocForAccompanyingPeriod) => g.uniqueKey)
+          .includes(genericDoc.uniqueKey),
+    )
+    .filter((genericDoc: GenericDocForAccompanyingPeriod) => {
+      if (textFilter.value === "") {
+        return true;
+      }
 
-            const needles = textFilter.value
-                .trim()
-                .split(" ")
-                .map((str: string) => str.trim().toLowerCase())
-                .filter((str: string) => str.length > 0);
-            const title: string =
-                "title" in genericDoc.metadata
-                    ? (genericDoc.metadata.title as string)
-                    : "";
-            if (title === "") {
-                return false;
-            }
+      const needles = textFilter.value
+        .trim()
+        .split(" ")
+        .map((str: string) => str.trim().toLowerCase())
+        .filter((str: string) => str.length > 0);
+      const title: string =
+        "title" in genericDoc.metadata
+          ? (genericDoc.metadata.title as string)
+          : "";
+      if (title === "") {
+        return false;
+      }
 
-            return needles.every((n: string) =>
-                title.toLowerCase().includes(n),
-            );
-        })
-        .filter((genericDoc: GenericDocForAccompanyingPeriod) => {
-            if (placesFilter.value.length === 0) {
-                return true;
-            }
+      return needles.every((n: string) => title.toLowerCase().includes(n));
+    })
+    .filter((genericDoc: GenericDocForAccompanyingPeriod) => {
+      if (placesFilter.value.length === 0) {
+        return true;
+      }
 
-            return placesFilter.value.includes(genericDoc.key);
-        })
-        .filter((genericDoc: GenericDocForAccompanyingPeriod) => {
-            if (dateToFilter.value === null) {
-                return true;
-            }
+      return placesFilter.value.includes(genericDoc.key);
+    })
+    .filter((genericDoc: GenericDocForAccompanyingPeriod) => {
+      if (dateToFilter.value === null) {
+        return true;
+      }
 
-            return genericDoc.doc_date.datetime8601 < dateToFilter.value;
-        })
-        .filter((genericDoc: GenericDocForAccompanyingPeriod) => {
-            if (dateFromFilter.value === null) {
-                return true;
-            }
+      return genericDoc.doc_date.datetime8601 < dateToFilter.value;
+    })
+    .filter((genericDoc: GenericDocForAccompanyingPeriod) => {
+      if (dateFromFilter.value === null) {
+        return true;
+      }
 
-            return genericDoc.doc_date.datetime8601 > dateFromFilter.value;
-        });
+      return genericDoc.doc_date.datetime8601 > dateFromFilter.value;
+    });
 });
 </script>
 
 <template>
-    <div v-if="loaded">
-        <div>
-            <form name="f" method="get">
-                <div class="accordion my-3" id="filterOrderAccordion">
-                    <h2 class="accordion-header" id="filterOrderHeading">
-                        <button
-                            class="accordion-button"
-                            type="button"
-                            data-bs-toggle="collapse"
-                            data-bs-target="#filterOrderCollapse"
-                            aria-expanded="true"
-                            aria-controls="filterOrderCollapse"
-                        >
-                            <strong
-                                ><i class="fa fa-fw fa-filter"></i>Filtrer la
-                                liste</strong
-                            >
-                        </button>
-                    </h2>
-                    <div
-                        class="accordion-collapse collapse"
-                        id="filterOrderCollapse"
-                        aria-labelledby="filterOrderHeading"
-                        data-bs-parent="#filterOrderAccordion"
-                        style=""
-                    >
-                        <div
-                            class="accordion-body chill_filter_order container-xxl p-5 py-2"
-                        >
-                            <div class="row my-2">
-                                <div class="col-sm-12">
-                                    <div class="input-group">
-                                        <input
-                                            v-model="textFilter"
-                                            type="search"
-                                            id="f_q"
-                                            name="f[q]"
-                                            placeholder="Chercher dans la liste"
-                                            class="form-control"
-                                        />
-                                        <button
-                                            type="submit"
-                                            class="btn btn-misc"
-                                        >
-                                            <i class="fa fa-search"></i>
-                                        </button>
-                                    </div>
-                                </div>
-                            </div>
-
-                            <div class="row my-2">
-                                <legend
-                                    class="col-form-label col-sm-4 required"
-                                >
-                                    Date du document
-                                </legend>
-                                <div class="col-sm-8 pt-1">
-                                    <div class="input-group">
-                                        <span class="input-group-text">Du</span>
-                                        <input
-                                            v-model="dateFromFilter"
-                                            type="date"
-                                            id="f_dateRanges_dateRange_from"
-                                            name="f[dateRanges][dateRange][from]"
-                                            class="form-control"
-                                        />
-                                        <span class="input-group-text">Au</span>
-                                        <input
-                                            v-model="dateToFilter"
-                                            type="date"
-                                            id="f_dateRanges_dateRange_to"
-                                            name="f[dateRanges][dateRange][to]"
-                                            class="form-control"
-                                        />
-                                    </div>
-                                </div>
-                            </div>
-
-                            <div class="row my-2">
-                                <div class="col-sm-4 col-form-label">
-                                    Filtrer par
-                                </div>
-                                <div class="col-sm-8 pt-2">
-                                    <div
-                                        class="form-check"
-                                        v-for="p in availablePlaces"
-                                        :key="p"
-                                    >
-                                        <input
-                                            type="checkbox"
-                                            v-model="placesFilter"
-                                            name="f[checkboxes][places][]"
-                                            class="form-check-input"
-                                            :value="p"
-                                        />
-                                        <label class="form-check-label">{{
-                                            placeTrans(p)
-                                        }}</label>
-                                    </div>
-                                </div>
-                            </div>
-                        </div>
-                    </div>
-                </div>
-            </form>
-        </div>
-
-        <div v-if="genericDocs.length > 0" class="flex-table chill-task-list">
-            <pick-generic-doc-item
-                v-for="g in filteredDocuments"
-                :key="g.uniqueKey"
-                :accompanying-period-id="accompanyingPeriodId"
-                :genericDoc="g"
-                :is-picked="isPicked(g)"
-                @pickGenericDoc="onPickDocument"
-                @removeGenericDoc="onRemoveGenericDoc"
-            ></pick-generic-doc-item>
-        </div>
-        <div v-else class="text-center chill-no-data-statement">
-            Aucun document dans ce parcours
-        </div>
-    </div>
-    <div v-else>
-        <div class="d-flex align-items-center">
-            <strong>Chargement…</strong>
+  <div v-if="loaded">
+    <div>
+      <form name="f" method="get">
+        <div class="accordion my-3" id="filterOrderAccordion">
+          <h2 class="accordion-header" id="filterOrderHeading">
+            <button
+              class="accordion-button"
+              type="button"
+              data-bs-toggle="collapse"
+              data-bs-target="#filterOrderCollapse"
+              aria-expanded="true"
+              aria-controls="filterOrderCollapse"
+            >
+              <strong
+                ><i class="fa fa-fw fa-filter"></i>Filtrer la liste</strong
+              >
+            </button>
+          </h2>
+          <div
+            class="accordion-collapse collapse"
+            id="filterOrderCollapse"
+            aria-labelledby="filterOrderHeading"
+            data-bs-parent="#filterOrderAccordion"
+            style=""
+          >
             <div
-                class="spinner-border ms-auto"
-                role="status"
-                aria-hidden="true"
-            ></div>
+              class="accordion-body chill_filter_order container-xxl p-5 py-2"
+            >
+              <div class="row my-2">
+                <div class="col-sm-12">
+                  <div class="input-group">
+                    <input
+                      v-model="textFilter"
+                      type="search"
+                      id="f_q"
+                      name="f[q]"
+                      placeholder="Chercher dans la liste"
+                      class="form-control"
+                    />
+                    <button type="submit" class="btn btn-misc">
+                      <i class="fa fa-search"></i>
+                    </button>
+                  </div>
+                </div>
+              </div>
+
+              <div class="row my-2">
+                <legend class="col-form-label col-sm-4 required">
+                  Date du document
+                </legend>
+                <div class="col-sm-8 pt-1">
+                  <div class="input-group">
+                    <span class="input-group-text">Du</span>
+                    <input
+                      v-model="dateFromFilter"
+                      type="date"
+                      id="f_dateRanges_dateRange_from"
+                      name="f[dateRanges][dateRange][from]"
+                      class="form-control"
+                    />
+                    <span class="input-group-text">Au</span>
+                    <input
+                      v-model="dateToFilter"
+                      type="date"
+                      id="f_dateRanges_dateRange_to"
+                      name="f[dateRanges][dateRange][to]"
+                      class="form-control"
+                    />
+                  </div>
+                </div>
+              </div>
+
+              <div class="row my-2">
+                <div class="col-sm-4 col-form-label">Filtrer par</div>
+                <div class="col-sm-8 pt-2">
+                  <div class="form-check" v-for="p in availablePlaces" :key="p">
+                    <input
+                      type="checkbox"
+                      v-model="placesFilter"
+                      name="f[checkboxes][places][]"
+                      class="form-check-input"
+                      :value="p"
+                    />
+                    <label class="form-check-label">{{ placeTrans(p) }}</label>
+                  </div>
+                </div>
+              </div>
+            </div>
+          </div>
         </div>
+      </form>
     </div>
+
+    <div v-if="genericDocs.length > 0" class="flex-table chill-task-list">
+      <pick-generic-doc-item
+        v-for="g in filteredDocuments"
+        :key="g.uniqueKey"
+        :accompanying-period-id="accompanyingPeriodId"
+        :genericDoc="g"
+        :is-picked="isPicked(g)"
+        @pickGenericDoc="onPickDocument"
+        @removeGenericDoc="onRemoveGenericDoc"
+      ></pick-generic-doc-item>
+    </div>
+    <div v-else class="text-center chill-no-data-statement">
+      Aucun document dans ce parcours
+    </div>
+  </div>
+  <div v-else>
+    <div class="d-flex align-items-center">
+      <strong>Chargement…</strong>
+      <div
+        class="spinner-border ms-auto"
+        role="status"
+        aria-hidden="true"
+      ></div>
+    </div>
+  </div>
 </template>
 
 <style scoped lang="scss"></style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/PickGenericDocModal.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/PickGenericDocModal.vue
index adaa4c825..c30afa5dc 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/PickGenericDocModal.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/PickGenericDocModal.vue
@@ -6,20 +6,20 @@ import { GenericDocForAccompanyingPeriod } from "ChillDocStoreAssets/types/gener
 import { EntityWorkflow } from "ChillMainAssets/types";
 
 interface PickGenericDocModalProps {
-    workflow: EntityWorkflow | null;
-    accompanyingPeriodId: number;
-    toRemove: GenericDocForAccompanyingPeriod[];
+  workflow: EntityWorkflow | null;
+  accompanyingPeriodId: number;
+  toRemove: GenericDocForAccompanyingPeriod[];
 }
 
 type PickGenericDocType = InstanceType<typeof PickGenericDoc>;
 
 const props = defineProps<PickGenericDocModalProps>();
 const emit = defineEmits<{
-    // eslint-disable-next-line @typescript-eslint/prefer-function-type
-    (
-        e: "pickGenericDoc",
-        payload: { genericDoc: GenericDocForAccompanyingPeriod },
-    ): void;
+  // eslint-disable-next-line @typescript-eslint/prefer-function-type
+  (
+    e: "pickGenericDoc",
+    payload: { genericDoc: GenericDocForAccompanyingPeriod },
+  ): void;
 }>();
 const picker = useTemplateRef<PickGenericDocType>("picker");
 const modalOpened = ref<boolean>(false);
@@ -29,88 +29,88 @@ const modalClasses = { "modal-xl": true, "modal-dialog-scrollable": true };
 const numberOfPicked = computed<number>(() => pickeds.value.length);
 
 const onPicked = ({
-    genericDoc,
+  genericDoc,
 }: {
-    genericDoc: GenericDocForAccompanyingPeriod;
+  genericDoc: GenericDocForAccompanyingPeriod;
 }) => {
-    pickeds.value.push(genericDoc);
+  pickeds.value.push(genericDoc);
 };
 
 const onRemove = ({
-    genericDoc,
+  genericDoc,
 }: {
-    genericDoc: GenericDocForAccompanyingPeriod;
+  genericDoc: GenericDocForAccompanyingPeriod;
 }) => {
-    const index = pickeds.value.findIndex(
-        (item) => item.uniqueKey === genericDoc.uniqueKey,
-    );
+  const index = pickeds.value.findIndex(
+    (item) => item.uniqueKey === genericDoc.uniqueKey,
+  );
 
-    if (index === -1) {
-        throw new Error("Remove generic doc that doesn't exist");
-    }
+  if (index === -1) {
+    throw new Error("Remove generic doc that doesn't exist");
+  }
 
-    pickeds.value.splice(index, 1);
+  pickeds.value.splice(index, 1);
 };
 
 const onConfirm = () => {
-    for (let genericDoc of pickeds.value) {
-        emit("pickGenericDoc", { genericDoc });
-    }
-    pickeds.value = [];
-    closeModal();
+  for (let genericDoc of pickeds.value) {
+    emit("pickGenericDoc", { genericDoc });
+  }
+  pickeds.value = [];
+  closeModal();
 };
 
 const closeModal = function () {
-    modalOpened.value = false;
+  modalOpened.value = false;
 };
 
 const openModal = function () {
-    modalOpened.value = true;
+  modalOpened.value = true;
 };
 
 defineExpose({ openModal, closeModal });
 </script>
 
 <template>
-    <modal
-        v-if="modalOpened"
-        @close="closeModal"
-        :modal-dialog-class="modalClasses"
-    >
-        <template v-slot:header>
-            <h2 class="modal-title">Ajouter une pièce jointe</h2>
-        </template>
-        <template v-slot:body>
-            <pick-generic-doc
-                :workflow="props.workflow"
-                :accompanying-period-id="props.accompanyingPeriodId"
-                :to-remove="props.toRemove"
-                :picked-list="pickeds"
-                ref="picker"
-                @pickGenericDoc="onPicked"
-                @removeGenericDoc="onRemove"
-            ></pick-generic-doc>
-        </template>
-        <template v-slot:footer>
-            <ul v-if="numberOfPicked > 0" class="record_actions">
-                <li>
-                    <button
-                        type="button"
-                        class="btn btn-chill-green text-white"
-                        @click="onConfirm"
-                    >
-                        <template v-if="numberOfPicked > 1">
-                            <i class="fa fa-plus"></i> Ajouter
-                            {{ numberOfPicked }} pièces jointes
-                        </template>
-                        <template v-else>
-                            <i class="fa fa-plus"></i> Ajouter une pièce jointe
-                        </template>
-                    </button>
-                </li>
-            </ul>
-        </template>
-    </modal>
+  <modal
+    v-if="modalOpened"
+    @close="closeModal"
+    :modal-dialog-class="modalClasses"
+  >
+    <template v-slot:header>
+      <h2 class="modal-title">Ajouter une pièce jointe</h2>
+    </template>
+    <template v-slot:body>
+      <pick-generic-doc
+        :workflow="props.workflow"
+        :accompanying-period-id="props.accompanyingPeriodId"
+        :to-remove="props.toRemove"
+        :picked-list="pickeds"
+        ref="picker"
+        @pickGenericDoc="onPicked"
+        @removeGenericDoc="onRemove"
+      ></pick-generic-doc>
+    </template>
+    <template v-slot:footer>
+      <ul v-if="numberOfPicked > 0" class="record_actions">
+        <li>
+          <button
+            type="button"
+            class="btn btn-chill-green text-white"
+            @click="onConfirm"
+          >
+            <template v-if="numberOfPicked > 1">
+              <i class="fa fa-plus"></i> Ajouter {{ numberOfPicked }} pièces
+              jointes
+            </template>
+            <template v-else>
+              <i class="fa fa-plus"></i> Ajouter une pièce jointe
+            </template>
+          </button>
+        </li>
+      </ul>
+    </template>
+  </modal>
 </template>
 
 <style scoped lang="scss"></style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/GenderIconRenderBox.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/GenderIconRenderBox.vue
index 6b11d400f..318d4faaa 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/GenderIconRenderBox.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/GenderIconRenderBox.vue
@@ -5,7 +5,7 @@
 <script setup lang="ts">
 import { computed } from "vue";
 import type { Gender } from "ChillMainAssets/types";
-import {toGenderTranslation} from "ChillMainAssets/lib/api/genderHelper";
+import { toGenderTranslation } from "ChillMainAssets/lib/api/genderHelper";
 
 interface GenderIconRenderBoxProps {
   gender: Gender;
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/EntityWorkflowVueSubscriber.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/EntityWorkflowVueSubscriber.vue
index a9e5348ea..63f762302 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/EntityWorkflowVueSubscriber.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/EntityWorkflowVueSubscriber.vue
@@ -1,79 +1,71 @@
 <template>
-    <div class="d-grid gap-2 my-3">
-        <button
-            class="btn btn-outline-primary text-start d-flex align-items-center"
-            :class="{ active: subscriberFinal }"
-            type="button"
-            @click="
-                subscribeTo(
-                    subscriberFinal ? 'unsubscribe' : 'subscribe',
-                    'final',
-                )
-            "
-        >
-            <i
-                class="fa fa-fw me-2"
-                :class="subscriberFinal ? 'fa-check-square-o' : 'fa-square-o'"
-            ></i>
-            <span>{{ trans(WORKFLOW_SUBSCRIBE_FINAL) }}</span>
-        </button>
-        <button
-            class="btn btn-outline-primary text-start d-flex align-items-center"
-            :class="{ active: subscriberStep }"
-            type="button"
-            @click="
-                subscribeTo(
-                    subscriberStep ? 'unsubscribe' : 'subscribe',
-                    'step',
-                )
-            "
-        >
-            <i
-                class="fa fa-fw me-2"
-                :class="subscriberStep ? 'fa-check-square-o' : 'fa-square-o'"
-            ></i>
-            <span>{{ trans(WORKFLOW_SUBSCRIBE_ALL_STEPS) }}</span>
-        </button>
-    </div>
+  <div class="d-grid gap-2 my-3">
+    <button
+      class="btn btn-outline-primary text-start d-flex align-items-center"
+      :class="{ active: subscriberFinal }"
+      type="button"
+      @click="
+        subscribeTo(subscriberFinal ? 'unsubscribe' : 'subscribe', 'final')
+      "
+    >
+      <i
+        class="fa fa-fw me-2"
+        :class="subscriberFinal ? 'fa-check-square-o' : 'fa-square-o'"
+      ></i>
+      <span>{{ trans(WORKFLOW_SUBSCRIBE_FINAL) }}</span>
+    </button>
+    <button
+      class="btn btn-outline-primary text-start d-flex align-items-center"
+      :class="{ active: subscriberStep }"
+      type="button"
+      @click="subscribeTo(subscriberStep ? 'unsubscribe' : 'subscribe', 'step')"
+    >
+      <i
+        class="fa fa-fw me-2"
+        :class="subscriberStep ? 'fa-check-square-o' : 'fa-square-o'"
+      ></i>
+      <span>{{ trans(WORKFLOW_SUBSCRIBE_ALL_STEPS) }}</span>
+    </button>
+  </div>
 </template>
 
 <script setup>
 import { makeFetch } from "ChillMainAssets/lib/api/apiMethods.ts";
 import { defineProps, defineEmits } from "vue";
 import {
-    trans,
-    WORKFLOW_SUBSCRIBE_FINAL,
-    WORKFLOW_SUBSCRIBE_ALL_STEPS,
+  trans,
+  WORKFLOW_SUBSCRIBE_FINAL,
+  WORKFLOW_SUBSCRIBE_ALL_STEPS,
 } from "translator";
 
 // props
 const props = defineProps({
-    entityWorkflowId: {
-        type: Number,
-        required: true,
-    },
-    subscriberStep: {
-        type: Boolean,
-        required: true,
-    },
-    subscriberFinal: {
-        type: Boolean,
-        required: true,
-    },
+  entityWorkflowId: {
+    type: Number,
+    required: true,
+  },
+  subscriberStep: {
+    type: Boolean,
+    required: true,
+  },
+  subscriberFinal: {
+    type: Boolean,
+    required: true,
+  },
 });
 
 //methods
 const subscribeTo = (step, to) => {
-    let params = new URLSearchParams();
-    params.set("subscribe", to);
+  let params = new URLSearchParams();
+  params.set("subscribe", to);
 
-    const url =
-        `/api/1.0/main/workflow/${props.entityWorkflowId}/${step}?` +
-        params.toString();
+  const url =
+    `/api/1.0/main/workflow/${props.entityWorkflowId}/${step}?` +
+    params.toString();
 
-    makeFetch("POST", url).then((response) => {
-        emit("subscriptionUpdated", response);
-    });
+  makeFetch("POST", url).then((response) => {
+    emit("subscriptionUpdated", response);
+  });
 };
 
 // emit
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
index 5df424de7..4ea96bbe9 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Modal.vue
@@ -1,42 +1,39 @@
 <template>
-    <transition name="modal">
-        <div class="modal-mask">
-            <!-- :: styles bootstrap :: -->
-            <div
-                class="modal fade show"
-                style="display: block"
-                aria-modal="true"
-                role="dialog"
-            >
-                <div class="modal-dialog" :class="props.modalDialogClass || {}">
-                    <div class="modal-content">
-                        <div class="modal-header">
-                            <slot name="header"></slot>
-                            <button class="close btn" @click="emits('close')">
-                                <i class="fa fa-times" aria-hidden="true"></i>
-                            </button>
-                        </div>
-                        <div class="modal-body">
-                            <div class="body-head">
-                                <slot name="body-head"></slot>
-                            </div>
-                            <slot name="body"></slot>
-                        </div>
-                        <div class="modal-footer" v-if="!hideFooter">
-                            <button
-                                class="btn btn-cancel"
-                                @click="emits('close')"
-                            >
-                                {{ trans(MODAL_ACTION_CLOSE) }}
-                            </button>
-                            <slot name="footer"></slot>
-                        </div>
-                    </div>
-                </div>
+  <transition name="modal">
+    <div class="modal-mask">
+      <!-- :: styles bootstrap :: -->
+      <div
+        class="modal fade show"
+        style="display: block"
+        aria-modal="true"
+        role="dialog"
+      >
+        <div class="modal-dialog" :class="props.modalDialogClass || {}">
+          <div class="modal-content">
+            <div class="modal-header">
+              <slot name="header"></slot>
+              <button class="close btn" @click="emits('close')">
+                <i class="fa fa-times" aria-hidden="true"></i>
+              </button>
             </div>
-            <!-- :: end styles bootstrap :: -->
+            <div class="modal-body">
+              <div class="body-head">
+                <slot name="body-head"></slot>
+              </div>
+              <slot name="body"></slot>
+            </div>
+            <div class="modal-footer" v-if="!hideFooter">
+              <button class="btn btn-cancel" @click="emits('close')">
+                {{ trans(MODAL_ACTION_CLOSE) }}
+              </button>
+              <slot name="footer"></slot>
+            </div>
+          </div>
         </div>
-    </transition>
+      </div>
+      <!-- :: end styles bootstrap :: -->
+    </div>
+  </transition>
 </template>
 
 <script lang="ts" setup>
@@ -53,10 +50,10 @@ import { trans, MODAL_ACTION_CLOSE } from "translator";
 import { defineProps } from "vue";
 
 defineSlots<{
-  header?: () => any,
-  body?: () => any,
-  footer?: () => any,
-  "body-head"?: () => any,
+  header?: () => any;
+  body?: () => any;
+  footer?: () => any;
+  "body-head"?: () => any;
 }>();
 
 export interface ModalProps {
@@ -72,7 +69,7 @@ const props = withDefaults(defineProps<ModalProps>(), {
 });
 
 const emits = defineEmits<{
-    close: [];
+  close: [];
 }>();
 </script>
 
@@ -81,19 +78,19 @@ const emits = defineEmits<{
     * This is a mask behind the modal.
     */
 .modal-mask {
-    position: fixed;
-    z-index: 9998;
-    top: 0;
-    left: 0;
-    width: 100%;
-    height: 100%;
-    background-color: rgba(0, 0, 0, 0.75);
-    transition: opacity 0.3s ease;
+  position: fixed;
+  z-index: 9998;
+  top: 0;
+  left: 0;
+  width: 100%;
+  height: 100%;
+  background-color: rgba(0, 0, 0, 0.75);
+  transition: opacity 0.3s ease;
 }
 .modal-header .close {
-    border-top-right-radius: 0.3rem;
-    margin-right: 0;
-    margin-left: auto;
+  border-top-right-radius: 0.3rem;
+  margin-right: 0;
+  margin-left: auto;
 }
 /*
    * The following styles are auto-applied to elements with
@@ -104,23 +101,23 @@ const emits = defineEmits<{
    * these styles.
    */
 .modal-enter {
-    opacity: 0;
+  opacity: 0;
 }
 .modal-leave-active {
-    opacity: 0;
+  opacity: 0;
 }
 .modal-enter .modal-container,
 .modal-leave-active .modal-container {
-    -webkit-transform: scale(1.1);
-    transform: scale(1.1);
+  -webkit-transform: scale(1.1);
+  transform: scale(1.1);
 }
 h3.modal-title {
-    font-size: 1.5rem;
-    font-weight: bold;
+  font-size: 1.5rem;
+  font-weight: bold;
 }
 div.modal-footer {
-    button:first-child {
-        margin-right: auto;
-    }
+  button:first-child {
+    margin-right: auto;
+  }
 }
 </style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/WaitingScreen.vue b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/WaitingScreen.vue
index 963db5e81..ea12b1577 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/WaitingScreen.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/WaitingScreen.vue
@@ -2,61 +2,61 @@
 import { WaitingScreenState } from "ChillMainAssets/types";
 
 interface Props {
-    state: WaitingScreenState;
+  state: WaitingScreenState;
 }
 
 const props = defineProps<Props>();
 </script>
 
 <template>
-    <div id="waiting-screen">
-        <div
-            v-if="props.state === 'pending' && !!$slots.pending"
-            class="alert alert-danger text-center"
-        >
-            <div>
-                <slot name="pending"></slot>
-            </div>
+  <div id="waiting-screen">
+    <div
+      v-if="props.state === 'pending' && !!$slots.pending"
+      class="alert alert-danger text-center"
+    >
+      <div>
+        <slot name="pending"></slot>
+      </div>
 
-            <div>
-                <i class="fa fa-cog fa-spin fa-3x fa-fw"></i>
-                <span class="sr-only">Loading...</span>
-            </div>
-        </div>
-
-        <div
-            v-if="props.state === 'stopped' && !!$slots.stopped"
-            class="alert alert-info"
-        >
-            <div>
-                <slot name="stopped"></slot>
-            </div>
-        </div>
-
-        <div
-            v-if="props.state === 'failure' && !!$slots.failure"
-            class="alert alert-danger text-center"
-        >
-            <div>
-                <slot name="failure"></slot>
-            </div>
-        </div>
-
-        <div
-            v-if="props.state === 'ready' && !!$slots.ready"
-            class="alert alert-success text-center"
-        >
-            <div>
-                <slot name="ready"></slot>
-            </div>
-        </div>
+      <div>
+        <i class="fa fa-cog fa-spin fa-3x fa-fw"></i>
+        <span class="sr-only">Loading...</span>
+      </div>
     </div>
+
+    <div
+      v-if="props.state === 'stopped' && !!$slots.stopped"
+      class="alert alert-info"
+    >
+      <div>
+        <slot name="stopped"></slot>
+      </div>
+    </div>
+
+    <div
+      v-if="props.state === 'failure' && !!$slots.failure"
+      class="alert alert-danger text-center"
+    >
+      <div>
+        <slot name="failure"></slot>
+      </div>
+    </div>
+
+    <div
+      v-if="props.state === 'ready' && !!$slots.ready"
+      class="alert alert-success text-center"
+    >
+      <div>
+        <slot name="ready"></slot>
+      </div>
+    </div>
+  </div>
 </template>
 
 <style scoped lang="scss">
 #waiting-screen {
-    > .alert {
-        min-height: 350px;
-    }
+  > .alert {
+    min-height: 350px;
+  }
 }
 </style>
diff --git a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_composables/violationList.ts b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_composables/violationList.ts
index 328972e1b..b8af0b519 100644
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_composables/violationList.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_composables/violationList.ts
@@ -1,23 +1,25 @@
-import {ref} from "vue";
-import {ValidationExceptionInterface} from "ChillMainAssets/types";
+import { ref } from "vue";
+import { ValidationExceptionInterface } from "ChillMainAssets/types";
 
-export function useViolationList<T extends Record<string, Record<string, string>>>() {
+export function useViolationList<
+  T extends Record<string, Record<string, string>>,
+>() {
   type ViolationKey = Extract<keyof T, string>;
-  const violationsList = ref<ValidationExceptionInterface<T>|null>(null);
+  const violationsList = ref<ValidationExceptionInterface<T> | null>(null);
 
   function violationTitles<P extends ViolationKey>(property: P): string[] {
     if (null === violationsList.value) {
       return [];
     }
-    const r = violationsList.value.violationsByNormalizedProperty(property).map((v) => v.title);
-
+    const r = violationsList.value
+      .violationsByNormalizedProperty(property)
+      .map((v) => v.title);
 
     return r;
-
   }
   function violationTitlesWithParameter<
     P extends ViolationKey,
-    Param extends Extract<keyof T[P], string>
+    Param extends Extract<keyof T[P], string>,
   >(
     property: P,
     with_parameter: Param,
@@ -26,26 +28,38 @@ export function useViolationList<T extends Record<string, Record<string, string>
     if (violationsList.value === null) {
       return [];
     }
-    return violationsList.value.violationsByNormalizedPropertyAndParams(property, with_parameter, with_parameter_value)
+    return violationsList.value
+      .violationsByNormalizedPropertyAndParams(
+        property,
+        with_parameter,
+        with_parameter_value,
+      )
       .map((v) => v.title);
   }
 
-
   function hasViolation<P extends ViolationKey>(property: P): boolean {
     return violationTitles(property).length > 0;
   }
   function hasViolationWithParameter<
     P extends ViolationKey,
-    Param extends Extract<keyof T[P], string>
+    Param extends Extract<keyof T[P], string>,
   >(
     property: P,
     with_parameter: Param,
     with_parameter_value: T[P][Param],
   ): boolean {
-    return violationTitlesWithParameter(property, with_parameter, with_parameter_value).length > 0;
+    return (
+      violationTitlesWithParameter(
+        property,
+        with_parameter,
+        with_parameter_value,
+      ).length > 0
+    );
   }
 
-  function setValidationException<V extends ValidationExceptionInterface<T>>(validationException: V): void {
+  function setValidationException<V extends ValidationExceptionInterface<T>>(
+    validationException: V,
+  ): void {
     violationsList.value = validationException;
   }
 
@@ -53,5 +67,12 @@ export function useViolationList<T extends Record<string, Record<string, string>
     violationsList.value = null;
   }
 
-  return {violationTitles, violationTitlesWithParameter, setValidationException, cleanException, hasViolationWithParameter, hasViolation};
+  return {
+    violationTitles,
+    violationTitlesWithParameter,
+    setValidationException,
+    cleanException,
+    hasViolationWithParameter,
+    hasViolation,
+  };
 }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/types.ts b/src/Bundle/ChillPersonBundle/Resources/public/types.ts
index 4523325e8..71906cfb3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/types.ts
+++ b/src/Bundle/ChillPersonBundle/Resources/public/types.ts
@@ -14,7 +14,8 @@ import {
   DateTimeWrite,
   SetGender,
   SetCenter,
-  SetCivility, Gender,
+  SetCivility,
+  Gender,
 } from "ChillMainAssets/types";
 import { StoredObject } from "ChillDocStoreAssets/types";
 import { Thirdparty } from "../../../ChillThirdPartyBundle/Resources/public/types";
@@ -157,16 +158,16 @@ export interface AccompanyingPeriod {
 }
 
 export interface AccompanyingPeriodWorkEvaluationDocument {
-    id: number;
-    type: "accompanying_period_work_evaluation_document";
-    storedObject: StoredObject;
-    title: string;
-    createdAt: DateTime | null;
-    createdBy: User | null;
-    updatedAt: DateTime | null;
-    updatedBy: User | null;
-    workflows_availables: WorkflowAvailable[];
-    workflows: object[];
+  id: number;
+  type: "accompanying_period_work_evaluation_document";
+  storedObject: StoredObject;
+  title: string;
+  createdAt: DateTime | null;
+  createdBy: User | null;
+  updatedAt: DateTime | null;
+  updatedBy: User | null;
+  workflows_availables: WorkflowAvailable[];
+  workflows: object[];
 }
 
 export interface AccompanyingPeriodWork {
@@ -195,139 +196,139 @@ export interface AccompanyingPeriodWork {
 }
 
 interface SocialAction {
-    id: number;
-    parent?: SocialAction | null;
-    children: SocialAction[];
-    issue?: SocialIssue | null;
-    ordering: number;
-    title: {
-        fr: string;
-    };
-    text: string;
-    defaultNotificationDelay?: string | null;
-    desactivationDate?: string | null;
-    evaluations: Evaluation[];
-    goals: Goal[];
-    results: Result[];
+  id: number;
+  parent?: SocialAction | null;
+  children: SocialAction[];
+  issue?: SocialIssue | null;
+  ordering: number;
+  title: {
+    fr: string;
+  };
+  text: string;
+  defaultNotificationDelay?: string | null;
+  desactivationDate?: string | null;
+  evaluations: Evaluation[];
+  goals: Goal[];
+  results: Result[];
 }
 
 export interface AccompanyingPeriodResource {
-    id: number;
-    accompanyingPeriod: AccompanyingPeriod;
-    comment?: string | null;
-    person?: Person | null;
-    thirdParty?: Thirdparty | null;
+  id: number;
+  accompanyingPeriod: AccompanyingPeriod;
+  comment?: string | null;
+  person?: Person | null;
+  thirdParty?: Thirdparty | null;
 }
 
 export interface Origin {
-    id: number;
-    label: {
-        fr: string;
-    };
-    noActiveAfter: DateTime;
+  id: number;
+  label: {
+    fr: string;
+  };
+  noActiveAfter: DateTime;
 }
 
 export interface ClosingMotive {
-    id: number;
-    active: boolean;
-    name: {
-        fr: string;
-    };
-    ordering: number;
-    isCanceledAccompanyingPeriod: boolean;
-    parent?: ClosingMotive | null;
-    children: ClosingMotive[];
+  id: number;
+  active: boolean;
+  name: {
+    fr: string;
+  };
+  ordering: number;
+  isCanceledAccompanyingPeriod: boolean;
+  parent?: ClosingMotive | null;
+  children: ClosingMotive[];
 }
 
 export interface AccompanyingPeriodParticipation {
-    id: number;
-    startDate: DateTime;
-    endDate?: DateTime | null;
-    accompanyingPeriod: AccompanyingPeriod;
-    person: Person;
+  id: number;
+  startDate: DateTime;
+  endDate?: DateTime | null;
+  accompanyingPeriod: AccompanyingPeriod;
+  person: Person;
 }
 
 export interface AccompanyingPeriodLocationHistory {
-    id: number;
-    startDate: DateTime;
-    endDate?: DateTime | null;
-    addressLocation?: Address | null;
-    period: AccompanyingPeriod;
-    personLocation?: Person | null;
+  id: number;
+  startDate: DateTime;
+  endDate?: DateTime | null;
+  addressLocation?: Address | null;
+  period: AccompanyingPeriod;
+  personLocation?: Person | null;
 }
 
 export interface SocialIssue {
-    id: number;
-    text: string;
-    parent?: SocialIssue | null;
-    children: SocialIssue[];
-    socialActions?: SocialAction[] | null;
-    ordering: number;
-    title: {
-        fr: string;
-    };
-    desactivationDate?: string | null;
+  id: number;
+  text: string;
+  parent?: SocialIssue | null;
+  children: SocialIssue[];
+  socialActions?: SocialAction[] | null;
+  ordering: number;
+  title: {
+    fr: string;
+  };
+  desactivationDate?: string | null;
 }
 
 export interface Goal {
-    id: number;
-    results: Result[];
-    socialActions?: SocialAction[] | null;
-    title: {
-        fr: string;
-    };
+  id: number;
+  results: Result[];
+  socialActions?: SocialAction[] | null;
+  title: {
+    fr: string;
+  };
 }
 
 export interface Result {
-    id: number;
-    accompanyingPeriodWorks: AccompanyingPeriodWork[];
-    accompanyingPeriodWorkGoals: AccompanyingPeriodWorkGoal[];
-    goals: Goal[];
-    socialActions: SocialAction[];
-    title: {
-        fr: string;
-    };
-    desactivationDate?: string | null;
+  id: number;
+  accompanyingPeriodWorks: AccompanyingPeriodWork[];
+  accompanyingPeriodWorkGoals: AccompanyingPeriodWorkGoal[];
+  goals: Goal[];
+  socialActions: SocialAction[];
+  title: {
+    fr: string;
+  };
+  desactivationDate?: string | null;
 }
 
 export interface AccompanyingPeriodWorkGoal {
-    id: number;
-    accompanyingPeriodWork: AccompanyingPeriodWork;
-    goal: Goal;
-    note: string;
-    results: Result[];
+  id: number;
+  accompanyingPeriodWork: AccompanyingPeriodWork;
+  goal: Goal;
+  note: string;
+  results: Result[];
 }
 
 export interface AccompanyingPeriodWorkEvaluation {
-    type: 'accompanying_period_work_evaluation';
-    accompanyingPeriodWork: AccompanyingPeriodWork | null;
-    comment: string;
-    createdAt: DateTime | null;
-    createdBy: User | null;
-    documents: AccompanyingPeriodWorkEvaluationDocument[];
-    endDate: DateTime | null;
-    evaluation: Evaluation | null;
-    id: number | null;
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    key: any;
-    maxDate: DateTime | null;
-    startDate: DateTime | null;
-    updatedAt: DateTime | null;
-    updatedBy: User | null;
-    warningInterval: string | null;
-    timeSpent: number | null;
+  type: "accompanying_period_work_evaluation";
+  accompanyingPeriodWork: AccompanyingPeriodWork | null;
+  comment: string;
+  createdAt: DateTime | null;
+  createdBy: User | null;
+  documents: AccompanyingPeriodWorkEvaluationDocument[];
+  endDate: DateTime | null;
+  evaluation: Evaluation | null;
+  id: number | null;
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  key: any;
+  maxDate: DateTime | null;
+  startDate: DateTime | null;
+  updatedAt: DateTime | null;
+  updatedBy: User | null;
+  warningInterval: string | null;
+  timeSpent: number | null;
 }
 
 export interface Evaluation {
-    id: number;
-    url: string;
-    socialActions: SocialAction[];
-    title: {
-        fr: string;
-    };
-    active: boolean;
-    delay: string;
-    notificationDelay: string;
+  id: number;
+  url: string;
+  socialActions: SocialAction[];
+  title: {
+    fr: string;
+  };
+  active: boolean;
+  delay: string;
+  notificationDelay: string;
 }
 
 export interface Step {
@@ -394,15 +395,15 @@ export interface AccompanyingCourse {
 }
 
 export interface AccompanyingPeriodWorkReferrerHistory {
-    id: number;
-    accompanyingPeriodWork: AccompanyingPeriodWork;
-    user: User;
-    startDate: DateTime;
-    endDate: DateTime | null;
-    createdAt: DateTime;
-    updatedAt: DateTime | null;
-    createdBy: User;
-    updatedBy: User | null;
+  id: number;
+  accompanyingPeriodWork: AccompanyingPeriodWork;
+  user: User;
+  startDate: DateTime;
+  endDate: DateTime | null;
+  createdAt: DateTime;
+  updatedAt: DateTime | null;
+  createdBy: User;
+  updatedBy: User | null;
 }
 
 export interface AccompanyingPeriodWorkEvaluationDocument {
@@ -432,7 +433,7 @@ export type EntityType =
   | "user"
   | "household";
 
-export type Entities = (UserGroup | User | Person | Thirdparty | Household);
+export type Entities = UserGroup | User | Person | Thirdparty | Household;
 
 export function isEntityHousehold(e: Entities): e is Household {
   return e.type === "household";
@@ -440,25 +441,34 @@ export function isEntityHousehold(e: Entities): e is Household {
 
 export type EntitiesOrMe = "me" | Entities;
 
-
 // Type guards to discriminate Suggestions by their result kind
-export function isSuggestionForUserGroup(s: Suggestion): s is Suggestion & { result: UserGroup } {
+export function isSuggestionForUserGroup(
+  s: Suggestion,
+): s is Suggestion & { result: UserGroup } {
   return (s as any)?.result?.type === "user_group";
 }
 
-export function isSuggestionForUser(s: Suggestion): s is Suggestion & { result: User } {
+export function isSuggestionForUser(
+  s: Suggestion,
+): s is Suggestion & { result: User } {
   return (s as any)?.result?.type === "user";
 }
 
-export function isSuggestionForPerson(s: Suggestion): s is Suggestion & { result: Person } {
+export function isSuggestionForPerson(
+  s: Suggestion,
+): s is Suggestion & { result: Person } {
   return (s as any)?.result?.type === "person";
 }
 
-export function isSuggestionForThirdParty(s: Suggestion): s is Suggestion & { result: Thirdparty } {
+export function isSuggestionForThirdParty(
+  s: Suggestion,
+): s is Suggestion & { result: Thirdparty } {
   return (s as any)?.result?.type === "thirdparty";
 }
 
-export function isSuggestionForHousehold(s: Suggestion): s is Suggestion & { result: Household } {
+export function isSuggestionForHousehold(
+  s: Suggestion,
+): s is Suggestion & { result: Household } {
   return (s as any)?.result?.type === "household";
 }
 
@@ -482,7 +492,7 @@ export interface SearchPagination {
 export interface Search {
   count: number;
   pagination: SearchPagination;
-  results: {relevance: number, result: Entities}[];
+  results: { relevance: number; result: Entities }[];
 }
 
 export interface SearchOptions {
@@ -498,7 +508,11 @@ export interface SearchOptions {
   };
 }
 
-type PersonIdentifierPresence = 'NOT_EDITABLE' | 'ON_EDIT' | 'ON_CREATION' | 'REQUIRED';
+type PersonIdentifierPresence =
+  | "NOT_EDITABLE"
+  | "ON_EDIT"
+  | "ON_CREATION"
+  | "REQUIRED";
 
 export interface PersonIdentifierWorker {
   type: "person_identifier_worker";
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue
index 687774a18..74fe0467d 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Confirm.vue
@@ -42,9 +42,7 @@
             </a>
           </li>
           <li>
-            <button
-                            class="btn btn-save"
-                            @click="modal.showModal = true">
+            <button class="btn btn-save" @click="modal.showModal = true">
               {{ $t("confirm.ok") }}
             </button>
           </li>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
index e023c227b..583062275 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/PersonsAssociated.vue
@@ -84,8 +84,12 @@
       <ul class="record_actions">
         <li class="add-persons">
           <add-persons
-            :button-title="trans(ACCOMPANYING_COURSE_PERSONS_ASSOCIATED_ADD_PERSON)"
-            :modal-title="trans(ACCOMPANYING_COURSE_PERSONS_ASSOCIATED_ADD_PERSON)"
+            :button-title="
+              trans(ACCOMPANYING_COURSE_PERSONS_ASSOCIATED_ADD_PERSON)
+            "
+            :modal-title="
+              trans(ACCOMPANYING_COURSE_PERSONS_ASSOCIATED_ADD_PERSON)
+            "
             :key="addPersons.key"
             :options="addPersons.options"
             @add-new-persons="addNewPersons"
@@ -108,7 +112,10 @@ import { mapGetters, mapState } from "vuex";
 import ParticipationItem from "./PersonsAssociated/ParticipationItem.vue";
 import AddPersons from "ChillPersonAssets/vuejs/_components/AddPersons.vue";
 import PersonText from "ChillPersonAssets/vuejs/_components/Entity/PersonText.vue";
-import {ACCOMPANYING_COURSE_PERSONS_ASSOCIATED_ADD_PERSON, trans} from "translator";
+import {
+  ACCOMPANYING_COURSE_PERSONS_ASSOCIATED_ADD_PERSON,
+  trans,
+} from "translator";
 
 export default {
   name: "PersonsAssociated",
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
index 254d527e9..6aad2109e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Requestor.vue
@@ -245,7 +245,7 @@ import Confidential from "ChillMainAssets/vuejs/_components/Confidential.vue";
 import { mapState } from "vuex";
 import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
 import PersonText from "ChillPersonAssets/vuejs/_components/Entity/PersonText.vue";
-import {ACCOMPANYING_COURSE_REQUESTOR_ADD, trans} from "translator";
+import { ACCOMPANYING_COURSE_REQUESTOR_ADD, trans } from "translator";
 
 export default {
   name: "Requestor",
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
index d09bc4fd7..8cf1fccdc 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/Resources.vue
@@ -59,7 +59,7 @@ import { mapState } from "vuex";
 import AddPersons from "ChillPersonAssets/vuejs/_components/AddPersons.vue";
 import ResourceItem from "./Resources/ResourceItem.vue";
 import PersonText from "ChillPersonAssets/vuejs/_components/Entity/PersonText.vue";
-import {ACCOMPANYING_COURSE_RESOURCES_ADD_RESOURCES, trans} from "translator";
+import { ACCOMPANYING_COURSE_RESOURCES_ADD_RESOURCES, trans } from "translator";
 
 export default {
   name: "Resources",
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
index bd888dd3c..6cd65b4a3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/App.vue
@@ -1,497 +1,468 @@
 <template>
-    <div id="workEditor" class="my-4">
-        <div id="title" class="action-row">
-            <div>
-                <p class="wl-item social-issues">
-                    <span class="chill-entity entity-social-issue">
-                        <span class="badge bg-chill-l-gray text-dark">{{
-                            work.socialAction.issue.text
-                        }}</span>
-                    </span>
-                </p>
-            </div>
-            <h2 class="badge-title">
-                <span class="title_label"></span>
-                <span class="title_action">{{ work.socialAction.text }}</span>
-            </h2>
-        </div>
-
-        <div id="startDate" class="action-row">
-            <label class="col-form-label">{{ $t("startDate") }}</label>
-            <input
-                v-model="startDate"
-                type="date"
-                required="true"
-                class="form-control"
-                v-once
-            />
-        </div>
-
-        <div id="endDate" class="action-row">
-            <label class="col-form-label">{{ $t("endDate") }}</label>
-            <input v-model="endDate" type="date" class="form-control" />
-        </div>
-
-        <div id="privateComment" class="action-row">
-            <label class="col-form-label">{{ $t("private_comment") }}</label>
-            <comment-editor v-model="privateComment"></comment-editor>
-        </div>
-
-        <div id="comment" class="action-row">
-            <label class="col-form-label">{{ $t("comments") }}</label>
-            <comment-editor v-model="note"></comment-editor>
-        </div>
-
-        <div id="objectives" class="action-row">
-            <div aria="hidden" class="title">
-                <div>
-                    <h3>{{ $t("goals_title") }}</h3>
-                </div>
-                <div>
-                    <h3>{{ $t("results_title") }}</h3>
-                </div>
-            </div>
-
-            <!-- 1. Goals with results that were already selected/saved to the entity -->
-            <div v-for="g in goalsPicked" :key="g.goal.id">
-                <div class="item-title" @click="removeGoal(g)">
-                    <span class="removable">{{
-                        localizeString(g.goal.title)
-                    }}</span>
-                </div>
-                <div>
-                    <add-result :goal="g.goal" destination="goal"></add-result>
-                </div>
-            </div>
-
-            <!-- 2. Results without objectives that were already selected/saved to the entity -->
-            <div v-if="hasResultsForAction">
-                <div
-                    class="results_without_objective"
-                    style="
-                        background: repeating-linear-gradient(
-                            45deg,
-                            #e6e6e6,
-                            #e6e6e6 10px,
-                            #f3f3f3 0,
-                            #f3f3f3 20px
-                        );
-                    "
-                >
-                    {{ $t("results_without_objective") }}
-                </div>
-                <div>
-                    <add-result
-                        :availableResults="resultsForAction"
-                        destination="action"
-                    ></add-result>
-                </div>
-            </div>
-
-            <!-- 3. Selector for objectives with results -->
-            <div class="accordion" id="expandedSuggestions">
-                <div
-                    v-if="availableForCheckGoal.length > 0"
-                    class="accordion-item"
-                >
-                    <h2
-                        class="accordion-header"
-                        id="heading_expanded_suggestions"
-                    >
-                        <button
-                            v-if="isExpanded"
-                            class="accordion-button"
-                            type="button"
-                            data-bs-toggle="collapse"
-                            aria-expanded="true"
-                            @click="toggleSelect"
-                        >
-                            Masquer
-                        </button>
-
-                        <button
-                            v-else
-                            class="accordion-button collapsed"
-                            type="button"
-                            data-bs-toggle="collapse"
-                            aria-expanded="false"
-                            @click="toggleSelect"
-                        >
-                            Motifs, objectifs et dispositfs disponibles
-                        </button>
-                    </h2>
-                    <div
-                        class="accordion-collapse"
-                        id="collapse_expanded_suggestions"
-                        aria-labelledby="heading_expanded_suggestions"
-                        data-bs-parent="#expandedSuggestions"
-                    >
-                        <template v-if="isExpanded">
-                            <ul class="list-suggest add-items">
-                                <li
-                                    v-for="g in availableForCheckGoal"
-                                    @click="addGoal(g)"
-                                    :key="g.id"
-                                >
-                                    <span>{{ localizeString(g.title) }}</span>
-                                </li>
-                            </ul>
-                        </template>
-                    </div>
-                    <p
-                        v-if="goalsPicked.length === 0"
-                        class="chill-no-data-statement"
-                    >
-                        Aucun objectif associé
-                    </p>
-                </div>
-                <div v-else>
-                    <span class="chill-no-data-statement">{{
-                        $t("no_goals_available")
-                    }}</span>
-                </div>
-            </div>
-
-            <!-- 4. Selector for results without objectives is already included above in section 2 -->
-        </div>
-
-        <div id="evaluations" class="action-row">
-            <div aria="hidden" class="title">
-                <div>
-                    <h3>
-                        {{ $t("Evaluations") }} - {{ $t("Forms") }} -
-                        {{ $t("Post") }}
-                    </h3>
-                </div>
-            </div>
-
-            <!-- list evaluations -->
-            <add-evaluation
-                v-for="e in pickedEvaluations"
-                v-bind:key="e.key"
-                v-bind:evaluation="e"
-                v-bind:docAnchorId="this.docAnchorId"
-            >
-            </add-evaluation>
-
-            <!-- box to add new evaluation -->
-            <div class="add_evaluation">
-                <div v-if="showAddEvaluation">
-                    <p>{{ $t("available_evaluations_text") }}</p>
-                    <ul class="list-suggest add-items">
-                        <li
-                            v-for="e in evaluationsForAction"
-                            @click="addEvaluation(e)"
-                            :key="e.id"
-                        >
-                            <span>{{ localizeString(e.title) }}</span>
-                        </li>
-                    </ul>
-                </div>
-                <ul
-                    class="record_actions"
-                    v-if="evaluationsForAction.length > 0"
-                >
-                    <li>
-                        <button
-                            :title="$t('add_an_evaluation')"
-                            class="btn btn-create"
-                            @click="toggleAddEvaluation"
-                        >
-                            {{ $t("add_an_evaluation") }}
-                        </button>
-                    </li>
-                </ul>
-                <div v-else>
-                    <span class="chill-no-data-statement">{{
-                        $t("no_evaluations_available")
-                    }}</span>
-                </div>
-            </div>
-        </div>
-
-        <div id="persons" class="action-row">
-            <h3 class="mb-3">{{ $t("persons_involved") }}</h3>
-
-            <ul class="list-unstyled">
-                <li v-for="p in personsReachables" :key="p.id">
-                    <div class="form-check">
-                        <input
-                            v-model="personsPicked"
-                            :value="p.id"
-                            type="checkbox"
-                            class="me-2 form-check-input"
-                            :id="'person_check' + p.id"
-                        />
-                        <label
-                            :for="'person_check' + p.id"
-                            class="form-check-label"
-                        >
-                            <person-text :person="p"></person-text>
-                        </label>
-                    </div>
-                </li>
-                <li
-                    v-for="p in getPreviousPersons"
-                    :key="p.id"
-                    class="alert alert-danger"
-                >
-                    <div class="form-check">
-                        <input
-                            v-model="personsPicked"
-                            :value="p.id"
-                            type="checkbox"
-                            class="me-2 form-check-input"
-                            :id="'person_check' + p.id"
-                        />
-                        <label
-                            :for="'person_check' + p.id"
-                            class="form-check-label"
-                        >
-                            <person-text :person="p"></person-text>
-                        </label>
-                    </div>
-                    <span
-                        ><i class="fa fa-warning"></i>&nbsp;{{
-                            $t("warning_previous_persons")
-                        }}</span
-                    >
-                </li>
-            </ul>
-        </div>
-
-        <div id="referrers" class="action-row">
-            <h3>{{ $t("referrers") }}</h3>
-
-            <div v-if="!hasReferrers">
-                <p class="chill-no-data-statement">{{ $t("no_referrers") }}</p>
-            </div>
-
-            <div v-else>
-                <ul class="list-suggest remove-items inline">
-                    <li
-                        v-for="u in referrers"
-                        :key="u.id"
-                        :title="$t('remove_referrer')"
-                        @click="removeReferrer(u)"
-                    >
-                        <span>
-                            {{ u.text }}
-                        </span>
-                    </li>
-                </ul>
-            </div>
-
-            <ul class="record_actions">
-                <li class="add-persons">
-                    <add-persons
-                        ref="referrerPicker"
-                        :key="referrerPicker.key"
-                        :buttonTitle="$t('add_referrers')"
-                        :modalTitle="$t('choose_referrers')"
-                        :options="referrerPicker.options"
-                        @addNewPersons="addReferrers"
-                    >
-                    </add-persons>
-                </li>
-            </ul>
-        </div>
-
-        <div id="handlingThirdParty" class="action-row">
-            <h3>{{ $t("handling_thirdparty") }}</h3>
-
-            <div v-if="!hasHandlingThirdParty">
-                <p class="chill-no-data-statement">
-                    {{ $t("no_handling_thirdparty") }}
-                </p>
-
-                <ul class="record_actions">
-                    <li class="add-persons">
-                        <add-persons
-                            ref="handlingThirdPartyPicker"
-                            v-bind:key="handlingThirdPartyPicker.key"
-                            v-bind:buttonTitle="
-                                $t('precise_handling_thirdparty')
-                            "
-                            v-bind:modalTitle="$t('choose_a_thirdparty')"
-                            v-bind:options="handlingThirdPartyPicker.options"
-                            @addNewPersons="setHandlingThirdParty"
-                        >
-                            <!-- to cast child method -->
-                        </add-persons>
-                    </li>
-                </ul>
-            </div>
-            <div v-else class="flex-table">
-                <third-party-render-box
-                    :thirdparty="handlingThirdParty"
-                    :options="{
-                        addLink: false,
-                        addId: false,
-                        addEntity: true,
-                        addInfo: false,
-                        hLevel: 3,
-                        isMultiline: true,
-                        isConfidential: false,
-                    }"
-                ></third-party-render-box>
-                <ul class="record_actions">
-                    <li>
-                        <button
-                            :title="$t('remove_handling_thirdparty')"
-                            class="btn btn-remove"
-                            @click="removeHandlingThirdParty"
-                        />
-                    </li>
-                </ul>
-            </div>
-        </div>
-
-        <div id="thirdParties" class="action-row">
-            <h3>{{ $t("thirdparty_intervener") }}</h3>
-
-            <div v-if="!hasThirdParties">
-                <p class="chill-no-data-statement">
-                    {{ $t("no_thirdparty_intervener") }}
-                </p>
-            </div>
-
-            <div v-else>
-                <div class="flex-bloc mb-3">
-                    <third-party-render-box
-                        v-for="thirdparty in thirdParties"
-                        :key="thirdparty.id"
-                        :thirdparty="thirdparty"
-                        :options="{
-                            addLink: false,
-                            addId: false,
-                            addEntity: true,
-                            addInfo: false,
-                            hLevel: 3,
-                        }"
-                    >
-                        <template v-slot:record-actions>
-                            <ul class="record_actions">
-                                <li>
-                                    <on-the-fly
-                                        :type="thirdparty.type"
-                                        :id="thirdparty.id"
-                                        action="show"
-                                    ></on-the-fly>
-                                </li>
-                                <li>
-                                    <on-the-fly
-                                        :type="thirdparty.type"
-                                        :id="thirdparty.id"
-                                        action="edit"
-                                        @saveFormOnTheFly="saveFormOnTheFly"
-                                        ref="onTheFly"
-                                    ></on-the-fly>
-                                </li>
-                                <li>
-                                    <button
-                                        :title="$t('remove_thirdparty')"
-                                        class="btn btn-sm btn-remove"
-                                        @click="removeThirdParty(thirdparty)"
-                                    />
-                                </li>
-                            </ul>
-                        </template>
-                    </third-party-render-box>
-                </div>
-            </div>
-
-            <ul class="record_actions">
-                <li class="add-persons">
-                    <add-persons
-                        ref="thirdPartyPicker"
-                        v-bind:key="thirdPartyPicker.key"
-                        v-bind:buttonTitle="$t('add_thirdparties')"
-                        v-bind:modalTitle="$t('choose_thirdparties')"
-                        v-bind:options="thirdPartyPicker.options"
-                        @addNewPersons="addThirdParties"
-                    >
-                        <!-- to cast child method -->
-                    </add-persons>
-                </li>
-            </ul>
-        </div>
-
-        <div
-            v-if="errors.length > 0"
-            id="errors"
-            class="alert alert-danger flashbag"
-        >
-            <p>{{ $t("fix_these_errors") }}</p>
-            <ul>
-                <li v-for="e in errors" :key="e.id">{{ e }}</li>
-            </ul>
-        </div>
+  <div id="workEditor" class="my-4">
+    <div id="title" class="action-row">
+      <div>
+        <p class="wl-item social-issues">
+          <span class="chill-entity entity-social-issue">
+            <span class="badge bg-chill-l-gray text-dark">{{
+              work.socialAction.issue.text
+            }}</span>
+          </span>
+        </p>
+      </div>
+      <h2 class="badge-title">
+        <span class="title_label"></span>
+        <span class="title_action">{{ work.socialAction.text }}</span>
+      </h2>
     </div>
-    <ul class="record_actions sticky-form-buttons">
-        <li>
-            <list-workflow-modal
-                :workflows="this.work.workflows"
-                :allowCreate="true"
-                relatedEntityClass="Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork"
-                :relatedEntityId="this.work.id"
-                :workflowsAvailables="this.work.workflows_availables"
-                :preventDefaultMoveToGenerate="true"
-                @go-to-generate-workflow="goToGenerateWorkflow"
-            ></list-workflow-modal>
-        </li>
 
-        <li>
+    <div id="startDate" class="action-row">
+      <label class="col-form-label">{{ $t("startDate") }}</label>
+      <input
+        v-model="startDate"
+        type="date"
+        required="true"
+        class="form-control"
+        v-once
+      />
+    </div>
+
+    <div id="endDate" class="action-row">
+      <label class="col-form-label">{{ $t("endDate") }}</label>
+      <input v-model="endDate" type="date" class="form-control" />
+    </div>
+
+    <div id="privateComment" class="action-row">
+      <label class="col-form-label">{{ $t("private_comment") }}</label>
+      <comment-editor v-model="privateComment"></comment-editor>
+    </div>
+
+    <div id="comment" class="action-row">
+      <label class="col-form-label">{{ $t("comments") }}</label>
+      <comment-editor v-model="note"></comment-editor>
+    </div>
+
+    <div id="objectives" class="action-row">
+      <div aria="hidden" class="title">
+        <div>
+          <h3>{{ $t("goals_title") }}</h3>
+        </div>
+        <div>
+          <h3>{{ $t("results_title") }}</h3>
+        </div>
+      </div>
+
+      <!-- 1. Goals with results that were already selected/saved to the entity -->
+      <div v-for="g in goalsPicked" :key="g.goal.id">
+        <div class="item-title" @click="removeGoal(g)">
+          <span class="removable">{{ localizeString(g.goal.title) }}</span>
+        </div>
+        <div>
+          <add-result :goal="g.goal" destination="goal"></add-result>
+        </div>
+      </div>
+
+      <!-- 2. Results without objectives that were already selected/saved to the entity -->
+      <div v-if="hasResultsForAction">
+        <div
+          class="results_without_objective"
+          style="
+            background: repeating-linear-gradient(
+              45deg,
+              #e6e6e6,
+              #e6e6e6 10px,
+              #f3f3f3 0,
+              #f3f3f3 20px
+            );
+          "
+        >
+          {{ $t("results_without_objective") }}
+        </div>
+        <div>
+          <add-result
+            :availableResults="resultsForAction"
+            destination="action"
+          ></add-result>
+        </div>
+      </div>
+
+      <!-- 3. Selector for objectives with results -->
+      <div class="accordion" id="expandedSuggestions">
+        <div v-if="availableForCheckGoal.length > 0" class="accordion-item">
+          <h2 class="accordion-header" id="heading_expanded_suggestions">
             <button
-                v-if="AmIRefferer"
-                class="btn btn-notify"
-                @click="goToGenerateNotification(false)"
-            ></button>
-            <template v-else>
-                <button
-                    id="btnGroupNotifyButtons"
-                    type="button"
-                    class="btn btn-notify dropdown-toggle"
-                    :title="$t('notification_send')"
-                    data-bs-toggle="dropdown"
-                    aria-expanded="false"
+              v-if="isExpanded"
+              class="accordion-button"
+              type="button"
+              data-bs-toggle="collapse"
+              aria-expanded="true"
+              @click="toggleSelect"
+            >
+              Masquer
+            </button>
+
+            <button
+              v-else
+              class="accordion-button collapsed"
+              type="button"
+              data-bs-toggle="collapse"
+              aria-expanded="false"
+              @click="toggleSelect"
+            >
+              Motifs, objectifs et dispositfs disponibles
+            </button>
+          </h2>
+          <div
+            class="accordion-collapse"
+            id="collapse_expanded_suggestions"
+            aria-labelledby="heading_expanded_suggestions"
+            data-bs-parent="#expandedSuggestions"
+          >
+            <template v-if="isExpanded">
+              <ul class="list-suggest add-items">
+                <li
+                  v-for="g in availableForCheckGoal"
+                  @click="addGoal(g)"
+                  :key="g.id"
                 >
-                    &nbsp;
-                </button>
-                <ul
-                    class="dropdown-menu"
-                    aria-labelledby="btnGroupNotifyButtons"
-                >
-                    <li>
-                        <a
-                            class="dropdown-item"
-                            @click="goToGenerateNotification(true)"
-                            >{{ $t("notification_notify_referrer") }}</a
-                        >
-                    </li>
-                    <li>
-                        <a
-                            class="dropdown-item"
-                            @click="goToGenerateNotification(false)"
-                            >{{ $t("notification_notify_any") }}</a
-                        >
-                    </li>
-                </ul>
+                  <span>{{ localizeString(g.title) }}</span>
+                </li>
+              </ul>
             </template>
-        </li>
+          </div>
+          <p v-if="goalsPicked.length === 0" class="chill-no-data-statement">
+            Aucun objectif associé
+          </p>
+        </div>
+        <div v-else>
+          <span class="chill-no-data-statement">{{
+            $t("no_goals_available")
+          }}</span>
+        </div>
+      </div>
 
-        <li v-if="!isPosting">
-            <button class="btn btn-save" @click="submit">
-                {{ $t("action.save") }}
-            </button>
-        </li>
+      <!-- 4. Selector for results without objectives is already included above in section 2 -->
+    </div>
 
-        <li v-if="isPosting">
-            <button class="btn btn-save" disabled>
-                {{ $t("action.save") }}
+    <div id="evaluations" class="action-row">
+      <div aria="hidden" class="title">
+        <div>
+          <h3>
+            {{ $t("Evaluations") }} - {{ $t("Forms") }} -
+            {{ $t("Post") }}
+          </h3>
+        </div>
+      </div>
+
+      <!-- list evaluations -->
+      <add-evaluation
+        v-for="e in pickedEvaluations"
+        v-bind:key="e.key"
+        v-bind:evaluation="e"
+        v-bind:docAnchorId="this.docAnchorId"
+      >
+      </add-evaluation>
+
+      <!-- box to add new evaluation -->
+      <div class="add_evaluation">
+        <div v-if="showAddEvaluation">
+          <p>{{ $t("available_evaluations_text") }}</p>
+          <ul class="list-suggest add-items">
+            <li
+              v-for="e in evaluationsForAction"
+              @click="addEvaluation(e)"
+              :key="e.id"
+            >
+              <span>{{ localizeString(e.title) }}</span>
+            </li>
+          </ul>
+        </div>
+        <ul class="record_actions" v-if="evaluationsForAction.length > 0">
+          <li>
+            <button
+              :title="$t('add_an_evaluation')"
+              class="btn btn-create"
+              @click="toggleAddEvaluation"
+            >
+              {{ $t("add_an_evaluation") }}
             </button>
+          </li>
+        </ul>
+        <div v-else>
+          <span class="chill-no-data-statement">{{
+            $t("no_evaluations_available")
+          }}</span>
+        </div>
+      </div>
+    </div>
+
+    <div id="persons" class="action-row">
+      <h3 class="mb-3">{{ $t("persons_involved") }}</h3>
+
+      <ul class="list-unstyled">
+        <li v-for="p in personsReachables" :key="p.id">
+          <div class="form-check">
+            <input
+              v-model="personsPicked"
+              :value="p.id"
+              type="checkbox"
+              class="me-2 form-check-input"
+              :id="'person_check' + p.id"
+            />
+            <label :for="'person_check' + p.id" class="form-check-label">
+              <person-text :person="p"></person-text>
+            </label>
+          </div>
         </li>
-    </ul>
+        <li
+          v-for="p in getPreviousPersons"
+          :key="p.id"
+          class="alert alert-danger"
+        >
+          <div class="form-check">
+            <input
+              v-model="personsPicked"
+              :value="p.id"
+              type="checkbox"
+              class="me-2 form-check-input"
+              :id="'person_check' + p.id"
+            />
+            <label :for="'person_check' + p.id" class="form-check-label">
+              <person-text :person="p"></person-text>
+            </label>
+          </div>
+          <span
+            ><i class="fa fa-warning"></i>&nbsp;{{
+              $t("warning_previous_persons")
+            }}</span
+          >
+        </li>
+      </ul>
+    </div>
+
+    <div id="referrers" class="action-row">
+      <h3>{{ $t("referrers") }}</h3>
+
+      <div v-if="!hasReferrers">
+        <p class="chill-no-data-statement">{{ $t("no_referrers") }}</p>
+      </div>
+
+      <div v-else>
+        <ul class="list-suggest remove-items inline">
+          <li
+            v-for="u in referrers"
+            :key="u.id"
+            :title="$t('remove_referrer')"
+            @click="removeReferrer(u)"
+          >
+            <span>
+              {{ u.text }}
+            </span>
+          </li>
+        </ul>
+      </div>
+
+      <ul class="record_actions">
+        <li class="add-persons">
+          <add-persons
+            ref="referrerPicker"
+            :key="referrerPicker.key"
+            :buttonTitle="$t('add_referrers')"
+            :modalTitle="$t('choose_referrers')"
+            :options="referrerPicker.options"
+            @addNewPersons="addReferrers"
+          >
+          </add-persons>
+        </li>
+      </ul>
+    </div>
+
+    <div id="handlingThirdParty" class="action-row">
+      <h3>{{ $t("handling_thirdparty") }}</h3>
+
+      <div v-if="!hasHandlingThirdParty">
+        <p class="chill-no-data-statement">
+          {{ $t("no_handling_thirdparty") }}
+        </p>
+
+        <ul class="record_actions">
+          <li class="add-persons">
+            <add-persons
+              ref="handlingThirdPartyPicker"
+              v-bind:key="handlingThirdPartyPicker.key"
+              v-bind:buttonTitle="$t('precise_handling_thirdparty')"
+              v-bind:modalTitle="$t('choose_a_thirdparty')"
+              v-bind:options="handlingThirdPartyPicker.options"
+              @addNewPersons="setHandlingThirdParty"
+            >
+              <!-- to cast child method -->
+            </add-persons>
+          </li>
+        </ul>
+      </div>
+      <div v-else class="flex-table">
+        <third-party-render-box
+          :thirdparty="handlingThirdParty"
+          :options="{
+            addLink: false,
+            addId: false,
+            addEntity: true,
+            addInfo: false,
+            hLevel: 3,
+            isMultiline: true,
+            isConfidential: false,
+          }"
+        ></third-party-render-box>
+        <ul class="record_actions">
+          <li>
+            <button
+              :title="$t('remove_handling_thirdparty')"
+              class="btn btn-remove"
+              @click="removeHandlingThirdParty"
+            />
+          </li>
+        </ul>
+      </div>
+    </div>
+
+    <div id="thirdParties" class="action-row">
+      <h3>{{ $t("thirdparty_intervener") }}</h3>
+
+      <div v-if="!hasThirdParties">
+        <p class="chill-no-data-statement">
+          {{ $t("no_thirdparty_intervener") }}
+        </p>
+      </div>
+
+      <div v-else>
+        <div class="flex-bloc mb-3">
+          <third-party-render-box
+            v-for="thirdparty in thirdParties"
+            :key="thirdparty.id"
+            :thirdparty="thirdparty"
+            :options="{
+              addLink: false,
+              addId: false,
+              addEntity: true,
+              addInfo: false,
+              hLevel: 3,
+            }"
+          >
+            <template v-slot:record-actions>
+              <ul class="record_actions">
+                <li>
+                  <on-the-fly
+                    :type="thirdparty.type"
+                    :id="thirdparty.id"
+                    action="show"
+                  ></on-the-fly>
+                </li>
+                <li>
+                  <on-the-fly
+                    :type="thirdparty.type"
+                    :id="thirdparty.id"
+                    action="edit"
+                    @saveFormOnTheFly="saveFormOnTheFly"
+                    ref="onTheFly"
+                  ></on-the-fly>
+                </li>
+                <li>
+                  <button
+                    :title="$t('remove_thirdparty')"
+                    class="btn btn-sm btn-remove"
+                    @click="removeThirdParty(thirdparty)"
+                  />
+                </li>
+              </ul>
+            </template>
+          </third-party-render-box>
+        </div>
+      </div>
+
+      <ul class="record_actions">
+        <li class="add-persons">
+          <add-persons
+            ref="thirdPartyPicker"
+            v-bind:key="thirdPartyPicker.key"
+            v-bind:buttonTitle="$t('add_thirdparties')"
+            v-bind:modalTitle="$t('choose_thirdparties')"
+            v-bind:options="thirdPartyPicker.options"
+            @addNewPersons="addThirdParties"
+          >
+            <!-- to cast child method -->
+          </add-persons>
+        </li>
+      </ul>
+    </div>
+
+    <div
+      v-if="errors.length > 0"
+      id="errors"
+      class="alert alert-danger flashbag"
+    >
+      <p>{{ $t("fix_these_errors") }}</p>
+      <ul>
+        <li v-for="e in errors" :key="e.id">{{ e }}</li>
+      </ul>
+    </div>
+  </div>
+  <ul class="record_actions sticky-form-buttons">
+    <li>
+      <list-workflow-modal
+        :workflows="this.work.workflows"
+        :allowCreate="true"
+        relatedEntityClass="Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWork"
+        :relatedEntityId="this.work.id"
+        :workflowsAvailables="this.work.workflows_availables"
+        :preventDefaultMoveToGenerate="true"
+        @go-to-generate-workflow="goToGenerateWorkflow"
+      ></list-workflow-modal>
+    </li>
+
+    <li>
+      <button
+        v-if="AmIRefferer"
+        class="btn btn-notify"
+        @click="goToGenerateNotification(false)"
+      ></button>
+      <template v-else>
+        <button
+          id="btnGroupNotifyButtons"
+          type="button"
+          class="btn btn-notify dropdown-toggle"
+          :title="$t('notification_send')"
+          data-bs-toggle="dropdown"
+          aria-expanded="false"
+        >
+          &nbsp;
+        </button>
+        <ul class="dropdown-menu" aria-labelledby="btnGroupNotifyButtons">
+          <li>
+            <a class="dropdown-item" @click="goToGenerateNotification(true)">{{
+              $t("notification_notify_referrer")
+            }}</a>
+          </li>
+          <li>
+            <a class="dropdown-item" @click="goToGenerateNotification(false)">{{
+              $t("notification_notify_any")
+            }}</a>
+          </li>
+        </ul>
+      </template>
+    </li>
+
+    <li v-if="!isPosting">
+      <button class="btn btn-save" @click="submit">
+        {{ $t("action.save") }}
+      </button>
+    </li>
+
+    <li v-if="isPosting">
+      <button class="btn btn-save" disabled>
+        {{ $t("action.save") }}
+      </button>
+    </li>
+  </ul>
 </template>
 
 <script>
@@ -508,346 +479,340 @@ import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
 import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
 
 const i18n = {
-    messages: {
-        fr: {
-            action: {
-                save: "Enregistrer",
-            },
-            conflict_on_save:
-                "Désolé, cette action d'accompagnement a été modifiée dans une autre fenêtre ou par un autre utilisateur. Rechargez la page pour voir ses changements.",
-            action_title: "Action d'accompagnement",
-            comments: "Commentaire",
-            startDate: "Date de début",
-            endDate: "Date de fin",
-            goals_title: "Motifs - objectifs - dispositifs",
-            available_goals_text:
-                "Motifs, objectifs et dispositifs disponibles pour ajout :",
-            results_title: "Orientations - résultats",
-            results_without_objective:
-                "Résultats - orientations sans objectifs",
-            add_objectif: "Ajouter un motif - objectif - dispositif",
-            add_an_objective: "Ajouter un objectif",
-            Evaluations: "Évaluations",
-            Forms: "Formulaires",
-            Post: "Courriers",
-            add_an_evaluation: "Ajouter une évaluation",
-            persons_involved: "Usagers concernés",
-            handling_thirdparty: "Tiers traitant",
-            no_handling_thirdparty: "Aucun tiers traitant",
-            precise_handling_thirdparty: "Indiquer un tiers traitant",
-            choose_a_thirdparty: "Choisir un tiers",
-            remove_thirdparty: "Enlever le tiers",
-            remove_handling_thirdparty: "Enlever le tiers traitant",
-            thirdparty_intervener: "Tiers intervenants",
-            no_thirdparty_intervener: "Aucun tiers intervenant",
-            add_thirdparties: "Ajouter des tiers",
-            choose_thirdparties: "Choisir des tiers",
-            fix_these_errors: "Veuillez corriger les erreurs suivantes :",
-            available_evaluations_text: "Documents disponibles pour ajout :",
-            no_evaluations_available: "Aucune évaluation disponible",
-            no_goals_available: "Aucun objectif disponible",
-            referrers: "Agents traitants",
-            add_referrers: "Ajouter des agents traitants",
-            no_referrers: "Aucun agent traitant",
-            choose_referrers: "Choisir des agents traitants",
-            remove_referrer: "Enlever l'agent",
-            private_comment: "Commentaire privé",
-            notification_notify_referrer: "Notifier le référent",
-            notification_notify_any: "Notifier d'autres utilisateurs",
-            notification_send: "Envoyer une notification",
-            warning_previous_persons:
-                "Cet usager n'est désormais plus concerné par le parcours, bien qu'il ait été associé à l'action par le passé.",
-        },
+  messages: {
+    fr: {
+      action: {
+        save: "Enregistrer",
+      },
+      conflict_on_save:
+        "Désolé, cette action d'accompagnement a été modifiée dans une autre fenêtre ou par un autre utilisateur. Rechargez la page pour voir ses changements.",
+      action_title: "Action d'accompagnement",
+      comments: "Commentaire",
+      startDate: "Date de début",
+      endDate: "Date de fin",
+      goals_title: "Motifs - objectifs - dispositifs",
+      available_goals_text:
+        "Motifs, objectifs et dispositifs disponibles pour ajout :",
+      results_title: "Orientations - résultats",
+      results_without_objective: "Résultats - orientations sans objectifs",
+      add_objectif: "Ajouter un motif - objectif - dispositif",
+      add_an_objective: "Ajouter un objectif",
+      Evaluations: "Évaluations",
+      Forms: "Formulaires",
+      Post: "Courriers",
+      add_an_evaluation: "Ajouter une évaluation",
+      persons_involved: "Usagers concernés",
+      handling_thirdparty: "Tiers traitant",
+      no_handling_thirdparty: "Aucun tiers traitant",
+      precise_handling_thirdparty: "Indiquer un tiers traitant",
+      choose_a_thirdparty: "Choisir un tiers",
+      remove_thirdparty: "Enlever le tiers",
+      remove_handling_thirdparty: "Enlever le tiers traitant",
+      thirdparty_intervener: "Tiers intervenants",
+      no_thirdparty_intervener: "Aucun tiers intervenant",
+      add_thirdparties: "Ajouter des tiers",
+      choose_thirdparties: "Choisir des tiers",
+      fix_these_errors: "Veuillez corriger les erreurs suivantes :",
+      available_evaluations_text: "Documents disponibles pour ajout :",
+      no_evaluations_available: "Aucune évaluation disponible",
+      no_goals_available: "Aucun objectif disponible",
+      referrers: "Agents traitants",
+      add_referrers: "Ajouter des agents traitants",
+      no_referrers: "Aucun agent traitant",
+      choose_referrers: "Choisir des agents traitants",
+      remove_referrer: "Enlever l'agent",
+      private_comment: "Commentaire privé",
+      notification_notify_referrer: "Notifier le référent",
+      notification_notify_any: "Notifier d'autres utilisateurs",
+      notification_send: "Envoyer une notification",
+      warning_previous_persons:
+        "Cet usager n'est désormais plus concerné par le parcours, bien qu'il ait été associé à l'action par le passé.",
     },
+  },
 };
 
 export default {
-    name: "App",
-    components: {
-        CommentEditor,
-        AddResult,
-        AddEvaluation,
-        AddPersons,
-        ThirdPartyRenderBox,
-        ListWorkflowModal,
-        OnTheFly,
-        PersonText,
+  name: "App",
+  components: {
+    CommentEditor,
+    AddResult,
+    AddEvaluation,
+    AddPersons,
+    ThirdPartyRenderBox,
+    ListWorkflowModal,
+    OnTheFly,
+    PersonText,
+  },
+  i18n,
+  data() {
+    return {
+      docAnchorId: null,
+      isExpanded: false,
+      showAddObjective: false,
+      showAddEvaluation: false,
+      handlingThirdPartyPicker: {
+        key: "handling-third-party",
+        options: {
+          type: ["thirdparty"],
+          priority: null,
+          uniq: true,
+          button: {
+            display: false,
+          },
+        },
+      },
+      thirdPartyPicker: {
+        key: "third-party",
+        options: {
+          type: ["thirdparty"],
+          priority: null,
+          uniq: false,
+          button: {
+            display: false,
+          },
+        },
+      },
+      referrerPicker: {
+        key: "referrer",
+        options: {
+          type: ["user"],
+          priority: null,
+          uniq: false,
+          button: {
+            display: false,
+          },
+        },
+      },
+    };
+  },
+  beforeMount() {
+    const urlParams = new URLSearchParams(window.location.search);
+    this.docAnchorId = urlParams.get("doc_id");
+  },
+  mounted() {
+    this.scrollToElement(this.docAnchorId);
+  },
+  computed: {
+    ...mapState([
+      "work",
+      "resultsForAction",
+      "evaluationsForAction",
+      "goalsPicked",
+      "personsReachables",
+      "handlingThirdParty",
+      "thirdParties",
+      "referrers",
+      "isPosting",
+      "errors",
+      "templatesAvailablesForAction",
+      "me",
+      "version",
+    ]),
+    ...mapGetters([
+      "hasResultsForAction",
+      "hasHandlingThirdParty",
+      "hasThirdParties",
+      "hasReferrers",
+      "getPreviousPersons",
+    ]),
+    classicEditor: () => ClassicEditor,
+    editorConfig: () => classicEditorConfig,
+    startDate: {
+      get() {
+        return this.$store.state.startDate;
+      },
+      set(v) {
+        this.$store.commit("setStartDate", v);
+      },
     },
-    i18n,
-    data() {
-        return {
-            docAnchorId: null,
-            isExpanded: false,
-            showAddObjective: false,
-            showAddEvaluation: false,
-            handlingThirdPartyPicker: {
-                key: "handling-third-party",
-                options: {
-                    type: ["thirdparty"],
-                    priority: null,
-                    uniq: true,
-                    button: {
-                        display: false,
-                    },
-                },
-            },
-            thirdPartyPicker: {
-                key: "third-party",
-                options: {
-                    type: ["thirdparty"],
-                    priority: null,
-                    uniq: false,
-                    button: {
-                        display: false,
-                    },
-                },
-            },
-            referrerPicker: {
-                key: "referrer",
-                options: {
-                    type: ["user"],
-                    priority: null,
-                    uniq: false,
-                    button: {
-                        display: false,
-                    },
-                },
-            },
-        };
+    endDate: {
+      get() {
+        return this.$store.state.endDate;
+      },
+      set(v) {
+        this.$store.commit("setEndDate", v);
+      },
     },
-    beforeMount() {
-        const urlParams = new URLSearchParams(window.location.search);
-        this.docAnchorId = urlParams.get("doc_id");
+    note: {
+      get() {
+        return this.$store.state.note;
+      },
+      set(v) {
+        this.$store.commit("setNote", v);
+      },
     },
-    mounted() {
-        this.scrollToElement(this.docAnchorId);
+    privateComment: {
+      get() {
+        return this.$store.state.privateComment;
+      },
+      set(v) {
+        this.$store.commit("setPrivateComment", v);
+      },
     },
-    computed: {
-        ...mapState([
-            "work",
-            "resultsForAction",
-            "evaluationsForAction",
-            "goalsPicked",
-            "personsReachables",
-            "handlingThirdParty",
-            "thirdParties",
-            "referrers",
-            "isPosting",
-            "errors",
-            "templatesAvailablesForAction",
-            "me",
-            "version",
-        ]),
-        ...mapGetters([
-            "hasResultsForAction",
-            "hasHandlingThirdParty",
-            "hasThirdParties",
-            "hasReferrers",
-            "getPreviousPersons",
-        ]),
-        classicEditor: () => ClassicEditor,
-        editorConfig: () => classicEditorConfig,
-        startDate: {
-            get() {
-                return this.$store.state.startDate;
-            },
-            set(v) {
-                this.$store.commit("setStartDate", v);
-            },
-        },
-        endDate: {
-            get() {
-                return this.$store.state.endDate;
-            },
-            set(v) {
-                this.$store.commit("setEndDate", v);
-            },
-        },
-        note: {
-            get() {
-                return this.$store.state.note;
-            },
-            set(v) {
-                this.$store.commit("setNote", v);
-            },
-        },
-        privateComment: {
-            get() {
-                return this.$store.state.privateComment;
-            },
-            set(v) {
-                this.$store.commit("setPrivateComment", v);
-            },
-        },
-        availableForCheckGoal() {
-            let pickedIds = this.$store.state.goalsPicked.map((g) => g.goal.id);
+    availableForCheckGoal() {
+      let pickedIds = this.$store.state.goalsPicked.map((g) => g.goal.id);
 
-            return this.$store.state.goalsForAction.filter(
-                (g) => !pickedIds.includes(g.id),
-            );
-        },
-        pickedEvaluations() {
-            return this.$store.state.evaluationsPicked;
-        },
-        personsPicked: {
-            get() {
-                let s = this.$store.state.personsPicked.map((p) => p.id);
-
-                return s;
-            },
-            set(v) {
-                this.$store.commit("setPersonsPickedIds", v);
-            },
-        },
-        AmIRefferer() {
-            return !(
-                this.work.accompanyingPeriod.user &&
-                this.me &&
-                this.work.accompanyingPeriod.user.id !== this.me.id
-            );
-        },
+      return this.$store.state.goalsForAction.filter(
+        (g) => !pickedIds.includes(g.id),
+      );
     },
-    methods: {
-        localizeString,
-        toggleSelect() {
-            this.isExpanded = !this.isExpanded;
-        },
-        addGoal(g) {
-            this.$store.commit("addGoal", g);
-        },
-        removeGoal(g) {
-            this.$store.commit("removeGoal", g);
-        },
-        addEvaluation(e) {
-            this.$store.dispatch("addEvaluation", e);
-        },
-        toggleAddEvaluation() {
-            this.showAddEvaluation = !this.showAddEvaluation;
-        },
-        setHandlingThirdParty({ selected, modal }) {
-            this.$store.commit(
-                "setHandlingThirdParty",
-                selected.shift().result,
-            );
-            this.$refs.handlingThirdPartyPicker.resetSearch();
-            modal.showModal = false;
-        },
-        removeHandlingThirdParty() {
-            this.$store.commit("setHandlingThirdParty", null);
-        },
-        addThirdParties({ selected, modal }) {
-            this.$store.commit(
-                "addThirdParties",
-                selected.map((r) => r.result),
-            );
-            this.$refs.thirdPartyPicker.resetSearch();
-            modal.showModal = false;
-        },
-        removeThirdParty(t) {
-            this.$store.commit("removeThirdParty", t);
-        },
-        addReferrers({ selected, modal }) {
-            this.$store.commit(
-                "addReferrers",
-                selected.map((r) => r.result),
-            );
-            this.$refs.referrerPicker.resetSearch();
-            modal.showModal = false;
-        },
-        removeReferrer(u) {
-            this.$store.commit("removeReferrer", u);
-        },
-        goToGenerateWorkflow({ link }) {
-            // console.log('save before leave to generate workflow')
-            const callback = () => {
-                window.location.assign(link);
-            };
+    pickedEvaluations() {
+      return this.$store.state.evaluationsPicked;
+    },
+    personsPicked: {
+      get() {
+        let s = this.$store.state.personsPicked.map((p) => p.id);
 
-            return this.$store.dispatch("submit", callback).catch((e) => {
-                console.log(e);
-                throw e;
-            });
-        },
-        goToGenerateNotification(tos) {
-            console.log("save before leave to notification");
-            const callback = () => {
-                if (tos === true) {
-                    window.location.assign(
-                        `/fr/notification/create?entityClass=Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork&entityId=${this.work.id}&tos[0]=${this.work.accompanyingPeriod.user.id}&returnPath=/fr/person/accompanying-period/${this.work.accompanyingPeriod.id}/work`,
-                    );
-                } else {
-                    window.location.assign(
-                        `/fr/notification/create?entityClass=Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork&entityId=${this.work.id}&returnPath=/fr/person/accompanying-period/${this.work.accompanyingPeriod.id}/work`,
-                    );
-                }
-            };
+        return s;
+      },
+      set(v) {
+        this.$store.commit("setPersonsPickedIds", v);
+      },
+    },
+    AmIRefferer() {
+      return !(
+        this.work.accompanyingPeriod.user &&
+        this.me &&
+        this.work.accompanyingPeriod.user.id !== this.me.id
+      );
+    },
+  },
+  methods: {
+    localizeString,
+    toggleSelect() {
+      this.isExpanded = !this.isExpanded;
+    },
+    addGoal(g) {
+      this.$store.commit("addGoal", g);
+    },
+    removeGoal(g) {
+      this.$store.commit("removeGoal", g);
+    },
+    addEvaluation(e) {
+      this.$store.dispatch("addEvaluation", e);
+    },
+    toggleAddEvaluation() {
+      this.showAddEvaluation = !this.showAddEvaluation;
+    },
+    setHandlingThirdParty({ selected, modal }) {
+      this.$store.commit("setHandlingThirdParty", selected.shift().result);
+      this.$refs.handlingThirdPartyPicker.resetSearch();
+      modal.showModal = false;
+    },
+    removeHandlingThirdParty() {
+      this.$store.commit("setHandlingThirdParty", null);
+    },
+    addThirdParties({ selected, modal }) {
+      this.$store.commit(
+        "addThirdParties",
+        selected.map((r) => r.result),
+      );
+      this.$refs.thirdPartyPicker.resetSearch();
+      modal.showModal = false;
+    },
+    removeThirdParty(t) {
+      this.$store.commit("removeThirdParty", t);
+    },
+    addReferrers({ selected, modal }) {
+      this.$store.commit(
+        "addReferrers",
+        selected.map((r) => r.result),
+      );
+      this.$refs.referrerPicker.resetSearch();
+      modal.showModal = false;
+    },
+    removeReferrer(u) {
+      this.$store.commit("removeReferrer", u);
+    },
+    goToGenerateWorkflow({ link }) {
+      // console.log('save before leave to generate workflow')
+      const callback = () => {
+        window.location.assign(link);
+      };
 
-            return this.$store.dispatch("submit", callback).catch((e) => {
-                console.log(e);
-                throw e;
-            });
-        },
-        submit() {
-            this.$store.dispatch("submit").catch((error) => {
-                if (
-                    error.name === "ValidationException" ||
-                    error.name === "AccessException"
-                ) {
-                    error.violations.forEach((violation) =>
-                        this.$toast.open({ message: violation }),
-                    );
-                } else if (error.name === "ConflictHttpException") {
-                    this.$toast.open({ message: this.$t("conflict_on_save") });
-                } else {
-                    this.$toast.open({ message: "An error occurred" });
-                    throw error;
-                }
-            });
-        },
-        saveFormOnTheFly(payload) {
-            // console.log('saveFormOnTheFly: type', payload.type, ', data', payload.data);
+      return this.$store.dispatch("submit", callback).catch((e) => {
+        console.log(e);
+        throw e;
+      });
+    },
+    goToGenerateNotification(tos) {
+      console.log("save before leave to notification");
+      const callback = () => {
+        if (tos === true) {
+          window.location.assign(
+            `/fr/notification/create?entityClass=Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork&entityId=${this.work.id}&tos[0]=${this.work.accompanyingPeriod.user.id}&returnPath=/fr/person/accompanying-period/${this.work.accompanyingPeriod.id}/work`,
+          );
+        } else {
+          window.location.assign(
+            `/fr/notification/create?entityClass=Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWork&entityId=${this.work.id}&returnPath=/fr/person/accompanying-period/${this.work.accompanyingPeriod.id}/work`,
+          );
+        }
+      };
 
-            let body = { type: payload.type };
-            body.name = payload.data.text;
-            body.email = payload.data.email;
-            body.telephone = payload.data.telephone;
-            body.telephone2 = payload.data.telephone2;
-            body.address = { id: payload.data.address.address_id };
+      return this.$store.dispatch("submit", callback).catch((e) => {
+        console.log(e);
+        throw e;
+      });
+    },
+    submit() {
+      this.$store.dispatch("submit").catch((error) => {
+        if (
+          error.name === "ValidationException" ||
+          error.name === "AccessException"
+        ) {
+          error.violations.forEach((violation) =>
+            this.$toast.open({ message: violation }),
+          );
+        } else if (error.name === "ConflictHttpException") {
+          this.$toast.open({ message: this.$t("conflict_on_save") });
+        } else {
+          this.$toast.open({ message: "An error occurred" });
+          throw error;
+        }
+      });
+    },
+    saveFormOnTheFly(payload) {
+      // console.log('saveFormOnTheFly: type', payload.type, ', data', payload.data);
 
-            makeFetch(
-                "PATCH",
-                `/api/1.0/thirdparty/thirdparty/${payload.data.id}.json`,
-                body,
-            )
-                .then((response) => {
-                    this.$store.dispatch("updateThirdParty", response);
-                    for (let otf of this.$refs.onTheFly) {
-                        otf.closeModal();
-                    }
-                })
-                .catch((error) => {
-                    if (error.name === "ValidationException") {
-                        for (let v of error.violations) {
-                            this.$toast.open({ message: v });
-                        }
-                    } else if (error.name === "ConflictHttpException") {
-                        this.$toast.open({
-                            message: this.$t("conflict_on_save"),
-                        });
-                    } else {
-                        this.$toast.open({ message: "An error occurred" });
-                    }
-                });
-        },
-        scrollToElement(docAnchorId) {
-            const documentEl = document.getElementById(
-                `document_${docAnchorId}`,
-            );
-            if (documentEl) {
-                documentEl.scrollIntoView({ behavior: "smooth" });
+      let body = { type: payload.type };
+      body.name = payload.data.text;
+      body.email = payload.data.email;
+      body.telephone = payload.data.telephone;
+      body.telephone2 = payload.data.telephone2;
+      body.address = { id: payload.data.address.address_id };
+
+      makeFetch(
+        "PATCH",
+        `/api/1.0/thirdparty/thirdparty/${payload.data.id}.json`,
+        body,
+      )
+        .then((response) => {
+          this.$store.dispatch("updateThirdParty", response);
+          for (let otf of this.$refs.onTheFly) {
+            otf.closeModal();
+          }
+        })
+        .catch((error) => {
+          if (error.name === "ValidationException") {
+            for (let v of error.violations) {
+              this.$toast.open({ message: v });
             }
-        },
+          } else if (error.name === "ConflictHttpException") {
+            this.$toast.open({
+              message: this.$t("conflict_on_save"),
+            });
+          } else {
+            this.$toast.open({ message: "An error occurred" });
+          }
+        });
     },
+    scrollToElement(docAnchorId) {
+      const documentEl = document.getElementById(`document_${docAnchorId}`);
+      if (documentEl) {
+        documentEl.scrollIntoView({ behavior: "smooth" });
+      }
+    },
+  },
 };
 </script>
 
@@ -856,172 +821,172 @@ export default {
 @import "~ChillMainAssets/chill/scss/mixins";
 
 div#workEditor {
-    display: grid;
-    grid-template-columns: 50%;
-    column-gap: 0rem;
-    grid-template-areas:
-        "title title"
-        "startDate endDate"
-        "comment comment"
-        "privateComment privateComment"
-        "objectives objectives"
-        "evaluations evaluations"
-        "persons persons"
-        "referrers referrers"
-        "handling handling"
-        "tparties tparties"
-        "errors errors";
+  display: grid;
+  grid-template-columns: 50%;
+  column-gap: 0rem;
+  grid-template-areas:
+    "title title"
+    "startDate endDate"
+    "comment comment"
+    "privateComment privateComment"
+    "objectives objectives"
+    "evaluations evaluations"
+    "persons persons"
+    "referrers referrers"
+    "handling handling"
+    "tparties tparties"
+    "errors errors";
 
-    #title {
-        grid-area: title;
-    }
-    #startDate {
-        grid-area: startDate;
-    }
-    #endDate {
-        grid-area: endDate;
-    }
-    #comment {
-        grid-area: comment;
-    }
-    #privateComment {
-        grid-area: privateComment;
-    }
-    #objectives {
-        grid-area: objectives;
-    }
-    #evaluations {
-        grid-area: evaluations;
-    }
-    #persons {
-        grid-area: persons;
-    }
-    #handlingThirdParty {
-        grid-area: handling;
-    }
-    #thirdParties {
-        grid-area: tparties;
-    }
-    #referrers {
-        grid-area: referrers;
-    }
-    #errors {
-        grid-area: errors;
+  #title {
+    grid-area: title;
+  }
+  #startDate {
+    grid-area: startDate;
+  }
+  #endDate {
+    grid-area: endDate;
+  }
+  #comment {
+    grid-area: comment;
+  }
+  #privateComment {
+    grid-area: privateComment;
+  }
+  #objectives {
+    grid-area: objectives;
+  }
+  #evaluations {
+    grid-area: evaluations;
+  }
+  #persons {
+    grid-area: persons;
+  }
+  #handlingThirdParty {
+    grid-area: handling;
+  }
+  #thirdParties {
+    grid-area: tparties;
+  }
+  #referrers {
+    grid-area: referrers;
+  }
+  #errors {
+    grid-area: errors;
+  }
+
+  div.action-row {
+    @include border-collapse;
+    padding: 1em;
+
+    &#title {
+      label {
+        margin-bottom: 0;
+      }
+      p {
+        margin-top: 0;
+        font-weight: bold;
+        font-size: 1rem;
+      }
     }
 
-    div.action-row {
+    &#objectives {
+      & > div {
+        display: grid;
+        grid-template-columns: 50%;
+        column-gap: 0rem;
+        grid-template-areas: "obj res";
+
+        & > div {
+          @include border-collapse;
+          padding: 1em;
+
+          &:nth-child(1) {
+            grid-area: obj;
+          }
+
+          &:nth-child(2) {
+            grid-area: res;
+          }
+        }
+
+        & > div.results_without_objective {
+          background: repeating-linear-gradient(
+            45deg,
+            $gray-200,
+            $gray-200 10px,
+            $gray-100 10px,
+            $gray-100 20px
+          );
+          text-align: center;
+          font-weight: 700;
+          padding-top: 1.5rem;
+        }
+      }
+    }
+
+    &#evaluations {
+      & > div {
         @include border-collapse;
         padding: 1em;
-
-        &#title {
-            label {
-                margin-bottom: 0;
-            }
-            p {
-                margin-top: 0;
-                font-weight: bold;
-                font-size: 1rem;
-            }
-        }
-
-        &#objectives {
-            & > div {
-                display: grid;
-                grid-template-columns: 50%;
-                column-gap: 0rem;
-                grid-template-areas: "obj res";
-
-                & > div {
-                    @include border-collapse;
-                    padding: 1em;
-
-                    &:nth-child(1) {
-                        grid-area: obj;
-                    }
-
-                    &:nth-child(2) {
-                        grid-area: res;
-                    }
-                }
-
-                & > div.results_without_objective {
-                    background: repeating-linear-gradient(
-                        45deg,
-                        $gray-200,
-                        $gray-200 10px,
-                        $gray-100 10px,
-                        $gray-100 20px
-                    );
-                    text-align: center;
-                    font-weight: 700;
-                    padding-top: 1.5rem;
-                }
-            }
-        }
-
-        &#evaluations {
-            & > div {
-                @include border-collapse;
-                padding: 1em;
-            }
-        }
-
-        &#objectives,
-        &#evaluations {
-            padding: 0;
-
-            & > div.title {
-                background-color: $gray-200;
-                color: $gray-700;
-
-                h3 {
-                    text-align: center;
-                }
-            }
-
-            .item-title {
-                font-weight: bold;
-            }
-            .item-details {
-                margin: 1em 2em;
-                font-size: 85%;
-            }
-
-            & > i.fa {
-                padding: 0.25rem;
-                color: $white;
-
-                &.fa-times {
-                    color: $red;
-                }
-            }
-        }
-
-        &#persons {
-            margin-top: 1.5em;
-        }
-
-        ul.record_actions {
-            margin-bottom: 0;
-        }
+      }
     }
 
-    div#errors {
-        &.alert {
-            margin-top: 2em;
+    &#objectives,
+    &#evaluations {
+      padding: 0;
+
+      & > div.title {
+        background-color: $gray-200;
+        color: $gray-700;
+
+        h3 {
+          text-align: center;
         }
+      }
+
+      .item-title {
+        font-weight: bold;
+      }
+      .item-details {
+        margin: 1em 2em;
+        font-size: 85%;
+      }
+
+      & > i.fa {
+        padding: 0.25rem;
+        color: $white;
+
+        &.fa-times {
+          color: $red;
+        }
+      }
     }
+
+    &#persons {
+      margin-top: 1.5em;
+    }
+
+    ul.record_actions {
+      margin-bottom: 0;
+    }
+  }
+
+  div#errors {
+    &.alert {
+      margin-top: 2em;
+    }
+  }
 }
 
 .accordion-item:first-of-type,
 .accordion-item:last-of-type {
-    border-radius: 0rem;
-    border: 0px;
-    .accordion-button {
-        padding: 0.25rem;
-        border: 1px solid rgba(17, 17, 17, 0.125);
-        margin-top: 20px;
-        margin-bottom: 20px;
-    }
+  border-radius: 0rem;
+  border: 0px;
+  .accordion-button {
+    padding: 0.25rem;
+    border: 1px solid rgba(17, 17, 17, 0.125);
+    margin-top: 20px;
+    margin-bottom: 20px;
+  }
 }
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/CommentInput.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/CommentInput.vue
index 84a27a5ed..62b46d2da 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/CommentInput.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/CommentInput.vue
@@ -1,19 +1,19 @@
 <template>
-    <div class="row mb-3">
-        <label class="col-sm-4 col-form-label visually-hidden">{{
-            trans(EVALUATION_PUBLIC_COMMENT)
-        }}</label>
-        <div class="col-sm-12">
-            <ckeditor
-                :editor="ClassicEditor"
-                :config="classicEditorConfig"
-                :placeholder="trans(EVALUATION_COMMENT_PLACEHOLDER)"
-                :value="comment"
-                @input="$emit('update:comment', $event)"
-                tag-name="textarea"
-            ></ckeditor>
-        </div>
+  <div class="row mb-3">
+    <label class="col-sm-4 col-form-label visually-hidden">{{
+      trans(EVALUATION_PUBLIC_COMMENT)
+    }}</label>
+    <div class="col-sm-12">
+      <ckeditor
+        :editor="ClassicEditor"
+        :config="classicEditorConfig"
+        :placeholder="trans(EVALUATION_COMMENT_PLACEHOLDER)"
+        :value="comment"
+        @input="$emit('update:comment', $event)"
+        tag-name="textarea"
+      ></ckeditor>
     </div>
+  </div>
 </template>
 
 <script setup>
@@ -21,9 +21,9 @@ import { Ckeditor } from "@ckeditor/ckeditor5-vue";
 import { ClassicEditor } from "ckeditor5";
 import classicEditorConfig from "ChillMainAssets/module/ckeditor5/editor_config";
 import {
-    EVALUATION_PUBLIC_COMMENT,
-    EVALUATION_COMMENT_PLACEHOLDER,
-    trans,
+  EVALUATION_PUBLIC_COMMENT,
+  EVALUATION_COMMENT_PLACEHOLDER,
+  trans,
 } from "translator";
 
 defineProps(["comment"]);
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/DateInputs.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/DateInputs.vue
index ac16b467f..86c9a69e7 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/DateInputs.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/DateInputs.vue
@@ -1,71 +1,71 @@
 <template>
-    <div class="row mb-3">
-        <label class="col-4 col-sm-2 col-md-4 col-lg-2 col-form-label">
-            {{ trans(EVALUATION_STARTDATE) }}
-        </label>
-        <div class="col-8 col-sm-4 col-md-8 col-lg-4">
-            <input
-                class="form-control form-control-sm"
-                type="date"
-                :value="startDate"
-                @input="$emit('update:startDate', $event.target.value)"
-            />
-        </div>
-
-        <label class="col-4 col-sm-2 col-md-4 col-lg-2 col-form-label">
-            {{ trans(EVALUATION_ENDDATE) }}
-        </label>
-        <div class="col-8 col-sm-4 col-md-8 col-lg-4">
-            <input
-                class="form-control form-control-sm"
-                type="date"
-                :value="endDate"
-                @input="$emit('update:endDate', $event.target.value)"
-            />
-        </div>
+  <div class="row mb-3">
+    <label class="col-4 col-sm-2 col-md-4 col-lg-2 col-form-label">
+      {{ trans(EVALUATION_STARTDATE) }}
+    </label>
+    <div class="col-8 col-sm-4 col-md-8 col-lg-4">
+      <input
+        class="form-control form-control-sm"
+        type="date"
+        :value="startDate"
+        @input="$emit('update:startDate', $event.target.value)"
+      />
     </div>
 
-    <div class="row mb-3">
-        <label class="col-4 col-sm-2 col-md-4 col-lg-2 col-form-label">
-            {{ trans(EVALUATION_MAXDATE) }}
-        </label>
-        <div class="col-8 col-sm-4 col-md-8 col-lg-4">
-            <input
-                class="form-control form-control-sm"
-                type="date"
-                :value="maxDate"
-                @input="$emit('update:maxDate', $event.target.value)"
-            />
-        </div>
-
-        <label class="col-4 col-sm-2 col-md-4 col-lg-2 col-form-label">
-            {{ trans(EVALUATION_WARNING_INTERVAL) }}
-        </label>
-        <div class="col-8 col-sm-4 col-md-8 col-lg-4">
-            <input
-                class="form-control form-control-sm"
-                type="number"
-                :value="warningInterval"
-                @input="$emit('update:warningInterval', $event.target.value)"
-            />
-        </div>
+    <label class="col-4 col-sm-2 col-md-4 col-lg-2 col-form-label">
+      {{ trans(EVALUATION_ENDDATE) }}
+    </label>
+    <div class="col-8 col-sm-4 col-md-8 col-lg-4">
+      <input
+        class="form-control form-control-sm"
+        type="date"
+        :value="endDate"
+        @input="$emit('update:endDate', $event.target.value)"
+      />
     </div>
+  </div>
+
+  <div class="row mb-3">
+    <label class="col-4 col-sm-2 col-md-4 col-lg-2 col-form-label">
+      {{ trans(EVALUATION_MAXDATE) }}
+    </label>
+    <div class="col-8 col-sm-4 col-md-8 col-lg-4">
+      <input
+        class="form-control form-control-sm"
+        type="date"
+        :value="maxDate"
+        @input="$emit('update:maxDate', $event.target.value)"
+      />
+    </div>
+
+    <label class="col-4 col-sm-2 col-md-4 col-lg-2 col-form-label">
+      {{ trans(EVALUATION_WARNING_INTERVAL) }}
+    </label>
+    <div class="col-8 col-sm-4 col-md-8 col-lg-4">
+      <input
+        class="form-control form-control-sm"
+        type="number"
+        :value="warningInterval"
+        @input="$emit('update:warningInterval', $event.target.value)"
+      />
+    </div>
+  </div>
 </template>
 
 <script setup>
 import {
-    EVALUATION_STARTDATE,
-    EVALUATION_ENDDATE,
-    EVALUATION_MAXDATE,
-    EVALUATION_WARNING_INTERVAL,
-    trans,
+  EVALUATION_STARTDATE,
+  EVALUATION_ENDDATE,
+  EVALUATION_MAXDATE,
+  EVALUATION_WARNING_INTERVAL,
+  trans,
 } from "translator";
 
 defineProps(["startDate", "endDate", "maxDate", "warningInterval"]);
 defineEmits([
-    "update:startDate",
-    "update:endDate",
-    "update:maxDate",
-    "update:warningInterval",
+  "update:startDate",
+  "update:endDate",
+  "update:maxDate",
+  "update:warningInterval",
 ]);
 </script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/DocumentActions.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/DocumentActions.vue
index 126fbffe6..2f7701210 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/DocumentActions.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/DocumentActions.vue
@@ -1,43 +1,43 @@
 <template>
-    <div class="row mb-3">
-        <h6>{{ trans(EVALUATION_DOCUMENT_ADD) }} :</h6>
-        <pick-template
-            entityClass="Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation"
-            :id="evaluation.id"
-            :templates="templates"
-            :preventDefaultMoveToGenerate="true"
-            @go-to-generate-document="submitBeforeGenerate"
-        >
-            <template v-slot:title>
-                <label class="col-form-label">{{
-                    trans(EVALUATION_GENERATE_A_DOCUMENT)
-                }}</label>
-            </template>
-        </pick-template>
-        <div>
-            <label class="col-form-label">{{
-                trans(EVALUATION_DOCUMENT_UPLOAD)
-            }}</label>
-            <ul class="record_actions document-upload">
-                <li>
-                    <drop-file-modal
-                        :allow-remove="false"
-                        @add-document="emit('addDocument', $event)"
-                    ></drop-file-modal>
-                </li>
-            </ul>
-        </div>
+  <div class="row mb-3">
+    <h6>{{ trans(EVALUATION_DOCUMENT_ADD) }} :</h6>
+    <pick-template
+      entityClass="Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluation"
+      :id="evaluation.id"
+      :templates="templates"
+      :preventDefaultMoveToGenerate="true"
+      @go-to-generate-document="submitBeforeGenerate"
+    >
+      <template v-slot:title>
+        <label class="col-form-label">{{
+          trans(EVALUATION_GENERATE_A_DOCUMENT)
+        }}</label>
+      </template>
+    </pick-template>
+    <div>
+      <label class="col-form-label">{{
+        trans(EVALUATION_DOCUMENT_UPLOAD)
+      }}</label>
+      <ul class="record_actions document-upload">
+        <li>
+          <drop-file-modal
+            :allow-remove="false"
+            @add-document="emit('addDocument', $event)"
+          ></drop-file-modal>
+        </li>
+      </ul>
     </div>
+  </div>
 </template>
 
 <script setup>
 import PickTemplate from "ChillDocGeneratorAssets/vuejs/_components/PickTemplate.vue";
 import DropFileModal from "ChillDocStoreAssets/vuejs/DropFileWidget/DropFileModal.vue";
 import {
-    EVALUATION_DOCUMENT_ADD,
-    EVALUATION_DOCUMENT_UPLOAD,
-    EVALUATION_GENERATE_A_DOCUMENT,
-    trans,
+  EVALUATION_DOCUMENT_ADD,
+  EVALUATION_DOCUMENT_UPLOAD,
+  EVALUATION_GENERATE_A_DOCUMENT,
+  trans,
 } from "translator";
 import { buildLink } from "ChillDocGeneratorAssets/lib/document-generator";
 import { useStore } from "vuex";
@@ -48,29 +48,29 @@ const props = defineProps(["evaluation", "templates"]);
 const emit = defineEmits(["addDocument"]);
 
 async function submitBeforeGenerate({ template }) {
-    const callback = (data) => {
-        let evaluationId = data.accompanyingPeriodWorkEvaluations.find(
-            (e) => e.key === props.evaluation.key,
-        ).id;
+  const callback = (data) => {
+    let evaluationId = data.accompanyingPeriodWorkEvaluations.find(
+      (e) => e.key === props.evaluation.key,
+    ).id;
 
-        window.location.assign(
-            buildLink(
-                template,
-                evaluationId,
-                "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluation",
-            ),
-        );
-    };
+    window.location.assign(
+      buildLink(
+        template,
+        evaluationId,
+        "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluation",
+      ),
+    );
+  };
 
-    return store.dispatch("submit", callback).catch((e) => {
-        console.log(e);
-        throw e;
-    });
+  return store.dispatch("submit", callback).catch((e) => {
+    console.log(e);
+    throw e;
+  });
 }
 </script>
 
 <style scoped>
 ul.document-upload {
-    justify-content: flex-start;
+  justify-content: flex-start;
 }
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/DocumentsList.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/DocumentsList.vue
index 7c9892de9..1a6f428ba 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/DocumentsList.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/DocumentsList.vue
@@ -1,288 +1,205 @@
 <template>
-    <div class="row mb-3">
-        <h5>{{ trans(EVALUATION_DOCUMENTS) }} :</h5>
-        <div class="flex-table">
-            <div
-                class="item-bloc"
-                v-for="(d, i) in documents"
-                :key="d.id"
-                :class="[
-                    parseInt(docAnchorId) === d.id ? 'bg-blink' : 'nothing',
-                ]"
-            >
-                <div :id="'document_' + d.id" class="item-row">
-                    <div class="input-group input-group-lg mb-3 row">
-                        <label class="col-sm-3 col-form-label"
-                            >Titre du document:</label
-                        >
-                        <div class="col-sm-9">
-                            <input
-                                class="form-control document-title"
-                                type="text"
-                                :value="d.title"
-                                :id="d.id"
-                                :data-key="i"
-                                @input="$emit('inputDocumentTitle', $event)"
-                            />
-                        </div>
-                    </div>
-                </div>
-                <div class="item-row">
-                    <div class="item-col item-meta">
-                        <p v-if="d.createdBy" class="createdBy">
-                            Créé par {{ d.createdBy.text }}<br />
-                            Le
-                            {{
-                                $d(ISOToDatetime(d.createdAt.datetime), "long")
-                            }}
-                        </p>
-                    </div>
-                </div>
-                <div class="item-row">
-                    <div class="item-col">
-                        <ul class="record_actions">
-                            <li
-                                v-if="
-                                    d.workflows_availables.length > 0 ||
-                                    d.workflows.length > 0
-                                "
-                            >
-                                <list-workflow-modal
-                                    :workflows="d.workflows"
-                                    :allowCreate="true"
-                                    relatedEntityClass="Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument"
-                                    :relatedEntityId="d.id"
-                                    :workflowsAvailables="
-                                        d.workflows_availables
-                                    "
-                                    :preventDefaultMoveToGenerate="true"
-                                    :goToGenerateWorkflowPayload="{ doc: d }"
-                                    @go-to-generate-workflow="
-                                        goToGenerateWorkflowEvaluationDocument
-                                    "
-                                ></list-workflow-modal>
-                            </li>
-                            <li>
-                                <button
-                                    v-if="AmIRefferer"
-                                    class="btn btn-notify"
-                                    @click="
-                                        $emit(
-                                            'goToGenerateNotification',
-                                            d,
-                                            false,
-                                        )
-                                    "
-                                ></button>
-                                <template v-else>
-                                    <button
-                                        id="btnGroupNotifyButtons"
-                                        type="button"
-                                        class="btn btn-notify dropdown-toggle"
-                                        :title="
-                                            trans(EVALUATION_NOTIFICATION_SEND)
-                                        "
-                                        data-bs-toggle="dropdown"
-                                        aria-expanded="false"
-                                    >
-                                        &nbsp;
-                                    </button>
-                                    <ul
-                                        class="dropdown-menu"
-                                        aria-labelledby="btnGroupNotifyButtons"
-                                    >
-                                        <li>
-                                            <a
-                                                class="dropdown-item"
-                                                @click="
-                                                    goToGenerateDocumentNotification(
-                                                        d,
-                                                        true,
-                                                    )
-                                                "
-                                            >
-                                                {{
-                                                    trans(
-                                                        EVALUATION_NOTIFICATION_NOTIFY_REFERRER,
-                                                    )
-                                                }}
-                                            </a>
-                                        </li>
-                                        <li>
-                                            <a
-                                                class="dropdown-item"
-                                                @click="
-                                                    goToGenerateDocumentNotification(
-                                                        d,
-                                                        false,
-                                                    )
-                                                "
-                                            >
-                                                {{
-                                                    trans(
-                                                        EVALUATION_NOTIFICATION_NOTIFY_ANY,
-                                                    )
-                                                }}
-                                            </a>
-                                        </li>
-                                    </ul>
-                                </template>
-                            </li>
-                            <li>
-                                <document-action-buttons-group
-                                    :stored-object="d.storedObject"
-                                    :filename="d.title"
-                                    :can-edit="true"
-                                    :execute-before-leave="
-                                        submitBeforeLeaveToEditor
-                                    "
-                                    :davLink="
-                                        d.storedObject._links?.dav_link.href
-                                    "
-                                    :davLinkExpiration="
-                                        d.storedObject._links?.dav_link
-                                            .expiration
-                                    "
-                                    @on-stored-object-status-change="
-                                        $emit('statusDocumentChanged', $event)
-                                    "
-                                ></document-action-buttons-group>
-                            </li>
-                            <!--replace document-->
-                            <li
-                                v-if="
-                                    Number.isInteger(d.id) &&
-                                    d.storedObject._permissions.canEdit
-                                "
-                            >
-                                <drop-file-modal
-                                    :existing-doc="d.storedObject"
-                                    :allow-remove="false"
-                                    @add-document="
-                                        (arg) =>
-                                            replaceDocument(
-                                                d,
-                                                arg.stored_object,
-                                                arg.stored_object_version,
-                                            )
-                                    "
-                                ></drop-file-modal>
-                            </li>
-                            <li v-if="Number.isInteger(d.id)">
-                                <div class="duplicate-dropdown">
-                                    <button
-                                        class="btn btn-outline-primary dropdown-toggle"
-                                        type="button"
-                                        data-bs-toggle="dropdown"
-                                        aria-expanded="false"
-                                    >
-                                        <i class="bi bi-lightning-fill"></i>
-                                    </button>
-                                    <ul class="dropdown-menu">
-                                        <!--delete-->
-                                        <li v-if="d.workflows.length === 0">
-                                            <a
-                                                class="dropdown-item"
-                                                @click="
-                                                    $emit('removeDocument', d)
-                                                "
-                                            >
-                                                <i
-                                                    class="fa fa-trash-o"
-                                                    aria-hidden="true"
-                                                ></i>
-                                                {{
-                                                    trans(
-                                                        EVALUATION_DOCUMENT_DELETE,
-                                                    )
-                                                }}
-                                            </a>
-                                        </li>
-                                        <!--duplicate document-->
-                                        <li>
-                                            <a
-                                                class="dropdown-item"
-                                                @click="
-                                                    $emit(
-                                                        'duplicateDocument',
-                                                        d,
-                                                    )
-                                                "
-                                            >
-                                                <i
-                                                    class="fa fa-copy"
-                                                    aria-hidden="true"
-                                                ></i>
-                                                {{
-                                                    trans(
-                                                        EVALUATION_DOCUMENT_DUPLICATE_HERE,
-                                                    )
-                                                }}
-                                            </a>
-                                        </li>
-                                        <li>
-                                            <a
-                                                class="dropdown-item"
-                                                @click="
-                                                    prepareDocumentDuplicationToWork(
-                                                        d,
-                                                    )
-                                                "
-                                            >
-                                                <i
-                                                    class="fa fa-copy"
-                                                    aria-hidden="true"
-                                                ></i>
-                                                {{
-                                                    trans(
-                                                        EVALUATION_DOCUMENT_DUPLICATE_TO_OTHER_EVALUATION,
-                                                    )
-                                                }}</a
-                                            >
-                                        </li>
-                                        <!--move document-->
-                                        <li
-                                            v-if="
-                                                d.storedObject._permissions
-                                                    .canEdit
-                                            "
-                                        >
-                                            <a
-                                                class="dropdown-item"
-                                                @click="
-                                                    prepareDocumentMoveToWork(d)
-                                                "
-                                            >
-                                                <i
-                                                    class="fa fa-arrows"
-                                                    aria-hidden="true"
-                                                ></i>
-                                                {{
-                                                    trans(
-                                                        EVALUATION_DOCUMENT_MOVE,
-                                                    )
-                                                }}</a
-                                            >
-                                        </li>
-                                    </ul>
-                                </div>
-                            </li>
-                        </ul>
-                    </div>
-                </div>
+  <div class="row mb-3">
+    <h5>{{ trans(EVALUATION_DOCUMENTS) }} :</h5>
+    <div class="flex-table">
+      <div
+        class="item-bloc"
+        v-for="(d, i) in documents"
+        :key="d.id"
+        :class="[parseInt(docAnchorId) === d.id ? 'bg-blink' : 'nothing']"
+      >
+        <div :id="'document_' + d.id" class="item-row">
+          <div class="input-group input-group-lg mb-3 row">
+            <label class="col-sm-3 col-form-label">Titre du document:</label>
+            <div class="col-sm-9">
+              <input
+                class="form-control document-title"
+                type="text"
+                :value="d.title"
+                :id="d.id"
+                :data-key="i"
+                @input="$emit('inputDocumentTitle', $event)"
+              />
             </div>
+          </div>
         </div>
+        <div class="item-row">
+          <div class="item-col item-meta">
+            <p v-if="d.createdBy" class="createdBy">
+              Créé par {{ d.createdBy.text }}<br />
+              Le
+              {{ $d(ISOToDatetime(d.createdAt.datetime), "long") }}
+            </p>
+          </div>
+        </div>
+        <div class="item-row">
+          <div class="item-col">
+            <ul class="record_actions">
+              <li
+                v-if="
+                  d.workflows_availables.length > 0 || d.workflows.length > 0
+                "
+              >
+                <list-workflow-modal
+                  :workflows="d.workflows"
+                  :allowCreate="true"
+                  relatedEntityClass="Chill\PersonBundle\Entity\AccompanyingPeriod\AccompanyingPeriodWorkEvaluationDocument"
+                  :relatedEntityId="d.id"
+                  :workflowsAvailables="d.workflows_availables"
+                  :preventDefaultMoveToGenerate="true"
+                  :goToGenerateWorkflowPayload="{ doc: d }"
+                  @go-to-generate-workflow="
+                    goToGenerateWorkflowEvaluationDocument
+                  "
+                ></list-workflow-modal>
+              </li>
+              <li>
+                <button
+                  v-if="AmIRefferer"
+                  class="btn btn-notify"
+                  @click="$emit('goToGenerateNotification', d, false)"
+                ></button>
+                <template v-else>
+                  <button
+                    id="btnGroupNotifyButtons"
+                    type="button"
+                    class="btn btn-notify dropdown-toggle"
+                    :title="trans(EVALUATION_NOTIFICATION_SEND)"
+                    data-bs-toggle="dropdown"
+                    aria-expanded="false"
+                  >
+                    &nbsp;
+                  </button>
+                  <ul
+                    class="dropdown-menu"
+                    aria-labelledby="btnGroupNotifyButtons"
+                  >
+                    <li>
+                      <a
+                        class="dropdown-item"
+                        @click="goToGenerateDocumentNotification(d, true)"
+                      >
+                        {{ trans(EVALUATION_NOTIFICATION_NOTIFY_REFERRER) }}
+                      </a>
+                    </li>
+                    <li>
+                      <a
+                        class="dropdown-item"
+                        @click="goToGenerateDocumentNotification(d, false)"
+                      >
+                        {{ trans(EVALUATION_NOTIFICATION_NOTIFY_ANY) }}
+                      </a>
+                    </li>
+                  </ul>
+                </template>
+              </li>
+              <li>
+                <document-action-buttons-group
+                  :stored-object="d.storedObject"
+                  :filename="d.title"
+                  :can-edit="true"
+                  :execute-before-leave="submitBeforeLeaveToEditor"
+                  :davLink="d.storedObject._links?.dav_link.href"
+                  :davLinkExpiration="
+                    d.storedObject._links?.dav_link.expiration
+                  "
+                  @on-stored-object-status-change="
+                    $emit('statusDocumentChanged', $event)
+                  "
+                ></document-action-buttons-group>
+              </li>
+              <!--replace document-->
+              <li
+                v-if="
+                  Number.isInteger(d.id) && d.storedObject._permissions.canEdit
+                "
+              >
+                <drop-file-modal
+                  :existing-doc="d.storedObject"
+                  :allow-remove="false"
+                  @add-document="
+                    (arg) =>
+                      replaceDocument(
+                        d,
+                        arg.stored_object,
+                        arg.stored_object_version,
+                      )
+                  "
+                ></drop-file-modal>
+              </li>
+              <li v-if="Number.isInteger(d.id)">
+                <div class="duplicate-dropdown">
+                  <button
+                    class="btn btn-outline-primary dropdown-toggle"
+                    type="button"
+                    data-bs-toggle="dropdown"
+                    aria-expanded="false"
+                  >
+                    <i class="bi bi-lightning-fill"></i>
+                  </button>
+                  <ul class="dropdown-menu">
+                    <!--delete-->
+                    <li v-if="d.workflows.length === 0">
+                      <a
+                        class="dropdown-item"
+                        @click="$emit('removeDocument', d)"
+                      >
+                        <i class="fa fa-trash-o" aria-hidden="true"></i>
+                        {{ trans(EVALUATION_DOCUMENT_DELETE) }}
+                      </a>
+                    </li>
+                    <!--duplicate document-->
+                    <li>
+                      <a
+                        class="dropdown-item"
+                        @click="$emit('duplicateDocument', d)"
+                      >
+                        <i class="fa fa-copy" aria-hidden="true"></i>
+                        {{ trans(EVALUATION_DOCUMENT_DUPLICATE_HERE) }}
+                      </a>
+                    </li>
+                    <li>
+                      <a
+                        class="dropdown-item"
+                        @click="prepareDocumentDuplicationToWork(d)"
+                      >
+                        <i class="fa fa-copy" aria-hidden="true"></i>
+                        {{
+                          trans(
+                            EVALUATION_DOCUMENT_DUPLICATE_TO_OTHER_EVALUATION,
+                          )
+                        }}</a
+                      >
+                    </li>
+                    <!--move document-->
+                    <li v-if="d.storedObject._permissions.canEdit">
+                      <a
+                        class="dropdown-item"
+                        @click="prepareDocumentMoveToWork(d)"
+                      >
+                        <i class="fa fa-arrows" aria-hidden="true"></i>
+                        {{ trans(EVALUATION_DOCUMENT_MOVE) }}</a
+                      >
+                    </li>
+                  </ul>
+                </div>
+              </li>
+            </ul>
+          </div>
+        </div>
+      </div>
     </div>
+  </div>
 
-    <AccompanyingPeriodWorkSelectorModal
-        v-if="showAccompanyingPeriodSelector"
-        v-model:selectedAcpw="selectedAcpw"
-        :accompanying-period-id="accompanyingPeriodId"
-        :is-evaluation-selector="true"
-        :ignore-accompanying-period-work-ids="[]"
-        @close-modal="showAccompanyingPeriodSelector = false"
-        @update:selectedEvaluation="selectedEvaluation = $event"
-    />
+  <AccompanyingPeriodWorkSelectorModal
+    v-if="showAccompanyingPeriodSelector"
+    v-model:selectedAcpw="selectedAcpw"
+    :accompanying-period-id="accompanyingPeriodId"
+    :is-evaluation-selector="true"
+    :ignore-accompanying-period-work-ids="[]"
+    @close-modal="showAccompanyingPeriodSelector = false"
+    @update:selectedEvaluation="selectedEvaluation = $event"
+  />
 </template>
 
 <script setup>
@@ -291,15 +208,15 @@ import ListWorkflowModal from "ChillMainAssets/vuejs/_components/EntityWorkflow/
 import DocumentActionButtonsGroup from "ChillDocStoreAssets/vuejs/DocumentActionButtonsGroup.vue";
 import DropFileModal from "ChillDocStoreAssets/vuejs/DropFileWidget/DropFileModal.vue";
 import {
-    EVALUATION_NOTIFICATION_NOTIFY_REFERRER,
-    EVALUATION_NOTIFICATION_NOTIFY_ANY,
-    EVALUATION_NOTIFICATION_SEND,
-    EVALUATION_DOCUMENTS,
-    EVALUATION_DOCUMENT_MOVE,
-    EVALUATION_DOCUMENT_DELETE,
-    EVALUATION_DOCUMENT_DUPLICATE_HERE,
-    EVALUATION_DOCUMENT_DUPLICATE_TO_OTHER_EVALUATION,
-    trans,
+  EVALUATION_NOTIFICATION_NOTIFY_REFERRER,
+  EVALUATION_NOTIFICATION_NOTIFY_ANY,
+  EVALUATION_NOTIFICATION_SEND,
+  EVALUATION_DOCUMENTS,
+  EVALUATION_DOCUMENT_MOVE,
+  EVALUATION_DOCUMENT_DELETE,
+  EVALUATION_DOCUMENT_DUPLICATE_HERE,
+  EVALUATION_DOCUMENT_DUPLICATE_TO_OTHER_EVALUATION,
+  trans,
 } from "translator";
 import { computed, ref, watch } from "vue";
 import AccompanyingPeriodWorkSelectorModal from "ChillPersonAssets/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkSelectorModal.vue";
@@ -308,17 +225,17 @@ import { buildLinkCreate as buildLinkCreateNotification } from "ChillMainAssets/
 import { useStore } from "vuex";
 
 const props = defineProps([
-    "documents",
-    "docAnchorId",
-    "accompanyingPeriodId",
-    "evaluation",
+  "documents",
+  "docAnchorId",
+  "accompanyingPeriodId",
+  "evaluation",
 ]);
 const emit = defineEmits([
-    "inputDocumentTitle",
-    "removeDocument",
-    "duplicateDocument",
-    "statusDocumentChanged",
-    "duplicateDocumentToWork",
+  "inputDocumentTitle",
+  "removeDocument",
+  "duplicateDocument",
+  "statusDocumentChanged",
+  "duplicateDocumentToWork",
 ]);
 
 const store = useStore();
@@ -329,67 +246,67 @@ const selectedDocumentToDuplicate = ref(null);
 const selectedDocumentToMove = ref(null);
 
 const AmIRefferer = computed(() => {
-    return !(
-        store.state.work.accompanyingPeriod.user &&
-        store.state.me &&
-        store.state.work.accompanyingPeriod.user.id !== store.state.me.id
-    );
+  return !(
+    store.state.work.accompanyingPeriod.user &&
+    store.state.me &&
+    store.state.work.accompanyingPeriod.user.id !== store.state.me.id
+  );
 });
 
 const prepareDocumentDuplicationToWork = (d) => {
-    selectedDocumentToDuplicate.value = d;
-    /** ensure selectedDocumentToMove is null */
-    selectedDocumentToMove.value = null;
+  selectedDocumentToDuplicate.value = d;
+  /** ensure selectedDocumentToMove is null */
+  selectedDocumentToMove.value = null;
 
-    showAccompanyingPeriodSelector.value = true;
+  showAccompanyingPeriodSelector.value = true;
 };
 
 const prepareDocumentMoveToWork = (d) => {
-    selectedDocumentToMove.value = d;
-    /** ensure selectedDocumentToDuplicate is null */
-    selectedDocumentToDuplicate.value = null;
+  selectedDocumentToMove.value = d;
+  /** ensure selectedDocumentToDuplicate is null */
+  selectedDocumentToDuplicate.value = null;
 
-    showAccompanyingPeriodSelector.value = true;
+  showAccompanyingPeriodSelector.value = true;
 };
 
 watch(selectedEvaluation, (val) => {
-    if (selectedDocumentToDuplicate.value) {
-        emit("duplicateDocumentToEvaluation", {
-            evaluation: val,
-            document: selectedDocumentToDuplicate.value,
-        });
-    } else {
-        emit("moveDocumentToEvaluation", {
-            evaluationDest: val,
-            document: selectedDocumentToMove.value,
-        });
-    }
+  if (selectedDocumentToDuplicate.value) {
+    emit("duplicateDocumentToEvaluation", {
+      evaluation: val,
+      document: selectedDocumentToDuplicate.value,
+    });
+  } else {
+    emit("moveDocumentToEvaluation", {
+      evaluationDest: val,
+      document: selectedDocumentToMove.value,
+    });
+  }
 });
 
 async function goToGenerateWorkflowEvaluationDocument({
-    workflowName,
-    payload,
+  workflowName,
+  payload,
 }) {
-    const callback = (data) => {
-        let evaluation = data.accompanyingPeriodWorkEvaluations.find(
-            (e) => e.key === props.evaluation.key,
-        );
-        let updatedDocument = evaluation.documents.find(
-            (d) => d.key === payload.doc.key,
-        );
-        window.location.assign(
-            buildLinkCreate(
-                workflowName,
-                "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument",
-                updatedDocument.id,
-            ),
-        );
-    };
+  const callback = (data) => {
+    let evaluation = data.accompanyingPeriodWorkEvaluations.find(
+      (e) => e.key === props.evaluation.key,
+    );
+    let updatedDocument = evaluation.documents.find(
+      (d) => d.key === payload.doc.key,
+    );
+    window.location.assign(
+      buildLinkCreate(
+        workflowName,
+        "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument",
+        updatedDocument.id,
+      ),
+    );
+  };
 
-    return store.dispatch("submit", callback).catch((e) => {
-        console.log(e);
-        throw e;
-    });
+  return store.dispatch("submit", callback).catch((e) => {
+    console.log(e);
+    throw e;
+  });
 }
 
 /**
@@ -401,55 +318,53 @@ async function goToGenerateWorkflowEvaluationDocument({
  * @return {void}
  */
 async function replaceDocument(oldDocument, storedObject, storedObjectVersion) {
-    let document = {
-        type: "accompanying_period_work_evaluation_document",
-        storedObject: storedObject,
-        title: oldDocument.title,
-    };
+  let document = {
+    type: "accompanying_period_work_evaluation_document",
+    storedObject: storedObject,
+    title: oldDocument.title,
+  };
 
-    return store.commit("replaceDocument", {
-        key: props.evaluation.key,
-        document,
-        oldDocument: oldDocument,
-        stored_object_version: storedObjectVersion,
-    });
+  return store.commit("replaceDocument", {
+    key: props.evaluation.key,
+    document,
+    oldDocument: oldDocument,
+    stored_object_version: storedObjectVersion,
+  });
 }
 
 async function goToGenerateDocumentNotification(document, tos) {
-    const callback = (data) => {
-        let evaluation = data.accompanyingPeriodWorkEvaluations.find(
-            (e) => e.key === props.evaluation.key,
-        );
-        let updatedDocument = evaluation.documents.find(
-            (d) => d.key === document.key,
-        );
-        window.location.assign(
-            buildLinkCreateNotification(
-                "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument",
-                updatedDocument.id,
-                tos === true
-                    ? store.state.work.accompanyingPeriod.user?.id
-                    : null,
-                window.location.pathname +
-                    window.location.search +
-                    window.location.hash,
-            ),
-        );
-    };
+  const callback = (data) => {
+    let evaluation = data.accompanyingPeriodWorkEvaluations.find(
+      (e) => e.key === props.evaluation.key,
+    );
+    let updatedDocument = evaluation.documents.find(
+      (d) => d.key === document.key,
+    );
+    window.location.assign(
+      buildLinkCreateNotification(
+        "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument",
+        updatedDocument.id,
+        tos === true ? store.state.work.accompanyingPeriod.user?.id : null,
+        window.location.pathname +
+          window.location.search +
+          window.location.hash,
+      ),
+    );
+  };
 
-    return store.dispatch("submit", callback).catch((e) => {
-        console.log(e);
-        throw e;
-    });
+  return store.dispatch("submit", callback).catch((e) => {
+    console.log(e);
+    throw e;
+  });
 }
 
 async function submitBeforeLeaveToEditor() {
-    console.log("submit beore edit 2");
-    // empty callback
-    const callback = () => null;
-    return store.dispatch("submit", callback).catch((e) => {
-        console.log(e);
-        throw e;
-    });
+  console.log("submit beore edit 2");
+  // empty callback
+  const callback = () => null;
+  return store.dispatch("submit", callback).catch((e) => {
+    console.log(e);
+    throw e;
+  });
 }
 </script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
index 6f459daec..91adc4bb1 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/FormEvaluation.vue
@@ -1,49 +1,47 @@
 <template>
-    <div>
-        <div class="m-md-3">
-            <DateInputs
-                :startDate="startDate"
-                :endDate="endDate"
-                :maxDate="maxDate"
-                :warningInterval="warningInterval"
-                @update:startDate="updateStartDate"
-                @update:endDate="updateEndDate"
-                @update:maxDate="updateMaxDate"
-                @update:warningInterval="updateWarningInterval"
-            />
+  <div>
+    <div class="m-md-3">
+      <DateInputs
+        :startDate="startDate"
+        :endDate="endDate"
+        :maxDate="maxDate"
+        :warningInterval="warningInterval"
+        @update:startDate="updateStartDate"
+        @update:endDate="updateEndDate"
+        @update:maxDate="updateMaxDate"
+        @update:warningInterval="updateWarningInterval"
+      />
 
-            <TimeSpentInput
-                :timeSpent="timeSpent"
-                :timeSpentChoices="timeSpentChoices"
-                @update:timeSpent="updateTimeSpent"
-            />
+      <TimeSpentInput
+        :timeSpent="timeSpent"
+        :timeSpentChoices="timeSpentChoices"
+        @update:timeSpent="updateTimeSpent"
+      />
 
-            <CommentInput :comment="comment" @update:comment="updateComment" />
+      <CommentInput :comment="comment" @update:comment="updateComment" />
 
-            <DocumentsList
-                v-if="evaluation.documents.length > 0"
-                :documents="evaluation.documents"
-                :docAnchorId="docAnchorId"
-                :evaluation="evaluation"
-                :accompanyingPeriodId="store.state.work.accompanyingPeriod.id"
-                @inputDocumentTitle="onInputDocumentTitle"
-                @removeDocument="removeDocument"
-                @duplicateDocument="duplicateDocument"
-                @duplicate-document-to-evaluation="
-                    duplicateDocumentToEvaluation
-                "
-                @move-document-to-evaluation="moveDocumentToEvaluation"
-                @statusDocumentChanged="onStatusDocumentChanged"
-                @goToGenerateNotification="goToGenerateDocumentNotification"
-            />
+      <DocumentsList
+        v-if="evaluation.documents.length > 0"
+        :documents="evaluation.documents"
+        :docAnchorId="docAnchorId"
+        :evaluation="evaluation"
+        :accompanyingPeriodId="store.state.work.accompanyingPeriod.id"
+        @inputDocumentTitle="onInputDocumentTitle"
+        @removeDocument="removeDocument"
+        @duplicateDocument="duplicateDocument"
+        @duplicate-document-to-evaluation="duplicateDocumentToEvaluation"
+        @move-document-to-evaluation="moveDocumentToEvaluation"
+        @statusDocumentChanged="onStatusDocumentChanged"
+        @goToGenerateNotification="goToGenerateDocumentNotification"
+      />
 
-            <DocumentActions
-                :evaluation="evaluation"
-                :templates="getTemplatesAvailables"
-                @addDocument="addDocument"
-            />
-        </div>
+      <DocumentActions
+        :evaluation="evaluation"
+        :templates="getTemplatesAvailables"
+        @addDocument="addDocument"
+      />
     </div>
+  </div>
 </template>
 
 <script setup>
@@ -55,9 +53,9 @@ import CommentInput from "./CommentInput.vue";
 import DocumentsList from "./DocumentsList.vue";
 import DocumentActions from "./DocumentActions.vue";
 import {
-    trans,
-    EVALUATION_DOCUMENT_DUPLICATE_SUCCESS,
-    EVALUATION_DOCUMENT_MOVE_SUCCESS,
+  trans,
+  EVALUATION_DOCUMENT_DUPLICATE_SUCCESS,
+  EVALUATION_DOCUMENT_MOVE_SUCCESS,
 } from "translator";
 import { useToast } from "vue-toast-notification";
 import { buildLinkCreate as buildLinkCreateNotification } from "ChillMainAssets/lib/entity-notification/api";
@@ -68,359 +66,357 @@ const store = useStore();
 const $toast = useToast();
 
 const timeSpentValues = [
-    60,
-    120,
-    180,
-    240,
-    300,
-    600,
-    900,
-    1200,
-    1500,
-    1800,
-    2700,
-    3600,
-    4500,
-    5400,
-    6300,
-    7200,
-    9000,
-    10800,
-    12600,
-    14400,
-    16200,
-    18000,
-    19800,
-    21600,
-    23400,
-    25200,
-    27000,
-    28800,
-    43200,
-    57600,
-    72000,
-    86400,
-    100800,
-    115200,
-    129600,
-    144000, // goes from 1 minute to 40 hours
+  60,
+  120,
+  180,
+  240,
+  300,
+  600,
+  900,
+  1200,
+  1500,
+  1800,
+  2700,
+  3600,
+  4500,
+  5400,
+  6300,
+  7200,
+  9000,
+  10800,
+  12600,
+  14400,
+  16200,
+  18000,
+  19800,
+  21600,
+  23400,
+  25200,
+  27000,
+  28800,
+  43200,
+  57600,
+  72000,
+  86400,
+  100800,
+  115200,
+  129600,
+  144000, // goes from 1 minute to 40 hours
 ];
 
 const formatDuration = (seconds, locale) => {
-    const currentLocale = locale || navigator.language || "fr";
+  const currentLocale = locale || navigator.language || "fr";
 
-    const totalHours = Math.floor(seconds / 3600);
-    const remainingMinutes = Math.floor((seconds % 3600) / 60);
+  const totalHours = Math.floor(seconds / 3600);
+  const remainingMinutes = Math.floor((seconds % 3600) / 60);
 
-    if (totalHours >= 8) {
-        const days = Math.floor(totalHours / 8);
-        const remainingHours = totalHours % 8;
+  if (totalHours >= 8) {
+    const days = Math.floor(totalHours / 8);
+    const remainingHours = totalHours % 8;
 
-        const parts = [];
-
-        if (days > 0) {
-            parts.push(
-                new Intl.NumberFormat(currentLocale, {
-                    style: "unit",
-                    unit: "day",
-                    unitDisplay: "long",
-                }).format(days),
-            );
-        }
-
-        if (remainingHours > 0) {
-            parts.push(
-                new Intl.NumberFormat(currentLocale, {
-                    style: "unit",
-                    unit: "hour",
-                    unitDisplay: "long",
-                }).format(remainingHours),
-            );
-        }
-
-        return parts.join(" ");
-    }
-
-    // For less than 8 hours, use hour and minute format
     const parts = [];
 
-    if (totalHours > 0) {
-        parts.push(
-            new Intl.NumberFormat(currentLocale, {
-                style: "unit",
-                unit: "hour",
-                unitDisplay: "long",
-            }).format(totalHours),
-        );
+    if (days > 0) {
+      parts.push(
+        new Intl.NumberFormat(currentLocale, {
+          style: "unit",
+          unit: "day",
+          unitDisplay: "long",
+        }).format(days),
+      );
     }
 
-    if (remainingMinutes > 0) {
-        parts.push(
-            new Intl.NumberFormat(currentLocale, {
-                style: "unit",
-                unit: "minute",
-                unitDisplay: "long",
-            }).format(remainingMinutes),
-        );
+    if (remainingHours > 0) {
+      parts.push(
+        new Intl.NumberFormat(currentLocale, {
+          style: "unit",
+          unit: "hour",
+          unitDisplay: "long",
+        }).format(remainingHours),
+      );
     }
 
-    console.log(parts);
-    console.log(parts.join(" "));
-
     return parts.join(" ");
+  }
+
+  // For less than 8 hours, use hour and minute format
+  const parts = [];
+
+  if (totalHours > 0) {
+    parts.push(
+      new Intl.NumberFormat(currentLocale, {
+        style: "unit",
+        unit: "hour",
+        unitDisplay: "long",
+      }).format(totalHours),
+    );
+  }
+
+  if (remainingMinutes > 0) {
+    parts.push(
+      new Intl.NumberFormat(currentLocale, {
+        style: "unit",
+        unit: "minute",
+        unitDisplay: "long",
+      }).format(remainingMinutes),
+    );
+  }
+
+  console.log(parts);
+  console.log(parts.join(" "));
+
+  return parts.join(" ");
 };
 
 const timeSpentChoices = computed(() => {
-    const locale = "fr";
-    return timeSpentValues.map((value) => ({
-        text: formatDuration(value, locale),
-        value: parseInt(value),
-    }));
+  const locale = "fr";
+  return timeSpentValues.map((value) => ({
+    text: formatDuration(value, locale),
+    value: parseInt(value),
+  }));
 });
 
 const startDate = computed({
-    get() {
-        return props.evaluation.startDate;
-    },
-    set(v) {
-        store.commit("setEvaluationStartDate", {
-            key: props.evaluation.key,
-            date: v,
-        });
-    },
+  get() {
+    return props.evaluation.startDate;
+  },
+  set(v) {
+    store.commit("setEvaluationStartDate", {
+      key: props.evaluation.key,
+      date: v,
+    });
+  },
 });
 
 const endDate = computed({
-    get() {
-        return props.evaluation.endDate;
-    },
-    set(v) {
-        store.commit("setEvaluationEndDate", {
-            key: props.evaluation.key,
-            date: v,
-        });
-    },
+  get() {
+    return props.evaluation.endDate;
+  },
+  set(v) {
+    store.commit("setEvaluationEndDate", {
+      key: props.evaluation.key,
+      date: v,
+    });
+  },
 });
 
 const maxDate = computed({
-    get() {
-        return props.evaluation.maxDate;
-    },
-    set(v) {
-        store.commit("setEvaluationMaxDate", {
-            key: props.evaluation.key,
-            date: v,
-        });
-    },
+  get() {
+    return props.evaluation.maxDate;
+  },
+  set(v) {
+    store.commit("setEvaluationMaxDate", {
+      key: props.evaluation.key,
+      date: v,
+    });
+  },
 });
 
 const warningInterval = computed({
-    get() {
-        return props.evaluation.warningInterval;
-    },
-    set(v) {
-        store.commit("setEvaluationWarningInterval", {
-            key: props.evaluation.key,
-            days: v,
-        });
-    },
+  get() {
+    return props.evaluation.warningInterval;
+  },
+  set(v) {
+    store.commit("setEvaluationWarningInterval", {
+      key: props.evaluation.key,
+      days: v,
+    });
+  },
 });
 
 const timeSpent = computed({
-    get() {
-        return props.evaluation.timeSpent;
-    },
-    set(v) {
-        store.commit("setEvaluationTimeSpent", {
-            key: props.evaluation.key,
-            time: v,
-        });
-    },
+  get() {
+    return props.evaluation.timeSpent;
+  },
+  set(v) {
+    store.commit("setEvaluationTimeSpent", {
+      key: props.evaluation.key,
+      time: v,
+    });
+  },
 });
 
 const comment = computed({
-    get() {
-        return props.evaluation.comment;
-    },
-    set(v) {
-        store.commit("setEvaluationComment", {
-            key: props.evaluation.key,
-            comment: v,
-        });
-    },
+  get() {
+    return props.evaluation.comment;
+  },
+  set(v) {
+    store.commit("setEvaluationComment", {
+      key: props.evaluation.key,
+      comment: v,
+    });
+  },
 });
 
 const getTemplatesAvailables = computed(() => {
-    return store.getters.getTemplatesAvailablesForEvaluation(
-        props.evaluation.evaluation,
-    );
+  return store.getters.getTemplatesAvailablesForEvaluation(
+    props.evaluation.evaluation,
+  );
 });
 
 // const getAccompanyingPeriod = computed(() => store.work)
 function updateStartDate(value) {
-    startDate.value = value;
+  startDate.value = value;
 }
 
 function updateEndDate(value) {
-    endDate.value = value;
+  endDate.value = value;
 }
 
 function updateMaxDate(value) {
-    maxDate.value = value;
+  maxDate.value = value;
 }
 
 function updateWarningInterval(value) {
-    warningInterval.value = value;
+  warningInterval.value = value;
 }
 
 function updateTimeSpent(value) {
-    timeSpent.value = parseInt(value);
+  timeSpent.value = parseInt(value);
 }
 
 function updateComment(value) {
-    comment.value = value;
+  comment.value = value;
 }
 
 function onInputDocumentTitle(event) {
-    const id = Number(event.target.id);
-    const key = Number(event.target.dataset.key) + 1;
-    const title = event.target.value;
-    store.commit("updateDocumentTitle", {
-        id: id,
-        key: key,
-        evaluationKey: props.evaluation.key,
-        title: title,
-    });
+  const id = Number(event.target.id);
+  const key = Number(event.target.dataset.key) + 1;
+  const title = event.target.value;
+  store.commit("updateDocumentTitle", {
+    id: id,
+    key: key,
+    evaluationKey: props.evaluation.key,
+    title: title,
+  });
 }
 
 function addDocument({ stored_object, stored_object_version, file_name }) {
-    let document = {
-        type: "accompanying_period_work_evaluation_document",
-        storedObject: stored_object,
-        title: file_name,
-    };
-    store.commit("addDocument", {
-        key: props.evaluation.key,
-        document,
-        stored_object_version,
-    });
+  let document = {
+    type: "accompanying_period_work_evaluation_document",
+    storedObject: stored_object,
+    title: file_name,
+  };
+  store.commit("addDocument", {
+    key: props.evaluation.key,
+    document,
+    stored_object_version,
+  });
 }
 
 function removeDocument(document) {
-    if (
-        window.confirm(
-            'Êtes-vous sûr·e de vouloir supprimer le document qui a pour titre "' +
-                document.title +
-                '" ?',
-        )
-    ) {
-        store.commit("removeDocument", {
-            key: props.evaluation.key,
-            document: document,
-        });
-    }
+  if (
+    window.confirm(
+      'Êtes-vous sûr·e de vouloir supprimer le document qui a pour titre "' +
+        document.title +
+        '" ?',
+    )
+  ) {
+    store.commit("removeDocument", {
+      key: props.evaluation.key,
+      document: document,
+    });
+  }
 }
 
 function duplicateDocument(document) {
-    store.dispatch("duplicateDocument", {
-        evaluation_key: props.evaluation.key,
-        document: document,
-    });
+  store.dispatch("duplicateDocument", {
+    evaluation_key: props.evaluation.key,
+    document: document,
+  });
 }
 
 function duplicateDocumentToEvaluation({ evaluation, document }) {
-    store
-        .dispatch("duplicateDocumentToEvaluation", {
-            evaluation: evaluation,
-            document: document,
-        })
-        .then(() => {
-            $toast.open({
-                message: trans(EVALUATION_DOCUMENT_DUPLICATE_SUCCESS),
-            });
-        })
-        .catch((e) => {
-            console.log(e);
-        });
+  store
+    .dispatch("duplicateDocumentToEvaluation", {
+      evaluation: evaluation,
+      document: document,
+    })
+    .then(() => {
+      $toast.open({
+        message: trans(EVALUATION_DOCUMENT_DUPLICATE_SUCCESS),
+      });
+    })
+    .catch((e) => {
+      console.log(e);
+    });
 }
 
 function moveDocumentToEvaluation({ evaluationDest, document }) {
-    console.log("dest eval in formEvaluation", evaluationDest);
-    store
-        .dispatch("moveDocumentToEvaluation", {
-            evaluationInitial: props.evaluation,
-            evaluationDest: evaluationDest,
-            document: document,
-        })
-        .then(() => {
-            $toast.open({
-                message: trans(EVALUATION_DOCUMENT_MOVE_SUCCESS),
-            });
-        })
-        .catch((e) => {
-            console.log(e);
-        });
+  console.log("dest eval in formEvaluation", evaluationDest);
+  store
+    .dispatch("moveDocumentToEvaluation", {
+      evaluationInitial: props.evaluation,
+      evaluationDest: evaluationDest,
+      document: document,
+    })
+    .then(() => {
+      $toast.open({
+        message: trans(EVALUATION_DOCUMENT_MOVE_SUCCESS),
+      });
+    })
+    .catch((e) => {
+      console.log(e);
+    });
 }
 
 function onStatusDocumentChanged(newStatus) {
-    store.commit("statusDocumentChanged", {
-        key: props.evaluation.key,
-        newStatus: newStatus,
-    });
+  store.commit("statusDocumentChanged", {
+    key: props.evaluation.key,
+    newStatus: newStatus,
+  });
 }
 
 function goToGenerateDocumentNotification(document, tos) {
-    const callback = (data) => {
-        let evaluation = data.accompanyingPeriodWorkEvaluations.find(
-            (e) => e.key === props.evaluation.key,
-        );
-        let updatedDocument = evaluation.documents.find(
-            (d) => d.key === document.key,
-        );
-        window.location.assign(
-            buildLinkCreateNotification(
-                "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument",
-                updatedDocument.id,
-                tos === true
-                    ? store.state.work.accompanyingPeriod.user.id
-                    : null,
-                window.location.pathname +
-                    window.location.search +
-                    window.location.hash,
-            ),
-        );
-    };
-    store.dispatch("submit", callback).catch((e) => {
-        console.log(e);
-        throw e;
-    });
+  const callback = (data) => {
+    let evaluation = data.accompanyingPeriodWorkEvaluations.find(
+      (e) => e.key === props.evaluation.key,
+    );
+    let updatedDocument = evaluation.documents.find(
+      (d) => d.key === document.key,
+    );
+    window.location.assign(
+      buildLinkCreateNotification(
+        "Chill\\PersonBundle\\Entity\\AccompanyingPeriod\\AccompanyingPeriodWorkEvaluationDocument",
+        updatedDocument.id,
+        tos === true ? store.state.work.accompanyingPeriod.user.id : null,
+        window.location.pathname +
+          window.location.search +
+          window.location.hash,
+      ),
+    );
+  };
+  store.dispatch("submit", callback).catch((e) => {
+    console.log(e);
+    throw e;
+  });
 }
 </script>
 
 <style lang="scss" scoped>
 input.document-title {
-    font-weight: bold;
-    font-size: 1rem;
+  font-weight: bold;
+  font-size: 1rem;
 }
 
 .bg-blink {
-    color: #050000;
-    padding: 10px;
-    display: inline-block;
-    border-radius: 5px;
-    animation: blinkingBackground 2.2s infinite;
-    animation-iteration-count: 2;
+  color: #050000;
+  padding: 10px;
+  display: inline-block;
+  border-radius: 5px;
+  animation: blinkingBackground 2.2s infinite;
+  animation-iteration-count: 2;
 }
 
 @keyframes blinkingBackground {
-    0% {
-        background-color: #ed776d;
-    }
-    50% {
-        background-color: #ffffff;
-    }
-    100% {
-        background-color: #ed776d;
-    }
+  0% {
+    background-color: #ed776d;
+  }
+  50% {
+    background-color: #ffffff;
+  }
+  100% {
+    background-color: #ed776d;
+  }
 }
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/TimeSpentInput.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/TimeSpentInput.vue
index e03ec0ed5..a253f87d3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/TimeSpentInput.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourseWorkEdit/components/TimeSpentInput.vue
@@ -1,27 +1,27 @@
 <template>
-    <div class="row mb-3">
-        <label class="col-4 col-sm-2 col-md-4 col-lg-2 col-form-label">
-            {{ trans(EVALUATION_TIME_SPENT) }}
-        </label>
-        <div class="col-8 col-sm-4 col-md-8 col-lg-4">
-            <select
-                class="form-control form-control-sm"
-                :value="timeSpent"
-                @input="$emit('update:timeSpent', $event.target.value)"
-            >
-                <option disabled value="">
-                    {{ trans(EVALUATION_TIME_SPENT) }}
-                </option>
-                <option
-                    v-for="time in timeSpentChoices"
-                    :value="time.value"
-                    :key="time.value"
-                >
-                    {{ time.text }}
-                </option>
-            </select>
-        </div>
+  <div class="row mb-3">
+    <label class="col-4 col-sm-2 col-md-4 col-lg-2 col-form-label">
+      {{ trans(EVALUATION_TIME_SPENT) }}
+    </label>
+    <div class="col-8 col-sm-4 col-md-8 col-lg-4">
+      <select
+        class="form-control form-control-sm"
+        :value="timeSpent"
+        @input="$emit('update:timeSpent', $event.target.value)"
+      >
+        <option disabled value="">
+          {{ trans(EVALUATION_TIME_SPENT) }}
+        </option>
+        <option
+          v-for="time in timeSpentChoices"
+          :value="time.value"
+          :key="time.value"
+        >
+          {{ time.text }}
+        </option>
+      </select>
     </div>
+  </div>
 </template>
 
 <script setup>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/OnTheFly.ts b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/OnTheFly.ts
index 44114a67f..742f7ef54 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/OnTheFly.ts
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/OnTheFly.ts
@@ -1,8 +1,9 @@
 import { fetchResults, makeFetch } from "ChillMainAssets/lib/api/apiMethods";
-import {Center, Civility, Gender, SetCenter} from "ChillMainAssets/types";
+import { Center, Civility, Gender, SetCenter } from "ChillMainAssets/types";
 import {
   AltName,
-  Person, PersonIdentifier,
+  Person,
+  PersonIdentifier,
   PersonIdentifierWorker,
   PersonWrite,
 } from "ChillPersonAssets/types";
@@ -26,21 +27,43 @@ export const personToWritePerson = (person: Person): PersonWrite => {
     type: "person",
     firstName: person.firstName,
     lastName: person.lastName,
-    altNames: person.altNames.map((altName) => ({key: altName.key, value: altName.label})),
+    altNames: person.altNames.map((altName) => ({
+      key: altName.key,
+      value: altName.label,
+    })),
     addressId: null,
-    birthdate: null === person.birthdate ? null : {datetime: person.birthdate.datetime8601},
-    deathdate: null === person.deathdate ? null : {datetime: person.deathdate.datetime8601},
+    birthdate:
+      null === person.birthdate
+        ? null
+        : { datetime: person.birthdate.datetime8601 },
+    deathdate:
+      null === person.deathdate
+        ? null
+        : { datetime: person.deathdate.datetime8601 },
     phonenumber: person.phonenumber,
     mobilenumber: person.mobilenumber,
-    center: null === person.centers ? null : person.centers
-      .map((center): SetCenter => ({id: center.id, type: "center"}))
-      .find(() => true) || null,
+    center:
+      null === person.centers
+        ? null
+        : person.centers
+            .map((center): SetCenter => ({ id: center.id, type: "center" }))
+            .find(() => true) || null,
     email: person.email,
-    civility: null === person.civility ? null : {id: person.civility.id, type: "chill_main_civility"},
-    gender: null === person.gender ? null : {id: person.gender.id, type: "chill_main_gender"},
-    identifiers: person.identifiers.map((identifier: PersonIdentifier) => ({type: "person_identifier", definition_id: identifier.definition.id, value: identifier.value})),
-  }
-}
+    civility:
+      null === person.civility
+        ? null
+        : { id: person.civility.id, type: "chill_main_civility" },
+    gender:
+      null === person.gender
+        ? null
+        : { id: person.gender.id, type: "chill_main_gender" },
+    identifiers: person.identifiers.map((identifier: PersonIdentifier) => ({
+      type: "person_identifier",
+      definition_id: identifier.definition.id,
+      value: identifier.value,
+    })),
+  };
+};
 
 export const getPersonAltNames = async (): Promise<AltName[]> =>
   fetch("/api/1.0/person/config/alt_names.json").then((response) => {
@@ -65,10 +88,12 @@ export const getPersonIdentifiers = async (): Promise<
   PersonIdentifierWorker[]
 > => fetchResults("/api/1.0/person/identifiers/workers");
 
-export interface WritePersonViolationMap
-  extends Record<string, Record<string, string>> {
+export interface WritePersonViolationMap extends Record<
+  string,
+  Record<string, string>
+> {
   firstName: {
-    "{{ value }}": string
+    "{{ value }}": string;
   };
   lastName: {
     "{{ value }}": string;
@@ -96,7 +121,7 @@ export interface WritePersonViolationMap
   birthdate: {};
   identifiers: {
     "{{ value }}": string;
-    "definition_id": string;
+    definition_id: string;
   };
 }
 export const createPerson = async (person: PersonWrite): Promise<Person> => {
@@ -107,10 +132,13 @@ export const createPerson = async (person: PersonWrite): Promise<Person> => {
   );
 };
 
-export const editPerson = async (person: PersonWrite, personId: number): Promise<Person> => {
+export const editPerson = async (
+  person: PersonWrite,
+  personId: number,
+): Promise<Person> => {
   return makeFetch<PersonWrite, Person, WritePersonViolationMap>(
     "PATCH",
     `/api/1.0/person/person/${personId}.json`,
     person,
   );
-}
+};
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/accompanyingCourseWorkEvaluationDocument.ts b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/accompanyingCourseWorkEvaluationDocument.ts
index 1a91ae28d..955c27b3b 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/accompanyingCourseWorkEvaluationDocument.ts
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_api/accompanyingCourseWorkEvaluationDocument.ts
@@ -11,21 +11,21 @@ export const duplicate = async (
 };
 
 export const duplicateDocumentToEvaluation = async (
-    document_id: number,
-    evaluation_id: number,
+  document_id: number,
+  evaluation_id: number,
 ): Promise<AccompanyingPeriodWorkEvaluationDocument> => {
-    return makeFetch<null, AccompanyingPeriodWorkEvaluationDocument>(
-        "POST",
-        `/api/1.0/person/accompanying-course-work-evaluation-document/${document_id}/evaluation/${evaluation_id}/duplicate`,
-    );
+  return makeFetch<null, AccompanyingPeriodWorkEvaluationDocument>(
+    "POST",
+    `/api/1.0/person/accompanying-course-work-evaluation-document/${document_id}/evaluation/${evaluation_id}/duplicate`,
+  );
 };
 
 export const moveDocumentToEvaluation = async (
-    document_id: number,
-    evaluation_id: number,
+  document_id: number,
+  evaluation_id: number,
 ): Promise<AccompanyingPeriodWorkEvaluationDocument> => {
-    return makeFetch<null, AccompanyingPeriodWorkEvaluationDocument>(
-        "POST",
-        `/api/1.0/person/accompanying-course-work-evaluation-document/${document_id}/evaluation/${evaluation_id}/move`,
-    );
+  return makeFetch<null, AccompanyingPeriodWorkEvaluationDocument>(
+    "POST",
+    `/api/1.0/person/accompanying-course-work-evaluation-document/${document_id}/evaluation/${evaluation_id}/move`,
+  );
 };
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkEvaluationItem.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkEvaluationItem.vue
index fc641a0a2..1beae1b90 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkEvaluationItem.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkEvaluationItem.vue
@@ -1,53 +1,47 @@
 <template>
-    <div class="container">
-        <div class="item-bloc">
-            <div class="item-row">
-                <h2 class="badge-title">
-                    <span class="title_label"></span>
-                    <span class="title_action">
-                        <span>
-                            {{ trans(EVALUATION) }}:
-                            <span class="badge bg-light text-dark">
-                                {{ eval?.evaluation?.title.fr }}
-                            </span>
-                        </span>
+  <div class="container">
+    <div class="item-bloc">
+      <div class="item-row">
+        <h2 class="badge-title">
+          <span class="title_label"></span>
+          <span class="title_action">
+            <span>
+              {{ trans(EVALUATION) }}:
+              <span class="badge bg-light text-dark">
+                {{ eval?.evaluation?.title.fr }}
+              </span>
+            </span>
 
-                        <ul class="small_in_title columns mt-1">
-                            <li>
-                                <span class="item-key">
-                                    {{
-                                        trans(
-                                            ACCOMPANYING_COURSE_WORK_START_DATE,
-                                        )
-                                    }}
-                                    :
-                                </span>
-                                <b>{{ formatDate(eval.startDate) }}</b>
-                            </li>
+            <ul class="small_in_title columns mt-1">
+              <li>
+                <span class="item-key">
+                  {{ trans(ACCOMPANYING_COURSE_WORK_START_DATE) }}
+                  :
+                </span>
+                <b>{{ formatDate(eval.startDate) }}</b>
+              </li>
 
-                            <li v-if="eval.endDate">
-                                <span class="item-key">
-                                    {{
-                                        trans(ACCOMPANYING_COURSE_WORK_END_DATE)
-                                    }}
-                                    :
-                                </span>
-                                <b>{{ formatDate(eval.endDate) }}</b>
-                            </li>
-                        </ul>
-                    </span>
-                </h2>
-            </div>
-        </div>
+              <li v-if="eval.endDate">
+                <span class="item-key">
+                  {{ trans(ACCOMPANYING_COURSE_WORK_END_DATE) }}
+                  :
+                </span>
+                <b>{{ formatDate(eval.endDate) }}</b>
+              </li>
+            </ul>
+          </span>
+        </h2>
+      </div>
     </div>
+  </div>
 </template>
 
 <script setup lang="ts">
 import {
-    ACCOMPANYING_COURSE_WORK_END_DATE,
-    ACCOMPANYING_COURSE_WORK_START_DATE,
-    EVALUATION,
-    trans,
+  ACCOMPANYING_COURSE_WORK_END_DATE,
+  ACCOMPANYING_COURSE_WORK_START_DATE,
+  EVALUATION,
+  trans,
 } from "translator";
 import { ISOToDate } from "ChillMainAssets/chill/js/date";
 import { DateTime } from "ChillMainAssets/types";
@@ -56,15 +50,15 @@ import { AccompanyingPeriodWorkEvaluation } from "../../../types";
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const props = defineProps<{ eval: AccompanyingPeriodWorkEvaluation }>();
 const formatDate = (dateObject: DateTime) => {
-    if (dateObject) {
-        const parsedDate = ISOToDate(dateObject.datetime);
-        if (parsedDate) {
-            return new Intl.DateTimeFormat("default", {
-                dateStyle: "short",
-            }).format(parsedDate);
-        } else {
-            return "";
-        }
+  if (dateObject) {
+    const parsedDate = ISOToDate(dateObject.datetime);
+    if (parsedDate) {
+      return new Intl.DateTimeFormat("default", {
+        dateStyle: "short",
+      }).format(parsedDate);
+    } else {
+      return "";
     }
+  }
 };
 </script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkEvaluationList.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkEvaluationList.vue
index 8581546f1..b85c87ec4 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkEvaluationList.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkEvaluationList.vue
@@ -1,24 +1,24 @@
 <template>
-    <div class="results">
-        <div
-            v-for="evaluation in evaluations"
-            :key="evaluation.id"
-            class="list-item"
-        >
-            <label class="acpw-item">
-                <div>
-                    <input
-                        type="radio"
-                        :value="evaluation"
-                        v-model="selectedEvaluation"
-                        name="item"
-                    />
-                </div>
-
-                <accompanying-period-work-evaluation-item :eval="evaluation" />
-            </label>
+  <div class="results">
+    <div
+      v-for="evaluation in evaluations"
+      :key="evaluation.id"
+      class="list-item"
+    >
+      <label class="acpw-item">
+        <div>
+          <input
+            type="radio"
+            :value="evaluation"
+            v-model="selectedEvaluation"
+            name="item"
+          />
         </div>
+
+        <accompanying-period-work-evaluation-item :eval="evaluation" />
+      </label>
     </div>
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -28,7 +28,7 @@ import AccompanyingPeriodWorkEvaluationItem from "ChillPersonAssets/vuejs/_compo
 
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const props = defineProps<{
-    evaluations: AccompanyingPeriodWorkEvaluation[];
+  evaluations: AccompanyingPeriodWorkEvaluation[];
 }>();
 const selectedEvaluation = ref<AccompanyingPeriodWorkEvaluation | null>(null);
 
@@ -36,12 +36,12 @@ const selectedEvaluation = ref<AccompanyingPeriodWorkEvaluation | null>(null);
 const emit = defineEmits();
 
 watch(selectedEvaluation, (newValue) => {
-    emit("update:selectedEvaluation", newValue);
+  emit("update:selectedEvaluation", newValue);
 });
 </script>
 
 <style>
 .acpw-item {
-    display: flex;
+  display: flex;
 }
 </style>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkList.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkList.vue
index 9a7afa7da..03d513b13 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkList.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkList.vue
@@ -27,22 +27,22 @@ import { AccompanyingPeriodWork } from "../../../types";
 import { defineProps, ref, watch } from "vue";
 
 const props = defineProps<{
-    accompanyingPeriodWorks: AccompanyingPeriodWork[];
-    selectedAcpw?: AccompanyingPeriodWork | null;
+  accompanyingPeriodWorks: AccompanyingPeriodWork[];
+  selectedAcpw?: AccompanyingPeriodWork | null;
 }>();
 const selectedAcpw = ref<AccompanyingPeriodWork | null>(
-    props.selectedAcpw ?? null,
+  props.selectedAcpw ?? null,
 );
 
 const emit = defineEmits<{
-    "update:selectedAcpw": [value: AccompanyingPeriodWork | null];
+  "update:selectedAcpw": [value: AccompanyingPeriodWork | null];
 }>();
 
 watch(
-    () => props.selectedAcpw,
-    (val) => {
-        selectedAcpw.value = val ?? null;
-    },
+  () => props.selectedAcpw,
+  (val) => {
+    selectedAcpw.value = val ?? null;
+  },
 );
 
 watch(selectedAcpw, (newValue) => {
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkSelectorModal.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkSelectorModal.vue
index 158f6c16b..5ba7c1283 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkSelectorModal.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkSelectorModal.vue
@@ -20,26 +20,28 @@
       </li>
     </ul>
 
-        <teleport to="body">
-            <modal
-                v-if="showModal"
-                @close="closeModal"
-                modal-dialog-class="modal-dialog-scrollable modal-xl"
-            >
-                <template #header>
-                    <h3>
-                        {{ getModalTitle() }}
-                    </h3>
-                </template>
+    <teleport to="body">
+      <modal
+        v-if="showModal"
+        @close="closeModal"
+        modal-dialog-class="modal-dialog-scrollable modal-xl"
+      >
+        <template #header>
+          <h3>
+            {{ getModalTitle() }}
+          </h3>
+        </template>
 
         <template #body>
           <accompanying-period-work-list
-            v-if="evaluations.length === 0":accompanying-period-works="accompanyingPeriodWorks"
-            v-model:selectedAcpw="selectedAcpw"/>
-                    <accompanying-period-work-evaluation-list
-                        v-if="evaluations.length > 0"
-                        :evaluations="evaluations"
-                        v-model:selectedEvaluation="selectedEvaluation"
+            v-if="evaluations.length === 0"
+            :accompanying-period-works="accompanyingPeriodWorks"
+            v-model:selectedAcpw="selectedAcpw"
+          />
+          <accompanying-period-work-evaluation-list
+            v-if="evaluations.length > 0"
+            :evaluations="evaluations"
+            v-model:selectedEvaluation="selectedEvaluation"
           />
         </template>
 
@@ -59,13 +61,14 @@ import Modal from "ChillMainAssets/vuejs/_components/Modal.vue";
 import AccompanyingPeriodWorkList from "./AccompanyingPeriodWorkList.vue";
 import { AccompanyingPeriodWork } from "../../../types";
 import {
-  trans,ACPW_DUPLICATE_SELECT_ACCOMPANYING_PERIOD_WORK,
-  ACPW_DUPLICATE_SELECT_AN_EVALUATION,CONFIRM,
-
+  trans,
+  ACPW_DUPLICATE_SELECT_ACCOMPANYING_PERIOD_WORK,
+  ACPW_DUPLICATE_SELECT_AN_EVALUATION,
+  CONFIRM,
 } from "translator";
 import { fetchResults } from "ChillMainAssets/lib/api/apiMethods";
 import AccompanyingPeriodWorkEvaluationList from "ChillPersonAssets/vuejs/_components/AccompanyingPeriodWorkSelector/AccompanyingPeriodWorkEvaluationList.vue";
-  import { AccompanyingPeriodWorkEvaluation } from "../../../types";
+import { AccompanyingPeriodWorkEvaluation } from "../../../types";
 
 const selectedAcpw = ref<AccompanyingPeriodWork | null>(null);
 const selectedEvaluation = ref<AccompanyingPeriodWorkEvaluation | null>(null);
@@ -74,21 +77,21 @@ const accompanyingPeriodWorks = ref<AccompanyingPeriodWork[]>([]);
 const evaluations = ref<AccompanyingPeriodWorkEvaluation[]>([]);
 
 const props = defineProps<{
-    accompanyingPeriodId: string;
-    isEvaluationSelector: boolean;
-    ignoreAccompanyingPeriodWorkIds: number[];
+  accompanyingPeriodId: string;
+  isEvaluationSelector: boolean;
+  ignoreAccompanyingPeriodWorkIds: number[];
 }>();
 
 const emit = defineEmits<{
   pickWork: [payload: { work: AccompanyingPeriodWork | null }];
-    closeModal: [];
-    "update:selectedEvaluation": [evaluation: AccompanyingPeriodWorkEvaluation];
+  closeModal: [];
+  "update:selectedEvaluation": [evaluation: AccompanyingPeriodWorkEvaluation];
 }>();
 
 const getModalTitle = () =>
-    evaluations.value.length > 0
-        ? trans(ACPW_DUPLICATE_SELECT_AN_EVALUATION)
-        : trans(ACPW_DUPLICATE_SELECT_ACCOMPANYING_PERIOD_WORK);
+  evaluations.value.length > 0
+    ? trans(ACPW_DUPLICATE_SELECT_AN_EVALUATION)
+    : trans(ACPW_DUPLICATE_SELECT_ACCOMPANYING_PERIOD_WORK);
 
 onMounted(() => {
   if (props.accompanyingPeriodId) {
@@ -97,70 +100,70 @@ onMounted(() => {
     console.error("No accompanyingperiod id was given");
   }
 
-    showModal.value = true;
+  showModal.value = true;
 });
 
 const getAccompanyingPeriodWorks = async (periodId: number) => {
   const url = `/api/1.0/person/accompanying-course/${periodId}/works.json`;
 
   const accompanyingPeriodWorksFetched =
-     await fetchResults<AccompanyingPeriodWork>(url);
+    await fetchResults<AccompanyingPeriodWork>(url);
   if (props.isEvaluationSelector) {
     accompanyingPeriodWorks.value = accompanyingPeriodWorksFetched.filter(
-  (acpw: AccompanyingPeriodWork) =>
-                acpw.accompanyingPeriodWorkEvaluations.length > 0 &&
-                typeof acpw.id !== "undefined" &&
-                !props.ignoreAccompanyingPeriodWorkIds.includes(acpw.id),
-        );
-    } else {
-        accompanyingPeriodWorks.value = accompanyingPeriodWorksFetched;
-    }
+      (acpw: AccompanyingPeriodWork) =>
+        acpw.accompanyingPeriodWorkEvaluations.length > 0 &&
+        typeof acpw.id !== "undefined" &&
+        !props.ignoreAccompanyingPeriodWorkIds.includes(acpw.id),
+    );
+  } else {
+    accompanyingPeriodWorks.value = accompanyingPeriodWorksFetched;
+  }
 };
 
 watch(selectedAcpw, (newValue) => {
-    const inputField = document.getElementById(
-        "find_accompanying_period_work_acpw",
-    ) as HTMLInputElement;
-    if (inputField) {
-        inputField.value = String(newValue?.id || "");
-    }
+  const inputField = document.getElementById(
+    "find_accompanying_period_work_acpw",
+  ) as HTMLInputElement;
+  if (inputField) {
+    inputField.value = String(newValue?.id || "");
+  }
 
-    /*  if (!props.isEvaluationSelector) {
+  /*  if (!props.isEvaluationSelector) {
     console.log("Emitting from watch:", { work: newValue });
     emit("pickWork", { work: newValue });
   }*/
 });
 
 const openModal = () => {
-    showModal.value = true;
+  showModal.value = true;
 };
 const closeModal = () => {
-    showModal.value = false;
-    selectedEvaluation.value = null;
-    // selectedAcpw.value = null;
-    emit("closeModal");
+  showModal.value = false;
+  selectedEvaluation.value = null;
+  // selectedAcpw.value = null;
+  emit("closeModal");
 };
 const confirmSelection = () => {
   selectedAcpw.value = selectedAcpw.value;
-    console.log("selectedAcpw", selectedAcpw.value);
+  console.log("selectedAcpw", selectedAcpw.value);
 
-    if (!props.isEvaluationSelector) {
-        if (selectedAcpw.value) {
-            // only emit if something is actually selected!emit("pickWork", { work: selectedAcpw.value });
-  closeModal();}
-        // optionally show some error or warning if not selected
-        return;
+  if (!props.isEvaluationSelector) {
+    if (selectedAcpw.value) {
+      // only emit if something is actually selected!emit("pickWork", { work: selectedAcpw.value });
+      closeModal();
     }
+    // optionally show some error or warning if not selected
+    return;
+  }
 
-    if (selectedAcpw.value && props.isEvaluationSelector) {
-        evaluations.value =
-            selectedAcpw.value.accompanyingPeriodWorkEvaluations;
-    }
+  if (selectedAcpw.value && props.isEvaluationSelector) {
+    evaluations.value = selectedAcpw.value.accompanyingPeriodWorkEvaluations;
+  }
 
-    if (selectedEvaluation.value && props.isEvaluationSelector) {
-        // console.log('evaluation log in modal', selectedEvaluation.value)
-        emit("update:selectedEvaluation", selectedEvaluation.value);
-        closeModal();
-    }
+  if (selectedEvaluation.value && props.isEvaluationSelector) {
+    // console.log('evaluation log in modal', selectedEvaluation.value)
+    emit("update:selectedEvaluation", selectedEvaluation.value);
+    closeModal();
+  }
 };
 </script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
index 417ef4b7a..ea4090452 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons.vue
@@ -25,7 +25,11 @@
   />
 
   <CreateModal
-    v-if="creatableEntityTypes.length > 0 && showModalCreate && null == thirdPartyParentAddContact"
+    v-if="
+      creatableEntityTypes.length > 0 &&
+      showModalCreate &&
+      null == thirdPartyParentAddContact
+    "
     action="create"
     :allowed-types="creatableEntityTypes"
     :query="query"
@@ -50,7 +54,7 @@
 </template>
 
 <script setup lang="ts">
-import {ref, computed, nextTick, useTemplateRef} from "vue";
+import { ref, computed, nextTick, useTemplateRef } from "vue";
 import PersonChooseModal from "./AddPersons/PersonChooseModal.vue";
 import type {
   Suggestion,
@@ -62,7 +66,10 @@ import type {
 import { marked } from "marked";
 import options = marked.options;
 import CreateModal from "ChillMainAssets/vuejs/OnTheFly/components/CreateModal.vue";
-import {Thirdparty, ThirdpartyCompany} from "../../../../../ChillThirdPartyBundle/Resources/public/types";
+import {
+  Thirdparty,
+  ThirdpartyCompany,
+} from "../../../../../ChillThirdPartyBundle/Resources/public/types";
 
 interface AddPersonsConfig {
   suggested?: Suggestion[];
@@ -80,13 +87,13 @@ const props = withDefaults(defineProps<AddPersonsConfig>(), {
 });
 
 const emit =
-  defineEmits<{
-    (e: "addNewPersons", payload: { selected: Suggestion[] }): void;
-  }
+  defineEmits<
+    (e: "addNewPersons", payload: { selected: Suggestion[] }) => void
   >();
 
 type PersonChooseModalType = InstanceType<typeof PersonChooseModal>;
-const personChooseModal = useTemplateRef<PersonChooseModalType>('personChooseModal');
+const personChooseModal =
+  useTemplateRef<PersonChooseModalType>("personChooseModal");
 
 /**
  * Flag to show/hide the modal "choose".
@@ -106,7 +113,7 @@ const query = ref("");
 /**
  * Temporarily store the thirdparty company when calling "addContact"
  */
-const thirdPartyParentAddContact = ref<ThirdpartyCompany|null>(null);
+const thirdPartyParentAddContact = ref<ThirdpartyCompany | null>(null);
 
 /**
  * Contains the selected elements.
@@ -156,7 +163,7 @@ function closeModalChoose(): void {
 }
 
 function closeModalCreate(): void {
-  if (null !== thirdPartyParentAddContact) {
+  if (null !== thirdPartyParentAddContact.value) {
     thirdPartyParentAddContact.value = null;
   }
   showModalCreate.value = false;
@@ -165,7 +172,10 @@ function closeModalCreate(): void {
 /**
  * Called by PersonSuggestion's updateSelection event, when an element is checked/unchecked
  */
-function updateSelected(payload: {suggestion: Suggestion, isSelected: boolean}): void {
+function updateSelected(payload: {
+  suggestion: Suggestion;
+  isSelected: boolean;
+}): void {
   if (payload.isSelected) {
     addSuggestionToSelected(payload.suggestion);
   } else {
@@ -194,7 +204,7 @@ function onPickEntities(): void {
   closeModalChoose();
 }
 
-function triggerAddContact({parent}: {parent: ThirdpartyCompany}): void {
+function triggerAddContact({ parent }: { parent: ThirdpartyCompany }): void {
   closeModalChoose();
   openModalChoose();
   thirdPartyParentAddContact.value = parent;
@@ -216,7 +226,7 @@ function onPersonCreated(payload: { person: Person }): void {
   }
 }
 
-function onThirdPartyCreated(payload: {thirdParty: Thirdparty}): void {
+function onThirdPartyCreated(payload: { thirdParty: Thirdparty }): void {
   showModalCreate.value = false;
   const suggestion = {
     result: payload.thirdParty,
@@ -236,7 +246,7 @@ function resetSearch(): void {
   personChooseModal.value?.resetSearch();
 }
 
-defineExpose({resetSearch})
+defineExpose({ resetSearch });
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonChooseModal.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonChooseModal.vue
index 8c0ddb802..966d7a364 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonChooseModal.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonChooseModal.vue
@@ -82,7 +82,11 @@
             v-if="props.allowCreate && query.length > 0"
             class="create-button"
           >
-            <button type="button" class="btn btn-submit" @click="emit('onAskForCreate', { query })">
+            <button
+              type="button"
+              class="btn btn-submit"
+              @click="emit('onAskForCreate', { query })"
+            >
               {{ trans(ONTHEFLY_CREATE_BUTTON, { q: query }) }}
             </button>
           </div>
@@ -125,7 +129,7 @@ import type {
   SearchOptions,
   Entities,
 } from "ChillPersonAssets/types";
-import {ThirdpartyCompany} from "../../../../../../ChillThirdPartyBundle/Resources/public/types";
+import { ThirdpartyCompany } from "../../../../../../ChillThirdPartyBundle/Resources/public/types";
 
 interface Props {
   modalTitle: string;
@@ -147,7 +151,10 @@ const emit = defineEmits<{
   (e: "onPickEntities"): void;
   (e: "onAskForCreate", payload: { query: string }): void;
   (e: "triggerAddContact", payload: { parent: ThirdpartyCompany }): void;
-  (e: "updateSelected", payload: {suggestion: Suggestion, isSelected: boolean}): void;
+  (
+    e: "updateSelected",
+    payload: { suggestion: Suggestion; isSelected: boolean },
+  ): void;
   (e: "cleanSelected"): void;
 }>();
 
@@ -181,27 +188,32 @@ const queryLength = computed(() => search.query.length);
 const suggestedCounter = computed(() => suggested.value.length);
 const selectedCounter = computed(() => props.selected.size);
 
-const checkUniq = computed(() =>
-  props.options.uniq ? "radio" : "checkbox",
+const checkUniq = computed(() => (props.options.uniq ? "radio" : "checkbox"));
+
+const selectedAndSuggested = computed<(Suggestion & { isSelected: boolean })[]>(
+  () => {
+    const selectedAndSuggested = [];
+
+    // add selected that are not in the search results
+    for (const selected of props.selected.values()) {
+      if (!suggested.value.some((s: Suggestion) => s.key === selected.key)) {
+        selectedAndSuggested.push({ ...selected, isSelected: false });
+      }
+    }
+    for (const suggestion of suggested.value) {
+      selectedAndSuggested.push({
+        ...suggestion,
+        isSelected: props.selected.has(suggestion.key),
+      });
+    }
+
+    return selectedAndSuggested;
+  },
 );
 
-const selectedAndSuggested = computed<(Suggestion & {isSelected: boolean})[]>(() => {
-  const selectedAndSuggested = [];
-
-  // add selected that are not in the search results
-  for (const selected of props.selected.values()) {
-    if (!suggested.value.some((s: Suggestion) => s.key === selected.key)) {
-      selectedAndSuggested.push({...selected, isSelected: false});
-    }
-  }
-  for (const suggestion of suggested.value) {
-    selectedAndSuggested.push({...suggestion, isSelected: props.selected.has(suggestion.key)})
-  }
-
-  return selectedAndSuggested;
-});
-
-const hasNoResult = computed(() => search.hasPreviousQuery && suggested.value.length === 0);
+const hasNoResult = computed(
+  () => search.hasPreviousQuery && suggested.value.length === 0,
+);
 
 function setQuery(q: string) {
   search.query = q;
@@ -240,14 +252,15 @@ function setQuery(q: string) {
   }, delay);
 }
 
-
-function loadSuggestions(suggestedArr: {relevance: number, result: Entities}[]): void {
+function loadSuggestions(
+  suggestedArr: { relevance: number; result: Entities }[],
+): void {
   suggested.value = suggestedArr.map((item) => {
     return {
       key: item.result.type + item.result.id,
       relevance: item.relevance,
-      result: item.result
-    }
+      result: item.result,
+    };
   });
 }
 
@@ -267,11 +280,11 @@ function resetSearch() {
 
 function selectAll() {
   suggested.value.forEach((suggestion: Suggestion) => {
-    emit("updateSelected", {suggestion, isSelected: true})
+    emit("updateSelected", { suggestion, isSelected: true });
   });
 }
 
-function triggerAddContact(payload: {parent: ThirdpartyCompany}) {
+function triggerAddContact(payload: { parent: ThirdpartyCompany }) {
   emit("triggerAddContact", payload);
 }
 
@@ -279,7 +292,7 @@ function triggerAddContact(payload: {parent: ThirdpartyCompany}) {
  * Triggered when the user clicks on the "add" button.
  */
 function pickEntities(): void {
-  emit("onPickEntities", );
+  emit("onPickEntities");
   search.query = "";
   emit("close");
 }
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonSuggestion.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonSuggestion.vue
index aeb8dcac3..bb528b0a8 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonSuggestion.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/PersonSuggestion.vue
@@ -1,14 +1,14 @@
 <template>
   <div class="list-item" :class="{ checked: props.isSelected }">
     <label>
-        <input
-          :type="type"
-          :value="props.item.key"
-          name="item"
-          :id="props.item.key"
-          :checked="props.isSelected"
-          @click="onUpdateValue"
-        />
+      <input
+        :type="type"
+        :value="props.item.key"
+        name="item"
+        :id="props.item.key"
+        :checked="props.isSelected"
+        @click="onUpdateValue"
+      />
 
       <suggestion-person
         v-if="isSuggestionForPerson(item)"
@@ -53,23 +53,27 @@ import SuggestionUserGroup from "./TypeUserGroup.vue";
 import {
   isSuggestionForHousehold,
   isSuggestionForPerson,
-  isSuggestionForThirdParty, isSuggestionForUser,
+  isSuggestionForThirdParty,
+  isSuggestionForUser,
   isSuggestionForUserGroup,
-  Suggestion
+  Suggestion,
 } from "ChillPersonAssets/types";
-import {ThirdpartyCompany} from "../../../../../../ChillThirdPartyBundle/Resources/public/types";
+import { ThirdpartyCompany } from "../../../../../../ChillThirdPartyBundle/Resources/public/types";
 
 const props = defineProps<{
   item: Suggestion;
   isSelected: boolean;
-  type: "radio"|"checkbox";
+  type: "radio" | "checkbox";
 }>();
 const emit = defineEmits<{
-  (e: "updateSelected", payload: {suggestion: Suggestion, isSelected: boolean}): void;
+  (
+    e: "updateSelected",
+    payload: { suggestion: Suggestion; isSelected: boolean },
+  ): void;
   (e: "triggerAddContact", payload: { parent: ThirdpartyCompany }): void;
 }>();
 
-const isChecked = computed<boolean>(() => props.isSelected)
+const isChecked = computed<boolean>(() => props.isSelected);
 
 const onUpdateValue = (event: Event) => {
   const target = event?.target;
@@ -77,10 +81,13 @@ const onUpdateValue = (event: Event) => {
     console.error("the value of checked is not an HTMLInputElement");
     return;
   }
-  emit("updateSelected", {suggestion: props.item, isSelected: props.type === "radio" ? true : target.checked});
-}
+  emit("updateSelected", {
+    suggestion: props.item,
+    isSelected: props.type === "radio" ? true : target.checked,
+  });
+};
 
-function triggerAddContact(payload: {parent: ThirdpartyCompany}) {
+function triggerAddContact(payload: { parent: ThirdpartyCompany }) {
   emit("triggerAddContact", payload);
 }
 </script>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeHousehold.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeHousehold.vue
index 4a99dcaac..f31b8308e 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeHousehold.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeHousehold.vue
@@ -16,10 +16,10 @@ import { defineProps } from "vue";
 import BadgeEntity from "ChillMainAssets/vuejs/_components/BadgeEntity.vue";
 import HouseholdRenderBox from "ChillPersonAssets/vuejs/_components/Entity/HouseholdRenderBox.vue";
 import { Suggestion } from "ChillPersonAssets/types";
-import {Household} from "ChillMainAssets/types";
+import { Household } from "ChillMainAssets/types";
 
 interface TypeHouseholdProps {
-  item: Suggestion & {result: Household};
+  item: Suggestion & { result: Household };
 }
 
 defineProps<TypeHouseholdProps>();
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypePerson.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypePerson.vue
index adba7af03..f088b7060 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypePerson.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypePerson.vue
@@ -23,7 +23,7 @@ import { computed, defineProps } from "vue";
 import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue";
 import BadgeEntity from "ChillMainAssets/vuejs/_components/BadgeEntity.vue";
 import PersonText from "ChillPersonAssets/vuejs/_components/Entity/PersonText.vue";
-import {Person, Suggestion} from "ChillPersonAssets/types";
+import { Person, Suggestion } from "ChillPersonAssets/types";
 
 function formatDate(dateString: string | undefined, format: string) {
   if (!dateString) return "";
@@ -36,7 +36,7 @@ function formatDate(dateString: string | undefined, format: string) {
 }
 
 const props = defineProps<{
-  item: Suggestion & { result: Person },
+  item: Suggestion & { result: Person };
 }>();
 
 const hasBirthdate = computed(() => props.item.result.birthdate !== null);
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue
index d665118cd..e861f11d6 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeThirdParty.vue
@@ -1,9 +1,15 @@
 <template>
   <div class="container tpartycontainer">
     <div class="tparty-identification">
-      <span v-if="(isThirdpartyChild(item.result) || isThirdpartyContact(item.result)) && item.result.profession" class="profession">{{
-        item.result.profession
-      }}</span>
+      <span
+        v-if="
+          (isThirdpartyChild(item.result) ||
+            isThirdpartyContact(item.result)) &&
+          item.result.profession
+        "
+        class="profession"
+        >{{ item.result.profession }}</span
+      >
       <span class="name"> {{ item.result.text }}&nbsp; </span>
       <span class="location">
         <template v-if="hasAddress">
@@ -12,7 +18,10 @@
         </template>
       </span>
     </div>
-    <div class="tpartyparent" v-if="isThirdpartyChild(item.result) && null !== item.result.parent">
+    <div
+      class="tpartyparent"
+      v-if="isThirdpartyChild(item.result) && null !== item.result.parent"
+    >
       <span class="name"> &gt; {{ item.result.parent.text }} </span>
     </div>
   </div>
@@ -22,8 +31,9 @@
     <a
       v-if="item.result.type === 'thirdparty' && item.result.kind === 'company'"
       class="btn btn-tpchild"
-      @click="emit('triggerAddContact', {parent: item.result})"
-    ><i class="bi bi-person-fill-add"></i></a>
+      @click="emit('triggerAddContact', { parent: item.result })"
+      ><i class="bi bi-person-fill-add"></i
+    ></a>
     <on-the-fly type="thirdparty" :id="item.result.id" action="show" />
   </div>
 </template>
@@ -38,16 +48,20 @@ import { Result, Suggestion } from "ChillPersonAssets/types";
 import {
   isThirdpartyChild,
   isThirdpartyContact,
-  Thirdparty, ThirdpartyCompany
+  Thirdparty,
+  ThirdpartyCompany,
 } from "./../../../../../../ChillThirdPartyBundle/Resources/public/types";
 
 interface TypeThirdPartyProps {
-  item: Suggestion & {result: Thirdparty};
+  item: Suggestion & { result: Thirdparty };
 }
 
 const props = defineProps<TypeThirdPartyProps>();
 
-const emit = defineEmits<(e: "triggerAddContact", payload: {parent: ThirdpartyCompany}) => void>();
+const emit =
+  defineEmits<
+    (e: "triggerAddContact", payload: { parent: ThirdpartyCompany }) => void
+  >();
 
 const onTheFly = ref<InstanceType<typeof OnTheFly> | null>(null);
 const toast = useToast();
@@ -56,7 +70,10 @@ const hasAddress = computed(() => {
   if (props.item.result.address !== null) {
     return true;
   }
-  if (isThirdpartyChild(props.item.result) && props.item.result.parent !== null) {
+  if (
+    isThirdpartyChild(props.item.result) &&
+    props.item.result.parent !== null
+  ) {
     return props.item.result.parent.address !== null;
   }
 
@@ -67,7 +84,11 @@ const getAddress = computed(() => {
   if (props.item.result.address !== null) {
     return props.item.result.address;
   }
-  if (isThirdpartyChild(props.item.result) && props.item.result.parent !== null && props.item.result.parent.address !== null) {
+  if (
+    isThirdpartyChild(props.item.result) &&
+    props.item.result.parent !== null &&
+    props.item.result.parent.address !== null
+  ) {
     return props.item.result.parent.address;
   }
   return null;
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUser.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUser.vue
index 9daf3219f..81864e4f8 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUser.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUser.vue
@@ -14,14 +14,13 @@ import { computed, defineProps } from "vue";
 import BadgeEntity from "ChillMainAssets/vuejs/_components/BadgeEntity.vue";
 import UserRenderBoxBadge from "ChillMainAssets/vuejs/_components/Entity/UserRenderBoxBadge.vue";
 import { Suggestion } from "ChillPersonAssets/types";
-import {User} from "ChillMainAssets/types";
+import { User } from "ChillMainAssets/types";
 
 interface TypeUserProps {
-  item: Suggestion & {result: User};
+  item: Suggestion & { result: User };
 }
 
 const props = defineProps<TypeUserProps>();
-
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUserGroup.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUserGroup.vue
index cbf212646..e818f9567 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUserGroup.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/AddPersons/TypeUserGroup.vue
@@ -15,7 +15,7 @@ import UserGroupRenderBox from "ChillMainAssets/vuejs/_components/Entity/UserGro
 import { Suggestion } from "ChillPersonAssets/types";
 
 interface TypeUserGroupProps {
-  item: Suggestion & {result: UserGroup};
+  item: Suggestion & { result: UserGroup };
 }
 
 const props = defineProps<TypeUserGroupProps>();
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
index fd181d0ba..c44841c00 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/Entity/PersonRenderBox.vue
@@ -23,35 +23,39 @@
             </div>
 
             <p>
-                <span
-                  v-if="options.addId == true"
-                  :title="person.personId"
+              <span v-if="options.addId == true" :title="person.personId"
                 ><i class="bi bi-info-circle"></i> {{ person.personId }}</span
-                >
+              >
             </p>
 
             <p v-if="options.addInfo === true" class="moreinfo">
               <gender-icon-render-box
                 v-if="person.gender"
                 :gender="person.gender"
-              /> <span
-                v-if="person.birthdate"
-              >
-                {{ trans(RENDERBOX_BIRTHDAY_STATEMENT, {gender: toGenderTranslation(person.gender), birthdate: ISOToDate(person.birthdate?.datetime)}) }}
+              />
+              <span v-if="person.birthdate">
+                {{
+                  trans(RENDERBOX_BIRTHDAY_STATEMENT, {
+                    gender: toGenderTranslation(person.gender),
+                    birthdate: ISOToDate(person.birthdate?.datetime),
+                  })
+                }}
               </span>
               <span v-if="options.addAge && person.birthdate" class="age">
-                ({{ trans(RENDERBOX_YEARS_OLD, {n: person.age}) }})
+                ({{ trans(RENDERBOX_YEARS_OLD, { n: person.age }) }})
               </span>
             </p>
 
             <p>
-              <span
-                v-if="person.deathdate"
-              >
-                {{ trans(RENDERBOX_DEATHDATE_STATEMENT, {gender: toGenderTranslation(person.gender), deathdate: ISOToDate(person.deathdate?.datetime)}) }}
+              <span v-if="person.deathdate">
+                {{
+                  trans(RENDERBOX_DEATHDATE_STATEMENT, {
+                    gender: toGenderTranslation(person.gender),
+                    deathdate: ISOToDate(person.deathdate?.datetime),
+                  })
+                }}
               </span>
             </p>
-
           </div>
         </div>
 
@@ -59,11 +63,11 @@
           <div class="float-button bottom">
             <div class="box">
               <div class="action">
-                <slot name="record-actions"/>
+                <slot name="record-actions" />
               </div>
               <ul class="list-content fa-ul">
                 <li v-if="person.current_household_id">
-                  <i class="fa fa-li fa-map-marker"/>
+                  <i class="fa fa-li fa-map-marker" />
                   <address-render-box
                     v-if="person.current_household_address"
                     :address="person.current_household_address"
@@ -84,7 +88,7 @@
                   </a>
                 </li>
                 <li v-else-if="options.addNoData">
-                  <i class="fa fa-li fa-map-marker"/>
+                  <i class="fa fa-li fa-map-marker" />
                   <p class="chill-no-data-statement">
                     {{ trans(RENDERBOX_NO_DATA) }}
                   </p>
@@ -100,7 +104,7 @@
                     v-for="(addr, i) in person.current_residential_addresses"
                     :key="i"
                   >
-                    <i class="fa fa-li fa-map-marker"/>
+                    <i class="fa fa-li fa-map-marker" />
                     <div v-if="addr.address">
                       <span class="item-key">
                         {{ trans(RENDERBOX_RESIDENTIAL_ADDRESS) }}:
@@ -145,36 +149,36 @@
                 </template>
 
                 <li v-if="person.email">
-                  <i class="fa fa-li fa-envelope-o"/>
+                  <i class="fa fa-li fa-envelope-o" />
                   <a :href="'mailto: ' + person.email">{{ person.email }}</a>
                 </li>
                 <li v-else-if="options.addNoData">
-                  <i class="fa fa-li fa-envelope-o"/>
+                  <i class="fa fa-li fa-envelope-o" />
                   <p class="chill-no-data-statement">
                     {{ trans(RENDERBOX_NO_DATA) }}
                   </p>
                 </li>
 
                 <li v-if="person.mobilenumber">
-                  <i class="fa fa-li fa-mobile"/>
+                  <i class="fa fa-li fa-mobile" />
                   <a :href="'tel: ' + person.mobilenumber">
                     {{ person.mobilenumber }}
                   </a>
                 </li>
                 <li v-else-if="options.addNoData">
-                  <i class="fa fa-li fa-mobile"/>
+                  <i class="fa fa-li fa-mobile" />
                   <p class="chill-no-data-statement">
                     {{ trans(RENDERBOX_NO_DATA) }}
                   </p>
                 </li>
                 <li v-if="person.phonenumber">
-                  <i class="fa fa-li fa-phone"/>
+                  <i class="fa fa-li fa-phone" />
                   <a :href="'tel: ' + person.phonenumber">
                     {{ person.phonenumber }}
                   </a>
                 </li>
                 <li v-else-if="options.addNoData">
-                  <i class="fa fa-li fa-phone"/>
+                  <i class="fa fa-li fa-phone" />
                   <p class="chill-no-data-statement">
                     {{ trans(RENDERBOX_NO_DATA) }}
                   </p>
@@ -187,25 +191,25 @@
                     options.addCenter
                   "
                 >
-                  <i class="fa fa-li fa-long-arrow-right"/>
+                  <i class="fa fa-li fa-long-arrow-right" />
                   <template v-for="c in person.centers">
                     {{ c.name }}
                   </template>
                 </li>
                 <li v-else-if="options.addNoData">
-                  <i class="fa fa-li fa-long-arrow-right"/>
+                  <i class="fa fa-li fa-long-arrow-right" />
                   <p class="chill-no-data-statement">
                     {{ trans(RENDERBOX_NO_DATA) }}
                   </p>
                 </li>
-                <slot name="custom-zone"/>
+                <slot name="custom-zone" />
               </ul>
             </div>
           </div>
         </div>
       </div>
 
-      <slot name="end-bloc"/>
+      <slot name="end-bloc" />
     </section>
   </div>
 
@@ -219,11 +223,11 @@
         class="fa-stack fa-holder"
         :title="trans(RENDERBOX_HOLDER)"
       >
-        <i class="fa fa-circle fa-stack-1x text-success"/>
+        <i class="fa fa-circle fa-stack-1x text-success" />
         <i class="fa fa-stack-1x">T</i>
       </span>
 
-      <person-text :person="person"/>
+      <person-text :person="person" />
     </a>
     <span v-else>
       <span
@@ -231,18 +235,18 @@
         class="fa-stack fa-holder"
         :title="trans(RENDERBOX_HOLDER)"
       >
-        <i class="fa fa-circle fa-stack-1x text-success"/>
+        <i class="fa fa-circle fa-stack-1x text-success" />
         <i class="fa fa-stack-1x">T</i>
       </span>
-      <person-text :person="person"/>
+      <person-text :person="person" />
     </span>
-    <slot name="post-badge"/>
+    <slot name="post-badge" />
   </span>
 </template>
 
 <script setup lang="ts">
-import {computed} from "vue";
-import {ISOToDate} from "ChillMainAssets/chill/js/date";
+import { computed } from "vue";
+import { ISOToDate } from "ChillMainAssets/chill/js/date";
 import AddressRenderBox from "ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue";
 import GenderIconRenderBox from "ChillMainAssets/vuejs/_components/Entity/GenderIconRenderBox.vue";
 import BadgeEntity from "ChillMainAssets/vuejs/_components/BadgeEntity.vue";
@@ -260,8 +264,8 @@ import {
   // PERSONS_ASSOCIATED_SHOW_HOUSEHOLD_NUMBER,
   RENDERBOX_YEARS_OLD,
 } from "translator";
-import {Person} from "ChillPersonAssets/types";
-import {toGenderTranslation} from "ChillMainAssets/lib/api/genderHelper";
+import { Person } from "ChillPersonAssets/types";
+import { toGenderTranslation } from "ChillMainAssets/lib/api/genderHelper";
 
 interface RenderOptions {
   addInfo?: boolean;
@@ -302,7 +306,7 @@ const props = withDefaults(defineProps<Props>(), {
     addNoData: true,
     isMultiline: true,
     isHolder: false,
-    addHouseholdLink: true
+    addHouseholdLink: true,
   }),
 });
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
index d2f9d33a5..88e7c19b3 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/Person.vue
@@ -44,7 +44,7 @@ interface Props {
   query?: string;
 }
 
-const props = withDefaults(defineProps<Props>(), {query: ""});
+const props = withDefaults(defineProps<Props>(), { query: "" });
 
 const person = ref<Person | null>(null);
 
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/PersonEdit.vue b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/PersonEdit.vue
index f131b4c6f..c8aeaa6bb 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/PersonEdit.vue
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_components/OnTheFly/PersonEdit.vue
@@ -81,11 +81,12 @@
               value=""
               @input="onAltNameInput($event, a.key)"
             />
-            <label :for="'label_' + a.key">{{ localizeString(a.labels) }}</label>
+            <label :for="'label_' + a.key">{{
+              localizeString(a.labels)
+            }}</label>
           </div>
         </div>
       </div>
-
     </template>
 
     <template v-if="action === 'create'">
@@ -98,18 +99,30 @@
           <div class="form-floating">
             <input
               class="form-control form-control-lg"
-              :class="{'is-invalid': violations.hasViolationWithParameter('identifiers', 'definition_id', worker.definition_id.toString())}"
+              :class="{
+                'is-invalid': violations.hasViolationWithParameter(
+                  'identifiers',
+                  'definition_id',
+                  worker.definition_id.toString(),
+                ),
+              }"
               type="text"
               :name="'worker_' + worker.definition_id"
               :placeholder="localizeString(worker.label)"
               @input="onIdentifierInput($event, worker.definition_id)"
             />
-            <label :for="'worker_' + worker.definition_id" :class="{required: worker.presence == 'REQUIRED'}">{{
-                localizeString(worker.label)
-              }}</label>
+            <label
+              :for="'worker_' + worker.definition_id"
+              :class="{ required: worker.presence == 'REQUIRED' }"
+              >{{ localizeString(worker.label) }}</label
+            >
           </div>
           <div
-            v-for="err in violations.violationTitlesWithParameter('identifiers', 'definition_id', worker.definition_id.toString())"
+            v-for="err in violations.violationTitlesWithParameter(
+              'identifiers',
+              'definition_id',
+              worker.definition_id.toString(),
+            )"
             class="invalid-feedback was-validated-force"
           >
             {{ err }}
@@ -163,7 +176,9 @@
               {{ c.name }}
             </option>
           </select>
-          <label for="center" class="required">{{ trans(PERSON_MESSAGES_PERSON_CENTER_TITLE) }}</label>
+          <label for="center" class="required">{{
+            trans(PERSON_MESSAGES_PERSON_CENTER_TITLE)
+          }}</label>
         </div>
         <div
           v-for="err in violations.violationTitles('center')"
@@ -190,7 +205,9 @@
               {{ localizeString(c.name) }}
             </option>
           </select>
-          <label for="civility">{{ trans(PERSON_MESSAGES_PERSON_CIVILITY_TITLE) }}</label>
+          <label for="civility">{{
+            trans(PERSON_MESSAGES_PERSON_CIVILITY_TITLE)
+          }}</label>
         </div>
         <div
           v-for="err in violations.violationTitles('civility')"
@@ -215,7 +232,7 @@
             v-model="birthDate"
             :placeholder="trans(BIRTHDATE)"
             :aria-label="trans(BIRTHDATE)"
-            />
+          />
           <label for="birthdate">{{ trans(BIRTHDATE) }}</label>
         </div>
         <div
@@ -241,7 +258,9 @@
             :aria-label="trans(PERSON_MESSAGES_PERSON_PHONENUMBER)"
             aria-describedby="phonenumber"
           />
-          <label for="phonenumber">{{ trans(PERSON_MESSAGES_PERSON_PHONENUMBER) }}</label>
+          <label for="phonenumber">{{
+            trans(PERSON_MESSAGES_PERSON_PHONENUMBER)
+          }}</label>
         </div>
         <div
           v-for="err in violations.violationTitles('phonenumber')"
@@ -266,7 +285,9 @@
             :aria-label="trans(PERSON_MESSAGES_PERSON_MOBILENUMBER)"
             aria-describedby="mobilenumber"
           />
-          <label for="mobilenumber">{{ trans(PERSON_MESSAGES_PERSON_MOBILENUMBER) }}</label>
+          <label for="mobilenumber">{{
+            trans(PERSON_MESSAGES_PERSON_MOBILENUMBER)
+          }}</label>
         </div>
         <div
           v-for="err in violations.violationTitles('mobilenumber')"
@@ -326,11 +347,8 @@
         ref="addAddress"
       />
     </div>
-
-  </div>
-  <div v-else>
-
   </div>
+  <div v-else></div>
 </template>
 
 <script setup lang="ts">
@@ -338,7 +356,8 @@ import { ref, reactive, computed, onMounted } from "vue";
 import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
 import AddAddress from "ChillMainAssets/vuejs/Address/components/AddAddress.vue";
 import {
-  createPerson, editPerson,
+  createPerson,
+  editPerson,
   getCentersForPersonCreation,
   getCivilities,
   getGenders,
@@ -366,23 +385,20 @@ import {
   PERSON_MESSAGES_PERSON_ADDRESS_SHOW_ADDRESS_FORM,
   PERSON_MESSAGES_PERSON_ADDRESS_WARNING,
 } from "translator";
-import {
-  Center,
-  Civility,
-  Gender,
-} from "ChillMainAssets/types";
+import { Center, Civility, Gender } from "ChillMainAssets/types";
 import {
   AltName,
   Person,
   PersonWrite,
   PersonIdentifierWorker,
 } from "ChillPersonAssets/types";
+import { isValidationException } from "ChillMainAssets/lib/api/apiMethods";
+import { useToast } from "vue-toast-notification";
 import {
-  isValidationException,
-} from "ChillMainAssets/lib/api/apiMethods";
-import {useToast} from "vue-toast-notification";
-import {getTimezoneOffsetString, ISOToDate} from "ChillMainAssets/chill/js/date";
-import {useViolationList} from "ChillMainAssets/vuejs/_composables/violationList";
+  getTimezoneOffsetString,
+  ISOToDate,
+} from "ChillMainAssets/chill/js/date";
+import { useViolationList } from "ChillMainAssets/vuejs/_composables/violationList";
 
 interface PersonEditComponentConfig {
   id?: number | null;
@@ -486,13 +502,16 @@ const birthDate = computed({
       person.birthdate = null;
       return;
     }
-    const offset = getTimezoneOffsetString(date, Intl.DateTimeFormat().resolvedOptions().timeZone);
+    const offset = getTimezoneOffsetString(
+      date,
+      Intl.DateTimeFormat().resolvedOptions().timeZone,
+    );
     if (person.birthdate) {
       person.birthdate.datetime = value + "T00:00:00" + offset;
     } else {
       person.birthdate = { datetime: value + "T00:00:00" + offset };
     }
-  }
+  },
 });
 const phonenumber = computed({
   get: () => person.phonenumber,
@@ -566,7 +585,7 @@ async function loadData() {
     const w = personToWritePerson(p);
     person.firstName = w.firstName;
     person.lastName = w.lastName;
-    person.altNames.push(...w.altNames)
+    person.altNames.push(...w.altNames);
     person.civility = w.civility;
     person.addressId = w.addressId;
     person.birthdate = w.birthdate;
@@ -633,7 +652,7 @@ function submitNewAddress(payload: { addressId: number }) {
 
 async function postPerson(): Promise<Person> {
   try {
-    if (props.action === 'create') {
+    if (props.action === "create") {
       const createdPerson = await createPerson(person);
       emit("onPersonCreated", { person: createdPerson });
 
@@ -667,8 +686,8 @@ onMounted(() => {
   getPersonIdentifiers().then((identifiers) => {
     config.identifiers = identifiers.filter(
       (w: PersonIdentifierWorker) =>
-        w.presence === 'ON_CREATION' || w.presence === 'REQUIRED'
-      );
+        w.presence === "ON_CREATION" || w.presence === "REQUIRED",
+    );
   });
   if (props.action !== "create") {
     loadData();
diff --git a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.ts b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.ts
index 26d905a97..d1a2a3b84 100644
--- a/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.ts
+++ b/src/Bundle/ChillPersonBundle/Resources/public/vuejs/_js/i18n.ts
@@ -1,64 +1,63 @@
 const personMessages = {
-    fr: {
-        add_persons: {
-            title: "Ajouter des usagers",
-            suggested_counter:
-                "Pas de résultats | 1 résultat | {count} résultats",
-            selected_counter: " 1 sélectionné | {count} sélectionnés",
-            search_some_persons: "Rechercher des personnes..",
-        },
-        item: {
-            type_person: "Usager",
-            type_user: "TMS",
-            type_thirdparty: "Tiers professionnel",
-            type_household: "Ménage",
-        },
-        person: {
-            firstname: "Prénom",
-            lastname: "Nom",
-            born: (ctx: { gender: "man" | "woman" | "neutral" }) => {
-                if (ctx.gender === "man") {
-                    return "Né le";
-                } else if (ctx.gender === "woman") {
-                    return "Née le";
-                } else {
-                    return "Né·e le";
-                }
-            },
-            center_id: "Identifiant du territoire",
-            center_type: "Type de territoire",
-            center_name: "Territoire", // vendée
-            phonenumber: "Téléphone",
-            mobilenumber: "Mobile",
-            altnames: "Autres noms",
-            email: "Courriel",
-            gender: {
-                title: "Genre",
-                placeholder: "Choisissez le genre de l'usager",
-                woman: "Féminin",
-                man: "Masculin",
-                neutral: "Neutre, non binaire",
-                unknown: "Non renseigné",
-                undefined: "Non renseigné",
-            },
-            civility: {
-                title: "Civilité",
-                placeholder: "Choisissez la civilité",
-            },
-            address: {
-                create_address: "Ajouter une adresse",
-                show_address_form:
-                    "Ajouter une adresse pour un usager non suivi et seul dans un ménage",
-                warning:
-                    "Un nouveau ménage va être créé. L'usager sera membre de ce ménage.",
-            },
-            center: {
-                placeholder: "Choisissez un territoire",
-                title: "territoire",
-            },
-        },
-        error_only_one_person: "Une seule personne peut être sélectionnée !",
+  fr: {
+    add_persons: {
+      title: "Ajouter des usagers",
+      suggested_counter: "Pas de résultats | 1 résultat | {count} résultats",
+      selected_counter: " 1 sélectionné | {count} sélectionnés",
+      search_some_persons: "Rechercher des personnes..",
     },
+    item: {
+      type_person: "Usager",
+      type_user: "TMS",
+      type_thirdparty: "Tiers professionnel",
+      type_household: "Ménage",
+    },
+    person: {
+      firstname: "Prénom",
+      lastname: "Nom",
+      born: (ctx: { gender: "man" | "woman" | "neutral" }) => {
+        if (ctx.gender === "man") {
+          return "Né le";
+        } else if (ctx.gender === "woman") {
+          return "Née le";
+        } else {
+          return "Né·e le";
+        }
+      },
+      center_id: "Identifiant du territoire",
+      center_type: "Type de territoire",
+      center_name: "Territoire", // vendée
+      phonenumber: "Téléphone",
+      mobilenumber: "Mobile",
+      altnames: "Autres noms",
+      email: "Courriel",
+      gender: {
+        title: "Genre",
+        placeholder: "Choisissez le genre de l'usager",
+        woman: "Féminin",
+        man: "Masculin",
+        neutral: "Neutre, non binaire",
+        unknown: "Non renseigné",
+        undefined: "Non renseigné",
+      },
+      civility: {
+        title: "Civilité",
+        placeholder: "Choisissez la civilité",
+      },
+      address: {
+        create_address: "Ajouter une adresse",
+        show_address_form:
+          "Ajouter une adresse pour un usager non suivi et seul dans un ménage",
+        warning:
+          "Un nouveau ménage va être créé. L'usager sera membre de ce ménage.",
+      },
+      center: {
+        placeholder: "Choisissez un territoire",
+        title: "territoire",
+      },
+    },
+    error_only_one_person: "Une seule personne peut être sélectionnée !",
+  },
 };
 
 export { personMessages };
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/types.ts b/src/Bundle/ChillThirdPartyBundle/Resources/public/types.ts
index a17797e6a..98524cfe1 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/types.ts
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/types.ts
@@ -2,7 +2,9 @@ import {
   Address,
   Center,
   Civility,
-  DateTime, SetAddress, SetCivility,
+  DateTime,
+  SetAddress,
+  SetCivility,
   User,
 } from "ChillMainAssets/types";
 
@@ -10,7 +12,7 @@ export type ThirdPartyKind = "contact" | "child" | "company";
 
 export interface BaseThirdParty {
   type: "thirdparty";
-  kind: ""|ThirdPartyKind;
+  kind: "" | ThirdPartyKind;
   text: string;
   acronym: string | null;
   active: boolean;
@@ -35,7 +37,10 @@ function isBaseThirdParty(t: unknown): t is BaseThirdParty {
     (o as any).type === "thirdparty" &&
     typeof o.id === "number" &&
     typeof o.text === "string" &&
-    (o.kind === "" || o.kind === "contact" || o.kind === "child" || o.kind === "company") &&
+    (o.kind === "" ||
+      o.kind === "contact" ||
+      o.kind === "child" ||
+      o.kind === "company") &&
     typeof o.active === "boolean"
   );
 }
@@ -51,13 +56,8 @@ export interface ThirdpartyCompany extends BaseThirdParty {
 }
 
 // Type guard to distinguish a ThirdpartyCompany
-export function isThirdpartyCompany(
-  t: BaseThirdParty
-): t is ThirdpartyCompany {
-  return (
-    t.type === "thirdparty" &&
-    t.kind === "company"
-  );
+export function isThirdpartyCompany(t: BaseThirdParty): t is ThirdpartyCompany {
+  return t.type === "thirdparty" && t.kind === "company";
 }
 
 export interface ThirdpartyChild extends BaseThirdParty {
@@ -75,13 +75,8 @@ export interface ThirdpartyChild extends BaseThirdParty {
 }
 
 // Type guard to distinguish a ThirdpartyChild
-export function isThirdpartyChild(
-  t: BaseThirdParty
-): t is ThirdpartyChild {
-  return (
-    t.type === "thirdparty" &&
-    t.kind === "child"
-  );
+export function isThirdpartyChild(t: BaseThirdParty): t is ThirdpartyChild {
+  return t.type === "thirdparty" && t.kind === "child";
 }
 
 export interface ThirdpartyContact extends BaseThirdParty {
@@ -99,24 +94,23 @@ export interface ThirdpartyContact extends BaseThirdParty {
 }
 
 // Type guard to distinguish a ThirdpartyContact
-export function isThirdpartyContact(
-  t: BaseThirdParty
-): t is ThirdpartyContact {
-  return (
-    t.type === "thirdparty" &&
-    t.kind === "contact"
-  );
+export function isThirdpartyContact(t: BaseThirdParty): t is ThirdpartyContact {
+  return t.type === "thirdparty" && t.kind === "contact";
 }
 
-export type Thirdparty = ThirdpartyCompany | ThirdpartyContact | ThirdpartyChild;
-
+export type Thirdparty =
+  | ThirdpartyCompany
+  | ThirdpartyContact
+  | ThirdpartyChild;
 
 export function isThirdparty(t: unknown): t is Thirdparty {
   if (!isBaseThirdParty(t)) {
     return false;
   }
 
-  return (isThirdpartyCompany(t) || isThirdpartyContact(t) || isThirdpartyChild(t));
+  return (
+    isThirdpartyCompany(t) || isThirdpartyContact(t) || isThirdpartyChild(t)
+  );
 }
 
 interface ThirdpartyType {
@@ -153,7 +147,7 @@ export interface ThirdPartyWrite {
   email: string;
   telephone: string;
   telephone2: string;
-  address: null|SetAddress;
+  address: null | SetAddress;
   comment: string;
-  parent: SetThirdParty|null;
+  parent: SetThirdParty | null;
 }
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_api/OnTheFly.ts b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_api/OnTheFly.ts
index 2e9f40f00..467126362 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_api/OnTheFly.ts
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_api/OnTheFly.ts
@@ -1,10 +1,16 @@
 /*
  * GET a thirdparty by id
  */
-import {isThirdpartyChild, isThirdpartyCompany, isThirdpartyContact, Thirdparty, ThirdPartyWrite} from '../../types';
-import {makeFetch} from "ChillMainAssets/lib/api/apiMethods";
+import {
+  isThirdpartyChild,
+  isThirdpartyCompany,
+  isThirdpartyContact,
+  Thirdparty,
+  ThirdPartyWrite,
+} from "../../types";
+import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
 
-export const getThirdparty = async (id: number) : Promise<Thirdparty> => {
+export const getThirdparty = async (id: number): Promise<Thirdparty> => {
   const url = `/api/1.0/thirdparty/thirdparty/${id}.json`;
   return fetch(url).then((response) => {
     if (response.ok) {
@@ -21,40 +27,41 @@ export const thirdpartyToWriteThirdParty = (t: Thirdparty): ThirdPartyWrite => {
   const isChild = isThirdpartyChild(t);
 
   return {
-    type: 'thirdparty',
+    type: "thirdparty",
     kind: t.kind,
     civility:
       (isContact || isChild) && t.civility
-        ? { type: 'chill_main_civility', id: t.civility.id }
+        ? { type: "chill_main_civility", id: t.civility.id }
         : null,
-    profession: (isContact || isChild) ? (t.profession ?? '') : '',
-    firstname: isCompany ? '' : (t.firstname ?? ''),
-    name: isCompany
-      ? (t.nameCompany ?? '')
-      : (t.name ?? ''),
-    email: t.email ?? '',
-    telephone: t.telephone ?? '',
-    telephone2: t.telephone2 ?? '',
+    profession: isContact || isChild ? (t.profession ?? "") : "",
+    firstname: isCompany ? "" : (t.firstname ?? ""),
+    name: isCompany ? (t.nameCompany ?? "") : (t.name ?? ""),
+    email: t.email ?? "",
+    telephone: t.telephone ?? "",
+    telephone2: t.telephone2 ?? "",
     address: null,
-    comment: isChild ? (t.comment ?? '') : '',
-    parent: isChild && t.parent ? { type: 'thirdparty', id: t.parent.id } : null,
+    comment: isChild ? (t.comment ?? "") : "",
+    parent:
+      isChild && t.parent ? { type: "thirdparty", id: t.parent.id } : null,
   };
 };
 
-export interface WriteThirdPartyViolationMap
-extends Record<string, Record<string, string>> {
+export interface WriteThirdPartyViolationMap extends Record<
+  string,
+  Record<string, string>
+> {
   email: {
     "{{ value }}": string;
-  },
+  };
   name: {
     "{{ value }}": string;
-  },
+  };
   telephone: {
     "{{ value }}": string;
-  }
+  };
   telephone2: {
     "{{ value }}": string;
-  }
+  };
 }
 
 /*
@@ -63,13 +70,16 @@ extends Record<string, Record<string, string>> {
 export const createThirdParty = async (body: ThirdPartyWrite) => {
   const url = `/api/1.0/thirdparty/thirdparty.json`;
 
-  return makeFetch<ThirdPartyWrite, Thirdparty>('POST', url, body);
+  return makeFetch<ThirdPartyWrite, Thirdparty>("POST", url, body);
 };
 
 /*
  * PATCH an existing thirdparty
  */
-export const patchThirdparty = async (id: number, body: ThirdPartyWrite): Promise<Thirdparty> => {
+export const patchThirdparty = async (
+  id: number,
+  body: ThirdPartyWrite,
+): Promise<Thirdparty> => {
   const url = `/api/1.0/thirdparty/thirdparty/${id}.json`;
-  return makeFetch('PATCH', url, body);
+  return makeFetch("PATCH", url, body);
 };
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
index fb4bf2071..6fead8a45 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/Entity/ThirdPartyRenderBox.vue
@@ -46,7 +46,7 @@
                 </li>
                 <li v-if="isThirdpartyChild(props.thirdparty)">
                   <i class="fa fa-li fa-hand-o-right" />
-                  <b class="me-2">{{ trans(THIRDPARTY_MESSAGES_CHILD_OF)}}</b>
+                  <b class="me-2">{{ trans(THIRDPARTY_MESSAGES_CHILD_OF) }}</b>
                   <on-the-fly
                     :type="props.thirdparty.parent.type"
                     :id="props.thirdparty.parent.id"
@@ -133,13 +133,14 @@ import { computed, defineAsyncComponent } from "vue";
 import AddressRenderBox from "ChillMainAssets/vuejs/_components/Entity/AddressRenderBox.vue";
 import Confidential from "ChillMainAssets/vuejs/_components/Confidential.vue";
 import BadgeEntity from "ChillMainAssets/vuejs/_components/BadgeEntity.vue";
-import {isThirdpartyChild, isThirdpartyCompany, Thirdparty} from "../../../types";
-import {localizeString} from "ChillMainAssets/lib/localizationHelper/localizationHelper";
-import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue";
 import {
-  THIRDPARTY_MESSAGES_CHILD_OF,
-  trans
-} from "translator";
+  isThirdpartyChild,
+  isThirdpartyCompany,
+  Thirdparty,
+} from "../../../types";
+import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
+import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue";
+import { THIRDPARTY_MESSAGES_CHILD_OF, trans } from "translator";
 
 // Async to avoid recursive resolution issues
 /*
@@ -160,7 +161,9 @@ interface RenderOptions {
 
 const props = defineProps<{ thirdparty: Thirdparty; options: RenderOptions }>();
 
-const isMultiline = computed<boolean>(() => props.options?.isMultiline ?? false);
+const isMultiline = computed<boolean>(
+  () => props.options?.isMultiline ?? false,
+);
 
 const hasParent = computed<boolean>(() => {
   return isThirdpartyChild(props.thirdparty);
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
index dd67587e5..0a83f1b3b 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdParty.vue
@@ -20,48 +20,53 @@
       action === 'edit' || action === 'create' || action === 'addContact'
     "
   >
-    <ThirdPartyEdit :id="id" :type="type" :action="action" :query="query" :parent="parent" />
+    <ThirdPartyEdit
+      :id="id"
+      :type="type"
+      :action="action"
+      :query="query"
+      :parent="parent"
+    />
   </div>
-
 </template>
 
 <script setup lang="ts">
-import {onMounted, ref} from 'vue'
-import ThirdPartyRenderBox from '../Entity/ThirdPartyRenderBox.vue'
-import ThirdPartyEdit from './ThirdPartyEdit.vue'
-import { getThirdparty } from '../../_api/OnTheFly'
-import {Thirdparty, ThirdpartyCompany} from '../../../types'
+import { onMounted, ref } from "vue";
+import ThirdPartyRenderBox from "../Entity/ThirdPartyRenderBox.vue";
+import ThirdPartyEdit from "./ThirdPartyEdit.vue";
+import { getThirdparty } from "../../_api/OnTheFly";
+import { Thirdparty, ThirdpartyCompany } from "../../../types";
 
-type ThirdPartyProp = {
-  id: number,
-  type: 'thirdparty',
-  action: 'show'|'edit'|'create',
-  parent?: null,
+interface ThirdPartyProp {
+  id: number;
+  type: "thirdparty";
+  action: "show" | "edit" | "create";
+  parent?: null;
 }
-type ThirdPartyAddContact = {
-  id: number,
-  type: 'thirdparty',
-  action: 'addContact',
-  parent: ThirdpartyCompany,
+interface ThirdPartyAddContact {
+  id: number;
+  type: "thirdparty";
+  action: "addContact";
+  parent: ThirdpartyCompany;
 }
 
-type ThirdPartyProps = ThirdPartyProp|ThirdPartyAddContact;
+type ThirdPartyProps = ThirdPartyProp | ThirdPartyAddContact;
 
 const props = withDefaults(defineProps<ThirdPartyProps>(), {
   parent: null,
 });
 
-const thirdparty = ref<Thirdparty|null>(null);
+const thirdparty = ref<Thirdparty | null>(null);
 
 async function loadData() {
   thirdparty.value = await getThirdparty(props.id);
 }
 
 onMounted(() => {
-  if (props.action === 'show' && props.id) {
-    loadData()
+  if (props.action === "show" && props.id) {
+    loadData();
   }
-})
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdPartyEdit.vue b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdPartyEdit.vue
index 027dd99f1..cb3d93ea2 100644
--- a/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdPartyEdit.vue
+++ b/src/Bundle/ChillThirdPartyBundle/Resources/public/vuejs/_components/OnTheFly/ThirdPartyEdit.vue
@@ -2,9 +2,11 @@
   <div>
     <div v-if="resolvedParent">
       <div class="parent-info">
-        <i class="fa fa-li fa-hand-o-right"/>
+        <i class="fa fa-li fa-hand-o-right" />
         <b class="me-2">{{ trans(THIRDPARTY_MESSAGES_CHILD_OF) }}</b>
-        <span class="chill-entity badge-thirdparty">{{ resolvedParent.text }}</span>
+        <span class="chill-entity badge-thirdparty">{{
+          resolvedParent.text
+        }}</span>
       </div>
     </div>
     <div class="form-floating mb-3" v-else-if="props.action === 'create'">
@@ -77,7 +79,9 @@
                     {{ localizeString(civility.name) }}
                   </option>
                 </select>
-                <label for="civility">{{ trans(THIRDPARTY_MESSAGES_THIRDPARTY_CIVILITY) }}</label>
+                <label for="civility">{{
+                  trans(THIRDPARTY_MESSAGES_THIRDPARTY_CIVILITY)
+                }}</label>
               </div>
             </div>
           </div>
@@ -93,7 +97,9 @@
                 :aria-label="trans(THIRDPARTY_MESSAGES_THIRDPARTY_PROFESSION)"
                 aria-describedby="profession"
               />
-              <label for="profession">{{ trans(THIRDPARTY_MESSAGES_THIRDPARTY_PROFESSION) }}</label>
+              <label for="profession">{{
+                trans(THIRDPARTY_MESSAGES_THIRDPARTY_PROFESSION)
+              }}</label>
             </div>
           </div>
         </div>
@@ -110,8 +116,8 @@
                   :placeholder="trans(THIRDPARTY_MESSAGES_THIRDPARTY_FIRSTNAME)"
                 />
                 <label for="firstname">{{
-                    trans(THIRDPARTY_MESSAGES_THIRDPARTY_FIRSTNAME)
-                  }}</label>
+                  trans(THIRDPARTY_MESSAGES_THIRDPARTY_FIRSTNAME)
+                }}</label>
               </div>
             </div>
             <div v-if="queryItems">
@@ -139,8 +145,8 @@
                   :placeholder="trans(THIRDPARTY_MESSAGES_THIRDPARTY_LASTNAME)"
                 />
                 <label for="name">{{
-                    trans(THIRDPARTY_MESSAGES_THIRDPARTY_LASTNAME)
-                  }}</label>
+                  trans(THIRDPARTY_MESSAGES_THIRDPARTY_LASTNAME)
+                }}</label>
               </div>
             </div>
             <div
@@ -177,8 +183,8 @@
               :placeholder="trans(THIRDPARTY_MESSAGES_THIRDPARTY_NAME)"
             />
             <label for="name">{{
-                trans(THIRDPARTY_MESSAGES_THIRDPARTY_NAME)
-              }}</label>
+              trans(THIRDPARTY_MESSAGES_THIRDPARTY_NAME)
+            }}</label>
           </div>
         </div>
 
@@ -212,7 +218,7 @@
     <div class="mb-3">
       <div class="input-group has-validation">
         <span id="email" class="input-group-text">
-          <i class="fa fa-fw fa-at"/>
+          <i class="fa fa-fw fa-at" />
         </span>
         <div class="form-floating">
           <input
@@ -224,7 +230,9 @@
             :aria-label="trans(THIRDPARTY_MESSAGES_THIRDPARTY_EMAIL)"
             aria-describedby="email"
           />
-          <label for="email">{{ trans(THIRDPARTY_MESSAGES_THIRDPARTY_EMAIL) }}</label>
+          <label for="email">{{
+            trans(THIRDPARTY_MESSAGES_THIRDPARTY_EMAIL)
+          }}</label>
         </div>
       </div>
       <div
@@ -238,19 +246,21 @@
     <div class="mb-3">
       <div class="input-group has-validation">
         <span class="input-group-text" id="phonenumber">
-          <i class="fa fa-fw fa-phone"/>
+          <i class="fa fa-fw fa-phone" />
         </span>
         <div class="form-floating">
           <input
             class="form-control form-control-lg"
-            :class="{'is-invalid': violations.hasViolation('telephone') }"
+            :class="{ 'is-invalid': violations.hasViolation('telephone') }"
             name="phonenumber"
             v-model="thirdParty.telephone"
             :placeholder="trans(THIRDPARTY_MESSAGES_THIRDPARTY_PHONENUMBER)"
             :aria-label="trans(THIRDPARTY_MESSAGES_THIRDPARTY_PHONENUMBER)"
             aria-describedby="phonenumber"
           />
-          <label for="phonenumber">{{ trans(THIRDPARTY_MESSAGES_THIRDPARTY_PHONENUMBER) }}</label>
+          <label for="phonenumber">{{
+            trans(THIRDPARTY_MESSAGES_THIRDPARTY_PHONENUMBER)
+          }}</label>
         </div>
       </div>
       <div
@@ -263,7 +273,9 @@
 
     <div class="mb-3">
       <div class="input-group has-validation">
-        <span class="input-group-text" id="phonenumber2"><i class="fa fa-fw fa-phone"/></span>
+        <span class="input-group-text" id="phonenumber2"
+          ><i class="fa fa-fw fa-phone"
+        /></span>
         <div class="form-floating">
           <input
             class="form-control form-control-lg"
@@ -274,7 +286,9 @@
             :aria-label="trans(THIRDPARTY_MESSAGES_THIRDPARTY_PHONENUMBER2)"
             aria-describedby="phonenumber2"
           />
-          <label for="phonenumber2">{{ trans(THIRDPARTY_MESSAGES_THIRDPARTY_PHONENUMBER2) }}</label>
+          <label for="phonenumber2">{{
+            trans(THIRDPARTY_MESSAGES_THIRDPARTY_PHONENUMBER2)
+          }}</label>
         </div>
       </div>
       <div
@@ -288,7 +302,7 @@
     <div v-if="props.action !== 'addContact'">
       <div class="input-group mb-3">
         <span class="input-group-text" id="comment"
-        ><i class="fa fa-fw fa-pencil"
+          ><i class="fa fa-fw fa-pencil"
         /></span>
         <textarea
           class="form-control form-control-lg"
@@ -301,17 +315,18 @@
 </template>
 
 <script setup lang="ts">
-import {ref, reactive, computed, onMounted, getCurrentInstance} from 'vue'
-import ThirdPartyRenderBox from '../Entity/ThirdPartyRenderBox.vue'
+import { ref, reactive, computed, onMounted, getCurrentInstance } from "vue";
+import ThirdPartyRenderBox from "../Entity/ThirdPartyRenderBox.vue";
 import AddAddress from "ChillMainAssets/vuejs/Address/components/AddAddress.vue";
 import {
   createThirdParty,
-  getThirdparty, patchThirdparty,
+  getThirdparty,
+  patchThirdparty,
   thirdpartyToWriteThirdParty,
-  WriteThirdPartyViolationMap
-} from '../../_api/OnTheFly'
-import BadgeEntity from 'ChillMainAssets/vuejs/_components/BadgeEntity.vue'
-import {localizeString as _localizeString} from 'ChillMainAssets/lib/localizationHelper/localizationHelper'
+  WriteThirdPartyViolationMap,
+} from "../../_api/OnTheFly";
+import BadgeEntity from "ChillMainAssets/vuejs/_components/BadgeEntity.vue";
+import { localizeString as _localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
 import {
   trans,
   THIRDPARTY_MESSAGES_THIRDPARTY_FIRSTNAME,
@@ -323,11 +338,13 @@ import {
   THIRDPARTY_MESSAGES_THIRDPARTY_COMMENT,
   THIRDPARTY_MESSAGES_THIRDPARTY_PROFESSION,
   THIRDPARTY_MESSAGES_THIRDPARTY_CIVILITY,
-  THIRDPARTY_MESSAGES_CHILD_OF, PERSON_EDIT_ERROR_WHILE_SAVING,
-} from 'translator'
+  THIRDPARTY_MESSAGES_CHILD_OF,
+  PERSON_EDIT_ERROR_WHILE_SAVING,
+} from "translator";
 import {
   createPerson,
-  getCivilities, WritePersonViolationMap,
+  getCivilities,
+  WritePersonViolationMap,
 } from "ChillPersonAssets/vuejs/_api/OnTheFly";
 import {
   isThirdpartyChild,
@@ -335,44 +352,49 @@ import {
   Thirdparty,
   ThirdpartyCompany,
   ThirdPartyKind,
-  ThirdPartyWrite
+  ThirdPartyWrite,
 } from "../../../types";
-import {Civility, SetCivility} from "ChillMainAssets/types";
-import {isValidationException} from "ChillMainAssets/lib/api/apiMethods";
-import {useViolationList} from "ChillMainAssets/vuejs/_composables/violationList";
-import {useToast} from "vue-toast-notification";
-
+import { Civility, SetCivility } from "ChillMainAssets/types";
+import { isValidationException } from "ChillMainAssets/lib/api/apiMethods";
+import { useViolationList } from "ChillMainAssets/vuejs/_composables/violationList";
+import { useToast } from "vue-toast-notification";
 
 interface ThirdPartyEditWriteProps {
   id?: number;
-  type?: 'thirdparty';
-  action: 'edit' | 'create'
+  type?: "thirdparty";
+  action: "edit" | "create";
   query?: string;
   parent?: null;
 }
 
 interface ThirdPartyAddContactProps {
   id?: null;
-  type?: 'thirdparty';
-  action: 'addContact';
+  type?: "thirdparty";
+  action: "addContact";
   query?: "";
   parent: ThirdpartyCompany;
 }
 
 type ThirdPartyEditProps = ThirdPartyAddContactProps | ThirdPartyEditWriteProps;
 
-const props = withDefaults(defineProps<ThirdPartyEditProps>(), {type: 'thirdparty', query: "", parent: null});
+const props = withDefaults(defineProps<ThirdPartyEditProps>(), {
+  type: "thirdparty",
+  query: "",
+  parent: null,
+});
 
 const emit =
-  defineEmits<(e: "onThirdPartyCreated", payload: { thirdParty: Thirdparty }) => void>();
+  defineEmits<
+    (e: "onThirdPartyCreated", payload: { thirdParty: Thirdparty }) => void
+  >();
 
-defineExpose({postThirdParty});
+defineExpose({ postThirdParty });
 
 const toast = useToast();
 
 const thirdParty = ref<ThirdPartyWrite>({
   type: "thirdparty",
-  kind: 'company',
+  kind: "company",
   address: null,
   civility: null,
   email: "",
@@ -385,7 +407,7 @@ const thirdParty = ref<ThirdPartyWrite>({
   parent: null,
 });
 
-const originalThirdParty = ref<Thirdparty|null>(null);
+const originalThirdParty = ref<Thirdparty | null>(null);
 
 const civility = computed<number | null>({
   get: () => {
@@ -397,21 +419,21 @@ const civility = computed<number | null>({
   },
   set: (value: number | null) => {
     thirdParty.value.civility =
-      value !== null ? {id: value, type: "chill_main_civility"} : null;
+      value !== null ? { id: value, type: "chill_main_civility" } : null;
   },
 });
 
-const civilities = ref<Civility[]>([])
+const civilities = ref<Civility[]>([]);
 
 const addAddress = reactive({
   options: {
     openPanesInModal: true,
     onlyButton: false,
-    button: {size: 'btn-sm'},
-    title: {create: 'add_an_address_title', edit: 'edit_address'},
+    button: { size: "btn-sm" },
+    title: { create: "add_an_address_title", edit: "edit_address" },
   },
-})
-const addAddressRef = ref<any>(null)
+});
+const addAddressRef = ref<any>(null);
 
 /**
  * We need a specific computed for the kind
@@ -421,31 +443,34 @@ const kind = computed<ThirdPartyKind>({
     return thirdParty.value.kind;
   },
   set(v) {
-    thirdParty.value.kind = v
+    thirdParty.value.kind = v;
   },
 });
 
 const context = computed(() => {
   const ctx: any = {
-    target: {name: props.type, id: props.id},
+    target: { name: props.type, id: props.id },
     edit: false,
     addressId: null as number | null,
     defaults: (window as any).addaddress,
-  }
+  };
   if (thirdParty.value.address) {
-    ctx.addressId = thirdParty.value.address.id
-    ctx.edit = true
+    ctx.addressId = thirdParty.value.address.id;
+    ctx.edit = true;
   }
-  return ctx
-})
+  return ctx;
+});
 
-const resolvedParent = computed<null|ThirdpartyCompany>(() => {
-  if (null !== originalThirdParty.value && isThirdpartyChild(originalThirdParty.value)) {
+const resolvedParent = computed<null | ThirdpartyCompany>(() => {
+  if (
+    null !== originalThirdParty.value &&
+    isThirdpartyChild(originalThirdParty.value)
+  ) {
     return originalThirdParty.value.parent;
   }
 
   return props.parent ?? null;
-})
+});
 
 /**
  * Find the query items to display for suggestion
@@ -461,7 +486,10 @@ const queryItems = computed(() => {
     .trim()
     .toLowerCase()
     .split(" ");
-  const lastNameWords = (thirdParty.value.name || "").trim().toLowerCase().split(" ");
+  const lastNameWords = (thirdParty.value.name || "")
+    .trim()
+    .toLowerCase()
+    .split(" ");
 
   return words
     .filter((word) => !firstNameWords.includes(word.toLowerCase()))
@@ -469,20 +497,19 @@ const queryItems = computed(() => {
 });
 
 function localizeString(str: any) {
-  return _localizeString(str)
+  return _localizeString(str);
 }
 
-
 onMounted(() => {
   getCivilities().then((cv) => {
     civilities.value = cv;
   });
   if (props.action === "edit") {
     loadData();
-  } else if (props.action === 'addContact') {
-    thirdParty.value.kind = 'child';
+  } else if (props.action === "addContact") {
+    thirdParty.value.kind = "child";
     thirdParty.value.address = null;
-    thirdParty.value.parent = {id: props.parent.id, type: 'thirdparty'};
+    thirdParty.value.parent = { id: props.parent.id, type: "thirdparty" };
   }
 });
 
@@ -495,38 +522,38 @@ async function loadData(): Promise<void> {
 
 function submitAddress(payload: { addressId: number }) {
   console.log(payload);
-  thirdParty.value.address = {id: payload.addressId};
+  thirdParty.value.address = { id: payload.addressId };
 }
 
-function addQueryItem(field: 'name' | 'firstName', queryItem: string) {
+function addQueryItem(field: "name" | "firstName", queryItem: string) {
   switch (field) {
-    case 'name':
+    case "name":
       if (thirdParty.value.name) {
-        thirdParty.value.name += ` ${queryItem}`
+        thirdParty.value.name += ` ${queryItem}`;
       } else {
-        thirdParty.value.name = queryItem
+        thirdParty.value.name = queryItem;
       }
-      break
-    case 'firstName':
-      thirdParty.value.firstname = queryItem
-      break
+      break;
+    case "firstName":
+      thirdParty.value.firstname = queryItem;
+      break;
   }
 }
 
 function addQuery(query: string) {
-  thirdParty.value.name = query
+  thirdParty.value.name = query;
 }
 
 const violations = useViolationList<WriteThirdPartyViolationMap>();
 
 async function postThirdParty(): Promise<Thirdparty> {
   try {
-    if (props.action === 'edit' && props.id) {
+    if (props.action === "edit" && props.id) {
       const tp = await patchThirdparty(props.id, thirdParty.value);
       return Promise.resolve(tp);
-    } else if (props.action === 'addContact' || props.action === 'create') {
+    } else if (props.action === "addContact" || props.action === "create") {
       const tp = await createThirdParty(thirdParty.value);
-      emit('onThirdPartyCreated', {thirdParty: tp});
+      emit("onThirdPartyCreated", { thirdParty: tp });
       return Promise.resolve(tp);
     }
   } catch (e: unknown) {
@@ -539,7 +566,6 @@ async function postThirdParty(): Promise<Thirdparty> {
   }
   throw "'action' is not edit with and id, or addContact or create";
 }
-
 </script>
 
 <style scoped lang="scss">
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
index 5999007f6..4bf36974f 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/types.ts
@@ -148,9 +148,8 @@ export type TicketHistoryLine =
   | CallerStateEvent;
 
 interface BaseTicket<
-  T extends
-    | "ticket_ticket:simple"
-    | "ticket_ticket:extended" = "ticket_ticket:simple",
+  T extends "ticket_ticket:simple" | "ticket_ticket:extended" =
+    "ticket_ticket:simple",
 > {
   type_extended: T;
   type: "ticket_ticket";
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
index 43d12fdbd..28a72d4b4 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
@@ -131,7 +131,10 @@ import { useStore } from "vuex";
 
 // Utils
 import { getTicketTitle, motiveHierarchyLabel } from "../utils/utils";
-import {isThirdparty, Thirdparty} from "../../../../../../../ChillThirdPartyBundle/Resources/public/types";
+import {
+  isThirdparty,
+  Thirdparty,
+} from "../../../../../../../ChillThirdPartyBundle/Resources/public/types";
 
 const props = defineProps<{
   ticket: Ticket;
@@ -197,7 +200,7 @@ const isEmergency = computed({
     }
   },
 });
-const caller = computed<Person[]|Thirdparty[]>(() => {
+const caller = computed<Person[] | Thirdparty[]>(() => {
   if (null === props.ticket.caller) {
     return [];
   }
@@ -207,7 +210,7 @@ const caller = computed<Person[]|Thirdparty[]>(() => {
   } else {
     return [props.ticket.caller];
   }
-})
+});
 
 const since = computed(() => {
   return store.getters.getSinceCreated(today.value);

From 473c5a9fa364c4658e76a3c0d0cd3f8751cc8cc8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 9 Dec 2025 15:27:39 +0100
Subject: [PATCH 263/283] Remove dependency on `@symfony/ux-translator` from
 `package.json`

- Deleted `@symfony/ux-translator` as it is no longer needed.
- Documented the change in `.changes/unreleased` with no schema modifications.
---
 .changes/unreleased/Fixed-20251209-152705.yaml | 7 +++++++
 package.json                                   | 1 -
 2 files changed, 7 insertions(+), 1 deletion(-)
 create mode 100644 .changes/unreleased/Fixed-20251209-152705.yaml

diff --git a/.changes/unreleased/Fixed-20251209-152705.yaml b/.changes/unreleased/Fixed-20251209-152705.yaml
new file mode 100644
index 000000000..1468d6caf
--- /dev/null
+++ b/.changes/unreleased/Fixed-20251209-152705.yaml
@@ -0,0 +1,7 @@
+kind: Fixed
+body: |
+    Remove dependency to package @symfony/ux-translator
+time: 2025-12-09T15:27:05.621925661+01:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change
diff --git a/package.json b/package.json
index 1b4c7df13..a013df3da 100644
--- a/package.json
+++ b/package.json
@@ -11,7 +11,6 @@
     "@hotwired/stimulus": "^3.0.0",
     "@luminateone/eslint-baseline": "^1.0.9",
     "@symfony/stimulus-bridge": "^3.2.0",
-    "@symfony/ux-translator": "file:vendor/symfony/ux-translator/assets",
     "@symfony/webpack-encore": "^4.1.0",
     "@tsconfig/node20": "^20.1.4",
     "@types/dompurify": "^3.0.5",

From d80661e4794104c1f7b9ecd1b3f9cc7d64a2c2d6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 9 Dec 2025 15:31:57 +0100
Subject: [PATCH 264/283] Release v4.10.0

---
 .changes/unreleased/Fixed-20251209-152705.yaml | 7 -------
 .changes/v4.10.0.md                            | 6 ++++++
 CHANGELOG.md                                   | 7 +++++++
 3 files changed, 13 insertions(+), 7 deletions(-)
 delete mode 100644 .changes/unreleased/Fixed-20251209-152705.yaml
 create mode 100644 .changes/v4.10.0.md

diff --git a/.changes/unreleased/Fixed-20251209-152705.yaml b/.changes/unreleased/Fixed-20251209-152705.yaml
deleted file mode 100644
index 1468d6caf..000000000
--- a/.changes/unreleased/Fixed-20251209-152705.yaml
+++ /dev/null
@@ -1,7 +0,0 @@
-kind: Fixed
-body: |
-    Remove dependency to package @symfony/ux-translator
-time: 2025-12-09T15:27:05.621925661+01:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change
diff --git a/.changes/v4.10.0.md b/.changes/v4.10.0.md
new file mode 100644
index 000000000..e3ecfbf24
--- /dev/null
+++ b/.changes/v4.10.0.md
@@ -0,0 +1,6 @@
+## v4.10.0 - 2025-12-09
+### Feature
+* [MR 928](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/928) [#462](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/462) Add the future appointments for the person in search results
+### Fixed
+* Remove dependency to package @symfony/ux-translator
+
diff --git a/CHANGELOG.md b/CHANGELOG.md
index e4669a037..b07fdc914 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,13 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
+## v4.10.0 - 2025-12-09
+### Feature
+* [MR 928](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/928) [#462](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/462) Add the future appointments for the person in search results
+### Fixed
+* Remove dependency to package @symfony/ux-translator
+
+
 ## v4.9.0 - 2025-12-05
 ### Feature
 * ([#459](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/459)) Add a counter for invitations awaiting reply   

From 6e1c9b6f29c3822529bd3871a079dcf1e0e735ab Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 9 Dec 2025 15:37:42 +0100
Subject: [PATCH 265/283] Remove `chill-project/chill-zimbra-bundle` from
 composer dependencies

- This package provoke failures on build in the CI
---
 composer.json | 1 -
 1 file changed, 1 deletion(-)

diff --git a/composer.json b/composer.json
index d6864d63f..e7c61424f 100644
--- a/composer.json
+++ b/composer.json
@@ -21,7 +21,6 @@
         "ext-openssl": "*",
         "ext-redis": "*",
         "ext-zlib": "*",
-        "chill-project/chill-zimbra-bundle": "@dev",
         "champs-libres/wopi-bundle": "dev-symfony-v5@dev",
         "champs-libres/wopi-lib": "dev-master@dev",
         "doctrine/data-fixtures": "^1.8",

From 723beb3c027e965142e8977738807958d93c5a81 Mon Sep 17 00:00:00 2001
From: Boris Waaub <boris.waaub@digitalternative.be>
Date: Tue, 9 Dec 2025 16:47:09 +0100
Subject: [PATCH 266/283] FIX: Ajustement du style du formulaire dans
 ActionToolbarComponent

---
 .../vuejs/TicketApp/components/ActionToolbarComponent.vue      | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
index 999c82c6d..919487f77 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
@@ -7,7 +7,6 @@
           class="btn btn-link p-0"
           style="
             position: absolute;
-            top: 0.5rem;
             right: 0.5rem;
             font-size: 2rem;
             line-height: 1;
@@ -26,7 +25,7 @@
           </label>
         </div>
 
-        <form @submit.prevent="submitAction">
+        <form class="p-2" @submit.prevent="submitAction">
           <comment-editor-component
             v-model="content"
             :motive="motive"

From 7714b07a9de23e456f4931b00fa7fc5237a17782 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Tue, 9 Dec 2025 17:11:11 +0100
Subject: [PATCH 267/283] Add changie for display of upcoming appointments
 within person context

---
 .changes/unreleased/Feature-20251209-170951.yaml | 6 ++++++
 1 file changed, 6 insertions(+)
 create mode 100644 .changes/unreleased/Feature-20251209-170951.yaml

diff --git a/.changes/unreleased/Feature-20251209-170951.yaml b/.changes/unreleased/Feature-20251209-170951.yaml
new file mode 100644
index 000000000..77b9a7b15
--- /dev/null
+++ b/.changes/unreleased/Feature-20251209-170951.yaml
@@ -0,0 +1,6 @@
+kind: Feature
+body: Display upcoming appointments within the person context in the search results
+time: 2025-12-09T17:09:51.811720451+01:00
+custom:
+    Issue: "462"
+    SchemaChange: No schema change

From 10052cc5e11b833babc90ff3813b20fb13620161 Mon Sep 17 00:00:00 2001
From: Boris Waaub <boris.waaub@digitalternative.be>
Date: Tue, 9 Dec 2025 17:11:45 +0100
Subject: [PATCH 268/283] =?UTF-8?q?FIX:=20Probl=C3=A8me=20au=20chargement?=
 =?UTF-8?q?=20des=20"pelotons"?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TicketApp/components/PelotonComponent.vue | 38 ++++++-------------
 1 file changed, 11 insertions(+), 27 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PelotonComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PelotonComponent.vue
index 9cc2f75b5..13bf284f5 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PelotonComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PelotonComponent.vue
@@ -18,7 +18,7 @@
         <select
           v-model="selectedStoredObject"
           class="form-select"
-          @change="onSelectionChange"
+          @change="fetchDocument"
           style="max-width: 400px"
         >
           <option
@@ -125,22 +125,7 @@ const isLoading = ref<boolean>(false);
 const error = ref<string>("");
 const showPelotonsModal = ref<boolean>(false);
 
-watch(
-  () => props.storedObjects,
-  (newStoredObjects) => {
-    if (
-      newStoredObjects &&
-      newStoredObjects.length > 0 &&
-      !selectedStoredObject.value
-    ) {
-      selectedStoredObject.value = newStoredObjects[0];
-      onSelectionChange();
-    }
-  },
-  { immediate: true },
-);
-
-async function onSelectionChange() {
+async function fetchDocument() {
   if (!selectedStoredObject.value) {
     cleanupPrevious();
     documentType.value = "";
@@ -162,7 +147,6 @@ async function onSelectionChange() {
       selectedStoredObject.value,
       selectedStoredObject.value.currentVersion,
     );
-    console.log("downloadInfo", downloadInfo);
     const rawResponse = await window.fetch(downloadInfo.url);
 
     if (!rawResponse.ok) {
@@ -228,22 +212,22 @@ function cleanupPrevious() {
     documentUrl.value = "";
   }
 }
-
 function handleClick() {
+  fetchDocument();
   showPelotonsModal.value = true;
-  if (
-    !selectedStoredObject.value &&
-    props.storedObjects &&
-    props.storedObjects.length > 0
-  ) {
-    selectedStoredObject.value = props.storedObjects[0];
-    onSelectionChange();
-  }
 }
 
 function closeModal() {
   showPelotonsModal.value = false;
 }
+
+watch(
+  () => props.storedObjects,
+  (newStoredObjects) => {
+    selectedStoredObject.value = newStoredObjects ? newStoredObjects[0] : null;
+  },
+  { immediate: true },
+);
 </script>
 
 <style lang="scss" scoped>

From 24927069a43f0830fc4a4badf310801c996d2d26 Mon Sep 17 00:00:00 2001
From: Boris Waaub <boris.waaub@digitalternative.be>
Date: Tue, 9 Dec 2025 17:14:07 +0100
Subject: [PATCH 269/283] FIX: eslint

---
 .../vuejs/TicketApp/components/BannerComponent.vue       | 9 ++++++---
 .../TicketList/components/TicketListItemComponent.vue    | 2 --
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
index 43d12fdbd..28a72d4b4 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/BannerComponent.vue
@@ -131,7 +131,10 @@ import { useStore } from "vuex";
 
 // Utils
 import { getTicketTitle, motiveHierarchyLabel } from "../utils/utils";
-import {isThirdparty, Thirdparty} from "../../../../../../../ChillThirdPartyBundle/Resources/public/types";
+import {
+  isThirdparty,
+  Thirdparty,
+} from "../../../../../../../ChillThirdPartyBundle/Resources/public/types";
 
 const props = defineProps<{
   ticket: Ticket;
@@ -197,7 +200,7 @@ const isEmergency = computed({
     }
   },
 });
-const caller = computed<Person[]|Thirdparty[]>(() => {
+const caller = computed<Person[] | Thirdparty[]>(() => {
   if (null === props.ticket.caller) {
     return [];
   }
@@ -207,7 +210,7 @@ const caller = computed<Person[]|Thirdparty[]>(() => {
   } else {
     return [props.ticket.caller];
   }
-})
+});
 
 const since = computed(() => {
   return store.getters.getSinceCreated(today.value);
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListItemComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListItemComponent.vue
index 7255c0c5d..410905fa6 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListItemComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListItemComponent.vue
@@ -94,8 +94,6 @@
 </template>
 
 <script setup lang="ts">
-import { defineProps, defineEmits } from "vue";
-
 // Types
 import { TicketSimple } from "../../../types";
 import { Person } from "ChillPersonAssets/types";

From 27853c594d0e8ff556d14fdc0691a8ded4145cde Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 10 Dec 2025 04:17:29 +0100
Subject: [PATCH 270/283] Fix missing translation variable in NewLocation
 component

---
 .changes/unreleased/Fixed-20251210-041722.yaml       |  6 ++++++
 .../Activity/components/Location/NewLocation.vue     | 12 ++++++++----
 2 files changed, 14 insertions(+), 4 deletions(-)
 create mode 100644 .changes/unreleased/Fixed-20251210-041722.yaml

diff --git a/.changes/unreleased/Fixed-20251210-041722.yaml b/.changes/unreleased/Fixed-20251210-041722.yaml
new file mode 100644
index 000000000..67667cb04
--- /dev/null
+++ b/.changes/unreleased/Fixed-20251210-041722.yaml
@@ -0,0 +1,6 @@
+kind: Fixed
+body: Fix missing translation variable in NewLocation component
+time: 2025-12-10T04:17:22.40669463+01:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue
index 1cc16ac95..3d771e861 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue
@@ -136,6 +136,8 @@ import {
     ACTIVITY_LOCATION_FIELDS_TYPE,
     ACTIVITY_CHOOSE_LOCATION_TYPE,
     ACTIVITY_CREATE_NEW_LOCATION,
+    ACTIVITY_EDIT_ADDRESS,
+    ACTIVITY_CREATE_ADDRESS,
     trans,
 } from "translator";
 
@@ -156,6 +158,8 @@ export default {
             ACTIVITY_LOCATION_FIELDS_TYPE,
             ACTIVITY_CHOOSE_LOCATION_TYPE,
             ACTIVITY_CREATE_NEW_LOCATION,
+            ACTIVITY_EDIT_ADDRESS,
+            ACTIVITY_CREATE_ADDRESS
         };
     },
     props: ["availableLocations"],
@@ -179,14 +183,14 @@ export default {
                 options: {
                     button: {
                         text: {
-                            create: "activity.create_address",
-                            edit: "activity.edit_address",
+                            create: ACTIVITY_CREATE_ADDRESS,
+                            edit: ACTIVITY_EDIT_ADDRESS,
                         },
                         size: "btn-sm",
                     },
                     title: {
-                        create: "activity.create_address",
-                        edit: "activity.edit_address",
+                        create: ACTIVITY_CREATE_ADDRESS,
+                        edit: ACTIVITY_EDIT_ADDRESS,
                     },
                 },
                 context: {

From c19b2e18ad73a163a1cf881ab3394a22b63c8fd4 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 10 Dec 2025 04:26:27 +0100
Subject: [PATCH 271/283] Move symfony/loco-translation-provider dependency to
 require-dev

---
 composer.json | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/composer.json b/composer.json
index e7c61424f..829d5e7db 100644
--- a/composer.json
+++ b/composer.json
@@ -61,7 +61,6 @@
         "symfony/http-client": "^5.4",
         "symfony/http-foundation": "^5.4",
         "symfony/intl": "^5.4",
-        "symfony/loco-translation-provider": "^6.0",
         "symfony/mailer": "^5.4",
         "symfony/messenger": "^5.4",
         "symfony/mime": "^5.4",
@@ -118,7 +117,8 @@
         "symfony/runtime": "^5.4",
         "symfony/stopwatch": "^5.4",
         "symfony/var-dumper": "^5.4",
-        "symfony/web-profiler-bundle": "^5.4"
+        "symfony/web-profiler-bundle": "^5.4",
+        "symfony/loco-translation-provider": "^6.0"
     },
     "conflict": {
         "symfony/symfony": "*"

From 09ef95d13e9b4b35a76dfa04c48d5aa876540af7 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 10 Dec 2025 04:32:19 +0100
Subject: [PATCH 272/283] Translate rst files to md format and add new index
 entries for translation directives and provider

---
 docs/source/development/index.md              |   2 +
 .../development/translation_directives.md     | 376 ++++++++++++++++
 .../development/translation_directives.rst    | 419 ------------------
 .../development/translation_provider.md       | 139 ++++++
 .../development/translation_provider.rst      | 148 -------
 5 files changed, 517 insertions(+), 567 deletions(-)
 create mode 100644 docs/source/development/translation_directives.md
 delete mode 100644 docs/source/development/translation_directives.rst
 create mode 100644 docs/source/development/translation_provider.md
 delete mode 100644 docs/source/development/translation_provider.rst

diff --git a/docs/source/development/index.md b/docs/source/development/index.md
index ab763538c..bb685dbd2 100644
--- a/docs/source/development/index.md
+++ b/docs/source/development/index.md
@@ -12,6 +12,8 @@ As Chill relies on the [symfony ](http://symfony.com) framework, reading the fra
 - [Messages to users](messages-to-users.md)
 - [Pagination](pagination.md)
 - [Localisation](localisation.md)
+- [Translation directives](translation_directives.md)
+- [Translation provider](translation_provider.md)
 - [Logging](logging.md)
 - [Database migrations](migrations.md)
 - [Searching](searching.md)
diff --git a/docs/source/development/translation_directives.md b/docs/source/development/translation_directives.md
new file mode 100644
index 000000000..ce7561904
--- /dev/null
+++ b/docs/source/development/translation_directives.md
@@ -0,0 +1,376 @@
+# Translation Key Directives
+
+These directives are meant to ensure better consistency across bundles, avoid duplication, and make keys more predictable.
+
+## General Principles
+
+1. **Use lowercase snake_case for all keys**
+
+2. **Use dot-separated namespaces**
+   The dot is used to reflect:
+    - bundle
+    - feature
+    - sub-feature
+    - key type
+
+3. **Do not use spaces in keys**
+
+4. **Avoid duplicating the same text in multiple places**
+   When a translation is needed, try a search for the translation value first and see if it exists elsewhere
+
+5. **If a key is used across multiple bundles, it must live in ChillMainBundle.**
+
+6. **If a key is used across multiple bundles and is a generic term, it must be placed in the `common` namespace.**
+
+## Key Structure
+
+We use the following structure:
+
+```
+<scope>.<feature>.<sub-feature>.<key-type>
+```
+
+Where:
+
+- `<scope>` identifies the bundle or shared context
+- `<feature>` identifies the part of the module using the translation
+- `<element>` describes the text purpose
+- `<subelement>` for a multi-level element (e.g., activity.export.person.count.description)
+
+### Examples of scopes
+
+- `activity` — ChillActivityBundle
+- `person` — ChillPersonBundle
+- `common` — neutral shared translation values
+
+## Naming Scopes
+
+### 1. Bundle-specific keys
+
+For most things inside a bundle:
+
+```
+activity.<feature>.<element>
+```
+
+Example:
+
+```
+activity.form.save
+activity.list.title
+activity.entity.type
+activity.menu.activities
+activity.controller.success_created
+```
+
+### 2. Shared UI elements (buttons, labels, generic text)
+
+These belong in the `common` namespace in ChillMainBundle:
+
+```
+common.save
+common.delete
+common.edit
+common.filter
+common.duration_time
+```
+
+## Translation Workflow
+
+Use the following workflow when deciding where a key belongs:
+
+1. **Is this text used in more than one bundle?**
+   → Place in `main` or `common`
+
+2. **Is this text generic UI (button, label, pagination, yes/no)?**
+   → Place in `common`
+
+3. **Is this text specific to one bundle and one feature?**
+   → Place in `<bundle>.feature.<element>`
+
+4. **Is this text related to an entity or value object?**
+   → Place in `<bundle>.entity.<entityname>.<field>`
+
+5. **Is this text used in forms?**
+   → `<bundle>.form.<field>` or `<bundle>.form.<action>`
+
+6. **Is this text related to exports?**
+   → `<bundle>.export.<feature>.<column>`
+
+7. **Is it related to filtering, searching or parameters?**
+   → `<bundle>.filter.<name>` or
+   → `<bundle>.filter.<feature>.<field>` for nested filters
+
+## Examples Based on Translations Within ChillActivityBundle
+
+Below are concrete examples from `ChillActivityBundle`, refactored according to the guidelines.
+
+### General activity keys
+
+Instead of scattered keys like:
+
+```
+Show the activity
+Edit the activity
+Activity
+Duration time
+...
+```
+
+We use:
+
+```
+activity.general.show
+activity.general.edit
+activity.general.title
+activity.general.duration
+activity.general.travel_time
+activity.general.attendee
+activity.general.remark
+activity.general.no_comments
+```
+
+### Forms
+
+Instead of keys like:
+
+```
+Activity creation
+Save activity
+Reset form
+Choose a type
+```
+
+Use:
+
+```
+activity.form.title_create
+activity.form.save
+activity.form.reset
+activity.form.choose_type
+activity.form.choose_duration
+```
+
+Long lists (like durations) should be grouped:
+
+```
+activity.form.duration.5min
+activity.form.duration.10min
+activity.form.duration.15min
+activity.form.duration.1h
+activity.form.duration.1h30
+activity.form.duration.2h
+...
+```
+
+### Entities
+
+Entity fields should follow:
+
+```
+activity.entity.activity.date
+activity.entity.activity.comment
+activity.entity.activity.deleted
+activity.entity.location.name
+activity.entity.location.type
+```
+
+### Controller messages
+
+Instead of strings as keys:
+
+```
+'Success : activity created!'
+'The form is not valid. The activity has not been created !'
+```
+
+Use:
+
+```
+activity.controller.success_created
+activity.controller.error_invalid_create
+activity.controller.success_updated
+activity.controller.error_invalid_update
+```
+
+### Roles
+
+Access control keys should be:
+
+```
+activity.role.create
+activity.role.update
+activity.role.see
+activity.role.see_details
+activity.role.delete
+activity.role.stats
+activity.role.list
+```
+
+### Admin
+
+```
+activity.admin.configuration
+activity.admin.types
+activity.admin.reasons
+activity.admin.reason_category
+activity.admin.presence
+```
+
+### CRUD
+
+```
+activity.crud.type.title_new
+activity.crud.type.title_edit
+activity.crud.presence.title_new
+```
+
+### Activity Reason
+
+```
+activity.reason.list
+activity.reason.create
+activity.reason.active
+activity.reason.category
+activity.reason.entity_title
+```
+
+### Exports
+
+Group them logically:
+
+```
+activity.export.person.count.title
+activity.export.person.count.description
+activity.export.person.count.header
+
+activity.export.period.sum_duration.title
+activity.export.period.sum_duration.description
+activity.export.period.sum_duration.header
+```
+
+### Filters
+
+Use hierarchical filters:
+
+```
+activity.filter.by_reason
+activity.filter.by_type
+activity.filter.by_date
+activity.filter.by_location
+activity.filter.by_sent_received
+activity.filter.by_user
+```
+
+### Aggregators
+
+```
+activity.aggregator.reason.by_category
+activity.aggregator.reason.level
+activity.aggregator.user.by_scope
+activity.aggregator.user.by_job
+```
+
+## Global/Shared Keys
+
+Keys like the following **must not be redeclared** in each bundle:
+
+- First name
+- Last name
+- Username
+- ID
+- Type
+- Duration
+- Comment
+- Date
+- Location
+- Present / Not present
+- Add / Edit / Delete / Save / Update
+
+These belong in `common` or `main`:
+
+```
+common.firstname
+common.lastname
+common.username
+common.id
+common.type
+common.comment
+common.date
+common.location
+common.present
+common.absent
+common.add
+common.edit
+common.delete
+common.save
+common.update
+```
+
+## Naming Directives Summary
+
+- **snake_case**
+- **namespaced with dots**
+- **bundle prefix for bundle-specific concepts**
+- **common or main for shared concepts**
+- **avoid free-floating keys (without namespace)**
+- **reuse common keys wherever possible**
+
+## Migration Strategy (Optional)
+
+To apply this structure progressively:
+
+1. New keys must follow these guidelines.
+2. Existing keys may remain as-is until refactored.
+3. When refactoring:
+    - Move cross-bundle keys to ChillMainBundle and possible `common` namespace.
+    - Replace duplicated keys with shared ones.
+
+---
+
+# Avoiding Duplicate Translations
+
+## 1. Use Shared Namespaces
+
+Two namespaces must be used for shared translations:
+
+- `common.*` — generic UI concepts (save, delete, date, name, etc.)
+
+If a translation may be reused in multiple bundles, it must be placed in the `common` namespace or in ChillMainBundle.
+
+## 2. Bundle-Specific Keys
+
+Keys belonging only to one bundle or one feature are namespaced inside that bundle:
+
+```
+activity.<feature>.<element>
+person.<feature>.<element>
+```
+
+## 3. Search Before Creating
+
+Before adding a new translation key, developers must:
+
+1. For common translations like "enregistrer/opslaan" look in the `common` namespace.
+2. Search in Loco or translations for existing values.
+
+If a suitable key exists, reuse it.
+
+## 4. Only Create a New Key When Necessary
+
+Create a new key only when the text is:
+
+- specific to the bundle
+- specific to the feature
+- not reusable elsewhere
+
+## 5. Progressive Cleanup
+
+Old duplicates may remain temporarily. When updating code in an area, clean duplicate values by moving them into `common` or `main`.
+
+## General Workflow
+
+- **Reuse shared keys** within `common` namespace.
+- **Search before creating** new keys.
+- **Namespace bundle-specific keys** under their bundle.
+- **Refactor progressively** when touching old code.
diff --git a/docs/source/development/translation_directives.rst b/docs/source/development/translation_directives.rst
deleted file mode 100644
index 106ffb3ab..000000000
--- a/docs/source/development/translation_directives.rst
+++ /dev/null
@@ -1,419 +0,0 @@
-============================================
-Directives for creating new translation keys
-============================================
-
-These directives are meant to ensure better consistency across bundles, avoid duplication, and make keys more predictable.
-
-
-General Principles
-==================
-
-1. **Use lowercase snake_case for all keys**
-
-2. **Use dot-separated namespaces**
-   The dot is used to reflect:
-   - bundle
-   - feature
-   - sub-feature
-   - key type
-
-3. **Do not use spaces in keys**
-
-4. **Avoid duplicating the same text in multiple places**
-   When a translation is needed, try a search for the translation value first and see if it exists elsewhere
-
-5. **If a key is used across multiple bundles, it must live in ChillMainBundle.**
-
-6. **If a key is used across multiple bundles and is a generic term, it must be placed in the ``common`` namespace.**
-
-
-Key Structure
-=============
-
-We use the following structure:
-
-.. code-block:: text
-
-    <scope>.<feature>.<sub-feature>.<key-type>
-
-Where:
-
-* ``<>`` identifies the bundle or shared context
-* ``<feature>`` identifies the part of the module using the translation
-* ``<element>`` describes the text purpose
-* ``<subelement>`` for a multi-level element ( eg. activity.export.person.count.description)
-
-Examples of scopes
-------------------
-
-* ``activity`` — ChillActivityBundle
-* ``person`` — ChillPersonBundle
-* ``common`` — neutral shared translation values
-
-
-Naming Scopes
-=============
-
-1. **Bundle-specific keys**
-
-   For most things inside a bundle:
-
-   .. code-block:: text
-
-       activity.<feature>.<element>
-
-   Example:
-
-   .. code-block:: text
-
-       activity.form.save
-       activity.list.title
-       activity.entity.type
-       activity.menu.activities
-       activity.controller.success_created
-
-2. **Shared UI elements (buttons, labels, generic text)**
-
-   These belong in the ``common`` namespace in ChillMainBundle:
-
-   .. code-block:: text
-
-       common.save
-       common.delete
-       common.edit
-       common.filter
-       common.duration_time
-
-Translation workflow
-====================
-
-Use the following workflow when deciding where a key belongs:
-
-1. **Is this text used in more than one bundle?**
-   → Place in ``main`` or ``common``
-
-2. **Is this text generic UI (button, label, pagination, yes/no)?**
-   → Place in ``common``
-
-3. **Is this text specific to one bundle and one feature?**
-   → Place in ``<bundle>.feature.<element>``
-
-4. **Is this text related to an entity or value object?**
-   → Place in ``<bundle>.entity.<entityname>.<field>``
-
-5. **Is this text used in forms?**
-   → ``<bundle>.form.<field>`` or ``<bundle>.form.<action>``
-
-6. **Is this text related to exports?**
-   → ``<bundle>.export.<feature>.<column>``
-
-7. **Is it related to filtering, searching or parameters?**
-   → ``<bundle>.filter.<name>`` or
-   → ``<bundle>.filter.<feature>.<field>`` for nested filters
-
-
-Examples based on translations within ChillActivityBundle
-=========================================================
-
-Below are concrete examples from ``ChillActivityBundle``,
-refactored according to the guidelines.
-
-
-General activity keys
----------------------
-
-Instead of scattered keys like::
-
-    Show the activity
-    Edit the activity
-    Activity
-    Duration time
-    ...
-
-We use:
-
-.. code-block:: text
-
-    activity.general.show
-    activity.general.edit
-    activity.general.title
-    activity.general.duration
-    activity.general.travel_time
-    activity.general.attendee
-    activity.general.remark
-    activity.general.no_comments
-
-
-Forms
------
-
-Instead of keys like::
-
-    Activity creation
-    Save activity
-    Reset form
-    Choose a type
-
-Use:
-
-.. code-block:: text
-
-    activity.form.title_create
-    activity.form.save
-    activity.form.reset
-    activity.form.choose_type
-    activity.form.choose_duration
-
-Long lists (like durations) should be grouped:
-
-.. code-block:: text
-
-    activity.form.duration.5min
-    activity.form.duration.10min
-    activity.form.duration.15min
-    activity.form.duration.1h
-    activity.form.duration.1h30
-    activity.form.duration.2h
-    ...
-
-Entities
---------
-
-Entity fields should follow:
-
-.. code-block:: text
-
-    activity.entity.activity.date
-    activity.entity.activity.comment
-    activity.entity.activity.deleted
-    activity.entity.location.name
-    activity.entity.location.type
-
-
-Controller messages
--------------------
-
-Instead of strings as keys::
-
-    'Success : activity created!'
-    'The form is not valid. The activity has not been created !'
-
-Use:
-
-.. code-block:: text
-
-    activity.controller.success_created
-    activity.controller.error_invalid_create
-    activity.controller.success_updated
-    activity.controller.error_invalid_update
-
-
-Roles
------
-
-Access control keys should be:
-
-.. code-block:: text
-
-    activity.role.create
-    activity.role.update
-    activity.role.see
-    activity.role.see_details
-    activity.role.delete
-    activity.role.stats
-    activity.role.list
-
-
-Admin
------
-
-.. code-block:: text
-
-    activity.admin.configuration
-    activity.admin.types
-    activity.admin.reasons
-    activity.admin.reason_category
-    activity.admin.presence
-
-
-CRUD
-----
-
-.. code-block:: text
-
-    activity.crud.type.title_new
-    activity.crud.type.title_edit
-    activity.crud.presence.title_new
-
-
-Activity Reason
----------------
-
-.. code-block:: text
-
-    activity.reason.list
-    activity.reason.create
-    activity.reason.active
-    activity.reason.category
-    activity.reason.entity_title
-
-
-Exports
--------
-
-Group them logically:
-
-.. code-block:: text
-
-    activity.export.person.count.title
-    activity.export.person.count.description
-    activity.export.person.count.header
-
-    activity.export.period.sum_duration.title
-    activity.export.period.sum_duration.description
-    activity.export.period.sum_duration.header
-
-
-Filters
--------
-
-Use hierarchical filters:
-
-.. code-block:: text
-
-    activity.filter.by_reason
-    activity.filter.by_type
-    activity.filter.by_date
-    activity.filter.by_location
-    activity.filter.by_sent_received
-    activity.filter.by_user
-
-
-Aggregators
------------
-
-.. code-block:: text
-
-    activity.aggregator.reason.by_category
-    activity.aggregator.reason.level
-    activity.aggregator.user.by_scope
-    activity.aggregator.user.by_job
-
-
-Global/Shared Keys
-==================
-
-Keys like the following **must not be redeclared** in each bundle:
-
-- First name
-- Last name
-- Username
-- ID
-- Type
-- Duration
-- Comment
-- Date
-- Location
-- Present / Not present
-- Add / Edit / Delete / Save / Update
-
-These belong in ``common`` or ``main``:
-
-.. code-block:: text
-
-    common.firstname
-    common.lastname
-    common.username
-    common.id
-    common.type
-    common.comment
-    common.date
-    common.location
-    common.present
-    common.absent
-    common.add
-    common.edit
-    common.delete
-    common.save
-    common.update
-
-
-Naming directives summary
-==========================
-
-* **snake_case**
-* **namespaced with dots**
-* **bundle prefix for bundle-specific concepts**
-* **common or main for shared concepts**
-* **avoid free-floating keys (without namespace)**
-* **reuse common keys wherever possible**
-
-
-Migration Strategy (Optional)
-=============================
-
-To apply this structure progressively:
-
-1. New keys must follow these guidelines.
-2. Existing keys may remain as-is until refactored.
-3. When refactoring:
-   - Move cross-bundle keys to ChillMainBundle and possible `common` namespace.
-   - Replace duplicated keys with shared ones.
-
-===========================================
-Avoiding duplicate translations
-===========================================
-
-1. Use Shared Namespaces
-========================
-
-Two namespaces must be used for shared translations:
-
-* ``common.*`` — generic UI concepts (save, delete, date, name, etc.)
-
-If a translation may be reused in multiple bundles, it must be placed
-in the ``common`` namespace or in ChillMainBundle.
-
-2. Bundle-Specific Keys
-=======================
-
-Keys belonging only to one bundle or one feature are namespaced inside that
-bundle:
-
-.. code-block:: text
-
-    activity.<feature>.<element>
-    person.<feature>.<element>
-
-3. Search Before Creating
-=========================
-
-Before adding a new translation key, developers must:
-
-1. For common translations like: "enregistrer/opslaan" look in the `common` namespace.
-3. Search in Loco or translations for existing values.
-
-If a suitable key exists, reuse it.
-
-4. Only Create a New Key When Necessary
-=======================================
-
-Create a new key only when the text is:
-
-* specific to the bundle
-* specific to the feature
-* not reusable elsewhere
-
-6. Progressive Cleanup
-======================
-
-Old duplicates may remain temporarily. When updating code in an area, clean
-duplicate values by moving them into ``common`` or ``main``.
-
-General workflow
-================
-
-* **Reuse shared keys** within ``common`` namespace.
-* **Search before creating** new keys.
-* **Namespace bundle-specific keys** under their bundle.
-* **Refactor progressively** when touching old code.
diff --git a/docs/source/development/translation_provider.md b/docs/source/development/translation_provider.md
new file mode 100644
index 000000000..29301f366
--- /dev/null
+++ b/docs/source/development/translation_provider.md
@@ -0,0 +1,139 @@
+# Managing Translations Within CHILL Using Loco as a Translation Provider
+
+Within CHILL we make use of Symfony's translation component together with *Loco* as an external translation provider. Using this setup centralises translations in a single online location (Loco), while still allowing developers to create and update translation keys locally in the project (YAML files).
+
+## Workflow
+
+We use the following workflow:
+
+- Developers create translation keys in YAML files inside each bundle.
+- Keys are written in **English**.
+- Application UI defaults to **French**, with **Dutch** as an additional locale (other languages can be added in the future).
+- Loco acts as the central translation memory and synchronisation source.
+- Loco Symfony package was installed so that built-in translation commands can be used to push/pull content between Loco and the local project.
+
+## Translation Directory Structure
+
+Each bundle contains its own `translations` directory, for example:
+
+```
+chill-bundles/
+    ChillCoreBundle/
+        translations/
+            messages.fr.yml
+            messages.nl.yml
+    ChillPersonBundle/
+        translations/
+            messages.fr.yml
+            messages.nl.yml
+    ...
+```
+
+## Configuration
+
+The translation configuration is defined in `config/packages/translation.yaml`:
+
+```yaml
+framework:
+    default_locale: '%env(resolve:LOCALE)%'
+    translator:
+        default_path: '%kernel.project_dir%/translations'
+        fallbacks:
+            - '%env(resolve:LOCALE)%'
+            - 'en'
+        providers:
+            loco:
+                dsn: '%env(LOCO_DSN)%'
+                domains: [ 'messages' ]
+                locales: [ 'fr', 'nl' ]
+```
+
+Note:
+
+- `en` is the **source locale** in Loco.
+- `fr` and `nl` are the **application locales**.
+- `domains: [messages]` means only `messages.*.yml` files are pushed.
+
+### Environment Variables
+
+In `.env`:
+
+```
+LOCALE=fr
+```
+
+In `.env.local`:
+
+```
+LOCO_DSN="loco://API_KEY@default"
+```
+
+Replace `API_KEY` with the key provided by Loco.
+
+## Working with Loco
+
+Loco shows all translation keys under three languages:
+
+- **English (source)** — keys are listed but remain "untranslated"
+- **French** — translated strings for French users
+- **Dutch** — translated strings for Dutch users
+
+Note: Don't add translations directly in the English column. This column simply represents the *key*.
+
+## Pushing Translations to Loco
+
+You can push local translations to Loco using:
+
+```bash
+symfony console translation:push loco --locales=fr --locales=nl --force
+```
+
+This will:
+
+- Upload all French and Dutch translation values from `*.fr.yml` and `*.nl.yml` files
+- Ensure Loco stays in sync with local YAML files
+- Create any missing keys in Loco
+
+## Pulling Translations from Loco
+
+When translators update strings in Loco, developers can fetch updates with:
+
+```bash
+symfony console translation:pull loco --locales=fr --locales=nl --force
+```
+
+This will:
+
+- Download the latest French and Dutch translations
+- Overwrite the local YAML files with Loco's content
+- Keep everything consistent across the team
+
+## Adding New Translation Keys (Developer Workflow)
+
+1. Add a new key directly in the appropriate YAML file, for example:
+
+   ```
+   chill-bundles/ChillPersonBundle/translations/messages.fr.yml
+   ```
+
+   Example key:
+
+   ```yaml
+   person.form.submit: "Envoyer"
+   ```
+
+2. Add Dutch translation as well if you can (otherwise leave empty to be translated within Loco later):
+
+   ```yaml
+   person.form.submit: "Verzenden"
+   ```
+
+3. Run a push to send the new key to Loco:
+
+   ```bash
+   symfony console translation:push loco --locales=fr --locales=nl --force
+   ```
+
+4. The key will now appear in Loco for translation management.
+
+Note: English appears as "untranslated", because it is merely the source language.
diff --git a/docs/source/development/translation_provider.rst b/docs/source/development/translation_provider.rst
deleted file mode 100644
index 98b117129..000000000
--- a/docs/source/development/translation_provider.rst
+++ /dev/null
@@ -1,148 +0,0 @@
-=======================================================================
-Managing translations within CHILL using Loco as a translation provider
-=======================================================================
-
-Within CHILL we make use of Symfony's translation component together with *Loco* as an external
-translation provider. Using this setup centralise translations in a single online
-location (Loco), while still allowing developers to create and update
-translation keys locally in the project (YAML files).
-
-Workflow
-========
-
-We use the following workflow:
-
-* Developers create translation keys in YAML files inside each bundle.
-* Keys are written in **English**.
-* Application UI defaults to **French**, with **Dutch** as an additional locale (other languages can be added in the future).
-* Loco acts as the central translation memory and synchronisation source.
-* Loco Symfony package was installed so that built-in translation commands can be used to push/pull content
-  between Loco and the local project.
-
-
-Translation directory structure
-===============================
-
-Each bundle contains its own ``translations`` directory, for example::
-
-    chill-bundles/
-        ChillCoreBundle/
-            translations/
-                messages.fr.yml
-                messages.nl.yml
-        ChillPersonBundle/
-            translations/
-                messages.fr.yml
-                messages.nl.yml
-        ...
-
-Configuration
-=============
-
-The translation configuration is defined in
-``config/packages/translation.yaml``::
-
-    framework:
-        default_locale: '%env(resolve:LOCALE)%'
-        translator:
-            default_path: '%kernel.project_dir%/translations'
-            fallbacks:
-                - '%env(resolve:LOCALE)%'
-                - 'en'
-            providers:
-                loco:
-                    dsn: '%env(LOCO_DSN)%'
-                    domains: [ 'messages' ]
-                    locales: [ 'fr', 'nl' ]
-
-Note:
-
-* ``en`` is the **source locale** in Loco.
-* ``fr`` and ``nl`` are the **application locales**.
-* ``domains: [messages]`` means only ``messages.*.yml`` files are pushed.
-
-
-Environment variables
----------------------
-
-In ``.env``::
-
-    LOCALE=fr
-
-In ``.env.local``::
-
-    LOCO_DSN="loco://API_KEY@default"
-
-Replace ``API_KEY`` with the key provided by Loco.
-
-
-Working with Loco
-=================
-
-Loco shows all translation keys under three languages:
-
-* **English (source)** — keys are listed but remain “untranslated”
-* **French** — translated strings for French users
-* **Dutch** — translated strings for Dutch users
-
-Note: Don't add translations directly in the English column.
-This column simply represents the *key*.
-
-
-Pushing translations to Loco
-============================
-
-You can push local translations to Loco using:
-
-.. code-block:: bash
-
-    symfony console translation:push loco --locales=fr --locales=nl --force
-
-This will:
-
-* Upload all French and Dutch translation values from ``*.fr.yml`` and
-  ``*.nl.yml`` files
-* Ensures Loco stays in sync with local YAML files
-* Creates any missing keys in Loco
-
-
-Pulling translations from Loco
-==============================
-
-When translators update strings in Loco, developers can fetch updates with:
-
-.. code-block:: bash
-
-    symfony console translation:pull loco --locales=fr --locales=nl --force
-
-This will:
-
-* Download the latest French and Dutch translations
-* Overwrite the local YAML files with Loco’s content
-* Keep everything consistent across the team
-
-
-Adding new translation keys (Developer workflow)
-================================================
-
-1. Add a new key directly in the appropriate YAML file, for example::
-
-       chill-bundles/ChillPersonBundle/translations/messages.fr.yml
-
-   Example key::
-
-       person.form.submit: "Envoyer"
-
-2. Add Dutch translation as well if you can (otherwise leave empty to be translated within Loco later)::
-
-       person.form.submit: "Verzenden"
-
-3. Run a push to send the new key to Loco:
-
-.. code-block:: bash
-
-    symfony console translation:push loco --locales=fr --locales=nl --force
-
-4. The key will now appear in Loco for translation management.
-
-Note: English appears as “untranslated”, because it is merely the source language

From 2600c6fa2a53f81a7c277db2162fdb7f41e44ab1 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 10 Dec 2025 05:06:03 +0100
Subject: [PATCH 273/283] Fix ByActivityNumberAggregator when used on count
 exports within ActivityBundle

---
 .../Aggregator/ACPAggregators/ByActivityNumberAggregator.php   | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByActivityNumberAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByActivityNumberAggregator.php
index e304a9d7f..125b197dc 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByActivityNumberAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByActivityNumberAggregator.php
@@ -27,7 +27,8 @@ class ByActivityNumberAggregator implements AggregatorInterface
     public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
     {
         $qb
-            ->addSelect('(SELECT COUNT(activity.id) FROM '.Activity::class.' activity WHERE activity.accompanyingPeriod = acp) AS activity_by_number_aggregator')
+            // Use a distinct alias inside the subquery to avoid colliding with the root alias "activity"
+            ->addSelect('(SELECT COUNT(agg_activity.id) FROM '.Activity::class.' agg_activity WHERE agg_activity.accompanyingPeriod = acp) AS activity_by_number_aggregator')
             ->addGroupBy('activity_by_number_aggregator');
     }
 

From c4a069ba2e0361bc36fde4a6842ba640f519a202 Mon Sep 17 00:00:00 2001
From: Julie Lenaerts <julielenaerts@gmail.com>
Date: Wed, 10 Dec 2025 05:11:56 +0100
Subject: [PATCH 274/283] Fix display of header for ByActivityNumberAggregator

---
 .changes/unreleased/Fixed-20251210-051234.yaml              | 6 ++++++
 .changes/unreleased/Fixed-20251210-051313.yaml              | 6 ++++++
 .../ACPAggregators/ByActivityNumberAggregator.php           | 2 +-
 3 files changed, 13 insertions(+), 1 deletion(-)
 create mode 100644 .changes/unreleased/Fixed-20251210-051234.yaml
 create mode 100644 .changes/unreleased/Fixed-20251210-051313.yaml

diff --git a/.changes/unreleased/Fixed-20251210-051234.yaml b/.changes/unreleased/Fixed-20251210-051234.yaml
new file mode 100644
index 000000000..581b37176
--- /dev/null
+++ b/.changes/unreleased/Fixed-20251210-051234.yaml
@@ -0,0 +1,6 @@
+kind: Fixed
+body: Fix display of header for ByActivityNumberAggregator
+time: 2025-12-10T05:12:34.061935068+01:00
+custom:
+    Issue: "476"
+    SchemaChange: No schema change
diff --git a/.changes/unreleased/Fixed-20251210-051313.yaml b/.changes/unreleased/Fixed-20251210-051313.yaml
new file mode 100644
index 000000000..c0a236e13
--- /dev/null
+++ b/.changes/unreleased/Fixed-20251210-051313.yaml
@@ -0,0 +1,6 @@
+kind: Fixed
+body: Fix use of ByActivityNumberAggregator in combination with activity count exports
+time: 2025-12-10T05:13:13.246754532+01:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change
diff --git a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByActivityNumberAggregator.php b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByActivityNumberAggregator.php
index 125b197dc..b901b10f5 100644
--- a/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByActivityNumberAggregator.php
+++ b/src/Bundle/ChillActivityBundle/Export/Aggregator/ACPAggregators/ByActivityNumberAggregator.php
@@ -66,7 +66,7 @@ class ByActivityNumberAggregator implements AggregatorInterface
     {
         return static function ($value) {
             if ('_header' === $value) {
-                return '';
+                return 'Count activities linked to an accompanying period';
             }
 
             if (null === $value) {

From a16d659f695f1633b829fe36d9873277e597d442 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 11 Dec 2025 13:26:10 +0000
Subject: [PATCH 275/283] Tentatively fix CTRL+C in Collabora editor with edge
 and chrome browser (+ remove zimbra bundle from configuration)

---
 .../unreleased/Fixed-20251211-135111.yaml     |  6 ++
 config/bundles.php                            |  1 -
 config/services.yaml                          |  3 +
 phpstan.dist.neon                             |  1 -
 .../ChillWopiBundle/chill.webpack.config.js   |  2 +-
 .../src/Resources/public/page/editor/index.js | 46 -------------
 .../src/Resources/public/page/editor/index.ts | 68 +++++++++++++++++++
 symfony.lock                                  |  3 -
 8 files changed, 78 insertions(+), 52 deletions(-)
 create mode 100644 .changes/unreleased/Fixed-20251211-135111.yaml
 delete mode 100644 src/Bundle/ChillWopiBundle/src/Resources/public/page/editor/index.js
 create mode 100644 src/Bundle/ChillWopiBundle/src/Resources/public/page/editor/index.ts

diff --git a/.changes/unreleased/Fixed-20251211-135111.yaml b/.changes/unreleased/Fixed-20251211-135111.yaml
new file mode 100644
index 000000000..0a179d649
--- /dev/null
+++ b/.changes/unreleased/Fixed-20251211-135111.yaml
@@ -0,0 +1,6 @@
+kind: Fixed
+body: Tentatively fix usage of CTRL+C in collabora editor with chrome / edge browser
+time: 2025-12-11T13:51:11.425545012+01:00
+custom:
+    Issue: "483"
+    SchemaChange: No schema change
diff --git a/config/bundles.php b/config/bundles.php
index 989338f3e..72b5e22f5 100644
--- a/config/bundles.php
+++ b/config/bundles.php
@@ -37,5 +37,4 @@ return [
     Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
     Symfony\UX\Translator\UxTranslatorBundle::class => ['all' => true],
     loophp\PsrHttpMessageBridgeBundle\PsrHttpMessageBridgeBundle::class => ['all' => true],
-    Chill\ZimbraBundle\ChillZimbraBundle::class => ['all' => true],
 ];
diff --git a/config/services.yaml b/config/services.yaml
index 11c095d99..037b57f6d 100644
--- a/config/services.yaml
+++ b/config/services.yaml
@@ -11,3 +11,6 @@ services:
         autowire: true      # Automatically injects dependencies in your services.
         autoconfigure: true # Automatically registers your services as commands, event subscribers, etc.
 
+when@dev:
+    services:
+        ChampsLibres\WopiLib\Contract\Service\ProofValidatorInterface: '@Chill\WopiBundle\Service\Wopi\NullProofValidator'
diff --git a/phpstan.dist.neon b/phpstan.dist.neon
index 38c3f7b61..60c36771e 100644
--- a/phpstan.dist.neon
+++ b/phpstan.dist.neon
@@ -3,7 +3,6 @@ parameters:
     paths:
         - src/
         - utils/
-        - packages/
     tmpDir: var/cache/phpstan
     reportUnmatchedIgnoredErrors: false
     excludePaths:
diff --git a/src/Bundle/ChillWopiBundle/chill.webpack.config.js b/src/Bundle/ChillWopiBundle/chill.webpack.config.js
index 05c231f68..8580597cc 100644
--- a/src/Bundle/ChillWopiBundle/chill.webpack.config.js
+++ b/src/Bundle/ChillWopiBundle/chill.webpack.config.js
@@ -2,7 +2,7 @@
 module.exports = function (encore, entries) {
   encore.addEntry(
     "page_wopi_editor",
-    __dirname + "/src/Resources/public/page/editor/index.js",
+    __dirname + "/src/Resources/public/page/editor/index.ts",
   );
   encore.addEntry(
     "mod_reload_page",
diff --git a/src/Bundle/ChillWopiBundle/src/Resources/public/page/editor/index.js b/src/Bundle/ChillWopiBundle/src/Resources/public/page/editor/index.js
deleted file mode 100644
index d946977df..000000000
--- a/src/Bundle/ChillWopiBundle/src/Resources/public/page/editor/index.js
+++ /dev/null
@@ -1,46 +0,0 @@
-require("./index.scss");
-
-window.addEventListener("DOMContentLoaded", function () {
-  let frameholder = document.getElementById("frameholder");
-  let office_frame = document.createElement("iframe");
-  office_frame.name = "office_frame";
-  office_frame.id = "office_frame";
-
-  // The title should be set for accessibility
-  office_frame.title = "Office Frame";
-
-  // This attribute allows true fullscreen mode in slideshow view
-  // when using PowerPoint's 'view' action.
-  office_frame.setAttribute("allowfullscreen", "true");
-
-  // The sandbox attribute is needed to allow automatic redirection to the O365 sign-in page in the business user flow
-  office_frame.setAttribute(
-    "sandbox",
-    "allow-downloads allow-scripts allow-same-origin allow-forms allow-modals allow-popups allow-top-navigation allow-popups-to-escape-sandbox",
-  );
-  frameholder.appendChild(office_frame);
-
-  document.getElementById("office_form").submit();
-
-  const url = new URL(editor_url);
-  const editor_domain = url.origin;
-
-  window.addEventListener("message", function (message) {
-    if (message.origin !== editor_domain) {
-      return;
-    }
-
-    let data = JSON.parse(message.data);
-
-    if ("UI_Close" === data.MessageId) {
-      closeEditor();
-    }
-  });
-});
-
-function closeEditor() {
-  let params = new URLSearchParams(window.location.search),
-    returnPath = params.get("returnPath");
-
-  window.location.assign(returnPath);
-}
diff --git a/src/Bundle/ChillWopiBundle/src/Resources/public/page/editor/index.ts b/src/Bundle/ChillWopiBundle/src/Resources/public/page/editor/index.ts
new file mode 100644
index 000000000..01ddad995
--- /dev/null
+++ b/src/Bundle/ChillWopiBundle/src/Resources/public/page/editor/index.ts
@@ -0,0 +1,68 @@
+import "./index.scss";
+
+// Provided by the server-side template
+declare const editor_url: string;
+
+window.addEventListener("DOMContentLoaded", function () {
+    const frameholder = document.getElementById("frameholder");
+    const office_frame = document.createElement("iframe");
+    office_frame.name = "office_frame";
+    office_frame.id = "office_frame";
+
+    // The title should be set for accessibility
+    office_frame.title = "Office Frame";
+
+    // This attribute allows true fullscreen mode in slideshow view
+    // when using PowerPoint's 'view' action.
+    office_frame.setAttribute("allowfullscreen", "true");
+
+    // The sandbox attribute is needed to allow automatic redirection to the O365 sign-in page in the business user flow
+    office_frame.setAttribute(
+        "sandbox",
+        "allow-downloads allow-scripts allow-same-origin allow-forms allow-modals allow-popups allow-top-navigation allow-popups-to-escape-sandbox",
+    );
+
+    office_frame.setAttribute(
+        "allow",
+        "clipboard-read *; clipboard-write *; fullscreen *",
+    );
+    if (frameholder) {
+        frameholder.appendChild(office_frame);
+    }
+
+    const officeForm = document.getElementById(
+        "office_form",
+    ) as HTMLFormElement | null;
+    officeForm?.submit();
+
+    const url = new URL(editor_url);
+    const editor_domain = url.origin;
+
+    window.addEventListener("message", function (message: MessageEvent) {
+        if (message.origin !== editor_domain) {
+            return;
+        }
+
+        let data: { MessageId: "UI_Close" | null; data: string };
+        try {
+            data =
+                typeof message.data === "string"
+                    ? JSON.parse(message.data)
+                    : message.data;
+        } catch (e: unknown) {
+            console.error("error while parsing data from message UI_CLOSE", e);
+            return;
+        }
+
+        if ("UI_Close" === data.MessageId) {
+            closeEditor();
+        }
+    });
+});
+
+function closeEditor(): void {
+    const params = new URLSearchParams(window.location.search);
+    const returnPath = params.get("returnPath") ?? "/";
+
+    window.location.assign(returnPath);
+}
diff --git a/symfony.lock b/symfony.lock
index 5724d23b9..532c9ec98 100644
--- a/symfony.lock
+++ b/symfony.lock
@@ -2,9 +2,6 @@
     "champs-libres/wopi-bundle": {
         "version": "dev-master"
     },
-    "chill-project/chill-zimbra-bundle": {
-        "version": "dev-472-zimbra-connector"
-    },
     "doctrine/annotations": {
         "version": "1.14",
         "recipe": {

From 0f1ff9baf4489ee2367d116a9e4afa311df4eda1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 11 Dec 2025 14:43:29 +0100
Subject: [PATCH 276/283] Fix CS

---
 .../public/vuejs/Activity/components/Location/NewLocation.vue   | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue
index 3d771e861..dff32b35d 100644
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue
@@ -159,7 +159,7 @@ export default {
             ACTIVITY_CHOOSE_LOCATION_TYPE,
             ACTIVITY_CREATE_NEW_LOCATION,
             ACTIVITY_EDIT_ADDRESS,
-            ACTIVITY_CREATE_ADDRESS
+            ACTIVITY_CREATE_ADDRESS,
         };
     },
     props: ["availableLocations"],

From ba4e44511004daa2994f701a3c281c383886a305 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Thu, 11 Dec 2025 14:49:07 +0100
Subject: [PATCH 277/283] Release v4.10.1

---
 .changes/unreleased/Feature-20251209-170951.yaml | 6 ------
 .changes/unreleased/Fixed-20251210-041722.yaml   | 6 ------
 .changes/unreleased/Fixed-20251210-051234.yaml   | 6 ------
 .changes/unreleased/Fixed-20251210-051313.yaml   | 6 ------
 .changes/unreleased/Fixed-20251211-135111.yaml   | 6 ------
 .changes/v4.10.1.md                              | 6 ++++++
 CHANGELOG.md                                     | 7 +++++++
 7 files changed, 13 insertions(+), 30 deletions(-)
 delete mode 100644 .changes/unreleased/Feature-20251209-170951.yaml
 delete mode 100644 .changes/unreleased/Fixed-20251210-041722.yaml
 delete mode 100644 .changes/unreleased/Fixed-20251210-051234.yaml
 delete mode 100644 .changes/unreleased/Fixed-20251210-051313.yaml
 delete mode 100644 .changes/unreleased/Fixed-20251211-135111.yaml
 create mode 100644 .changes/v4.10.1.md

diff --git a/.changes/unreleased/Feature-20251209-170951.yaml b/.changes/unreleased/Feature-20251209-170951.yaml
deleted file mode 100644
index 77b9a7b15..000000000
--- a/.changes/unreleased/Feature-20251209-170951.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Feature
-body: Display upcoming appointments within the person context in the search results
-time: 2025-12-09T17:09:51.811720451+01:00
-custom:
-    Issue: "462"
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/Fixed-20251210-041722.yaml b/.changes/unreleased/Fixed-20251210-041722.yaml
deleted file mode 100644
index 67667cb04..000000000
--- a/.changes/unreleased/Fixed-20251210-041722.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Fixed
-body: Fix missing translation variable in NewLocation component
-time: 2025-12-10T04:17:22.40669463+01:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/Fixed-20251210-051234.yaml b/.changes/unreleased/Fixed-20251210-051234.yaml
deleted file mode 100644
index 581b37176..000000000
--- a/.changes/unreleased/Fixed-20251210-051234.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Fixed
-body: Fix display of header for ByActivityNumberAggregator
-time: 2025-12-10T05:12:34.061935068+01:00
-custom:
-    Issue: "476"
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/Fixed-20251210-051313.yaml b/.changes/unreleased/Fixed-20251210-051313.yaml
deleted file mode 100644
index c0a236e13..000000000
--- a/.changes/unreleased/Fixed-20251210-051313.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Fixed
-body: Fix use of ByActivityNumberAggregator in combination with activity count exports
-time: 2025-12-10T05:13:13.246754532+01:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change
diff --git a/.changes/unreleased/Fixed-20251211-135111.yaml b/.changes/unreleased/Fixed-20251211-135111.yaml
deleted file mode 100644
index 0a179d649..000000000
--- a/.changes/unreleased/Fixed-20251211-135111.yaml
+++ /dev/null
@@ -1,6 +0,0 @@
-kind: Fixed
-body: Tentatively fix usage of CTRL+C in collabora editor with chrome / edge browser
-time: 2025-12-11T13:51:11.425545012+01:00
-custom:
-    Issue: "483"
-    SchemaChange: No schema change
diff --git a/.changes/v4.10.1.md b/.changes/v4.10.1.md
new file mode 100644
index 000000000..410d89bf0
--- /dev/null
+++ b/.changes/v4.10.1.md
@@ -0,0 +1,6 @@
+## v4.10.1 - 2025-12-11
+### Fixed
+* Fix missing translation variable in NewLocation component
+* ([#476](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/476)) Fix display of header for ByActivityNumberAggregator
+* Fix use of ByActivityNumberAggregator in combination with activity count exports
+* ([#483](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/483)) Tentatively fix usage of CTRL+C in collabora editor with chrome / edge browser
diff --git a/CHANGELOG.md b/CHANGELOG.md
index b07fdc914..5700c47cb 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,6 +6,13 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
+## v4.10.1 - 2025-12-11
+### Fixed
+* Fix missing translation variable in NewLocation component
+* ([#476](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/476)) Fix display of header for ByActivityNumberAggregator
+* Fix use of ByActivityNumberAggregator in combination with activity count exports
+* ([#483](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/483)) Tentatively fix usage of CTRL+C in collabora editor with chrome / edge browser
+
 ## v4.10.0 - 2025-12-09
 ### Feature
 * [MR 928](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/928) [#462](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/462) Add the future appointments for the person in search results

From b630c940d449f94c3a6588a0be1221c582413501 Mon Sep 17 00:00:00 2001
From: Boris Waaub <boris.waaub@digitalternative.be>
Date: Fri, 12 Dec 2025 09:17:22 +0000
Subject: [PATCH 278/283] 1849 1848 1920 1921 fix bugs

---
 .../Resources/public/vuejs/TicketApp/App.vue  |  58 +++-
 .../components/ActionToolbarComponent.vue     |   3 +-
 .../TicketApp/components/PelotonComponent.vue |  38 +--
 .../components/TicketInitFormComponent.vue    | 185 +++++------
 .../components/TicketListItemComponent.vue    |  10 +-
 .../src/translations/messages+intl-icu.fr.yml | 301 +++++++++---------
 6 files changed, 284 insertions(+), 311 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
index b2abb8276..c9f2352b1 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/App.vue
@@ -30,7 +30,7 @@
   <Modal
     v-if="showTicketInitFormModal"
     :show="showTicketInitFormModal"
-    modal-dialog-class="modal-lg"
+    :modal-dialog-class="modalDialogClass"
     @close="closeModal"
   >
     <template #header>
@@ -41,18 +41,24 @@
 
     <template #body>
       <ticket-init-form-component
+        v-model="ticketForm"
         :ticket="ticket"
         :motives="motives"
         :suggested-persons="suggestedPersons"
         @submit="handleFormSubmit"
       />
     </template>
+    <template #footer>
+      <button class="btn btn-primary" @click="handleFormSubmit">
+        {{ trans(CHILL_TICKET_TICKET_INIT_FORM_SUBMIT) }}
+      </button>
+    </template>
   </Modal>
 </template>
 
 <script setup lang="ts">
 import { useToast } from "vue-toast-notification";
-import { computed, onMounted, ref } from "vue";
+import { computed, onMounted, onUnmounted, ref } from "vue";
 import { useStore } from "vuex";
 
 // Types
@@ -71,6 +77,7 @@ import ToggleComponent from "../TicketList/components/ToggleComponent.vue";
 // Translations
 import {
   trans,
+  CHILL_TICKET_TICKET_INIT_FORM_SUBMIT,
   CHILL_TICKET_TICKET_INIT_FORM_TITLE,
   CHILL_TICKET_TICKET_INIT_FORM_SUCCESS,
   CHILL_TICKET_TICKET_INIT_FORM_ERROR,
@@ -96,26 +103,49 @@ const showTicketInitFormModal = ref(false);
 const loading = ref(true);
 const refreshKey = ref(0);
 
-async function handleFormSubmit(ticketForm: TicketInitForm) {
+// ticketForm réactif pour v-model
+const ticketForm = ref({
+  content: "",
+  addressees: ticket.value?.currentAddressees,
+  motive: ticket.value?.currentMotive,
+  persons: ticket.value?.currentPersons,
+  caller: ticket.value?.caller,
+  emergency: ticket.value?.emergency,
+} as TicketInitForm);
+
+const modalDialogClass = ref(
+  window.innerWidth < 990 ? "modal-fullscreen" : "modal-lg",
+);
+
+function updateModalClass() {
+  modalDialogClass.value =
+    window.innerWidth < 990 ? "modal-fullscreen" : "modal-lg";
+}
+window.addEventListener("resize", updateModalClass);
+
+async function handleFormSubmit() {
   try {
-    if (!ticketForm.motive || ticketForm.content.trim() === "") {
+    if (!ticketForm.value.motive || ticketForm.value.content.trim() === "") {
       toast.warning(trans(CHILL_TICKET_TICKET_INIT_FORM_WARNING));
       return;
     }
-    if (ticketForm.motive) {
-      await store.dispatch("createMotive", ticketForm.motive);
+    if (ticketForm.value.motive) {
+      await store.dispatch("createMotive", ticketForm.value.motive);
     }
-    if (ticketForm.content.trim() !== "") {
-      await store.dispatch("createComment", ticketForm.content);
+    if (ticketForm.value.content.trim() !== "") {
+      await store.dispatch("createComment", ticketForm.value.content);
     }
 
     // Ne pas mettre à jour emergency si le motif force l'état d'urgence
-    if (ticketForm.motive && !ticketForm.motive.makeTicketEmergency) {
-      await store.dispatch("setEmergency", ticketForm.emergency);
+    if (
+      ticketForm.value.motive &&
+      !ticketForm.value.motive.makeTicketEmergency
+    ) {
+      await store.dispatch("setEmergency", ticketForm.value.emergency);
     }
 
-    await store.dispatch("setAddressees", ticketForm.addressees);
-    await store.dispatch("setPersons", ticketForm.persons);
+    await store.dispatch("setAddressees", ticketForm.value.addressees);
+    await store.dispatch("setPersons", ticketForm.value.persons);
 
     // Forcer le rafraîchissement des composants
     refreshKey.value++;
@@ -147,6 +177,10 @@ onMounted(() => {
     loading.value = false;
   }
 });
+
+onUnmounted(() => {
+  window.removeEventListener("resize", updateModalClass);
+});
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
index 999c82c6d..919487f77 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/ActionToolbarComponent.vue
@@ -7,7 +7,6 @@
           class="btn btn-link p-0"
           style="
             position: absolute;
-            top: 0.5rem;
             right: 0.5rem;
             font-size: 2rem;
             line-height: 1;
@@ -26,7 +25,7 @@
           </label>
         </div>
 
-        <form @submit.prevent="submitAction">
+        <form class="p-2" @submit.prevent="submitAction">
           <comment-editor-component
             v-model="content"
             :motive="motive"
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PelotonComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PelotonComponent.vue
index 9cc2f75b5..13bf284f5 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PelotonComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/PelotonComponent.vue
@@ -18,7 +18,7 @@
         <select
           v-model="selectedStoredObject"
           class="form-select"
-          @change="onSelectionChange"
+          @change="fetchDocument"
           style="max-width: 400px"
         >
           <option
@@ -125,22 +125,7 @@ const isLoading = ref<boolean>(false);
 const error = ref<string>("");
 const showPelotonsModal = ref<boolean>(false);
 
-watch(
-  () => props.storedObjects,
-  (newStoredObjects) => {
-    if (
-      newStoredObjects &&
-      newStoredObjects.length > 0 &&
-      !selectedStoredObject.value
-    ) {
-      selectedStoredObject.value = newStoredObjects[0];
-      onSelectionChange();
-    }
-  },
-  { immediate: true },
-);
-
-async function onSelectionChange() {
+async function fetchDocument() {
   if (!selectedStoredObject.value) {
     cleanupPrevious();
     documentType.value = "";
@@ -162,7 +147,6 @@ async function onSelectionChange() {
       selectedStoredObject.value,
       selectedStoredObject.value.currentVersion,
     );
-    console.log("downloadInfo", downloadInfo);
     const rawResponse = await window.fetch(downloadInfo.url);
 
     if (!rawResponse.ok) {
@@ -228,22 +212,22 @@ function cleanupPrevious() {
     documentUrl.value = "";
   }
 }
-
 function handleClick() {
+  fetchDocument();
   showPelotonsModal.value = true;
-  if (
-    !selectedStoredObject.value &&
-    props.storedObjects &&
-    props.storedObjects.length > 0
-  ) {
-    selectedStoredObject.value = props.storedObjects[0];
-    onSelectionChange();
-  }
 }
 
 function closeModal() {
   showPelotonsModal.value = false;
 }
+
+watch(
+  () => props.storedObjects,
+  (newStoredObjects) => {
+    selectedStoredObject.value = newStoredObjects ? newStoredObjects[0] : null;
+  },
+  { immediate: true },
+);
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketInitFormComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketInitFormComponent.vue
index 7a3066251..463209f1a 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketInitFormComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketApp/components/TicketInitFormComponent.vue
@@ -1,84 +1,73 @@
 <template>
   <div class="card mb-4">
     <div class="card-body">
-      <form @submit.prevent="submitForm">
-        <div class="mb-3">
-          <label class="form-label pe-2" for="emergency">
-            {{ trans(CHILL_TICKET_LIST_FILTER_EMERGENCY) }}
-          </label>
-          <emergency-toggle-component v-model="isEmergency" class="float-end" />
-        </div>
+      <div class="mb-3">
+        <label class="form-label pe-2" for="emergency">
+          {{ trans(CHILL_TICKET_LIST_FILTER_EMERGENCY) }}
+        </label>
+        <emergency-toggle-component v-model="isEmergency" class="float-end" />
+      </div>
 
-        <!-- Sélection du motif -->
-        <div class="mb-3">
-          <label class="form-label">{{
-            trans(CHILL_TICKET_TICKET_SET_MOTIVE_TITLE)
-          }}</label>
-          <motive-selector-component
-            v-model="ticketForm.motive"
-            :motives="motives"
-          />
-        </div>
+      <!-- Sélection du motif -->
+      <div class="mb-3">
+        <label class="form-label">{{
+          trans(CHILL_TICKET_TICKET_SET_MOTIVE_TITLE)
+        }}</label>
+        <motive-selector-component
+          v-model="ticketForm.motive"
+          :motives="motives"
+        />
+      </div>
 
-        <!-- Sélection des personnes -->
-        <div class="row mb-3">
-          <div class="col-md-6">
-            <label class="form-label">
-              {{ trans(CHILL_TICKET_TICKET_SET_PERSONS_TITLE_CALLER) }}
-            </label>
-            <persons-selector-component
-              v-model="ticketForm.caller"
-              :suggested="[]"
-              :multiple="false"
-              :types="['person', 'thirdparty']"
-              :label="trans(CHILL_TICKET_TICKET_SET_PERSONS_CALLER_LABEL)"
-            />
-          </div>
-          <div class="col-md-6">
-            <label class="form-label">
-              {{ trans(CHILL_TICKET_TICKET_SET_PERSONS_TITLE_PERSON) }}
-            </label>
-            <persons-selector-component
-              v-model="ticketForm.persons"
-              :suggested="suggestedPersons"
-              :multiple="true"
-              :types="['person']"
-              :label="trans(CHILL_TICKET_TICKET_SET_PERSONS_USER_LABEL)"
-            />
-          </div>
-        </div>
-
-        <!-- Éditeur de commentaire -->
-        <div class="mb-3">
-          <label class="form-label">{{
-            trans(CHILL_TICKET_TICKET_ADD_COMMENT_TITLE)
-          }}</label>
-          <comment-editor-component
-            v-model="ticketForm.content"
-            :motive="ticketForm.motive ? ticketForm.motive : null"
-          />
-        </div>
-
-        <!-- Attribution des tickets -->
-        <div class="mb-3">
+      <!-- Sélection des personnes -->
+      <div class="row mb-3">
+        <div class="col-md-6">
           <label class="form-label">
-            {{ trans(CHILL_TICKET_TICKET_ADD_ADDRESSEE_TITLE) }}
+            {{ trans(CHILL_TICKET_TICKET_SET_PERSONS_TITLE_CALLER) }}
           </label>
-          <addressee-selector-component
-            v-model="ticketForm.addressees"
-            :suggested="userGroups"
+          <persons-selector-component
+            v-model="ticketForm.caller"
+            :suggested="[]"
+            :multiple="false"
+            :types="['person', 'thirdparty']"
+            :label="trans(CHILL_TICKET_TICKET_SET_PERSONS_CALLER_LABEL)"
           />
         </div>
-        <!-- Boutons d'action -->
-        <div class="d-flex justify-content-end gap-2 mt-4">
-          <button type="button" class="btn btn-secondary" @click="resetForm">
-            {{ trans(CHILL_TICKET_TICKET_INIT_FORM_RESET) }}
-          </button>
-          <button type="submit" class="btn btn-primary">
-            {{ trans(CHILL_TICKET_TICKET_INIT_FORM_SUBMIT) }}
-          </button>
+        <div class="col-md-6">
+          <label class="form-label">
+            {{ trans(CHILL_TICKET_TICKET_SET_PERSONS_TITLE_PERSON) }}
+          </label>
+          <persons-selector-component
+            v-model="ticketForm.persons"
+            :suggested="suggestedPersons"
+            :multiple="true"
+            :types="['person']"
+            :label="trans(CHILL_TICKET_TICKET_SET_PERSONS_USER_LABEL)"
+          />
         </div>
-      </form>
+      </div>
+
+      <!-- Éditeur de commentaire -->
+      <div class="mb-3">
+        <label class="form-label">{{
+          trans(CHILL_TICKET_TICKET_ADD_COMMENT_TITLE)
+        }}</label>
+        <comment-editor-component
+          v-model="ticketForm.content"
+          :motive="ticketForm.motive ? ticketForm.motive : null"
+        />
+      </div>
+
+      <!-- Attribution des tickets -->
+      <div class="mb-3">
+        <label class="form-label">
+          {{ trans(CHILL_TICKET_TICKET_ADD_ADDRESSEE_TITLE) }}
+        </label>
+        <addressee-selector-component
+          v-model="ticketForm.addressees"
+          :suggested="userGroups"
+        />
+      </div>
     </div>
   </div>
 </template>
@@ -94,20 +83,12 @@ import PersonsSelectorComponent from "./Person/PersonsSelectorComponent.vue";
 import AddresseeSelectorComponent from "./Addressee/AddresseeSelectorComponent.vue";
 import EmergencyToggleComponent from "./Emergency/EmergencyToggleComponent.vue";
 // Types
-import {
-  Motive,
-  MotiveWithParent,
-  Ticket,
-  TicketEmergencyState,
-  TicketInitForm,
-} from "../../../types";
+import { Motive, TicketInitForm } from "../../../types";
 import { Person } from "ChillPersonAssets/types";
 
 // Translations
 import {
   trans,
-  CHILL_TICKET_TICKET_INIT_FORM_SUBMIT,
-  CHILL_TICKET_TICKET_INIT_FORM_RESET,
   CHILL_TICKET_TICKET_SET_MOTIVE_TITLE,
   CHILL_TICKET_TICKET_ADD_COMMENT_TITLE,
   CHILL_TICKET_TICKET_SET_PERSONS_TITLE_CALLER,
@@ -117,32 +98,23 @@ import {
   CHILL_TICKET_LIST_FILTER_EMERGENCY,
   CHILL_TICKET_TICKET_ADD_ADDRESSEE_TITLE,
 } from "translator";
-import { UserGroup, UserGroupOrUser } from "ChillMainAssets/types";
+import { UserGroup } from "ChillMainAssets/types";
 
 const props = defineProps<{
-  ticket: Ticket;
+  modelValue: TicketInitForm;
   motives: Motive[];
   suggestedPersons: Person[];
 }>();
 
 const emit = defineEmits<{
   "update:modelValue": [value: TicketInitForm];
-  submit: [formData: TicketInitForm];
 }>();
 
 const store = useStore();
 
-const ticketForm = reactive({
-  content: "",
-  addressees: props.ticket.currentAddressees as UserGroupOrUser[],
-  motive: props.ticket.currentMotive as MotiveWithParent | null,
-  persons: props.ticket.currentPersons as Person[],
-  caller: props.ticket.caller as Person | null,
-  emergency: props.ticket.emergency as TicketEmergencyState,
-} as TicketInitForm);
-
+const ticketForm = reactive({ ...props.modelValue });
 const isEmergency = ref<boolean>(
-  props.ticket.emergency == "yes" ? true : false,
+  props.modelValue.emergency == "yes" ? true : false,
 );
 
 const userGroups = computed(() => store.getters.getUserGroups as UserGroup[]);
@@ -155,23 +127,16 @@ watch(
   },
 );
 
-function submitForm() {
-  emit("submit", {
-    content: ticketForm.content,
-    motive: ticketForm.motive,
-    addressees: [...ticketForm.addressees],
-    persons: [...ticketForm.persons],
-    caller: ticketForm.caller,
-    emergency: isEmergency.value ? "yes" : "no",
-  });
-}
-function resetForm() {
-  ticketForm.content = "";
-  ticketForm.motive = null;
-  ticketForm.persons = [];
-  ticketForm.caller = null;
-  ticketForm.emergency = props.ticket.emergency as TicketEmergencyState;
-}
+watch(
+  ticketForm,
+  (newVal) => {
+    emit("update:modelValue", {
+      ...newVal,
+      emergency: isEmergency.value ? "yes" : "no",
+    });
+  },
+  { deep: true },
+);
 </script>
 
 <style lang="scss" scoped>
diff --git a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListItemComponent.vue b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListItemComponent.vue
index 5ac4b4d7d..410905fa6 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListItemComponent.vue
+++ b/src/Bundle/ChillTicketBundle/src/Resources/public/vuejs/TicketList/components/TicketListItemComponent.vue
@@ -3,13 +3,7 @@
     <div class="card-body">
       <div class="wrap-header">
         <div class="row align-items-top">
-          <div
-            v-if="
-              null !== ticket.currentMotive &&
-              null !== ticket.currentMotive.parent
-            "
-            class="col-6"
-          >
+          <div class="col-6">
             <div class="small text-muted">
               {{ motiveHierarchyLabel(ticket.currentMotive) }}
             </div>
@@ -100,8 +94,6 @@
 </template>
 
 <script setup lang="ts">
-import { defineProps, defineEmits } from "vue";
-
 // Types
 import { TicketSimple } from "../../../types";
 import { Person } from "ChillPersonAssets/types";
diff --git a/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml b/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
index 71d75e4f5..095595fea 100644
--- a/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
+++ b/src/Bundle/ChillTicketBundle/src/translations/messages+intl-icu.fr.yml
@@ -1,156 +1,155 @@
 restore: Restaurer
 chill_ticket:
-  list:
-    title: "Tickets"
-    title_with_name: "{name, select, null {Tickets} undefined {Tickets} other {Tickets de {name}}}"
-    title_menu: "Tickets de l'usager"
-    show_all_history: "Afficher tout l'historique"
-    title_previous_tickets: "{name, select, other {Précédent ticket de {name}} undefined {Précédent ticket}}"
-    no_tickets: "Aucun ticket"
-    loading_ticket: "Chargement des tickets..."
-    loading_ticket_details: "Chargement de l'historique du ticket..."
-    error_loading_ticket: "Erreur lors du chargement des ticket"
-    load_more: "Voir plus..."
-    addressees: "Destinataires"
-    persons: "Usager concernés"
-    callers: "Appelants"
-    filter:
-      to_me: Tickets qui me sont destinés
-      in_alert: Tickets en alerte (délai de résolution dépassé)
-      created_between: Créés entre
-      state_change: État actuel
-      title: "Filtres des tickets"
-      persons_concerned: "Usagers concernés"
-      by_person: "Par personne"
-      creators: "Créateurs"
-      by_creator: "Par créateur"
-      addressees: "Par destinataire"
-      by_addressees: "Par destinataire"
-      by_motives: "Par motifs"
-      by_ticket_id: "Par numéro de ticket"
-      ticket_id: "Numéro de ticket"
-      current_state: "État actuel"
-      open: "Ouvert"
-      closed: "Clôturé"
-      emergency: "Urgent"
-      no_emergency: "Non urgent"
-      created_after: "Créé après"
-      created_before: "Créé avant"
-      response_time_exceeded: "Temps de réponse dépassé"
-      response_time_warning: 'Attention : ce filtre désactive les filtres "par dates" et affiche uniquement les tickets ouverts'
-      reset: "Réinitialiser"
-      apply: "Appliquer les filtres"
-      remove: "Supprimer"
-      result: "{count, plural, =0 {Aucun résultat} =1 {resultat} other {resultats}}"
+    list:
+        title: "Tickets"
+        title_with_name: "{name, select, null {Tickets} undefined {Tickets} other {Tickets de {name}}}"
+        title_menu: "Tickets de l'usager"
+        show_all_history: "Afficher tout l'historique"
+        title_previous_tickets: "{name, select, other {Précédent ticket de {name}} undefined {Précédent ticket}}"
+        no_tickets: "Aucun ticket"
+        loading_ticket: "Chargement des tickets..."
+        loading_ticket_details: "Chargement de l'historique du ticket..."
+        error_loading_ticket: "Erreur lors du chargement des ticket"
+        load_more: "Voir plus..."
+        addressees: "Destinataires"
+        persons: "Usager concernés"
+        callers: "Appelants"
+        filter:
+            to_me: Tickets qui me sont destinés
+            in_alert: Tickets en alerte (délai de résolution dépassé)
+            created_between: Créés entre
+            state_change: État actuel
+            title: "Filtres des tickets"
+            persons_concerned: "Usagers concernés"
+            by_person: "Par personne"
+            creators: "Créateurs"
+            by_creator: "Par créateur"
+            addressees: "Par destinataire"
+            by_addressees: "Par destinataire"
+            by_motives: "Par motifs"
+            by_ticket_id: "Par numéro de ticket"
+            ticket_id: "Numéro de ticket"
+            current_state: "État actuel"
+            open: "Ouvert"
+            closed: "Clôturé"
+            emergency: "Urgent"
+            no_emergency: "Non urgent"
+            created_after: "Créé après"
+            created_before: "Créé avant"
+            response_time_exceeded: "Temps de réponse dépassé"
+            response_time_warning: 'Attention : ce filtre désactive les filtres "par dates" et affiche uniquement les tickets ouverts'
+            reset: "Réinitialiser"
+            apply: "Appliquer les filtres"
+            remove: "Supprimer"
+            result: "{count, plural, =0 {Aucun résultat} =1 {resultat} other {resultats}}"
 
-  ticket:
-    init_form:
-      title: "Ajouter des informations sur le ticket"
-      submit: "Mettre à jour le ticket"
-      reset: "Réinitialiser"
-      success: "Ticket mis à jour avec succès"
-      error: "Veuillez remplir tous les champs obligatoires"
-      warning: "Veuillez remplir au minimum le motif et le commentaire"
-    history:
-      add_comment: "Commentaire ajouté"
-      addressees_state: "{count, plural, =0 {Destinataire supprimé} =1 {Destinataire ajouté} other {Destinataire ajoutés}}"
-      persons_state: "{count, plural, =0 {Usagers supprimés} =1 {Usager concerné ajouté} other {Usagers concernés ajoutés}}"
-      set_caller: "{id, select, null {Appelant supprimé} other {Appelant ajouté}}"
-      set_motive: "Motif ajouté"
-      create_ticket: "Ticket créé"
-      state_change: ""
-      emergency_change: ""
-      mask_comment: "Supprimer"
-    previous_tickets: "Précédents tickets"
-    actions_toolbar:
-      cancel: "Annuler"
-      save: "Enregistrer"
-      close: "Clôturer"
-      close_success: "Ticket clôturé"
-      close_error: "Erreur lors de la clotûre du ticket"
-      reopen: "Rouvrir"
-      reopen_success: "Rouverture du ticket réussie"
-      reopen_error: "Erreur lors de la rouverture du ticket"
-    visible_comment:
-      success: "Commentaire restauré"
-    mask_comment:
-      success: "Commentaire supprimé"
-      hint: "Ce commentaire a été supprimé."
-    edit_comment:
-      title: "Éditer le commentaire"
-      success: "Commentaire modifié"
-    add_comment:
-      title: "Commentaire"
-      label: "Ajouter un commentaire"
-      success: "Commentaire enregistré"
-      content: "Ajouter un commentaire"
-      error: "Aucun commentaire ajouté"
-    set_motive:
-      title: "Motif"
-      label: "Choisir un motif"
-      success: "Motif enregistré"
-      error: "Aucun motif sélectionné"
-    add_addressee:
-      title: "Attribuer"
-      user_group_label: "Attribuer à un groupe"
-      user_label: "Attribuer à un ou plusieurs utilisateurs"
-      success: "Attribution effectuée"
-      error: "Aucun destinataire sélectionné"
-    set_persons:
-      title: "Appelant et usager(s)"
-      title_person: "Usager(s)"
-      title_caller: "Appelant"
-      user_label: "Ajouter un usager"
-      caller_label: "Ajouter un appelant"
-      success: "Appelants et usagers mis à jour"
-      error: "Aucun usager sélectionné"
-    banner:
-      person: "{count, plural, =0 {Aucun usager impliqué} =1 {Usager impliqué} other {Usagers impliqués}}"
-      speaker: "{count, plural, =0 {Aucun destinataire} =1 {Destinataire} other {Destinataires}}"
-      caller: "{count, plural, =0 {Aucun appelant} =1 {Appelant} other {Appelants}}"
-      open: "Ouvert"
-      closed: "Clôturé"
-      since: "Depuis {time}"
-      and: "et"
-      days: >-
-        {count, plural,
-                =0    {aucun jour}
-                =1    {1 jour}
-                other {# jours}
-        }
-      hours: >-
-        {count, plural,
-                =0    {aucune heure}
-                =1    {1 heure}
-                other {# heures}
-        }
-      minutes: >-
-        {count, plural,
-                =0    {aucune minute}
-                =1    {1 minute}
-                other {# minutes}
-        }
-      seconds: >-
-        {count, plural,
-                =0    {aucune seconde}
-                =1    {1 seconde}
-                other {# secondes}
-        }
-      no_motive: "Aucun motif"
-      emergency: "URGENT"
-      emergency_success: "Ticket marqué comme urgent"
-      emergency_error: "Erreur lors de la tentative de marquage du ticket comme urgent"
-      no_emergency_success: "Ticket marqué comme non urgent"
-      no_emergency_error: "Erreur lors de la tentative de marquage du ticket comme non urgent"
-  peloton:
-    loading: "Chargement..."
-    loading_document: "Chargement du document..."
-    error_loading: "Erreur lors du chargement du document."
-    error_not_ready: "Le document n'est pas prêt ou accessible."
-    unsupported_type: "Type de document non supporté pour l'affichage."
-    open_new_tab: "Ouvrir dans un nouvel onglet"
-    iframe_not_supported: "Votre navigateur ne supporte pas les iframes."
-    click_to_open_pdf: "Cliquez ici pour ouvrir le PDF"
+    ticket:
+        init_form:
+            title: "Ajouter des informations sur le ticket"
+            submit: "Mettre à jour le ticket"
+            success: "Ticket mis à jour avec succès"
+            error: "Veuillez remplir tous les champs obligatoires"
+            warning: "Veuillez remplir au minimum le motif et le commentaire"
+        history:
+            add_comment: "Commentaire ajouté"
+            addressees_state: "{count, plural, =0 {Destinataire supprimé} =1 {Destinataire ajouté} other {Destinataire ajoutés}}"
+            persons_state: "{count, plural, =0 {Usagers supprimés} =1 {Usager concerné ajouté} other {Usagers concernés ajoutés}}"
+            set_caller: "{id, select, null {Appelant supprimé} other {Appelant ajouté}}"
+            set_motive: "Motif ajouté"
+            create_ticket: "Ticket créé"
+            state_change: ""
+            emergency_change: ""
+            mask_comment: "Supprimer"
+        previous_tickets: "Précédents tickets"
+        actions_toolbar:
+            cancel: "Annuler"
+            save: "Enregistrer"
+            close: "Clôturer"
+            close_success: "Ticket clôturé"
+            close_error: "Erreur lors de la clotûre du ticket"
+            reopen: "Rouvrir"
+            reopen_success: "Rouverture du ticket réussie"
+            reopen_error: "Erreur lors de la rouverture du ticket"
+        visible_comment:
+            success: "Commentaire restauré"
+        mask_comment:
+            success: "Commentaire supprimé"
+            hint: "Ce commentaire a été supprimé."
+        edit_comment:
+            title: "Éditer le commentaire"
+            success: "Commentaire modifié"
+        add_comment:
+            title: "Commentaire"
+            label: "Ajouter un commentaire"
+            success: "Commentaire enregistré"
+            content: "Ajouter un commentaire"
+            error: "Aucun commentaire ajouté"
+        set_motive:
+            title: "Motif"
+            label: "Choisir un motif"
+            success: "Motif enregistré"
+            error: "Aucun motif sélectionné"
+        add_addressee:
+            title: "Attribuer"
+            user_group_label: "Attribuer à un groupe"
+            user_label: "Attribuer à un ou plusieurs utilisateurs"
+            success: "Attribution effectuée"
+            error: "Aucun destinataire sélectionné"
+        set_persons:
+            title: "Appelant et usager(s)"
+            title_person: "Usager(s)"
+            title_caller: "Appelant"
+            user_label: "Ajouter un usager"
+            caller_label: "Ajouter un appelant"
+            success: "Appelants et usagers mis à jour"
+            error: "Aucun usager sélectionné"
+        banner:
+            person: "{count, plural, =0 {Aucun usager impliqué} =1 {Usager impliqué} other {Usagers impliqués}}"
+            speaker: "{count, plural, =0 {Aucun destinataire} =1 {Destinataire} other {Destinataires}}"
+            caller: "{count, plural, =0 {Aucun appelant} =1 {Appelant} other {Appelants}}"
+            open: "Ouvert"
+            closed: "Clôturé"
+            since: "Depuis {time}"
+            and: "et"
+            days: >-
+                {count, plural,
+                        =0    {aucun jour}
+                        =1    {1 jour}
+                        other {# jours}
+                }
+            hours: >-
+                {count, plural,
+                        =0    {aucune heure}
+                        =1    {1 heure}
+                        other {# heures}
+                }
+            minutes: >-
+                {count, plural,
+                        =0    {aucune minute}
+                        =1    {1 minute}
+                        other {# minutes}
+                }
+            seconds: >-
+                {count, plural,
+                        =0    {aucune seconde}
+                        =1    {1 seconde}
+                        other {# secondes}
+                }
+            no_motive: "Aucun motif"
+            emergency: "URGENT"
+            emergency_success: "Ticket marqué comme urgent"
+            emergency_error: "Erreur lors de la tentative de marquage du ticket comme urgent"
+            no_emergency_success: "Ticket marqué comme non urgent"
+            no_emergency_error: "Erreur lors de la tentative de marquage du ticket comme non urgent"
+    peloton:
+        loading: "Chargement..."
+        loading_document: "Chargement du document..."
+        error_loading: "Erreur lors du chargement du document."
+        error_not_ready: "Le document n'est pas prêt ou accessible."
+        unsupported_type: "Type de document non supporté pour l'affichage."
+        open_new_tab: "Ouvrir dans un nouvel onglet"
+        iframe_not_supported: "Votre navigateur ne supporte pas les iframes."
+        click_to_open_pdf: "Cliquez ici pour ouvrir le PDF"
 
 admin:
     ticket:
@@ -168,7 +167,7 @@ crud:
         title_new: Nouveau motif
         title_edit: Modifier le motif
         new:
-          "Create a new motive": "Créer un nouveau motif"
+            "Create a new motive": "Créer un nouveau motif"
 
 "Label": "Libellé"
 "Active": "Actif"

From 022c0aaebf05f819cf52569635104b141d98e6e8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 16 Dec 2025 14:03:18 +0100
Subject: [PATCH 279/283] Add support for parent > child notation in motive
 import.

- Trimmed labels during motive import to ensure consistent formatting.
- Introduced logic to parse and handle "parent > child" syntax in motive names.
- Automatically creates and links parent motives if they don't exist.
- Added test case to verify parent-child relationship creation and linking.
---
 .../Import/ImportMotivesFromDirectory.php     | 45 +++++++++++-
 .../Import/ImportMotivesFromDirectoryTest.php | 68 +++++++++++++++++++
 2 files changed, 111 insertions(+), 2 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Service/Import/ImportMotivesFromDirectory.php b/src/Bundle/ChillTicketBundle/src/Service/Import/ImportMotivesFromDirectory.php
index 2bd1178b0..a963d0f5a 100644
--- a/src/Bundle/ChillTicketBundle/src/Service/Import/ImportMotivesFromDirectory.php
+++ b/src/Bundle/ChillTicketBundle/src/Service/Import/ImportMotivesFromDirectory.php
@@ -54,19 +54,60 @@ final readonly class ImportMotivesFromDirectory
                 throw new \RuntimeException(sprintf('Item %d: missing or invalid "label" (expected array).', $index));
             }
             $labelArray = $item['label'];
+            // Trim all labels when they are strings
+            foreach ($labelArray as $k => $v) {
+                if (\is_string($v)) {
+                    $labelArray[$k] = trim($v);
+                }
+            }
+
             $labelForSearch = $labelArray[$lang] ?? null;
             if (!\is_string($labelForSearch) || '' === trim($labelForSearch)) {
                 throw new \RuntimeException(sprintf('Item %d: missing label for language "%s".', $index, $lang));
             }
 
-            $existing = $this->motiveRepository->findByLabel($labelForSearch, $lang);
+            // Support parent > child notation in the current language label
+            $parentName = null;
+            $childName = trim($labelForSearch);
+            if (false !== strpos($childName, '>')) {
+                [$parentName, $childName] = array_map('trim', explode('>', $childName, 2));
+            }
+
+            // Find or create the current motive (child or standalone)
+            $existing = $this->motiveRepository->findByLabel($childName, $lang);
             if (\count($existing) > 1) {
-                throw new \RuntimeException(sprintf('Item %d: multiple motives found with label "%s" for lang "%s".', $index, $labelForSearch, $lang));
+                throw new \RuntimeException(sprintf('Item %d: multiple motives found with label "%s" for lang "%s".', $index, $childName, $lang));
             }
             $motive = $existing[0] ?? new Motive();
 
+            // Ensure the stored label for the current language is the child/standalone name (trimmed)
+            $labelArray[$lang] = $childName;
             $motive->setLabel($labelArray);
 
+            // If a parent is defined, ensure it exists and link it
+            if (null !== $parentName && '' !== $parentName) {
+                $parentCandidates = $this->motiveRepository->findByLabel($parentName, $lang);
+                if (\count($parentCandidates) > 1) {
+                    throw new \RuntimeException(sprintf('Item %d: multiple parent motives found with label "%s" for lang "%s".', $index, $parentName, $lang));
+                }
+                $parent = $parentCandidates[0] ?? null;
+                if (null === $parent) {
+                    $parent = new Motive();
+                    $parentLabel = $labelArray;
+                    $parentLabel[$lang] = $parentName;
+                    // Make sure all labels are trimmed
+                    foreach ($parentLabel as $k => $v) {
+                        if (\is_string($v)) {
+                            $parentLabel[$k] = trim($v);
+                        }
+                    }
+                    $parent->setLabel($parentLabel);
+                    $this->entityManager->persist($parent);
+                }
+
+                $motive->setParent($parent);
+            }
+
             // urgent: if true => YES, if explicitly false => NO, if absent => leave null
             if (array_key_exists('urgent', $item)) {
                 $urgent = (bool) $item['urgent'];
diff --git a/src/Bundle/ChillTicketBundle/tests/Service/Import/ImportMotivesFromDirectoryTest.php b/src/Bundle/ChillTicketBundle/tests/Service/Import/ImportMotivesFromDirectoryTest.php
index b86d471a8..07e94f2be 100644
--- a/src/Bundle/ChillTicketBundle/tests/Service/Import/ImportMotivesFromDirectoryTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Service/Import/ImportMotivesFromDirectoryTest.php
@@ -14,6 +14,7 @@ namespace Chill\TicketBundle\Tests\Service\Import;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\DocStoreBundle\Entity\StoredObjectVersion;
 use Chill\DocStoreBundle\Service\StoredObjectManagerInterface;
+use Chill\TicketBundle\Entity\Motive;
 use Chill\TicketBundle\Repository\MotiveRepository;
 use Chill\TicketBundle\Service\Import\ImportMotivesFromDirectory;
 use Doctrine\ORM\EntityManagerInterface;
@@ -92,4 +93,71 @@ YAML;
         // If we reached here, it's a successful smoke test
         $this->assertTrue(true);
     }
+
+    public function testImportWithParentCreatesAndLinks(): void
+    {
+        // 1) Prepare temporary directory with a motives.yaml that declares a parent > child label
+        $tmpBase = sys_get_temp_dir().DIRECTORY_SEPARATOR.'chill_ticket_import_'.bin2hex(random_bytes(6));
+        $this->assertTrue(mkdir($tmpBase, 0777, true));
+
+        $yaml = <<<'YAML'
+- label:
+    fr: "  Parent  >   Child  "
+YAML;
+        file_put_contents($tmpBase.DIRECTORY_SEPARATOR.'motives.yaml', $yaml);
+
+        // 2) Create repository prophecy: both child and parent are initially missing
+        $repoProphecy = $this->prophesize(MotiveRepository::class);
+        $repoProphecy->findByLabel('Child', 'fr')->willReturn([])->shouldBeCalled();
+        $repoProphecy->findByLabel('Parent', 'fr')->willReturn([])->shouldBeCalled();
+
+        // 3) Capture persisted motives to verify parent/child relation
+        $persistedMotives = [];
+        $emProphecy = $this->prophesize(EntityManagerInterface::class);
+        $emProphecy->persist(Argument::type(Motive::class))
+            ->will(function ($args) use (&$persistedMotives) {
+                $persistedMotives[] = $args[0];
+            })
+            ->shouldBeCalled();
+        $emProphecy->flush()->shouldBeCalled();
+
+        // StoredObjectManager is unused in this scenario; provide a dummy mock
+        $somMock = $this->createMock(StoredObjectManagerInterface::class);
+
+        // 4) Run the importer
+        $importer = new ImportMotivesFromDirectory(
+            $emProphecy->reveal(),
+            $somMock,
+            $repoProphecy->reveal(),
+        );
+        $importer->import($tmpBase, 'fr');
+
+        // 5) Assertions: we should have at least two motives persisted (parent and child)
+        $this->assertGreaterThanOrEqual(2, \count($persistedMotives));
+
+        // Identify child and parent
+        $child = null;
+        $parent = null;
+        foreach ($persistedMotives as $m) {
+            if (!$m instanceof Motive) {
+                continue;
+            }
+            $label = $m->getLabel();
+            $fr = $label['fr'] ?? null;
+            if ('Child' === $fr) {
+                $child = $m;
+            } elseif ('Parent' === $fr) {
+                $parent = $m;
+            }
+        }
+
+        $this->assertInstanceOf(Motive::class, $child, 'Child motive must be created');
+        $this->assertInstanceOf(Motive::class, $parent, 'Parent motive must be created');
+        $this->assertSame($parent, $child->getParent(), 'Child must reference the created parent');
+        $this->assertTrue($parent->isParent(), 'Parent must have at least one child');
+
+        // 6) Cleanup
+        @unlink($tmpBase.DIRECTORY_SEPARATOR.'motives.yaml');
+        @rmdir($tmpBase);
+    }
 }

From 46b1399c3ca4f53ca8a3a6dc43d12abac7cef7af Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 16 Dec 2025 14:07:38 +0100
Subject: [PATCH 280/283] Add support for "ordering" field in motive import.

- Extended motive import logic to parse and set the "ordering" field from YAML.
- Ensured invalid "ordering" values throw a runtime exception.
- Updated test cases to verify "ordering" is correctly set for child and standalone motives.
- Verified parent motives retain default "ordering" value (0).
---
 .../Import/ImportMotivesFromDirectory.php      |  9 +++++++++
 .../Import/ImportMotivesFromDirectoryTest.php  | 18 +++++++++++++-----
 2 files changed, 22 insertions(+), 5 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Service/Import/ImportMotivesFromDirectory.php b/src/Bundle/ChillTicketBundle/src/Service/Import/ImportMotivesFromDirectory.php
index a963d0f5a..3d9bf9d84 100644
--- a/src/Bundle/ChillTicketBundle/src/Service/Import/ImportMotivesFromDirectory.php
+++ b/src/Bundle/ChillTicketBundle/src/Service/Import/ImportMotivesFromDirectory.php
@@ -108,6 +108,15 @@ final readonly class ImportMotivesFromDirectory
                 $motive->setParent($parent);
             }
 
+            // ordering: applies only to the current (child/standalone) motive when provided
+            if (array_key_exists('ordering', $item)) {
+                $ordering = $item['ordering'];
+                if (!\is_int($ordering) && !\is_float($ordering) && !(\is_string($ordering) && is_numeric($ordering))) {
+                    throw new \RuntimeException(sprintf('Item %d: invalid "ordering" value (must be numeric).', $index));
+                }
+                $motive->setOrdering((float) $ordering);
+            }
+
             // urgent: if true => YES, if explicitly false => NO, if absent => leave null
             if (array_key_exists('urgent', $item)) {
                 $urgent = (bool) $item['urgent'];
diff --git a/src/Bundle/ChillTicketBundle/tests/Service/Import/ImportMotivesFromDirectoryTest.php b/src/Bundle/ChillTicketBundle/tests/Service/Import/ImportMotivesFromDirectoryTest.php
index 07e94f2be..ba52d32fc 100644
--- a/src/Bundle/ChillTicketBundle/tests/Service/Import/ImportMotivesFromDirectoryTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Service/Import/ImportMotivesFromDirectoryTest.php
@@ -43,6 +43,7 @@ class ImportMotivesFromDirectoryTest extends TestCase
         $yaml = <<<'YAML'
 - label:
     fr: "Test Motive"
+  ordering: 12.5
   urgent: true
   supplementary_informations:
     - label:
@@ -58,9 +59,12 @@ YAML;
         $emProphecy = $this->prophesize(EntityManagerInterface::class);
         // persist should be called for StoredObject and Motive at least once
         $emProphecy->persist(Argument::type(StoredObject::class))->shouldBeCalled();
-        $emProphecy->persist(Argument::that(fn ($arg) =>
-            // Motive class is in another namespace; just check it's an object with setLabel method
-            \is_object($arg) && method_exists($arg, 'setLabel')))->shouldBeCalled();
+        $capturedMotive = null;
+        $emProphecy->persist(Argument::type(Motive::class))
+            ->will(function ($args) use (&$capturedMotive) {
+                $capturedMotive = $args[0];
+            })
+            ->shouldBeCalled();
         $emProphecy->flush()->shouldBeCalled();
 
         $somMock = $this->createMock(StoredObjectManagerInterface::class);
@@ -90,8 +94,9 @@ YAML;
         @unlink($tmpBase.DIRECTORY_SEPARATOR.'motives.yaml');
         @rmdir($tmpBase);
 
-        // If we reached here, it's a successful smoke test
-        $this->assertTrue(true);
+        // Verify that ordering has been properly set on the created motive
+        $this->assertInstanceOf(Motive::class, $capturedMotive);
+        $this->assertSame(12.5, $capturedMotive->getOrdering());
     }
 
     public function testImportWithParentCreatesAndLinks(): void
@@ -103,6 +108,7 @@ YAML;
         $yaml = <<<'YAML'
 - label:
     fr: "  Parent  >   Child  "
+  ordering: 7
 YAML;
         file_put_contents($tmpBase.DIRECTORY_SEPARATOR.'motives.yaml', $yaml);
 
@@ -155,6 +161,8 @@ YAML;
         $this->assertInstanceOf(Motive::class, $parent, 'Parent motive must be created');
         $this->assertSame($parent, $child->getParent(), 'Child must reference the created parent');
         $this->assertTrue($parent->isParent(), 'Parent must have at least one child');
+        $this->assertSame(7.0, $child->getOrdering(), 'Child ordering must be set from YAML');
+        $this->assertSame(0.0, $parent->getOrdering(), 'Parent ordering must remain untouched (default)');
 
         // 6) Cleanup
         @unlink($tmpBase.DIRECTORY_SEPARATOR.'motives.yaml');

From e1cda00a982f96cd9b233d6b627cf980a297bb67 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 16 Dec 2025 14:53:23 +0100
Subject: [PATCH 281/283] Optimize motive import with in-memory caching for
 deduplication.

- Introduced an in-memory cache to store and reuse created or found motives during import, reducing redundant database operations.
- Updated the logic to ensure parent motives are created or retrieved via the cache.
- Modified the test suite to verify parent and child motive relationships with deduplication.
- Ensured labels are consistently formatted and trimmed during the import process.
---
 .../Import/ImportMotivesFromDirectory.php     | 115 +++++++++++++-----
 .../Import/ImportMotivesFromDirectoryTest.php |  74 +++++++++++
 2 files changed, 160 insertions(+), 29 deletions(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Service/Import/ImportMotivesFromDirectory.php b/src/Bundle/ChillTicketBundle/src/Service/Import/ImportMotivesFromDirectory.php
index 3d9bf9d84..d61908366 100644
--- a/src/Bundle/ChillTicketBundle/src/Service/Import/ImportMotivesFromDirectory.php
+++ b/src/Bundle/ChillTicketBundle/src/Service/Import/ImportMotivesFromDirectory.php
@@ -21,11 +21,84 @@ use Symfony\Component\Yaml\Yaml;
 
 final readonly class ImportMotivesFromDirectory
 {
+    /**
+     * Cache en mémoire des Motive créés/trouvés pendant l'import.
+     * Clé: "$lang|lower(trim(label))" → valeur: Motive.
+     */
+    private \ArrayObject $parentsAndMotives;
+
     public function __construct(
         private EntityManagerInterface $entityManager,
         private StoredObjectManagerInterface $storedObjectManager,
         private MotiveRepository $motiveRepository,
-    ) {}
+    ) {
+        // Objet mutable pour rester compatible avec la classe readonly
+        $this->parentsAndMotives = new \ArrayObject();
+    }
+
+    private function buildCacheKey(string $lang, string $label): string
+    {
+        return $lang.'|'.mb_strtolower(trim($label));
+    }
+
+    private function getFromCache(string $lang, string $label): ?Motive
+    {
+        $key = $this->buildCacheKey($lang, $label);
+
+        if ($this->parentsAndMotives->offsetExists($key)) {
+            return $this->parentsAndMotives->offsetGet($key);
+        }
+
+        return null;
+    }
+
+    private function putInCache(string $lang, string $label, Motive $motive): void
+    {
+        $this->parentsAndMotives->offsetSet($this->buildCacheKey($lang, $label), $motive);
+    }
+
+    /**
+     * Trouve un Motive par label/lang en utilisant d'abord le cache, puis le repository.
+     * Si inexistant, le crée, le persiste, l’ajoute au cache et le retourne.
+     *
+     * @param array $baseLabels tableau de labels (sera copié/ajusté pour la langue courante)
+     */
+    private function findOrCreateMotiveByLabel(string $name, string $lang, array $baseLabels): Motive
+    {
+        $name = trim($name);
+
+        if ('' === $name) {
+            throw new \InvalidArgumentException('Empty motive name provided to findOrCreateMotiveByLabel');
+        }
+
+        if (null !== ($cached = $this->getFromCache($lang, $name))) {
+            return $cached;
+        }
+
+        $existing = $this->motiveRepository->findByLabel($name, $lang);
+        if (\count($existing) > 1) {
+            throw new \RuntimeException(sprintf('Multiple motives found with label "%s" for lang "%s".', $name, $lang));
+        }
+        $motive = $existing[0] ?? new Motive();
+
+        // Préparer les labels: copie, trim, puis forcer la valeur de la langue courante
+        $labels = $baseLabels;
+        foreach ($labels as $k => $v) {
+            if (\is_string($v)) {
+                $labels[$k] = trim($v);
+            }
+        }
+        $labels[$lang] = $name; // forcer le label courant
+        $motive->setLabel($labels);
+
+        if (!isset($existing[0])) {
+            $this->entityManager->persist($motive);
+        }
+
+        $this->putInCache($lang, $name, $motive);
+
+        return $motive;
+    }
 
     public function import(string $directory, string $lang): void
     {
@@ -73,37 +146,21 @@ final readonly class ImportMotivesFromDirectory
                 [$parentName, $childName] = array_map('trim', explode('>', $childName, 2));
             }
 
-            // Find or create the current motive (child or standalone)
-            $existing = $this->motiveRepository->findByLabel($childName, $lang);
-            if (\count($existing) > 1) {
-                throw new \RuntimeException(sprintf('Item %d: multiple motives found with label "%s" for lang "%s".', $index, $childName, $lang));
-            }
-            $motive = $existing[0] ?? new Motive();
-
-            // Ensure the stored label for the current language is the child/standalone name (trimmed)
-            $labelArray[$lang] = $childName;
-            $motive->setLabel($labelArray);
+            // Find or create the current motive (child or standalone) en utilisant le cache
+            $motive = $this->getFromCache($lang, $childName)
+                ?? $this->findOrCreateMotiveByLabel($childName, $lang, $labelArray);
+            // S’assurer que le label courant reflète bien le nom de l’enfant/standalone
+            // (utile si l’entité existait déjà mais avec un label non trim)
+            $labelsForChild = $motive->getLabel();
+            $labelsForChild[$lang] = $childName;
+            $motive->setLabel($labelsForChild);
 
             // If a parent is defined, ensure it exists and link it
             if (null !== $parentName && '' !== $parentName) {
-                $parentCandidates = $this->motiveRepository->findByLabel($parentName, $lang);
-                if (\count($parentCandidates) > 1) {
-                    throw new \RuntimeException(sprintf('Item %d: multiple parent motives found with label "%s" for lang "%s".', $index, $parentName, $lang));
-                }
-                $parent = $parentCandidates[0] ?? null;
-                if (null === $parent) {
-                    $parent = new Motive();
-                    $parentLabel = $labelArray;
-                    $parentLabel[$lang] = $parentName;
-                    // Make sure all labels are trimmed
-                    foreach ($parentLabel as $k => $v) {
-                        if (\is_string($v)) {
-                            $parentLabel[$k] = trim($v);
-                        }
-                    }
-                    $parent->setLabel($parentLabel);
-                    $this->entityManager->persist($parent);
-                }
+                // Trouver/créer le parent via cache pour éviter les doublons
+                $parentLabel = $labelArray;
+                $parent = $this->getFromCache($lang, $parentName)
+                    ?? $this->findOrCreateMotiveByLabel($parentName, $lang, $parentLabel);
 
                 $motive->setParent($parent);
             }
diff --git a/src/Bundle/ChillTicketBundle/tests/Service/Import/ImportMotivesFromDirectoryTest.php b/src/Bundle/ChillTicketBundle/tests/Service/Import/ImportMotivesFromDirectoryTest.php
index ba52d32fc..8939940b7 100644
--- a/src/Bundle/ChillTicketBundle/tests/Service/Import/ImportMotivesFromDirectoryTest.php
+++ b/src/Bundle/ChillTicketBundle/tests/Service/Import/ImportMotivesFromDirectoryTest.php
@@ -168,4 +168,78 @@ YAML;
         @unlink($tmpBase.DIRECTORY_SEPARATOR.'motives.yaml');
         @rmdir($tmpBase);
     }
+
+    public function testImportReusesParentAcrossItems(): void
+    {
+        // 1) Prépare un répertoire temporaire avec deux items partageant le même parent
+        $tmpBase = sys_get_temp_dir().DIRECTORY_SEPARATOR.'chill_ticket_import_'.bin2hex(random_bytes(6));
+        $this->assertTrue(mkdir($tmpBase, 0777, true));
+
+        $yaml = <<<'YAML'
+- label:
+    fr: "Parent > A"
+  ordering: 1
+- label:
+    fr: "Parent > B"
+  ordering: 2
+YAML;
+        file_put_contents($tmpBase.DIRECTORY_SEPARATOR.'motives.yaml', $yaml);
+
+        // 2) Repository: parent/children absents initialement
+        $repoProphecy = $this->prophesize(MotiveRepository::class);
+        $repoProphecy->findByLabel('A', 'fr')->willReturn([])->shouldBeCalledTimes(1);
+        $repoProphecy->findByLabel('Parent', 'fr')->willReturn([])->shouldBeCalledTimes(1);
+        $repoProphecy->findByLabel('B', 'fr')->willReturn([])->shouldBeCalledTimes(1);
+
+        // 3) Capture des persist() pour compter les entités créées
+        $persistedMotives = [];
+        $emProphecy = $this->prophesize(EntityManagerInterface::class);
+        $emProphecy->persist(Argument::type(Motive::class))
+            ->will(function ($args) use (&$persistedMotives) {
+                $persistedMotives[] = $args[0];
+            })
+            ->shouldBeCalled();
+        $emProphecy->flush()->shouldBeCalled();
+
+        // 4) Exécute l'import
+        $somMock = $this->createMock(StoredObjectManagerInterface::class);
+        $importer = new ImportMotivesFromDirectory(
+            $emProphecy->reveal(),
+            $somMock,
+            $repoProphecy->reveal(),
+        );
+        $importer->import($tmpBase, 'fr');
+
+        // 5) Vérifications: un seul parent créé et partagé (déduplication par instance)
+        $unique = [];
+        foreach ($persistedMotives as $m) {
+            if (!$m instanceof Motive) {
+                continue;
+            }
+            $unique[spl_object_hash($m)] = $m;
+        }
+
+        $parents = [];
+        $children = [];
+        foreach ($unique as $m) {
+            $label = $m->getLabel();
+            $fr = $label['fr'] ?? null;
+            if ('Parent' === $fr) {
+                $parents[] = $m;
+            }
+            if ('A' === $fr || 'B' === $fr) {
+                $children[] = $m;
+            }
+        }
+
+        $this->assertCount(1, $parents, 'Le parent doit être créé une seule fois');
+        $this->assertCount(2, $children, 'Les deux enfants doivent être créés');
+        $this->assertSame($parents[0], $children[0]->getParent());
+        $this->assertSame($parents[0], $children[1]->getParent());
+        $this->assertTrue($parents[0]->isParent());
+
+        // 6) Nettoyage
+        @unlink($tmpBase.DIRECTORY_SEPARATOR.'motives.yaml');
+        @rmdir($tmpBase);
+    }
 }

From b1f7b83fdc77954d822a638d4dbeefba4bb73f62 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Tue, 16 Dec 2025 14:53:33 +0100
Subject: [PATCH 282/283] Replace `PhonenumberConstraint` with `PhoneNumber`
 constraint in user profile update.

- Updated the `UpdateProfileCommand` to use `\Misd\PhoneNumberBundle\Validator\Constraints\PhoneNumber` instead of the deprecated `PhonenumberConstraint`.
- Removed unused `PhonenumberConstraint` imports from relevant files.
---
 .../Action/User/UpdateProfile/UpdateProfileCommand.php         | 3 +--
 src/Bundle/ChillMainBundle/Entity/User.php                     | 1 -
 2 files changed, 1 insertion(+), 3 deletions(-)

diff --git a/src/Bundle/ChillMainBundle/Action/User/UpdateProfile/UpdateProfileCommand.php b/src/Bundle/ChillMainBundle/Action/User/UpdateProfile/UpdateProfileCommand.php
index 061f8e55a..d0c8e4ac7 100644
--- a/src/Bundle/ChillMainBundle/Action/User/UpdateProfile/UpdateProfileCommand.php
+++ b/src/Bundle/ChillMainBundle/Action/User/UpdateProfile/UpdateProfileCommand.php
@@ -13,7 +13,6 @@ namespace Chill\MainBundle\Action\User\UpdateProfile;
 
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Notification\NotificationFlagManager;
-use Chill\MainBundle\Validation\Constraint\PhonenumberConstraint;
 use libphonenumber\PhoneNumber;
 use Symfony\Component\Validator\Constraints as Assert;
 
@@ -22,7 +21,7 @@ final class UpdateProfileCommand
     public array $notificationFlags = [];
 
     public function __construct(
-        #[PhonenumberConstraint]
+        #[\Misd\PhoneNumberBundle\Validator\Constraints\PhoneNumber]
         public ?PhoneNumber $phonenumber,
         #[Assert\Choice(choices: ['fr', 'nl'], message: 'Locale must be either "fr" or "nl"')]
         public string $locale = 'fr',
diff --git a/src/Bundle/ChillMainBundle/Entity/User.php b/src/Bundle/ChillMainBundle/Entity/User.php
index d1f2c4277..aca4134be 100644
--- a/src/Bundle/ChillMainBundle/Entity/User.php
+++ b/src/Bundle/ChillMainBundle/Entity/User.php
@@ -23,7 +23,6 @@ use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Serializer\Annotation as Serializer;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
-use Chill\MainBundle\Validation\Constraint\PhonenumberConstraint;
 use Symfony\Component\Validator\Constraints as Assert;
 
 /**

From 2b1f337a28febfc7f097ad3ac5e19e1ef9707eb5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Julien=20Fastr=C3=A9?= <julien.fastre@champs-libres.coop>
Date: Wed, 17 Dec 2025 15:31:53 +0100
Subject: [PATCH 283/283] Serialize ticket filter parameters with JSON groups
 in person list view.

- Updated `list.html.twig` to serialize `ticketFilterParams` using the 'read' group for JSON normalization.
---
 .../ChillTicketBundle/src/Resources/views/Person/list.html.twig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/Bundle/ChillTicketBundle/src/Resources/views/Person/list.html.twig b/src/Bundle/ChillTicketBundle/src/Resources/views/Person/list.html.twig
index 76bd14595..bbd0f8903 100644
--- a/src/Bundle/ChillTicketBundle/src/Resources/views/Person/list.html.twig
+++ b/src/Bundle/ChillTicketBundle/src/Resources/views/Person/list.html.twig
@@ -14,7 +14,7 @@
 {% block js %}
     {{ parent() }}
     <script type="text/javascript">
-        window.ticketFilterParams = {{ ticketFilterParams|serialize|raw }};
+        window.ticketFilterParams = {{ ticketFilterParams|serialize('json', {'groups': ['read']})|raw }};
     </script>
     {{ encore_entry_script_tags('vue_ticket_list') }}
 {% endblock %}