Change free text field to choice field within cancel reason form

CalendarRemovedMessage should be triggered upon 'editing' the Calendar entity setting it's status to canceled. Otherwise trigger CalendarMessage instead

.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-20250918-114044.yaml

@@ -0,0 +1,6 @@
+kind: Fixed
+body: Increased the number of required characters when setting a new password in Chill from 9 to 14 - GDPR compliance
+time: 2025-09-18T11:40:44.858533536+02:00
+custom:
+    Issue: "426"
+    SchemaChange: No schema change

.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   

.editorconfig

@@ -23,7 +23,7 @@ max_line_length = 0
 indent_size = 2
 indent_style = space
 
-[*.rst]
-indent_size = 3
-indent_style = space
+[.rst]
+ident_size = 3
+ident_style = space
 

.junie/guidelines.md

@@ -234,16 +234,20 @@ 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).
-
-Tests must be run using the `symfony` command:
+The tests are run from the project's root (not from the bundle's root).
 
 ```bash
+# Run all tests
+vendor/bin/phpunit
+
+# Run tests for a specific bundle
+vendor/bin/phpunit --testsuite NameBundle
+
 # Run a specific test file
-symfony composer exec phpunit -- path/to/TestFile.php
+vendor/bin/phpunit path/to/TestFile.php
 
 # Run a specific test method
-symfony composer exec phpunit -- --filter methodName path/to/TestFile.php
+vendor/bin/phpunit --filter methodName path/to/TestFile.php
 ```
 
 #### Test Structure

.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,34 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
+## 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

assets/translator.ts

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

composer.json

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

@@ -35,7 +35,6 @@ 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],
 ];

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

package.json

@@ -79,12 +79,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/Resources/public/vuejs/Activity/components/ConcernedGroups.vue

@@ -10,7 +10,10 @@
             />
         </div>
         <div
-      v-if="getContext === 'accompanyingCourse' && suggestedEntities.length > 0"
+            v-if="
+                getContext === 'accompanyingCourse' &&
+                suggestedEntities.length > 0
+            "
         >
             <ul class="list-suggest add-items inline">
                 <li

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

@@ -39,11 +39,17 @@
                                 <option selected disabled value="">
                                     {{ trans(ACTIVITY_CHOOSE_LOCATION_TYPE) }}
                                 </option>
-                <option v-for="t in locationTypes" :value="t" :key="t.id">
+                                <option
+                                    v-for="t in locationTypes"
+                                    :value="t"
+                                    :key="t.id"
+                                >
                                     {{ localizeString(t.title) }}
                                 </option>
                             </select>
-              <label>{{ trans(ACTIVITY_LOCATION_FIELDS_TYPE) }}</label>
+                            <label>{{
+                                trans(ACTIVITY_LOCATION_FIELDS_TYPE)
+                            }}</label>
                         </div>
 
                         <div class="form-floating mb-3">
@@ -102,7 +108,10 @@
                     </form>
                 </template>
                 <template #footer>
-          <button class="btn btn-save" @click.prevent="saveNewLocation">
+                    <button
+                        class="btn btn-save"
+                        @click.prevent="saveNewLocation"
+                    >
                         {{ trans(SAVE) }}
                     </button>
                 </template>
