Display calendar items linked to person within search results

Update chill bundles to v4.7.0
Merge branch '455-results-objectives-display-order' into 'master'
2025-11-12 15:18:22 +00:00 · 2025-11-12 13:00:52 +01:00 · 2025-11-10 16:47:38 +01:00 · 2025-11-07 16:23:53 +00:00 · 2025-11-07 16:23:52 +00:00 · 2025-11-07 14:48:48 +00:00
124 changed files with 2450 additions and 504 deletions
--- a/.changes/unreleased/Feature-20251112-130016.yaml
+++ b/.changes/unreleased/Feature-20251112-130016.yaml
@@ -0,0 +1,6 @@
+kind: Feature
+body: Display appointments (calendar items) linked to a person within the search results, like it was done for accompanying periods
+time: 2025-11-12T13:00:16.844313583+01:00
+custom:
+    Issue: "462"
+    SchemaChange: No schema change
--- a/.changes/unreleased/Fixed-20251003-224044.yaml
+++ b/.changes/unreleased/Fixed-20251003-224044.yaml
@@ -1,6 +0,0 @@
-kind: Fixed
-body: Fix the rendering of list of StoredObjectVersions, where there are kept version (before converting to pdf) and intermediate versions deleted
-time: 2025-10-03T22:40:44.685474863+02:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change
--- a/.changes/unreleased/Fixed-20251006-121315.yaml
+++ b/.changes/unreleased/Fixed-20251006-121315.yaml
@@ -1,6 +0,0 @@
-kind: Fixed
-body: 'Notification: fix editing of sent notification by removing form.addressesEmails, a field that no longer exists'
-time: 2025-10-06T12:13:15.45905994+02:00
-custom:
-    Issue: "434"
-    SchemaChange: No schema change
--- a/.changes/v4.6.0.md
+++ b/.changes/v4.6.0.md
@@ -0,0 +1,14 @@
+## v4.6.0 - 2025-10-15
+### Feature
+* ([#423](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/423)) Create environment banner that can be activated and configured depending on the image deployed   
+* ([#394](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/394)) Only show active workflow on the page "my tracked workflow"   
+### Fixed
+* Fix loading of classLists in SocialIssuesAcc.vue, ensure elements are present   
+* Fix the rendering of list of StoredObjectVersions, where there are kept version (before converting to pdf) and intermediate versions deleted   
+* ([#434](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/434)) Notification: fix editing of sent notification by removing form.addressesEmails, a field that no longer exists   
+* Fix loading of social issues and social actions within vue component   
+* ([#446](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/446)) Add unique condition on stored object filename, with cleaning step on existing duplicate filenames   
+
+  **Schema Change**: Drop or rename table or columns, or enforce new constraint that must be manually fixed
+* [workflow] take permissions into account to delete the workflow attachment   
+* ([#448](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/448)) Fix the execution of daily cronjob notification, when the previous last execution storage was invalid   
--- a/.changes/v4.6.1.md
+++ b/.changes/v4.6.1.md
@@ -0,0 +1,3 @@
+## v4.6.1 - 2025-10-27
+### Fixed
+* Fix export case where no 'reason' is picked within the PersonHavingActivityBetweenDateFilter.php   
--- a/.changes/v4.7.0.md
+++ b/.changes/v4.7.0.md
@@ -0,0 +1,21 @@
+## v4.7.0 - 2025-11-10
+### Feature
+* ([#385](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/385)) Create invitation list in user menu   
+* ([#404](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/404)) Add columns for comments linked to an activity in the activity list export   
+### Fixed
+* ([#451](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/451)) Fix: display also social actions linked to parents of the selected social issue   
+* ([#453](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/453)) Fix: export actions and their results in csv even when action does not have any goals attached to it.   
+* Fix the possibility to delete a workflow   
+
+  **Schema Change**: Drop or rename table or columns, or enforce new constraint that must be manually fixed
+* ([#457](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/457)) Fix the fusion of thirdparty properties that are located in another schema than public for TO_ONE relations + add extra loop for MANY_TO_MANY relations where thirdparty is the source instead of the target   
+* ([#428](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/428)) Fix suggestion of referrer when creating notification for accompanyingPeriodWorkDocument   
+### DX
+* Send notifications log to dedicated channel, if it exists
+   
+### UX
+* ([#425](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/425)) Change the terms 'cercle' and 'centre' to 'service', and 'territoire' respectively.   
+* ([#542](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/542)) Improve the ux for selecting whether user wants to be notified of the final step of a workflow or all steps   
+* Expand timeSpent choices for evaluation document and translate them to user locale or fallback 'fr'   
+* ([#455](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/455)) Change the order of display for results and objectives in the social work/action form   
+* Wrap text when it is too long within badges   
--- a/.junie/guidelines.md
+++ b/.junie/guidelines.md
@@ -240,9 +240,6 @@ The tests are run from the project's root (not from the bundle's root).
 # Run all tests
 vendor/bin/phpunit

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

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

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

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


+## v4.7.0 - 2025-11-10
+### Feature
+* ([#385](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/385)) Create invitation list in user menu   
+* ([#404](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/404)) Add columns for comments linked to an activity in the activity list export   
+### Fixed
+* ([#451](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/451)) Fix: display also social actions linked to parents of the selected social issue   
+* ([#453](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/453)) Fix: export actions and their results in csv even when action does not have any goals attached to it.   
+* Fix the possibility to delete a workflow   
+
+  **Schema Change**: Drop or rename table or columns, or enforce new constraint that must be manually fixed
+* ([#457](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/457)) Fix the fusion of thirdparty properties that are located in another schema than public for TO_ONE relations + add extra loop for MANY_TO_MANY relations where thirdparty is the source instead of the target   
+* ([#428](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/428)) Fix suggestion of referrer when creating notification for accompanyingPeriodWorkDocument   
+### DX
+* Send notifications log to dedicated channel, if it exists
+   
+### UX
+* ([#425](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/425)) Change the terms 'cercle' and 'centre' to 'service', and 'territoire' respectively.   
+* ([#542](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/542)) Improve the ux for selecting whether user wants to be notified of the final step of a workflow or all steps   
+* Expand timeSpent choices for evaluation document and translate them to user locale or fallback 'fr'   
+* ([#455](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/455)) Change the order of display for results and objectives in the social work/action form   
+* Wrap text when it is too long within badges   
+
+## v4.6.1 - 2025-10-27
+### Fixed
+* Fix export case where no 'reason' is picked within the PersonHavingActivityBetweenDateFilter.php   
+
+## 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   
--- a/composer.json
+++ b/composer.json
@@ -14,7 +14,7 @@
        "ext-openssl": "*",
        "ext-redis": "*",
        "ext-zlib": "*",
-        "champs-libres/wopi-bundle": "dev-master@dev",
+        "champs-libres/wopi-bundle": "dev-symfony-v5@dev",
        "champs-libres/wopi-lib": "dev-master@dev",
        "doctrine/data-fixtures": "^1.8",
        "doctrine/doctrine-bundle": "^2.1",
--- a/config/bundles.php
+++ b/config/bundles.php
@@ -2,7 +2,6 @@

 return [
    Symfony\Bundle\FrameworkBundle\FrameworkBundle::class => ['all' => true],
-    loophp\PsrHttpMessageBridgeBundle\PsrHttpMessageBridgeBundle::class => ['all' => true],
    ChampsLibres\WopiBundle\WopiBundle::class => ['all' => true],
    Doctrine\Bundle\DoctrineBundle\DoctrineBundle::class => ['all' => true],
    Doctrine\Bundle\FixturesBundle\DoctrineFixturesBundle::class => ['dev' => true, 'test' => true],
@@ -37,4 +36,5 @@ return [
    Chill\WopiBundle\ChillWopiBundle::class => ['all' => true],
    Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
    Symfony\UX\Translator\UxTranslatorBundle::class => ['all' => true],
+    loophp\PsrHttpMessageBridgeBundle\PsrHttpMessageBridgeBundle::class => ['all' => true],
 ];
--- a/config/packages/chill.yaml
+++ b/config/packages/chill.yaml
@@ -1,6 +1,13 @@
 chill_main:
    available_languages: [ '%env(resolve:LOCALE)%', 'en' ]
    available_countries: ['BE', 'FR']
+    top_banner:
+        visible: 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
@@ -0,0 +1,2 @@
+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
-    - Center center
-    - Cercle cercle
+    - Territoire territoire
+    - Service service
    - 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 centres et les usagers;
+- la liaison entre les territoires et les usagers;
 - etc.

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

+                {% if chill_aside_activity_config.show_concerned_persons_count == 'visible' %}
+                    <dt class="inline">{{ 'Concerned persons count'|trans }}</dt>
+                    <dd>{{ entity.concernedPersonsCount }}</dd>
+                {% endif %}
+
 				<dt class="inline">{{ 'Remark'|trans }}</dt>
 				{%- if entity.note is empty -%}
 					<dd>
--- a/src/Bundle/ChillAsideActivityBundle/src/Tests/Export/Aggregator/ByConcernedPersonsCountAggregatorTest.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Tests/Export/Aggregator/ByConcernedPersonsCountAggregatorTest.php
@@ -0,0 +1,49 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\AsideActivityBundle\Tests\Export\Aggregator;
+
+use Chill\AsideActivityBundle\Entity\AsideActivity;
+use Chill\AsideActivityBundle\Export\Aggregator\ByConcernedPersonsCountAggregator;
+use Chill\MainBundle\Test\Export\AbstractAggregatorTest;
+use Doctrine\ORM\EntityManagerInterface;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class ByConcernedPersonsCountAggregatorTest extends AbstractAggregatorTest
+{
+    public function getAggregator()
+    {
+        return new ByConcernedPersonsCountAggregator();
+    }
+
+    public static function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public static function getQueryBuilders(): iterable
+    {
+        self::bootKernel();
+        $em = self::getContainer()->get(EntityManagerInterface::class);
+
+        return [
+            $em->createQueryBuilder()
+                ->select('count(aside.id)')
+                ->from(AsideActivity::class, 'aside'),
+        ];
+    }
+}
--- a/src/Bundle/ChillAsideActivityBundle/src/Tests/Export/Export/SumConcernedPersonsCountAsideActivityTest.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/Tests/Export/Export/SumConcernedPersonsCountAsideActivityTest.php
@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\AsideActivityBundle\Tests\Export\Export;
+
+use Chill\AsideActivityBundle\Export\Export\SumConcernedPersonsCountAsideActivity;
+use Chill\AsideActivityBundle\Repository\AsideActivityRepository;
+use Chill\MainBundle\Test\Export\AbstractExportTest;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+final class SumConcernedPersonsCountAsideActivityTest extends AbstractExportTest
+{
+    protected function setUp(): void
+    {
+        self::bootKernel();
+    }
+
+    public function getExport()
+    {
+        $repository = self::getContainer()->get(AsideActivityRepository::class);
+
+        yield new SumConcernedPersonsCountAsideActivity($repository);
+    }
+
+    public static function getFormData(): array
+    {
+        return [
+            [],
+        ];
+    }
+
+    public static function getModifiersCombination(): array
+    {
+        return [
+            ['aside_activity'],
+        ];
+    }
+}
--- a/src/Bundle/ChillAsideActivityBundle/src/config/services/export.yaml
+++ b/src/Bundle/ChillAsideActivityBundle/src/config/services/export.yaml
@@ -20,6 +20,10 @@ services:
      tags:
          - { name: chill.export, alias: 'avg_aside_activity_duration' }

+  Chill\AsideActivityBundle\Export\Export\SumConcernedPersonsCountAsideActivity:
+      tags:
+          - { name: chill.export, alias: 'sum_aside_activity_concerned_persons_count' }
+
  ## Filters
  chill.aside_activity.export.date_filter:
    class: Chill\AsideActivityBundle\Export\Filter\ByDateFilter
@@ -70,3 +74,7 @@ services:
  Chill\AsideActivityBundle\Export\Aggregator\ByLocationAggregator:
      tags:
          - { name: chill.export_aggregator, alias: 'aside_activity_location_aggregator' }
+
+  Chill\AsideActivityBundle\Export\Aggregator\ByConcernedPersonsCountAggregator:
+      tags:
+          - { name: chill.export_aggregator, alias: 'aside_activity_concerned_persons_count_aggregator' }
--- a/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20251006113048.php
+++ b/src/Bundle/ChillAsideActivityBundle/src/migrations/Version20251006113048.php
@@ -0,0 +1,33 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\Migrations\AsideActivity;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20251006113048 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Add concernedPersonsCount property to AsideActivity entity';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_asideactivity.asideactivity ADD concernedPersonsCount INT DEFAULT 0');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_asideactivity.AsideActivity DROP concernedPersonsCount');
+    }
+}
--- a/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
+++ b/src/Bundle/ChillAsideActivityBundle/src/translations/messages.fr.yml
@@ -27,6 +27,7 @@ Emergency: Urgent
 by: "Par "
 location: Lieu
 Asideactivity location: Localisation de l'activité
+Concerned persons count: Nombre d'usager concernés

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

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

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

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

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

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

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

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

    final public const CANCELEDBY_PERSON = 'CANCELEDBY_PERSON';

    final public const CANCELEDBY_USER = 'CANCELEDBY_USER';

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

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

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

    public function configureOptions(OptionsResolver $resolver)
--- a/src/Bundle/ChillCalendarBundle/Form/CancelType.php
+++ b/src/Bundle/ChillCalendarBundle/Form/CancelType.php
@@ -0,0 +1,42 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\CalendarBundle\Form;
+
+use Chill\CalendarBundle\Entity\Calendar;
+use Chill\CalendarBundle\Entity\CancelReason;
+use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Symfony\Bridge\Doctrine\Form\Type\EntityType;
+use Symfony\Component\Form\AbstractType;
+use Symfony\Component\Form\FormBuilderInterface;
+use Symfony\Component\OptionsResolver\OptionsResolver;
+
+class CancelType extends AbstractType
+{
+    public function __construct(private readonly TranslatableStringHelperInterface $translatableStringHelper) {}
+
+    public function buildForm(FormBuilderInterface $builder, array $options)
+    {
+        $builder->add('cancelReason', EntityType::class, [
+            'class' => CancelReason::class,
+            'required' => true,
+            'choice_label' => fn (CancelReason $cancelReason) => $this->translatableStringHelper->localize($cancelReason->getName()),
+        ]);
+    }
+
+    public function configureOptions(OptionsResolver $resolver)
+    {
+        $resolver->setDefaults([
+            'data_class' => Calendar::class,
+
+        ]);
+    }
+}
--- a/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php
+++ b/src/Bundle/ChillCalendarBundle/Menu/UserMenuBuilder.php
@@ -25,6 +25,13 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
        if ($this->security->isGranted('ROLE_USER')) {
            $menu->addChild('My calendar list', [
                'route' => 'chill_calendar_calendar_list_my',
+            ])
+                ->setExtras([
+                    'order' => 8,
+                    'icon' => 'tasks',
+                ]);
+            $menu->addChild('invite.list.title', [
+                'route' => 'chill_calendar_invitations_list_my',
            ])
                ->setExtras([
                    'order' => 9,
--- a/src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarEntityListener.php
+++ b/src/Bundle/ChillCalendarBundle/Messenger/Doctrine/CalendarEntityListener.php
@@ -21,6 +21,7 @@ namespace Chill\CalendarBundle\Messenger\Doctrine;
 use Chill\CalendarBundle\Entity\Calendar;
 use Chill\CalendarBundle\Messenger\Message\CalendarMessage;
 use Chill\CalendarBundle\Messenger\Message\CalendarRemovedMessage;
+use Chill\MainBundle\Entity\User;
 use Doctrine\ORM\Event\PostPersistEventArgs;
 use Doctrine\ORM\Event\PostRemoveEventArgs;
 use Doctrine\ORM\Event\PostUpdateEventArgs;
@@ -31,6 +32,17 @@ class CalendarEntityListener
 {
    public function __construct(private readonly MessageBusInterface $messageBus, private readonly Security $security) {}

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

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

    public function getRemoteId(): string
    {
+        dump($this->remoteId);
+
        return $this->remoteId;
    }
 }
--- a/src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php
+++ b/src/Bundle/ChillCalendarBundle/Repository/CalendarRepository.php
@@ -191,6 +191,7 @@ class CalendarRepository implements ObjectRepository
                    $qb->expr()->eq('c.mainUser', ':user'),
                    $qb->expr()->gte('c.startDate', ':startDate'),
                    $qb->expr()->lte('c.endDate', ':endDate'),
+                    $qb->expr()->isNull('c.cancelReason'),
                )
            )
            ->setParameters([
--- a/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php
+++ b/src/Bundle/ChillCalendarBundle/Repository/InviteRepository.php
@@ -41,7 +41,7 @@ class InviteRepository implements ObjectRepository
    /**
     * @return array|Invite[]
     */
-    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null)
+    public function findBy(array $criteria, ?array $orderBy = null, ?int $limit = null, ?int $offset = null): array
    {
        return $this->entityRepository->findBy($criteria, $orderBy, $limit, $offset);
    }
--- a/src/Bundle/ChillCalendarBundle/Resources/config/services/controller.yml
+++ b/src/Bundle/ChillCalendarBundle/Resources/config/services/controller.yml
@@ -1,5 +1,6 @@
 services:
    Chill\CalendarBundle\Controller\:
        autowire: true
+        autoconfigure: true
        resource: '../../../Controller'
        tags: ['controller.service_arguments']
--- a/src/Bundle/ChillCalendarBundle/Resources/public/chill/scss/calendar-list.scss
+++ b/src/Bundle/ChillCalendarBundle/Resources/public/chill/scss/calendar-list.scss
@@ -14,13 +14,13 @@ div.calendar-list {
    ul.calendar-list {
        display: inline-block;
    }
-
-    & > a.calendar-list__global {
-        display: inline-block;
-        padding: 0.2rem;
-        min-width: 2rem;
-        border: 1px solid var(--bs-chill-blue);
-        border-radius: 0.25rem;
-        text-align: center;
-    }
+}
+
+.calendar-list__global {
+    display: inline-block;
+    padding: 0.2rem;
+    min-width: 2rem;
+    border: 1px solid var(--bs-chill-blue);
+    border-radius: 0.25rem;
+    text-align: center;
 }
--- a/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig
+++ b/src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig
@@ -1,17 +1,23 @@
-{# list used in context of person or accompanyingPeriod #}
+{# list used in context of person, accompanyingPeriod or user #}

-{% if calendarItems|length > 0 %}
-    <div class="flex-table list-records context-accompanyingCourse">
-
-        {% for calendar in calendarItems %}
-
-            <div class="item-bloc">
-                <div class="item-row main">
-                    <div class="item-col">
-                        <div class="wrap-header">
+<div class="item-bloc">
+    <div class="item-row main">
+        <div class="item-col">
+            <div class="wrap-header">
+                <div class="wl-row">
+                    {% if calendar.status == 'canceled' %}
+                                <div class="badge rounded-pill bg-danger">
+                                    <span>{{ 'chill_calendar.canceled'|trans }}: </span>
+                                    <span>{{ calendar.cancelReason.name|localize_translatable_string }}</span>
+                                </div>
+                                    {% endif %}
+                            </div>
                            <div class="wl-row">
                                <div class="wl-col title">
                                    <p class="date-label">
+                                        {% if calendar.status == 'canceled' %}
+                                        <del>
+                                            {% endif %}
                                        {% if context == 'person' and calendar.context == 'accompanying_period' %}
                                            <a href="{{ chill_path_add_return_path('chill_person_accompanying_course_index', {'accompanying_period_id': calendar.accompanyingPeriod.id}) }}" style="text-decoration: none;">
                                                <span class="badge bg-primary">
@@ -19,6 +25,9 @@
                                                </span>
                                            </a>
                                        {% endif %}
+                                        {% if calendar.status == 'canceled' %}
+                                            <del>
+                                        {% endif %}
                                        {% if calendar.endDate.diff(calendar.startDate).days >= 1 %}
                                                {{ calendar.startDate|format_datetime('short', 'short') }}
                                                - {{ calendar.endDate|format_datetime('short', 'short') }}
@@ -26,44 +35,46 @@
                                            {{ calendar.startDate|format_datetime('short', 'short') }}
                                                - {{ calendar.endDate|format_datetime('none', 'short') }}
                                        {% endif %}
-                                    </p>
-
-                                    <div class="duration short-message">
-                                        <i class="fa fa-fw fa-hourglass-end"></i>
-                                        {{ calendar.duration|date('%H:%I') }}
-                                        {% if false == calendar.sendSMS or null == calendar.sendSMS %}
-                                            <!-- no sms will be send -->
-                                        {% else %}
-                                            {% if calendar.smsStatus == 'sms_sent' %}
-                                                <span title="{{ 'SMS already sent'|trans }}" class="badge bg-info">
-                                                    <i class="fa fa-check "></i>
-                                                    <i class="fa fa-envelope "></i>
-                                                </span>
-                                            {% else %}
-                                                <span title="{{ 'Will send SMS'|trans }}" class="badge bg-info">
-                                                    <i class="fa fa-envelope "></i>
-                                                    <i class="fa fa-hourglass-end "></i>
-                                                </span>
-                                            {% endif %}
+                                        {% if calendar.status == 'canceled' %}
+                                            </del>
                                        {% endif %}
-                                    </div>

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

                    </div>
                </div>
+            </div>

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

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

-                {% if calendar.comment.comment is not empty %}
-                    <div class="item-row details separator">
-                        <div class="item-col comment">
-                            {{ calendar.comment|chill_entity_render_box( { 'limit_lines': 3, 'metadata': false } ) }}
                        </div>
                    </div>
-                {% endif %}
-
-                {% if calendar.location is not empty %}
-                    <div class="item-row separator">
-                        <div>
-                            {% if calendar.location.address is not same as(null) and calendar.location.name is not empty %}
-                                <i class="fa fa-map-marker"></i>{% endif %}
-                            {% if calendar.location.name is not empty %}{{ calendar.location.name }}{% endif %}
-                            {% if calendar.location.address is not same as(null) %}{{ calendar.location.address|chill_entity_render_box({'multiline': false, 'with_picto': (calendar.location.name is empty)}) }}{% else %}
-                                <i class="fa fa-map-marker"></i>{% endif %}
-                            {% if calendar.location.phonenumber1 is not empty %}<i
-                                class="fa fa-phone"></i> {{ calendar.location.phonenumber1|chill_format_phonenumber }}{% endif %}
-                            {% if calendar.location.phonenumber2 is not empty %}<i
-                                class="fa fa-phone"></i> {{ calendar.location.phonenumber2|chill_format_phonenumber }}{% endif %}
-                        </div>
-                    </div>
-                {% endif %}
-
-                <div class="item-row separator column">
-                    <div>
-
-                        {{ include('@ChillCalendar/Calendar/_documents.twig.html') }}
-                    </div>
                </div>
+            </div>
+        </div>
+    {% endif %}

-                {% if calendar.activity is not null %}
-                    <div class="item-row separator">
-                        <div class="item-col">
-                            <div class="wrap-list">
-                                <div class="wl-row">
-                                    <div class="wl-col title"><h3>{{ 'Activity'|trans }}</h3></div>
-                                    <div class="wl-col list activity-linked">
-                                        <h2 class="badge-title">
-                                            <span class="title_label"></span>
-                                            <span class="title_action">
-                                            {{ calendar.activity.type.name | localize_translatable_string }}
-
-                                                {% if calendar.activity.emergency %}
-                                                    <span class="badge bg-danger rounded-pill fs-6 float-end">{{ 'Emergency'|trans|upper }}</span>
-                                                {% endif %}
-                                        </span>
-                                        </h2>
-
-                                        <ul class="record_actions">
-                                            <li class="cancel">
-                                                <span class="createdBy">
-                                                     {{ 'Created by'|trans }}
-                                                    <b>{{ calendar.activity.createdBy|chill_entity_render_string({'at_date': calendar.activity.createdAt}) }}</b>, {{ 'on'|trans }} {{ calendar.activity.createdAt|format_datetime('short', 'short') }}
-                                                </span>
-                                            </li>
-                                            {% if is_granted('CHILL_ACTIVITY_SEE', calendar.activity) %}
-                                                <li>
-                                                    <a href="{{ chill_path_add_return_path('chill_activity_activity_show', {'id': calendar.activity.id}) }}" class="btn btn-sm btn-show" ></a>
-                                                </li>
-                                            {% endif %}
-                                        </ul>
-
-                                    </div>
-                                </div>
+    <div class="item-row separator">
+        <ul class="record_actions">
+                {% if is_granted('CHILL_CALENDAR_DOC_EDIT', calendar) and calendar.status is not constant('STATUS_CANCELED', calendar) %}
+                    {% if templates|length == 0 %}
+                        <li>
+                            <a class="btn btn-create"
+                               href="{{ chill_path_add_return_path('chill_calendar_calendardoc_new', {'id': calendar.id }) }}">
+                                {{ 'chill_calendar.Add a document'|trans }}
+                            </a>
+                        </li>
+                    {% else %}
+                        <li>
+                            <div class="dropdown">
+                                <button class="btn btn-create dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
+                                    {{ 'chill_calendar.Add a document'|trans }}
+                                </button>
+                                <ul class="dropdown-menu">
+                                    <li>
+                                        <a class="dropdown-item"
+                                           href="{{ chill_path_add_return_path('chill_calendar_calendardoc_new', {'id': calendar.id }) }}">
+                                            {{ 'chill_calendar.Upload a document'|trans }}
+                                        </a>
+                                    </li>
+                                    {% for template in templates %}
+                                    <li>
+                                        <a class="dropdown-item"
+                                            href="{{ chill_path_add_return_path('chill_docgenerator_generate_from_template', {'template': template.id, 'entityClassName': 'Chill\\CalendarBundle\\Entity\\Calendar', 'entityId': calendar.id}) }}"
+                                        >
+                                           {{ template.name|localize_translatable_string }}
+                                        </a>
+                                    </li>
+                                    {% endfor %}
+                                </ul>
                            </div>
-                        </div>
-                    </div>
+                        </li>
+                    {% endif %}
                {% endif %}
+            {% if calendar.activity is null and (
+                (calendar.context == 'accompanying_period' and is_granted('CHILL_ACTIVITY_CREATE', calendar.accompanyingPeriod))
+                or
+                (calendar.context == 'person' and is_granted('CHILL_ACTIVITY_CREATE', calendar.person))
+                )
+                            and calendar.status is not constant('STATUS_CANCELED', calendar)
+            %}
+                <li>
+                    <a class="btn btn-create"
+                       href="{{ chill_path_add_return_path('chill_calendar_calendar_to_activity', { 'id': calendar.id }) }}">
+                        {{ 'Transform to activity'|trans }}
+                    </a>
+                </li>
+            {% endif %}

-                <div class="item-row separator">
-                    <ul class="record_actions">
-                        {% if is_granted('CHILL_CALENDAR_DOC_EDIT', calendar) %}
-                            {% if templates|length == 0 %}
-                                <li>
-                                    <a class="btn btn-create"
-                                       href="{{ chill_path_add_return_path('chill_calendar_calendardoc_new', {'id': calendar.id }) }}">
-                                        {{ 'chill_calendar.Add a document'|trans }}
-                                    </a>
-                                </li>
-                            {% else %}
-                                <li>
-                                    <div class="dropdown">
-                                        <button class="btn btn-create dropdown-toggle" type="button" data-bs-toggle="dropdown" aria-expanded="false">
-                                            {{ 'chill_calendar.Add a document'|trans }}
-                                        </button>
-                                        <ul class="dropdown-menu">
-                                            <li>
-                                                <a class="dropdown-item"
-                                                   href="{{ chill_path_add_return_path('chill_calendar_calendardoc_new', {'id': calendar.id }) }}">
-                                                    {{ 'chill_calendar.Upload a document'|trans }}
-                                                </a>
-                                            </li>
-                                            {% for template in templates %}
-                                            <li>
-                                                <a class="dropdown-item"
-                                                    href="{{ chill_path_add_return_path('chill_docgenerator_generate_from_template', {'template': template.id, 'entityClassName': 'Chill\\CalendarBundle\\Entity\\Calendar', 'entityId': calendar.id}) }}"
-                                                >
-                                                   {{ template.name|localize_translatable_string }}
-                                                </a>
-                                            </li>
-                                            {% endfor %}
-                                        </ul>
-                                    </div>
-                                </li>
-                            {% endif %}
-                        {% endif %}
-                        {% if calendar.activity is null and (
-                            (calendar.context == 'accompanying_period' and is_granted('CHILL_ACTIVITY_CREATE', calendar.accompanyingPeriod))
-                            or
-                            (calendar.context == 'person' and is_granted('CHILL_ACTIVITY_CREATE', calendar.person))
-                            )
-                        %}
-                            <li>
-                                <a class="btn btn-create"
-                                   href="{{ chill_path_add_return_path('chill_calendar_calendar_to_activity', { 'id': calendar.id }) }}">
-                                    {{ 'Transform to activity'|trans }}
-                                </a>
-                            </li>
-                        {% endif %}
-
-                        {% if (calendar.isInvited(app.user)) %}
+            {% if calendar.isInvited(app.user) and not calendar.isCanceled %}
                            {% set invite = calendar.inviteForUser(app.user) %}
                            <li>
                                <div invite-answer data-status="{{ invite.status|e('html_attr') }}"
@@ -213,12 +226,18 @@
                                   class="btn btn-show "></a>
                            </li>
                        {% endif %}
-                        {% if is_granted('CHILL_CALENDAR_CALENDAR_EDIT', calendar) %}
+
+                        {% if is_granted('CHILL_CALENDAR_CALENDAR_EDIT', calendar) and calendar.status is not constant('STATUS_CANCELED', calendar) %}
                        <li>
                            <a href="{{ chill_path_add_return_path('chill_calendar_calendar_edit', { 'id': calendar.id }) }}"
                               class="btn btn-update "></a>
                        </li>
+                        <li>
+                            <a href="{{ chill_path_add_return_path('chill_calendar_calendar_cancel', { 'id': calendar.id } ) }}"
+                               class="btn btn-action"><i class="bi bi-x-circle"></i> {{ 'Cancel'|trans }}</a>
+                        </li>
                        {% endif %}
+
                        {% if is_granted('CHILL_CALENDAR_CALENDAR_DELETE', calendar) %}
                        <li>
                            <a href="{{ chill_path_add_return_path('chill_calendar_calendar_delete', { 'id': calendar.id } ) }}"
@@ -227,14 +246,8 @@
                        {% endif %}
                    </ul>

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

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

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

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

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

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

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

 # exports
 Exports of calendar: Exports des rendez-vous
--- a/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepositoryInterface.php
+++ b/src/Bundle/ChillDocGeneratorBundle/Repository/DocGeneratorTemplateRepositoryInterface.php
@@ -20,4 +20,9 @@ use Doctrine\Persistence\ObjectRepository;
 interface DocGeneratorTemplateRepositoryInterface extends ObjectRepository
 {
    public function countByEntity(string $entity): int;
+
+    /**
+     * @return array|DocGeneratorTemplate[]
+     */
+    public function findByEntity(string $entity, ?int $start = 0, ?int $limit = 50): array;
 }
--- a/src/Bundle/ChillDocStoreBundle/Entity/StoredObjectVersion.php
+++ b/src/Bundle/ChillDocStoreBundle/Entity/StoredObjectVersion.php
@@ -23,10 +23,14 @@ use Random\RandomException;
 * Store each version of StoredObject's.
 *
 * A version should not be created manually: use the method @see{StoredObject::registerVersion} instead.
+ *
+ * Each filename must be unique within the same StoredObject. We add a condition on id to apply this condition only for
+ * newly created versions when this new index is applied.
 */
 #[ORM\Entity]
 #[ORM\Table('chill_doc.stored_object_version')]
 #[ORM\UniqueConstraint(name: 'chill_doc_stored_object_version_unique_by_object', columns: ['stored_object_id', 'version'])]
+#[ORM\UniqueConstraint(name: 'chill_doc_stored_object_version_unique_by_filename', columns: ['filename'], options: ['where' => '(id > 0)'])]
 class StoredObjectVersion implements TrackCreationInterface
 {
    use TrackCreationTrait;
--- a/src/Bundle/ChillDocStoreBundle/Resources/public/types/generic_doc.ts
+++ b/src/Bundle/ChillDocStoreBundle/Resources/public/types/generic_doc.ts
@@ -36,6 +36,18 @@ export interface GenericDocForAccompanyingPeriod extends GenericDoc {
    context: "accompanying-period";
 }

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

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

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

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

 export interface GenericDocForAccompanyingCourseWorkEvaluationDocument
    extends GenericDocForAccompanyingPeriod {
    key: "accompanying_period_work_evaluation_document";
    metadata: BaseMetadataWithHtml;
+    storedObject: StoredObject;
 }
--- a/src/Bundle/ChillDocStoreBundle/migrations/Version20251013094414.php
+++ b/src/Bundle/ChillDocStoreBundle/migrations/Version20251013094414.php
@@ -0,0 +1,63 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\Migrations\DocStore;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20251013094414 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'DocStore: Enforce filename uniqueness on chill_doc.stored_object_version; clean duplicates and add partial unique index on filename (for new rows only).';
+    }
+
+    public function up(Schema $schema): void
+    {
+        // 1) Clean duplicates: for each (stored_object_id, filename, key, iv), keep only the last inserted row
+        //    and delete all others. Use ROW_NUMBER over id DESC to define the last one.
+        $this->addSql(<<<'SQL'
+            WITH ranked AS (
+                SELECT id,
+                       rank() OVER (
+                           PARTITION BY stored_object_id, filename, "key"::jsonb, iv::jsonb
+                           ORDER BY id DESC
+                       ) AS rn
+                FROM chill_doc.stored_object_version
+            )
+            DELETE FROM chill_doc.stored_object_version sov
+            USING ranked r
+            WHERE sov.id = r.id
+              AND r.rn > 1
+        SQL);
+
+        // 2) Create a partial unique index on filename that applies only to subsequently inserted rows.
+        //    Per user's instruction, compute the cutoff using the stored_object_id sequence value.
+        $nextVal = (int) $this->connection->fetchOne("SELECT nextval('chill_doc.stored_object_version_id_seq')");
+
+        // Safety: if somehow sequence is not available, fallback to current max id from the table
+        if ($nextVal <= 0) {
+            $nextVal = (int) $this->connection->fetchOne('SELECT COALESCE(MAX(id), 0) FROM chill_doc.stored_object_version');
+        }
+
+        $this->addSql(sprintf(
+            'CREATE UNIQUE INDEX chill_doc_stored_object_version_unique_by_filename ON chill_doc.stored_object_version (filename) WHERE id > %d',
+            $nextVal
+        ));
+    }
+
+    public function down(Schema $schema): void
+    {
+        // Drop the partial unique index; data cleanup is irreversible.
+        $this->addSql('DROP INDEX IF EXISTS chill_doc_stored_object_version_unique_by_filename');
+    }
+}
--- a/src/Bundle/ChillEventBundle/Controller/EventController.php
+++ b/src/Bundle/ChillEventBundle/Controller/EventController.php
@@ -246,7 +246,7 @@ final class EventController extends AbstractController
                'class' => Center::class,
                'choices' => $centers,
                'placeholder' => $this->translator->trans('Pick a center'),
-                'label' => 'To which centre should the event be associated ?',
+                'label' => 'To which territory should the event be associated ?',
            ])
            ->add('submit', SubmitType::class, [
                'label' => 'Next step',
--- a/src/Bundle/ChillEventBundle/translations/messages.fr.yml
+++ b/src/Bundle/ChillEventBundle/translations/messages.fr.yml
@@ -64,7 +64,7 @@ CHILL_EVENT_PARTICIPATION_SEE_DETAILS: Voir le détail d'une participation

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

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

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

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

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

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

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

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

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

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

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

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

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

-        $csv = Writer::createFromPath('php://temp', 'r+');
+        $csv = Writer::from('php://temp', 'r+');
        $csv->insertOne(
            array_map(
                fn (string $e) => $this->translator->trans('admin.users.export.'.$e),
--- a/src/Bundle/ChillMainBundle/Controller/WorkflowController.php
+++ b/src/Bundle/ChillMainBundle/Controller/WorkflowController.php
@@ -264,11 +264,12 @@ class WorkflowController extends AbstractController
    {
        $this->denyAccessUnlessGranted('IS_AUTHENTICATED_REMEMBERED');

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

        $workflows = $this->entityWorkflowRepository->findBySubscriber(
            $this->security->getUser(),
+            false,
            ['createdAt' => 'DESC'],
            $paginator->getItemsPerPage(),
            $paginator->getCurrentPageFirstItemNumber()
--- a/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
+++ b/src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php
@@ -205,6 +205,11 @@ class ChillMainExtension extends Extension implements
                []
        );

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

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

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

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

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

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

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

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

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

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

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

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

+        if (null !== $isFinal) {
+            if ($isFinal) {
+                $qb->andWhere(sprintf('EXISTS (SELECT 1 FROM %s step WHERE step.isFinal = true AND ew = step.entityWorkflow)', EntityWorkflowStep::class));
+            } else {
+                $qb->andWhere(sprintf('NOT EXISTS (SELECT 1 FROM %s step WHERE step.isFinal = true AND ew = step.entityWorkflow)', EntityWorkflowStep::class));
+            }
+        }
+
        return $qb;
    }
 }
--- a/src/Bundle/ChillMainBundle/Resources/public/types.ts
+++ b/src/Bundle/ChillMainBundle/Resources/public/types.ts
@@ -1,4 +1,7 @@
-import { GenericDoc } from "ChillDocStoreAssets/types/generic_doc";
+import {
+    GenericDoc,
+    isGenericDocWithStoredObject,
+} from "ChillDocStoreAssets/types/generic_doc";
 import { StoredObject, StoredObjectStatus } from "ChillDocStoreAssets/types";
 import { Person } from "../../../ChillPersonBundle/Resources/public/types";

@@ -203,6 +206,25 @@ export interface WorkflowAttachment {
    genericDoc: null | GenericDoc;
 }

+export type AttachmentWithDocAndStored = WorkflowAttachment & {
+    genericDoc: GenericDoc & { storedObject: StoredObject };
+};
+
+export function isAttachmentWithDocAndStored(
+    a: WorkflowAttachment,
+): a is AttachmentWithDocAndStored {
+    return (
+        isWorkflowAttachmentWithGenericDoc(a) &&
+        isGenericDocWithStoredObject(a.genericDoc)
+    );
+}
+
+export function isWorkflowAttachmentWithGenericDoc(
+    attachment: WorkflowAttachment,
+): attachment is WorkflowAttachment & { genericDoc: GenericDoc } {
+    return attachment.genericDoc !== null;
+}
+
 export interface Workflow {
    name: string;
    text: string;
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/App.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/App.vue
@@ -6,6 +6,7 @@ import { GenericDocForAccompanyingPeriod } from "ChillDocStoreAssets/types/gener
 import AttachmentList from "ChillMainAssets/vuejs/WorkflowAttachment/Component/AttachmentList.vue";
 import { GenericDoc } from "ChillDocStoreAssets/types";
 import { fetchWorkflow } from "ChillMainAssets/lib/workflow/api";
+import { trans, WORKFLOW_ATTACHMENTS_ADD_AN_ATTACHMENT } from "translator";

 interface AppConfig {
    workflowId: number;
@@ -83,7 +84,7 @@ const canEditAttachement = computed<boolean>(() => {
    <ul v-if="canEditAttachement" class="record_actions">
        <li>
            <button type="button" class="btn btn-create" @click="openModal">
-                Ajouter une pièce jointe
+                {{ trans(WORKFLOW_ATTACHMENTS_ADD_AN_ATTACHMENT) }}
            </button>
        </li>
    </ul>
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/AttachmentList.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/AttachmentList.vue
@@ -1,7 +1,14 @@
 <script setup lang="ts">
-import { EntityWorkflow, WorkflowAttachment } from "ChillMainAssets/types";
+import {
+    AttachmentWithDocAndStored,
+    EntityWorkflow,
+    isAttachmentWithDocAndStored,
+    WorkflowAttachment,
+} from "ChillMainAssets/types";
 import GenericDocItemBox from "ChillMainAssets/vuejs/WorkflowAttachment/Component/GenericDocItemBox.vue";
 import DocumentActionButtonsGroup from "ChillDocStoreAssets/vuejs/DocumentActionButtonsGroup.vue";
+import { computed } from "vue";
+import { trans, WORKFLOW_ATTACHMENTS_NO_ATTACHMENT } from "translator";

 interface AttachmentListProps {
    attachments: WorkflowAttachment[];
@@ -14,35 +21,43 @@ const emit = defineEmits<{
 }>();

 const props = defineProps<AttachmentListProps>();
+
+const notNullAttachments = computed<AttachmentWithDocAndStored[]>(() =>
+    props.attachments.filter(
+        (a: WorkflowAttachment): a is AttachmentWithDocAndStored =>
+            isAttachmentWithDocAndStored(a),
+    ),
+);
+
+const canRemove = computed<boolean>((): boolean => {
+    if (null === props.workflow) {
+        return false;
+    }
+
+    return props.workflow._permissions.CHILL_MAIN_WORKFLOW_ATTACHMENT_EDIT;
+});
 </script>

 <template>
    <p
-        v-if="props.attachments.length === 0"
+        v-if="notNullAttachments.length === 0"
        class="chill-no-data-statement text-center"
    >
-        Aucune pièce jointe
+        {{ trans(WORKFLOW_ATTACHMENTS_NO_ATTACHMENT) }}
    </p>
-    <!-- TODO translate -->
-    <div else class="flex-table">
-        <div v-for="a in props.attachments" :key="a.id" class="item-bloc">
+    <div v-else class="flex-table">
+        <div v-for="a in notNullAttachments" :key="a.id" class="item-bloc">
            <generic-doc-item-box
-                v-if="a.genericDoc !== null"
                :generic-doc="a.genericDoc"
            ></generic-doc-item-box>
            <div class="item-row separator">
                <ul class="record_actions">
-                    <li v-if="a.genericDoc?.storedObject !== null">
+                    <li>
                        <document-action-buttons-group
                            :stored-object="a.genericDoc.storedObject"
                        ></document-action-buttons-group>
                    </li>
-                    <li
-                        v-if="
-                            !workflow?._permissions
-                                .CHILL_MAIN_WORKFLOW_ATTACHMENT_EDIT
-                        "
-                    >
+                    <li v-if="canRemove">
                        <button
                            type="button"
                            class="btn btn-delete"
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/GenericDocItemBox.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/WorkflowAttachment/Component/GenericDocItemBox.vue
@@ -1,8 +1,8 @@
 <script setup lang="ts">
-import { GenericDocForAccompanyingPeriod } from "ChillDocStoreAssets/types/generic_doc";
+import { GenericDoc } from "ChillDocStoreAssets/types/generic_doc";

 interface GenericDocItemBoxProps {
-    genericDoc: GenericDocForAccompanyingPeriod;
+    genericDoc: GenericDoc;
 }

 const props = defineProps<GenericDocItemBoxProps>();
--- a/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/EntityWorkflowVueSubscriber.vue
+++ b/src/Bundle/ChillMainBundle/Resources/public/vuejs/_components/EntityWorkflow/EntityWorkflowVueSubscriber.vue
@@ -1,40 +1,38 @@
 <template>
    <div class="d-grid gap-2 my-3">
        <button
-            class="btn btn-misc"
+            class="btn btn-outline-primary text-start d-flex align-items-center"
+            :class="{ active: subscriberFinal }"
            type="button"
-            v-if="!subscriberFinal"
-            @click="subscribeTo('subscribe', 'final')"
+            @click="
+                subscribeTo(
+                    subscriberFinal ? 'unsubscribe' : 'subscribe',
+                    'final',
+                )
+            "
        >
-            <i class="fa fa-check fa-fw"></i>
-            {{ trans(WORKFLOW_SUBSCRIBE_FINAL) }}
+            <i
+                class="fa fa-fw me-2"
+                :class="subscriberFinal ? 'fa-check-square-o' : 'fa-square-o'"
+            ></i>
+            <span>{{ trans(WORKFLOW_SUBSCRIBE_FINAL) }}</span>
        </button>
        <button
-            class="btn btn-misc"
+            class="btn btn-outline-primary text-start d-flex align-items-center"
+            :class="{ active: subscriberStep }"
            type="button"
-            v-if="subscriberFinal"
-            @click="subscribeTo('unsubscribe', 'final')"
+            @click="
+                subscribeTo(
+                    subscriberStep ? 'unsubscribe' : 'subscribe',
+                    'step',
+                )
+            "
        >
-            <i class="fa fa-times fa-fw"></i>
-            {{ trans(WORKFLOW_UNSUBSCRIBE_FINAL) }}
-        </button>
-        <button
-            class="btn btn-misc"
-            type="button"
-            v-if="!subscriberStep"
-            @click="subscribeTo('subscribe', 'step')"
-        >
-            <i class="fa fa-check fa-fw"></i>
-            {{ trans(WORKFLOW_SUBSCRIBE_ALL_STEPS) }}
-        </button>
-        <button
-            class="btn btn-misc"
-            type="button"
-            v-if="subscriberStep"
-            @click="subscribeTo('unsubscribe', 'step')"
-        >
-            <i class="fa fa-times fa-fw"></i>
-            {{ trans(WORKFLOW_UNSUBSCRIBE_ALL_STEPS) }}
+            <i
+                class="fa fa-fw me-2"
+                :class="subscriberStep ? 'fa-check-square-o' : 'fa-square-o'"
+            ></i>
+            <span>{{ trans(WORKFLOW_SUBSCRIBE_ALL_STEPS) }}</span>
        </button>
    </div>
 </template>
@@ -45,9 +43,7 @@ import { defineProps, defineEmits } from "vue";
 import {
    trans,
    WORKFLOW_SUBSCRIBE_FINAL,
-    WORKFLOW_UNSUBSCRIBE_FINAL,
    WORKFLOW_SUBSCRIBE_ALL_STEPS,
-    WORKFLOW_UNSUBSCRIBE_ALL_STEPS,
 } from "translator";

 // props
--- a/src/Bundle/ChillMainBundle/Resources/views/Layout/_top_banner.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/Layout/_top_banner.html.twig
@@ -0,0 +1,17 @@
+{% if chill_main_config.top_banner is defined and chill_main_config.top_banner.text is defined %}
+    {% set banner_text = '' %}
+    {% set current_locale = app.request.locale %}
+
+    {% if chill_main_config.top_banner.text[current_locale] is defined %}
+        {% set banner_text = chill_main_config.top_banner.text[current_locale] %}
+    {% else %}
+        {% set banner_text = chill_main_config.top_banner.text|first %}
+    {% endif %}
+
+    {% if banner_text %}
+        <div class="top-banner w-100 text-center py-2"
+             style="{% if chill_main_config.top_banner.color is defined %}color: {{ chill_main_config.top_banner.color }};{% endif %}{% if chill_main_config.top_banner.background_color is defined %}background-color: {{ chill_main_config.top_banner.background_color }};{% endif %}">
+            {{ banner_text }}
+        </div>
+    {% endif %}
+{% endif %}
--- a/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/User/index.html.twig
@@ -61,7 +61,7 @@
                                {% endif %}
                            </li>
                            <li>
-                                <span class="dt">cercle/centre:</span>
+                                <span class="dt">{{ 'Scope'|trans }}/{{ 'center'|trans }}:</span>
                                {% if entity.mainScope %}
                                    {{ entity.mainScope.name|localize_translatable_string }}
                                {% endif %}
--- a/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
+++ b/src/Bundle/ChillMainBundle/Resources/views/layout.html.twig
@@ -26,6 +26,10 @@
 </head>

 <body>
+    {% if chill_main_config.top_banner is defined and chill_main_config.top_banner.visible is true %}
+        {{ include('@ChillMain/Layout/_top_banner.html.twig') }}
+    {% endif %}
+
    {% if responsive_debug is defined and responsive_debug == 1 %}
        {{ include('@ChillMain/Layout/_debug.html.twig') }}
    {% endif %}
--- a/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminUserMenuBuilder.php
+++ b/src/Bundle/ChillMainBundle/Routing/MenuBuilder/AdminUserMenuBuilder.php
@@ -49,7 +49,7 @@ class AdminUserMenuBuilder implements LocalMenuBuilderInterface
            'route' => 'chill_crud_center_index',
        ])->setExtras(['order' => 1010]);

-        $menu->addChild('Regroupements des centres', [
+        $menu->addChild('Regroupements des territoires', [
            'route' => 'chill_crud_regroupment_index',
        ])->setExtras(['order' => 1015]);

--- a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBEFromBestAddress.php
+++ b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBEFromBestAddress.php
@@ -64,7 +64,7 @@ class AddressReferenceBEFromBestAddress

        $uncompressedStream = gzopen($tmpname, 'r');

-        $csv = Reader::createFromStream($uncompressedStream);
+        $csv = Reader::from($uncompressedStream);
        $csv->setDelimiter(',');
        $csv->setHeaderOffset(0);

--- a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBaseImporter.php
+++ b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceBaseImporter.php
@@ -287,7 +287,7 @@ final class AddressReferenceBaseImporter

            $filename = sprintf('%s-%s.csv', (new \DateTimeImmutable())->format('Ymd-His'), uniqid());
            $path = Path::normalize(sprintf('%s%s%s', sys_get_temp_dir(), DIRECTORY_SEPARATOR, $filename));
-            $writer = Writer::createFromPath($path, 'w+');
+            $writer = Writer::from($path, 'w+');
            // insert headers
            $writer->insertOne([
                'postalcode',
--- a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceFromBAN.php
+++ b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceFromBAN.php
@@ -53,7 +53,7 @@ class AddressReferenceFromBAN
        // re-open it to read it
        $csvDecompressed = gzopen($path, 'r');

-        $csv = Reader::createFromStream($csvDecompressed);
+        $csv = Reader::from($csvDecompressed);
        $csv->setDelimiter(';')->setHeaderOffset(0);
        $stmt = new Statement();
        $stmt = $stmt->process($csv, [
--- a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceFromBano.php
+++ b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceFromBano.php
@@ -41,7 +41,7 @@ class AddressReferenceFromBano

        fseek($file, 0);

-        $csv = Reader::createFromStream($file);
+        $csv = Reader::from($file);
        $csv->setDelimiter(',');
        $stmt = new Statement();
        $stmt = $stmt->process($csv, [
--- a/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceLU.php
+++ b/src/Bundle/ChillMainBundle/Service/Import/AddressReferenceLU.php
@@ -39,7 +39,7 @@ class AddressReferenceLU

        fseek($file, 0);

-        $csv = Reader::createFromStream($file);
+        $csv = Reader::from($file);
        $csv->setDelimiter(';');
        $csv->setHeaderOffset(0);

--- a/src/Bundle/ChillMainBundle/Service/Import/PostalCodeBEFromBestAddress.php
+++ b/src/Bundle/ChillMainBundle/Service/Import/PostalCodeBEFromBestAddress.php
@@ -43,7 +43,7 @@ class PostalCodeBEFromBestAddress

        $uncompressedStream = gzopen($tmpname, 'r');

-        $csv = Reader::createFromStream($uncompressedStream);
+        $csv = Reader::from($uncompressedStream);
        $csv->setDelimiter(',');
        $csv->setHeaderOffset(0);

--- a/src/Bundle/ChillMainBundle/Service/Import/PostalCodeFRFromOpenData.php
+++ b/src/Bundle/ChillMainBundle/Service/Import/PostalCodeFRFromOpenData.php
@@ -47,7 +47,7 @@ class PostalCodeFRFromOpenData

        fseek($tmpfile, 0);

-        $csv = Reader::createFromStream($tmpfile);
+        $csv = Reader::from($tmpfile);
        $csv->setDelimiter(',');
        $csv->setHeaderOffset(0);

--- a/src/Bundle/ChillMainBundle/Service/Notifier/SentMessageEventSubscriber.php
+++ b/src/Bundle/ChillMainBundle/Service/Notifier/SentMessageEventSubscriber.php
@@ -18,7 +18,7 @@ use Symfony\Component\Notifier\Event\SentMessageEvent;
 final readonly class SentMessageEventSubscriber implements EventSubscriberInterface
 {
    public function __construct(
-        private LoggerInterface $logger,
+        private LoggerInterface $notifierLogger, // will be send to "notifierLogger" if it exists
    ) {}

    public static function getSubscribedEvents()
@@ -33,9 +33,9 @@ final readonly class SentMessageEventSubscriber implements EventSubscriberInterf
        $message = $event->getMessage();

        if (null === $message->getMessageId()) {
-            $this->logger->info('[sms] a sms message did not had any id after sending.', ['validReceiversI' => $message->getOriginalMessage()->getRecipientId()]);
+            $this->notifierLogger->info('[sms] a sms message did not had any id after sending.', ['validReceiversI' => $message->getOriginalMessage()->getRecipientId()]);
        } else {
-            $this->logger->warning('[sms] a sms was sent', ['validReceiversI' => $message->getOriginalMessage()->getRecipientId(), 'idsI' => $message->getMessageId()]);
+            $this->notifierLogger->warning('[sms] a sms was sent', ['validReceiversI' => $message->getOriginalMessage()->getRecipientId(), 'idsI' => $message->getMessageId()]);
        }
    }
 }
--- a/src/Bundle/ChillMainBundle/Tests/Controller/ScopeControllerTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Controller/ScopeControllerTest.php
@@ -35,7 +35,7 @@ final class ScopeControllerTest extends WebTestCase
            $client->getResponse()->getStatusCode(),
            'Unexpected HTTP status code for GET /fr/admin/scope/'
        );
-        $crawler = $client->click($crawler->selectLink('Créer un nouveau cercle')->link());
+        $crawler = $client->click($crawler->selectLink('Créer un nouveau service')->link());
        // Fill in the form and submit it
        $form = $crawler->selectButton('Créer')->form([
            'chill_mainbundle_scope[name][fr]' => 'Test en fr',
--- a/src/Bundle/ChillMainBundle/Tests/DependencyInjection/ConfigurationTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/DependencyInjection/ConfigurationTest.php
@@ -0,0 +1,98 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Tests\DependencyInjection;
+
+use Chill\MainBundle\DependencyInjection\Configuration;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Config\Definition\Processor;
+use Symfony\Component\DependencyInjection\ContainerBuilder;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class ConfigurationTest extends TestCase
+{
+    public function testTopBannerConfiguration(): void
+    {
+        $containerBuilder = new ContainerBuilder();
+        $configuration = new Configuration([], $containerBuilder);
+        $processor = new Processor();
+
+        // Test with top_banner configuration
+        $config = [
+            'chill_main' => [
+                'top_banner' => [
+                    'text' => [
+                        'fr' => 'Vous travaillez actuellement avec la version de pré-production de Chill.',
+                        'nl' => 'Je werkte momenteel in de pré-productie versie van Chill.',
+                    ],
+                    'color' => 'white',
+                    'background-color' => 'red',
+                ],
+            ],
+        ];
+
+        $processedConfig = $processor->processConfiguration($configuration, $config);
+
+        self::assertArrayHasKey('top_banner', $processedConfig);
+        self::assertArrayHasKey('text', $processedConfig['top_banner']);
+        self::assertArrayHasKey('fr', $processedConfig['top_banner']['text']);
+        self::assertArrayHasKey('nl', $processedConfig['top_banner']['text']);
+        self::assertSame('white', $processedConfig['top_banner']['color']);
+        self::assertSame('red', $processedConfig['top_banner']['background_color']);
+    }
+
+    public function testTopBannerConfigurationOptional(): void
+    {
+        $containerBuilder = new ContainerBuilder();
+        $configuration = new Configuration([], $containerBuilder);
+        $processor = new Processor();
+
+        // Test without top_banner configuration
+        $config = [
+            'chill_main' => [],
+        ];
+
+        $processedConfig = $processor->processConfiguration($configuration, $config);
+
+        // top_banner should not be present when not configured
+        self::assertArrayNotHasKey('top_banner', $processedConfig);
+    }
+
+    public function testTopBannerWithMinimalConfiguration(): void
+    {
+        $containerBuilder = new ContainerBuilder();
+        $configuration = new Configuration([], $containerBuilder);
+        $processor = new Processor();
+
+        // Test with minimal top_banner configuration (only text)
+        $config = [
+            'chill_main' => [
+                'top_banner' => [
+                    'text' => [
+                        'fr' => 'Test message',
+                    ],
+                ],
+            ],
+        ];
+
+        $processedConfig = $processor->processConfiguration($configuration, $config);
+
+        self::assertArrayHasKey('top_banner', $processedConfig);
+        self::assertArrayHasKey('text', $processedConfig['top_banner']);
+        self::assertSame('Test message', $processedConfig['top_banner']['text']['fr']);
+        self::assertNull($processedConfig['top_banner']['color']);
+        self::assertNull($processedConfig['top_banner']['background_color']);
+    }
+}
--- a/src/Bundle/ChillMainBundle/Tests/Notification/Email/DailyNotificationDigestCronJobFunctionalTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Notification/Email/DailyNotificationDigestCronJobFunctionalTest.php
@@ -37,10 +37,5 @@ class DailyNotificationDigestCronJobFunctionalTest extends KernelTestCase
        $actual = $this->dailyNotificationDigestCronjob->run([]);

        self::assertArrayHasKey('last_execution', $actual);
-        self::assertInstanceOf(
-            \DateTimeImmutable::class,
-            \DateTimeImmutable::createFromFormat('Y-m-d-H:i:s.u e', $actual['last_execution']),
-            'test that the string can be converted to a date'
-        );
    }
 }
--- a/src/Bundle/ChillMainBundle/Tests/Notification/Email/DailyNotificationDigestCronJobTest.php
+++ b/src/Bundle/ChillMainBundle/Tests/Notification/Email/DailyNotificationDigestCronJobTest.php
@@ -12,16 +12,21 @@ declare(strict_types=1);
 namespace Chill\MainBundle\Tests\Notification\Email;

 use Chill\MainBundle\Notification\Email\DailyNotificationDigestCronjob;
+use Chill\MainBundle\Notification\Email\NotificationEmailMessages\ScheduleDailyNotificationDigestMessage;
 use Doctrine\DBAL\Connection;
+use Doctrine\DBAL\Result;
+use Doctrine\DBAL\Statement;
 use PHPUnit\Framework\TestCase;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Clock\ClockInterface;
+use Symfony\Component\Clock\MockClock;
+use Symfony\Component\Messenger\Envelope;
 use Symfony\Component\Messenger\MessageBusInterface;

 /**
 * @internal
 *
- * @coversNothing
+ * @covers \DailyNotificationDigestCronjob
 */
 class DailyNotificationDigestCronJobTest extends TestCase
 {
@@ -30,6 +35,7 @@ class DailyNotificationDigestCronJobTest extends TestCase
    private MessageBusInterface $messageBus;
    private LoggerInterface $logger;
    private DailyNotificationDigestCronjob $cronjob;
+    private \DateTimeImmutable $firstNow;

    protected function setUp(): void
    {
@@ -38,6 +44,8 @@ class DailyNotificationDigestCronJobTest extends TestCase
        $this->messageBus = $this->createMock(MessageBusInterface::class);
        $this->logger = $this->createMock(LoggerInterface::class);

+        $this->firstNow = new \DateTimeImmutable('2024-01-02T07:15:00+00:00');
+
        $this->cronjob = new DailyNotificationDigestCronjob(
            $this->clock,
            $this->connection,
@@ -78,4 +86,129 @@ class DailyNotificationDigestCronJobTest extends TestCase
            'hour 23 - should not run' => [23, false],
        ];
    }
+
+    public function testRunFirstExecutionReturnsStateAndDispatches(): array
+    {
+        // Use MockClock for deterministic time
+        $firstNow = $this->firstNow;
+        $clock = new MockClock($firstNow);
+
+        // Mock DBAL statement/result
+        $statement = $this->createMock(Statement::class);
+        $result = $this->createMock(Result::class);
+
+        $this->connection->method('prepare')->willReturn($statement);
+        $statement->method('bindValue')->willReturnSelf();
+        $statement->method('executeQuery')->willReturn($result);
+
+        $rows = [
+            ['user_id' => 10],
+            ['user_id' => 42],
+        ];
+        $result->method('fetchAllAssociative')->willReturn($rows);
+
+        $dispatched = [];
+        $this->messageBus->method('dispatch')->willReturnCallback(function ($message) use (&$dispatched) {
+            $dispatched[] = $message;
+
+            return new Envelope($message);
+        });
+
+        $cron = new DailyNotificationDigestCronjob($clock, $this->connection, $this->messageBus, $this->logger);
+        $state = $cron->run([]);
+
+        // Assert dispatch count and message contents
+        self::assertCount(2, $dispatched);
+        $expectedLast = $firstNow->sub(new \DateInterval('P1D'));
+        foreach ($dispatched as $i => $msg) {
+            self::assertInstanceOf(ScheduleDailyNotificationDigestMessage::class, $msg);
+            self::assertTrue(in_array($msg->getUserId(), [10, 42], true));
+            self::assertEquals($firstNow, $msg->getCurrentDateTime(), 'compare the current date');
+            self::assertEquals($expectedLast, $msg->getLastExecutionDateTime(), 'compare the last execution date');
+        }
+
+        // Assert returned state
+        self::assertIsArray($state);
+        self::assertArrayHasKey('last_execution', $state);
+        self::assertSame($firstNow->format(\DateTimeInterface::ATOM), $state['last_execution']);
+
+        return $state;
+    }
+
+    /**
+     * @depends testRunFirstExecutionReturnsStateAndDispatches
+     */
+    public function testRunSecondExecutionUsesPreviousState(array $previousState): void
+    {
+        $firstNow = $this->firstNow;
+        $secondNow = $firstNow->add(new \DateInterval('P1D'));
+        $clock = new MockClock($secondNow);
+
+        // Mock DBAL for a single user this time
+        $statement = $this->createMock(Statement::class);
+        $result = $this->createMock(Result::class);
+
+        $this->connection->method('prepare')->willReturn($statement);
+        $statement->method('bindValue')->willReturnSelf();
+        $statement->method('executeQuery')->willReturn($result);
+
+        $rows = [
+            ['user_id' => 7],
+        ];
+        $result->method('fetchAllAssociative')->willReturn($rows);
+
+        $captured = [];
+        $this->messageBus->method('dispatch')->willReturnCallback(function ($message) use (&$captured) {
+            $captured[] = $message;
+
+            return new Envelope($message);
+        });
+
+        $cron = new DailyNotificationDigestCronjob($clock, $this->connection, $this->messageBus, $this->logger);
+        $cron->run($previousState);
+
+        self::assertCount(1, $captured);
+        $msg = $captured[0];
+        self::assertInstanceOf(ScheduleDailyNotificationDigestMessage::class, $msg);
+        self::assertEquals(7, $msg->getUserId());
+        self::assertEquals($secondNow, $msg->getCurrentDateTime(), 'compare the current date');
+        self::assertEquals($firstNow, $msg->getLastExecutionDateTime(), 'compare the last execution date');
+    }
+
+    public function testRunWithInvalidExecutionState(): void
+    {
+        $firstNow = new \DateTimeImmutable('2025-10-14T10:30:00 Europe/Brussels');
+        $previousExpected = $firstNow->sub(new \DateInterval('P1D'));
+        $clock = new MockClock($firstNow);
+
+        // Mock DBAL for a single user this time
+        $statement = $this->createMock(Statement::class);
+        $result = $this->createMock(Result::class);
+
+        $this->connection->method('prepare')->willReturn($statement);
+        $statement->method('bindValue')->willReturnSelf();
+        $statement->method('executeQuery')->willReturn($result);
+
+        $rows = [
+            ['user_id' => 7],
+        ];
+        $result->method('fetchAllAssociative')->willReturn($rows);
+
+        $captured = [];
+        $this->messageBus->method('dispatch')->willReturnCallback(function ($message) use (&$captured) {
+            $captured[] = $message;
+
+            return new Envelope($message);
+        });
+
+        $cron = new DailyNotificationDigestCronjob($clock, $this->connection, $this->messageBus, $this->logger);
+        $cron->run(['last_execution' => 'invalid data']);
+
+        self::assertCount(1, $captured);
+        $msg = $captured[0];
+        self::assertInstanceOf(ScheduleDailyNotificationDigestMessage::class, $msg);
+        self::assertEquals(7, $msg->getUserId());
+        self::assertEquals($firstNow, $msg->getCurrentDateTime(), 'compare the current date');
+        self::assertEquals($previousExpected, $msg->getLastExecutionDateTime(), 'compare the last execution date');
+    }
 }
--- a/src/Bundle/ChillMainBundle/migrations/Version20251104124123.php
+++ b/src/Bundle/ChillMainBundle/migrations/Version20251104124123.php
@@ -0,0 +1,46 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\Migrations\Main;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+final class Version20251104124123 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Delete on cascade EntityWorkflowStepHold';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_main_workflow_entity_step_hold
+                   DROP CONSTRAINT fk_1be2e7c73b21e9c');
+
+        $this->addSql('ALTER TABLE chill_main_workflow_entity_step_hold
+                   ADD CONSTRAINT fk_1be2e7c73b21e9c
+                   FOREIGN KEY (step_id)
+                   REFERENCES chill_main_workflow_entity_step (id)
+                   ON DELETE CASCADE');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE chill_main_workflow_entity_step_hold
+                   DROP CONSTRAINT fk_1be2e7c73b21e9c');
+
+        $this->addSql('ALTER TABLE chill_main_workflow_entity_step_hold
+                   ADD CONSTRAINT fk_1be2e7c73b21e9c
+                   FOREIGN KEY (step_id)
+                   REFERENCES chill_main_workflow_entity_step (id)');
+    }
+}
--- a/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml
+++ b/src/Bundle/ChillMainBundle/translations/messages+intl-icu.fr.yaml
@@ -127,6 +127,20 @@ duration:
            few {# minutes}
            other {# minutes}
        }
+    hour: >-
+        {h, plural,
+            =0 {Aucune durée}
+            one {# heure}
+            few {# heures}
+            other {# heures}
+        }
+    day: >-
+        {d, plural,
+            =0 {Aucune durée}
+            one {# jour}
+            few {# jours}
+            other {# jours}
+        }

 filter_order:
    by_date:
--- a/Show More
+++ b/Show More
Author	SHA1	Message	Date
Julie Lenaerts	f7ea7e4dbf	Display calendar items linked to person within search results	2025-11-12 13:00:52 +01:00
Julie Lenaerts	0a58e05230	Update chill bundles to v4.7.0	2025-11-10 16:47:38 +01:00
Julien Fastré	68c83223dd	Merge branch '455-results-objectives-display-order' into 'master' Resolve "Action d'accompagnement - afficher les objectifs avant les résultats" Closes #455 See merge request Chill-Projet/chill-bundles!913	2025-11-07 16:23:53 +00:00
LenaertsJ	c28bd22560	Resolve "Action d'accompagnement - afficher les objectifs avant les résultats"	2025-11-07 16:23:52 +00:00
Julien Fastré	a5ef2475fb	Merge branch 'text-wrapping-badges' into 'master' Wrap text when it is too long within badges See merge request Chill-Projet/chill-bundles!918	2025-11-07 14:48:48 +00:00
Julie Lenaerts	86dd9bfb80	Wrap text when it is too long within badges	2025-11-07 15:18:02 +01:00
Julien Fastré	c28670f0fd	Merge branch '457-merge-thirdparty-bug' into 'master' Fix the fusion of thirdparty properties that are located in another schema... Closes #457 See merge request Chill-Projet/chill-bundles!916	2025-11-07 10:50:03 +00:00
LenaertsJ	9e2c030224	Fix the fusion of thirdparty properties that are located in another schema...	2025-11-07 10:50:03 +00:00
Julie Lenaerts	a706c6f337	fix: set back to true suggestion of referrer when creating notification for accompanyingPeriodWorkDocument	2025-11-06 16:18:33 +01:00
Julien Fastré	bc63b489ee	Merge branch '285-cancel-calendar' into 'master' Permettre d'annuler un rendez-vous Closes #285 See merge request Chill-Projet/chill-bundles!775	2025-11-06 15:07:11 +00:00
LenaertsJ	a4cfc6a178	Permettre d'annuler un rendez-vous	2025-11-06 15:07:11 +00:00
Julien Fastré	f75d1da3b1	Merge branch '385-invitation-list' into 'master' Add user invitation list page Closes #385 See merge request Chill-Projet/chill-bundles!866	2025-11-06 12:06:15 +00:00
Julien Fastré	b8b68e5e5a	Rename page title key for invitations list to align with translation standards - Replaced hardcoded title 'My invitations list' with 'invite.list.title' translation key.	2025-11-06 13:00:38 +01:00
Julien Fastré	ae5ba67064	Update UserMenuBuilder to adjust menu labels and sort order - Renamed 'My invitations list' to 'invite.list.title'. - Updated the sort order for 'My calendar' from 9 to 8, to place "invitation list" just after the calendar list	2025-11-06 13:00:28 +01:00
Julien Fastré	bfe4dd3aec	Merge branch 'master' into 385-invitation-list	2025-11-06 12:14:21 +01:00
Julien Fastré	3a4c20b53d	Merge branch '405-aside-activity-associated-persons' into 'master' Resolve "Activités annexes: ajouter le nombre d'usagers concernés pour chaque activité annexe" Closes #405 See merge request Chill-Projet/chill-bundles!895	2025-11-05 09:48:50 +00:00
LenaertsJ	b0c86e238d	Resolve "Activités annexes: ajouter le nombre d'usagers concernés pour chaque activité annexe"	2025-11-05 09:48:50 +00:00
Julien Fastré	d7614aeab2	Merge branch '454-evaluation-time-spent-choices' into 'master' Expand timeSpent choices for evaluation document and translate them to user locale or fallback 'fr' Closes #454 See merge request Chill-Projet/chill-bundles!912	2025-11-05 09:29:51 +00:00
LenaertsJ	671ed21d59	Expand timeSpent choices for evaluation document and translate them to user locale or fallback 'fr'	2025-11-05 09:29:50 +00:00
Julien Fastré	4b9db6ceb6	Merge branch '451-activity-social-actions-list' into 'master' Fix: display also social actions linked to parents of the selected social issue Closes #451 See merge request Chill-Projet/chill-bundles!907	2025-11-05 08:51:47 +00:00
LenaertsJ	c79c39b562	Fix: display also social actions linked to parents of the selected social issue	2025-11-05 08:51:47 +00:00
Julien Fastré	bf768b8e99	Merge branch '404-action-list-add-comments' into 'master' Feature: add columns for comments linked to an activity (comment, user, date) Closes #404 See merge request Chill-Projet/chill-bundles!909	2025-11-05 08:50:16 +00:00
Julien Fastré	2df01833ad	Merge branch '453-bug-csv-social-actions' into 'master' Fix: export actions and their results in csv even when action does not have... Closes #453 See merge request Chill-Projet/chill-bundles!908	2025-11-05 08:47:50 +00:00
LenaertsJ	ffb8183d4d	Fix: export actions and their results in csv even when action does not have...	2025-11-05 08:47:49 +00:00
Julien Fastré	5d45339bf7	Merge branch 'fix/loading-wopi-bundle' into 'master' Fix loading of wopi-bundle See merge request Chill-Projet/chill-bundles!915	2025-11-05 08:32:55 +00:00
Julien Fastré	e87e5cbbaf	Fix loading of wopi-bundle	2025-11-05 08:32:54 +00:00
Julien Fastré	fa8e92ebf5	Merge branch '425-rename-cercle-and-centre' into 'master' Resolve "Partout, renommer "cercle" en "service" et "centre" en "territoire"" Closes #425 See merge request Chill-Projet/chill-bundles!894	2025-11-04 15:25:11 +00:00
LenaertsJ	b7a92bf656	Resolve "Partout, renommer "cercle" en "service" et "centre" en "territoire""	2025-11-04 15:25:10 +00:00
Julien Fastré	3dbbda7b64	Merge branch '452-workflow-suivi-ux' into 'master' Redo ux for selceting follow-up preferences for workflow Closes #452 See merge request Chill-Projet/chill-bundles!906	2025-11-04 15:00:51 +00:00
Julie Lenaerts	769d76a0cc	Fix the possibility to delete a workflow when it is on hold	2025-11-04 13:52:54 +01:00
Julie Lenaerts	722b37fbcc	Set wopi-bundle dependency back to original	2025-11-04 09:28:23 +01:00
Julie Lenaerts	bf38ec22c9	Add missing import in FormEvaluation.vue and temporarily set wopi-bundle requirement to specific commit (until bundles is fully upgraded to sf7)	2025-10-30 11:40:20 +01:00
Julie Lenaerts	3d99c0f561	Feature: add columns for comments linked to an activity (comment, user, date)	2025-10-29 15:26:06 +01:00
Julie Lenaerts	2221d17930	Redo ux for selceting follow-up preferences for workflow	2025-10-29 11:17:47 +01:00
Julien Fastré	9c2abb2dfa	Merge branch 'send-notification-log-to-channel' into 'master' Send notifications log to dedicated `notifierLogger` channel if available See merge request Chill-Projet/chill-bundles!905	2025-10-27 15:58:48 +00:00
Julien Fastré	94744b9542	Send notifications log to dedicated `notifierLogger` channel if available	2025-10-27 15:58:48 +00:00
Julie Lenaerts	f42bb498e4	Fix deprecation notice League/csv for createFromStream and createFromPath replaced by new from() method	2025-10-27 13:21:04 +01:00
Julie Lenaerts	01889ac671	Upgrade to v4.6.1	2025-10-27 12:59:11 +01:00
Julie Lenaerts	62e5842311	Fix case where no 'reason' is picked within the PersonHavingActivityBetweenDateFilter.php	2025-10-27 12:50:34 +01:00
Julien Fastré	8ad6f397a8	Release v4.6.0	2025-10-15 12:40:22 +02:00
Julien Fastré	d713704633	Merge branch '394-page-workflow-subscribed-only-finalize' into 'master' Only show active workflow on the page "my tracked workflows" Closes #394 See merge request Chill-Projet/chill-bundles!901	2025-10-15 10:13:38 +00:00
Julien Fastré	b1fa9242a0	Only show active workflow on the page "my tracked workflows"	2025-10-15 10:13:38 +00:00
Julien Fastré	6ac554f93a	Merge branch '448-fix-daily-cronjob-digest' into 'master' Fix sending of daily notification, when the previous last_execution parameter is not a valid last_execution date format Closes #448 See merge request Chill-Projet/chill-bundles!900	2025-10-15 10:12:10 +00:00
Julien Fastré	372d8e5825	Fix sending of daily notification, when the previous last_execution parameter is not a valid last_execution date format	2025-10-15 10:12:10 +00:00
Julien Fastré	10f05e5559	Merge branch 'fix/fix-deletion-attachments' into 'master' Take permissions into account for deletion of WorkflowAttachment (+ type safety) See merge request Chill-Projet/chill-bundles!899	2025-10-13 14:12:06 +00:00
Julien Fastré	ddb2a65419	Take permissions into account for deletion of WorkflowAttachment (+ type safety)	2025-10-13 14:12:06 +00:00
Julien Fastré	8d40a8089f	Merge branch '446-fix-duplicated-filename-stored-object-version' into 'master' Enforce filename uniqueness in `StoredObjectVersion` with partial unique index... Closes #446 See merge request Chill-Projet/chill-bundles!898	2025-10-13 10:47:47 +00:00
Julien Fastré	e1bf4a24d2	Enforce filename uniqueness in `StoredObjectVersion` with partial unique index...	2025-10-13 10:47:47 +00:00
Julien Fastré	208a378185	Merge branch 'fix_mado_to_validate' into 'master' Fix loading of classlists in SocialIssuesAcc.vue See merge request Chill-Projet/chill-bundles!833	2025-10-08 11:44:49 +00:00
Julien Fastré	9089c8959b	remove ux/translator package in error	2025-10-08 11:35:47 +00:00
Julien Fastré	1b9b581c31	Hide top_banner by default	2025-10-08 13:10:26 +02:00
Julien Fastré	aa1abe4c88	Merge branch '423-environment-banner' into 'master' Resolve "Ajouter un bandeau qui permet de distinguer les différents environnements" Closes #423 See merge request Chill-Projet/chill-bundles!896	2025-10-08 11:05:22 +00:00
LenaertsJ	d82c9cc9a7	Resolve "Ajouter un bandeau qui permet de distinguer les différents environnements"	2025-10-08 11:05:22 +00:00
Julie Lenaerts	a7e3b1c5d2	Use an object (instead of string) for dynamic classList in SocialIssuesAcc.vue component	2025-10-08 11:37:02 +02:00
Julie Lenaerts	84cf11933d	Fix loading of classlists in SocialIssuesAcc.vue	2025-10-08 11:21:09 +02:00
Julie Lenaerts	74c9eb5585	Rector corrections	2025-09-30 16:23:27 +02:00
Julie Lenaerts	f93c7e014f	Add test for MyInvitationsController.php	2025-09-30 15:45:26 +02:00
Julie Lenaerts	e6a799abc4	Add translation for invitation list page title	2025-09-30 15:30:38 +02:00
Julie Lenaerts	68a0ef7115	Reorganize templates to allow re-use of _list.html.twig within listByUser.html.twig template	2025-09-30 15:30:20 +02:00
Julie Lenaerts	1675c56f3d	Fix order of paginator parameters passed to findBy method	2025-09-30 15:29:41 +02:00
Julie Lenaerts	675e8450fc	WIP: switch from ACLAware to normal repository usage	2025-09-30 14:34:47 +02:00
Julie Lenaerts	4ffd7034d0	feat: add invitation list - Introduced `MyInvitationsController` for managing user invitations - Added `InviteACLAwareRepository` and its interface for handling invite data operations - Created views for listing and displaying user-specific invitations - Updated user menu to include "My invitations list" option	2025-09-30 14:34:47 +02:00