Merge branch 'master' into ticket-app-master

# Conflicts:
#	.junie/guidelines.md
#	src/Bundle/ChillCalendarBundle/Resources/public/vuejs/MyCalendarRange/App2.vue
#	src/Bundle/ChillPersonBundle/Resources/public/vuejs/AccompanyingCourse/components/ButtonLocation.vue

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

.gitlab-ci.yml

@@ -1,5 +1,4 @@
 ---
-
 # Select what we should cache between builds
 cache:
     paths:
@@ -58,18 +57,17 @@ mirror_chill_zimbra_bundle:
 
     rules:
         # 1) Allow manual run from GitLab UI, whatever the branch
-        -   if: '$CI_PIPELINE_SOURCE == "web"'
+        - if: '$CI_PIPELINE_SOURCE == "web"'
 
         # 2) Auto-run on commits to master or 472-zimbra-connector
         #    but only if relevant files changed
-        -   if: '$CI_COMMIT_BRANCH == "master" || $CI_COMMIT_BRANCH == "472-zimbra-connector"'
-            changes:
-                - packages/ChillZimbraBundle/**/*
-                - .gitlab-ci.yml
+        - if: '$CI_COMMIT_BRANCH == "master" || $CI_COMMIT_BRANCH == "472-zimbra-connector"'
+          changes:
+              - packages/ChillZimbraBundle/**/*
+              - .gitlab-ci.yml
 
         # 3) Otherwise: never run
-        -   when: never
-
+        - when: never
 
     before_script:
         - apk add --no-cache git git-subtree openssh
@@ -99,10 +97,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,12 +110,15 @@ build:
         expire_in: 1 day
         paths:
             - vendor/
+            - var/
 
 code_style:
     stage: Tests
     image: chill/base-image:8.3-edge
     script:
         - php-cs-fixer fix --dry-run -v --show-progress=none
+    dependencies:
+        - build
     cache:
         paths:
             - .cache/
@@ -133,6 +136,8 @@ phpstan_tests:
         - bin/console cache:clear --env=dev
     script:
         - composer exec phpstan -- analyze --memory-limit=3G
+    dependencies:
+        - build
     cache:
         paths:
             - .cache/
@@ -148,6 +153,8 @@ rector_tests:
         - bin/console cache:clear --env=dev
     script:
         - composer exec rector -- process --dry-run
+    dependencies:
+        - build
     cache:
         paths:
             - .cache/
@@ -166,10 +173,37 @@ lint:
     script:
         - yarn install --ignore-optional
         - npx eslint-baseline "src/**/*.{js,ts,vue}"
+    dependencies:
+        - build
     cache:
         paths:
             - node_modules/
-
+    artifacts:
+        expire_in: 1 day
+        paths:
+            - vendor/
+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
@@ -195,6 +229,8 @@ unit_tests:
         - php bin/console doctrine:fixtures:load -n --env=test
     script:
         - composer exec phpunit -- --colors=never --exclude-group dbIntensive,openstack-integration
+    dependencies:
+        - build
     artifacts:
         expire_in: 1 day
         paths:
@@ -208,5 +244,5 @@ release:
     script:
         - echo "running release_job"
     release:
-        tag_name: '$CI_COMMIT_TAG'
+        tag_name: "$CI_COMMIT_TAG"
         description: "./.changes/$CI_COMMIT_TAG.md"

.junie/guidelines.md

@@ -234,17 +234,17 @@ This must be a decision made by a human, not by an AI. Every AI task must abort
 
 #### Running Tests
 
-The tests are run from the project's root (not from the bundle's root: so, do not change the directory to any bundle directory before running tests).
-
-Tests must be run using the `symfony` command:
+The tests are run from the project's root (not from the bundle's root).
 
 ```bash
+# Run all tests
+symfony composer exec phpunit
 
 # Run a specific test file
 symfony composer exec phpunit -- path/to/TestFile.php
 
 # Run a specific test method
-symfony composer exec 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

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

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

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

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

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

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/Location/NewLocation.vue

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

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/ChillActivityBundle/migrations/Version20251118124241.php

@@ -39,7 +39,7 @@ final class Version20251118124241 extends AbstractMigration
         $this->addSql("COMMENT ON COLUMN activity_user.by_migration IS 'For backup purpose - can be safely deleted after a while. See migration \\Chill\\Migrations\\Activity\\Version20251118124241'");
 
         $this->addSql('INSERT INTO activity_user (activity_id, user_id, by_migration)
-            SELECT id, user_id, true FROM activity
+            SELECT id, user_id, true FROM activity WHERE user_id is not null
             ON CONFLICT DO NOTHING');
     }
 

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 %}
-    {% set totalCharges = totalCharges + c.amount %}
+    {% 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 %}
-    {% set totalResources = totalResources + r.amount %}
+    {% 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

@@ -71,4 +71,11 @@ export function isEventInputCalendarRange(
   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/Components/CalendarActive.vue

@@ -7,7 +7,7 @@
         <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>
+        <span v-else>{{ invite.status }}</span>
       </template>
     </span>
     <span class="form-check-inline form-switch">
@@ -42,8 +42,6 @@
 </template>
 
 <script>
-import { mapGetters } from "vuex";
-
 export default {
   name: "CalendarActive",
   props: {

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

@@ -47,77 +47,38 @@
   </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`;
-      window
-        .fetch(url, {
-          method: "POST",
-        })
-        .then((r: Response) => {
-          if (!r.ok) {
-            console.error("could not confirm answer", newStatus);
-            return;
-          }
-          console.log("answer sent", newStatus);
-          this.$emit("statusChanged", newStatus);
-        });
-    },
-  },
-});
+function changeStatus(newStatus: AnswerStatus) {
+  const url = `/api/1.0/calendar/calendar/${props.calendarId}/answer/${newStatus}.json`;
+  window
+    .fetch(url, {
+      method: "POST",
+    })
+    .then((r: Response) => {
+      if (!r.ok) {
+        console.error("could not confirm answer", newStatus);
+        return;
+      }
+      emit("statusChanged", newStatus);
+    });
+}
 </script>
 
 <style scoped></style>

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

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

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

@@ -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/views/Calendar/_list.html.twig

@@ -78,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">

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/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">
@@ -75,7 +75,6 @@ import {
 import {
   StoredObject,
   StoredObjectStatusChange,
-  StoredObjectVersion,
   WopiEditButtonExecutableBeforeLeaveFunction,
 } from "../types";
 import DesktopEditButton from "ChillDocStoreAssets/vuejs/StoredObjectButton/DesktopEditButton.vue";
@@ -206,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/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,24 +41,23 @@ 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<
-    (
-      e: "addDocument",
-      {
-        stored_object_version: StoredObjectVersionCreated,
-        stored_object: StoredObject,
-        file_name: string,
-      },
-    ) => void
-  >();
+const emit = defineEmits<
+  (
+    e: "addDocument",
+    payload: {
+      stored_object_version: StoredObjectVersionCreated;
+      stored_object: StoredObject;
+      file_name: string;
+    },
+  ) => void
+>();
 
 const is_dragging: Ref<boolean> = ref(false);
 const uploading: Ref<boolean> = ref(false);
@@ -134,38 +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/DesktopEditButton.vue

@@ -1,42 +1,3 @@
-<script setup lang="ts">
-import Modal from "ChillMainAssets/vuejs/_components/Modal.vue";
-import { computed, reactive } from "vue";
-
-export interface DesktopEditButtonConfig {
-  editLink: null;
-  classes: Record<string, boolean>;
-  expirationLink: number | Date;
-}
-
-interface DesktopEditButtonState {
-  modalOpened: boolean;
-}
-
-const state: DesktopEditButtonState = reactive({ modalOpened: false });
-
-const props = defineProps<DesktopEditButtonConfig>();
-
-const buildCommand = computed<string>(
-  () => "vnd.libreoffice.command:ofe|u|" + props.editLink,
-);
-
-const editionUntilFormatted = computed<string>(() => {
-  let d;
-
-  if (props.expirationLink instanceof Date) {
-    d = props.expirationLink;
-  } else {
-    d = new Date(props.expirationLink * 1000);
-  }
-  console.log(props.expirationLink);
-
-  return new Intl.DateTimeFormat(undefined, {
-    dateStyle: "long",
-    timeStyle: "medium",
-  }).format(d);
-});
-</script>
-
 <template>
   <teleport to="body">
     <modal v-if="state.modalOpened" @close="state.modalOpened = false">
@@ -90,3 +51,41 @@ 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: string;
+  classes: Record<string, boolean>;
+  expirationLink: number | Date;
+}
+
+interface DesktopEditButtonState {
+  modalOpened: boolean;
+}
+
+const state: DesktopEditButtonState = reactive({ modalOpened: false });
+
+const props = defineProps<DesktopEditButtonConfig>();
+
+const buildCommand = computed<string>(
+  () => "vnd.libreoffice.command:ofe|u|" + props.editLink,
+);
+
+const editionUntilFormatted = computed<string>(() => {
+  let d;
+
+  if (props.expirationLink instanceof Date) {
+    d = props.expirationLink;
+  } else {
+    d = new Date(props.expirationLink * 1000);
+  }
+
+  return new Intl.DateTimeFormat(undefined, {
+    dateStyle: "long",
+    timeStyle: "medium",
+  }).format(d);
+});
+</script>

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;

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>(() => {
@@ -60,77 +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/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;
+    }
 }

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

@@ -16,6 +16,7 @@ use Chill\DocStoreBundle\Repository\AccompanyingCourseDocumentRepository;
 use Chill\DocStoreBundle\Repository\AssociatedEntityToStoredObjectInterface;
 use Chill\DocStoreBundle\Security\Authorization\AccompanyingCourseDocumentVoter;
 use Chill\DocStoreBundle\Security\Authorization\StoredObjectRoleEnum;
+use Chill\MainBundle\Repository\Workflow\EntityWorkflowAttachmentRepository;
 use Chill\MainBundle\Workflow\Helper\WorkflowRelatedEntityPermissionHelper;
 use Symfony\Component\Security\Core\Security;
 
@@ -25,8 +26,9 @@ final class AccompanyingCourseDocumentStoredObjectVoter extends AbstractStoredOb
         private readonly AccompanyingCourseDocumentRepository $repository,
         Security $security,
         WorkflowRelatedEntityPermissionHelper $workflowDocumentService,