@@ -235,7 +244,8 @@ export default {
         },
         hasPhonenumber1() {
             return (
-        this.selected.phonenumber1 !== null && this.selected.phonenumber1 !== ""
+                this.selected.phonenumber1 !== null &&
+                this.selected.phonenumber1 !== ""
             );
         },
         showAddAddress() {

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

@@ -49,7 +49,9 @@
             </div>
             <div class="col-8">
                 <div v-if="actionIsLoading === true">
-          <i class="chill-green fa fa-circle-o-notch fa-spin fa-lg"></i>
+                    <i
+                        class="chill-green fa fa-circle-o-notch fa-spin fa-lg"
+                    ></i>
                 </div>
 
                 <span
@@ -62,7 +64,8 @@
                 <template
                     v-else-if="
                         socialActionsList.length > 0 &&
-            (socialIssuesSelected.length || socialActionsSelected.length)
+                        (socialIssuesSelected.length ||
+                            socialActionsSelected.length)
                     "
                 >
                     <div
@@ -85,7 +88,9 @@
                 </template>
 
                 <span
-          v-else-if="actionAreLoaded && socialActionsList.length === 0"
+                    v-else-if="
+                        actionAreLoaded && socialActionsList.length === 0
+                    "
                     class="inline-choice chill-no-data-statement mt-3"
                 >
                     {{ trans(ACTIVITY_SOCIAL_ACTION_LIST_EMPTY) }}
@@ -164,7 +169,8 @@ export default {
             /* 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.socialIssuesList.filter((i) => i.id === issue.id)
+                        .length !== 1
                 ) {
                     this.$store.commit("addIssueInList", issue);
                 }

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

@@ -10,7 +10,9 @@
                 :value="issue"
             />
             <label class="form-check-label" :for="issue.id">
-        <span class="badge bg-chill-l-gray text-dark">{{ issue.text }}</span>
+                <span class="badge bg-chill-l-gray text-dark">{{
+                    issue.text
+                }}</span>
             </label>
         </div>
     </span>

src/Bundle/ChillAsideActivityBundle/src/Resources/views/asideActivity/view.html.twig

@@ -55,5 +55,6 @@
 			</dl>
 
 		{% endblock %}
+        {% block content_view_actions_duplicate_link %}{% endblock %}
 	{% endembed %}
 {% endblock %}

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

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

@@ -68,7 +68,9 @@ export type EventInputCalendarRange = EventInput & {
 export function isEventInputCalendarRange(
     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

@@ -61,14 +61,24 @@
                     <label class="input-group-text" for="slotDuration"
                         >Durée des créneaux</label
                     >
-          <select v-model="slotDuration" id="slotDuration" class="form-select">
+                    <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">
+                    <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>
@@ -84,7 +94,11 @@
                         <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">
+                    <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>
@@ -112,7 +126,9 @@
                                 v-model="hideWeekends"
                             />
                         </span>
-            <label for="showHideWE" class="form-check-label input-group-text"
+                        <label
+                            for="showHideWE"
+                            class="form-check-label input-group-text"
                             >Week-ends</label
                         >
                     </div>
@@ -128,7 +144,9 @@
                     <b v-else-if="arg.event.extendedProps.is === 'range'"
                         >{{ arg.timeText }}
                         {{ arg.event.extendedProps.locationName }}
-            <small>{{ arg.event.extendedProps.userLabel }}</small></b
+                        <small>{{
+                            arg.event.extendedProps.userLabel
+                        }}</small></b
                     >
                     <b v-else-if="arg.event.extendedProps.is === 'current'"
                         >{{ arg.timeText }} {{ $t("current_selected") }}
@@ -136,7 +154,9 @@
                     <b v-else-if="arg.event.extendedProps.is === 'local'">{{
                         arg.event.title
                     }}</b>
-          <b v-else>{{ arg.timeText }} {{ $t("current_selected") }} </b>
+                    <b v-else
+                        >{{ arg.timeText }} {{ $t("current_selected") }}
+                    </b>
                 </span>
             </template>
         </FullCalendar>
@@ -250,7 +270,9 @@ export default {
                     this.$store.state.activity.endDate !== null)
             ) {
                 if (
-          !window.confirm(this.$t("change_main_user_will_reset_event_data"))
+                    !window.confirm(
+                        this.$t("change_main_user_will_reset_event_data"),
+                    )
                 ) {
                     return;
                 }
@@ -258,9 +280,13 @@ export default {
 
             // 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));
+                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.$data.previousUser.push(
+                        this.$store.getters.getMainUser,
+                    );
                 }
             }
 
@@ -290,7 +316,8 @@ export default {
             // show an alert if changing mainUser
             if (
                 (this.$store.getters.getMainUser !== null &&
-          this.$store.state.me.id !== this.$store.getters.getMainUser.id) ||
+                    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"))) {
@@ -334,7 +361,9 @@ export default {
                     this.$store.getters.getMainUser.id
             ) {
                 if (
-          !window.confirm(this.$t("this_calendar_range_will_change_main_user"))
+                    !window.confirm(
+                        this.$t("this_calendar_range_will_change_main_user"),
+                    )
                 ) {
                     return;
                 }

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/Components/CalendarActive.vue

@@ -4,9 +4,18 @@
             {{ 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" />
+                <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>
@@ -60,7 +69,8 @@ export default {
     computed: {
         style() {
             return {
-        backgroundColor: this.$store.getters.getUserData(this.user).mainColor,
+                backgroundColor: this.$store.getters.getUserData(this.user)
+                    .mainColor,
             };
         },
         rangeShow: {
@@ -71,7 +81,9 @@ export default {
                 });
             },
             get() {
-        return this.$store.getters.isRangeShownOnCalendarForUser(this.user);
+                return this.$store.getters.isRangeShownOnCalendarForUser(
+                    this.user,
+                );
             },
         },
         remoteShow: {
@@ -82,7 +94,9 @@ export default {
                 });
             },
             get() {
-        return this.$store.getters.isRemoteShownOnCalendarForUser(this.user);
+                return this.$store.getters.isRemoteShownOnCalendarForUser(
+                    this.user,
+                );
             },
         },
     },

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

@@ -22,25 +22,33 @@
         </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
+                <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
+                <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
+                    ><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
+                    ><i class="fa fa-hourglass-o"></i>
+                    {{ $t("Set_pending") }}</a
                 >
             </li>
         </ul>
@@ -83,7 +91,9 @@ export default defineComponent({
         },
     },
     emits: {
-    statusChanged(payload: "accepted" | "declined" | "pending" | "tentative") {
+        statusChanged(
+            payload: "accepted" | "declined" | "pending" | "tentative",
+        ) {
             return true;
         },
     },

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

@@ -23,14 +23,24 @@
                 <label class="input-group-text" for="slotDuration"
                     >Durée des créneaux</label
                 >
-        <select v-model="slotDuration" id="slotDuration" class="form-select">
+                <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">
+                <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>
@@ -46,7 +56,11 @@
                     <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">
+                <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>
@@ -74,7 +88,9 @@
                             v-model="showWeekends"
                         />
                     </span>
-          <label for="showHideWE" class="form-check-label input-group-text"
+                    <label
+                        for="showHideWE"
+                        class="form-check-label input-group-text"
                         >Week-ends</label
                     >
                 </div>
@@ -84,12 +100,17 @@
     <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-if="event.extendedProps.is === 'remote'">{{
+                    event.title
+                }}</b>
                 <b v-else-if="event.extendedProps.is === 'range'"
-          >{{ formatDate(event.startStr) }} -
+                    >{{ formatDate(event.startStr, "time") }} -
+                    {{ formatDate(event.endStr, "time") }}:
                     {{ event.extendedProps.locationName }}</b
                 >
-        <b v-else-if="event.extendedProps.is === 'local'">{{ event.title }}</b>
+                <b v-else-if="event.extendedProps.is === 'local'">{{
+                    event.title
+                }}</b>
                 <b v-else>no 'is'</b>
                 <a
                     v-if="event.extendedProps.is === 'range'"
@@ -108,7 +129,11 @@
                     <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">
+                    <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") }}
@@ -117,16 +142,27 @@
                 </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" />
+                        <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" />
+                        <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">
+                        <button
+                            class="btn btn-action float-end"
+                            @click="copyDay"
+                        >
                             {{ $t("copy_range") }}
                         </button>
                     </div>
@@ -138,7 +174,11 @@
                             id="copyFromWeek"
                             class="form-select"
                         >
-              <option v-for="w in lastWeeks" :value="w.value" :key="w.value">
+                            <option
+                                v-for="w in lastWeeks"
+                                :value="w.value"
+                                :key="w.value"
+                            >
                                 {{ w.text }}
                             </option>
                         </select>
@@ -147,14 +187,25 @@
                         <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">
+                        <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">
+                        <button
+                            class="btn btn-action float-end"
+                            @click="copyWeek"
+                        >
                             {{ $t("copy_range") }}
                         </button>
                     </div>
@@ -246,9 +297,26 @@ const nextWeeks = computed((): Weeks[] =>
     }),
 );
 
-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>({

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

@@ -41,7 +41,9 @@ const futureStore = function (): Promise<Store<State>> {
         });
 
         store.commit("me/setWhoAmi", user, { root: true });
-    store.dispatch("locations/getLocations", null, { root: true }).then((_) => {
+        store
+            .dispatch("locations/getLocations", null, { root: true })
+            .then((_) => {
                 return store.dispatch("locations/getCurrentLocation", null, {
                     root: true,
                 });

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

@@ -29,7 +29,10 @@ export default {
             (state: CalendarLocalsState) =>
             ({ start, end }: { start: Date; end: Date }): boolean => {
                 for (const range of state.localsLoaded) {
-          if (start.getTime() === range.start && end.getTime() === range.end) {
+                    if (
+                        start.getTime() === range.start &&
+                        end.getTime() === range.end
+                    ) {
                         return true;
                     }
                 }
@@ -51,7 +54,10 @@ export default {
             });
             state.key = state.key + toAdd.length;
         },
-    addLoaded(state: CalendarLocalsState, payload: { start: Date; end: Date }) {
+        addLoaded(
+            state: CalendarLocalsState,
+            payload: { start: Date; end: Date },
+        ) {
             state.localsLoaded.push({
                 start: payload.start.getTime(),
                 end: payload.end.getTime(),
@@ -79,7 +85,11 @@ export default {
                 end: end,
             });
 
-      return fetchCalendarLocalForUser(ctx.rootGetters["me/getMe"], start, 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);

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

@@ -40,7 +40,10 @@ export default {
             (state: CalendarRangesState) =>
             ({ start, end }: { start: Date; end: Date }): boolean => {
                 for (const range of state.rangesLoaded) {
-          if (start.getTime() === range.start && end.getTime() === range.end) {
+                    if (
+                        start.getTime() === range.start &&
+                        end.getTime() === range.end
+                    ) {
                         return true;
                     }
                 }
@@ -107,7 +110,9 @@ export default {
             state: CalendarRangesState,
             externalEvents: (EventInput & { id: string })[],
         ) {
-      const toAdd = externalEvents.filter((r) => !state.rangesIndex.has(r.id));
+            const toAdd = externalEvents.filter(
+                (r) => !state.rangesIndex.has(r.id),
+            );
 
             toAdd.forEach((r) => {
                 state.rangesIndex.add(r.id);
@@ -115,7 +120,10 @@ export default {
             });
             state.key = state.key + toAdd.length;
         },
-    addLoaded(state: CalendarRangesState, payload: { start: Date; end: Date }) {
+        addLoaded(
+            state: CalendarRangesState,
+            payload: { start: Date; end: Date },
+        ) {
             state.rangesLoaded.push({
                 start: payload.start.getTime(),
                 end: payload.end.getTime(),
@@ -134,12 +142,17 @@ export default {
         },
         removeRange(state: CalendarRangesState, calendarRangeId: number) {
             const found = state.ranges.find(
-        (r) => r.calendarRangeId === calendarRangeId && r.is === "range",
+                (r) =>
+                    r.calendarRangeId === calendarRangeId && r.is === "range",
             );
 
             if (found !== undefined) {
                 state.ranges = state.ranges.filter(
-          (r) => !(r.calendarRangeId === calendarRangeId && r.is === "range"),
+                    (r) =>
+                        !(
+                            r.calendarRangeId === calendarRangeId &&
+                            r.is === "range"
+                        ),
                 );
 
                 if (typeof found.id === "string") {
@@ -198,7 +211,11 @@ export default {
         },
         createRange(
             ctx: Context,
-      { start, end, location }: { start: Date; end: Date; location: Location },
+            {
+                start,
+                end,
+                location,
+            }: { start: Date; end: Date; location: Location },
         ): Promise<null> {
             const url = `/api/1.0/calendar/calendar-range.json?`;
 
@@ -223,7 +240,11 @@ export default {
                 },
             } as CalendarRangeCreate;
 
-      return makeFetch<CalendarRangeCreate, CalendarRange>("POST", url, body)
+            return makeFetch<CalendarRangeCreate, CalendarRange>(
+                "POST",
+                url,
+                body,
+            )
                 .then((newRange) => {
                     ctx.commit("addRange", newRange);
 
@@ -260,7 +281,11 @@ export default {
                 },
             } as CalendarRangeEdit;
 
-      return makeFetch<CalendarRangeEdit, CalendarRange>("PATCH", url, body)
+            return makeFetch<CalendarRangeEdit, CalendarRange>(
+                "PATCH",
+                url,
+                body,
+            )
                 .then((range) => {
                     ctx.commit("updateRange", range);
                     return Promise.resolve(null);
@@ -285,7 +310,11 @@ export default {
                 },
             } as CalendarRangeEdit;
 
-      return makeFetch<CalendarRangeEdit, CalendarRange>("PATCH", url, body)
+            return makeFetch<CalendarRangeEdit, CalendarRange>(
+                "PATCH",
+                url,
+                body,
+            )
                 .then((range) => {
                     ctx.commit("updateRange", range);
                     return Promise.resolve(null);
@@ -305,14 +334,20 @@ export default {
 
             for (const r of rangesToCopy) {
                 const start = new Date(ISOToDatetime(r.start) as Date);
-        start.setFullYear(to.getFullYear(), to.getMonth(), to.getDate());
+                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 }));
+                promises.push(
+                    ctx.dispatch("createRange", { start, end, location }),
+                );
             }
 
             return Promise.all(promises).then(() => Promise.resolve(null));
@@ -334,7 +369,9 @@ export default {
                     r.locationId,
                 );
 
-        promises.push(ctx.dispatch("createRange", { start, end, location }));
+                promises.push(
+                    ctx.dispatch("createRange", { start, end, location }),
+                );
             }
 
             return Promise.all(promises).then(() => Promise.resolve(null));

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

@@ -29,7 +29,10 @@ export default {
             (state: CalendarRemotesState) =>
             ({ start, end }: { start: Date; end: Date }): boolean => {
                 for (const range of state.remotesLoaded) {
-          if (start.getTime() === range.start && end.getTime() === range.end) {
+                    if (
+                        start.getTime() === range.start &&
+                        end.getTime() === range.end
+                    ) {
                         return true;
                     }
                 }
@@ -82,7 +85,11 @@ export default {
                 end: end,
             });
 
-      return fetchCalendarRemoteForUser(ctx.rootGetters["me/getMe"], start, 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);

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/_components/CalendarUserSelector/CalendarUserSelector.vue

@@ -112,8 +112,11 @@ export default {
 
                             results.forEach((i) => {
                                 if (!users.some((j) => i.user.id === j.id)) {
-                  let ratio = Math.floor(users.length / COLORS.length);
-                  let colorIndex = users.length - ratio * COLORS.length;
+                                    let ratio = Math.floor(
+                                        users.length / COLORS.length,
+                                    );
+                                    let colorIndex =
+                                        users.length - ratio * COLORS.length;
                                     users.push({
                                         id: i.user.id,
                                         username: i.user.username,
@@ -150,29 +153,45 @@ export default {
                                 (me) =>
                                     new Promise((resolve, reject) => {
                                         this.users.logged = me;
-                    let currentUser = users.find((u) => u.id === me.id);
+                                        let currentUser = users.find(
+                                            (u) => u.id === me.id,
+                                        );
                                         this.value = currentUser;
 
                                         fetchCalendar(currentUser.id).then(
                                             (calendar) =>
-                        new Promise((resolve, reject) => {
-                          let results = calendar.results;
-                          let events = results.map((i) => ({
-                            start: i.startDate.datetime,
-                            end: i.endDate.datetime,
-                          }));
-                          let calendarEventsCurrentUser = {
+                                                new Promise(
+                                                    (resolve, reject) => {
+                                                        let results =
+                                                            calendar.results;
+                                                        let events =
+                                                            results.map(
+                                                                (i) => ({
+                                                                    start: i
+                                                                        .startDate
+                                                                        .datetime,
+                                                                    end: i
+                                                                        .endDate
+                                                                        .datetime,
+                                                                }),
+                                                            );
+                                                        let calendarEventsCurrentUser =
+                                                            {
                                                                 events: events,
                                                                 color: "darkblue",
                                                                 id: 1000,
                                                                 editable: false,
                                                             };
-                          this.calendarEvents.user = calendarEventsCurrentUser;
+                                                        this.calendarEvents.user =
+                                                            calendarEventsCurrentUser;
 
-                          this.selectUsers(currentUser);
+                                                        this.selectUsers(
+                                                            currentUser,
+                                                        );
 
                                                         resolve();
-                        }),
+                                                    },
+                                                ),
                                         );
 
                                         resolve();
@@ -190,7 +209,9 @@ export default {
             return `${value.username}`;
         },
         coloriseSelectedValues() {
-      let tags = document.querySelectorAll("div.multiselect__tags-wrap")[0];
+            let tags = document.querySelectorAll(
+                "div.multiselect__tags-wrap",
+            )[0];
 
             if (tags.hasChildNodes()) {
                 let children = tags.childNodes;
@@ -211,8 +232,8 @@ export default {
         },
         selectEvents() {
             let selectedUsersId = this.users.selected.map((a) => a.id);
-      this.calendarEvents.selected = this.calendarEvents.loaded.filter((a) =>
-        selectedUsersId.includes(a.id),
+            this.calendarEvents.selected = this.calendarEvents.loaded.filter(
+                (a) => selectedUsersId.includes(a.id),
             );
         },
         selectUsers(value) {
@@ -222,7 +243,9 @@ export default {
             this.updateEventsSource();
         },
         unSelectUsers(value) {
-      this.users.selected = this.users.selected.filter((a) => a.id != value.id);
+            this.users.selected = this.users.selected.filter(
+                (a) => a.id != value.id,
+            );
             this.selectEvents();
             this.updateEventsSource();
         },

src/Bundle/ChillCalendarBundle/Resources/views/Calendar/_list.html.twig

@@ -9,9 +9,20 @@
                 <div class="item-row main">
                     <div class="item-col">
                         <div class="wrap-header">
+                            <div class="wl-row">
+                                {% if calendar.status == 'canceled' %}
+                                <div class="badge rounded-pill bg-danger">
+                                    <span>{{ 'chill_calendar.canceled'|trans }}: </span>
+                                    <span>{{ calendar.cancelReason.name|localize_translatable_string }}</span>
+                                </div>
+                                    {% endif %}
+                            </div>
                             <div class="wl-row">
                                 <div class="wl-col title">
                                     <p class="date-label">
+                                        {% if calendar.status == 'canceled' %}
+                                        <del>
+                                            {% endif %}
                                         {% if context == 'person' and calendar.context == 'accompanying_period' %}
                                             <a href="{{ chill_path_add_return_path('chill_person_accompanying_course_index', {'accompanying_period_id': calendar.accompanyingPeriod.id}) }}" style="text-decoration: none;">
                                                 <span class="badge bg-primary">
@@ -19,6 +30,9 @@
                                                 </span>
                                             </a>
                                         {% endif %}
+                                        {% if calendar.status == 'canceled' %}
+                                            <del>
+                                        {% endif %}
                                         {% if calendar.endDate.diff(calendar.startDate).days >= 1 %}
                                                 {{ calendar.startDate|format_datetime('short', 'short') }}
                                                 - {{ calendar.endDate|format_datetime('short', 'short') }}
@@ -26,13 +40,15 @@
                                             {{ calendar.startDate|format_datetime('short', 'short') }}
                                                 - {{ calendar.endDate|format_datetime('none', 'short') }}
                                         {% endif %}
-                                    </p>
+                                        {% if calendar.status == 'canceled' %}
+                                            </del>
+                                        {% endif %}
 
                                     <div class="duration short-message">
                                         <i class="fa fa-fw fa-hourglass-end"></i>
                                         {{ calendar.duration|date('%H:%I') }}
                                         {% if false == calendar.sendSMS or null == calendar.sendSMS %}
-                                            <!-- no sms will be send -->
+                                            <!-- no sms will be sent -->
                                         {% else %}
                                             {% if calendar.smsStatus == 'sms_sent' %}
                                                 <span title="{{ 'SMS already sent'|trans }}" class="badge bg-info">
@@ -63,8 +79,7 @@
                     </div>
                 </div>
 
-                {% if calendar.comment.comment is not empty
-                    or calendar.users|length > 0
+                {% if calendar.users|length > 0
                     or calendar.thirdParties|length > 0
                     or calendar.users|length > 0 %}
                     <div class="item-row details separator">
@@ -103,12 +118,13 @@
                     </div>
                 {% endif %}
 
+                {% if calendar.documents is not empty %}
                     <div class="item-row separator column">
                         <div>
-
                             {{ include('@ChillCalendar/Calendar/_documents.twig.html') }}
                         </div>
                     </div>
+                {% endif %}
 
                 {% if calendar.activity is not null %}
                     <div class="item-row separator">
@@ -151,7 +167,7 @@
 
                 <div class="item-row separator">
                     <ul class="record_actions">
-                        {% if is_granted('CHILL_CALENDAR_DOC_EDIT', calendar) %}
+                        {% if is_granted('CHILL_CALENDAR_DOC_EDIT', calendar) and calendar.status is not constant('STATUS_CANCELED', calendar) %}
                             {% if templates|length == 0 %}
                                 <li>
                                     <a class="btn btn-create"
@@ -191,6 +207,7 @@
                             or
                             (calendar.context == 'person' and is_granted('CHILL_ACTIVITY_CREATE', calendar.person))
                             )
+                            and calendar.status is not constant('STATUS_CANCELED', calendar)
                         %}
                             <li>
                                 <a class="btn btn-create"
@@ -213,12 +230,18 @@
                                    class="btn btn-show "></a>
                             </li>
                         {% endif %}
-                        {% if is_granted('CHILL_CALENDAR_CALENDAR_EDIT', calendar) %}
+
+                        {% if is_granted('CHILL_CALENDAR_CALENDAR_EDIT', calendar) and calendar.status is not constant('STATUS_CANCELED', calendar) %}
                         <li>
                             <a href="{{ chill_path_add_return_path('chill_calendar_calendar_edit', { 'id': calendar.id }) }}"
                                class="btn btn-update "></a>
                         </li>
+                        <li>
+                            <a href="{{ chill_path_add_return_path('chill_calendar_calendar_cancel', { 'id': calendar.id } ) }}"
+                               class="btn btn-remove">{{ 'Cancel'|trans }}</a>
+                        </li>
                         {% endif %}
+
                         {% if is_granted('CHILL_CALENDAR_CALENDAR_DELETE', calendar) %}
                         <li>
                             <a href="{{ chill_path_add_return_path('chill_calendar_calendar_delete', { 'id': calendar.id } ) }}"

src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByAccompanyingCourse.html.twig

@@ -0,0 +1,29 @@
+{% extends "@ChillPerson/AccompanyingCourse/layout.html.twig" %}
+
+{% set activeRouteKey = 'chill_calendar_calendar_list' %}
+
+{% block title  'chill_calendar.cancel_calendar_item'|trans %}
+
+{% block content %}
+
+    {{ form_start(form) }}
+
+    {{ form_row(form.cancelReason) }}
+
+    <ul class="record_actions sticky-form-buttons">
+        <li class="save">
+            <a
+                class="btn btn-cancel"
+                href="{{ chill_return_path_or('chill_calendar_calendar_list', { 'id': accompanyingCourse.id } )}}"
+            >
+                {{ 'Cancel'|trans|chill_return_path_label }}
+            </a>
+        </li>
+        <li>
+            {{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-save' }, 'label': 'Save' } ) }}
+        </li>
+    </ul>
+
+    {{ form_end(form) }}
+
+{% endblock %}

src/Bundle/ChillCalendarBundle/Resources/views/Calendar/cancelCalendarByPerson.html.twig

@@ -0,0 +1,29 @@
+{% extends "@ChillPerson/Person/layout.html.twig" %}
+
+{% set activeRouteKey = 'chill_calendar_calendar_list' %}
+
+{% block title  'chill_calendar.cancel_calendar_item'|trans %}
+
+{% block content %}
+
+    {{ form_start(form) }}
+
+    {{ form_row(form.cancelReason) }}
+
+    <ul class="record_actions sticky-form-buttons">
+        <li class="save">
+            <a
+                class="btn btn-cancel"
+                href="{{ chill_return_path_or('chill_calendar_calendar_list', { 'id': person.id } )}}"
+            >
+                {{ 'Cancel'|trans|chill_return_path_label }}
+            </a>
+        </li>
+        <li>
+            {{ form_widget(form.submit, { 'attr' : { 'class': 'btn btn-save' }, 'label': 'Save' } ) }}
+        </li>
+    </ul>
+
+    {{ form_end(form) }}
+
+{% endblock %}

src/Bundle/ChillCalendarBundle/Resources/views/CancelReason/index.html.twig

@@ -5,7 +5,7 @@
         {% block table_entities_thead_tr %}
             <th>{{ 'Id'|trans }}</th>
             <th>{{ 'Name'|trans }}</th>
-            <th>{{ 'canceledBy'|trans }}</th>
+            <th>{{ 'Canceled by'|trans }}</th>
             <th>{{ 'active'|trans }}</th>
             <th>&nbsp;</th>
         {% endblock %}

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

@@ -19,6 +19,7 @@ declare(strict_types=1);
 namespace Chill\CalendarBundle\Service\ShortMessageNotification;
 
 use Chill\CalendarBundle\Entity\Calendar;
+use Chill\CalendarBundle\Entity\CancelReason;
 use libphonenumber\PhoneNumberFormat;
 use libphonenumber\PhoneNumberUtil;
 use Symfony\Component\Notifier\Message\SmsMessage;
@@ -57,7 +58,7 @@ class DefaultShortMessageForCalendarBuilder implements ShortMessageForCalendarBu
                     $this->phoneUtil->format($person->getMobilenumber(), PhoneNumberFormat::E164),
                     $this->engine->render('@ChillCalendar/CalendarShortMessage/short_message.txt.twig', ['calendar' => $calendar]),
                 );
-            } elseif (Calendar::SMS_CANCEL_PENDING === $calendar->getSmsStatus()) {
+            } elseif (Calendar::SMS_CANCEL_PENDING === $calendar->getSmsStatus() && (null === $calendar->getCancelReason() || CancelReason::CANCELEDBY_PERSON !== $calendar->getCancelReason()->getCanceledBy())) {
                 $toUsers[] = new SmsMessage(
                     $this->phoneUtil->format($person->getMobilenumber(), PhoneNumberFormat::E164),
                     $this->engine->render('@ChillCalendar/CalendarShortMessage/short_message_canceled.txt.twig', ['calendar' => $calendar]),

src/Bundle/ChillCalendarBundle/translations/messages.fr.yml

@@ -31,8 +31,7 @@ Will send SMS: Un SMS de rappel sera envoyé
 Will not send SMS: Aucun SMS de rappel ne sera envoyé
 SMS already sent: Un SMS a été envoyé
 
-canceledBy: supprimé par
-Canceled by: supprimé par
+Canceled by: Annulé par
 Calendar configuration: Gestion des rendez-vous
 
 crud:
@@ -44,6 +43,14 @@ crud:
         title_edit: Modifier le motif d'annulation
 
 chill_calendar:
+    canceled: Annulé
+    cancel_reason: Raison d'annulation
+    cancel_calendar_item: Annuler rendez-vous
+    calendar_canceled: Le rendez-vous a été annulé
+    canceled_by:
+        user: Utilisateur
+        person: Usager
+        other: Autre
     Document: Document d'un rendez-vous
     form:
         The main user is mandatory. He will organize the appointment.: L'utilisateur principal est obligatoire. Il est l'organisateur de l'événement.

src/Bundle/ChillDocGeneratorBundle/Resources/public/vuejs/_components/PickTemplate.vue

@@ -20,7 +20,10 @@
                                 </option>
                                 <template v-for="t in templates" :key="t.id">
                                     <option :value="t.id">
-                    {{ localizeString(t.name) || "Aucun nom défini" }}
+                                        {{
+                                            localizeString(t.name) ||
+                                            "Aucun nom défini"
+                                        }}
                                     </option>
                                 </template>
                             </select>
@@ -28,7 +31,9 @@
                                 v-if="canGenerate"
                                 class="btn btn-update btn-sm change-icon"
                                 :href="buildUrlGenerate"
-                @click.prevent="clickGenerate($event, buildUrlGenerate)"
+                                @click.prevent="
+                                    clickGenerate($event, buildUrlGenerate)
+                                "
                                 ><i class="fa fa-fw fa-cog"
                             /></a>
                             <a

src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php

@@ -94,7 +94,7 @@ class StoredObject implements Document, TrackCreationInterface
     /**
      * @var Collection<int, StoredObjectVersion>&Selectable<int, StoredObjectVersion>
      */
-    #[ORM\OneToMany(mappedBy: 'storedObject', targetEntity: StoredObjectVersion::class, cascade: ['persist'], orphanRemoval: true, fetch: 'EAGER')]
+    #[ORM\OneToMany(mappedBy: 'storedObject', targetEntity: StoredObjectVersion::class, cascade: ['persist'], orphanRemoval: true)]
     private Collection&Selectable $versions;
 
     /**

src/Bundle/ChillDocStoreBundle/Resources/public/module/async_upload/index.ts

@@ -13,9 +13,8 @@ const startApp = (
 
     const inputTitle = collectionEntry?.querySelector("input[type='text']");
 
-  const input_stored_object: HTMLInputElement | null = divElement.querySelector(
-    "input[data-stored-object]",
-  );
+    const input_stored_object: HTMLInputElement | null =
+        divElement.querySelector("input[data-stored-object]");
     if (null === input_stored_object) {
         throw new Error("input to stored object not found");
     }
@@ -54,7 +53,9 @@ const startApp = (
                 console.log("version added", stored_object_version);
                 this.$data.existingDoc = stored_object;
                 this.$data.existingDoc.currentVersion = stored_object_version;
-        input_stored_object.value = JSON.stringify(this.$data.existingDoc);
+                input_stored_object.value = JSON.stringify(
+                    this.$data.existingDoc,
+                );
                 if (this.$data.inputTitle) {
                     if (!this.$data.inputTitle?.value) {
                         this.$data.inputTitle.value = file_name;

src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentActionButtonsGroup.vue

@@ -49,7 +49,9 @@
             <li v-if="isHistoryViewable">
                 <history-button
                     :stored-object="props.storedObject"
-          :can-edit="canEdit && props.storedObject._permissions.canEdit"
+                    :can-edit="
+                        canEdit && props.storedObject._permissions.canEdit
+                    "
                 ></history-button>
             </li>
         </ul>
@@ -127,7 +129,9 @@ const props = withDefaults(defineProps<DocumentActionButtonsGroupConfig>(), {
     canDownload: true,
     canConvertPdf: true,
     returnPath:
-    window.location.pathname + window.location.search + window.location.hash,
+        window.location.pathname +
+        window.location.search +
+        window.location.hash,
 });
 
 /**

src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DocumentSignature/App.vue

@@ -29,7 +29,9 @@
         </modal>
     </teleport>
     <div class="col-12 m-auto sticky-top">
-    <div class="row justify-content-center border-bottom pdf-tools d-md-none">
+        <div
+            class="row justify-content-center border-bottom pdf-tools d-md-none"
+        >
             <div class="col-5 text-center turn-page">
                 <select
                     class="form-select form-select-sm"
@@ -90,7 +92,10 @@
                 v-if="signature.zones.length === 1 && signedState !== 'signed'"
                 class="col-5 p-0 text-center turnSignature"
             >
-        <button class="btn btn-light btn-sm" @click="goToSignatureZoneUnique">
+                <button
+                    class="btn btn-light btn-sm"
+                    @click="goToSignatureZoneUnique"
+                >
                     {{ trans(SIGNATURES_GO_TO_SIGNATURE_UNIQUE) }}
                 </button>
             </div>
@@ -145,7 +150,10 @@
                     :title="trans(SIGNATURES_ADD_SIGN_ZONE)"
                 >
                     <template v-if="canvasEvent === 'add'">
-            <div class="spinner-border spinner-border-sm" role="status">
+                        <div
+                            class="spinner-border spinner-border-sm"
+                            role="status"
+                        >
                             <span class="visually-hidden">Loading...</span>
                         </div>
                     </template>
@@ -199,7 +207,10 @@
                 v-if="signature.zones.length === 1 && signedState !== 'signed'"
                 class="col-4 d-xl-none text-center turnSignature p-0"
             >
-        <button class="btn btn-light btn-sm" @click="goToSignatureZoneUnique">
+                <button
+                    class="btn btn-light btn-sm"
+                    @click="goToSignatureZoneUnique"
+                >
                     {{ trans(SIGNATURES_GO_TO_SIGNATURE_UNIQUE) }}
                 </button>
             </div>
@@ -227,7 +238,10 @@
                 v-if="signature.zones.length === 1 && signedState !== 'signed'"
                 class="col-4 d-none d-xl-flex p-0 text-center turnSignature"
             >
-        <button class="btn btn-light btn-sm" @click="goToSignatureZoneUnique">
+                <button
+                    class="btn btn-light btn-sm"
+                    @click="goToSignatureZoneUnique"
+                >
                     {{ trans(SIGNATURES_GO_TO_SIGNATURE_UNIQUE) }}
                 </button>
             </div>
@@ -285,7 +299,10 @@
                     </template>
                     <template v-else>
                         {{ trans(SIGNATURES_CLICK_ON_DOCUMENT) }}
-            <div class="spinner-border spinner-border-sm" role="status">
+                        <div
+                            class="spinner-border spinner-border-sm"
+                            role="status"
+                        >
                             <span class="visually-hidden">Loading...</span>
                         </div>
                     </template>
@@ -545,8 +562,14 @@ const addCanvasEvents = () => {
             );
         });
     } else {
-    const canvas = document.querySelectorAll("canvas")[0] as HTMLCanvasElement;
-    canvas.addEventListener("pointerup", (e) => canvasClick(e, canvas), false);
+        const canvas = document.querySelectorAll(
+            "canvas",
+        )[0] as HTMLCanvasElement;
+        canvas.addEventListener(
+            "pointerup",
+            (e) => canvasClick(e, canvas),
+            false,
+        );
     }
 };
 
@@ -582,7 +605,11 @@ const hitSignature = (
         scaleYToCanvas(zone.y, canvas.height, zone.PDFPage.height) <
         xy[1] &&
     xy[1] <
-    scaleYToCanvas(zone.height - zone.y, canvas.height, zone.PDFPage.height) +
+        scaleYToCanvas(
+            zone.height - zone.y,
+            canvas.height,
+            zone.PDFPage.height,
+        ) +
             zone.PDFPage.height * zoom.value;
 
 const selectZone = async (z: SignatureZone, canvas: HTMLCanvasElement) => {
@@ -598,7 +625,8 @@ const selectZoneEvent = (e: PointerEvent, canvas: HTMLCanvasElement) =>
     signature.zones
         .filter(
             (z) =>
-        (z.PDFPage.index + 1 === getCanvasId(canvas) && multiPage.value) ||
+                (z.PDFPage.index + 1 === getCanvasId(canvas) &&
+                    multiPage.value) ||
                 (z.PDFPage.index + 1 === page.value && !multiPage.value),
         )
         .map((z) => {

src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DropFileWidget/DropFile.vue

@@ -153,10 +153,12 @@ const handleFile = async (file: File): Promise<void> => {
             </p>
             <!-- todo i18n -->
             <p v-if="has_existing_doc">
-        Déposez un document ou cliquez ici pour remplacer le document existant
+                Déposez un document ou cliquez ici pour remplacer le document
+                existant
             </p>
             <p v-else>
-        Déposez un document ou cliquez ici pour ouvrir le navigateur de fichier
+                Déposez un document ou cliquez ici pour ouvrir le navigateur de
+                fichier
             </p>
         </div>
         <div v-else class="waiting">

src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/DropFileWidget/DropFileModal.vue

@@ -4,6 +4,7 @@ import { StoredObject, StoredObjectVersion } from "../../types";
 import DropFileWidget from "ChillDocStoreAssets/vuejs/DropFileWidget/DropFileWidget.vue";
 import { computed, reactive } from "vue";
 import { useToast } from "vue-toast-notification";
+import { DOCUMENT_ADD, trans } from "translator";
 
 interface DropFileConfig {
     allowRemove: boolean;
@@ -75,11 +76,9 @@ function closeModal(): void {
         @click="openModal"
         class="btn btn-create"
     >
-    Ajouter un document
-  </button>
-  <button v-else @click="openModal" class="btn btn-edit">
-    Remplacer le document
+        {{ trans(DOCUMENT_ADD) }}
     </button>
+    <button v-else @click="openModal" class="btn btn-edit"></button>
     <modal
         v-if="state.showModal"
         :modal-dialog-class="modalClasses"

src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/ConvertButton.vue

@@ -35,7 +35,9 @@ async function download_and_open(event: Event): Promise<void> {
     if (null === state.content) {
         event.preventDefault();
 
-    const raw = await download_doc(build_convert_link(props.storedObject.uuid));
+        const raw = await download_doc(
+            build_convert_link(props.storedObject.uuid),
+        );
         state.content = window.URL.createObjectURL(raw);
 
         button.href = window.URL.createObjectURL(raw);

src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/DesktopEditButton.vue

@@ -42,7 +42,9 @@ const editionUntilFormatted = computed<string>(() => {
         <modal v-if="state.modalOpened" @close="state.modalOpened = false">
             <template v-slot:body>
                 <div class="desktop-edit">
-          <p class="center">Veuillez enregistrer vos modifications avant le</p>
+                    <p class="center">
+                        Veuillez enregistrer vos modifications avant le
+                    </p>
                     <p>
                         <strong>{{ editionUntilFormatted }}</strong>
                     </p>
@@ -55,21 +57,23 @@ const editionUntilFormatted = computed<string>(() => {
 
                     <p>
                         <small
-              >Le document peut être édité uniquement en utilisant Libre
-              Office.</small
+                            >Le document peut être édité uniquement en utilisant
+                            Libre Office.</small
                         >
                     </p>
 
                     <p>
                         <small
-              >En cas d'échec lors de l'enregistrement, sauver le document sur
-              le poste de travail avant de le déposer à nouveau ici.</small
+                            >En cas d'échec lors de l'enregistrement, sauver le
+                            document sur le poste de travail avant de le déposer
+                            à nouveau ici.</small
                         >
                     </p>
 
                     <p>
                         <small
-              >Vous pouvez naviguez sur d'autres pages pendant l'édition.</small
+                            >Vous pouvez naviguez sur d'autres pages pendant
+                            l'édition.</small
                         >
                     </p>
                 </div>

src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/DownloadButton.vue

@@ -95,7 +95,10 @@ async function download_and_open(): Promise<void> {
     let raw;
 
     try {
-    raw = await download_and_decrypt_doc(props.storedObject, props.atVersion);
+        raw = await download_and_decrypt_doc(
+            props.storedObject,
+            props.atVersion,
+        );
     } catch (e) {
         console.error("error while downloading and decrypting document");
         console.error(e);

src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/HistoryButton/HistoryButtonListItem.vue

@@ -49,7 +49,8 @@ const isRestored = computed<boolean>(
 );
 
 const isDuplicated = computed<boolean>(
-  () => props.version.version === 0 && null !== props.version["from-restored"],
+    () =>
+        props.version.version === 0 && null !== props.version["from-restored"],
 );
 
 const classes = computed<{
@@ -69,9 +70,16 @@ const classes = computed<{
     <div :class="classes">
         <div
             class="col-12 tags"
-      v-if="isCurrent || isKeptBeforeConversion || isRestored || isDuplicated"
+            v-if="
+                isCurrent ||
+                isKeptBeforeConversion ||
+                isRestored ||
+                isDuplicated
+            "
+        >
+            <span class="badge bg-success" v-if="isCurrent"
+                >Version actuelle</span
             >
-      <span class="badge bg-success" v-if="isCurrent">Version actuelle</span>
             <span class="badge bg-info" v-if="isKeptBeforeConversion"
                 >Conservée avant conversion dans un autre format</span
             >
@@ -88,17 +96,21 @@ const classes = computed<{
             <span
                 ><strong>&nbsp;#{{ version.version + 1 }}&nbsp;</strong></span
             >
-      <template v-if="version.createdBy !== null && version.createdAt !== null"
+            <template
+                v-if="version.createdBy !== null && version.createdAt !== null"
                 ><strong v-if="version.version == 0">créé par</strong
                 ><strong v-else>modifié par</strong>
                 <span class="badge-user"
-          ><UserRenderBoxBadge :user="version.createdBy"></UserRenderBoxBadge
+                    ><UserRenderBoxBadge
+                        :user="version.createdBy"
+                    ></UserRenderBoxBadge
                 ></span>
                 <strong>à</strong>
                 {{
                     $d(ISOToDatetime(version.createdAt.datetime8601), "long")
                 }}</template
-      ><template v-if="version.createdBy === null && version.createdAt !== null"
+            ><template
+                v-if="version.createdBy === null && version.createdAt !== null"
                 ><strong v-if="version.version == 0">Créé le</strong
                 ><strong v-else>modifié le</strong>
                 {{

src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/WopiEditButton.vue

@@ -2,7 +2,9 @@
     <a
         :class="Object.assign(props.classes, { btn: true })"
         @click="beforeLeave($event)"
-    :href="build_wopi_editor_link(props.storedObject.uuid, props.returnPath)"
+        :href="
+            build_wopi_editor_link(props.storedObject.uuid, props.returnPath)
+        "
     >
         <i class="fa fa-paragraph"></i>
         Editer en ligne

src/Bundle/ChillDocStoreBundle/Resources/public/vuejs/StoredObjectButton/helpers.ts

@@ -145,7 +145,9 @@ async function download_info_link(
 function build_wopi_editor_link(uuid: string, returnPath?: string) {
     if (returnPath === undefined) {
         returnPath =
-      window.location.pathname + window.location.search + window.location.hash;
+            window.location.pathname +
+            window.location.search +
+            window.location.hash;
     }
 
     return (
@@ -184,7 +186,10 @@ async function download_and_decrypt_doc(
     ) {
         downloadInfo = storedObject._links.downloadLink;
     } else {
-    downloadInfo = await download_info_link(storedObject, atVersionToDownload);
+        downloadInfo = await download_info_link(
+            storedObject,
+            atVersionToDownload,
+        );
     }
 
     const rawResponse = await window.fetch(downloadInfo.url);
@@ -239,7 +244,10 @@ async function download_doc_as_pdf(storedObject: StoredObject): Promise<Blob> {
     }
 
     if (storedObject.currentVersion?.type === "application/pdf") {
-    return download_and_decrypt_doc(storedObject, storedObject.currentVersion);
+        return download_and_decrypt_doc(
+            storedObject,
+            storedObject.currentVersion,
+        );
     }
 
     const convertLink = build_convert_link(storedObject.uuid);

src/Bundle/ChillDocStoreBundle/Serializer/Normalizer/StoredObjectVersionNormalizer.php

@@ -43,17 +43,11 @@ class StoredObjectVersionNormalizer implements NormalizerInterface, NormalizerAw
             'createdBy' => $this->normalizer->normalize($object->getCreatedBy(), $format, [...$context, UserNormalizer::AT_DATE => $object->getCreatedAt()]),
         ];
 
-        $normalizationGroups = $context[AbstractNormalizer::GROUPS] ?? [];
-
-        if (is_string($normalizationGroups)) {
-            $normalizationGroups = [$normalizationGroups];
-        }
-
-        if (in_array(self::WITH_POINT_IN_TIMES_CONTEXT, $normalizationGroups, true)) {
+        if (in_array(self::WITH_POINT_IN_TIMES_CONTEXT, $context[AbstractNormalizer::GROUPS] ?? [], true)) {
             $data['point-in-times'] = $this->normalizer->normalize($object->getPointInTimes(), $format, $context);
         }
 
-        if (in_array(self::WITH_RESTORED_CONTEXT, $normalizationGroups, true)) {
+        if (in_array(self::WITH_RESTORED_CONTEXT, $context[AbstractNormalizer::GROUPS] ?? [], true)) {
             $data['from-restored'] = $this->normalizer->normalize($object->getCreatedFrom(), $format, [AbstractNormalizer::GROUPS => ['read']]);
         }
 

src/Bundle/ChillDocStoreBundle/translations/messages.fr.yml

@@ -23,6 +23,8 @@ See the document: Voir le document
 
 document:
     Any title: Aucun titre
+    replace: Remplacer
+    Add: Ajouter un document
 
 generic_doc:
     filter:

src/Bundle/ChillJobBundle/src/Entity/Immersion.php

@@ -19,6 +19,7 @@ use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\Address;
 use libphonenumber\PhoneNumber;
 use Symfony\Component\Validator\Constraints as Assert;
+use Chill\MainBundle\Validation\Constraint\PhonenumberConstraint;
 
 /**
  * Immersion.
@@ -85,14 +86,14 @@ class Immersion implements \Stringable
      * @Assert\NotBlank()
      */
     #[ORM\Column(name: 'tuteurPhoneNumber', type: 'phone_number', nullable: true)]
-    #[\Misd\PhoneNumberBundle\Validator\Constraints\PhoneNumber]
+    #[PhonenumberConstraint(type: 'any')]
     private ?PhoneNumber $tuteurPhoneNumber = null;
 
     #[ORM\Column(name: 'structureAccName', type: \Doctrine\DBAL\Types\Types::TEXT, nullable: true)]
     private ?string $structureAccName = null;
 
     #[ORM\Column(name: 'structureAccPhonenumber', type: 'phone_number', nullable: true)]
-    #[\Misd\PhoneNumberBundle\Validator\Constraints\PhoneNumber]
+    #[PhonenumberConstraint(type: 'any')]
     private ?PhoneNumber $structureAccPhonenumber = null;
 
     #[ORM\Column(name: 'structureAccEmail', type: \Doctrine\DBAL\Types\Types::TEXT, nullable: true)]

src/Bundle/ChillJobBundle/src/Resources/views/CV/view.html.twig

@@ -118,7 +118,7 @@
 
         {{ entity.notes|chill_print_or_message("Aucune note", 'blockquote') }}
     {% endblock crud_content_view_details %}
-
+    {% block content_view_actions_duplicate_link %}{% endblock %}
     {% block content_view_actions_back %}
         <li class="cancel">
             <a class="btn btn-cancel" href="{{ chill_return_path_or('chill_job_report_index', { 'person': entity.person.id }) }}">

src/Bundle/ChillJobBundle/src/Resources/views/Frein/view.html.twig

@@ -46,6 +46,7 @@
             </dd>
         </dl>
     {% endblock crud_content_view_details %}
+    {% block content_view_actions_duplicate_link %}{% endblock %}
 
     {% block content_view_actions_back %}
         <li class="cancel">

src/Bundle/ChillJobBundle/src/Resources/views/Immersion/view.html.twig

@@ -206,6 +206,8 @@
             </a>
         </li>
     {% endblock %}
+    {% block content_view_actions_duplicate_link %}{% endblock %}
+
     {% block content_view_actions_after %}
         <li>
             <a class="btn btn-misc" href="{{ chill_return_path_or('chill_crud_immersion_bilan', { 'id': entity.id, 'person_id': entity.person.id }) }}">

src/Bundle/ChillJobBundle/src/Resources/views/ProjetProfessionnel/view.html.twig

@@ -94,6 +94,7 @@
 
 
     {% endblock crud_content_view_details %}
+    {% block content_view_actions_duplicate_link %}{% endblock %}
 
     {% block content_view_actions_back %}
         <li class="cancel">

src/Bundle/ChillMainBundle/Action/User/UpdateProfile/UpdateProfileCommand.php

@@ -0,0 +1,64 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Action\User\UpdateProfile;
+
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Notification\NotificationFlagManager;
+use Chill\MainBundle\Validation\Constraint\PhonenumberConstraint;
+use libphonenumber\PhoneNumber;
+
+final class UpdateProfileCommand
+{
+    public array $notificationFlags = [];
+
+    public function __construct(
+        #[PhonenumberConstraint]
+        public ?PhoneNumber $phonenumber,
+    ) {}
+
+    public static function create(User $user, NotificationFlagManager $flagManager): self
+    {
+        $updateProfileCommand = new self($user->getPhonenumber());
+
+        foreach ($flagManager->getAllNotificationFlagProviders() as $provider) {
+            $updateProfileCommand->setNotificationFlag(
+                $provider->getFlag(),
+                User::NOTIF_FLAG_IMMEDIATE_EMAIL,
+                $user->isNotificationSendImmediately($provider->getFlag())
+            );
+            $updateProfileCommand->setNotificationFlag(
+                $provider->getFlag(),
+                User::NOTIF_FLAG_DAILY_DIGEST,
+                $user->isNotificationDailyDigest($provider->getFlag())
+            );
+        }
+
+        return $updateProfileCommand;
+    }
+
+    /**
+     * @param User::NOTIF_FLAG_IMMEDIATE_EMAIL|User::NOTIF_FLAG_DAILY_DIGEST $kind
+     */
+    private function setNotificationFlag(string $type, string $kind, bool $value): void
+    {
+        if (!array_key_exists($type, $this->notificationFlags)) {
+            $this->notificationFlags[$type] = ['immediate_email' => true, 'daily_digest' => false];
+        }
+
+        $k = match ($kind) {
+            User::NOTIF_FLAG_IMMEDIATE_EMAIL => 'immediate_email',
+            User::NOTIF_FLAG_DAILY_DIGEST => 'daily_digest',
+        };
+
+        $this->notificationFlags[$type][$k] = $value;
+    }
+}

src/Bundle/ChillMainBundle/Action/User/UpdateProfile/UpdateProfileCommandHandler.php

@@ -0,0 +1,27 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Action\User\UpdateProfile;
+
+use Chill\MainBundle\Entity\User;
+
+final readonly class UpdateProfileCommandHandler
+{
+    public function updateProfile(User $user, UpdateProfileCommand $command): void
+    {
+        $user->setPhonenumber($command->phonenumber);
+
+        foreach ($command->notificationFlags as $flag => $values) {
+            $user->setNotificationImmediately($flag, $values['immediate_email']);
+            $user->setNotificationDailyDigest($flag, $values['daily_digest']);
+        }
+    }
+}

src/Bundle/ChillMainBundle/ChillMainBundle.php

@@ -14,6 +14,7 @@ namespace Chill\MainBundle;
 use Chill\MainBundle\Cron\CronJobInterface;
 use Chill\MainBundle\CRUD\CompilerPass\CRUDControllerCompilerPass;
 use Chill\MainBundle\DependencyInjection\CompilerPass\ACLFlagsCompilerPass;
+use Chill\MainBundle\DependencyInjection\CompilerPass\MenuCompilerPass;
 use Chill\MainBundle\DependencyInjection\CompilerPass\NotificationCounterCompilerPass;
 use Chill\MainBundle\DependencyInjection\CompilerPass\SearchableServicesCompilerPass;
 use Chill\MainBundle\DependencyInjection\CompilerPass\TimelineCompilerClass;
@@ -69,6 +70,7 @@ class ChillMainBundle extends Bundle
         $container->addCompilerPass(new TimelineCompilerClass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
         $container->addCompilerPass(new WidgetsCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
         $container->addCompilerPass(new NotificationCounterCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
+        $container->addCompilerPass(new MenuCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
         $container->addCompilerPass(new ACLFlagsCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
         $container->addCompilerPass(new CRUDControllerCompilerPass(), \Symfony\Component\DependencyInjection\Compiler\PassConfig::TYPE_BEFORE_OPTIMIZATION, 0);
     }

src/Bundle/ChillMainBundle/Command/OverrideTranslationCommand.php

@@ -1,115 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\MainBundle\Command;
-
-use Symfony\Component\Console\Command\Command;
-use Symfony\Component\Console\Input\InputArgument;
-use Symfony\Component\Console\Input\InputInterface;
-use Symfony\Component\Console\Output\OutputInterface;
-use Symfony\Component\HttpKernel\KernelInterface;
-use Symfony\Component\Translation\MessageCatalogue;
-use Symfony\Component\Translation\Reader\TranslationReaderInterface;
-use Symfony\Component\Translation\Writer\TranslationWriterInterface;
-use Symfony\Component\Yaml\Yaml;
-
-class OverrideTranslationCommand extends Command
-{
-    public function __construct(
-        private readonly TranslationReaderInterface $reader,
-        private readonly TranslationWriterInterface $writer,
-    ) {
-        $this->setName('chill:main:override_translation');
-        parent::__construct();
-    }
-
-    protected function configure(): void
-    {
-        $this
-            ->setDescription('Generate a translation catalogue with translation remplacements based on replacements provided in a YAML file.')
-            ->addArgument('locale', InputArgument::REQUIRED, 'The locale to process (e.g. fr, en).')
-            ->addArgument('overrides', InputArgument::REQUIRED, 'Path to the overrides YAML file (list of {from, to}).');
-    }
-
-    protected function execute(InputInterface $input, OutputInterface $output): int
-    {
-        $locale = (string) $input->getArgument('locale');
-        $overridesPath = (string) $input->getArgument('overrides');
-
-        $catalogue = $this->loadCatalogue($locale);
-        $overrides = $this->loadOverrides($overridesPath);
-
-
-        $toOverrideCatalogue = new MessageCatalogue($locale);
-        foreach ($catalogue->getDomains() as $domain) {
-            // hack: we have to replace the suffix ".intl-icu" by "+intl-ic"
-            $domain = str_replace('.intl-icu', '+intl-icu', $domain);
-            foreach ($catalogue->all($domain) as $key => $translation) {
-                foreach ($overrides as $changes) {
-                    $from = $changes['from'];
-                    $to = $changes['to'];
-
-                    if (is_string($translation) && str_contains($translation, $from)) {
-                        $newTranslation = strtr($translation, [$from => $to]);
-                        $toOverrideCatalogue->set($key, $newTranslation, $domain);
-                        $translation = $newTranslation;
-                    }
-                }
-            }
-        }
-
-        /** @var KernelInterface $kernel */
-        /* @phpstan-ignore-next-line */
-        $kernel = $this->getApplication()->getKernel();
-        $outputDir = rtrim($kernel->getProjectDir(), '/').'/translations';
-        if (!is_dir($outputDir)) {
-            @mkdir($outputDir, 0775, true);
-        }
-
-        // Writer expects the 'path' option to be a directory; it will create the proper file name
-        $this->writer->write($toOverrideCatalogue, 'yaml', ['path' => $outputDir]);
-
-        $output->writeln(sprintf('Override catalogue written to %s (domain: messages, locale: %s).', $outputDir, $locale));
-
-        return Command::SUCCESS;
-    }
-
-    /**
-     * @return list<array{from: string, to: string}>
-     */
-    private function loadOverrides(string $path): array
-    {
-        return Yaml::parseFile($path);
-    }
-
-    private function loadCatalogue(string $locale): MessageCatalogue
-    {
-        /** @var KernelInterface $kernel */
-        /* @phpstan-ignore-next-line */
-        $kernel = $this->getApplication()->getKernel();
-
-        // collect path for translations
-        $transPaths = [];
-        foreach ($kernel->getBundles() as $bundle) {
-            $bundleDir = $bundle->getPath();
-            $transPaths[] = is_dir($bundleDir.'/Resources/translations') ? $bundleDir.'/Resources/translations' : $bundle->getPath().'/translations';
-        }
-
-        $currentCatalogue = new MessageCatalogue($locale);
-        foreach ($transPaths as $path) {
-            if (is_dir($path)) {
-                $this->reader->read($path, $currentCatalogue);
-            }
-        }
-
-        return $currentCatalogue;
-    }
-}

src/Bundle/ChillMainBundle/Controller/AbsenceController.php

@@ -48,6 +48,7 @@ class AbsenceController extends AbstractController
         $user = $this->security->getUser();
 
         $user->setAbsenceStart(null);
+        $user->setAbsenceEnd(null);
         $em = $this->managerRegistry->getManager();
         $em->flush();
 

src/Bundle/ChillMainBundle/Controller/UserProfileController.php

@@ -1,63 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\MainBundle\Controller;
-
-use Chill\MainBundle\Form\UserProfileType;
-use Chill\MainBundle\Security\ChillSecurity;
-use Symfony\Bundle\FrameworkBundle\Controller\AbstractController;
-use Symfony\Component\HttpFoundation\Request;
-use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
-use Symfony\Contracts\Translation\TranslatorInterface;
-use Symfony\Component\Routing\Annotation\Route;
-
-final class UserProfileController extends AbstractController
-{
-    public function __construct(
-        private readonly TranslatorInterface $translator,
-        private readonly ChillSecurity $security,
-        private readonly \Doctrine\Persistence\ManagerRegistry $managerRegistry,
-    ) {}
-
-    /**
-     * User profile that allows editing of phonenumber and visualization of certain data.
-     */
-    #[Route(path: '/{_locale}/main/user/my-profile', name: 'chill_main_user_profile')]
-    public function __invoke(Request $request)
-    {
-        if (!$this->security->isGranted('ROLE_USER')) {
-            throw new AccessDeniedHttpException();
-        }
-
-        $user = $this->security->getUser();
-        $editForm = $this->createForm(UserProfileType::class, $user);
-
-        $editForm->get('notificationFlags')->setData($user->getNotificationFlags());
-
-        $editForm->handleRequest($request);
-
-        if ($editForm->isSubmitted() && $editForm->isValid()) {
-            $notificationFlagsData = $editForm->get('notificationFlags')->getData();
-            $user->setNotificationFlags($notificationFlagsData);
-
-            $em = $this->managerRegistry->getManager();
-            $em->flush();
-            $this->addFlash('success', $this->translator->trans('user.profile.Profile successfully updated!'));
-
-            return $this->redirectToRoute('chill_main_user_profile');
-        }
-
-        return $this->render('@ChillMain/User/profile.html.twig', [
-            'user' => $user,
-            'form' => $editForm->createView(),
-        ]);
-    }
-}

src/Bundle/ChillMainBundle/Controller/UserUpdateProfileController.php

@@ -0,0 +1,75 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Controller;
+
+use Chill\MainBundle\Action\User\UpdateProfile\UpdateProfileCommand;
+use Chill\MainBundle\Action\User\UpdateProfile\UpdateProfileCommandHandler;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Form\UpdateProfileType;
+use Chill\MainBundle\Notification\NotificationFlagManager;
+use Chill\MainBundle\Security\ChillSecurity;
+use Doctrine\ORM\EntityManagerInterface;
+use Symfony\Component\Form\FormFactoryInterface;
+use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Request;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\HttpFoundation\Session\Session;
+use Symfony\Component\HttpKernel\Exception\AccessDeniedHttpException;
+use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
+use Symfony\Contracts\Translation\TranslatorInterface;
+use Symfony\Component\Routing\Annotation\Route;
+use Twig\Environment;
+
+final readonly class UserUpdateProfileController
+{
+    public function __construct(
+        private TranslatorInterface $translator,
+        private ChillSecurity $security,
+        private EntityManagerInterface $entityManager,
+        private NotificationFlagManager $notificationFlagManager,
+        private FormFactoryInterface $formFactory,
+        private UrlGeneratorInterface $urlGenerator,
+        private Environment $twig,
+        private UpdateProfileCommandHandler $updateProfileCommandHandler,
+    ) {}
+
+    /**
+     * User profile that allows editing of phonenumber and visualization of certain data.
+     */
+    #[Route(path: '/{_locale}/main/user/my-profile', name: 'chill_main_user_profile')]
+    public function __invoke(Request $request, Session $session)
+    {
+        if (!$this->security->isGranted('ROLE_USER')) {
+            throw new AccessDeniedHttpException();
+        }
+
+        $user = $this->security->getUser();
+
+        $command = UpdateProfileCommand::create($user, $this->notificationFlagManager);
+        $editForm = $this->formFactory->create(UpdateProfileType::class, $command);
+
+        $editForm->handleRequest($request);
+
+        if ($editForm->isSubmitted() && $editForm->isValid()) {
+            $this->updateProfileCommandHandler->updateProfile($user, $command);
+            $this->entityManager->flush();
+            $session->getFlashBag()->add('success', $this->translator->trans('user.profile.Profile successfully updated!'));
+
+            return new RedirectResponse($this->urlGenerator->generate('chill_main_user_profile'));
+        }
+
+        return new Response($this->twig->render('@ChillMain/User/profile.html.twig', [
+            'user' => $user,
+            'form' => $editForm->createView(),
+        ]));
+    }
+}

src/Bundle/ChillMainBundle/Entity/Location.php

@@ -14,9 +14,9 @@ namespace Chill\MainBundle\Entity;
 use Chill\MainBundle\Doctrine\Model\TrackCreationInterface;
 use Chill\MainBundle\Doctrine\Model\TrackUpdateInterface;
 use Chill\MainBundle\Repository\LocationRepository;
+use Chill\MainBundle\Validation\Constraint\PhonenumberConstraint;
 use Doctrine\ORM\Mapping as ORM;
 use libphonenumber\PhoneNumber;
-use Misd\PhoneNumberBundle\Validator\Constraints\PhoneNumber as MisdPhoneNumberConstraint;
 use Symfony\Component\Serializer\Annotation as Serializer;
 use Symfony\Component\Serializer\Annotation\DiscriminatorMap;
 
@@ -67,12 +67,12 @@ class Location implements TrackCreationInterface, TrackUpdateInterface
 
     #[Serializer\Groups(['read', 'write', 'docgen:read'])]
     #[ORM\Column(type: 'phone_number', nullable: true)]
-    #[MisdPhoneNumberConstraint(type: [MisdPhoneNumberConstraint::ANY])]
+    #[PhonenumberConstraint(type: 'any')]
     private ?PhoneNumber $phonenumber1 = null;
 
     #[Serializer\Groups(['read', 'write', 'docgen:read'])]
     #[ORM\Column(type: 'phone_number', nullable: true)]
-    #[MisdPhoneNumberConstraint(type: [MisdPhoneNumberConstraint::ANY])]
+    #[PhonenumberConstraint(type: 'any')]
     private ?PhoneNumber $phonenumber2 = null;
 
     #[Serializer\Groups(['read'])]

src/Bundle/ChillMainBundle/Entity/User.php

@@ -23,6 +23,8 @@ use Symfony\Component\Security\Core\User\PasswordAuthenticatedUserInterface;
 use Symfony\Component\Security\Core\User\UserInterface;
 use Symfony\Component\Serializer\Annotation as Serializer;
 use Symfony\Component\Validator\Context\ExecutionContextInterface;
+use Chill\MainBundle\Validation\Constraint\PhonenumberConstraint;
+use Symfony\Component\Validator\Constraints as Assert;
 
 /**
  * User.
@@ -44,6 +46,8 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter
     #[ORM\Column(type: \Doctrine\DBAL\Types\Types::DATETIME_IMMUTABLE, nullable: true)]
     private ?\DateTimeImmutable $absenceStart = null;
 
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::DATETIME_IMMUTABLE, nullable: true)]
+    private ?\DateTimeImmutable $absenceEnd = null;
     /**
      * Array where SAML attributes's data are stored.
      */
@@ -115,7 +119,7 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter
      * The user's mobile phone number.
      */
     #[ORM\Column(type: 'phone_number', nullable: true)]
-    #[\Misd\PhoneNumberBundle\Validator\Constraints\PhoneNumber]
+    #[PhonenumberConstraint]
     private ?PhoneNumber $phonenumber = null;
 
     /**
@@ -156,6 +160,11 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter
         return $this->absenceStart;
     }
 
+    public function getAbsenceEnd(): ?\DateTimeImmutable
+    {
+        return $this->absenceEnd;
+    }
+
     /**
      * Get attributes.
      *
@@ -335,7 +344,13 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter
 
     public function isAbsent(): bool
     {
-        return null !== $this->getAbsenceStart() && $this->getAbsenceStart() <= new \DateTimeImmutable('now');
+        $now = new \DateTimeImmutable('now');
+        $absenceStart = $this->getAbsenceStart();
+        $absenceEnd = $this->getAbsenceEnd();
+
+        return null !== $absenceStart
+            && $absenceStart <= $now
+            && (null === $absenceEnd || $now <= $absenceEnd);
     }
 
     /**
@@ -409,6 +424,11 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter
         $this->absenceStart = $absenceStart;
     }
 
+    public function setAbsenceEnd(?\DateTimeImmutable $absenceEnd): void
+    {
+        $this->absenceEnd = $absenceEnd;
+    }
+
     public function setAttributeByDomain(string $domain, string $key, $value): self
     {
         $this->attributes[$domain][$key] = $value;
@@ -632,46 +652,82 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter
         return true;
     }
 
-    public function getNotificationFlags(): array
+    private function getNotificationFlagData(string $flag): array
     {
-        return $this->notificationFlags;
-    }
-
-    public function setNotificationFlags(array $notificationFlags)
-    {
-        $this->notificationFlags = $notificationFlags;
-    }
-
-    public function getNotificationFlagData(string $flag): array
-    {
-        return $this->notificationFlags[$flag] ?? [];
-    }
-
-    public function setNotificationFlagData(string $flag, array $data): void
-    {
-        $this->notificationFlags[$flag] = $data;
+        return $this->notificationFlags[$flag] ?? [self::NOTIF_FLAG_IMMEDIATE_EMAIL];
     }
 
     public function isNotificationSendImmediately(string $type): bool
     {
-        if ([] === $this->getNotificationFlagData($type) || in_array(User::NOTIF_FLAG_IMMEDIATE_EMAIL, $this->getNotificationFlagData($type), true)) {
-            return true;
+        return $this->isNotificationForElement($type, self::NOTIF_FLAG_IMMEDIATE_EMAIL);
     }
 
-        return false;
+    public function setNotificationImmediately(string $type, bool $active): void
+    {
+        $this->setNotificationFlagElement($type, $active, self::NOTIF_FLAG_IMMEDIATE_EMAIL);
+    }
+
+    public function setNotificationDailyDigest(string $type, bool $active): void
+    {
+        $this->setNotificationFlagElement($type, $active, self::NOTIF_FLAG_DAILY_DIGEST);
+    }
+
+    /**
+     * @param self::NOTIF_FLAG_IMMEDIATE_EMAIL|self::NOTIF_FLAG_DAILY_DIGEST $kind
+     */
+    private function setNotificationFlagElement(string $type, bool $active, string $kind): void
+    {
+        $notificationFlags = [...$this->notificationFlags];
+        $changed = false;
+
+        if (!isset($notificationFlags[$type])) {
+            $notificationFlags[$type] = [self::NOTIF_FLAG_IMMEDIATE_EMAIL];
+            $changed = true;
+        }
+
+        if ($active) {
+            if (!in_array($kind, $notificationFlags[$type], true)) {
+                $notificationFlags[$type] = [...$notificationFlags[$type], $kind];
+                $changed = true;
+            }
+        } else {
+            if (in_array($kind, $notificationFlags[$type], true)) {
+                $notificationFlags[$type] = array_values(
+                    array_filter($notificationFlags[$type], static fn ($k) => $k !== $kind)
+                );
+                $changed = true;
+            }
+        }
+
+        if ($changed) {
+            $this->notificationFlags = [...$notificationFlags];
+        }
+    }
+
+    private function isNotificationForElement(string $type, string $kind): bool
+    {
+        return in_array($kind, $this->getNotificationFlagData($type), true);
     }
 
     public function isNotificationDailyDigest(string $type): bool
     {
-        if (in_array(User::NOTIF_FLAG_DAILY_DIGEST, $this->getNotificationFlagData($type), true)) {
-            return true;
-        }
-
-        return false;
+        return $this->isNotificationForElement($type, self::NOTIF_FLAG_DAILY_DIGEST);
     }
 
     public function getLocale(): string
     {
         return 'fr';
     }
+
+    #[Assert\Callback]
+    public function validateAbsenceDates(ExecutionContextInterface $context): void
+    {
+        if (null !== $this->getAbsenceEnd() && null === $this->getAbsenceStart()) {
+            $context->buildViolation(
+                'user.absence_end_requires_start'
+            )
+                ->atPath('absenceEnd')
+                ->addViolation();
+        }
+    }
 }

src/Bundle/ChillMainBundle/Export/Formatter/SpreadsheetListFormatter.php

@@ -27,8 +27,6 @@ use Symfony\Component\HttpFoundation\Response;
 use Symfony\Contracts\Translation\TranslatableInterface;
 use Symfony\Contracts\Translation\TranslatorInterface;
 
-// command to get the report with curl : curl --user "center a_social:password" "http://localhost:8000/fr/exports/generate/count_person?export[filters][person_gender_filter][enabled]=&export[filters][person_nationality_filter][enabled]=&export[filters][person_nationality_filter][form][nationalities]=&export[aggregators][person_nationality_aggregator][order]=1&export[aggregators][person_nationality_aggregator][form][group_by_level]=country&export[submit]=&export[_token]=RHpjHl389GrK-bd6iY5NsEqrD5UKOTHH40QKE9J1edU" --globoff
-
 /**
  * Create a CSV List for the export.
  */

src/Bundle/ChillMainBundle/Form/AbsenceType.php

@@ -23,9 +23,14 @@ class AbsenceType extends AbstractType
     {
         $builder
             ->add('absenceStart', ChillDateType::class, [
-                'required' => true,
+                'required' => false,
                 'input' => 'datetime_immutable',
                 'label' => 'absence.Absence start',
+            ])
+            ->add('absenceEnd', ChillDateType::class, [
+                'required' => false,
+                'input' => 'datetime_immutable',
+                'label' => 'absence.Absence end',
             ]);
     }
 

src/Bundle/ChillMainBundle/Form/DataMapper/NotificationFlagDataMapper.php

@@ -1,75 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-/*
- * Chill is a software for social workers
- *
- * For the full copyright and license information, please view
- * the LICENSE file that was distributed with this source code.
- */
-
-namespace Chill\MainBundle\Form\DataMapper;
-
-use Chill\MainBundle\Entity\User;
-use Symfony\Component\Form\DataMapperInterface;
-
-final readonly class NotificationFlagDataMapper implements DataMapperInterface
-{
-    public function __construct(private array $notificationFlagProviders) {}
-
-    public function mapDataToForms($viewData, $forms): void
-    {
-        if (null === $viewData) {
-            $viewData = [];
-        }
-
-        $formsArray = iterator_to_array($forms);
-
-        foreach ($this->notificationFlagProviders as $flagProvider) {
-            $flag = $flagProvider->getFlag();
-
-            if (isset($formsArray[$flag])) {
-                $flagForm = $formsArray[$flag];
-
-                $immediateEmailChecked = in_array(User::NOTIF_FLAG_IMMEDIATE_EMAIL, $viewData[$flag] ?? [], true)
-                    || !array_key_exists($flag, $viewData);
-                $dailyEmailChecked = in_array(User::NOTIF_FLAG_DAILY_DIGEST, $viewData[$flag] ?? [], true);
-
-                if ($flagForm->has('immediate_email')) {
-                    $flagForm->get('immediate_email')->setData($immediateEmailChecked);
-                }
-                if ($flagForm->has('daily_email')) {
-                    $flagForm->get('daily_email')->setData($dailyEmailChecked);
-                }
-            }
-        }
-    }
-
-    public function mapFormsToData($forms, &$viewData): void
-    {
-        $formsArray = iterator_to_array($forms);
-        $viewData = [];
-
-        foreach ($this->notificationFlagProviders as $flagProvider) {
-            $flag = $flagProvider->getFlag();
-
-            if (isset($formsArray[$flag])) {
-                $flagForm = $formsArray[$flag];
-                $viewData[$flag] = [];
-
-                if (true === $flagForm['immediate_email']->getData()) {
-                    $viewData[$flag][] = User::NOTIF_FLAG_IMMEDIATE_EMAIL;
-                }
-
-                if (true === $flagForm['daily_email']->getData()) {
-                    $viewData[$flag][] = User::NOTIF_FLAG_DAILY_DIGEST;
-                }
-
-                if ([] === $viewData[$flag]) {
-                    $viewData[$flag][] = User::NOTIF_FLAG_IMMEDIATE_EMAIL;
-                }
-            }
-        }
-    }
-}

src/Bundle/ChillMainBundle/Form/Type/NotificationFlagsType.php

@@ -11,11 +11,9 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Form\Type;
 
-use Chill\MainBundle\Form\DataMapper\NotificationFlagDataMapper;
 use Chill\MainBundle\Notification\NotificationFlagManager;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
-use Symfony\Component\Form\Extension\Core\Type\FormType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
@@ -30,27 +28,24 @@ class NotificationFlagsType extends AbstractType
 
     public function buildForm(FormBuilderInterface $builder, array $options): void
     {
-        $builder->setDataMapper(new NotificationFlagDataMapper($this->notificationFlagProviders));
-
         foreach ($this->notificationFlagProviders as $flagProvider) {
             $flag = $flagProvider->getFlag();
-            $builder->add($flag, FormType::class, [
+            $flagBuilder = $builder->create($flag, options: [
                 'label' => $flagProvider->getLabel(),
-                'required' => false,
+                'compound' => true,
             ]);
 
-            $builder->get($flag)
+            $flagBuilder
                 ->add('immediate_email', CheckboxType::class, [
                     'label' => false,
                     'required' => false,
-                    'mapped' => false,
                 ])
-                ->add('daily_email', CheckboxType::class, [
+                ->add('daily_digest', CheckboxType::class, [
                     'label' => false,
                     'required' => false,
-                    'mapped' => false,
                 ])
             ;
+            $builder->add($flagBuilder);
         }
     }
 
@@ -58,6 +53,7 @@ class NotificationFlagsType extends AbstractType
     {
         $resolver->setDefaults([
             'data_class' => null,
+            'compound' => true,
         ]);
     }
 }

src/Bundle/ChillMainBundle/Form/UpdateProfileType.php

@@ -11,31 +11,29 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Form;
 
+use Chill\MainBundle\Action\User\UpdateProfile\UpdateProfileCommand;
 use Chill\MainBundle\Form\Type\ChillPhoneNumberType;
 use Chill\MainBundle\Form\Type\NotificationFlagsType;
 use Symfony\Component\Form\AbstractType;
 use Symfony\Component\Form\FormBuilderInterface;
 use Symfony\Component\OptionsResolver\OptionsResolver;
 
-class UserProfileType extends AbstractType
+class UpdateProfileType extends AbstractType
 {
-    public function buildForm(FormBuilderInterface $builder, array $options)
+    public function buildForm(FormBuilderInterface $builder, array $options): void
     {
         $builder
             ->add('phonenumber', ChillPhoneNumberType::class, [
                 'required' => false,
             ])
-            ->add('notificationFlags', NotificationFlagsType::class, [
-                'label' => false,
-                'mapped' => false,
-            ])
+            ->add('notificationFlags', NotificationFlagsType::class)
         ;
     }
 
-    public function configureOptions(OptionsResolver $resolver)
+    public function configureOptions(OptionsResolver $resolver): void
     {
         $resolver->setDefaults([
-            'data_class' => \Chill\MainBundle\Entity\User::class,
+            'data_class' => UpdateProfileCommand::class,
         ]);
     }
 }

src/Bundle/ChillMainBundle/Form/UserPasswordType.php

@@ -59,7 +59,7 @@ class UserPasswordType extends AbstractType
                 'invalid_message' => 'The password fields must match',
                 'constraints' => [
                     new Length([
-                        'min' => 9,
+                        'min' => 14,
                         'minMessage' => 'The password must be greater than {{ limit }} characters',
                     ]),
                     new NotBlank(),

src/Bundle/ChillMainBundle/Form/UserType.php

@@ -105,6 +105,11 @@ class UserType extends AbstractType
                 'required' => false,
                 'input' => 'datetime_immutable',
                 'label' => 'absence.Absence start',
+            ])
+            ->add('absenceEnd', ChillDateType::class, [
+                'required' => false,
+                'input' => 'datetime_immutable',
+                'label' => 'absence.Absence end',
             ]);
 
         // @phpstan-ignore-next-line

src/Bundle/ChillMainBundle/Phonenumber/PhoneNumberHelperInterface.php

@@ -31,8 +31,6 @@ interface PhoneNumberHelperInterface
 
     /**
      * Return true if the validation is configured and available.
-     *
-     * @deprecated this is an internal behaviour of the helper and should not be taken into account outside of the implementation
      */
     public function isPhonenumberValidationConfigured(): bool;
 

src/Bundle/ChillMainBundle/Phonenumber/PhonenumberHelper.php

@@ -76,24 +76,6 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
             ->formatOutOfCountryCallingNumber($phoneNumber, $this->config['default_carrier_code']);
     }
 
-    /**
-     * @throws NumberParseException
-     */
-    public function parse(string $phoneNumber): PhoneNumber
-    {
-        $sanitizedPhoneNumber = $phoneNumber;
-
-        if (str_starts_with($sanitizedPhoneNumber, '00')) {
-            $sanitizedPhoneNumber = '+'.substr($sanitizedPhoneNumber, 2, null);
-        }
-
-        if (!str_starts_with($sanitizedPhoneNumber, '+') && !str_starts_with($sanitizedPhoneNumber, '0')) {
-            $sanitizedPhoneNumber = '+'.$sanitizedPhoneNumber;
-        }
-
-        return $this->phoneNumberUtil->parse($sanitizedPhoneNumber, $this->config['default_carrier_code']);
-    }
-
     /**
      * Get type (mobile, landline, ...) for phone number.
      */
@@ -122,7 +104,7 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
      */
     public function isValidPhonenumberAny($phonenumber): bool
     {
-        if (false === $this->isConfigured) {
+        if (false === $this->isPhonenumberValidationConfigured()) {
             return true;
         }
         $validation = $this->performTwilioLookup($phonenumber);
@@ -142,7 +124,7 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
      */
     public function isValidPhonenumberLandOrVoip($phonenumber): bool
     {
-        if (false === $this->isConfigured) {
+        if (false === $this->isPhonenumberValidationConfigured()) {
             return true;
         }
 
@@ -163,7 +145,7 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
      */
     public function isValidPhonenumberMobile($phonenumber): bool
     {
-        if (false === $this->isConfigured) {
+        if (false === $this->isPhonenumberValidationConfigured()) {
             return true;
         }
 
@@ -178,7 +160,7 @@ final class PhonenumberHelper implements PhoneNumberHelperInterface
 
     private function performTwilioLookup($phonenumber)
     {
-        if (false === $this->isConfigured) {
+        if (false === $this->isPhonenumberValidationConfigured()) {
             return null;
         }
 

src/Bundle/ChillMainBundle/Resources/public/chill/js/date.ts

@@ -37,8 +37,13 @@ export const ISOToDate = (str: string | null): Date | null => {
         return null;
     }
 
-  const [year, month, day] = str.split("-").map((p) => parseInt(p));
+    // If the string already contains time info, use it directly
+    if (str.includes("T") || str.includes(" ")) {
+        return new Date(str);
+    }
 
+    // Otherwise, parse date only
+    const [year, month, day] = str.split("-").map((p) => parseInt(p));
     return new Date(year, month - 1, day, 0, 0, 0, 0);
 };
 
@@ -56,7 +61,9 @@ export const ISOToDatetime = (str: string | null): Date | null => {
         [time, timezone] = times.split(times.charAt(8)),
         [hours, minutes, seconds] = time.split(":").map((s) => parseInt(s));
     if ("0000" === timezone) {
-    return new Date(Date.UTC(year, month - 1, date, hours, minutes, seconds));
+        return new Date(
+            Date.UTC(year, month - 1, date, hours, minutes, seconds),
+        );
     }
 
     return new Date(year, month - 1, date, hours, minutes, seconds);
@@ -67,20 +74,19 @@ export const ISOToDatetime = (str: string | null): Date | null => {
  *
  */
 export const datetimeToISO = (date: Date): string => {
-  let cal, time, offset;
-  cal = [
+    const cal = [
         date.getFullYear(),
         (date.getMonth() + 1).toString().padStart(2, "0"),
         date.getDate().toString().padStart(2, "0"),
     ].join("-");
 
-  time = [
+    const time = [
         date.getHours().toString().padStart(2, "0"),
         date.getMinutes().toString().padStart(2, "0"),
         date.getSeconds().toString().padStart(2, "0"),
     ].join(":");
 
-  offset = [
+    const offset = [
         date.getTimezoneOffset() <= 0 ? "+" : "-",
         Math.abs(Math.floor(date.getTimezoneOffset() / 60))
             .toString()
@@ -152,24 +158,11 @@ export const intervalISOToDays = (str: string | null): number | null => {
                 vstring = "";
                 break;
             default:
-        throw Error("this character should not appears: " + str.charAt(i));
+                throw Error(
+                    "this character should not appears: " + str.charAt(i),
+                );
         }
     }
 
     return days;
 };
-
-export function getTimezoneOffsetString(date: Date, timeZone: string): string {
-  const utcDate = new Date(date.toLocaleString("en-US", { timeZone: "UTC" }));
-  const tzDate  = new Date(date.toLocaleString("en-US", { timeZone }));
-  const offsetMinutes = (utcDate.getTime() - tzDate.getTime()) / (60 * 1000);
-
-  // Inverser le signe pour avoir la convention ±HH:MM
-  const sign = offsetMinutes <= 0 ? "+" : "-";
-  const absMinutes = Math.abs(offsetMinutes);
-  const hours = String(Math.floor(absMinutes / 60)).padStart(2, "0");
-  const minutes = String(absMinutes % 60).padStart(2, "0");
-
-  return `${sign}${hours}:${minutes}`;
-}
-

src/Bundle/ChillMainBundle/Resources/public/lib/api/apiMethods.ts

@@ -1,26 +1,15 @@
-import {
-  DynamicKeys,
-  Scope,
-  ValidationExceptionInterface,
-  ValidationProblemFromMap,
-  ViolationFromMap
-} from "../../types";
+import { Scope } from "../../types";
 
 export type body = Record<string, boolean | string | number | null>;
 export type fetchOption = Record<string, boolean | string | number | null>;
-export type Primitive = string | number | boolean | null;
+
 export type Params = Record<string, number | string>;
 
-export interface Pagination {
-  first: number;
-  items_per_page: number;
-  more: boolean;
-  next: string | null;
-  previous: string | null;
-}
-
 export interface PaginationResponse<T> {
-  pagination: Pagination;
+    pagination: {
+        more: boolean;
+        items_per_page: number;
+    };
     results: T[];
     count: number;
 }
@@ -31,115 +20,20 @@ export interface TransportExceptionInterface {
     name: string;
 }
 
-export class ValidationException<
-    M extends Record<string, Record<string, string|number>> = Record<
-      string,
-      Record<string, string|number>
-    >,
-  >
-  extends Error
-  implements ValidationExceptionInterface<M>
-{
-  public readonly name = "ValidationException" as const;
-  public readonly problems: ValidationProblemFromMap<M>;
-  public readonly violations: string[];
-  public readonly violationsList: ViolationFromMap<M>[];
-  public readonly titles: string[];
-  public readonly propertyPaths: DynamicKeys<M> & string[];
-  public readonly byProperty: Record<Extract<keyof M, string>, string[]>;
-
-  constructor(problem: ValidationProblemFromMap<M>) {
-    const message = [problem.title, problem.detail].filter(Boolean).join(" — ");
-    super(message);
-    Object.setPrototypeOf(this, new.target.prototype);
-
-    this.problems = problem;
-
-    this.violationsList = problem.violations;
-    this.violations = problem.violations.map(
-      (v) => `${v.title}: ${v.propertyPath}`,
-    );
-
-    this.titles = problem.violations.map((v) => v.title);
-
-    this.propertyPaths = problem.violations.map(
-      (v) => v.propertyPath,
-    ) as DynamicKeys<M> & string[];
-
-    this.byProperty = problem.violations.reduce(
-      (acc, v) => {
-        const key = v.propertyPath.replace('/\[\d+\]$/', "") as Extract<keyof M, string>;
-        (acc[key] ||= []).push(v.title);
-        return acc;
-      },
-      {} as Record<Extract<keyof M, string>, string[]>,
-    );
-
-    if (Error.captureStackTrace) {
-      Error.captureStackTrace(this, ValidationException);
-    }
+export interface ValidationExceptionInterface
+    extends TransportExceptionInterface {
+    name: "ValidationException";
+    error: object;
+    violations: string[];
+    titles: string[];
+    propertyPaths: string[];
 }
 
-  violationsByNormalizedProperty(property: Extract<keyof M, string>): ViolationFromMap<M>[] {
-    return this.violationsList.filter((v) => v.propertyPath.replace(/\[\d+\]$/, "") === property);
-  }
-
-  violationsByNormalizedPropertyAndParams<
-    P extends Extract<keyof M, string>,
-    K extends Extract<keyof M[P], string>
-  >(
-    property: P,
-    param: K,
-    param_value: M[P][K]
-  ): ViolationFromMap<M>[]
-  {
-    const list = this.violationsByNormalizedProperty(property);
-
-    return  list.filter(
-      (v): boolean =>
-        !!v.parameters &&
-        // `with_parameter in v.parameters` check indexing
-        param in v.parameters &&
-        // the cast is safe, because we have overloading that bind the types
-        (v.parameters as M[P])[param] === param_value
-    );
-  }
-}
-
-/**
- * Check that the exception is a ValidationExceptionInterface
- * @param x
- */
-export function isValidationException<M extends Record<string, Record<string, string|number>>>(
-  x: unknown,
-): x is ValidationExceptionInterface<M> {
-  return (
-    x instanceof ValidationException ||
-    (typeof x === "object" &&
-      x !== null &&
-      (x as any).name === "ValidationException")
-  );
-}
-
-export function isValidationProblem(x: unknown): x is {
-  type: string;
+export interface ValidationErrorResponse extends TransportExceptionInterface {
+    violations: {
         title: string;
-  violations: { propertyPath: string; title: string }[];
-} {
-  if (!x || typeof x !== "object") return false;
-  const o = x as any;
-  return (
-    typeof o.type === "string" &&
-    typeof o.title === "string" &&
-    Array.isArray(o.violations) &&
-    o.violations.every(
-      (v: any) =>
-        v &&
-        typeof v === "object" &&
-        typeof v.propertyPath === "string" &&
-        typeof v.title === "string",
-    )
-  );
+        propertyPath: string;
+    }[];
 }
 
 export interface AccessExceptionInterface extends TransportExceptionInterface {
@@ -166,151 +60,12 @@ export interface ConflictHttpExceptionInterface
 }
 
 /**
- * Generic api method that can be adapted to any fetch request.
+ * Generic api method that can be adapted to any fetch request
  *
- * What this does
- * - Performs a single HTTP request using fetch and returns the parsed JSON as Output.
- * - Interprets common API errors and throws typed exceptions you can catch in your UI.
- * - When the server returns a Symfony validation problem (HTTP 422), the error is
- *   rethrown as a typed ValidationException that is aware of your Violation Map (see below).
- *
- * Important: For GET endpoints that return lists, prefer using fetchResults, which
- * handles pagination and aggregation for you.
- *
- * Violation Map (M): make your 422 errors strongly typed
- * ------------------------------------------------------
- * Symfony’s validation problem+json payload looks like this (simplified):
- *
- *   {
- *     "type": "https://symfony.com/errors/validation",
- *     "title": "Validation Failed",
- *     "violations": [
- *       {
- *         "propertyPath": "mobilenumber",
- *         "title": "This value is not a valid phone number.",
- *         "parameters": {
- *           "{{ value }}": "+33 1 02 03 04 05",
- *           "{{ types }}": "mobile number"
- *         },
- *         "type": "urn:uuid:..."
- *       }
- *     ]
- *   }
- *
- * The makeFetch generic type parameter M lets you describe, field by field, which
- * parameters may appear for each propertyPath. Doing so gives you full type-safety when
- * consuming ValidationException in your UI code.
- *
- * How to build M (Violation Map)
- * - M is a map where each key is a server-side propertyPath (string), and the value is a
- *   record describing the allowed keys in the parameters object for that property.
- * - Keys in parameters are the exact strings you receive from Symfony, including the
- *   curly-braced placeholders such as "{{ value }}", "{{ types }}", etc.
- *
- * Example from Person creation (WritePersonViolationMap)
- * -----------------------------------------------------
- * In ChillPersonBundle/Resources/public/vuejs/_api/OnTheFly.ts you’ll find:
- *
- *   export type WritePersonViolationMap = {
- *     gender: {
- *       "{{ value }}": string | null;
- *     };
- *     mobilenumber: {
- *       "{{ types }}": string;          // ex: "mobile number"
- *       "{{ value }}": string;          // ex: "+33 1 02 03 04 05"
- *     };
- *   };
- *
- * This means:
- * - If the server reports a violation for propertyPath "gender", the parameters object
- *   is expected to contain a key "{{ value }}" with a string or null value.
- * - If the server reports a violation for propertyPath "mobilenumber", the parameters
- *   may include "{{ value }}" and "{{ types }}" as strings.
- *
- * How makeFetch uses M
- * - When the response has status 422 and the payload matches a Symfony validation
- *   problem, makeFetch casts it to ValidationProblemFromMap<M> and throws a
- *   ValidationException<M>.
- * - The ValidationException exposes helpful, pre-computed fields:
- *   - exception.problem: the full typed payload
- *   - exception.violations: ["Title: propertyPath", ...]
- *   - exception.titles: ["Title 1", "Title 2", ...]
- *   - exception.propertyPaths: ["gender", "mobilenumber", ...] (typed from M)
- *   - exception.byProperty: { gender: [titles...], mobilenumber: [titles...] }
- *
- * Typical usage patterns
- * ----------------------
- * 1) GET without Validation Map (no 422 expected):
- *
- *   const centers = await makeFetch<null, { showCenters: boolean; centers: Center[] }>(
- *     "GET",
- *     "/api/1.0/person/creation/authorized-centers",
- *     null
- *   );
- *
- * 2) POST with body and Violation Map:
- *
- *   type WritePersonViolationMap = {
- *     gender: { "{{ value }}": string | null };
- *     mobilenumber: { "{{ types }}": string; "{{ value }}": string };
- *   };
- *
- *   try {
- *     const created = await makeFetch<PersonWrite, Person, WritePersonViolationMap>(
- *       "POST",
- *       "/api/1.0/person/person.json",
- *       personPayload
- *     );
- *     // Success path
- *   } catch (e) {
- *     if (isValidationException(e)) {
- *       // Fully typed:
- *       e.propertyPaths.includes("mobilenumber");
- *       const firstTitleForMobile = e.byProperty.mobilenumber?.[0];
- *       // You can also inspect parameter values:
- *       const v = e.problem.violations.find(v => v.propertyPath === "mobilenumber");
- *       const rawValue = v?.parameters?.["{{ value }}"]; // typed as string
- *     } else {
- *       // Other error handling (AccessException, ConflictHttpException, etc.)
- *     }
- *   }
- *
- * Tips to design your Violation Map
- * - Use exact propertyPath strings as exposed by the API (they usually match your
- *   DTO field names or entity property paths used by the validator).
- * - Inside each property, list only the placeholders that you actually read in the UI
- *   (you can always add more later). This keeps your types strict but pragmatic.
- * - If a field may not include parameters at all, you can set it to an empty object {}.
- * - If you don’t care about parameter typing, you can omit M entirely and rely on the
- *   default loose typing (Record<string, Primitive>), but you’ll lose safety.
- *
- * Error taxonomy thrown by makeFetch
- * - ValidationException<M> when status = 422 and payload is a validation problem.
- * - AccessException when status = 403.
- * - ConflictHttpException when status = 409.
- * - A generic error object for other non-ok statuses.
- *
- * @typeParam Input  - Shape of the request body you send (if any)
- * @typeParam Output - Shape of the successful JSON response you expect
- * @typeParam M      - Violation Map describing the per-field parameters you expect
- *                     in Symfony validation violations. See examples above.
- *
- * @param method  The HTTP method to use (POST, GET, PUT, PATCH, DELETE)
- * @param url     The absolute or relative URL to call
- * @param body    The request payload. If null/undefined, no body is sent
- * @param options Extra fetch options/headers merged into the request
- *
- * @returns The parsed JSON response typed as Output. For 204 No Content, resolves
- *          with undefined (void).
+ * This method is suitable make a single fetch. When performing a GET to fetch a list of elements, always consider pagination
+ * and use of the @link{fetchResults} method.
  */
-export const makeFetch = async <
-  Input,
-  Output,
-  M extends Record<string, Record<string, string|number>> = Record<
-    string,
-    Record<string, string|number>
-  >,
->(
+export const makeFetch = <Input, Output>(
     method: "POST" | "GET" | "PUT" | "PATCH" | "DELETE",
     url: string,
     body?: body | Input | null,
@@ -330,8 +85,7 @@ export const makeFetch = async <
     if (typeof options !== "undefined") {
         opts = Object.assign(opts, options);
     }
-
-  return fetch(url, opts).then(async (response) => {
+    return fetch(url, opts).then((response) => {
         if (response.status === 204) {
             return Promise.resolve();
         }
@@ -341,20 +95,9 @@ export const makeFetch = async <
         }
 
         if (response.status === 422) {
-      // Unprocessable Entity -> payload de validation Symfony
-      const json = await response.json().catch(() => undefined);
-
-      if (isValidationProblem(json)) {
-        // On ré-interprète le payload selon M (ParamMap) pour typer les violations
-        const problem = json as unknown as ValidationProblemFromMap<M>;
-        throw new ValidationException<M>(problem);
-      }
-
-      const err = new Error(
-        "Validation failed but payload is not a ValidationProblem",
-      );
-      (err as any).raw = json;
-      throw err;
+            return response.json().then((response) => {
+                throw ValidationException(response);
+            });
         }
 
         if (response.status === 403) {
@@ -419,6 +162,12 @@ function _fetchAction<T>(
                 throw NotFoundException(response);
             }
 
+            if (response.status === 422) {
+                return response.json().then((response) => {
+                    throw ValidationException(response);
+                });
+            }
+
             if (response.status === 403) {
                 throw AccessException(response);
             }
@@ -477,6 +226,24 @@ export const fetchScopes = (): Promise<Scope[]> => {
     return fetchResults("/api/1.0/main/scope.json");
 };
 
+/**
+ * Error objects to be thrown
+ */
+const ValidationException = (
+    response: ValidationErrorResponse,
+): ValidationExceptionInterface => {
+    const error = {} as ValidationExceptionInterface;
+    error.name = "ValidationException";
+    error.violations = response.violations.map(
+        (violation) => `${violation.title}: ${violation.propertyPath}`,
+    );
+    error.titles = response.violations.map((violation) => violation.title);
+    error.propertyPaths = response.violations.map(
+        (violation) => violation.propertyPath,
+    );
+    return error;
+};
+
 // eslint-disable-next-line @typescript-eslint/no-unused-vars
 const AccessException = (response: Response): AccessExceptionInterface => {
     const error = {} as AccessExceptionInterface;

src/Bundle/ChillMainBundle/Resources/public/lib/api/genderHelper.ts

@@ -1,17 +0,0 @@
-import {Gender, GenderTranslation} from "ChillMainAssets/types";
-
-/**
- * Translates a given gender object into its corresponding gender translation string.
- *
- * @param {Gender|null} gender - The gender object to be translated, null values are also supported
- * @return {GenderTranslation} Returns the gender translation string corresponding to the provided gender,
- *                             or "unknown" if the gender is null.
- */
-export function toGenderTranslation(gender: Gender|null): GenderTranslation
-{
-  if (null === gender) {
-    return "unknown";
-  }
-
-  return gender.genderTranslation;
-}