Correct eslint issues

Remove console.logs
Fix test according to Junie guidelines
2025-11-10 06:08:25 +00:00 · 2025-09-29 17:07:21 +02:00 · 2025-09-29 17:06:05 +02:00 · 2025-09-29 16:23:13 +02:00 · 2025-09-29 15:58:36 +02:00 · 2025-09-29 15:44:49 +02:00
182 changed files with 1234 additions and 4021 deletions
--- a/.changes/unreleased/DX-20251027-150053.yaml
+++ b/.changes/unreleased/DX-20251027-150053.yaml
@@ -1,7 +0,0 @@
-kind: DX
-body: |
-    Send notifications log to dedicated channel, if it exists
-time: 2025-10-27T15:00:53.309372316+01:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change
--- a/.changes/unreleased/Feature-20250808-120802.yaml
+++ b/.changes/unreleased/Feature-20250808-120802.yaml
@@ -1,6 +0,0 @@
-kind: Feature
-body: Create invitation list in user menu
-time: 2025-08-08T12:08:02.446361367+02:00
-custom:
-    Issue: "385"
-    SchemaChange: No schema change
--- a/.changes/unreleased/Feature-20251029-152510.yaml
+++ b/.changes/unreleased/Feature-20251029-152510.yaml
@@ -1,6 +0,0 @@
-kind: Feature
-body: Add columns for comments linked to an activity in the activity list export
-time: 2025-10-29T15:25:10.493968528+01:00
-custom:
-    Issue: "404"
-    SchemaChange: No schema change
--- a/.changes/unreleased/Fixed-20250918-114044.yaml
+++ b/.changes/unreleased/Fixed-20250918-114044.yaml
@@ -0,0 +1,6 @@
+kind: Fixed
+body: Increased the number of required characters when setting a new password in Chill from 9 to 14 - GDPR compliance
+time: 2025-09-18T11:40:44.858533536+02:00
+custom:
+    Issue: "426"
+    SchemaChange: No schema change
--- a/.changes/unreleased/Fixed-20251029-124355.yaml
+++ b/.changes/unreleased/Fixed-20251029-124355.yaml
@@ -1,6 +0,0 @@
-kind: Fixed
-body: 'Fix: display also social actions linked to parents of the selected social issue'
-time: 2025-10-29T12:43:55.008647232+01:00
-custom:
-    Issue: "451"
-    SchemaChange: No schema change
--- a/.changes/unreleased/Fixed-20251029-143836.yaml
+++ b/.changes/unreleased/Fixed-20251029-143836.yaml
@@ -1,6 +0,0 @@
-kind: Fixed
-body: 'Fix: export actions and their results in csv even when action does not have any goals attached to it.'
-time: 2025-10-29T14:38:36.195220844+01:00
-custom:
-    Issue: "453"
-    SchemaChange: No schema change
--- a/.changes/unreleased/Fixed-20251104-135108.yaml
+++ b/.changes/unreleased/Fixed-20251104-135108.yaml
@@ -1,6 +0,0 @@
-kind: Fixed
-body: Fix the possibility to delete a workflow
-time: 2025-11-04T13:51:08.113234488+01:00
-custom:
-    Issue: ""
-    SchemaChange: Drop or rename table or columns, or enforce new constraint that must be manually fixed
--- a/.changes/unreleased/Fixed-20251106-123641.yaml
+++ b/.changes/unreleased/Fixed-20251106-123641.yaml
@@ -1,6 +0,0 @@
-kind: Fixed
-body: Fix the fusion of thirdparty properties that are located in another schema than public for TO_ONE relations + add extra loop for MANY_TO_MANY relations where thirdparty is the source instead of the target
-time: 2025-11-06T12:36:41.555991969+01:00
-custom:
-    Issue: "457"
-    SchemaChange: No schema change
--- a/.changes/unreleased/Fixed-20251106-161605.yaml
+++ b/.changes/unreleased/Fixed-20251106-161605.yaml
@@ -1,6 +0,0 @@
-kind: Fixed
-body: Fix suggestion of referrer when creating notification for accompanyingPeriodWorkDocument
-time: 2025-11-06T16:16:05.861813041+01:00
-custom:
-    Issue: "428"
-    SchemaChange: No schema change
--- a/.changes/unreleased/UX-20251006-123932.yaml
+++ b/.changes/unreleased/UX-20251006-123932.yaml
@@ -1,6 +0,0 @@
-kind: UX
-body: Change the terms 'cercle' and 'centre' to 'service', and 'territoire' respectively.
-time: 2025-10-06T12:39:32.514056818+02:00
-custom:
-    Issue: "425"
-    SchemaChange: No schema change
--- a/.changes/unreleased/UX-20251029-110804.yaml
+++ b/.changes/unreleased/UX-20251029-110804.yaml
@@ -1,6 +0,0 @@
-kind: UX
-body: Improve the ux for selecting whether user wants to be notified of the final step of a workflow or all steps
-time: 2025-10-29T11:08:04.077020411+01:00
-custom:
-    Issue: "542"
-    SchemaChange: No schema change
--- a/.changes/unreleased/UX-20251030-180919.yaml
+++ b/.changes/unreleased/UX-20251030-180919.yaml
@@ -1,6 +0,0 @@
-kind: UX
-body: Expand timeSpent choices for evaluation document and translate them to user locale or fallback 'fr'
-time: 2025-10-30T18:09:19.373907522+01:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change
--- a/.changes/unreleased/UX-20251103-131554.yaml
+++ b/.changes/unreleased/UX-20251103-131554.yaml
@@ -1,6 +0,0 @@
-kind: UX
-body: Change the order of display for results and objectives in the social work/action form
-time: 2025-11-03T13:15:54.837971477+01:00
-custom:
-    Issue: "455"
-    SchemaChange: No schema change
--- a/.changes/unreleased/UX-20251107-151736.yaml
+++ b/.changes/unreleased/UX-20251107-151736.yaml
@@ -1,6 +0,0 @@
-kind: UX
-body: Wrap text when it is too long within badges
-time: 2025-11-07T15:17:36.104379989+01:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change
--- a/.changes/v4.5.0.md
+++ b/.changes/v4.5.0.md
@@ -1,13 +0,0 @@
-## v4.5.0 - 2025-10-03
-### Feature
-* Only allow delete of attachment on workflows that are not final   
-* Move up signature buttons on index workflow page for easier access   
-* Filter out document from attachment list if it is the same as the workflow document   
-* Block edition on attached document on workflow, if the workflow is finalized or sent external   
-* Convert workflow's attached document to pdf while sending them external   
-* After a signature is canceled or rejected, going to a waiting page until the post-process routines apply a workflow transition   
-### Fixed
-* ([#426](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/426)) Increased the number of required characters when setting a new password in Chill from 9 to 14 - GDPR compliance   
-* Fix permissions on storedObject which are subject by a workflow   
-### DX
-* Introduce a WaitingScreen component to display a waiting screen   
--- a/.changes/v4.5.1.md
+++ b/.changes/v4.5.1.md
@@ -1,4 +0,0 @@
-## v4.5.1 - 2025-10-03
-### Fixed
-* Add missing javascript dependency   
-* Add exception handling for conversion of attachment on sending external, when documens are already in pdf   
--- a/.changes/v4.6.0.md
+++ b/.changes/v4.6.0.md
@@ -1,14 +0,0 @@
-## v4.6.0 - 2025-10-15
-### Feature
-* ([#423](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/423)) Create environment banner that can be activated and configured depending on the image deployed   
-* ([#394](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/394)) Only show active workflow on the page "my tracked workflow"   
-### Fixed
-* Fix loading of classLists in SocialIssuesAcc.vue, ensure elements are present   
-* Fix the rendering of list of StoredObjectVersions, where there are kept version (before converting to pdf) and intermediate versions deleted   
-* ([#434](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/434)) Notification: fix editing of sent notification by removing form.addressesEmails, a field that no longer exists   
-* Fix loading of social issues and social actions within vue component   
-* ([#446](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/446)) Add unique condition on stored object filename, with cleaning step on existing duplicate filenames   
-
-  **Schema Change**: Drop or rename table or columns, or enforce new constraint that must be manually fixed
-* [workflow] take permissions into account to delete the workflow attachment   
-* ([#448](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/448)) Fix the execution of daily cronjob notification, when the previous last execution storage was invalid   
--- a/.changes/v4.6.1.md
+++ b/.changes/v4.6.1.md
@@ -1,3 +0,0 @@
-## v4.6.1 - 2025-10-27
-### Fixed
-* Fix export case where no 'reason' is picked within the PersonHavingActivityBetweenDateFilter.php   
--- a/.junie/guidelines.md
+++ b/.junie/guidelines.md
@@ -240,6 +240,9 @@ The tests are run from the project's root (not from the bundle's root).
 # Run all tests
 vendor/bin/phpunit

+# Run tests for a specific bundle
+vendor/bin/phpunit --testsuite NameBundle
+
 # Run a specific test file
 vendor/bin/phpunit path/to/TestFile.php

@@ -247,9 +250,6 @@ vendor/bin/phpunit path/to/TestFile.php
 vendor/bin/phpunit --filter methodName path/to/TestFile.php
 ```

-When writing tests, only test specific files. Do not run all tests or the full
-test suite.
-
 #### Test Structure

 Tests are organized by bundle and follow the same structure as the bundle itself:
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -6,44 +6,6 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).


-## v4.6.1 - 2025-10-27
-### Fixed
-* Fix export case where no 'reason' is picked within the PersonHavingActivityBetweenDateFilter.php   
-
-## v4.6.0 - 2025-10-15
-### Feature
-* ([#423](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/423)) Create environment banner that can be activated and configured depending on the image deployed   
-* ([#394](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/394)) Only show active workflow on the page "my tracked workflow"   
-### Fixed
-* Fix loading of classLists in SocialIssuesAcc.vue, ensure elements are present   
-* Fix the rendering of list of StoredObjectVersions, where there are kept version (before converting to pdf) and intermediate versions deleted   
-* ([#434](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/434)) Notification: fix editing of sent notification by removing form.addressesEmails, a field that no longer exists   
-* Fix loading of social issues and social actions within vue component   
-* ([#446](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/446)) Add unique condition on stored object filename, with cleaning step on existing duplicate filenames   
-
-  **Schema Change**: Drop or rename table or columns, or enforce new constraint that must be manually fixed
-* [workflow] take permissions into account to delete the workflow attachment   
-* ([#448](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/448)) Fix the execution of daily cronjob notification, when the previous last execution storage was invalid   
-
-## v4.5.1 - 2025-10-03
-### Fixed
-* Add missing javascript dependency
-* Add exception handling for conversion of attachment on sending external, when documens are already in pdf
-
-## v4.5.0 - 2025-10-03
-### Feature
-* Only allow delete of attachment on workflows that are not final
-* Move up signature buttons on index workflow page for easier access
-* Filter out document from attachment list if it is the same as the workflow document
-* Block edition on attached document on workflow, if the workflow is finalized or sent external
-* Convert workflow's attached document to pdf while sending them external
-* After a signature is canceled or rejected, going to a waiting page until the post-process routines apply a workflow transition
-### Fixed
-* ([#426](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/426)) Increased the number of required characters when setting a new password in Chill from 9 to 14 - GDPR compliance
-* Fix permissions on storedObject which are subject by a workflow
-### DX
-* Introduce a WaitingScreen component to display a waiting screen
-
 ## v4.4.2 - 2025-09-12
 ### Fixed
 * Fix document generation and workflow generation do not work on accompanying period work documents   
@@ -780,7 +742,7 @@ Fix color of Chill footer
 - ajout d'un filtre et regroupement par usager participant sur les échanges
 - ajout d'un regroupement: par type d'activité associé au parcours;
 - trie les filtre et regroupements par ordre alphabétique dans els exports
- ajout d'un paramètre qui permet de désactiver le filtre par territoire dans les exports
+- ajout d'un paramètre qui permet de désactiver le filtre par centre dans les exports
 - correction de l'interface de date dans les filtres et regroupements "par statut du parcours à la date"

 ## v2.9.2 - 2023-10-17
@@ -960,7 +922,7 @@ error when trying to reedit a saved export
 - ajout d'un regroupement par métier des intervenants sur un parcours;
 - ajout d'un regroupement par service des intervenants sur un parcours;
 - ajout d'un regroupement par utilisateur intervenant sur un parcours
- ajout d'un regroupement "par territoire de l'usager";
+- ajout d'un regroupement "par centre de l'usager";
 - ajout d'un filtre "par métier intervenant sur un parcours";
 - ajout d'un filtre "par service intervenant sur un parcours";
 - création d'un rôle spécifique pour voir les parcours confidentiels (et séparer de celui de la liste qui permet de ré-assigner les parcours en lot);
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
        "ext-openssl": "*",
        "ext-redis": "*",
        "ext-zlib": "*",
-        "champs-libres/wopi-bundle": "dev-symfony-v5@dev",
+        "champs-libres/wopi-bundle": "dev-master@dev",
        "champs-libres/wopi-lib": "dev-master@dev",
        "doctrine/data-fixtures": "^1.8",
        "doctrine/doctrine-bundle": "^2.1",
--- a/config/bundles.php
+++ b/config/bundles.php
@@ -2,6 +2,7 @@

 return [
    Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
+    loophp\PsrHttpMessageBridgeBundle\PsrHttpMessageBridgeBundle::class => ['all' => true],
    ChampsLibres\WopiBundle\WopiBundle::class => ['all' => true],
    Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true],
    Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true],
@@ -36,5 +37,4 @@ return [
    Chill\WopiBundle\ChillWopiBundle::class => ['all' => true],
    Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
    Symfony\UX\Translator\UxTranslatorBundle::class => ['all' => true],
-    loophp\PsrHttpMessageBridgeBundle\PsrHttpMessageBridgeBundle::class => ['all' => true],
 ];
--- a/config/packages/chill.yaml
+++ b/config/packages/chill.yaml
@@ -1,13 +1,6 @@
 chill_main:
    available_languages: [ '%env(resolve:LOCALE)%', 'en' ]
    available_countries: ['BE', 'FR']
-    top_banner:
-        visible: false
-        text:
-            fr: 'Vous travaillez actuellement avec la version de PRÉ-PRODUCTION.'
-            nl: 'Je werkt momenteel in de PRE-PRODUCTIE versie'
-        color: '#353535'
-        background_color: '#d8bb48'
    notifications:
        from_email: '%env(resolve:NOTIFICATION_FROM_EMAIL)%'
        from_name: '%env(resolve:NOTIFICATION_FROM_NAME)%'
--- a/config/packages/chill_aside_activity.yaml
+++ b/config/packages/chill_aside_activity.yaml
@@ -1,2 +0,0 @@
-chill_aside_activity:
-    show_concerned_persons_count: hidden
--- a/docs/source/_static/bundles/docStore/doc_store_classes.puml
+++ b/docs/source/_static/bundles/docStore/doc_store_classes.puml
@@ -23,8 +23,8 @@ class "Document" {
    - text description
    - ArrayCollection_DocumentCategory categories
    - varchar_150 content #link to openstack
-    - Territoire territoire
-    - Service service
+    - Center center
+    - Cercle cercle
    - User user
    - DateTime date # Creation date
 }
--- a/docs/source/development/database-principles.rst
+++ b/docs/source/development/database-principles.rst
@@ -38,7 +38,7 @@ Certaines données sont historisées:

 - les référents d'un parcours;
 - les statuts d'un parcours;
- la liaison entre les territoires et les usagers;
+- la liaison entre les centres et les usagers;
 - etc.

 Dans ces cas-là, Chill crée généralement deux colonnes, qui sont habituellement nommées :code:`startDate` et :code:`endDate`. Lorsque la colonne :code:`endDate` est à :code:`NULL`, cela signifie que la période n'est pas "fermée". La colonne :code:`startDate` n'est pas nullable.
--- a/docs/source/development/database/table_list.csv
+++ b/docs/source/development/database/table_list.csv
@@ -1,6 +1,6 @@
 order,table_schema,table_name,commentaire
 1,chill_3party,party_category,Catégorie de tiers
-2,chill_3party,party_center,Association entre les tiers et les territoires (déprécié)
+2,chill_3party,party_center,Association entre les tiers et les centres (déprécié)
 3,chill_3party,party_profession,Profession du tiers (déprécié)
 4,chill_3party,third_party,Tiers
 5,chill_3party,thirdparty_category,association tiers - catégories
@@ -54,7 +54,7 @@ order,table_schema,table_name,commentaire
 53,public,activitytpresence,Présence aux échanges
 54,public,activitytype,Types d'échanges
 55,public,activitytypecategory,Catégories de types d'échanges
-56,public,centers,"Territoires (territoires, agences, etc.)"
+56,public,centers,"Centres (territoires, agences, etc.)"
 57,public,chill_activity_activity_chill_person_socialaction,
 58,public,chill_activity_activity_chill_person_socialissue
 59,public,chill_docgen_template,Gabarits de documents
@@ -111,7 +111,7 @@ order,table_schema,table_name,commentaire
 110,public,chill_person_marital_status,Etats civils
 111,public,chill_person_not_duplicate,
 112,public,chill_person_person,Usagers
-113,public,chill_person_person_center_history,Historique des territoires d'un usagers
+113,public,chill_person_person_center_history,Historique des centres d'un usagers
 114,public,chill_person_persons_to_addresses,Déprécié
 115,public,chill_person_phone,Numéros d etéléphone supplémentaires d'un usager
 116,public,chill_person_relations,Types de relations de filiation
@@ -142,7 +142,7 @@ order,table_schema,table_name,commentaire
 141,public,permission_groups
 142,public,permissionsgroup_rolescope
 143,public,persons_spoken_languages
-144,public,regroupment,Regroupement de territoires
+144,public,regroupment,Regroupement de centres
 145,public,regroupment_center,
 146,public,role_scopes,
 147,public,scopes,Services
--- a/package.json
+++ b/package.json
@@ -55,7 +55,6 @@
    "@tsconfig/node20": "^20.1.4",
    "@types/dompurify": "^3.0.5",
    "@types/leaflet": "^1.9.3",
-    "@vueuse/core": "^13.9.0",
    "bootstrap-icons": "^1.11.3",
    "dropzone": "^5.7.6",
    "es6-promise": "^4.2.8",
--- a/src/Bundle/ChillActivityBundle/Export/Export/ListActivityHelper.php
+++ b/src/Bundle/ChillActivityBundle/Export/Export/ListActivityHelper.php
@@ -66,9 +66,6 @@ class ListActivityHelper
            ->leftJoin('activity.location', 'location')
            ->addSelect('location.name AS locationName')
            ->addSelect('activity.sentReceived')
-            ->addSelect('activity.comment.comment AS commentText')
-            ->addSelect('activity.comment.date AS commentDate')
-            ->addSelect('JSON_BUILD_OBJECT(\'uid\', activity.comment.userId, \'d\', activity.comment.date) AS commentUser')
            ->addSelect('JSON_BUILD_OBJECT(\'uid\', IDENTITY(activity.createdBy), \'d\', activity.createdAt) AS createdBy')
            ->addSelect('activity.createdAt')
            ->addSelect('JSON_BUILD_OBJECT(\'uid\', IDENTITY(activity.updatedBy), \'d\', activity.updatedAt) AS updatedBy')
@@ -90,8 +87,6 @@ class ListActivityHelper
            'createdAt', 'updatedAt' => $this->dateTimeHelper->getLabel($key),
            'createdBy', 'updatedBy' => $this->userHelper->getLabel($key, $values, $key),
            'date' => $this->dateTimeHelper->getLabel(self::MSG_KEY.$key),
-            'commentDate' => $this->dateTimeHelper->getLabel(self::MSG_KEY.'comment_date'),
-            'commentUser' => $this->userHelper->getLabel($key, $values, self::MSG_KEY.'comment_user'),
            'attendeeName' => function ($value) {
                if ('_header' === $value) {
                    return 'Attendee';
@@ -181,9 +176,6 @@ class ListActivityHelper
            'usersNames',
            'thirdPartiesIds',
            'thirdPartiesNames',
-            'commentText',
-            'commentDate',
-            'commentUser',
            'createdBy',
            'createdAt',
            'updatedBy',
--- a/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/ActivityReasonFilter.php
@@ -90,9 +90,7 @@ class ActivityReasonFilter implements ExportElementValidatedInterface, FilterInt

    public function getFormDefaultData(): array
    {
-        return [
-            'reasons' => [],
-        ];
+        return [];
    }

    public function describeAction($data, ExportGenerationContext $context): string|\Symfony\Contracts\Translation\TranslatableInterface|array
--- a/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php
+++ b/src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php
@@ -42,8 +42,6 @@ final readonly class PersonHavingActivityBetweenDateFilter implements ExportElem

    public function alterQuery(QueryBuilder $qb, $data, ExportGenerationContext $exportGenerationContext): void
    {
-        error_log('alterQuery called with data: '.json_encode(array_keys($data)));
-
        // create a subquery for activity
        $sqb = $qb->getEntityManager()->createQueryBuilder();
        $sqb->select('1')
@@ -61,6 +59,7 @@ final readonly class PersonHavingActivityBetweenDateFilter implements ExportElem
        if (\in_array('activity', $qb->getAllAliases(), true)) {
            $sqb->andWhere('activity_person_having_activity.id = activity.id');
        }
+
        if (isset($data['reasons']) && [] !== $data['reasons']) {
            // add clause activity reason
            $sqb->join('activity_person_having_activity.reasons', 'reasons_person_having_activity');
@@ -125,38 +124,12 @@ final readonly class PersonHavingActivityBetweenDateFilter implements ExportElem

    public function normalizeFormData(array $formData): array
    {
-        $normalized = [
-            'date_from_rolling' => $formData['date_from_rolling']->normalize(),
-            'date_to_rolling' => $formData['date_to_rolling']->normalize(),
-            'reasons' => [],
-        ];
-
-        if (isset($formData['reasons']) && [] !== $formData['reasons']) {
-            $normalized['reasons'] = array_map(
-                fn (ActivityReason $reason) => $reason->getId(),
-                $formData['reasons']
-            );
-        }
-
-        return $normalized;
+        return ['date_from_rolling' => $formData['date_from_rolling']->normalize(), 'date_to_rolling' => $formData['date_to_rolling']->normalize()];
    }

    public function denormalizeFormData(array $formData, int $fromVersion): array
    {
-        $denormalized = [
-            'date_from_rolling' => RollingDate::fromNormalized($formData['date_from_rolling']),
-            'date_to_rolling' => RollingDate::fromNormalized($formData['date_to_rolling']),
-            'reasons' => [],
-        ];
-
-        if (isset($formData['reasons']) && [] !== $formData['reasons']) {
-            $denormalized['reasons'] = array_map(
-                fn ($id) => $this->activityReasonRepository->find($id),
-                $formData['reasons']
-            );
-        }
-
-        return $denormalized;
+        return ['date_from_rolling' => RollingDate::fromNormalized($formData['date_from_rolling']), 'date_to_rolling' => RollingDate::fromNormalized($formData['date_to_rolling'])];
    }

    public function getFormDefaultData(): array
@@ -170,12 +143,10 @@ final readonly class PersonHavingActivityBetweenDateFilter implements ExportElem

    public function describeAction($data, ExportGenerationContext $context): array
    {
-        $reasons = $data['reasons'] ?? [];
-
        return [
-            [] === $reasons ?
-                'export.filter.activity.describe_action_with_no_subject'
-                : 'export.filter.activity.describe_action_with_subject',
+            [] === $data['reasons'] ?
+                'export.filter.person_between_dates.describe_action_with_no_subject'
+                : 'export.filter.person_between_dates.describe_action_with_subject',
            [
                'date_from' => $this->rollingDateConverter->convert($data['date_from_rolling']),
                'date_to' => $this->rollingDateConverter->convert($data['date_to_rolling']),
@@ -183,7 +154,7 @@ final readonly class PersonHavingActivityBetweenDateFilter implements ExportElem
                    ', ',
                    array_map(
                        fn (ActivityReason $r): string => '"'.$this->translatableStringHelper->localize($r->getName()).'"',
-                        $reasons
+                        $data['reasons']
                    )
                ),
            ],
@@ -197,7 +168,6 @@ final readonly class PersonHavingActivityBetweenDateFilter implements ExportElem

    public function validateForm($data, ExecutionContextInterface $context): void
    {
-        error_log('validateForm called with data: '.json_encode(array_keys($data)));
        if ($this->rollingDateConverter->convert($data['date_from_rolling'])
            >= $this->rollingDateConverter->convert($data['date_to_rolling'])) {
            $context->buildViolation('export.filter.activity.person_between_dates.date mismatch')
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc.vue
@@ -136,14 +136,8 @@ export default {
            issueIsLoading: false,
            actionIsLoading: false,
            actionAreLoaded: false,
-            socialIssuesClassList: {
-                "col-form-label": true,
-                required: false,
-            },
-            socialActionsClassList: {
-                "col-form-label": true,
-                required: false,
-            },
+            socialIssuesClassList: `col-form-label ${document.querySelector("input#chill_activitybundle_activity_socialIssues").getAttribute("required") ? "required" : ""}`,
+            socialActionsClassList: `col-form-label ${document.querySelector("input#chill_activitybundle_activity_socialActions").getAttribute("required") ? "required" : ""}`,
        };
    },
    computed: {
@@ -164,21 +158,6 @@ export default {
        },
    },
    mounted() {
-        /* Load classNames after element is present */
-        const socialActionsEl = document.querySelector(
-            "input#chill_activitybundle_activity_socialActions",
-        );
-        if (socialActionsEl && socialActionsEl.hasAttribute("required")) {
-            this.socialActionsClassList.required = true;
-        }
-
-        const socialIssuesEl = document.querySelector(
-            "input#chill_activitybundle_activity_socialIssues",
-        );
-        if (socialIssuesEl && socialIssuesEl.hasAttribute("required")) {
-            this.socialIssuesClassList.required = true;
-        }
-
        /* Load other issues in multiselect */
        this.issueIsLoading = true;
        this.actionAreLoaded = false;
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialAction.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialAction.vue
@@ -43,23 +43,11 @@ export default {
 span.badge {
    @include badge_social($social-action-color);
    font-size: 95%;
-    white-space: normal;
-    word-wrap: break-word;
-    word-break: break-word;
-    display: inline-block;
-    max-width: 100%;
    margin-bottom: 5px;
    margin-right: 1em;
-    text-align: left;
-    line-height: 1.2em;
-
-    &::before {
-        position: absolute;
-        left: 11px;
-        top: 0;
-        margin: 0 0.3em 0 -0.75em;
-    }
-    position: relative;
-    padding-left: 1.5em;
+    max-width: 100%; /* Adjust as needed */
+    overflow: hidden;
+    text-overflow: ellipsis;
+    white-space: nowrap;
 }
 </style>
--- a/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialIssue.vue
+++ b/src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialIssue.vue
@@ -43,22 +43,7 @@ export default {
 span.badge {
    @include badge_social($social-issue-color);
    font-size: 95%;
-    white-space: normal;
-    word-wrap: break-word;
-    word-break: break-word;
-    display: inline-block;
-    max-width: 100%;
    margin-bottom: 5px;
    margin-right: 1em;
-    text-align: left;
-
-    &::before {
-        position: absolute;
-        left: 11px;
-        top: 0;
-        margin: 0 0.3em 0 -0.75em;
-    }
-    position: relative;
-    padding-left: 1.5em;
 }
 </style>
--- a/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillActivityBundle/translations/messages.fr.yml
@@ -10,7 +10,7 @@ Attendee: Présence de l'usager
 attendee: présence de l'usager
 list_reasons: liste des sujets
 user_username: nom de l'utilisateur
-circle_name: nom du service
+circle_name: nom du cercle
 Remark: Commentaire
 No comments: Aucun commentaire
 Add a new activity: Ajouter une nouvel échange
@@ -20,7 +20,7 @@ not present: absent
 Delete: Supprimer
 Update: Mettre à jour
 Update activity: Modifier l'échange
-Scope: Service
+Scope: Cercle
 Activity data: Données de l'échange
 Activity location: Localisation de l'échange
 No reason associated: Aucun sujet
@@ -398,15 +398,13 @@ export:
            sent received: Envoyé ou reçu
            emergency: Urgence
            accompanying course id: Identifiant du parcours
-            course circles: Services du parcours
+            course circles: Cercles du parcours
            travelTime: Durée de déplacement
            durationTime: Durée
            id: Identifiant
            List activities linked to an accompanying course: Liste les échanges liés à un parcours en fonction de différents filtres.
            List activity linked to a course: Liste des échanges liés à un parcours
-            commentText: Commentaire
-            comment_date: Date de la dernière édition du commentaire
-            comment_user: Dernière édition par
+

    filter:
        activity:
--- a/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/ChillAsideActivityExtension.php
@@ -25,7 +25,6 @@ final class ChillAsideActivityExtension extends Extension implements PrependExte
        $config = $this->processConfiguration($configuration, $configs);

        $container->setParameter('chill_aside_activity.form.time_duration', $config['form']['time_duration']);
-        $container->setParameter('chill_aside_activity.show_concerned_persons_count', 'visible' === $config['show_concerned_persons_count']);

        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
        $loader->load('services.yaml');
@@ -39,24 +38,6 @@ final class ChillAsideActivityExtension extends Extension implements PrependExte
    {
        $this->prependRoute($container);
        $this->prependCruds($container);
-        $this->prependTwigConfig($container);
-    }
-
-    protected function prependTwigConfig(ContainerBuilder $container)
-    {
-        // Get the configuration for this bundle
-        $chillAsideActivityConfig = $container->getExtensionConfig($this->getAlias());
-        $config = $this->processConfiguration($this->getConfiguration($chillAsideActivityConfig, $container), $chillAsideActivityConfig);
-
-        // Add configuration to twig globals
-        $twigConfig = [
-            'globals' => [
-                'chill_aside_activity_config' => [
-                    'show_concerned_persons_count' => 'visible' === $config['show_concerned_persons_count'],
-                ],
-            ],
-        ];
-        $container->prependExtensionConfig('twig', $twigConfig);
    }

    protected function prependCruds(ContainerBuilder $container)
--- a/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/DependencyInjection/Configuration.php
@@ -141,12 +141,6 @@ class Configuration implements ConfigurationInterface
            ->end()
            ->end()
            ->end()
-            ->end()
-            ->enumNode('show_concerned_persons_count')
-            ->values(['hidden', 'visible'])
-            ->defaultValue('hidden')
-            ->info('Show the concerned persons count field in aside activity forms and views')
-            ->end()
            ->end();

        return $treeBuilder;
--- a/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivity.php
@@ -62,10 +62,6 @@ class AsideActivity implements TrackCreationInterface, TrackUpdateInterface
    #[ORM\ManyToOne(targetEntity: User::class)]
    private User $updatedBy;

-    #[Assert\GreaterThanOrEqual(0)]
-    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::INTEGER, nullable: true)]
-    private ?int $concernedPersonsCount = 0;
-
    public function getAgent(): ?User
    {
        return $this->agent;
@@ -190,16 +186,4 @@ class AsideActivity implements TrackCreationInterface, TrackUpdateInterface

        return $this;
    }
-
-    public function getConcernedPersonsCount(): ?int
-    {
-        return $this->concernedPersonsCount;
-    }
-
-    public function setConcernedPersonsCount(?int $concernedPersonsCount): self
-    {
-        $this->concernedPersonsCount = $concernedPersonsCount;
-
-        return $this;
-    }
 }
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByConcernedPersonsCountAggregator.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByConcernedPersonsCountAggregator.php
@@ -1,86 +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\AsideActivityBundle\Export\Aggregator;
-
-use Chill\AsideActivityBundle\Export\Declarations;
-use Chill\MainBundle\Export\AggregatorInterface;
-use Doctrine\ORM\QueryBuilder;
-use Symfony\Component\Form\FormBuilderInterface;
-
-class ByConcernedPersonsCountAggregator implements AggregatorInterface
-{
-    public function addRole(): ?string
-    {
-        return null;
-    }
-
-    public function alterQuery(QueryBuilder $qb, $data, \Chill\MainBundle\Export\ExportGenerationContext $exportGenerationContext): void
-    {
-        $qb->addSelect('aside.concernedPersonsCount AS by_concerned_persons_count_aggregator')
-            ->addGroupBy('by_concerned_persons_count_aggregator');
-    }
-
-    public function applyOn(): string
-    {
-        return Declarations::ASIDE_ACTIVITY_TYPE;
-    }
-
-    public function buildForm(FormBuilderInterface $builder): void
-    {
-        // No form needed
-    }
-
-    public function getNormalizationVersion(): int
-    {
-        return 1;
-    }
-
-    public function normalizeFormData(array $formData): array
-    {
-        return [];
-    }
-
-    public function denormalizeFormData(array $formData, int $fromVersion): array
-    {
-        return [];
-    }
-
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }
-
-    public function getLabels($key, array $values, $data): callable
-    {
-        return function ($value): string {
-            if ('_header' === $value) {
-                return 'export.aggregator.Concerned persons count';
-            }
-
-            if (null === $value) {
-                return 'export.aggregator.No concerned persons count specified';
-            }
-
-            return (string) $value;
-        };
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['by_concerned_persons_count_aggregator'];
-    }
-
-    public function getTitle(): string
-    {
-        return 'export.aggregator.Group by concerned persons count';
-    }
-}
--- a/src/Bundle/ChillAsideActivityBundle/src/Export/Export/SumConcernedPersonsCountAsideActivity.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Export/Export/SumConcernedPersonsCountAsideActivity.php
@@ -1,116 +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\AsideActivityBundle\Export\Export;
-
-use Chill\AsideActivityBundle\Export\Declarations;
-use Chill\AsideActivityBundle\Repository\AsideActivityRepository;
-use Chill\AsideActivityBundle\Security\AsideActivityVoter;
-use Chill\MainBundle\Export\ExportInterface;
-use Chill\MainBundle\Export\FormatterInterface;
-use Chill\MainBundle\Export\GroupedExportInterface;
-use Doctrine\ORM\Query;
-use Symfony\Component\Form\FormBuilderInterface;
-
-class SumConcernedPersonsCountAsideActivity implements ExportInterface, GroupedExportInterface
-{
-    public function __construct(private readonly AsideActivityRepository $repository) {}
-
-    public function buildForm(FormBuilderInterface $builder) {}
-
-    public function getNormalizationVersion(): int
-    {
-        return 1;
-    }
-
-    public function normalizeFormData(array $formData): array
-    {
-        return [];
-    }
-
-    public function denormalizeFormData(array $formData, int $fromVersion): array
-    {
-        return [];
-    }
-
-    public function getFormDefaultData(): array
-    {
-        return [];
-    }
-
-    public function getAllowedFormattersTypes(): array
-    {
-        return [FormatterInterface::TYPE_TABULAR];
-    }
-
-    public function getDescription(): string
-    {
-        return 'export.Sum concerned persons count for aside activities';
-    }
-
-    public function getGroup(): string
-    {
-        return 'export.Exports of aside activities';
-    }
-
-    public function getLabels($key, array $values, $data)
-    {
-        if ('export_sum_concerned_persons_count' !== $key) {
-            throw new \LogicException("the key {$key} is not used by this export");
-        }
-
-        $labels = array_combine($values, $values);
-        $labels['_header'] = $this->getTitle();
-
-        return static fn ($value) => $labels[$value];
-    }
-
-    public function getQueryKeys($data): array
-    {
-        return ['export_sum_concerned_persons_count'];
-    }
-
-    public function getResult($query, $data, \Chill\MainBundle\Export\ExportGenerationContext $context): array
-    {
-        return $query->getQuery()->getResult(Query::HYDRATE_SCALAR);
-    }
-
-    public function getTitle(): string
-    {
-        return 'export.Sum concerned persons count for aside activities';
-    }
-
-    public function getType(): string
-    {
-        return Declarations::ASIDE_ACTIVITY_TYPE;
-    }
-
-    public function initiateQuery(array $requiredModifiers, array $acl, array $data, \Chill\MainBundle\Export\ExportGenerationContext $context): \Doctrine\ORM\QueryBuilder
-    {
-        $qb = $this->repository->createQueryBuilder('aside');
-
-        $qb->select('SUM(COALESCE(aside.concernedPersonsCount, 0)) as export_sum_concerned_persons_count');
-
-        return $qb;
-    }
-
-    public function requiredRole(): string
-    {
-        return AsideActivityVoter::STATS;
-    }
-
-    public function supportsModifiers(): array
-    {
-        return [
-            Declarations::ASIDE_ACTIVITY_TYPE,
-        ];
-    }
-}
--- a/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Form/AsideActivityFormType.php
@@ -21,7 +21,6 @@ use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\DataTransformer\DateTimeToTimestampTransformer;
 use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
-use Symfony\Component\Form\Extension\Core\Type\IntegerType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\Form\FormEvent;
 use Symfony\Component\Form\FormEvents;
@@ -30,13 +29,11 @@ use Symfony\Component\OptionsResolver\OptionsResolver;
 final class AsideActivityFormType extends AbstractType
 {
    private readonly array $timeChoices;
-    private readonly bool $showConcernedPersonsCount;

    public function __construct(
        ParameterBagInterface $parameterBag,
    ) {
        $this->timeChoices = $parameterBag->get('chill_aside_activity.form.time_duration');
-        $this->showConcernedPersonsCount = $parameterBag->get('chill_aside_activity.show_concerned_persons_count');
    }

    public function buildForm(FormBuilderInterface $builder, array $options)
@@ -79,16 +76,6 @@ final class AsideActivityFormType extends AbstractType
            ->add('location', PickUserLocationType::class)
        ;

-        if ($this->showConcernedPersonsCount) {
-            $builder->add('concernedPersonsCount', IntegerType::class, [
-                'label' => 'Concerned persons count',
-                'required' => false,
-                'attr' => [
-                    'min' => 0,
-                ],
-            ]);
-        }
-
        foreach (['duration'] as $fieldName) {
            $builder->get($fieldName)
                ->addModelTransformer($durationTimeTransformer);
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/index.html.twig
@@ -42,11 +42,6 @@
                                {%- if entity.location.name is defined -%}
                                    <div><i class="fa fa-fw fa-map-marker"></i>{{ entity.location.name }}</div>
                                {%- endif -%}
-
-                                {%- if entity.concernedPersonsCount > 0 -%}
-                                    <div><i class="fa fa-fw fa-user"></i>{{ entity.concernedPersonsCount }}</div>
-                                {%- endif -%}
-
 							</div>
 							<div class="item-col" style="justify-content: flex-end;">
 								<div class="box">
--- a/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig
+++ b/src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig
@@ -38,11 +38,6 @@
 				<dt class="inline">{{ 'Duration'|trans }}</dt>
 				<dd>{{ entity.duration|date('H:i') }}</dd>

-                {% if chill_aside_activity_config.show_concerned_persons_count == 'visible' %}
-                    <dt class="inline">{{ 'Concerned persons count'|trans }}</dt>
-                    <dd>{{ entity.concernedPersonsCount }}</dd>
-                {% endif %}
-
 				<dt class="inline">{{ 'Remark'|trans }}</dt>
 				{%- if entity.note is empty -%}
 					<dd>
--- a/src/Bundle/ChillAsideActivityBundle/src/Tests/Export/Aggregator/ByConcernedPersonsCountAggregatorTest.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Tests/Export/Aggregator/ByConcernedPersonsCountAggregatorTest.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\AsideActivityBundle\Tests\Export\Aggregator;
-
-use Chill\AsideActivityBundle\Entity\AsideActivity;
-use Chill\AsideActivityBundle\Export\Aggregator\ByConcernedPersonsCountAggregator;
-use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
-use Doctrine\ORM\EntityManagerInterface;
-
-/**
- * @internal
- *
- * @coversNothing
- */
-class ByConcernedPersonsCountAggregatorTest extends AbstractAggregatorTest
-{
-    public function getAggregator()
-    {
-        return new ByConcernedPersonsCountAggregator();
-    }
-
-    public static function getFormData(): array
-    {
-        return [
-            [],
-        ];
-    }
-
-    public static function getQueryBuilders(): iterable
-    {
-        self::bootKernel();
-        $em = self::getContainer()->get(EntityManagerInterface::class);
-
-        return [
-            $em->createQueryBuilder()
-                ->select('count(aside.id)')
-                ->from(AsideActivity::class, 'aside'),
-        ];
-    }
-}
--- a/src/Bundle/ChillAsideActivityBundle/src/Tests/Export/Export/SumConcernedPersonsCountAsideActivityTest.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Tests/Export/Export/SumConcernedPersonsCountAsideActivityTest.php
@@ -1,50 +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\AsideActivityBundle\Tests\Export\Export;
-
-use Chill\AsideActivityBundle\Export\Export\SumConcernedPersonsCountAsideActivity;
-use Chill\AsideActivityBundle\Repository\AsideActivityRepository;
-use Chill\MainBundle\Test\Export\AbstractExportTest;
-
-/**
- * @internal
- *
- * @coversNothing
- */
-final class SumConcernedPersonsCountAsideActivityTest extends AbstractExportTest
-{
-    protected function setUp(): void
-    {
-        self::bootKernel();
-    }
-
-    public function getExport()
-    {
-        $repository = self::getContainer()->get(AsideActivityRepository::class);
-
-        yield new SumConcernedPersonsCountAsideActivity($repository);
-    }
-
-    public static function getFormData(): array
-    {
-        return [
-            [],
-        ];
-    }
-
-    public static function getModifiersCombination(): array
-    {
-        return [
-            ['aside_activity'],
-        ];
-    }
-}
--- a/src/Bundle/ChillAsideActivityBundle/src/config/services/export.yaml
+++ b/src/Bundle/ChillAsideActivityBundle/src/config/services/export.yaml
@@ -20,10 +20,6 @@ services:
      tags:
          - { name: chill.export, alias: 'avg_aside_activity_duration' }

-  Chill\AsideActivityBundle\Export\Export\SumConcernedPersonsCountAsideActivity:
-      tags:
-          - { name: chill.export, alias: 'sum_aside_activity_concerned_persons_count' }
-
  ## Filters
  chill.aside_activity.export.date_filter:
    class: Chill\AsideActivityBundle\Export\Filter\ByDateFilter
@@ -74,7 +70,3 @@ services:
  Chill\AsideActivityBundle\Export\Aggregator\ByLocationAggregator:
      tags:
          - { name: chill.export_aggregator, alias: 'aside_activity_location_aggregator' }
-
-  Chill\AsideActivityBundle\Export\Aggregator\ByConcernedPersonsCountAggregator:
-      tags:
-          - { name: chill.export_aggregator, alias: 'aside_activity_concerned_persons_count_aggregator' }
--- a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20251006113048.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20251006113048.php
@@ -1,33 +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\Migrations\AsideActivity;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-final class Version20251006113048 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'Add concernedPersonsCount property to AsideActivity entity';
-    }
-
-    public function up(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_asideactivity.asideactivity ADD concernedPersonsCount INT DEFAULT 0');
-    }
-
-    public function down(Schema $schema): void
-    {
-        $this->addSql('ALTER TABLE chill_asideactivity.AsideActivity DROP concernedPersonsCount');
-    }
-}
--- a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
+++ b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
@@ -27,7 +27,6 @@ Emergency: Urgent
 by: "Par "
 location: Lieu
 Asideactivity location: Localisation de l'activité
-Concerned persons count: Nombre d'usager concernés

 # Crud
 crud:
@@ -178,7 +177,7 @@ export:
        agent_id: Utilisateur
        creator_id: Créateur
        main_scope: Service principal de l'utilisateur
-        main_center: Territoire principal de l'utilisateur
+        main_center: Centre principal de l'utilisateur
        aside_activity_type: Catégorie d'activité annexe
        date: Date
        duration: Durée
@@ -191,7 +190,6 @@ export:
    Count aside activities by various parameters.: Compte le nombre d'activités annexes selon divers critères
    Average aside activities duration: Durée moyenne des activités annexes
    Sum aside activities duration: Durée des activités annexes
-    Sum concerned persons count for aside activities: Nombre d'usager concernés par les activités annexes
    filter:
        Filter by aside activity date: Filtrer les activités annexes par date
        Filter by aside activity type: Filtrer les activités annexes par type d'activité
@@ -212,8 +210,6 @@ export:
        'Filtered by aside activity location: only %location%': "Filtré par localisation: uniquement %location%"
    aggregator:
        Group by aside activity type: Grouper les activités annexes par type d'activité
-        Group by concerned persons count: Grouper les activités annexes par nombre d'usagers conernés
-        Concerned persons count: Nombre d'usagers concernés
        Aside activity type: Type d'activité annexe
        by_user_job:
            Aggregate by user job: Grouper les activités annexes par métier des utilisateurs
--- a/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/CalendarController.php
@@ -13,7 +13,6 @@ namespace Chill\CalendarBundle\Controller;

 use Chill\CalendarBundle\Entity\Calendar;
 use Chill\CalendarBundle\Form\CalendarType;
-use Chill\CalendarBundle\Form\CancelType;
 use Chill\CalendarBundle\RemoteCalendar\Connector\RemoteCalendarConnectorInterface;
 use Chill\CalendarBundle\Repository\CalendarACLAwareRepositoryInterface;
 use Chill\CalendarBundle\Security\Voter\CalendarVoter;
@@ -31,7 +30,6 @@ use Chill\PersonBundle\Repository\PersonRepository;
 use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Chill\PersonBundle\Security\Authorization\PersonVoter;
 use Chill\ThirdPartyBundle\Entity\ThirdParty;
-use Doctrine\ORM\EntityManagerInterface;
 use http\Exception\UnexpectedValueException;
 use Psr\Log\LoggerInterface;
 use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
@@ -62,7 +60,6 @@ class CalendarController extends AbstractController
        private readonly UserRepositoryInterface $userRepository,
        private readonly TranslatorInterface $translator,
        private readonly \Doctrine\Persistence\ManagerRegistry $managerRegistry,
-        private readonly EntityManagerInterface $em,
    ) {}

    /**
@@ -114,55 +111,6 @@ class CalendarController extends AbstractController
        ]);
    }

-    #[Route(path: '/{_locale}/calendar/calendar/{id}/cancel', name: 'chill_calendar_calendar_cancel')]
-    public function cancelAction(Calendar $calendar, Request $request): Response
-    {
-        // Deal with sms being sent or not
-        // Communicate cancellation with the remote calendar.
-
-        $this->denyAccessUnlessGranted(CalendarVoter::EDIT, $calendar);
-
-        [$person, $accompanyingPeriod] = [$calendar->getPerson(), $calendar->getAccompanyingPeriod()];
-
-        $form = $this->createForm(CancelType::class, $calendar);
-        $form->add('submit', SubmitType::class);
-
-        if ($accompanyingPeriod instanceof AccompanyingPeriod) {
-            $view = '@ChillCalendar/Calendar/cancelCalendarByAccompanyingCourse.html.twig';
-            $redirectRoute = $this->generateUrl('chill_calendar_calendar_list_by_period', ['id' => $accompanyingPeriod->getId()]);
-        } elseif ($person instanceof Person) {
-            $view = '@ChillCalendar/Calendar/cancelCalendarByPerson.html.twig';
-            $redirectRoute = $this->generateUrl('chill_calendar_calendar_list_by_person', ['id' => $person->getId()]);
-        } else {
-            throw new \RuntimeException('nor person or accompanying period');
-        }
-
-        $form->handleRequest($request);
-
-        if ($form->isSubmitted() && $form->isValid()) {
-
-            $this->logger->notice('A calendar event has been cancelled', [
-                'by_user' => $this->getUser()->getUsername(),
-                'calendar_id' => $calendar->getId(),
-            ]);
-
-            $calendar->setStatus($calendar::STATUS_CANCELED);
-            $calendar->setSmsStatus($calendar::SMS_CANCEL_PENDING);
-            $this->em->flush();
-
-            $this->addFlash('success', $this->translator->trans('chill_calendar.calendar_canceled'));
-
-            return new RedirectResponse($redirectRoute);
-        }
-
-        return $this->render($view, [
-            'calendar' => $calendar,
-            'form' => $form->createView(),
-            'accompanyingCourse' => $accompanyingPeriod,
-            'person' => $person,
-        ]);
-    }
-
    /**
     * Edit a calendar item.
     */
@@ -318,7 +266,7 @@ class CalendarController extends AbstractController
        }

        if (!$this->getUser() instanceof User) {
-            throw new UnauthorizedHttpException('you are not a user');
+            throw new UnauthorizedHttpException('you are not an user');
        }

        $view = '@ChillCalendar/Calendar/listByUser.html.twig';
--- a/src/Bundle/ChillCalendarBundle/Controller/MyInvitationsController.php
+++ b/src/Bundle/ChillCalendarBundle/Controller/MyInvitationsController.php
@@ -1,58 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\CalendarBundle\Controller;
-
-use Chill\CalendarBundle\Entity\Calendar;
-use Chill\CalendarBundle\Repository\InviteRepository;
-use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepositoryInterface;
-use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Pagination\PaginatorFactory;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\HttpKernel\Exception\UnauthorizedHttpException;
-use Symfony\Component\Routing\Annotation\Route;
-
-class MyInvitationsController extends AbstractController
-{
-    public function __construct(private readonly InviteRepository $inviteRepository, private readonly PaginatorFactory $paginator, private readonly DocGeneratorTemplateRepositoryInterface $docGeneratorTemplateRepository) {}
-
-    #[Route(path: '/{_locale}/calendar/invitations/my', name: 'chill_calendar_invitations_list_my')]
-    public function myInvitations(Request $request): Response
-    {
-        $this->denyAccessUnlessGranted('ROLE_USER');
-
-        $user = $this->getUser();
-
-        if (!$user instanceof User) {
-            throw new UnauthorizedHttpException('you are not a user');
-        }
-
-        $total = count($this->inviteRepository->findBy(['user' => $user]));
-        $paginator = $this->paginator->create($total);
-
-        $invitations = $this->inviteRepository->findBy(
-            ['user' => $user],
-            ['createdAt' => 'DESC'],
-            $paginator->getItemsPerPage(),
-            $paginator->getCurrentPageFirstItemNumber()
-        );
-
-        $view = '@ChillCalendar/Invitations/listByUser.html.twig';
-
-        return $this->render($view, [
-            'invitations' => $invitations,
-            'paginator' => $paginator,
-            'templates' => $this->docGeneratorTemplateRepository->findByEntity(Calendar::class),
-        ]);
-    }
-}
--- a/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCancelReason.php
+++ b/src/Bundle/ChillCalendarBundle/DataFixtures/ORM/LoadCancelReason.php
@@ -35,7 +35,7 @@ class LoadCancelReason extends Fixture implements FixtureGroupInterface
        $arr = [
            ['name' => CancelReason::CANCELEDBY_USER],
            ['name' => CancelReason::CANCELEDBY_PERSON],
-            ['name' => CancelReason::CANCELEDBY_OTHER],
+            ['name' => CancelReason::CANCELEDBY_DONOTCOUNT],
        ];

        foreach ($arr as $a) {
--- a/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/Calendar.php
@@ -269,11 +269,6 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
        return $this->cancelReason;
    }

-    public function isCanceled(): bool
-    {
-        return null !== $this->cancelReason;
-    }
-
    public function getCenters(): ?iterable
    {
        return match ($this->getContext()) {
--- a/src/Bundle/ChillCalendarBundle/Entity/CancelReason.php
+++ b/src/Bundle/ChillCalendarBundle/Entity/CancelReason.php
@@ -18,14 +18,14 @@ use Doctrine\ORM\Mapping as ORM;
 #[ORM\Table(name: 'chill_calendar.cancel_reason')]
 class CancelReason
 {
-    final public const CANCELEDBY_OTHER = 'CANCELEDBY_OTHER';
+    final public const CANCELEDBY_DONOTCOUNT = 'CANCELEDBY_DONOTCOUNT';

    final public const CANCELEDBY_PERSON = 'CANCELEDBY_PERSON';

    final public const CANCELEDBY_USER = 'CANCELEDBY_USER';

-    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::BOOLEAN, options: ['default' => true])]
-    private bool $active = true;
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::BOOLEAN)]
+    private ?bool $active = null;

    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, length: 255)]
    private ?string $canceledBy = null;
--- a/src/Bundle/ChillCalendarBundle/Form/CancelReasonType.php
+++ b/src/Bundle/ChillCalendarBundle/Form/CancelReasonType.php
@@ -15,7 +15,7 @@ use Chill\CalendarBundle\Entity\CancelReason;
 use Chill\MainBundle\Form\Type\TranslatableStringFormType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
-use Symfony\Component\Form\Extension\Core\Type\ChoiceType;
+use Symfony\Component\Form\Extension\Core\Type\TextType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;

@@ -28,14 +28,7 @@ class CancelReasonType extends AbstractType
            ->add('active', CheckboxType::class, [
                'required' => false,
            ])
-            ->add('canceledBy', ChoiceType::class, [
-                'choices' => [
-                    'chill_calendar.canceled_by.user' => CancelReason::CANCELEDBY_USER,
-                    'chill_calendar.canceled_by.person' => CancelReason::CANCELEDBY_PERSON,
-                    'chill_calendar.canceled_by.other' => CancelReason::CANCELEDBY_OTHER,
-                ],
-                'required' => true,
-            ]);
+            ->add('canceledBy', TextType::class);
    }

    public function configureOptions(OptionsResolver $resolver)
--- a/src/Bundle/ChillCalendarBundle/Form/CancelType.php
+++ b/src/Bundle/ChillCalendarBundle/Form/CancelType.php
@@ -1,42 +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\Form;
-
-use Chill\CalendarBundle\Entity\Calendar;
-use Chill\CalendarBundle\Entity\CancelReason;
-use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
-use Symfony\Bridge\Doctrine\Form\Type\EntityType;
-use Symfony\Component\Form\AbstractType;
-use Symfony\Component\Form\FormBuilderInterface;
-use Symfony\Component\OptionsResolver\OptionsResolver;
-
-class CancelType extends AbstractType
-{
-    public function __construct(private readonly TranslatableStringHelperInterface $translatableStringHelper) {}
-
-    public function buildForm(FormBuilderInterface $builder, array $options)
-    {
-        $builder->add('cancelReason', EntityType::class, [
-            'class' => CancelReason::class,
-            'required' => true,
-            'choice_label' => fn (CancelReason $cancelReason) => $this->translatableStringHelper->localize($cancelReason->getName()),
-        ]);
-    }
-
-    public function configureOptions(OptionsResolver $resolver)
-    {
-        $resolver->setDefaults([
-            'data_class' => Calendar::class,
-
-        ]);
-    }
-}
--- a/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php
+++ b/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php
@@ -25,13 +25,6 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
        if ($this->security->isGranted('ROLE_USER')) {
            $menu->addChild('My calendar list', [
                'route' => 'chill_calendar_calendar_list_my',
-            ])
-                ->setExtras([
-                    'order' => 8,
-                    'icon' => 'tasks',
-                ]);
-            $menu->addChild('invite.list.title', [
-                'route' => 'chill_calendar_invitations_list_my',
            ])
                ->setExtras([
                    'order' => 9,
--- a/src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarEntityListener.php
+++ b/src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarEntityListener.php
@@ -21,7 +21,6 @@ namespace Chill\CalendarBundle\Messenger\Doctrine;
 use Chill\CalendarBundle\Entity\Calendar;
 use Chill\CalendarBundle\Messenger\Message\CalendarMessage;
 use Chill\CalendarBundle\Messenger\Message\CalendarRemovedMessage;
-use Chill\MainBundle\Entity\User;
 use Doctrine\ORM\Event\PostPersistEventArgs;
 use Doctrine\ORM\Event\PostRemoveEventArgs;
 use Doctrine\ORM\Event\PostUpdateEventArgs;
@@ -32,17 +31,6 @@ class CalendarEntityListener
 {
    public function __construct(private readonly MessageBusInterface $messageBus, private readonly Security $security) {}

-    private function getAuthenticatedUser(): User
-    {
-        $user = $this->security->getUser();
-
-        if (!$user instanceof User) {
-            throw new \LogicException('Expected an instance of User.');
-        }
-
-        return $user;
-    }
-
    public function postPersist(Calendar $calendar, PostPersistEventArgs $args): void
    {
        if (!$calendar->preventEnqueueChanges) {
@@ -50,7 +38,7 @@ class CalendarEntityListener
                new CalendarMessage(
                    $calendar,
                    CalendarMessage::CALENDAR_PERSIST,
-                    $this->getAuthenticatedUser()
+                    $this->security->getUser()
                )
            );
        }
@@ -62,7 +50,7 @@ class CalendarEntityListener
            $this->messageBus->dispatch(
                new CalendarRemovedMessage(
                    $calendar,
-                    $this->getAuthenticatedUser()
+                    $this->security->getUser()
                )
            );
        }
@@ -70,19 +58,12 @@ class CalendarEntityListener

    public function postUpdate(Calendar $calendar, PostUpdateEventArgs $args): void
    {
-        if ($calendar->getStatus() === $calendar::STATUS_CANCELED) {
-            $this->messageBus->dispatch(
-                new CalendarRemovedMessage(
-                    $calendar,
-                    $this->getAuthenticatedUser()
-                )
-            );
-        } elseif (!$calendar->preventEnqueueChanges) {
+        if (!$calendar->preventEnqueueChanges) {
            $this->messageBus->dispatch(
                new CalendarMessage(
                    $calendar,
                    CalendarMessage::CALENDAR_UPDATE,
-                    $this->getAuthenticatedUser()
+                    $this->security->getUser()
                )
            );
        }
--- a/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarRemovedMessage.php
+++ b/src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarRemovedMessage.php
@@ -70,8 +70,6 @@ class CalendarRemovedMessage

    public function getRemoteId(): string
    {
-        dump($this->remoteId);
-
        return $this->remoteId;
    }
 }
--- a/src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php
+++ b/src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php
@@ -191,7 +191,6 @@ class CalendarRepository implements ObjectRepository
                    $qb->expr()->eq('c.mainUser', ':user'),
                    $qb->expr()->gte('c.startDate', ':startDate'),
                    $qb->expr()->lte('c.endDate', ':endDate'),
-                    $qb->expr()->isNull('c.cancelReason'),
                )
            )
            ->setParameters([
--- a/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php
+++ b/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php
@@ -41,7 +41,7 @@ class InviteRepository implements ObjectRepository
    /**
     * @return array|Invite[]
     */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
+    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null)
    {
        return $this->entityRepository->findBy($criteria, $orderBy, $limit, $offset);
    }
--- a/src/Bundle/ChillCalendarBundle/Resources/config/services/controller.yml
+++ b/src/Bundle/ChillCalendarBundle/Resources/config/services/controller.yml
@@ -1,6 +1,5 @@
 services:
    Chill\CalendarBundle\Controller\:
        autowire: true
-        autoconfigure: true
        resource: '../../../Controller'
        tags: ['controller.service_arguments']
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig
@@ -1,23 +1,17 @@
-{# list used in context of person, accompanyingPeriod or user #}
+{# list used in context of person or accompanyingPeriod #}

-<div class="item-bloc">
-    <div class="item-row main">
-        <div class="item-col">
-            <div class="wrap-header">
-                <div class="wl-row">
-                    {% if calendar.status == 'canceled' %}
-                                <div class="badge rounded-pill bg-danger">
-                                    <span>{{ 'chill_calendar.canceled'|trans }}: </span>
-                                    <span>{{ calendar.cancelReason.name|localize_translatable_string }}</span>
-                                </div>
-                                    {% endif %}
-                            </div>
+{% if calendarItems|length > 0 %}
+    <div class="flex-table list-records context-accompanyingCourse">
+
+        {% for calendar in calendarItems %}
+
+            <div class="item-bloc">
+                <div class="item-row main">
+                    <div class="item-col">
+                        <div class="wrap-header">
                            <div class="wl-row">
                                <div class="wl-col title">
                                    <p class="date-label">
-                                        {% if calendar.status == 'canceled' %}
-                                        <del>
-                                            {% endif %}
                                        {% if context == 'person' and calendar.context == 'accompanying_period' %}
                                            <a href="{{ chill_path_add_return_path('chill_person_accompanying_course_index', {'accompanying_period_id': calendar.accompanyingPeriod.id}) }}" style="text-decoration: none;">
                                                <span class="badge bg-primary">
@@ -25,9 +19,6 @@
                                                </span>
                                            </a>
                                        {% endif %}
-                                        {% if calendar.status == 'canceled' %}
-                                            <del>
-                                        {% endif %}
                                        {% if calendar.endDate.diff(calendar.startDate).days >= 1 %}
                                                {{ calendar.startDate|format_datetime('short', 'short') }}
                                                - {{ calendar.endDate|format_datetime('short', 'short') }}
@@ -35,46 +26,44 @@
                                            {{ calendar.startDate|format_datetime('short', 'short') }}
                                                - {{ calendar.endDate|format_datetime('none', 'short') }}
                                        {% endif %}
-                                        {% if calendar.status == 'canceled' %}
-                                            </del>
-                                        {% endif %}
+                                    </p>

-                        <div class="duration short-message">
-                            <i class="fa fa-fw fa-hourglass-end"></i>
-                            {{ calendar.duration|date('%H:%I') }}
-                            {% if false == calendar.sendSMS or null == calendar.sendSMS %}
-                                <!-- no sms will be sent -->
-                            {% else %}
-                                {% if calendar.smsStatus == 'sms_sent' %}
-                                    <span title="{{ 'SMS already sent'|trans }}" class="badge bg-info">
-                                        <i class="fa fa-check "></i>
-                                        <i class="fa fa-envelope "></i>
-                                    </span>
-                                {% else %}
-                                    <span title="{{ 'Will send SMS'|trans }}" class="badge bg-info">
-                                        <i class="fa fa-envelope "></i>
-                                        <i class="fa fa-hourglass-end "></i>
-                                    </span>
+                                    <div class="duration short-message">
+                                        <i class="fa fa-fw fa-hourglass-end"></i>
+                                        {{ calendar.duration|date('%H:%I') }}
+                                        {% if false == calendar.sendSMS or null == calendar.sendSMS %}
+                                            <!-- no sms will be send -->
+                                        {% else %}
+                                            {% if calendar.smsStatus == 'sms_sent' %}
+                                                <span title="{{ 'SMS already sent'|trans }}" class="badge bg-info">
+                                                    <i class="fa fa-check "></i>
+                                                    <i class="fa fa-envelope "></i>
+                                                </span>
+                                            {% else %}
+                                                <span title="{{ 'Will send SMS'|trans }}" class="badge bg-info">
+                                                    <i class="fa fa-envelope "></i>
+                                                    <i class="fa fa-hourglass-end "></i>
+                                                </span>
+                                            {% endif %}
+                                        {% endif %}
+                                    </div>
+
+                                </div>
+                            </div>
+                        </div>
+
+                        <div class="item-col">
+                            <ul class="list-content">
+                                {% if calendar.mainUser is not empty %}
+                                    <span class="badge-user">{{ calendar.mainUser|chill_entity_render_box({'at_date': calendar.startDate}) }}</span>
                                {% endif %}
-                            {% endif %}
+                            </ul>
                        </div>

                    </div>
                </div>
-            </div>

-            <div class="item-col">
-                <ul class="list-content">
-                    {% if calendar.mainUser is not empty %}
-                        <span class="badge-user">{{ calendar.mainUser|chill_entity_render_box({'at_date': calendar.startDate}) }}</span>
-                    {% endif %}
-                </ul>
-            </div>
-
-        </div>
-    </div>
-
-    {% if calendar.comment.comment is not empty
+                {% if calendar.comment.comment is not empty
                    or calendar.users|length > 0
                    or calendar.thirdParties|length > 0
                    or calendar.users|length > 0 %}
@@ -87,133 +76,131 @@
                            } %}
                        </div>

-        </div>
-    {% endif %}
-
-    {% if calendar.comment.comment is not empty %}
-        <div class="item-row details separator">
-            <div class="item-col comment">
-                {{ calendar.comment|chill_entity_render_box( { 'limit_lines': 3, 'metadata': false } ) }}
-            </div>
-        </div>
-    {% endif %}
-
-    {% if calendar.location is not empty %}
-        <div class="item-row separator">
-            <div>
-                {% if calendar.location.address is not same as(null) and calendar.location.name is not empty %}
-                    <i class="fa fa-map-marker"></i>{% endif %}
-                {% if calendar.location.name is not empty %}{{ calendar.location.name }}{% endif %}
-                {% if calendar.location.address is not same as(null) %}{{ calendar.location.address|chill_entity_render_box({'multiline': false, 'with_picto': (calendar.location.name is empty)}) }}{% else %}
-                    <i class="fa fa-map-marker"></i>{% endif %}
-                {% if calendar.location.phonenumber1 is not empty %}<i
-                    class="fa fa-phone"></i> {{ calendar.location.phonenumber1|chill_format_phonenumber }}{% endif %}
-                {% if calendar.location.phonenumber2 is not empty %}<i
-                    class="fa fa-phone"></i> {{ calendar.location.phonenumber2|chill_format_phonenumber }}{% endif %}
-            </div>
-        </div>
-    {% endif %}
-
-    {% if calendar.documents is not empty %}
-        <div class="item-row separator column">
-            <div>
-                {{ include('@ChillCalendar/Calendar/_documents.twig.html') }}
-            </div>
-        </div>
-    {% endif %}
-
-    {% if calendar.activity is not null %}
-        <div class="item-row separator">
-            <div class="item-col">
-                <div class="wrap-list">
-                    <div class="wl-row">
-                        <div class="wl-col title"><h3>{{ 'Activity'|trans }}</h3></div>
-                        <div class="wl-col list activity-linked">
-                            <h2 class="badge-title">
-                                <span class="title_label"></span>
-                                <span class="title_action">
-                                {{ calendar.activity.type.name | localize_translatable_string }}
-
-                                    {% if calendar.activity.emergency %}
-                                        <span class="badge bg-danger rounded-pill fs-6 float-end">{{ 'Emergency'|trans|upper }}</span>
-                                    {% endif %}
-                            </span>
-                            </h2>
-
-                            <ul class="record_actions">
-                                <li class="cancel">
-                                    <span class="createdBy">
-                                         {{ 'Created by'|trans }}
-                                        <b>{{ calendar.activity.createdBy|chill_entity_render_string({'at_date': calendar.activity.createdAt}) }}</b>, {{ 'on'|trans }} {{ calendar.activity.createdAt|format_datetime('short', 'short') }}
-                                    </span>
-                                </li>
-                                {% if is_granted('CHILL_ACTIVITY_SEE', calendar.activity) %}
-                                    <li>
-                                        <a href="{{ chill_path_add_return_path('chill_activity_activity_show', {'id': calendar.activity.id}) }}" class="btn btn-sm btn-show" ></a>
-                                    </li>
-                                {% endif %}
-                            </ul>
+                    </div>
+                {% endif %}

+                {% if calendar.comment.comment is not empty %}
+                    <div class="item-row details separator">
+                        <div class="item-col comment">
+                            {{ calendar.comment|chill_entity_render_box( { 'limit_lines': 3, 'metadata': false } ) }}
                        </div>
                    </div>
-                </div>
-            </div>
-        </div>
-    {% endif %}
-
-    <div class="item-row separator">
-        <ul class="record_actions">
-                {% if is_granted('CHILL_CALENDAR_DOC_EDIT', calendar) and calendar.status is not constant('STATUS_CANCELED', calendar) %}
-                    {% if templates|length == 0 %}
-                        <li>
-                            <a class="btn btn-create"
-                               href="{{ chill_path_add_return_path('chill_calendar_calendardoc_new', {'id': calendar.id }) }}">
-                                {{ 'chill_calendar.Add a document'|trans }}
-                            </a>
-                        </li>
-                    {% else %}
-                        <li>
-                            <div class="dropdown">
-                                <button class="btn btn-create dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
-                                    {{ 'chill_calendar.Add a document'|trans }}
-                                </button>
-                                <ul class="dropdown-menu">
-                                    <li>
-                                        <a class="dropdown-item"
-                                           href="{{ chill_path_add_return_path('chill_calendar_calendardoc_new', {'id': calendar.id }) }}">
-                                            {{ 'chill_calendar.Upload a document'|trans }}
-                                        </a>
-                                    </li>
-                                    {% for template in templates %}
-                                    <li>
-                                        <a class="dropdown-item"
-                                            href="{{ chill_path_add_return_path('chill_docgenerator_generate_from_template', {'template': template.id, 'entityClassName': 'Chill\\CalendarBundle\\Entity\\Calendar', 'entityId': calendar.id}) }}"
-                                        >
-                                           {{ template.name|localize_translatable_string }}
-                                        </a>
-                                    </li>
-                                    {% endfor %}
-                                </ul>
-                            </div>
-                        </li>
-                    {% endif %}
                {% endif %}
-            {% if calendar.activity is null and (
-                (calendar.context == 'accompanying_period' and is_granted('CHILL_ACTIVITY_CREATE', calendar.accompanyingPeriod))
-                or
-                (calendar.context == 'person' and is_granted('CHILL_ACTIVITY_CREATE', calendar.person))
-                )
-                            and calendar.status is not constant('STATUS_CANCELED', calendar)
-            %}
-                <li>
-                    <a class="btn btn-create"
-                       href="{{ chill_path_add_return_path('chill_calendar_calendar_to_activity', { 'id': calendar.id }) }}">
-                        {{ 'Transform to activity'|trans }}
-                    </a>
-                </li>
-            {% endif %}

-            {% if calendar.isInvited(app.user) and not calendar.isCanceled %}
+                {% if calendar.location is not empty %}
+                    <div class="item-row separator">
+                        <div>
+                            {% if calendar.location.address is not same as(null) and calendar.location.name is not empty %}
+                                <i class="fa fa-map-marker"></i>{% endif %}
+                            {% if calendar.location.name is not empty %}{{ calendar.location.name }}{% endif %}
+                            {% if calendar.location.address is not same as(null) %}{{ calendar.location.address|chill_entity_render_box({'multiline': false, 'with_picto': (calendar.location.name is empty)}) }}{% else %}
+                                <i class="fa fa-map-marker"></i>{% endif %}
+                            {% if calendar.location.phonenumber1 is not empty %}<i
+                                class="fa fa-phone"></i> {{ calendar.location.phonenumber1|chill_format_phonenumber }}{% endif %}
+                            {% if calendar.location.phonenumber2 is not empty %}<i
+                                class="fa fa-phone"></i> {{ calendar.location.phonenumber2|chill_format_phonenumber }}{% endif %}
+                        </div>
+                    </div>
+                {% endif %}
+
+                <div class="item-row separator column">
+                    <div>
+
+                        {{ include('@ChillCalendar/Calendar/_documents.twig.html') }}
+                    </div>
+                </div>
+
+                {% if calendar.activity is not null %}
+                    <div class="item-row separator">
+                        <div class="item-col">
+                            <div class="wrap-list">
+                                <div class="wl-row">
+                                    <div class="wl-col title"><h3>{{ 'Activity'|trans }}</h3></div>
+                                    <div class="wl-col list activity-linked">
+                                        <h2 class="badge-title">
+                                            <span class="title_label"></span>
+                                            <span class="title_action">
+                                            {{ calendar.activity.type.name | localize_translatable_string }}
+
+                                                {% if calendar.activity.emergency %}
+                                                    <span class="badge bg-danger rounded-pill fs-6 float-end">{{ 'Emergency'|trans|upper }}</span>
+                                                {% endif %}
+                                        </span>
+                                        </h2>
+
+                                        <ul class="record_actions">
+                                            <li class="cancel">
+                                                <span class="createdBy">
+                                                     {{ 'Created by'|trans }}
+                                                    <b>{{ calendar.activity.createdBy|chill_entity_render_string({'at_date': calendar.activity.createdAt}) }}</b>, {{ 'on'|trans }} {{ calendar.activity.createdAt|format_datetime('short', 'short') }}
+                                                </span>
+                                            </li>
+                                            {% if is_granted('CHILL_ACTIVITY_SEE', calendar.activity) %}
+                                                <li>
+                                                    <a href="{{ chill_path_add_return_path('chill_activity_activity_show', {'id': calendar.activity.id}) }}" class="btn btn-sm btn-show" ></a>
+                                                </li>
+                                            {% endif %}
+                                        </ul>
+
+                                    </div>
+                                </div>
+                            </div>
+                        </div>
+                    </div>
+                {% endif %}
+
+                <div class="item-row separator">
+                    <ul class="record_actions">
+                        {% if is_granted('CHILL_CALENDAR_DOC_EDIT', calendar) %}
+                            {% if templates|length == 0 %}
+                                <li>
+                                    <a class="btn btn-create"
+                                       href="{{ chill_path_add_return_path('chill_calendar_calendardoc_new', {'id': calendar.id }) }}">
+                                        {{ 'chill_calendar.Add a document'|trans }}
+                                    </a>
+                                </li>
+                            {% else %}
+                                <li>
+                                    <div class="dropdown">
+                                        <button class="btn btn-create dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
+                                            {{ 'chill_calendar.Add a document'|trans }}
+                                        </button>
+                                        <ul class="dropdown-menu">
+                                            <li>
+                                                <a class="dropdown-item"
+                                                   href="{{ chill_path_add_return_path('chill_calendar_calendardoc_new', {'id': calendar.id }) }}">
+                                                    {{ 'chill_calendar.Upload a document'|trans }}
+                                                </a>
+                                            </li>
+                                            {% for template in templates %}
+                                            <li>
+                                                <a class="dropdown-item"
+                                                    href="{{ chill_path_add_return_path('chill_docgenerator_generate_from_template', {'template': template.id, 'entityClassName': 'Chill\\CalendarBundle\\Entity\\Calendar', 'entityId': calendar.id}) }}"
+                                                >
+                                                   {{ template.name|localize_translatable_string }}
+                                                </a>
+                                            </li>
+                                            {% endfor %}
+                                        </ul>
+                                    </div>
+                                </li>
+                            {% endif %}
+                        {% endif %}
+                        {% if calendar.activity is null and (
+                            (calendar.context == 'accompanying_period' and is_granted('CHILL_ACTIVITY_CREATE', calendar.accompanyingPeriod))
+                            or
+                            (calendar.context == 'person' and is_granted('CHILL_ACTIVITY_CREATE', calendar.person))
+                            )
+                        %}
+                            <li>
+                                <a class="btn btn-create"
+                                   href="{{ chill_path_add_return_path('chill_calendar_calendar_to_activity', { 'id': calendar.id }) }}">
+                                    {{ 'Transform to activity'|trans }}
+                                </a>
+                            </li>
+                        {% endif %}
+
+                        {% if (calendar.isInvited(app.user)) %}
                            {% set invite = calendar.inviteForUser(app.user) %}
                            <li>
                                <div invite-answer data-status="{{ invite.status|e('html_attr') }}"
@@ -226,18 +213,12 @@
                                   class="btn btn-show "></a>
                            </li>
                        {% endif %}
-
-                        {% if is_granted('CHILL_CALENDAR_CALENDAR_EDIT', calendar) and calendar.status is not constant('STATUS_CANCELED', calendar) %}
+                        {% if is_granted('CHILL_CALENDAR_CALENDAR_EDIT', calendar) %}
                        <li>
                            <a href="{{ chill_path_add_return_path('chill_calendar_calendar_edit', { 'id': calendar.id }) }}"
                               class="btn btn-update "></a>
                        </li>
-                        <li>
-                            <a href="{{ chill_path_add_return_path('chill_calendar_calendar_cancel', { 'id': calendar.id } ) }}"
-                               class="btn btn-action"><i class="bi bi-x-circle"></i> {{ 'Cancel'|trans }}</a>
-                        </li>
                        {% endif %}
-
                        {% if is_granted('CHILL_CALENDAR_CALENDAR_DELETE', calendar) %}
                        <li>
                            <a href="{{ chill_path_add_return_path('chill_calendar_calendar_delete', { 'id': calendar.id } ) }}"
@@ -246,8 +227,14 @@
                        {% endif %}
                    </ul>

+                </div>
+
+            </div>
+        {% endfor %}
+
+        {% if calendarItems|length < paginator.getTotalItems %}
+            {{ chill_pagination(paginator) }}
+        {% endif %}
+
    </div>
-
-</div>
-
-
+{% endif %}
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByAccompanyingCourse.html.twig
@@ -1,29 +0,0 @@
-{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig" %}
-
-{% set activeRouteKey = 'chill_calendar_calendar_list' %}
-
-{% block title  'chill_calendar.cancel_calendar_item'|trans %}
-
-{% block content %}
-
-    {{ form_start(form) }}
-
-    {{ form_row(form.cancelReason) }}
-
-    <ul class="record_actions sticky-form-buttons">
-        <li class="cancel">
-            <a
-                class="btn btn-cancel"
-                href="{{ chill_return_path_or('chill_calendar_calendar_list', { 'id': accompanyingCourse.id } )}}"
-            >
-                {{ 'Cancel'|trans|chill_return_path_label }}
-            </a>
-        </li>
-        <li>
-            {{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-save' }, 'label': 'Save' } ) }}
-        </li>
-    </ul>
-
-    {{ form_end(form) }}
-
-{% endblock %}
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByPerson.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByPerson.html.twig
@@ -1,29 +0,0 @@
-{% extends "@ChillPerson/Person/layout.html.twig" %}
-
-{% set activeRouteKey = 'chill_calendar_calendar_list' %}
-
-{% block title  'chill_calendar.cancel_calendar_item'|trans %}
-
-{% block content %}
-
-    {{ form_start(form) }}
-
-    {{ form_row(form.cancelReason) }}
-
-    <ul class="record_actions sticky-form-buttons">
-        <li class="cancel">
-            <a
-                class="btn btn-cancel"
-                href="{{ chill_return_path_or('chill_calendar_calendar_list', { 'id': person.id } )}}"
-            >
-                {{ 'Cancel'|trans|chill_return_path_label }}
-            </a>
-        </li>
-        <li>
-            {{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-save' }, 'label': 'Save' } ) }}
-        </li>
-    </ul>
-
-    {{ form_end(form) }}
-
-{% endblock %}
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByAccompanyingCourse.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByAccompanyingCourse.html.twig
@@ -34,18 +34,7 @@
            {% endif %}
        </p>
    {% else %}
-        {% if calendarItems|length > 0 %}
-            <div class="flex-table list-records context-accompanyingCourse">
-                {% for calendar in calendarItems %}
-                    {{ include('@ChillCalendar/Calendar/_list.html.twig', {context: 'accompanying_course'}) }}
-                {% endfor %}
-            </div>
-
-            {% if calendarItems|length < paginator.getTotalItems %}
-                {{ chill_pagination(paginator) }}
-            {% endif %}
-
-        {% endif %}
+        {{ include('@ChillCalendar/Calendar/_list.html.twig', {context: 'accompanying_course'}) }}
    {% endif %}

    <ul class="record_actions sticky-form-buttons">
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByPerson.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/listByPerson.html.twig
@@ -33,17 +33,7 @@
            {% endif %}
        </p>
    {% else %}
-        {% if calendarItems|length > 0 %}
-            <div class="flex-table list-records context-person">
-                {% for calendar in calendarItems %}
-                    {{ include ('@ChillCalendar/Calendar/_list.html.twig', {context: 'person'}) }}
-                {% endfor %}
-            </div>
-
-            {% if calendarItems|length < paginator.getTotalItems %}
-                {{ chill_pagination(paginator) }}
-            {% endif %}
-        {% endif %}
+        {{ include ('@ChillCalendar/Calendar/_list.html.twig', {context: 'person'}) }}
    {% endif %}

    <ul class="record_actions sticky-form-buttons">
--- a/src/Bundle/ChillCalendarBundle/Resources/views/CalendarShortMessage/short_message_canceled.txt.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/CalendarShortMessage/short_message_canceled.txt.twig
--- a/src/Bundle/ChillCalendarBundle/Resources/views/CancelReason/index.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/CancelReason/index.html.twig
@@ -5,7 +5,7 @@
        {% block table_entities_thead_tr %}
            <th>{{ 'Id'|trans }}</th>
            <th>{{ 'Name'|trans }}</th>
-            <th>{{ 'Canceled by'|trans }}</th>
+            <th>{{ 'canceledBy'|trans }}</th>
            <th>{{ 'active'|trans }}</th>
            <th>&nbsp;</th>
        {% endblock %}
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Invitations/listByUser.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Invitations/listByUser.html.twig
@@ -1,40 +0,0 @@
-{% extends "@ChillMain/layout.html.twig" %}
-
-{% set activeRouteKey = 'chill_calendar_invitations_list' %}
-
-{% block title %}{{ 'invite.list.title'|trans }}{% endblock title %}
-
-{% block content %}
-
-    <h1>{{ 'invite.list.title'|trans }}</h1>
-
-    {% if invitations|length == 0 %}
-        <p class="chill-no-data-statement">
-            {{ "invite.list.none"|trans }}
-        </p>
-    {% else %}
-        <div class="flex-table list-records">
-            {% for invitation in invitations %}
-                {% set calendar = invitation.getCalendar %}
-                {{ include('@ChillCalendar/Calendar/_list.html.twig', {context: 'user'}) }}
-            {% endfor %}
-        </div>
-
-        {% if invitations|length < paginator.getTotalItems %}
-            {{ chill_pagination(paginator) }}
-        {% endif %}
-    {% endif %}
-
-{% endblock %}
-
-{% block js %}
-    {{ parent() }}
-    {{ encore_entry_script_tags('mod_answer') }}
-    {{ encore_entry_script_tags('mod_document_action_buttons_group') }}
-{% endblock %}
-
-{% block css %}
-    {{ parent() }}
-    {{ encore_entry_link_tags('mod_answer') }}
-    {{ encore_entry_link_tags('mod_document_action_buttons_group') }}
-{% endblock %}
--- a/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/DefaultShortMessageForCalendarBuilder.php
+++ b/src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/DefaultShortMessageForCalendarBuilder.php
@@ -19,7 +19,6 @@ declare(strict_types=1);
 namespace Chill\CalendarBundle\Service\ShortMessageNotification;

 use Chill\CalendarBundle\Entity\Calendar;
-use Chill\CalendarBundle\Entity\CancelReason;
 use libphonenumber\PhoneNumberFormat;
 use libphonenumber\PhoneNumberUtil;
 use Symfony\Component\Notifier\Message\SmsMessage;
@@ -58,7 +57,7 @@ class DefaultShortMessageForCalendarBuilder implements ShortMessageForCalendarBu
                    $this->phoneUtil->format($person->getMobilenumber(), PhoneNumberFormat::E164),
                    $this->engine->render('@ChillCalendar/CalendarShortMessage/short_message.txt.twig', ['calendar' => $calendar]),
                );
-            } elseif (Calendar::SMS_CANCEL_PENDING === $calendar->getSmsStatus() && (null === $calendar->getCancelReason() || CancelReason::CANCELEDBY_PERSON !== $calendar->getCancelReason()->getCanceledBy())) {
+            } elseif (Calendar::SMS_CANCEL_PENDING === $calendar->getSmsStatus()) {
                $toUsers[] = new SmsMessage(
                    $this->phoneUtil->format($person->getMobilenumber(), PhoneNumberFormat::E164),
                    $this->engine->render('@ChillCalendar/CalendarShortMessage/short_message_canceled.txt.twig', ['calendar' => $calendar]),
--- a/src/Bundle/ChillCalendarBundle/Tests/Controller/MyInvitationsControllerTest.php
+++ b/src/Bundle/ChillCalendarBundle/Tests/Controller/MyInvitationsControllerTest.php
@@ -1,292 +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\Tests\Controller;
-
-use Chill\CalendarBundle\Controller\MyInvitationsController;
-use Chill\CalendarBundle\Entity\Calendar;
-use Chill\CalendarBundle\Entity\Invite;
-use Chill\CalendarBundle\Repository\InviteRepository;
-use Chill\DocGeneratorBundle\Repository\DocGeneratorTemplateRepositoryInterface;
-use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Pagination\PaginatorFactory;
-use Chill\MainBundle\Pagination\PaginatorInterface;
-use PHPUnit\Framework\TestCase;
-use Prophecy\PhpUnit\ProphecyTrait;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface;
-use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
-use Symfony\Component\Security\Core\Authorization\AuthorizationCheckerInterface;
-use Twig\Environment;
-
-/**
- * @internal
- *
- * @coversNothing
- */
-final class MyInvitationsControllerTest extends TestCase
-{
-    use ProphecyTrait;
-
-    private MyInvitationsController $controller;
-
-    protected function setUp(): void
-    {
-        // Create prophecies for dependencies
-        $inviteRepository = $this->prophesize(InviteRepository::class);
-        $paginatorFactory = $this->prophesize(PaginatorFactory::class);
-        $docGeneratorTemplateRepository = $this->prophesize(DocGeneratorTemplateRepositoryInterface::class);
-
-        // Create controller instance
-        $this->controller = new MyInvitationsController(
-            $inviteRepository->reveal(),
-            $paginatorFactory->reveal(),
-            $docGeneratorTemplateRepository->reveal()
-        );
-
-        // Set up necessary services for AbstractController
-        $authorizationChecker = $this->prophesize(AuthorizationCheckerInterface::class);
-        $tokenStorage = $this->prophesize(TokenStorageInterface::class);
-        $twig = $this->prophesize(Environment::class);
-
-        // Use reflection to set the container
-        $reflection = new \ReflectionClass($this->controller);
-        $containerProperty = $reflection->getParentClass()->getProperty('container');
-        $containerProperty->setAccessible(true);
-
-        // Create a mock container
-        $container = $this->prophesize(\Psr\Container\ContainerInterface::class);
-        $container->has('security.authorization_checker')->willReturn(true);
-        $container->get('security.authorization_checker')->willReturn($authorizationChecker->reveal());
-        $container->has('security.token_storage')->willReturn(true);
-        $container->get('security.token_storage')->willReturn($tokenStorage->reveal());
-        $container->has('twig')->willReturn(true);
-        $container->get('twig')->willReturn($twig->reveal());
-
-        $containerProperty->setValue($this->controller, $container->reveal());
-    }
-
-    public function testMyInvitationsReturnsCorrectAmountOfInvitations(): void
-    {
-        // Create test user
-        $user = new User();
-        $user->setUsername('testuser');
-
-        // Create test invitations
-        $invite1 = new Invite();
-        $invite1->setUser($user);
-        $invite1->setStatus(Invite::PENDING);
-
-        $invite2 = new Invite();
-        $invite2->setUser($user);
-        $invite2->setStatus(Invite::ACCEPTED);
-
-        $invite3 = new Invite();
-        $invite3->setUser($user);
-        $invite3->setStatus(Invite::DECLINED);
-
-        $allInvitations = [$invite1, $invite2, $invite3];
-        $paginatedInvitations = [$invite1, $invite2]; // First page with 2 items per page
-
-        // Set up repository prophecies
-        $inviteRepository = $this->prophesize(InviteRepository::class);
-        $inviteRepository->findBy(['user' => $user])->willReturn($allInvitations);
-        $inviteRepository->findBy(
-            ['user' => $user],
-            ['createdAt' => 'DESC'],
-            2, // items per page
-            0  // offset
-        )->willReturn($paginatedInvitations);
-
-        // Set up paginator prophecies
-        $paginator = $this->prophesize(PaginatorInterface::class);
-        $paginator->getItemsPerPage()->willReturn(2);
-        $paginator->getCurrentPageFirstItemNumber()->willReturn(0);
-
-        $paginatorFactory = $this->prophesize(PaginatorFactory::class);
-        $paginatorFactory->create(3)->willReturn($paginator->reveal());
-
-        // Set up doc generator repository
-        $docGeneratorTemplateRepository = $this->prophesize(DocGeneratorTemplateRepositoryInterface::class);
-        $docGeneratorTemplateRepository->findByEntity(Calendar::class)->willReturn([]);
-
-        // Create controller with mocked dependencies
-        $controller = new MyInvitationsController(
-            $inviteRepository->reveal(),
-            $paginatorFactory->reveal(),
-            $docGeneratorTemplateRepository->reveal()
-        );
-
-        // Set up authorization checker to return true for ROLE_USER
-        $authorizationChecker = $this->prophesize(AuthorizationCheckerInterface::class);
-        $authorizationChecker->isGranted('ROLE_USER', null)->willReturn(true);
-
-        // Set up token storage to return user
-        $token = $this->prophesize(TokenInterface::class);
-        $token->getUser()->willReturn($user);
-        $tokenStorage = $this->prophesize(TokenStorageInterface::class);
-        $tokenStorage->getToken()->willReturn($token->reveal());
-
-        // Set up twig to return a response
-        $twig = $this->prophesize(Environment::class);
-        $twig->render('@ChillCalendar/Invitations/listByUser.html.twig', [
-            'invitations' => $paginatedInvitations,
-            'paginator' => $paginator->reveal(),
-            'templates' => [],
-        ])->willReturn('rendered content');
-
-        // Set up container
-        $container = $this->prophesize(\Psr\Container\ContainerInterface::class);
-        $container->has('security.authorization_checker')->willReturn(true);
-        $container->get('security.authorization_checker')->willReturn($authorizationChecker->reveal());
-        $container->has('security.token_storage')->willReturn(true);
-        $container->get('security.token_storage')->willReturn($tokenStorage->reveal());
-        $container->has('twig')->willReturn(true);
-        $container->get('twig')->willReturn($twig->reveal());
-
-        // Use reflection to set the container
-        $reflection = new \ReflectionClass($controller);
-        $containerProperty = $reflection->getParentClass()->getProperty('container');
-        $containerProperty->setAccessible(true);
-        $containerProperty->setValue($controller, $container->reveal());
-
-        // Create request
-        $request = new Request();
-
-        // Execute the action
-        $response = $controller->myInvitations($request);
-
-        // Assert that response is successful
-        self::assertInstanceOf(Response::class, $response);
-        self::assertSame(200, $response->getStatusCode());
-        self::assertSame('rendered content', $response->getContent());
-    }
-
-    public function testMyInvitationsPageLoads(): void
-    {
-        // Create test user
-        $user = new User();
-        $user->setUsername('testuser');
-
-        // Set up repository prophecies - no invitations
-        $inviteRepository = $this->prophesize(InviteRepository::class);
-        $inviteRepository->findBy(['user' => $user])->willReturn([]);
-        $inviteRepository->findBy(
-            ['user' => $user],
-            ['createdAt' => 'DESC'],
-            20, // default items per page
-            0   // offset
-        )->willReturn([]);
-
-        // Set up paginator prophecies
-        $paginator = $this->prophesize(PaginatorInterface::class);
-        $paginator->getItemsPerPage()->willReturn(20);
-        $paginator->getCurrentPageFirstItemNumber()->willReturn(0);
-
-        $paginatorFactory = $this->prophesize(PaginatorFactory::class);
-        $paginatorFactory->create(0)->willReturn($paginator->reveal());
-
-        // Set up doc generator repository
-        $docGeneratorTemplateRepository = $this->prophesize(DocGeneratorTemplateRepositoryInterface::class);
-        $docGeneratorTemplateRepository->findByEntity(Calendar::class)->willReturn([]);
-
-        // Create controller with mocked dependencies
-        $controller = new MyInvitationsController(
-            $inviteRepository->reveal(),
-            $paginatorFactory->reveal(),
-            $docGeneratorTemplateRepository->reveal()
-        );
-
-        // Set up authorization checker to return true for ROLE_USER
-        $authorizationChecker = $this->prophesize(AuthorizationCheckerInterface::class);
-        $authorizationChecker->isGranted('ROLE_USER', null)->willReturn(true);
-
-        // Set up token storage to return user
-        $token = $this->prophesize(TokenInterface::class);
-        $token->getUser()->willReturn($user);
-        $tokenStorage = $this->prophesize(TokenStorageInterface::class);
-        $tokenStorage->getToken()->willReturn($token->reveal());
-
-        // Set up twig to return a response
-        $twig = $this->prophesize(Environment::class);
-        $twig->render('@ChillCalendar/Invitations/listByUser.html.twig', [
-            'invitations' => [],
-            'paginator' => $paginator->reveal(),
-            'templates' => [],
-        ])->willReturn('empty page content');
-
-        // Set up container
-        $container = $this->prophesize(\Psr\Container\ContainerInterface::class);
-        $container->has('security.authorization_checker')->willReturn(true);
-        $container->get('security.authorization_checker')->willReturn($authorizationChecker->reveal());
-        $container->has('security.token_storage')->willReturn(true);
-        $container->get('security.token_storage')->willReturn($tokenStorage->reveal());
-        $container->has('twig')->willReturn(true);
-        $container->get('twig')->willReturn($twig->reveal());
-
-        // Use reflection to set the container
-        $reflection = new \ReflectionClass($controller);
-        $containerProperty = $reflection->getParentClass()->getProperty('container');
-        $containerProperty->setAccessible(true);
-        $containerProperty->setValue($controller, $container->reveal());
-
-        // Create request
-        $request = new Request();
-
-        // Execute the action
-        $response = $controller->myInvitations($request);
-
-        // Assert that page loads successfully
-        self::assertInstanceOf(Response::class, $response);
-        self::assertSame(200, $response->getStatusCode());
-        self::assertSame('empty page content', $response->getContent());
-    }
-
-    public function testMyInvitationsRequiresAuthentication(): void
-    {
-        // Create controller with minimal dependencies
-        $inviteRepository = $this->prophesize(InviteRepository::class);
-        $paginatorFactory = $this->prophesize(PaginatorFactory::class);
-        $docGeneratorTemplateRepository = $this->prophesize(DocGeneratorTemplateRepositoryInterface::class);
-
-        $controller = new MyInvitationsController(
-            $inviteRepository->reveal(),
-            $paginatorFactory->reveal(),
-            $docGeneratorTemplateRepository->reveal()
-        );
-
-        // Set up authorization checker to return false for ROLE_USER
-        $authorizationChecker = $this->prophesize(AuthorizationCheckerInterface::class);
-        $authorizationChecker->isGranted('ROLE_USER')->willReturn(false);
-        $authorizationChecker->isGranted('ROLE_USER', null)->willReturn(false);
-
-        // Set up container
-        $container = $this->prophesize(\Psr\Container\ContainerInterface::class);
-        $container->has('security.authorization_checker')->willReturn(true);
-        $container->get('security.authorization_checker')->willReturn($authorizationChecker->reveal());
-
-        // Use reflection to set the container
-        $reflection = new \ReflectionClass($controller);
-        $containerProperty = $reflection->getParentClass()->getProperty('container');
-        $containerProperty->setAccessible(true);
-        $containerProperty->setValue($controller, $container->reveal());
-
-        // Create request
-        $request = new Request();
-
-        // Expect AccessDeniedException
-        $this->expectException(\Symfony\Component\Security\Core\Exception\AccessDeniedException::class);
-
-        // Execute the action
-        $controller->myInvitations($request);
-    }
-}
--- a/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillCalendarBundle/translations/messages.fr.yml
@@ -31,7 +31,8 @@ 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é

-Canceled by: Annulé par
+canceledBy: supprimé par
+Canceled by: supprimé par
 Calendar configuration: Gestion des rendez-vous

 crud:
@@ -43,14 +44,6 @@ crud:
        title_edit: Modifier le motif d'annulation

 chill_calendar:
-    canceled: Annulé
-    cancel_reason: Raison d'annulation
-    cancel_calendar_item: Annuler rendez-vous
-    calendar_canceled: Le rendez-vous a été annulé
-    canceled_by:
-        user: Utilisateur
-        person: Usager
-        other: Autre
    Document: Document d'un rendez-vous
    form:
        The main user is mandatory. He will organize the appointment.: L'utilisateur principal est obligatoire. Il est l'organisateur de l'événement.
@@ -93,9 +86,6 @@ invite:
    declined: Refusé
    pending: En attente
    tentative: Accepté provisoirement
-    list:
-        none: Il n'y aucun invitation
-        title: Mes invitations

 # exports
 Exports of calendar: Exports des rendez-vous
--- a/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepositoryInterface.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepositoryInterface.php
@@ -20,9 +20,4 @@ use Doctrine\Persistence\ObjectRepository;
 interface DocGeneratorTemplateRepositoryInterface extends ObjectRepository
 {
    public function countByEntity(string $entity): int;
-
-    /**
-     * @return array|DocGeneratorTemplate[]
-     */
-    public function findByEntity(string $entity, ?int $start = 0, ?int $limit = 50): array;
 }
--- a/src/Bundle/ChillDocStoreBundle/Controller/StoredObjectVersionApiController.php
+++ b/src/Bundle/ChillDocStoreBundle/Controller/StoredObjectVersionApiController.php
@@ -59,7 +59,7 @@ final readonly class StoredObjectVersionApiController

        return new JsonResponse(
            $this->serializer->serialize(
-                new Collection(array_values($items->toArray()), $paginator),
+                new Collection($items, $paginator),
                'json',
                [AbstractNormalizer::GROUPS => ['read', StoredObjectVersionNormalizer::WITH_POINT_IN_TIMES_CONTEXT, StoredObjectVersionNormalizer::WITH_RESTORED_CONTEXT]]
            ),
--- a/src/Bundle/ChillDocStoreBundle/Entity/StoredObjectVersion.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/StoredObjectVersion.php
@@ -23,14 +23,10 @@ use Random\RandomException;
 * Store each version of StoredObject's.
 *
 * A version should not be created manually: use the method @see{StoredObject::registerVersion} instead.
- *
- * Each filename must be unique within the same StoredObject. We add a condition on id to apply this condition only for
- * newly created versions when this new index is applied.
 */
 #[ORM\Entity]
 #[ORM\Table('chill_doc.stored_object_version')]
 #[ORM\UniqueConstraint(name: 'chill_doc_stored_object_version_unique_by_object', columns: ['stored_object_id', 'version'])]
-#[ORM\UniqueConstraint(name: 'chill_doc_stored_object_version_unique_by_filename', columns: ['filename'], options: ['where' => '(id > 0)'])]
 class StoredObjectVersion implements TrackCreationInterface
 {
    use TrackCreationTrait;
--- a/src/Bundle/ChillDocStoreBundle/Exception/ConversionWithSameMimeTypeException.php
+++ b/src/Bundle/ChillDocStoreBundle/Exception/ConversionWithSameMimeTypeException.php
@@ -1,20 +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\Exception;
-
-class ConversionWithSameMimeTypeException extends \RuntimeException
-{
-    public function __construct(string $mimeType, ?\Throwable $previous = null)
-    {
-        parent::__construct("Conversion to same MIME type '{$mimeType}' is not allowed: already at the same MIME type", 0, $previous);
-    }
-}
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/types/generic_doc.ts
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/types/generic_doc.ts
@@ -25,7 +25,7 @@ export interface GenericDoc {
    type: "doc_store_generic_doc";
    uniqueKey: string;
    key: string;
-    identifiers: { id: number };
+    identifiers: object;
    context: "person" | "accompanying-period";
    doc_date: DateTime;
    metadata: GenericDocMetadata;
@@ -36,18 +36,6 @@ export interface GenericDocForAccompanyingPeriod extends GenericDoc {
    context: "accompanying-period";
 }

-export function isGenericDocForAccompanyingPeriod(
-    doc: GenericDoc,
-): doc is GenericDocForAccompanyingPeriod {
-    return doc.context === "accompanying-period";
-}
-
-export function isGenericDocWithStoredObject(
-    doc: GenericDoc,
-): doc is GenericDoc & { storedObject: StoredObject } {
-    return doc.storedObject !== null;
-}
-
 interface BaseMetadataWithHtml extends BaseMetadata {
    html: string;
 }
@@ -56,33 +44,28 @@ export interface GenericDocForAccompanyingCourseDocument
    extends GenericDocForAccompanyingPeriod {
    key: "accompanying_course_document";
    metadata: BaseMetadataWithHtml;
-    storedObject: StoredObject;
 }

 export interface GenericDocForAccompanyingCourseActivityDocument
    extends GenericDocForAccompanyingPeriod {
    key: "accompanying_course_activity_document";
    metadata: BaseMetadataWithHtml;
-    storedObject: StoredObject;
 }

 export interface GenericDocForAccompanyingCourseCalendarDocument
    extends GenericDocForAccompanyingPeriod {
    key: "accompanying_course_calendar_document";
    metadata: BaseMetadataWithHtml;
-    storedObject: StoredObject;
 }

 export interface GenericDocForAccompanyingCoursePersonDocument
    extends GenericDocForAccompanyingPeriod {
    key: "person_document";
    metadata: BaseMetadataWithHtml;
-    storedObject: StoredObject;
 }

 export interface GenericDocForAccompanyingCourseWorkEvaluationDocument
    extends GenericDocForAccompanyingPeriod {
    key: "accompanying_period_work_evaluation_document";
    metadata: BaseMetadataWithHtml;
-    storedObject: StoredObject;
 }
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton/HistoryButtonListItem.vue
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton/HistoryButtonListItem.vue
@@ -3,9 +3,9 @@ import {
    StoredObject,
    StoredObjectPointInTime,
    StoredObjectVersionWithPointInTime,
-} from "ChillDocStoreAssets/types";
+} from "./../../../types";
 import UserRenderBoxBadge from "ChillMainAssets/vuejs/_components/Entity/UserRenderBoxBadge.vue";
-import { ISOToDatetime } from "ChillMainAssets/chill/js/date";
+import { ISOToDatetime } from "./../../../../../../ChillMainBundle/Resources/public/chill/js/date";
 import FileIcon from "ChillDocStoreAssets/vuejs/FileIcon.vue";
 import RestoreVersionButton from "ChillDocStoreAssets/vuejs/StoredObjectButton/HistoryButton/RestoreVersionButton.vue";
 import DownloadButton from "ChillDocStoreAssets/vuejs/StoredObjectButton/DownloadButton.vue";
--- a/src/Bundle/ChillDocStoreBundle/Security/Authorization/StoredObjectVoter/AbstractStoredObjectVoter.php
+++ b/src/Bundle/ChillDocStoreBundle/Security/Authorization/StoredObjectVoter/AbstractStoredObjectVoter.php
@@ -46,16 +46,6 @@ abstract class AbstractStoredObjectVoter implements StoredObjectVoterInterface

    public function voteOnAttribute(StoredObjectRoleEnum $attribute, StoredObject $subject, TokenInterface $token): bool
    {
-        // we first try to get the permission from the workflow, as attachement (this is the less intensive query)
-        $workflowPermissionAsAttachment = match ($attribute) {
-            StoredObjectRoleEnum::SEE => $this->workflowDocumentService->isAllowedByWorkflowForReadOperation($subject),
-            StoredObjectRoleEnum::EDIT => $this->workflowDocumentService->isAllowedByWorkflowForWriteOperation($subject),
-        };
-
-        if (WorkflowRelatedEntityPermissionHelper::FORCE_DENIED === $workflowPermissionAsAttachment) {
-            return false;
-        }
-
        // Retrieve the related entity
        $entity = $this->getRepository()->findAssociatedEntityToStoredObject($subject);

@@ -76,7 +66,7 @@ abstract class AbstractStoredObjectVoter implements StoredObjectVoterInterface
        return match ($workflowPermission) {
            WorkflowRelatedEntityPermissionHelper::FORCE_GRANT => true,
            WorkflowRelatedEntityPermissionHelper::FORCE_DENIED => false,
-            WorkflowRelatedEntityPermissionHelper::ABSTAIN => WorkflowRelatedEntityPermissionHelper::FORCE_GRANT === $workflowPermissionAsAttachment || $regularPermission,
+            WorkflowRelatedEntityPermissionHelper::ABSTAIN => $regularPermission,
        };
    }
 }
--- a/src/Bundle/ChillDocStoreBundle/Security/Authorization/StoredObjectVoterInterface.php
+++ b/src/Bundle/ChillDocStoreBundle/Security/Authorization/StoredObjectVoterInterface.php
@@ -14,12 +14,6 @@ namespace Chill\DocStoreBundle\Security\Authorization;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;

-/**
- * Interface for voting on stored object permissions.
- *
- * Each time a stored object is attached to a document, the voter is responsible for determining
- * whether the user has the necessary permissions to access or modify the stored object.
- */
 interface StoredObjectVoterInterface
 {
    public function supports(StoredObjectRoleEnum $attribute, StoredObject $subject): bool;
--- a/src/Bundle/ChillDocStoreBundle/Service/StoredObjectToPdfConverter.php
+++ b/src/Bundle/ChillDocStoreBundle/Service/StoredObjectToPdfConverter.php
@@ -15,7 +15,6 @@ use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\DocStoreBundle\Entity\StoredObjectPointInTime;
 use Chill\DocStoreBundle\Entity\StoredObjectPointInTimeReasonEnum;
 use Chill\DocStoreBundle\Entity\StoredObjectVersion;
-use Chill\DocStoreBundle\Exception\ConversionWithSameMimeTypeException;
 use Chill\DocStoreBundle\Exception\StoredObjectManagerException;
 use Chill\WopiBundle\Service\WopiConverter;
 use Symfony\Component\Mime\MimeTypesInterface;
@@ -42,10 +41,9 @@ class StoredObjectToPdfConverter
     *
     * @return array{0: StoredObjectPointInTime, 1: StoredObjectVersion, 2?: string} contains the point in time before conversion and the new version of the stored object. The converted content is included in the response if $includeConvertedContent is true
     *
-     * @throws \UnexpectedValueException           if the preferred mime type for the conversion is not found
-     * @throws \RuntimeException                   if the conversion or storage of the new version fails
+     * @throws \UnexpectedValueException    if the preferred mime type for the conversion is not found
+     * @throws \RuntimeException            if the conversion or storage of the new version fails
     * @throws StoredObjectManagerException
-     * @throws ConversionWithSameMimeTypeException if the document has already the same mime type79*
     */
    public function addConvertedVersion(StoredObject $storedObject, string $lang, $convertTo = 'pdf', bool $includeConvertedContent = false): array
    {
@@ -58,7 +56,7 @@ class StoredObjectToPdfConverter
        $currentVersion = $storedObject->getCurrentVersion();

        if ($currentVersion->getType() === $newMimeType) {
-            throw new ConversionWithSameMimeTypeException($newMimeType);
+            throw new \UnexpectedValueException('Already at the same mime type');
        }

        $content = $this->storedObjectManager->read($currentVersion);
--- a/src/Bundle/ChillDocStoreBundle/Tests/Controller/StoredObjectVersionApiControllerTest.php
+++ b/src/Bundle/ChillDocStoreBundle/Tests/Controller/StoredObjectVersionApiControllerTest.php
@@ -40,10 +40,6 @@ class StoredObjectVersionApiControllerTest extends \PHPUnit\Framework\TestCase
            $storedObject->registerVersion();
        }

-        // remove one version in the history
-        $v5 = $storedObject->getVersions()->get(5);
-        $storedObject->removeVersion($v5);
-
        $security = $this->prophesize(Security::class);
        $security->isGranted(StoredObjectRoleEnum::SEE->value, $storedObject)
            ->willReturn(true)
@@ -57,7 +53,6 @@ class StoredObjectVersionApiControllerTest extends \PHPUnit\Framework\TestCase
        self::assertEquals($response->getStatusCode(), 200);
        self::assertIsArray($body);
        self::assertArrayHasKey('results', $body);
-        self::assertIsList($body['results']);
        self::assertCount(10, $body['results']);
    }

--- a/src/Bundle/ChillDocStoreBundle/Tests/Security/Authorization/AbstractStoredObjectVoterTest.php
+++ b/src/Bundle/ChillDocStoreBundle/Tests/Security/Authorization/AbstractStoredObjectVoterTest.php
@@ -86,165 +86,9 @@ class AbstractStoredObjectVoterTest extends TestCase
    }

    /**
-     * @dataProvider dataProviderVoteOnAttributeWithStoredObjectPermission
+     * @dataProvider dataProviderVoteOnAttribute
     */
-    public function testVoteOnAttributeWithStoredObjectPermission(
-        StoredObjectRoleEnum $attribute,
-        bool $expected,
-        bool $isGrantedRegularPermission,
-        string $isGrantedWorkflowPermission,
-        string $isGrantedStoredObjectAttachment,
-    ): void {
-        $storedObject = new StoredObject();
-        $repository = new DummyRepository($related = new \stdClass());
-        $token = new UsernamePasswordToken(new User(), 'dummy');
-
-        $security = $this->prophesize(Security::class);
-        $security->isGranted('SOME_ROLE', $related)->willReturn($isGrantedRegularPermission);
-
-        $workflowRelatedEntityPermissionHelper = $this->prophesize(WorkflowRelatedEntityPermissionHelper::class);
-
-        $security = $this->prophesize(Security::class);
-        $security->isGranted('SOME_ROLE', $related)->willReturn($isGrantedRegularPermission);
-
-        if (StoredObjectRoleEnum::SEE === $attribute) {
-            $workflowRelatedEntityPermissionHelper->isAllowedByWorkflowForReadOperation($storedObject)
-                ->shouldBeCalled()
-                ->willReturn($isGrantedStoredObjectAttachment);
-            $workflowRelatedEntityPermissionHelper->isAllowedByWorkflowForReadOperation($related)
-                ->willReturn($isGrantedWorkflowPermission);
-        } elseif (StoredObjectRoleEnum::EDIT === $attribute) {
-            $workflowRelatedEntityPermissionHelper->isAllowedByWorkflowForWriteOperation($storedObject)
-                ->shouldBeCalled()
-                ->willReturn($isGrantedStoredObjectAttachment);
-            $workflowRelatedEntityPermissionHelper->isAllowedByWorkflowForWriteOperation($related)
-                ->willReturn($isGrantedWorkflowPermission);
-        } else {
-            throw new \LogicException('Invalid attribute for StoredObjectVoter');
-        }
-
-        $storedObjectVoter = new class ($repository, $workflowRelatedEntityPermissionHelper->reveal(), $security->reveal()) extends AbstractStoredObjectVoter {
-            public function __construct(private $repository, $helper, $security)
-            {
-                parent::__construct($security, $helper);
-            }
-
-            protected function getRepository(): AssociatedEntityToStoredObjectInterface
-            {
-                return $this->repository;
-            }
-
-            protected function getClass(): string
-            {
-                return \stdClass::class;
-            }
-
-            protected function attributeToRole(StoredObjectRoleEnum $attribute): string
-            {
-                return 'SOME_ROLE';
-            }
-
-            protected function canBeAssociatedWithWorkflow(): bool
-            {
-                return true;
-            }
-        };
-
-        $actual = $storedObjectVoter->voteOnAttribute($attribute, $storedObject, $token);
-
-        self::assertEquals($expected, $actual);
-    }
-
-    public static function dataProviderVoteOnAttributeWithStoredObjectPermission(): iterable
-    {
-        foreach (['read' => StoredObjectRoleEnum::SEE, 'write' => StoredObjectRoleEnum::EDIT] as $action => $attribute) {
-            yield 'Not related to any workflow nor attachment ('.$action.')' => [
-                $attribute,
-                true,
-                true,
-                WorkflowRelatedEntityPermissionHelper::ABSTAIN,
-                WorkflowRelatedEntityPermissionHelper::ABSTAIN,
-            ];
-
-            yield 'Not related to any workflow nor attachment (refuse) ('.$action.')' => [
-                $attribute,
-                false,
-                false,
-                WorkflowRelatedEntityPermissionHelper::ABSTAIN,
-                WorkflowRelatedEntityPermissionHelper::ABSTAIN,
-            ];
-
-            yield 'Is granted by a workflow takes precedence (workflow) ('.$action.')' => [
-                $attribute,
-                false,
-                true,
-                WorkflowRelatedEntityPermissionHelper::FORCE_DENIED,
-                WorkflowRelatedEntityPermissionHelper::ABSTAIN,
-            ];
-
-            yield 'Is granted by a workflow takes precedence (stored object) ('.$action.')' => [
-                $attribute,
-                false,
-                true,
-                WorkflowRelatedEntityPermissionHelper::ABSTAIN,
-                WorkflowRelatedEntityPermissionHelper::FORCE_DENIED,
-            ];
-
-            yield 'Is granted by a workflow takes precedence (workflow) although grant ('.$action.')' => [
-                $attribute,
-                false,
-                true,
-                WorkflowRelatedEntityPermissionHelper::FORCE_DENIED,
-                WorkflowRelatedEntityPermissionHelper::FORCE_GRANT,
-            ];
-
-            yield 'Is granted by a workflow takes precedence (stored object) although grant ('.$action.')' => [
-                $attribute,
-                false,
-                true,
-                WorkflowRelatedEntityPermissionHelper::FORCE_GRANT,
-                WorkflowRelatedEntityPermissionHelper::FORCE_DENIED,
-            ];
-
-            yield 'Is granted by a workflow takes precedence (initially refused) (workflow) although grant ('.$action.')' => [
-                $attribute,
-                false,
-                false,
-                WorkflowRelatedEntityPermissionHelper::FORCE_DENIED,
-                WorkflowRelatedEntityPermissionHelper::FORCE_GRANT,
-            ];
-
-            yield 'Is granted by a workflow takes precedence (initially refused) (stored object) although grant ('.$action.')' => [
-                $attribute,
-                false,
-                false,
-                WorkflowRelatedEntityPermissionHelper::FORCE_GRANT,
-                WorkflowRelatedEntityPermissionHelper::FORCE_DENIED,
-            ];
-
-            yield 'Force grant inverse the regular permission (workflow) ('.$action.')' => [
-                $attribute,
-                true,
-                false,
-                WorkflowRelatedEntityPermissionHelper::FORCE_GRANT,
-                WorkflowRelatedEntityPermissionHelper::ABSTAIN,
-            ];
-
-            yield 'Force grant inverse the regular permission (so) ('.$action.')' => [
-                $attribute,
-                true,
-                false,
-                WorkflowRelatedEntityPermissionHelper::ABSTAIN,
-                WorkflowRelatedEntityPermissionHelper::FORCE_GRANT,
-            ];
-
-        }
-    }
-
-    /**
-     * @dataProvider dataProviderVoteOnAttributeWithoutStoredObjectPermission
-     */
-    public function testVoteOnAttributeWithoutStoredObjectPermission(
+    public function testVoteOnAttribute(
        StoredObjectRoleEnum $attribute,
        bool $expected,
        bool $canBeAssociatedWithWorkflow,
@@ -261,10 +105,6 @@ class AbstractStoredObjectVoterTest extends TestCase
        $security->isGranted('SOME_ROLE', $related)->willReturn($isGrantedRegularPermission);

        $workflowRelatedEntityPermissionHelper = $this->prophesize(WorkflowRelatedEntityPermissionHelper::class);
-
-        $workflowRelatedEntityPermissionHelper->isAllowedByWorkflowForReadOperation($storedObject)->willReturn(WorkflowRelatedEntityPermissionHelper::ABSTAIN);
-        $workflowRelatedEntityPermissionHelper->isAllowedByWorkflowForWriteOperation($storedObject)->willReturn(WorkflowRelatedEntityPermissionHelper::ABSTAIN);
-
        if (null !== $isGrantedWorkflowPermissionRead) {
            $workflowRelatedEntityPermissionHelper->isAllowedByWorkflowForReadOperation($related)
                ->willReturn($isGrantedWorkflowPermissionRead)->shouldBeCalled();
@@ -283,7 +123,7 @@ class AbstractStoredObjectVoterTest extends TestCase
        self::assertEquals($expected, $voter->voteOnAttribute($attribute, $storedObject, $token), $message);
    }

-    public static function dataProviderVoteOnAttributeWithoutStoredObjectPermission(): iterable
+    public static function dataProviderVoteOnAttribute(): iterable
    {
        // not associated on a workflow
        yield [StoredObjectRoleEnum::SEE, true, false, true, null, null, 'not associated on a workflow, granted by regular access, must not rely on helper'];
--- a/src/Bundle/ChillDocStoreBundle/migrations/Version20251013094414.php
+++ b/src/Bundle/ChillDocStoreBundle/migrations/Version20251013094414.php
@@ -1,63 +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\Migrations\DocStore;
-
-use Doctrine\DBAL\Schema\Schema;
-use Doctrine\Migrations\AbstractMigration;
-
-final class Version20251013094414 extends AbstractMigration
-{
-    public function getDescription(): string
-    {
-        return 'DocStore: Enforce filename uniqueness on chill_doc.stored_object_version; clean duplicates and add partial unique index on filename (for new rows only).';
-    }
-
-    public function up(Schema $schema): void
-    {
-        // 1) Clean duplicates: for each (stored_object_id, filename, key, iv), keep only the last inserted row
-        //    and delete all others. Use ROW_NUMBER over id DESC to define the last one.
-        $this->addSql(<<<'SQL'
-            WITH ranked AS (
-                SELECT id,
-                       rank() OVER (
-                           PARTITION BY stored_object_id, filename, "key"::jsonb, iv::jsonb
-                           ORDER BY id DESC
-                       ) AS rn
-                FROM chill_doc.stored_object_version
-            )
-            DELETE FROM chill_doc.stored_object_version sov
-            USING ranked r
-            WHERE sov.id = r.id
-              AND r.rn > 1
-        SQL);
-
-        // 2) Create a partial unique index on filename that applies only to subsequently inserted rows.
-        //    Per user's instruction, compute the cutoff using the stored_object_id sequence value.
-        $nextVal = (int) $this->connection->fetchOne("SELECT nextval('chill_doc.stored_object_version_id_seq')");
-
-        // Safety: if somehow sequence is not available, fallback to current max id from the table
-        if ($nextVal <= 0) {
-            $nextVal = (int) $this->connection->fetchOne('SELECT COALESCE(MAX(id), 0) FROM chill_doc.stored_object_version');
-        }
-
-        $this->addSql(sprintf(
-            'CREATE UNIQUE INDEX chill_doc_stored_object_version_unique_by_filename ON chill_doc.stored_object_version (filename) WHERE id > %d',
-            $nextVal
-        ));
-    }
-
-    public function down(Schema $schema): void
-    {
-        // Drop the partial unique index; data cleanup is irreversible.
-        $this->addSql('DROP INDEX IF EXISTS chill_doc_stored_object_version_unique_by_filename');
-    }
-}
--- a/src/Bundle/ChillEventBundle/Controller/EventController.php
+++ b/src/Bundle/ChillEventBundle/Controller/EventController.php
@@ -246,7 +246,7 @@ final class EventController extends AbstractController
                'class' => Center::class,
                'choices' => $centers,
                'placeholder' => $this->translator->trans('Pick a center'),
-                'label' => 'To which territory should the event be associated ?',
+                'label' => 'To which centre should the event be associated ?',
            ])
            ->add('submit', SubmitType::class, [
                'label' => 'Next step',
--- a/src/Bundle/ChillEventBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillEventBundle/translations/messages.fr.yml
@@ -64,7 +64,7 @@ CHILL_EVENT_PARTICIPATION_SEE_DETAILS: Voir le détail d'une participation

 # TODO check place to put this
 Next step: Étape suivante
-To which territory should the event be associated ?: À quel territoire doit être associé l'événement ?
+To which centre should the event be associated ?: À quel centre doit être associé l'événement ?

 # timeline
 past: passé
@@ -151,7 +151,7 @@ event:
    filter:
        event_types: Par types d'événement
        event_dates: Par date d'événement
-        center: Par territoire
+        center: Par centre
        by_responsable: Par responsable
        pick_responsable: Filtrer par responsables
    budget:
@@ -188,7 +188,7 @@ event_id: Identifiant
 event_name: Nom
 event_date: Date
 event_type: Type d'évenement
-event_center: Territoire
+event_center: Centre
 event_moderator: Responsable
 event_participants_count: Nombre de participants
 event_location: Localisation
--- a/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
+++ b/src/Bundle/ChillMainBundle/CRUD/Controller/CRUDController.php
@@ -102,6 +102,7 @@ class CRUDController extends AbstractController
                Resolver::class => Resolver::class,
                SerializerInterface::class => SerializerInterface::class,
                FilterOrderHelperFactoryInterface::class => FilterOrderHelperFactoryInterface::class,
+                ManagerRegistry::class => ManagerRegistry::class,
            ]
        );
    }
@@ -673,7 +674,7 @@ class CRUDController extends AbstractController

    protected function getManagerRegistry(): ManagerRegistry
    {
-        return $this->container->get('doctrine');
+        return $this->container->get(ManagerRegistry::class);
    }

    /**
--- a/src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/ChillImportUsersCommand.php
@@ -334,7 +334,7 @@ class ChillImportUsersCommand extends Command

    protected function loadUsers()
    {
-        $reader = Reader::from($this->tempInput->getArgument('csvfile'));
+        $reader = Reader::createFromPath($this->tempInput->getArgument('csvfile'));
        $reader->setHeaderOffset(0);

        foreach ($reader->getRecords() as $line => $r) {
@@ -362,7 +362,7 @@ class ChillImportUsersCommand extends Command

    protected function prepareGroupingCenters()
    {
-        $reader = Reader::from($this->tempInput->getOption('grouping-centers'));
+        $reader = Reader::createFromPath($this->tempInput->getOption('grouping-centers'));
        $reader->setHeaderOffset(0);

        foreach ($reader->getRecords() as $r) {
@@ -378,7 +378,7 @@ class ChillImportUsersCommand extends Command

    protected function prepareWriter()
    {
-        $this->output = $output = Writer::from($this->tempInput
+        $this->output = $output = Writer::createFromPath($this->tempInput
            ->getOption('csv-dump'), 'a+');

        $output->insertOne([
--- a/src/Bundle/ChillMainBundle/Command/ChillUserSendRenewPasswordCodeCommand.php
+++ b/src/Bundle/ChillMainBundle/Command/ChillUserSendRenewPasswordCodeCommand.php
@@ -119,7 +119,7 @@ class ChillUserSendRenewPasswordCodeCommand extends Command
    protected function getReader()
    {
        try {
-            $reader = Reader::from($this->input->getArgument('csvfile'));
+            $reader = Reader::createFromPath($this->input->getArgument('csvfile'));
        } catch (\Exception $e) {
            $this->logger->error('The csv file could not be read', [
                'path' => $this->input->getArgument('csvfile'),
--- a/src/Bundle/ChillMainBundle/Controller/UserExportController.php
+++ b/src/Bundle/ChillMainBundle/Controller/UserExportController.php
@@ -43,7 +43,7 @@ final readonly class UserExportController

        $users = $this->userRepository->findAllAsArray($request->getLocale());

-        $csv = Writer::from('php://temp', 'r+');
+        $csv = Writer::createFromPath('php://temp', 'r+');
        $csv->insertOne(
            array_map(
                fn (string $e) => $this->translator->trans('admin.users.export.'.$e),
@@ -104,7 +104,7 @@ final readonly class UserExportController

        $userPermissions = $this->userRepository->findAllUserACLAsArray();

-        $csv = Writer::from('php://temp', 'r+');
+        $csv = Writer::createFromPath('php://temp', 'r+');
        $csv->insertOne(
            array_map(
                fn (string $e) => $this->translator->trans('admin.users.export.'.$e),
--- a/src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php
+++ b/src/Bundle/ChillMainBundle/Controller/WorkflowApiController.php
@@ -11,7 +11,6 @@ declare(strict_types=1);

 namespace Chill\MainBundle\Controller;

-use Chill\MainBundle\CRUD\Controller\ApiController;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
 use Chill\MainBundle\Pagination\PaginatorFactory;
@@ -28,7 +27,7 @@ use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Serializer\SerializerInterface;

-class WorkflowApiController extends ApiController
+class WorkflowApiController
 {
    public function __construct(private readonly EntityManagerInterface $entityManager, private readonly EntityWorkflowRepository $entityWorkflowRepository, private readonly PaginatorFactory $paginatorFactory, private readonly Security $security, private readonly SerializerInterface $serializer) {}

--- a/src/Bundle/ChillMainBundle/Controller/WorkflowController.php
+++ b/src/Bundle/ChillMainBundle/Controller/WorkflowController.php
@@ -264,12 +264,11 @@ class WorkflowController extends AbstractController
    {
        $this->denyAccessUnlessGranted('IS_AUTHENTICATED_REMEMBERED');

-        $total = $this->entityWorkflowRepository->countBySubscriber($this->security->getUser(), false);
+        $total = $this->entityWorkflowRepository->countBySubscriber($this->security->getUser());
        $paginator = $this->paginatorFactory->create($total);

        $workflows = $this->entityWorkflowRepository->findBySubscriber(
            $this->security->getUser(),
-            false,
            ['createdAt' => 'DESC'],
            $paginator->getItemsPerPage(),
            $paginator->getCurrentPageFirstItemNumber()
--- a/src/Bundle/ChillMainBundle/Controller/WorkflowSignatureStateChangeController.php
+++ b/src/Bundle/ChillMainBundle/Controller/WorkflowSignatureStateChangeController.php
@@ -44,7 +44,7 @@ final readonly class WorkflowSignatureStateChangeController
            $signature,
            $request,
            EntityWorkflowStepSignatureVoter::CANCEL,
-            fn (EntityWorkflowStepSignature $signature): string => $this->signatureStepStateChanger->markSignatureAsCanceled($signature),
+            function (EntityWorkflowStepSignature $signature) {$this->signatureStepStateChanger->markSignatureAsCanceled($signature); },
            '@ChillMain/WorkflowSignature/cancel.html.twig',
        );
    }
@@ -56,18 +56,11 @@ final readonly class WorkflowSignatureStateChangeController
            $signature,
            $request,
            EntityWorkflowStepSignatureVoter::REJECT,
-            fn (EntityWorkflowStepSignature $signature): string => $this->signatureStepStateChanger->markSignatureAsRejected($signature),
+            function (EntityWorkflowStepSignature $signature) {$this->signatureStepStateChanger->markSignatureAsRejected($signature); },
            '@ChillMain/WorkflowSignature/reject.html.twig',
        );
    }

-    /**
-     * @param callable(EntityWorkflowStepSignature): string $markSignature
-     *
-     * @throws \Twig\Error\LoaderError
-     * @throws \Twig\Error\RuntimeError
-     * @throws \Twig\Error\SyntaxError
-     */
    private function markSignatureAction(
        EntityWorkflowStepSignature $signature,
        Request $request,
@@ -86,13 +79,12 @@ final readonly class WorkflowSignatureStateChangeController
        $form->handleRequest($request);

        if ($form->isSubmitted() && $form->isValid()) {
-            $expectedStep = $this->entityManager->wrapInTransaction(fn () => $markSignature($signature));
+            $this->entityManager->wrapInTransaction(function () use ($signature, $markSignature) {
+                $markSignature($signature);
+            });

            return new RedirectResponse(
-                $this->chillUrlGenerator->forwardReturnPath(
-                    'chill_main_workflow_wait',
-                    ['id' => $signature->getStep()->getEntityWorkflow()->getId(), 'expectedStep' => $expectedStep]
-                )
+                $this->chillUrlGenerator->returnPathOr('chill_main_workflow_show', ['id' => $signature->getStep()->getEntityWorkflow()->getId()])
            );
        }

--- a/src/Bundle/ChillMainBundle/Controller/WorkflowWaitStepChangeController.php
+++ b/src/Bundle/ChillMainBundle/Controller/WorkflowWaitStepChangeController.php
@@ -1,41 +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\Controller;
-
-use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
-use Chill\MainBundle\Routing\ChillUrlGeneratorInterface;
-use Symfony\Component\HttpFoundation\RedirectResponse;
-use Symfony\Component\HttpFoundation\Response;
-use Symfony\Component\Routing\Annotation\Route;
-use Twig\Environment;
-
-final readonly class WorkflowWaitStepChangeController
-{
-    public function __construct(
-        private ChillUrlGeneratorInterface $chillUrlGenerator,
-        private Environment $twig,
-    ) {}
-
-    #[Route('/{_locale}/main/workflow/{id}/wait/{expectedStep}', name: 'chill_main_workflow_wait', methods: ['GET'])]
-    public function waitForSignatureChange(EntityWorkflow $entityWorkflow, string $expectedStep): Response
-    {
-        if ($entityWorkflow->getStep() === $expectedStep) {
-            return new RedirectResponse(
-                $this->chillUrlGenerator->returnPathOr('chill_main_workflow_show', ['id' => $entityWorkflow->getId()])
-            );
-        }
-
-        return new Response(
-            $this->twig->render('@ChillMain/Workflow/waiting.html.twig', ['workflow' => $entityWorkflow, 'expectedStep' => $expectedStep])
-        );
-    }
-}
--- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
@@ -30,7 +30,6 @@ use Chill\MainBundle\Controller\UserGroupAdminController;
 use Chill\MainBundle\Controller\UserGroupApiController;
 use Chill\MainBundle\Controller\UserJobApiController;
 use Chill\MainBundle\Controller\UserJobController;
-use Chill\MainBundle\Controller\WorkflowApiController;
 use Chill\MainBundle\DependencyInjection\Widget\Factory\WidgetFactoryInterface;
 use Chill\MainBundle\Doctrine\DQL\Age;
 use Chill\MainBundle\Doctrine\DQL\Extract;
@@ -67,7 +66,6 @@ use Chill\MainBundle\Entity\Regroupment;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\UserGroup;
 use Chill\MainBundle\Entity\UserJob;
-use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
 use Chill\MainBundle\Form\CenterType;
 use Chill\MainBundle\Form\CivilityType;
 use Chill\MainBundle\Form\CountryType;
@@ -81,7 +79,6 @@ use Chill\MainBundle\Form\UserGroupType;
 use Chill\MainBundle\Form\UserJobType;
 use Chill\MainBundle\Form\UserType;
 use Chill\MainBundle\Security\Authorization\ChillExportVoter;
-use Chill\MainBundle\Security\Authorization\EntityWorkflowVoter;
 use Misd\PhoneNumberBundle\Doctrine\DBAL\Types\PhoneNumberType;
 use Ramsey\Uuid\Doctrine\UuidType;
 use Symfony\Component\Config\FileLocator;
@@ -205,11 +202,6 @@ class ChillMainExtension extends Extension implements
                []
        );

-        $container->setParameter(
-            'chill_main.top_banner',
-            $config['top_banner'] ?? []
-        );
-
        $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
        $loader->load('services.yaml');
        $loader->load('services/doctrine.yaml');
@@ -255,7 +247,6 @@ class ChillMainExtension extends Extension implements
                    'name' => $config['installation_name'], ],
                'available_languages' => $config['available_languages'],
                'add_address' => $config['add_address'],
-                'chill_main_config' => $config,
            ],
            'form_themes' => ['@ChillMain/Form/fields.html.twig'],
        ];
@@ -949,21 +940,6 @@ class ChillMainExtension extends Extension implements
                        ],
                    ],
                ],
-                [
-                    'class' => EntityWorkflow::class,
-                    'name' => 'workflow',
-                    'base_path' => '/api/1.0/main/workflow',
-                    'base_role' => EntityWorkflowVoter::SEE,
-                    'controller' => WorkflowApiController::class,
-                    'actions' => [
-                        '_entity' => [
-                            'methods' => [
-                                Request::METHOD_GET => true,
-                                Request::METHOD_HEAD => true,
-                            ],
-                        ],
-                    ],
-                ],
            ],
        ]);
    }
--- a/src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php
@@ -168,20 +168,6 @@ class Configuration implements ConfigurationInterface
            ->end()
            ->end()
            ->end()
-            ->arrayNode('top_banner')
-            ->canBeUnset()
-            ->children()
-            ->booleanNode('visible')
-            ->defaultFalse()
-            ->end()
-            ->arrayNode('text')
-            ->useAttributeAsKey('lang')
-            ->scalarPrototype()->end()
-            ->end() // end of text
-            ->scalarNode('color')->defaultNull()->end()
-            ->scalarNode('background_color')->defaultNull()->end()
-            ->end() // end of top_banner children
-            ->end() // end of top_banner
            ->arrayNode('widgets')
            ->canBeEnabled()
            ->canBeUnset()
--- a/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php
+++ b/src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflowStep.php
@@ -123,7 +123,7 @@ class EntityWorkflowStep
    /**
     * @var Collection<int, EntityWorkflowStepHold>
     */
-    #[ORM\OneToMany(mappedBy: 'step', targetEntity: EntityWorkflowStepHold::class, cascade: ['remove'])]
+    #[ORM\OneToMany(mappedBy: 'step', targetEntity: EntityWorkflowStepHold::class)]
    private Collection $holdsOnStep;

    /**
--- a/src/Bundle/ChillMainBundle/Notification/Email/DailyNotificationDigestCronjob.php
+++ b/src/Bundle/ChillMainBundle/Notification/Email/DailyNotificationDigestCronjob.php
@@ -53,16 +53,11 @@ readonly class DailyNotificationDigestCronjob implements CronJobInterface
    public function run(array $lastExecutionData): ?array
    {
        $now = $this->clock->now();
-
        if (isset($lastExecutionData['last_execution'])) {
            $lastExecution = \DateTimeImmutable::createFromFormat(
                \DateTimeImmutable::ATOM,
                $lastExecutionData['last_execution']
            );
-
-            if (false === $lastExecution) {
-                $lastExecution = $now->sub(new \DateInterval('P1D'));
-            }
        } else {
            $lastExecution = $now->sub(new \DateInterval('P1D'));
        }
@@ -101,7 +96,7 @@ readonly class DailyNotificationDigestCronjob implements CronJobInterface
        ]);

        return [
-            'last_execution' => $now->format(\DateTimeInterface::ATOM),
+            'last_execution' => $now->format('Y-m-d-H:i:s.u e'),
        ];
    }
 }
--- a/src/Bundle/ChillMainBundle/Pagination/PaginatorFactory.php
+++ b/src/Bundle/ChillMainBundle/Pagination/PaginatorFactory.php
@@ -17,7 +17,7 @@ use Symfony\Component\Routing\RouterInterface;
 /**
 * Create paginator instances.
 */
-class PaginatorFactory implements PaginatorFactoryInterface
+final readonly class PaginatorFactory implements PaginatorFactoryInterface
 {
    final public const DEFAULT_CURRENT_PAGE_KEY = 'page';

@@ -29,16 +29,16 @@ class PaginatorFactory implements PaginatorFactoryInterface
        /**
         * the request stack.
         */
-        private readonly RequestStack $requestStack,
+        private RequestStack $requestStack,
        /**
         * the router and generator for url.
         */
-        private readonly RouterInterface $router,
+        private RouterInterface $router,
        /**
         * the default item per page. This may be overriden by
         * the request or inside the paginator.
         */
-        private readonly int $itemPerPage = 20,
+        private int $itemPerPage = 20,
    ) {}

    /**
--- a/src/Bundle/ChillMainBundle/Repository/Workflow/EntityWorkflowRepository.php
+++ b/src/Bundle/ChillMainBundle/Repository/Workflow/EntityWorkflowRepository.php
@@ -57,15 +57,9 @@ class EntityWorkflowRepository implements ObjectRepository
        return (int) $qb->getQuery()->getSingleScalarResult();
    }

-    /**
-     * @param bool|null $isFinal true to get only the entityWorkflow which is finalized, false to get the workflows that are not finalized, and null to ignore
-     *
-     * @throws \Doctrine\ORM\NoResultException
-     * @throws \Doctrine\ORM\NonUniqueResultException
-     */
-    public function countBySubscriber(User $user, ?bool $isFinal = null): int
+    public function countBySubscriber(User $user): int
    {
-        $qb = $this->buildQueryBySubscriber($user, $isFinal)->select('count(ew)');
+        $qb = $this->buildQueryBySubscriber($user)->select('count(ew)');

        return (int) $qb->getQuery()->getSingleScalarResult();
    }
@@ -188,14 +182,9 @@ class EntityWorkflowRepository implements ObjectRepository
        return $qb->getQuery()->getResult();
    }

-    /**
-     * @param bool|null  $isFinal true to get only the entityWorkflow which is finalized, false to get the workflows that are not finalized, and null to ignore
-     * @param mixed|null $limit
-     * @param mixed|null $offset
-     */
-    public function findBySubscriber(User $user, ?bool $isFinal = null, ?array $orderBy = null, $limit = null, $offset = null): array
+    public function findBySubscriber(User $user, ?array $orderBy = null, $limit = null, $offset = null): array
    {
-        $qb = $this->buildQueryBySubscriber($user, $isFinal)->select('ew');
+        $qb = $this->buildQueryBySubscriber($user)->select('ew');

        foreach ($orderBy as $key => $sort) {
            $qb->addOrderBy('ew.'.$key, $sort);
@@ -323,7 +312,7 @@ class EntityWorkflowRepository implements ObjectRepository
        return $qb;
    }

-    private function buildQueryBySubscriber(User $user, ?bool $isFinal): QueryBuilder
+    private function buildQueryBySubscriber(User $user): QueryBuilder
    {
        $qb = $this->repository->createQueryBuilder('ew');

@@ -336,14 +325,6 @@ class EntityWorkflowRepository implements ObjectRepository

        $qb->setParameter('user', $user);

-        if (null !== $isFinal) {
-            if ($isFinal) {
-                $qb->andWhere(sprintf('EXISTS (SELECT 1 FROM %s step WHERE step.isFinal = true AND ew = step.entityWorkflow)', EntityWorkflowStep::class));
-            } else {
-                $qb->andWhere(sprintf('NOT EXISTS (SELECT 1 FROM %s step WHERE step.isFinal = true AND ew = step.entityWorkflow)', EntityWorkflowStep::class));
-            }
-        }
-
        return $qb;
    }
 }
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Julie Lenaerts	10de431c48	Correct eslint issues	2025-09-29 17:07:21 +02:00
Julie Lenaerts	cb173c6341	Remove console.logs	2025-09-29 17:06:05 +02:00
Julie Lenaerts	20bbb6b485	Fix test according to Junie guidelines	2025-09-29 16:23:13 +02:00
Julie Lenaerts	c731f1967b	Change logic for triggering notification when task is edited and assigned a new user	2025-09-29 15:58:36 +02:00
Julie Lenaerts	2434d91e4a	Fix the notification dashboard widget to include task related notifications	2025-09-29 15:44:49 +02:00
Julie Lenaerts	13a4795333	Pipeline fixes	2025-09-29 15:14:34 +02:00
Julie Lenaerts	2bb5776002	Add missing parameter in creation of new AssignTaskEvent	2025-09-29 15:14:34 +02:00
Julie Lenaerts	34dde37789	Add `TaskAssignEventSubscriber` unit tests - Covered `getSubscribedEvents` method behavior - Added tests for `onTaskAssigned` with changed and unchanged assignees - Validated notification properties in appropriate scenarios	2025-09-29 15:14:34 +02:00
Julie Lenaerts	609b8f9af1	Improve assignee handling and task assignment logic - Added `hasAssigneeChanged` method for detecting assignee change - Updated `onTaskAssigned` logic to trigger only on assignee change	2025-09-29 15:14:34 +02:00
Julie Lenaerts	57d922c05e	Trans task assignment notification email - Updated `task_assignment_notification_content.txt.twig` with dynamic translations and URLs	2025-09-29 15:14:34 +02:00
Julie Lenaerts	ad579f3269	Add task assignment notification system - Introduced `AssignTaskEvent`, `TaskAssignEventSubscriber`, and `AssignTaskNotificationFlagProvider` for task assignment notifications - WIP : Added notification templates for task assignment title and content - Updated `SingleTaskController` to dispatch `AssignTaskEvent` - Adjusted translations and service configurations accordingly	2025-09-29 15:14:34 +02:00
Julie Lenaerts	30e1416018	Refactor `TaskNotificationHandler` logic	2025-09-29 15:14:34 +02:00
Julie Lenaerts	b6b03cfcec	feat: add task notification handler - WIP Implement `TaskNotificationHandler` for generating task-related notifications - Created `showInNotification.html.twig` for rendering task notification view - Added logic to fetch and display task data in notifications	2025-09-29 15:14:34 +02:00