+        EntityWorkflowAttachmentRepository $attachmentRepository,
     ) {
-        parent::__construct($security, $workflowDocumentService);
+        parent::__construct($security, $attachmentRepository, $workflowDocumentService);
     }
 
     protected function getRepository(): AssociatedEntityToStoredObjectInterface

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

@@ -16,6 +16,7 @@ use Chill\DocStoreBundle\Repository\AssociatedEntityToStoredObjectInterface;
 use Chill\DocStoreBundle\Repository\PersonDocumentRepository;
 use Chill\DocStoreBundle\Security\Authorization\PersonDocumentVoter;
 use Chill\DocStoreBundle\Security\Authorization\StoredObjectRoleEnum;
+use Chill\MainBundle\Repository\Workflow\EntityWorkflowAttachmentRepository;
 use Chill\MainBundle\Workflow\Helper\WorkflowRelatedEntityPermissionHelper;
 use Symfony\Component\Security\Core\Security;
 
@@ -25,8 +26,9 @@ class PersonDocumentStoredObjectVoter extends AbstractStoredObjectVoter
         private readonly PersonDocumentRepository $repository,
         Security $security,
         WorkflowRelatedEntityPermissionHelper $workflowDocumentService,
+        EntityWorkflowAttachmentRepository $attachmentRepository,
     ) {
-        parent::__construct($security, $workflowDocumentService);
+        parent::__construct($security, $attachmentRepository, $workflowDocumentService);
     }
 
     protected function getRepository(): AssociatedEntityToStoredObjectInterface

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

@@ -16,8 +16,11 @@ use Chill\DocStoreBundle\Repository\AssociatedEntityToStoredObjectInterface;
 use Chill\DocStoreBundle\Security\Authorization\StoredObjectRoleEnum;
 use Chill\DocStoreBundle\Security\Authorization\StoredObjectVoter\AbstractStoredObjectVoter;
 use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Workflow\Helper\WorkflowRelatedEntityPermissionHelper;
+use Chill\MainBundle\Entity\Workflow\EntityWorkflowAttachment;
+use Chill\MainBundle\Repository\Workflow\EntityWorkflowAttachmentRepository;
+use Chill\MainBundle\Workflow\Helper\WorkflowRelatedEntityPermissionHelperInterface;
 use PHPUnit\Framework\TestCase;
+use Prophecy\Argument;
 use Prophecy\PhpUnit\ProphecyTrait;
 use Symfony\Component\Security\Core\Authentication\Token\UsernamePasswordToken;
 use Symfony\Component\Security\Core\Security;
