Merge branch 'fixes/upsert-person-fixes' into 'master'

Fix: Prevent redundant center assignment in `PersonUpsertHandler`

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

.changes/unreleased/DX-20260324-153805.yaml

@@ -0,0 +1,8 @@
+kind: DX
+body: 'Changie: add a field for adding a release note tag when creating an entry in changie.'
+time: 2026-03-24T15:38:05.320350835+01:00
+custom:
+    IRN: "No"
+    Issue: ""
+    MR: ""
+    SchemaChange: No schema change

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

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

@@ -0,0 +1,6 @@
+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-20250808-120802.yaml

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

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

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

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

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

.changes/unreleased/Feature-20251210-032045.yaml

@@ -1,6 +0,0 @@
-kind: Feature
-body: 'Add filtering to admin lists: social actions, social issues, goals, results, and evaluations'
-time: 2025-12-10T03:20:45.135973502+01:00
-custom:
-    Issue: "478"
-    SchemaChange: No schema change

.changes/unreleased/Feature-20260324-164018.yaml

@@ -0,0 +1,7 @@
+kind: Feature
+body: Add a field "externalId" on center, to ease the synchronisation of centers with external tools
+time: 2026-03-24T16:40:18.159561269+01:00
+custom:
+    Issue: "507"
+    MR: "977"
+    SchemaChange: Add columns or tables

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

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

.changes/unreleased/Fixed-20251211-214908.yaml

@@ -1,7 +0,0 @@
-kind: Fixed
-body: |
-    Fix migration query after previous fix
-time: 2025-12-11T21:49:08.899926492+01:00
-custom:
-    Issue: "466"
-    SchemaChange: No schema change

.changes/unreleased/Major-20260326-162018.yaml

@@ -0,0 +1,6 @@
+kind: Major
+body: Add a bundle to deal with tickets
+time: 2026-03-26T16:20:18.302331043+01:00
+custom:
+    Issue: ""
+    SchemaChange: Add columns or tables

.changes/v4.11.0.md

