Merge branch '1828-1829-fix-bugs-empty-motive-list-and-suggestion-caller' into 'ticket-app-master'

FIX: Frontend: La liste des motifs reste vide et Frontend: l'appelant apparait deux fois dans les suggestions

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

.changes/unreleased/DX-20251027-150053.yaml

@@ -0,0 +1,7 @@
+kind: DX
+body: |
+    Send notifications log to dedicated channel, if it exists
+time: 2025-10-27T15:00:53.309372316+01:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change

.changes/unreleased/Feature-20250808-120802.yaml

@@ -0,0 +1,6 @@
+kind: Feature
+body: Create invitation list in user menu
+time: 2025-08-08T12:08:02.446361367+02:00
+custom:
+    Issue: "385"
+    SchemaChange: No schema change

.changes/unreleased/Feature-20251007-155945.yaml

@@ -0,0 +1,6 @@
+kind: Feature
+body: Admin interface for Motive entity
+time: 2025-10-07T15:59:45.597029709+02:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change

.changes/unreleased/Feature-20251022-111552.yaml

@@ -0,0 +1,6 @@
+kind: Feature
+body: Add an admin interface for Motive entity
+time: 2025-10-22T11:15:52.13937955+02:00
+custom:
+    Issue: ""
+    SchemaChange: Add columns or tables

.changes/unreleased/Feature-20251029-152510.yaml

@@ -0,0 +1,6 @@
+kind: Feature
+body: Add columns for comments linked to an activity in the activity list export
+time: 2025-10-29T15:25:10.493968528+01:00
+custom:
+    Issue: "404"
+    SchemaChange: No schema change

.changes/unreleased/Fixed-20251029-124355.yaml

@@ -0,0 +1,6 @@
+kind: Fixed
+body: 'Fix: display also social actions linked to parents of the selected social issue'
+time: 2025-10-29T12:43:55.008647232+01:00
+custom:
+    Issue: "451"
+    SchemaChange: No schema change

.changes/unreleased/Fixed-20251029-143836.yaml

@@ -0,0 +1,6 @@
+kind: Fixed
+body: 'Fix: export actions and their results in csv even when action does not have any goals attached to it.'
+time: 2025-10-29T14:38:36.195220844+01:00
+custom:
+    Issue: "453"
+    SchemaChange: No schema change

.changes/unreleased/Fixed-20251104-135108.yaml

@@ -0,0 +1,6 @@
+kind: Fixed
+body: Fix the possibility to delete a workflow
+time: 2025-11-04T13:51:08.113234488+01:00
+custom:
+    Issue: ""
+    SchemaChange: Drop or rename table or columns, or enforce new constraint that must be manually fixed

.changes/unreleased/Fixed-20251106-161605.yaml

@@ -0,0 +1,6 @@
+kind: Fixed
+body: Fix suggestion of referrer when creating notification for accompanyingPeriodWorkDocument
+time: 2025-11-06T16:16:05.861813041+01:00
+custom:
+    Issue: "428"
+    SchemaChange: No schema change

.changes/unreleased/UX-20251006-123932.yaml

@@ -0,0 +1,6 @@
+kind: UX
+body: Change the terms 'cercle' and 'centre' to 'service', and 'territoire' respectively.
+time: 2025-10-06T12:39:32.514056818+02:00
+custom:
+    Issue: "425"
+    SchemaChange: No schema change

.changes/unreleased/UX-20251029-110804.yaml

@@ -0,0 +1,6 @@
+kind: UX
+body: Improve the ux for selecting whether user wants to be notified of the final step of a workflow or all steps
+time: 2025-10-29T11:08:04.077020411+01:00
+custom:
+    Issue: "542"
+    SchemaChange: No schema change

.changes/unreleased/UX-20251030-180919.yaml

@@ -0,0 +1,6 @@
+kind: UX
+body: Expand timeSpent choices for evaluation document and translate them to user locale or fallback 'fr'
+time: 2025-10-30T18:09:19.373907522+01:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change

.changes/v4.0.2.md

@@ -0,0 +1,4 @@
+## v4.0.2 - 2025-07-09
+### Fixed
+* Fix add missing translation   
+* Fix the transfer of evaluations and documents during of accompanyingperiodwork   

.changes/v4.1.0.md

