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.
merge ticket-app-master and fix rector / cs
2025-09-30 02:25:00 +00:00 · 2024-05-28 15:58:17 +02:00 · 2024-05-28 15:54:52 +02:00 · 2024-05-28 15:08:59 +02:00 · 2024-05-28 14:59:25 +02:00 · 2024-05-28 13:47:58 +02:00
229 changed files with 6765 additions and 2136 deletions
--- a/.changes/unreleased/Feature-20240530-160003.yaml
+++ b/.changes/unreleased/Feature-20240530-160003.yaml
@@ -1,6 +0,0 @@
-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: ""
--- a/.changes/unreleased/Feature-20240531-190242.yaml
+++ b/.changes/unreleased/Feature-20240531-190242.yaml
@@ -1,6 +0,0 @@
-kind: Feature
-body: |
-  Upgrade CKEditor and refactor configuration with use of typescript
-time: 2024-05-31T19:02:42.776662753+02:00
-custom:
-  Issue: ""
--- a/.changes/v2.20.0.md
+++ b/.changes/v2.20.0.md
@@ -1,21 +0,0 @@
-## v2.20.0 - 2024-06-05
-### Fixed
-* ([#170](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/170)) Display agents traitants instead of accompanying period referrer in export list social actions.
-* Added translations for choices of durations (> 5 hours)
-### Feature
-* ([#145](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/145)) Allow to open documents in LibreOffice locally (need configuration within security);
-
-  This endpoint should be added to make the endpoint works properly:
-
-  ```yaml
-  security:
-      firewalls:
-          dav:
-               pattern: ^/dav
-               provider: chain_provider
-               stateless: true
-               guard:
-                   authenticators:
-                       - Chill\DocStoreBundle\Security\Guard\JWTOnDavUrlAuthenticator
-
-  ```
--- a/.changes/v2.20.1.md
+++ b/.changes/v2.20.1.md
@@ -1,3 +0,0 @@
-## v2.20.1 - 2024-06-05
-### Fixed
-* Do not allow StoredObjectCreated for edit and convert buttons 
--- a/.changes/v2.21.0.md
+++ b/.changes/v2.21.0.md
@@ -1,31 +0,0 @@
-## v2.21.0 - 2024-06-18
-### Feature
-* Add flash menu buttons in search results, to open directly a new calendar, or a new activity in an accompanying period
-* ([#122](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/122)) Improve the list of calendar in the search results: make all calendar clicable, and display a list of calendars
-* ([#282](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/282)) [export] add start date and end date on filters "filter course by referrer job" and "filter course by referrer scope"
-* ([#282](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/282)) [export] the aggregator "Group by referrer" now accept a date range.
-* ([#282](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/282)) [export] add date range on "group course by referrer's scope"
-* ([#282](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/282)) [export] add date range on "group course by referrer's jobs"
-* ([#168](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/168) In the UX, display user job and service at the time when he performs an action:
-  now, the job and service is shown:
-  * at the activity's date,
-  * at the appointment's date,
-  * when the user is marked as referrer for an accompanying period work,
-  * when the user apply a transition in a workflow,
-  * when the user updates or creates "something" ("created/updated by ... at ..."),
-  * or when he wrote a comment,
-  * …
-
-### Traduction francophone
-* Ajout d'un menu "flash" dans les résultats de recherche, pour créer un rendez-vous ou un échange dans un parcours depuis les résultats de recherche;
-* Améliore la liste des rendez-vous dans les résultats de recherche: les rendez-vous sont cliquables;
-* [exports] Ajout d'intervalles de dates pour des filtres et regroupements des parcours par référent, métier du référent, service du référent;
-* Affiche le métier et le service des utilisateurs à la date à laquelle il a exécuté une action. Le métier et le service est affiché:
-  * à la date d'un échange,
-  * au jour d'un rendez-vous,
-  * quand l'utilisateur est devenu référent d'un parcours d'accompagnement,
-  * quand il a appliqué une transition sur un workflow,
-  * quand il a mise à jour ou créé une fiche, dans les mentions "créé / mise à jour par ..., le ...",
-  * quand il a mis à jour un commentaire,
-  * …
-
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,64 +6,6 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).


-## v2.21.0 - 2024-06-18
-### Feature
-* Add flash menu buttons in search results, to open directly a new calendar, or a new activity in an accompanying period
-* ([#122](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/122)) Improve the list of calendar in the search results: make all calendar clicable, and display a list of calendars
-* ([#282](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/282)) [export] add start date and end date on filters "filter course by referrer job" and "filter course by referrer scope"
-* ([#282](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/282)) [export] the aggregator "Group by referrer" now accept a date range.
-* ([#282](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/282)) [export] add date range on "group course by referrer's scope"
-* ([#282](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/282)) [export] add date range on "group course by referrer's jobs"
-* ([#168](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/168) In the UX, display user job and service at the time when he performs an action:
-  now, the job and service is shown:
-  * at the activity's date,
-  * at the appointment's date,
-  * when the user is marked as referrer for an accompanying period work,
-  * when the user apply a transition in a workflow,
-  * when the user updates or creates "something" ("created/updated by ... at ..."),
-  * or when he wrote a comment,
-  * …
-
-### Traduction francophone
-* Ajout d'un menu "flash" dans les résultats de recherche, pour créer un rendez-vous ou un échange dans un parcours depuis les résultats de recherche;
-* Améliore la liste des rendez-vous dans les résultats de recherche: les rendez-vous sont cliquables;
-* [exports] Ajout d'intervalles de dates pour des filtres et regroupements des parcours par référent, métier du référent, service du référent;
-* Affiche le métier et le service des utilisateurs à la date à laquelle il a exécuté une action. Le métier et le service est affiché:
-  * à la date d'un échange,
-  * au jour d'un rendez-vous,
-  * quand l'utilisateur est devenu référent d'un parcours d'accompagnement,
-  * quand il a appliqué une transition sur un workflow,
-  * quand il a mise à jour ou créé une fiche, dans les mentions "créé / mise à jour par ..., le ...",
-  * quand il a mis à jour un commentaire,
-  * …
-
-
-## v2.20.1 - 2024-06-05
-### Fixed
-* Do not allow StoredObjectCreated for edit and convert buttons 
-
-## v2.20.0 - 2024-06-05
-### Fixed
-* ([#170](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/170)) Display agents traitants instead of accompanying period referrer in export list social actions.
-* Added translations for choices of durations (> 5 hours)
-### Feature
-* ([#145](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/145)) Allow to open documents in LibreOffice locally (need configuration within security);
-
-  This endpoint should be added to make the endpoint works properly:
-
-  ```yaml
-  security:
-      firewalls:
-          dav:
-               pattern: ^/dav
-               provider: chain_provider
-               stateless: true
-               guard:
-                   authenticators:
-                       - Chill\DocStoreBundle\Security\Guard\JWTOnDavUrlAuthenticator
-
-  ```
-
 ## v2.19.0 - 2024-05-14
 ### Feature
 * ([#197](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/197)) Make the script which subscribe to microsoft calendars changes more tolerant to errors or missing configuration on the microsoft side
--- 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
--- a/composer.json
+++ b/composer.json
@@ -92,12 +92,12 @@
        "phpstan/phpstan": "^1.9",
        "phpstan/phpstan-deprecation-rules": "^1.1",
        "phpstan/phpstan-strict-rules": "^1.0",
-        "phpunit/phpunit": "^10.5.24",
+        "phpunit/phpunit": ">= 7.5",
        "rector/rector": "^1.1.0",
        "symfony/debug-bundle": "^5.4",
        "symfony/dotenv": "^5.4",
        "symfony/maker-bundle": "^1.20",
-        "symfony/phpunit-bridge": "^7.1",
+        "symfony/phpunit-bridge": "^5.4",
        "symfony/runtime": "^5.4",
        "symfony/stopwatch": "^5.4",
        "symfony/var-dumper": "^5.4"
@@ -119,6 +119,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"
@@ -126,8 +127,9 @@
    },
    "autoload-dev": {
        "psr-4": {
-            "App\\": "tests/",
+            "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"
        }
@@ -149,7 +151,6 @@
    "scripts": {
        "auto-scripts": {
            "cache:clear": "symfony-cmd"
-        },
-        "php-cs-fixer": "php-cs-fixer fix --config=./.php-cs-fixer.dist.php --show-progress=none"
+        }
    }
 }
--- a/docs/source/installation/index.rst
+++ b/docs/source/installation/index.rst
@@ -95,7 +95,7 @@ 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.
+or in the :code:`.env.local` file, which should not be commited 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.
@@ -114,12 +114,6 @@ you can either:
 - 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).

- set up the jwt authentication bundle
-
-Some environment variables are available for the JWT authentication bundle in the :code:`.env` file. You must also run the command
-:code:`symfony console lexik:jwt:generate-keypair` to generate some keys that will be stored in the paths set up in the :code:`JWT_SECRET_KEY`
-and the :code:`JWT_PUBLIC_KEY` env variables. This is only required for using the stored documents in Chill.
-
 Prepare migrations and other tools
 **********************************

@@ -185,7 +179,7 @@ Install fixtures
 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"`.
+visibile in the "users" table: :code:`docker compose exec database psql -U app -c "SELECT username FROM users"`.

 The password is always :code:`password`.

--- a/package.json
+++ b/package.json
@@ -6,13 +6,12 @@
    "@apidevtools/swagger-cli": "^4.0.4",
    "@babel/core": "^7.20.5",
    "@babel/preset-env": "^7.20.2",
-    "@ckeditor/ckeditor5-build-classic": "^41.4.2",
-    "@ckeditor/ckeditor5-dev-utils": "^40.2.0",
+    "@ckeditor/ckeditor5-build-classic": "^35.3.2",
+    "@ckeditor/ckeditor5-dev-utils": "^31.1.13",
    "@ckeditor/ckeditor5-dev-webpack-plugin": "^31.1.13",
-    "@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",
+    "@ckeditor/ckeditor5-markdown-gfm": "^35.3.2",
+    "@ckeditor/ckeditor5-theme-lark": "^35.3.2",
+    "@ckeditor/ckeditor5-vue": "^4.0.1",
    "@symfony/webpack-encore": "^4.1.0",
    "@tsconfig/node14": "^1.0.1",
      "@types/dompurify": "^3.0.5",
@@ -32,7 +31,7 @@
    "select2-bootstrap-theme": "0.1.0-beta.10",
    "style-loader": "^3.3.1",
    "ts-loader": "^9.3.1",
-    "typescript": "^5.4.5",
+    "typescript": "^4.7.2",
    "vue-loader": "^17.0.0",
    "webpack": "^5.75.0",
    "webpack-cli": "^5.0.1"
@@ -46,11 +45,9 @@
    "@fullcalendar/vue3": "^6.1.4",
    "@popperjs/core": "^2.9.2",
    "@types/leaflet": "^1.9.3",
-    "@types/dompurify": "^3.0.5",
    "dropzone": "^5.7.6",
    "es6-promise": "^4.2.8",
    "leaflet": "^1.7.1",
-    "marked": "^12.0.2",
    "masonry-layout": "^4.2.2",
    "mime": "^4.0.0",
    "swagger-ui": "^4.15.5",
--- 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>
--- a/src/Bundle/ChillActivityBundle/Menu/AccompanyingCourseQuickMenuBuilder.php
+++ b/src/Bundle/ChillActivityBundle/Menu/AccompanyingCourseQuickMenuBuilder.php
@@ -1,49 +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\ActivityBundle\Menu;
-
-use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
-use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
-use Knp\Menu\MenuItem;
-use Symfony\Component\Security\Core\Security;
-
-final readonly class AccompanyingCourseQuickMenuBuilder implements LocalMenuBuilderInterface
-{
-    public function __construct(private Security $security) {}
-
-    public static function getMenuIds(): array
-    {
-        return ['accompanying_course_quick_menu'];
-    }
-
-    public function buildMenu($menuId, MenuItem $menu, array $parameters)
-    {
-        /** @var \Chill\PersonBundle\Entity\AccompanyingPeriod $accompanyingCourse */
-        $accompanyingCourse = $parameters['accompanying-course'];
-
-        if ($this->security->isGranted(ActivityVoter::CREATE, $accompanyingCourse)) {
-            $menu
-                ->addChild('Create a new activity in accompanying course', [
-                    'route' => 'chill_activity_activity_new',
-                    'routeParameters' => [
-                        // 'activityType_id' => '',
-                        'accompanying_period_id' => $accompanyingCourse->getId(),
-                    ],
-                ])
-                ->setExtras([
-                    'order' => 10,
-                    'icon' => 'plus',
-                ])
-            ;
-        }
-    }
-}
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig
@@ -68,7 +68,7 @@
                    <div class="wl-col title"><h3>{{ 'Referrer'|trans }}</h3></div>
                    <div class="wl-col list">
                        <p class="wl-item">
-                            <span class="badge-user">{{ activity.user|chill_entity_render_box({'at_date': activity.date}) }}</span>
+                            <span class="badge-user">{{ activity.user|chill_entity_render_box }}</span>
                        </p>
                    </div>
                </div>
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig
@@ -87,8 +87,7 @@
                            <li>
                                {% if bloc.type == 'user' %}
                                    <span class="badge-user">
-                                        hello
-                                        {{ item|chill_entity_render_box({'render': 'raw', 'addAltNames': false, 'at_date': entity.date }) }}
+                                        {{ item|chill_entity_render_box({'render': 'raw', 'addAltNames': false }) }}
                                    </span>
                                {% else %}
                                    {{ _self.insert_onthefly(bloc.type, item) }}
@@ -115,7 +114,7 @@
                <li>
                    {% if bloc.type == 'user' %}
                        <span class="badge-user">
-                            {{ item|chill_entity_render_box({'render': 'raw', 'addAltNames': false, 'at_date': entity.date }) }}
+                            {{ item|chill_entity_render_box({'render': 'raw', 'addAltNames': false }) }}
                        </span>
                    {% else %}
                        {{ _self.insert_onthefly(bloc.type, item) }}
@@ -143,7 +142,7 @@
                        <span class="wl-item">
                            {% if bloc.type == 'user' %}
                                <span class="badge-user">
-                                    {{ item|chill_entity_render_box({'render': 'raw', 'addAltNames': false, 'at_date': entity.date }) }}
+                                    {{ item|chill_entity_render_box({'render': 'raw', 'addAltNames': false }) }}
                                    {%- if context == 'calendar_accompanyingCourse' or context == 'calendar_person' %}
                                        {% set invite = entity.inviteForUser(item) %}
                                        {% if invite is not null %}
--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/list_recent.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/list_recent.html.twig
@@ -41,7 +41,7 @@
                        {% if activity.user and t.userVisible %}
                            <li>
                                <span class="item-key">{{ 'Referrer'|trans ~ ': ' }}</span>
-                                <span class="badge-user">{{ activity.user|chill_entity_render_box({'at_date': activity.date}) }}</span>
+                                <span class="badge-user">{{ activity.user|chill_entity_render_box }}</span>
                            </li>
                        {% endif %}

--- a/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
+++ b/src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig
@@ -37,7 +37,7 @@
                {%- if entity.user is not null %}
                    <dt class="inline">{{ 'Referrer'|trans|capitalize }}</dt>
                    <dd>
-                        <span class="badge-user">{{ entity.user|chill_entity_render_box({'at_date': entity.date}) }}</span>
+                        <span class="badge-user">{{ entity.user|chill_entity_render_box }}</span>
                    </dd>
                {% endif %}

--- a/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php
+++ b/src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php
@@ -145,7 +145,7 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
                throw new \RuntimeException('Could not determine context of activity.');
            }
        } elseif ($subject instanceof AccompanyingPeriod) {
-            if (AccompanyingPeriod::STEP_CLOSED === $subject->getStep() || AccompanyingPeriod::STEP_DRAFT === $subject->getStep()) {
+            if (AccompanyingPeriod::STEP_CLOSED === $subject->getStep()) {
                if (\in_array($attribute, [self::UPDATE, self::CREATE, self::DELETE], true)) {
                    return false;
                }
--- a/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityTypeTest.php
+++ b/src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityTypeTest.php
@@ -60,7 +60,7 @@ final class TranslatableActivityTypeTest extends KernelTestCase
        $this->assertInstanceOf(
            ActivityType::class,
            $form->getData()['type'],
-            'The data is an instance of Chill\ActivityBundle\Entity\ActivityType'
+            'The data is an instance of Chill\\ActivityBundle\\Entity\\ActivityType'
        );
        $this->assertEquals($type->getId(), $form->getData()['type']->getId());

--- a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
@@ -77,18 +77,6 @@ Choose a type: Choisir un type
 4 hours: 4 heures
 4 hours 30: 4 heures 30
 5 hours: 5 heures
-5 hours 30: 5 heure 30
-6 hours: 6 heures
-6 hours 30: 6 heure 30
-7 hours: 7 heures
-7 hours 30: 7 heure 30
-8 hours: 8 heures
-8 hours 30: 8 heure 30
-9 hours: 9 heures
-9 hours 30: 9 heure 30
-10 hours: 10 heures
-11 hours: 11 heures
-12 hours: 12 heures
 Concerned groups: Parties concernées par l'échange
 Persons in accompanying course: Usagers du parcours
 Third persons: Tiers non-pro.
@@ -222,7 +210,6 @@ Documents label: Libellé du champ Documents
 # activity type category admin
 ActivityTypeCategory list: Liste des catégories des types d'échange
 Create a new activity type category: Créer une nouvelle catégorie de type d'échange
-Create a new activity in accompanying course: Créer un échange dans le parcours

 # activity delete
 Remove activity: Supprimer un échange
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig
@@ -49,13 +49,13 @@
 										<li>
 											<span>
 												<abbr class="referrer" title={{ 'Created by'|trans }}>{{ 'By'|trans }}:</abbr>
-												<b>{{ entity.createdBy|chill_entity_render_box({'at_date': entity.date}) }}</b>
+												<b>{{ entity.createdBy|chill_entity_render_box }}</b>
 											</span>
 										</li>
 										<li>
 											<span>
 												<abbr class="referrer" title={{ 'Created for'|trans }}>{{ 'For'|trans }}:</abbr>
-												<b>{{ entity.agent|chill_entity_render_box({'at_date': entity.date}) }}</b>
+												<b>{{ entity.agent|chill_entity_render_box }}</b>

 											</span>
 										</li>
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig
@@ -18,10 +18,10 @@
 				<dd>{{ entity.type|chill_entity_render_box }}</dd>

 				<dt class="inline">{{ 'Created by'|trans }}</dt>
-				<dd>{{ entity.createdBy|chill_entity_render_box({'at_date': entity.date}) }}</dd>
+				<dd>{{ entity.createdBy }}</dd>

 				<dt class="inline">{{ 'Created for'|trans }}</dt>
-				<dd>{{ entity.agent|chill_entity_render_box({'at_date': entity.date}) }}</dd>
+				<dd>{{ entity.agent }}</dd>
                
                <dt class="inline">{{ 'Asideactivity location'|trans }}</dt>
                {%- if entity.location.name is defined -%}
--- a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
+++ b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
@@ -72,21 +72,21 @@ days: jours
 1 hour 30: 1 heure 30
 1 hour 45: 1 heure 45
 2 hours: 2 heures
-2 hours 30: 2 heures 30
+2 hours 30: 2 heure 30
 3 hours: 3 heures
-3 hours 30: 3 heures 30
+3 hours 30: 3 heure 30
 4 hours: 4 heures
-4 hours 30: 4 heures 30
+4 hours 30: 4 heure 30
 5 hours: 5 heures
-5 hours 30: 5 heures 30
+5 hours 30: 5 heure 30
 6 hours: 6 heures
-6 hours 30: 6 heures 30
+6 hours 30: 6 heure 30
 7 hours: 7 heures
-7 hours 30: 7 heures 30
+7 hours 30: 7 heure 30
 8 hours: 8 heures
-8 hours 30: 8 heures 30
+8 hours 30: 8 heure 30
 9 hours: 9 heures
-9 hours 30: 9 heures 30
+9 hours 30: 9 heure 30
 10 hours: 10 heures
 1/2 day: 1/2 jour
 1 day: 1 jour
--- a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
@@ -440,16 +440,6 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
        return $this->startDate;
    }

-    /**
-     * get the date of the calendar.
-     *
-     * Useful for showing the date of the calendar event, required by twig in some places.
-     */
-    public function getDate(): ?\DateTimeImmutable
-    {
-        return $this->getStartDate();
-    }
-
    public function getStatus(): ?string
    {
        return $this->status;
--- a/src/Bundle/ChillCalendarBundle/Menu/AccompanyingCourseQuickMenuBuilder.php
+++ b/src/Bundle/ChillCalendarBundle/Menu/AccompanyingCourseQuickMenuBuilder.php
@@ -1,48 +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\Menu;
-
-use Chill\CalendarBundle\Security\Voter\CalendarVoter;
-use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
-use Knp\Menu\MenuItem;
-use Symfony\Component\Security\Core\Security;
-
-final readonly class AccompanyingCourseQuickMenuBuilder implements LocalMenuBuilderInterface
-{
-    public function __construct(private Security $security) {}
-
-    public static function getMenuIds(): array
-    {
-        return ['accompanying_course_quick_menu'];
-    }
-
-    public function buildMenu($menuId, MenuItem $menu, array $parameters)
-    {
-        /** @var \Chill\PersonBundle\Entity\AccompanyingPeriod $accompanyingCourse */
-        $accompanyingCourse = $parameters['accompanying-course'];
-
-        if ($this->security->isGranted(CalendarVoter::CREATE, $accompanyingCourse)) {
-            $menu
-                ->addChild('Create a new calendar in accompanying course', [
-                    'route' => 'chill_calendar_calendar_new',
-                    'routeParameters' => [
-                        'accompanying_period_id' => $accompanyingCourse->getId(),
-                    ],
-                ])
-                ->setExtras([
-                    'order' => 20,
-                    'icon' => 'plus',
-                ])
-            ;
-        }
-    }
-}
--- a/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteEventConverter.php
+++ b/src/Bundle/ChillCalendarBundle/RemoteCalendar/Connector/MSGraph/RemoteEventConverter.php
@@ -37,12 +37,12 @@ class RemoteEventConverter
     * valid when the remote string contains also a timezone, like in
     * lastModifiedDate.
     */
-    final public const REMOTE_DATETIMEZONE_FORMAT = 'Y-m-d\TH:i:s.u?P';
+    final public const REMOTE_DATETIMEZONE_FORMAT = 'Y-m-d\\TH:i:s.u?P';

    /**
     * Same as above, but sometimes the date is expressed with only 6 milliseconds.
     */
-    final public const REMOTE_DATETIMEZONE_FORMAT_ALT = 'Y-m-d\TH:i:s.uP';
+    final public const REMOTE_DATETIMEZONE_FORMAT_ALT = 'Y-m-d\\TH:i:s.uP';

    private const REMOTE_DATE_FORMAT = 'Y-m-d\TH:i:s.u0';

--- a/src/Bundle/ChillCalendarBundle/Resources/public/chill/chill.js
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/chill/chill.js
@@ -1,2 +1 @@
 import './scss/badge.scss';
-import './scss/calendar-list.scss';
--- a/src/Bundle/ChillCalendarBundle/Resources/public/chill/scss/calendar-list.scss
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/chill/scss/calendar-list.scss
@@ -1,26 +0,0 @@
-ul.calendar-list {
-    list-style-type: none;
-    padding: 0;
-    & > li {
-        display: inline-block;
-    }
-    & > li:nth-child(n+2) {
-        margin-left: 0.25rem;
-    }
-}
-
-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;
-    }
-}
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig
@@ -55,7 +55,7 @@
                        <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>
+                                    <span class="badge-user">{{ calendar.mainUser|chill_entity_render_box }}</span>
                                {% endif %}
                            </ul>
                        </div>
@@ -132,7 +132,7 @@
                                            <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') }}
+                                                    <b>{{ calendar.activity.createdBy|chill_entity_render_string }}</b>, {{ 'on'|trans }} {{ calendar.activity.createdAt|format_datetime('short', 'short') }}
                                                </span>
                                            </li>
                                            {% if is_granted('CHILL_ACTIVITY_SEE', calendar.activity) %}
--- a/src/Bundle/ChillCalendarBundle/Security/Voter/CalendarVoter.php
+++ b/src/Bundle/ChillCalendarBundle/Security/Voter/CalendarVoter.php
@@ -89,7 +89,7 @@ class CalendarVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
            switch ($attribute) {
                case self::SEE:
                case self::CREATE:
-                    if (AccompanyingPeriod::STEP_DRAFT === $subject->getStep() || AccompanyingPeriod::STEP_CLOSED === $subject->getStep()) {
+                    if (AccompanyingPeriod::STEP_DRAFT === $subject->getStep()) {
                        return false;
                    }

--- a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
@@ -26,7 +26,6 @@ The calendar item has been successfully removed.: Le rendez-vous a été supprim
 From the day: Du
 to the day: au
 Transform to activity: Transformer en échange
-Create a new calendar in accompanying course: Créer un rendez-vous dans le parcours
 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é
--- a/src/Bundle/ChillDocGeneratorBundle/Test/DocGenNormalizerTestAbstract.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Test/DocGenNormalizerTestAbstract.php
@@ -1,65 +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\DocGeneratorBundle\Test;
-
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-use Symfony\Component\Serializer\Normalizer\AbstractNormalizer;
-use Symfony\Component\Serializer\Normalizer\NormalizerInterface;
-
-/**
- * @template T of object
- */
-abstract class DocGenNormalizerTestAbstract extends KernelTestCase
-{
-    public function testNullValueHasSameKeysAsNull(): void
-    {
-        $normalizedObject = $this->getNormalizer()->normalize($this->provideNotNullObject(), 'docgen', [
-            AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => $this->provideDocGenExpectClass(),
-        ]);
-        $nullNormalizedObject = $this->getNormalizer()->normalize(null, 'docgen', [
-            AbstractNormalizer::GROUPS => ['docgen:read'], 'docgen:expects' => $this->provideDocGenExpectClass(),
-        ]);
-
-        self::assertEqualsCanonicalizing(array_keys($normalizedObject), array_keys($nullNormalizedObject));
-        self::assertArrayHasKey('isNull', $nullNormalizedObject, 'each object must have an "isNull" key');
-        self::assertTrue($nullNormalizedObject['isNull'], 'isNull key must be true for null objects');
-        self::assertFalse($normalizedObject['isNull'], 'isNull key must be false for null objects');
-
-        foreach ($normalizedObject as $key => $value) {
-            if (in_array($key, ['isNull', 'type'])) {
-                continue;
-            }
-
-            if (is_array($value)) {
-                if (array_is_list($value)) {
-                    self::assertEquals([], $nullNormalizedObject[$key], "list must be serialized as an empty array, in {$key}");
-                } else {
-                    self::assertEqualsCanonicalizing(array_keys($value), array_keys($nullNormalizedObject[$key]), "sub-object must have the same keys, in {$key}");
-                }
-            } elseif (is_string($value)) {
-                self::assertEquals('', $nullNormalizedObject[$key], 'strings must be ');
-            }
-        }
-    }
-
-    /**
-     * @return T
-     */
-    abstract public function provideNotNullObject(): object;
-
-    /**
-     * @return class-string<T>
-     */
-    abstract public function provideDocGenExpectClass(): string;
-
-    abstract public function getNormalizer(): NormalizerInterface;
-}
--- a/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php
@@ -313,19 +313,4 @@ class StoredObject implements Document, TrackCreationInterface

        return $this;
    }
-
-    public function saveHistory(): void
-    {
-        if ('' === $this->getFilename()) {
-            return;
-        }
-
-        $this->datas['history'][] = [
-            'filename' => $this->getFilename(),
-            'iv' => $this->getIv(),
-            'key_infos' => $this->getKeyInfos(),
-            'type' => $this->getType(),
-            'before' => (new \DateTimeImmutable('now'))->getTimestamp(),
-        ];
-    }
 }
--- a/src/Bundle/ChillDocStoreBundle/Form/DataMapper/StoredObjectDataMapper.php
+++ b/src/Bundle/ChillDocStoreBundle/Form/DataMapper/StoredObjectDataMapper.php
@@ -57,8 +57,8 @@ class StoredObjectDataMapper implements DataMapperInterface

        /** @var StoredObject $viewData */
        if ($viewData->getFilename() !== $forms['stored_object']->getData()['filename']) {
-            // we want to keep the previous history
-            $viewData->saveHistory();
+            // we do not want to erase the previous object
+            $viewData = new StoredObject();
        }

        $viewData->setFilename($forms['stored_object']->getData()['filename']);
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentActionButtonsGroup.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentActionButtonsGroup.vue
@@ -4,13 +4,13 @@
      Actions
    </button>
    <ul class="dropdown-menu">
-      <li v-if="props.canEdit && is_extension_editable(props.storedObject.type) && props.storedObject.status !== 'stored_object_created'">
+      <li v-if="props.canEdit && is_extension_editable(props.storedObject.type)">
        <wopi-edit-button :stored-object="props.storedObject" :classes="{'dropdown-item': true}" :execute-before-leave="props.executeBeforeLeave"></wopi-edit-button>
      </li>
      <li v-if="props.canEdit && is_extension_editable(props.storedObject.type) && props.davLink !== undefined && props.davLinkExpiration !== undefined">
        <desktop-edit-button :classes="{'dropdown-item': true}" :edit-link="props.davLink" :expiration-link="props.davLinkExpiration"></desktop-edit-button>
      </li>
-      <li v-if="props.storedObject.type != 'application/pdf' && is_extension_viewable(props.storedObject.type) && props.canConvertPdf && props.storedObject.status !== 'stored_object_created'">
+      <li v-if="props.storedObject.type != 'application/pdf' && is_extension_viewable(props.storedObject.type) && props.canConvertPdf">
        <convert-button :stored-object="props.storedObject" :filename="filename" :classes="{'dropdown-item': true}"></convert-button>
      </li>
      <li v-if="props.canDownload">
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/ConvertButton.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/ConvertButton.vue
@@ -13,7 +13,7 @@ import {reactive} from "vue";
 import {StoredObject, StoredObjectCreated} from "../../types";

 interface ConvertButtonConfig {
-  storedObject: StoredObject,
+  storedObject: StoredObject|StoredObjectCreated,
  classes: { [key: string]: boolean},
  filename?: string,
 };
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/WopiEditButton.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/WopiEditButton.vue
@@ -11,7 +11,7 @@ import {build_wopi_editor_link} from "./helpers";
 import {StoredObject, StoredObjectCreated, WopiEditButtonExecutableBeforeLeaveFunction} from "../../types";

 interface WopiEditButtonConfig {
-  storedObject: StoredObject,
+  storedObject: StoredObject|StoredObjectCreated,
  returnPath?: string,
  classes: {[k: string] : boolean},
  executeBeforeLeave?: WopiEditButtonExecutableBeforeLeaveFunction,
--- a/src/Bundle/ChillDocStoreBundle/Tests/Entity/StoredObjectTest.php
+++ b/src/Bundle/ChillDocStoreBundle/Tests/Entity/StoredObjectTest.php
@@ -1,53 +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\DocStoreBundle\Tests\Entity;
-
-use Chill\DocStoreBundle\Entity\StoredObject;
-use Symfony\Bundle\FrameworkBundle\Test\KernelTestCase;
-
-/**
- * @internal
- *
- * @coversNothing
- */
-class StoredObjectTest extends KernelTestCase
-{
-    public function testSaveHistory(): void
-    {
-        $storedObject = new StoredObject();
-        $storedObject
-            ->setFilename('test_0')
-            ->setIv([2, 4, 6, 8])
-            ->setKeyInfos(['key' => ['data0' => 'data0']])
-            ->setType('text/html');
-
-        $storedObject->saveHistory();
-
-        $storedObject
-            ->setFilename('test_1')
-            ->setIv([8, 10, 12])
-            ->setKeyInfos(['key' => ['data1' => 'data1']])
-            ->setType('text/text');
-
-        $storedObject->saveHistory();
-
-        self::assertEquals('test_0', $storedObject->getDatas()['history'][0]['filename']);
-        self::assertEquals([2, 4, 6, 8], $storedObject->getDatas()['history'][0]['iv']);
-        self::assertEquals(['key' => ['data0' => 'data0']], $storedObject->getDatas()['history'][0]['key_infos']);
-        self::assertEquals('text/html', $storedObject->getDatas()['history'][0]['type']);
-
-        self::assertEquals('test_1', $storedObject->getDatas()['history'][1]['filename']);
-        self::assertEquals([8, 10, 12], $storedObject->getDatas()['history'][1]['iv']);
-        self::assertEquals(['key' => ['data1' => 'data1']], $storedObject->getDatas()['history'][1]['key_infos']);
-        self::assertEquals('text/text', $storedObject->getDatas()['history'][1]['type']);
-    }
-}
--- a/src/Bundle/ChillDocStoreBundle/Tests/Form/StoredObjectTypeTest.php
+++ b/src/Bundle/ChillDocStoreBundle/Tests/Form/StoredObjectTypeTest.php
@@ -56,14 +56,14 @@ class StoredObjectTypeTest extends TypeTestCase
            {"filename":"abcdef","iv":[10, 15, 20, 30],"keyInfos":[],"type":"text/html","status":"object_store_created"}
            JSON];
        $model = new StoredObject();
-        $originalObjectId = spl_object_hash($model);
+        $originalObjectId = spl_object_id($model);
        $form = $this->factory->create(StoredObjectType::class, $model, ['has_title' => true]);

        $form->submit($formData);

        $this->assertTrue($form->isSynchronized());
        $model = $form->getData();
-        $this->assertEquals($originalObjectId, spl_object_hash($model));
+        $this->assertNotEquals($originalObjectId, spl_object_hash($model));
        $this->assertEquals('abcdef', $model->getFilename());
        $this->assertEquals([10, 15, 20, 30], $model->getIv());
        $this->assertEquals('text/html', $model->getType());
--- a/src/Bundle/ChillMainBundle/Controller/ExportController.php
+++ b/src/Bundle/ChillMainBundle/Controller/ExportController.php
@@ -632,7 +632,7 @@ class ExportController extends AbstractController
        }
    }

-    private function rebuildRawData(?string $key): array
+    private function rebuildRawData(string $key): array
    {
        if (null === $key) {
            throw $this->createNotFoundException('key does not exists');
--- a/src/Bundle/ChillMainBundle/Controller/UserGroupApiController.php
+++ 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 {}
--- a/src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadUserGroup.php
+++ 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)
+        ;
+    }
+}
--- 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,
+                            ],
+                        ],
+                    ],
+                ],
            ],
        ]);
    }
--- a/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ShortMessageCompilerPass.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/ShortMessageCompilerPass.php
@@ -43,7 +43,7 @@ class ShortMessageCompilerPass implements CompilerPassInterface
            $defaultTransporter = new Reference(NullShortMessageSender::class);
        } elseif ('ovh' === $dsn['scheme']) {
            if (!class_exists('\\'.\Ovh\Api::class)) {
-                throw new RuntimeException('Class \Ovh\Api not found');
+                throw new RuntimeException('Class \\Ovh\\Api not found');
            }

            foreach (['user', 'host', 'pass'] as $component) {
--- a/src/Bundle/ChillMainBundle/Entity/User.php
+++ b/src/Bundle/ChillMainBundle/Entity/User.php
@@ -216,13 +216,13 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter
        return $this->mainLocation;
    }

-    public function getMainScope(?\DateTimeImmutable $atDate = null): ?Scope
+    public function getMainScope(?\DateTimeImmutable $at = null): ?Scope
    {
-        $atDate ??= new \DateTimeImmutable('now');
+        $at ??= new \DateTimeImmutable('now');

        foreach ($this->scopeHistories as $scopeHistory) {
-            if ($atDate >= $scopeHistory->getStartDate() && (
-                null === $scopeHistory->getEndDate() || $atDate < $scopeHistory->getEndDate()
+            if ($at >= $scopeHistory->getStartDate() && (
+                null === $scopeHistory->getEndDate() || $at < $scopeHistory->getEndDate()
            )) {
                return $scopeHistory->getScope();
            }
@@ -265,13 +265,13 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter
        return $this->salt;
    }

-    public function getUserJob(?\DateTimeImmutable $atDate = null): ?UserJob
+    public function getUserJob(?\DateTimeImmutable $at = null): ?UserJob
    {
-        $atDate ??= new \DateTimeImmutable('now');
+        $at ??= new \DateTimeImmutable('now');

        foreach ($this->jobHistories as $jobHistory) {
-            if ($atDate >= $jobHistory->getStartDate() && (
-                null === $jobHistory->getEndDate() || $atDate < $jobHistory->getEndDate()
+            if ($at >= $jobHistory->getStartDate() && (
+                null === $jobHistory->getEndDate() || $at < $jobHistory->getEndDate()
            )) {
                return $jobHistory->getJob();
            }
@@ -285,11 +285,6 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter
        return $this->jobHistories;
    }

-    public function getUserScopeHistories(): Collection
-    {
-        return $this->scopeHistories;
-    }
-
    /**
     * @return ArrayCollection|UserJobHistory[]
     */
--- a/src/Bundle/ChillMainBundle/Entity/UserGroup.php
+++ b/src/Bundle/ChillMainBundle/Entity/UserGroup.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\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 = [];
+
+    /**
+     * @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;
+
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::TEXT, nullable: false, options: ['default' => '#ffffffff'])]
+    #[Serializer\Groups(['read'])]
+    private string $backgroundColor = '#ffffffff';
+
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::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: \Doctrine\DBAL\Types\Types::TEXT, nullable: false, options: ['default' => ''])]
+    #[Serializer\Groups(['read'])]
+    private string $excludeKey = '';
+
+    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;
+    }
+
+    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;
+    }
+}
--- a/src/Bundle/ChillMainBundle/Export/DataTransformerInterface.php
+++ b/src/Bundle/ChillMainBundle/Export/DataTransformerInterface.php
@@ -1,25 +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\MainBundle\Export;
-
-/**
- * Transform data from filter.
- *
- * This interface defines a method for transforming filter's form data before it is processed.
- *
- * You can implement this interface on @see{FilterInterface} or @see{AggregatorInterface}, to allow to transform existing data in saved exports
- * and replace it with some default values, or new default values.
- */
-interface DataTransformerInterface
-{
-    public function transformData(?array $before): array;
-}
--- a/src/Bundle/ChillMainBundle/Export/ExportManager.php
+++ b/src/Bundle/ChillMainBundle/Export/ExportManager.php
@@ -190,7 +190,7 @@ class ExportManager
            // throw an error if the export require other modifier, which is
            // not allowed when the export return a `NativeQuery`
            if (\count($export->supportsModifiers()) > 0) {
-                throw new \LogicException("The export with alias `{$exportAlias}` return ".'a `\Doctrine\ORM\NativeQuery` and supports modifiers, which is not allowed. Either the method `supportsModifiers` should return an empty array, or return a `Doctrine\ORM\QueryBuilder`');
+                throw new \LogicException("The export with alias `{$exportAlias}` return ".'a `\\Doctrine\\ORM\\NativeQuery` and supports modifiers, which is not allowed. Either the method `supportsModifiers` should return an empty array, or return a `Doctrine\\ORM\\QueryBuilder`');
            }
        } elseif ($query instanceof QueryBuilder) {
            // handle filters
@@ -203,7 +203,7 @@ class ExportManager
                'dql' => $query->getDQL(),
            ]);
        } else {
-            throw new \UnexpectedValueException('The method `intiateQuery` should return a `\Doctrine\ORM\NativeQuery` or a `Doctrine\ORM\QueryBuilder` object.');
+            throw new \UnexpectedValueException('The method `intiateQuery` should return a `\\Doctrine\\ORM\\NativeQuery` or a `Doctrine\\ORM\\QueryBuilder` object.');
        }

        $result = $export->getResult($query, $data[ExportType::EXPORT_KEY]);
--- a/src/Bundle/ChillMainBundle/Export/FilterInterface.php
+++ b/src/Bundle/ChillMainBundle/Export/FilterInterface.php
@@ -32,9 +32,6 @@ interface FilterInterface extends ModifierInterface

    /**
     * Get the default data, that can be use as "data" for the form.
-     *
-     * In case of adding new parameters to a filter, you can implement a @see{DataTransformerFilterInterface} to
-     * transforme the filters's data saved in an export to the desired state.
     */
    public function getFormDefaultData(): array;

--- a/src/Bundle/ChillMainBundle/Form/Type/Export/AggregatorType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Export/AggregatorType.php
@@ -11,9 +11,7 @@ declare(strict_types=1);

 namespace Chill\MainBundle\Form\Type\Export;

-use Chill\MainBundle\Export\DataTransformerInterface;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\CallbackTransformer;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -21,7 +19,9 @@ use Symfony\Component\OptionsResolver\OptionsResolver;

 class AggregatorType extends AbstractType
 {
-    public function buildForm(FormBuilderInterface $builder, array $options): void
+    public function __construct() {}
+
+    public function buildForm(FormBuilderInterface $builder, array $options)
    {
        $exportManager = $options['export_manager'];
        $aggregator = $exportManager->getAggregator($options['aggregator_alias']);
@@ -32,24 +32,17 @@ class AggregatorType extends AbstractType
                'required' => false,
            ]);

-        $aggregatorFormBuilder = $builder->create('form', FormType::class, [
+        $filterFormBuilder = $builder->create('form', FormType::class, [
            'compound' => true,
            'required' => false,
            'error_bubbling' => false,
        ]);
-        $aggregator->buildForm($aggregatorFormBuilder);
+        $aggregator->buildForm($filterFormBuilder);

-        if ($aggregator instanceof DataTransformerInterface) {
-            $aggregatorFormBuilder->addViewTransformer(new CallbackTransformer(
-                fn (?array $data) => $data,
-                fn (?array $data) => $aggregator->transformData($data),
-            ));
+        $builder->add($filterFormBuilder);
    }

-        $builder->add($aggregatorFormBuilder);
-    }
-
-    public function configureOptions(OptionsResolver $resolver): void
+    public function configureOptions(OptionsResolver $resolver)
    {
        $resolver->setRequired('aggregator_alias')
            ->setRequired('export_manager')
--- a/src/Bundle/ChillMainBundle/Form/Type/Export/FilterType.php
+++ b/src/Bundle/ChillMainBundle/Form/Type/Export/FilterType.php
@@ -11,10 +11,8 @@ declare(strict_types=1);

 namespace Chill\MainBundle\Form\Type\Export;

-use Chill\MainBundle\Export\DataTransformerInterface;
 use Chill\MainBundle\Export\FilterInterface;
 use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\CallbackTransformer;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
 use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\Form\FormBuilderInterface;
@@ -43,13 +41,6 @@ class FilterType extends AbstractType
        ]);
        $filter->buildForm($filterFormBuilder);

-        if ($filter instanceof DataTransformerInterface) {
-            $filterFormBuilder->addViewTransformer(new CallbackTransformer(
-                fn (?array $data) => $data,
-                fn (?array $data) => $filter->transformData($data),
-            ));
-        }
-
        $builder->add($filterFormBuilder);
    }

--- 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.
     */
--- a/src/Bundle/ChillMainBundle/Resources/public/chill/js/date.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/chill/js/date.ts
@@ -59,10 +59,6 @@ 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);
 }

--- 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/>.
 */

-import mime from 'mime';
+var mime = require('mime')

-export const download_report = (url, container) => {
+var download_report = (url, container) => {
    var download_text = container.dataset.downloadText,
        alias = container.dataset.alias;

@@ -43,14 +43,7 @@ export const download_report = (url, container) => {
                content = URL.createObjectURL(blob);
            }

-            const extensions = new Map();
-            extensions.set('application/vnd.openxmlformats-officedocument.spreadsheetml.sheet', 'xlsx');
-            extensions.set('application/vnd.oasis.opendocument.spreadsheet', 'ods');
-            extensions.set('application/vnd.ms-excel', 'xlsx');
-            extensions.set('text/csv', 'csv');
-            extensions.set('text/csv; charset=utf-8', 'csv');
-
-            extension = extensions.get(type);
+            extension = mime.getExtension(type);

            link.appendChild(document.createTextNode(download_text));
            link.classList.add("btn", "btn-action");
@@ -62,7 +55,7 @@ export const download_report = (url, container) => {
            container.innerHTML = "";
            container.appendChild(link);
        }).catch(function(error) {
-            console.error(error);
+            console.log(error);
            var problem_text =
                    document.createTextNode("Problem during download");

@@ -70,3 +63,5 @@ export const download_report = (url, container) => {
                .replaceChild(problem_text, container.firstChild);
        });
 };
+
+module.exports = download_report;
--- a/src/Bundle/ChillMainBundle/Resources/public/module/ckeditor5/editor_config.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/ckeditor5/editor_config.ts
@@ -39,5 +39,23 @@ 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 );
+        })
+    ;
+});
--- a/src/Bundle/ChillMainBundle/Resources/public/module/ckeditor5/index.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/module/ckeditor5/index.ts
@@ -1,15 +0,0 @@
-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'));
--- a/src/Bundle/ChillMainBundle/Resources/public/page/export/download-export.js
+++ b/src/Bundle/ChillMainBundle/Resources/public/page/export/download-export.js
@@ -1,16 +0,0 @@
-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);
-});
--- a/src/Bundle/ChillMainBundle/Resources/public/types.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/types.ts
@@ -1,6 +1,6 @@
 export interface DateTime {
    datetime: string;
-  datetime8601: string
+    datetime8601: string;
 }

 export interface Civility {
@@ -12,8 +12,8 @@ export interface Job {
    id: number;
    type: "user_job";
    label: {
-    "fr": string; // could have other key. How to do that in ts ?
-  }
+        fr: string; // could have other key. How to do that in ts ?
+    };
 }

 export interface Center {
@@ -26,8 +26,8 @@ export interface Scope {
    id: number;
    type: "scope";
    name: {
-    "fr": string
-  }
+        fr: string;
+    };
 }

 export interface User {
@@ -42,15 +42,26 @@ export interface User {
    // todo: mainCenter; mainJob; etc..
 }

+export interface UserGroup {
+    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;
-}
+};

 export interface Postcode {
    id: number;
@@ -62,7 +73,7 @@ export interface Postcode {
 export type Point = {
    type: "Point";
    coordinates: [lat: number, lon: number];
-}
+};

 export interface Country {
    id: number;
@@ -70,7 +81,7 @@ export interface Country {
    code: string;
 }

-export type AddressRefStatus = 'match'|'to_review'|'reviewed';
+export type AddressRefStatus = "match" | "to_review" | "reviewed";

 export interface Address {
    type: "address";
@@ -98,7 +109,7 @@ export interface Address {
 }

 export interface AddressWithPoint extends Address {
-  point: Point
+    point: Point;
 }

 export interface AddressReference {
@@ -138,7 +149,7 @@ export interface Location {
    createdBy: User | null;
    updatedAt: DateTime | null;
    updatedBy: User | null;
-  email: string | null
+    email: string | null;
    name: string;
    phonenumber1: string | null;
    phonenumber2: string | null;
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/DashboardWidgets/NewsItem.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/DashboardWidgets/NewsItem.vue
@@ -139,7 +139,7 @@ const postprocess = (html: string): string => {
 }

 const convertMarkdownToHtml = (markdown: string): string => {
-    marked.use({'hooks': {postprocess, preprocess}, 'async': false});
+    marked.use({'hooks': {postprocess, preprocess}});
    const rawHtml = marked(markdown) as string;
    return rawHtml;
 };
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/UserRenderBoxBadge.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/Entity/UserRenderBoxBadge.vue
@@ -1,13 +1,24 @@
 <template>
    <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 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>
--- a/src/Bundle/ChillMainBundle/Resources/views/Dev/dev.assets.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Dev/dev.assets.html.twig
@@ -1,306 +0,0 @@
-{% 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 %}
--- a/src/Bundle/ChillMainBundle/Resources/views/Dev/dev.assets.test1.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Dev/dev.assets.test1.html.twig
@@ -1,84 +0,0 @@
-{% 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 %}
--- a/src/Bundle/ChillMainBundle/Resources/views/Dev/dev.assets.test2.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Dev/dev.assets.test2.html.twig
@@ -1,78 +0,0 @@
-{% 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 %}
--- a/src/Bundle/ChillMainBundle/Resources/views/Entity/CommentEmbeddable.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Entity/CommentEmbeddable.html.twig
@@ -40,7 +40,7 @@
                        {{ 'by_user'|trans ~ ' ' }}
                    {% endif %}
                    <span class="user">
-                        {{ user|chill_entity_render_box({'at_date': comment.date}) }}
+                        {{ user|chill_entity_render_box(options['user']) }}
                    </span>
                {% endif %}
            </div>
--- a/src/Bundle/ChillMainBundle/Resources/views/Entity/user.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Entity/user.html.twig
@@ -1,10 +1,10 @@
 <span class="chill-entity entity-user">
    {{- user.label }}
-    {%- if opts['user_job'] and user.userJob(opts['at_date']) is not null %}
-        <span class="user-job">({{ user.userJob(opts['at_date']).label|localize_translatable_string }})</span>
+    {%- if opts['user_job'] and user.userJob(opts['at']) is not null %}
+        <span class="user-job">({{ user.userJob(opts['at']).label|localize_translatable_string }})</span>
    {%- endif -%}
-    {%- if opts['main_scope'] and user.mainScope(opts['at_date']) is not null %}
-    <span class="main-scope">({{ user.mainScope(opts['at_date']).name|localize_translatable_string }})</span>
+    {%- if opts['main_scope'] and user.mainScope(opts['at']) is not null %}
+    <span class="main-scope">({{ user.mainScope(opts['at']).name|localize_translatable_string }})</span>
    {%- endif -%}
    {%- if opts['absence'] and user.isAbsent %}
        <span class="badge bg-danger rounded-pill" title="{{ 'absence.Absent'|trans|escape('html_attr') }}">{{ 'absence.A'|trans }}</span>
--- a/src/Bundle/ChillMainBundle/Resources/views/Export/download.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Export/download.html.twig
@@ -22,13 +22,15 @@

 {% block js %}
 <script type="text/javascript">
-window.export_generate_url = "{{  path('chill_main_export_generate', { 'alias' : alias } ) }}";
-</script>
-{{ encore_entry_link_tags('page_download_exports') }}
-{% endblock %}
+window.addEventListener("DOMContentLoaded", function(e) {
+    var url = "{{ path('chill_main_export_generate', { 'alias' : alias } ) }}",
+        query = window.location.search,
+        container = document.querySelector("#download_container")
+        ;

-{% block css %}
-    {{ encore_entry_script_tags('page_download_exports') }}
+    chill.download_report(url+query, container);
+});
+</script>
 {% endblock %}

 {% block content %}
--- a/src/Bundle/ChillMainBundle/Resources/views/Menu/quick_menu.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Menu/quick_menu.html.twig
@@ -1,20 +0,0 @@
-{% if menus|length > 0 %}
-<li class="dropdown">
-    <a class="dropdown-toggle btn btn-sm btn-outline-primary"
-        href="#"
-        role="button"
-        data-bs-toggle="dropdown"
-        aria-expanded="false">
-        <i class="fa fa-flash"></i>
-    </a>
-    <div class="dropdown-menu">
-        {% for menu in menus %}
-            <a class="dropdown-item"
-                href="{{ menu.uri }}"
-                ><i class="fa fa-{{- menu.extras.icon }} fa-fw"></i>
-                {{ menu.label|trans }}
-            </a>
-        {% endfor %}
-    </div>
-</li>
-{% endif %}
--- a/src/Bundle/ChillMainBundle/Resources/views/Notification/_list_item.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/_list_item.html.twig
@@ -21,7 +21,7 @@
                        </span>
                        {% if not c.notification.isSystem %}
                            <span class="badge-user">
-                                    {{ c.notification.sender|chill_entity_render_string({'at_date': c.notification.date}) }}
+                                    {{ c.notification.sender|chill_entity_render_string }}
                                </span>
                        {% else %}
                            <span class="badge-user system">{{ 'notification.is_system'|trans }}</span>
@@ -53,7 +53,7 @@
                        {% endif %}
                        {% for a in c.notification.addressees %}
                            <span class="badge-user">
-                                {{ a|chill_entity_render_string({'at_date': c.notification.date}) }}
+                                {{ a|chill_entity_render_string }}
                            </span>
                        {% endfor %}
                        {% for a in c.notification.addressesEmails %}
--- a/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Notification/show.html.twig
@@ -1,7 +1,7 @@
 {% extends "@ChillMain/layout.html.twig"  %}

 {% block title 'notification.show notification from %sender%'|trans(
-    { '%sender%': notification.sender|chill_entity_render_string({'at_date': notification.date}) }
+    { '%sender%': notification.sender|chill_entity_render_string }
 ) ~ ' ' ~ notification.title %}

 {% block js %}
--- a/src/Bundle/ChillMainBundle/Resources/views/Workflow/_decision.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_decision.html.twig
@@ -31,14 +31,14 @@
                <div class="row">
                    <div class="col-sm-12">
                        {{ 'By'|trans }}
-                        {{ step.previous.transitionBy|chill_entity_render_box({'at_date': step.previous.transitionAt }) }},
+                        {{ step.previous.transitionBy|chill_entity_render_box }},
                        {{ step.previous.transitionAt|format_datetime('short', 'short') }}
                    </div>
                </div>
            {% else %}
                <div class="row">
                    <div class="col-sm-4">{{ 'workflow.Created by'|trans }}</div>
-                    <div class="col-sm-8">{{ step.entityWorkflow.createdBy|chill_entity_render_box({'at_date': step.entityWorkflow.createdAt}) }}</div>
+                    <div class="col-sm-8">{{ step.entityWorkflow.createdBy|chill_entity_render_box }}</div>
                </div>
                <div class="row">
                    <div class="col-sm-4">{{ 'Le'|trans }}</div>
@@ -110,8 +110,8 @@
            {% if entity_workflow.currentStep.destUserByAccessKey|length > 0 %}
                <p><b>{{ 'workflow.Those users are also granted to apply a transition by using an access key'|trans }}&nbsp;:</b></p>
                <ul>
-                    {% for u in entity_workflow.currentStepChained.destUserByAccessKey %}
-                        <li>{{ u|chill_entity_render_box({'at_date': entity_workflow.currentStepChained.previous.transitionAt }) }}</li>
+                    {% for u in entity_workflow.currentStep.destUserByAccessKey %}
+                        <li>{{ u|chill_entity_render_box }}</li>
                    {% endfor %}
                </ul>
            {% endif %}
--- a/src/Bundle/ChillMainBundle/Resources/views/Workflow/_history.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/_history.html.twig
@@ -42,7 +42,7 @@
                    <div class="item-col" style="width: inherit;">
                        {% if step.transitionBy is not null %}
                            <div>
-                                {{ step.transitionBy|chill_entity_render_box({'at_date': step.transitionAt}) }}
+                                {{ step.transitionBy|chill_entity_render_box }}
                            </div>
                        {% endif %}
                        <div>
@@ -76,7 +76,7 @@
                            <p><b>{{ 'workflow.Users allowed to apply transition'|trans }}&nbsp;: </b></p>
                            <ul>
                                {% for u in step.destUser %}
-                                    <li>{{ u|chill_entity_render_box({'at_date': step.previous.transitionAt}) }}</li>
+                                    <li>{{ u|chill_entity_render_box }}</li>
                                {% endfor %}
                            </ul>
                        {% endif %}
@@ -85,7 +85,7 @@
                            <p><b>{{ 'workflow.Users put in Cc'|trans }}&nbsp;: </b></p>
                            <ul>
                                {% for u in step.ccUser %}
-                                    <li>{{ u|chill_entity_render_box({'at_date': step.previous.transitionAt}) }}</li>
+                                    <li>{{ u|chill_entity_render_box }}</li>
                                {% endfor %}
                            </ul>
                        {% endif %}
@@ -103,7 +103,7 @@
                            <p><b>{{ 'workflow.Those users are also granted to apply a transition by using an access key'|trans }}&nbsp;:</b></p>
                            <ul>
                                {% for u in step.destUserByAccessKey %}
-                                    <li>{{ u|chill_entity_render_box({'at_date': step.previous.transitionAt}) }}</li>
+                                    <li>{{ u|chill_entity_render_box }}</li>
                                {% endfor %}
                            </ul>
                        {% endif %}
--- a/src/Bundle/ChillMainBundle/Resources/views/Workflow/macro_breadcrumb.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Workflow/macro_breadcrumb.html.twig
@@ -3,7 +3,7 @@
        {% if step.previous is not null %}
            <li>
                <span class="item-key">{{ 'By'|trans ~ ' : ' }}</span>
-                <b>{{ step.previous.transitionBy|chill_entity_render_box({'at_date': step.previous.transitionAt }) }}</b>
+                <b>{{ step.previous.transitionBy|chill_entity_render_box }}</b>
            </li>
            <li>
                <span class="item-key">{{ 'Le'|trans ~ ' : ' }}</span>
@@ -12,19 +12,19 @@
            <li>
                <span class="item-key">{{ 'workflow.For'|trans ~ ' : ' }}</span>
                <b>
-                    {% for d in step.destUser %}{{ d|chill_entity_render_string({'at_date': step.previous.transitionAt}) }}{% if not loop.last %}, {% endif %}{% endfor %}
+                    {% for d in step.destUser %}{{ d|chill_entity_render_string }}{% if not loop.last %}, {% endif %}{% endfor %}
                </b>
            </li>
            <li>
                <span class="item-key">{{ 'workflow.Cc'|trans ~ ' : ' }}</span>
                <b>
-                    {% for u in step.ccUser %}{{ u|chill_entity_render_string({'at_date': step.previous.transitionAt }) }}{% if not loop.last %}, {% endif %}{% endfor %}
+                    {% for u in step.ccUser %}{{ u|chill_entity_render_string }}{% if not loop.last %}, {% endif %}{% endfor %}
                </b>
            </li>
        {% else %}
            <li>
                <span class="item-key">{{ 'workflow.Created by'|trans ~ ' : ' }}</span>
-                <b>{{ step.entityWorkflow.createdBy|chill_entity_render_box({'at_date': step.entityWorkflow.createdAt }) }}</b>
+                <b>{{ step.entityWorkflow.createdBy|chill_entity_render_box }}</b>
            </li>
            <li>
                <span class="item-key">{{ 'Le'|trans ~ ' : ' }}</span>
--- a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
@@ -69,6 +69,7 @@
                    </div>
                {% endif %}

+                {% block wrapping_content %}
                    {% block content %}
                        <div class="col-8 main_search">
                            {% if app.user.isAbsent %}
@@ -99,6 +100,7 @@
                        {% include '@ChillMain/Homepage/index.html.twig' %}

                    {% endblock %}
+                {% endblock %}

            </div>
        {% endblock %}
--- a/src/Bundle/ChillMainBundle/Routing/MenuTwig.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuTwig.php
@@ -11,6 +11,8 @@ declare(strict_types=1);

 namespace Chill\MainBundle\Routing;

+use Symfony\Component\DependencyInjection\ContainerAwareInterface;
+use Symfony\Component\DependencyInjection\ContainerInterface;
 use Twig\Environment;
 use Twig\Extension\AbstractExtension;
 use Twig\TwigFunction;
@@ -18,8 +20,10 @@ use Twig\TwigFunction;
 /**
 * Add the filter 'chill_menu'.
 */
-class MenuTwig extends AbstractExtension
+class MenuTwig extends AbstractExtension implements ContainerAwareInterface
 {
+    private ?ContainerInterface $container = null;
+
    /**
     * the default parameters for chillMenu.
     *
@@ -80,4 +84,9 @@ class MenuTwig extends AbstractExtension
    {
        return 'chill_menu';
    }
+
+    public function setContainer(?ContainerInterface $container = null)
+    {
+        $this->container = $container;
+    }
 }
--- a/src/Bundle/ChillMainBundle/Search/Utils/ExtractDateFromPattern.php
+++ b/src/Bundle/ChillMainBundle/Search/Utils/ExtractDateFromPattern.php
@@ -14,9 +14,9 @@ namespace Chill\MainBundle\Search\Utils;
 class ExtractDateFromPattern
 {
    private const DATE_PATTERN = [
-        ['([12]\d{3}-(0[1-9]|1[0-2])-(0[1-9]|[12]\d|3[01]))', 'Y-m-d'], // 1981-05-12
-        ['((0[1-9]|[12]\d|3[01])\/(0[1-9]|1[0-2])\/([12]\d{3}))', 'd/m/Y'], // 15/12/1980
-        ['((0[1-9]|[12]\d|3[01])-(0[1-9]|1[0-2])-([12]\d{3}))', 'd-m-Y'], // 15/12/1980
+        ['([12]\\d{3}-(0[1-9]|1[0-2])-(0[1-9]|[12]\\d|3[01]))', 'Y-m-d'], // 1981-05-12
+        ['((0[1-9]|[12]\\d|3[01])\\/(0[1-9]|1[0-2])\\/([12]\\d{3}))', 'd/m/Y'], // 15/12/1980
+        ['((0[1-9]|[12]\\d|3[01])-(0[1-9]|1[0-2])-([12]\\d{3}))', 'd-m-Y'], // 15/12/1980
    ];

    public function extractDates(string $subject): SearchExtractionResult
--- a/src/Bundle/ChillMainBundle/Search/Utils/ExtractPhonenumberFromPattern.php
+++ b/src/Bundle/ChillMainBundle/Search/Utils/ExtractPhonenumberFromPattern.php
@@ -16,7 +16,7 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;

 class ExtractPhonenumberFromPattern
 {
-    private const PATTERN = '([\+]{0,1}[0-9\ ]{5,})';
+    private const PATTERN = '([\\+]{0,1}[0-9\\ ]{5,})';

    private readonly string $defaultCarrierCode;

--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowStepNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/EntityWorkflowStepNormalizer.php
@@ -52,7 +52,7 @@ class EntityWorkflowStepNormalizer implements NormalizerAwareInterface, Normaliz
            $data['transitionPreviousBy'] = $this->normalizer->normalize(
                $previous->getTransitionBy(),
                $format,
-                [...$context, UserNormalizer::AT_DATE => $previous->getTransitionAt()]
+                $context
            );
            $data['transitionPreviousAt'] = $this->normalizer->normalize(
                $previous->getTransitionAt(),
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/NotificationNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/NotificationNormalizer.php
@@ -45,7 +45,7 @@ class NotificationNormalizer implements NormalizerAwareInterface, NormalizerInte
            'message' => $object->getMessage(),
            'relatedEntityClass' => $object->getRelatedEntityClass(),
            'relatedEntityId' => $object->getRelatedEntityId(),
-            'sender' => $this->normalizer->normalize($object->getSender(), $format, [...$context, UserNormalizer::AT_DATE => $object->getDate()]),
+            'sender' => $this->normalizer->normalize($object->getSender(), $format, $context),
            'title' => $object->getTitle(),
            'entity' => null !== $entity ? $this->normalizer->normalize($entity, $format, $context) : null,
        ];
--- a/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php
+++ b/src/Bundle/ChillMainBundle/Serializer/Normalizer/UserNormalizer.php
@@ -19,7 +19,6 @@ use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\UserJob;
 use Chill\MainBundle\Templating\Entity\UserRender;
 use libphonenumber\PhoneNumber;
-use Symfony\Component\Clock\ClockInterface;
 use Symfony\Component\Serializer\Normalizer\ContextAwareNormalizerInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerAwareTrait;
@@ -28,8 +27,6 @@ class UserNormalizer implements ContextAwareNormalizerInterface, NormalizerAware
 {
    use NormalizerAwareTrait;

-    final public const AT_DATE = 'chill:user:at_date';
-
    final public const NULL_USER = [
        'type' => 'user',
        'id' => '',
@@ -41,16 +38,10 @@ class UserNormalizer implements ContextAwareNormalizerInterface, NormalizerAware
        'isAbsent' => false,
    ];

-    public function __construct(private readonly UserRender $userRender, private readonly ClockInterface $clock) {}
+    public function __construct(private readonly UserRender $userRender) {}

-    /**
-     * @param mixed|null $format
-     *
-     * @throws \Symfony\Component\Serializer\Exception\ExceptionInterface
-     */
    public function normalize($object, $format = null, array $context = [])
    {
-        /** @var array{"chill:user:at_date"?: \DateTimeImmutable|\DateTime} $context */
        /** @var User $object */
        $userJobContext = array_merge(
            $context,
@@ -81,23 +72,18 @@ class UserNormalizer implements ContextAwareNormalizerInterface, NormalizerAware
            return [...self::NULL_USER, 'phonenumber' => $this->normalizer->normalize(null, $format, $phonenumberContext), 'civility' => $this->normalizer->normalize(null, $format, $civilityContext), 'user_job' => $this->normalizer->normalize(null, $format, $userJobContext), 'main_center' => $this->normalizer->normalize(null, $format, $centerContext), 'main_scope' => $this->normalizer->normalize(null, $format, $scopeContext), 'current_location' => $this->normalizer->normalize(null, $format, $locationContext), 'main_location' => $this->normalizer->normalize(null, $format, $locationContext)];
        }

-        $at = $context[self::AT_DATE] ?? $this->clock->now();
-        if ($at instanceof \DateTime) {
-            $at = \DateTimeImmutable::createFromMutable($at);
-        }
-
        $data = [
            'type' => 'user',
            'id' => $object->getId(),
            'username' => $object->getUsername(),
-            'text' => $this->userRender->renderString($object, ['at_date' => $at]),
+            'text' => $this->userRender->renderString($object, []),
            'text_without_absent' => $this->userRender->renderString($object, ['absence' => false]),
            'label' => $object->getLabel(),
            'email' => (string) $object->getEmail(),
            'phonenumber' => $this->normalizer->normalize($object->getPhonenumber(), $format, $phonenumberContext),
-            'user_job' => $this->normalizer->normalize($object->getUserJob($at), $format, $userJobContext),
+            'user_job' => $this->normalizer->normalize($object->getUserJob(), $format, $userJobContext),
            'main_center' => $this->normalizer->normalize($object->getMainCenter(), $format, $centerContext),
-            'main_scope' => $this->normalizer->normalize($object->getMainScope($at), $format, $scopeContext),
+            'main_scope' => $this->normalizer->normalize($object->getMainScope(), $format, $scopeContext),
            'isAbsent' => $object->isAbsent(),
        ];

--- 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.1.1';
+    private const RELEASE = 'https://gitea.champs-libres.be/api/v1/repos/Chill-project/belgian-bestaddresses-transform/releases/tags/v1.0.0';

    public function __construct(private readonly HttpClientInterface $client, private readonly AddressReferenceBaseImporter $baseImporter, private readonly AddressToReferenceMatcher $addressToReferenceMatcher) {}

--- a/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php
+++ b/src/Bundle/ChillMainBundle/Templating/Entity/UserRender.php
@@ -12,14 +12,8 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Templating\Entity;

 use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use DateTime;
-use DateTimeImmutable;
-use Symfony\Component\Clock\ClockInterface;
+use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Symfony\Contracts\Translation\TranslatorInterface;
-use Twig\Error\LoaderError;
-use Twig\Error\RuntimeError;
-use Twig\Error\SyntaxError;

 /**
 * @implements ChillEntityRenderInterface<User>
@@ -30,31 +24,15 @@ class UserRender implements ChillEntityRenderInterface
        'main_scope' => true,
        'user_job' => true,
        'absence' => true,
-        'at_date' => null, // instanceof DateTimeInterface
+        'at' => null,
    ];

-    public function __construct(
-        private readonly TranslatableStringHelperInterface $translatableStringHelper,
-        private readonly \Twig\Environment $engine,
-        private readonly TranslatorInterface $translator,
-        private readonly ClockInterface $clock,
-    ) {}
+    public function __construct(private readonly TranslatableStringHelper $translatableStringHelper, private readonly \Twig\Environment $engine, private readonly TranslatorInterface $translator) {}

-    /**
-     * @throws LoaderError
-     * @throws RuntimeError
-     * @throws SyntaxError
-     */
    public function renderBox($entity, array $options): string
    {
        $opts = \array_merge(self::DEFAULT_OPTIONS, $options);

-        if (null === $opts['at_date']) {
-            $opts['at_date'] = $this->clock->now();
-        } elseif ($opts['at_date'] instanceof \DateTime) {
-            $opts['at_date'] = \DateTimeImmutable::createFromMutable($opts['at_date']);
-        }
-
        return $this->engine->render('@ChillMain/Entity/user.html.twig', [
            'user' => $entity,
            'opts' => $opts,
@@ -65,24 +43,16 @@ class UserRender implements ChillEntityRenderInterface
    {
        $opts = \array_merge(self::DEFAULT_OPTIONS, $options);

-        //        $immutableAtDate = $opts['at_date'] instanceOf DateTime ? DateTimeImmutable::createFromMutable($opts['at_date']) : $opts['at_date'];
-
-        if (null === $opts['at_date']) {
-            $opts['at_date'] = $this->clock->now();
-        } elseif ($opts['at_date'] instanceof \DateTime) {
-            $opts['at_date'] = \DateTimeImmutable::createFromMutable($opts['at_date']);
-        }
-
        $str = $entity->getLabel();

-        if (null !== $entity->getUserJob($opts['at_date']) && $opts['user_job']) {
+        if (null !== $entity->getUserJob($opts['at']) && $opts['user_job']) {
            $str .= ' ('.$this->translatableStringHelper
-                ->localize($entity->getUserJob($opts['at_date'])->getLabel()).')';
+                ->localize($entity->getUserJob($opts['at'])->getLabel()).')';
        }

-        if (null !== $entity->getMainScope($opts['at_date']) && $opts['main_scope']) {
+        if (null !== $entity->getMainScope($opts['at']) && $opts['main_scope']) {
            $str .= ' ('.$this->translatableStringHelper
-                ->localize($entity->getMainScope($opts['at_date'])->getName()).')';
+                ->localize($entity->getMainScope($opts['at'])->getName()).')';
        }

        if ($entity->isAbsent() && $opts['absence']) {
--- a/src/Bundle/ChillMainBundle/Test/Export/AbstractAggregatorTest.php
+++ b/src/Bundle/ChillMainBundle/Test/Export/AbstractAggregatorTest.php
@@ -338,11 +338,15 @@ abstract class AbstractAggregatorTest extends KernelTestCase
                    .'is a string or an be converted to a string', $key)
            );

-            $head = \call_user_func($closure, '_header');
-
-            self::assertIsString($head);
-            self::assertNotEquals('', $head);
-            self::assertNotEquals('_header', $head);
+            $this->assertTrue(
+                // conditions
+                \is_string((string) \call_user_func($closure, '_header'))
+                && !empty(\call_user_func($closure, '_header'))
+                && '_header' !== \call_user_func($closure, '_header'),
+                // message
+                sprintf('Test that the callable return by `getLabels` for key %s '
+                .'can provide an header', $key)
+            );
        }
    }

--- 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));
+    }
 }
--- a/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/UserNormalizerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Serializer/Normalizer/UserNormalizerTest.php
@@ -25,7 +25,6 @@ use libphonenumber\PhoneNumberUtil;
 use PHPUnit\Framework\TestCase;
 use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
-use Symfony\Component\Clock\MockClock;
 use Symfony\Component\Serializer\Exception\ExceptionInterface;
 use Symfony\Component\Serializer\Normalizer\NormalizerInterface;

@@ -123,9 +122,7 @@ final class UserNormalizerTest extends TestCase
        $userRender = $this->prophesize(UserRender::class);
        $userRender->renderString(Argument::type(User::class), Argument::type('array'))->willReturn($user ? $user->getLabel() : '');

-        $clock = new MockClock(new \DateTimeImmutable('now'));
-
-        $normalizer = new UserNormalizer($userRender->reveal(), $clock);
+        $normalizer = new UserNormalizer($userRender->reveal());
        $normalizer->setNormalizer(new class () implements NormalizerInterface {
            public function normalize($object, ?string $format = null, array $context = [])
            {
--- a/src/Bundle/ChillMainBundle/Tests/Templating/Entity/UserRenderTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Templating/Entity/UserRenderTest.php
@@ -1,109 +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 Templating\Entity;
-
-use Chill\MainBundle\Entity\Scope;
-use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Entity\UserJob;
-use Chill\MainBundle\Templating\Entity\UserRender;
-use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use PHPUnit\Framework\TestCase;
-use Prophecy\Argument;
-use Prophecy\PhpUnit\ProphecyTrait;
-use Symfony\Component\Clock\MockClock;
-use Symfony\Contracts\Translation\TranslatorInterface;
-use Twig\Environment;
-
-/**
- * @internal
- *
- * @coversNothing
- */
-class UserRenderTest extends TestCase
-{
-    use ProphecyTrait;
-
-    public function testRenderUserWithJobAndScopeAtCertainDate(): void
-    {
-        // Create a user with a certain user job
-
-        $user = new User();
-        $userJobA = new UserJob();
-        $scopeA = new Scope();
-
-        $userJobA->setLabel(['fr' => 'assistant social'])
-            ->setActive(true);
-        $scopeA->setName(['fr' => 'service A']);
-        $user->setLabel('BOB ISLA');
-
-        $userJobB = new UserJob();
-        $scopeB = new Scope();
-
-        $userJobB->setLabel(['fr' => 'directrice'])
-            ->setActive(true);
-        $scopeB->setName(['fr' => 'service B']);
-
-        $userJobHistoryA = (new User\UserJobHistory())
-            ->setUser($user)
-            ->setJob($userJobA)
-            ->setStartDate(new \DateTimeImmutable('2023-11-01 12:00:00'))
-            ->setEndDate(new \DateTimeImmutable('2023-11-30 00:00:00'));
-
-        $userScopeHistoryA = (new User\UserScopeHistory())
-            ->setUser($user)
-            ->setScope($scopeA)
-            ->setStartDate(new \DateTimeImmutable('2023-11-01 12:00:00'))
-            ->setEndDate(new \DateTimeImmutable('2023-11-30 00:00:00'));
-
-        $userJobHistoryB = (new User\UserJobHistory())
-            ->setUser($user)
-            ->setJob($userJobB)
-            ->setStartDate(new \DateTimeImmutable('2023-12-01 12:00:00'));
-
-        $userScopeHistoryB = (new User\UserScopeHistory())
-            ->setUser($user)
-            ->setScope($scopeB)
-            ->setStartDate(new \DateTimeImmutable('2023-12-01 12:00:00'));
-
-        $user->getUserJobHistories()->add($userJobHistoryA);
-        $user->getUserScopeHistories()->add($userScopeHistoryA);
-
-        $user->getUserJobHistories()->add($userJobHistoryB);
-        $user->getUserScopeHistories()->add($userScopeHistoryB);
-
-        // Create renderer
-        $translatableStringHelperMock = $this->prophesize(TranslatableStringHelperInterface::class);
-        $translatableStringHelperMock->localize(Argument::type('array'))->will(fn ($args) => $args[0]['fr']);
-
-        $engineMock = $this->createMock(Environment::class);
-        $translatorMock = $this->createMock(TranslatorInterface::class);
-        $clock = new MockClock(new \DateTimeImmutable('2023-12-15 12:00:00'));
-
-        $renderer = new UserRender($translatableStringHelperMock->reveal(), $engineMock, $translatorMock, $clock);
-
-        $optionsNoDate['at_date'] = null;
-        $options['at_date'] = new \DateTime('2023-11-25 12:00:00');
-        $optionsTwo['at_date'] = new \DateTime('2024-01-30 12:00:00');
-
-        // Check that the user render for the first activity corresponds with the first user job
-        $expectedStringA = 'BOB ISLA (assistant social) (service A)';
-        $this->assertEquals($expectedStringA, $renderer->renderString($user, $options));
-
-        // Check that the user render for the second activity corresponds with the second user job
-        $expectedStringB = 'BOB ISLA (directrice) (service B)';
-        $this->assertEquals($expectedStringB, $renderer->renderString($user, $optionsTwo));
-
-        // Check that the user renders the job and scope that is active now, when no date is given
-        $expectedStringC = 'BOB ISLA (directrice) (service B)';
-        $this->assertEquals($expectedStringC, $renderer->renderString($user, $optionsNoDate));
-    }
-}
--- a/src/Bundle/ChillMainBundle/Tests/Validation/Validator/UserGroupDoNotExcludeTest.php
+++ 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();
+    }
+}
--- a/src/Bundle/ChillMainBundle/Validation/Constraint/UserGroupDoNotExclude.php
+++ 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;
+    }
+}
--- a/src/Bundle/ChillMainBundle/Validation/Validator/UserGroupDoNotExclude.php
+++ 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();
+            }
+        }
+    }
+}
--- 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:
@@ -908,3 +944,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/UserGroup'
+                403:
+                    description: "Unauthorized"
--- 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 CKEditorTranslationsPlugin( {
+        .addPlugin( new CKEditorWebpackPlugin( {
            language: 'fr',
            addMainLanguageTranslationsToAllAssets: true,
            verbose: !encore.isProduction(),
@@ -52,14 +52,12 @@ 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);

@@ -67,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');
+    encore.addEntry('mod_ckeditor5', __dirname + '/Resources/public/module/ckeditor5/index.js');
    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');
--- a/src/Bundle/ChillMainBundle/config/services/routing.yaml
+++ b/src/Bundle/ChillMainBundle/config/services/routing.yaml
@@ -20,5 +20,9 @@ services:

    chill.main.twig.chill_menu:
        class: Chill\MainBundle\Routing\MenuTwig
+        arguments:
+            - "@chill.main.menu_composer"
+        calls:
+            - [setContainer, ["@service_container"]]
        tags:
            - { name: twig.extension }
--- 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:
--- a/src/Bundle/ChillMainBundle/migrations/Version20240416145021.php
+++ 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');
+    }
+}
--- a/src/Bundle/ChillMainBundle/migrations/Version20240422091752.php
+++ 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');
+    }
+}
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod.php
@@ -707,24 +707,19 @@ class AccompanyingPeriod implements
    public function getNextCalendarsForPerson(Person $person, $limit = 5): ReadableCollection
    {
        $today = new \DateTimeImmutable('today');
+        $criteria = Criteria::create()
+            ->where(Criteria::expr()->gte('startDate', $today))
+            // ->andWhere(Criteria::expr()->memberOf('persons', $person))
+            ->orderBy(['startDate' => 'DESC'])
+            ->setMaxResults($limit * 2);

-        $criteria = Criteria::create();
-        $expr = Criteria::expr();
-
-        $criteria
-            ->where(
-                $expr->gte('startDate', $today),
-            )
-            ->orderBy(['startDate' => 'ASC']);
-
-        $criteriaByPerson = Criteria::create();
-        $criteriaByPerson
-            ->where(
-                $expr->memberOf('persons', $person)
-            )
-            ->setMaxResults($limit);
-
-        return $this->calendars->matching($criteria)->matching($criteriaByPerson);
+        return $this->calendars->matching($criteria)
+            ->matching(
+                // due to a bug, filter two times
+                Criteria::create()
+                    ->where(Criteria::expr()->memberOf('persons', $person))
+                    ->setMaxResults($limit)
+            );
    }

    /**
@@ -1337,16 +1332,6 @@ class AccompanyingPeriod implements
        return $this;
    }

-    public function getUserHistories(): ReadableCollection
-    {
-        return $this->userHistories;
-    }
-
-    public function getCurrentUserHistory(): ?UserHistory
-    {
-        return $this->getUserHistories()->findFirst(fn (int $key, UserHistory $userHistory) => null === $userHistory->getEndDate());
-    }
-
    private function addStepHistory(AccompanyingPeriodStepHistory $stepHistory, array $context = []): self
    {
        if (!$this->stepHistories->contains($stepHistory)) {
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/AccompanyingPeriodWork.php
@@ -42,10 +42,9 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
    /**
     * @var Collection<AccompanyingPeriodWorkEvaluation>
     *
-     * @internal the serialization for write evaluations is handled in `accompanyingperiodworkdenormalizer`
-     * @internal the serialization for context docgen:read is handled in `accompanyingperiodworknormalizer`
+     * @internal /!\ the serialization for write evaluations is handled in `AccompanyingPeriodWorkDenormalizer`
     */
-    #[Serializer\Groups(['read'])]
+    #[Serializer\Groups(['read', 'docgen:read'])]
    #[ORM\OneToMany(targetEntity: AccompanyingPeriodWorkEvaluation::class, mappedBy: 'accompanyingPeriodWork', cascade: ['remove', 'persist'], orphanRemoval: true)]
    #[ORM\OrderBy(['startDate' => \Doctrine\Common\Collections\Criteria::DESC, 'id' => 'DESC'])]
    private Collection $accompanyingPeriodWorkEvaluations;
@@ -292,20 +291,18 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
    /**
     * @return ReadableCollection<int, User>
     */
-    #[Serializer\Groups(['accompanying_period_work:edit'])]
+    #[Serializer\Groups(['read', 'docgen:read', 'read:accompanyingPeriodWork:light', 'accompanying_period_work:edit', 'accompanying_period_work:create'])]
    public function getReferrers(): ReadableCollection
    {
        $users = $this->referrersHistory
            ->filter(fn (AccompanyingPeriodWorkReferrerHistory $h) => null === $h->getEndDate())
            ->map(fn (AccompanyingPeriodWorkReferrerHistory $h) => $h->getUser())
-            ->getValues();
+            ->getValues()
+        ;

        return new ArrayCollection(array_values($users));
    }

-    /**
-     * @return Collection<int, AccompanyingPeriodWorkReferrerHistory>
-     */
    public function getReferrersHistory(): Collection
    {
        return $this->referrersHistory;
@@ -473,9 +470,9 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues
        return $this;
    }

-    public function setCreatedBy(?User $user): self
+    public function setCreatedBy(?User $createdBy): self
    {
-        $this->createdBy = $user;
+        $this->createdBy = $createdBy;

        return $this;
    }
@@ -517,14 +514,14 @@ class AccompanyingPeriodWork implements AccompanyingPeriodLinkedWithSocialIssues

    public function setStartDate(\DateTimeInterface $startDate): self
    {
-        $this->startDate = $startDate instanceof \DateTime ? \DateTimeImmutable::createFromMutable($startDate) : $startDate;
+        $this->startDate = $startDate;

        return $this;
    }

    public function setUpdatedAt(\DateTimeInterface $datetime): TrackUpdateInterface
    {
-        $this->updatedAt = $datetime instanceof \DateTime ? \DateTimeImmutable::createFromMutable($datetime) : $datetime;
+        $this->updatedAt = $datetime;

        return $this;
    }
--- a/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php
+++ b/src/Bundle/ChillPersonBundle/Entity/AccompanyingPeriod/Comment.php
@@ -132,11 +132,6 @@ class Comment implements TrackCreationInterface, TrackUpdateInterface
        return $this;
    }

-    public function getCreatedBy(): ?User
-    {
-        return $this->getCreator();
-    }
-
    public function setUpdatedAt(\DateTimeInterface $updatedAt): self
    {
        $this->updatedAt = $updatedAt;
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/GeographicalUnitStatAggregator.php
@@ -28,7 +28,11 @@ use Symfony\Component\Form\FormBuilderInterface;

 final readonly class GeographicalUnitStatAggregator implements AggregatorInterface
 {
-    public function __construct(private GeographicalUnitLayerRepositoryInterface $geographicalUnitLayerRepository, private TranslatableStringHelperInterface $translatableStringHelper, private RollingDateConverterInterface $rollingDateConverter) {}
+    public function __construct(
+        private GeographicalUnitLayerRepositoryInterface $geographicalUnitLayerRepository,
+        private TranslatableStringHelperInterface $translatableStringHelper,
+        private RollingDateConverterInterface $rollingDateConverter
+    ) {}

    public function addRole(): ?string
    {
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerAggregator.php
@@ -12,7 +12,6 @@ declare(strict_types=1);
 namespace Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;

 use Chill\MainBundle\Export\AggregatorInterface;
-use Chill\MainBundle\Export\DataTransformerInterface;
 use Chill\MainBundle\Form\Type\PickRollingDateType;
 use Chill\MainBundle\Repository\UserRepository;
 use Chill\MainBundle\Service\RollingDate\RollingDate;
@@ -22,17 +21,13 @@ use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;

-final readonly class ReferrerAggregator implements AggregatorInterface, DataTransformerInterface
+final readonly class ReferrerAggregator implements AggregatorInterface
 {
    private const A = 'acp_ref_agg_uhistory';

    private const P = 'acp_ref_agg_date';

-    public function __construct(
-        private UserRepository $userRepository,
-        private UserRender $userRender,
-        private RollingDateConverterInterface $rollingDateConverter
-    ) {}
+    public function __construct(private UserRepository $userRepository, private UserRender $userRender, private RollingDateConverterInterface $rollingDateConverter) {}

    public function addRole(): ?string
    {
@@ -49,16 +44,18 @@ final readonly class ReferrerAggregator implements AggregatorInterface, DataTran
                $qb->expr()->orX(
                    $qb->expr()->isNull(self::A),
                    $qb->expr()->andX(
-                        $qb->expr()->lt(self::A.'.startDate', ':'.self::P.'_end_date'),
+                        $qb->expr()->lte(self::A.'.startDate', ':'.self::P),
                        $qb->expr()->orX(
                            $qb->expr()->isNull(self::A.'.endDate'),
-                            $qb->expr()->gte(self::A.'.endDate', ':'.self::P.'_start_date')
+                            $qb->expr()->gt(self::A.'.endDate', ':'.self::P)
                        )
                    )
                )
            )
-            ->setParameter(':'.self::P.'_end_date', $this->rollingDateConverter->convert($data['end_date']))
-            ->setParameter(':'.self::P.'_start_date', $this->rollingDateConverter->convert($data['end_date']));
+            ->setParameter(
+                self::P,
+                $this->rollingDateConverter->convert($data['date_calc'])
+            );
    }

    public function applyOn(): string
@@ -69,37 +66,15 @@ final readonly class ReferrerAggregator implements AggregatorInterface, DataTran
    public function buildForm(FormBuilderInterface $builder)
    {
        $builder
-            ->add('start_date', PickRollingDateType::class, [
-                'label' => 'export.aggregator.course.by_referrer.Referrer after',
-                'required' => true,
-            ])
-            ->add('end_date', PickRollingDateType::class, [
-                'label' => 'export.aggregator.course.by_referrer.Until',
+            ->add('date_calc', PickRollingDateType::class, [
+                'label' => 'export.aggregator.course.by_referrer.Computation date for referrer',
                'required' => true,
            ]);
    }

    public function getFormDefaultData(): array
    {
-        return [
-            'start_date' => new RollingDate(RollingDate::T_YEAR_CURRENT_START),
-            'end_date' => new RollingDate(RollingDate::T_TODAY),
-        ];
-    }
-
-    public function transformData(?array $before): array
-    {
-        $default = $this->getFormDefaultData();
-        $data = [];
-
-        if (null === $before) {
-            return $default;
-        }
-
-        $data['start_date'] = $before['date_calc'] ?? $before['start_date'] ?? $default['start_date'];
-        $data['end_date'] = $before['date_calc'] ?? $before['end_date'] ?? $default['end_date'];
-
-        return $data;
+        return ['date_calc' => new RollingDate(RollingDate::T_TODAY)];
    }

    public function getLabels($key, array $values, $data)
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/ReferrerScopeAggregator.php
@@ -13,25 +13,20 @@ namespace Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;

 use Chill\MainBundle\Entity\User\UserScopeHistory;
 use Chill\MainBundle\Export\AggregatorInterface;
-use Chill\MainBundle\Export\DataTransformerInterface;
-use Chill\MainBundle\Form\Type\PickRollingDateType;
 use Chill\MainBundle\Repository\ScopeRepositoryInterface;
-use Chill\MainBundle\Service\RollingDate\RollingDate;
-use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;

-readonly class ReferrerScopeAggregator implements AggregatorInterface, DataTransformerInterface
+readonly class ReferrerScopeAggregator implements AggregatorInterface
 {
    private const PREFIX = 'acp_agg_referrer_scope';

    public function __construct(
        private ScopeRepositoryInterface $scopeRepository,
        private TranslatableStringHelperInterface $translatableStringHelper,
-        private RollingDateConverterInterface $rollingDateConverter,
    ) {}

    public function addRole(): ?string
@@ -51,16 +46,11 @@ readonly class ReferrerScopeAggregator implements AggregatorInterface, DataTrans
                $qb->expr()->andX(
                    $qb->expr()->eq("{$p}_userHistory.accompanyingPeriod", 'acp.id'),
                    $qb->expr()->andX(
-                        // check that the user is referrer when the accompanying period is opened
                        $qb->expr()->gte('COALESCE(acp.closingDate, CURRENT_TIMESTAMP())', "{$p}_userHistory.startDate"),
                        $qb->expr()->orX(
                            $qb->expr()->isNull("{$p}_userHistory.endDate"),
                            $qb->expr()->lt('COALESCE(acp.closingDate, CURRENT_TIMESTAMP())', "{$p}_userHistory.endDate")
                        )
-                    ),
-                    $qb->expr()->andX(
-                        "{$p}_userHistory.startDate <= :{$p}_endDate",
-                        "COALESCE({$p}_userHistory.endDate, CURRENT_TIMESTAMP()) > :{$p}_startDate"
                    )
                )
            )
@@ -76,15 +66,9 @@ readonly class ReferrerScopeAggregator implements AggregatorInterface, DataTrans
                            $qb->expr()->isNull("{$p}_scopeHistory.endDate"),
                            $qb->expr()->gt("{$p}_scopeHistory.endDate", "{$p}_userHistory.startDate")
                        )
-                    ),
-                    $qb->expr()->andX(
-                        "{$p}_scopeHistory.startDate <= :{$p}_endDate",
-                        "COALESCE({$p}_scopeHistory.endDate, CURRENT_TIMESTAMP()) > :{$p}_startDate"
                    )
                )
            )
-            ->setParameter("{$p}_startDate", $this->rollingDateConverter->convert($data['start_date']))
-            ->setParameter("{$p}_endDate", $this->rollingDateConverter->convert($data['end_date']))
            ->addSelect("IDENTITY({$p}_scopeHistory.scope) AS {$p}_select")
            ->addGroupBy("{$p}_select");
    }
@@ -94,36 +78,11 @@ readonly class ReferrerScopeAggregator implements AggregatorInterface, DataTrans
        return Declarations::ACP_TYPE;
    }

-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder
-            ->add('start_date', PickRollingDateType::class, [
-                'label' => 'export.aggregator.course.by_referrer_scope.Referrer and scope after',
-                'required' => true,
-            ])
-            ->add('end_date', PickRollingDateType::class, [
-                'label' => 'export.aggregator.course.by_referrer_scope.Until',
-                'required' => true,
-            ]);
-    }
+    public function buildForm(FormBuilderInterface $builder) {}

    public function getFormDefaultData(): array
    {
-        return [
-            'start_date' => new RollingDate(RollingDate::T_YEAR_CURRENT_START),
-            'end_date' => new RollingDate(RollingDate::T_TODAY),
-        ];
-    }
-
-    public function transformData(?array $before): array
-    {
-        $default = $this->getFormDefaultData();
-        $data = [];
-
-        $data['start_date'] = $before['start_date'] ?? new RollingDate(RollingDate::T_FIXED_DATE, new \DateTimeImmutable('1970-01-01'));
-        $data['end_date'] = $before['end_date'] ?? $default['end_date'];
-
-        return $data;
+        return [];
    }

    public function getLabels($key, array $values, $data)
--- a/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/UserJobAggregator.php
+++ b/src/Bundle/ChillPersonBundle/Export/Aggregator/AccompanyingCourseAggregators/UserJobAggregator.php
@@ -13,25 +13,20 @@ namespace Chill\PersonBundle\Export\Aggregator\AccompanyingCourseAggregators;

 use Chill\MainBundle\Entity\User\UserJobHistory;
 use Chill\MainBundle\Export\AggregatorInterface;
-use Chill\MainBundle\Export\DataTransformerInterface;
-use Chill\MainBundle\Form\Type\PickRollingDateType;
 use Chill\MainBundle\Repository\UserJobRepository;
-use Chill\MainBundle\Service\RollingDate\RollingDate;
-use Chill\MainBundle\Service\RollingDate\RollingDateConverterInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelper;
 use Chill\PersonBundle\Export\Declarations;
 use Doctrine\ORM\Query\Expr\Join;
 use Doctrine\ORM\QueryBuilder;
 use Symfony\Component\Form\FormBuilderInterface;

-final readonly class UserJobAggregator implements AggregatorInterface, DataTransformerInterface
+final readonly class UserJobAggregator implements AggregatorInterface
 {
    private const PREFIX = 'acp_agg_user_job';

    public function __construct(
        private UserJobRepository $jobRepository,
-        private TranslatableStringHelper $translatableStringHelper,
-        private RollingDateConverterInterface $rollingDateConverter,
+        private TranslatableStringHelper $translatableStringHelper
    ) {}

    public function addRole(): ?string
@@ -56,10 +51,6 @@ final readonly class UserJobAggregator implements AggregatorInterface, DataTrans
                            $qb->expr()->isNull("{$p}_userHistory.endDate"),
                            $qb->expr()->lt('COALESCE(acp.closingDate, CURRENT_TIMESTAMP())', "{$p}_userHistory.endDate")
                        )
-                    ),
-                    $qb->expr()->andX(
-                        "{$p}_userHistory.startDate <= :{$p}_endDate",
-                        "COALESCE({$p}_userHistory.endDate, CURRENT_TIMESTAMP()) > :{$p}_startDate"
                    )
                )
            )
@@ -75,15 +66,9 @@ final readonly class UserJobAggregator implements AggregatorInterface, DataTrans
                            $qb->expr()->isNull("{$p}_jobHistory.endDate"),
                            $qb->expr()->gt("{$p}_jobHistory.endDate", "{$p}_userHistory.startDate")
                        )
-                    ),
-                    $qb->expr()->andX(
-                        "{$p}_jobHistory.startDate <= :{$p}_endDate",
-                        "COALESCE({$p}_jobHistory.endDate, CURRENT_TIMESTAMP()) > :{$p}_startDate"
                    )
                )
            )
-            ->setParameter("{$p}_startDate", $this->rollingDateConverter->convert($data['start_date']))
-            ->setParameter("{$p}_endDate", $this->rollingDateConverter->convert($data['end_date']))
            ->addSelect("IDENTITY({$p}_jobHistory.job) AS {$p}_select")
            ->addGroupBy("{$p}_select");
    }
@@ -93,36 +78,11 @@ final readonly class UserJobAggregator implements AggregatorInterface, DataTrans
        return Declarations::ACP_TYPE;
    }

