Add changie

form field addressesEmail removed

.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-20251003-224044.yaml

@@ -0,0 +1,6 @@
+kind: Fixed
+body: Fix the rendering of list of StoredObjectVersions, where there are kept version (before converting to pdf) and intermediate versions deleted
+time: 2025-10-03T22:40:44.685474863+02:00
+custom:
+    Issue: ""
+    SchemaChange: No schema change

.changes/unreleased/Fixed-20251006-121315.yaml

@@ -0,0 +1,6 @@
+kind: Fixed
+body: 'Notification: fix editing of sent notification by removing form.addressesEmails, a field that no longer exists'
+time: 2025-10-06T12:13:15.45905994+02:00
+custom:
+    Issue: "434"
+    SchemaChange: No schema change

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

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

.changes/v2.10.0.md

@@ -16,5 +16,5 @@
 - ajout d'un filtre et regroupement par usager participant sur les échanges
 - ajout d'un regroupement: par type d'activité associé au parcours;
 - trie les filtre et regroupements par ordre alphabétique dans els exports
-- ajout d'un paramètre qui permet de désactiver le filtre par centre dans les exports
+- ajout d'un paramètre qui permet de désactiver le filtre par territoire dans les exports
 - correction de l'interface de date dans les filtres et regroupements "par statut du parcours à la date"

.changes/v2.4.0.md

@@ -29,7 +29,7 @@
 - ajout d'un regroupement par métier des intervenants sur un parcours;
 - ajout d'un regroupement par service des intervenants sur un parcours;
 - ajout d'un regroupement par utilisateur intervenant sur un parcours
-- ajout d'un regroupement "par centre de l'usager";
+- ajout d'un regroupement "par territoire de l'usager";
 - ajout d'un filtre "par métier intervenant sur un parcours";
 - ajout d'un filtre "par service intervenant sur un parcours";
 - création d'un rôle spécifique pour voir les parcours confidentiels (et séparer de celui de la liste qui permet de ré-assigner les parcours en lot);

.changes/v4.3.0.md

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

.changes/v4.4.0.md

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

.changes/v4.4.1.md

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

.changes/v4.4.2.md

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

.changes/v4.5.0.md

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

.changes/v4.5.1.md

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

.editorconfig

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

.junie/guidelines.md

@@ -234,9 +234,15 @@ This must be a decision made by a human, not by an AI. Every AI task must abort
 
 #### Running Tests
 