@@ -0,0 +1,12 @@
+## v4.1.0 - 2025-08-26
+### Feature
+* ([#400](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/400)) Add filter to social actions list to filter out actions where current user intervenes   
+* ([#399](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/399)) Show filters on list pages unfolded by default   
+* Expansion of event module with new fields in the creation form: thematic, internal/external animator, responsable, and budget elements. Filtering options in the event list + adapted exports   
+
+  **Schema Change**: Add columns or tables
+### Fixed
+* ([#382](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/382)) adjust display logic for accompanying period dates, include closing date if period is closed.   
+* ([#384](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/384)) add min and step attributes to integer field in DateIntervalType   
+### UX
+* Limit display of participations in event list   

.changes/v4.2.0.md

@@ -0,0 +1,10 @@
+## v4.2.0 - 2025-09-02
+### Feature
+* ([#64](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/64)) Add external identifier for a Person
+
+  **Schema Change**: Add columns or tables
+* ([#330](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/330) Allow users to choose for which notifications they want to receive an email
+### Fixed
+* ([#422](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/422)) Fixed html layout of pages for recovering password
+* Fix typo in 'uncheckAll' script for centers selection
+* Fix incorrect parameter name in event details link

.changes/v4.2.1.md

@@ -0,0 +1,6 @@
+## v4.2.1 - 2025-09-03
+### Fixed
+* Fix exports to work with DirectExportInterface   
+### DX
+* Improve error message when a stored object cannot be written on local disk
+   

.changes/v4.3.0.md

@@ -0,0 +1,10 @@
+## v4.3.0 - 2025-09-08
+### Feature
+* ([#409](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/409)) Add 45 and 60 min calendar ranges   
+* Add a command to generate a list of permissions   
+* ([#412](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/412)) Add an absence end date   
+
+  **Schema Change**: Add columns or tables
+### Fixed
+* fix date formatting in calendar range display   
+* Change route URL to avoid clash with person duplicate controller method   

.changes/v4.4.0.md

@@ -0,0 +1,8 @@
+## v4.4.0 - 2025-09-11
+### Feature
+* ([#359](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/359)) Allow the merge of two accompanying period works   
+* ([#369](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/369)) Duplication of a document to another accompanying period work evaluation   
+* ([#359](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/359)) Fusion of two accompanying period works   
+### Fixed
+* Fix display of 'duplicate' and 'merge' buttons in CRUD templates   
+* Fix saving notification preferences in user's profile   

.changes/v4.4.1.md

@@ -0,0 +1,3 @@
+## v4.4.1 - 2025-09-11
+### Fixed
+* fix translations in duplicate evaluation document modal and realign close modal button   

.changes/v4.4.2.md

@@ -0,0 +1,3 @@
+## v4.4.2 - 2025-09-12
+### Fixed
+* Fix document generation and workflow generation do not work on accompanying period work documents   

.changes/v4.5.0.md

@@ -0,0 +1,13 @@
+## v4.5.0 - 2025-10-03
+### Feature
+* Only allow delete of attachment on workflows that are not final   
+* Move up signature buttons on index workflow page for easier access   
+* Filter out document from attachment list if it is the same as the workflow document   
+* Block edition on attached document on workflow, if the workflow is finalized or sent external   
+* Convert workflow's attached document to pdf while sending them external   
+* After a signature is canceled or rejected, going to a waiting page until the post-process routines apply a workflow transition   
+### Fixed
+* ([#426](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/426)) Increased the number of required characters when setting a new password in Chill from 9 to 14 - GDPR compliance   
+* Fix permissions on storedObject which are subject by a workflow   
+### DX
+* Introduce a WaitingScreen component to display a waiting screen   

.changes/v4.5.1.md

@@ -0,0 +1,4 @@
+## v4.5.1 - 2025-10-03
+### Fixed
+* Add missing javascript dependency   
+* Add exception handling for conversion of attachment on sending external, when documens are already in pdf   

.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   

.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   

.env

@@ -16,6 +16,9 @@ APP_ENV=prod
 APP_SECRET=!ChangeMeInAppEnv!
 ###< symfony/framework-bundle ###
 
+## Wopi server for editing documents online
+EDITOR_SERVER=http://collabora:9980
+
 # must be manually set in .env.local
 # ADMIN_PASSWORD=
 
@@ -89,13 +92,3 @@ REDIS_URL=redis://${REDIS_HOST}:${REDIS_PORT}
 ###> symfony/ovh-cloud-notifier ###
 # OVHCLOUD_DSN=ovhcloud://APPLICATION_KEY:APPLICATION_SECRET@default?consumer_key=CONSUMER_KEY&service_name=SERVICE_NAME
 ###< symfony/ovh-cloud-notifier ###
-
-###> symfony/mercure-bundle ###
-# See https://symfony.com/doc/current/mercure.html#configuration
-# The URL of the Mercure hub, used by the app to publish updates (can be a local URL)
-MERCURE_URL=https://example.com/.well-known/mercure
-# The public URL of the Mercure hub, used by the browser to connect
-MERCURE_PUBLIC_URL=https://example.com/.well-known/mercure
-# The secret used to sign the JWTs
-MERCURE_JWT_SECRET="!ChangeThisMercureHubJWTSecretKey!"
-###< symfony/mercure-bundle ###

.gitignore

@@ -18,6 +18,9 @@ migrations/*
 templates/*
 translations/*
 
+# we allow developers to add customization on their installation, without commiting it
+config/packages/dev/*
+
 ###> symfony/framework-bundle ###
 /.env.local
 /.env.local.php

.junie/guidelines.md

@@ -27,11 +27,11 @@ Chill is a comprehensive web application built as a set of Symfony bundles. It i
 
 ## Project Structure
 
-Note: This is a project which exists from a long time ago, and we found multiple structure inside each bundle. When having the choice, the developers should choose the new structure.
+Note: This is a project that's existed for a long time, and throughout the years we've used multiple structures inside each bundle. When having the choice, the developers should choose the new structure.
 
 The project follows a standard Symfony bundle structure:
 - `/src/Bundle/`: Contains all the Chill bundles. The code is either at the root of the bundle directory, or within a `src/` directory (preferred). See psr4 mapping at the root's `composer.json`.
-- each bundle come with his own tests, either in the `Tests` directory (when the code is directly within the bundle directory (for instance `src/Bundle/ChillMainBundle/Tests`, `src/Bundle/ChillPersonBundle/Tests`)), or inside the `tests` directory, alongside to the `src/` sub-directory (example: `src/Bundle/ChillWopiBundle/tests`) (this is the preferred way).
+- each bundle comes with its own tests, either in the `Tests` directory (when the code is directly within the bundle directory (for instance `src/Bundle/ChillMainBundle/Tests`, `src/Bundle/ChillPersonBundle/Tests`)), or inside the `tests` directory, alongside the `src/` sub-directory (example: `src/Bundle/ChillWopiBundle/tests`) (this is the preferred way).
 - `/docs/`: Contains project documentation
 
 Each bundle typically has the following structure:
@@ -46,13 +46,13 @@ Each bundle typically has the following structure:
 
 ### A special word about TicketBundle
 
-The ticket bundle is developed using a kind of "Command" pattern. The controller fill a "Command", and a "CommandHandler" handle this command. They are savec in the `src/Bundle/ChillTicketBundle/src/Action` directory.
+The ticket bundle is developed using a kind of "Command" pattern. The controller fills a "Command," and a "CommandHandler" handles this command. They are saved in the `src/Bundle/ChillTicketBundle/src/Action` directory.
 
 ## Development Guidelines
 
 ### Building and Configuration Instructions
 
-All the command should be run through the `symfony` command, which will configure the required variables.
+All the commands should be run through the `symfony` command, which will configure the required variables.
 
 For assets, we must ensure that we use node at version `^20.0.0`. This is done using `nvm use 20`.
 
@@ -87,7 +87,7 @@ For assets, we must ensure that we use node at version `^20.0.0`. This is done u
    docker compose up -d
    ```
 
-5. **Set Up the Database**:
+6. **Set Up the Database**:
    ```bash
    # Create the database
    symfony console doctrine:database:create
@@ -99,20 +99,20 @@ For assets, we must ensure that we use node at version `^20.0.0`. This is done u
    symfony console doctrine:fixtures:load
    ```
 
-6. **Build Assets**:
+7. **Build Assets**:
    ```bash
    nvm use 20
    yarn run encore dev
    ```
 
-7. **Start the Development Server**:
+8. **Start the Development Server**:
    ```bash
    symfony server:start -d
    ```
 
 #### Docker Setup
 
-The project includes Docker configuration for easier development:
+The project includes a Docker configuration for easier development:
 
 1. **Start Docker Services**:
    ```bash
@@ -153,9 +153,9 @@ Key configuration files:
 
 Each time a doctrine entity is created, we generate migration to adapt the database.
 
-The migration are created using the command `symfony console doctrine:migrations:diff --no-interaction --namespace <namespace>`, where the namespace is the relevant namespace for migration. As this is a bash script, do not forget to quote the `\` (`\` must become `\\` in your command).
+The migration is created using the command `symfony console doctrine:migrations:diff --no-interaction --namespace <namespace>`, where the namespace is the relevant namespace for migration. As this is a bash script, remember to quote the `\` (`\` must become `\\` in your command).
 
-Each bundle has his own namespace for migration (always ask me to confirm that command, with a list of updated / created entities so that I can confirm you that it is ok):
+Each bundle has his own namespace for migration (always ask me to confirm that command with a list of updated / created entities so that I can confirm to you that it is ok):
 
 - `Chill\Bundle\ActivityBundle` writes migrations to `Chill\Migrations\Activity`;
 - `Chill\Bundle\BudgetBundle` writes migrations to `Chill\Migrations\Budget`;
@@ -183,22 +183,60 @@ Once created the, comment's classes should be removed and a description of the c
 
 When we need to use a DateTime or DateTimeImmutable that need to express "now", we prefer the usage of
 `Symfony\Component\Clock\ClockInterface`, where possible. This is usually not possible in doctrine entities,
-where injection does not work when restoring an entity from database, but usually possible in services.
+where injection does not work when restoring an entity from a database, but usually possible in services.
+
+In test, we use `\Symfony\Component\Clock\MockClock` which is an implementation of `Symfony\Component\Clock\ClockInterface`
+where we have full and easy control of the date.
 
 ### Testing Information
 
 The project uses PHPUnit for testing. Each bundle has its own test suite, and there's also a global test suite at the root level.
 
+#### Use of mock in tests
+
+##### General mocking
+
 For creating mock, we prefer using prophecy (library phpspec/prophecy).
 
+##### Useful helpers and tips that avoid creating a mock
+
+Some notable implementations that are test helpers and avoid creating a mock:
+
+- `\Psr\Log\NullLogger`, an implementation of `\Psr\Log\LoggerInterface`;
+- `\Symfony\Component\Clock\MockClock`, an implementation of `Symfony\Component\Clock\ClockInterface` (already mentioned above);
+- `\Symfony\Component\HttpClient\MockHttpClient`, an implementation of `\Symfony\Contracts\HttpClient\HttpClientInterface`;
+- When using `\Symfony\Component\Mailer\MailerInterface`, we can create the mock with "InMemoryTransport":
+
+    ```php
+    use Symfony\Component\Mailer\Transport\InMemoryTransport;
+    use \Symfony\Component\Mailer\Mailer;
+
+    $transport = new InMemoryTransport();
+    $mailer = new Mailer($transport);
+
+    // After sending:
+    $messages = $transport->getSent(); // array of SentMessage
+    ```
+- When using `\Symfony\Contracts\EventDispatcher\EventDispatcherInterface`, we can use directly an instance of `\Symfony\Component\EventDispatcher\EventDispatcher`;
+
+##### When we prefer not creating a mock
+
+- When we use Doctrine Entities related to the project, we prefer not to use a mock: we instantiate them directly (unless it requires too much code to write);
+
+##### Mocking final and readonly classes
+
+Classes marked as final can't be mocked. To avoid that, either:
+
+- we remove the `final` keyword from the class;
+- we extract an interface from the final class.
+
+This must be a decision made by a human, not by an AI. Every AI task must abort with an explicit message in that case.
+
 #### Running Tests
 
-```bash
-# Run all tests
-vendor/bin/phpunit
+The tests are run from the project's root (not from the bundle's root: so, do not change the directory to any bundle directory before running tests).
 
-# Run tests for a specific bundle
-vendor/bin/phpunit --testsuite NameBundle
+```bash
 
 # Run a specific test file
 vendor/bin/phpunit path/to/TestFile.php
@@ -207,6 +245,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:
@@ -254,7 +295,7 @@ class TicketTest extends TestCase
 
 #### Test Database
 
-For tests that require a database, the project uses postgresql database filled by fixtures (usage of doctrine-fixtures). You can configure a different database for testing in the `.env.test` file.
+For tests that require a database, the project uses a postgresql database filled with fixtures (usage of doctrine-fixtures). You can configure a different database for testing in the `.env.test` file.
 
 ### Code Quality Tools
 

CHANGELOG.md

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

assets/translator.ts

@@ -1,7 +1,12 @@
-import { trans, setLocale, setLocaleFallbacks } from "./ux-translator";
+import {
+  trans,
+  setLocale,
+  getLocale,
+  setLocaleFallbacks,
+} from "./ux-translator";
 
-setLocaleFallbacks({"en": "fr", "nl": "fr", "fr": "en"});
-setLocale('fr');
+setLocaleFallbacks({ en: "fr", nl: "fr", fr: "en" });
+setLocale("fr");
 
-export { trans };
-export * from '../var/translations';
+export { trans, getLocale };
+export * from "../var/translations";

compose.override.yaml

@@ -32,9 +32,3 @@ services:
         hostname: my-rabbit
         volumes:
             - ./docker/rabbitmq/data:/var/lib/rabbitmq
-
-    ###> symfony/mercure-bundle ###
-    mercure:
-        ports:
-            - "127.0.0.1:8043:443"
-###< symfony/mercure-bundle ###

compose.yaml

@@ -50,36 +50,7 @@ services:
             timeout: 30s
             retries: 3
 
-    ###> symfony/mercure-bundle ###
-    mercure:
-        image: dunglas/mercure
-        restart: unless-stopped
-        environment:
-            # Uncomment the following line to disable HTTPS,
-            #SERVER_NAME: ':80'
-            MERCURE_PUBLISHER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
-            MERCURE_SUBSCRIBER_JWT_KEY: '!ChangeThisMercureHubJWTSecretKey!'
-            # Set the URL of your Symfony project (without trailing slash!) as value of the cors_origins directive
-            MERCURE_EXTRA_DIRECTIVES: |
-                cors_origins http://chill-bundles.wip https://chill-bundles.wip
-        # Comment the following line to disable the development mode
-        command: /usr/bin/caddy run --config /etc/caddy/dev.Caddyfile
-        healthcheck:
-            test: [ "CMD", "curl", "-f", "https://localhost/healthz" ]
-            timeout: 5s
-            retries: 5
-            start_period: 60s
-        volumes:
-            - mercure_data:/data
-            - mercure_config:/config
-###< symfony/mercure-bundle ###
-
 volumes:
     ###> doctrine/doctrine-bundle ###
     database_data:
-    ###< doctrine/doctrine-bundle ###
-
-    ###> symfony/mercure-bundle ###
-    mercure_data:
-    mercure_config:
-###< symfony/mercure-bundle ###
+###< doctrine/doctrine-bundle ###

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",
@@ -55,7 +55,6 @@
         "symfony/http-foundation": "^5.4",
         "symfony/intl": "^5.4",
         "symfony/mailer": "^5.4",
-        "symfony/mercure-bundle": "^0.3.9",
         "symfony/messenger": "^5.4",
         "symfony/mime": "^5.4",
         "symfony/monolog-bundle": "^3.5",

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],
@@ -38,5 +37,5 @@ return [
     Chill\TicketBundle\ChillTicketBundle::class => ['all' => true],
     Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
     Symfony\UX\Translator\UxTranslatorBundle::class => ['all' => true],
-    Symfony\Bundle\MercureBundle\MercureBundle::class => ['all' => true],
+    loophp\PsrHttpMessageBridgeBundle\PsrHttpMessageBridgeBundle::class => ['all' => true],
 ];

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)%'

config/packages/chill_aside_activity.yaml

@@ -0,0 +1,2 @@
+chill_aside_activity:
+    show_concerned_persons_count: hidden

config/packages/chill_doc_store.yaml

@@ -1,5 +1,5 @@
 chill_doc_store:
-    use_driver: openstack
+    use_driver: local_storage
     local_storage:
         storage_path: '%kernel.project_dir%/var/storage'
     openstack:

config/packages/chill_ticket.yaml

@@ -1,4 +1,5 @@
 chill_ticket:
     ticket:
         person_per_ticket:    one # One of "one"; "many"
+        response_time_exceeded_delay: PT12H
 

config/packages/mercure.yaml

@@ -1,8 +0,0 @@
-mercure:
-    hubs:
-        default:
-            url: '%env(MERCURE_URL)%'
-            public_url: '%env(MERCURE_PUBLIC_URL)%'
-            jwt:
-                secret: '%env(MERCURE_JWT_SECRET)%'
-                publish: '*'

config/packages/messenger.yaml

@@ -62,8 +62,11 @@ framework:
             'Chill\MainBundle\Workflow\Messenger\PostSignatureStateChangeMessage': priority
             'Chill\MainBundle\Workflow\Messenger\PostPublicViewMessage': async
             'Chill\MainBundle\Service\Workflow\CancelStaleWorkflowMessage': async
+            'Chill\MainBundle\Notification\Email\NotificationEmailMessages\SendImmediateNotificationEmailMessage': async
             'Chill\MainBundle\Export\Messenger\ExportRequestGenerationMessage': priority
             'Chill\MainBundle\Export\Messenger\RemoveExportGenerationMessage': async
+            'Chill\MainBundle\Notification\Email\NotificationEmailMessages\ScheduleDailyNotificationDigestMessage': async
+            'Chill\TicketBundle\Messenger\PostTicketUpdateMessage': async
             # end of routes added by chill-bundles recipes
             # Route your messages to the transports
             # 'App\Message\YourMessage': async

config/routes/chill_assets_dev.yaml

@@ -17,8 +17,3 @@ when@dev:
         defaults:
             template: '@ChillMain/Dev/dev.assets.test2.html.twig'
 
-    dev_mercure:
-        path: /_dev/mercure
-        controller: Symfony\Bundle\FrameworkBundle\Controller\TemplateController
-        defaults:
-            template: '@ChillMain/Dev/dev.mercure.html.twig'

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
 }

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.

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

package.json

@@ -11,7 +11,6 @@
     "@hotwired/stimulus": "^3.0.0",
     "@luminateone/eslint-baseline": "^1.0.9",
     "@symfony/stimulus-bridge": "^3.2.0",
-    "@symfony/ux-translator": "file:vendor/symfony/ux-translator/assets",
     "@symfony/webpack-encore": "^4.1.0",
     "@tsconfig/node20": "^20.1.4",
     "@types/dompurify": "^3.0.5",
@@ -42,6 +41,7 @@
     "typescript": "^5.6.3",
     "typescript-eslint": "^8.13.0",
     "vue-loader": "^17.0.0",
+    "vue-tsc": "^3.1.3",
     "webpack": "^5.75.0",
     "webpack-cli": "^5.0.1"
   },
@@ -56,6 +56,7 @@
     "@tsconfig/node20": "^20.1.4",
     "@types/dompurify": "^3.0.5",
     "@types/leaflet": "^1.9.3",
+    "@vueuse/core": "^13.9.0",
     "bootstrap-icons": "^1.11.3",
     "dropzone": "^5.7.6",
     "es6-promise": "^4.2.8",

resources/dev.Caddyfile

@@ -1,20 +0,0 @@
-{
-	# Désactive les redirections automatiques HTTP -> HTTPS
-	# auto_https off
-	# Désactive le port 80 par défaut
-	# default_bind :8080
-}
-
-localhost:8043 {
-	 mercure {
-	 	# Publisher JWT key
-	 	publisher_jwt !ChangeThisMercureHubJWTSecretKey!
-	 	# Subscriber JWT key
-	 	subscriber_jwt !ChangeThisMercureHubJWTSecretKey!
-	 	cors_origins http://chill-bundles.wip https://chill-bundles.wip
-	 	ui
-	 	demo
-	 }
-
-	 respond "Not Found" 404
-}

resources/ticket_motives_import/README.md

@@ -0,0 +1,8 @@
+In this directory, you find an example of file for the command `chill:main:ticket_motives_import`.
+
+This file contains a list of ticket motives to import into the system. Each entry is a dictionary with two keys: `code` and `label`. The `code` key contains the unique code for the ticket motive, and the `label` key contains the human-readable label for the ticket motive.
+
+The `stored_objects` key contains the documents that will be associated with the tickets. They must be found in the same directory.
+
+The command `chill:main:ticket_motives_import` uses this file to import the specified ticket motives into the system.
+

resources/ticket_motives_import/motives.yaml

@@ -0,0 +1,136 @@
+- label:
+    fr: Appel famille pour annonce de décès
+  urgent: false
+  supplementary_informations:
+  - label:
+      fr: Date du décès
+  - label:
+      fr: lieu du décès (domicile ou hôpital)
+  - label:
+      fr: nom de l’hôpital
+  - label:
+      fr: service concerné
+  stored_objects:
+  - label:
+      fr: ☀️ De 07h à 21h
+    filename: 2_doc_20250402_Pelotons flux externes consolidés.pdf
+  - label:
+      fr: 🌙 De 21h à 07h du matin
+    filename: 3_doc_20250402_Pelotons flux externes consolidés.pdf
+  - label:
+      fr: 🗓️ Dimanches et jours fériés
+    filename: 4_doc_20250402_Pelotons flux externes consolidés.pdf
+- label:
+    fr: 'Appel famille pour annonce absence : hospitalisation ou consultation'
+  urgent: false
+  supplementary_informations:
+  - label:
+      fr: Quel hôpital
+  - label:
+      fr: quel service
+  - label:
+      fr: pour quelles raisons
+  - label:
+      fr: 'consultation : date et heure'
+  - label:
+      fr: hospitalisation complète ou HDJ
+  stored_objects:
+  - label:
+      fr: ☀️ De 07h à 21h
+    filename: 5_doc_20250402_Pelotons flux externes consolidés.pdf
+  - label:
+      fr: 🌙 De 21h à 07h du matin
+    filename: 6_doc_20250402_Pelotons flux externes consolidés.pdf
+  - label:
+      fr: 🗓️ Dimanches et jours fériés
+    filename: 7_doc_20250402_Pelotons flux externes consolidés.pdf
+- label:
+    fr: 'Appel famille pour annonce absence : interruption de prise en charge'
+  urgent: false
+  supplementary_informations:
+  - label:
+      fr: Pour quelles raisons ? Date
+  - label:
+      fr: durée
+  - label:
+      fr: accord médical ?
+  stored_objects:
+  - label:
+      fr: ☀️ De 07h à 21h
+    filename: 8_doc_20250402_Pelotons flux externes consolidés.pdf
+  - label:
+      fr: 🌙 De 21h à 07h du matin
+    filename: 9_doc_20250402_Pelotons flux externes consolidés.pdf
+  - label:
+      fr: 🗓️ Dimanches et jours fériés
+    filename: 10_doc_20250402_Pelotons flux externes consolidés.pdf
+- label:
+    fr: 'Appel famille pour annonce absence : changement d’adresse'
+  urgent: false
+  supplementary_informations:
+  - label:
+      fr: Où
+  - label:
+      fr: Pourquoi ? Pour combien de temps ? Besoin d’un relais des soins ? Nouvelle adresse ?
+  stored_objects:
+  - label:
+      fr: ☀️ De 07h à 21h
+    filename: 11_doc_20250402_Pelotons flux externes consolidés.pdf
+  - label:
+      fr: 🌙 De 21h à 07h du matin
+    filename: 12_doc_20250402_Pelotons flux externes consolidés.pdf
+  - label:
+      fr: 🗓️ Dimanches et jours fériés
+    filename: 13_doc_20250402_Pelotons flux externes consolidés.pdf
+- label:
+    fr: Appel famille pour altération de l’état général du patient
+  urgent: true
+  supplementary_informations:
+  - label:
+      fr: Recherche des symptômes
+  - label:
+      fr: Attentes par rapport à la demande
+  stored_objects:
+  - label:
+      fr: ☀️ De 07h à 21h
+    filename: 14_doc_20250402_Pelotons flux externes consolidés.pdf
+  - label:
+      fr: 🌙 De 21h à 07h du matin
+    filename: 15_doc_20250402_Pelotons flux externes consolidés.pdf
+  - label:
+      fr: 🗓️ Dimanches et jours fériés
+    filename: 16_doc_20250402_Pelotons flux externes consolidés.pdf
+- label:
+    fr: Appel famille pour prise en charge de la douleur
+  urgent: true
+  supplementary_informations:
+  - label:
+      fr: Localisation douleur
+  - label:
+      fr: Horaire dernier passage
+  - label:
+      fr: Traitements en cours
+  stored_objects:
+  - label:
+      fr: ☀️ De 07h à 21h
+    filename: 17_doc_20250402_Pelotons flux externes consolidés.pdf
+  - label:
+      fr: 🌙 De 21h à 07h du matin
+    filename: 18_doc_20250402_Pelotons flux externes consolidés.pdf
+  - label:
+      fr: 🗓️ Dimanches et jours fériés
+    filename: 19_doc_20250402_Pelotons flux externes consolidés.pdf
+- label:
+    fr: Appel famille pour information sur la date de prise en charge
+  urgent: false
+  supplementary_informations: []
+  stored_objects:
+  - label:
+      fr: ☀️ De 07h à 21h
+    filename: 20_doc_20250402_Pelotons flux externes consolidés.pdf
+  - label:
+      fr: 🌙 De 21h à 07h du matin
+    filename: 21_doc_20250402_Pelotons flux externes consolidés.pdf
+  - label:
+      fr: 🗓️ Dimanches et jours fériés
+    filename: 22_doc_20250402_Pelotons flux externes consolidés.pdf

resources/translation_override/README.md

@@ -0,0 +1,6 @@
+In this directory, you find an example of file for the command `chill:main:override_translation`.
+
+This file contains a list of translations to override in the translation catalogue. Each entry is a dictionary with two keys: `from` and `to`. The `from` key contains the original translation string, and the `to` key contains the replacement string.
+
+The command `chill:main:override_translation` uses this file to generate a new translation catalogue with the specified overrides applied.
+

resources/translation_override/overrides.yaml

@@ -0,0 +1,8 @@
+- {from: "de l'usager", to: "du patient"}
+- {from: "l'usager", to: "le patient"}
+- {from: "L'usager", to: "Le patient"}
+- {from: "d'usagers", to: "de patients"}
+- {from: "usagers", to: "patients"}
+- {from: "Usagers", to: "Patients"}
+- {from: "usager", to: "patient"}
+- {from: "Usager", to: "Patient"}

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',

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

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')

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

@@ -1,98 +1,103 @@
 <template>
-  <teleport to="#social-issues-acc">
-    <div class="mb-3 row">
-      <div class="col-4">
-        <label :class="socialIssuesClassList">{{
-          trans(ACTIVITY_SOCIAL_ISSUES)
-        }}</label>
-      </div>
-      <div class="col-8">
-        <check-social-issue
-          v-for="issue in socialIssuesList"
-          :key="issue.id"
-          :issue="issue"
-          :selection="socialIssuesSelected"
-          @updateSelected="updateIssuesSelected"
-        >
-        </check-social-issue>
+    <teleport to="#social-issues-acc">
+        <div class="mb-3 row">
+            <div class="col-4">
+                <label :class="socialIssuesClassList">{{
+                    trans(ACTIVITY_SOCIAL_ISSUES)
+                }}</label>
+            </div>
+            <div class="col-8">
+                <check-social-issue
+                    v-for="issue in socialIssuesList"
+                    :key="issue.id"
+                    :issue="issue"
+                    :selection="socialIssuesSelected"
+                    @updateSelected="updateIssuesSelected"
+                >
+                </check-social-issue>
 
-        <div class="my-3">
-          <VueMultiselect
-            name="otherIssues"
-            label="text"
-            track-by="id"
-            open-direction="bottom"
-            :close-on-select="true"
-            :preserve-search="false"
-            :reset-after="true"
-            :hide-selected="true"
-            :taggable="false"
-            :multiple="false"
-            :searchable="true"
-            :allow-empty="true"
-            :show-labels="false"
-            :loading="issueIsLoading"
-            :placeholder="trans(ACTIVITY_CHOOSE_OTHER_SOCIAL_ISSUE)"
-            :options="socialIssuesOther"
-            @select="addIssueInList"
-          >
-          </VueMultiselect>
-        </div>
-      </div>
-    </div>
-
-    <div class="mb-3 row">
-      <div class="col-4">
-        <label :class="socialActionsClassList">{{
-          trans(ACTIVITY_SOCIAL_ACTIONS)
-        }}</label>
-      </div>
-      <div class="col-8">
-        <div v-if="actionIsLoading === true">
-          <i class="chill-green fa fa-circle-o-notch fa-spin fa-lg"></i>
+                <div class="my-3">
+                    <VueMultiselect
+                        name="otherIssues"
+                        label="text"
+                        track-by="id"
+                        open-direction="bottom"
+                        :close-on-select="true"
+                        :preserve-search="false"
+                        :reset-after="true"
+                        :hide-selected="true"
+                        :taggable="false"
+                        :multiple="false"
+                        :searchable="true"
+                        :allow-empty="true"
+                        :show-labels="false"
+                        :loading="issueIsLoading"
+                        :placeholder="trans(ACTIVITY_CHOOSE_OTHER_SOCIAL_ISSUE)"
+                        :options="socialIssuesOther"
+                        @select="addIssueInList"
+                    >
+                    </VueMultiselect>
+                </div>
+            </div>
         </div>
 
-        <span
-          v-else-if="socialIssuesSelected.length === 0"
-          class="inline-choice chill-no-data-statement mt-3"
-        >
-          {{ trans(ACTIVITY_SELECT_FIRST_A_SOCIAL_ISSUE) }}
-        </span>
+        <div class="mb-3 row">
+            <div class="col-4">
+                <label :class="socialActionsClassList">{{
+                    trans(ACTIVITY_SOCIAL_ACTIONS)
+                }}</label>
+            </div>
+            <div class="col-8">
+                <div v-if="actionIsLoading === true">
+                    <i
+                        class="chill-green fa fa-circle-o-notch fa-spin fa-lg"
+                    ></i>
+                </div>
 
-        <template
-          v-else-if="
-            socialActionsList.length > 0 &&
-            (socialIssuesSelected.length || socialActionsSelected.length)
-          "
-        >
-          <div
-            id="actionsList"
-            v-for="group in socialActionsList"
-            :key="group.issue"
-          >
-            <span class="badge bg-chill-l-gray text-dark">{{
-              group.issue
-            }}</span>
-            <check-social-action
-              v-for="action in group.actions"
-              :key="action.id"
-              :action="action"
-              :selection="socialActionsSelected"
-              @updateSelected="updateActionsSelected"
-            >
-            </check-social-action>
-          </div>
-        </template>
+                <span
+                    v-else-if="socialIssuesSelected.length === 0"
+                    class="inline-choice chill-no-data-statement mt-3"
+                >
+                    {{ trans(ACTIVITY_SELECT_FIRST_A_SOCIAL_ISSUE) }}
+                </span>
 
-        <span
-          v-else-if="actionAreLoaded && socialActionsList.length === 0"
-          class="inline-choice chill-no-data-statement mt-3"
-        >
-          {{ trans(ACTIVITY_SOCIAL_ACTION_LIST_EMPTY) }}
-        </span>
-      </div>
-    </div>
-  </teleport>
+                <template
+                    v-else-if="
+                        socialActionsList.length > 0 &&
+                        (socialIssuesSelected.length ||
+                            socialActionsSelected.length)
+                    "
+                >
+                    <div
+                        id="actionsList"
+                        v-for="group in socialActionsList"
+                        :key="group.issue"
+                    >
+                        <span class="badge bg-chill-l-gray text-dark">{{
+                            group.issue
+                        }}</span>
+                        <check-social-action
+                            v-for="action in group.actions"
+                            :key="action.id"
+                            :action="action"
+                            :selection="socialActionsSelected"
+                            @updateSelected="updateActionsSelected"
+                        >
+                        </check-social-action>
+                    </div>
+                </template>
+
+                <span
+                    v-else-if="
+                        actionAreLoaded && socialActionsList.length === 0
+                    "
+                    class="inline-choice chill-no-data-statement mt-3"
+                >
+                    {{ trans(ACTIVITY_SOCIAL_ACTION_LIST_EMPTY) }}
+                </span>
+            </div>
+        </div>
+    </teleport>
 </template>
 
 <script>
@@ -101,153 +106,175 @@ import CheckSocialIssue from "./SocialIssuesAcc/CheckSocialIssue.vue";
 import CheckSocialAction from "./SocialIssuesAcc/CheckSocialAction.vue";
 import { getSocialIssues, getSocialActionByIssue } from "../api.js";
 import {
-  ACTIVITY_SOCIAL_ACTION_LIST_EMPTY,
-  ACTIVITY_SELECT_FIRST_A_SOCIAL_ISSUE,
-  ACTIVITY_SOCIAL_ACTIONS,
-  ACTIVITY_SOCIAL_ISSUES,
-  ACTIVITY_CHOOSE_OTHER_SOCIAL_ISSUE,
-  trans,
+    ACTIVITY_SOCIAL_ACTION_LIST_EMPTY,
+    ACTIVITY_SELECT_FIRST_A_SOCIAL_ISSUE,
+    ACTIVITY_SOCIAL_ACTIONS,
+    ACTIVITY_SOCIAL_ISSUES,
+    ACTIVITY_CHOOSE_OTHER_SOCIAL_ISSUE,
+    trans,
 } from "translator";
 
 export default {
-  name: "SocialIssuesAcc",
-  components: {
-    CheckSocialIssue,
-    CheckSocialAction,
-    VueMultiselect,
-  },
-  setup() {
-    return {
-      trans,
-      ACTIVITY_SOCIAL_ACTION_LIST_EMPTY,
-      ACTIVITY_SELECT_FIRST_A_SOCIAL_ISSUE,
-      ACTIVITY_SOCIAL_ACTIONS,
-      ACTIVITY_SOCIAL_ISSUES,
-      ACTIVITY_CHOOSE_OTHER_SOCIAL_ISSUE,
-    };
-  },
-  data() {
-    return {
-      issueIsLoading: false,
-      actionIsLoading: false,
-      actionAreLoaded: false,
-      socialIssuesClassList: `col-form-label ${document.querySelector("input#chill_activitybundle_activity_socialIssues").getAttribute("required") ? "required" : ""}`,
-      socialActionsClassList: `col-form-label ${document.querySelector("input#chill_activitybundle_activity_socialActions").getAttribute("required") ? "required" : ""}`,
-    };
-  },
-  computed: {
-    socialIssuesList() {
-      return this.$store.state.activity.accompanyingPeriod.socialIssues;
+    name: "SocialIssuesAcc",
+    components: {
+        CheckSocialIssue,
+        CheckSocialAction,
+        VueMultiselect,
     },
-    socialIssuesSelected() {
-      return this.$store.state.activity.socialIssues;
+    setup() {
+        return {
+            trans,
+            ACTIVITY_SOCIAL_ACTION_LIST_EMPTY,
+            ACTIVITY_SELECT_FIRST_A_SOCIAL_ISSUE,
+            ACTIVITY_SOCIAL_ACTIONS,
+            ACTIVITY_SOCIAL_ISSUES,
+            ACTIVITY_CHOOSE_OTHER_SOCIAL_ISSUE,
+        };
     },
-    socialIssuesOther() {
-      return this.$store.state.socialIssuesOther;
+    data() {
+        return {
+            issueIsLoading: false,
+            actionIsLoading: false,
+            actionAreLoaded: false,
+            socialIssuesClassList: {
+                "col-form-label": true,
+                required: false,
+            },
+            socialActionsClassList: {
+                "col-form-label": true,
+                required: false,
+            },
+        };
     },
-    socialActionsList() {
-      return this.$store.getters.socialActionsListSorted;
+    computed: {
+        socialIssuesList() {
+            return this.$store.state.activity.accompanyingPeriod.socialIssues;
+        },
+        socialIssuesSelected() {
+            return this.$store.state.activity.socialIssues;
+        },
+        socialIssuesOther() {
+            return this.$store.state.socialIssuesOther;
+        },
+        socialActionsList() {
+            return this.$store.getters.socialActionsListSorted;
+        },
+        socialActionsSelected() {
+            return this.$store.state.activity.socialActions;
+        },
     },
-    socialActionsSelected() {
-      return this.$store.state.activity.socialActions;
-    },
-  },
-  mounted() {
-    /* Load other issues in multiselect */
-    this.issueIsLoading = true;
-    this.actionAreLoaded = false;
-
-    getSocialIssues().then((response) => {
-      /* Add issues to the store */
-      this.$store.commit("updateIssuesOther", response);
-
-      /* Add in list the issues already associated (if not yet listed) */
-      this.socialIssuesSelected.forEach((issue) => {
-        if (
-          this.socialIssuesList.filter((i) => i.id === issue.id).length !== 1
-        ) {
-          this.$store.commit("addIssueInList", issue);
+    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;
         }
-      });
 
-      /* Remove from multiselect the issues that are not yet in the checkbox list */
-      this.socialIssuesList.forEach((issue) => {
-        this.$store.commit("removeIssueInOther", issue);
-      });
+        const socialIssuesEl = document.querySelector(
+            "input#chill_activitybundle_activity_socialIssues",
+        );
+        if (socialIssuesEl && socialIssuesEl.hasAttribute("required")) {
+            this.socialIssuesClassList.required = true;
+        }
 
-      /* Filter issues */
-      this.$store.commit("filterList", "issues");
+        /* Load other issues in multiselect */
+        this.issueIsLoading = true;
+        this.actionAreLoaded = false;
 
-      /* Add in list the actions already associated (if not yet listed) */
-      this.socialActionsSelected.forEach((action) => {
-        this.$store.commit("addActionInList", action);
-      });
+        getSocialIssues().then((response) => {
+            /* Add issues to the store */
+            this.$store.commit("updateIssuesOther", response);
 
-      /* Filter actions */
-      this.$store.commit("filterList", "actions");
+            /* Add in list the issues already associated (if not yet listed) */
+            this.socialIssuesSelected.forEach((issue) => {
+                if (
+                    this.socialIssuesList.filter((i) => i.id === issue.id)
+                        .length !== 1
+                ) {
+                    this.$store.commit("addIssueInList", issue);
+                }
+            });
 
-      this.issueIsLoading = false;
-      this.actionAreLoaded = true;
-      this.updateActionsList();
-    });
-  },
-  methods: {
-    /* When choosing an issue in multiselect, add it in checkboxes (as selected),
+            /* Remove from multiselect the issues that are not yet in the checkbox list */
+            this.socialIssuesList.forEach((issue) => {
+                this.$store.commit("removeIssueInOther", issue);
+            });
+
+            /* Filter issues */
+            this.$store.commit("filterList", "issues");
+
+            /* Add in list the actions already associated (if not yet listed) */
+            this.socialActionsSelected.forEach((action) => {
+                this.$store.commit("addActionInList", action);
+            });
+
+            /* Filter actions */
+            this.$store.commit("filterList", "actions");
+
+            this.issueIsLoading = false;
+            this.actionAreLoaded = true;
+            this.updateActionsList();
+        });
+    },
+    methods: {
+        /* When choosing an issue in multiselect, add it in checkboxes (as selected),
          remove it from multiselect, and add socialActions concerned
       */
-    addIssueInList(value) {
-      //console.log('addIssueInList', value);
-      this.$store.commit("addIssueInList", value);
-      this.$store.commit("removeIssueInOther", value);
-      this.$store.dispatch("addIssueSelected", value);
-      this.updateActionsList();
-    },
-    /* Update value for selected issues checkboxes
-     */
-    updateIssuesSelected(issues) {
-      //console.log('updateIssuesSelected', issues);
-      this.$store.dispatch("updateIssuesSelected", issues);
-      this.updateActionsList();
-    },
-    /* Update value for selected actions checkboxes
-     */
-    updateActionsSelected(actions) {
-      //console.log('updateActionsSelected', actions);
-      this.$store.dispatch("updateActionsSelected", actions);
-    },
-    /* Add socialActions concerned: after reset, loop on each issue selected
+        addIssueInList(value) {
+            //console.log('addIssueInList', value);
+            this.$store.commit("addIssueInList", value);
+            this.$store.commit("removeIssueInOther", value);
+            this.$store.dispatch("addIssueSelected", value);
+            this.updateActionsList();
+        },
+        /* Update value for selected issues checkboxes
+         */
+        updateIssuesSelected(issues) {
+            //console.log('updateIssuesSelected', issues);
+            this.$store.dispatch("updateIssuesSelected", issues);
+            this.updateActionsList();
+        },
+        /* Update value for selected actions checkboxes
+         */
+        updateActionsSelected(actions) {
+            //console.log('updateActionsSelected', actions);
+            this.$store.dispatch("updateActionsSelected", actions);
+        },
+        /* Add socialActions concerned: after reset, loop on each issue selected
          to get social actions concerned
       */
-    updateActionsList() {
-      this.resetActionsList();
-      this.socialIssuesSelected.forEach((item) => {
-        this.actionIsLoading = true;
-        getSocialActionByIssue(item.id).then(
-          (actions) =>
-            new Promise((resolve) => {
-              actions.results.forEach((action) => {
-                this.$store.commit("addActionInList", action);
-              }, this);
+        updateActionsList() {
+            this.resetActionsList();
+            this.socialIssuesSelected.forEach((item) => {
+                this.actionIsLoading = true;
+                getSocialActionByIssue(item.id).then(
+                    (actions) =>
+                        new Promise((resolve) => {
+                            actions.results.forEach((action) => {
+                                this.$store.commit("addActionInList", action);
+                            }, this);
 
-              this.$store.commit("filterList", "actions");
+                            this.$store.commit("filterList", "actions");
 
-              this.actionIsLoading = false;
-              this.actionAreLoaded = true;
-              resolve();
-            }),
-        );
-      }, this);
+                            this.actionIsLoading = false;
+                            this.actionAreLoaded = true;
+                            resolve();
+                        }),
+                );
+            }, this);
+        },
+        /* Reset socialActions List: flush list and restore selected actions
+         */
+        resetActionsList() {
+            this.$store.commit("resetActionsList");
+            this.actionAreLoaded = false;
+            this.socialActionsSelected.forEach((item) => {
+                this.$store.commit("addActionInList", item);
+            }, this);
+        },
     },
-    /* Reset socialActions List: flush list and restore selected actions
-     */
-    resetActionsList() {
-      this.$store.commit("resetActionsList");
-      this.actionAreLoaded = false;
-      this.socialActionsSelected.forEach((item) => {
-        this.$store.commit("addActionInList", item);
-      }, this);
-    },
-  },
 };
 </script>
 
@@ -257,18 +284,18 @@ export default {
 @import "ChillMainAssets/chill/scss/chill_variables";
 
 span.multiselect__single {
-  display: none !important;
+    display: none !important;
 }
 
 #actionsList {
-  border-radius: 0.5rem;
-  padding: 1rem;
-  margin: 0.5rem;
-  background-color: whitesmoke;
+    border-radius: 0.5rem;
+    padding: 1rem;
+    margin: 0.5rem;
+    background-color: whitesmoke;
 }
 
 span.badge {
-  margin-bottom: 0.5rem;
-  @include badge_social($social-issue-color);
+    margin-bottom: 0.5rem;
+    @include badge_social($social-issue-color);
 }
 </style>

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:

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)

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;

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;
+    }
 }

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';
+    }
+}

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,
+        ];
+    }
+}

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);

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">

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>
@@ -55,5 +60,6 @@
 			</dl>
 
 		{% endblock %}
+        {% block content_view_actions_duplicate_link %}{% endblock %}
 	{% endembed %}
 {% endblock %}

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

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'],
+        ];
+    }
+}

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' }

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');
+    }
+}

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

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';

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),
+        ]);
+    }
+}

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) {

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()) {

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;

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)

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,
+
+        ]);
+    }
+}

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,

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()
                 )
             );
         }

