Fix gender translation for unknown

Add gender entity

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

.changes/unreleased/Feature-20231212-154841.yaml

@@ -1,5 +0,0 @@
-kind: Feature
-body: '[DX] move async-upload-bundle features into chill-bundles'
-time: 2023-12-12T15:48:41.954970271+01:00
-custom:
-  Issue: "221"

.changes/unreleased/Fixed-20240410-103736.yaml

@@ -1,6 +0,0 @@
-kind: Fixed
-body: Fix resolving of centers for an household, which will fix in turn the access
-  control
-time: 2024-04-10T10:37:36.462484988+02:00
-custom:
-  Issue: ""

.changes/v2.18.2.md

@@ -0,0 +1,3 @@
+## v2.18.2 - 2024-04-12
+### Fixed
+* ([#250](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/250)) Postal codes import : fix the source URL and the keys to handle each record 

.changes/v2.19.0.md

@@ -0,0 +1,20 @@
+## v2.19.0 - 2024-05-14
+### Feature
+* ([#197](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/197)) Make the script which subscribe to microsoft calendars changes more tolerant to errors or missing configuration on the microsoft side
+* ([#276](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/276)) Take closing date into account when computing the geographical unit on accompanying period. When a person moved after an accompanying period is closed, the date of closing accompanying period is took into account if it is earlier than the date given by the user.
+### Fixed
+* ([#270](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/270)) Fix broken link in homepage when a evaluation from a closed acc period was present in the homepage widget
+* ([#275](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/275)) Allow the filter "filter accompanying period by geographical unit" to take period's location on address into account
+### UX
+* Form for document generation moved to the top of document list page
+* ([#266](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/266)) Event bundle: adjust certain graphical issues for better user experience
+
+
+### Traduction francophone des principaux changements
+
+- script de synchronisation des agendas de microsoft Outlook: le script est plus tolérant aux erreurs de configuration côté serveur (manque de droit d'accès);
+- dans les statistiques sur les parcours d'accompagnements, regroupement et filtre par unité géographique: lorsque la date de prise en compte de l'adresse est postérieure à la fermeture du parcours, c'est la date de fermeture du parcours qui est prise en compte (cela permet de tenir compte de la localisation de l'usager au moment de la fermeture dans le cas où celui-ci aurait déménagé par la suite);
+- sur la page d'accueil, il n'y a plus de rappel pour les évaluations pour les parcours cloturés;
+- correction du filtre "filtrer par zone géographique"
+- répétition du bouton pour générer un document en haut de la page "liste des documents", quand il y a plus de cinq documents;
+- module événement: améliorerations graphiques

.changes/v2.20.0.md

@@ -0,0 +1,21 @@
+## v2.20.0 - 2024-06-05
+### Fixed
+* ([#170](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/170)) Display agents traitants instead of accompanying period referrer in export list social actions.
+* Added translations for choices of durations (> 5 hours)
+### Feature
+* ([#145](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/145)) Allow to open documents in LibreOffice locally (need configuration within security);
+
+  This endpoint should be added to make the endpoint works properly:
+
+  ```yaml
+  security:
+      firewalls:
+          dav:
+               pattern: ^/dav
+               provider: chain_provider
+               stateless: true
+               guard:
+                   authenticators:
+                       - Chill\DocStoreBundle\Security\Guard\JWTOnDavUrlAuthenticator
+
+  ```

.changes/v2.20.1.md

@@ -0,0 +1,3 @@
+## v2.20.1 - 2024-06-05
+### Fixed
+* Do not allow StoredObjectCreated for edit and convert buttons 

.changes/v2.21.0.md

@@ -0,0 +1,31 @@
+## v2.21.0 - 2024-06-18
+### Feature
+* Add flash menu buttons in search results, to open directly a new calendar, or a new activity in an accompanying period
+* ([#122](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/122)) Improve the list of calendar in the search results: make all calendar clicable, and display a list of calendars
+* ([#282](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/282)) [export] add start date and end date on filters "filter course by referrer job" and "filter course by referrer scope"
+* ([#282](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/282)) [export] the aggregator "Group by referrer" now accept a date range.
+* ([#282](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/282)) [export] add date range on "group course by referrer's scope"
+* ([#282](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/282)) [export] add date range on "group course by referrer's jobs"
+* ([#168](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/168) In the UX, display user job and service at the time when he performs an action:
+  now, the job and service is shown:
+  * at the activity's date,
+  * at the appointment's date,
+  * when the user is marked as referrer for an accompanying period work,
+  * when the user apply a transition in a workflow,
+  * when the user updates or creates "something" ("created/updated by ... at ..."),
+  * or when he wrote a comment,
+  * …
+
+### Traduction francophone
+* Ajout d'un menu "flash" dans les résultats de recherche, pour créer un rendez-vous ou un échange dans un parcours depuis les résultats de recherche;
+* Améliore la liste des rendez-vous dans les résultats de recherche: les rendez-vous sont cliquables;
+* [exports] Ajout d'intervalles de dates pour des filtres et regroupements des parcours par référent, métier du référent, service du référent;
+* Affiche le métier et le service des utilisateurs à la date à laquelle il a exécuté une action. Le métier et le service est affiché:
+  * à la date d'un échange,
+  * au jour d'un rendez-vous,
+  * quand l'utilisateur est devenu référent d'un parcours d'accompagnement,
+  * quand il a appliqué une transition sur un workflow,
+  * quand il a mise à jour ou créé une fiche, dans les mentions "créé / mise à jour par ..., le ...",
+  * quand il a mis à jour un commentaire,
+  * …
+

.changes/v2.22.0.md

@@ -0,0 +1,6 @@
+## v2.22.0 - 2024-06-25
+### Feature
+* ([#216](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/216)) [event bundle] exports  added for the event module
+
+### Traduction francophone
+* Exports sont ajoutés pour la module événement.

.changes/v2.22.1.md

@@ -0,0 +1,5 @@
+## v2.22.1 - 2024-07-01
+### Fixed
+* Remove debug word 
+### DX
+* Add a command for reading official address DB from Luxembourg and update chill addresses 

.changes/v2.22.2.md

@@ -0,0 +1,3 @@
+## v2.22.2 - 2024-07-03
+### Fixed
+* Remove scope required for event participation stats 

.changes/v2.23.0.md

@@ -0,0 +1,30 @@
+## v2.23.0 - 2024-07-23 & 2024-07-19
+### Feature
+* ([#221](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/221)) [DX] move async-upload-bundle features into chill-bundles
+* Add job bundle (module emploi)
+* Upgrade import of address list to the last version of compiled addresses of belgian-best-address
+
+* Upgrade CKEditor and refactor configuration with use of typescript
+
+* ([#123](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/123)) Add a button to duplicate calendar ranges from a week to another one
+* [admin] filter users by active / inactive in the admin user's list
+* ([#273](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/273)) Add the possibility to mark all notifications as read
+
+
+* Handle duplicate reference id in the import of reference addresses
+* Do not update the "createdAt" column when importing postal code which does not change
+* Display filename on file upload within the UI interface
+### Fixed
+* Fix resolving of centers for an household, which will fix in turn the access control
+* Resolved type hinting error in activity list export
+* ([#271](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/271)) Take into account the acp closing date in the acp works date filter
+
+### Traduction française des principaux changements
+- Ajout d'un bouton pour dupliquer les périodes de disponibilités d'une semaine à une autre;
+- dans l'interface d'administration, filtre sur les utilisateurs actifs. Par défaut, seul les utilisateurs
+  actifs sont affichés;
+- Nouveau bouton pour indiquer toutes les notifications comme lues;
+- Améliorations sur l'import des adresses et des codes postaux;
+- Affiche le nom du fichier déposé quand on téléverse un fichier depuis le poste de travail local;
+- Agrandit l'icône du type de fichier dans l'interface de dépôt de fichier;
+- correction: tient compte de la date de fermeture du parcours dans les filtres sur les actions d'accompagnement.

.changes/v2.24.0.md

@@ -0,0 +1,3 @@
+## v2.24.0 - 2024-09-11
+### Feature
+* ([#306](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/306)) When a document is converted or downloaded in the browser, this document is removed from the browser memory after 45s. Future click on the button re-download the document. 

.changes/v3.0.0.md

@@ -0,0 +1,5 @@
+## v3.0.0 - 2024-08-26
+### Fixed
+* Fix delete action for accompanying periods in draft state 
+* Fix connection to azure when making an calendar event in chill 
+* CollectionType js fixes for remove button and adding multiple entries 

.changes/v3.1.0.md

@@ -0,0 +1,3 @@
+## v3.1.0 - 2024-08-30
+### Feature
+* Add export aggregator to aggregate activities by household + filter persons that are not part of an accompanyingperiod during a certain timeframe. 

.changes/v3.1.1.md

@@ -0,0 +1,6 @@
+## v3.1.1 - 2024-10-01
+### Fixed
+* ([#308](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/308)) Show only the current referrer in the page "show" for an accompanying period workf 
+* ([#309](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/309)) Correctly compute the grouping by referrer aggregator
+ 
+* Fixed typing of custom field long choice and custom field group 

.changes/v3.2.0.md

@@ -0,0 +1,3 @@
+## v3.2.0 - 2024-10-30
+### Feature
+* Introduce a gender entity 

.changes/v3.2.1.md

@@ -0,0 +1,4 @@
+## v3.2.1 - 2024-10-31
+### Fixed
+* Add the possibility of unknown to the gender entity 
+* Fix the fusion of person doubles by excluding accompanyingPeriod work entities to be deleted. They are moved instead. 

.changes/v3.2.2.md

@@ -0,0 +1,3 @@
+## v3.2.2 - 2024-10-31
+### Fixed
+* Fix gender translation for unknown 

.gitlab-ci.yml

@@ -138,4 +138,4 @@ release:
         - echo "running release_job"
     release:
         tag_name: '$CI_COMMIT_TAG'
-        description: "./.changes/v$CI_COMMIT_TAG.md"
+        description: "./.changes/$CI_COMMIT_TAG.md"

.php-cs-fixer.dist.php

@@ -27,6 +27,7 @@ $config
     ->setRiskyAllowed(true)
     ->setCacheFile('.cache/php-cs-fixer.cache')
     ->setUsingCache(true)
+    ->setParallelConfig(PhpCsFixer\Runner\Parallel\ParallelConfigFactory::detect())
 ;
 
 $rules = $config->getRules();

CHANGELOG.md

@@ -6,6 +6,171 @@ adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html),
 and is generated by [Changie](https://github.com/miniscruff/changie).
 
 
+## v3.2.2 - 2024-10-31
+### Fixed
+* Fix gender translation for unknown 
+
+## v3.2.1 - 2024-10-31
+### Fixed
+* Add the possibility of unknown to the gender entity 
+* Fix the fusion of person doubles by excluding accompanyingPeriod work entities to be deleted. They are moved instead. 
+
+## v3.2.0 - 2024-10-30
+### Feature
+* Introduce a gender entity 
+
+## v3.1.1 - 2024-10-01
+### Fixed
+* ([#308](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/308)) Show only the current referrer in the page "show" for an accompanying period workf 
+* ([#309](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/309)) Correctly compute the grouping by referrer aggregator
+ 
+* Fixed typing of custom field long choice and custom field group 
+
+## v3.1.0 - 2024-08-30
+### Feature
+* Add export aggregator to aggregate activities by household + filter persons that are not part of an accompanyingperiod during a certain timeframe. 
+
+## v3.0.0 - 2024-08-26
+### Fixed
+* Fix delete action for accompanying periods in draft state 
+* Fix connection to azure when making an calendar event in chill 
+* CollectionType js fixes for remove button and adding multiple entries 
+
+## v2.24.0 - 2024-09-11
+### Feature
+* ([#306](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/306)) When a document is converted or downloaded in the browser, this document is removed from the browser memory after 45s. Future click on the button re-download the document. 
+
+## v2.23.0 - 2024-07-23 & 2024-07-19
+### Feature
+* ([#221](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/221)) [DX] move async-upload-bundle features into chill-bundles
+* Add job bundle (module emploi)
+* Upgrade import of address list to the last version of compiled addresses of belgian-best-address
+
+* Upgrade CKEditor and refactor configuration with use of typescript
+
+* ([#123](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/123)) Add a button to duplicate calendar ranges from a week to another one
+* [admin] filter users by active / inactive in the admin user's list
+* ([#273](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/273)) Add the possibility to mark all notifications as read
+
+
+* Handle duplicate reference id in the import of reference addresses
+* Do not update the "createdAt" column when importing postal code which does not change
+* Display filename on file upload within the UI interface
+### Fixed
+* Fix resolving of centers for an household, which will fix in turn the access control
+* Resolved type hinting error in activity list export
+* ([#271](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/271)) Take into account the acp closing date in the acp works date filter
+
+### Traduction française des principaux changements
+- Ajout d'un bouton pour dupliquer les périodes de disponibilités d'une semaine à une autre;
+- dans l'interface d'administration, filtre sur les utilisateurs actifs. Par défaut, seul les utilisateurs
+  actifs sont affichés;
+- Nouveau bouton pour indiquer toutes les notifications comme lues;
+- Améliorations sur l'import des adresses et des codes postaux;
+- Affiche le nom du fichier déposé quand on téléverse un fichier depuis le poste de travail local;
+- Agrandit l'icône du type de fichier dans l'interface de dépôt de fichier;
+- correction: tient compte de la date de fermeture du parcours dans les filtres sur les actions d'accompagnement.
+
+## v2.22.2 - 2024-07-03
+### Fixed
+* Remove scope required for event participation stats 
+
+## v2.22.1 - 2024-07-01
+### Fixed
+* Remove debug word 
+### DX
+* Add a command for reading official address DB from Luxembourg and update chill addresses 
+
+## v2.22.0 - 2024-06-25
+### Feature
+* ([#216](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/216)) [event bundle] exports  added for the event module
+
+### Traduction francophone
+* Exports sont ajoutés pour la module événement.
+
+## v2.21.0 - 2024-06-18
+### Feature
+* Add flash menu buttons in search results, to open directly a new calendar, or a new activity in an accompanying period
+* ([#122](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/122)) Improve the list of calendar in the search results: make all calendar clicable, and display a list of calendars
+* ([#282](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/282)) [export] add start date and end date on filters "filter course by referrer job" and "filter course by referrer scope"
+* ([#282](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/282)) [export] the aggregator "Group by referrer" now accept a date range.
+* ([#282](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/282)) [export] add date range on "group course by referrer's scope"
+* ([#282](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/282)) [export] add date range on "group course by referrer's jobs"
+* ([#168](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/168) In the UX, display user job and service at the time when he performs an action:
+  now, the job and service is shown:
+  * at the activity's date,
+  * at the appointment's date,
+  * when the user is marked as referrer for an accompanying period work,
+  * when the user apply a transition in a workflow,
+  * when the user updates or creates "something" ("created/updated by ... at ..."),
+  * or when he wrote a comment,
+  * …
+
+### Traduction francophone
+* Ajout d'un menu "flash" dans les résultats de recherche, pour créer un rendez-vous ou un échange dans un parcours depuis les résultats de recherche;
+* Améliore la liste des rendez-vous dans les résultats de recherche: les rendez-vous sont cliquables;
+* [exports] Ajout d'intervalles de dates pour des filtres et regroupements des parcours par référent, métier du référent, service du référent;
+* Affiche le métier et le service des utilisateurs à la date à laquelle il a exécuté une action. Le métier et le service est affiché:
+  * à la date d'un échange,
+  * au jour d'un rendez-vous,
+  * quand l'utilisateur est devenu référent d'un parcours d'accompagnement,
+  * quand il a appliqué une transition sur un workflow,
+  * quand il a mise à jour ou créé une fiche, dans les mentions "créé / mise à jour par ..., le ...",
+  * quand il a mis à jour un commentaire,
+  * …
+
+
+## v2.20.1 - 2024-06-05
+### Fixed
+* Do not allow StoredObjectCreated for edit and convert buttons 
+
+## v2.20.0 - 2024-06-05
+### Fixed
+* ([#170](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/170)) Display agents traitants instead of accompanying period referrer in export list social actions.
+* Added translations for choices of durations (> 5 hours)
+### Feature
+* ([#145](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/145)) Allow to open documents in LibreOffice locally (need configuration within security);
+
+  This endpoint should be added to make the endpoint works properly:
+
+  ```yaml
+  security:
+      firewalls:
+          dav:
+               pattern: ^/dav
+               provider: chain_provider
+               stateless: true
+               guard:
+                   authenticators:
+                       - Chill\DocStoreBundle\Security\Guard\JWTOnDavUrlAuthenticator
+
+  ```
+
+## v2.19.0 - 2024-05-14
+### Feature
+* ([#197](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/197)) Make the script which subscribe to microsoft calendars changes more tolerant to errors or missing configuration on the microsoft side
+* ([#276](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/276)) Take closing date into account when computing the geographical unit on accompanying period. When a person moved after an accompanying period is closed, the date of closing accompanying period is took into account if it is earlier than the date given by the user.
+### Fixed
+* ([#270](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/270)) Fix broken link in homepage when a evaluation from a closed acc period was present in the homepage widget
+* ([#275](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/275)) Allow the filter "filter accompanying period by geographical unit" to take period's location on address into account
+### UX
+* Form for document generation moved to the top of document list page
+* ([#266](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/266)) Event bundle: adjust certain graphical issues for better user experience
+
+
+### Traduction francophone des principaux changements
+
+- script de synchronisation des agendas de microsoft Outlook: le script est plus tolérant aux erreurs de configuration côté serveur (manque de droit d'accès);
+- dans les statistiques sur les parcours d'accompagnements, regroupement et filtre par unité géographique: lorsque la date de prise en compte de l'adresse est postérieure à la fermeture du parcours, c'est la date de fermeture du parcours qui est prise en compte (cela permet de tenir compte de la localisation de l'usager au moment de la fermeture dans le cas où celui-ci aurait déménagé par la suite);
+- sur la page d'accueil, il n'y a plus de rappel pour les évaluations pour les parcours cloturés;
+- correction du filtre "filtrer par zone géographique"
+- répétition du bouton pour générer un document en haut de la page "liste des documents", quand il y a plus de cinq documents;
+- module événement: améliorerations graphiques
+
+## v2.18.2 - 2024-04-12
+### Fixed
+* ([#250](https://gitlab.com/Chill-Projet/chill-bundles/-/issues/250)) Postal codes import : fix the source URL and the keys to handle each record 
+
 ## v2.18.1 - 2024-03-26
 ### Fixed
 * Fix layout issue in document generation for admin (minor) 

composer.json

@@ -9,6 +9,7 @@
     ],
     "require": {
         "php": "^8.2",
+        "ext-dom": "*",
         "ext-json": "*",
         "ext-openssl": "*",
         "ext-redis": "*",
@@ -18,7 +19,6 @@
         "doctrine/doctrine-migrations-bundle": "^3.0",
         "doctrine/orm": "^2.13.0",
         "erusev/parsedown": "^1.7",
-        "graylog2/gelf-php": "^1.5",
         "knplabs/knp-menu-bundle": "^3.0",
         "knplabs/knp-time-bundle": "^1.12",
         "knpuniversity/oauth2-client-bundle": "^2.10",
@@ -42,6 +42,7 @@
         "symfony/dom-crawler": "^5.4",
         "symfony/error-handler": "^5.4",
         "symfony/event-dispatcher": "^5.4",
+        "symfony/event-dispatcher-contracts": "^2.4",
         "symfony/expression-language": "^5.4",
         "symfony/filesystem": "^5.4",
         "symfony/finder": "^5.4",
@@ -91,12 +92,12 @@
         "phpstan/phpstan": "^1.9",
         "phpstan/phpstan-deprecation-rules": "^1.1",
         "phpstan/phpstan-strict-rules": "^1.0",
-        "phpunit/phpunit": ">= 7.5",
-        "rector/rector": "^1.0.0",
+        "phpunit/phpunit": "^10.5.24",
+        "rector/rector": "^1.1.0",
         "symfony/debug-bundle": "^5.4",
         "symfony/dotenv": "^5.4",
         "symfony/maker-bundle": "^1.20",
-        "symfony/phpunit-bridge": "^5.4",
+        "symfony/phpunit-bridge": "^7.1",
         "symfony/runtime": "^5.4",
         "symfony/stopwatch": "^5.4",
         "symfony/var-dumper": "^5.4"
@@ -114,6 +115,8 @@
             "Chill\\DocGeneratorBundle\\": "src/Bundle/ChillDocGeneratorBundle",
             "Chill\\DocStoreBundle\\": "src/Bundle/ChillDocStoreBundle",
             "Chill\\EventBundle\\": "src/Bundle/ChillEventBundle",
+            "Chill\\FranceTravailApiBundle\\": "src/Bundle/ChillFranceTravailApiBundle/src",
+            "Chill\\JobBundle\\": "src/Bundle/ChillJobBundle/src",
             "Chill\\MainBundle\\": "src/Bundle/ChillMainBundle",
             "Chill\\PersonBundle\\": "src/Bundle/ChillPersonBundle",
             "Chill\\ReportBundle\\": "src/Bundle/ChillReportBundle",
@@ -148,6 +151,7 @@
     "scripts": {
         "auto-scripts": {
             "cache:clear": "symfony-cmd"
-        }
+        },
+        "php-cs-fixer": "php-cs-fixer fix --config=./.php-cs-fixer.dist.php --show-progress=none"
     }
 }

docs/source/_static/code/exports/BirthdateFilter.php

@@ -21,7 +21,7 @@ use Symfony\Component\Validator\Context\ExecutionContextInterface;
 class BirthdateFilter implements ExportElementValidatedInterface, FilterInterface
 {
     // add specific role for this filter
-    public function addRole()
+    public function addRole(): ?string
     {
         // we do not need any new role for this filter, so we return null
         return null;

docs/source/development/cronjob.rst

@@ -39,9 +39,12 @@ Implements a :code:`Chill\MainBundle\Cron\CronJobInterface`. Here is an example:
     use Chill\MainBundle\Entity\CronJobExecution;
     use DateInterval;
     use DateTimeImmutable;
+    use Symfony\Component\Clock\ClockInterface;
 
     class MyCronJob implements CronJobInterface
     {
+        function __construct(private ClockInterface $clock) {}
+
         public function canRun(?CronJobExecution $cronJobExecution): bool
         {
             // the parameter $cronJobExecution contains data about the last execution of the cronjob
@@ -56,7 +59,7 @@ Implements a :code:`Chill\MainBundle\Cron\CronJobInterface`. Here is an example:
 
             // this cron job should be executed if the last execution is greater than one day, but only during the night
 
-            $now = new DateTimeImmutable('now');
+            $now = $clock->now();
 
             return $cronJobExecution->getLastStart() < $now->sub(new DateInterval('P1D'))
                 && in_array($now->format('H'), self::ACCEPTED_HOURS, true)
@@ -69,10 +72,15 @@ Implements a :code:`Chill\MainBundle\Cron\CronJobInterface`. Here is an example:
             return 'arbitrary-and-unique-key';
         }
 
-        public function run(): void
+        public function run(array $lastExecutionData): void
         {
             // here, we execute the command
-        }
+
+            // we return execution data, which will be served for next execution
+            // this data should be easily serializable in a json column: it should contains
+            // only int, string, etc. Avoid storing object
+            return ['last-execution-id' => 0];
+       }
     }
 
 How are cron job scheduled ?

docs/source/installation/index.rst

@@ -14,6 +14,359 @@
 Installation & Usage
 ####################
 
+
+You will learn here how to install a new symfony project with chill, and configure it.
+
+Requirements
+============
+
+The installation is tested on a Debian-like linux distribution. The installation on other operating systems is not documented.
+
+You have to install the following tools on your computer:
+
+- `PHP <https://www.php.net/>`_, version 8.3+, with the following extensions: pdo_pgsql, intl, mbstring, zip, bcmath, exif, sockets, redis, ast, gd;
+- `composer <https://getcomposer.org/>`_;
+- `symfony cli <https://symfony.com/download>`_;
+- `node, we encourage you to use nvm to configure the correct version <https://github.com/nvm-sh/nvm>`_. The project contains an
+  :code:`.nvmrc` file which selects automatically the required version of node (if present).
+- `yarn <https://classic.yarnpkg.com/lang/en/docs/install/>`_. We use the version 1.22+ for now.
+- `docker and the plugin compose <https://docker.com>`_ to run the database
+
+Chill needs a redis server and a postgresql database, and a few other things like a "relatorio service" which will
+generate documents from templates. **All these things are available through docker using the plugin compose**. We do not provide
+information on how to run this without docker compose.
+
+
+Install a new project
+=====================
+
+Initialize project and dependencies
+***********************************
+
+.. code-block:: bash
+
+   symfony new --version=5.4 my_chill_project
+   cd my_chill_project
+
+We strongly encourage you to initialize a git repository at this step, to track further changes.
+
+.. code-block:: bash
+
+   # add the flex endpoints required for custom recipes
+   cat <<< "$(jq '.extra.symfony += {"endpoint": ["flex://defaults", "https://gitlab.com/api/v4/projects/57371968/repository/files/index.json/raw?ref=main"]}' composer.json)" > composer.json
+   # install chill and some dependencies
+   # TODO fix the suffix "alpha1" and replace by ^3.0.0 when version 3.0.0 will be released
+   symfony composer require chill-project/chill-bundles v3.0.0-RC3 champs-libres/wopi-lib dev-master@dev champs-libres/wopi-bundle dev-master@dev
+
+We encourage you to accept the inclusion of the "Docker configuration from recipes": this is the documented way to run the database.
+You must also accept to configure recipes from the contrib repository, unless you want to configure the bundles manually).
+
+.. code-block:: bash
+
+   # fix some configuration
+   ./post-install-chill.sh
+   # install node dependencies
+   yarn install
+   # and compile assets
+   yarn run encore production
+
+.. note::
+
+   If you encounter this error during assets compilation (:code:`yarn run encore production`) (repeated multiple times):
+
+   .. code-block:: txt
+
+      [tsl] ERROR in /tmp/chill/v1/public/bundles/chillcalendar/types.ts(2,65)
+            TS2307: Cannot find module '../../../ChillMainBundle/Resources/public/types' or its corresponding type declarations.
+
+   run:
+
+   .. code-block:: bash
+
+      rm -rf public/bundles/*
+
+   Then restart the compilation of assets (:code:```yarn run encore production```)
+
+Configure your project
+**********************
+
+You should read the configuration files in :code:`chill/config/packages` carefully, especially if you have
+custom developments. But most of the time, this should be fine.
+
+You have to configure some local variables, which are described in the :code:`.env` file. The secrets should not be stored
+in this :code:`.env` file, but instead using the `secrets management tool <https://symfony.com/doc/current/configuration/secrets.html>`_
+or in the :code:`.env.local` file, which should not be committed to the git repository.
+
+You do not need to set variables for the smtp server, redis server and relatorio server, as they are generated automatically
+by the symfony server, from the docker compose services.
+
+The only required variable is the :code:`ADMIN_PASSWORD`. You can generate a hashed and salted admin password using the command
+:code:`symfony console security:hash-password <your password> 'Symfony\Component\Security\Core\User\User'`. Then,
+you can either:
+
+- add this password to the :code:`.env.local` file, you must escape the character :code:`$`: if the generated password
+  is :code:`$2y$13$iyvJLuT4YEa6iWXyQV4/N.hNHpNG8kXlYDkkt5MkYy4FXcSwYAwmm`, your :code:`.env.local` file will be:
+
+  .. code-block:: env
+
+     ADMIN_PASSWORD=\$2y\$13\$iyvJLuT4YEa6iWXyQV4/N.hNHpNG8kXlYDkkt5MkYy4FXcSwYAwmm
+     # note: if you copy-paste the line above, the password will be "admin".
+
+- add the generated password to the secrets manager (**note**: you must add the generated hashed password to the secrets env,
+  not the password in clear text).
+
+- set up the jwt authentication bundle
+
+Some environment variables are available for the JWT authentication bundle in the :code:`.env` file. 
+
+Prepare migrations and other tools
+**********************************
+
+To continue the installation process, you will have to run migrations:
+
+.. code-block:: bash
+
+   # start databases and other services
+   docker compose up -d
+   # the first start, it may last some seconds, you can check with docker compose ps
+   # run migrations
+   symfony console doctrine:migrations:migrate
+   # setup messenger
+   symfony console messenger:setup-transports
+   # prepare some views
+   symfony console chill:db:sync-views
+   # generate jwt token, required for some api features (webdav access, ...)
+   symfony console lexik:jwt:generate-keypair
+
+.. warning::
+
+   If you encounter an error while running :code:`symfony console messenger:setup-transports`, you can set up the messenger
+   transport to redis, by adding this in the :code:`.env.local` or :code:`.env` file:
+
+   .. code-block:: env
+
+      MESSENGER_TRANSPORT_DSN=redis://${REDIS_HOST}:${REDIS_PORT}/messages
+
+Start your web server locally
+*****************************
+
+At this step, Chill will be ready to be served locally, but without any configuration. You can run the project
+locally using the `local symfony server <https://symfony.com/doc/current/setup/symfony_server.html>`_:
+
+.. code-block:: bash
+
+   # see the whole possibilities at https://symfony.com/doc/current/setup/symfony_server.html
+   symfony server:start -d
+
+
+If you need to test the instance with accounts and some basic configuration, please install the fixtures (see below).
+
+
+Add capabilities for dev
+========================
+
+If you need to add custom bundles, you can develop them in the `src/` directory, like for any other symfony project. You
+can rely on the whole chill framework, meaning there is no need to add them to the original `chill-bundles`.
+
+You will require some bundles to have the following development tools:
+
+- add fixtures
+- add profiler and debug bundle
+
+Install fixtures
+****************
+
+.. code-block:: bash
+
+   # generate fixtures for chill
+   symfony composer require --dev doctrine/doctrine-fixtures-bundle nelmio/alice
+   # now, you can generate fixtures (this will reset your database)
+   symfony console doctrine:fixtures:load
+
+This will generate user accounts, centers, and some basic configuration.
+
+The accounts created are: :code:`center a_social`, :code:`center b_social`, :code:`center a_direction`, ...  The full list is
+visible in the "users" table: :code:`docker compose exec database psql -U app -c "SELECT username FROM users"`.
+
+The password is always :code:`password`.
+
+.. warning::
+
+   The fixtures are not fully functional. See the `corresponding issue <https://gitlab.com/Chill-Projet/chill-bundles/-/issues/280>`_.
+
+Add web profiler and debugger
+*****************************
+
+.. code-block:: bash
+
+   symfony composer require --dev symfony/web-profiler-bundle symfony/debug-bundle
+
+Working on chill bundles
+************************
+
+If you plan to improve the chill-bundles repository, that's great!
+
+You will have to download chill-bundles as a git repository (and not as an archive, which is barely editable).
+
+In your :code:`composer.json` file, add these lines:
+
+.. code-block:: diff
+
+    {
+        "config": {
+   +        "preferred-install": {
+   +            "chill-project/chill-bundles": "source",
+                "*": "dist"
+   +         }
+        }
+
+Then, run :code:`symfony composer reinstall chill-project/chill-bundles` to re-install the package from source.
+
+Code style, code quality and other tools
+****************************************
+
+For development, you will also have to install:
+
+- `php-cs-fixer <https://cs.symfony.com/>`_
+
+We also encourage you to use tools like `phpstan <https://phpstan.org>`_ and `rector <https://getrector.com>`_.
+
+Commit and share your project
+=============================
+
+If multiple developers work on a project, you can commit your symfony project and share it with other people.
+
+When another developer clones your project, they will have to:
+
+- run :code:`symfony composer install` and :code:`yarn install` to install the same dependencies as the initial developer;
+- run :code:`yarn run encore production` to compile assets;
+- copy any possible variables from the :code:`.env.local` files;
+- start the docker compose stack, using :code:`docker compose`, and run migrations, set up transports, and prepare chill db views
+  (see the corresponding command above)
+
+Update
+======
+
+In order to update your app, you must update dependencies:
+
+- for chill-bundles, you can `set the last version <https://gitlab.com/Chill-Projet/chill-bundles/-/releases>`_ manually
+  in the :code:`composer.json` file, or set the version to `^3.0.0` and run :code:`symfony composer update` regularly
+- run :code:`composer update` and :code:`yarn update` to maintain your dependencies up-to-date.
+
+After each update, you must update your database schema:
+
+.. code-block:: bash
+
+   symfony console doctrine:migrations:migrate
+   symfony console chill:db:sync-views
+
+Operations
+==========
+
+Build assets
+************
+
+run those commands:
+
+.. code-block:: bash
+
+   # for production (or in dev, when you don't need to work on your assets and need some speed)
+   yarn run encore production
+   # in dev, when you wan't to reload the assets on each changes
+   yarn run encore dev --watch
+
+How to execute the console ?
+****************************
+
+.. code-block:: bash
+
+   # start the console with all required variables
+   symfony console
+   # you can add your command after that:
+   symfony console list
+
+How to generate documents
+*************************
+
+Documents are generated asynchronously by `"consuming messages" <https://symfony.com/doc/current/messenger.html#consuming-messages-running-the-worker>`_.
+
+You must generate them using a dedicated process:
+
+.. code-block:: bash
+
+   symfony console messenger:consume async priority
+
+To avoid memory issues, we encourage you to also use the :code:`--limit` parameter of the command.
+
+How to read emails sent by the program ?
+*******************************************
+
+In development, there is a built-in "mail catcher". Open it with :code:`symfony open:local:webmail`
+
+How to run cron-jobs ?
+**********************
+
+Some commands must be executed in :ref:`cron jobs <cronjob>`. To execute them:
+
+.. code-block:: bash
+
+   symfony console chill:cron-job:execute
+
+What about materialized views ?
+*******************************
+
+There are some materialized views in chill, to speed up some complex computations in the database.
+
+In order to refresh them, run a cron job or refresh them manually in your database.
+
+How to run tests for chill-bundles
+**********************************
+
+Tests reside inside the installed bundles. You must `cd` into that directory, download the required packages, and execute them from this place.
+
+**Note**: some bundles require the fixtures to be executed. See the dedicated _how-tos_.
+
+Example, for running a unit test inside `main` bundle:
+
+.. code-block:: bash
+
+   # cd into main directory
+   cd vendor/chill-project/chill-bundles
+   composer install
+   # run tests
+   bin/phpunit src/Bundle/path/to/your/test
+
+Or for running tests to check code style and php conventions with csfixer and phpstan:
+
+Troubleshooting
+===============
+
+Error `An exception has been thrown during the rendering of a template ("Asset manifest file "/var/www/app/web/build/manifest.json" does not exist.").` on first run
+********************************************************************************************************************************************************************
+
+Build assets, see above.
+
+Running in production
+=====================
+
+Currently, to run this software in production, the *state of the art* is the following :
+
+1. Run the software locally and tweak the configuration to your needs ;
+2. Build the image and store it in a private container registry.
+
+.. warning::
+
+   In production, you **must** set these variables:
+
+   * ``APP_ENV`` to ``prod``
+   * ``APP_DEBUG`` to ``false``
+
+   There are security issues if you keep the same variables as for production.
+
+
+Going further
+=============
+
 .. toctree::
    :maxdepth: 2
 
@@ -21,386 +374,3 @@ Installation & Usage
    load-addresses.rst
    prod-calendar-sms-sending.rst
    msgraph-configure.rst
-
-
-Requirements
-************
-
-- This project use `docker  <https://docker.com>`_ to be run. As a developer, use `docker-compose <https://docs.docker.com/compose/overview/>`_ to bootstrap a dev environment in a glance. You do not need any other dependencies ;
-- Make is used to automate scripts.
-
-Installation
-************
-
-If you plan to run chill in production:
-
-1. install it locally first, and check if everything is ok on your local machine;
-2. once ready, build the image from your local machine, and deploy them.
-
-If you want to develop some bundles, the first step is sufficient (until you deploy on production).
-
-
-1. Get the code
-===============
-
-Clone or download the chill-skeleton project and `cd` into the main directory.
-
-
-.. code-block:: bash
-
-   git clone https://gitea.champs-libres.be/Chill-project/chill-skeleton-basic.git
-   cd chill-skeleton-basic
-
-
-As a developer, the code will stay on your computer and will be executed in docker container. To avoid permission problem, the code should be run with the same uid/gid from your current user. This is why we get your current user id with the command ``id -u`` in each following scripts.
-
-2. Prepare composer to download the sources
-===========================================
-
-As you are running in dev, you must configure an auth token for getting the source code.
-
-.. warning
-
-   If you skip this part, the code will be downloaded from dist instead of source (with git repository). You will probably replace the source manually, but the next time you will run ```composer update```, your repository will be replaced and you might loose something.
-
-1. Create a personal access token from https://gitlab.com/-/profile/personal_access_tokens, with the `read_api` scope.
-2. add a file called ```.composer/auth.json``` with this content:
-
-   .. code-block:: json
-
-      {
-        "gitlab-token": {
-            "gitlab.com": "glXXX-XXXXXXXXXXXXXXXXXXXX"
-        }
-      }
-
-2. Prepare your variables and environment
-=========================================
-
-Copy ```docker-compose.override.dev.yml``` into ```docker-compose.override.yml```
-
-.. code-block:: bash
-
-   cp docker-compose.override.dev.template.yml docker-compose.override.yml
-
-2. Prepare your variables and docker-compose
-============================================
-
-Have a look at the variable in ``.env`` and check if you need to adapt them. If they do not adapt with your need, or if some are missing:
-
-1. copy the file as ``.env.local``: ``cp .env .env.local``
-2. you may replace some variables inside ``.env``
-
-Prepare also you docker-compose installation, and adapt it to your needs:
-
-1. If you plan to deploy on dev, copy the file ``docker-compose.override.dev.template.yml`` to ``docker-compose.override.yml``.
-2. adapt to your needs.
-
-
-**Note**: If you intend to use the bundle ``Chill-Doc-Store``, you will need to configure and install an openstack object storage container with temporary url middleware. You will have to configure `secret keys <https://docs.openstack.org/swift/latest/api/temporary_url_middleware.html#secret-keys>`_.
-
-3. Run the bootstrap script
-===========================
-
-This script can be run using `make`
-
-.. code-block:: bash
-
-   make init
-
-This script will :
-
-1. force docker-compose to, eventually, pull the base images and build the image used by this project ;
-2. run an install script to download `composer <https://getcomposer.org>`_ ;
-3. install the php dependencies
-4. build assets
-
-.. warning::
-
-   The script will work only if the binary ``docker-compose`` is located into your ``PATH``. If you use ``compose`` as a docker plugin,
-   you can simulate this binary by creating this file at (for instance), ``/usr/local/bin/docker-compose`` (and run ``chmod +x /usr/local/bin/docker-compose``):
-
-   .. code-block:: bash
-
-      #!/bin/bash
-
-      /usr/bin/docker compose "$@"
-
-
-.. note::
-
-   In some cases it can happen that an old image (chill_base_php82 or chill_php82) stored in the docker cache will make the script fail. To solve this problem you have to delete the image and the container, before the make init :
-
-    .. code-block:: bash
-
-       docker-compose images php
-       docker rmi -f chill_php82:prod
-       docker-compose rm php
-
-
-4. Start the project
-====================
-
-.. code-block:: bash
-
-   docker-compose up
-
-**On the first run** (and after each upgrade), you must execute *post update commands* and run database migrations. With a container up and running, execute the following commands:
-
-.. code-block:: bash
-
-   # mount into to container
-   ./docker-php.sh
-   bin/console chill:db:sync-views
-   # and load fixtures
-   bin/console doctrine:migrations:migrate
-
-
-Chill will be available at ``http://localhost:8001.`` Currently, there isn't any user or data. To add fixtures, run
-
-.. code-block:: bash
-
-   # mount into to container
-   ./docker-php.sh
-   # and load fixtures (do not this for production)
-   bin/console doctrine:fixtures:load --purge-with-truncate
-
-There are several users available:
-
-- ``center a_social``
-- ``center b_social``
-
-The password is always ``password``.
-
-Now, read `Operations` below. For running in production, read `prod_`.
-
-
-Operations
-**********
-
-Build assets
-============
-
-run those commands:
-
-.. code-block:: bash
-
-   make build-assets
-
-How to execute the console ?
-============================
-
-.. code-block:: bash
-
-   # if a container is running
-   ./docker-php.sh
-   # if not
-   docker-compose run --user $(id -u) php bin/console
-
-How to create the database schema (= run migrations) ?
-======================================================
-
-.. code-block:: bash
-
-   # if a container is running
-   ./docker-php.sh
-   bin/console doctrine:migrations:migrate
-   bin/console chill:db:sync-views
-   # if not
-   docker-compose run --user $(id -u) php bin/console doctrine:migrations:migrate
-   docker-compose run --user $(id -u) php bin/console chill:db:sync-views
-
-
-How to read the email sent by the program ?
-===========================================
-
-Go at ``http://localhost:8005`` and you should have access to mailcatcher.
-
-In case of you should click on a link in the email, be aware that you should remove the "s" from https.
-
-How to load fixtures ? (development mode only)
-==============================================
-
-.. code-block:: bash
-
-   # if a container is running
-   ./docker-php.sh
-   bin/console doctrine:fixtures:load
-   # if not
-   docker-compose run --user $(id -u) php bin/console doctrine:fixtures:load
-
-How to open a terminal in the project
-=====================================
-
-.. code-block:: bash
-
-   # if a container is running
-   ./docker-php.sh
-   # if not
-   docker-compose run --user $(id -u) php /bin/bash
-
-How to run cron-jobs ?
-======================
-
-Some command must be executed in :ref:`cron jobs <cronjob>`. To execute them:
-
-.. code-block:: bash
-
-   # if a container is running
-   ./docker-php.sh
-   bin/console chill:cron-job:execute
-   # some of them are executed only during the night. So, we have to force the execution during the day:
-   bin/console chill:cron-job:execute 'name-of-the-cron'
-   # if not
-   docker-compose run --user $(id -u) php bin/console chill:cron-job:execute
-   # some of them are executed only during the night. So, we have to force the execution during the day:
-   docker-compose run --user $(id -u) php bin/console chill:cron-job:execute 'name-of-the-cron'
-
-How to run composer ?
-=====================
-
-.. code-block:: bash
-
-   # if a container is running
-   ./docker-php.sh
-   composer
-   # if not
-   docker-compose run --user $(id -u) php composer
-
-How to access to PGADMIN ?
-==========================
-
-Pgadmin is installed with docker-compose, and is available **only if you uncomment the appropriate lines into ``docker-compose.override.yml``.
-
-You can access it at ``http://localhost:8002``.
-
-Credentials:
-
-- login: from the variable you set into ``docker-composer.override.yml``
-- password: same :-)
-
-How to run tests ?
-==================
-
-Tests reside inside the installed bundles. You must `cd` into that directory, download the required packages, and execute them from this place.
-
-**Note**: some bundle require the fixture to be executed. See the dedicated _how-tos_.
-
-Exemple, for running unit test inside `main` bundle:
-
-.. code-block:: bash
-
-   # mount into the php image
-   ./docker-php.sh
-   # cd into main directory
-   cd vendor/chill-project/chill-bundles
-   # download deps
-   git submodule init
-   git submodule update
-   composer install
-   # run tests
-   bin/phpunit src/Bundle/path/to/your/test
-
-Or for running tests to check code style and php conventions with csfixer and phpstan:
-
-.. code-block:: bash
-
-    # run code style fixer
-    bin/grumphp run --tasks=phpcsfixer
-    # run phpstan
-    bin/grumphp run --tasks=phpstan
-
-
-.. note::
-
-    To avoid phpstan block your commits:
-
-    .. code-block:: bash
-
-        git commit -n ...
-
-    To avoid phpstan block your commits permanently:
-
-    .. code-block:: bash
-
-        ./bin/grumphp git:deinit
-
-How to run webpack interactively
-================================
-
-Executing :code:`bash docker-node.sh` will open a terminal in a node container, with volumes mounted.
-
-How to switch the branch for chill-bundles, and get new dependencies
-====================================================================
-
-During development, you will switch to new branches for chill-bundles. As long as the dependencies are equals, this does not cause any problem. But sometimes, a new branch introduces a new dependency, and you must download it.
-
-.. warning::
-
-   Ensure that you have gitlab-token ready before updating your branches. See above.
-
-In order to do that without pain, use those steps:
-
-0. Ensuire you have a token, set
-1. at the app's root, update the ``composer.json`` to your current branch:
-
-.. code-block:: json
-
-   {
-      "require": {
-          "chill-bundles": "dev-<my-branch>@dev"
-   }
-
-2. mount into the php container (``./docker-php.sh``), and run ``composer update``
-
-Error `An exception has been thrown during the rendering of a template ("Asset manifest file "/var/www/app/web/build/manifest.json" does not exist.").` on first run
-====================================================================================================================================================================
-
-Run :code:`make build-assets`
-
-Running in production
-*********************
-
-Currently, to run this software in production, the *state of the art* is the following :
-
-1. Run the software locally and tweak the configuration to your needs ;
-2. Build the image and store them into a private container registry. This can be done using :code:`make build-and-push-image`.
-
-   To be sure to target the correct container registry, you have to adapt the image names into your ``docker-compose.override.yml`` file.
-3. Push the image on your registry, or upload them to the destination machine using ``docker image save`` and ``docker image load``.
-3. Run the image on your production server, using docker-compose or eventually docker stack. You have to customize the variable set in docker-compose.
-
-   See also the :ref:`running-production-tips-and-tricks` below.
-
-.. warning::
-
-   In production, you **must** set those variables:
-
-   * ``APP_ENV`` to ``prod``
-   * ``APP_DEBUG`` to ``false``
-
-   There are security issues if you keep the same variable than for production.
-
-
-.. _running-production-tips-and-tricks:
-
-Tips and tricks
-===============
-
-Operation on database (backups, running custom sql, replication) are easier to set when run outside of a container. If you run into a container, take care of the volume where data are stored.
-
-The PHP sessions are stored inside redis. This is useful if you distribute the traffic amongst different php server: they will share same sessions if a request goes into a different instance of the container.
-
-When the PHP servers are shared across multiple instances, take care that some data is stored into redis: the same redis server should be reachable by all instances.
-
-It is worth having an eye on the configuration of logstash container.
-
-
-Design principles
-*****************
-
-Why the DB URL is also set in environment, and not in .env file ?
-=================================================================
-
-Because, at startup, a script does check the db is up and, if not, wait for a couple of seconds before running ``entrypoint.sh``. For avoiding double configuration, the configuration of the PHP app takes his configuration from environment also (and it will be standard in future releases, with symfony 4.0).
-

docs/source/installation/load-addresses.rst

@@ -8,6 +8,16 @@ Chill can store a list of geolocated address references, which are used to sugge
 
 Those addresses may be load from a dedicated source.
 
+Countries
+=========
+
+In order to load addresses into the chill application we first have to make sure that a list of countries is present.
+To import the countries run the following command.
+
+.. code-block:: bash
+
+    bin/console chill:main:countries:populate
+
 In France
 =========
 

package.json

@@ -6,15 +6,16 @@
     "@apidevtools/swagger-cli": "^4.0.4",
     "@babel/core": "^7.20.5",
     "@babel/preset-env": "^7.20.2",
-    "@ckeditor/ckeditor5-build-classic": "^35.3.2",
-    "@ckeditor/ckeditor5-dev-utils": "^31.1.13",
+    "@ckeditor/ckeditor5-build-classic": "^41.4.2",
+    "@ckeditor/ckeditor5-dev-utils": "^40.2.0",
     "@ckeditor/ckeditor5-dev-webpack-plugin": "^31.1.13",
-    "@ckeditor/ckeditor5-markdown-gfm": "^35.3.2",
-    "@ckeditor/ckeditor5-theme-lark": "^35.3.2",
-    "@ckeditor/ckeditor5-vue": "^4.0.1",
+    "@ckeditor/ckeditor5-dev-translations": "^40.2.0",
+    "@ckeditor/ckeditor5-markdown-gfm": "^41.4.2",
+    "@ckeditor/ckeditor5-theme-lark": "^41.4.2",
+    "@ckeditor/ckeditor5-vue": "^5.1.0",
     "@symfony/webpack-encore": "^4.1.0",
     "@tsconfig/node14": "^1.0.1",
-      "@types/dompurify": "^3.0.5",
+    "@types/dompurify": "^3.0.5",
     "bindings": "^1.5.0",
     "bootstrap": "5.2.3",
     "chokidar": "^3.5.1",
@@ -26,12 +27,12 @@
     "popper.js": "^1.16.1",
     "postcss-loader": "^7.0.2",
     "raw-loader": "^4.0.2",
-    "sass-loader": "^13.0.0",
+    "sass-loader": "^14.0.0",
     "select2": "^4.0.13",
     "select2-bootstrap-theme": "0.1.0-beta.10",
     "style-loader": "^3.3.1",
     "ts-loader": "^9.3.1",
-    "typescript": "^4.7.2",
+    "typescript": "^5.4.5",
     "vue-loader": "^17.0.0",
     "webpack": "^5.75.0",
     "webpack-cli": "^5.0.1"
@@ -45,9 +46,11 @@
     "@fullcalendar/vue3": "^6.1.4",
     "@popperjs/core": "^2.9.2",
     "@types/leaflet": "^1.9.3",
+    "@types/dompurify": "^3.0.5",
     "dropzone": "^5.7.6",
     "es6-promise": "^4.2.8",
     "leaflet": "^1.7.1",
+    "marked": "^12.0.2",
     "masonry-layout": "^4.2.2",
     "mime": "^4.0.0",
     "swagger-ui": "^4.15.5",
@@ -55,8 +58,9 @@
     "vue": "^3.2.37",
     "vue-i18n": "^9.1.6",
     "vue-multiselect": "3.0.0-alpha.2",
-    "vue-toast-notification": "^2.0",
-    "vuex": "^4.0.0"
+    "vue-toast-notification": "^3.1.2",
+    "vuex": "^4.0.0",
+    "bootstrap-icons": "^1.11.3"
   },
   "browserslist": [
     "Firefox ESR"

phpstan-baseline-2024-05.neon

@@ -0,0 +1,14 @@
+parameters:
+	ignoreErrors:
+		-
+			message: "#^Parameter \\#1 \\$records of method League\\\\Csv\\\\Writer\\:\\:insertAll\\(\\) expects iterable\\<array\\<float\\|int\\|string\\|Stringable\\|null\\>\\>, iterable\\<array\\<string, bool\\|int\\|string\\>\\> given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Controller/UserExportController.php
+
+		-
+			message: """
+				#^Fetching deprecated class constant ASC of class Doctrine\\\\Common\\\\Collections\\\\Criteria\\:
+				use Order\\:\\:Ascending instead$#
+			"""
+			count: 1
+			path: src/Bundle/ChillMainBundle/Entity/Workflow/EntityWorkflow.php

phpstan-baseline.neon

@@ -1,34 +1,29 @@
 parameters:
 	ignoreErrors:
+		-
+			message: "#^Foreach overwrites \\$key with its key variable\\.$#"
+			count: 1
+			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
+
 		-
 			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
 			count: 1
 			path: src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php
 
 		-
-			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			message: "#^Property Chill\\\\CustomFieldsBundle\\\\Entity\\\\CustomField\\:\\:\\$required \\(false\\) does not accept bool\\.$#"
 			count: 1
-			path: src/Bundle/ChillPersonBundle/Form/PersonType.php
+			path: src/Bundle/ChillCustomFieldsBundle/Entity/CustomField.php
 
 		-
-			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
-			count: 1
-			path: src/Bundle/ChillMainBundle/Templating/ChillTwigRoutingHelper.php
-
-		-
-			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Entity/CustomFieldsGroup.php
-
-		-
-			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			message: "#^Parameter \\#1 \\$user of method Chill\\\\DocStoreBundle\\\\Entity\\\\Document\\:\\:setUser\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User\\|null, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
 			count: 2
-			path: src/Bundle/ChillMainBundle/Repository/NotificationRepository.php
+			path: src/Bundle/ChillDocStoreBundle/Controller/DocumentAccompanyingCourseController.php
 
 		-
-			message: "#^Foreach overwrites \\$key with its key variable\\.$#"
-			count: 1
-			path: src/Bundle/ChillCustomFieldsBundle/Controller/CustomFieldsGroupController.php
+			message: "#^Parameter \\#1 \\$user of method Chill\\\\DocStoreBundle\\\\Entity\\\\Document\\:\\:setUser\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User\\|null, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface\\|null given\\.$#"
+			count: 2
+			path: src/Bundle/ChillDocStoreBundle/Controller/DocumentPersonController.php
 
 		-
 			message: "#^Variable \\$participation might not be defined\\.$#"
@@ -40,6 +35,106 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillEventBundle/Form/ChoiceLoader/EventChoiceLoader.php
 
+		-
+			message: "#^Comparison operation \"\\>\" between \\(bool\\|int\\|Redis\\) and 0 results in an error\\.$#"
+			count: 1
+			path: src/Bundle/ChillFranceTravailApiBundle/src/ApiHelper/ApiWrapper.php
+
+		-
+			message: "#^Variable \\$response might not be defined\\.$#"
+			count: 1
+			path: src/Bundle/ChillFranceTravailApiBundle/src/ApiHelper/ApiWrapper.php
+
+		-
+			message: "#^Function GuzzleHttp\\\\Psr7\\\\get not found\\.$#"
+			count: 1
+			path: src/Bundle/ChillFranceTravailApiBundle/src/ApiHelper/PartenaireRomeAppellation.php
+
+		-
+			message: "#^Function GuzzleHttp\\\\Psr7\\\\str not found\\.$#"
+			count: 2
+			path: src/Bundle/ChillFranceTravailApiBundle/src/ApiHelper/PartenaireRomeAppellation.php
+
+		-
+			message: "#^Parameter \\#1 \\$seconds of function sleep expects int, string given\\.$#"
+			count: 1
+			path: src/Bundle/ChillFranceTravailApiBundle/src/ApiHelper/PartenaireRomeAppellation.php
+
+		-
+			message: "#^Unreachable statement \\- code above always terminates\\.$#"
+			count: 1
+			path: src/Bundle/ChillJobBundle/src/Controller/CSPersonController.php
+
+		-
+			message: "#^Parameter \\#1 \\$interval of method DateTimeImmutable\\:\\:add\\(\\) expects DateInterval, string\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillJobBundle/src/Entity/Immersion.php
+
+		-
+			message: "#^Parameter \\#1 \\$object of static method DateTimeImmutable\\:\\:createFromMutable\\(\\) expects DateTime, DateTimeInterface given\\.$#"
+			count: 1
+			path: src/Bundle/ChillJobBundle/src/Entity/Immersion.php
+
+		-
+			message: "#^Property Chill\\\\JobBundle\\\\Entity\\\\Rome\\\\Metier\\:\\:\\$appellations is never read, only written\\.$#"
+			count: 1
+			path: src/Bundle/ChillJobBundle/src/Entity/Rome/Metier.php
+
+		-
+			message: "#^Method Chill\\\\JobBundle\\\\Export\\\\ListCSPerson\\:\\:splitArrayToColumns\\(\\) never returns Closure so it can be removed from the return type\\.$#"
+			count: 1
+			path: src/Bundle/ChillJobBundle/src/Export/ListCSPerson.php
+
+		-
+			message: "#^Variable \\$f might not be defined\\.$#"
+			count: 1
+			path: src/Bundle/ChillJobBundle/src/Export/ListCSPerson.php
+
+		-
+			message: "#^Method Chill\\\\JobBundle\\\\Export\\\\ListFrein\\:\\:splitArrayToColumns\\(\\) never returns Closure so it can be removed from the return type\\.$#"
+			count: 1
+			path: src/Bundle/ChillJobBundle/src/Export/ListFrein.php
+
+		-
+			message: "#^Method Chill\\\\JobBundle\\\\Export\\\\ListProjetProfessionnel\\:\\:splitArrayToColumns\\(\\) never returns Closure so it can be removed from the return type\\.$#"
+			count: 1
+			path: src/Bundle/ChillJobBundle/src/Export/ListProjetProfessionnel.php
+
+		-
+			message: "#^Property Chill\\\\JobBundle\\\\Form\\\\ChoiceLoader\\\\RomeAppellationChoiceLoader\\:\\:\\$appellationRepository \\(Chill\\\\JobBundle\\\\Repository\\\\Rome\\\\AppellationRepository\\) does not accept Doctrine\\\\ORM\\\\EntityRepository\\<Chill\\\\JobBundle\\\\Entity\\\\Rome\\\\Appellation\\>\\.$#"
+			count: 1
+			path: src/Bundle/ChillJobBundle/src/Form/ChoiceLoader/RomeAppellationChoiceLoader.php
+
+		-
+			message: "#^Result of && is always false\\.$#"
+			count: 1
+			path: src/Bundle/ChillJobBundle/src/Form/ChoiceLoader/RomeAppellationChoiceLoader.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between array\\{\\} and Symfony\\\\Component\\\\Validator\\\\ConstraintViolationListInterface will always evaluate to false\\.$#"
+			count: 2
+			path: src/Bundle/ChillJobBundle/src/Form/ChoiceLoader/RomeAppellationChoiceLoader.php
+
+		-
+			message: "#^Strict comparison using \\=\\=\\= between null and string will always evaluate to false\\.$#"
+			count: 1
+			path: src/Bundle/ChillJobBundle/src/Form/ChoiceLoader/RomeAppellationChoiceLoader.php
+
+		-
+			message: "#^Variable \\$metier might not be defined\\.$#"
+			count: 1
+			path: src/Bundle/ChillJobBundle/src/Form/ChoiceLoader/RomeAppellationChoiceLoader.php
+
+		-
+			message: "#^Parameter \\#1 \\$interval of method DateTimeImmutable\\:\\:add\\(\\) expects DateInterval, string\\|null given\\.$#"
+			count: 1
+			path: src/Bundle/ChillJobBundle/src/Security/Authorization/CSConnectesVoter.php
+
+		-
+			message: "#^Parameter \\#1 \\$object of static method DateTimeImmutable\\:\\:createFromMutable\\(\\) expects DateTime, DateTimeInterface given\\.$#"
+			count: 1
+			path: src/Bundle/ChillJobBundle/src/Security/Authorization/CSConnectesVoter.php
+
 		-
 			message: "#^Cannot unset offset '_token' on array\\{formatter\\: mixed, export\\: mixed, centers\\: mixed, alias\\: string\\}\\.$#"
 			count: 1
@@ -65,11 +160,31 @@ parameters:
 			count: 1
 			path: src/Bundle/ChillMainBundle/Form/ChoiceLoader/PostalCodeChoiceLoader.php
 
+		-
+			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			count: 2
+			path: src/Bundle/ChillMainBundle/Repository/NotificationRepository.php
+
+		-
+			message: "#^Parameter \\#1 \\$user of method Chill\\\\MainBundle\\\\Security\\\\Authorization\\\\AuthorizationHelper\\:\\:userHasAccessForCenter\\(\\) expects Chill\\\\MainBundle\\\\Entity\\\\User, Symfony\\\\Component\\\\Security\\\\Core\\\\User\\\\UserInterface given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Security/Authorization/AuthorizationHelper.php
+
+		-
+			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			count: 1
+			path: src/Bundle/ChillMainBundle/Templating/ChillTwigRoutingHelper.php
+
 		-
 			message: "#^Foreach overwrites \\$value with its value variable\\.$#"
 			count: 1
 			path: src/Bundle/ChillPersonBundle/Form/ChoiceLoader/PersonChoiceLoader.php
 
+		-
+			message: "#^Only booleans are allowed in an if condition, mixed given\\.$#"
+			count: 1
+			path: src/Bundle/ChillPersonBundle/Form/PersonType.php
+
 		-
 			message: "#^Foreach overwrites \\$value with its value variable\\.$#"
 			count: 1

phpstan.neon.dist

@@ -33,3 +33,5 @@ includes:
     - phpstan-baseline-level-5.neon
     - phpstan-deprecations-sf54.neon
     - phpstan-baseline-deprecations-doctrine-orm.neon
+    - phpstan-baseline-2024-05.neon
+

rector.php

@@ -28,6 +28,9 @@ return static function (RectorConfig $rectorConfig): void {
 
     // register a single rule
     $rectorConfig->rule(InlineConstructorDefaultToPropertyRector::class);
+    $rectorConfig->rule(Rector\TypeDeclaration\Rector\ClassMethod\AddParamTypeFromPropertyTypeRector::class);
+    $rectorConfig->rule(Rector\TypeDeclaration\Rector\Class_\MergeDateTimePropertyTypeDeclarationRector::class);
+    $rectorConfig->rule(Rector\TypeDeclaration\Rector\ClassMethod\AddReturnTypeDeclarationBasedOnParentClassMethodRector::class);
 
     // part of the symfony 54 rules
     $rectorConfig->rule(\Rector\Symfony\Symfony53\Rector\StaticPropertyFetch\KernelTestCaseContainerPropertyDeprecationRector::class);
@@ -36,14 +39,14 @@ return static function (RectorConfig $rectorConfig): void {
 
     //define sets of rules
     $rectorConfig->sets([
-        \Rector\Symfony\Set\SymfonySetList::SYMFONY_50,
-        \Rector\Symfony\Set\SymfonySetList::SYMFONY_50_TYPES,
-        \Rector\Symfony\Set\SymfonySetList::SYMFONY_51,
-        \Rector\Symfony\Set\SymfonySetList::SYMFONY_52,
-        \Rector\Symfony\Set\SymfonySetList::SYMFONY_53,
-        \Rector\Symfony\Set\SymfonySetList::SYMFONY_54,
+        LevelSetList::UP_TO_PHP_82,
+        \Rector\Symfony\Set\SymfonySetList::SYMFONY_40,
+        \Rector\Symfony\Set\SymfonySetList::SYMFONY_41,
+        \Rector\Symfony\Set\SymfonySetList::SYMFONY_42,
+        \Rector\Symfony\Set\SymfonySetList::SYMFONY_43,
+        \Rector\Symfony\Set\SymfonySetList::SYMFONY_44,
         \Rector\Doctrine\Set\DoctrineSetList::DOCTRINE_CODE_QUALITY,
-        \Rector\Doctrine\Set\DoctrineSetList::ANNOTATIONS_TO_ATTRIBUTES,
+        \Rector\PHPUnit\Set\PHPUnitSetList::PHPUNIT_90,
     ]);
 
     $rectorConfig->ruleWithConfiguration(\Rector\Php80\Rector\Class_\AnnotationToAttributeRector::class, [
@@ -66,9 +69,8 @@ return static function (RectorConfig $rectorConfig): void {
 
     // skip some path...
     $rectorConfig->skip([
-        // we must adapt service definition
-        \Rector\Symfony\Symfony28\Rector\MethodCall\GetToConstructorInjectionRector::class,
-        \Rector\Symfony\Symfony34\Rector\Closure\ContainerGetNameToTypeInTestsRector::class,
+        // waiting for fixing this bug: https://github.com/rectorphp/rector-doctrine/issues/342
+        \Rector\Doctrine\CodeQuality\Rector\Property\ImproveDoctrineCollectionDocTypeInEntityRector::class,
     ]);
 
     $rectorConfig->ruleWithConfiguration(AnnotationToAttributeRector::class, [

src/Bundle/ChillActivityBundle/Controller/ActivityController.php

@@ -68,7 +68,7 @@ final class ActivityController extends AbstractController
         private readonly FilterOrderHelperFactoryInterface $filterOrderHelperFactory,
         private readonly TranslatableStringHelperInterface $translatableStringHelper,
         private readonly PaginatorFactory $paginatorFactory,
-        private readonly ChillSecurity $security
+        private readonly ChillSecurity $security,
     ) {}
 
     /**
@@ -99,10 +99,10 @@ final class ActivityController extends AbstractController
 
         $form = $this->createDeleteForm($activity->getId(), $person, $accompanyingPeriod);
 
-        if (Request::METHOD_DELETE === $request->getMethod()) {
+        if (Request::METHOD_POST === $request->getMethod()) {
             $form->handleRequest($request);
 
-            if ($form->isValid()) {
+            if ($form->isSubmitted() && $form->isValid()) {
                 $this->logger->notice('An activity has been removed', [
                     'by_user' => $this->getUser()->getUsername(),
                     'activity_id' => $activity->getId(),
@@ -640,7 +640,6 @@ final class ActivityController extends AbstractController
 
         return $this->createFormBuilder()
             ->setAction($this->generateUrl('chill_activity_activity_delete', $params))
-            ->setMethod('DELETE')
             ->add('submit', SubmitType::class, ['label' => 'Delete'])
             ->getForm();
     }

src/Bundle/ChillActivityBundle/Entity/Activity.php

@@ -80,7 +80,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     private \DateTime $date;
 
     /**
-     * @var Collection<StoredObject>
+     * @var Collection<int, StoredObject>
      */
     #[Assert\Valid(traverse: true)]
     #[ORM\ManyToMany(targetEntity: StoredObject::class, cascade: ['persist'])]
@@ -107,7 +107,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     private ?Person $person = null;
 
     /**
-     * @var Collection<Person>
+     * @var Collection<int, \Chill\PersonBundle\Entity\Person>
      */
     #[Groups(['read', 'docgen:read'])]
     #[ORM\ManyToMany(targetEntity: Person::class)]
@@ -117,7 +117,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     private PrivateCommentEmbeddable $privateComment;
 
     /**
-     * @var Collection<ActivityReason>
+     * @var Collection<int, ActivityReason>
      */
     #[Groups(['docgen:read'])]
     #[ORM\ManyToMany(targetEntity: ActivityReason::class)]
@@ -132,7 +132,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     private string $sentReceived = '';
 
     /**
-     * @var Collection<SocialAction>
+     * @var Collection<int, \Chill\PersonBundle\Entity\SocialWork\SocialAction>
      */
     #[Groups(['read', 'docgen:read'])]
     #[ORM\ManyToMany(targetEntity: SocialAction::class)]
@@ -140,7 +140,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     private Collection $socialActions;
 
     /**
-     * @var Collection<SocialIssue>
+     * @var Collection<int, SocialIssue>
      */
     #[Groups(['read', 'docgen:read'])]
     #[ORM\ManyToMany(targetEntity: SocialIssue::class)]
@@ -148,7 +148,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     private Collection $socialIssues;
 
     /**
-     * @var Collection<ThirdParty>
+     * @var Collection<int, ThirdParty>
      */
     #[Groups(['read', 'docgen:read'])]
     #[ORM\ManyToMany(targetEntity: ThirdParty::class)]
@@ -162,7 +162,7 @@ class Activity implements AccompanyingPeriodLinkedWithSocialIssuesEntityInterfac
     private ?User $user = null;
 
     /**
-     * @var Collection<User>
+     * @var Collection<int, User>
      */
     #[Groups(['read', 'docgen:read'])]
     #[ORM\ManyToMany(targetEntity: User::class)]

src/Bundle/ChillActivityBundle/Entity/ActivityReason.php

@@ -79,11 +79,9 @@ class ActivityReason
     /**
      * Set active.
      *
-     * @param bool $active
-     *
      * @return ActivityReason
      */
-    public function setActive($active)
+    public function setActive(bool $active)
     {
         $this->active = $active;
 
@@ -110,11 +108,9 @@ class ActivityReason
     /**
      * Set name.
      *
-     * @param array $name
-     *
      * @return ActivityReason
      */
-    public function setName($name)
+    public function setName(array $name)
     {
         $this->name = $name;
 

src/Bundle/ChillActivityBundle/Entity/ActivityReasonCategory.php

@@ -40,9 +40,9 @@ class ActivityReasonCategory implements \Stringable
     /**
      * Array of ActivityReason.
      *
-     * @var Collection<ActivityReason>
+     * @var Collection<int, ActivityReason>
      */
-    #[ORM\OneToMany(targetEntity: ActivityReason::class, mappedBy: 'category')]
+    #[ORM\OneToMany(mappedBy: 'category', targetEntity: ActivityReason::class)]
     private Collection $reasons;
 
     /**

src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityReasonAggregator.php

@@ -28,7 +28,7 @@ class ActivityReasonAggregator implements AggregatorInterface, ExportElementVali
     public function __construct(
         protected ActivityReasonCategoryRepository $activityReasonCategoryRepository,
         protected ActivityReasonRepository $activityReasonRepository,
-        protected TranslatableStringHelper $translatableStringHelper
+        protected TranslatableStringHelper $translatableStringHelper,
     ) {}
 
     public function addRole(): ?string

src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersJobAggregator.php

@@ -26,7 +26,7 @@ class ActivityUsersJobAggregator implements AggregatorInterface
 
     public function __construct(
         private readonly UserJobRepositoryInterface $userJobRepository,
-        private readonly TranslatableStringHelperInterface $translatableStringHelper
+        private readonly TranslatableStringHelperInterface $translatableStringHelper,
     ) {}
 
     public function addRole(): ?string

src/Bundle/ChillActivityBundle/Export/Aggregator/ActivityUsersScopeAggregator.php

@@ -26,7 +26,7 @@ class ActivityUsersScopeAggregator implements AggregatorInterface
 
     public function __construct(
         private readonly ScopeRepositoryInterface $scopeRepository,
-        private readonly TranslatableStringHelperInterface $translatableStringHelper
+        private readonly TranslatableStringHelperInterface $translatableStringHelper,
     ) {}
 
     public function addRole(): ?string

src/Bundle/ChillActivityBundle/Export/Aggregator/CreatorJobAggregator.php

@@ -26,7 +26,7 @@ class CreatorJobAggregator implements AggregatorInterface
 
     public function __construct(
         private readonly UserJobRepositoryInterface $userJobRepository,
-        private readonly TranslatableStringHelper $translatableStringHelper
+        private readonly TranslatableStringHelper $translatableStringHelper,
     ) {}
 
     public function addRole(): ?string

src/Bundle/ChillActivityBundle/Export/Aggregator/CreatorScopeAggregator.php

@@ -26,7 +26,7 @@ class CreatorScopeAggregator implements AggregatorInterface
 
     public function __construct(
         private readonly ScopeRepository $scopeRepository,
-        private readonly TranslatableStringHelper $translatableStringHelper
+        private readonly TranslatableStringHelper $translatableStringHelper,
     ) {}
 
     public function addRole(): ?string

src/Bundle/ChillActivityBundle/Export/Aggregator/PersonAggregators/HouseholdAggregator.php

@@ -0,0 +1,99 @@
+<?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\ActivityBundle\Export\Aggregator\PersonAggregators;
+
+use Chill\ActivityBundle\Export\Declarations;
+use Chill\MainBundle\Export\AggregatorInterface;
+use Chill\PersonBundle\Entity\Household\Household;
+use Chill\PersonBundle\Entity\Household\HouseholdMember;
+use Chill\PersonBundle\Repository\Household\HouseholdRepository;
+use Doctrine\ORM\Query\Expr\Join;
+use Doctrine\ORM\QueryBuilder;
+use Symfony\Component\Form\FormBuilderInterface;
+
+final readonly class HouseholdAggregator implements AggregatorInterface
+{
+    public function __construct(private HouseholdRepository $householdRepository) {}
+
+    public function buildForm(FormBuilderInterface $builder)
+    {
+        // nothing to add here
+    }
+
+    public function getFormDefaultData(): array
+    {
+        return [];
+    }
+
+    public function getLabels($key, array $values, mixed $data)
+    {
+        return function (int|string|null $value): string|int {
+            if ('_header' === $value) {
+                return 'export.aggregator.person.by_household.household';
+            }
+
+            if ('' === $value || null === $value || null === $household = $this->householdRepository->find($value)) {
+                return '';
+            }
+
+            return $household->getId();
+        };
+    }
+
+    public function getQueryKeys($data)
+    {
+        return ['activity_household_agg'];
+    }
+
+    public function getTitle()
+    {
+        return 'export.aggregator.person.by_household.title';
+    }
+
+    public function addRole(): ?string
+    {
+        return null;
+    }
+
+    public function alterQuery(QueryBuilder $qb, $data)
+    {
+        $qb->join(
+            HouseholdMember::class,
+            'activity_household_agg_household_member',
+            Join::WITH,
+            $qb->expr()->andX(
+                $qb->expr()->eq('activity_household_agg_household_member.person', 'activity.person'),
+                $qb->expr()->lte('activity_household_agg_household_member.startDate', 'activity.date'),
+                $qb->expr()->orX(
+                    $qb->expr()->gte('activity_household_agg_household_member.endDate', 'activity.date'),
+                    $qb->expr()->isNull('activity_household_agg_household_member.endDate')
+                )
+            )
+        );
+
+        $qb->join(
+            Household::class,
+            'activity_household_agg_household',
+            Join::WITH,
+            $qb->expr()->eq('activity_household_agg_household_member.household', 'activity_household_agg_household')
+        );
+
+        $qb
+            ->addSelect('activity_household_agg_household.id AS activity_household_agg')
+            ->addGroupBy('activity_household_agg');
+    }
+
+    public function applyOn()
+    {
+        return Declarations::ACTIVITY_PERSON;
+    }
+}

src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/ListActivity.php

@@ -19,6 +19,7 @@ use Chill\MainBundle\Export\FormatterInterface;
 use Chill\MainBundle\Export\GroupedExportInterface;
 use Chill\MainBundle\Export\ListInterface;
 use Chill\MainBundle\Templating\TranslatableStringHelperInterface;
+use Chill\PersonBundle\Entity\Household\HouseholdMember;
 use Chill\PersonBundle\Export\Declarations as PersonDeclarations;
 use Doctrine\DBAL\Exception\InvalidArgumentException;
 use Doctrine\ORM\EntityManagerInterface;
@@ -44,6 +45,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
         'person_firstname',
         'person_lastname',
         'person_id',
+        'household_id',
     ];
     private readonly bool $filterStatsByCenters;
 
@@ -189,19 +191,26 @@ class ListActivity implements ListInterface, GroupedExportInterface
     {
         $centers = array_map(static fn ($el) => $el['center'], $acl);
 
-        // throw an error if any fields are present
+        // throw an error if no fields are present
         if (!\array_key_exists('fields', $data)) {
-            throw new InvalidArgumentException('Any fields have been checked.');
+            throw new InvalidArgumentException('No fields have been checked.');
         }
 
         $qb = $this->entityManager->createQueryBuilder();
 
         $qb
             ->from('ChillActivityBundle:Activity', 'activity')
-            ->join('activity.person', 'actperson');
+            ->join('activity.person', 'person')
+            ->join(
+                HouseholdMember::class,
+                'householdmember',
+                Query\Expr\Join::WITH,
+                'person = householdmember.person AND householdmember.startDate <= activity.date AND (householdmember.endDate IS NULL OR householdmember.endDate > activity.date)'
+            )
+            ->join('householdmember.household', 'household');
 
         if ($this->filterStatsByCenters) {
-            $qb->join('actperson.centerHistory', 'centerHistory');
+            $qb->join('person.centerHistory', 'centerHistory');
             $qb->where(
                 $qb->expr()->andX(
                     $qb->expr()->lte('centerHistory.startDate', 'activity.date'),
@@ -224,17 +233,22 @@ class ListActivity implements ListInterface, GroupedExportInterface
                         break;
 
                     case 'person_firstname':
-                        $qb->addSelect('actperson.firstName AS person_firstname');
+                        $qb->addSelect('person.firstName AS person_firstname');
 
                         break;
 
                     case 'person_lastname':
-                        $qb->addSelect('actperson.lastName AS person_lastname');
+                        $qb->addSelect('person.lastName AS person_lastname');
 
                         break;
 
                     case 'person_id':
-                        $qb->addSelect('actperson.id AS person_id');
+                        $qb->addSelect('person.id AS person_id');
+
+                        break;
+
+                    case 'household_id':
+                        $qb->addSelect('household.id AS household_id');
 
                         break;
 
@@ -284,7 +298,7 @@ class ListActivity implements ListInterface, GroupedExportInterface
         return ActivityStatsVoter::LISTS;
     }
 
-    public function supportsModifiers()
+    public function supportsModifiers(): array
     {
         return [
             Declarations::ACTIVITY,

src/Bundle/ChillActivityBundle/Export/Export/LinkedToPerson/StatActivityDuration.php

@@ -42,7 +42,7 @@ class StatActivityDuration implements ExportInterface, GroupedExportInterface
         /**
          * The action for this report.
          */
-        protected string $action = 'sum'
+        protected string $action = 'sum',
     ) {
         $this->filterStatsByCenters = $parameterBag->get('chill_main')['acl']['filter_stats_by_center'];
     }

src/Bundle/ChillActivityBundle/Export/Export/ListActivityHelper.php

@@ -39,7 +39,7 @@ class ListActivityHelper
         private readonly TranslatorInterface $translator,
         private readonly TranslatableStringHelperInterface $translatableStringHelper,
         private readonly TranslatableStringExportLabelHelper $translatableStringLabelHelper,
-        private readonly UserHelper $userHelper
+        private readonly UserHelper $userHelper,
     ) {}
 
     public function addSelect(QueryBuilder $qb): void
@@ -152,7 +152,7 @@ class ListActivityHelper
                     return '';
                 }
 
-                return $this->translator->trans($value);
+                return $this->translator->trans((string) $value);
             },
         };
     }

src/Bundle/ChillActivityBundle/Export/Filter/ActivityPresenceFilter.php

@@ -25,7 +25,7 @@ final readonly class ActivityPresenceFilter implements FilterInterface
 {
     public function __construct(
         private TranslatableStringHelperInterface $translatableStringHelper,
-        private TranslatorInterface $translator
+        private TranslatorInterface $translator,
     ) {}
 
     public function getTitle()

src/Bundle/ChillActivityBundle/Export/Filter/ActivityTypeFilter.php

@@ -26,7 +26,7 @@ class ActivityTypeFilter implements ExportElementValidatedInterface, FilterInter
 {
     public function __construct(
         protected TranslatableStringHelperInterface $translatableStringHelper,
-        protected ActivityTypeRepositoryInterface $activityTypeRepository
+        protected ActivityTypeRepositoryInterface $activityTypeRepository,
     ) {}
 
     public function addRole(): ?string

src/Bundle/ChillActivityBundle/Export/Filter/PersonFilters/PersonHavingActivityBetweenDateFilter.php

@@ -39,7 +39,7 @@ final readonly class PersonHavingActivityBetweenDateFilter implements ExportElem
         return null;
     }
 
-    public function alterQuery(QueryBuilder $qb, $data)
+    public function alterQuery(QueryBuilder $qb, $data): void
     {
         // create a subquery for activity
         $sqb = $qb->getEntityManager()->createQueryBuilder();
@@ -121,7 +121,7 @@ final readonly class PersonHavingActivityBetweenDateFilter implements ExportElem
         ];
     }
 
-    public function describeAction($data, $format = 'string')
+    public function describeAction($data, $format = 'string'): array
     {
         return [
             [] === $data['reasons'] ?
@@ -141,7 +141,7 @@ final readonly class PersonHavingActivityBetweenDateFilter implements ExportElem
         ];
     }
 
-    public function getTitle()
+    public function getTitle(): string
     {
         return 'export.filter.activity.person_between_dates.title';
     }

src/Bundle/ChillActivityBundle/Export/Filter/UsersJobFilter.php

@@ -29,7 +29,7 @@ class UsersJobFilter implements FilterInterface
 
     public function __construct(
         private readonly TranslatableStringHelperInterface $translatableStringHelper,
-        private readonly UserJobRepositoryInterface $userJobRepository
+        private readonly UserJobRepositoryInterface $userJobRepository,
     ) {}
 
     public function addRole(): ?string

src/Bundle/ChillActivityBundle/Export/Filter/UsersScopeFilter.php

@@ -29,7 +29,7 @@ class UsersScopeFilter implements FilterInterface
 
     public function __construct(
         private readonly ScopeRepositoryInterface $scopeRepository,
-        private readonly TranslatableStringHelperInterface $translatableStringHelper
+        private readonly TranslatableStringHelperInterface $translatableStringHelper,
     ) {}
 
     public function addRole(): ?string

src/Bundle/ChillActivityBundle/Form/ActivityType.php

@@ -15,11 +15,10 @@ use Chill\ActivityBundle\Entity\Activity;
 use Chill\ActivityBundle\Entity\ActivityPresence;
 use Chill\ActivityBundle\Form\Type\PickActivityReasonType;
 use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
-use Chill\DocStoreBundle\Form\StoredObjectType;
+use Chill\DocStoreBundle\Form\CollectionStoredObjectType;
 use Chill\MainBundle\Entity\Center;
 use Chill\MainBundle\Entity\Location;
 use Chill\MainBundle\Entity\User;
-use Chill\MainBundle\Form\Type\ChillCollectionType;
 use Chill\MainBundle\Form\Type\ChillDateType;
 use Chill\MainBundle\Form\Type\CommentType;
 use Chill\MainBundle\Form\Type\PickUserDynamicType;
@@ -60,7 +59,7 @@ class ActivityType extends AbstractType
         protected TranslatableStringHelper $translatableStringHelper,
         protected array $timeChoices,
         protected SocialIssueRender $socialIssueRender,
-        protected SocialActionRender $socialActionRender
+        protected SocialActionRender $socialActionRender,
     ) {
         if (!$tokenStorage->getToken()->getUser() instanceof User) {
             throw new \RuntimeException('you should have a valid user');
@@ -276,16 +275,9 @@ class ActivityType extends AbstractType
         }
 
         if ($activityType->isVisible('documents')) {
-            $builder->add('documents', ChillCollectionType::class, [
-                'entry_type' => StoredObjectType::class,
+            $builder->add('documents', CollectionStoredObjectType::class, [
                 'label' => $activityType->getLabel('documents'),
                 'required' => $activityType->isRequired('documents'),
-                'allow_add' => true,
-                'allow_delete' => true,
-                'button_add_label' => 'activity.Insert a document',
-                'button_remove_label' => 'activity.Remove a document',
-                'empty_collection_explain' => 'No documents',
-                'entry_options' => ['has_title' => true],
             ]);
         }
 

src/Bundle/ChillActivityBundle/Form/Type/PickActivityReasonType.php

@@ -27,7 +27,7 @@ class PickActivityReasonType extends AbstractType
     public function __construct(
         private readonly ActivityReasonRepository $activityReasonRepository,
         private readonly ActivityReasonRender $reasonRender,
-        private readonly TranslatableStringHelperInterface $translatableStringHelper
+        private readonly TranslatableStringHelperInterface $translatableStringHelper,
     ) {}
 
     public function configureOptions(OptionsResolver $resolver)

src/Bundle/ChillActivityBundle/Menu/AccompanyingCourseQuickMenuBuilder.php

@@ -0,0 +1,49 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\ActivityBundle\Menu;
+
+use Chill\ActivityBundle\Security\Authorization\ActivityVoter;
+use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Knp\Menu\MenuItem;
+use Symfony\Component\Security\Core\Security;
+
+final readonly class AccompanyingCourseQuickMenuBuilder implements LocalMenuBuilderInterface
+{
+    public function __construct(private Security $security) {}
+
+    public static function getMenuIds(): array
+    {
+        return ['accompanying_course_quick_menu'];
+    }
+
+    public function buildMenu($menuId, MenuItem $menu, array $parameters)
+    {
+        /** @var \Chill\PersonBundle\Entity\AccompanyingPeriod $accompanyingCourse */
+        $accompanyingCourse = $parameters['accompanying-course'];
+
+        if ($this->security->isGranted(ActivityVoter::CREATE, $accompanyingCourse)) {
+            $menu
+                ->addChild('Create a new activity in accompanying course', [
+                    'route' => 'chill_activity_activity_new',
+                    'routeParameters' => [
+                        // 'activityType_id' => '',
+                        'accompanying_period_id' => $accompanyingCourse->getId(),
+                    ],
+                ])
+                ->setExtras([
+                    'order' => 10,
+                    'icon' => 'plus',
+                ])
+            ;
+        }
+    }
+}

src/Bundle/ChillActivityBundle/Repository/ActivityDocumentACLAwareRepository.php

@@ -32,7 +32,7 @@ final readonly class ActivityDocumentACLAwareRepository implements ActivityDocum
         private EntityManagerInterface $em,
         private CenterResolverManagerInterface $centerResolverManager,
         private AuthorizationHelperForCurrentUserInterface $authorizationHelperForCurrentUser,
-        private Security $security
+        private Security $security,
     ) {}
 
     public function buildFetchQueryActivityDocumentLinkedToPersonFromPersonContext(Person $person, ?\DateTimeImmutable $startDate = null, ?\DateTimeImmutable $endDate = null, ?string $content = null): FetchQueryInterface

src/Bundle/ChillActivityBundle/Repository/ActivityReasonRepository.php

@@ -25,7 +25,7 @@ class ActivityReasonRepository extends ServiceEntityRepository
 {
     public function __construct(
         ManagerRegistry $registry,
-        private readonly RequestStack $requestStack
+        private readonly RequestStack $requestStack,
     ) {
         parent::__construct($registry, ActivityReason::class);
     }

src/Bundle/ChillActivityBundle/Repository/ActivityTypeRepository.php

@@ -15,9 +15,9 @@ use Chill\ActivityBundle\Entity\ActivityType;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 
-final class ActivityTypeRepository implements ActivityTypeRepositoryInterface
+final readonly class ActivityTypeRepository implements ActivityTypeRepositoryInterface
 {
-    private readonly EntityRepository $repository;
+    private EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $em)
     {

src/Bundle/ChillActivityBundle/Resources/views/Activity/_list_item.html.twig

@@ -68,7 +68,7 @@
                     <div class="wl-col title"><h3>{{ 'Referrer'|trans }}</h3></div>
                     <div class="wl-col list">
                         <p class="wl-item">
-                            <span class="badge-user">{{ activity.user|chill_entity_render_box }}</span>
+                            <span class="badge-user">{{ activity.user|chill_entity_render_box({'at_date': activity.date}) }}</span>
                         </p>
                     </div>
                 </div>

src/Bundle/ChillActivityBundle/Resources/views/Activity/concernedGroups.html.twig

@@ -87,7 +87,7 @@
                             <li>
                                 {% if bloc.type == 'user' %}
                                     <span class="badge-user">
-                                        {{ item|chill_entity_render_box({'render': 'raw', 'addAltNames': false }) }}
+                                        {{ item|chill_entity_render_box({'render': 'raw', 'addAltNames': false, 'at_date': entity.date }) }}
                                     </span>
                                 {% else %}
                                     {{ _self.insert_onthefly(bloc.type, item) }}
@@ -114,7 +114,7 @@
                 <li>
                     {% if bloc.type == 'user' %}
                         <span class="badge-user">
-                            {{ item|chill_entity_render_box({'render': 'raw', 'addAltNames': false }) }}
+                            {{ item|chill_entity_render_box({'render': 'raw', 'addAltNames': false, 'at_date': entity.date }) }}
                         </span>
                     {% else %}
                         {{ _self.insert_onthefly(bloc.type, item) }}
@@ -142,7 +142,7 @@
                         <span class="wl-item">
                             {% if bloc.type == 'user' %}
                                 <span class="badge-user">
-                                    {{ item|chill_entity_render_box({'render': 'raw', 'addAltNames': false }) }}
+                                    {{ item|chill_entity_render_box({'render': 'raw', 'addAltNames': false, 'at_date': entity.date }) }}
                                     {%- if context == 'calendar_accompanyingCourse' or context == 'calendar_person' %}
                                         {% set invite = entity.inviteForUser(item) %}
                                         {% if invite is not null %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/edit.html.twig

@@ -92,7 +92,9 @@
 {% endif %}
 
 {%- if edit_form.documents is defined -%}
-    {{ form_row(edit_form.documents) }}
+    {{ form_label(edit_form.documents) }}
+    {{ form_errors(edit_form.documents) }}
+    {{ form_widget(edit_form.documents) }}
     <div data-docgen-template-picker="data-docgen-template-picker" data-entity-class="Chill\ActivityBundle\Entity\Activity" data-entity-id="{{ entity.id }}"></div>
 {% endif %}
 
@@ -127,4 +129,4 @@
 
 {% block css %}
     {{ encore_entry_link_tags('mod_pickentity_type') }}
-{% endblock %}
+{% endblock %}

src/Bundle/ChillActivityBundle/Resources/views/Activity/list_recent.html.twig

@@ -41,7 +41,7 @@
                         {% if activity.user and t.userVisible %}
                             <li>
                                 <span class="item-key">{{ 'Referrer'|trans ~ ': ' }}</span>
-                                <span class="badge-user">{{ activity.user|chill_entity_render_box }}</span>
+                                <span class="badge-user">{{ activity.user|chill_entity_render_box({'at_date': activity.date}) }}</span>
                             </li>
                         {% endif %}
 

src/Bundle/ChillActivityBundle/Resources/views/Activity/show.html.twig

@@ -37,7 +37,7 @@
                 {%- if entity.user is not null %}
                     <dt class="inline">{{ 'Referrer'|trans|capitalize }}</dt>
                     <dd>
-                        <span class="badge-user">{{ entity.user|chill_entity_render_box }}</span>
+                        <span class="badge-user">{{ entity.user|chill_entity_render_box({'at_date': entity.date}) }}</span>
                     </dd>
                 {% endif %}
 

src/Bundle/ChillActivityBundle/Security/Authorization/ActivityVoter.php

@@ -75,7 +75,7 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
 
     public function __construct(
         protected Security $security,
-        VoterHelperFactoryInterface $voterHelperFactory
+        VoterHelperFactoryInterface $voterHelperFactory,
     ) {
         $this->voterHelper = $voterHelperFactory->generate(self::class)
             ->addCheckFor(Person::class, [self::SEE, self::CREATE])
@@ -145,7 +145,7 @@ class ActivityVoter extends AbstractChillVoter implements ProvideRoleHierarchyIn
                 throw new \RuntimeException('Could not determine context of activity.');
             }
         } elseif ($subject instanceof AccompanyingPeriod) {
-            if (AccompanyingPeriod::STEP_CLOSED === $subject->getStep()) {
+            if (AccompanyingPeriod::STEP_CLOSED === $subject->getStep() || AccompanyingPeriod::STEP_DRAFT === $subject->getStep()) {
                 if (\in_array($attribute, [self::UPDATE, self::CREATE, self::DELETE], true)) {
                     return false;
                 }

src/Bundle/ChillActivityBundle/Service/DocGenerator/ActivityContext.php

@@ -50,7 +50,7 @@ class ActivityContext implements
         private readonly TranslatorInterface $translator,
         private readonly BaseContextData $baseContextData,
         private readonly ThirdPartyRender $thirdPartyRender,
-        private readonly ThirdPartyRepository $thirdPartyRepository
+        private readonly ThirdPartyRepository $thirdPartyRepository,
     ) {}
 
     public function adminFormReverseTransform(array $data): array

src/Bundle/ChillActivityBundle/Service/DocGenerator/ListActivitiesByAccompanyingPeriodContext.php

@@ -56,7 +56,7 @@ class ListActivitiesByAccompanyingPeriodContext implements
         private readonly SocialIssueRepository $socialIssueRepository,
         private readonly ThirdPartyRepository $thirdPartyRepository,
         private readonly TranslatableStringHelperInterface $translatableStringHelper,
-        private readonly UserRepository $userRepository
+        private readonly UserRepository $userRepository,
     ) {}
 
     public function adminFormReverseTransform(array $data): array

src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityReasonTest.php

@@ -76,7 +76,7 @@ final class TranslatableActivityReasonTest extends TypeTestCase
      */
     protected function getTranslatableStringHelper(
         $locale = 'en',
-        $fallbackLocale = 'en'
+        $fallbackLocale = 'en',
     ) {
         $prophet = new \Prophecy\Prophet();
         $requestStack = $prophet->prophesize();

src/Bundle/ChillActivityBundle/Tests/Form/Type/TranslatableActivityTypeTest.php

@@ -60,7 +60,7 @@ final class TranslatableActivityTypeTest extends KernelTestCase
         $this->assertInstanceOf(
             ActivityType::class,
             $form->getData()['type'],
-            'The data is an instance of Chill\\ActivityBundle\\Entity\\ActivityType'
+            'The data is an instance of Chill\ActivityBundle\Entity\ActivityType'
         );
         $this->assertEquals($type->getId(), $form->getData()['type']->getId());
 

src/Bundle/ChillActivityBundle/Tests/Security/Authorization/ActivityVoterTest.php

@@ -138,7 +138,7 @@ final class ActivityVoterTest extends KernelTestCase
         Scope $scope,
         Center $center,
         $attribute,
-        $message
+        $message,
     ) {
         $token = $this->prepareToken($user);
         $activity = $this->prepareActivity($scope, $this->preparePerson($center));

src/Bundle/ChillActivityBundle/Timeline/TimelineActivityProvider.php

@@ -32,7 +32,7 @@ class TimelineActivityProvider implements TimelineProviderInterface
         protected EntityManagerInterface $em,
         protected AuthorizationHelperInterface $helper,
         TokenStorageInterface $storage,
-        protected ActivityACLAwareRepository $aclAwareRepository
+        protected ActivityACLAwareRepository $aclAwareRepository,
     ) {
         if (!$storage->getToken()->getUser() instanceof User) {
             throw new \RuntimeException('A user should be authenticated !');

src/Bundle/ChillActivityBundle/config/services/export.yaml

@@ -243,3 +243,7 @@ services:
     Chill\ActivityBundle\Export\Aggregator\PersonAggregators\PersonAggregator:
         tags:
             - { name: chill.export_aggregator, alias: activity_person_agg }
+
+    Chill\ActivityBundle\Export\Aggregator\PersonAggregators\HouseholdAggregator:
+        tags:
+            - { name: chill.export_aggregator, alias: activity_household_agg }

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

@@ -77,6 +77,18 @@ Choose a type: Choisir un type
 4 hours: 4 heures
 4 hours 30: 4 heures 30
 5 hours: 5 heures
+5 hours 30: 5 heure 30
+6 hours: 6 heures
+6 hours 30: 6 heure 30
+7 hours: 7 heures
+7 hours 30: 7 heure 30
+8 hours: 8 heures
+8 hours 30: 8 heure 30
+9 hours: 9 heures
+9 hours 30: 9 heure 30
+10 hours: 10 heures
+11 hours: 11 heures
+12 hours: 12 heures
 Concerned groups: Parties concernées par l'échange
 Persons in accompanying course: Usagers du parcours
 Third persons: Tiers non-pro.
@@ -210,6 +222,7 @@ Documents label: Libellé du champ Documents
 # activity type category admin
 ActivityTypeCategory list: Liste des catégories des types d'échange
 Create a new activity type category: Créer une nouvelle catégorie de type d'échange
+Create a new activity in accompanying course: Créer un échange dans le parcours
 
 # activity delete
 Remove activity: Supprimer un échange
@@ -415,6 +428,9 @@ export:
             by_person:
                 title: Grouper les échanges par usager (dossier d'usager dans lequel l'échange est enregistré)
                 person: Usager
+            by_household:
+                title: Grouper les échanges par ménage
+                household: Identifiant ménage
         acp:
             by_activity_type:
                 title: Grouper les parcours par type d'échange

src/Bundle/ChillAsideActivityBundle/src/Controller/AsideActivityController.php

@@ -25,7 +25,7 @@ final class AsideActivityController extends CRUDController
 {
     public function __construct(
         private readonly AsideActivityCategoryRepository $categoryRepository,
-        private readonly Security $security
+        private readonly Security $security,
     ) {}
 
     public function createEntity(string $action, Request $request): object
@@ -76,7 +76,7 @@ final class AsideActivityController extends CRUDController
         string $action,
         $query,
         Request $request,
-        PaginatorInterface $paginator
+        PaginatorInterface $paginator,
     ) {
         if ('index' === $action) {
             return $query->orderBy('e.date', 'DESC');

src/Bundle/ChillAsideActivityBundle/src/Entity/AsideActivityCategory.php

@@ -22,9 +22,9 @@ use Symfony\Component\Validator\Context\ExecutionContextInterface;
 class AsideActivityCategory
 {
     /**
-     * @var Collection<AsideActivityCategory>
+     * @var Collection<int, AsideActivityCategory>
      */
-    #[ORM\OneToMany(targetEntity: AsideActivityCategory::class, mappedBy: 'parent')]
+    #[ORM\OneToMany(mappedBy: 'parent', targetEntity: AsideActivityCategory::class)]
     private Collection $children;
 
     #[ORM\Id]

src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByActivityTypeAggregator.php

@@ -22,7 +22,7 @@ class ByActivityTypeAggregator implements AggregatorInterface
 {
     public function __construct(
         private readonly AsideActivityCategoryRepository $asideActivityCategoryRepository,
-        private readonly TranslatableStringHelper $translatableStringHelper
+        private readonly TranslatableStringHelper $translatableStringHelper,
     ) {}
 
     public function addRole(): ?string

src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByUserJobAggregator.php

@@ -26,7 +26,7 @@ class ByUserJobAggregator implements AggregatorInterface
 
     public function __construct(
         private readonly UserJobRepositoryInterface $userJobRepository,
-        private readonly TranslatableStringHelperInterface $translatableStringHelper
+        private readonly TranslatableStringHelperInterface $translatableStringHelper,
     ) {}
 
     public function addRole(): ?string

src/Bundle/ChillAsideActivityBundle/src/Export/Aggregator/ByUserScopeAggregator.php

@@ -26,7 +26,7 @@ class ByUserScopeAggregator implements AggregatorInterface
 
     public function __construct(
         private readonly ScopeRepositoryInterface $scopeRepository,
-        private readonly TranslatableStringHelperInterface $translatableStringHelper
+        private readonly TranslatableStringHelperInterface $translatableStringHelper,
     ) {}
 
     public function addRole(): ?string

src/Bundle/ChillAsideActivityBundle/src/Export/Export/ListAsideActivity.php

@@ -41,7 +41,7 @@ final readonly class ListAsideActivity implements ListInterface, GroupedExportIn
         private AsideActivityCategoryRepository $asideActivityCategoryRepository,
         private CategoryRender $categoryRender,
         private LocationRepository $locationRepository,
-        private TranslatableStringHelperInterface $translatableStringHelper
+        private TranslatableStringHelperInterface $translatableStringHelper,
     ) {}
 
     public function buildForm(FormBuilderInterface $builder) {}

src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByActivityTypeFilter.php

@@ -27,7 +27,7 @@ class ByActivityTypeFilter implements FilterInterface
     public function __construct(
         private readonly CategoryRender $categoryRender,
         private readonly TranslatableStringHelperInterface $translatableStringHelper,
-        private readonly AsideActivityCategoryRepository $asideActivityTypeRepository
+        private readonly AsideActivityCategoryRepository $asideActivityTypeRepository,
     ) {}
 
     public function addRole(): ?string

src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByLocationFilter.php

@@ -24,7 +24,7 @@ use Symfony\Component\Security\Core\Security;
 final readonly class ByLocationFilter implements FilterInterface
 {
     public function __construct(
-        private Security $security
+        private Security $security,
     ) {}
 
     public function getTitle(): string

src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserJobFilter.php

@@ -29,7 +29,7 @@ class ByUserJobFilter implements FilterInterface
 
     public function __construct(
         private readonly TranslatableStringHelperInterface $translatableStringHelper,
-        private readonly UserJobRepositoryInterface $userJobRepository
+        private readonly UserJobRepositoryInterface $userJobRepository,
     ) {}
 
     public function addRole(): ?string

src/Bundle/ChillAsideActivityBundle/src/Export/Filter/ByUserScopeFilter.php

@@ -29,7 +29,7 @@ class ByUserScopeFilter implements FilterInterface
 
     public function __construct(
         private readonly ScopeRepositoryInterface $scopeRepository,
-        private readonly TranslatableStringHelperInterface $translatableStringHelper
+        private readonly TranslatableStringHelperInterface $translatableStringHelper,
     ) {}
 
     public function addRole(): ?string

src/Bundle/ChillAsideActivityBundle/src/Menu/UserMenuBuilder.php

@@ -44,7 +44,7 @@ class UserMenuBuilder implements LocalMenuBuilderInterface
         CountNotificationTask $counter,
         TokenStorageInterface $tokenStorage,
         TranslatorInterface $translator,
-        AuthorizationCheckerInterface $authorizationChecker
+        AuthorizationCheckerInterface $authorizationChecker,
     ) {
         $this->counter = $counter;
         $this->tokenStorage = $tokenStorage;

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

@@ -49,13 +49,13 @@
 										<li>
 											<span>
 												<abbr class="referrer" title={{ 'Created by'|trans }}>{{ 'By'|trans }}:</abbr>
-												<b>{{ entity.createdBy|chill_entity_render_box }}</b>
+												<b>{{ entity.createdBy|chill_entity_render_box({'at_date': entity.date}) }}</b>
 											</span>
 										</li>
 										<li>
 											<span>
 												<abbr class="referrer" title={{ 'Created for'|trans }}>{{ 'For'|trans }}:</abbr>
-												<b>{{ entity.agent|chill_entity_render_box }}</b>
+												<b>{{ entity.agent|chill_entity_render_box({'at_date': entity.date}) }}</b>
 
 											</span>
 										</li>

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

@@ -18,11 +18,11 @@
 				<dd>{{ entity.type|chill_entity_render_box }}</dd>
 
 				<dt class="inline">{{ 'Created by'|trans }}</dt>
-				<dd>{{ entity.createdBy }}</dd>
+				<dd>{{ entity.createdBy|chill_entity_render_box({'at_date': entity.date}) }}</dd>
 
 				<dt class="inline">{{ 'Created for'|trans }}</dt>
-				<dd>{{ entity.agent }}</dd>
-                
+				<dd>{{ entity.agent|chill_entity_render_box({'at_date': entity.date}) }}</dd>
+
                 <dt class="inline">{{ 'Asideactivity location'|trans }}</dt>
                 {%- if entity.location.name is defined -%}
                     <dd>{{ entity.location.name }}</dd>

src/Bundle/ChillAsideActivityBundle/src/Security/AsideActivityVoter.php

@@ -26,7 +26,7 @@ class AsideActivityVoter extends AbstractChillVoter implements ProvideRoleHierar
     private readonly VoterHelperInterface $voterHelper;
 
     public function __construct(
-        VoterHelperFactoryInterface $voterHelperFactory
+        VoterHelperFactoryInterface $voterHelperFactory,
     ) {
         $this->voterHelper = $voterHelperFactory
             ->generate(self::class)

src/Bundle/ChillAsideActivityBundle/src/Tests/Chill/DocStoreBundle/Tests/Security/Guard/DavTokenAuthenticationEventSubscriberTest.php

@@ -0,0 +1,66 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\DocStoreBundle\Tests\Security\Guard;
+
+use Chill\DocStoreBundle\Security\Authorization\StoredObjectRoleEnum;
+use Chill\DocStoreBundle\Security\Guard\DavTokenAuthenticationEventSubscriber;
+use Lexik\Bundle\JWTAuthenticationBundle\Event\JWTAuthenticatedEvent;
+use PHPUnit\Framework\TestCase;
+use Symfony\Component\Security\Core\Authentication\Token\AbstractToken;
+
+/**
+ * @internal
+ *
+ * @coversNothing
+ */
+class DavTokenAuthenticationEventSubscriberTest extends TestCase
+{
+    public function testOnJWTAuthenticatedWithDavDataInPayload(): void
+    {
+        $eventSubscriber = new DavTokenAuthenticationEventSubscriber();
+        $token = new class () extends AbstractToken {
+            public function getCredentials()
+            {
+                return null;
+            }
+        };
+        $event = new JWTAuthenticatedEvent([
+            'dav' => 1,
+            'so' => '1234',
+            'e' => 1,
+        ], $token);
+
+        $eventSubscriber->onJWTAuthenticated($event);
+
+        self::assertTrue($token->hasAttribute(DavTokenAuthenticationEventSubscriber::STORED_OBJECT));
+        self::assertTrue($token->hasAttribute(DavTokenAuthenticationEventSubscriber::ACTIONS));
+        self::assertEquals('1234', $token->getAttribute(DavTokenAuthenticationEventSubscriber::STORED_OBJECT));
+        self::assertEquals(StoredObjectRoleEnum::EDIT, $token->getAttribute(DavTokenAuthenticationEventSubscriber::ACTIONS));
+    }
+
+    public function testOnJWTAuthenticatedWithDavNoDataInPayload(): void
+    {
+        $eventSubscriber = new DavTokenAuthenticationEventSubscriber();
+        $token = new class () extends AbstractToken {
+            public function getCredentials()
+            {
+                return null;
+            }
+        };
+        $event = new JWTAuthenticatedEvent([], $token);
+
+        $eventSubscriber->onJWTAuthenticated($event);
+
+        self::assertFalse($token->hasAttribute(DavTokenAuthenticationEventSubscriber::STORED_OBJECT));
+        self::assertFalse($token->hasAttribute(DavTokenAuthenticationEventSubscriber::ACTIONS));
+    }
+}

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

@@ -72,21 +72,21 @@ days: jours
 1 hour 30: 1 heure 30
 1 hour 45: 1 heure 45
 2 hours: 2 heures
-2 hours 30: 2 heure 30
+2 hours 30: 2 heures 30
 3 hours: 3 heures
-3 hours 30: 3 heure 30
+3 hours 30: 3 heures 30
 4 hours: 4 heures
-4 hours 30: 4 heure 30
+4 hours 30: 4 heures 30
 5 hours: 5 heures
-5 hours 30: 5 heure 30
+5 hours 30: 5 heures 30
 6 hours: 6 heures
-6 hours 30: 6 heure 30
+6 hours 30: 6 heures 30
 7 hours: 7 heures
-7 hours 30: 7 heure 30
+7 hours 30: 7 heures 30
 8 hours: 8 heures
-8 hours 30: 8 heure 30
+8 hours 30: 8 heures 30
 9 hours: 9 heures
-9 hours 30: 9 heure 30
+9 hours 30: 9 heures 30
 10 hours: 10 heures
 1/2 day: 1/2 jour
 1 day: 1 jour

src/Bundle/ChillBudgetBundle/Controller/AbstractElementController.php

@@ -54,7 +54,7 @@ abstract class AbstractElementController extends AbstractController
             $indexPage = 'chill_budget_elements_household_index';
         }
 
-        if (Request::METHOD_DELETE === $request->getMethod()) {
+        if (Request::METHOD_POST === $request->getMethod()) {
             $form->handleRequest($request);
 
             if ($form->isSubmitted() && $form->isValid()) {
@@ -198,10 +198,9 @@ abstract class AbstractElementController extends AbstractController
     /**
      * Creates a form to delete a help request entity by id.
      */
-    private function createDeleteForm(): Form
+    private function createDeleteForm(): \Symfony\Component\Form\FormInterface
     {
         return $this->createFormBuilder()
-            ->setMethod(Request::METHOD_DELETE)
             ->add('submit', SubmitType::class, ['label' => 'Delete'])
             ->getForm();
     }

src/Bundle/ChillBudgetBundle/Entity/Charge.php

@@ -100,7 +100,7 @@ class Charge extends AbstractElement implements HasCentersInterface
         return $this;
     }
 
-    public function setHelp($help)
+    public function setHelp(?string $help)
     {
         $this->help = $help;
 

src/Bundle/ChillBudgetBundle/Repository/ChargeKindRepository.php

@@ -15,9 +15,9 @@ use Chill\BudgetBundle\Entity\ChargeKind;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 
-final class ChargeKindRepository implements ChargeKindRepositoryInterface
+final readonly class ChargeKindRepository implements ChargeKindRepositoryInterface
 {
-    private readonly EntityRepository $repository;
+    private EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {

src/Bundle/ChillBudgetBundle/Repository/ResourceKindRepository.php

@@ -15,9 +15,9 @@ use Chill\BudgetBundle\Entity\ResourceKind;
 use Doctrine\ORM\EntityManagerInterface;
 use Doctrine\ORM\EntityRepository;
 
-final class ResourceKindRepository implements ResourceKindRepositoryInterface
+final readonly class ResourceKindRepository implements ResourceKindRepositoryInterface
 {
-    private readonly EntityRepository $repository;
+    private EntityRepository $repository;
 
     public function __construct(EntityManagerInterface $entityManager)
     {

src/Bundle/ChillCalendarBundle/Command/MapAndSubscribeUserCalendarCommand.php

@@ -51,8 +51,6 @@ final class MapAndSubscribeUserCalendarCommand extends Command
 
         $limit = 50;
         $offset = 0;
-        /** @var \DateInterval $interval the interval before the end of the expiration */
-        $interval = new \DateInterval('P1D');
         $expiration = (new \DateTimeImmutable('now'))->add(new \DateInterval($input->getOption('subscription-duration')));
         $users = $this->userRepository->findAllAsArray('fr');
         $created = 0;
@@ -95,7 +93,6 @@ final class MapAndSubscribeUserCalendarCommand extends Command
             } catch (UserAbsenceSyncException $e) {
                 $this->logger->error('could not sync user absence', ['userId' => $user->getId(), 'email' => $user->getEmail(), 'exception' => $e->getTraceAsString(), 'message' => $e->getMessage()]);
                 $output->writeln(sprintf('Could not sync user absence: id: %s and email: %s', $user->getId(), $user->getEmail()));
-                throw $e;
             }
 
             // we first try to renew an existing subscription, if any.

src/Bundle/ChillCalendarBundle/Command/SendTestShortMessageOnCalendarCommand.php

@@ -47,7 +47,7 @@ class SendTestShortMessageOnCalendarCommand extends Command
         private readonly PhoneNumberHelperInterface $phoneNumberHelper,
         private readonly ShortMessageForCalendarBuilderInterface $messageForCalendarBuilder,
         private readonly ShortMessageTransporterInterface $transporter,
-        private readonly UserRepositoryInterface $userRepository
+        private readonly UserRepositoryInterface $userRepository,
     ) {
         parent::__construct('chill:calendar:test-send-short-message');
     }

src/Bundle/ChillCalendarBundle/Controller/CalendarController.php

@@ -59,7 +59,7 @@ class CalendarController extends AbstractController
         private readonly AccompanyingPeriodRepository $accompanyingPeriodRepository,
         private readonly UserRepositoryInterface $userRepository,
         private readonly TranslatorInterface $translator,
-        private readonly \Doctrine\Persistence\ManagerRegistry $managerRegistry
+        private readonly \Doctrine\Persistence\ManagerRegistry $managerRegistry,
     ) {}
 
     /**
@@ -84,7 +84,7 @@ class CalendarController extends AbstractController
 
         $form = $this->createDeleteForm($entity);
 
-        if (Request::METHOD_DELETE === $request->getMethod()) {
+        if (Request::METHOD_POST === $request->getMethod()) {
             $form->handleRequest($request);
 
             if ($form->isValid()) {
@@ -512,7 +512,6 @@ class CalendarController extends AbstractController
     {
         return $this->createFormBuilder()
             ->setAction($this->generateUrl('chill_calendar_calendar_delete', ['id' => $calendar->getId()]))
-            ->setMethod('DELETE')
             ->add('submit', SubmitType::class, ['label' => 'Delete'])
             ->getForm();
     }

src/Bundle/ChillCalendarBundle/Entity/Calendar.php

@@ -103,7 +103,7 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
     private int $dateTimeVersion = 0;
 
     /**
-     * @var Collection<CalendarDoc>
+     * @var Collection<int, \Chill\CalendarBundle\Entity\CalendarDoc>
      */
     #[ORM\OneToMany(mappedBy: 'calendar', targetEntity: CalendarDoc::class, orphanRemoval: true)]
     private Collection $documents;
@@ -120,7 +120,7 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
     private ?int $id = null;
 
     /**
-     * @var Collection&Selectable<int, Invite>
+     * @var \Doctrine\Common\Collections\Collection<int, \Chill\CalendarBundle\Entity\Invite>&Selectable
      */
     #[Serializer\Groups(['read', 'docgen:read'])]
     #[ORM\OneToMany(mappedBy: 'calendar', targetEntity: Invite::class, cascade: ['persist', 'remove', 'merge', 'detach'], orphanRemoval: true)]
@@ -143,7 +143,7 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
     private ?Person $person = null;
 
     /**
-     * @var Collection<Person>
+     * @var Collection<int, Person>
      */
     #[Serializer\Groups(['calendar:read', 'read', 'calendar:light', 'docgen:read'])]
     #[Assert\Count(min: 1, minMessage: 'calendar.At least {{ limit }} person is required.')]
@@ -157,7 +157,7 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
     private PrivateCommentEmbeddable $privateComment;
 
     /**
-     * @var Collection<ThirdParty>
+     * @var Collection<int, ThirdParty>
      */
     #[Serializer\Groups(['calendar:read', 'read', 'calendar:light', 'docgen:read'])]
     #[ORM\ManyToMany(targetEntity: ThirdParty::class)]
@@ -440,6 +440,16 @@ class Calendar implements TrackCreationInterface, TrackUpdateInterface, HasCente
         return $this->startDate;
     }
 
+    /**
+     * get the date of the calendar.
+     *
+     * Useful for showing the date of the calendar event, required by twig in some places.
+     */
+    public function getDate(): ?\DateTimeImmutable
+    {
+        return $this->getStartDate();
+    }
+
     public function getStatus(): ?string
     {
         return $this->status;

src/Bundle/ChillCalendarBundle/Entity/CalendarDoc.php

@@ -47,7 +47,7 @@ class CalendarDoc implements TrackCreationInterface, TrackUpdateInterface
         Calendar $calendar,
         #[ORM\ManyToOne(targetEntity: StoredObject::class, cascade: ['persist'])]
         #[ORM\JoinColumn(nullable: false)]
-        private ?StoredObject $storedObject
+        private ?StoredObject $storedObject,
     ) {
         $this->setCalendar($calendar);
         $this->datetimeVersion = $calendar->getDateTimeVersion();

src/Bundle/ChillCalendarBundle/Export/Aggregator/JobAggregator.php

@@ -26,7 +26,7 @@ final readonly class JobAggregator implements AggregatorInterface
 
     public function __construct(
         private UserJobRepository $jobRepository,
-        private TranslatableStringHelper $translatableStringHelper
+        private TranslatableStringHelper $translatableStringHelper,
     ) {}
 
     public function addRole(): ?string

src/Bundle/ChillCalendarBundle/Export/Aggregator/ScopeAggregator.php

@@ -26,7 +26,7 @@ final readonly class ScopeAggregator implements AggregatorInterface
 
     public function __construct(
         private ScopeRepository $scopeRepository,
-        private TranslatableStringHelper $translatableStringHelper
+        private TranslatableStringHelper $translatableStringHelper,
     ) {}
 
     public function addRole(): ?string

src/Bundle/ChillCalendarBundle/Export/Filter/JobFilter.php

@@ -28,7 +28,7 @@ final readonly class JobFilter implements FilterInterface
 
     public function __construct(
         private TranslatableStringHelper $translatableStringHelper,
-        private UserJobRepositoryInterface $userJobRepository
+        private UserJobRepositoryInterface $userJobRepository,
     ) {}
 
     public function addRole(): ?string

src/Bundle/ChillCalendarBundle/Export/Filter/ScopeFilter.php

@@ -30,7 +30,7 @@ class ScopeFilter implements FilterInterface
     public function __construct(
         protected TranslatorInterface $translator,
         private readonly TranslatableStringHelper $translatableStringHelper,
-        private readonly ScopeRepositoryInterface $scopeRepository
+        private readonly ScopeRepositoryInterface $scopeRepository,
     ) {}
 
     public function addRole(): ?string

src/Bundle/ChillCalendarBundle/Form/CalendarType.php

@@ -37,7 +37,7 @@ class CalendarType extends AbstractType
         private readonly IdToUsersDataTransformer $idToUsersDataTransformer,
         private readonly IdToLocationDataTransformer $idToLocationDataTransformer,
         private readonly ThirdPartiesToIdDataTransformer $partiesToIdDataTransformer,
-        private readonly IdToCalendarRangeDataTransformer $calendarRangeDataTransformer
+        private readonly IdToCalendarRangeDataTransformer $calendarRangeDataTransformer,
     ) {}
 
     public function buildForm(FormBuilderInterface $builder, array $options)

src/Bundle/ChillCalendarBundle/Menu/AccompanyingCourseQuickMenuBuilder.php

@@ -0,0 +1,48 @@
+<?php
+
+declare(strict_types=1);
+
+/*
+ * Chill is a software for social workers
+ *
+ * For the full copyright and license information, please view
+ * the LICENSE file that was distributed with this source code.
+ */
+
+namespace Chill\CalendarBundle\Menu;
+
+use Chill\CalendarBundle\Security\Voter\CalendarVoter;
+use Chill\MainBundle\Routing\LocalMenuBuilderInterface;
+use Knp\Menu\MenuItem;
+use Symfony\Component\Security\Core\Security;
+
+final readonly class AccompanyingCourseQuickMenuBuilder implements LocalMenuBuilderInterface
+{
+    public function __construct(private Security $security) {}
+
+    public static function getMenuIds(): array
+    {
+        return ['accompanying_course_quick_menu'];
+    }
+
+    public function buildMenu($menuId, MenuItem $menu, array $parameters)
+    {
+        /** @var \Chill\PersonBundle\Entity\AccompanyingPeriod $accompanyingCourse */
+        $accompanyingCourse = $parameters['accompanying-course'];
+
+        if ($this->security->isGranted(CalendarVoter::CREATE, $accompanyingCourse)) {
+            $menu
+                ->addChild('Create a new calendar in accompanying course', [
+                    'route' => 'chill_calendar_calendar_new',
+                    'routeParameters' => [
+                        'accompanying_period_id' => $accompanyingCourse->getId(),
+                    ],
+                ])
+                ->setExtras([
+                    'order' => 20,
+                    'icon' => 'plus',
+                ])
+            ;
+        }
+    }
+}