add changie

- Added a migration to backfill activity-user associations for creators.
- Introduced a temporary `by_migration` column for tracking and future cleanup.

.changes/unreleased/Feature-20240530-160003.yaml

@@ -1,6 +0,0 @@
-kind: Feature
-body: |
-  Upgrade import of address list to the last version of compiled addresses of belgian-best-address
-time: 2024-05-30T16:00:03.440767606+02:00
-custom:
-  Issue: ""

.changes/unreleased/Feature-20240531-190242.yaml

@@ -1,6 +0,0 @@
-kind: Feature
-body: |
-  Upgrade CKEditor and refactor configuration with use of typescript
-time: 2024-05-31T19:02:42.776662753+02:00
-custom:
-  Issue: ""

.changes/unreleased/Feature-20250904-181032.yaml

@@ -1,6 +0,0 @@
-kind: Feature
-body: Add a command to generate a list of permissions
-time: 2025-09-04T18:10:32.334524026+02:00
-custom:
-    Issue: ""
-    SchemaChange: No schema change

.changes/unreleased/Fixed-20251118-140559.yaml

@@ -0,0 +1,7 @@
+kind: Fixed
+body: |
+    Associate activity's creator as a participant by default, and retro-actively append the creator to each activity
+time: 2025-11-18T14:05:59.904993123+01:00
+custom:
+    Issue: "466"
+    SchemaChange: Add columns or tables

.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   

.changes/v4.7.0.md