src/Bundle/ChillCalendarBundle/Messenger/Message/CalendarRemovedMessage.php

@@ -70,6 +70,8 @@ class CalendarRemovedMessage
 
     public function getRemoteId(): string
     {
+        dump($this->remoteId);
+
         return $this->remoteId;
     }
 }

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([

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);
     }

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']

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/App.vue

@@ -1,146 +1,166 @@
 <template>
-  <teleport to="#mainUser">
-    <h2 class="chill-red">Utilisateur principal</h2>
-    <div>
-      <div>
-        <div v-if="null !== this.$store.getters.getMainUser">
-          <calendar-active :user="this.$store.getters.getMainUser" />
+    <teleport to="#mainUser">
+        <h2 class="chill-red">Utilisateur principal</h2>
+        <div>
+            <div>
+                <div v-if="null !== this.$store.getters.getMainUser">
+                    <calendar-active :user="this.$store.getters.getMainUser" />
+                </div>
+                <pick-entity
+                    :multiple="false"
+                    :types="['user']"
+                    :uniqid="'main_user_calendar'"
+                    :picked="
+                        null !== this.$store.getters.getMainUser
+                            ? [this.$store.getters.getMainUser]
+                            : []
+                    "
+                    :removable-if-set="false"
+                    :display-picked="false"
+                    :suggested="this.suggestedUsers"
+                    :label="'main_user'"
+                    @add-new-entity="setMainUser"
+                />
+            </div>
         </div>