@@ -31,21 +34,31 @@ class AbstractStoredObjectVoterTest extends TestCase
 {
     use ProphecyTrait;
 
+    /**
+     * @param array<int, EntityWorkflowAttachment> $attachments
+     *
+     * @return void
+     */
     private function buildStoredObjectVoter(
         bool $canBeAssociatedWithWorkflow,
         AssociatedEntityToStoredObjectInterface $repository,
         Security $security,
-        ?WorkflowRelatedEntityPermissionHelper $workflowDocumentService = null,
+        ?WorkflowRelatedEntityPermissionHelperInterface $workflowDocumentService = null,
+        array $attachments = [],
     ): AbstractStoredObjectVoter {
+        $attachmentsRepository = $this->prophesize(EntityWorkflowAttachmentRepository::class);
+        $attachmentsRepository->findByStoredObject(Argument::type(StoredObject::class))->willReturn($attachments);
+
         // Anonymous class extending the abstract class
-        return new class ($canBeAssociatedWithWorkflow, $repository, $security, $workflowDocumentService) extends AbstractStoredObjectVoter {
+        return new class ($canBeAssociatedWithWorkflow, $repository, $security, $attachmentsRepository->reveal(), $workflowDocumentService) extends AbstractStoredObjectVoter {
             public function __construct(
                 private readonly bool $canBeAssociatedWithWorkflow,
                 private readonly AssociatedEntityToStoredObjectInterface $repository,
                 Security $security,
-                ?WorkflowRelatedEntityPermissionHelper $workflowDocumentService = null,
+                EntityWorkflowAttachmentRepository $attachmentRepository,
+                WorkflowRelatedEntityPermissionHelperInterface $workflowDocumentService,
             ) {
-                parent::__construct($security, $workflowDocumentService);
+                parent::__construct($security, $attachmentRepository, $workflowDocumentService);
             }
 
             protected function attributeToRole($attribute): string
@@ -72,28 +85,29 @@ class AbstractStoredObjectVoterTest extends TestCase
 
     public function testSupportsOnAttribute(): void
     {
-        $voter = $this->buildStoredObjectVoter(false, new DummyRepository(new \stdClass()), $this->prophesize(Security::class)->reveal(), null);
+        $entityWorkflowService = $this->prophesize(WorkflowRelatedEntityPermissionHelperInterface::class);
+
+        $voter = $this->buildStoredObjectVoter(false, new DummyRepository(new \stdClass()), $this->prophesize(Security::class)->reveal(), $entityWorkflowService->reveal());
 
         self::assertTrue($voter->supports(StoredObjectRoleEnum::SEE, new StoredObject()));
 
-        $voter = $this->buildStoredObjectVoter(false, new DummyRepository(new User()), $this->prophesize(Security::class)->reveal(), null);
+        $voter = $this->buildStoredObjectVoter(false, new DummyRepository(new User()), $this->prophesize(Security::class)->reveal(), $entityWorkflowService->reveal());
 
         self::assertFalse($voter->supports(StoredObjectRoleEnum::SEE, new StoredObject()));
 
-        $voter = $this->buildStoredObjectVoter(false, new DummyRepository(null), $this->prophesize(Security::class)->reveal(), null);
+        $voter = $this->buildStoredObjectVoter(false, new DummyRepository(null), $this->prophesize(Security::class)->reveal(), $entityWorkflowService->reveal());
 
         self::assertFalse($voter->supports(StoredObjectRoleEnum::SEE, new StoredObject()));
     }
 
     /**
-     * @dataProvider dataProviderVoteOnAttributeWithStoredObjectPermission
+     * @dataProvider dataProviderVoteOnAttributeWithWorkflow
      */
-    public function testVoteOnAttributeWithStoredObjectPermission(
+    public function testVoteOnAttributeWithWorkflow(
         StoredObjectRoleEnum $attribute,
         bool $expected,
         bool $isGrantedRegularPermission,
         string $isGrantedWorkflowPermission,
-        string $isGrantedStoredObjectAttachment,
     ): void {
         $storedObject = new StoredObject();
         $repository = new DummyRepository($related = new \stdClass());
@@ -102,31 +116,28 @@ class AbstractStoredObjectVoterTest extends TestCase
         $security = $this->prophesize(Security::class);
         $security->isGranted('SOME_ROLE', $related)->willReturn($isGrantedRegularPermission);
 
-        $workflowRelatedEntityPermissionHelper = $this->prophesize(WorkflowRelatedEntityPermissionHelper::class);
+        $workflowRelatedEntityPermissionHelper = $this->prophesize(WorkflowRelatedEntityPermissionHelperInterface::class);
 
         $security = $this->prophesize(Security::class);
         $security->isGranted('SOME_ROLE', $related)->willReturn($isGrantedRegularPermission);
 
+        $attachementRepository = $this->prophesize(EntityWorkflowAttachmentRepository::class);
+        $attachementRepository->findByStoredObject($storedObject)->willReturn([]);
+
         if (StoredObjectRoleEnum::SEE === $attribute) {
-            $workflowRelatedEntityPermissionHelper->isAllowedByWorkflowForReadOperation($storedObject)
-                ->shouldBeCalled()
-                ->willReturn($isGrantedStoredObjectAttachment);
             $workflowRelatedEntityPermissionHelper->isAllowedByWorkflowForReadOperation($related)
                 ->willReturn($isGrantedWorkflowPermission);
         } elseif (StoredObjectRoleEnum::EDIT === $attribute) {
-            $workflowRelatedEntityPermissionHelper->isAllowedByWorkflowForWriteOperation($storedObject)
-                ->shouldBeCalled()
-                ->willReturn($isGrantedStoredObjectAttachment);
             $workflowRelatedEntityPermissionHelper->isAllowedByWorkflowForWriteOperation($related)
                 ->willReturn($isGrantedWorkflowPermission);
         } else {
             throw new \LogicException('Invalid attribute for StoredObjectVoter');
         }
 
-        $storedObjectVoter = new class ($repository, $workflowRelatedEntityPermissionHelper->reveal(), $security->reveal()) extends AbstractStoredObjectVoter {
-            public function __construct(private $repository, $helper, $security)
+        $storedObjectVoter = new class ($repository, $workflowRelatedEntityPermissionHelper->reveal(), $security->reveal(), $attachementRepository->reveal()) extends AbstractStoredObjectVoter {
+            public function __construct(private $repository, $helper, $security, EntityWorkflowAttachmentRepository $attachmentRepository)
             {
-                parent::__construct($security, $helper);
+                parent::__construct($security, $attachmentRepository, $helper);
             }
 
             protected function getRepository(): AssociatedEntityToStoredObjectInterface
@@ -155,96 +166,64 @@ class AbstractStoredObjectVoterTest extends TestCase
         self::assertEquals($expected, $actual);
     }
 
-    public static function dataProviderVoteOnAttributeWithStoredObjectPermission(): iterable
+    public static function dataProviderVoteOnAttributeWithWorkflow(): iterable
     {
         foreach (['read' => StoredObjectRoleEnum::SEE, 'write' => StoredObjectRoleEnum::EDIT] as $action => $attribute) {
             yield 'Not related to any workflow nor attachment ('.$action.')' => [
                 $attribute,
                 true,
                 true,
-                WorkflowRelatedEntityPermissionHelper::ABSTAIN,
-                WorkflowRelatedEntityPermissionHelper::ABSTAIN,
+                WorkflowRelatedEntityPermissionHelperInterface::ABSTAIN,
             ];
 
             yield 'Not related to any workflow nor attachment (refuse) ('.$action.')' => [
                 $attribute,
                 false,
                 false,
-                WorkflowRelatedEntityPermissionHelper::ABSTAIN,
-                WorkflowRelatedEntityPermissionHelper::ABSTAIN,
+                WorkflowRelatedEntityPermissionHelperInterface::ABSTAIN,
             ];
 
             yield 'Is granted by a workflow takes precedence (workflow) ('.$action.')' => [
                 $attribute,
                 false,
                 true,
-                WorkflowRelatedEntityPermissionHelper::FORCE_DENIED,
-                WorkflowRelatedEntityPermissionHelper::ABSTAIN,
+                WorkflowRelatedEntityPermissionHelperInterface::FORCE_DENIED,
             ];
 
             yield 'Is granted by a workflow takes precedence (stored object) ('.$action.')' => [
                 $attribute,
                 false,
-                true,
-                WorkflowRelatedEntityPermissionHelper::ABSTAIN,
-                WorkflowRelatedEntityPermissionHelper::FORCE_DENIED,
-            ];
-
-            yield 'Is granted by a workflow takes precedence (workflow) although grant ('.$action.')' => [
-                $attribute,
                 false,
-                true,
-                WorkflowRelatedEntityPermissionHelper::FORCE_DENIED,
-                WorkflowRelatedEntityPermissionHelper::FORCE_GRANT,
+                WorkflowRelatedEntityPermissionHelperInterface::ABSTAIN,
             ];
 
             yield 'Is granted by a workflow takes precedence (stored object) although grant ('.$action.')' => [
                 $attribute,
-                false,
                 true,
-                WorkflowRelatedEntityPermissionHelper::FORCE_GRANT,
-                WorkflowRelatedEntityPermissionHelper::FORCE_DENIED,
+                true,
+                WorkflowRelatedEntityPermissionHelperInterface::FORCE_GRANT,
             ];
 
             yield 'Is granted by a workflow takes precedence (initially refused) (workflow) although grant ('.$action.')' => [
                 $attribute,
                 false,
                 false,
-                WorkflowRelatedEntityPermissionHelper::FORCE_DENIED,
-                WorkflowRelatedEntityPermissionHelper::FORCE_GRANT,
+                WorkflowRelatedEntityPermissionHelperInterface::FORCE_DENIED,
             ];
 
             yield 'Is granted by a workflow takes precedence (initially refused) (stored object) although grant ('.$action.')' => [
-                $attribute,
-                false,
-                false,
-                WorkflowRelatedEntityPermissionHelper::FORCE_GRANT,
-                WorkflowRelatedEntityPermissionHelper::FORCE_DENIED,
-            ];
-
-            yield 'Force grant inverse the regular permission (workflow) ('.$action.')' => [
                 $attribute,
                 true,
                 false,
-                WorkflowRelatedEntityPermissionHelper::FORCE_GRANT,
-                WorkflowRelatedEntityPermissionHelper::ABSTAIN,
+                WorkflowRelatedEntityPermissionHelperInterface::FORCE_GRANT,
             ];
-
-            yield 'Force grant inverse the regular permission (so) ('.$action.')' => [
-                $attribute,
-                true,
-                false,
-                WorkflowRelatedEntityPermissionHelper::ABSTAIN,
-                WorkflowRelatedEntityPermissionHelper::FORCE_GRANT,
-            ];
-
         }
     }
 
     /**
-     * @dataProvider dataProviderVoteOnAttributeWithoutStoredObjectPermission
+     * @dataProvider dataProviderVoteOnAttribute
      */
-    public function testVoteOnAttributeWithoutStoredObjectPermission(
+    public function testVoteOnAttribute(
         StoredObjectRoleEnum $attribute,
         bool $expected,
         bool $canBeAssociatedWithWorkflow,
@@ -260,10 +239,7 @@ class AbstractStoredObjectVoterTest extends TestCase
         $security = $this->prophesize(Security::class);
         $security->isGranted('SOME_ROLE', $related)->willReturn($isGrantedRegularPermission);
 
-        $workflowRelatedEntityPermissionHelper = $this->prophesize(WorkflowRelatedEntityPermissionHelper::class);
-
-        $workflowRelatedEntityPermissionHelper->isAllowedByWorkflowForReadOperation($storedObject)->willReturn(WorkflowRelatedEntityPermissionHelper::ABSTAIN);
-        $workflowRelatedEntityPermissionHelper->isAllowedByWorkflowForWriteOperation($storedObject)->willReturn(WorkflowRelatedEntityPermissionHelper::ABSTAIN);
+        $workflowRelatedEntityPermissionHelper = $this->prophesize(WorkflowRelatedEntityPermissionHelperInterface::class);
 
         if (null !== $isGrantedWorkflowPermissionRead) {
             $workflowRelatedEntityPermissionHelper->isAllowedByWorkflowForReadOperation($related)
@@ -283,27 +259,155 @@ class AbstractStoredObjectVoterTest extends TestCase
         self::assertEquals($expected, $voter->voteOnAttribute($attribute, $storedObject, $token), $message);
     }
 
-    public static function dataProviderVoteOnAttributeWithoutStoredObjectPermission(): iterable
+    public static function dataProviderVoteOnAttribute(): iterable
     {
         // not associated on a workflow
         yield [StoredObjectRoleEnum::SEE, true, false, true, null, null, 'not associated on a workflow, granted by regular access, must not rely on helper'];
         yield [StoredObjectRoleEnum::SEE, false, false, false, null, null, 'not associated on a workflow, denied by regular access, must not rely on helper'];
 
         // associated on a workflow, read operation
-        yield [StoredObjectRoleEnum::SEE, true, true, true, WorkflowRelatedEntityPermissionHelper::FORCE_GRANT, null, 'associated on a workflow, read by regular, force grant by workflow, ask for read, should be granted'];
-        yield [StoredObjectRoleEnum::SEE, true, true, true, WorkflowRelatedEntityPermissionHelper::ABSTAIN, null, 'associated on a workflow, read by regular, abstain by workflow, ask for read, should be granted'];
-        yield [StoredObjectRoleEnum::SEE, false, true, true, WorkflowRelatedEntityPermissionHelper::FORCE_DENIED, null, 'associated on a workflow, read by regular, force grant by workflow, ask for read, should be denied'];
-        yield [StoredObjectRoleEnum::SEE, true, true, false, WorkflowRelatedEntityPermissionHelper::FORCE_GRANT, null, 'associated on a workflow, denied read by regular, force grant by workflow, ask for read, should be granted'];
-        yield [StoredObjectRoleEnum::SEE, false, true, false, WorkflowRelatedEntityPermissionHelper::ABSTAIN, null, 'associated on a workflow, denied read by regular, abstain by workflow, ask for read, should be granted'];
-        yield [StoredObjectRoleEnum::SEE, false, true, false, WorkflowRelatedEntityPermissionHelper::FORCE_DENIED, null, 'associated on a workflow, denied read by regular, force grant by workflow, ask for read, should be denied'];
+        yield [StoredObjectRoleEnum::SEE, true, true, true, WorkflowRelatedEntityPermissionHelperInterface::FORCE_GRANT, null, 'associated on a workflow, read by regular, force grant by workflow, ask for read, should be granted'];
+        yield [StoredObjectRoleEnum::SEE, true, true, true, WorkflowRelatedEntityPermissionHelperInterface::ABSTAIN, null, 'associated on a workflow, read by regular, abstain by workflow, ask for read, should be granted'];
+        yield [StoredObjectRoleEnum::SEE, false, true, true, WorkflowRelatedEntityPermissionHelperInterface::FORCE_DENIED, null, 'associated on a workflow, read by regular, force grant by workflow, ask for read, should be denied'];
+        yield [StoredObjectRoleEnum::SEE, true, true, false, WorkflowRelatedEntityPermissionHelperInterface::FORCE_GRANT, null, 'associated on a workflow, denied read by regular, force grant by workflow, ask for read, should be granted'];
+        yield [StoredObjectRoleEnum::SEE, false, true, false, WorkflowRelatedEntityPermissionHelperInterface::ABSTAIN, null, 'associated on a workflow, denied read by regular, abstain by workflow, ask for read, should be granted'];
+        yield [StoredObjectRoleEnum::SEE, false, true, false, WorkflowRelatedEntityPermissionHelperInterface::FORCE_DENIED, null, 'associated on a workflow, denied read by regular, force grant by workflow, ask for read, should be denied'];
 
         // association on a workflow, write operation
-        yield [StoredObjectRoleEnum::EDIT, true, true, true, null, WorkflowRelatedEntityPermissionHelper::FORCE_GRANT, 'associated on a workflow, write by regular, force grant by workflow, ask for write, should be granted'];
-        yield [StoredObjectRoleEnum::EDIT, true, true, true, null, WorkflowRelatedEntityPermissionHelper::ABSTAIN, 'associated on a workflow, write by regular, abstain by workflow, ask for write, should be granted'];
-        yield [StoredObjectRoleEnum::EDIT, false, true, true, null, WorkflowRelatedEntityPermissionHelper::FORCE_DENIED, 'associated on a workflow, write by regular, force grant by workflow, ask for write, should be denied'];
-        yield [StoredObjectRoleEnum::EDIT, true, true, false, null, WorkflowRelatedEntityPermissionHelper::FORCE_GRANT, 'associated on a workflow, denied write by regular, force grant by workflow, ask for write, should be granted'];
-        yield [StoredObjectRoleEnum::EDIT, false, true, false, null, WorkflowRelatedEntityPermissionHelper::ABSTAIN, 'associated on a workflow, denied write by regular, abstain by workflow, ask for write, should be granted'];
-        yield [StoredObjectRoleEnum::EDIT, false, true, false, null, WorkflowRelatedEntityPermissionHelper::FORCE_DENIED, 'associated on a workflow, denied write by regular, force grant by workflow, ask for write, should be denied'];
+        yield [StoredObjectRoleEnum::EDIT, true, true, true, null, WorkflowRelatedEntityPermissionHelperInterface::FORCE_GRANT, 'associated on a workflow, write by regular, force grant by workflow, ask for write, should be granted'];
+        yield [StoredObjectRoleEnum::EDIT, true, true, true, null, WorkflowRelatedEntityPermissionHelperInterface::ABSTAIN, 'associated on a workflow, write by regular, abstain by workflow, ask for write, should be granted'];
+        yield [StoredObjectRoleEnum::EDIT, false, true, true, null, WorkflowRelatedEntityPermissionHelperInterface::FORCE_DENIED, 'associated on a workflow, write by regular, force grant by workflow, ask for write, should be denied'];
+        yield [StoredObjectRoleEnum::EDIT, true, true, false, null, WorkflowRelatedEntityPermissionHelperInterface::FORCE_GRANT, 'associated on a workflow, denied write by regular, force grant by workflow, ask for write, should be granted'];
+        yield [StoredObjectRoleEnum::EDIT, false, true, false, null, WorkflowRelatedEntityPermissionHelperInterface::ABSTAIN, 'associated on a workflow, denied write by regular, abstain by workflow, ask for write, should be granted'];
+        yield [StoredObjectRoleEnum::EDIT, false, true, false, null, WorkflowRelatedEntityPermissionHelperInterface::FORCE_DENIED, 'associated on a workflow, denied write by regular, force grant by workflow, ask for write, should be denied'];
+    }
+
+    /**
+     * @dataProvider dataProviderPrecedenceOfDirectAssociationOverWorkflowAttachments
+     */
+    public function testPrecedenceOfDirectAssociationOverWorkflowAttachments(
+        StoredObjectRoleEnum $attribute,
+        bool $expected,
+        bool $regularPermission,
+        string $directWorkflowPermission,
+        string $attachmentWorkflowPermission,
+        string $message,
+    ): void {
+        $storedObject = new StoredObject();
+        $repository = new DummyRepository($related = new \stdClass());
+        $token = new UsernamePasswordToken(new User(), 'dummy');
+
+        $security = $this->prophesize(Security::class);
+        $security->isGranted('SOME_ROLE', $related)->willReturn($regularPermission);
+
+        $workflowHelper = $this->prophesize(WorkflowRelatedEntityPermissionHelperInterface::class);
+
+        // Direct association permission
+        if (StoredObjectRoleEnum::SEE === $attribute) {
+            $workflowHelper->isAllowedByWorkflowForReadOperation($related)
+                ->willReturn($directWorkflowPermission);
+        } else {
+            $workflowHelper->isAllowedByWorkflowForWriteOperation($related)
+                ->willReturn($directWorkflowPermission);
+        }
+
+        // Attachment permission
+        $entityWorkflow = $this->prophesize(\Chill\MainBundle\Entity\Workflow\EntityWorkflow::class)->reveal();
+        $attachment = $this->prophesize(EntityWorkflowAttachment::class);
+        $attachment->getEntityWorkflow()->willReturn($entityWorkflow);
+
+        if (StoredObjectRoleEnum::SEE === $attribute) {
+            $workflowHelper->isAllowedByWorkflowForReadOperation($entityWorkflow)
+                ->willReturn($attachmentWorkflowPermission);
+        } else {
+            $workflowHelper->isAllowedByWorkflowForWriteOperation($entityWorkflow)
+                ->willReturn($attachmentWorkflowPermission);
+        }
+
+        $voter = $this->buildStoredObjectVoter(
+            true,
+            $repository,
+            $security->reveal(),
+            $workflowHelper->reveal(),
+            [$attachment->reveal()]
+        );
+
+        self::assertEquals($expected, $voter->voteOnAttribute($attribute, $storedObject, $token), $message);
+    }
+
+    public static function dataProviderPrecedenceOfDirectAssociationOverWorkflowAttachments(): iterable
+    {
+        $cases = [
+            [
+                'expected' => true,
+                'regular' => false,
+                'direct' => WorkflowRelatedEntityPermissionHelperInterface::FORCE_GRANT,
+                'attachment' => WorkflowRelatedEntityPermissionHelperInterface::FORCE_DENIED,
+                'message' => 'Direct FORCE_GRANT should win over attachment FORCE_DENIED',
+            ],
+            [
+                'expected' => false,
+                'regular' => true,
+                'direct' => WorkflowRelatedEntityPermissionHelperInterface::FORCE_DENIED,
+                'attachment' => WorkflowRelatedEntityPermissionHelperInterface::FORCE_GRANT,
+                'message' => 'Direct FORCE_DENIED should win over attachment FORCE_GRANT',
+            ],
+            [
+                'expected' => true,
+                'regular' => false,
+                'direct' => WorkflowRelatedEntityPermissionHelperInterface::FORCE_GRANT,
+                'attachment' => WorkflowRelatedEntityPermissionHelperInterface::ABSTAIN,
+                'message' => 'Direct FORCE_GRANT should win over attachment ABSTAIN',
+            ],
+            [
+                'expected' => false,
+                'regular' => true,
+                'direct' => WorkflowRelatedEntityPermissionHelperInterface::FORCE_DENIED,
+                'attachment' => WorkflowRelatedEntityPermissionHelperInterface::ABSTAIN,
+                'message' => 'Direct FORCE_DENIED should win over attachment ABSTAIN',
+            ],
+            [
+                'expected' => true,
+                'regular' => false,
+                'direct' => WorkflowRelatedEntityPermissionHelperInterface::ABSTAIN,
+                'attachment' => WorkflowRelatedEntityPermissionHelperInterface::FORCE_GRANT,
+                'message' => 'Direct ABSTAIN should let attachment FORCE_GRANT win',
+            ],
+            [
+                'expected' => false,
+                'regular' => true,
+                'direct' => WorkflowRelatedEntityPermissionHelperInterface::ABSTAIN,
+                'attachment' => WorkflowRelatedEntityPermissionHelperInterface::FORCE_DENIED,
+                'message' => 'Direct ABSTAIN should let attachment FORCE_DENIED win',
+            ],
+            [
+                'expected' => true,
+                'regular' => true,
+                'direct' => WorkflowRelatedEntityPermissionHelperInterface::ABSTAIN,
+                'attachment' => WorkflowRelatedEntityPermissionHelperInterface::ABSTAIN,
+                'message' => 'Both ABSTAIN should let regular permission (true) win',
+            ],
+            [
+                'expected' => false,
+                'regular' => false,
+                'direct' => WorkflowRelatedEntityPermissionHelperInterface::ABSTAIN,
+                'attachment' => WorkflowRelatedEntityPermissionHelperInterface::ABSTAIN,
+                'message' => 'Both ABSTAIN should let regular permission (false) win',
+            ],
+        ];
+
+        foreach ([StoredObjectRoleEnum::SEE, StoredObjectRoleEnum::EDIT] as $attribute) {
+            foreach ($cases as $case) {
+                yield sprintf('%s - %s', $attribute->name, $case['message']) => [
+                    $attribute,
+                    $case['expected'],
+                    $case['regular'],
+                    $case['direct'],
+                    $case['attachment'],
+                    $case['message'],
+                ];
+            }
+        }
     }
 }
 

src/Bundle/ChillEventBundle/DataFixtures/ORM/LoadParticipation.php

@@ -34,6 +34,7 @@ class LoadParticipation extends AbstractFixture implements OrderedFixtureInterfa
 
     public function __construct()
     {
+        mt_srand(123456789);
         $this->faker = \Faker\Factory::create('fr_FR');
     }
 
@@ -45,7 +46,7 @@ class LoadParticipation extends AbstractFixture implements OrderedFixtureInterfa
         for ($i = 0; $i < $expectedNumber; ++$i) {
             $event = (new Event())
                 ->setDate($this->faker->dateTimeBetween('-2 years', '+6 months'))
-                ->setName($this->faker->words(random_int(2, 4), true))
+                ->setName($this->faker->words(mt_rand(2, 4), true))
                 ->setType($this->getReference(LoadEventTypes::$refs[array_rand(LoadEventTypes::$refs)], EventType::class))
                 ->setCenter($center)
                 ->setCircle(
@@ -78,7 +79,7 @@ class LoadParticipation extends AbstractFixture implements OrderedFixtureInterfa
 
             /** @var Person $person */
             foreach ($people as $person) {
-                $nb = random_int(0, 3);
+                $nb = mt_rand(0, 3);
 
                 for ($i = 0; $i < $nb; ++$i) {
                     $event = $events[array_rand($events)];

src/Bundle/ChillEventBundle/DependencyInjection/ChillEventExtension.php

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

src/Bundle/ChillEventBundle/Security/Authorization/EventStoredObjectVoter.php

@@ -14,6 +14,7 @@ namespace Chill\EventBundle\Security\Authorization;
 use Chill\DocStoreBundle\Repository\AssociatedEntityToStoredObjectInterface;
 use Chill\DocStoreBundle\Security\Authorization\StoredObjectRoleEnum;
 use Chill\DocStoreBundle\Security\Authorization\StoredObjectVoter\AbstractStoredObjectVoter;
+use Chill\MainBundle\Repository\Workflow\EntityWorkflowAttachmentRepository;
 use Chill\MainBundle\Workflow\Helper\WorkflowRelatedEntityPermissionHelper;
 use Chill\EventBundle\Entity\Event;
 use Chill\EventBundle\Repository\EventRepository;
@@ -26,8 +27,9 @@ class EventStoredObjectVoter extends AbstractStoredObjectVoter
         private readonly EventRepository $repository,
         Security $security,
         WorkflowRelatedEntityPermissionHelper $workflowDocumentService,
+        EntityWorkflowAttachmentRepository $attachmentRepository,
     ) {
-        parent::__construct($security, $workflowDocumentService);
+        parent::__construct($security, $attachmentRepository, $workflowDocumentService);
     }
 
     protected function getRepository(): AssociatedEntityToStoredObjectInterface

src/Bundle/ChillJobBundle/src/Resources/translations/messages.nl.yml

@@ -189,14 +189,14 @@ crud:
         title_edit: Rapport "belemmering" bewerken
         title_delete: Belemmering verwijderen
         button_delete: Verwijderen
-        confirm_message_delete: %as_string% verwijderen?
+        confirm_message_delete: "%as_string% verwijderen?"
     cscv:
         title_new: Nieuw CV voor %person%
         title_view: CV voor %person%
         title_edit: CV bewerken
         title_delete: CV verwijderen
         button_delete: Verwijderen
-        confirm_message_delete: %as_string% verwijderen?
+        confirm_message_delete: "%as_string% verwijderen?"
         no_date: Geen datum aangegeven
         no_end_date: einddatum onbekend
         no_start_date: startdatum onbekend
@@ -206,7 +206,7 @@ crud:
         title_edit: Immersie bewerken
         title_delete: Immersie verwijderen
         button_delete: Verwijderen
-        confirm_message_delete: %as_string% verwijderen?
+        confirm_message_delete: "%as_string% verwijderen?"
     projet_prof:
         title_new: Nieuw professioneel project voor %person%
         title_view: Professioneel project voor %person%

src/Bundle/ChillMainBundle/Command/LoadAddressesFRFromBANCommand.php

@@ -31,7 +31,8 @@ class LoadAddressesFRFromBANCommand extends Command
     {
         $this->setName('chill:main:address-ref-from-ban')
             ->addArgument('departementNo', InputArgument::REQUIRED | InputArgument::IS_ARRAY, 'a list of departement numbers')
-            ->addOption('send-report-email', 's', InputOption::VALUE_REQUIRED, 'Email address where a list of unimported addresses can be send');
+            ->addOption('send-report-email', 's', InputOption::VALUE_REQUIRED, 'Email address where a list of unimported addresses can be send')
+            ->addOption('allow-remove-double-refid', 'd', InputOption::VALUE_NONE, 'Should the address importer be allowed to remove same refid in the source data, if any');
     }
 
     protected function execute(InputInterface $input, OutputInterface $output): int
@@ -40,7 +41,7 @@ class LoadAddressesFRFromBANCommand extends Command
         foreach ($input->getArgument('departementNo') as $departementNo) {
             $output->writeln('Import addresses for '.$departementNo);
 
-            $this->addressReferenceFromBAN->import($departementNo, $input->hasOption('send-report-email') ? $input->getOption('send-report-email') : null);
+            $this->addressReferenceFromBAN->import($departementNo, $input->hasOption('send-report-email') ? $input->getOption('send-report-email') : null, allowRemoveDoubleRefId: $input->hasOption('allow-remove-double-refid') ? $input->getOption('allow-remove-double-refid') : false);
         }
 
         return Command::SUCCESS;

src/Bundle/ChillMainBundle/Command/LoadAndUpdateLanguagesCommand.php

@@ -48,7 +48,7 @@ class LoadAndUpdateLanguagesCommand extends Command
     /**
      * (non-PHPdoc).
      *
-     * @see \Symfony\Component\Console\Command\Command::configure()
+     * @see Command::configure()
      */
     protected function configure()
     {
@@ -73,7 +73,7 @@ class LoadAndUpdateLanguagesCommand extends Command
     /**
      * (non-PHPdoc).
      *
-     * @see \Symfony\Component\Console\Command\Command::execute()
+     * @see Command::execute()
      */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {

src/Bundle/ChillMainBundle/Command/LoadCountriesCommand.php

@@ -51,7 +51,7 @@ class LoadCountriesCommand extends Command
     /**
      * (non-PHPdoc).
      *
-     * @see \Symfony\Component\Console\Command\Command::configure()
+     * @see Command::configure()
      */
     protected function configure()
     {
@@ -61,7 +61,7 @@ class LoadCountriesCommand extends Command
     /**
      * (non-PHPdoc).
      *
-     * @see \Symfony\Component\Console\Command\Command::execute()
+     * @see Command::execute()
      */
     protected function execute(InputInterface $input, OutputInterface $output): int
     {

src/Bundle/ChillMainBundle/Controller/PostalCodeAPIController.php

@@ -79,5 +79,7 @@ final class PostalCodeAPIController extends ApiController
 
         $qb->andWhere('e.origin = :zero')
             ->setParameter('zero', 0);
+
+        $qb->andWhere('e.deletedAt IS NULL');
     }
 }

src/Bundle/ChillMainBundle/Controller/WorkflowViewSendPublicController.php

@@ -62,15 +62,15 @@ final readonly class WorkflowViewSendPublicController
             );
         }
 
-        if (100 < $workflowSend->getViews()->count()) {
-            $this->chillLogger->info(self::LOG_PREFIX.'100 view reached, not allowed to see it again');
-            throw new AccessDeniedHttpException('100 views reached, not allowed to see it again');
+        if (30 < $workflowSend->getViews()->count()) {
+            $this->chillLogger->info(self::LOG_PREFIX.'30 view reached, not allowed to see it again');
+            throw new AccessDeniedHttpException('30 views reached, not allowed to see it again');
         }
 
         try {
             $metadata = new EntityWorkflowViewMetadataDTO(
                 $workflowSend->getViews()->count(),
-                100 - $workflowSend->getViews()->count(),
+                30 - $workflowSend->getViews()->count(),
             );
             $response = new Response(
                 $this->entityWorkflowManager->renderPublicView($workflowSend, $metadata),

src/Bundle/ChillMainBundle/DataFixtures/ORM/LoadAddressReferences.php

@@ -31,6 +31,7 @@ class LoadAddressReferences extends AbstractFixture implements ContainerAwareInt
 
     public function __construct()
     {
+        mt_srand(123456789);
         $this->faker = \Faker\Factory::create('fr_FR');
     }
 
@@ -67,7 +68,7 @@ class LoadAddressReferences extends AbstractFixture implements ContainerAwareInt
 
         $ar->setRefId($this->faker->numerify('ref-id-######'));
         $ar->setStreet($this->faker->streetName);
-        $ar->setStreetNumber((string) random_int(0, 199));
+        $ar->setStreetNumber((string) mt_rand(0, 199));
         $ar->setPoint($this->getRandomPoint());
         $ar->setPostcode($this->getReference(
             LoadPostalCodes::$refs[array_rand(LoadPostalCodes::$refs)],
@@ -88,8 +89,8 @@ class LoadAddressReferences extends AbstractFixture implements ContainerAwareInt
     {
         $lonBrussels = 4.35243;
         $latBrussels = 50.84676;
-        $lon = $lonBrussels + 0.01 * random_int(-5, 5);
-        $lat = $latBrussels + 0.01 * random_int(-5, 5);
+        $lon = $lonBrussels + 0.01 * mt_rand(-5, 5);
+        $lat = $latBrussels + 0.01 * mt_rand(-5, 5);
 
         return Point::fromLonLat($lon, $lat);
     }

src/Bundle/ChillMainBundle/DependencyInjection/ChillMainExtension.php

@@ -84,6 +84,7 @@ use Chill\MainBundle\Security\Authorization\ChillExportVoter;
 use Chill\MainBundle\Security\Authorization\EntityWorkflowVoter;
 use Misd\PhoneNumberBundle\Doctrine\DBAL\Types\PhoneNumberType;
 use Ramsey\Uuid\Doctrine\UuidType;
+use Symfony\Component\Config\Definition\Exception\InvalidConfigurationException;
 use Symfony\Component\Config\FileLocator;
 use Symfony\Component\DependencyInjection\ContainerBuilder;
 use Symfony\Component\DependencyInjection\Extension\PrependExtensionInterface;
@@ -210,6 +211,15 @@ class ChillMainExtension extends Extension implements
             $config['top_banner'] ?? []
         );
 
+        if (!in_array($config['homepage']['default_tab'], $config['homepage']['display_tabs'], true)) {
+            throw new InvalidConfigurationException('The chill_main.homepage.default_tab must be included in chill_main.homepage.display_tabs');
+        }
+
+        $container->setParameter(
+            'chill_main.homepage',
+            $config['homepage']
+        );
+
         $loader = new Loader\YamlFileLoader($container, new FileLocator(__DIR__.'/../config'));
         $loader->load('services.yaml');
         $loader->load('services/doctrine.yaml');
@@ -241,7 +251,7 @@ class ChillMainExtension extends Extension implements
         // $this->configureSms($config['short_messages'], $container, $loader);
     }
 
-    public function prepend(ContainerBuilder $container)
+    public function prepend(ContainerBuilder $container): void
     {
         $this->prependNotifierTexterWithLegacyData($container);
 
@@ -256,6 +266,7 @@ class ChillMainExtension extends Extension implements
                 'available_languages' => $config['available_languages'],
                 'add_address' => $config['add_address'],
                 'chill_main_config' => $config,
+                'homepage_widget_config' => $config['homepage'],
             ],
             'form_themes' => ['@ChillMain/Form/fields.html.twig'],
         ];

src/Bundle/ChillMainBundle/DependencyInjection/CompilerPass/SearchableServicesCompilerPass.php

@@ -20,7 +20,7 @@ class SearchableServicesCompilerPass implements CompilerPassInterface
     /**
      * (non-PHPdoc).
      *
-     * @see \Symfony\Component\DependencyInjection\Compiler\CompilerPassInterface::process()
+     * @see CompilerPassInterface::process()
      */
     public function process(ContainerBuilder $container)
     {

src/Bundle/ChillMainBundle/DependencyInjection/Configuration.php

@@ -325,6 +325,17 @@ class Configuration implements ConfigurationInterface
             ->end()
             ->end();
 
+        /* @phpstan-ignore-next-line */
+        $rootNode->children()
+            ->arrayNode('homepage')->addDefaultsIfNotSet()
+            ->children()
+            ->scalarNode('default_tab')->defaultValue('MyCustoms')->end()
+            ->arrayNode('display_tabs')
+            ->info('List of tabs to display on the homepage.')
+            ->defaultValue(['MyCustoms', 'MyNotifications', 'MyAccompanyingCourses', 'MyEvaluations', 'MyTasks', 'MyWorkflows'])
+            ->scalarPrototype()->end()
+            ->end();
+
         return $treeBuilder;
     }
 }

src/Bundle/ChillMainBundle/DependencyInjection/Widget/Factory/AbstractWidgetFactory.php

@@ -32,7 +32,7 @@ abstract class AbstractWidgetFactory implements WidgetFactoryInterface
      * Will create the definition by returning the definition from the `services.yml`
      * file (or `services.xml` or `what-you-want.yml`).
      *
-     * @see \Chill\MainBundle\DependencyInjection\Widget\Factory\WidgetFactoryInterface::createDefinition()
+     * @see WidgetFactoryInterface::createDefinition()
      */
     public function createDefinition(ContainerBuilder $containerBuilder, $place, $order, array $config)
     {

src/Bundle/ChillMainBundle/Entity/Center.php

@@ -45,6 +45,9 @@ class Center implements HasCenterInterface, \Stringable
     #[ORM\ManyToMany(targetEntity: Regroupment::class, mappedBy: 'centers')]
     private Collection $regroupments;
 
+    #[ORM\Column(type: \Doctrine\DBAL\Types\Types::TEXT, options: ['default' => ''])]
+    private string $externalId = '';
+
     /**
      * Center constructor.
      */
@@ -124,4 +127,19 @@ class Center implements HasCenterInterface, \Stringable
 
         return $this;
     }
+
+    public function getExternalId(): string
+    {
+        return $this->externalId;
+    }
+
+    public function setExternalId(string $externalId): void
+    {
+        $this->externalId = $externalId;
+    }
+
+    public function hasExternalId(): bool
+    {
+        return '' !== $this->externalId;
+    }
 }

src/Bundle/ChillMainBundle/Entity/Notification.php

@@ -215,17 +215,21 @@ class Notification implements TrackUpdateInterface
         return $this->addressees;
     }
 
+    /**
+     * @return list<User|UserGroup>
+     */
     public function getAllAddressees(): array
     {
         $allUsers = [];
 
         foreach ($this->getAddressees() as $user) {
-            $allUsers[$user->getId()] = $user;
+            $allUsers['u_'.$user->getId()] = $user;
         }
 
         foreach ($this->getAddresseeUserGroups() as $userGroup) {
+            $allUsers['ug_'.$userGroup->getId()] = $userGroup;
             foreach ($userGroup->getUsers() as $user) {
-                $allUsers[$user->getId()] = $user;
+                $allUsers['u_'.$user->getId()] = $user;
             }
         }
 

src/Bundle/ChillMainBundle/Entity/PostalCode.php

@@ -215,4 +215,14 @@ class PostalCode implements TrackUpdateInterface, TrackCreationInterface
 
         return $this;
     }
+
+    public function isDeleted(): bool
+    {
+        return null !== $this->deletedAt;
+    }
+
+    public function getDeletedAt(): ?\DateTimeImmutable
+    {
+        return $this->deletedAt;
+    }
 }

src/Bundle/ChillMainBundle/Entity/User.php

@@ -133,6 +133,9 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter
     #[ORM\Column(type: \Doctrine\DBAL\Types\Types::STRING, length: 5, nullable: false, options: ['default' => 'fr'])]
     private string $locale = 'fr';
 
+    #[ORM\ManyToMany(targetEntity: UserGroup::class, mappedBy: 'users')]
+    private Collection&Selectable $groupsAsMember;
+
     /**
      * User constructor.
      */
@@ -141,6 +144,7 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter
         $this->groupCenters = new ArrayCollection();
         $this->scopeHistories = new ArrayCollection();
         $this->jobHistories = new ArrayCollection();
+        $this->groupsAsMember = new ArrayCollection();
     }
 
     public function __toString(): string
@@ -170,6 +174,32 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter
         return $this->absenceEnd;
     }
 
+    public function addGroupAsMember(UserGroup $userGroup): self
+    {
+        if (!$this->groupsAsMember->contains($userGroup)) {
+            $this->groupsAsMember->add($userGroup);
+        }
+
+        return $this;
+    }
+
+    public function removeGroupAsMember(UserGroup $userGroup): self
+    {
+        if ($this->groupsAsMember->contains($userGroup)) {
+            $this->groupsAsMember->removeElement($userGroup);
+        }
+
+        return $this;
+    }
+
+    /**
+     * @return Selectable&Collection<int, UserGroup>
+     */
+    public function getGroupsAsMember(): Collection&Selectable
+    {
+        return $this->groupsAsMember;
+    }
+
     /**
      * Get attributes.
      *
@@ -657,6 +687,11 @@ class User implements UserInterface, \Stringable, PasswordAuthenticatedUserInter
         return true;
     }
 
+    public function isUserGroup(): bool
+    {
+        return false;
+    }
+
     private function getNotificationFlagData(string $flag): array
     {
         return $this->notificationFlags[$flag] ?? [self::NOTIF_FLAG_IMMEDIATE_EMAIL];

src/Bundle/ChillMainBundle/Entity/UserGroup.php

@@ -54,7 +54,7 @@ class UserGroup
     /**
      * @var Collection<int, User>&Selectable<int, User>
      */
-    #[ORM\ManyToMany(targetEntity: User::class)]
+    #[ORM\ManyToMany(targetEntity: User::class, inversedBy: 'groupsAsMember')]
     #[ORM\JoinTable(name: 'chill_main_user_group_user')]
     private Collection&Selectable $users;
 
@@ -129,6 +129,7 @@ class UserGroup
     {
         if (!$this->users->contains($user)) {
             $this->users[] = $user;
+            $user->addGroupAsMember($this);
         }
 
         return $this;
@@ -138,6 +139,7 @@ class UserGroup
     {
         if ($this->users->contains($user)) {
             $this->users->removeElement($user);
+            $user->removeGroupAsMember($this);
         }
 
         return $this;
@@ -256,6 +258,21 @@ class UserGroup
         return true;
     }
 
+    public function isUser(): bool
+    {
+        return false;
+    }
+
+    /**
+     * Return a locale for the userGroup.
+     *
+     * Currently hardcoded, should be replaced by a property.
+     */
+    public function getLocale(): string
+    {
+        return 'fr';
+    }
+
     public function contains(User $user): bool
     {
         return $this->users->contains($user);

src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php

@@ -394,6 +394,10 @@ class EntityWorkflow implements TrackCreationInterface, TrackUpdateInterface
 
     public function isUserInvolved(User $user): bool
     {
+        if ($this->getCreatedBy() === $user) {
+            return true;
+        }
+
         foreach ($this->getSteps() as $step) {
             if ($step->getAllDestUser()->contains($user)) {
                 return true;

src/Bundle/ChillMainBundle/Notification/Email/NotificationEmailHandlers/SendImmediateNotificationEmailHandler.php

@@ -14,7 +14,8 @@ namespace Chill\MainBundle\Notification\Email\NotificationEmailHandlers;
 use Chill\MainBundle\Notification\Email\NotificationEmailMessages\SendImmediateNotificationEmailMessage;
 use Chill\MainBundle\Notification\Email\NotificationMailer;
 use Chill\MainBundle\Repository\NotificationRepository;
-use Chill\MainBundle\Repository\UserRepository;
+use Chill\MainBundle\Repository\UserGroupRepository;
+use Chill\MainBundle\Repository\UserRepositoryInterface;
 use Psr\Log\LoggerInterface;
 use Symfony\Component\Mailer\Exception\TransportExceptionInterface;
 use Symfony\Component\Messenger\Attribute\AsMessageHandler;
@@ -24,7 +25,8 @@ readonly class SendImmediateNotificationEmailHandler
 {
     public function __construct(
         private NotificationRepository $notificationRepository,
-        private UserRepository $userRepository,
+        private UserRepositoryInterface $userRepository,
+        private UserGroupRepository $userGroupRepository,
         private NotificationMailer $notificationMailer,
         private LoggerInterface $logger,
     ) {}
@@ -36,7 +38,13 @@ readonly class SendImmediateNotificationEmailHandler
     public function __invoke(SendImmediateNotificationEmailMessage $message): void
     {
         $notification = $this->notificationRepository->find($message->getNotificationId());
-        $addressee = $this->userRepository->find($message->getAddresseeId());
+        if (null !== $message->getUserId()) {
+            $addressee = $this->userRepository->find($message->getUserId());
+        } elseif (null !== $message->getUserGroupId()) {
+            $addressee = $this->userGroupRepository->find($message->getUserGroupId());
+        } else {
+            throw new \InvalidArgumentException('Addressee not found: nor an user nor a user group');
+        }
 
         if (null === $notification) {
             $this->logger->error('[SendImmediateNotificationEmailHandler] Notification not found', [
@@ -48,10 +56,11 @@ readonly class SendImmediateNotificationEmailHandler
 
         if (null === $addressee) {
             $this->logger->error('[SendImmediateNotificationEmailHandler] Addressee not found', [
-                'addressee_id' => $message->getAddresseeId(),
+                'user_id' => $message->getUserId(),
+                'user_group_id' => $message->getUserGroupId(),
             ]);
 
-            throw new \InvalidArgumentException(sprintf('User with ID %s not found', $message->getAddresseeId()));
+            throw new \InvalidArgumentException(sprintf('User with ID %s or user group with id %s not found', $message->getUserId(), $message->getUserGroupId()));
         }
 
         try {
@@ -59,7 +68,8 @@ readonly class SendImmediateNotificationEmailHandler
         } catch (\Exception $e) {
             $this->logger->error('[SendImmediateNotificationEmailHandler] Failed to send email', [
                 'notification_id' => $message->getNotificationId(),
-                'addressee_id' => $message->getAddresseeId(),
+                'user_id' => $message->getUserId(),
+                'user_group_id' => $message->getUserGroupId(),
                 'stacktrace' => $e->getTraceAsString(),
             ]);
             throw $e;

src/Bundle/ChillMainBundle/Notification/Email/NotificationEmailMessages/SendImmediateNotificationEmailMessage.php

@@ -11,20 +11,45 @@ declare(strict_types=1);
 
 namespace Chill\MainBundle\Notification\Email\NotificationEmailMessages;
 
+use Chill\MainBundle\Entity\Notification;
+use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Entity\UserGroup;
+
 readonly class SendImmediateNotificationEmailMessage
 {
+    private int $notificationId;
+
+    private ?int $userId;
+
+    private ?int $userGroupId;
+
     public function __construct(
-        private int $notificationId,
-        private int $addresseeId,
-    ) {}
+        Notification $notification,
+        UserGroup|User $addressee,
+    ) {
+        $this->notificationId = $notification->getId();
+
+        if ($addressee instanceof User) {
+            $this->userId = $addressee->getId();
+            $this->userGroupId = null;
+        } else {
+            $this->userGroupId = $addressee->getId();
+            $this->userId = null;
+        }
+    }
 
     public function getNotificationId(): int
     {
         return $this->notificationId;
     }
 
-    public function getAddresseeId(): int
+    public function getUserId(): ?int
     {
-        return $this->addresseeId;
+        return $this->userId;
+    }
+
+    public function getUserGroupId(): ?int
+    {
+        return $this->userGroupId;
     }
 }

src/Bundle/ChillMainBundle/Notification/Email/NotificationMailer.php

@@ -14,6 +14,7 @@ namespace Chill\MainBundle\Notification\Email;
 use Chill\MainBundle\Entity\Notification;
 use Chill\MainBundle\Entity\NotificationComment;
 use Chill\MainBundle\Entity\User;
+use Chill\MainBundle\Entity\UserGroup;
 use Chill\MainBundle\Notification\Email\NotificationEmailMessages\SendImmediateNotificationEmailMessage;
 use Doctrine\ORM\Event\PostPersistEventArgs;
 use Psr\Log\LoggerInterface;
@@ -26,13 +27,13 @@ use Symfony\Contracts\Translation\TranslatorInterface;
 
 // use Symfony\Component\Translation\LocaleSwitcher;
 
-readonly class NotificationMailer
+class NotificationMailer
 {
     public function __construct(
-        private MailerInterface $mailer,
-        private LoggerInterface $logger,
-        private MessageBusInterface $messageBus,
-        private TranslatorInterface $translator,
+        private readonly MailerInterface $mailer,
+        private readonly LoggerInterface $logger,
+        private readonly MessageBusInterface $messageBus,
+        private readonly TranslatorInterface $translator,
         // private LocaleSwitcher $localeSwitcher,
     ) {}
 
@@ -59,7 +60,8 @@ readonly class NotificationMailer
             $email
                 ->to($dest->getEmail())
                 ->subject('Re: '.$comment->getNotification()->getTitle())
-                ->textTemplate('@ChillMain/Notification/email_notification_comment_persist.md.twig')
+                ->textTemplate('@ChillMain/Notification/email_notification_comment_persist.txt.twig')
+                ->htmlTemplate('@ChillMain/Notification/email_notification_comment_persist.md.twig')
                 ->context([
                     'comment' => $comment,
                     'dest' => $dest,
@@ -83,7 +85,6 @@ readonly class NotificationMailer
     public function postPersistNotification(Notification $notification, PostPersistEventArgs $eventArgs): void
     {
         $this->sendNotificationEmailsToAddressees($notification);
-        $this->sendNotificationEmailsToAddressesEmails($notification);
     }
 
     private function sendNotificationEmailsToAddressees(Notification $notification): void
@@ -100,25 +101,27 @@ readonly class NotificationMailer
             if (null === $addressee->getEmail()) {
                 continue;
             }
-
+            if ($notification->getSender() === $addressee) {
+                continue;
+            }
             $this->processNotificationForAddressee($notification, $addressee);
         }
     }
 
-    private function processNotificationForAddressee(Notification $notification, User $addressee): void
+    private function processNotificationForAddressee(Notification $notification, User|UserGroup $addressee): void
     {
         $notificationType = $notification->getType();
 
-        if ($addressee->isNotificationSendImmediately($notificationType)) {
+        if ($addressee instanceof UserGroup || $addressee->isNotificationSendImmediately($notificationType)) {
             $this->scheduleImmediateEmail($notification, $addressee);
         }
     }
 
-    private function scheduleImmediateEmail(Notification $notification, User $addressee): void
+    private function scheduleImmediateEmail(Notification $notification, User|UserGroup $addressee): void
     {
         $message = new SendImmediateNotificationEmailMessage(
-            $notification->getId(),
-            $addressee->getId()
+            $notification,
+            $addressee,
         );
 
         $this->messageBus->dispatch($message);
@@ -130,13 +133,17 @@ readonly class NotificationMailer
     }
 
     /**
-     * This method sends the email but is now called by the immediate notification email message handler.
+     * Send an email about a Notification.
+     *
+     * It is called by immediate notification email message handler:
+     *
+     * @see{\Chill\MainBundle\Notification\Email\NotificationEmailHandlers\SendImmediateNotificationEmailHandler}
      *
      * @throws TransportExceptionInterface
      */
-    public function sendEmailToAddressee(Notification $notification, User $addressee): void
+    public function sendEmailToAddressee(Notification $notification, User|UserGroup $addressee): void
     {
-        if (null === $addressee->getEmail()) {
+        if (null === $addressee->getEmail() || '' === $addressee->getEmail()) {
             return;
         }
 
@@ -149,7 +156,8 @@ readonly class NotificationMailer
             } else {
                 $email = new TemplatedEmail();
                 $email
-                    ->textTemplate('@ChillMain/Notification/email_non_system_notification_content.md.twig')
+                    ->textTemplate('@ChillMain/Notification/email_non_system_notification_content.txt.twig')
+                    ->htmlTemplate('@ChillMain/Notification/email_non_system_notification_content.md.twig')
                     ->context([
                         'notification' => $notification,
                         'dest' => $addressee,
@@ -186,7 +194,8 @@ readonly class NotificationMailer
         } else {
             $email = new TemplatedEmail();
             $email
-                ->textTemplate('@ChillMain/Notification/email_non_system_notification_content.md.twig')
+                ->textTemplate('@ChillMain/Notification/email_non_system_notification_content.txt.twig')
+                ->htmlTemplate('@ChillMain/Notification/email_non_system_notification_content.md.twig')
                 ->context([
                     'notification' => $notification,
                     'dest' => $addressee,
@@ -286,38 +295,4 @@ readonly class NotificationMailer
             throw $e;
         }
     }
-
-    private function sendNotificationEmailsToAddressesEmails(Notification $notification): void
-    {
-        foreach ($notification->getAddresseeUserGroups() as $userGroup) {
-
-            if (!$userGroup->hasEmail()) {
-                continue;
-            }
-
-            $emailAddress = $userGroup->getEmail();
-
-            $email = new TemplatedEmail();
-            $email
-                ->textTemplate('@ChillMain/Notification/email_non_system_notification_content_to_email.md.twig')
-                ->context([
-                    'notification' => $notification,
-                    'dest' => $emailAddress,
-                ]);
-
-            $email
-                ->subject($notification->getTitle())
-                ->to($emailAddress);
-
-            try {
-                $this->mailer->send($email);
-            } catch (TransportExceptionInterface $e) {
-                $this->logger->warning('[NotificationMailer] could not send an email notification', [
-                    'to' => $emailAddress,
-                    'error_message' => $e->getMessage(),
-                    'error_trace' => $e->getTraceAsString(),
-                ]);
-            }
-        }
-    }
 }

src/Bundle/ChillMainBundle/Repository/CenterRepository.php

@@ -29,6 +29,11 @@ final readonly class CenterRepository implements CenterRepositoryInterface
         return $this->repository->find($id, $lockMode, $lockVersion);
     }
 
+    public function findOneByExternalId(string $externalId): ?Center
+    {
+        return $this->repository->findOneBy(['externalId' => $externalId]);
+    }
+
     /**
      * @return Center[]
      */

src/Bundle/ChillMainBundle/Repository/CenterRepositoryInterface.php

@@ -24,4 +24,6 @@ interface CenterRepositoryInterface extends ObjectRepository
      * @return Center[]
      */
     public function findActive(): array;
+
+    public function findOneByExternalId(string $externalId): ?Center;
 }

src/Bundle/ChillMainBundle/Repository/GroupCenterRepository.php

@@ -14,9 +14,8 @@ namespace Chill\MainBundle\Repository;
 use Chill\MainBundle\Entity\GroupCenter;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
-use Doctrine\Persistence\ObjectRepository;
 
-final readonly class GroupCenterRepository implements ObjectRepository
+final readonly class GroupCenterRepository implements GroupCenterRepositoryInterface
 {
     private EntityRepository $repository;
 

src/Bundle/ChillMainBundle/Repository/GroupCenterRepositoryInterface.php

@@ -0,0 +1,40 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\MainBundle\Repository;
+
+use Chill\MainBundle\Entity\GroupCenter;
+use Doctrine\Persistence\ObjectRepository;
+
+/**
+ * @extends ObjectRepository<GroupCenter>
+ */
+interface GroupCenterRepositoryInterface extends ObjectRepository
+{
+    public function find($id, $lockMode = null, $lockVersion = null): ?GroupCenter;
+
+    /**
+     * @return GroupCenter[]
+     */
+    public function findAll(): array;
+
+    /**
+     * @param mixed|null $limit
+     * @param mixed|null $offset
+     *
+     * @return GroupCenter[]
+     */
+    public function findBy(array $criteria, ?array $orderBy = null, $limit = null, $offset = null): array;
+
+    public function findOneBy(array $criteria, ?array $orderBy = null): ?GroupCenter;
+
+    public function getClassName();
+}

src/Bundle/ChillMainBundle/Repository/NotificationRepository.php

@@ -23,7 +23,7 @@ use Doctrine\ORM\Query;
 use Doctrine\ORM\QueryBuilder;
 use Doctrine\Persistence\ObjectRepository;
 
-final class NotificationRepository implements ObjectRepository
+class NotificationRepository implements ObjectRepository
 {
     private ?Statement $notificationByRelatedEntityAndUserAssociatedStatement = null;
 

src/Bundle/ChillMainBundle/Repository/PostalCodeRepository.php

@@ -100,7 +100,9 @@ final readonly class PostalCodeRepository implements PostalCodeRepositoryInterfa
 
         $query
             ->setFromClause('chill_main_postal_code cmpc')
-            ->andWhereClause('cmpc.origin = 0');
+            ->andWhereClause('cmpc.origin = 0')
+            ->andWhereClause('cmpc.deletedAt IS NULL')
+        ;
 
         if (null !== $country) {
             $query->andWhereClause('cmpc.country_id = ?', [$country->getId()]);

src/Bundle/ChillMainBundle/Repository/UserGroupRepository.php

@@ -18,7 +18,7 @@ use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 use Symfony\Contracts\Translation\LocaleAwareInterface;
 
-final class UserGroupRepository implements UserGroupRepositoryInterface, LocaleAwareInterface
+class UserGroupRepository implements UserGroupRepositoryInterface, LocaleAwareInterface
 {
     private readonly EntityRepository $repository;
 

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

@@ -486,9 +486,15 @@ export enum HomepageTabs {
   MyWorkflows,
 }
 
+/**
+ * The configuration for homepage config.
+ *
+ * This config comes from configuration (see ChillMainBundle/DependencyInjection/Configuration or chill_main.homepage configuration
+ * in packages/config files). It goes through a twig globals, and is displayed in the homepage.
+ */
 export interface HomepageConfig {
-  defaultTab: HomepageTabs;
-  displayTabs: HomepageTabs[];
+  default_tab: HomepageTabs;
+  display_tabs: HomepageTabs[];
 }
 
 export interface TabDefinition {

src/Bundle/ChillMainBundle/Resources/public/vuejs/DownloadExport/App.vue

@@ -1,3 +1,38 @@
+<template>
+  <WaitingScreen :state="state">
+    <template v-slot:pending>
+      <p>
+        {{ trans(EXPORT_GENERATION_EXPORT_GENERATION_IS_PENDING) }}
+      </p>
+    </template>
+
+    <template v-slot:stopped>
+      <p>
+        {{ trans(EXPORT_GENERATION_TOO_MANY_RETRIES) }}
+      </p>
+    </template>
+
+    <template v-slot:failure>
+      <p>
+        {{ trans(EXPORT_GENERATION_ERROR_WHILE_GENERATING_EXPORT) }}
+      </p>
+    </template>
+
+    <template v-slot:ready>
+      <p>
+        {{ trans(EXPORT_GENERATION_EXPORT_READY) }}
+      </p>
+
+      <p v-if="storedObject !== null">
+        <document-action-buttons-group
+          :stored-object="storedObject"
+          :filename="filename"
+        ></document-action-buttons-group>
+      </p>
+    </template>
+  </WaitingScreen>
+</template>
+
 <script setup lang="ts">
 import {
   trans,
@@ -87,38 +122,3 @@ onMounted(() => {
   onObjectNewStatusCallback();
 });
 </script>
-
-<template>
-  <WaitingScreen :state="state">
-    <template v-slot:pending>
-      <p>
-        {{ trans(EXPORT_GENERATION_EXPORT_GENERATION_IS_PENDING) }}
-      </p>
-    </template>
-
-    <template v-slot:stopped>
-      <p>
-        {{ trans(EXPORT_GENERATION_TOO_MANY_RETRIES) }}
-      </p>
-    </template>
-
-    <template v-slot:failure>
-      <p>
-        {{ trans(EXPORT_GENERATION_ERROR_WHILE_GENERATING_EXPORT) }}
-      </p>
-    </template>
-
-    <template v-slot:ready>
-      <p>
-        {{ trans(EXPORT_GENERATION_EXPORT_READY) }}
-      </p>
-
-      <p v-if="storedObject !== null">
-        <document-action-buttons-group
-          :stored-object="storedObject"
-          :filename="filename"
-        ></document-action-buttons-group>
-      </p>
-    </template>
-  </WaitingScreen>
-</template>

src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/App.vue

@@ -123,7 +123,7 @@ const tabDefinitions: TabDefinition[] = [
 
 const displayedTabs = computed(() => {
   const tabs = [] as TabDefinition[];
-  for (const tabEnum of homepageConfig.value.displayTabs) {
+  for (const tabEnum of homepageConfig.value.display_tabs) {
     const def = tabDefinitions.find(
       (t) => t.key === Number(HomepageTabs[tabEnum]),
     );
@@ -132,7 +132,7 @@ const displayedTabs = computed(() => {
   return tabs.filter(Boolean);
 });
 
-const activeTab = ref(Number(HomepageTabs[homepageConfig.value.defaultTab]));
+const activeTab = ref(Number(HomepageTabs[homepageConfig.value.default_tab]));
 
 const loading = computed(() => store.state.loading);
 
@@ -152,5 +152,6 @@ onMounted(() => {
 <style scoped>
 a.nav-link {
   cursor: pointer;
+  padding: 8px;
 }
 </style>

src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyAccompanyingCourses.vue

@@ -63,7 +63,7 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, ComputedRef } from "vue";
+import { computed, ComputedRef, onMounted } from "vue";
 import { useStore } from "vuex";
 import TabTable from "./TabTable.vue";
 import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue";
@@ -82,6 +82,7 @@ import {
   CONFIDENTIAL,
   trans,
 } from "translator";
+import { HomepageTabs } from "ChillMainAssets/types";
 import { localizeDateTimeFormat } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
 
 const store = useStore();
@@ -103,6 +104,12 @@ const noResults = computed(() => {
 function getUrl(c: { id: number }): string {
   return `/fr/parcours/${c.id}`;
 }
+onMounted(() => {
+  store.dispatch("getByTab", {
+    tab: HomepageTabs.MyAccompanyingCourses,
+    param: "",
+  });
+});
 </script>
 
 <style scoped>

src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyEvaluations.vue

@@ -85,7 +85,7 @@
 </template>
 
 <script lang="ts" setup>
-import { computed } from "vue";
+import { computed, onMounted } from "vue";
 import { useStore } from "vuex";
 import TabTable from "./TabTable.vue";
 import OnTheFly from "ChillMainAssets/vuejs/OnTheFly/components/OnTheFly.vue";
@@ -112,6 +112,7 @@ import {
   trans,
 } from "translator";
 import { localizeDateTimeFormat } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
+import { HomepageTabs } from "ChillMainAssets/types";
 
 const evaluations: ComputedRef<
   PaginationResponse<AccompanyingPeriodWorkEvaluation>
@@ -150,6 +151,12 @@ function getUrl(
   }
   return "";
 }
+onMounted(() => {
+  store.dispatch("getByTab", {
+    tab: HomepageTabs.MyEvaluations,
+    param: "",
+  });
+});
 </script>
 
 <style scoped></style>

src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyNotifications.vue

@@ -44,7 +44,7 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, ComputedRef } from "vue";
+import { computed, ComputedRef, onMounted } from "vue";
 import { useStore } from "vuex";
 import TabTable from "./TabTable.vue";
 import { Notification } from "ChillPersonAssets/types";
@@ -66,6 +66,7 @@ import {
 } from "translator";
 import { PaginationResponse } from "ChillMainAssets/lib/api/apiMethods";
 import { localizeDateTimeFormat } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
+import { HomepageTabs } from "ChillMainAssets/types";
 
 const store = useStore();
 
@@ -121,6 +122,12 @@ function getEntityUrl(n: Notification): string {
       throw "notification type unknown";
   }
 }
+onMounted(() => {
+  store.dispatch("getByTab", {
+    tab: HomepageTabs.MyNotifications,
+    param: "",
+  });
+});
 </script>
 
 <style lang="scss" scoped>

src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyTasks.vue

@@ -78,7 +78,7 @@
 </template>
 
 <script lang="ts" setup>
-import { computed, ComputedRef } from "vue";
+import { computed, ComputedRef, onMounted } from "vue";
 import { useStore } from "vuex";
 import TabTable from "./TabTable.vue";
 import {
@@ -95,6 +95,7 @@ import {
 import { TasksState } from "./store/modules/homepage";
 import { Alert, Warning } from "ChillPersonAssets/types";
 import { localizeDateTimeFormat } from "ChillMainAssets/lib/localizationHelper/localizationHelper";
+import { HomepageTabs } from "ChillMainAssets/types";
 
 const store = useStore();
 
@@ -123,6 +124,12 @@ const noResultsWarning = computed(() => {
 function getUrl(t: Warning | Alert): string {
   return `/fr/task/single-task/${t.id}/show`;
 }
+onMounted(() => {
+  store.dispatch("getByTab", {
+    tab: HomepageTabs.MyTasks,
+    param: "",
+  });
+});
 </script>
 
 <style scoped>

src/Bundle/ChillMainBundle/Resources/public/vuejs/HomepageWidget/MyWorkflows.vue

@@ -11,7 +11,7 @@
 </template>
 
 <script lang="ts" setup>
-import { computed } from "vue";
+import { computed, onMounted } from "vue";
 import { useStore } from "vuex";
 import MyWorkflowsTable from "./MyWorkflowsTable.vue";
 import {
@@ -19,9 +19,16 @@ import {
   MY_WORKFLOWS_DESCRIPTION_CC,
   trans,
 } from "translator";
+import { HomepageTabs } from "ChillMainAssets/types";
 
 const store = useStore();
 
 const workflows = computed(() => store.state.homepage.workflows);
 const workflowsCc = computed(() => store.state.homepage.workflowsCc);
+onMounted(() => {
+  store.dispatch("getByTab", {
+    tab: HomepageTabs.MyWorkflows,
+    param: "",
+  });
+});
 </script>

src/Bundle/ChillMainBundle/Resources/public/vuejs/OnTheFly/components/OnTheFly.vue

@@ -115,7 +115,7 @@
   </teleport>
 </template>
 <script setup lang="ts">
-import { ref, computed, defineEmits, defineProps, useTemplateRef } from "vue";
+import { ref, computed, useTemplateRef } from "vue";
 import Modal from "ChillMainAssets/vuejs/_components/Modal.vue";
 import OnTheFlyCreate from "./Create.vue";
 import OnTheFlyPerson from "ChillPersonAssets/vuejs/_components/OnTheFly/Person.vue";
@@ -144,6 +144,7 @@ import {
 } from "translator";
 import PersonEdit from "ChillPersonAssets/vuejs/_components/OnTheFly/PersonEdit.vue";
 import ThirdPartyEdit from "ChillThirdPartyAssets/vuejs/_components/OnTheFly/ThirdPartyEdit.vue";
+import { Person } from "ChillPersonAssets/types";
 
 // Types
 type EntityType = "person" | "thirdparty";
@@ -181,7 +182,7 @@ const emit =
   defineEmits<
     (
       e: "saveFormOnTheFly",
-      payload: { type: string | undefined; data: any },
+      payload: { type: string | undefined; data: Person },
     ) => void
   >();
 
@@ -331,12 +332,12 @@ function buildLocation(
 async function saveAction() {
   if (props.type === "person") {
     const person = await castEditPerson.value?.postPerson();
-    if (null !== person) {
+    if (person) {
       emit("saveFormOnTheFly", { type: props.type, data: person });
     }
   } else if (props.type === "thirdparty") {
     const thirdParty = await castEditThirdParty.value?.postThirdParty();
-    if (null !== thirdParty) {
+    if (thirdParty) {
       emit("saveFormOnTheFly", { type: props.type, data: thirdParty });
     }
   }

src/Bundle/ChillMainBundle/Resources/public/vuejs/PickEntity/PickEntity.vue

@@ -76,14 +76,7 @@
 </template>
 
 <script lang="ts" setup>
-import {
-  ref,
-  computed,
-  defineProps,
-  defineEmits,
-  defineComponent,
-  withDefaults,
-} from "vue";
+import { ref, computed, defineComponent } from "vue";
 import AddPersons from "ChillPersonAssets/vuejs/_components/AddPersons.vue";
 import {
   Entities,
@@ -102,7 +95,6 @@ import {
   USER_CURRENT_USER,
   trans,
 } from "translator";
-import { addNewEntities } from "ChillMainAssets/types";
 
 defineComponent({
   components: {