@@ -0,0 +1,9 @@
+## v4.11.0 - 2025-12-17
+### Feature
+* ([#478](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/478)) Add filtering to admin lists: social actions, social issues, goals, results, and evaluations   
+### Fixed
+* ([#466](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/466)) Fix migration query after previous fix
+   
+* Fix translation key/value
+
+Cannot start with % and should be wrapped in "".   

.changes/v4.12.0.md

@@ -0,0 +1,16 @@
+## v4.12.0 - 2026-01-15
+### Feature
+* ([#473](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/473)) Display version of chill bundles in application footer
+* Increase the delay before removing stale workflow from 90 days to 180 days.
+### Fixed
+* ([#480](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/480)) Fix the condition to display concerned persons in calendar list items.
+* ([#481](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/481)) Fix ordering of social actions: actions with a closing date in the future should be considered as 'still open'.
+* ([#477](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/477)) Fix export group by center for persons without a center in CenterAggregator.php
+* Fix the calculation of budget balance to only take into account resources and charges that are still actual
+* ([#489](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/489)) Fix desactivation date for Goals and results
+* ([#490](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/490)) Prevent sending a notification when the user signs the document himself
+* ([#491](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/491)) Fix: acc periods of which user is the referrer should not be included if when the list is filtered by center and none of the participations are part of the center
+* ([#492](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/492)) fix CommentInput: replace deprecated value binding with model-value
+* ([#493](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/493)) fix issue with stored object permissions associated with workflows (as attachment, or through a related entity)
+
+   BC: the constructor's signature of `\Chill\DocStoreBundle\Security\Authorization\StoredObjectVoter\AbstractStoredObjectVoter` has changed.

.changes/v4.12.1.md

@@ -0,0 +1,4 @@
+## v4.12.1 - 2026-02-01
+### Fixed
+* ([#496](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/496)) Add the option to deal with duplicate address in BAN adress importer
+   

.changes/v4.13.0.md

@@ -0,0 +1,15 @@
+## v4.13.0 - 2026-02-23
+### Feature
+* ([#500](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/500)) ([!964](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/964)) Limit the number of public download of stored object to 30 downloads
+* ([#495](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/495)) ([!967](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/967)) Send email related to notification in both html and txt format, and render quote correctly
+
+### Fixed
+* ([#438](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/438)) Change wrong color of submit button "Désigner comme adresse du parcours"
+* ([#498](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/498)) For giving edit permissions on documents, take into account the workflow creator
+* Fixed mispelling of address in translations: addresse -> adresse
+* ([#499](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/499)) ([!963](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/963)) Fix: some postal code appears in the UI, although they are marked as deleted
+* ([#501](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/501)) ([!966](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/966)) Fix deprecation in the markdown rendering
+* ([#494](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/494)) ([!965](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/965)) Remove unused all-day slot display
+
+### DX
+* ([!960](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/960)) Configure changie to ask for merge request number for a better tracking of changes

.changes/v4.14.0.md

@@ -0,0 +1,6 @@
+## v4.14.0 - 2026-03-09
+### Feature
+* ([#486](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/486)) ([!<no value>](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/<no value>)) Add filter and aggregator based on referrer's main center for exports of accompanying period   
+### Fixed
+* ([#502](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/502)) ([!968](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/968)) Fix import of postal code: mark postal code as deleted if they are not present in the import any more   
+* ([#503](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/503)) ([!969](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/969)) Add a flash message when reassigning accompanying course (reassign list)   

.changes/v4.14.1.md

@@ -0,0 +1,5 @@
+## v4.14.1 - 2026-03-16
+### Security
+* ([#506](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/506)) ([!972](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/972)) Fix permission in list of activities in person context   
+### DX
+* ([#504](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/504)) ([!970](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/970)) Add seeds in DataFixtures and in some tests to avoid random test failures   

.changes/v4.14.2.md

@@ -0,0 +1,3 @@
+## v4.14.2 - 2026-03-18
+### Fixed
+* Fix link inside notification email   

.changie.yaml

@@ -7,7 +7,7 @@ versionFormat: '## {{.Version}} - {{.Time.Format "2006-01-02"}}'
 kindFormat: '### {{.Kind}}'
 # Note: it is possible to add a `.custom.Long` text manually into the yaml file produced by `changie new`. This will add a long description.
 changeFormat: >-
-    * {{ if not (eq .Custom.Issue "") }}([#{{ .Custom.Issue }}](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/{{ .Custom.Issue }})) {{ end }}{{ .Body }}   {{ if and .Custom.SchemaChange (ne .Custom.SchemaChange "No schema change") }}
+    * {{ if not (eq .Custom.Issue "") }}([#{{ .Custom.Issue }}](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/{{ .Custom.Issue }})) {{ end }}{{ if not (eq .Custom.MR "") }}([!{{ .Custom.MR }}](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/{{ .Custom.MR }})) {{ end }}{{ .Body }} {{ if (eq .Custom.IRN "Yes") }}(RN){{ end }}  {{ if and .Custom.SchemaChange (ne .Custom.SchemaChange "No schema change") }}
 
       **Schema Change**: {{ .Custom.SchemaChange }}
       {{- end -}}
@@ -30,6 +30,20 @@ custom:
         type: int
         minInt: 1
 
+    -   key: MR
+        label: Merge request number (on chill-bundles repository) (optional)
+        optional: true
+        type: int
+        minInt: 1
+
+    -   key: IRN
+        label: Is this interesting for release notes ?
+        optional: false
+        type: enum
+        enumOptions:
+            - "No"
+            - "Yes"
+
 body:
     # allow multiline messages
     block: true
@@ -46,6 +60,8 @@ kinds:
         auto: patch
     -   label: UX
         auto: patch
+    -   label: Major
+        auto: major
 newlines:
     afterChangelogHeader: 1
     beforeChangelogVersion: 1

.editorconfig

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

.gitlab-ci.yml

@@ -99,10 +99,12 @@ build:
     stage: Composer install
     image: chill/base-image:8.3-edge
     variables:
+        COMPOSER_MEMORY_LIMIT: 3G
     before_script:
         - composer config -g cache-dir "$(pwd)/.cache"
     script:
         - composer install --optimize-autoloader --no-ansi --no-interaction --no-progress
+        - php bin/console cache:clear
     cache:
         paths:
             - .cache/
@@ -110,6 +112,7 @@ build:
         expire_in: 1 day
         paths:
             - vendor/
+            - var/translations/
 
 code_style:
     stage: Tests
@@ -169,7 +172,27 @@ lint:
     cache:
         paths:
             - node_modules/
-
+vue_tsc:
+    stage: Tests
+    image: node:20-alpine
+    before_script:
+        - apk add --no-cache python3 make g++ py3-setuptools
+        - export PYTHON="$(which python3)"
+        - export PATH="./node_modules/.bin:$PATH"
+    script:
+        - yarn install --ignore-optional
+        - yarn vue-tsc --noEmit > vue-tsc-report.txt 2>&1 || true
+        - cat vue-tsc-report.txt
+        - grep -q "error" vue-tsc-report.txt && exit 2 || exit 0
+    dependencies:
+        - build
+    cache:
+        paths:
+            - node_modules/
+    artifacts:
+        expire_in: 1 day
+        paths:
+            - vue-tsc-report.txt
 # psalm_tests:
 #     stage: Tests
 #     image: gitea.champs-libres.be/chill-project/chill-skeleton-basic/base-image:php82

.junie/guidelines.md

@@ -238,13 +238,14 @@ The tests are run from the project's root (not from the bundle's root).
 
 ```bash
 # Run all tests
-vendor/bin/phpunit
+symfony composer exec phpunit
 
 # Run a specific test file
-vendor/bin/phpunit path/to/TestFile.php
+symfony composer exec phpunit -- path/to/TestFile.php
+symfony composer exec phpunit -- path/to/TestFile.php
 
 # Run a specific test method
-vendor/bin/phpunit --filter methodName path/to/TestFile.php
+symfony composer exec phpunit --filter methodName path/to/TestFile.php
 ```
 
 When writing tests, only test specific files. Do not run all tests or the full

.prettierrc

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

.vscode/launch.json

@@ -0,0 +1,30 @@
+{
+    // 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

@@ -0,0 +1,23 @@
+{
+    "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,71 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
+## v4.14.2 - 2026-03-18
+### Fixed
+* Fix link inside notification email   
+
+## v4.14.1 - 2026-03-16
+### Security
+* ([#506](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/506)) ([!972](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/972)) Fix permission in list of activities in person context   
+### DX
+* ([#504](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/504)) ([!970](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/970)) Add seeds in DataFixtures and in some tests to avoid random test failures   
+
+## v4.14.0 - 2026-03-09
+### Feature
+* ([#486](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/486)) ([!<no value>](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/<no value>)) Add filter and aggregator based on referrer's main center for exports of accompanying period   
+### Fixed
+* ([#502](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/502)) ([!968](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/968)) Fix import of postal code: mark postal code as deleted if they are not present in the import any more   
+* ([#503](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/503)) ([!969](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/969)) Add a flash message when reassigning accompanying course (reassign list)   
+
+## v4.13.0 - 2026-02-23
+### Feature
+* ([#500](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/500)) ([!964](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/964)) Limit the number of public download of stored object to 30 downloads
+* ([#495](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/495)) ([!967](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/967)) Send email related to notification in both html and txt format, and render quote correctly
+
+### Fixed
+* ([#438](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/438)) Change wrong color of submit button "Désigner comme adresse du parcours"
+* ([#498](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/498)) For giving edit permissions on documents, take into account the workflow creator
+* Fixed mispelling of address in translations: addresse -> adresse
+* ([#499](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/499)) ([!963](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/963)) Fix: some postal code appears in the UI, although they are marked as deleted
+* ([#501](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/501)) ([!966](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/966)) Fix deprecation in the markdown rendering
+* ([#494](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/494)) ([!965](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/965)) Remove unused all-day slot display
+
+### DX
+* ([!960](https://gitlab.com/Chill-Projet/chill-bundles/-/merge_requests/960)) Configure changie to ask for merge request number for a better tracking of changes
+
+## v4.12.1 - 2026-02-01
+### Fixed
+* ([#496](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/496)) Add the option to deal with duplicate address in BAN adress importer
+   
+
+## v4.12.0 - 2026-01-15
+### Feature
+* ([#473](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/473)) Display version of chill bundles in application footer
+* Increase the delay before removing stale workflow from 90 days to 180 days.
+### Fixed
+* ([#480](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/480)) Fix the condition to display concerned persons in calendar list items.
+* ([#481](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/481)) Fix ordering of social actions: actions with a closing date in the future should be considered as 'still open'.
+* ([#477](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/477)) Fix export group by center for persons without a center in CenterAggregator.php
+* Fix the calculation of budget balance to only take into account resources and charges that are still actual
+* ([#489](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/489)) Fix desactivation date for Goals and results
+* ([#490](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/490)) Prevent sending a notification when the user signs the document himself
+* ([#491](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/491)) Fix: acc periods of which user is the referrer should not be included if when the list is filtered by center and none of the participations are part of the center
+* ([#492](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/492)) fix CommentInput: replace deprecated value binding with model-value
+* ([#493](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/493)) fix issue with stored object permissions associated with workflows (as attachment, or through a related entity)
+
+   BC: the constructor's signature of `\Chill\DocStoreBundle\Security\Authorization\StoredObjectVoter\AbstractStoredObjectVoter` has changed.
+
+## v4.11.0 - 2025-12-17
+### Feature
+* ([#478](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/478)) Add filtering to admin lists: social actions, social issues, goals, results, and evaluations   
+### Fixed
+* ([#466](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/466)) Fix migration query after previous fix
+   
+* Fix translation key/value
+
+Cannot start with % and should be wrapped in "".   
+
 ## v4.10.1 - 2025-12-11
 ### Fixed
 * Fix missing translation variable in NewLocation component

CONVENTIONS-fr.md

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

assets/translator.ts

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

composer.json

@@ -21,6 +21,7 @@
         "ext-openssl": "*",
         "ext-redis": "*",
         "ext-zlib": "*",
+        "composer-runtime-api": "*",
         "champs-libres/wopi-bundle": "dev-symfony-v5@dev",
         "champs-libres/wopi-lib": "dev-master@dev",
         "doctrine/data-fixtures": "^1.8",
@@ -82,7 +83,7 @@
         "symfony/templating": "^5.4",
         "symfony/translation": "^5.4",
         "symfony/twig-bundle": "^5.4",
-        "symfony/ux-translator": "^2.22",
+        "symfony/ux-translator": "2.31.0",
         "symfony/validator": "^5.4",
         "symfony/webpack-encore-bundle": "^1.11",
         "symfony/workflow": "^5.4",
@@ -97,7 +98,7 @@
     "require-dev": {
         "doctrine/doctrine-fixtures-bundle": "^3.3",
         "fakerphp/faker": "^1.13",
-        "friendsofphp/php-cs-fixer": "3.65.0",
+        "friendsofphp/php-cs-fixer": "^3.94",
         "jangregor/phpstan-prophecy": "^1.0",
         "nelmio/alice": "^3.8",
         "nikic/php-parser": "^4.15",
@@ -112,13 +113,13 @@
         "symfony/debug-bundle": "^5.4",
         "symfony/dotenv": "^5.4",
         "symfony/flex": "^2.4",
+        "symfony/loco-translation-provider": "^6.0",
         "symfony/maker-bundle": "^1.20",
         "symfony/phpunit-bridge": "^7.1",
         "symfony/runtime": "^5.4",
         "symfony/stopwatch": "^5.4",
         "symfony/var-dumper": "^5.4",
-        "symfony/web-profiler-bundle": "^5.4",
-        "symfony/loco-translation-provider": "^6.0"
+        "symfony/web-profiler-bundle": "^5.4"
     },
     "conflict": {
         "symfony/symfony": "*"
@@ -141,6 +142,7 @@
             "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

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

config/packages/chill.yaml

@@ -34,6 +34,9 @@ chill_main:
             x: '%env(float:ADD_ADDRESS_MAP_CENTER_X)%'
             y: '%env(float:ADD_ADDRESS_MAP_CENTER_Y)%'
             z: '%env(float:ADD_ADDRESS_MAP_CENTER_Z)%'
+    homepage:
+        default_tab: 'MyCustoms'
+        display_tabs: ['MyCustoms', 'MyNotifications', 'MyAccompanyingCourses', 'MyEvaluations', 'MyTasks', 'MyWorkflows', 'MyTickets']
 
 when@test:
     chill_main:

config/packages/chill_doc_store.yaml

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

config/packages/chill_ticket.yaml

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

config/packages/doctrine_migrations_chill.yaml

@@ -14,6 +14,7 @@ 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/packages/messenger.yaml

@@ -66,6 +66,7 @@ framework:
             'Chill\MainBundle\Export\Messenger\ExportRequestGenerationMessage': priority
             'Chill\MainBundle\Export\Messenger\RemoveExportGenerationMessage': async
             'Chill\MainBundle\Notification\Email\NotificationEmailMessages\ScheduleDailyNotificationDigestMessage': async
+            'Chill\TicketBundle\Messenger\PostTicketUpdateMessage': async
             # end of routes added by chill-bundles recipes
             # Route your messages to the transports
             # 'App\Message\YourMessage': async

config/packages/nelmio_alice.yaml

@@ -8,5 +8,6 @@ when@dev: &dev
             - 'file'
             - 'md5'
             - 'sha1'
+        seed: 1234567890
 
 when@test: *dev

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

@@ -1,23 +1,90 @@
-Permission is granted to copy, distribute and/or modify this document
-   under the terms of the GNU Free Documentation License, Version 1.3
-   or any later version published by the Free Software Foundation;
-   with no Invariant Sections, no Front-Cover Texts, and no Back-Cover Texts.
-   A copy of the license is included in the section entitled "GNU
-   Free Documentation License".
+# Create a new bundle {#create-new-bundle}
 
-###### 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 [installation-for-development` section, and add your new repository to the composer.json file
-6. Work as :ref:`usual ](editing-code-and-commiting.md)
+:::: warning
+::: title
+Warning
+:::
 
 This part of the doc is not yet tested
+::::
 
-TODO
+## Create a new directory with Bundle class
+
+``` bash
+mkdir -p src/Bundle/ChillSomeBundle/src/config
+mkdir -p src/Bundle/ChillSomeBundle/src/Controller
+```
+
+Add a bundle file
+
+``` 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:
+
+``` yaml
+chill_ticket_controller:
+    resource: '@ChillTicketBundle/Controller/'
+    type: annotation
+```
+
+## Register the new psr-4 namespace
+
+In composer.json, add the new psr4 namespace
+
+``` diff
+{
+"autoload": {
+    "psr-4": {
++        "Chill\\SomeBundle\\": "src/Bundle/ChillSomeBundle/src",
+    }
+}
+}
+```
+
+## Register the bundle
+
+Register in the file `config/bundles.php`:
+
+``` php
+Vendor\Bundle\YourBundle\YourBundle::class => ['all' => true],
+```
+
+And import routes in `config/routes/chill_some_bundle.yaml`:
+
+``` yaml
+chill_ticket_bundle:
+    resource: '@ChillSomeBundle/config/routes.yaml'
+```
+
+## Add the doctrine_migration namespace
+
+Add the namespace to `config/packages/doctrine_migrations_chill.yaml`
+
+``` diff
+doctrine_migrations:
+    migrations_paths:
++        'Chill\Some\Ticket': '@ChillSomeBundle/migrations'
+```
+
+## Dump autoloading
+
+``` bash
+symfony composer dump-autoload
+```

package.json

@@ -41,6 +41,7 @@
     "typescript": "^5.6.3",
     "typescript-eslint": "^8.13.0",
     "vue-loader": "^17.0.0",
+    "vue-tsc": "^3.1.3",
     "webpack": "^5.75.0",
     "webpack-cli": "^5.0.1"
   },
@@ -80,12 +81,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> 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 src/Bundle/ChillTicketBundle/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": "npx eslint-baseline --fix \"src/**/*.{js,ts,vue}\""
+    "eslint": "eslint-baseline --fix \"src/**/*.{js,ts,vue}\""
   },
   "private": true
 }

packages/ChillZimbraBundle/.changes/unreleased/Added-20260122-153223.yaml

@@ -0,0 +1,3 @@
+kind: Added
+body: Use admin delegated account for handling authentication
+time: 2026-01-22T15:32:23.932994899+01:00

packages/ChillZimbraBundle/src/Calendar/Connector/ZimbraConnector/CreateZimbraComponent.php

@@ -80,12 +80,19 @@ final readonly class CreateZimbraComponent
             $location = $calendar->getCalendar()->getLocation();
             $hasLocation = $calendar->getCalendar()->hasLocation();
             $isPrivate = $calendar->getCalendar()->getAccompanyingPeriod()?->isConfidential() ?? false;
-        } else {
+        } elseif ($calendar instanceof Calendar) {
             $startDate = $calendar->getStartDate();
             $endDate = $calendar->getEndDate();
             $location = $calendar->getLocation();
             $hasLocation = $calendar->hasLocation();
             $isPrivate = $calendar->getAccompanyingPeriod()?->isConfidential() ?? false;
+        } else {
+            // Calendar range case
+            $startDate = $calendar->getStartDate();
+            $endDate = $calendar->getEndDate();
+            $location = $calendar->getLocation();
+            $hasLocation = $calendar->hasLocation();
+            $isPrivate = false;
         }
 
         $comp = new InviteComponent();

packages/ChillZimbraBundle/src/Calendar/Connector/ZimbraConnector/SoapClientBuilder.php

@@ -11,48 +11,84 @@ declare(strict_types=1);
 
 namespace Chill\ZimbraBundle\Calendar\Connector\ZimbraConnector;
 
+use Symfony\Component\Clock\ClockInterface;
 use Symfony\Component\DependencyInjection\ParameterBag\ParameterBagInterface;
 use Symfony\Component\HttpClient\Psr18Client;
 use Symfony\Contracts\HttpClient\HttpClientInterface;
+use Zimbra\Admin\AdminApi;
 use Zimbra\Common\Enum\AccountBy;
 use Zimbra\Common\Soap\ClientFactory;
+use Zimbra\Common\Struct\AccountSelector;
 use Zimbra\Common\Struct\Header\AccountInfo;
 use Zimbra\Mail\MailApi;
 
-final readonly class SoapClientBuilder
+final class SoapClientBuilder
 {
-    private string $username;
+    private readonly string $username;
 
-    private string $password;
+    private readonly string $password;
 
-    private string $url;
+    private readonly string $url;
 
-    public function __construct(private ParameterBagInterface $parameterBag, private HttpClientInterface $client)
-    {
+    private readonly string $adminUrl;
+
+    private readonly bool $verifyHost;
+
+    private readonly bool $verifyPeer;
+
+    private readonly bool $adminVerifyHost;
+
+    private readonly bool $adminVerifyPeer;
+
+    /**
+     * Keep the cache of the tokens.
+     *
+     * @var array<string, array{token: string, expirationTime: \DateTimeImmutable}>
+     */
+    private array $tokenCache = [];
+
+    public function __construct(
+        private readonly ParameterBagInterface $parameterBag,
+        private readonly HttpClientInterface $client,
+        private readonly ClockInterface $clock,
+    ) {
         $dsn = $this->parameterBag->get('chill_calendar.remote_calendar_dsn');
         $url = parse_url($dsn);
 
         $this->username = urldecode($url['user']);
         $this->password = urldecode($url['pass']);
         if ('zimbra+http' === $url['scheme']) {
-            $scheme = 'http://';
+            $scheme = 'http';
             $port = $url['port'] ?? 80;
         } elseif ('zimbra+https' === $url['scheme']) {
-            $scheme = 'https://';
+            $scheme = 'https';
             $port = $url['port'] ?? 443;
         } else {
             throw new \Symfony\Component\DependencyInjection\Exception\InvalidArgumentException('Unsupported remote calendar scheme: '.$url['scheme']);
         }
 
-        $this->url = $scheme.$url['host'].':'.$port;
+        // get attributes for adminUrl
+        $query = [];
+        parse_str($url['query'] ?? '', $query);
+        $adminPort = $query['adminPort'] ?? '7071';
+        $adminHost = $query['adminHost'] ?? $url['host'];
+        $adminScheme = $query['adminScheme'] ?? $scheme;
+
+        $this->verifyPeer = (bool) ($query['verifyPeer'] ?? true);
+        $this->verifyHost = (bool) ($query['verifyHost'] ?? true);
+        $this->adminVerifyHost = (bool) ($query['adminVerifyHost'] ?? $this->verifyPeer);
+        $this->adminVerifyPeer = (bool) ($query['adminVerifyPeer'] ?? $this->verifyHost);
+
+        $this->url = $scheme.'://'.$url['host'].':'.$port;
+        $this->adminUrl = $adminScheme.'://'.$adminHost.':'.$adminPort;
     }
 
     private function buildApi(): MailApi
     {
         $baseClient = $this->client->withOptions([
             'base_uri' => $location = $this->url.'/service/soap',
-            'verify_host' => false,
-            'verify_peer' => false,
+            'verify_host' => $this->verifyHost,
+            'verify_peer' => $this->verifyPeer,
         ]);
         $psr18Client = new Psr18Client($baseClient);
         $api = new MailApi();
@@ -62,12 +98,36 @@ final readonly class SoapClientBuilder
         return $api;
     }
 
+    private function buildAdminApi(): AdminApi
+    {
+        $baseClient = $this->client->withOptions([
+            'base_uri' => $location = $this->adminUrl.'/service/admin/soap',
+            'verify_host' => $this->adminVerifyHost,
+            'verify_peer' => $this->adminVerifyPeer,
+        ]);
+        $psr18Client = new Psr18Client($baseClient);
+        $api = new AdminApi();
+        $client = ClientFactory::create($location, $psr18Client);
+        $api->setClient($client);
+
+        return $api;
+    }
+
     public function getApiForAccount(string $accountName): MailApi
     {
-        $api = $this->buildApi();
-        $response = $api->authByAccountName($this->username, $this->password);
+        ['token' => $token, 'expirationTime' => $expirationTime] = $this->tokenCache[$accountName]
+            ?? ['token' => null, 'expirationTime' => null];
 
-        $token = $response->getAuthToken();
+        if (null === $token || null === $expirationTime || $expirationTime <= $this->clock->now()) {
+            $adminApi = $this->buildAdminApi();
+            $adminApi->auth($this->username, $this->password);
+
+            $delegateResponse = $adminApi->delegateAuth(new AccountSelector(AccountBy::NAME, $accountName));
+            $token = $delegateResponse->getAuthToken();
+            $expiration = $delegateResponse->getLifetime();
+            $expirationTime = $this->clock->now()->add(new \DateInterval('PT'.$expiration.'S'));
+            $this->tokenCache[$accountName] = ['token' => $token, 'expirationTime' => $expirationTime];
+        }
 
         $apiBy = $this->buildApi();
         $apiBy->setAuthToken($token);

phpunit.xml.dist

@@ -58,6 +58,10 @@
       <!-- 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

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

resources/ticket_motives_import/motives.yaml

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

resources/translation_override/README.md

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

resources/translation_override/overrides.yaml

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

src/Bundle/ChillActivityBundle/DataFixtures/ORM/LoadActivity.php

@@ -33,6 +33,7 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface
 
     public function __construct(private readonly EntityManagerInterface $em)
     {
+        mt_srand(123456789);
         $this->faker = FakerFactory::create('fr_FR');
     }
 
@@ -48,7 +49,7 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface
             ->findAll();
 
         foreach ($persons as $person) {
-            $activityNbr = random_int(0, 3);
+            $activityNbr = mt_rand(0, 3);
 
             for ($i = 0; $i < $activityNbr; ++$i) {
                 $activity = $this->newRandomActivity($person);
@@ -73,7 +74,7 @@ class LoadActivity extends AbstractFixture implements OrderedFixtureInterface
 
         //      ->setAttendee($this->faker->boolean())
 
-        for ($i = 0; random_int(0, 4) > $i; ++$i) {
+        for ($i = 0; mt_rand(0, 4) > $i; ++$i) {
             $reason = $this->getRandomActivityReason();
 
             if (null !== $reason) {

src/Bundle/ChillActivityBundle/DependencyInjection/ChillActivityExtension.php

@@ -69,7 +69,7 @@ class ChillActivityExtension extends Extension implements PrependExtensionInterf
     }
 
     /** (non-PHPdoc).
-     * @see \Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface::prepend()
+     * @see PrependExtensionInterface::prepend()
      */
     public function prependRoutes(ContainerBuilder $container)
     {

src/Bundle/ChillActivityBundle/Repository/ActivityACLAwareRepository.php

@@ -24,6 +24,7 @@ use Chill\MainBundle\Security\Authorization\AuthorizationHelperForCurrentUserInt
 use Chill\MainBundle\Security\Resolver\CenterResolverManagerInterface;
 use Chill\PersonBundle\Entity\AccompanyingPeriod;
 use Chill\PersonBundle\Entity\Person;
+use Chill\PersonBundle\Security\Authorization\AccompanyingPeriodVoter;
 use Doctrine\DBAL\Types\Types;
 use Doctrine\ORM\AbstractQuery;
 use Doctrine\ORM\EntityManagerInterface;
@@ -340,7 +341,7 @@ final readonly class ActivityACLAwareRepository implements ActivityACLAwareRepos
         }
 
         foreach ($person->getAccompanyingPeriodParticipations() as $participation) {
-            if (!$this->security->isGranted(ActivityVoter::SEE, $participation->getAccompanyingPeriod())) {
+            if (!$this->security->isGranted(AccompanyingPeriodVoter::SEE, $participation->getAccompanyingPeriod())) {
                 continue;
             }
 

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

@@ -10,10 +10,7 @@
       />
     </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,17 +39,11 @@
                 <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">
@@ -108,10 +102,7 @@
           </form>
         </template>
         <template #footer>
-                    <button
-                        class="btn btn-save"
-                        @click.prevent="saveNewLocation"
-                    >
+          <button class="btn btn-save" @click.prevent="saveNewLocation">
             {{ trans(SAVE) }}
           </button>
         </template>
@@ -248,8 +239,7 @@ 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,9 +49,7 @@
       </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
@@ -64,8 +62,7 @@
         <template
           v-else-if="
             socialActionsList.length > 0 &&
-                        (socialIssuesSelected.length ||
-                            socialActionsSelected.length)
+            (socialIssuesSelected.length || socialActionsSelected.length)
           "
         >
           <div
@@ -88,9 +85,7 @@
         </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) }}
@@ -190,8 +185,7 @@ 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/CheckSocialAction.vue

@@ -52,7 +52,6 @@ span.badge {
   margin-right: 1em;
   text-align: left;
   line-height: 1.2em;
-
   &::before {
     position: absolute;
     left: 11px;

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

@@ -10,9 +10,7 @@
         :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/Security/Authorization/ActivityStoredObjectVoter.php

@@ -16,7 +16,8 @@ use Chill\ActivityBundle\Repository\ActivityRepository;
 use Chill\DocStoreBundle\Repository\AssociatedEntityToStoredObjectInterface;
 use Chill\DocStoreBundle\Security\Authorization\StoredObjectRoleEnum;
 use Chill\DocStoreBundle\Security\Authorization\StoredObjectVoter\AbstractStoredObjectVoter;
-use Chill\MainBundle\Workflow\Helper\WorkflowRelatedEntityPermissionHelper;
+use Chill\MainBundle\Repository\Workflow\EntityWorkflowAttachmentRepository;
+use Chill\MainBundle\Workflow\Helper\WorkflowRelatedEntityPermissionHelperInterface;
 use Symfony\Component\Security\Core\Security;
 
 class ActivityStoredObjectVoter extends AbstractStoredObjectVoter
@@ -24,9 +25,10 @@ class ActivityStoredObjectVoter extends AbstractStoredObjectVoter
     public function __construct(
         private readonly ActivityRepository $repository,
         Security $security,
-        WorkflowRelatedEntityPermissionHelper $workflowDocumentService,
+        WorkflowRelatedEntityPermissionHelperInterface $workflowDocumentService,
+        EntityWorkflowAttachmentRepository $attachmentRepository,
     ) {
-        parent::__construct($security, $workflowDocumentService);
+        parent::__construct($security, $attachmentRepository, $workflowDocumentService);
     }
 
     protected function getRepository(): AssociatedEntityToStoredObjectInterface

src/Bundle/ChillAsideActivityBundle/src/DataFixtures/ORM/LoadAsideActivity.php

@@ -21,7 +21,10 @@ use Doctrine\Persistence\ObjectManager;
 
 class LoadAsideActivity extends Fixture implements DependentFixtureInterface
 {
-    public function __construct(private readonly UserRepository $userRepository) {}
+    public function __construct(private readonly UserRepository $userRepository)
+    {
+        mt_srand(123456789);
+    }
 
     public function getDependencies(): array
     {
@@ -47,7 +50,7 @@ class LoadAsideActivity extends Fixture implements DependentFixtureInterface
                     $this->getReference('aside_activity_category_0', AsideActivityCategory::class)
                 )
                 ->setDate((new \DateTimeImmutable('today'))
-                    ->sub(new \DateInterval('P'.\random_int(1, 100).'D')));
+                    ->sub(new \DateInterval('P'.\mt_rand(1, 100).'D')));
 
             $manager->persist($activity);
         }

src/Bundle/ChillBudgetBundle/DependencyInjection/ChillBudgetExtension.php

@@ -56,7 +56,7 @@ class ChillBudgetExtension extends Extension implements PrependExtensionInterfac
     }
 
     /** (non-PHPdoc).
-     * @see \Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface::prepend()
+     * @see PrependExtensionInterface::prepend()
      */
     public function prependRoutes(ContainerBuilder $container)
     {

src/Bundle/ChillBudgetBundle/Resources/views/Budget/_macros.html.twig

@@ -72,14 +72,20 @@
 
 {% macro table_results(actualCharges, actualResources, results) %}
 
+{% set now = date() %}
+
 {% set totalCharges = 0 %}
 {% for c in actualCharges %}
+    {% if c.startDate <= now and (c.endDate is null or c.endDate >= now) %}
         {% set totalCharges = totalCharges + c.amount %}
+    {% endif %}
 {% endfor %}
 
 {% set totalResources = 0 %}
 {% for r in actualResources %}
+    {% if r.startDate <= now and (r.endDate is null or r.endDate >= now) %}
         {% set totalResources = totalResources + r.amount %}
+    {% endif %}
 {% endfor %}
 
 {% set result = (totalResources - totalCharges) %}

src/Bundle/ChillCalendarBundle/Resources/public/types.ts

@@ -68,9 +68,14 @@ 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 enum AnswerStatus {
+  ACCEPTED = "accepted",
+  DECLINED = "declined",
+  PENDING = "pending",
+  TENTATIVE = "tentative",
 }
 
 export {};

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

@@ -61,11 +61,7 @@
           <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>
@@ -74,11 +70,7 @@
             <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>
@@ -94,11 +86,7 @@
             <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>
@@ -126,9 +114,7 @@
                 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>
@@ -144,9 +130,7 @@
           <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") }}
@@ -154,9 +138,7 @@
           <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>
@@ -270,9 +252,7 @@ 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;
         }
@@ -280,13 +260,9 @@ 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);
         }
       }
 
@@ -316,8 +292,7 @@ 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"))) {
@@ -361,9 +336,7 @@ 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,19 +4,10 @@
       {{ user.text }}
       <template v-if="invite !== null">
         <i v-if="invite.status === 'accepted'" class="fa fa-check" />
-                <i
-                    v-else-if="invite.status === 'declined'"
-                    class="fa fa-times"
-                />
-                <i
-                    v-else-if="invite.status === 'pending'"
-                    class="fa fa-question-o"
-                />
-                <i
-                    v-else-if="invite.status === 'tentative'"
-                    class="fa fa-question"
-                />
-                <span v-else="">{{ invite.status }}</span>
+        <i v-else-if="invite.status === 'declined'" class="fa fa-times" />
+        <i v-else-if="invite.status === 'pending'" class="fa fa-question-o" />
+        <i v-else-if="invite.status === 'tentative'" class="fa fa-question" />
+        <span v-else>{{ invite.status }}</span>
       </template>
     </span>
     <span class="form-check-inline form-switch">
@@ -51,8 +42,6 @@
 </template>
 
 <script>
-import { mapGetters } from "vuex";
-
 export default {
   name: "CalendarActive",
   props: {
@@ -69,8 +58,7 @@ export default {
   computed: {
     style() {
       return {
-                backgroundColor: this.$store.getters.getUserData(this.user)
-                    .mainColor,
+        backgroundColor: this.$store.getters.getUserData(this.user).mainColor,
       };
     },
     rangeShow: {
@@ -81,9 +69,7 @@ export default {
         });
       },
       get() {
-                return this.$store.getters.isRangeShownOnCalendarForUser(
-                    this.user,
-                );
+        return this.$store.getters.isRangeShownOnCalendarForUser(this.user);
       },
     },
     remoteShow: {
@@ -94,9 +80,7 @@ export default {
         });
       },
       get() {
-                return this.$store.getters.isRemoteShownOnCalendarForUser(
-                    this.user,
-                );
+        return this.$store.getters.isRemoteShownOnCalendarForUser(this.user);
       },
     },
   },

src/Bundle/ChillCalendarBundle/Resources/public/vuejs/Calendar/i18n.js

@@ -24,6 +24,14 @@ const appMessages = {
     list_three_days: "Liste 3 jours",
     current_selected: "Rendez-vous fixé",
     main_user: "Utilisateur principal",
+    Give_an_answer: "Répondre",
+    Accepted: "Accepté",
+    Declined: "Refusé",
+    Tentative: "Accepté provisoirement",
+    Accept: "Accepter",
+    Decline: "Refuser",
+    Tentatively_accept: "Accepter provisoirement",
+    Set_pending: "Ne pas répondre",
   },
 };
 

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

@@ -22,97 +22,51 @@
     </button>
     <ul class="dropdown-menu" aria-labelledby="btnGroupDrop1">
       <li v-if="status !== Statuses.ACCEPTED">
-                <a
-                    class="dropdown-item"
-                    @click="changeStatus(Statuses.ACCEPTED)"
-                    ><i class="fa fa-check" aria-hidden="true"></i>
-                    {{ $t("Accept") }}</a
+        <a class="dropdown-item" @click="changeStatus(Statuses.ACCEPTED)"
+          ><i class="fa fa-check" aria-hidden="true"></i> {{ $t("Accept") }}</a
         >
       </li>
       <li v-if="status !== Statuses.DECLINED">
-                <a
-                    class="dropdown-item"
-                    @click="changeStatus(Statuses.DECLINED)"
-                    ><i class="fa fa-times" aria-hidden="true"></i>
-                    {{ $t("Decline") }}</a
+        <a class="dropdown-item" @click="changeStatus(Statuses.DECLINED)"
+          ><i class="fa fa-times" aria-hidden="true"></i> {{ $t("Decline") }}</a
         >
       </li>
       <li v-if="status !== Statuses.TENTATIVELY_ACCEPTED">
         <a
           class="dropdown-item"
           @click="changeStatus(Statuses.TENTATIVELY_ACCEPTED)"
-                    ><i class="fa fa-question"></i>
-                    {{ $t("Tentatively_accept") }}</a
+          ><i class="fa fa-question"></i> {{ $t("Tentatively_accept") }}</a
         >
       </li>
       <li v-if="status !== Statuses.PENDING">
         <a class="dropdown-item" @click="changeStatus(Statuses.PENDING)"
-                    ><i class="fa fa-hourglass-o"></i>
-                    {{ $t("Set_pending") }}</a
+          ><i class="fa fa-hourglass-o"></i> {{ $t("Set_pending") }}</a
         >
       </li>
     </ul>
   </div>
 </template>
 
-<script lang="ts">
-import { defineComponent, PropType } from "vue";
+<script lang="ts" setup>
+import { AnswerStatus } from "../../types";
 
-const ACCEPTED = "accepted";
-const DECLINED = "declined";
-const PENDING = "pending";
-const TENTATIVELY_ACCEPTED = "tentative";
+const props = defineProps<{
+  calendarId: number;
+  status: AnswerStatus;
+}>();
 
-const i18n = {
-    messages: {
-        fr: {
-            Give_an_answer: "Répondre",
-            Accepted: "Accepté",
-            Declined: "Refusé",
-            Tentative: "Accepté provisoirement",
-            Accept: "Accepter",
-            Decline: "Refuser",
-            Tentatively_accept: "Accepter provisoirement",
-            Set_pending: "Ne pas répondre",
-        },
-    },
+const emit =
+  defineEmits<(e: "statusChanged", newStatus: AnswerStatus) => void>();
+
+const Statuses = {
+  ACCEPTED: AnswerStatus.ACCEPTED,
+  DECLINED: AnswerStatus.DECLINED,
+  PENDING: AnswerStatus.PENDING,
+  TENTATIVELY_ACCEPTED: AnswerStatus.TENTATIVE,
 };
 
-export default defineComponent({
-    name: "Answer",
-    i18n,
-    props: {
-        calendarId: { type: Number, required: true },
-        status: {
-            type: String as PropType<
-                "accepted" | "declined" | "pending" | "tentative"
-            >,
-            required: true,
-        },
-    },
-    emits: {
-        statusChanged(
-            payload: "accepted" | "declined" | "pending" | "tentative",
-        ) {
-            return true;
-        },
-    },
-    data() {
-        return {
-            Statuses: {
-                ACCEPTED,
-                DECLINED,
-                PENDING,
-                TENTATIVELY_ACCEPTED,
-            },
-        };
-    },
-    methods: {
-        changeStatus: function (
-            newStatus: "accepted" | "declined" | "pending" | "tentative",
-        ) {
-            console.log("changeStatus", newStatus);
-            const url = `/api/1.0/calendar/calendar/${this.$props.calendarId}/answer/${newStatus}.json`;
+function changeStatus(newStatus: AnswerStatus) {
+  const url = `/api/1.0/calendar/calendar/${props.calendarId}/answer/${newStatus}.json`;
   window
     .fetch(url, {
       method: "POST",
@@ -122,12 +76,9 @@ export default defineComponent({
         console.error("could not confirm answer", newStatus);
         return;
       }
-                    console.log("answer sent", newStatus);
-                    this.$emit("statusChanged", newStatus);
-                });
-        },
-    },
+      emit("statusChanged", newStatus);
     });
+}
 </script>
 
 <style scoped></style>

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

@@ -23,11 +23,7 @@
         <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>
@@ -36,11 +32,7 @@
           <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>
@@ -56,11 +48,7 @@
           <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>
@@ -88,9 +76,7 @@
               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>
@@ -100,9 +86,7 @@
   <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, "time") }} -
           {{ formatDate(event.endStr, "time") }}:
@@ -132,11 +116,7 @@
           <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") }}
@@ -145,27 +125,16 @@
         </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>
@@ -178,9 +147,9 @@
               class="form-select"
             >
               <option
-                                v-for="w in lastWeeks"
+                v-for="(w, index) in lastWeeks"
                 :value="w.value"
-                                :key="w.value"
+                :key="w.value ?? `last-${index}`"
               >
                 {{ w.text }}
               </option>
@@ -190,25 +159,18 @@
             <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 v-model="copyToWeek" id="copyToWeek" class="form-select">
               <option
-                                v-for="w in nextWeeks"
+                v-for="(w, index) in nextWeeks"
                 :value="w.value"
-                                :key="w.value"
+                :key="w.value ?? `next-${index}`"
               >
                 {{ 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>
@@ -346,6 +308,7 @@ const baseOptions = ref<CalendarOptions>({
     center: "title",
     right: "timeGridWeek,timeGridDay",
   },
+  allDaySlot: false,
 });
 
 const ranges = computed<EventInput[]>(() => {
@@ -504,7 +467,7 @@ onMounted(() => {
 <style scoped>
 #copy-widget {
   position: sticky;
-    bottom: 0px;
+  bottom: 0;
   background-color: white;
   z-index: 9999999999;
   padding: 0.25rem 0 0.25rem;

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

@@ -74,12 +74,12 @@ const saveAndClose = function (e: Event): void {
       location: location.value,
       calendarRangeId: calendarRangeId.value,
     })
-        .then((_) => {
+    .then(() => {
       showModal.value = false;
     });
 };
 
-const closeModal = function (_: any): void {
+const closeModal = function (): void {
   showModal.value = false;
 };
 

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

@@ -41,9 +41,7 @@ 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,10 +29,7 @@ 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;
           }
         }
@@ -54,10 +51,7 @@ 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(),
@@ -85,11 +79,7 @@ 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,10 +40,7 @@ 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;
           }
         }
@@ -110,9 +107,7 @@ 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);
@@ -120,10 +115,7 @@ 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(),
@@ -142,17 +134,12 @@ 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") {
@@ -211,11 +198,7 @@ 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?`;
 
@@ -240,11 +223,7 @@ export default {
         },
       } as CalendarRangeCreate;
 
-            return makeFetch<CalendarRangeCreate, CalendarRange>(
-                "POST",
-                url,
-                body,
-            )
+      return makeFetch<CalendarRangeCreate, CalendarRange>("POST", url, body)
         .then((newRange) => {
           ctx.commit("addRange", newRange);
 
@@ -281,11 +260,7 @@ 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);
@@ -310,11 +285,7 @@ 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);
@@ -334,20 +305,14 @@ 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));
@@ -369,9 +334,7 @@ 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,10 +29,7 @@ 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;
           }
         }
@@ -85,11 +82,7 @@ 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,11 +112,8 @@ export default {
 
               results.forEach((i) => {
                 if (!users.some((j) => i.user.id === j.id)) {
-                                    let ratio = Math.floor(
-                                        users.length / COLORS.length,
-                                    );
-                                    let colorIndex =
-                                        users.length - ratio * COLORS.length;
+                  let ratio = Math.floor(users.length / COLORS.length);
+                  let colorIndex = users.length - ratio * COLORS.length;
                   users.push({
                     id: i.user.id,
                     username: i.user.username,
@@ -153,45 +150,29 @@ export default {
                 (me) =>
                   new Promise((resolve, reject) => {
                     this.users.logged = me;
-                                        let currentUser = users.find(
-                                            (u) => u.id === me.id,
-                                        );
+                    let currentUser = users.find((u) => u.id === me.id);
                     this.value = currentUser;
 
                     fetchCalendar(currentUser.id).then(
                       (calendar) =>
-                                                new Promise(
-                                                    (resolve, reject) => {
-                                                        let results =
-                                                            calendar.results;
-                                                        let events =
-                                                            results.map(
-                                                                (i) => ({
-                                                                    start: i
-                                                                        .startDate
-                                                                        .datetime,
-                                                                    end: i
-                                                                        .endDate
-                                                                        .datetime,
-                                                                }),
-                                                            );
-                                                        let calendarEventsCurrentUser =
-                                                            {
+                        new Promise((resolve, reject) => {
+                          let results = calendar.results;
+                          let events = results.map((i) => ({
+                            start: i.startDate.datetime,
+                            end: i.endDate.datetime,
+                          }));
+                          let calendarEventsCurrentUser = {
                             events: events,
                             color: "darkblue",
                             id: 1000,
                             editable: false,
                           };
-                                                        this.calendarEvents.user =
-                                                            calendarEventsCurrentUser;
+                          this.calendarEvents.user = calendarEventsCurrentUser;
 
-                                                        this.selectUsers(
-                                                            currentUser,
-                                                        );
+                          this.selectUsers(currentUser);
 
                           resolve();
-                                                    },
-                                                ),
+                        }),
                     );
 
                     resolve();
@@ -209,9 +190,7 @@ 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;
@@ -232,8 +211,8 @@ export default {
     },
     selectEvents() {
       let selectedUsersId = this.users.selected.map((a) => a.id);
-            this.calendarEvents.selected = this.calendarEvents.loaded.filter(
-                (a) => selectedUsersId.includes(a.id),
+      this.calendarEvents.selected = this.calendarEvents.loaded.filter((a) =>
+        selectedUsersId.includes(a.id),
       );
     },
     selectUsers(value) {
@@ -243,9 +222,7 @@ export default {
       this.updateEventsSource();
     },
     unSelectUsers(value) {
-            this.users.selected = this.users.selected.filter(
-                (a) => a.id != value.id,
-            );
+      this.users.selected = this.users.selected.filter((a) => a.id != value.id);
       this.selectEvents();
       this.updateEventsSource();
     },

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

@@ -28,6 +28,9 @@
                                         {% if calendar.status == 'canceled' %}
                                             <del>
                                         {% endif %}
+                                        {% if calendar.status == 'canceled' %}
+                                            <del>
+                                        {% endif %}
                                         {% if calendar.endDate.diff(calendar.startDate).days >= 1 %}
                                                 {{ calendar.startDate|format_datetime('short', 'short') }}
                                                 - {{ calendar.endDate|format_datetime('short', 'short') }}
@@ -75,7 +78,7 @@
     </div>
 
     {% if calendar.comment.comment is not empty
-                    or calendar.users|length > 0
+                    or calendar.persons|length > 0
                     or calendar.thirdParties|length > 0
                     or calendar.users|length > 0 %}
                     <div class="item-row details separator">
@@ -237,6 +240,10 @@
                             <a href="{{ chill_path_add_return_path('chill_calendar_calendar_cancel', { 'id': calendar.id } ) }}"
                                class="btn btn-action"><i class="bi bi-x-circle"></i> {{ 'Cancel'|trans }}</a>
                         </li>
+                        <li>
+                            <a href="{{ chill_path_add_return_path('chill_calendar_calendar_cancel', { 'id': calendar.id } ) }}"
+                               class="btn btn-action"><i class="bi bi-x-circle"></i> {{ 'Cancel'|trans }}</a>
+                        </li>
                         {% endif %}
 
                         {% if is_granted('CHILL_CALENDAR_CALENDAR_DELETE', calendar) %}

src/Bundle/ChillCalendarBundle/Tests/Controller/CalendarControllerTest.php

@@ -45,8 +45,12 @@ final class CalendarControllerTest extends WebTestCase
     /**
      * @dataProvider provideAccompanyingPeriod
      */
-    public function testList(int $accompanyingPeriodId)
+    public function testList(?int $accompanyingPeriodId)
     {
+        if (null === $accompanyingPeriodId) {
+            $this->markTestSkipped('No AccompanyingPeriod matching criteria found in database.');
+        }
+
         $this->client->request(
             Request::METHOD_GET,
             sprintf('/fr/calendar/calendar/by-period/%d', $accompanyingPeriodId)
@@ -58,8 +62,12 @@ final class CalendarControllerTest extends WebTestCase
     /**
      * @dataProvider provideAccompanyingPeriod
      */
-    public function testNew(int $accompanyingPeriodId)
+    public function testNew(?int $accompanyingPeriodId)
     {
+        if (null === $accompanyingPeriodId) {
+            $this->markTestSkipped('No AccompanyingPeriod matching criteria found in database.');
+        }
+
         $this->client->request(
             Request::METHOD_GET,
             sprintf('/fr/calendar/calendar/new?accompanying_period_id=%d', $accompanyingPeriodId)
@@ -88,6 +96,17 @@ final class CalendarControllerTest extends WebTestCase
             ->getQuery()
             ->getSingleScalarResult();
 
+        self::ensureKernelShutdown();
+
+        if (0 === $nb) {
+            yield [null];
+
+            return;
+        }
+
+        self::bootKernel();
+        $em = self::getContainer()->get(EntityManagerInterface::class);
+
         yield [$em->createQueryBuilder()
             ->from(AccompanyingPeriod::class, 'ac')
             ->select('ac.id')

src/Bundle/ChillCustomFieldsBundle/DataFixtures/ORM/LoadOption.php

@@ -41,6 +41,7 @@ class LoadOption extends AbstractFixture implements OrderedFixtureInterface
 
     public function __construct()
     {
+        mt_srand(123456789);
         $this->fakerFr = \Faker\Factory::create('fr_FR');
         $this->fakerEn = \Faker\Factory::create('en_EN');
         $this->fakerNl = \Faker\Factory::create('nl_NL');
@@ -104,7 +105,7 @@ class LoadOption extends AbstractFixture implements OrderedFixtureInterface
             $manager->persist($parent);
 
             // Load children
-            $expected_nb_children = random_int(10, 50);
+            $expected_nb_children = mt_rand(10, 50);
 
             for ($i = 0; $i < $expected_nb_children; ++$i) {
                 $companyName = $this->fakerFr->company;
@@ -144,7 +145,7 @@ class LoadOption extends AbstractFixture implements OrderedFixtureInterface
             $manager->persist($parent);
 
             // Load children
-            $expected_nb_children = random_int(10, 50);
+            $expected_nb_children = mt_rand(10, 50);
 
             for ($i = 0; $i < $expected_nb_children; ++$i) {
                 $manager->persist($this->createChildOption($parent, [

src/Bundle/ChillCustomFieldsBundle/DependencyInjection/ChillCustomFieldsExtension.php

@@ -52,7 +52,7 @@ class ChillCustomFieldsExtension extends Extension implements PrependExtensionIn
     }
 
     /** (non-PHPdoc).
-     * @see \Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface::prepend()
+     * @see PrependExtensionInterface::prepend()
      */
     public function prepend(ContainerBuilder $container)
     {

src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoiceWithOtherType.php

@@ -25,7 +25,7 @@ class ChoiceWithOtherType extends AbstractType
     private string $otherValueLabel = 'Other value';
 
     /** (non-PHPdoc).
-     * @see \Symfony\Component\Form\AbstractType::buildForm()
+     * @see AbstractType::buildForm()
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {
@@ -42,7 +42,7 @@ class ChoiceWithOtherType extends AbstractType
     }
 
     /** (non-PHPdoc).
-     * @see \Symfony\Component\Form\AbstractType::configureOptions()
+     * @see AbstractType::configureOptions()
      */
     public function configureOptions(OptionsResolver $resolver)
     {

src/Bundle/ChillCustomFieldsBundle/Form/Type/ChoicesListType.php

@@ -22,7 +22,7 @@ use Symfony\Component\Form\FormEvents;
 class ChoicesListType extends AbstractType
 {
     /** (non-PHPdoc).
-     * @see \Symfony\Component\Form\AbstractType::buildForm()
+     * @see AbstractType::buildForm()
      */
     public function buildForm(FormBuilderInterface $builder, array $options)
     {

src/Bundle/ChillCustomFieldsBundle/Service/CustomFieldProvider.php

@@ -82,7 +82,7 @@ class CustomFieldProvider implements ContainerAwareInterface
     /**
      * (non-PHPdoc).
      *
-     * @see \Symfony\Component\DependencyInjection\ContainerAwareInterface::setContainer()
+     * @see ContainerAwareInterface::setContainer()
      */
     public function setContainer(?ContainerInterface $container = null)
     {

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

@@ -20,10 +20,7 @@
                 </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>
@@ -31,9 +28,7 @@
                 v-if="canGenerate"
                 class="btn btn-update btn-sm change-icon"
                 :href="buildUrlGenerate"
-                                @click.prevent="
-                                    clickGenerate($event, buildUrlGenerate)
-                                "
+                @click.prevent="clickGenerate($event, buildUrlGenerate)"
                 ><i class="fa fa-fw fa-cog"
               /></a>
               <a

src/Bundle/ChillDocStoreBundle/Entity/StoredObject.php

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

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

@@ -13,8 +13,9 @@ const startApp = (
 
   const inputTitle = collectionEntry?.querySelector("input[type='text']");
 
-    const input_stored_object: HTMLInputElement | null =
-        divElement.querySelector("input[data-stored-object]");
+  const input_stored_object: HTMLInputElement | null = divElement.querySelector(
+    "input[data-stored-object]",
+  );
   if (null === input_stored_object) {
     throw new Error("input to stored object not found");
   }
@@ -53,9 +54,7 @@ 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/module/document_action_buttons_group/index.ts

@@ -2,12 +2,11 @@ import { _createI18n } from "ChillMainAssets/vuejs/_js/i18n";
 import DocumentActionButtonsGroup from "../../vuejs/DocumentActionButtonsGroup.vue";
 import { createApp } from "vue";
 import { StoredObject, StoredObjectStatusChange } from "../../types";
-import { is_object_ready } from "../../vuejs/StoredObjectButton/helpers";
 import ToastPlugin from "vue-toast-notification";
 
 const i18n = _createI18n({});
 
-window.addEventListener("DOMContentLoaded", function (e) {
+window.addEventListener("DOMContentLoaded", function () {
   document
     .querySelectorAll<HTMLDivElement>("div[data-download-buttons]")
     .forEach((el) => {

src/Bundle/ChillDocStoreBundle/Resources/public/types/index.ts

@@ -9,6 +9,7 @@ export interface StoredObject {
   uuid: string;
   prefix: string;
   status: StoredObjectStatus;
+  type: string;
   currentVersion:
     | null
     | StoredObjectVersionCreated

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

@@ -26,8 +26,8 @@
       <li v-if="isEditableOnDesktop">
         <desktop-edit-button
           :classes="{ 'dropdown-item': true }"
-                    :edit-link="props.davLink"
-                    :expiration-link="props.davLinkExpiration"
+          :edit-link="props.davLink ?? ''"
+          :expiration-link="props.davLinkExpiration ?? 0"
         ></desktop-edit-button>
       </li>
       <li v-if="isConvertibleToPdf">
@@ -49,9 +49,7 @@
       <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>
@@ -77,7 +75,6 @@ import {
 import {
   StoredObject,
   StoredObjectStatusChange,
-    StoredObjectVersion,
   WopiEditButtonExecutableBeforeLeaveFunction,
 } from "../types";
 import DesktopEditButton from "ChillDocStoreAssets/vuejs/StoredObjectButton/DesktopEditButton.vue";
@@ -129,9 +126,7 @@ 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,
 });
 
 /**
@@ -210,10 +205,6 @@ const checkForReady = function (): void {
 };
 
 const onObjectNewStatusCallback = async function (): Promise<void> {
-    if (props.storedObject.status === "stored_object_created") {
-        return Promise.resolve();
-    }
-
   const new_status = await is_object_ready(props.storedObject);
   if (props.storedObject.status !== new_status.status) {
     emit("onStoredObjectStatusChange", new_status);

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

@@ -29,9 +29,7 @@
     </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"
@@ -92,10 +90,7 @@
         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>
@@ -150,10 +145,7 @@
           :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>
@@ -207,10 +199,7 @@
         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>
@@ -238,10 +227,7 @@
         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>
@@ -299,10 +285,7 @@
           </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>
@@ -562,14 +545,8 @@ const addCanvasEvents = () => {
       );
     });
   } else {
-        const canvas = document.querySelectorAll(
-            "canvas",
-        )[0] as HTMLCanvasElement;
-        canvas.addEventListener(
-            "pointerup",
-            (e) => canvasClick(e, canvas),
-            false,
-        );
+    const canvas = document.querySelectorAll("canvas")[0] as HTMLCanvasElement;
+    canvas.addEventListener("pointerup", (e) => canvasClick(e, canvas), false);
   }
 };
 
@@ -605,11 +582,7 @@ 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) => {
@@ -625,8 +598,7 @@ 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

@@ -1,3 +1,35 @@
+<template>
+  <div class="drop-file">
+    <div
+      v-if="!uploading"
+      :class="{ area: true, dragging: is_dragging }"
+      @click="onZoneClick"
+      @dragover="onDragOver"
+      @dragleave="onDragLeave"
+      @drop="onDrop"
+    >
+      <p v-if="has_existing_doc" class="file-icon">
+        <file-icon :type="props.existingDoc?.type ?? ''"></file-icon>
+      </p>
+
+      <p v-if="display_filename !== null" class="display-filename">
+        {{ display_filename }}
+      </p>
+      <!-- todo i18n -->
+      <p v-if="has_existing_doc">
+        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
+      </p>
+    </div>
+    <div v-else class="waiting">
+      <i class="fa fa-cog fa-spin fa-3x fa-fw"></i>
+      <span class="sr-only">Loading...</span>
+    </div>
+  </div>
+</template>
+
 <script setup lang="ts">
 import { StoredObject, StoredObjectVersionCreated } from "../../types";
 import {
@@ -9,21 +41,20 @@ import { computed, ref, Ref } from "vue";
 import FileIcon from "ChillDocStoreAssets/vuejs/FileIcon.vue";
 
 interface DropFileConfig {
-    existingDoc?: StoredObject;
+  existingDoc: StoredObject | null;
 }
 
 const props = withDefaults(defineProps<DropFileConfig>(), {
   existingDoc: null,
 });
 
-const emit =
-    defineEmits<
+const emit = defineEmits<
   (
     e: "addDocument",
-            {
-                stored_object_version: StoredObjectVersionCreated,
-                stored_object: StoredObject,
-                file_name: string,
+    payload: {
+      stored_object_version: StoredObjectVersionCreated;
+      stored_object: StoredObject;
+      file_name: string;
     },
   ) => void
 >();
@@ -134,40 +165,6 @@ const handleFile = async (file: File): Promise<void> => {
 };
 </script>
 
-<template>
-    <div class="drop-file">
-        <div
-            v-if="!uploading"
-            :class="{ area: true, dragging: is_dragging }"
-            @click="onZoneClick"
-            @dragover="onDragOver"
-            @dragleave="onDragLeave"
-            @drop="onDrop"
-        >
-            <p v-if="has_existing_doc" class="file-icon">
-                <file-icon :type="props.existingDoc?.type"></file-icon>
-            </p>
-
-            <p v-if="display_filename !== null" class="display-filename">
-                {{ display_filename }}
-            </p>
-            <!-- todo i18n -->
-            <p v-if="has_existing_doc">
-                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
-            </p>
-        </div>
-        <div v-else class="waiting">
-            <i class="fa fa-cog fa-spin fa-3x fa-fw"></i>
-            <span class="sr-only">Loading...</span>
-        </div>
-    </div>
-</template>
-
 <style scoped lang="scss">
 .drop-file {
   width: 100%;

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

@@ -18,10 +18,10 @@ const props = withDefaults(defineProps<DropFileConfig>(), {
 const emit = defineEmits<{
   (
     e: "addDocument",
-        {
-            stored_object: StoredObject,
-            stored_object_version: StoredObjectVersion,
-            file_name: string,
+    payload: {
+      stored_object: StoredObject;
+      stored_object_version: StoredObjectVersion;
+      file_name: string;
     },
   ): void;
   (e: "removeDocument"): void;

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

@@ -1,6 +1,34 @@
+<template>
+  <div>
+    <drop-file
+      :existingDoc="props.existingDoc ?? null"
+      @addDocument="onAddDocument"
+    ></drop-file>
+
+    <ul class="record_actions">
+      <li v-if="props?.existingDoc">
+        <document-action-buttons-group
+          :stored-object="props.existingDoc"
+          :can-edit="props.existingDoc?.status === 'ready'"
+          :can-download="true"
+          :dav-link="dav_link_href ?? ''"
+          :dav-link-expiration="dav_link_expiration ?? 0"
+        />
+      </li>
+      <li>
+        <button
+          v-if="allowRemove"
+          class="btn btn-delete"
+          @click="onRemoveDocument($event)"
+        ></button>
+      </li>
+    </ul>
+  </div>
+</template>
+
 <script setup lang="ts">
 import { StoredObject, StoredObjectVersion } from "../../types";
-import { computed, ref, Ref } from "vue";
+import { computed } from "vue";
 import DropFile from "ChillDocStoreAssets/vuejs/DropFileWidget/DropFile.vue";
 import DocumentActionButtonsGroup from "ChillDocStoreAssets/vuejs/DocumentActionButtonsGroup.vue";
 
@@ -16,19 +44,15 @@ const props = withDefaults(defineProps<DropFileConfig>(), {
 const emit = defineEmits<{
   (
     e: "addDocument",
-        {
-            stored_object: StoredObject,
-            stored_object_version: StoredObjectVersion,
-            file_name: string,
+    payload: {
+      stored_object: StoredObject;
+      stored_object_version: StoredObjectVersion;
+      file_name: string;
     },
   ): void;
   (e: "removeDocument"): void;
 }>();
 
-const has_existing_doc = computed<boolean>(() => {
-    return props.existingDoc !== undefined && props.existingDoc !== null;
-});
-
 const dav_link_expiration = computed<number | undefined>(() => {
   if (props.existingDoc === undefined || props.existingDoc === null) {
     return undefined;
@@ -69,33 +93,4 @@ const onRemoveDocument = (e: Event): void => {
   emit("removeDocument");
 };
 </script>
-
-<template>
-    <div>
-        <drop-file
-            :existingDoc="props.existingDoc"
-            @addDocument="onAddDocument"
-        ></drop-file>
-
-        <ul class="record_actions">
-            <li v-if="has_existing_doc">
-                <document-action-buttons-group
-                    :stored-object="props.existingDoc"
-                    :can-edit="props.existingDoc?.status === 'ready'"
-                    :can-download="true"
-                    :dav-link="dav_link_href"
-                    :dav-link-expiration="dav_link_expiration"
-                />
-            </li>
-            <li>
-                <button
-                    v-if="allowRemove"
-                    class="btn btn-delete"
-                    @click="onRemoveDocument($event)"
-                ></button>
-            </li>
-        </ul>
-    </div>
-</template>
-
 <style scoped lang="scss"></style>

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

@@ -1,11 +1,3 @@
-<script setup lang="ts">
-interface FileIconConfig {
-    type: string;
-}
-
-const props = defineProps<FileIconConfig>();
-</script>
-
 <template>
   <i class="fa fa-file-pdf-o" v-if="props.type === 'application/pdf'"></i>
   <i
@@ -43,4 +35,12 @@ const props = defineProps<FileIconConfig>();
   <i class="fa fa-file-code-o" v-else></i>
 </template>
 
+<script setup lang="ts">
+interface FileIconConfig {
+  type: string;
+}
+
+const props = defineProps<FileIconConfig>();
+</script>
+
 <style scoped lang="scss"></style>

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

@@ -35,9 +35,7 @@ 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

@@ -1,9 +1,63 @@
+<template>
+  <teleport to="body">
+    <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>
+            <strong>{{ editionUntilFormatted }}</strong>
+          </p>
+
+          <p>
+            <a class="btn btn-primary" :href="buildCommand"
+              >Ouvrir le document pour édition</a
+            >
+          </p>
+
+          <p>
+            <small
+              >Le document peut être édité uniquement en utilisant Libre
+              Office.</small
+            >
+          </p>
+
+          <p>
+            <small
+              >En cas d'échec lors de l'enregistrement, sauver le document sur
+              le poste de travail avant de le déposer à nouveau ici.</small
+            >
+          </p>
+
+          <p>
+            <small
+              >Vous pouvez naviguez sur d'autres pages pendant l'édition.</small
+            >
+          </p>
+        </div>
+      </template>
+    </modal>
+  </teleport>
+  <a :class="props.classes" @click="state.modalOpened = true">
+    <i class="fa fa-desktop"></i>
+    Éditer sur le bureau
+  </a>
+</template>
+
+<style scoped lang="scss">
+.desktop-edit {
+  text-align: center;
+}
+i.fa::before {
+  color: var(--bs-dropdown-link-hover-color);
+}
+</style>
+
 <script setup lang="ts">
 import Modal from "ChillMainAssets/vuejs/_components/Modal.vue";
 import { computed, reactive } from "vue";
 
 export interface DesktopEditButtonConfig {
-    editLink: null;
+  editLink: string;
   classes: Record<string, boolean>;
   expirationLink: number | Date;
 }
@@ -28,7 +82,6 @@ const editionUntilFormatted = computed<string>(() => {
   } else {
     d = new Date(props.expirationLink * 1000);
   }
-    console.log(props.expirationLink);
 
   return new Intl.DateTimeFormat(undefined, {
     dateStyle: "long",
@@ -36,61 +89,3 @@ const editionUntilFormatted = computed<string>(() => {
   }).format(d);
 });
 </script>
-
-<template>
-    <teleport to="body">
-        <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>
-                        <strong>{{ editionUntilFormatted }}</strong>
-                    </p>
-
-                    <p>
-                        <a class="btn btn-primary" :href="buildCommand"
-                            >Ouvrir le document pour édition</a
-                        >
-                    </p>
-
-                    <p>
-                        <small
-                            >Le document peut être édité uniquement en utilisant
-                            Libre Office.</small
-                        >
-                    </p>
-
-                    <p>
-                        <small
-                            >En cas d'échec lors de l'enregistrement, sauver le
-                            document sur le poste de travail avant de le déposer
-                            à nouveau ici.</small
-                        >
-                    </p>
-
-                    <p>
-                        <small
-                            >Vous pouvez naviguez sur d'autres pages pendant
-                            l'édition.</small
-                        >
-                    </p>
-                </div>
-            </template>
-        </modal>
-    </teleport>
-    <a :class="props.classes" @click="state.modalOpened = true">
-        <i class="fa fa-desktop"></i>
-        Éditer sur le bureau
-    </a>
-</template>
-
-<style scoped lang="scss">
-.desktop-edit {
-    text-align: center;
-}
-i.fa::before {
-    color: var(--bs-dropdown-link-hover-color);
-}
-</style>

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

@@ -12,7 +12,7 @@
     v-else
     :class="props.classes"
     target="_blank"
-        :type="props.atVersion.type"
+    :type="props.atVersion?.type"
     :download="buildDocumentName()"
     :href="state.href_url"
     ref="open_button"
@@ -27,11 +27,15 @@
 import { reactive, ref, nextTick, onMounted } from "vue";
 import { download_and_decrypt_doc } from "./helpers";
 import mime from "mime";
-import { StoredObject, StoredObjectVersion } from "../../types";
+import {
+  StoredObject,
+  StoredObjectVersionCreated,
+  StoredObjectVersionPersisted,
+} from "../../types";
 
 interface DownloadButtonConfig {
   storedObject: StoredObject;
-    atVersion: StoredObjectVersion;
+  atVersion: null | StoredObjectVersionCreated | StoredObjectVersionPersisted;
   classes: Record<string, boolean>;
   filename?: string;
   /**
@@ -70,7 +74,7 @@ function buildDocumentName(): string {
     document_name = "document";
   }
 
-    const ext = mime.getExtension(props.atVersion.type);
+  const ext = mime.getExtension(props.atVersion?.type ?? "");
 
   if (null !== ext) {
     return document_name + "." + ext;
@@ -95,10 +99,7 @@ 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.vue

@@ -1,10 +1,24 @@
+<template>
+  <a @click="download_version_and_open_modal" class="dropdown-item">
+    <history-button-modal
+      ref="modal"
+      :versions="state.versions"
+      :stored-object="storedObject"
+      :can-edit="canEdit"
+      @restore-version="onRestoreVersion"
+    ></history-button-modal>
+    <i class="fa fa-history"></i>
+    Historique
+  </a>
+</template>
+
 <script setup lang="ts">
 import HistoryButtonModal from "ChillDocStoreAssets/vuejs/StoredObjectButton/HistoryButton/HistoryButtonModal.vue";
 import {
   StoredObject,
   StoredObjectVersionWithPointInTime,
 } from "./../../types";
-import { computed, reactive, ref, useTemplateRef } from "vue";
+import { reactive, useTemplateRef } from "vue";
 import { get_versions } from "./HistoryButton/api";
 
 interface HistoryButtonConfig {
@@ -38,29 +52,11 @@ const download_version_and_open_modal = async function (): Promise<void> {
   }
 };
 
-const onRestoreVersion = ({
-    newVersion,
-}: {
-    newVersion: StoredObjectVersionWithPointInTime;
-}) => {
+const onRestoreVersion = (newVersion: StoredObjectVersionWithPointInTime) => {
   state.versions.unshift(newVersion);
 };
 </script>
 
-<template>
-    <a @click="download_version_and_open_modal" class="dropdown-item">
-        <history-button-modal
-            ref="modal"
-            :versions="state.versions"
-            :stored-object="storedObject"
-            :can-edit="canEdit"
-            @restore-version="onRestoreVersion"
-        ></history-button-modal>
-        <i class="fa fa-history"></i>
-        Historique
-    </a>
-</template>
-
 <style scoped lang="scss">
 i.fa::before {
   color: var(--bs-dropdown-link-hover-color);

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

@@ -1,3 +1,22 @@
+<template>
+  <template v-if="props.versions.length > 0">
+    <div class="container">
+      <template v-for="v in props.versions" :key="v.id">
+        <history-button-list-item
+          :version="v"
+          :can-edit="canEdit"
+          :is-current="higher_version === v.version"
+          :stored-object="storedObject"
+          @restore-version="onRestored"
+        ></history-button-list-item>
+      </template>
+    </div>
+  </template>
+  <template v-else>
+    <p>Chargement des versions</p>
+  </template>
+</template>
+
 <script setup lang="ts">
 import {
   StoredObject,
@@ -40,33 +59,10 @@ const higher_version = computed<number>(() =>
  *
  * internally, keep track of the newly restored version
  */
-const onRestored = ({
-    newVersion,
-}: {
-    newVersion: StoredObjectVersionWithPointInTime;
-}) => {
+const onRestored = (newVersion: StoredObjectVersionWithPointInTime) => {
   state.restored = newVersion.version;
-    emit("restoreVersion", { newVersion });
+  emit("restoreVersion", newVersion);
 };
 </script>
 
-<template>
-    <template v-if="props.versions.length > 0">
-        <div class="container">
-            <template v-for="v in props.versions" :key="v.id">
-                <history-button-list-item
-                    :version="v"
-                    :can-edit="canEdit"
-                    :is-current="higher_version === v.version"
-                    :stored-object="storedObject"
-                    @restore-version="onRestored"
-                ></history-button-list-item>
-            </template>
-        </div>
-    </template>
-    <template v-else>
-        <p>Chargement des versions</p>
-    </template>
-</template>
-
 <style scoped lang="scss"></style>

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

@@ -1,3 +1,70 @@
+<template>
+  <div :class="classes">
+    <div
+      class="col-12 tags"
+      v-if="isCurrent || isKeptBeforeConversion || isRestored || isDuplicated"
+    >
+      <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
+      >
+      <span class="badge bg-info" v-if="isRestored"
+        >Restaurée depuis la version
+        {{
+          version["from-restored"]?.version
+            ? version["from-restored"]?.version + 1
+            : ""
+        }}</span
+      >
+      <span class="badge bg-info" v-if="isDuplicated"
+        >Dupliqué depuis un autre document</span
+      >
+    </div>
+    <div class="col-12">
+      <file-icon :type="version.type"></file-icon>
+      <span
+        ><strong>&nbsp;#{{ version.version + 1 }}&nbsp;</strong></span
+      >
+      <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" />
+        </span>
+        <strong>à</strong>
+        {{ $d(ISOToDatetime(version.createdAt.datetime8601) ?? 0, "long") }}
+      </template>
+      <template v-if="version.createdBy === null && version.createdAt !== null">
+        <strong v-if="version.version == 0">Créé le</strong>
+        <strong v-else>modifié le</strong>
+        {{ $d(ISOToDatetime(version.createdAt.datetime8601) ?? 0, "long") }}
+      </template>
+    </div>
+    <div class="col-12">
+      <ul class="record_actions small slim on-version-actions">
+        <li v-if="canEdit && !isCurrent">
+          <restore-version-button
+            :stored-object-version="props.version"
+            @restore-version="onRestore"
+          ></restore-version-button>
+        </li>
+        <li>
+          <download-button
+            :stored-object="storedObject"
+            :at-version="version"
+            :classes="{
+              btn: true,
+              'btn-outline-primary': true,
+              'btn-sm': true,
+            }"
+            :display-action-string-in-button="false"
+          ></download-button>
+        </li>
+      </ul>
+    </div>
+  </div>
+</template>
+
 <script setup lang="ts">
 import {
   StoredObject,
@@ -24,12 +91,8 @@ const emit = defineEmits<{
 
 const props = defineProps<HistoryButtonListItemConfig>();
 
-const onRestore = ({
-    newVersion,
-}: {
-    newVersion: StoredObjectVersionWithPointInTime;
-}) => {
-    emit("restoreVersion", { newVersion });
+const onRestore = (newVersion: StoredObjectVersionWithPointInTime) => {
+  emit("restoreVersion", newVersion);
 };
 
 const isKeptBeforeConversion = computed<boolean>(() => {
@@ -49,8 +112,7 @@ 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<{
@@ -61,88 +123,11 @@ const classes = computed<{
 }>(() => ({
   row: true,
   "row-hover": true,
-    "blinking-1": props.isRestored && 0 === props.version.version % 2,
-    "blinking-2": props.isRestored && 1 === props.version.version % 2,
+  "blinking-1": isRestored.value && 0 === props.version.version % 2,
+  "blinking-2": isRestored.value && 1 === props.version.version % 2,
 }));
 </script>
 
-<template>
-    <div :class="classes">
-        <div
-            class="col-12 tags"
-            v-if="
-                isCurrent ||
-                isKeptBeforeConversion ||
-                isRestored ||
-                isDuplicated
-            "
-        >
-            <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
-            >
-            <span class="badge bg-info" v-if="isRestored"
-                >Restaurée depuis la version
-                {{ version["from-restored"]?.version + 1 }}</span
-            >
-            <span class="badge bg-info" v-if="isDuplicated"
-                >Dupliqué depuis un autre document</span
-            >
-        </div>
-        <div class="col-12">
-            <file-icon :type="version.type"></file-icon>
-            <span
-                ><strong>&nbsp;#{{ version.version + 1 }}&nbsp;</strong></span
-            >
-            <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
-                ></span>
-                <strong>à</strong>
-                {{
-                    $d(ISOToDatetime(version.createdAt.datetime8601), "long")
-                }}</template
-            ><template
-                v-if="version.createdBy === null && version.createdAt !== null"
-                ><strong v-if="version.version == 0">Créé le</strong
-                ><strong v-else>modifié le</strong>
-                {{
-                    $d(ISOToDatetime(version.createdAt.datetime8601), "long")
-                }}</template
-            >
-        </div>
-        <div class="col-12">
-            <ul class="record_actions small slim on-version-actions">
-                <li v-if="canEdit && !isCurrent">
-                    <restore-version-button
-                        :stored-object-version="props.version"
-                        @restore-version="onRestore"
-                    ></restore-version-button>
-                </li>
-                <li>
-                    <download-button
-                        :stored-object="storedObject"
-                        :at-version="version"
-                        :classes="{
-                            btn: true,
-                            'btn-outline-primary': true,
-                            'btn-sm': true,
-                        }"
-                        :display-action-string-in-button="false"
-                    ></download-button>
-                </li>
-            </ul>
-        </div>
-    </div>
-</template>
-
 <style scoped lang="scss">
 div.tags {
   span.badge:not(:last-child) {

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

@@ -1,3 +1,22 @@
+<template>
+  <Teleport to="body">
+    <modal v-if="state.opened" @close="state.opened = false">
+      <template v-slot:header>
+        <h3>Historique des versions du document</h3>
+      </template>
+      <template v-slot:body>
+        <p>Les versions sont conservées pendant 90 jours.</p>
+        <history-button-list
+          :versions="props.versions"
+          :can-edit="canEdit"
+          :stored-object="storedObject"
+          @restore-version="onRestoreVersion"
+        ></history-button-list>
+      </template>
+    </modal>
+  </Teleport>
+</template>
+
 <script setup lang="ts">
 import Modal from "ChillMainAssets/vuejs/_components/Modal.vue";
 import { reactive } from "vue";
@@ -28,29 +47,10 @@ const open = () => {
   state.opened = true;
 };
 
-const onRestoreVersion = (payload: {
-    newVersion: StoredObjectVersionWithPointInTime;
-}) => emit("restoreVersion", payload);
+const onRestoreVersion = (newVersion: StoredObjectVersionWithPointInTime) =>
+  emit("restoreVersion", newVersion);
 
 defineExpose({ open });
 </script>
-<template>
-    <Teleport to="body">
-        <modal v-if="state.opened" @close="state.opened = false">
-            <template v-slot:header>
-                <h3>Historique des versions du document</h3>
-            </template>
-            <template v-slot:body>
-                <p>Les versions sont conservées pendant 90 jours.</p>
-                <history-button-list
-                    :versions="props.versions"
-                    :can-edit="canEdit"
-                    :stored-object="storedObject"
-                    @restore-version="onRestoreVersion"
-                ></history-button-list>
-            </template>
-        </modal>
-    </Teleport>
-</template>
 
 <style scoped lang="scss"></style>

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

@@ -1,3 +1,13 @@
+<template>
+  <button
+    class="btn btn-outline-action"
+    @click="restore_version_fn"
+    title="Restaurer"
+  >
+    <i class="fa fa-rotate-left"></i> Restaurer
+  </button>
+</template>
+
 <script setup lang="ts">
 import {
   StoredObjectVersionPersisted,
@@ -22,18 +32,8 @@ const restore_version_fn = async () => {
   const newVersion = await restore_version(props.storedObjectVersion);
 
   $toast.success("Version restaurée");
-    emit("restoreVersion", { newVersion });
+  emit("restoreVersion", newVersion);
 };
 </script>
 
-<template>
-    <button
-        class="btn btn-outline-action"
-        @click="restore_version_fn"
-        title="Restaurer"
-    >
-        <i class="fa fa-rotate-left"></i> Restaurer
-    </button>
-</template>
-
 <style scoped lang="scss"></style>

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

@@ -2,9 +2,7 @@
   <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,9 +145,7 @@ 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 (
@@ -177,8 +175,6 @@ async function download_and_decrypt_doc(
     throw new Error("no version associated to stored object");
   }
 
-    // sometimes, the downloadInfo may be embedded into the storedObject
-    console.log("storedObject", storedObject);
   let downloadInfo;
   if (
     typeof storedObject._links !== "undefined" &&
@@ -186,10 +182,7 @@ 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);
@@ -244,10 +237,7 @@ 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);
@@ -277,6 +267,7 @@ async function is_object_ready(
 export {
   build_convert_link,
   build_wopi_editor_link,
+  download_info_link,
   download_and_decrypt_doc,
   download_doc,
   download_doc_as_pdf,

src/Bundle/ChillDocStoreBundle/Security/Authorization/StoredObjectVoter/AbstractStoredObjectVoter.php

@@ -15,7 +15,10 @@ use Chill\DocStoreBundle\Entity\StoredObject;
 use Chill\DocStoreBundle\Repository\AssociatedEntityToStoredObjectInterface;
 use Chill\DocStoreBundle\Security\Authorization\StoredObjectRoleEnum;
 use Chill\DocStoreBundle\Security\Authorization\StoredObjectVoterInterface;
-use Chill\MainBundle\Workflow\Helper\WorkflowRelatedEntityPermissionHelper;
+use Chill\MainBundle\Entity\Workflow\EntityWorkflow;
+use Chill\MainBundle\Entity\Workflow\EntityWorkflowAttachment;
+use Chill\MainBundle\Repository\Workflow\EntityWorkflowAttachmentRepository;
+use Chill\MainBundle\Workflow\Helper\WorkflowRelatedEntityPermissionHelperInterface;
 use Symfony\Component\Security\Core\Authentication\Token\TokenInterface;
 use Symfony\Component\Security\Core\Security;
 
@@ -34,7 +37,8 @@ abstract class AbstractStoredObjectVoter implements StoredObjectVoterInterface
 
     public function __construct(
         private readonly Security $security,
-        private readonly ?WorkflowRelatedEntityPermissionHelper $workflowDocumentService = null,
+        private readonly EntityWorkflowAttachmentRepository $entityWorkflowAttachmentRepository,
+        private readonly WorkflowRelatedEntityPermissionHelperInterface $workflowDocumentService,
     ) {}
 
     public function supports(StoredObjectRoleEnum $attribute, StoredObject $subject): bool
@@ -46,16 +50,6 @@ 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);
 
@@ -65,7 +59,7 @@ abstract class AbstractStoredObjectVoter implements StoredObjectVoterInterface
         $regularPermission = $this->security->isGranted($voterAttribute, $entity);
 
         if (!$this->canBeAssociatedWithWorkflow()) {
-            return $regularPermission;
+            return $this->voteOnStoredObjectAsAttachementOfAWorkflow($attribute, $regularPermission, $subject);
         }
 
         $workflowPermission = match ($attribute) {
@@ -74,9 +68,41 @@ abstract class AbstractStoredObjectVoter implements StoredObjectVoterInterface
         };
 
         return match ($workflowPermission) {
-            WorkflowRelatedEntityPermissionHelper::FORCE_GRANT => true,
-            WorkflowRelatedEntityPermissionHelper::FORCE_DENIED => false,
-            WorkflowRelatedEntityPermissionHelper::ABSTAIN => WorkflowRelatedEntityPermissionHelper::FORCE_GRANT === $workflowPermissionAsAttachment || $regularPermission,
+            WorkflowRelatedEntityPermissionHelperInterface::FORCE_GRANT => true,
+            WorkflowRelatedEntityPermissionHelperInterface::FORCE_DENIED => false,
+            WorkflowRelatedEntityPermissionHelperInterface::ABSTAIN => $this->voteOnStoredObjectAsAttachementOfAWorkflow($attribute, $regularPermission, $subject),
         };
     }
+
+    private function voteOnStoredObjectAsAttachementOfAWorkflow(StoredObjectRoleEnum $attribute, bool $regularPermission, StoredObject $storedObject): bool
+    {
+        $attachments = $this->entityWorkflowAttachmentRepository->findByStoredObject($storedObject);
+
+        // we get all the entity workflows where the stored object is attached
+        $entityWorkflows = array_map(static fn (EntityWorkflowAttachment $attachment) => $attachment->getEntityWorkflow(), $attachments);
+
+        // we compute all the permission for each entity workflow
+        $permissions = array_map(fn (EntityWorkflow $entityWorkflow): string => match ($attribute) {
+            StoredObjectRoleEnum::SEE => $this->workflowDocumentService->isAllowedByWorkflowForReadOperation($entityWorkflow),
+            StoredObjectRoleEnum::EDIT => $this->workflowDocumentService->isAllowedByWorkflowForWriteOperation($entityWorkflow),
+        }, $entityWorkflows);
+
+        // now, we reduce the permissions: abstain are ignored. Between DENIED and and GRANT, DENIED takes precedence
+        $computedPermission = WorkflowRelatedEntityPermissionHelperInterface::ABSTAIN;
+        foreach ($permissions as $permission) {
+            if (WorkflowRelatedEntityPermissionHelperInterface::FORCE_DENIED === $permission) {
+                return false;
+            }
+            if (WorkflowRelatedEntityPermissionHelperInterface::FORCE_GRANT === $permission) {
+                $computedPermission = WorkflowRelatedEntityPermissionHelperInterface::FORCE_GRANT;
+            }
+        }
+
+        if (WorkflowRelatedEntityPermissionHelperInterface::ABSTAIN === $computedPermission) {
+            return $regularPermission;
+        }
+
+        // this is the case where WorkflowRelatedEntityPermissionHelperInterface::FORCE_GRANT is returned
+        return true;
+    }
 }