-        <pick-entity
-          :multiple="false"
-          :types="['user']"
-          :uniqid="'main_user_calendar'"
-          :picked="
-            null !== this.$store.getters.getMainUser
-              ? [this.$store.getters.getMainUser]
-              : []
-          "
-          :removable-if-set="false"
-          :display-picked="false"
-          :suggested="this.suggestedUsers"
-          :label="'main_user'"
-          @add-new-entity="setMainUser"
-        />
-      </div>
-    </div>
-  </teleport>
+    </teleport>
 
-  <concerned-groups />
+    <concerned-groups />
 
-  <teleport to="#schedule">
-    <div class="row mb-3" v-if="activity.startDate !== null">
-      <label class="col-form-label col-sm-4">Date</label>
-      <div class="col-sm-8">
-        {{ $d(activity.startDate, "long") }} -
-        {{ $d(activity.endDate, "hoursOnly") }}
-        <span v-if="activity.calendarRange === null"
-          >(Pas de plage de disponibilité sélectionnée)</span
+    <teleport to="#schedule">
+        <div class="row mb-3" v-if="activity.startDate !== null">
+            <label class="col-form-label col-sm-4">Date</label>
+            <div class="col-sm-8">
+                {{ $d(activity.startDate, "long") }} -
+                {{ $d(activity.endDate, "hoursOnly") }}
+                <span v-if="activity.calendarRange === null"
+                    >(Pas de plage de disponibilité sélectionnée)</span
+                >
+                <span v-else>(Une plage de disponibilité sélectionnée)</span>
+            </div>
+        </div>
+    </teleport>
+
+    <location />
+
+    <teleport to="#fullCalendar">
+        <div class="calendar-actives">
+            <template v-for="u in getActiveUsers" :key="u.id">
+                <calendar-active
+                    :user="u"
+                    :invite="this.$store.getters.getInviteForUser(u)"
+                />
+            </template>
+        </div>
+        <div
+            class="display-options row justify-content-between"
+            style="margin-top: 1rem"
         >