-    public function buildForm(FormBuilderInterface $builder)
-    {
-        $builder
-            ->add('start_date', PickRollingDateType::class, [
-                'label' => 'export.aggregator.course.by_referrer_job.Referrer and job after',
-                'required' => true,
-            ])
-            ->add('end_date', PickRollingDateType::class, [
-                'label' => 'export.aggregator.course.by_referrer_job.Until',
-                'required' => true,
-            ]);
-    }
+    public function buildForm(FormBuilderInterface $builder) {}

    public function getFormDefaultData(): array
    {
-        return [
-            'start_date' => new RollingDate(RollingDate::T_YEAR_CURRENT_START),
-            'end_date' => new RollingDate(RollingDate::T_TODAY),
-        ];
-    }
-
-    public function transformData(?array $before): array
-    {
-        $default = $this->getFormDefaultData();
-        $data = [];
-
-        $data['start_date'] = $before['start_date'] ?? new RollingDate(RollingDate::T_FIXED_DATE, new \DateTimeImmutable('1970-01-01'));
-        $data['end_date'] = $before['end_date'] ?? $default['end_date'];
-
-        return $data;
+        return [];
    }

    public function getLabels($key, array $values, $data)
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Julien Fastré	e00ece4200	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.	2024-05-28 15:58:17 +02:00
Julien Fastré	640fd71402	merge ticket-app-master and fix rector / cs	2024-05-28 15:54:52 +02:00
Julien Fastré	aae50ca290	Merge branch 'ticket-app-master' into chill-bundles-ticket-app-adaptations	2024-05-28 15:08:59 +02:00
Julien Fastré	1fa483598b	Merge branch 'upgrade-sf5' into ticket-app-master	2024-05-28 14:59:25 +02:00
Julien Fastré	e4b6a468f8	adding fixtures for ticket in every environment	2024-05-28 13:47:58 +02:00
Boris Waaub	66c7758023	Adapt module name	2024-05-22 11:17:07 +02:00
Boris Waaub	4750d2c24e	Adapt module name	2024-05-22 11:16:18 +02:00
Boris Waaub	ca05e3d979	Layout adaptation	2024-05-22 11:12:22 +02:00
Boris Waaub	a20f9b4f86	Generalize ticket actions	2024-05-22 00:38:47 +02:00
Boris Waaub	c73c1eb8d5	Rename "appelant" by "patient"	2024-05-21 22:24:30 +02:00
Boris Waaub	8778bb0731	Use colors and badges for history and banner	2024-05-21 22:22:33 +02:00
Boris Waaub	c7d20eebc5	chore: Remove unused code in AddresseeSelectorComponent.vue	2024-05-21 20:53:15 +02:00
Boris Waaub	b9e130c159	Use suggestion for user asignee	2024-05-21 20:44:23 +02:00
Boris Waaub	3e8bc94af3	Remove user object display	2024-05-21 18:14:11 +02:00
Boris Waaub	0c914c9f9f	Remove "remove_addressee" history line	2024-05-21 17:32:40 +02:00
Boris Waaub	580a60c939	Add user_group for returning type	2024-05-21 17:32:05 +02:00
Boris Waaub	4996ac3b7c	Adapt layout action toolbar	2024-05-21 15:22:13 +02:00
Boris Waaub	2a23bf19cb	use record_actions sticky-form-buttons	2024-05-21 10:53:25 +02:00
Boris Waaub	650d2596d9	Update ticket display to use ticket ID instead of external reference	2024-05-21 09:54:06 +02:00
Boris Waaub	2bdd5a329e	Merge branch 'ticket-app-master' of gitlab.com:boriswa/chill-bundles into ticket-app-master	2024-05-21 09:53:32 +02:00
Julien Fastré	78d1776733	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.	2024-05-17 13:14:26 +02:00
Julien Fastré	66dc603c85	fix cs with new version of php-cs-fixer	2024-05-17 12:20:33 +02:00
Julien Fastré	3a8154ecce	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.	2024-05-17 12:17:00 +02:00
Julien Fastré	c81828e04f	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.	2024-05-17 12:16:28 +02:00
Boris Waaub	ec17dd7de2	Merge branch 'master' of https://gitlab.com/Chill-Projet/chill-bundles into ticket-app-master	2024-05-13 16:08:19 +02:00
Julien Fastré	76c076a5f3	Merge branch 'ticket-app-create-template' into 'ticket-app-master' Mise à jour des messages de l'interface utilisateur pour inclure les... See merge request Chill-Projet/chill-bundles!689	2024-05-13 13:34:43 +00:00
Boris Waaub	f0045edd6c	FIX: Ouvert depuis	2024-05-13 12:33:11 +02:00
Boris Waaub	d00b76ffcd	$tc n'est plus supporté pour i18n composition api, il faut utiliser $t. FIX: Person PersonRenderBox	2024-05-13 12:16:07 +02:00
Boris Waaub	8991f0ef3f	Modification i18n	2024-05-13 12:00:11 +02:00
Boris Waaub	d6f5eae0c9	Rendre les commentaire markdown	2024-05-13 11:59:50 +02:00
Boris Waaub	821fce3dd8	$tc n'est plus supporté pour i18n composiontion api, il faut utiliser $t. Source : https://github.com/intlify/vue-cli-plugin-i18n/issues/214 i18n composion api : https://vue-i18n.intlify.dev/api/composition	2024-05-13 11:38:28 +02:00
Boris Waaub	1d33ae1e39	use ckeditor	2024-05-08 18:03:50 +02:00
Boris Waaub	19af0feb57	Use PersonRenderBox	2024-05-08 17:54:03 +02:00
Boris Waaub	1c09e9a692	Merge branch 'ticket-app-master' into ticket-app-create-template	2024-05-08 16:05:35 +02:00
Boris Waaub	d72e748388	Merge branch 'ticket-app-master' of https://gitlab.com/boriswa/chill-bundles into ticket-app-master	2024-05-08 16:02:09 +02:00
Boris Waaub	ab850b7b70	Fusionner les utilisateurs/goupes en une "Card"	2024-05-06 20:07:15 +02:00
Boris Waaub	3f9745d8cf	Use teleport for banner	2024-05-06 18:03:04 +02:00
Boris Waaub	473765366a	Add tranfert with AddPerson	2024-05-06 16:38:56 +02:00
Boris Waaub	6500c24a7f	Déplacer le répertoire translation dans source	2024-05-02 14:10:22 +02:00
Boris Waaub	1d00457141	Ajouter les propriétés createdAt et updatedBy à l'interface Ticket	2024-05-02 14:09:52 +02:00
Boris Waaub	eb0bf56cff	Add user group addressee	2024-05-02 13:18:45 +02:00
Boris Waaub	7b8cd90cf1	Add user store	2024-05-02 12:03:10 +02:00
Boris Waaub	a27d92aba0	Add comment and motive	2024-05-02 00:50:33 +02:00
Boris Waaub	85bdfb9e21	Remove banner component	2024-05-01 22:04:07 +02:00
Boris Waaub	4cffcf4de1	Use translate in setup	2024-05-01 22:03:36 +02:00
Boris Waaub	b2587a688f	Déplacer le composant banner dans twig	2024-05-01 15:51:12 +02:00
Boris Waaub	c9f0e9843b	Déplacer le composant banner dans twig	2024-05-01 15:49:32 +02:00
Boris Waaub	b40ad9e445	Mise à jour des messages de l'interface utilisateur pour inclure les fonctionnalités de commentaire, de motif et de transfert	2024-04-25 11:16:08 +02:00
Boris Waaub	3e10e47e29	Merge branch 'ticket-app-master' into ticket-app-create-template	2024-04-25 10:37:42 +02:00
Boris Waaub	2a1963e993	Mise à jour de l'interface utilisateur pour le composant ActionToolbarComponent	2024-04-25 10:36:45 +02:00
Julien Fastré	34c171659b	Merge branch 'ticket-app/backend-3' into 'ticket-app-master' Add functionality to set addressees for a ticket See merge request Chill-Projet/chill-bundles!683	2024-04-24 16:50:29 +00:00
Julien Fastré	2d8b960d9e	Re-open the same ticket if a ticket already exists with the same externalRef, instead of creating a new one	2024-04-24 18:48:00 +02:00
Julien Fastré	831ae03431	Merge branch 'ticket-app/backend-2' into 'ticket-app-master' Add functionality to add comments to tickets See merge request Chill-Projet/chill-bundles!681	2024-04-23 21:42:07 +00:00
Julien Fastré	45828174d1	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.	2024-04-23 23:39:01 +02:00
Julien Fastré	ed45f14a45	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.	2024-04-23 23:38:34 +02:00
Julien Fastré	fa67835690	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.	2024-04-23 23:00:12 +02:00
Julien Fastré	b434d38091	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.	2024-04-23 22:50:51 +02:00
Boris Waaub	800a952532	Add base template	2024-04-23 20:41:32 +02:00
Julien Fastré	9f355032a8	Create a "do not exclude" validation constraint for user groups	2024-04-22 12:41:43 +02:00
Julien Fastré	0bc6e62d4d	Add fixtures for UserGroup	2024-04-22 12:01:49 +02:00
Julien Fastré	46fb1c04b5	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.	2024-04-22 12:01:28 +02:00
Julien Fastré	3b2c3d1464	Merge branch 'ticket-app-create-store' into 'ticket-app-master' Create vuex store See merge request Chill-Projet/chill-bundles!678	2024-04-22 08:29:56 +00:00
Boris Waaub	0bd6038160	Merge branch chill-bundles:master into ticket-app-master	2024-04-19 15:54:24 +00:00
Boris Waaub	baab8e94ce	Add ticket to storeand catch error with toast in component	2024-04-19 17:46:12 +02:00
Julien Fastré	e2deb55fdb	Create api endpoint for listing user-group	2024-04-19 15:34:43 +02:00
Boris Waaub	2cdfb50058	Mise en œuvre de la fonctionnalité de remplacement du motif du ticket 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é.	2024-04-19 14:12:09 +02:00
Julien Fastré	39d701feb2	Serialize ticket's Comment	2024-04-18 22:10:56 +02:00
Julien Fastré	613ee8b186	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.	2024-04-18 21:57:55 +02:00
Julien Fastré	56a1a488de	Return the content of the ticket on replace motive POST request	2024-04-18 15:44:05 +02:00
Julien Fastré	3f789ad0f4	Merge branch 'ticket-app/create-entities' into 'ticket-app-master' Add phone number search function to PersonACLAwareRepository See merge request Chill-Projet/chill-bundles!677	2024-04-18 11:21:46 +00:00
Julien Fastré	467bea7cde	Serialization of tickets with history	2024-04-18 13:13:09 +02:00
Julien Fastré	670b8eb82b	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.	2024-04-18 13:13:08 +02:00
Julien Fastré	a9760b323f	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.	2024-04-18 13:13:08 +02:00
Julien Fastré	71a3a1924a	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.	2024-04-18 13:13:07 +02:00
Julien Fastré	ecdc1e25bf	Layout of banner for ticket	2024-04-18 13:13:07 +02:00
Julien Fastré	dd37427be1	Bootstrap ticket layout and vue app to edit ticket	2024-04-18 13:13:07 +02:00
Julien Fastré	c8467df1b1	fixup! Rename Command directory to Action to avoid confusion with symfony commands	2024-04-18 13:13:06 +02:00
Julien Fastré	4c89a954fa	Refactor test, fixing the constructor	2024-04-18 13:13:05 +02:00
Julien Fastré	7c1f3b114d	Rename Command directory to Action to avoid confusion with symfony commands	2024-04-18 13:13:05 +02:00
Julien Fastré	36bc4dab24	Configure a testsuite for TicketBundle	2024-04-18 13:13:04 +02:00
Julien Fastré	4b30d92282	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.	2024-04-18 13:13:04 +02:00
Julien Fastré	75fbec5489	Create entities and doctrine mapping for ticket	2024-04-18 13:13:03 +02:00
Julien Fastré	912fdd6349	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.	2024-04-16 14:41:55 +02:00
Julien Fastré	5832542978	load also tests for ticket bundle	2024-04-16 14:41:39 +02:00
Julien Fastré	5c3585a1ed	Fix loading of environment variable in bootstrap process	2024-04-16 14:41:29 +02:00
Julien Fastré	a2f1e20ddf	Fix cs	2024-04-15 15:49:47 +02:00
Julien Fastré	4d67702a76	Bootstrap loading of controllers and routes for ticket bundle	2024-04-15 15:48:25 +02:00
Julien Fastré	18e442db29	Merge branch 'ticket-app-init' into 'ticket-app-master' Add ChillTicketBundle webpack configuration See merge request Chill-Projet/chill-bundles!673	2024-04-15 12:44:21 +00:00
Boris Waaub	deb3d92189	Add ChillTicketBundle webpack configuration	2024-04-15 14:34:09 +02:00
Julien Fastré	a59ea7db31	Compiles with ticket bundle	2024-04-15 13:48:49 +02:00
Julien Fastré	a738b0cac9	Initialize ChillTicketBundle	2024-04-15 13:22:36 +02:00