-The tests are run from the project's root (not from the bundle's root: so, do not change the directory to any bundle directory before running tests).
+The tests are run from the project's root (not from the bundle's root).
 
 ```bash
+# Run all tests
+vendor/bin/phpunit
+
+# Run tests for a specific bundle
+vendor/bin/phpunit --testsuite NameBundle
+
 # Run a specific test file
 vendor/bin/phpunit path/to/TestFile.php
 

.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,53 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
+## v4.5.1 - 2025-10-03
+### Fixed
+* Add missing javascript dependency
+* Add exception handling for conversion of attachment on sending external, when documens are already in pdf
+
+## v4.5.0 - 2025-10-03
+### Feature
+* Only allow delete of attachment on workflows that are not final
+* Move up signature buttons on index workflow page for easier access
+* Filter out document from attachment list if it is the same as the workflow document
+* Block edition on attached document on workflow, if the workflow is finalized or sent external
+* Convert workflow's attached document to pdf while sending them external
+* After a signature is canceled or rejected, going to a waiting page until the post-process routines apply a workflow transition
+### Fixed
+* ([#426](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/426)) Increased the number of required characters when setting a new password in Chill from 9 to 14 - GDPR compliance
+* Fix permissions on storedObject which are subject by a workflow
+### DX
+* Introduce a WaitingScreen component to display a waiting screen
+
+## v4.4.2 - 2025-09-12
+### Fixed
+* Fix document generation and workflow generation do not work on accompanying period work documents
+
+## v4.4.1 - 2025-09-11
+### Fixed
+* fix translations in duplicate evaluation document modal and realign close modal button
+
+## v4.4.0 - 2025-09-11
+### Feature
+* ([#359](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/359)) Allow the merge of two accompanying period works
+* ([#369](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/369)) Duplication of a document to another accompanying period work evaluation
+* ([#359](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/359)) Fusion of two accompanying period works
+### Fixed
+* Fix display of 'duplicate' and 'merge' buttons in CRUD templates
+* Fix saving notification preferences in user's profile
+
+## v4.3.0 - 2025-09-08
+### Feature
+* ([#409](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/409)) Add 45 and 60 min calendar ranges
+* Add a command to generate a list of permissions
+* ([#412](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/412)) Add an absence end date
+
+  **Schema Change**: Add columns or tables
+### Fixed
+* fix date formatting in calendar range display
+* Change route URL to avoid clash with person duplicate controller method
+
 ## v4.2.1 - 2025-09-03
 ### Fixed
 * Fix exports to work with DirectExportInterface
@@ -714,7 +761,7 @@ Fix color of Chill footer
 - ajout d'un filtre et regroupement par usager participant sur les échanges
 - ajout d'un regroupement: par type d'activité associé au parcours;
 - trie les filtre et regroupements par ordre alphabétique dans els exports
-- ajout d'un paramètre qui permet de désactiver le filtre par centre dans les exports
+- ajout d'un paramètre qui permet de désactiver le filtre par territoire dans les exports
 - correction de l'interface de date dans les filtres et regroupements "par statut du parcours à la date"
 
 ## v2.9.2 - 2023-10-17
@@ -894,7 +941,7 @@ error when trying to reedit a saved export
 - ajout d'un regroupement par métier des intervenants sur un parcours;
 - ajout d'un regroupement par service des intervenants sur un parcours;
 - ajout d'un regroupement par utilisateur intervenant sur un parcours
-- ajout d'un regroupement "par centre de l'usager";
+- ajout d'un regroupement "par territoire de l'usager";
 - ajout d'un filtre "par métier intervenant sur un parcours";
 - ajout d'un filtre "par service intervenant sur un parcours";
 - création d'un rôle spécifique pour voir les parcours confidentiels (et séparer de celui de la liste qui permet de ré-assigner les parcours en lot);

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 {
+import { trans, setLocale, setLocaleFallbacks } from "./ux-translator";
-  trans,
-  setLocale,
-  getLocale,
-  setLocaleFallbacks,
-} from "./ux-translator";
 
-setLocaleFallbacks({ en: "fr", nl: "fr", fr: "en" });
+setLocaleFallbacks({"en": "fr", "nl": "fr", "fr": "en"});
-setLocale("fr");
+setLocale('fr');
 
-export { trans, getLocale };
+export { trans };
-export * from "../var/translations";
+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/_static/bundles/docStore/doc_store_classes.puml

@@ -23,8 +23,8 @@ class "Document" {
     - text description
     - ArrayCollection_DocumentCategory categories
     - varchar_150 content #link to openstack
-    - Center center
+    - Territoire territoire
-    - Cercle cercle
+    - Service service
     - User user
     - DateTime date # Creation date
 }

docs/source/development/create-a-new-bundle.rst

@@ -11,94 +11,24 @@
 Create a new bundle
 *******************
 
+Create your own bundle is not a trivial task.
+
+The easiest way to achieve this is seems to be : 
+
+1. Prepare a fresh installation of the chill project, in a new directory
+2. Create a new bundle in this project, in the src directory
+3. Initialize a git repository **at the root bundle**, and create your initial commit.
+4. Register the bundle with composer/packagist. If you do not plan to distribute your bundle with packagist, you may use a custom repository for achieve this [#f1]_
+5. Move to a development installation, made as described in the :ref:`installation-for-development` section, and add your new repository to the composer.json file
+6. Work as :ref:`usual <editing-code-and-commiting>`
+
 .. warning::
 
     This part of the doc is not yet tested
 
-Create a new directory with Bundle class
+TODO
-----------------------------------------
-
-.. 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",
-        }
-    }
-    }
 
 
-Register the bundle
+.. rubric:: Footnotes
--------------------
-
-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
 
+.. [#f1] Be aware that we use the Affero GPL Licence, which ensure that all users must have access to derivative works done with this software.

docs/source/development/database-principles.rst

@@ -38,7 +38,7 @@ Certaines données sont historisées:
 
 - les référents d'un parcours;
 - les statuts d'un parcours;
-- la liaison entre les centres et les usagers;
+- la liaison entre les territoires et les usagers;
 - etc.
 
 Dans ces cas-là, Chill crée généralement deux colonnes, qui sont habituellement nommées :code:`startDate` et :code:`endDate`. Lorsque la colonne :code:`endDate` est à :code:`NULL`, cela signifie que la période n'est pas "fermée". La colonne :code:`startDate` n'est pas nullable.

docs/source/development/database/table_list.csv

@@ -1,6 +1,6 @@
 order,table_schema,table_name,commentaire
 1,chill_3party,party_category,Catégorie de tiers
-2,chill_3party,party_center,Association entre les tiers et les centres (déprécié)
+2,chill_3party,party_center,Association entre les tiers et les territoires (déprécié)
 3,chill_3party,party_profession,Profession du tiers (déprécié)
 4,chill_3party,third_party,Tiers
 5,chill_3party,thirdparty_category,association tiers - catégories
@@ -54,7 +54,7 @@ order,table_schema,table_name,commentaire
 53,public,activitytpresence,Présence aux échanges
 54,public,activitytype,Types d'échanges
 55,public,activitytypecategory,Catégories de types d'échanges
-56,public,centers,"Centres (territoires, agences, etc.)"
+56,public,centers,"Territoires (territoires, agences, etc.)"
 57,public,chill_activity_activity_chill_person_socialaction,
 58,public,chill_activity_activity_chill_person_socialissue
 59,public,chill_docgen_template,Gabarits de documents
@@ -111,7 +111,7 @@ order,table_schema,table_name,commentaire
 110,public,chill_person_marital_status,Etats civils
 111,public,chill_person_not_duplicate,
 112,public,chill_person_person,Usagers
-113,public,chill_person_person_center_history,Historique des centres d'un usagers
+113,public,chill_person_person_center_history,Historique des territoires d'un usagers
 114,public,chill_person_persons_to_addresses,Déprécié
 115,public,chill_person_phone,Numéros d etéléphone supplémentaires d'un usager
 116,public,chill_person_relations,Types de relations de filiation
@@ -142,7 +142,7 @@ order,table_schema,table_name,commentaire
 141,public,permission_groups
 142,public,permissionsgroup_rolescope
 143,public,persons_spoken_languages
-144,public,regroupment,Regroupement de centres
+144,public,regroupment,Regroupement de territoires
 145,public,regroupment_center,
 146,public,role_scopes,
 147,public,scopes,Services

package.json

@@ -55,6 +55,7 @@
     "@tsconfig/node20": "^20.1.4",
     "@types/dompurify": "^3.0.5",
     "@types/leaflet": "^1.9.3",
+    "@vueuse/core": "^13.9.0",
     "bootstrap-icons": "^1.11.3",
     "dropzone": "^5.7.6",
     "es6-promise": "^4.2.8",
@@ -79,12 +80,12 @@
     "dev": "encore dev",
     "watch": "encore dev --watch",
     "build": "encore production --progress",
-    "specs-build": "yaml-merge src/Bundle/ChillMainBundle/chill.api.specs.yaml src/Bundle/ChillPersonBundle/chill.api.specs.yaml src/Bundle/ChillCalendarBundle/chill.api.specs.yaml src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml src/Bundle/ChillDocStoreBundle/chill.api.specs.yaml src/Bundle/ChillTicketBundle/chill.api.specs.yaml> templates/api/specs.yaml",
+    "specs-build": "yaml-merge src/Bundle/ChillMainBundle/chill.api.specs.yaml src/Bundle/ChillPersonBundle/chill.api.specs.yaml src/Bundle/ChillCalendarBundle/chill.api.specs.yaml src/Bundle/ChillThirdPartyBundle/chill.api.specs.yaml src/Bundle/ChillDocStoreBundle/chill.api.specs.yaml> templates/api/specs.yaml",
     "specs-validate": "swagger-cli validate templates/api/specs.yaml",
     "specs-create-dir": "mkdir -p templates/api",
     "specs": "yarn run specs-create-dir && yarn run specs-build && yarn run specs-validate",
     "version": "node --version",
-    "eslint": "eslint-baseline --fix \"src/**/*.{js,ts,vue}\""
+    "eslint": "npx eslint-baseline --fix \"src/**/*.{js,ts,vue}\""
   },
   "private": true
 }

phpunit.xml.dist

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

resources/ticket_motives_import/README.md

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

resources/ticket_motives_import/motives.yaml

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

resources/translation_override/README.md

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

resources/translation_override/overrides.yaml

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

src/Bundle/ChillActivityBundle/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/ChillActivityBundle/translations/messages.fr.yml

@@ -10,7 +10,7 @@ Attendee: Présence de l'usager
 attendee: présence de l'usager
 list_reasons: liste des sujets
 user_username: nom de l'utilisateur
-circle_name: nom du cercle
+circle_name: nom du service
 Remark: Commentaire
 No comments: Aucun commentaire
 Add a new activity: Ajouter une nouvel échange
@@ -20,7 +20,7 @@ not present: absent
 Delete: Supprimer
 Update: Mettre à jour
 Update activity: Modifier l'échange
-Scope: Cercle
+Scope: Service
 Activity data: Données de l'échange
 Activity location: Localisation de l'échange
 No reason associated: Aucun sujet
@@ -398,7 +398,7 @@ export:
             sent received: Envoyé ou reçu
             emergency: Urgence
             accompanying course id: Identifiant du parcours
-            course circles: Cercles du parcours
+            course circles: Services du parcours
             travelTime: Durée de déplacement
             durationTime: Durée
             id: Identifiant

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/ChillAsideActivityBundle/src/translations/messages.fr.yml

@@ -177,7 +177,7 @@ export:
         agent_id: Utilisateur
         creator_id: Créateur
         main_scope: Service principal de l'utilisateur
-        main_center: Centre principal de l'utilisateur
+        main_center: Territoire principal de l'utilisateur
         aside_activity_type: Catégorie d'activité annexe
         date: Date
         duration: Durée

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
-        <i v-else-if="invite.status === 'pending'" class="fa fa-question-o" />
+                    v-else-if="invite.status === 'declined'"
-        <i v-else-if="invite.status === 'tentative'" class="fa fa-question" />
+                    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)"
+                <a
-          ><i class="fa fa-check" aria-hidden="true"></i> {{ $t("Accept") }}</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)"
+                <a
-          ><i class="fa fa-times" aria-hidden="true"></i> {{ $t("Decline") }}</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">
+                        <select
-              <option v-for="w in nextWeeks" :value="w.value" :key="w.value">
+                            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) => {
+const formatDate = (datetime: string, format: null | "time" = null) => {
-  console.log(typeof datetime);
+    const date = ISOToDate(datetime);
-  return 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 ratio = Math.floor(
-                  let colorIndex = users.length - ratio * COLORS.length;
+                                        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) => {
+                                                new Promise(
-                          let results = calendar.results;
+                                                    (resolve, reject) => {
-                          let events = results.map((i) => ({
+                                                        let results =
-                            start: i.startDate.datetime,
+                                                            calendar.results;
-                            end: i.endDate.datetime,
+                                                        let events =
-                          }));
+                                                            results.map(
-                          let calendarEventsCurrentUser = {
+                                                                (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) =>
+            this.calendarEvents.selected = this.calendarEvents.loaded.filter(
-        selectedUsersId.includes(a.id),
+                (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/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/Controller/StoredObjectVersionApiController.php

@@ -59,7 +59,7 @@ final readonly class StoredObjectVersionApiController
 
         return new JsonResponse(
             $this->serializer->serialize(
-                new Collection($items, $paginator),
+                new Collection(array_values($items->toArray()), $paginator),
                 'json',
                 [AbstractNormalizer::GROUPS => ['read', StoredObjectVersionNormalizer::WITH_POINT_IN_TIMES_CONTEXT, StoredObjectVersionNormalizer::WITH_RESTORED_CONTEXT]]
             ),

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/Exception/ConversionWithSameMimeTypeException.php

@@ -0,0 +1,20 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\DocStoreBundle\Exception;
+
+class ConversionWithSameMimeTypeException extends \RuntimeException
+{
+    public function __construct(string $mimeType, ?\Throwable $previous = null)
+    {
+        parent::__construct("Conversion to same MIME type '{$mimeType}' is not allowed: already at the same MIME type", 0, $previous);
+    }
+}

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(
+    const input_stored_object: HTMLInputElement | null =
-    "input[data-stored-object]",
+        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/types/generic_doc.ts

@@ -25,7 +25,7 @@ export interface GenericDoc {
     type: "doc_store_generic_doc";
     uniqueKey: string;
     key: string;
-  identifiers: object;
+    identifiers: { id: number };
     context: "person" | "accompanying-period";
     doc_date: DateTime;
     metadata: GenericDocMetadata;

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;
+        const canvas = document.querySelectorAll(
-    canvas.addEventListener("pointerup", (e) => canvasClick(e, canvas), false);
+            "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
+        {{ trans(DOCUMENT_ADD) }}
-  </button>
-  <button v-else @click="openModal" class="btn btn-edit">
-    Remplacer le document
     </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
+                            >Le document peut être édité uniquement en utilisant
-              Office.</small
+                            Libre Office.</small
                         >
                     </p>
 
                     <p>
                         <small
-              >En cas d'échec lors de l'enregistrement, sauver le document sur
+                            >En cas d'échec lors de l'enregistrement, sauver le
-              le poste de travail avant de le déposer à nouveau ici.</small
+                            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

@@ -3,9 +3,9 @@ import {
     StoredObject,
     StoredObjectPointInTime,
     StoredObjectVersionWithPointInTime,
-} from "./../../../types";
+} from "ChillDocStoreAssets/types";
 import UserRenderBoxBadge from "ChillMainAssets/vuejs/_components/Entity/UserRenderBoxBadge.vue";
-import { ISOToDatetime } from "./../../../../../../ChillMainBundle/Resources/public/chill/js/date";
+import { ISOToDatetime } from "ChillMainAssets/chill/js/date";
 import FileIcon from "ChillDocStoreAssets/vuejs/FileIcon.vue";
 import RestoreVersionButton from "ChillDocStoreAssets/vuejs/StoredObjectButton/HistoryButton/RestoreVersionButton.vue";
 import DownloadButton from "ChillDocStoreAssets/vuejs/StoredObjectButton/DownloadButton.vue";
@@ -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/Security/Authorization/StoredObjectVoter/AbstractStoredObjectVoter.php

@@ -46,6 +46,16 @@ abstract class AbstractStoredObjectVoter implements StoredObjectVoterInterface
 
     public function voteOnAttribute(StoredObjectRoleEnum $attribute, StoredObject $subject, TokenInterface $token): bool
     {
+        // we first try to get the permission from the workflow, as attachement (this is the less intensive query)
+        $workflowPermissionAsAttachment = match ($attribute) {
+            StoredObjectRoleEnum::SEE => $this->workflowDocumentService->isAllowedByWorkflowForReadOperation($subject),
+            StoredObjectRoleEnum::EDIT => $this->workflowDocumentService->isAllowedByWorkflowForWriteOperation($subject),
+        };
+
+        if (WorkflowRelatedEntityPermissionHelper::FORCE_DENIED === $workflowPermissionAsAttachment) {
+            return false;
+        }
+
         // Retrieve the related entity
         $entity = $this->getRepository()->findAssociatedEntityToStoredObject($subject);
 
@@ -66,7 +76,7 @@ abstract class AbstractStoredObjectVoter implements StoredObjectVoterInterface
         return match ($workflowPermission) {
             WorkflowRelatedEntityPermissionHelper::FORCE_GRANT => true,
             WorkflowRelatedEntityPermissionHelper::FORCE_DENIED => false,
-            WorkflowRelatedEntityPermissionHelper::ABSTAIN => $regularPermission,
+            WorkflowRelatedEntityPermissionHelper::ABSTAIN => WorkflowRelatedEntityPermissionHelper::FORCE_GRANT === $workflowPermissionAsAttachment || $regularPermission,
         };
     }
 }

src/Bundle/ChillDocStoreBundle/Security/Authorization/StoredObjectVoterInterface.php

@@ -14,6 +14,12 @@ namespace Chill\DocStoreBundle\Security\Authorization;
 use Chill\DocStoreBundle\Entity\StoredObject;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 
+/**
+ * Interface for voting on stored object permissions.
+ *
+ * Each time a stored object is attached to a document, the voter is responsible for determining
+ * whether the user has the necessary permissions to access or modify the stored object.
+ */
 interface StoredObjectVoterInterface
 {
     public function supports(StoredObjectRoleEnum $attribute, StoredObject $subject): bool;

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 (in_array(self::WITH_POINT_IN_TIMES_CONTEXT, $context[AbstractNormalizer::GROUPS] ?? [], true)) {
-
-        if (is_string($normalizationGroups)) {
-            $normalizationGroups = [$normalizationGroups];
-        }
-
-        if (in_array(self::WITH_POINT_IN_TIMES_CONTEXT, $normalizationGroups, 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/Service/StoredObjectToPdfConverter.php

@@ -15,6 +15,7 @@ use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\DocStoreBundle\Entity\StoredObjectPointInTime;
 use Chill\DocStoreBundle\Entity\StoredObjectPointInTimeReasonEnum;
 use Chill\DocStoreBundle\Entity\StoredObjectVersion;
+use Chill\DocStoreBundle\Exception\ConversionWithSameMimeTypeException;
 use Chill\DocStoreBundle\Exception\StoredObjectManagerException;
 use Chill\WopiBundle\Service\WopiConverter;
 use Symfony\Component\Mime\MimeTypesInterface;
@@ -44,6 +45,7 @@ class StoredObjectToPdfConverter
      * @throws \UnexpectedValueException           if the preferred mime type for the conversion is not found
      * @throws \RuntimeException                   if the conversion or storage of the new version fails
      * @throws StoredObjectManagerException
+     * @throws ConversionWithSameMimeTypeException if the document has already the same mime type79*
      */
     public function addConvertedVersion(StoredObject $storedObject, string $lang, $convertTo = 'pdf', bool $includeConvertedContent = false): array
     {
@@ -56,7 +58,7 @@ class StoredObjectToPdfConverter
         $currentVersion = $storedObject->getCurrentVersion();
 
         if ($currentVersion->getType() === $newMimeType) {
-            throw new \UnexpectedValueException('Already at the same mime type');
+            throw new ConversionWithSameMimeTypeException($newMimeType);
         }
 
         $content = $this->storedObjectManager->read($currentVersion);

src/Bundle/ChillDocStoreBundle/Tests/Controller/StoredObjectVersionApiControllerTest.php

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

src/Bundle/ChillDocStoreBundle/Tests/Security/Authorization/AbstractStoredObjectVoterTest.php

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

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/ChillEventBundle/Controller/EventController.php

@@ -246,7 +246,7 @@ final class EventController extends AbstractController
                 'class' => Center::class,
                 'choices' => $centers,
                 'placeholder' => $this->translator->trans('Pick a center'),
-                'label' => 'To which centre should the event be associated ?',
+                'label' => 'To which territory should the event be associated ?',
             ])
             ->add('submit', SubmitType::class, [
                 'label' => 'Next step',

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

@@ -64,7 +64,7 @@ CHILL_EVENT_PARTICIPATION_SEE_DETAILS: Voir le détail d'une participation
 
 # TODO check place to put this
 Next step: Étape suivante
-To which centre should the event be associated ?: À quel centre doit être associé l'événement ?
+To which territory should the event be associated ?: À quel territoire doit être associé l'événement ?
 
 # timeline
 past: passé
@@ -151,7 +151,7 @@ event:
     filter:
         event_types: Par types d'événement
         event_dates: Par date d'événement
-        center: Par centre
+        center: Par territoire
         by_responsable: Par responsable
         pick_responsable: Filtrer par responsables
     budget:
@@ -188,7 +188,7 @@ event_id: Identifiant
 event_name: Nom
 event_date: Date
 event_type: Type d'évenement
-event_center: Centre
+event_center: Territoire
 event_moderator: Responsable
 event_participants_count: Nombre de participants
 event_location: Localisation

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/Controller/WorkflowApiController.php

@@ -11,6 +11,7 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Controller;
 
+use Chill\MainBundle\CRUD\Controller\ApiController;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
 use Chill\MainBundle\Pagination\PaginatorFactory;
@@ -27,7 +28,7 @@ use Symfony\Component\Security\Core\Exception\AccessDeniedException;
 use Symfony\Component\Security\Core\Security;
 use Symfony\Component\Serializer\SerializerInterface;
 
-class WorkflowApiController
+class WorkflowApiController extends ApiController
 {
     public function __construct(private readonly EntityManagerInterface $entityManager, private readonly EntityWorkflowRepository $entityWorkflowRepository, private readonly PaginatorFactory $paginatorFactory, private readonly Security $security, private readonly SerializerInterface $serializer) {}
 

src/Bundle/ChillMainBundle/Controller/WorkflowSignatureStateChangeController.php

@@ -44,7 +44,7 @@ final readonly class WorkflowSignatureStateChangeController
             $signature,
             $request,
             EntityWorkflowStepSignatureVoter::CANCEL,
-            function (EntityWorkflowStepSignature $signature) {$this->signatureStepStateChanger->markSignatureAsCanceled($signature); },
+            fn (EntityWorkflowStepSignature $signature): string => $this->signatureStepStateChanger->markSignatureAsCanceled($signature),
             '@ChillMain/WorkflowSignature/cancel.html.twig',
         );
     }
@@ -56,11 +56,18 @@ final readonly class WorkflowSignatureStateChangeController
             $signature,
             $request,
             EntityWorkflowStepSignatureVoter::REJECT,
-            function (EntityWorkflowStepSignature $signature) {$this->signatureStepStateChanger->markSignatureAsRejected($signature); },
+            fn (EntityWorkflowStepSignature $signature): string => $this->signatureStepStateChanger->markSignatureAsRejected($signature),
             '@ChillMain/WorkflowSignature/reject.html.twig',
         );
     }
 
+    /**
+     * @param callable(EntityWorkflowStepSignature): string $markSignature
+     *
+     * @throws \Twig\Error\LoaderError
+     * @throws \Twig\Error\RuntimeError
+     * @throws \Twig\Error\SyntaxError
+     */
     private function markSignatureAction(
         EntityWorkflowStepSignature $signature,
         Request $request,
@@ -79,12 +86,13 @@ final readonly class WorkflowSignatureStateChangeController
         $form->handleRequest($request);
 
         if ($form->isSubmitted() && $form->isValid()) {
-            $this->entityManager->wrapInTransaction(function () use ($signature, $markSignature) {
+            $expectedStep = $this->entityManager->wrapInTransaction(fn () => $markSignature($signature));
-                $markSignature($signature);
-            });
 
             return new RedirectResponse(
-                $this->chillUrlGenerator->returnPathOr('chill_main_workflow_show', ['id' => $signature->getStep()->getEntityWorkflow()->getId()])
+                $this->chillUrlGenerator->forwardReturnPath(
+                    'chill_main_workflow_wait',
+                    ['id' => $signature->getStep()->getEntityWorkflow()->getId(), 'expectedStep' => $expectedStep]
+                )
             );
         }
 

src/Bundle/ChillMainBundle/Controller/WorkflowWaitStepChangeController.php

@@ -0,0 +1,41 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Controller;
+
+use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
+use Chill\MainBundle\Routing\ChillUrlGeneratorInterface;
+use Symfony\Component\HttpFoundation\RedirectResponse;
+use Symfony\Component\HttpFoundation\Response;
+use Symfony\Component\Routing\Annotation\Route;
+use Twig\Environment;
+
+final readonly class WorkflowWaitStepChangeController
+{
+    public function __construct(
+        private ChillUrlGeneratorInterface $chillUrlGenerator,
+        private Environment $twig,
+    ) {}
+
+    #[Route('/{_locale}/main/workflow/{id}/wait/{expectedStep}', name: 'chill_main_workflow_wait', methods: ['GET'])]
+    public function waitForSignatureChange(EntityWorkflow $entityWorkflow, string $expectedStep): Response
+    {
+        if ($entityWorkflow->getStep() === $expectedStep) {
+            return new RedirectResponse(
+                $this->chillUrlGenerator->returnPathOr('chill_main_workflow_show', ['id' => $entityWorkflow->getId()])
+            );
+        }
+
+        return new Response(
+            $this->twig->render('@ChillMain/Workflow/waiting.html.twig', ['workflow' => $entityWorkflow, 'expectedStep' => $expectedStep])
+        );
+    }
+}

src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php

@@ -30,6 +30,7 @@ use Chill\MainBundle\Controller\UserGroupAdminController;
 use Chill\MainBundle\Controller\UserGroupApiController;
 use Chill\MainBundle\Controller\UserJobApiController;
 use Chill\MainBundle\Controller\UserJobController;
+use Chill\MainBundle\Controller\WorkflowApiController;
 use Chill\MainBundle\DependencyInjection\Widget\Factory\WidgetFactoryInterface;
 use Chill\MainBundle\Doctrine\DQL\Age;
 use Chill\MainBundle\Doctrine\DQL\Extract;
@@ -66,6 +67,7 @@ use Chill\MainBundle\Entity\Regroupment;
 use Chill\MainBundle\Entity\User;
 use Chill\MainBundle\Entity\UserGroup;
 use Chill\MainBundle\Entity\UserJob;
+use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
 use Chill\MainBundle\Form\CenterType;
 use Chill\MainBundle\Form\CivilityType;
 use Chill\MainBundle\Form\CountryType;
@@ -79,6 +81,7 @@ use Chill\MainBundle\Form\UserGroupType;
 use Chill\MainBundle\Form\UserJobType;
 use Chill\MainBundle\Form\UserType;
 use Chill\MainBundle\Security\Authorization\ChillExportVoter;
+use Chill\MainBundle\Security\Authorization\EntityWorkflowVoter;
 use Misd\PhoneNumberBundle\Doctrine\DBAL\Types\PhoneNumberType;
 use Ramsey\Uuid\Doctrine\UuidType;
 use Symfony\Component\Config\FileLocator;
@@ -940,6 +943,21 @@ class ChillMainExtension extends Extension implements
                         ],
                     ],
                 ],
+                [
+                    'class' => EntityWorkflow::class,
+                    'name' => 'workflow',
+                    'base_path' => '/api/1.0/main/workflow',
+                    'base_role' => EntityWorkflowVoter::SEE,
+                    'controller' => WorkflowApiController::class,
+                    'actions' => [
+                        '_entity' => [
+                            'methods' => [
+                                Request::METHOD_GET => true,
+                                Request::METHOD_HEAD => true,
+                            ],
+                        ],
+                    ],
+                ],
             ],
         ]);
     }

src/Bundle/ChillMainBundle/Entity/User.php

@@ -24,6 +24,7 @@ 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.
@@ -45,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.
      */
@@ -157,6 +160,11 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter
         return $this->absenceStart;
     }
 
+    public function getAbsenceEnd(): ?\DateTimeImmutable
+    {
+        return $this->absenceEnd;
+    }
+
     /**
      * Get attributes.
      *
@@ -336,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);
     }
 
     /**
@@ -410,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;
@@ -633,46 +652,82 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter
         return true;
     }
 
-    public function getNotificationFlags(): array
+    private function getNotificationFlagData(string $flag): array
     {
-        return $this->notificationFlags;
+        return $this->notificationFlags[$flag] ?? [self::NOTIF_FLAG_IMMEDIATE_EMAIL];
-    }
-
-    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;
     }
 
     public function isNotificationSendImmediately(string $type): bool
     {
-        if ([] === $this->getNotificationFlagData($type) || in_array(User::NOTIF_FLAG_IMMEDIATE_EMAIL, $this->getNotificationFlagData($type), true)) {
+        return $this->isNotificationForElement($type, self::NOTIF_FLAG_IMMEDIATE_EMAIL);
-            return true;
     }
 
-        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 $this->isNotificationForElement($type, self::NOTIF_FLAG_DAILY_DIGEST);
-            return true;
-        }
-
-        return false;
     }
 
     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,
         ]);
     }
 }