@@ -0,0 +1,21 @@
+## v4.7.0 - 2025-11-10
+### Feature
+* ([#385](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/385)) Create invitation list in user menu   
+* ([#404](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/404)) Add columns for comments linked to an activity in the activity list export   
+### Fixed
+* ([#451](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/451)) Fix: display also social actions linked to parents of the selected social issue   
+* ([#453](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/453)) Fix: export actions and their results in csv even when action does not have any goals attached to it.   
+* Fix the possibility to delete a workflow   
+
+  **Schema Change**: Drop or rename table or columns, or enforce new constraint that must be manually fixed
+* ([#457](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/457)) Fix the fusion of thirdparty properties that are located in another schema than public for TO_ONE relations + add extra loop for MANY_TO_MANY relations where thirdparty is the source instead of the target   
+* ([#428](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/428)) Fix suggestion of referrer when creating notification for accompanyingPeriodWorkDocument   
+### DX
+* Send notifications log to dedicated channel, if it exists
+   
+### UX
+* ([#425](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/425)) Change the terms 'cercle' and 'centre' to 'service', and 'territoire' respectively.   
+* ([#542](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/542)) Improve the ux for selecting whether user wants to be notified of the final step of a workflow or all steps   
+* Expand timeSpent choices for evaluation document and translate them to user locale or fallback 'fr'   
+* ([#455](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/455)) Change the order of display for results and objectives in the social work/action form   
+* Wrap text when it is too long within badges   

.changes/v4.8.0.md

@@ -0,0 +1,9 @@
+## v4.8.0 - 2025-11-17
+### Feature
+* ([#461](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/461)) Make a calendar item on the 'mes rendez-vous' page clickable. Clicking will navigate to the edit page of the calendar item.   
+### Fixed
+* ([#463](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/463)) Display calendar items for which an invite was accepted on the mes rendez-vous page   
+* Improve accessibility on login page
+   
+### UX
+* ([#449](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/449)) Remove the label if there is only one scope and no scope picking field is displayed.   

.editorconfig

@@ -19,11 +19,11 @@ max_line_length = 80
 [COMMIT_EDITMSG]
 max_line_length = 0
 
-[*.{js,vue,ts}]
+[*.{js, vue, ts}]
 indent_size = 2
 indent_style = space
 
-[*.rst]
-indent_size = 3
-indent_style = space
+[.rst]
+ident_size = 3
+ident_style = space
 

.junie/guidelines.md

@@ -234,9 +234,12 @@ This must be a decision made by a human, not by an AI. Every AI task must abort
 
 #### Running Tests
 
-The tests are run from the project's root (not from the bundle's root: so, do not change the directory to any bundle directory before running tests).
+The tests are run from the project's root (not from the bundle's root).
 
 ```bash
+# Run all tests
+vendor/bin/phpunit
+
 # Run a specific test file
 vendor/bin/phpunit path/to/TestFile.php
 
@@ -244,6 +247,9 @@ vendor/bin/phpunit path/to/TestFile.php
 vendor/bin/phpunit --filter methodName path/to/TestFile.php
 ```
 
+When writing tests, only test specific files. Do not run all tests or the full
+test suite.
+
 #### Test Structure
 
 Tests are organized by bundle and follow the same structure as the bundle itself:

.prettierrc

@@ -1,4 +0,0 @@
-{
-  "tabWidth": 2,
-  "useTabs": false
-}

.vscode/launch.json

@@ -1,30 +0,0 @@
-{
-    // Use IntelliSense to learn about possible attributes.
-    // For more information, visit: https://go.microsoft.com/fwlink/?linkid=830387
-    "version": "0.2.0",
-    "configurations": [
-        {
-            "name": "Chill Debug",
-            "type": "php",
-            "request": "launch",
-            "port": 9000,
-            "pathMappings": {
-                "/var/www/html": "${workspaceFolder}"
-            },
-            "preLaunchTask": "symfony"
-        },
-        {
-            "name": "Yarn Encore Dev (Watch)",
-            "type": "node-terminal",
-            "request": "launch",
-            "command": "yarn encore dev --watch",
-            "cwd": "${workspaceFolder}"
-        }
-    ],
-    "compounds": [
-        {
-            "name": "Chill Debug + Yarn Encore Dev (Watch)",
-            "configurations": ["Chill Debug", "Yarn Encore Dev (Watch)"]
-        }
-    ]
-}

.vscode/tasks.json

@@ -1,23 +0,0 @@
-{
-    "tasks": [
-        {
-            "type": "shell",
-            "command": "symfony",
-            "args": [
-                "server:start",
-                "--allow-http",
-                "--no-tls",
-                "--port=8000",
-                "--allow-all-ip",
-                "-d"
-            ],
-            "label": "symfony"
-        },
-        {
-            "type": "shell",
-            "command": "yarn",
-            "args": ["encore", "dev", "--watch"],
-            "label": "webpack"
-        }
-    ]
-}

CHANGELOG.md

@@ -6,6 +6,104 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
+## v4.8.0 - 2025-11-17
+### Feature
+* ([#461](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/461)) Make a calendar item on the 'mes rendez-vous' page clickable. Clicking will navigate to the edit page of the calendar item.   
+### Fixed
+* ([#463](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/463)) Display calendar items for which an invite was accepted on the mes rendez-vous page   
+* Improve accessibility on login page
+   
+### UX
+* ([#449](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/449)) Remove the label if there is only one scope and no scope picking field is displayed.   
+
+## v4.7.0 - 2025-11-10
+### Feature
+* ([#385](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/385)) Create invitation list in user menu   
+* ([#404](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/404)) Add columns for comments linked to an activity in the activity list export   
+### Fixed
+* ([#451](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/451)) Fix: display also social actions linked to parents of the selected social issue   
+* ([#453](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/453)) Fix: export actions and their results in csv even when action does not have any goals attached to it.   
+* Fix the possibility to delete a workflow   
+
+  **Schema Change**: Drop or rename table or columns, or enforce new constraint that must be manually fixed
+* ([#457](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/457)) Fix the fusion of thirdparty properties that are located in another schema than public for TO_ONE relations + add extra loop for MANY_TO_MANY relations where thirdparty is the source instead of the target   
+* ([#428](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/428)) Fix suggestion of referrer when creating notification for accompanyingPeriodWorkDocument   
+### DX
+* Send notifications log to dedicated channel, if it exists
+   
+### UX
+* ([#425](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/425)) Change the terms 'cercle' and 'centre' to 'service', and 'territoire' respectively.   
+* ([#542](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/542)) Improve the ux for selecting whether user wants to be notified of the final step of a workflow or all steps   
+* Expand timeSpent choices for evaluation document and translate them to user locale or fallback 'fr'   
+* ([#455](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/455)) Change the order of display for results and objectives in the social work/action form   
+* Wrap text when it is too long within badges   
+
+## v4.6.1 - 2025-10-27
+### Fixed
+* Fix export case where no 'reason' is picked within the PersonHavingActivityBetweenDateFilter.php   
+
+## v4.6.0 - 2025-10-15
+### Feature
+* ([#423](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/423)) Create environment banner that can be activated and configured depending on the image deployed   
+* ([#394](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/394)) Only show active workflow on the page "my tracked workflow"   
+### Fixed
+* Fix loading of classLists in SocialIssuesAcc.vue, ensure elements are present   
+* Fix the rendering of list of StoredObjectVersions, where there are kept version (before converting to pdf) and intermediate versions deleted   
+* ([#434](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/434)) Notification: fix editing of sent notification by removing form.addressesEmails, a field that no longer exists   
+* Fix loading of social issues and social actions within vue component   
+* ([#446](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/446)) Add unique condition on stored object filename, with cleaning step on existing duplicate filenames   
+
+  **Schema Change**: Drop or rename table or columns, or enforce new constraint that must be manually fixed
+* [workflow] take permissions into account to delete the workflow attachment   
+* ([#448](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/448)) Fix the execution of daily cronjob notification, when the previous last execution storage was invalid   
+
+## v4.5.1 - 2025-10-03
+### Fixed
+* Add missing javascript dependency   
+* 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   

CONVENTIONS-fr.md

@@ -54,7 +54,7 @@ Arborescence:
     - person
     - personvendee
     - household_edit_metadata
-        - index.ts
+        - index.js
 ```
 
 ## Organisation des feuilles de styles

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",
@@ -133,7 +133,6 @@
             "Chill\\TaskBundle\\": "src/Bundle/ChillTaskBundle",
             "Chill\\ThirdPartyBundle\\": "src/Bundle/ChillThirdPartyBundle",
             "Chill\\WopiBundle\\": "src/Bundle/ChillWopiBundle/src",
-            "Chill\\TicketBundle\\": "src/Bundle/ChillTicketBundle/src",
             "Chill\\Utils\\Rector\\": "utils/rector/src"
         }
     },

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],
@@ -35,7 +34,7 @@ return [
     Chill\ThirdPartyBundle\ChillThirdPartyBundle::class => ['all' => true],
     Chill\BudgetBundle\ChillBudgetBundle::class => ['all' => true],
     Chill\WopiBundle\ChillWopiBundle::class => ['all' => true],
-    Chill\TicketBundle\ChillTicketBundle::class => ['all' => true],
     Symfony\Bundle\WebProfilerBundle\WebProfilerBundle::class => ['dev' => true, 'test' => true],
     Symfony\UX\Translator\UxTranslatorBundle::class => ['all' => true],
+    loophp\PsrHttpMessageBridgeBundle\PsrHttpMessageBridgeBundle::class => ['all' => true],
 ];

config/packages/chill.yaml

@@ -1,6 +1,13 @@
 chill_main:
-    available_languages: [ '%env(resolve:LOCALE)%', 'en' ]
+    available_languages: [ '%env(resolve:LOCALE)%', 'en', 'nl' ]
     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: local_storage
+    use_driver: openstack
     local_storage:
         storage_path: '%kernel.project_dir%/var/storage'
     openstack:

config/packages/chill_ticket.yaml

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

config/packages/doctrine_migrations_chill.yaml

@@ -14,7 +14,6 @@ doctrine_migrations:
         'Chill\Migrations\Calendar': '@ChillCalendarBundle/migrations'
         'Chill\Migrations\Budget': '@ChillBudgetBundle/migrations'
         'Chill\Migrations\Report': '@ChillReportBundle/migrations'
-        'Chill\Migrations\Ticket': '@ChillTicketBundle/migrations'
     all_or_nothing:
         true
 

config/routes/chill_ticket.yaml

@@ -1,2 +0,0 @@
-chill_ticket_bundle:
-    resource: '@ChillTicketBundle/config/routes.yaml'

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/create-a-new-bundle.rst

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

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

@@ -55,6 +55,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",
@@ -79,12 +80,12 @@
     "dev": "encore dev",
     "watch": "encore dev --watch",
     "build": "encore production --progress",
-    "specs-build": "yaml-merge src/Bundle/ChillMainBundle/chill.api.specs.yaml src/Bundle/ChillPersonBundle/chill.api.specs.yaml src/Bundle/ChillCalendarBundle/chill.api.specs.yaml src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml src/Bundle/ChillDocStoreBundle/chill.api.specs.yaml src/Bundle/ChillTicketBundle/chill.api.specs.yaml> templates/api/specs.yaml",
+    "specs-build": "yaml-merge src/Bundle/ChillMainBundle/chill.api.specs.yaml src/Bundle/ChillPersonBundle/chill.api.specs.yaml src/Bundle/ChillCalendarBundle/chill.api.specs.yaml src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml src/Bundle/ChillDocStoreBundle/chill.api.specs.yaml> templates/api/specs.yaml",
     "specs-validate": "swagger-cli validate templates/api/specs.yaml",
     "specs-create-dir": "mkdir -p templates/api",
     "specs": "yarn run specs-create-dir && yarn run specs-build && yarn run specs-validate",
     "version": "node --version",
-    "eslint": "eslint-baseline --fix \"src/**/*.{js,ts,vue}\""
+    "eslint": "npx eslint-baseline --fix \"src/**/*.{js,ts,vue}\""
   },
   "private": true
 }

phpunit.xml.dist

@@ -58,10 +58,6 @@
       <!-- temporarily removed, the time to find a fix -->
       <exclude>src/Bundle/ChillPersonBundle/Tests/Controller/PersonDuplicateControllerViewTest.php</exclude>
     </testsuite>
-
-    <testsuite name="TicketBundle">
-      <directory suffix="Test.php">src/Bundle/ChillTicketBundle/tests/</directory>
-    </testsuite>
     <!--
         <testsuite name="ReportBundle">
             <directory suffix="Test.php">src/Bundle/ChillReportBundle/Tests/</directory>

resources/ticket_motives_import/README.md

@@ -1,8 +0,0 @@
-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

@@ -1,136 +0,0 @@
-- 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

@@ -1,6 +0,0 @@
-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

@@ -1,8 +0,0 @@
-- {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/Controller/ActivityController.php

@@ -382,6 +382,7 @@ final class ActivityController extends AbstractController
 
         $entity = new Activity();
         $entity->setUser($this->security->getUser());
+        $entity->addUser($this->security->getUser());
 
         if ($person instanceof Person) {
             $entity->setPerson($person);

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/Form/ActivityType.php

@@ -88,8 +88,8 @@ class ActivityType extends AbstractType
 
         if (null !== $options['data']->getPerson()) {
             $builder->add('scope', ScopePickerType::class, [
-                'center' => $options['center'],
                 'role' => ActivityVoter::CREATE === (string) $options['role'] ? ActivityVoter::CREATE_PERSON : (string) $options['role'],
+                'center' => $options['center'],
                 'required' => true,
             ]);
         }

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/App.vue

@@ -1,7 +1,7 @@
 <template>
-  <concerned-groups v-if="hasPerson" />
-  <social-issues-acc v-if="hasSocialIssues" />
-  <location v-if="hasLocation" />
+    <concerned-groups v-if="hasPerson" />
+    <social-issues-acc v-if="hasSocialIssues" />
+    <location v-if="hasLocation" />
 </template>
 
 <script>
@@ -10,12 +10,12 @@ import SocialIssuesAcc from "./components/SocialIssuesAcc.vue";
 import Location from "./components/Location.vue";
 
 export default {
-  name: "App",
-  props: ["hasSocialIssues", "hasLocation", "hasPerson"],
-  components: {
-    ConcernedGroups,
-    SocialIssuesAcc,
-    Location,
-  },
+    name: "App",
+    props: ["hasSocialIssues", "hasLocation", "hasPerson"],
+    components: {
+        ConcernedGroups,
+        SocialIssuesAcc,
+        Location,
+    },
 };
 </script>

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

@@ -1,43 +1,46 @@
 <template>
-  <teleport to="#add-persons" v-if="isComponentVisible">
-    <div class="flex-bloc concerned-groups" :class="getContext">
-      <persons-bloc
-        v-for="bloc in contextPersonsBlocs"
-        :key="bloc.key"
-        :bloc="bloc"
-        :bloc-width="getBlocWidth"
-        :set-persons-in-bloc="setPersonsInBloc"
-      />
-    </div>
-    <div
-      v-if="getContext === 'accompanyingCourse' && suggestedEntities.length > 0"
-    >
-      <ul class="list-suggest add-items inline">
-        <li
-          v-for="(p, i) in suggestedEntities"
-          @click="addSuggestedEntity(p)"
-          :key="`suggestedEntities-${i}`"
+    <teleport to="#add-persons" v-if="isComponentVisible">
+        <div class="flex-bloc concerned-groups" :class="getContext">
+            <persons-bloc
+                v-for="bloc in contextPersonsBlocs"
+                :key="bloc.key"
+                :bloc="bloc"
+                :bloc-width="getBlocWidth"
+                :set-persons-in-bloc="setPersonsInBloc"
+            />
+        </div>
+        <div
+            v-if="
+                getContext === 'accompanyingCourse' &&
+                suggestedEntities.length > 0
+            "
         >
-          <person-text v-if="p.type === 'person'" :person="p" />
-          <span v-else>{{ p.text }}</span>
-        </li>
-      </ul>
-    </div>
+            <ul class="list-suggest add-items inline">
+                <li
+                    v-for="(p, i) in suggestedEntities"
+                    @click="addSuggestedEntity(p)"
+                    :key="`suggestedEntities-${i}`"
+                >
+                    <person-text v-if="p.type === 'person'" :person="p" />
+                    <span v-else>{{ p.text }}</span>
+                </li>
+            </ul>
+        </div>
 
-    <ul class="record_actions">
-      <li class="add-persons">
-        <add-persons
-          :buttonTitle="trans(ACTIVITY_ADD_PERSONS)"
-          :modalTitle="trans(ACTIVITY_ADD_PERSONS)"
-          v-bind:key="addPersons.key"
-          v-bind:options="addPersonsOptions"
-          @addNewPersons="addNewPersons"
-          ref="addPersons"
-        >
-        </add-persons>
-      </li>
-    </ul>
-  </teleport>
+        <ul class="record_actions">
+            <li class="add-persons">
+                <add-persons
+                    :buttonTitle="trans(ACTIVITY_ADD_PERSONS)"
+                    :modalTitle="trans(ACTIVITY_ADD_PERSONS)"
+                    v-bind:key="addPersons.key"
+                    v-bind:options="addPersonsOptions"
+                    @addNewPersons="addNewPersons"
+                    ref="addPersons"
+                >
+                </add-persons>
+            </li>
+        </ul>
+    </teleport>
 </template>
 
 <script>
@@ -46,208 +49,208 @@ import AddPersons from "ChillPersonAssets/vuejs/_components/AddPersons.vue";
 import PersonsBloc from "./ConcernedGroups/PersonsBloc.vue";
 import PersonText from "ChillPersonAssets/vuejs/_components/Entity/PersonText.vue";
 import {
-  ACTIVITY_BLOC_PERSONS,
-  ACTIVITY_BLOC_PERSONS_ASSOCIATED,
-  ACTIVITY_BLOC_THIRDPARTY,
-  ACTIVITY_BLOC_USERS,
-  ACTIVITY_ADD_PERSONS,
-  trans,
+    ACTIVITY_BLOC_PERSONS,
+    ACTIVITY_BLOC_PERSONS_ASSOCIATED,
+    ACTIVITY_BLOC_THIRDPARTY,
+    ACTIVITY_BLOC_USERS,
+    ACTIVITY_ADD_PERSONS,
+    trans,
 } from "translator";
 
 export default {
-  name: "ConcernedGroups",
-  components: {
-    AddPersons,
-    PersonsBloc,
-    PersonText,
-  },
-  setup() {
-    return {
-      trans,
-      ACTIVITY_ADD_PERSONS,
-    };
-  },
-  data() {
-    return {
-      personsBlocs: [
-        {
-          key: "persons",
-          title: trans(ACTIVITY_BLOC_PERSONS),
-          persons: [],
-          included: false,
+    name: "ConcernedGroups",
+    components: {
+        AddPersons,
+        PersonsBloc,
+        PersonText,
+    },
+    setup() {
+        return {
+            trans,
+            ACTIVITY_ADD_PERSONS,
+        };
+    },
+    data() {
+        return {
+            personsBlocs: [
+                {
+                    key: "persons",
+                    title: trans(ACTIVITY_BLOC_PERSONS),
+                    persons: [],
+                    included: false,
+                },
+                {
+                    key: "personsAssociated",
+                    title: trans(ACTIVITY_BLOC_PERSONS_ASSOCIATED),
+                    persons: [],
+                    included: window.activity
+                        ? window.activity.activityType.personsVisible !== 0
+                        : true,
+                },
+                {
+                    key: "personsNotAssociated",
+                    title: "activity.bloc_persons_not_associated",
+                    persons: [],
+                    included: window.activity
+                        ? window.activity.activityType.personsVisible !== 0
+                        : true,
+                },
+                {
+                    key: "thirdparty",
+                    title: trans(ACTIVITY_BLOC_THIRDPARTY),
+                    persons: [],
+                    included: window.activity
+                        ? window.activity.activityType.thirdPartiesVisible !== 0
+                        : true,
+                },
+                {
+                    key: "users",
+                    title: trans(ACTIVITY_BLOC_USERS),
+                    persons: [],
+                    included: window.activity
+                        ? window.activity.activityType.usersVisible !== 0
+                        : true,
+                },
+            ],
+            addPersons: {
+                key: "activity",
+            },
+        };
+    },
+    computed: {
+        isComponentVisible() {
+            return window.activity
+                ? window.activity.activityType.personsVisible !== 0 ||
+                      window.activity.activityType.thirdPartiesVisible !== 0 ||
+                      window.activity.activityType.usersVisible !== 0
+                : true;
         },
-        {
-          key: "personsAssociated",
-          title: trans(ACTIVITY_BLOC_PERSONS_ASSOCIATED),
-          persons: [],
-          included: window.activity
-            ? window.activity.activityType.personsVisible !== 0
-            : true,
+        ...mapState({
+            persons: (state) => state.activity.persons,
+            thirdParties: (state) => state.activity.thirdParties,
+            users: (state) => state.activity.users,
+            accompanyingCourse: (state) => state.activity.accompanyingPeriod,
+        }),
+        ...mapGetters(["suggestedEntities"]),
+        getContext() {
+            return this.accompanyingCourse ? "accompanyingCourse" : "person";
         },
-        {
-          key: "personsNotAssociated",
-          title: "activity.bloc_persons_not_associated",
-          persons: [],
-          included: window.activity
-            ? window.activity.activityType.personsVisible !== 0
-            : true,
+        contextPersonsBlocs() {
+            return this.personsBlocs.filter((bloc) => bloc.included !== false);
         },
-        {
-          key: "thirdparty",
-          title: trans(ACTIVITY_BLOC_THIRDPARTY),
-          persons: [],
-          included: window.activity
-            ? window.activity.activityType.thirdPartiesVisible !== 0
-            : true,
+        addPersonsOptions() {
+            let optionsType = [];
+            if (window.activity) {
+                if (window.activity.activityType.personsVisible !== 0) {
+                    optionsType.push("person");
+                }
+                if (window.activity.activityType.thirdPartiesVisible !== 0) {
+                    optionsType.push("thirdparty");
+                }
+                if (window.activity.activityType.usersVisible !== 0) {
+                    optionsType.push("user");
+                }
+            } else {
+                optionsType = ["person", "thirdparty", "user"];
+            }
+            return {
+                type: optionsType,
+                priority: null,
+                uniq: false,
+                button: {
+                    size: "btn-sm",
+                },
+            };
         },
-        {
-          key: "users",
-          title: trans(ACTIVITY_BLOC_USERS),
-          persons: [],
-          included: window.activity
-            ? window.activity.activityType.usersVisible !== 0
-            : true,
+        getBlocWidth() {
+            return Math.round(100 / this.contextPersonsBlocs.length) + "%";
         },
-      ],
-      addPersons: {
-        key: "activity",
-      },
-    };
-  },
-  computed: {
-    isComponentVisible() {
-      return window.activity
-        ? window.activity.activityType.personsVisible !== 0 ||
-            window.activity.activityType.thirdPartiesVisible !== 0 ||
-            window.activity.activityType.usersVisible !== 0
-        : true;
     },
-    ...mapState({
-      persons: (state) => state.activity.persons,
-      thirdParties: (state) => state.activity.thirdParties,
-      users: (state) => state.activity.users,
-      accompanyingCourse: (state) => state.activity.accompanyingPeriod,
-    }),
-    ...mapGetters(["suggestedEntities"]),
-    getContext() {
-      return this.accompanyingCourse ? "accompanyingCourse" : "person";
+    mounted() {
+        this.setPersonsInBloc();
     },
-    contextPersonsBlocs() {
-      return this.personsBlocs.filter((bloc) => bloc.included !== false);
-    },
-    addPersonsOptions() {
-      let optionsType = [];
-      if (window.activity) {
-        if (window.activity.activityType.personsVisible !== 0) {
-          optionsType.push("person");
-        }
-        if (window.activity.activityType.thirdPartiesVisible !== 0) {
-          optionsType.push("thirdparty");
-        }
-        if (window.activity.activityType.usersVisible !== 0) {
-          optionsType.push("user");
-        }
-      } else {
-        optionsType = ["person", "thirdparty", "user"];
-      }
-      return {
-        type: optionsType,
-        priority: null,
-        uniq: false,
-        button: {
-          size: "btn-sm",
+    methods: {
+        setPersonsInBloc() {
+            let groups;
+            if (this.accompanyingCourse) {
+                groups = this.splitPersonsInGroups();
+            }
+            this.personsBlocs.forEach((bloc) => {
+                if (this.accompanyingCourse) {
+                    switch (bloc.key) {
+                        case "personsAssociated":
+                            bloc.persons = groups.personsAssociated;
+                            bloc.included = true;
+                            break;
+                        case "personsNotAssociated":
+                            bloc.persons = groups.personsNotAssociated;
+                            bloc.included = true;
+                            break;
+                    }
+                } else {
+                    switch (bloc.key) {
+                        case "persons":
+                            bloc.persons = this.persons;
+                            bloc.included = true;
+                            break;
+                    }
+                }
+                switch (bloc.key) {
+                    case "thirdparty":
+                        bloc.persons = this.thirdParties;
+                        break;
+                    case "users":
+                        bloc.persons = this.users;
+                        break;
+                }
+            }, groups);
+        },
+        splitPersonsInGroups() {
+            let personsAssociated = [];
+            let personsNotAssociated = this.persons;
+            let participations = this.getCourseParticipations();
+            this.persons.forEach((person) => {
+                participations.forEach((participation) => {
+                    if (person.id === participation.id) {
+                        //console.log(person.id);
+                        personsAssociated.push(person);
+                        personsNotAssociated = personsNotAssociated.filter(
+                            (p) => p !== person,
+                        );
+                    }
+                });
+            });
+            return {
+                personsAssociated: personsAssociated,
+                personsNotAssociated: personsNotAssociated,
+            };
+        },
+        getCourseParticipations() {
+            let participations = [];
+            this.accompanyingCourse.participations.forEach((participation) => {
+                if (!participation.endDate) {
+                    participations.push(participation.person);
+                }
+            });
+            return participations;
+        },
+        addNewPersons({ selected, modal }) {
+            console.log("@@@ CLICK button addNewPersons", selected);
+            selected.forEach((item) => {
+                this.$store.dispatch("addPersonsInvolved", item);
+            }, this);
+            this.$refs.addPersons.resetSearch(); // to cast child method
+            modal.showModal = false;
+            this.setPersonsInBloc();
+        },
+        addSuggestedEntity(person) {
+            this.$store.dispatch("addPersonsInvolved", {
+                result: person,
+                type: "person",
+            });
+            this.setPersonsInBloc();
         },
-      };
     },
-    getBlocWidth() {
-      return Math.round(100 / this.contextPersonsBlocs.length) + "%";
-    },
-  },
-  mounted() {
-    this.setPersonsInBloc();
-  },
-  methods: {
-    setPersonsInBloc() {
-      let groups;
-      if (this.accompanyingCourse) {
-        groups = this.splitPersonsInGroups();
-      }
-      this.personsBlocs.forEach((bloc) => {
-        if (this.accompanyingCourse) {
-          switch (bloc.key) {
-            case "personsAssociated":
-              bloc.persons = groups.personsAssociated;
-              bloc.included = true;
-              break;
-            case "personsNotAssociated":
-              bloc.persons = groups.personsNotAssociated;
-              bloc.included = true;
-              break;
-          }
-        } else {
-          switch (bloc.key) {
-            case "persons":
-              bloc.persons = this.persons;
-              bloc.included = true;
-              break;
-          }
-        }
-        switch (bloc.key) {
-          case "thirdparty":
-            bloc.persons = this.thirdParties;
-            break;
-          case "users":
-            bloc.persons = this.users;
-            break;
-        }
-      }, groups);
-    },
-    splitPersonsInGroups() {
-      let personsAssociated = [];
-      let personsNotAssociated = this.persons;
-      let participations = this.getCourseParticipations();
-      this.persons.forEach((person) => {
-        participations.forEach((participation) => {
-          if (person.id === participation.id) {
-            //console.log(person.id);
-            personsAssociated.push(person);
-            personsNotAssociated = personsNotAssociated.filter(
-              (p) => p !== person,
-            );
-          }
-        });
-      });
-      return {
-        personsAssociated: personsAssociated,
-        personsNotAssociated: personsNotAssociated,
-      };
-    },
-    getCourseParticipations() {
-      let participations = [];
-      this.accompanyingCourse.participations.forEach((participation) => {
-        if (!participation.endDate) {
-          participations.push(participation.person);
-        }
-      });
-      return participations;
-    },
-    addNewPersons({ selected, modal }) {
-      console.log("@@@ CLICK button addNewPersons", selected);
-      selected.forEach((item) => {
-        this.$store.dispatch("addPersonsInvolved", item);
-      }, this);
-      this.$refs.addPersons.resetSearch(); // to cast child method
-      modal.showModal = false;
-      this.setPersonsInBloc();
-    },
-    addSuggestedEntity(person) {
-      this.$store.dispatch("addPersonsInvolved", {
-        result: person,
-        type: "person",
-      });
-      this.setPersonsInBloc();
-    },
-  },
 };
 </script>
 

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonBadge.vue

@@ -1,29 +1,29 @@
 <template>
-  <li>
-    <span :title="person.text" @click.prevent="$emit('remove', person)">
-      <span class="chill_denomination">
-        <person-text :person="person" :is-cut="true" />
-      </span>
-    </span>
-  </li>
+    <li>
+        <span :title="person.text" @click.prevent="$emit('remove', person)">
+            <span class="chill_denomination">
+                <person-text :person="person" :is-cut="true" />
+            </span>
+        </span>
+    </li>
 </template>
 
 <script>
 import PersonText from "ChillPersonAssets/vuejs/_components/Entity/PersonText.vue";
 
 export default {
-  name: "PersonBadge",
-  props: ["person"],
-  components: {
-    PersonText,
-  },
-  // computed: {
-  //    textCutted() {
-  //       let more = (this.person.text.length > 15) ?'…' : '';
-  //       return this.person.text.slice(0,15) + more;
-  //    }
-  // },
-  emits: ["remove"],
+    name: "PersonBadge",
+    props: ["person"],
+    components: {
+        PersonText,
+    },
+    // computed: {
+    //    textCutted() {
+    //       let more = (this.person.text.length > 15) ?'…' : '';
+    //       return this.person.text.slice(0,15) + more;
+    //    }
+    // },
+    emits: ["remove"],
 };
 </script>
 

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/ConcernedGroups/PersonsBloc.vue

@@ -1,38 +1,38 @@
 <template>
-  <div class="item-bloc" :style="{ 'flex-basis': blocWidth }">
-    <div class="item-row">
-      <div class="item-col">
-        <h4>{{ $t(bloc.title) }}</h4>
-      </div>
-      <div class="item-col">
-        <ul class="list-suggest remove-items">
-          <person-badge
-            v-for="person in bloc.persons"
-            :key="person.id"
-            :person="person"
-            @remove="removePerson"
-          />
-        </ul>
-      </div>
+    <div class="item-bloc" :style="{ 'flex-basis': blocWidth }">
+        <div class="item-row">
+            <div class="item-col">
+                <h4>{{ $t(bloc.title) }}</h4>
+            </div>
+            <div class="item-col">
+                <ul class="list-suggest remove-items">
+                    <person-badge
+                        v-for="person in bloc.persons"
+                        :key="person.id"
+                        :person="person"
+                        @remove="removePerson"
+                    />
+                </ul>
+            </div>
+        </div>
     </div>
-  </div>
 </template>
 
 <script>
 import PersonBadge from "./PersonBadge.vue";
 export default {
-  name: "PersonsBloc",
-  components: {
-    PersonBadge,
-  },
-  props: ["bloc", "setPersonsInBloc", "blocWidth"],
-  methods: {
-    removePerson(item) {
-      console.log("@@ CLICK remove person: item", item);
-      this.$store.dispatch("removePersonInvolved", item);
-      this.setPersonsInBloc();
+    name: "PersonsBloc",
+    components: {
+        PersonBadge,
+    },
+    props: ["bloc", "setPersonsInBloc", "blocWidth"],
+    methods: {
+        removePerson(item) {
+            console.log("@@ CLICK remove person: item", item);
+            this.$store.dispatch("removePersonInvolved", item);
+            this.setPersonsInBloc();
+        },
     },
-  },
 };
 </script>
 

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

@@ -1,32 +1,32 @@
 <template>
-  <teleport to="#location">
-    <div class="mb-3 row">
-      <label :class="locationClassList">
-        {{ trans(ACTIVITY_LOCATION) }}
-      </label>
-      <div class="col-sm-8">
-        <VueMultiselect
-          name="selectLocation"
-          id="selectLocation"
-          label="name"
-          track-by="id"
-          open-direction="top"
-          :multiple="false"
-          :searchable="true"
-          :placeholder="trans(ACTIVITY_CHOOSE_LOCATION)"
-          :custom-label="customLabel"
-          :select-label="trans(MULTISELECT_SELECT_LABEL)"
-          :deselect-label="trans(MULTISELECT_DESELECT_LABEL)"
-          :selected-label="trans(MULTISELECT_SELECTED_LABEL)"
-          :options="availableLocations"
-          group-values="locations"
-          group-label="locationGroup"
-          v-model="location"
-        />
-        <new-location v-bind:available-locations="availableLocations" />
-      </div>
-    </div>
-  </teleport>
+    <teleport to="#location">
+        <div class="mb-3 row">
+            <label :class="locationClassList">
+                {{ trans(ACTIVITY_LOCATION) }}
+            </label>
+            <div class="col-sm-8">
+                <VueMultiselect
+                    name="selectLocation"
+                    id="selectLocation"
+                    label="name"
+                    track-by="id"
+                    open-direction="top"
+                    :multiple="false"
+                    :searchable="true"
+                    :placeholder="trans(ACTIVITY_CHOOSE_LOCATION)"
+                    :custom-label="customLabel"
+                    :select-label="trans(MULTISELECT_SELECT_LABEL)"
+                    :deselect-label="trans(MULTISELECT_DESELECT_LABEL)"
+                    :selected-label="trans(MULTISELECT_SELECTED_LABEL)"
+                    :options="availableLocations"
+                    group-values="locations"
+                    group-label="locationGroup"
+                    v-model="location"
+                />
+                <new-location v-bind:available-locations="availableLocations" />
+            </div>
+        </div>
+    </teleport>
 </template>
 
 <script>
@@ -35,60 +35,60 @@ import VueMultiselect from "vue-multiselect";
 import NewLocation from "./Location/NewLocation.vue";
 import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
 import {
-  trans,
-  ACTIVITY_LOCATION,
-  ACTIVITY_CHOOSE_LOCATION,
-  MULTISELECT_SELECT_LABEL,
-  MULTISELECT_DESELECT_LABEL,
-  MULTISELECT_SELECTED_LABEL,
+    trans,
+    ACTIVITY_LOCATION,
+    ACTIVITY_CHOOSE_LOCATION,
+    MULTISELECT_SELECT_LABEL,
+    MULTISELECT_DESELECT_LABEL,
+    MULTISELECT_SELECTED_LABEL,
 } from "translator";
 
 export default {
-  name: "Location",
-  components: {
-    NewLocation,
-    VueMultiselect,
-  },
-  setup() {
-    return {
-      trans,
-      ACTIVITY_LOCATION,
-      ACTIVITY_CHOOSE_LOCATION,
-      MULTISELECT_SELECT_LABEL,
-      MULTISELECT_DESELECT_LABEL,
-      MULTISELECT_SELECTED_LABEL,
-    };
-  },
-  data() {
-    return {
-      locationClassList: `col-form-label col-sm-4 ${document.querySelector("input#chill_activitybundle_activity_location").getAttribute("required") ? "required" : ""}`,
-    };
-  },
-  computed: {
-    ...mapState(["activity", "availableLocations"]),
-    ...mapGetters(["suggestedEntities"]),
-    location: {
-      get() {
-        return this.activity.location;
-      },
-      set(value) {
-        this.$store.dispatch("updateLocation", value);
-      },
+    name: "Location",
+    components: {
+        NewLocation,
+        VueMultiselect,
     },
-  },
-  methods: {
-    labelAccompanyingCourseLocation(value) {
-      return `${value.address.text} (${localizeString(value.locationType.title)})`;
+    setup() {
+        return {
+            trans,
+            ACTIVITY_LOCATION,
+            ACTIVITY_CHOOSE_LOCATION,
+            MULTISELECT_SELECT_LABEL,
+            MULTISELECT_DESELECT_LABEL,
+            MULTISELECT_SELECTED_LABEL,
+        };
     },
-    customLabel(value) {
-      return value.locationType
-        ? value.name
-          ? value.name === "__AccompanyingCourseLocation__"
-            ? this.labelAccompanyingCourseLocation(value)
-            : `${value.name} (${localizeString(value.locationType.title)})`
-          : localizeString(value.locationType.title)
-        : "";
+    data() {
+        return {
+            locationClassList: `col-form-label col-sm-4 ${document.querySelector("input#chill_activitybundle_activity_location").getAttribute("required") ? "required" : ""}`,
+        };
+    },
+    computed: {
+        ...mapState(["activity", "availableLocations"]),
+        ...mapGetters(["suggestedEntities"]),
+        location: {
+            get() {
+                return this.activity.location;
+            },
+            set(value) {
+                this.$store.dispatch("updateLocation", value);
+            },
+        },
+    },
+    methods: {
+        labelAccompanyingCourseLocation(value) {
+            return `${value.address.text} (${localizeString(value.locationType.title)})`;
+        },
+        customLabel(value) {
+            return value.locationType
+                ? value.name
+                    ? value.name === "__AccompanyingCourseLocation__"
+                        ? this.labelAccompanyingCourseLocation(value)
+                        : `${value.name} (${localizeString(value.locationType.title)})`
+                    : localizeString(value.locationType.title)
+                : "";
+        },
     },
-  },
 };
 </script>

src/Bundle/ChillActivityBundle/Resources/public/vuejs/Activity/components/Location/NewLocation.vue

@@ -1,114 +1,123 @@
 <template>
-  <div>
-    <ul class="record_actions">
-      <li>
-        <a class="btn btn-sm btn-create" @click="openModal">
-          {{ trans(ACTIVITY_CREATE_NEW_LOCATION) }}
-        </a>
-      </li>
-    </ul>
+    <div>
+        <ul class="record_actions">
+            <li>
+                <a class="btn btn-sm btn-create" @click="openModal">
+                    {{ trans(ACTIVITY_CREATE_NEW_LOCATION) }}
+                </a>
+            </li>
+        </ul>
 
-    <teleport to="body">
-      <modal
-        v-if="modal.showModal"
-        :modalDialogClass="modal.modalDialogClass"
-        @close="modal.showModal = false"
-      >
-        <template #header>
-          <h3 class="modal-title">
-            {{ trans(ACTIVITY_CREATE_NEW_LOCATION) }}
-          </h3>
-        </template>
-        <template #body>
-          <form>
-            <div class="alert alert-warning" v-if="errors.length">
-              <ul>
-                <li v-for="(e, i) in errors" :key="i">
-                  {{ e }}
-                </li>
-              </ul>
-            </div>
+        <teleport to="body">
+            <modal
+                v-if="modal.showModal"
+                :modalDialogClass="modal.modalDialogClass"
+                @close="modal.showModal = false"
+            >
+                <template #header>
+                    <h3 class="modal-title">
+                        {{ trans(ACTIVITY_CREATE_NEW_LOCATION) }}
+                    </h3>
+                </template>
+                <template #body>
+                    <form>
+                        <div class="alert alert-warning" v-if="errors.length">
+                            <ul>
+                                <li v-for="(e, i) in errors" :key="i">
+                                    {{ e }}
+                                </li>
+                            </ul>
+                        </div>
 
-            <div class="form-floating mb-3">
-              <select
-                class="form-select form-select-lg"
-                id="type"
-                required
-                v-model="selectType"
-              >
-                <option selected disabled value="">
-                  {{ trans(ACTIVITY_CHOOSE_LOCATION_TYPE) }}
-                </option>
-                <option v-for="t in locationTypes" :value="t" :key="t.id">
-                  {{ localizeString(t.title) }}
-                </option>
-              </select>
-              <label>{{ trans(ACTIVITY_LOCATION_FIELDS_TYPE) }}</label>
-            </div>
+                        <div class="form-floating mb-3">
+                            <select
+                                class="form-select form-select-lg"
+                                id="type"
+                                required
+                                v-model="selectType"
+                            >
+                                <option selected disabled value="">
+                                    {{ trans(ACTIVITY_CHOOSE_LOCATION_TYPE) }}
+                                </option>
+                                <option
+                                    v-for="t in locationTypes"
+                                    :value="t"
+                                    :key="t.id"
+                                >
+                                    {{ localizeString(t.title) }}
+                                </option>
+                            </select>
+                            <label>{{
+                                trans(ACTIVITY_LOCATION_FIELDS_TYPE)
+                            }}</label>
+                        </div>
 
-            <div class="form-floating mb-3">
-              <input
-                class="form-control form-control-lg"
-                id="name"
-                v-model="inputName"
-                placeholder
-              />
-              <label for="name">{{
-                trans(ACTIVITY_LOCATION_FIELDS_NAME)
-              }}</label>
-            </div>
+                        <div class="form-floating mb-3">
+                            <input
+                                class="form-control form-control-lg"
+                                id="name"
+                                v-model="inputName"
+                                placeholder
+                            />
+                            <label for="name">{{
+                                trans(ACTIVITY_LOCATION_FIELDS_NAME)
+                            }}</label>
+                        </div>
 
-            <add-address
-              :context="addAddress.context"
-              :options="addAddress.options"
-              :addressChangedCallback="submitNewAddress"
-              v-if="showAddAddress"
-              ref="addAddress"
-            />
+                        <add-address
+                            :context="addAddress.context"
+                            :options="addAddress.options"
+                            :addressChangedCallback="submitNewAddress"
+                            v-if="showAddAddress"
+                            ref="addAddress"
+                        />
 
-            <div class="form-floating mb-3" v-if="showContactData">
-              <input
-                class="form-control form-control-lg"
-                id="phonenumber1"
-                v-model="inputPhonenumber1"
-                placeholder
-              />
-              <label for="phonenumber1">{{
-                trans(ACTIVITY_LOCATION_FIELDS_PHONENUMBER1)
-              }}</label>
-            </div>
-            <div class="form-floating mb-3" v-if="hasPhonenumber1">
-              <input
-                class="form-control form-control-lg"
-                id="phonenumber2"
-                v-model="inputPhonenumber2"
-                placeholder
-              />
-              <label for="phonenumber2">{{
-                trans(ACTIVITY_LOCATION_FIELDS_PHONENUMBER2)
-              }}</label>
-            </div>
-            <div class="form-floating mb-3" v-if="showContactData">
-              <input
-                class="form-control form-control-lg"
-                id="email"
-                v-model="inputEmail"
-                placeholder
-              />
-              <label for="email">{{
-                trans(ACTIVITY_LOCATION_FIELDS_EMAIL)
-              }}</label>
-            </div>
-          </form>
-        </template>
-        <template #footer>
-          <button class="btn btn-save" @click.prevent="saveNewLocation">
-            {{ trans(SAVE) }}
-          </button>
-        </template>
-      </modal>
-    </teleport>
-  </div>
+                        <div class="form-floating mb-3" v-if="showContactData">
+                            <input
+                                class="form-control form-control-lg"
+                                id="phonenumber1"
+                                v-model="inputPhonenumber1"
+                                placeholder
+                            />
+                            <label for="phonenumber1">{{
+                                trans(ACTIVITY_LOCATION_FIELDS_PHONENUMBER1)
+                            }}</label>
+                        </div>
+                        <div class="form-floating mb-3" v-if="hasPhonenumber1">
+                            <input
+                                class="form-control form-control-lg"
+                                id="phonenumber2"
+                                v-model="inputPhonenumber2"
+                                placeholder
+                            />
+                            <label for="phonenumber2">{{
+                                trans(ACTIVITY_LOCATION_FIELDS_PHONENUMBER2)
+                            }}</label>
+                        </div>
+                        <div class="form-floating mb-3" v-if="showContactData">
+                            <input
+                                class="form-control form-control-lg"
+                                id="email"
+                                v-model="inputEmail"
+                                placeholder
+                            />
+                            <label for="email">{{
+                                trans(ACTIVITY_LOCATION_FIELDS_EMAIL)
+                            }}</label>
+                        </div>
+                    </form>
+                </template>
+                <template #footer>
+                    <button
+                        class="btn btn-save"
+                        @click.prevent="saveNewLocation"
+                    >
+                        {{ trans(SAVE) }}
+                    </button>
+                </template>
+            </modal>
+        </teleport>
+    </div>
 </template>
 
 <script>
@@ -119,236 +128,237 @@ import { getLocationTypes } from "../../api";
 import { makeFetch } from "ChillMainAssets/lib/api/apiMethods";
 import { localizeString } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
 import {
-  SAVE,
-  ACTIVITY_LOCATION_FIELDS_EMAIL,
-  ACTIVITY_LOCATION_FIELDS_PHONENUMBER1,
-  ACTIVITY_LOCATION_FIELDS_PHONENUMBER2,
-  ACTIVITY_LOCATION_FIELDS_NAME,
-  ACTIVITY_LOCATION_FIELDS_TYPE,
-  ACTIVITY_CHOOSE_LOCATION_TYPE,
-  ACTIVITY_CREATE_NEW_LOCATION,
-  trans,
+    SAVE,
+    ACTIVITY_LOCATION_FIELDS_EMAIL,
+    ACTIVITY_LOCATION_FIELDS_PHONENUMBER1,
+    ACTIVITY_LOCATION_FIELDS_PHONENUMBER2,
+    ACTIVITY_LOCATION_FIELDS_NAME,
+    ACTIVITY_LOCATION_FIELDS_TYPE,
+    ACTIVITY_CHOOSE_LOCATION_TYPE,
+    ACTIVITY_CREATE_NEW_LOCATION,
+    trans,
 } from "translator";
 
 export default {
-  name: "NewLocation",
-  components: {
-    Modal,
-    AddAddress,
-  },
-  setup() {
-    return {
-      trans,
-      SAVE,
-      ACTIVITY_LOCATION_FIELDS_EMAIL,
-      ACTIVITY_LOCATION_FIELDS_PHONENUMBER1,
-      ACTIVITY_LOCATION_FIELDS_PHONENUMBER2,
-      ACTIVITY_LOCATION_FIELDS_NAME,
-      ACTIVITY_LOCATION_FIELDS_TYPE,
-      ACTIVITY_CHOOSE_LOCATION_TYPE,
-      ACTIVITY_CREATE_NEW_LOCATION,
-    };
-  },
-  props: ["availableLocations"],
-  data() {
-    return {
-      errors: [],
-      selected: {
-        type: null,
-        name: null,
-        addressId: null,
-        phonenumber1: null,
-        phonenumber2: null,
-        email: null,
-      },
-      locationTypes: [],
-      modal: {
-        showModal: false,
-        modalDialogClass: "modal-dialog-scrollable modal-xl",
-      },
-      addAddress: {
-        options: {
-          button: {
-            text: {
-              create: "activity.create_address",
-              edit: "activity.edit_address",
-            },
-            size: "btn-sm",
-          },
-          title: {
-            create: "activity.create_address",
-            edit: "activity.edit_address",
-          },
-        },
-        context: {
-          target: {
-            //name, id
-          },
-          edit: false,
-          addressId: null,
-          defaults: window.addaddress,
-        },
-      },
-    };
-  },
-  computed: {
-    ...mapState(["activity"]),
-    selectType: {
-      get() {
-        return this.selected.type;
-      },
-      set(value) {
-        this.selected.type = value;
-      },
+    name: "NewLocation",
+    components: {
+        Modal,
+        AddAddress,
     },
-    inputName: {
-      get() {
-        return this.selected.name;
-      },
-      set(value) {
-        this.selected.name = value;
-      },
-    },
-    inputEmail: {
-      get() {
-        return this.selected.email;
-      },
-      set(value) {
-        this.selected.email = value;
-      },
-    },
-    inputPhonenumber1: {
-      get() {
-        return this.selected.phonenumber1;
-      },
-      set(value) {
-        this.selected.phonenumber1 = value;
-      },
-    },
-    inputPhonenumber2: {
-      get() {
-        return this.selected.phonenumber2;
-      },
-      set(value) {
-        this.selected.phonenumber2 = value;
-      },
-    },
-    hasPhonenumber1() {
-      return (
-        this.selected.phonenumber1 !== null && this.selected.phonenumber1 !== ""
-      );
-    },
-    showAddAddress() {
-      let cond = false;
-      if (this.selected.type) {
-        if (this.selected.type.addressRequired !== "never") {
-          cond = true;
-        }
-      }
-      return cond;
-    },
-    showContactData() {
-      let cond = false;
-      if (this.selected.type) {
-        if (this.selected.type.contactData !== "never") {
-          cond = true;
-        }
-      }
-      return cond;
-    },
-  },
-  mounted() {
-    this.getLocationTypesList();
-  },
-  methods: {
-    localizeString,
-    checkForm() {
-      let cond = true;
-      this.errors = [];
-      if (!this.selected.type) {
-        this.errors.push("Type de localisation requis");
-        cond = false;
-      } else {
-        if (
-          this.selected.type.addressRequired === "required" &&
-          !this.selected.addressId
-        ) {
-          this.errors.push("Adresse requise");
-          cond = false;
-        }
-        if (
-          this.selected.type.contactData === "required" &&
-          !this.selected.phonenumber1
-        ) {
-          this.errors.push("Numéro de téléphone requis");
-          cond = false;
-        }
-        if (
-          this.selected.type.contactData === "required" &&
-          !this.selected.email
-        ) {
-          this.errors.push("Adresse email requise");
-          cond = false;
-        }
-      }
-      return cond;
-    },
-    getLocationTypesList() {
-      getLocationTypes().then((results) => {
-        this.locationTypes = results.filter(
-          (t) => t.availableForUsers === true,
-        );
-      });
-    },
-    openModal() {
-      this.modal.showModal = true;
-    },
-    saveNewLocation() {
-      if (this.checkForm()) {
-        let body = {
-          type: "location",
-          name: this.selected.name,
-          locationType: {
-            id: this.selected.type.id,
-            type: "location-type",
-          },
-          phonenumber1: this.selected.phonenumber1,
-          phonenumber2: this.selected.phonenumber2,
-          email: this.selected.email,
+    setup() {
+        return {
+            trans,
+            SAVE,
+            ACTIVITY_LOCATION_FIELDS_EMAIL,
+            ACTIVITY_LOCATION_FIELDS_PHONENUMBER1,
+            ACTIVITY_LOCATION_FIELDS_PHONENUMBER2,
+            ACTIVITY_LOCATION_FIELDS_NAME,
+            ACTIVITY_LOCATION_FIELDS_TYPE,
+            ACTIVITY_CHOOSE_LOCATION_TYPE,
+            ACTIVITY_CREATE_NEW_LOCATION,
         };
-        if (this.selected.addressId) {
-          body = Object.assign(body, {
-            address: {
-              id: this.selected.addressId,
+    },
+    props: ["availableLocations"],
+    data() {
+        return {
+            errors: [],
+            selected: {
+                type: null,
+                name: null,
+                addressId: null,
+                phonenumber1: null,
+                phonenumber2: null,
+                email: null,
             },
-          });
-        }
-
-        makeFetch("POST", "/api/1.0/main/location.json", body)
-          .then((response) => {
-            this.$store.dispatch("addAvailableLocationGroup", {
-              locationGroup: "Localisations nouvellement créées",
-              locations: [response],
-            });
-            this.$store.dispatch("updateLocation", response);
-            this.modal.showModal = false;
-          })
-          .catch((error) => {
-            if (error.name === "ValidationException") {
-              for (let v of error.violations) {
-                this.errors.push(v);
-              }
-            } else {
-              this.errors.push("An error occurred");
+            locationTypes: [],
+            modal: {
+                showModal: false,
+                modalDialogClass: "modal-dialog-scrollable modal-xl",
+            },
+            addAddress: {
+                options: {
+                    button: {
+                        text: {
+                            create: "activity.create_address",
+                            edit: "activity.edit_address",
+                        },
+                        size: "btn-sm",
+                    },
+                    title: {
+                        create: "activity.create_address",
+                        edit: "activity.edit_address",
+                    },
+                },
+                context: {
+                    target: {
+                        //name, id
+                    },
+                    edit: false,
+                    addressId: null,
+                    defaults: window.addaddress,
+                },
+            },
+        };
+    },
+    computed: {
+        ...mapState(["activity"]),
+        selectType: {
+            get() {
+                return this.selected.type;
+            },
+            set(value) {
+                this.selected.type = value;
+            },
+        },
+        inputName: {
+            get() {
+                return this.selected.name;
+            },
+            set(value) {
+                this.selected.name = value;
+            },
+        },
+        inputEmail: {
+            get() {
+                return this.selected.email;
+            },
+            set(value) {
+                this.selected.email = value;
+            },
+        },
+        inputPhonenumber1: {
+            get() {
+                return this.selected.phonenumber1;
+            },
+            set(value) {
+                this.selected.phonenumber1 = value;
+            },
+        },
+        inputPhonenumber2: {
+            get() {
+                return this.selected.phonenumber2;
+            },
+            set(value) {
+                this.selected.phonenumber2 = value;
+            },
+        },
+        hasPhonenumber1() {
+            return (
+                this.selected.phonenumber1 !== null &&
+                this.selected.phonenumber1 !== ""
+            );
+        },
+        showAddAddress() {
+            let cond = false;
+            if (this.selected.type) {
+                if (this.selected.type.addressRequired !== "never") {
+                    cond = true;
+                }
             }
-          });
-      }
+            return cond;
+        },
+        showContactData() {
+            let cond = false;
+            if (this.selected.type) {
+                if (this.selected.type.contactData !== "never") {
+                    cond = true;
+                }
+            }
+            return cond;
+        },
     },
-    submitNewAddress(payload) {
-      this.selected.addressId = payload.addressId;
-      this.addAddress.context.addressId = payload.addressId;
-      this.addAddress.context.edit = true;
+    mounted() {
+        this.getLocationTypesList();
+    },
+    methods: {
+        localizeString,
+        checkForm() {
+            let cond = true;
+            this.errors = [];
+            if (!this.selected.type) {
+                this.errors.push("Type de localisation requis");
+                cond = false;
+            } else {
+                if (
+                    this.selected.type.addressRequired === "required" &&
+                    !this.selected.addressId
+                ) {
+                    this.errors.push("Adresse requise");
+                    cond = false;
+                }
+                if (
+                    this.selected.type.contactData === "required" &&
+                    !this.selected.phonenumber1
+                ) {
+                    this.errors.push("Numéro de téléphone requis");
+                    cond = false;
+                }
+                if (
+                    this.selected.type.contactData === "required" &&
+                    !this.selected.email
+                ) {
+                    this.errors.push("Adresse email requise");
+                    cond = false;
+                }
+            }
+            return cond;
+        },
+        getLocationTypesList() {
+            getLocationTypes().then((results) => {
+                this.locationTypes = results.filter(
+                    (t) => t.availableForUsers === true,
+                );
+            });
+        },
+        openModal() {
+            this.modal.showModal = true;
+        },
+        saveNewLocation() {
+            if (this.checkForm()) {
+                let body = {
+                    type: "location",
+                    name: this.selected.name,
+                    locationType: {
+                        id: this.selected.type.id,
+                        type: "location-type",
+                    },
+                    phonenumber1: this.selected.phonenumber1,
+                    phonenumber2: this.selected.phonenumber2,
+                    email: this.selected.email,
+                };
+                if (this.selected.addressId) {
+                    body = Object.assign(body, {
+                        address: {
+                            id: this.selected.addressId,
+                        },
+                    });
+                }
+
+                makeFetch("POST", "/api/1.0/main/location.json", body)
+                    .then((response) => {
+                        this.$store.dispatch("addAvailableLocationGroup", {
+                            locationGroup: "Localisations nouvellement créées",
+                            locations: [response],
+                        });
+                        this.$store.dispatch("updateLocation", response);
+                        this.modal.showModal = false;
+                    })
+                    .catch((error) => {
+                        if (error.name === "ValidationException") {
+                            for (let v of error.violations) {
+                                this.errors.push(v);
+                            }
+                        } else {
+                            this.errors.push("An error occurred");
+                        }
+                    });
+            }
+        },
+        submitNewAddress(payload) {
+            this.selected.addressId = payload.addressId;
+            this.addAddress.context.addressId = payload.addressId;
+            this.addAddress.context.edit = true;
+        },
     },
-  },
 };
 </script>

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/Resources/public/vuejs/Activity/components/SocialIssuesAcc/CheckSocialAction.vue

@@ -1,38 +1,38 @@
 <template>
-  <span class="inline-choice">
-    <div class="form-check">
-      <input
-        class="form-check-input"
-        type="checkbox"
-        v-model="selected"
-        name="action"
-        :id="action.id"
-        :value="action"
-      />
-      <label class="form-check-label" :for="action.id">
-        <span class="badge bg-light text-dark" :title="action.text">{{
-          action.text
-        }}</span>
-      </label>
-    </div>
-  </span>
+    <span class="inline-choice">
+        <div class="form-check">
+            <input
+                class="form-check-input"
+                type="checkbox"
+                v-model="selected"
+                name="action"
+                :id="action.id"
+                :value="action"
+            />
+            <label class="form-check-label" :for="action.id">
+                <span class="badge bg-light text-dark" :title="action.text">{{
+                    action.text
+                }}</span>
+            </label>
+        </div>
+    </span>
 </template>
 
 <script>
 export default {
-  name: "CheckSocialAction",
-  props: ["action", "selection"],
-  emits: ["updateSelected"],
-  computed: {
-    selected: {
-      set(value) {
-        this.$emit("updateSelected", value);
-      },
-      get() {
-        return this.selection;
-      },
+    name: "CheckSocialAction",
+    props: ["action", "selection"],
+    emits: ["updateSelected"],
+    computed: {
+        selected: {
+            set(value) {
+                this.$emit("updateSelected", value);
+            },
+            get() {
+                return this.selection;
+            },
+        },
     },
-  },
 };
 </script>
 
@@ -41,13 +41,25 @@ export default {
 @import "ChillPersonAssets/chill/scss/mixins";
 @import "ChillMainAssets/chill/scss/chill_variables";
 span.badge {
-  @include badge_social($social-action-color);
-  font-size: 95%;
-  margin-bottom: 5px;
-  margin-right: 1em;
-  max-width: 100%; /* Adjust as needed */
-  overflow: hidden;
-  text-overflow: ellipsis;
-  white-space: nowrap;
+    @include badge_social($social-action-color);
+    font-size: 95%;
+    white-space: normal;
+    word-wrap: break-word;
+    word-break: break-word;
+    display: inline-block;
+    max-width: 100%;
+    margin-bottom: 5px;
+    margin-right: 1em;
+    text-align: left;
+    line-height: 1.2em;
+
+    &::before {
+        position: absolute;
+        left: 11px;
+        top: 0;
+        margin: 0 0.3em 0 -0.75em;
+    }
+    position: relative;
+    padding-left: 1.5em;
 }
 </style>

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

@@ -1,36 +1,38 @@
 <template>
-  <span class="inline-choice">
-    <div class="form-check">
-      <input
-        class="form-check-input"
-        type="checkbox"
-        v-model="selected"
-        name="issue"
-        :id="issue.id"
-        :value="issue"
-      />
-      <label class="form-check-label" :for="issue.id">
-        <span class="badge bg-chill-l-gray text-dark">{{ issue.text }}</span>
-      </label>
-    </div>
-  </span>
+    <span class="inline-choice">
+        <div class="form-check">
+            <input
+                class="form-check-input"
+                type="checkbox"
+                v-model="selected"
+                name="issue"
+                :id="issue.id"
+                :value="issue"
+            />
+            <label class="form-check-label" :for="issue.id">
+                <span class="badge bg-chill-l-gray text-dark">{{
+                    issue.text
+                }}</span>
+            </label>
+        </div>
+    </span>
 </template>
 
 <script>
 export default {
-  name: "CheckSocialIssue",
-  props: ["issue", "selection"],
-  emits: ["updateSelected"],
-  computed: {
-    selected: {
-      set(value) {
-        this.$emit("updateSelected", value);
-      },
-      get() {
-        return this.selection;
-      },
+    name: "CheckSocialIssue",
+    props: ["issue", "selection"],
+    emits: ["updateSelected"],
+    computed: {
+        selected: {
+            set(value) {
+                this.$emit("updateSelected", value);
+            },
+            get() {
+                return this.selection;
+            },
+        },
     },
-  },
 };
 </script>
 
@@ -39,9 +41,24 @@ export default {
 @import "ChillPersonAssets/chill/scss/mixins";
 @import "ChillMainAssets/chill/scss/chill_variables";
 span.badge {
-  @include badge_social($social-issue-color);
-  font-size: 95%;
-  margin-bottom: 5px;
-  margin-right: 1em;
+    @include badge_social($social-issue-color);
+    font-size: 95%;
+    white-space: normal;
+    word-wrap: break-word;
+    word-break: break-word;
+    display: inline-block;
+    max-width: 100%;
+    margin-bottom: 5px;
+    margin-right: 1em;
+    text-align: left;
+
+    &::before {
+        position: absolute;
+        left: 11px;
+        top: 0;
+        margin: 0 0.3em 0 -0.75em;
+    }
+    position: relative;
+    padding-left: 1.5em;
 }
 </style>

src/Bundle/ChillActivityBundle/migrations/Version20251118124241.php

@@ -0,0 +1,50 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\Migrations\Activity;
+
+use Doctrine\DBAL\Schema\Schema;
+use Doctrine\Migrations\AbstractMigration;
+
+/**
+ * Migration fixing the automatic association of users to activities (exchanges).
+ *
+ * Originally, the user who created an exchange was not automatically associated
+ * to it (the "TMS" column), which led to incomplete data and biased statistics.
+ *
+ * This migration:
+ *  - retroactively associates the creator of each exchange to the corresponding
+ *    activity;
+ *  - flags these backfilled associations with a temporary column so it is clear
+ *    they were added by this data correction and can be safely cleaned up later.
+ */
+final class Version20251118124241 extends AbstractMigration
+{
+    public function getDescription(): string
+    {
+        return 'Insert the creator of activity into the activity_user table';
+    }
+
+    public function up(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE activity_user ADD COLUMN by_migration BOOL DEFAULT FALSE');
+        $this->addSql("COMMENT ON COLUMN activity_user.by_migration IS 'For backup purpose - can be safely deleted after a while. See migration \\Chill\\Migrations\\Activity\\Version20251118124241'");
+
+        $this->addSql('INSERT INTO activity_user (activity_id, user_id, by_migration)
+            SELECT id, user_id, true FROM activity
+            ON CONFLICT DO NOTHING');
+    }
+
+    public function down(Schema $schema): void
+    {
+        $this->addSql('ALTER TABLE activity_user DROP COLUMN by_migration');
+    }
+}

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

@@ -9,25 +9,25 @@ declare(strict_types=1);
  * the LICENSE file that was distributed with this source code.
  */
 
-namespace Chill\Migrations\Ticket;
+namespace Chill\Migrations\AsideActivity;
 
 use Doctrine\DBAL\Schema\Schema;
 use Doctrine\Migrations\AbstractMigration;
 
-final class Version20250711131126 extends AbstractMigration
+final class Version20251006113048 extends AbstractMigration
 {
     public function getDescription(): string
     {
-        return 'Add supplementaryComments property to Motive entity as JSONB type to store list of comments with label';
+        return 'Add concernedPersonsCount property to AsideActivity entity';
     }
 
     public function up(Schema $schema): void
     {
-        $this->addSql('ALTER TABLE chill_ticket.motive ADD supplementaryComments JSONB DEFAULT \'[]\' NOT NULL');
+        $this->addSql('ALTER TABLE chill_asideactivity.asideactivity ADD concernedPersonsCount INT DEFAULT 0');
     }
 
     public function down(Schema $schema): void
     {
-        $this->addSql('ALTER TABLE chill_ticket.motive DROP supplementaryComments');
+        $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/CalendarAPIController.php

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\CalendarBundle\Controller;
 
 use Chill\CalendarBundle\Repository\CalendarRepository;
+use Chill\CalendarBundle\Repository\InviteRepository;
 use Chill\MainBundle\CRUD\Controller\ApiController;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Serializer\Model\Collection;
@@ -23,7 +24,10 @@ use Symfony\Component\Routing\Annotation\Route;
 
 class CalendarAPIController extends ApiController
 {
-    public function __construct(private readonly CalendarRepository $calendarRepository) {}
+    public function __construct(
+        private readonly CalendarRepository $calendarRepository,
+        private readonly InviteRepository $inviteRepository,
+    ) {}
 
     #[Route(path: '/api/1.0/calendar/calendar/by-user/{id}.{_format}', name: 'chill_api_single_calendar_list_by-user', requirements: ['_format' => 'json'])]
     public function listByUser(User $user, Request $request, string $_format): JsonResponse
@@ -52,16 +56,37 @@ class CalendarAPIController extends ApiController
             throw new BadRequestHttpException('dateTo not parsable');
         }
 
-        $total = $this->calendarRepository->countByUser($user, $dateFrom, $dateTo);
-        $paginator = $this->getPaginatorFactory()->create($total);
-        $ranges = $this->calendarRepository->findByUser(
+        // Get calendar items where user is the main user
+        $ownCalendars = $this->calendarRepository->findByUser(
             $user,
             $dateFrom,
-            $dateTo,
-            $paginator->getItemsPerPage(),
-            $paginator->getCurrentPageFirstItemNumber()
+            $dateTo
         );
 
+        // Get calendar items from accepted invites
+        $acceptedInvites = $this->inviteRepository->findAcceptedInvitesByUserAndDateRange($user, $dateFrom, $dateTo);
+        $inviteCalendars = array_map(fn ($invite) => $invite->getCalendar(), $acceptedInvites);
+
+        // Merge
+        $allCalendars = array_merge($ownCalendars, $inviteCalendars);
+        $uniqueCalendars = [];
+        $seenIds = [];
+
+        foreach ($allCalendars as $calendar) {
+            $id = $calendar->getId();
+            if (!in_array($id, $seenIds, true)) {
+                $seenIds[] = $id;
+                $uniqueCalendars[] = $calendar;
+            }
+        }
+
+        $total = count($uniqueCalendars);
+        $paginator = $this->getPaginatorFactory()->create($total);
+
+        $offset = $paginator->getCurrentPageFirstItemNumber();
+        $limit = $paginator->getItemsPerPage();
+        $ranges = array_slice($uniqueCalendars, $offset, $limit);
+
         $collection = new Collection($ranges, $paginator);
 
         return $this->json($collection, Response::HTTP_OK, [], ['groups' => ['calendar:light']]);

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

@@ -12,6 +12,7 @@ declare(strict_types=1);
 namespace Chill\CalendarBundle\Repository;
 
 use Chill\CalendarBundle\Entity\Invite;
+use Chill\MainBundle\Entity\User;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Doctrine\Persistence\ObjectRepository;
@@ -41,7 +42,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);
     }
@@ -51,6 +52,52 @@ class InviteRepository implements ObjectRepository
         return $this->entityRepository->findOneBy($criteria);
     }
 
+    /**
+     * Find accepted invites for a user within a date range.
+     *
+     * @return array|Invite[]
+     */
+    public function findAcceptedInvitesByUserAndDateRange(User $user, \DateTimeImmutable $from, \DateTimeImmutable $to): array
+    {
+        return $this->buildAcceptedInviteByUserAndDateRangeQuery($user, $from, $to)
+            ->getQuery()
+            ->getResult();
+    }
+
+    /**
+     * Count accepted invites for a user within a date range.
+     */
+    public function countAcceptedInvitesByUserAndDateRange(User $user, \DateTimeImmutable $from, \DateTimeImmutable $to): int
+    {
+        return $this->buildAcceptedInviteByUserAndDateRangeQuery($user, $from, $to)
+            ->select('COUNT(c)')
+            ->getQuery()
+            ->getSingleScalarResult();
+    }
+
+    public function buildAcceptedInviteByUserAndDateRangeQuery(User $user, \DateTimeImmutable $from, \DateTimeImmutable $to)
+    {
+        $qb = $this->entityRepository->createQueryBuilder('i');
+
+        return $qb
+            ->join('i.calendar', 'c')
+            ->where(
+                $qb->expr()->andX(
+                    $qb->expr()->eq('i.user', ':user'),
+                    $qb->expr()->eq('i.status', ':status'),
+                    $qb->expr()->gte('c.startDate', ':startDate'),
+                    $qb->expr()->lte('c.endDate', ':endDate'),
+                    $qb->expr()->isNull('c.cancelReason')
+                )
+            )
+            ->setParameters([
+                'user' => $user,
+                'status' => Invite::ACCEPTED,
+                'startDate' => $from,
+                'endDate' => $to,
+            ]);
+    }
+
     public function getClassName(): string
     {
         return Invite::class;

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/types.ts

@@ -1,74 +1,76 @@
 import { EventInput } from "@fullcalendar/core";
 import {
-  DateTime,
-  Location,
-  User,
-  UserAssociatedInterface,
+    DateTime,
+    Location,
+    User,
+    UserAssociatedInterface,
 } from "../../../ChillMainBundle/Resources/public/types";
 import { Person } from "../../../ChillPersonBundle/Resources/public/types";
 
 export interface CalendarRange {
-  id: number;
-  endDate: DateTime;
-  startDate: DateTime;
-  user: User;
-  location: Location;
-  createdAt: DateTime;
-  createdBy: User;
-  updatedAt: DateTime;
-  updatedBy: User;
+    id: number;
+    endDate: DateTime;
+    startDate: DateTime;
+    user: User;
+    location: Location;
+    createdAt: DateTime;
+    createdBy: User;
+    updatedAt: DateTime;
+    updatedBy: User;
 }
 
 export interface CalendarRangeCreate {
-  user: UserAssociatedInterface;
-  startDate: DateTime;
-  endDate: DateTime;
-  location: Location;
+    user: UserAssociatedInterface;
+    startDate: DateTime;
+    endDate: DateTime;
+    location: Location;
 }
 
 export interface CalendarRangeEdit {
-  startDate?: DateTime;
-  endDate?: DateTime;
-  location?: Location;
+    startDate?: DateTime;
+    endDate?: DateTime;
+    location?: Location;
 }
 
 export interface Calendar {
-  id: number;
+    id: number;
 }
 
 export interface CalendarLight {
-  id: number;
-  endDate: DateTime;
-  startDate: DateTime;
-  mainUser: User;
-  persons: Person[];
-  status: "valid" | "moved" | "canceled";
+    id: number;
+    endDate: DateTime;
+    startDate: DateTime;
+    mainUser: User;
+    persons: Person[];
+    status: "valid" | "moved" | "canceled";
 }
 
 export interface CalendarRemote {
-  id: number;
-  endDate: DateTime;
-  startDate: DateTime;
-  title: string;
-  isAllDay: boolean;
+    id: number;
+    endDate: DateTime;
+    startDate: DateTime;
+    title: string;
+    isAllDay: boolean;
 }
 
 export type EventInputCalendarRange = EventInput & {
-  id: string;
-  userId: number;
-  userLabel: string;
-  calendarRangeId: number;
-  locationId: number;
-  locationName: string;
-  start: string;
-  end: string;
-  is: "range";
+    id: string;
+    userId: number;
+    userLabel: string;
+    calendarRangeId: number;
+    locationId: number;
+    locationName: string;
+    start: string;
+    end: string;
+    is: "range";
 };
 
 export function isEventInputCalendarRange(
-  toBeDetermined: EventInputCalendarRange | EventInput,
+    toBeDetermined: EventInputCalendarRange | EventInput,
 ): toBeDetermined is EventInputCalendarRange {
-  return typeof toBeDetermined.is === "string" && toBeDetermined.is === "range";
+    return (
+        typeof toBeDetermined.is === "string" && toBeDetermined.is === "range"
+    );
 }
 
 export {};

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/Calendar/Components/CalendarActive.vue

@@ -1,105 +1,119 @@
 <template>
-  <div :style="style" class="calendar-active">
-    <span class="badge-user">
-      {{ user.text }}
-      <template v-if="invite !== null">
-        <i v-if="invite.status === 'accepted'" class="fa fa-check" />
-        <i v-else-if="invite.status === 'declined'" class="fa fa-times" />
-        <i v-else-if="invite.status === 'pending'" class="fa fa-question-o" />
-        <i v-else-if="invite.status === 'tentative'" class="fa fa-question" />
-        <span v-else="">{{ invite.status }}</span>
-      </template>
-    </span>
-    <span class="form-check-inline form-switch">
-      <input
-        class="form-check-input"
-        type="checkbox"
-        id="flexSwitchCheckDefault"
-        v-model="rangeShow"
-      />
-      &nbsp;<label
-        class="form-check-label"
-        for="flexSwitchCheckDefault"
-        title="Disponibilités"
-        ><i class="fa fa-calendar-check-o"
-      /></label>
-    </span>
-    <span class="form-check-inline form-switch">
-      <input
-        class="form-check-input"
-        type="checkbox"
-        id="flexSwitchCheckDefault"
-        v-model="remoteShow"
-      />
-      &nbsp;<label
-        class="form-check-label"
-        for="flexSwitchCheckDefault"
-        title="Agenda"
-        ><i class="fa fa-calendar"
-      /></label>
-    </span>
-  </div>
+    <div :style="style" class="calendar-active">
+        <span class="badge-user">
+            {{ user.text }}
+            <template v-if="invite !== null">
+                <i v-if="invite.status === 'accepted'" class="fa fa-check" />
+                <i
+                    v-else-if="invite.status === 'declined'"
+                    class="fa fa-times"
+                />
+                <i
+                    v-else-if="invite.status === 'pending'"
+                    class="fa fa-question-o"
+                />
+                <i
+                    v-else-if="invite.status === 'tentative'"
+                    class="fa fa-question"
+                />
+                <span v-else="">{{ invite.status }}</span>
+            </template>
+        </span>
+        <span class="form-check-inline form-switch">
+            <input
+                class="form-check-input"
+                type="checkbox"
+                id="flexSwitchCheckDefault"
+                v-model="rangeShow"
+            />
+            &nbsp;<label
+                class="form-check-label"
+                for="flexSwitchCheckDefault"
+                title="Disponibilités"
+                ><i class="fa fa-calendar-check-o"
+            /></label>
+        </span>
+        <span class="form-check-inline form-switch">
+            <input
+                class="form-check-input"
+                type="checkbox"
+                id="flexSwitchCheckDefault"
+                v-model="remoteShow"
+            />
+            &nbsp;<label
+                class="form-check-label"
+                for="flexSwitchCheckDefault"
+                title="Agenda"
+                ><i class="fa fa-calendar"
+            /></label>
+        </span>
+    </div>
 </template>
 
 <script>
 import { mapGetters } from "vuex";
 
 export default {
-  name: "CalendarActive",
-  props: {
-    user: {
-      type: Object,
-      required: true,
+    name: "CalendarActive",
+    props: {
+        user: {
+            type: Object,
+            required: true,
+        },
+        invite: {
+            type: Object,
+            required: false,
+            default: null,
+        },
     },
-    invite: {
-      type: Object,
-      required: false,
-      default: null,
+    computed: {
+        style() {
+            return {
+                backgroundColor: this.$store.getters.getUserData(this.user)
+                    .mainColor,
+            };
+        },
+        rangeShow: {
+            set(value) {
+                this.$store.commit("showUserOnCalendar", {
+                    user: this.user,
+                    ranges: value,
+                });
+            },
+            get() {
+                return this.$store.getters.isRangeShownOnCalendarForUser(
+                    this.user,
+                );
+            },
+        },
+        remoteShow: {
+            set(value) {
+                this.$store.commit("showUserOnCalendar", {
+                    user: this.user,
+                    remotes: value,
+                });
+            },
+            get() {
+                return this.$store.getters.isRemoteShownOnCalendarForUser(
+                    this.user,
+                );
+            },
+        },
     },
-  },
-  computed: {
-    style() {
-      return {
-        backgroundColor: this.$store.getters.getUserData(this.user).mainColor,
-      };
-    },
-    rangeShow: {
-      set(value) {
-        this.$store.commit("showUserOnCalendar", {
-          user: this.user,
-          ranges: value,
-        });
-      },
-      get() {
-        return this.$store.getters.isRangeShownOnCalendarForUser(this.user);
-      },
-    },
-    remoteShow: {
-      set(value) {
-        this.$store.commit("showUserOnCalendar", {
-          user: this.user,
-          remotes: value,
-        });
-      },
-      get() {
-        return this.$store.getters.isRemoteShownOnCalendarForUser(this.user);
-      },
-    },
-  },
 };
 </script>
 
 <style scoped lang="scss">
 .calendar-active {
-  margin: 0 0.25rem 0.25rem 0;
-  padding: 0.5rem;
+    margin: 0 0.25rem 0.25rem 0;
+    padding: 0.5rem;
 
-  border-radius: 0.5rem;
+    border-radius: 0.5rem;
 
-  color: var(--bs-blue);
+    color: var(--bs-blue);
 
-  & > .badge-user {
-    margin-right: 0.5rem;
-  }
+    & > .badge-user {
+        margin-right: 0.5rem;
+    }
 }
 </style>

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/api.ts

@@ -14,37 +14,37 @@ export { whoami } from "../../../../../ChillMainBundle/Resources/public/lib/api/
  * @return Promise
  */
 export const fetchCalendarRangeForUser = (
-  user: User,
-  start: Date,
-  end: Date,
+    user: User,
+    start: Date,
+    end: Date,
 ): Promise<CalendarRange[]> => {
-  const uri = `/api/1.0/calendar/calendar-range-available/${user.id}.json`;
-  const dateFrom = datetimeToISO(start);
-  const dateTo = datetimeToISO(end);
+    const uri = `/api/1.0/calendar/calendar-range-available/${user.id}.json`;
+    const dateFrom = datetimeToISO(start);
+    const dateTo = datetimeToISO(end);
 
-  return fetchResults<CalendarRange>(uri, { dateFrom, dateTo });
+    return fetchResults<CalendarRange>(uri, { dateFrom, dateTo });
 };
 
 export const fetchCalendarRemoteForUser = (
-  user: User,
-  start: Date,
-  end: Date,
+    user: User,
+    start: Date,
+    end: Date,
 ): Promise<CalendarRemote[]> => {
-  const uri = `/api/1.0/calendar/proxy/calendar/by-user/${user.id}/events`;
-  const dateFrom = datetimeToISO(start);
-  const dateTo = datetimeToISO(end);
+    const uri = `/api/1.0/calendar/proxy/calendar/by-user/${user.id}/events`;
+    const dateFrom = datetimeToISO(start);
+    const dateTo = datetimeToISO(end);
 
-  return fetchResults<CalendarRemote>(uri, { dateFrom, dateTo });
+    return fetchResults<CalendarRemote>(uri, { dateFrom, dateTo });
 };
 
 export const fetchCalendarLocalForUser = (
-  user: User,
-  start: Date,
-  end: Date,
+    user: User,
+    start: Date,
+    end: Date,
 ): Promise<CalendarLight[]> => {
-  const uri = `/api/1.0/calendar/calendar/by-user/${user.id}.json`;
-  const dateFrom = datetimeToISO(start);
-  const dateTo = datetimeToISO(end);
+    const uri = `/api/1.0/calendar/calendar/by-user/${user.id}.json`;
+    const dateFrom = datetimeToISO(start);
+    const dateTo = datetimeToISO(end);
 
-  return fetchResults<CalendarLight>(uri, { dateFrom, dateTo });
+    return fetchResults<CalendarLight>(uri, { dateFrom, dateTo });
 };

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/const.ts

@@ -1,17 +1,17 @@
 const COLORS = [
-  /* from https://colorbrewer2.org/#type=qualitative&scheme=Set3&n=12 */
-  "#8dd3c7",
-  "#ffffb3",
-  "#bebada",
-  "#fb8072",
-  "#80b1d3",
-  "#fdb462",
-  "#b3de69",
-  "#fccde5",
-  "#d9d9d9",
-  "#bc80bd",
-  "#ccebc5",
-  "#ffed6f",
+    /* from https://colorbrewer2.org/#type=qualitative&scheme=Set3&n=12 */
+    "#8dd3c7",
+    "#ffffb3",
+    "#bebada",
+    "#fb8072",
+    "#80b1d3",
+    "#fdb462",
+    "#b3de69",
+    "#fccde5",
+    "#d9d9d9",
+    "#bc80bd",
+    "#ccebc5",
+    "#ffed6f",
 ];
 
 export { COLORS };

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/store/utils.ts

@@ -1,117 +1,117 @@
 import { COLORS } from "../const";
 import { ISOToDatetime } from "../../../../../../ChillMainBundle/Resources/public/chill/js/date";
 import {
-  DateTime,
-  User,
+    DateTime,
+    User,
 } from "../../../../../../ChillMainBundle/Resources/public/types";
 import { CalendarLight, CalendarRange, CalendarRemote } from "../../../types";
 import type { EventInputCalendarRange } from "../../../types";
 import { EventInput } from "@fullcalendar/core";
 
 export interface UserData {
-  user: User;
-  calendarRanges: CalendarRange[];
-  calendarRangesLoaded: {}[];
-  remotes: CalendarRemote[];
-  remotesLoaded: {}[];
-  locals: CalendarRemote[];
-  localsLoaded: {}[];
-  mainColor: string;
+    user: User;
+    calendarRanges: CalendarRange[];
+    calendarRangesLoaded: {}[];
+    remotes: CalendarRemote[];
+    remotesLoaded: {}[];
+    locals: CalendarRemote[];
+    localsLoaded: {}[];
+    mainColor: string;
 }
 
 export const addIdToValue = (string: string, id: number): string => {
-  const array = string ? string.split(",") : [];
-  array.push(id.toString());
-  const str = array.join();
-  return str;
+    const array = string ? string.split(",") : [];
+    array.push(id.toString());
+    const str = array.join();
+    return str;
 };
 
 export const removeIdFromValue = (string: string, id: number) => {
-  let array = string.split(",");
-  array = array.filter((el) => el !== id.toString());
-  const str = array.join();
-  return str;
+    let array = string.split(",");
+    array = array.filter((el) => el !== id.toString());
+    const str = array.join();
+    return str;
 };
 
 /*
  * Assign missing keys for the ConcernedGroups component
  */
 export const mapEntity = (entity: EventInput): EventInput => {
-  const calendar = { ...entity };
-  Object.assign(calendar, { thirdParties: entity.professionals });
+    const calendar = { ...entity };
+    Object.assign(calendar, { thirdParties: entity.professionals });
 
-  if (entity.startDate !== null) {
-    calendar.startDate = ISOToDatetime(entity.startDate.datetime);
-  }
-  if (entity.endDate !== null) {
-    calendar.endDate = ISOToDatetime(entity.endDate.datetime);
-  }
+    if (entity.startDate !== null) {
+        calendar.startDate = ISOToDatetime(entity.startDate.datetime);
+    }
+    if (entity.endDate !== null) {
+        calendar.endDate = ISOToDatetime(entity.endDate.datetime);
+    }
 
-  if (entity.calendarRange !== null) {
-    calendar.calendarRange.calendarRangeId = entity.calendarRange.id;
-    calendar.calendarRange.id = `range_${entity.calendarRange.id}`;
-  }
+    if (entity.calendarRange !== null) {
+        calendar.calendarRange.calendarRangeId = entity.calendarRange.id;
+        calendar.calendarRange.id = `range_${entity.calendarRange.id}`;
+    }
 
-  return calendar;
+    return calendar;
 };
 
 export const createUserData = (user: User, colorIndex: number): UserData => {
-  const colorId = colorIndex % COLORS.length;
+    const colorId = colorIndex % COLORS.length;
 
-  return {
-    user: user,
-    calendarRanges: [],
-    calendarRangesLoaded: [],
-    remotes: [],
-    remotesLoaded: [],
-    locals: [],
-    localsLoaded: [],
-    mainColor: COLORS[colorId],
-  };
+    return {
+        user: user,
+        calendarRanges: [],
+        calendarRangesLoaded: [],
+        remotes: [],
+        remotesLoaded: [],
+        locals: [],
+        localsLoaded: [],
+        mainColor: COLORS[colorId],
+    };
 };
 
 // TODO move this function to a more global namespace, as it is also in use in MyCalendarRange app
 export const calendarRangeToFullCalendarEvent = (
-  entity: CalendarRange,
+    entity: CalendarRange,
 ): EventInputCalendarRange => {
-  return {
-    id: `range_${entity.id}`,
-    title: "(" + entity.user.text + ")",
-    start: entity.startDate.datetime8601,
-    end: entity.endDate.datetime8601,
-    allDay: false,
-    userId: entity.user.id,
-    userLabel: entity.user.label,
-    calendarRangeId: entity.id,
-    locationId: entity.location.id,
-    locationName: entity.location.name,
-    is: "range",
-  };
+    return {
+        id: `range_${entity.id}`,
+        title: "(" + entity.user.text + ")",
+        start: entity.startDate.datetime8601,
+        end: entity.endDate.datetime8601,
+        allDay: false,
+        userId: entity.user.id,
+        userLabel: entity.user.label,
+        calendarRangeId: entity.id,
+        locationId: entity.location.id,
+        locationName: entity.location.name,
+        is: "range",
+    };
 };
 
 export const remoteToFullCalendarEvent = (
-  entity: CalendarRemote,
+    entity: CalendarRemote,
 ): EventInput & { id: string } => {
-  return {
-    id: `range_${entity.id}`,
-    title: entity.title,
-    start: entity.startDate.datetime8601,
-    end: entity.endDate.datetime8601,
-    allDay: entity.isAllDay,
-    is: "remote",
-  };
+    return {
+        id: `range_${entity.id}`,
+        title: entity.title,
+        start: entity.startDate.datetime8601,
+        end: entity.endDate.datetime8601,
+        allDay: entity.isAllDay,
+        is: "remote",
+    };
 };
 
 export const localsToFullCalendarEvent = (
-  entity: CalendarLight,
+    entity: CalendarLight,
 ): EventInput & { id: string; originId: number } => {
-  return {
-    id: `local_${entity.id}`,
-    title: entity.persons.map((p) => p.text).join(", "),
-    originId: entity.id,
-    start: entity.startDate.datetime8601,
-    end: entity.endDate.datetime8601,
-    allDay: false,
-    is: "local",
-  };
+    return {
+        id: `local_${entity.id}`,
+        title: entity.persons.map((p) => p.text).join(", "),
+        originId: entity.id,
+        start: entity.startDate.datetime8601,
+        end: entity.endDate.datetime8601,
+        allDay: false,
+        is: "local",
+    };
 };

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Invite/Answer.vue

@@ -1,50 +1,58 @@
 <template>
-  <div class="btn-group" role="group">
-    <button
-      id="btnGroupDrop1"
-      type="button"
-      class="btn btn-misc dropdown-toggle"
-      data-bs-toggle="dropdown"
-      aria-expanded="false"
-    >
-      <template v-if="status === Statuses.PENDING">
-        <span class="fa fa-hourglass"></span> {{ $t("Give_an_answer") }}
-      </template>
-      <template v-else-if="status === Statuses.ACCEPTED">
-        <span class="fa fa-check"></span> {{ $t("Accepted") }}
-      </template>
-      <template v-else-if="status === Statuses.DECLINED">
-        <span class="fa fa-times"></span> {{ $t("Declined") }}
-      </template>
-      <template v-else-if="status === Statuses.TENTATIVELY_ACCEPTED">
-        <span class="fa fa-question"></span> {{ $t("Tentative") }}
-      </template>
-    </button>
-    <ul class="dropdown-menu" aria-labelledby="btnGroupDrop1">
-      <li v-if="status !== Statuses.ACCEPTED">
-        <a class="dropdown-item" @click="changeStatus(Statuses.ACCEPTED)"
-          ><i class="fa fa-check" aria-hidden="true"></i> {{ $t("Accept") }}</a
+    <div class="btn-group" role="group">
+        <button
+            id="btnGroupDrop1"
+            type="button"
+            class="btn btn-misc dropdown-toggle"
+            data-bs-toggle="dropdown"
+            aria-expanded="false"
         >
-      </li>
-      <li v-if="status !== Statuses.DECLINED">
-        <a class="dropdown-item" @click="changeStatus(Statuses.DECLINED)"
-          ><i class="fa fa-times" aria-hidden="true"></i> {{ $t("Decline") }}</a
-        >
-      </li>
-      <li v-if="status !== Statuses.TENTATIVELY_ACCEPTED">
-        <a
-          class="dropdown-item"
-          @click="changeStatus(Statuses.TENTATIVELY_ACCEPTED)"
-          ><i class="fa fa-question"></i> {{ $t("Tentatively_accept") }}</a
-        >
-      </li>
-      <li v-if="status !== Statuses.PENDING">
-        <a class="dropdown-item" @click="changeStatus(Statuses.PENDING)"
-          ><i class="fa fa-hourglass-o"></i> {{ $t("Set_pending") }}</a
-        >
-      </li>
-    </ul>
-  </div>
+            <template v-if="status === Statuses.PENDING">
+                <span class="fa fa-hourglass"></span> {{ $t("Give_an_answer") }}
+            </template>
+            <template v-else-if="status === Statuses.ACCEPTED">
+                <span class="fa fa-check"></span> {{ $t("Accepted") }}
+            </template>
+            <template v-else-if="status === Statuses.DECLINED">
+                <span class="fa fa-times"></span> {{ $t("Declined") }}
+            </template>
+            <template v-else-if="status === Statuses.TENTATIVELY_ACCEPTED">
+                <span class="fa fa-question"></span> {{ $t("Tentative") }}
+            </template>
+        </button>
+        <ul class="dropdown-menu" aria-labelledby="btnGroupDrop1">
+            <li v-if="status !== Statuses.ACCEPTED">
+                <a
+                    class="dropdown-item"
+                    @click="changeStatus(Statuses.ACCEPTED)"
+                    ><i class="fa fa-check" aria-hidden="true"></i>
+                    {{ $t("Accept") }}</a
+                >
+            </li>
+            <li v-if="status !== Statuses.DECLINED">
+                <a
+                    class="dropdown-item"
+                    @click="changeStatus(Statuses.DECLINED)"
+                    ><i class="fa fa-times" aria-hidden="true"></i>
+                    {{ $t("Decline") }}</a
+                >
+            </li>
+            <li v-if="status !== Statuses.TENTATIVELY_ACCEPTED">
+                <a
+                    class="dropdown-item"
+                    @click="changeStatus(Statuses.TENTATIVELY_ACCEPTED)"
+                    ><i class="fa fa-question"></i>
+                    {{ $t("Tentatively_accept") }}</a
+                >
+            </li>
+            <li v-if="status !== Statuses.PENDING">
+                <a class="dropdown-item" @click="changeStatus(Statuses.PENDING)"
+                    ><i class="fa fa-hourglass-o"></i>
+                    {{ $t("Set_pending") }}</a
+                >
+            </li>
+        </ul>
+    </div>
 </template>
 
 <script lang="ts">
@@ -56,67 +64,69 @@ const PENDING = "pending";
 const TENTATIVELY_ACCEPTED = "tentative";
 
 const i18n = {
-  messages: {
-    fr: {
-      Give_an_answer: "Répondre",
-      Accepted: "Accepté",
-      Declined: "Refusé",
-      Tentative: "Accepté provisoirement",
-      Accept: "Accepter",
-      Decline: "Refuser",
-      Tentatively_accept: "Accepter provisoirement",
-      Set_pending: "Ne pas répondre",
+    messages: {
+        fr: {
+            Give_an_answer: "Répondre",
+            Accepted: "Accepté",
+            Declined: "Refusé",
+            Tentative: "Accepté provisoirement",
+            Accept: "Accepter",
+            Decline: "Refuser",
+            Tentatively_accept: "Accepter provisoirement",
+            Set_pending: "Ne pas répondre",
+        },
     },
-  },
 };
 
 export default defineComponent({
-  name: "Answer",
-  i18n,
-  props: {
-    calendarId: { type: Number, required: true },
-    status: {
-      type: String as PropType<
-        "accepted" | "declined" | "pending" | "tentative"
-      >,
-      required: true,
+    name: "Answer",
+    i18n,
+    props: {
+        calendarId: { type: Number, required: true },
+        status: {
+            type: String as PropType<
+                "accepted" | "declined" | "pending" | "tentative"
+            >,
+            required: true,
+        },
     },
-  },
-  emits: {
-    statusChanged(payload: "accepted" | "declined" | "pending" | "tentative") {
-      return true;
+    emits: {
+        statusChanged(
+            payload: "accepted" | "declined" | "pending" | "tentative",
+        ) {
+            return true;
+        },
     },
-  },
-  data() {
-    return {
-      Statuses: {
-        ACCEPTED,
-        DECLINED,
-        PENDING,
-        TENTATIVELY_ACCEPTED,
-      },
-    };
-  },
-  methods: {
-    changeStatus: function (
-      newStatus: "accepted" | "declined" | "pending" | "tentative",
-    ) {
-      console.log("changeStatus", newStatus);
-      const url = `/api/1.0/calendar/calendar/${this.$props.calendarId}/answer/${newStatus}.json`;
-      window
-        .fetch(url, {
-          method: "POST",
-        })
-        .then((r: Response) => {
-          if (!r.ok) {
-            console.error("could not confirm answer", newStatus);
-            return;
-          }
-          console.log("answer sent", newStatus);
-          this.$emit("statusChanged", newStatus);
-        });
+    data() {
+        return {
+            Statuses: {
+                ACCEPTED,
+                DECLINED,
+                PENDING,
+                TENTATIVELY_ACCEPTED,
+            },
+        };
+    },
+    methods: {
+        changeStatus: function (
+            newStatus: "accepted" | "declined" | "pending" | "tentative",
+        ) {
+            console.log("changeStatus", newStatus);
+            const url = `/api/1.0/calendar/calendar/${this.$props.calendarId}/answer/${newStatus}.json`;
+            window
+                .fetch(url, {
+                    method: "POST",
+                })
+                .then((r: Response) => {
+                    if (!r.ok) {
+                        console.error("could not confirm answer", newStatus);
+                        return;
+                    }
+                    console.log("answer sent", newStatus);
+                    this.$emit("statusChanged", newStatus);
+                });
+        },
     },
-  },
 });
 </script>
 

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

@@ -1,177 +1,231 @@
 <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
+                >
+                <a
+                    :href="calendarLink(event.id)"
+                    v-else-if="event.extendedProps.is === 'local'"
+                >
+                    <b>{{ event.title }}</b>
+                </a>
+                <b v-else>no 'is'</b>
+                <a
+                    v-if="event.extendedProps.is === 'range'"
+                    class="fa fa-fw fa-times delete"
+                    @click.prevent="onClickDelete(event)"
+                >
+                </a>
+            </span>
         </template>
-        <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 +233,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 +261,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 +396,122 @@ const sources = computed<EventSourceInput[]>(() => {
 */
 
 const calendarOptions = computed((): CalendarOptions => {
-  return {
-    ...baseOptions.value,
-    weekends: showWeekends.value,
-    slotDuration: slotDuration.value,
-    events: ranges.value,
-    slotMinTime: slotMinTime.value,
-    slotMaxTime: slotMaxTime.value,
-  };
+    return {
+        ...baseOptions.value,
+        weekends: showWeekends.value,
+        slotDuration: slotDuration.value,
+        events: ranges.value,
+        slotMinTime: slotMinTime.value,
+        slotMaxTime: slotMaxTime.value,
+    };
 });
 
 /**
  * launched when the calendar range date change
  */
 function onDatesSet(event: DatesSetArg): void {
-  store.dispatch("fullCalendar/setCurrentDatesView", {
-    start: event.start,
-    end: event.end,
-  });
+    store.dispatch("fullCalendar/setCurrentDatesView", {
+        start: event.start,
+        end: event.end,
+    });
 }
 
 function onDateSelect(event: DateSelectArg): void {
-  if (null === pickedLocation.value) {
-    window.alert(
-      "Indiquez une localisation avant de créer une période de disponibilité.",
-    );
-    return;
-  }
+    if (null === pickedLocation.value) {
+        window.alert(
+            "Indiquez une localisation avant de créer une période de disponibilité.",
+        );
+        return;
+    }
 
-  store.dispatch("calendarRanges/createRange", {
-    start: event.start,
-    end: event.end,
-    location: pickedLocation.value,
-  });
+    store.dispatch("calendarRanges/createRange", {
+        start: event.start,
+        end: event.end,
+        location: pickedLocation.value,
+    });
 }
 
 /**
  * When a calendar range is deleted
  */
 function onClickDelete(event: EventApi): void {
-  if (event.extendedProps.is !== "range") {
-    return;
-  }
+    if (event.extendedProps.is !== "range") {
+        return;
+    }
 
-  store.dispatch(
-    "calendarRanges/deleteRange",
-    event.extendedProps.calendarRangeId,
-  );
+    store.dispatch(
+        "calendarRanges/deleteRange",
+        event.extendedProps.calendarRangeId,
+    );
 }
 
 function onEventDropOrResize(payload: EventDropArg | EventResizeDoneArg) {
-  if (payload.event.extendedProps.is !== "range") {
-    return;
-  }
+    if (payload.event.extendedProps.is !== "range") {
+        return;
+    }
 
-  store.dispatch("calendarRanges/patchRangeTime", {
-    calendarRangeId: payload.event.extendedProps.calendarRangeId,
-    start: payload.event.start,
-    end: payload.event.end,
-  });
+    store.dispatch("calendarRanges/patchRangeTime", {
+        calendarRangeId: payload.event.extendedProps.calendarRangeId,
+        start: payload.event.start,
+        end: payload.event.end,
+    });
 }
 
 function onEventClick(payload: EventClickArg): void {
-  // @ts-ignore TS does not recognize the target. But it does exists.
-  if (payload.jsEvent.target.classList.contains("delete")) {
-    return;
-  }
-  if (payload.event.extendedProps.is !== "range") {
-    return;
-  }
+    // @ts-ignore TS does not recognize the target. But it does exists.
+    if (payload.jsEvent.target.classList.contains("delete")) {
+        return;
+    }
+    if (payload.event.extendedProps.is !== "range") {
+        return;
+    }
 
-  editLocation.value?.startEdit(payload.event);
+    editLocation.value?.startEdit(payload.event);
 }
 
 function copyDay() {
-  if (null === copyFrom.value || null === copyTo.value) {
-    return;
-  }
-  store.dispatch("calendarRanges/copyFromDayToAnotherDay", {
-    from: ISOToDate(copyFrom.value),
-    to: ISOToDate(copyTo.value),
-  });
+    if (null === copyFrom.value || null === copyTo.value) {
+        return;
+    }
+    store.dispatch("calendarRanges/copyFromDayToAnotherDay", {
+        from: ISOToDate(copyFrom.value),
+        to: ISOToDate(copyTo.value),
+    });
 }
 
 function copyWeek() {
-  if (null === copyFromWeek.value || null === copyToWeek.value) {
-    return;
-  }
-  store.dispatch("calendarRanges/copyFromWeekToAnotherWeek", {
-    fromMonday: ISOToDate(copyFromWeek.value),
-    toMonday: ISOToDate(copyToWeek.value),
-  });
+    if (null === copyFromWeek.value || null === copyToWeek.value) {
+        return;
+    }
+    store.dispatch("calendarRanges/copyFromWeekToAnotherWeek", {
+        fromMonday: ISOToDate(copyFromWeek.value),
+        toMonday: ISOToDate(copyToWeek.value),
+    });
 }
 
+const calendarLink = (calendarId: string) => {
+    const idStr = calendarId.match(/_(\d+)$/)?.[1];
+
+    return `/fr/calendar/calendar/${idStr}/edit`;
+};
+
 onMounted(() => {
-  copyFromWeek.value = dateToISO(getMonday(0));
-  copyToWeek.value = dateToISO(getMonday(1));
+    copyFromWeek.value = dateToISO(getMonday(0));
+    copyToWeek.value = dateToISO(getMonday(1));
 });
 </script>
 
 <style scoped>
 #copy-widget {
-  position: sticky;
-  bottom: 0px;
-  background-color: white;
-  z-index: 9999999999;
-  padding: 0.25rem 0 0.25rem;
+    position: sticky;
+    bottom: 0px;
+    background-color: white;
+    z-index: 9999999999;
+    padding: 0.25rem 0 0.25rem;
 }
 div.copy-chevron {
-  text-align: center;
-  font-size: x-large;
-  width: 2rem;
+    text-align: center;
+    font-size: x-large;
+    width: 2rem;
 }
 </style>

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/Components/EditLocation.vue

@@ -1,28 +1,28 @@
 <template>
-  <component :is="Teleport" to="body">
-    <modal v-if="showModal" @close="closeModal">
-      <template v-slot:header>
-        <h3>{{ "Modifier le lieu" }}</h3>
-      </template>
+    <component :is="Teleport" to="body">
+        <modal v-if="showModal" @close="closeModal">
+            <template v-slot:header>
+                <h3>{{ "Modifier le lieu" }}</h3>
+            </template>
 
-      <template v-slot:body>
-        <div></div>
-        <label>Localisation</label>
-        <vue-multiselect
-          v-model="location"
-          :options="locations"
-          :label="'name'"
-          :track-by="'id'"
-        ></vue-multiselect>
-      </template>
+            <template v-slot:body>
+                <div></div>
+                <label>Localisation</label>
+                <vue-multiselect
+                    v-model="location"
+                    :options="locations"
+                    :label="'name'"
+                    :track-by="'id'"
+                ></vue-multiselect>
+            </template>
 
-      <template v-slot:footer>
-        <button class="btn btn-save" @click="saveAndClose">
-          {{ "Enregistrer" }}
-        </button>
-      </template>
-    </modal>
-  </component>
+            <template v-slot:footer>
+                <button class="btn btn-save" @click="saveAndClose">
+                    {{ "Enregistrer" }}
+                </button>
+            </template>
+        </modal>
+    </component>
 </template>
 
 <script setup lang="ts">
@@ -39,7 +39,7 @@ import VueMultiselect from "vue-multiselect";
 import { Teleport as teleport_, TeleportProps, VNodeProps } from "vue";
 
 const Teleport = teleport_ as new () => {
-  $props: VNodeProps & TeleportProps;
+    $props: VNodeProps & TeleportProps;
 };
 
 const store = useStore(key);
@@ -50,37 +50,37 @@ const showModal = ref(false);
 //const tele = ref<InstanceType<typeof Teleport> | null>(null);
 
 const locations = computed<Location[]>(() => {
-  return store.state.locations.locations;
+    return store.state.locations.locations;
 });
 
 const startEdit = function (event: EventApi): void {
-  console.log("startEditing", event);
-  calendarRangeId.value = event.extendedProps.calendarRangeId;
-  location.value =
-    store.getters["locations/getLocationById"](
-      event.extendedProps.locationId,
-    ) || null;
+    console.log("startEditing", event);
+    calendarRangeId.value = event.extendedProps.calendarRangeId;
+    location.value =
+        store.getters["locations/getLocationById"](
+            event.extendedProps.locationId,
+        ) || null;
 
-  console.log("new location value", location.value);
-  console.log("calendar range id", calendarRangeId.value);
-  showModal.value = true;
+    console.log("new location value", location.value);
+    console.log("calendar range id", calendarRangeId.value);
+    showModal.value = true;
 };
 
 const saveAndClose = function (e: Event): void {
-  console.log("saveEditAndClose", e);
+    console.log("saveEditAndClose", e);
 
-  store
-    .dispatch("calendarRanges/patchRangeLocation", {
-      location: location.value,
-      calendarRangeId: calendarRangeId.value,
-    })
-    .then((_) => {
-      showModal.value = false;
-    });
+    store
+        .dispatch("calendarRanges/patchRangeLocation", {
+            location: location.value,
+            calendarRangeId: calendarRangeId.value,
+        })
+        .then((_) => {
+            showModal.value = false;
+        });
 };
 
 const closeModal = function (_: any): void {
-  showModal.value = false;
+    showModal.value = false;
 };
 
 defineExpose({ startEdit });

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/i18n.ts

@@ -1,27 +1,27 @@
 const appMessages = {
-  fr: {
-    created_availabilities: "Lieu des plages de disponibilités créées",
-    edit_your_calendar_range: "Planifiez vos plages de disponibilités",
-    show_my_calendar: "Afficher mon calendrier",
-    show_weekends: "Afficher les week-ends",
-    copy_range: "Copier",
-    copy_range_from_to: "Copier les plages",
-    from_day_to_day: "d'un jour à l'autre",
-    from_week_to_week: "d'une semaine à l'autre",
-    copy_range_how_to:
-      "Créez les plages de disponibilités durant une journée et copiez-les facilement au jour suivant avec ce bouton. Si les week-ends sont cachés, le jour suivant un vendredi sera le lundi.",
-    new_range_to_save: "Nouvelles plages à enregistrer",
-    update_range_to_save: "Plages à modifier",
-    delete_range_to_save: "Plages à supprimer",
-    by: "Par",
-    main_user_concerned: "Utilisateur concerné",
-    dateFrom: "De",
-    dateTo: "à",
-    day: "Jour",
-    week: "Semaine",
-    month: "Mois",
-    today: "Aujourd'hui",
-  },
+    fr: {
+        created_availabilities: "Lieu des plages de disponibilités créées",
+        edit_your_calendar_range: "Planifiez vos plages de disponibilités",
+        show_my_calendar: "Afficher mon calendrier",
+        show_weekends: "Afficher les week-ends",
+        copy_range: "Copier",
+        copy_range_from_to: "Copier les plages",
+        from_day_to_day: "d'un jour à l'autre",
+        from_week_to_week: "d'une semaine à l'autre",
+        copy_range_how_to:
+            "Créez les plages de disponibilités durant une journée et copiez-les facilement au jour suivant avec ce bouton. Si les week-ends sont cachés, le jour suivant un vendredi sera le lundi.",
+        new_range_to_save: "Nouvelles plages à enregistrer",
+        update_range_to_save: "Plages à modifier",
+        delete_range_to_save: "Plages à supprimer",
+        by: "Par",
+        main_user_concerned: "Utilisateur concerné",
+        dateFrom: "De",
+        dateTo: "à",
+        day: "Jour",
+        week: "Semaine",
+        month: "Mois",
+        today: "Aujourd'hui",
+    },
 };
 
 export { appMessages };

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/index2.ts

@@ -7,13 +7,13 @@ import App2 from "./App2.vue";
 import { useI18n } from "vue-i18n";
 
 futureStore().then((store) => {
-  const i18n = _createI18n(appMessages, false);
+    const i18n = _createI18n(appMessages, false);
 
-  const app = createApp({
-    template: `<app></app>`,
-  })
-    .use(store, key)
-    .use(i18n)
-    .component("app", App2)
-    .mount("#myCalendar");
+    const app = createApp({
+        template: `<app></app>`,
+    })
+        .use(store, key)
+        .use(i18n)
+        .component("app", App2)
+        .mount("#myCalendar");
 });

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/index.ts

@@ -5,7 +5,7 @@ import me, { MeState } from "./modules/me";
 import fullCalendar, { FullCalendarState } from "./modules/fullcalendar";
 import calendarRanges, { CalendarRangesState } from "./modules/calendarRanges";
 import calendarRemotes, {
-  CalendarRemotesState,
+    CalendarRemotesState,
 } from "./modules/calendarRemotes";
 import { whoami } from "../../../../../../ChillMainBundle/Resources/public/lib/api/user";
 import { User } from "../../../../../../ChillMainBundle/Resources/public/types";
@@ -15,40 +15,42 @@ import calendarLocals, { CalendarLocalsState } from "./modules/calendarLocals";
 const debug = process.env.NODE_ENV !== "production";
 
 export interface State {
-  calendarRanges: CalendarRangesState;
-  calendarRemotes: CalendarRemotesState;
-  calendarLocals: CalendarLocalsState;
-  fullCalendar: FullCalendarState;
-  me: MeState;
-  locations: LocationState;
+    calendarRanges: CalendarRangesState;
+    calendarRemotes: CalendarRemotesState;
+    calendarLocals: CalendarLocalsState;
+    fullCalendar: FullCalendarState;
+    me: MeState;
+    locations: LocationState;
 }
 
 export const key: InjectionKey<Store<State>> = Symbol();
 
 const futureStore = function (): Promise<Store<State>> {
-  return whoami().then((user: User) => {
-    const store = createStore<State>({
-      strict: debug,
-      modules: {
-        me,
-        fullCalendar,
-        calendarRanges,
-        calendarRemotes,
-        calendarLocals,
-        locations,
-      },
-      mutations: {},
-    });
+    return whoami().then((user: User) => {
+        const store = createStore<State>({
+            strict: debug,
+            modules: {
+                me,
+                fullCalendar,
+                calendarRanges,
+                calendarRemotes,
+                calendarLocals,
+                locations,
+            },
+            mutations: {},
+        });
 
-    store.commit("me/setWhoAmi", user, { root: true });
-    store.dispatch("locations/getLocations", null, { root: true }).then((_) => {
-      return store.dispatch("locations/getCurrentLocation", null, {
-        root: true,
-      });
-    });
+        store.commit("me/setWhoAmi", user, { root: true });
+        store
+            .dispatch("locations/getLocations", null, { root: true })
+            .then((_) => {
+                return store.dispatch("locations/getCurrentLocation", null, {
+                    root: true,
+                });
+            });
 
-    return Promise.resolve(store);
-  });
+        return Promise.resolve(store);
+    });
 };
 
 export default futureStore;

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/calendarLocals.ts

@@ -8,99 +8,109 @@ import { TransportExceptionInterface } from "../../../../../../../ChillMainBundl
 import { COLORS } from "../../../Calendar/const";
 
 export interface CalendarLocalsState {
-  locals: EventInput[];
-  localsLoaded: { start: number; end: number }[];
-  localsIndex: Set<string>;
-  key: number;
+    locals: EventInput[];
+    localsLoaded: { start: number; end: number }[];
+    localsIndex: Set<string>;
+    key: number;
 }
 
 type Context = ActionContext<CalendarLocalsState, State>;
 
 export default {
-  namespaced: true,
-  state: (): CalendarLocalsState => ({
-    locals: [],
-    localsLoaded: [],
-    localsIndex: new Set<string>(),
-    key: 0,
-  }),
-  getters: {
-    isLocalsLoaded:
-      (state: CalendarLocalsState) =>
-      ({ start, end }: { start: Date; end: Date }): boolean => {
-        for (const range of state.localsLoaded) {
-          if (start.getTime() === range.start && end.getTime() === range.end) {
-            return true;
-          }
-        }
+    namespaced: true,
+    state: (): CalendarLocalsState => ({
+        locals: [],
+        localsLoaded: [],
+        localsIndex: new Set<string>(),
+        key: 0,
+    }),
+    getters: {
+        isLocalsLoaded:
+            (state: CalendarLocalsState) =>
+            ({ start, end }: { start: Date; end: Date }): boolean => {
+                for (const range of state.localsLoaded) {
+                    if (
+                        start.getTime() === range.start &&
+                        end.getTime() === range.end
+                    ) {
+                        return true;
+                    }
+                }
 
-        return false;
-      },
-  },
-  mutations: {
-    addLocals(state: CalendarLocalsState, ranges: CalendarLight[]) {
-      console.log("addLocals", ranges);
-
-      const toAdd = ranges
-        .map((cr) => localsToFullCalendarEvent(cr))
-        .filter((r) => !state.localsIndex.has(r.id));
-
-      toAdd.forEach((r) => {
-        state.localsIndex.add(r.id);
-        state.locals.push(r);
-      });
-      state.key = state.key + toAdd.length;
+                return false;
+            },
     },
-    addLoaded(state: CalendarLocalsState, payload: { start: Date; end: Date }) {
-      state.localsLoaded.push({
-        start: payload.start.getTime(),
-        end: payload.end.getTime(),
-      });
+    mutations: {
+        addLocals(state: CalendarLocalsState, ranges: CalendarLight[]) {
+            console.log("addLocals", ranges);
+
+            const toAdd = ranges
+                .map((cr) => localsToFullCalendarEvent(cr))
+                .filter((r) => !state.localsIndex.has(r.id));
+
+            toAdd.forEach((r) => {
+                state.localsIndex.add(r.id);
+                state.locals.push(r);
+            });
+            state.key = state.key + toAdd.length;
+        },
+        addLoaded(
+            state: CalendarLocalsState,
+            payload: { start: Date; end: Date },
+        ) {
+            state.localsLoaded.push({
+                start: payload.start.getTime(),
+                end: payload.end.getTime(),
+            });
+        },
     },
-  },
-  actions: {
-    fetchLocals(
-      ctx: Context,
-      payload: { start: Date; end: Date },
-    ): Promise<null> {
-      const start = payload.start;
-      const end = payload.end;
+    actions: {
+        fetchLocals(
+            ctx: Context,
+            payload: { start: Date; end: Date },
+        ): Promise<null> {
+            const start = payload.start;
+            const end = payload.end;
 
-      if (ctx.rootGetters["me/getMe"] === null) {
-        return Promise.resolve(null);
-      }
+            if (ctx.rootGetters["me/getMe"] === null) {
+                return Promise.resolve(null);
+            }
 
-      if (ctx.getters.isLocalsLoaded({ start, end })) {
-        return Promise.resolve(ctx.getters.getRangeSource);
-      }
+            if (ctx.getters.isLocalsLoaded({ start, end })) {
+                return Promise.resolve(ctx.getters.getRangeSource);
+            }
 
-      ctx.commit("addLoaded", {
-        start: start,
-        end: end,
-      });
+            ctx.commit("addLoaded", {
+                start: start,
+                end: end,
+            });
 
-      return fetchCalendarLocalForUser(ctx.rootGetters["me/getMe"], start, end)
-        .then((remotes: CalendarLight[]) => {
-          // to be add when reactivity problem will be solve ?
-          //ctx.commit('addRemotes', remotes);
-          const inputs = remotes
-            .map((cr) => localsToFullCalendarEvent(cr))
-            .map((cr) => ({
-              ...cr,
-              backgroundColor: COLORS[0],
-              textColor: "black",
-              editable: false,
-            }));
-          ctx.commit("calendarRanges/addExternals", inputs, {
-            root: true,
-          });
-          return Promise.resolve(null);
-        })
-        .catch((e: TransportExceptionInterface) => {
-          console.error(e);
+            return fetchCalendarLocalForUser(
+                ctx.rootGetters["me/getMe"],
+                start,
+                end,
+            )
+                .then((remotes: CalendarLight[]) => {
+                    // to be add when reactivity problem will be solve ?
+                    //ctx.commit('addRemotes', remotes);
+                    const inputs = remotes
+                        .map((cr) => localsToFullCalendarEvent(cr))
+                        .map((cr) => ({
+                            ...cr,
+                            backgroundColor: COLORS[0],
+                            textColor: "black",
+                            editable: false,
+                        }));
+                    ctx.commit("calendarRanges/addExternals", inputs, {
+                        root: true,
+                    });
+                    return Promise.resolve(null);
+                })
+                .catch((e: TransportExceptionInterface) => {
+                    console.error(e);
 
-          return Promise.resolve(null);
-        });
+                    return Promise.resolve(null);
+                });
+        },
     },
-  },
 } as Module<CalendarLocalsState, State>;

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/calendarRanges.ts

@@ -1,10 +1,10 @@
 import { State } from "./../index";
 import { ActionContext, Module } from "vuex";
 import {
-  CalendarRange,
-  CalendarRangeCreate,
-  CalendarRangeEdit,
-  isEventInputCalendarRange,
+    CalendarRange,
+    CalendarRangeCreate,
+    CalendarRangeEdit,
+    isEventInputCalendarRange,
 } from "../../../../types";
 import { Location } from "../../../../../../../ChillMainBundle/Resources/public/types";
 import { fetchCalendarRangeForUser } from "../../../Calendar/api";
@@ -12,332 +12,369 @@ import { calendarRangeToFullCalendarEvent } from "../../../Calendar/store/utils"
 import { EventInput } from "@fullcalendar/core";
 import { makeFetch } from "../../../../../../../ChillMainBundle/Resources/public/lib/api/apiMethods";
 import {
-  datetimeToISO,
-  dateToISO,
-  ISOToDatetime,
+    datetimeToISO,
+    dateToISO,
+    ISOToDatetime,
 } from "../../../../../../../ChillMainBundle/Resources/public/chill/js/date";
 import type { EventInputCalendarRange } from "../../../../types";
 
 export interface CalendarRangesState {
-  ranges: (EventInput | EventInputCalendarRange)[];
-  rangesLoaded: { start: number; end: number }[];
-  rangesIndex: Set<string>;
-  key: number;
+    ranges: (EventInput | EventInputCalendarRange)[];
+    rangesLoaded: { start: number; end: number }[];
+    rangesIndex: Set<string>;
+    key: number;
 }
 
 type Context = ActionContext<CalendarRangesState, State>;
 
 export default {
-  namespaced: true,
-  state: (): CalendarRangesState => ({
-    ranges: [],
-    rangesLoaded: [],
-    rangesIndex: new Set<string>(),
-    key: 0,
-  }),
-  getters: {
-    isRangeLoaded:
-      (state: CalendarRangesState) =>
-      ({ start, end }: { start: Date; end: Date }): boolean => {
-        for (const range of state.rangesLoaded) {
-          if (start.getTime() === range.start && end.getTime() === range.end) {
-            return true;
-          }
-        }
+    namespaced: true,
+    state: (): CalendarRangesState => ({
+        ranges: [],
+        rangesLoaded: [],
+        rangesIndex: new Set<string>(),
+        key: 0,
+    }),
+    getters: {
+        isRangeLoaded:
+            (state: CalendarRangesState) =>
+            ({ start, end }: { start: Date; end: Date }): boolean => {
+                for (const range of state.rangesLoaded) {
+                    if (
+                        start.getTime() === range.start &&
+                        end.getTime() === range.end
+                    ) {
+                        return true;
+                    }
+                }
 
-        return false;
-      },
-    getRangesOnDate:
-      (state: CalendarRangesState) =>
-      (date: Date): EventInputCalendarRange[] => {
-        const founds = [];
-        const dateStr = dateToISO(date) as string;
+                return false;
+            },
+        getRangesOnDate:
+            (state: CalendarRangesState) =>
+            (date: Date): EventInputCalendarRange[] => {
+                const founds = [];
+                const dateStr = dateToISO(date) as string;
 
-        for (const range of state.ranges) {
-          if (
-            isEventInputCalendarRange(range) &&
-            range.start.startsWith(dateStr)
-          ) {
-            founds.push(range);
-          }
-        }
+                for (const range of state.ranges) {
+                    if (
+                        isEventInputCalendarRange(range) &&
+                        range.start.startsWith(dateStr)
+                    ) {
+                        founds.push(range);
+                    }
+                }
 
-        return founds;
-      },
-    getRangesOnWeek:
-      (state: CalendarRangesState) =>
-      (mondayDate: Date): EventInputCalendarRange[] => {
-        const founds = [];
-        for (const d of Array.from(Array(7).keys())) {
-          const dateOfWeek = new Date(mondayDate);
-          dateOfWeek.setDate(mondayDate.getDate() + d);
-          const dateStr = dateToISO(dateOfWeek) as string;
-          for (const range of state.ranges) {
-            if (
-              isEventInputCalendarRange(range) &&
-              range.start.startsWith(dateStr)
-            ) {
-              founds.push(range);
+                return founds;
+            },
+        getRangesOnWeek:
+            (state: CalendarRangesState) =>
+            (mondayDate: Date): EventInputCalendarRange[] => {
+                const founds = [];
+                for (const d of Array.from(Array(7).keys())) {
+                    const dateOfWeek = new Date(mondayDate);
+                    dateOfWeek.setDate(mondayDate.getDate() + d);
+                    const dateStr = dateToISO(dateOfWeek) as string;
+                    for (const range of state.ranges) {
+                        if (
+                            isEventInputCalendarRange(range) &&
+                            range.start.startsWith(dateStr)
+                        ) {
+                            founds.push(range);
+                        }
+                    }
+                }
+
+                return founds;
+            },
+    },
+    mutations: {
+        addRanges(state: CalendarRangesState, ranges: CalendarRange[]) {
+            const toAdd = ranges
+                .map((cr) => calendarRangeToFullCalendarEvent(cr))
+                .map((cr) => ({
+                    ...cr,
+                    backgroundColor: "white",
+                    borderColor: "#3788d8",
+                    textColor: "black",
+                }))
+                .filter((r) => !state.rangesIndex.has(r.id));
+
+            toAdd.forEach((r) => {
+                state.rangesIndex.add(r.id);
+                state.ranges.push(r);
+            });
+            state.key = state.key + toAdd.length;
+        },
+        addExternals(
+            state: CalendarRangesState,
+            externalEvents: (EventInput & { id: string })[],
+        ) {
+            const toAdd = externalEvents.filter(
+                (r) => !state.rangesIndex.has(r.id),
+            );
+
+            toAdd.forEach((r) => {
+                state.rangesIndex.add(r.id);
+                state.ranges.push(r);
+            });
+            state.key = state.key + toAdd.length;
+        },
+        addLoaded(
+            state: CalendarRangesState,
+            payload: { start: Date; end: Date },
+        ) {
+            state.rangesLoaded.push({
+                start: payload.start.getTime(),
+                end: payload.end.getTime(),
+            });
+        },
+        addRange(state: CalendarRangesState, payload: CalendarRange) {
+            const asEvent = calendarRangeToFullCalendarEvent(payload);
+            state.ranges.push({
+                ...asEvent,
+                backgroundColor: "white",
+                borderColor: "#3788d8",
+                textColor: "black",
+            });
+            state.rangesIndex.add(asEvent.id);
+            state.key = state.key + 1;
+        },
+        removeRange(state: CalendarRangesState, calendarRangeId: number) {
+            const found = state.ranges.find(
+                (r) =>
+                    r.calendarRangeId === calendarRangeId && r.is === "range",
+            );
+
+            if (found !== undefined) {
+                state.ranges = state.ranges.filter(
+                    (r) =>
+                        !(
+                            r.calendarRangeId === calendarRangeId &&
+                            r.is === "range"
+                        ),
+                );
+
+                if (typeof found.id === "string") {
+                    // should always be true
+                    state.rangesIndex.delete(found.id);
+                }
+
+                state.key = state.key + 1;
             }
-          }
-        }
-
-        return founds;
-      },
-  },
-  mutations: {
-    addRanges(state: CalendarRangesState, ranges: CalendarRange[]) {
-      const toAdd = ranges
-        .map((cr) => calendarRangeToFullCalendarEvent(cr))
-        .map((cr) => ({
-          ...cr,
-          backgroundColor: "white",
-          borderColor: "#3788d8",
-          textColor: "black",
-        }))
-        .filter((r) => !state.rangesIndex.has(r.id));
-
-      toAdd.forEach((r) => {
-        state.rangesIndex.add(r.id);
-        state.ranges.push(r);
-      });
-      state.key = state.key + toAdd.length;
-    },
-    addExternals(
-      state: CalendarRangesState,
-      externalEvents: (EventInput & { id: string })[],
-    ) {
-      const toAdd = externalEvents.filter((r) => !state.rangesIndex.has(r.id));
-
-      toAdd.forEach((r) => {
-        state.rangesIndex.add(r.id);
-        state.ranges.push(r);
-      });
-      state.key = state.key + toAdd.length;
-    },
-    addLoaded(state: CalendarRangesState, payload: { start: Date; end: Date }) {
-      state.rangesLoaded.push({
-        start: payload.start.getTime(),
-        end: payload.end.getTime(),
-      });
-    },
-    addRange(state: CalendarRangesState, payload: CalendarRange) {
-      const asEvent = calendarRangeToFullCalendarEvent(payload);
-      state.ranges.push({
-        ...asEvent,
-        backgroundColor: "white",
-        borderColor: "#3788d8",
-        textColor: "black",
-      });
-      state.rangesIndex.add(asEvent.id);
-      state.key = state.key + 1;
-    },
-    removeRange(state: CalendarRangesState, calendarRangeId: number) {
-      const found = state.ranges.find(
-        (r) => r.calendarRangeId === calendarRangeId && r.is === "range",
-      );
-
-      if (found !== undefined) {
-        state.ranges = state.ranges.filter(
-          (r) => !(r.calendarRangeId === calendarRangeId && r.is === "range"),
-        );
-
-        if (typeof found.id === "string") {
-          // should always be true
-          state.rangesIndex.delete(found.id);
-        }
-
-        state.key = state.key + 1;
-      }
-    },
-    updateRange(state: CalendarRangesState, range: CalendarRange) {
-      const found = state.ranges.find(
-        (r) => r.calendarRangeId === range.id && r.is === "range",
-      );
-      const newEvent = calendarRangeToFullCalendarEvent(range);
-
-      if (found !== undefined) {
-        found.start = newEvent.start;
-        found.end = newEvent.end;
-        found.locationId = range.location.id;
-        found.locationName = range.location.name;
-      }
-
-      state.key = state.key + 1;
-    },
-  },
-  actions: {
-    fetchRanges(
-      ctx: Context,
-      payload: { start: Date; end: Date },
-    ): Promise<null> {
-      const start = payload.start;
-      const end = payload.end;
-
-      if (ctx.rootGetters["me/getMe"] === null) {
-        return Promise.resolve(ctx.getters.getRangeSource);
-      }
-
-      if (ctx.getters.isRangeLoaded({ start, end })) {
-        return Promise.resolve(ctx.getters.getRangeSource);
-      }
-
-      ctx.commit("addLoaded", {
-        start: start,
-        end: end,
-      });
-
-      return fetchCalendarRangeForUser(
-        ctx.rootGetters["me/getMe"],
-        start,
-        end,
-      ).then((ranges: CalendarRange[]) => {
-        ctx.commit("addRanges", ranges);
-        return Promise.resolve(null);
-      });
-    },
-    createRange(
-      ctx: Context,
-      { start, end, location }: { start: Date; end: Date; location: Location },
-    ): Promise<null> {
-      const url = `/api/1.0/calendar/calendar-range.json?`;
-
-      if (ctx.rootState.me.me === null) {
-        throw new Error("user is currently null");
-      }
-
-      const body = {
-        user: {
-          id: ctx.rootState.me.me.id,
-          type: "user",
         },
-        startDate: {
-          datetime: datetimeToISO(start),
+        updateRange(state: CalendarRangesState, range: CalendarRange) {
+            const found = state.ranges.find(
+                (r) => r.calendarRangeId === range.id && r.is === "range",
+            );
+            const newEvent = calendarRangeToFullCalendarEvent(range);
+
+            if (found !== undefined) {
+                found.start = newEvent.start;
+                found.end = newEvent.end;
+                found.locationId = range.location.id;
+                found.locationName = range.location.name;
+            }
+
+            state.key = state.key + 1;
         },
-        endDate: {
-          datetime: datetimeToISO(end),
+    },
+    actions: {
+        fetchRanges(
+            ctx: Context,
+            payload: { start: Date; end: Date },
+        ): Promise<null> {
+            const start = payload.start;
+            const end = payload.end;
+
+            if (ctx.rootGetters["me/getMe"] === null) {
+                return Promise.resolve(ctx.getters.getRangeSource);
+            }
+
+            if (ctx.getters.isRangeLoaded({ start, end })) {
+                return Promise.resolve(ctx.getters.getRangeSource);
+            }
+
+            ctx.commit("addLoaded", {
+                start: start,
+                end: end,
+            });
+
+            return fetchCalendarRangeForUser(
+                ctx.rootGetters["me/getMe"],
+                start,
+                end,
+            ).then((ranges: CalendarRange[]) => {
+                ctx.commit("addRanges", ranges);
+                return Promise.resolve(null);
+            });
         },
-        location: {
-          id: location.id,
-          type: "location",
+        createRange(
+            ctx: Context,
+            {
+                start,
+                end,
+                location,
+            }: { start: Date; end: Date; location: Location },
+        ): Promise<null> {
+            const url = `/api/1.0/calendar/calendar-range.json?`;
+
+            if (ctx.rootState.me.me === null) {
+                throw new Error("user is currently null");
+            }
+
+            const body = {
+                user: {
+                    id: ctx.rootState.me.me.id,
+                    type: "user",
+                },
+                startDate: {
+                    datetime: datetimeToISO(start),
+                },
+                endDate: {
+                    datetime: datetimeToISO(end),
+                },
+                location: {
+                    id: location.id,
+                    type: "location",
+                },
+            } as CalendarRangeCreate;
+
+            return makeFetch<CalendarRangeCreate, CalendarRange>(
+                "POST",
+                url,
+                body,
+            )
+                .then((newRange) => {
+                    ctx.commit("addRange", newRange);
+
+                    return Promise.resolve(null);
+                })
+                .catch((error) => {
+                    console.error(error);
+
+                    throw error;
+                });
         },
-      } as CalendarRangeCreate;
+        deleteRange(ctx: Context, calendarRangeId: number) {
+            const url = `/api/1.0/calendar/calendar-range/${calendarRangeId}.json`;
 
-      return makeFetch<CalendarRangeCreate, CalendarRange>("POST", url, body)
-        .then((newRange) => {
-          ctx.commit("addRange", newRange);
-
-          return Promise.resolve(null);
-        })
-        .catch((error) => {
-          console.error(error);
-
-          throw error;
-        });
-    },
-    deleteRange(ctx: Context, calendarRangeId: number) {
-      const url = `/api/1.0/calendar/calendar-range/${calendarRangeId}.json`;
-
-      makeFetch<undefined, never>("DELETE", url).then(() => {
-        ctx.commit("removeRange", calendarRangeId);
-      });
-    },
-    patchRangeTime(
-      ctx,
-      {
-        calendarRangeId,
-        start,
-        end,
-      }: { calendarRangeId: number; start: Date; end: Date },
-    ): Promise<null> {
-      const url = `/api/1.0/calendar/calendar-range/${calendarRangeId}.json`;
-      const body = {
-        startDate: {
-          datetime: datetimeToISO(start),
+            makeFetch<undefined, never>("DELETE", url).then(() => {
+                ctx.commit("removeRange", calendarRangeId);
+            });
         },
-        endDate: {
-          datetime: datetimeToISO(end),
+        patchRangeTime(
+            ctx,
+            {
+                calendarRangeId,
+                start,
+                end,
+            }: { calendarRangeId: number; start: Date; end: Date },
+        ): Promise<null> {
+            const url = `/api/1.0/calendar/calendar-range/${calendarRangeId}.json`;
+            const body = {
+                startDate: {
+                    datetime: datetimeToISO(start),
+                },
+                endDate: {
+                    datetime: datetimeToISO(end),
+                },
+            } as CalendarRangeEdit;
+
+            return makeFetch<CalendarRangeEdit, CalendarRange>(
+                "PATCH",
+                url,
+                body,
+            )
+                .then((range) => {
+                    ctx.commit("updateRange", range);
+                    return Promise.resolve(null);
+                })
+                .catch((error) => {
+                    console.error(error);
+                    return Promise.resolve(null);
+                });
         },
-      } as CalendarRangeEdit;
+        patchRangeLocation(
+            ctx,
+            {
+                location,
+                calendarRangeId,
+            }: { location: Location; calendarRangeId: number },
+        ): Promise<null> {
+            const url = `/api/1.0/calendar/calendar-range/${calendarRangeId}.json`;
+            const body = {
+                location: {
+                    id: location.id,
+                    type: "location",
+                },
+            } as CalendarRangeEdit;
 
-      return makeFetch<CalendarRangeEdit, CalendarRange>("PATCH", url, body)
-        .then((range) => {
-          ctx.commit("updateRange", range);
-          return Promise.resolve(null);
-        })
-        .catch((error) => {
-          console.error(error);
-          return Promise.resolve(null);
-        });
-    },
-    patchRangeLocation(
-      ctx,
-      {
-        location,
-        calendarRangeId,
-      }: { location: Location; calendarRangeId: number },
-    ): Promise<null> {
-      const url = `/api/1.0/calendar/calendar-range/${calendarRangeId}.json`;
-      const body = {
-        location: {
-          id: location.id,
-          type: "location",
+            return makeFetch<CalendarRangeEdit, CalendarRange>(
+                "PATCH",
+                url,
+                body,
+            )
+                .then((range) => {
+                    ctx.commit("updateRange", range);
+                    return Promise.resolve(null);
+                })
+                .catch((error) => {
+                    console.error(error);
+                    return Promise.resolve(null);
+                });
         },
-      } as CalendarRangeEdit;
+        copyFromDayToAnotherDay(
+            ctx,
+            { from, to }: { from: Date; to: Date },
+        ): Promise<null> {
+            const rangesToCopy: EventInputCalendarRange[] =
+                ctx.getters["getRangesOnDate"](from);
+            const promises = [];
 
-      return makeFetch<CalendarRangeEdit, CalendarRange>("PATCH", url, body)
-        .then((range) => {
-          ctx.commit("updateRange", range);
-          return Promise.resolve(null);
-        })
-        .catch((error) => {
-          console.error(error);
-          return Promise.resolve(null);
-        });
+            for (const r of rangesToCopy) {
+                const start = new Date(ISOToDatetime(r.start) as Date);
+                start.setFullYear(
+                    to.getFullYear(),
+                    to.getMonth(),
+                    to.getDate(),
+                );
+                const end = new Date(ISOToDatetime(r.end) as Date);
+                end.setFullYear(to.getFullYear(), to.getMonth(), to.getDate());
+                const location = ctx.rootGetters["locations/getLocationById"](
+                    r.locationId,
+                );
+
+                promises.push(
+                    ctx.dispatch("createRange", { start, end, location }),
+                );
+            }
+
+            return Promise.all(promises).then(() => Promise.resolve(null));
+        },
+        copyFromWeekToAnotherWeek(
+            ctx: Context,
+            { fromMonday, toMonday }: { fromMonday: Date; toMonday: Date },
+        ): Promise<null> {
+            const rangesToCopy: EventInputCalendarRange[] =
+                ctx.getters["getRangesOnWeek"](fromMonday);
+            const promises = [];
+            const diffTime = toMonday.getTime() - fromMonday.getTime();
+            for (const r of rangesToCopy) {
+                const start = new Date(ISOToDatetime(r.start) as Date);
+                const end = new Date(ISOToDatetime(r.end) as Date);
+                start.setTime(start.getTime() + diffTime);
+                end.setTime(end.getTime() + diffTime);
+                const location = ctx.rootGetters["locations/getLocationById"](
+                    r.locationId,
+                );
+
+                promises.push(
+                    ctx.dispatch("createRange", { start, end, location }),
+                );
+            }
+
+            return Promise.all(promises).then(() => Promise.resolve(null));
+        },
     },
-    copyFromDayToAnotherDay(
-      ctx,
-      { from, to }: { from: Date; to: Date },
-    ): Promise<null> {
-      const rangesToCopy: EventInputCalendarRange[] =
-        ctx.getters["getRangesOnDate"](from);
-      const promises = [];
-
-      for (const r of rangesToCopy) {
-        const start = new Date(ISOToDatetime(r.start) as Date);
-        start.setFullYear(to.getFullYear(), to.getMonth(), to.getDate());
-        const end = new Date(ISOToDatetime(r.end) as Date);
-        end.setFullYear(to.getFullYear(), to.getMonth(), to.getDate());
-        const location = ctx.rootGetters["locations/getLocationById"](
-          r.locationId,
-        );
-
-        promises.push(ctx.dispatch("createRange", { start, end, location }));
-      }
-
-      return Promise.all(promises).then(() => Promise.resolve(null));
-    },
-    copyFromWeekToAnotherWeek(
-      ctx: Context,
-      { fromMonday, toMonday }: { fromMonday: Date; toMonday: Date },
-    ): Promise<null> {
-      const rangesToCopy: EventInputCalendarRange[] =
-        ctx.getters["getRangesOnWeek"](fromMonday);
-      const promises = [];
-      const diffTime = toMonday.getTime() - fromMonday.getTime();
-      for (const r of rangesToCopy) {
-        const start = new Date(ISOToDatetime(r.start) as Date);
-        const end = new Date(ISOToDatetime(r.end) as Date);
-        start.setTime(start.getTime() + diffTime);
-        end.setTime(end.getTime() + diffTime);
-        const location = ctx.rootGetters["locations/getLocationById"](
-          r.locationId,
-        );
-
-        promises.push(ctx.dispatch("createRange", { start, end, location }));
-      }
-
-      return Promise.all(promises).then(() => Promise.resolve(null));
-    },
-  },
 } as Module<CalendarRangesState, State>;

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/calendarRemotes.ts

@@ -8,102 +8,109 @@ import { TransportExceptionInterface } from "../../../../../../../ChillMainBundl
 import { COLORS } from "../../../Calendar/const";
 
 export interface CalendarRemotesState {
-  remotes: EventInput[];
-  remotesLoaded: { start: number; end: number }[];
-  remotesIndex: Set<string>;
-  key: number;
+    remotes: EventInput[];
+    remotesLoaded: { start: number; end: number }[];
+    remotesIndex: Set<string>;
+    key: number;
 }
 
 type Context = ActionContext<CalendarRemotesState, State>;
 
 export default {
-  namespaced: true,
-  state: (): CalendarRemotesState => ({
-    remotes: [],
-    remotesLoaded: [],
-    remotesIndex: new Set<string>(),
-    key: 0,
-  }),
-  getters: {
-    isRemotesLoaded:
-      (state: CalendarRemotesState) =>
-      ({ start, end }: { start: Date; end: Date }): boolean => {
-        for (const range of state.remotesLoaded) {
-          if (start.getTime() === range.start && end.getTime() === range.end) {
-            return true;
-          }
-        }
+    namespaced: true,
+    state: (): CalendarRemotesState => ({
+        remotes: [],
+        remotesLoaded: [],
+        remotesIndex: new Set<string>(),
+        key: 0,
+    }),
+    getters: {
+        isRemotesLoaded:
+            (state: CalendarRemotesState) =>
+            ({ start, end }: { start: Date; end: Date }): boolean => {
+                for (const range of state.remotesLoaded) {
+                    if (
+                        start.getTime() === range.start &&
+                        end.getTime() === range.end
+                    ) {
+                        return true;
+                    }
+                }
 
-        return false;
-      },
-  },
-  mutations: {
-    addRemotes(state: CalendarRemotesState, ranges: CalendarRemote[]) {
-      console.log("addRemotes", ranges);
-
-      const toAdd = ranges
-        .map((cr) => remoteToFullCalendarEvent(cr))
-        .filter((r) => !state.remotesIndex.has(r.id));
-
-      toAdd.forEach((r) => {
-        state.remotesIndex.add(r.id);
-        state.remotes.push(r);
-      });
-      state.key = state.key + toAdd.length;
+                return false;
+            },
     },
-    addLoaded(
-      state: CalendarRemotesState,
-      payload: { start: Date; end: Date },
-    ) {
-      state.remotesLoaded.push({
-        start: payload.start.getTime(),
-        end: payload.end.getTime(),
-      });
+    mutations: {
+        addRemotes(state: CalendarRemotesState, ranges: CalendarRemote[]) {
+            console.log("addRemotes", ranges);
+
+            const toAdd = ranges
+                .map((cr) => remoteToFullCalendarEvent(cr))
+                .filter((r) => !state.remotesIndex.has(r.id));
+
+            toAdd.forEach((r) => {
+                state.remotesIndex.add(r.id);
+                state.remotes.push(r);
+            });
+            state.key = state.key + toAdd.length;
+        },
+        addLoaded(
+            state: CalendarRemotesState,
+            payload: { start: Date; end: Date },
+        ) {
+            state.remotesLoaded.push({
+                start: payload.start.getTime(),
+                end: payload.end.getTime(),
+            });
+        },
     },
-  },
-  actions: {
-    fetchRemotes(
-      ctx: Context,
-      payload: { start: Date; end: Date },
-    ): Promise<null> {
-      const start = payload.start;
-      const end = payload.end;
+    actions: {
+        fetchRemotes(
+            ctx: Context,
+            payload: { start: Date; end: Date },
+        ): Promise<null> {
+            const start = payload.start;
+            const end = payload.end;
 
-      if (ctx.rootGetters["me/getMe"] === null) {
-        return Promise.resolve(null);
-      }
+            if (ctx.rootGetters["me/getMe"] === null) {
+                return Promise.resolve(null);
+            }
 
-      if (ctx.getters.isRemotesLoaded({ start, end })) {
-        return Promise.resolve(ctx.getters.getRangeSource);
-      }
+            if (ctx.getters.isRemotesLoaded({ start, end })) {
+                return Promise.resolve(ctx.getters.getRangeSource);
+            }
 
-      ctx.commit("addLoaded", {
-        start: start,
-        end: end,
-      });
+            ctx.commit("addLoaded", {
+                start: start,
+                end: end,
+            });
 
-      return fetchCalendarRemoteForUser(ctx.rootGetters["me/getMe"], start, end)
-        .then((remotes: CalendarRemote[]) => {
-          // to be add when reactivity problem will be solve ?
-          //ctx.commit('addRemotes', remotes);
-          const inputs = remotes
-            .map((cr) => remoteToFullCalendarEvent(cr))
-            .map((cr) => ({
-              ...cr,
-              backgroundColor: COLORS[0],
-              textColor: "black",
-              editable: false,
-            }));
-          ctx.commit("calendarRanges/addExternals", inputs, {
-            root: true,
-          });
-          return Promise.resolve(null);
-        })
-        .catch((e: TransportExceptionInterface) => {
-          console.error(e);
+            return fetchCalendarRemoteForUser(
+                ctx.rootGetters["me/getMe"],
+                start,
+                end,
+            )
+                .then((remotes: CalendarRemote[]) => {
+                    // to be add when reactivity problem will be solve ?
+                    //ctx.commit('addRemotes', remotes);
+                    const inputs = remotes
+                        .map((cr) => remoteToFullCalendarEvent(cr))
+                        .map((cr) => ({
+                            ...cr,
+                            backgroundColor: COLORS[0],
+                            textColor: "black",
+                            editable: false,
+                        }));
+                    ctx.commit("calendarRanges/addExternals", inputs, {
+                        root: true,
+                    });
+                    return Promise.resolve(null);
+                })
+                .catch((e: TransportExceptionInterface) => {
+                    console.error(e);
 
-          return Promise.resolve(null);
-        });
+                    return Promise.resolve(null);
+                });
+        },
     },
-  },
 } as Module<CalendarRemotesState, State>;

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/fullcalendar.ts

@@ -2,77 +2,77 @@ import { State } from "./../index";
 import { ActionContext } from "vuex";
 
 export interface FullCalendarState {
-  currentView: {
-    start: Date | null;
-    end: Date | null;
-  };
-  key: number;
+    currentView: {
+        start: Date | null;
+        end: Date | null;
+    };
+    key: number;
 }
 
 type Context = ActionContext<FullCalendarState, State>;
 
 export default {
-  namespaced: true,
-  state: (): FullCalendarState => ({
-    currentView: {
-      start: null,
-      end: null,
+    namespaced: true,
+    state: (): FullCalendarState => ({
+        currentView: {
+            start: null,
+            end: null,
+        },
+        key: 0,
+    }),
+    mutations: {
+        setCurrentDatesView: function (
+            state: FullCalendarState,
+            payload: { start: Date; end: Date },
+        ): void {
+            state.currentView.start = payload.start;
+            state.currentView.end = payload.end;
+        },
+        increaseKey: function (state: FullCalendarState): void {
+            state.key = state.key + 1;
+        },
     },
-    key: 0,
-  }),
-  mutations: {
-    setCurrentDatesView: function (
-      state: FullCalendarState,
-      payload: { start: Date; end: Date },
-    ): void {
-      state.currentView.start = payload.start;
-      state.currentView.end = payload.end;
-    },
-    increaseKey: function (state: FullCalendarState): void {
-      state.key = state.key + 1;
-    },
-  },
-  actions: {
-    setCurrentDatesView(
-      ctx: Context,
-      { start, end }: { start: Date | null; end: Date | null },
-    ): Promise<null> {
-      console.log("dispatch setCurrentDatesView", { start, end });
+    actions: {
+        setCurrentDatesView(
+            ctx: Context,
+            { start, end }: { start: Date | null; end: Date | null },
+        ): Promise<null> {
+            console.log("dispatch setCurrentDatesView", { start, end });
 
-      if (
-        ctx.state.currentView.start !== start ||
-        ctx.state.currentView.end !== end
-      ) {
-        ctx.commit("setCurrentDatesView", { start, end });
-      }
+            if (
+                ctx.state.currentView.start !== start ||
+                ctx.state.currentView.end !== end
+            ) {
+                ctx.commit("setCurrentDatesView", { start, end });
+            }
 
-      if (start !== null && end !== null) {
-        return Promise.all([
-          ctx
-            .dispatch(
-              "calendarRanges/fetchRanges",
-              { start, end },
-              { root: true },
-            )
-            .then((_) => Promise.resolve(null)),
-          ctx
-            .dispatch(
-              "calendarRemotes/fetchRemotes",
-              { start, end },
-              { root: true },
-            )
-            .then((_) => Promise.resolve(null)),
-          ctx
-            .dispatch(
-              "calendarLocals/fetchLocals",
-              { start, end },
-              { root: true },
-            )
-            .then((_) => Promise.resolve(null)),
-        ]).then((_) => Promise.resolve(null));
-      } else {
-        return Promise.resolve(null);
-      }
+            if (start !== null && end !== null) {
+                return Promise.all([
+                    ctx
+                        .dispatch(
+                            "calendarRanges/fetchRanges",
+                            { start, end },
+                            { root: true },
+                        )
+                        .then((_) => Promise.resolve(null)),
+                    ctx
+                        .dispatch(
+                            "calendarRemotes/fetchRemotes",
+                            { start, end },
+                            { root: true },
+                        )
+                        .then((_) => Promise.resolve(null)),
+                    ctx
+                        .dispatch(
+                            "calendarLocals/fetchLocals",
+                            { start, end },
+                            { root: true },
+                        )
+                        .then((_) => Promise.resolve(null)),
+                ]).then((_) => Promise.resolve(null));
+            } else {
+                return Promise.resolve(null);
+            }
+        },
     },
-  },
 };

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/location.ts

@@ -5,61 +5,61 @@ import { getLocations } from "../../../../../../../ChillMainBundle/Resources/pub
 import { whereami } from "../../../../../../../ChillMainBundle/Resources/public/lib/api/user";
 
 export interface LocationState {
-  locations: Location[];
-  locationPicked: Location | null;
-  currentLocation: Location | null;
+    locations: Location[];
+    locationPicked: Location | null;
+    currentLocation: Location | null;
 }
 
 export default {
-  namespaced: true,
-  state: (): LocationState => {
-    return {
-      locations: [],
-      locationPicked: null,
-      currentLocation: null,
-    };
-  },
-  getters: {
-    getLocationById:
-      (state) =>
-      (id: number): Location | undefined => {
-        return state.locations.find((l) => l.id === id);
-      },
-  },
-  mutations: {
-    setLocations(state, locations): void {
-      state.locations = locations;
+    namespaced: true,
+    state: (): LocationState => {
+        return {
+            locations: [],
+            locationPicked: null,
+            currentLocation: null,
+        };
     },
-    setLocationPicked(state, location: Location | null): void {
-      if (null === location) {
-        state.locationPicked = null;
-        return;
-      }
+    getters: {
+        getLocationById:
+            (state) =>
+            (id: number): Location | undefined => {
+                return state.locations.find((l) => l.id === id);
+            },
+    },
+    mutations: {
+        setLocations(state, locations): void {
+            state.locations = locations;
+        },
+        setLocationPicked(state, location: Location | null): void {
+            if (null === location) {
+                state.locationPicked = null;
+                return;
+            }
 
-      state.locationPicked =
-        state.locations.find((l) => l.id === location.id) || null;
-    },
-    setCurrentLocation(state, location: Location | null): void {
-      if (null === location) {
-        state.currentLocation = null;
-        return;
-      }
+            state.locationPicked =
+                state.locations.find((l) => l.id === location.id) || null;
+        },
+        setCurrentLocation(state, location: Location | null): void {
+            if (null === location) {
+                state.currentLocation = null;
+                return;
+            }
 
-      state.currentLocation =
-        state.locations.find((l) => l.id === location.id) || null;
+            state.currentLocation =
+                state.locations.find((l) => l.id === location.id) || null;
+        },
     },
-  },
-  actions: {
-    getLocations(ctx): Promise<void> {
-      return getLocations().then((locations) => {
-        ctx.commit("setLocations", locations);
-        return Promise.resolve();
-      });
+    actions: {
+        getLocations(ctx): Promise<void> {
+            return getLocations().then((locations) => {
+                ctx.commit("setLocations", locations);
+                return Promise.resolve();
+            });
+        },
+        getCurrentLocation(ctx): Promise<void> {
+            return whereami().then((location) => {
+                ctx.commit("setCurrentLocation", location);
+            });
+        },
     },
-    getCurrentLocation(ctx): Promise<void> {
-      return whereami().then((location) => {
-        ctx.commit("setCurrentLocation", location);
-      });
-    },
-  },
 } as Module<LocationState, State>;

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/store/modules/me.ts

@@ -3,24 +3,24 @@ import { User } from "../../../../../../../ChillMainBundle/Resources/public/type
 import { ActionContext } from "vuex";
 
 export interface MeState {
-  me: User | null;
+    me: User | null;
 }
 
 type Context = ActionContext<MeState, State>;
 
 export default {
-  namespaced: true,
-  state: (): MeState => ({
-    me: null,
-  }),
-  getters: {
-    getMe: function (state: MeState): User | null {
-      return state.me;
+    namespaced: true,
+    state: (): MeState => ({
+        me: null,
+    }),
+    getters: {
+        getMe: function (state: MeState): User | null {
+            return state.me;
+        },
     },
-  },
-  mutations: {
-    setWhoAmi(state: MeState, me: User) {
-      state.me = me;
+    mutations: {
+        setWhoAmi(state: MeState, me: User) {
+            state.me = me;
+        },
     },
-  },
 };