-        <span v-else>(Une plage de disponibilité sélectionnée)</span>
-      </div>
-    </div>
-  </teleport>
-
-  <location />
-
-  <teleport to="#fullCalendar">
-    <div class="calendar-actives">
-      <template v-for="u in getActiveUsers" :key="u.id">
-        <calendar-active
-          :user="u"
-          :invite="this.$store.getters.getInviteForUser(u)"
-        />
-      </template>
-    </div>
-    <div
-      class="display-options row justify-content-between"
-      style="margin-top: 1rem"
-    >
-      <div class="col-sm-9 col-xs-12">
-        <div class="input-group mb-3">
-          <label class="input-group-text" for="slotDuration"
-            >Durée des créneaux</label
-          >
-          <select v-model="slotDuration" id="slotDuration" class="form-select">
-            <option value="00:05:00">5 minutes</option>
-            <option value="00:10:00">10 minutes</option>
-            <option value="00:15:00">15 minutes</option>
-            <option value="00:30:00">30 minutes</option>
-          </select>
-          <label class="input-group-text" for="slotMinTime">De</label>
-          <select v-model="slotMinTime" id="slotMinTime" class="form-select">
-            <option value="00:00:00">0h</option>
-            <option value="01:00:00">1h</option>
-            <option value="02:00:00">2h</option>
-            <option value="03:00:00">3h</option>
-            <option value="04:00:00">4h</option>
-            <option value="05:00:00">5h</option>
-            <option value="06:00:00">6h</option>
-            <option value="07:00:00">7h</option>
-            <option value="08:00:00">8h</option>
-            <option value="09:00:00">9h</option>
-            <option value="10:00:00">10h</option>
-            <option value="11:00:00">11h</option>
-            <option value="12:00:00">12h</option>
-          </select>
-          <label class="input-group-text" for="slotMaxTime">À</label>
-          <select v-model="slotMaxTime" id="slotMaxTime" class="form-select">
-            <option value="12:00:00">12h</option>
-            <option value="13:00:00">13h</option>
-            <option value="14:00:00">14h</option>
-            <option value="15:00:00">15h</option>
-            <option value="16:00:00">16h</option>
-            <option value="17:00:00">17h</option>
-            <option value="18:00:00">18h</option>
-            <option value="19:00:00">19h</option>
-            <option value="20:00:00">20h</option>
-            <option value="21:00:00">21h</option>
-            <option value="22:00:00">22h</option>
-            <option value="23:00:00">23h</option>
-            <option value="23:59:59">24h</option>
-          </select>
+            <div class="col-sm-9 col-xs-12">
+                <div class="input-group mb-3">
+                    <label class="input-group-text" for="slotDuration"
+                        >Durée des créneaux</label
+                    >
+                    <select
+                        v-model="slotDuration"
+                        id="slotDuration"
+                        class="form-select"
+                    >
+                        <option value="00:05:00">5 minutes</option>
+                        <option value="00:10:00">10 minutes</option>
+                        <option value="00:15:00">15 minutes</option>
+                        <option value="00:30:00">30 minutes</option>
+                        <option value="00:45:00">45 minutes</option>
+                        <option value="00:60:00">60 minutes</option>
+                    </select>
+                    <label class="input-group-text" for="slotMinTime">De</label>
+                    <select
+                        v-model="slotMinTime"
+                        id="slotMinTime"
+                        class="form-select"
+                    >
+                        <option value="00:00:00">0h</option>
+                        <option value="01:00:00">1h</option>
+                        <option value="02:00:00">2h</option>
+                        <option value="03:00:00">3h</option>
+                        <option value="04:00:00">4h</option>
+                        <option value="05:00:00">5h</option>
+                        <option value="06:00:00">6h</option>
+                        <option value="07:00:00">7h</option>
+                        <option value="08:00:00">8h</option>
+                        <option value="09:00:00">9h</option>
+                        <option value="10:00:00">10h</option>
+                        <option value="11:00:00">11h</option>
+                        <option value="12:00:00">12h</option>
+                    </select>
+                    <label class="input-group-text" for="slotMaxTime">À</label>
+                    <select
+                        v-model="slotMaxTime"
+                        id="slotMaxTime"
+                        class="form-select"
+                    >
+                        <option value="12:00:00">12h</option>
+                        <option value="13:00:00">13h</option>
+                        <option value="14:00:00">14h</option>
+                        <option value="15:00:00">15h</option>
+                        <option value="16:00:00">16h</option>
+                        <option value="17:00:00">17h</option>
+                        <option value="18:00:00">18h</option>
+                        <option value="19:00:00">19h</option>
+                        <option value="20:00:00">20h</option>
+                        <option value="21:00:00">21h</option>
+                        <option value="22:00:00">22h</option>
+                        <option value="23:00:00">23h</option>
+                        <option value="23:59:59">24h</option>
+                    </select>
+                </div>
+            </div>
+            <div class="col-sm-3 col-xs-12">
+                <div class="float-end">
+                    <div class="form-check input-group">
+                        <span class="input-group-text">
+                            <input
+                                id="showHideWE"
+                                class="mt-0"
+                                type="checkbox"
+                                v-model="hideWeekends"
+                            />
+                        </span>
+                        <label
+                            for="showHideWE"
+                            class="form-check-label input-group-text"
+                            >Week-ends</label
+                        >
+                    </div>
+                </div>
+            </div>
         </div>
-      </div>
-      <div class="col-sm-3 col-xs-12">
-        <div class="float-end">
-          <div class="form-check input-group">
-            <span class="input-group-text">
-              <input
-                id="showHideWE"
-                class="mt-0"
-                type="checkbox"
-                v-model="hideWeekends"
-              />
-            </span>
-            <label for="showHideWE" class="form-check-label input-group-text"
-              >Week-ends</label
-            >
-          </div>
-        </div>
-      </div>
-    </div>
-    <FullCalendar ref="fullCalendar" :options="calendarOptions">
-      <template #eventContent="arg">
-        <span>
-          <b v-if="arg.event.extendedProps.is === 'remote'">{{
-            arg.event.title
-          }}</b>
-          <b v-else-if="arg.event.extendedProps.is === 'range'"
-            >{{ arg.timeText }}
-            {{ arg.event.extendedProps.locationName }}
-            <small>{{ arg.event.extendedProps.userLabel }}</small></b
-          >
-          <b v-else-if="arg.event.extendedProps.is === 'current'"
-            >{{ arg.timeText }} {{ $t("current_selected") }}
-          </b>
-          <b v-else-if="arg.event.extendedProps.is === 'local'">{{
-            arg.event.title
-          }}</b>
-          <b v-else>{{ arg.timeText }} {{ $t("current_selected") }} </b>
-        </span>
-      </template>
-    </FullCalendar>
-  </teleport>
+        <FullCalendar ref="fullCalendar" :options="calendarOptions">
+            <template #eventContent="arg">
+                <span>
+                    <b v-if="arg.event.extendedProps.is === 'remote'">{{
+                        arg.event.title
+                    }}</b>
+                    <b v-else-if="arg.event.extendedProps.is === 'range'"
+                        >{{ arg.timeText }}
+                        {{ arg.event.extendedProps.locationName }}
+                        <small>{{
+                            arg.event.extendedProps.userLabel
+                        }}</small></b
+                    >
+                    <b v-else-if="arg.event.extendedProps.is === 'current'"
+                        >{{ arg.timeText }} {{ $t("current_selected") }}
+                    </b>
+                    <b v-else-if="arg.event.extendedProps.is === 'local'">{{
+                        arg.event.title
+                    }}</b>
+                    <b v-else
+                        >{{ arg.timeText }} {{ $t("current_selected") }}
+                    </b>
+                </span>
+            </template>
+        </FullCalendar>
+    </teleport>
 </template>
 
 <script>
@@ -157,210 +177,219 @@ import PickEntity from "ChillMainAssets/vuejs/PickEntity/PickEntity.vue";
 import { mapGetters, mapState } from "vuex";
 
 export default {
-  name: "App",
-  components: {
-    ConcernedGroups,
-    Location,
-    FullCalendar,
-    CalendarActive,
-    PickEntity,
-  },
-  data() {
-    return {
-      errorMsg: [],
-      showMyCalendar: false,
-      slotDuration: "00:05:00",
-      slotMinTime: "09:00:00",
-      slotMaxTime: "18:00:00",
-      hideWeekEnds: true,
-      previousUser: [],
-    };
-  },
-  computed: {
-    ...mapGetters(["getMainUser"]),
-    ...mapState(["activity"]),
-    events() {
-      return this.$store.getters.getEventSources;
+    name: "App",
+    components: {
+        ConcernedGroups,
+        Location,
+        FullCalendar,
+        CalendarActive,
+        PickEntity,
     },
-    calendarOptions() {
-      return {
-        locale: frLocale,
-        plugins: [
-          dayGridPlugin,
-          interactionPlugin,
-          timeGridPlugin,
-          dayGridPlugin,
-          listPlugin,
-        ],
-        initialView: "timeGridWeek",
-        initialDate: this.$store.getters.getInitialDate,
-        eventSources: this.events,
-        selectable: true,
-        slotMinTime: this.slotMinTime,
-        slotMaxTime: this.slotMaxTime,
-        scrollTimeReset: false,
-        datesSet: this.onDatesSet,
-        select: this.onDateSelect,
-        eventChange: this.onEventChange,
-        eventClick: this.onEventClick,
-        selectMirror: true,
-        editable: true,
-        weekends: !this.hideWeekEnds,
-        headerToolbar: {
-          left: "prev,next today",
-          center: "title",
-          right: "timeGridWeek,timeGridDay,listWeek",
+    data() {
+        return {
+            errorMsg: [],
+            showMyCalendar: false,
+            slotDuration: "00:05:00",
+            slotMinTime: "09:00:00",
+            slotMaxTime: "18:00:00",
+            hideWeekEnds: true,
+            previousUser: [],
+        };
+    },
+    computed: {
+        ...mapGetters(["getMainUser"]),
+        ...mapState(["activity"]),
+        events() {
+            return this.$store.getters.getEventSources;
         },
-        views: {
-          timeGrid: {
-            slotEventOverlap: false,
-            slotDuration: this.slotDuration,
-          },
+        calendarOptions() {
+            return {
+                locale: frLocale,
+                plugins: [
+                    dayGridPlugin,
+                    interactionPlugin,
+                    timeGridPlugin,
+                    dayGridPlugin,
+                    listPlugin,
+                ],
+                initialView: "timeGridWeek",
+                initialDate: this.$store.getters.getInitialDate,
+                eventSources: this.events,
+                selectable: true,
+                slotMinTime: this.slotMinTime,
+                slotMaxTime: this.slotMaxTime,
+                scrollTimeReset: false,
+                datesSet: this.onDatesSet,
+                select: this.onDateSelect,
+                eventChange: this.onEventChange,
+                eventClick: this.onEventClick,
+                selectMirror: true,
+                editable: true,
+                weekends: !this.hideWeekEnds,
+                headerToolbar: {
+                    left: "prev,next today",
+                    center: "title",
+                    right: "timeGridWeek,timeGridDay,listWeek",
+                },
+                views: {
+                    timeGrid: {
+                        slotEventOverlap: false,
+                        slotDuration: this.slotDuration,
+                    },
+                },
+            };
+        },
+        getActiveUsers() {
+            const users = [];
+            for (const id of this.$store.state.currentView.users.keys()) {
+                users.push(this.$store.getters.getUserDataById(id).user);
+            }
+            return users;
+        },
+        suggestedUsers() {
+            const suggested = [];
+
+            this.$data.previousUser.forEach((u) => {
+                if (u.id !== this.$store.getters.getMainUser.id) {
+                    suggested.push(u);
+                }
+            });
+
+            return suggested;
         },
-      };
     },
-    getActiveUsers() {
-      const users = [];
-      for (const id of this.$store.state.currentView.users.keys()) {
-        users.push(this.$store.getters.getUserDataById(id).user);
-      }
-      return users;
+    methods: {
+        setMainUser({ entity }) {
+            const user = entity;
+            console.log("setMainUser APP", entity);
+
+            if (
+                user.id !== this.$store.getters.getMainUser &&
+                (this.$store.state.activity.calendarRange !== null ||
+                    this.$store.state.activity.startDate !== null ||
+                    this.$store.state.activity.endDate !== null)
+            ) {
+                if (
+                    !window.confirm(
+                        this.$t("change_main_user_will_reset_event_data"),
+                    )
+                ) {
+                    return;
+                }
+            }
+
+            // add the previous user, if any, in the previous user list (in use for suggestion)
+            if (null !== this.$store.getters.getMainUser) {
+                const suggestedUids = new Set(
+                    this.$data.previousUser.map((u) => u.id),
+                );
+                if (!suggestedUids.has(this.$store.getters.getMainUser.id)) {
+                    this.$data.previousUser.push(
+                        this.$store.getters.getMainUser,
+                    );
+                }
+            }
+
+            this.$store.dispatch("setMainUser", user);
+            this.$store.commit("showUserOnCalendar", {
+                user,
+                ranges: true,
+                remotes: true,
+            });
+        },
+        removeMainUser(user) {
+            console.log("removeMainUser APP", user);
+
+            window.alert(this.$t("main_user_is_mandatory"));
+            return;
+        },
+        onDatesSet(event) {
+            console.log("onDatesSet", event);
+            this.$store.dispatch("setCurrentDatesView", {
+                start: event.start,
+                end: event.end,
+            });
+        },
+        onDateSelect(payload) {
+            console.log("onDateSelect", payload);
+
+            // show an alert if changing mainUser
+            if (
+                (this.$store.getters.getMainUser !== null &&
+                    this.$store.state.me.id !==
+                        this.$store.getters.getMainUser.id) ||
+                this.$store.getters.getMainUser === null
+            ) {
+                if (!window.confirm(this.$t("will_change_main_user_for_me"))) {
+                    return;
+                } else {
+                    this.$store.commit("showUserOnCalendar", {
+                        user: this.$store.state.me,
+                        remotes: true,
+                        ranges: true,
+                    });
+                }
+            }
+
+            this.$store.dispatch("setEventTimes", {
+                start: payload.start,
+                end: payload.end,
+            });
+        },
+        onEventChange(payload) {
+            console.log("onEventChange", payload);
+            if (this.$store.state.activity.calendarRange !== null) {
+                throw new Error(
+                    "not allowed to edit a calendar associated with a calendar range",
+                );
+            }
+            this.$store.dispatch("setEventTimes", {
+                start: payload.event.start,
+                end: payload.event.end,
+            });
+        },
+        onEventClick(payload) {
+            if (payload.event.extendedProps.is !== "range") {
+                // do nothing when clicking on remote
+                return;
+            }
+
+            // show an alert if changing mainUser
+            if (
+                this.$store.getters.getMainUser !== null &&
+                payload.event.extendedProps.userId !==
+                    this.$store.getters.getMainUser.id
+            ) {
+                if (
+                    !window.confirm(
+                        this.$t("this_calendar_range_will_change_main_user"),
+                    )
+                ) {
+                    return;
+                }
+            }
+
+            this.$store.dispatch("associateCalendarToRange", {
+                range: payload.event,
+            });
+        },
     },
-    suggestedUsers() {
-      const suggested = [];
-
-      this.$data.previousUser.forEach((u) => {
-        if (u.id !== this.$store.getters.getMainUser.id) {
-          suggested.push(u);
-        }
-      });
-
-      return suggested;
-    },
-  },
-  methods: {
-    setMainUser({ entity }) {
-      const user = entity;
-      console.log("setMainUser APP", entity);
-
-      if (
-        user.id !== this.$store.getters.getMainUser &&
-        (this.$store.state.activity.calendarRange !== null ||
-          this.$store.state.activity.startDate !== null ||
-          this.$store.state.activity.endDate !== null)
-      ) {
-        if (
-          !window.confirm(this.$t("change_main_user_will_reset_event_data"))
-        ) {
-          return;
-        }
-      }
-
-      // add the previous user, if any, in the previous user list (in use for suggestion)
-      if (null !== this.$store.getters.getMainUser) {
-        const suggestedUids = new Set(this.$data.previousUser.map((u) => u.id));
-        if (!suggestedUids.has(this.$store.getters.getMainUser.id)) {
-          this.$data.previousUser.push(this.$store.getters.getMainUser);
-        }
-      }
-
-      this.$store.dispatch("setMainUser", user);
-      this.$store.commit("showUserOnCalendar", {
-        user,
-        ranges: true,
-        remotes: true,
-      });
-    },
-    removeMainUser(user) {
-      console.log("removeMainUser APP", user);
-
-      window.alert(this.$t("main_user_is_mandatory"));
-      return;
-    },
-    onDatesSet(event) {
-      console.log("onDatesSet", event);
-      this.$store.dispatch("setCurrentDatesView", {
-        start: event.start,
-        end: event.end,
-      });
-    },
-    onDateSelect(payload) {
-      console.log("onDateSelect", payload);
-
-      // show an alert if changing mainUser
-      if (
-        (this.$store.getters.getMainUser !== null &&
-          this.$store.state.me.id !== this.$store.getters.getMainUser.id) ||
-        this.$store.getters.getMainUser === null
-      ) {
-        if (!window.confirm(this.$t("will_change_main_user_for_me"))) {
-          return;
-        } else {
-          this.$store.commit("showUserOnCalendar", {
-            user: this.$store.state.me,
-            remotes: true,
-            ranges: true,
-          });
-        }
-      }
-
-      this.$store.dispatch("setEventTimes", {
-        start: payload.start,
-        end: payload.end,
-      });
-    },
-    onEventChange(payload) {
-      console.log("onEventChange", payload);
-      if (this.$store.state.activity.calendarRange !== null) {
-        throw new Error(
-          "not allowed to edit a calendar associated with a calendar range",
-        );
-      }
-      this.$store.dispatch("setEventTimes", {
-        start: payload.event.start,
-        end: payload.event.end,
-      });
-    },
-    onEventClick(payload) {
-      if (payload.event.extendedProps.is !== "range") {
-        // do nothing when clicking on remote
-        return;
-      }
-
-      // show an alert if changing mainUser
-      if (
-        this.$store.getters.getMainUser !== null &&
-        payload.event.extendedProps.userId !==
-          this.$store.getters.getMainUser.id
-      ) {
-        if (
-          !window.confirm(this.$t("this_calendar_range_will_change_main_user"))
-        ) {
-          return;
-        }
-      }
-
-      this.$store.dispatch("associateCalendarToRange", {
-        range: payload.event,
-      });
-    },
-  },
 };
 </script>
 
 <style>
 .calendar-actives {
-  display: flex;
-  flex-direction: row;
-  flex-wrap: wrap;
+    display: flex;
+    flex-direction: row;
+    flex-wrap: wrap;
 }
 
 .display-options {
-  margin-top: 1rem;
+    margin-top: 1rem;
 }
 
 /* for events which are range */
 .fc-event.isrange {
-  border-width: 3px;
+    border-width: 3px;
 }
 </style>

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App2.vue

@@ -1,177 +1,228 @@
 <template>
-  <div class="row">
-    <div class="col-sm">
-      <label class="form-label">{{ $t("created_availabilities") }}</label>
-      <vue-multiselect
-        v-model="pickedLocation"
-        :options="locations"
-        :label="'name'"
-        :track-by="'id'"
-        :selectLabel="'Presser \'Entrée\' pour choisir'"
-        :selectedLabel="'Choisir'"
-        :deselectLabel="'Presser \'Entrée\' pour enlever'"
-        :placeholder="'Choisir'"
-      ></vue-multiselect>
-    </div>
-  </div>
-  <div
-    class="display-options row justify-content-between"
-    style="margin-top: 1rem"
-  >
-    <div class="col-sm-9 col-xs-12">
-      <div class="input-group mb-3">
-        <label class="input-group-text" for="slotDuration"
-          >Durée des créneaux</label
-        >
-        <select v-model="slotDuration" id="slotDuration" class="form-select">
-          <option value="00:05:00">5 minutes</option>
-          <option value="00:10:00">10 minutes</option>
-          <option value="00:15:00">15 minutes</option>
-          <option value="00:30:00">30 minutes</option>
-        </select>
-        <label class="input-group-text" for="slotMinTime">De</label>
-        <select v-model="slotMinTime" id="slotMinTime" class="form-select">
-          <option value="00:00:00">0h</option>
-          <option value="01:00:00">1h</option>
-          <option value="02:00:00">2h</option>
-          <option value="03:00:00">3h</option>
-          <option value="04:00:00">4h</option>
-          <option value="05:00:00">5h</option>
-          <option value="06:00:00">6h</option>
-          <option value="07:00:00">7h</option>
-          <option value="08:00:00">8h</option>
-          <option value="09:00:00">9h</option>
-          <option value="10:00:00">10h</option>
-          <option value="11:00:00">11h</option>
-          <option value="12:00:00">12h</option>
-        </select>
-        <label class="input-group-text" for="slotMaxTime">À</label>
-        <select v-model="slotMaxTime" id="slotMaxTime" class="form-select">
-          <option value="12:00:00">12h</option>
-          <option value="13:00:00">13h</option>
-          <option value="14:00:00">14h</option>
-          <option value="15:00:00">15h</option>
-          <option value="16:00:00">16h</option>
-          <option value="17:00:00">17h</option>
-          <option value="18:00:00">18h</option>
-          <option value="19:00:00">19h</option>
-          <option value="20:00:00">20h</option>
-          <option value="21:00:00">21h</option>
-          <option value="22:00:00">22h</option>
-          <option value="23:00:00">23h</option>
-          <option value="23:59:59">24h</option>
-        </select>
-      </div>
-    </div>
-    <div class="col-xs-12 col-sm-3">
-      <div class="float-end">
-        <div class="form-check input-group">
-          <span class="input-group-text">
-            <input
-              id="showHideWE"
-              class="mt-0"
-              type="checkbox"
-              v-model="showWeekends"
-            />
-          </span>
-          <label for="showHideWE" class="form-check-label input-group-text"
-            >Week-ends</label
-          >
+    <div class="row">
+        <div class="col-sm">
+            <label class="form-label">{{ $t("created_availabilities") }}</label>
+            <vue-multiselect
+                v-model="pickedLocation"
+                :options="locations"
+                :label="'name'"
+                :track-by="'id'"
+                :selectLabel="'Presser \'Entrée\' pour choisir'"
+                :selectedLabel="'Choisir'"
+                :deselectLabel="'Presser \'Entrée\' pour enlever'"
+                :placeholder="'Choisir'"
+            ></vue-multiselect>
         </div>
-      </div>
     </div>
-  </div>
-  <FullCalendar :options="calendarOptions" ref="calendarRef">
-    <template v-slot:eventContent="{ event }: { event: EventApi }">
-      <span :class="eventClasses">
-        <b v-if="event.extendedProps.is === 'remote'">{{ event.title }}</b>
-        <b v-else-if="event.extendedProps.is === 'range'"
-          >{{ formatDate(event.startStr) }} -
-          {{ event.extendedProps.locationName }}</b
-        >
-        <b v-else-if="event.extendedProps.is === 'local'">{{ event.title }}</b>
-        <b v-else>no 'is'</b>
-        <a
-          v-if="event.extendedProps.is === 'range'"
-          class="fa fa-fw fa-times delete"
-          @click.prevent="onClickDelete(event)"
-        >
-        </a>
-      </span>
-    </template>
-  </FullCalendar>
-
-  <div id="copy-widget">
-    <div class="container mt-2 mb-2">
-      <div class="row justify-content-between align-items-center mb-4">
-        <div class="col-xs-12 col-sm-3 col-md-2">
-          <h6 class="chill-red">{{ $t("copy_range_from_to") }}</h6>
+    <div
+        class="display-options row justify-content-between"
+        style="margin-top: 1rem"
+    >
+        <div class="col-sm-9 col-xs-12">
+            <div class="input-group mb-3">
+                <label class="input-group-text" for="slotDuration"
+                    >Durée des créneaux</label
+                >
+                <select
+                    v-model="slotDuration"
+                    id="slotDuration"
+                    class="form-select"
+                >
+                    <option value="00:05:00">5 minutes</option>
+                    <option value="00:10:00">10 minutes</option>
+                    <option value="00:15:00">15 minutes</option>
+                    <option value="00:30:00">30 minutes</option>
+                    <option value="00:45:00">45 minutes</option>
+                    <option value="00:60:00">60 minutes</option>
+                </select>
+                <label class="input-group-text" for="slotMinTime">De</label>
+                <select
+                    v-model="slotMinTime"
+                    id="slotMinTime"
+                    class="form-select"
+                >
+                    <option value="00:00:00">0h</option>
+                    <option value="01:00:00">1h</option>
+                    <option value="02:00:00">2h</option>
+                    <option value="03:00:00">3h</option>
+                    <option value="04:00:00">4h</option>
+                    <option value="05:00:00">5h</option>
+                    <option value="06:00:00">6h</option>
+                    <option value="07:00:00">7h</option>
+                    <option value="08:00:00">8h</option>
+                    <option value="09:00:00">9h</option>
+                    <option value="10:00:00">10h</option>
+                    <option value="11:00:00">11h</option>
+                    <option value="12:00:00">12h</option>
+                </select>
+                <label class="input-group-text" for="slotMaxTime">À</label>
+                <select
+                    v-model="slotMaxTime"
+                    id="slotMaxTime"
+                    class="form-select"
+                >
+                    <option value="12:00:00">12h</option>
+                    <option value="13:00:00">13h</option>
+                    <option value="14:00:00">14h</option>
+                    <option value="15:00:00">15h</option>
+                    <option value="16:00:00">16h</option>
+                    <option value="17:00:00">17h</option>
+                    <option value="18:00:00">18h</option>
+                    <option value="19:00:00">19h</option>
+                    <option value="20:00:00">20h</option>
+                    <option value="21:00:00">21h</option>
+                    <option value="22:00:00">22h</option>
+                    <option value="23:00:00">23h</option>
+                    <option value="23:59:59">24h</option>
+                </select>
+            </div>
         </div>
-        <div class="col-xs-12 col-sm-9 col-md-2">
-          <select v-model="dayOrWeek" id="dayOrWeek" class="form-select">
-            <option value="day">{{ $t("from_day_to_day") }}</option>
-            <option value="week">
-              {{ $t("from_week_to_week") }}
-            </option>
-          </select>
+        <div class="col-xs-12 col-sm-3">
+            <div class="float-end">
+                <div class="form-check input-group">
+                    <span class="input-group-text">
+                        <input
+                            id="showHideWE"
+                            class="mt-0"
+                            type="checkbox"
+                            v-model="showWeekends"
+                        />
+                    </span>
+                    <label
+                        for="showHideWE"
+                        class="form-check-label input-group-text"
+                        >Week-ends</label
+                    >
+                </div>
+            </div>
         </div>
-        <template v-if="dayOrWeek === 'day'">
-          <div class="col-xs-12 col-sm-3 col-md-3">
-            <input class="form-control" type="date" v-model="copyFrom" />
-          </div>
-          <div class="col-xs-12 col-sm-1 col-md-1 copy-chevron">
-            <i class="fa fa-angle-double-right"></i>
-          </div>
-          <div class="col-xs-12 col-sm-3 col-md-3">
-            <input class="form-control" type="date" v-model="copyTo" />
-          </div>
-          <div class="col-xs-12 col-sm-5 col-md-1">
-            <button class="btn btn-action float-end" @click="copyDay">
-              {{ $t("copy_range") }}
-            </button>
-          </div>
+    </div>
+    <FullCalendar :options="calendarOptions" ref="calendarRef">
+        <template v-slot:eventContent="{ event }: { event: EventApi }">
+            <span :class="eventClasses">
+                <b v-if="event.extendedProps.is === 'remote'">{{
+                    event.title
+                }}</b>
+                <b v-else-if="event.extendedProps.is === 'range'"
+                    >{{ formatDate(event.startStr, "time") }} -
+                    {{ formatDate(event.endStr, "time") }}:
+                    {{ event.extendedProps.locationName }}</b
+                >
+                <b v-else-if="event.extendedProps.is === 'local'">{{
+                    event.title
+                }}</b>
+                <b v-else>no 'is'</b>
+                <a
+                    v-if="event.extendedProps.is === 'range'"
+                    class="fa fa-fw fa-times delete"
+                    @click.prevent="onClickDelete(event)"
+                >
+                </a>
+            </span>
         </template>
-        <template v-else>
-          <div class="col-xs-12 col-sm-3 col-md-3">
-            <select
-              v-model="copyFromWeek"
-              id="copyFromWeek"
-              class="form-select"
-            >
-              <option v-for="w in lastWeeks" :value="w.value" :key="w.value">
-                {{ w.text }}
-              </option>
-            </select>
-          </div>
-          <div class="col-xs-12 col-sm-1 col-md-1 copy-chevron">
-            <i class="fa fa-angle-double-right"></i>
-          </div>
-          <div class="col-xs-12 col-sm-3 col-md-3">
-            <select v-model="copyToWeek" id="copyToWeek" class="form-select">
-              <option v-for="w in nextWeeks" :value="w.value" :key="w.value">
-                {{ w.text }}
-              </option>
-            </select>
-          </div>
-          <div class="col-xs-12 col-sm-5 col-md-1">
-            <button class="btn btn-action float-end" @click="copyWeek">
-              {{ $t("copy_range") }}
-            </button>
-          </div>
-        </template>
-      </div>
-    </div>
-  </div>
+    </FullCalendar>
 
-  <!-- not directly seen, but include in a modal -->
-  <edit-location ref="editLocation"></edit-location>
+    <div id="copy-widget">
+        <div class="container mt-2 mb-2">
+            <div class="row justify-content-between align-items-center mb-4">
+                <div class="col-xs-12 col-sm-3 col-md-2">
+                    <h6 class="chill-red">{{ $t("copy_range_from_to") }}</h6>
+                </div>
+                <div class="col-xs-12 col-sm-9 col-md-2">
+                    <select
+                        v-model="dayOrWeek"
+                        id="dayOrWeek"
+                        class="form-select"
+                    >
+                        <option value="day">{{ $t("from_day_to_day") }}</option>
+                        <option value="week">
+                            {{ $t("from_week_to_week") }}
+                        </option>
+                    </select>
+                </div>
+                <template v-if="dayOrWeek === 'day'">
+                    <div class="col-xs-12 col-sm-3 col-md-3">
+                        <input
+                            class="form-control"
+                            type="date"
+                            v-model="copyFrom"
+                        />
+                    </div>
+                    <div class="col-xs-12 col-sm-1 col-md-1 copy-chevron">
+                        <i class="fa fa-angle-double-right"></i>
+                    </div>
+                    <div class="col-xs-12 col-sm-3 col-md-3">
+                        <input
+                            class="form-control"
+                            type="date"
+                            v-model="copyTo"
+                        />
+                    </div>
+                    <div class="col-xs-12 col-sm-5 col-md-1">
+                        <button
+                            class="btn btn-action float-end"
+                            @click="copyDay"
+                        >
+                            {{ $t("copy_range") }}
+                        </button>
+                    </div>
+                </template>
+                <template v-else>
+                    <div class="col-xs-12 col-sm-3 col-md-3">
+                        <select
+                            v-model="copyFromWeek"
+                            id="copyFromWeek"
+                            class="form-select"
+                        >
+                            <option
+                                v-for="w in lastWeeks"
+                                :value="w.value"
+                                :key="w.value"
+                            >
+                                {{ w.text }}
+                            </option>
+                        </select>
+                    </div>
+                    <div class="col-xs-12 col-sm-1 col-md-1 copy-chevron">
+                        <i class="fa fa-angle-double-right"></i>
+                    </div>
+                    <div class="col-xs-12 col-sm-3 col-md-3">
+                        <select
+                            v-model="copyToWeek"
+                            id="copyToWeek"
+                            class="form-select"
+                        >
+                            <option
+                                v-for="w in nextWeeks"
+                                :value="w.value"
+                                :key="w.value"
+                            >
+                                {{ w.text }}
+                            </option>
+                        </select>
+                    </div>
+                    <div class="col-xs-12 col-sm-5 col-md-1">
+                        <button
+                            class="btn btn-action float-end"
+                            @click="copyWeek"
+                        >
+                            {{ $t("copy_range") }}
+                        </button>
+                    </div>
+                </template>
+            </div>
+        </div>
+    </div>
+
+    <!-- not directly seen, but include in a modal -->
+    <edit-location ref="editLocation"></edit-location>
 </template>
 
 <script setup lang="ts">
 import type {
-  CalendarOptions,
-  DatesSetArg,
-  EventInput,
+    CalendarOptions,
+    DatesSetArg,
+    EventInput,
 } from "@fullcalendar/core";
 import { computed, ref, onMounted } from "vue";
 import { useStore } from "vuex";
@@ -179,14 +230,14 @@ import { key } from "./store";
 import FullCalendar from "@fullcalendar/vue3";
 import frLocale from "@fullcalendar/core/locales/fr";
 import interactionPlugin, {
-  EventResizeDoneArg,
+    EventResizeDoneArg,
 } from "@fullcalendar/interaction";
 import timeGridPlugin from "@fullcalendar/timegrid";
 import {
-  EventApi,
-  DateSelectArg,
-  EventDropArg,
-  EventClickArg,
+    EventApi,
+    DateSelectArg,
+    EventDropArg,
+    EventClickArg,
 } from "@fullcalendar/core";
 import { dateToISO, ISOToDate } from "ChillMainAssets/chill/js/date";
 import VueMultiselect from "vue-multiselect";
@@ -207,96 +258,113 @@ const copyFromWeek = ref<string | null>(null);
 const copyToWeek = ref<string | null>(null);
 
 interface Weeks {
-  value: string | null;
-  text: string;
+    value: string | null;
+    text: string;
 }
 
 const getMonday = (week: number): Date => {
-  const lastMonday = new Date();
-  lastMonday.setDate(
-    lastMonday.getDate() - ((lastMonday.getDay() + 6) % 7) + week * 7,
-  );
-  return lastMonday;
+    const lastMonday = new Date();
+    lastMonday.setDate(
+        lastMonday.getDate() - ((lastMonday.getDay() + 6) % 7) + week * 7,
+    );
+    return lastMonday;
 };
 
 const dateOptions: Intl.DateTimeFormatOptions = {
-  weekday: "long",
-  year: "numeric",
-  month: "long",
-  day: "numeric",
+    weekday: "long",
+    year: "numeric",
+    month: "long",
+    day: "numeric",
 };
 
 const lastWeeks = computed((): Weeks[] =>
-  Array.from(Array(30).keys()).map((w) => {
-    const lastMonday = getMonday(15 - w);
-    return {
-      value: dateToISO(lastMonday),
-      text: `Semaine du ${lastMonday.toLocaleDateString("fr-FR", dateOptions)}`,
-    };
-  }),
+    Array.from(Array(30).keys()).map((w) => {
+        const lastMonday = getMonday(15 - w);
+        return {
+            value: dateToISO(lastMonday),
+            text: `Semaine du ${lastMonday.toLocaleDateString("fr-FR", dateOptions)}`,
+        };
+    }),
 );
 
 const nextWeeks = computed((): Weeks[] =>
-  Array.from(Array(52).keys()).map((w) => {
-    const nextMonday = getMonday(w + 1);
-    return {
-      value: dateToISO(nextMonday),
-      text: `Semaine du ${nextMonday.toLocaleDateString("fr-FR", dateOptions)}`,
-    };
-  }),
+    Array.from(Array(52).keys()).map((w) => {
+        const nextMonday = getMonday(w + 1);
+        return {
+            value: dateToISO(nextMonday),
+            text: `Semaine du ${nextMonday.toLocaleDateString("fr-FR", dateOptions)}`,
+        };
+    }),
 );
 
-const formatDate = (datetime: string) => {
-  console.log(typeof datetime);
-  return ISOToDate(datetime);
+const formatDate = (datetime: string, format: null | "time" = null) => {
+    const date = ISOToDate(datetime);
+    if (!date) return "";
+
+    if (format === "time") {
+        return date.toLocaleTimeString("fr-FR", {
+            hour: "2-digit",
+            minute: "2-digit",
+        });
+    }
+
+    // French date formatting
+    return date.toLocaleDateString("fr-FR", {
+        weekday: "short",
+        year: "numeric",
+        month: "short",
+        day: "numeric",
+        hour: "2-digit",
+        minute: "2-digit",
+    });
 };
 
 const baseOptions = ref<CalendarOptions>({
-  locale: frLocale,
-  plugins: [interactionPlugin, timeGridPlugin],
-  initialView: "timeGridWeek",
-  initialDate: new Date(),
-  scrollTimeReset: false,
-  selectable: true,
-  // when the dates are changes in the fullcalendar view OR when new events are added
-  datesSet: onDatesSet,
-  // when a date is selected
-  select: onDateSelect,
-  // when a event is resized
-  eventResize: onEventDropOrResize,
-  // when an event is moved
-  eventDrop: onEventDropOrResize,
-  // when an event si clicked
-  eventClick: onEventClick,
-  selectMirror: false,
-  editable: true,
-  headerToolbar: {
-    left: "prev,next today",
-    center: "title",
-    right: "timeGridWeek,timeGridDay",
-  },
+    locale: frLocale,
+    plugins: [interactionPlugin, timeGridPlugin],
+    initialView: "timeGridWeek",
+    initialDate: new Date(),
+    scrollTimeReset: false,
+    selectable: true,
+    // when the dates are changes in the fullcalendar view OR when new events are added
+    datesSet: onDatesSet,
+    // when a date is selected
+    select: onDateSelect,
+    // when a event is resized
+    eventResize: onEventDropOrResize,
+    // when an event is moved
+    eventDrop: onEventDropOrResize,
+    // when an event si clicked
+    eventClick: onEventClick,
+    selectMirror: false,
+    editable: true,
+    headerToolbar: {
+        left: "prev,next today",
+        center: "title",
+        right: "timeGridWeek,timeGridDay",
+    },
 });
 
 const ranges = computed<EventInput[]>(() => {
-  return store.state.calendarRanges.ranges;
+    return store.state.calendarRanges.ranges;
 });
 
 const locations = computed<Location[]>(() => {
-  return store.state.locations.locations;
+    return store.state.locations.locations;
 });
 
 const pickedLocation = computed<Location | null>({
-  get(): Location | null {
-    return (
-      store.state.locations.locationPicked ||
-      store.state.locations.currentLocation
-    );
-  },
-  set(newLocation: Location | null): void {
-    store.commit("locations/setLocationPicked", newLocation, {
-      root: true,
-    });
-  },
+    get(): Location | null {
+        return (
+            store.state.locations.locationPicked ||
+            store.state.locations.currentLocation
+        );
+    },
+    set(newLocation: Location | null): void {
+        store.commit("locations/setLocationPicked", newLocation, {
+            root: true,
+        });
+    },
 });
 
 /**
@@ -325,116 +393,116 @@ const sources = computed<EventSourceInput[]>(() => {
 */
 
 const calendarOptions = computed((): CalendarOptions => {
-  return {
-    ...baseOptions.value,
-    weekends: showWeekends.value,
-    slotDuration: slotDuration.value,
-    events: ranges.value,
-    slotMinTime: slotMinTime.value,
-    slotMaxTime: slotMaxTime.value,
-  };
+    return {
+        ...baseOptions.value,
+        weekends: showWeekends.value,
+        slotDuration: slotDuration.value,
+        events: ranges.value,
+        slotMinTime: slotMinTime.value,
+        slotMaxTime: slotMaxTime.value,
+    };
 });
 
 /**
  * launched when the calendar range date change
  */
 function onDatesSet(event: DatesSetArg): void {
-  store.dispatch("fullCalendar/setCurrentDatesView", {
-    start: event.start,
-    end: event.end,
-  });
+    store.dispatch("fullCalendar/setCurrentDatesView", {
+        start: event.start,
+        end: event.end,
+    });
 }
 
 function onDateSelect(event: DateSelectArg): void {
-  if (null === pickedLocation.value) {
-    window.alert(
-      "Indiquez une localisation avant de créer une période de disponibilité.",
-    );
-    return;
-  }
+    if (null === pickedLocation.value) {
+        window.alert(
+            "Indiquez une localisation avant de créer une période de disponibilité.",
+        );
+        return;
+    }
 
-  store.dispatch("calendarRanges/createRange", {
-    start: event.start,
-    end: event.end,
-    location: pickedLocation.value,
-  });
+    store.dispatch("calendarRanges/createRange", {
+        start: event.start,
+        end: event.end,
+        location: pickedLocation.value,
+    });
 }
 
 /**
  * When a calendar range is deleted
  */
 function onClickDelete(event: EventApi): void {
-  if (event.extendedProps.is !== "range") {
-    return;
-  }
+    if (event.extendedProps.is !== "range") {
+        return;
+    }
 
-  store.dispatch(
-    "calendarRanges/deleteRange",
-    event.extendedProps.calendarRangeId,
-  );
+    store.dispatch(
+        "calendarRanges/deleteRange",
+        event.extendedProps.calendarRangeId,
+    );
 }
 
 function onEventDropOrResize(payload: EventDropArg | EventResizeDoneArg) {
-  if (payload.event.extendedProps.is !== "range") {
-    return;
-  }
+    if (payload.event.extendedProps.is !== "range") {
+        return;
+    }
 
-  store.dispatch("calendarRanges/patchRangeTime", {
-    calendarRangeId: payload.event.extendedProps.calendarRangeId,
-    start: payload.event.start,
-    end: payload.event.end,
-  });
+    store.dispatch("calendarRanges/patchRangeTime", {
+        calendarRangeId: payload.event.extendedProps.calendarRangeId,
+        start: payload.event.start,
+        end: payload.event.end,
+    });
 }
 
 function onEventClick(payload: EventClickArg): void {
-  // @ts-ignore TS does not recognize the target. But it does exists.
-  if (payload.jsEvent.target.classList.contains("delete")) {
-    return;
-  }
-  if (payload.event.extendedProps.is !== "range") {
-    return;
-  }
+    // @ts-ignore TS does not recognize the target. But it does exists.
+    if (payload.jsEvent.target.classList.contains("delete")) {
+        return;
+    }
+    if (payload.event.extendedProps.is !== "range") {
+        return;
+    }
 
-  editLocation.value?.startEdit(payload.event);
+    editLocation.value?.startEdit(payload.event);
 }
 
 function copyDay() {
-  if (null === copyFrom.value || null === copyTo.value) {
-    return;
-  }
-  store.dispatch("calendarRanges/copyFromDayToAnotherDay", {
-    from: ISOToDate(copyFrom.value),
-    to: ISOToDate(copyTo.value),
-  });
+    if (null === copyFrom.value || null === copyTo.value) {
+        return;
+    }
+    store.dispatch("calendarRanges/copyFromDayToAnotherDay", {
+        from: ISOToDate(copyFrom.value),
+        to: ISOToDate(copyTo.value),
+    });
 }
 
 function copyWeek() {
-  if (null === copyFromWeek.value || null === copyToWeek.value) {
-    return;
-  }
-  store.dispatch("calendarRanges/copyFromWeekToAnotherWeek", {
-    fromMonday: ISOToDate(copyFromWeek.value),
-    toMonday: ISOToDate(copyToWeek.value),
-  });
+    if (null === copyFromWeek.value || null === copyToWeek.value) {
+        return;
+    }
+    store.dispatch("calendarRanges/copyFromWeekToAnotherWeek", {
+        fromMonday: ISOToDate(copyFromWeek.value),
+        toMonday: ISOToDate(copyToWeek.value),
+    });
 }
 
 onMounted(() => {
-  copyFromWeek.value = dateToISO(getMonday(0));
-  copyToWeek.value = dateToISO(getMonday(1));
+    copyFromWeek.value = dateToISO(getMonday(0));
+    copyToWeek.value = dateToISO(getMonday(1));
 });
 </script>
 
 <style scoped>
 #copy-widget {
-  position: sticky;
-  bottom: 0px;
-  background-color: white;
-  z-index: 9999999999;
-  padding: 0.25rem 0 0.25rem;
+    position: sticky;
+    bottom: 0px;
+    background-color: white;
+    z-index: 9999999999;
+    padding: 0.25rem 0 0.25rem;
 }
 div.copy-chevron {
-  text-align: center;
-  font-size: x-large;
-  width: 2rem;
+    text-align: center;
+    font-size: x-large;
+    width: 2rem;
 }
 </style>

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>
+
+

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 %}

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 %}

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">

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">

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 %}

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 %}

src/Bundle/ChillCalendarBundle/Service/ShortMessageNotification/CalendarForShortMessageProvider.php

@@ -24,7 +24,11 @@ use Doctrine\ORM\EntityManagerInterface;
 
 class CalendarForShortMessageProvider
 {
-    public function __construct(private readonly CalendarRepository $calendarRepository, private readonly EntityManagerInterface $em, private readonly RangeGeneratorInterface $rangeGenerator) {}
+    public function __construct(
+        private readonly CalendarRepository $calendarRepository,
+        private readonly EntityManagerInterface $em,
+        private readonly RangeGeneratorInterface $rangeGenerator,
+    ) {}
 
     /**
      * Generate calendars instance.

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]),

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);
+    }
+}

src/Bundle/ChillCalendarBundle/Tests/Service/ShortMessageNotification/CalendarForShortMessageProviderTest.php

@@ -21,7 +21,6 @@ namespace Chill\CalendarBundle\Tests\Service\ShortMessageNotification;
 use Chill\CalendarBundle\Entity\Calendar;
 use Chill\CalendarBundle\Repository\CalendarRepository;
 use Chill\CalendarBundle\Service\ShortMessageNotification\CalendarForShortMessageProvider;
-use Chill\CalendarBundle\Service\ShortMessageNotification\DefaultRangeGenerator;
 use Chill\CalendarBundle\Service\ShortMessageNotification\RangeGeneratorInterface;
 use Doctrine\ORM\EntityManagerInterface;
 use PHPUnit\Framework\TestCase;
@@ -82,10 +81,16 @@ final class CalendarForShortMessageProviderTest extends TestCase
         $em = $this->prophesize(EntityManagerInterface::class);
         $em->clear()->shouldBeCalled();
 
+        $calendarRangeGenerator = $this->prophesize(RangeGeneratorInterface::class);
+        $calendarRangeGenerator->generateRange(Argument::any())->willReturn([
+            'startDate' => new \DateTimeImmutable('yesterday'),
+            'endDate' => new \DateTimeImmutable('now'),
+        ]);
+
         $provider = new CalendarForShortMessageProvider(
             $calendarRepository->reveal(),
             $em->reveal(),
-            new DefaultRangeGenerator()
+            $calendarRangeGenerator->reveal(),
         );
 
         $calendars = iterator_to_array($provider->getCalendars(new \DateTimeImmutable('now')));
@@ -103,26 +108,32 @@ final class CalendarForShortMessageProviderTest extends TestCase
             Argument::type(\DateTimeImmutable::class),
             Argument::type('int'),
             Argument::exact(0)
-        )->will(static fn ($args) => array_fill(0, 1, new Calendar()))->shouldBeCalledTimes(1);
+        )->will(static fn ($args) => array_fill(0, 10, new Calendar()))->shouldBeCalledTimes(1);
         $calendarRepository->findByNotificationAvailable(
             Argument::type(\DateTimeImmutable::class),
             Argument::type(\DateTimeImmutable::class),
             Argument::type('int'),
-            Argument::not(0)
+            Argument::exact(10)
         )->will(static fn ($args) => [])->shouldBeCalledTimes(1);
 
         $em = $this->prophesize(EntityManagerInterface::class);
         $em->clear()->shouldBeCalled();
 
+        $calendarRangeGenerator = $this->prophesize(RangeGeneratorInterface::class);
+        $calendarRangeGenerator->generateRange(Argument::any())->willReturn([
+            'startDate' => new \DateTimeImmutable('yesterday'),
+            'endDate' => new \DateTimeImmutable('now'),
+        ]);
+
         $provider = new CalendarForShortMessageProvider(
             $calendarRepository->reveal(),
             $em->reveal(),
-            new DefaultRangeGenerator()
+            $calendarRangeGenerator->reveal(),
         );
 
         $calendars = iterator_to_array($provider->getCalendars(new \DateTimeImmutable('now')));
 
-        $this->assertEquals(1, \count($calendars));
+        $this->assertEquals(10, \count($calendars));
         $this->assertContainsOnly(Calendar::class, $calendars);
     }
 }

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

src/Bundle/ChillCustomFieldsBundle/EntityRepository/CustomFieldsDefaultGroupRepository.php

@@ -0,0 +1,29 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\CustomFieldsBundle\EntityRepository;
+
+use Chill\CustomFieldsBundle\Entity\CustomFieldsDefaultGroup;
+use Doctrine\Bundle\DoctrineBundle\Repository\ServiceEntityRepository;
+use Doctrine\Persistence\ManagerRegistry;
+
+class CustomFieldsDefaultGroupRepository extends ServiceEntityRepository
+{
+    public function __construct(ManagerRegistry $registry)
+    {
+        parent::__construct($registry, CustomFieldsDefaultGroup::class);
+    }
+
+    public function findOneByEntity(string $className): ?CustomFieldsDefaultGroup
+    {
+        return $this->findOneBy(['entity' => $className]);
+    }
+}

src/Bundle/ChillCustomFieldsBundle/config/services.yaml

@@ -127,3 +127,7 @@ services:
         factory: ["@doctrine", getRepository]
         arguments:
             - "Chill\\CustomFieldsBundle\\Entity\\CustomFieldLongChoice\\Option"
+
+    Chill\CustomFieldsBundle\EntityRepository\CustomFieldsDefaultGroupRepository:
+        autowire: true
+        autoconfigure: true

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;
 }

src/Bundle/ChillDocStoreBundle/AsyncUpload/Driver/LocalStorage/StoredObjectManager.php

@@ -18,6 +18,7 @@ use Chill\DocStoreBundle\Exception\StoredObjectManagerException;
 use Chill\DocStoreBundle\Service\Cryptography\KeyGenerator;
 use Chill\DocStoreBundle\Service\StoredObjectManagerInterface;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
+use Symfony\Component\Filesystem\Exception\IOExceptionInterface;
 use Symfony\Component\Filesystem\Filesystem;
 use Symfony\Component\Filesystem\Path;
 
@@ -147,16 +148,11 @@ class StoredObjectManager implements StoredObjectManagerInterface
     public function writeContent(string $filename, string $encryptedContent): void
     {
         $fullPath = $this->buildPath($filename);
-        $dir = Path::getDirectory($fullPath);
 
-        if (!$this->filesystem->exists($dir)) {
-            $this->filesystem->mkdir($dir);
-        }
-
-        $result = file_put_contents($fullPath, $encryptedContent);
-
-        if (false === $result) {
-            throw StoredObjectManagerException::unableToStoreDocumentOnDisk();
+        try {
+            $this->filesystem->dumpFile($fullPath, $encryptedContent);
+        } catch (IOExceptionInterface $exception) {
+            throw StoredObjectManagerException::unableToStoreDocumentOnDisk($exception);
         }
     }